From 9d82a443d65ea3e4e015ba6988208231fa8fdc77 Mon Sep 17 00:00:00 2001 From: Roger Leigh Date: Sun, 26 Oct 2008 17:28:20 +0000 Subject: Imported Upstream version 5.1.98.2 --- AUTHORS | 2 +- ChangeLog | 5061 ++++++++++++----- Makefile.am | 4 +- Makefile.in | 41 +- NEWS | 1482 ++--- README | 176 +- aclocal.m4 | 417 +- configure | 2445 +------- configure.ac | 114 +- doc/Makefile.in | 39 +- doc/README.maintaining | 96 +- doc/developer/Makefile.am | 10 +- doc/developer/Makefile.in | 47 +- doc/developer/gutenprint.pdf | Bin 519476 -> 519476 bytes doc/gutenprint/gutenprint.tag | 151 +- doc/gutenprint/html/annotated.html | 2 +- doc/gutenprint/html/array_8h.html | 2 +- doc/gutenprint/html/bit-ops_8h.html | 2 +- doc/gutenprint/html/channel_8h.html | 2 +- doc/gutenprint/html/classes.html | 2 +- doc/gutenprint/html/color_8h.html | 2 +- doc/gutenprint/html/curve-cache_8h.html | 2 +- doc/gutenprint/html/curve_8h.html | 12 +- doc/gutenprint/html/deprecated.html | 2 +- doc/gutenprint/html/dither_8h.html | 2 +- doc/gutenprint/html/files.html | 2 +- doc/gutenprint/html/functions.html | 12 +- doc/gutenprint/html/functions_vars.html | 12 +- doc/gutenprint/html/globals.html | 2 +- doc/gutenprint/html/globals_0x62.html | 2 +- doc/gutenprint/html/globals_0x63.html | 2 +- doc/gutenprint/html/globals_0x64.html | 2 +- doc/gutenprint/html/globals_0x67.html | 2 +- doc/gutenprint/html/globals_0x6e.html | 2 +- doc/gutenprint/html/globals_0x70.html | 6 +- doc/gutenprint/html/globals_0x73.html | 24 +- doc/gutenprint/html/globals_0x74.html | 2 +- doc/gutenprint/html/globals_defs.html | 6 +- doc/gutenprint/html/globals_enum.html | 4 +- doc/gutenprint/html/globals_eval.html | 6 +- doc/gutenprint/html/globals_func.html | 10 +- doc/gutenprint/html/globals_type.html | 2 +- doc/gutenprint/html/globals_vars.html | 2 +- doc/gutenprint/html/group__array.html | 2 +- doc/gutenprint/html/group__color.html | 2 +- doc/gutenprint/html/group__curve.html | 81 +- doc/gutenprint/html/group__image.html | 2 +- doc/gutenprint/html/group__intl.html | 2 +- doc/gutenprint/html/group__intl__internal.html | 2 +- doc/gutenprint/html/group__list.html | 2 +- doc/gutenprint/html/group__papersize.html | 29 +- doc/gutenprint/html/group__printer.html | 2 +- doc/gutenprint/html/group__sequence.html | 81 +- doc/gutenprint/html/group__util.html | 34 +- doc/gutenprint/html/group__vars.html | 2 +- doc/gutenprint/html/group__version.html | 10 +- .../html/gutenprint-intl-internal_8h.html | 2 +- doc/gutenprint/html/gutenprint-intl_8h.html | 2 +- doc/gutenprint/html/gutenprint-module_8h.html | 2 +- doc/gutenprint/html/gutenprint-version_8h.html | 6 +- doc/gutenprint/html/gutenprint_8h.html | 2 +- doc/gutenprint/html/image_8h.html | 2 +- doc/gutenprint/html/index.html | 2 +- doc/gutenprint/html/list_8h.html | 2 +- doc/gutenprint/html/module_8h.html | 2 +- doc/gutenprint/html/modules.html | 2 +- doc/gutenprint/html/mxml_8h.html | 2 +- doc/gutenprint/html/pages.html | 2 +- doc/gutenprint/html/paper_8h.html | 6 +- doc/gutenprint/html/path_8h.html | 2 +- doc/gutenprint/html/printers_8h.html | 2 +- doc/gutenprint/html/sequence_8h.html | 12 +- doc/gutenprint/html/string-list_8h.html | 2 +- .../html/structstp__cached__curve__t.html | 2 +- doc/gutenprint/html/structstp__color__t.html | 2 +- doc/gutenprint/html/structstp__colorfuncs__t.html | 2 +- .../html/structstp__curve__point__t.html | 2 +- .../structstp__dither__matrix__generic__t.html | 2 +- .../html/structstp__dither__matrix__impl__t.html | 2 +- .../html/structstp__dither__matrix__normal__t.html | 2 +- .../html/structstp__dither__matrix__short__t.html | 2 +- doc/gutenprint/html/structstp__dotsize__t.html | 2 +- .../html/structstp__double__bound__t.html | 2 +- doc/gutenprint/html/structstp__family__t.html | 2 +- doc/gutenprint/html/structstp__image__t.html | 2 +- doc/gutenprint/html/structstp__int__bound__t.html | 2 +- doc/gutenprint/html/structstp__lineactive__t.html | 2 +- doc/gutenprint/html/structstp__linebounds__t.html | 2 +- doc/gutenprint/html/structstp__linebufs__t.html | 2 +- doc/gutenprint/html/structstp__linecount__t.html | 2 +- doc/gutenprint/html/structstp__lineoff__t.html | 2 +- doc/gutenprint/html/structstp__module__t.html | 2 +- .../html/structstp__module__version__t.html | 2 +- doc/gutenprint/html/structstp__mxml__attr__t.html | 2 +- .../html/structstp__mxml__element__t.html | 2 +- doc/gutenprint/html/structstp__mxml__node__s.html | 2 +- doc/gutenprint/html/structstp__mxml__text__t.html | 2 +- doc/gutenprint/html/structstp__papersize__t.html | 22 +- .../html/structstp__param__string__t.html | 2 +- doc/gutenprint/html/structstp__parameter__t.html | 2 +- doc/gutenprint/html/structstp__pass__t.html | 2 +- doc/gutenprint/html/structstp__printfuncs__t.html | 2 +- doc/gutenprint/html/structstp__raw__t.html | 2 +- doc/gutenprint/html/structstp__shade__t.html | 2 +- doc/gutenprint/html/structstp__weave__t.html | 2 +- doc/gutenprint/html/unionstp__mxml__value__t.html | 2 +- doc/gutenprint/html/util_8h.html | 4 +- doc/gutenprint/html/vars_8h.html | 2 +- doc/gutenprint/html/weave_8h.html | 2 +- doc/gutenprint/html/xml_8h.html | 2 +- doc/gutenprintui2/gutenprintui2.tag | 8 +- doc/gutenprintui2/html/annotated.html | 2 +- doc/gutenprintui2/html/classes.html | 2 +- doc/gutenprintui2/html/curve_8h.html | 2 +- doc/gutenprintui2/html/files.html | 2 +- doc/gutenprintui2/html/functions.html | 2 +- doc/gutenprintui2/html/functions_vars.html | 2 +- doc/gutenprintui2/html/gammacurve_8h.html | 2 +- doc/gutenprintui2/html/globals.html | 2 +- doc/gutenprintui2/html/globals_defs.html | 2 +- doc/gutenprintui2/html/globals_enum.html | 2 +- doc/gutenprintui2/html/globals_eval.html | 2 +- doc/gutenprintui2/html/globals_func.html | 2 +- doc/gutenprintui2/html/globals_type.html | 2 +- doc/gutenprintui2/html/gutenprintui_8h.html | 2 +- doc/gutenprintui2/html/index.html | 2 +- doc/gutenprintui2/html/struct__StpuiCurve.html | 2 +- .../html/struct__StpuiCurveClass.html | 2 +- .../html/struct__StpuiGammaCurve.html | 2 +- .../html/struct__StpuiGammaCurveClass.html | 2 +- doc/gutenprintui2/html/structstpui__image__t.html | 2 +- doc/gutenprintui2/html/structstpui__plist__t.html | 2 +- doc/gutenprintui2/html/typebuiltins_8h.html | 2 +- include/Makefile.am | 4 +- include/Makefile.in | 41 +- include/gutenprint/Makefile.am | 2 +- include/gutenprint/Makefile.in | 39 +- include/gutenprint/bit-ops.h | 2 +- include/gutenprint/curve.h | 27 +- include/gutenprint/paper.h | 14 +- include/gutenprint/printers.h | 4 +- include/gutenprint/sequence.h | 26 +- include/gutenprint/util.h | 6 +- include/gutenprint/vars.h | 2 +- include/gutenprintui/Makefile.am | 37 - include/gutenprintui/Makefile.in | 550 -- include/gutenprintui/gutenprintui.h | 178 - include/gutenprintui2/Makefile.in | 39 +- m4/stp_gimp.m4 | 43 - m4/stp_release.m4 | 2 +- man/Makefile.am | 4 +- man/Makefile.in | 47 +- man/cups-genppdconfig.8.in | 63 - po/POTFILES.in | 9 - po/cs.gmo | Bin 31654 -> 31593 bytes po/cs.po | 4396 ++++++++------- po/da.gmo | Bin 112141 -> 126903 bytes po/da.po | 4581 ++++++++------- po/de.gmo | Bin 30268 -> 30037 bytes po/de.po | 4907 ++++++++-------- po/el.gmo | Bin 4643 -> 4362 bytes po/el.po | 5052 +++++++++-------- po/en_GB.gmo | Bin 110930 -> 107467 bytes po/en_GB.po | 4057 ++++++++------ po/es.gmo | Bin 29676 -> 29409 bytes po/es.po | 5175 +++++++++-------- po/fr.gmo | Bin 114055 -> 111234 bytes po/fr.po | 4042 ++++++++------ po/gutenprint.pot | 3916 +++++++------ po/hu.gmo | Bin 102448 -> 104945 bytes po/hu.po | 4503 +++++++-------- po/ja.gmo | Bin 33814 -> 29500 bytes po/ja.po | 5835 ++++++++++---------- po/nb.gmo | Bin 13531 -> 13469 bytes po/nb.po | 4025 ++++++++------ po/nl.gmo | Bin 113413 -> 115254 bytes po/nl.po | 4632 ++++++++-------- po/pl.gmo | Bin 7386 -> 7249 bytes po/pl.po | 4426 ++++++++------- po/pt.gmo | Bin 31864 -> 31495 bytes po/pt.po | 5081 +++++++++-------- po/sk.gmo | Bin 31094 -> 30011 bytes po/sk.po | 5759 ++++++++++--------- po/sv.gmo | Bin 101259 -> 97814 bytes po/sv.po | 4312 ++++++++------- po/zh_TW.gmo | Bin 29036 -> 28405 bytes po/zh_TW.po | 4359 ++++++++------- samples/Makefile.in | 39 +- scripts/Makefile.in | 39 +- scripts/mkchlog | 85 +- src/Makefile.am | 4 +- src/Makefile.in | 41 +- src/cups/Makefile.am | 22 +- src/cups/Makefile.in | 155 +- src/cups/canon.c | 810 --- src/cups/command.types | 4 +- src/cups/commandtoepson.c | 4 +- src/cups/cups-calibrate.c | 2 +- src/cups/cups-genppdconfig.in | 480 -- src/cups/cups-genppdupdate.in | 496 +- src/cups/epson.c | 879 --- src/cups/genppd.c | 12 +- src/cups/rastertoprinter.c | 4 +- src/escputil/Makefile.in | 39 +- src/escputil/d4lib.c | 1 + src/escputil/escputil.c | 2 +- src/foomatic/Makefile.in | 39 +- src/foomatic/foomatic-printermap | 32 + src/foomatic/gutenprint-version.c | 2 +- src/foomatic/paper_sizes.c | 2 +- src/foomatic/printer_margins.c | 2 +- src/foomatic/printer_options.c | 2 +- src/foomatic/printers.c | 2 +- src/ghost/Makefile.in | 39 +- src/ghost/ijsgutenprint.c | 66 +- src/gimp/Makefile.am | 48 - src/gimp/Makefile.in | 616 --- src/gimp/print-image-gimp.c | 447 -- src/gimp/print-intl.h | 39 - src/gimp/print.c | 458 -- src/gimp/print_gimp.h | 46 - src/gimp2/Makefile.in | 39 +- src/gutenprintui/Makefile.am | 75 - src/gutenprintui/Makefile.in | 743 --- src/gutenprintui/gutenprintui-internal.h | 244 - src/gutenprintui/gutenprintui.pc.in | 12 - src/gutenprintui/panel.c | 5225 ------------------ src/gutenprintui/plist.c | 1793 ------ src/gutenprintui/print-image-thumbnail.c | 130 - src/gutenprintui/printrc.h | 44 - src/gutenprintui/printrcl.c | 2118 ------- src/gutenprintui/printrcl.l | 115 - src/gutenprintui/printrcy.c | 2061 ------- src/gutenprintui/printrcy.h | 133 - src/gutenprintui/printrcy.y | 447 -- src/gutenprintui/ui-utils.c | 870 --- src/gutenprintui2/Makefile.am | 2 +- src/gutenprintui2/Makefile.in | 39 +- src/gutenprintui2/gutenprintui-internal.h | 14 +- src/gutenprintui2/panel.c | 387 +- src/gutenprintui2/plist.c | 40 +- src/gutenprintui2/printrcl.c | 1341 ++--- src/gutenprintui2/printrcy.c | 1248 ++--- src/gutenprintui2/printrcy.h | 33 +- src/gutenprintui2/printrcy.y | 2 +- src/main/Makefile.am | 16 +- src/main/Makefile.in | 86 +- src/main/bit-ops.c | 2 +- src/main/canon-inks.h | 13 + src/main/canon-modes.h | 4 + src/main/canon-printers.h | 73 +- src/main/color-conversion.h | 4 +- src/main/curve.c | 45 +- src/main/dither-eventone.c | 711 +-- src/main/dither-impl.h | 11 +- src/main/dither-inks.c | 3 +- src/main/dither-main.c | 17 +- src/main/dither-ordered.c | 319 +- src/main/escp2-channels.c | 296 +- src/main/escp2-driver.c | 2 +- src/main/escp2-inks.c | 32 +- src/main/escp2-papers.c | 19 +- src/main/escp2-resolutions.c | 18 +- src/main/module.c | 6 +- src/main/papers.xml | 178 +- src/main/print-canon.c | 19 +- src/main/print-color.c | 75 +- src/main/print-dither-matrices.c | 7 +- src/main/print-escp2-data.c | 513 +- src/main/print-escp2.c | 542 +- src/main/print-escp2.h | 19 +- src/main/print-lexmark.c | 2 +- src/main/print-olympus.c | 12 +- src/main/print-papers.c | 17 +- src/main/print-pcl.c | 112 +- src/main/print-ps.c | 824 +-- src/main/print-raw.c | 2 +- src/main/print-util.c | 2 +- src/main/print-vars.c | 41 +- src/main/print-weave.c | 2 +- src/main/printers.c | 48 +- src/main/printers.xml | 61 +- src/main/sequence.c | 30 +- src/main/util.h | 4 +- src/main/xml.c | 2 +- src/main/xmlppd.c | 530 ++ src/main/xmlppd.h | 46 + src/testpattern/Makefile.am | 2 +- src/testpattern/Makefile.in | 39 +- src/testpattern/printer_options.c | 2 +- src/testpattern/printers.c | 2 +- src/testpattern/run-testpattern | 2 +- src/testpattern/testpattern.c | 444 +- src/testpattern/testpattern.h | 13 +- src/testpattern/testpatternl.c | 476 +- src/testpattern/testpatternl.l | 7 +- src/testpattern/testpatterny.c | 800 +-- src/testpattern/testpatterny.h | 78 +- src/testpattern/testpatterny.y | 151 +- test/Makefile.am | 2 +- test/Makefile.in | 39 +- test/curve.c | 65 +- test/unprint.c | 4 +- 303 files changed, 53152 insertions(+), 66715 deletions(-) delete mode 100644 include/gutenprintui/Makefile.am delete mode 100644 include/gutenprintui/Makefile.in delete mode 100644 include/gutenprintui/gutenprintui.h delete mode 100644 man/cups-genppdconfig.8.in delete mode 100644 src/cups/canon.c delete mode 100644 src/cups/cups-genppdconfig.in delete mode 100644 src/cups/epson.c delete mode 100644 src/gimp/Makefile.am delete mode 100644 src/gimp/Makefile.in delete mode 100644 src/gimp/print-image-gimp.c delete mode 100644 src/gimp/print-intl.h delete mode 100644 src/gimp/print.c delete mode 100644 src/gimp/print_gimp.h delete mode 100644 src/gutenprintui/Makefile.am delete mode 100644 src/gutenprintui/Makefile.in delete mode 100644 src/gutenprintui/gutenprintui-internal.h delete mode 100644 src/gutenprintui/gutenprintui.pc.in delete mode 100644 src/gutenprintui/panel.c delete mode 100644 src/gutenprintui/plist.c delete mode 100644 src/gutenprintui/print-image-thumbnail.c delete mode 100644 src/gutenprintui/printrc.h delete mode 100644 src/gutenprintui/printrcl.c delete mode 100644 src/gutenprintui/printrcl.l delete mode 100644 src/gutenprintui/printrcy.c delete mode 100644 src/gutenprintui/printrcy.h delete mode 100644 src/gutenprintui/printrcy.y delete mode 100644 src/gutenprintui/ui-utils.c create mode 100644 src/main/xmlppd.c create mode 100644 src/main/xmlppd.h diff --git a/AUTHORS b/AUTHORS index 98909d5..dd9d17b 100644 --- a/AUTHORS +++ b/AUTHORS @@ -75,7 +75,7 @@ Mark Tomlinson Implementation of Raph Levien's EvenTone dither Michael Mraka - Olympus driver + DyeSub (formerly Olympus) driver Michael Natterer New user interface diff --git a/ChangeLog b/ChangeLog index c13a216..03f8016 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,600 +1,2803 @@ +=============================================================================== +Name: gutenprint-5_2_0-beta2 + +2008-04-28 + + Files: NEWS (1.364) (+9 -1) + README (1.186) (+2 -2) + configure.ac (1.180) (+3 -3) + src/main/Makefile.am (1.99) (+3 -3) + + Emergency fix for Gutenprint 5.2.0-beta2 + +=============================================================================== +Name: gutenprint-5_2_0-beta1 + +2008-04-26 + + Files: po/cs.po (1.48) (+1168 -1176) + po/da.po (1.85) (+716 -645) + po/de.po (1.62) (+1168 -1176) + po/el.po (1.63) (+1155 -1182) + po/en_GB.po (1.155) (+1804 -1638) + po/es.po (1.61) (+1168 -1176) + po/fr.po (1.89) (+1788 -1633) + po/hu.po (1.19) (+1155 -1178) + po/ja.po (1.57) (+1168 -1176) + po/nb.po (1.22) (+1728 -1035) + po/nl.po (1.67) (+751 -661) + po/pl.po (1.67) (+1147 -1184) + po/pt.po (1.62) (+1168 -1176) + po/sk.po (1.66) (+1168 -1176) + po/sv.po (1.92) (+3529 -2449) + po/zh_TW.po (1.22) (+1115 -1192) + + Gutenprint 5.2-beta1 release + +2008-04-26 + + Files: po/da.po (1.84) (+8090 -122) + + Fix Danish translation (somehow got mangled) + +2008-04-26 + + Files: NEWS (1.363) (+6 -3) + src/foomatic/foomatic-printermap (1.166) (+5 -0) + src/main/print-pcl.c (1.150) (+54 -1) + src/main/printers.xml (1.227) (+6 -1) + + Add support for generic large format laser printers + +2008-04-25 + + Files: NEWS (1.362) (+6 -0) + + Updates. + +2008-04-25 + + Files: po/da.po (1.83) (+122 -8283) + + Updated Danish translation + +2008-04-23 + + Files: po/nl.po (1.66) (+1166 -1271) + + Fix some translated strings + +2008-04-22 + + Files: src/ghost/ijsgutenprint.c (1.20) (+33 -33) + + Don't translate error/warning strings. + +2008-04-20 + + Files: src/main/canon-printers.h (1.46) (+44 -1) + src/main/print-canon.c (1.226) (+9 -2) + + switch channel order to CMYK for the iP4500 might fix #1834153 + +2008-04-20 + + Files: src/main/canon-printers.h (1.45) (+1 -1) + + make the iX5000 use the I Raster commandset so that the driver may also work for the MP520 (untested) + +2008-04-18 + + Files: NEWS (1.361) (+7 -1) + + Prep for 5.2-beta + +2008-04-15 + + Files: po/en_GB.po (1.154) (+1942 -2720) + po/fr.po (1.88) (+2450 -3582) + + Updates from translation service + +2008-04-15 + + Files: po/cs.po (1.47) (+5814 -2499) + po/da.po (1.82) (+2513 -1807) + po/de.po (1.61) (+5338 -2123) + po/el.po (1.62) (+5626 -2364) + po/en_GB.po (1.153) (+5854 -2043) + po/es.po (1.60) (+5809 -2506) + po/fr.po (1.87) (+5814 -2511) + po/hu.po (1.18) (+2491 -1795) + po/ja.po (1.56) (+5820 -2504) + po/nl.po (1.65) (+2550 -1824) + po/pl.po (1.66) (+5479 -2287) + po/pt.po (1.61) (+5825 -2508) + po/sk.po (1.65) (+5804 -2505) + po/zh_TW.po (1.21) (+5738 -2096) + + run msgmerge + +2008-04-15 + + Files: po/cs.po (1.46) (+2346 -5078) + po/da.po (1.81) (+2532 -3346) + po/de.po (1.60) (+2308 -4917) + po/el.po (1.61) (+2573 -5254) + po/en_GB.po (1.152) (+3158 -6191) + po/es.po (1.59) (+2686 -5408) + po/fr.po (1.86) (+3443 -5614) + po/hu.po (1.17) (+2517 -3322) + po/ja.po (1.55) (+2940 -5673) + po/nl.po (1.64) (+2550 -3384) + po/pl.po (1.65) (+2307 -4915) + po/pt.po (1.60) (+2582 -5316) + po/sk.po (1.64) (+2916 -5634) + po/sv.po (1.91) (+4116 -5040) + po/zh_TW.po (1.20) (+2742 -6283) + + Resync with tarnslationproject.org + +2008-04-15 + + Files: src/main/papers.xml (1.28) (+7 -1) + + Add L-size photo paper (3.5x5). + +2008-04-13 + + Files: NEWS (1.360) (+94 -543) + README (1.185) (+50 -68) + configure.ac (1.179) (+6 -6) + + Bump version to 5.2 beta + +2008-04-12 + + Files: Makefile.am (1.151) (+2 -2) + scripts/mkchlog (1.11) (+64 -21) + + Record release points in change log + +2008-04-12 + + Files: src/cups/cups-genppdupdate.in (1.42) (+12 -3) + + Function correctly when both -r and -s are used. + +2008-04-07 + + Files: src/cups/cups-genppdupdate.in (1.41) (+13 -4) + + Further improve performance by not changing PPD values that don't + actually change. + +2008-04-06 + + Files: src/cups/cups-genppdupdate.in (1.40) (+147 -148) + + Add -f option to allow bypassing ownership check. + + Improve file search. + + Don't pre-check for Gutenprint/Gimp-Print PPD files (just wastes + time). + + Exit with non-zero status if any updates failed (as opposed to skipped + or invalid). + +2008-04-06 + + Files: src/cups/genppd.c (1.142) (+8 -2) + + Check the URI scheme to make sure the version is correct. + +2008-04-06 + + Files: src/main/print-canon.c (1.225) (+2 -2) + + fixed mixed declaration and code warning + +2008-04-06 + + Files: src/main/print-canon.c (1.224) (+5 -2) + + make it possible to easily change the channel order + +2008-04-06 + + Files: src/cups/cups-genppdupdate.in (1.39) (+3 -3) + + Minor wording changes + +2008-04-06 + + Files: src/cups/cups-genppdupdate.in (1.38) (+50 -118) + + Improve performance by making only one pass over the PPD file and + extracting all data at that time. Old code made a lot of separate + passes over the data. + +2008-04-06 + + Files: src/cups/cups-genppdupdate.in (1.37) (+3 -1) + + Update help message. + +2008-04-06 + + Files: README (1.184) (+14 -14) + + Change cups-genppdupdate.5.1 to cups-genppdupdate. + +2008-04-06 + + Files: configure.ac (1.178) (+3 -6) + src/cups/Makefile.am (1.96) (+3 -6) + src/cups/cups-genppdupdate.in (1.36) (+55 -12) + + Make cups-genppdupdate generic, but favor the current version + +2008-04-01 + + Files: configure.ac (1.177) (+2 -8) + man/Makefile.am (1.23) (+1 -3) + man/cups-genppdconfig.8.in (1.7) (removed) + + Complete removal of cups-genppdconfig + +2008-03-31 + + Files: src/cups/Makefile.am (1.95) (+4 -6) + src/cups/cups-genppdconfig.in (1.15) (removed) + + Remove no longer used cups-genppdconfig + +2008-03-31 + + Files: src/cups/cups-genppdupdate.in (1.35) (+24 -8) + + [ 1929738 ] genppdupdate updates twice with case-insensitive filesystems + +2008-03-29 + + Files: src/foomatic/foomatic-printermap (1.165) (+177 -0) + src/main/printers.xml (1.226) (+178 -1) + + Restore PCL inkjet printers + +2008-03-07 + + Files: configure.ac (1.176) (+3 -3) + + Bump version + +=============================================================================== +Name: gutenprint-5_1_7 + +2008-03-07 + + Files: po/cs.po (1.45) (+1792 -1383) + po/da.po (1.80) (+1777 -1367) + po/de.po (1.59) (+1776 -1368) + po/el.po (1.60) (+1773 -1368) + po/en_GB.po (1.151) (+1777 -1367) + po/es.po (1.58) (+1777 -1368) + po/fr.po (1.85) (+1777 -1367) + po/hu.po (1.16) (+1777 -1367) + po/ja.po (1.54) (+1777 -1368) + po/nb.po (1.21) (+1773 -1368) + po/nl.po (1.63) (+1777 -1367) + po/pl.po (1.64) (+1782 -1385) + po/pt.po (1.59) (+1777 -1368) + po/sk.po (1.63) (+1777 -1368) + po/sv.po (1.90) (+1779 -1368) + po/zh_TW.po (1.19) (+1763 -1368) + + Gutenprint 5.1.7 release + +2008-03-05 + + Files: src/main/print-vars.c (1.81) (+20 -21) + + Make check_vars into a macro to allow it to be inlined. + +2008-03-05 + + Files: configure.ac (1.175) (+3 -3) + + Reduce inlining limit to fix compile problem on OS X 10.2 (and + shrink binary). + +2008-03-02 + + Files: NEWS (1.359) (+62 -13) + README (1.183) (+1 -1) + + Prep for 5.1.7 + +2008-02-28 + + Files: doc/README.maintaining (1.24) (+24 -72) + + Updates. + +2008-02-27 + + Files: doc/developer/Makefile.am (1.22) (+3 -3) + + Fix typo + +2008-02-27 + + Files: src/main/print-escp2.c (1.387) (+6 -2) + + Don't offer a choice of ink types if there's only one "real" choice. + +2008-02-27 + + Files: NEWS (1.358) (+1 -1) + + Correct number of supported printers. + +2008-02-27 + + Files: NEWS (1.357) (+20 -0) + src/foomatic/foomatic-printermap (1.164) (+7 -0) + src/main/escp2-channels.c (1.75) (+61 -11) + src/main/escp2-papers.c (1.108) (+15 -4) + src/main/print-escp2-data.c (1.246) (+22 -3) + src/main/printers.xml (1.225) (+20 -13) + + Add and correct many Epson PictureMate printers. Not all of these + printers are tuned at this point. + +2008-02-27 + + Files: src/main/printers.xml (1.224) (+2 -2) + + Fix typo. + +2008-02-24 + + Files: NEWS (1.356) (+8 -8) + + Refer to 5.1 rather than 5.0 where appropriate. + +2008-02-24 + + Files: NEWS (1.355) (+50 -0) + src/main/print-escp2-data.c (1.245) (+13 -13) + + Fix borderless printing on R2400. + + Improve 2880x2880 and 5760x2880 resolution on many printers. + +2008-02-24 + + Files: src/main/print-escp2-data.c (1.244) (+2 -2) + + Fix definition of PM-G820. + +2008-02-24 + + Files: src/main/print-escp2-data.c (1.243) (+7 -7) + + Fix 5760x2880 printing on R800 and 1400. + +2008-02-24 + + Files: src/main/print-escp2-data.c (1.242) (+2 -2) + + Setting extra_feed for the C120 causes poor quality in color output at + the bottom of the page. + +2008-02-24 + + Files: src/main/print-escp2-data.c (1.241) (+2 -2) + + Extra feed yields better results on C120, but still not perfect at + 2880 DPI vertical. + +2008-02-24 + + Files: src/main/escp2-resolutions.c (1.44) (+17 -1) + src/main/print-escp2-data.c (1.240) (+3 -3) + + Enable use of 2880x2880 DPI for Ultra Photo and 5760x2880 for Best + quality for Claria-based printers. + +2008-02-24 + + Files: src/main/printers.xml (1.223) (+2 -2) + + Fix typo. + +2008-02-24 + + Files: src/main/print-escp2-data.c (1.239) (+3 -3) + + Improve print quality near the bottom of the page at 5760x2880 and + 2880x2880 DPI on Claria printers (see bug 1700313). + +2008-02-19 + + Files: src/main/dither-eventone.c (1.42) (+372 -335) + + Use standard Gutenprint C style. + +2008-02-18 + + Files: src/main/dither-eventone.c (1.41) (+12 -2) + src/main/dither-impl.h (1.32) (+3 -4) + src/main/dither-inks.c (1.26) (+1 -2) + src/main/dither-main.c (1.59) (+4 -6) + src/main/dither-ordered.c (1.28) (+76 -81) + src/main/print-dither-matrices.c (1.37) (+1 -6) + src/testpattern/run-testpattern (1.23) (+1 -1) + + Move some eventone-specific stuff out of the core dither object. + + Add segmented new ordered dither algorithm. + +2008-02-17 + + Files: NEWS (1.354) (+3 -1) + + mention fixed bugs + +2008-02-17 + + Files: src/main/canon-printers.h (1.44) (+12 -0) + src/main/printers.xml (1.222) (+2 -2) + + the PIXMA MP520 only works with the I printing command + +2008-02-17 + + Files: NEWS (1.353) (+4 -0) + src/foomatic/foomatic-printermap (1.163) (+2 -0) + src/main/canon-inks.h (1.22) (+13 -0) + src/main/canon-modes.h (1.31) (+4 -0) + src/main/canon-printers.h (1.43) (+12 -0) + src/main/printers.xml (1.221) (+3 -1) + + added (untested) support for Canon PIXMA MP520 and iP6000D + +2008-02-03 + + Files: doc/developer/Makefile.am (1.21) (+9 -1) + + Give a useful error if db2pdf or db2html is missing. + +2008-02-03 + + Files: src/main/escp2-inks.c (1.62) (+2 -2) + + A few more fixes for the 1400. + +2008-02-03 + + Files: src/main/print-escp2-data.c (1.238) (+2 -2) + + Correct base resolution for Stylus Photo 1400 at 1440x1440 DPI. + +2008-02-03 + + Files: src/main/escp2-inks.c (1.61) (+15 -15) + src/main/print-escp2-data.c (1.237) (+5 -5) + + Retune Claria-based printers + +2008-02-03 + + Files: src/testpattern/testpatternl.l (1.20) (+3 -3) + + Accept hex integers. + +2008-02-03 + + Files: src/main/print-escp2.c (1.386) (+14 -4) + + Allow passing base resolution, drop size, and such on the command line. + +2008-02-02 + + Files: src/main/dither-ordered.c (1.27) (+15 -9) + + In segmented mode, treat the lowest order segment (corresponding to + output value of 0) as normal ordered dither. + +2008-01-31 + + Files: src/gutenprintui2/plist.c (1.17) (+10 -10) + + - printer queue list was queried by grep|awk|sed and grep|sed colons; + changed to awk only + +2008-01-30 + + Files: src/gutenprintui2/plist.c (1.16) (+14 -2) + + Reset LC_MESSAGES and LANG in addition to LC_ALL to ensure that lpstat + doesn't translate messages. + +2008-01-30 + + Files: src/gutenprintui2/plist.c (1.15) (+5 -2) + + Explain why it's important to use lpstat -v rather than lpstat -t or + lpstat -p, which in some ways are easier to parse. + +2008-01-27 + + Files: src/testpattern/testpattern.c (1.48) (+227 -217) + src/testpattern/testpattern.h (1.17) (+7 -6) + src/testpattern/testpatternl.l (1.19) (+3 -2) + src/testpattern/testpatterny.y (1.30) (+81 -70) + + Allow floats to be input without decimal point + +2008-01-27 + + Files: test/unprint.c (1.39) (+2 -2) + + Fix determination of multiple drop size status. + +2008-01-26 + + Files: src/main/print-pcl.c (1.149) (+4 -4) + + Fix definitions of adjustable guide trays. + +2008-01-26 + + Files: src/main/dither-impl.h (1.31) (+3 -2) + src/main/dither-main.c (1.58) (+7 -2) + src/main/dither-ordered.c (1.26) (+75 -1) + + Add drop size segmented dither algorithm + +2008-01-25 + + Files: src/main/print-color.c (1.139) (+2 -2) + + Fix silly typo + +2008-01-22 + + Files: src/gutenprintui2/gutenprintui-internal.h (1.5) (+3 -1) + src/gutenprintui2/panel.c (1.17) (+120 -115) + + Add reset buttons to individual settings + +2008-01-22 + + Files: src/main/print-escp2.c (1.385) (+47 -1) + + Expose actual (per-paper and printer) GCR settings. + +2008-01-21 + + Files: src/main/printers.c (1.83) (+15 -20) + + Speed up stp_init + +2008-01-21 + + Files: include/gutenprint/curve.h (1.2) (+23 -4) + include/gutenprint/sequence.h (1.2) (+23 -3) + src/gutenprintui2/gutenprintui-internal.h (1.4) (+11 -1) + src/gutenprintui2/panel.c (1.16) (+188 -2) + src/main/color-conversion.h (1.12) (+1 -3) + src/main/curve.c (1.53) (+44 -1) + src/main/print-color.c (1.138) (+74 -1) + src/main/sequence.c (1.25) (+29 -1) + test/curve.c (1.23) (+64 -1) + + Add ability to dump out LUT state (curves and such). This is a prototype. + + Add ability to reverse curves and sequences. Still needs tests. + +2008-01-19 + + Files: src/main/escp2-channels.c (1.74) (+113 -113) + src/main/print-escp2.c (1.384) (+443 -18) + src/main/print-escp2.h (1.117) (+6 -4) + + Add drop size parameters. + + Add light ink values. + + Add real light ink transition (cutoff) parameters and rename existing + cutoff parameters to "scale" (i. e. density scale). + +2008-01-15 + + Files: src/cups/genppd.c (1.141) (+3 -2) + + Fix valgrind issue + +2008-01-15 + + Files: include/gutenprint/paper.h (1.2) (+12 -2) + src/main/papers.xml (1.27) (+169 -1) + src/main/print-escp2-data.c (1.236) (+259 -173) + src/main/print-escp2.c (1.383) (+14 -1) + src/main/print-escp2.h (1.116) (+10 -3) + src/main/print-papers.c (1.38) (+15 -2) + src/main/print-pcl.c (1.148) (+50 -9) + + Flag envelope paper sizes so that drivers can treat them specially. + This mechanism is extensible. + + Add landscape equivalents for all envelope sizes. + + Flag Epson printers that are supposed to print envelopes in landscape mode. + + Fix margins for PCL printers for paper trays with movable guides. + +2008-01-13 + + Files: src/main/printers.c (1.82) (+7 -8) + + Fix a few warnings + +2008-01-13 + + Files: NEWS (1.352) (+30 -2) + README (1.182) (+5 -5) + configure.ac (1.174) (+3 -3) + src/foomatic/foomatic-printermap (1.162) (+18 -0) + src/main/printers.xml (1.220) (+19 -1) + + Add some new Epson printers; bump version + +2008-01-07 + + Files: src/main/canon-printers.h (1.42) (+1 -1) + + Fix printing for the PIXMA iP4500 + +2008-01-06 + + Files: src/main/print-escp2-data.c (1.235) (+2 -2) + + The C120 does work at 5760x2880, but the bottom can be a bit fuzzy + (same issue as with other printers for which we've enabled + 5760x2880). So let's enable it here. + +2008-01-05 + + Files: src/gutenprintui2/plist.c (1.14) (+7 -2) + + Set locale to C when calling external programs + +2008-01-03 + + Files: src/main/print-canon.c (1.223) (+6 -1) + + also call canon_end_job when in Page mode + +=============================================================================== +Name: gutenprint-5_1_6 + 2008-01-02 - Files: src/cups/rastertoprinter.c (1.105.2.6) (+4 -4) + Files: src/cups/rastertoprinter.c (1.120) (+4 -4) + + Don't print the command line options on a single line in the debug output. + +2007-12-31 + + Files: src/cups/rastertoprinter.c (1.119) (+129 -105) + + Improve debug error message output + +2007-12-31 + + Files: NEWS (1.351) (+2 -2) + + Prep for 5.1.6. + +2007-12-31 + + Files: NEWS (1.350) (+36 -12) + README (1.181) (+5 -5) + configure.ac (1.173) (+3 -3) + + Prep for 5.1.6 + +2007-12-31 + + Files: src/main/buffer-image.c (1.2) (+3 -0) + + [ 1844169 ] Severe per-page memory leak w/Canon driver, DuplexNoTumble + +2007-12-31 + + Files: src/testpattern/run-testpattern-2.in (1.11) (+32 -6) + src/testpattern/testpattern.c (1.47) (+120 -8) + + Test duplex and tumble by default, using multiple pages. + + Allow -p option to specify use of multiple pages. + + Correctly generate all data (fix some valgrind problems). + +2007-12-30 + + Files: src/main/dither-ordered.c (1.25) (+11 -28) + + The top and bottom of each range can be computed trivially from the + fraction at which we start using larger drops. + +2007-12-30 + + Files: src/main/dither-ordered.c (1.24) (+88 -115) + + Simplify the calculations somewhat (and get better results). + +2007-12-30 + + Files: src/main/escp2-driver.c (1.38) (+2 -2) + + Fix compile problem on OS X. + +=============================================================================== +Name: gutenprint-5_1_5 + +2007-12-29 + + Files: po/cs.po (1.44) (+1184 -1115) + po/da.po (1.79) (+1187 -1115) + po/de.po (1.58) (+1184 -1115) + po/el.po (1.59) (+1185 -1115) + po/en_GB.po (1.150) (+1187 -1115) + po/es.po (1.57) (+1185 -1115) + po/fr.po (1.84) (+1187 -1115) + po/hu.po (1.15) (+1187 -1115) + po/ja.po (1.53) (+1185 -1115) + po/nb.po (1.20) (+1185 -1115) + po/nl.po (1.62) (+1187 -1115) + po/pl.po (1.63) (+1184 -1115) + po/pt.po (1.58) (+1185 -1115) + po/sk.po (1.62) (+1185 -1115) + po/sv.po (1.89) (+1187 -1116) + po/zh_TW.po (1.18) (+1185 -1115) + + Gutenprint 5.1.5 release + +2007-12-29 + + Files: Makefile.am (1.150) (+35 -35) + + Remove GNU make-ism. + +2007-12-28 + + Files: src/main/dither-ordered.c (1.23) (+9 -3) + + Correctly handle cases where some channels have multiple drop sizes + but others don't. + +2007-12-28 + + Files: src/testpattern/run-testpattern-2.in (1.10) (+20 -8) + + Allow overriding the default settings for dither algorithm and color + correction. + +2007-12-28 + + Files: src/main/printers.xml (1.219) (+7 -2) + + tweak PIXMA iP4200 patch by Piotr Stachura + +2007-12-28 + + Files: NEWS (1.349) (+13 -4) + src/foomatic/foomatic-printermap (1.161) (+1 -0) + src/main/printers.xml (1.218) (+2 -1) + + Add Sharp AR-M257 + +2007-12-28 + + Files: src/main/dither-impl.h (1.30) (+4 -3) + src/main/dither-main.c (1.57) (+3 -1) + src/main/dither-ordered.c (1.22) (+280 -2) + + Add Ordered New dither + +2007-12-28 + + Files: NEWS (1.348) (+3 -0) + + updated news + +2007-12-28 + + Files: src/foomatic/foomatic-printermap (1.160) (+1 -0) + src/main/canon-inks.h (1.21) (+1 -1) + src/main/canon-modes.h (1.30) (+6 -0) + src/main/canon-printers.h (1.41) (+12 -0) + src/main/print-canon.c (1.222) (+4 -1) + src/main/printers.xml (1.217) (+2 -1) + + untested support for the PIXMA iP8500 (#1703011) + +2007-12-28 + + Files: AUTHORS (1.24) (+3 -0) + + added Piotr Stachura to authors + +2007-12-28 + + Files: src/main/print-canon.c (1.221) (+57 -36) + + also use the hsv maps from the printmode based on patch by Piotr Stachura + +2007-12-28 + + Files: src/main/canon-modes.h (1.29) (+32 -2) + src/main/canon-printers.h (1.40) (+48 -3) + + hsv adjustment curves for the Canon PIXMA iP4200 patch by Piotr Stachura + +2007-12-28 + + Files: src/cups/rastertoprinter.c (1.118) (+5 -5) + + CUPS seems to swallow the startup messages if they're INFO. + +2007-12-27 + + Files: src/cups/rastertoprinter.c (1.117) (+11 -5) + + Emit simple informational messages that will help us debug problems in + the CUPS driver. + +2007-12-27 + + Files: src/main/print-olympus.c (1.83) (+2 -2) + + Fix for ES series printers, from pizza@shaftnet.org + +2007-12-27 + + Files: NEWS (1.347) (+78 -12) + README (1.180) (+5 -5) + configure.ac (1.172) (+3 -3) + + Prep for 5.1.5 + +2007-12-27 + + Files: src/main/escp2-inks.c (1.60) (+6 -6) + src/main/escp2-papers.c (1.107) (+14 -14) + src/main/print-escp2-data.c (1.234) (+3 -3) + + Improve tuning for C120 + +2007-12-26 + + Files: src/main/dither-impl.h (1.29) (+3 -4) + src/main/dither-main.c (1.56) (+1 -3) + src/main/dither-ordered.c (1.21) (+2 -88) + src/main/papers.xml (1.26) (+0 -18) + src/main/print-papers.c (1.37) (+0 -5) + src/main/print-weave.c (1.68) (+29 -29) + + Back out unintended commit + +2007-12-26 + + Files: src/main/dither-impl.h (1.28) (+4 -3) + src/main/dither-main.c (1.55) (+3 -1) + src/main/dither-ordered.c (1.20) (+88 -2) + src/main/escp2-channels.c (1.73) (+14 -1) + src/main/papers.xml (1.25) (+19 -1) + src/main/print-escp2-data.c (1.233) (+89 -89) + src/main/print-escp2.c (1.382) (+9 -2) + src/main/print-escp2.h (1.115) (+7 -2) + src/main/print-papers.c (1.36) (+6 -1) + src/main/print-weave.c (1.67) (+30 -30) + + Fix escputil issues with Claria and interchangeable cartridge printers + +2007-12-26 + + Files: src/escputil/escputil.c (1.92) (+24 -17) + + Distinguish between ink cartridge and ink color, and print the ink + color correctly on printers that offer multiple choices. + +2007-12-26 + + Files: src/escputil/d4lib.c (1.9) (+2 -2) + + Be a bit less conservative with the timings (this is still 5x longer + than previous). + +2007-12-26 + + Files: src/main/escp2-channels.c (1.72) (+13 -1) + src/main/print-escp2-data.c (1.232) (+2 -2) + + Fix escputil for C120 + +2007-12-26 + + Files: src/escputil/escputil.c (1.91) (+6 -5) + + Handle newer printers with 4-byte ink status. + +2007-12-26 + + Files: src/escputil/d4lib.c (1.8) (+3 -2) + + Improve reliability by increasing timeouts. + +2007-12-26 + + Files: src/main/escp2-channels.c (1.71) (+2 -2) + src/main/escp2-inks.c (1.59) (+29 -1) + src/main/escp2-papers.c (1.106) (+92 -1) + src/main/print-escp2-data.c (1.231) (+9 -6) + + First pass tuning for C120 + +2007-12-25 + + Files: src/main/escp2-channels.c (1.70) (+2 -2) + src/main/print-escp2-data.c (1.230) (+6 -4) + + Make borderless work on C120. Fix a few other problems. Still not tuned. + +2007-12-25 + + Files: src/cups/cups-genppdupdate.in (1.34) (+30 -26) + + Improve performance of cups-genppdupdate. + +2007-12-24 + + Files: src/foomatic/foomatic-printermap (1.159) (+4 -0) + src/main/escp2-channels.c (1.69) (+244 -105) + src/main/escp2-driver.c (1.37) (+71 -25) + src/main/print-escp2-data.c (1.229) (+22 -1) + src/main/print-escp2.c (1.381) (+57 -3) + src/main/print-escp2.h (1.114) (+11 -5) + src/main/printers.xml (1.216) (+5 -1) + + Preliminary support for Epson C110, C120, D120, PX-V780. Untuned. + +2007-12-24 + + Files: src/foomatic/foomatic-printermap (1.158) (+1 -0) + src/main/canon-printers.h (1.39) (+2 -2) + src/main/printers.xml (1.215) (+2 -1) + + support for the PIXMA MP610 + +2007-12-24 + + Files: src/main/Makefile.am (1.98) (+2 -2) + src/main/mark.c (1.5) (removed) + src/main/page.c (1.4) (removed) + src/main/ppd.c (1.6) (removed) + src/main/ppd.h (1.5) (removed) + src/main/print-ps.c (1.99) (+121 -184) + src/main/xmlppd.c (1.2) (+3 -3) + src/main/xmlppd.h (1.2) (+2 -2) + + Replace Postscript PPD back end with XML-based one that's GPL2+. + +2007-12-24 + + Files: src/cups/rastertoprinter.c (1.116) (+3 -3) + + Replace 'index' with the more portable 'strchr'. + +2007-12-24 + + Files: src/main/xmlppd.c (1.1) (added) + src/main/xmlppd.h (1.1) (added) + + First checkin of replacement PPD code (compiles, does not run successfully) + +2007-12-23 + + Files: src/foomatic/foomatic-printermap (1.157) (+1 -0) + src/main/canon-modes.h (1.28) (+7 -0) + src/main/canon-printers.h (1.38) (+12 -0) + src/main/printers.xml (1.214) (+2 -1) + + added support for Canon i80 (as reported in #1547011 it is similar to the BJC7100) + +2007-12-23 + + Files: src/cups/command.types (1.2) (+13 -21) + src/cups/commandtoepson.c (1.3) (+13 -21) + src/cups/cups-calibrate.c (1.6) (+11 -19) + src/cups/genppd.c (1.140) (+12 -20) + src/cups/rastertoprinter.c (1.115) (+12 -20) + + Update license text... + +2007-12-23 + + Files: src/foomatic/foomatic-printermap (1.156) (+1 -0) + src/main/canon-inks.h (1.20) (+15 -0) + src/main/canon-modes.h (1.27) (+6 -0) + src/main/canon-printers.h (1.37) (+12 -0) + src/main/print-canon.c (1.220) (+10 -4) + src/main/printers.xml (1.213) (+2 -1) + + untested support for the PIXMA Pro9500 (#1849699) + +2007-12-23 + + Files: src/main/canon-printers.h (1.36) (+12 -0) + src/main/printers.xml (1.212) (+2 -2) + + does the iP4500 only work with CANON_CAP_I ? still waiting for confirmation + +2007-12-16 + + Files: configure.ac (1.171) (+8 -5) + + Add AM_PROG_CC_C_O and improve some messages. + +2007-12-13 + + Files: src/main/mark.c (1.4) (+17 -15) + src/main/page.c (1.3) (+17 -15) + src/main/ppd.c (1.5) (+17 -22) + src/main/ppd.h (1.4) (+17 -22) + + [ 1848308 ] LICENSE.txt file missing + +2007-12-12 + + Files: src/cups/test-rastertogutenprint.in (1.3) (+3 -6) + + Select pages from user manual rather than using saved PDF. + +2007-12-11 + + Files: src/cups/test-rastertogutenprint.in (1.2) (+8 -4) + + Try to make it work on OS X. + +2007-12-11 + + Files: configure.ac (1.170) (+4 -2) + src/cups/Makefile.am (1.94) (+4 -3) + src/cups/genppd.c (1.139) (+7 -2) + src/cups/rastertoprinter.c (1.114) (+162 -91) + src/cups/test-rastertogutenprint.in (1.1) (added) + + Add test for CUPS driver + +2007-12-10 + + Files: NEWS (1.346) (+3 -2) + + Fix typo + +2007-12-09 + + Files: src/main/print-olympus.c (1.82) (+3 -3) + + Fix page sizes to not cause PPD files to blow out. + +2007-12-09 + + Files: src/main/printers.xml (1.211) (+16 -16) + + Change "Okidata" to "Oki" to fit PPD spec. + +=============================================================================== +Name: gutenprint-5_1_4 + +2007-12-09 + + Files: po/cs.po (1.43) (+1179 -1748) + po/da.po (1.78) (+1791 -1819) + po/de.po (1.57) (+1184 -1761) + po/el.po (1.58) (+1178 -1748) + po/en_GB.po (1.149) (+1790 -1818) + po/es.po (1.56) (+1179 -1748) + po/fr.po (1.83) (+1791 -1819) + po/hu.po (1.14) (+1790 -1819) + po/ja.po (1.52) (+1179 -1748) + po/nb.po (1.19) (+1178 -1747) + po/nl.po (1.61) (+1791 -1819) + po/pl.po (1.62) (+1178 -1748) + po/pt.po (1.57) (+1179 -1748) + po/sk.po (1.61) (+1179 -1748) + po/sv.po (1.88) (+1792 -1823) + po/zh_TW.po (1.17) (+2812 -2887) + + Gutenprint 5.1.4 release + +2007-12-09 + + Files: src/ghost/ijsgutenprint.c (1.19) (+3 -3) + + Replace free with stp_free when paired with stp_malloc. + +2007-12-08 + + Files: src/cups/rastertoprinter.c (1.113) (+4 -2) + + Fix a small memory leak. + +2007-12-08 + + Files: README (1.179) (+4 -4) + + One more change. + +2007-12-08 + + Files: README (1.178) (+4 -4) + + One more change. + +2007-12-08 + + Files: README (1.177) (+3 -0) + + One more change + +2007-12-08 + + Files: Makefile.am (1.149) (+3 -3) + README (1.176) (+20 -19) + configure.ac (1.169) (+4 -2) + + Some patches from Greg Troxel + +2007-12-07 + + Files: NEWS (1.345) (+1 -0) + src/foomatic/foomatic-printermap (1.155) (+1 -0) + src/main/printers.xml (1.210) (+2 -1) + + experimental support for the Canon PIXMA iP4500 + +2007-12-07 + + Files: src/cups/rastertoprinter.c (1.112) (+8 -8) + + Improve debugging output a bit + +2007-12-05 + + Files: NEWS (1.344) (+4 -1) + + Clarify issue with CUPS driver. + +2007-12-02 + + Files: src/testpattern/run-testpattern (1.22) (+2 -2) + src/testpattern/run-testpattern-1 (1.9) (+2 -2) + test/run-testdither (1.12) (+2 -2) + + Unify valgrind options across all tests + +2007-12-02 + + Files: NEWS (1.343) (+4 -1) + + Clarify PPD file change + +2007-12-02 + + Files: NEWS (1.342) (+21 -3) + + Add note to packagers to release notes also. + +2007-12-02 + + Files: README (1.175) (+19 -0) + + Add note to packagers about development releases. + +2007-12-02 + + Files: NEWS (1.341) (+14 -14) + + Note OS X 10.5. + +2007-12-02 + + Files: NEWS (1.340) (+13 -13) + README (1.174) (+37 -39) + configure.ac (1.168) (+4 -4) + + Change "the GIMP" to "GIMP". + +2007-12-02 + + Files: src/gutenprintui2/Makefile.am (1.7) (+3 -1) + src/testpattern/Makefile.am (1.27) (+3 -1) + + Packaging fix from Greg Troxel + +2007-12-02 + + Files: src/main/gutenprint.pc.in (1.3) (+1 -1) + + Packaging fix from Greg Troxel. + +2007-11-24 + + Files: NEWS (1.339) (+31 -7) + + Updates + +2007-11-24 + + Files: src/testpattern/run-testpattern-2.in (1.9) (+12 -6) + + Make MD5 output look like it's actually come from the files. + +2007-11-24 + + Files: src/testpattern/Makefile.am (1.26) (+2 -2) + src/testpattern/run-testpattern-1 (1.8) (+4 -4) + src/testpattern/run-testpattern-2.in (1.8) (+56 -32) + src/testpattern/testpattern.c (1.46) (+38 -9) + + Fold dither algorithm testing into run-testpattern-2. + + Print better messages from run-testpattern-1. + + Allow testpattern to send output to a command rather than just a file. + + Change -m option to take an optional argument (for saving md5 sums) and + to use testpattern command output to generate md5 sums (for performance). + +2007-11-24 + + Files: src/cups/genppd.c (1.138) (+15 -9) + src/cups/test-ppds (1.3) (+16 -52) + + Make the default resolution appear square to external programs. + + Re-enable the PPD check. + +2007-11-23 + + Files: src/cups/cups-genppdupdate.in (1.33) (+9 -8) + + Eliminate incorrect nested $_. + +2007-11-23 + + Files: src/cups/genppd.c (1.137) (+9 -25) + + Eliminate use of non-compliant PPD resolutions altogether. + +2007-11-23 + + Files: src/cups/cups-genppdupdate.in (1.32) (+55 -7) + src/cups/genppd.c (1.136) (+28 -2) + + Map Gutenprint resolution names to valid PPD resolution names + +2007-11-23 + + Files: po/fr.po (1.82) (+6 -6) + + Shorten translations slightly for PPD compliance. + +2007-11-23 + + Files: po/nl.po (1.60) (+6 -6) + + Fix a few punctuation problems. + +2007-11-21 + + Files: src/testpattern/run-testpattern (1.21) (+25 -7) + src/testpattern/run-testpattern-1 (1.7) (+33 -10) + src/testpattern/run-testpattern-2.in (1.7) (+18 -2) + src/testpattern/testpattern.c (1.45) (+18 -2) + src/testpattern/testpattern.h (1.16) (+3 -1) + src/testpattern/testpatternl.l (1.18) (+2 -1) + src/testpattern/testpatterny.y (1.29) (+21 -2) + + Allow test pattern generator to output data to a file. + +2007-11-20 + + Files: src/main/print-olympus.c (1.81) (+3 -3) + src/main/printers.xml (1.209) (+4 -4) + + support for Canon ES series (patch#2 from Solomon Peachy ) + +2007-11-17 + + Files: src/main/print-escp2-data.c (1.228) (+2 -2) + src/main/print-escp2.c (1.380) (+10 -2) + src/main/print-escp2.h (1.113) (+3 -2) + + 1831542 Borderless regression (5.0.1, 5.1.3) on Epson 2200 + +2007-11-17 + + Files: src/cups/cups-genppdupdate.in (1.31) (+14 -4) + + Don't die if we can't upgrade a particular PPD file. + +2007-11-11 + + Files: src/foomatic/foomatic-printermap (1.154) (+3 -0) + src/main/print-olympus.c (1.80) (+59 -1) + src/main/printers.xml (1.208) (+4 -1) + + support for Canon ES series (patch from Solomon Peachy ) + +2007-11-10 + + Files: src/foomatic/foomatic-printermap (1.153) (+1 -0) + src/main/canon-inks.h (1.19) (+17 -0) + src/main/canon-modes.h (1.26) (+4 -0) + src/main/canon-printers.h (1.35) (+12 -0) + src/main/printers.xml (1.207) (+2 -1) + + support for the Canon PIXMA iP5300 (untested) + +2007-10-27 + + Files: src/main/canon-media.h (1.10) (+24 -30) + + remove support qualities from the various media types + they seems to be different for every printer and I don't want to maintain + a per printer paperlist + +2007-10-27 + + Files: src/main/canon-inks.h (1.18) (+39 -9) + + document where we found the iP4000 inksets + +2007-10-27 + + Files: src/main/canon-printers.h (1.34) (+13 -12) + + the new default printer in case the printers.xml entry for a printer is invalid is now the mp830 as the previous default S200 uses special printmodes + +2007-10-27 + + Files: src/main/canon-printers.h (1.33) (+34 -35) + + remove the now obsolete model code from the printer caps + +2007-10-27 + + Files: src/main/canon-printers.h (1.32) (+2 -2) + src/main/print-canon.c (1.219) (+47 -10) + src/main/printers.xml (1.206) (+35 -35) + + Systematic model_id assignment for Canon printers + model_id is now family followed by the model nr + FNNNNNN + + family can be + 0 for the old BJC printers + 1 for the S-Series + 2 for the i-Series + 3 for the PIXMA iP-Series + 4 for the PIXMA iX-Series + 5 for the PIXMA MP-Series + 6 for the PIXUS-Series + + So for example Canon S200 would be 1000200 + + The entry for the MP710 in the printer caps has been renamed to MP740 + as it changed over time + +2007-10-27 + + Files: src/main/print-canon.c (1.218) (+9 -9) + + use printer names for the special printer handling + +2007-10-27 + + Files: src/foomatic/foomatic-printermap (1.152) (+3 -0) + + added Canon BJC5100,5500,8500 + +2007-10-27 + + Files: src/main/canon-modes.h (1.25) (+1 -1) + + Get rid of + bjc-s500 + BW+600x600dpi_draft`PhotoCMY' is not a valid InkType + Print options not verified; cannot print. + +2007-10-27 + + Files: src/main/canon-printers.h (1.31) (+35 -34) + + add a name for every printer to the printer caps + +2007-10-27 + + Files: src/main/printers.xml (1.205) (+4 -1) + + add some more printers that were already present in canon-printers.h (BCJ 5100,5500,8500) no idea about their state + +2007-10-26 + + Files: src/main/canon-modes.h (1.24) (+3 -2) + + disable high mode for S500 as it does not produce black, reenable 300dpi mode + +2007-10-24 + + Files: src/main/canon-inks.h (1.17) (+12 -0) + src/main/canon-modes.h (1.23) (+6 -1) + src/main/canon-printers.h (1.30) (+12 -0) + src/main/printers.xml (1.204) (+2 -2) + + first attempt to support more modes on the Canon S500 + +2007-10-23 + + Files: src/main/canon-modes.h (1.22) (+2 -1) + src/main/printers.xml (1.203) (+2 -2) + + another attempt to fix printing on the MP710 and 300dpi support for the iP3000 and similar printers + +2007-10-18 + + Files: src/main/print-olympus.c (1.79) (+7 -6) + + bugfix: wrong color for Olympus P-S100 reported in Support Requests-1527186 + - RGB data was generated instead of BGR + - bug also affected Olympus P-440 + +2007-10-18 + + Files: src/main/print-olympus.c (1.78) (+3 -1) + + bugfix: added missing part of init string for Sony UP DP-10 + +2007-10-17 + + Files: src/foomatic/foomatic-printermap (1.151) (+1 -1) + src/main/printers.xml (1.202) (+2 -2) + + typo shinco -> shinko + +2007-10-17 + + Files: src/foomatic/foomatic-printermap (1.150) (+1 -0) + src/main/print-olympus.c (1.77) (+71 -1) + src/main/printers.xml (1.201) (+2 -1) + + experimental support for Shinko CHC S9045 + +2007-10-17 + + Files: src/main/print-olympus.c (1.76) (+25 -14) + + fixing the bug: privdata contains "unrotated" dimensions after switching to + landscape mode + +2007-10-17 + + Files: src/main/print-olympus.c (1.75) (+101 -101) + + rename x* and y* variables to h* and w* (height, width) for better readability + +2007-10-16 + + Files: src/main/printers.xml (1.200) (+2 -2) + + fix printing on the MP710 + +2007-10-06 + + Files: src/main/printers.xml (1.199) (+7 -7) + + fix spaces + +2007-10-01 + + Files: src/foomatic/foomatic-printermap (1.149) (+4 -0) + src/main/print-olympus.c (1.74) (+3 -2) + src/main/printers.xml (1.198) (+5 -1) + + printers compatible with Canon SELPHY CP-710 + +2007-09-24 + + Files: NEWS (1.338) (+212 -8) + src/foomatic/foomatic-printermap (1.148) (+0 -177) + src/main/printers.xml (1.197) (+1 -178) + + Remove support for printers supported by HPIJS + +2007-09-23 + + Files: src/main/printers.xml (1.196) (+8 -2) + + improve color quality for the PIXMA iX5000, values by Tony Zitaret + +2007-09-23 + + Files: src/main/canon-printers.h (1.29) (+2 -2) + src/main/print-canon.c (1.217) (+3 -3) + + fix margins for the BJC 3000 patch by David Keegan (#794600) + +2007-09-22 + + Files: test/pixma_parse.c (1.14) (+21 -7) + + add -x param to specify the maximum width of the output ppm + +2007-09-20 + + Files: src/main/printers.xml (1.195) (+2 -2) + + decrease gamma for iP4000 and friends to 1/0.6 + fixes #1687853 + and maybe #101537 (ubuntu #120016 and #135311) + +2007-09-19 + + Files: src/main/print-canon.c (1.216) (+2 -2) + + Fix a bug where the canon driver would silently discard some lines when the + bitdepth is 2 or higher. + hopefully fixes #101537 + not sure because this bug was very hard to trigger: + the whole imageable area had to be filled with maximum color intensity + (ubuntu #120016 and #135311) + +2007-09-19 + + Files: src/main/print-canon.c (1.215) (+3 -4) + + no need to pass ydpi to canon_write + +2007-09-18 + + Files: NEWS (1.337) (+1 -0) + src/foomatic/foomatic-printermap (1.147) (+1 -0) + src/main/printers.xml (1.194) (+2 -1) + + according to Rob klein Gunnewieck the MP180 works with the MP150 driver, too + +2007-09-12 + + Files: NEWS (1.336) (+1 -0) + src/foomatic/foomatic-printermap (1.146) (+1 -0) + src/main/printers.xml (1.193) (+2 -1) + + Support Epson DX4050 + +2007-09-12 + + Files: NEWS (1.335) (+1 -0) + src/foomatic/foomatic-printermap (1.145) (+1 -0) + src/main/printers.xml (1.192) (+2 -1) + + according to Rob klein Gunnewieck the Canon Pixma MP170 works with the MP150 driver + +2007-09-09 + + Files: include/gutenprint/util.h (1.6) (+3 -2) + src/cups/genppd.c (1.135) (+26 -24) + src/cups/rastertoprinter.c (1.111) (+25 -14) + src/main/mark.c (1.3) (+3 -3) + src/main/ppd.c (1.4) (+80 -47) + src/main/ppd.h (1.3) (+14 -2) + src/main/print-ps.c (1.98) (+143 -31) + + Use Gutenprint option data where available rather than PPD file + enumerations. + +2007-09-09 + + Files: NEWS (1.334) (+33 -9) + + Updates + +2007-09-09 + + Files: src/foomatic/foomatic-printermap (1.144) (+5 -0) + src/main/printers.xml (1.191) (+7 -2) + + Add Epson CX4900, CX5600, CX7400, CX9400, RX595. Correct definition + of CX6300 for borderless mode. + +2007-09-02 + + Files: NEWS (1.333) (+9 -0) + src/main/escp2-resolutions.c (1.43) (+5 -5) + src/main/print-escp2.c (1.379) (+20 -13) + + Do not offer resolutions above 5760x1440 for quality settings on Epson + printers. Experiments have demonstrated that the bottom of the page + prints poorly at 2880x2880 and 5760x2880 on many printers, and Epson + does not currently offer resolutions above 5760x1440 on any printers. + See bug 1700313. + +2007-09-02 + + Files: src/main/print-util.c (1.115) (+14 -6) + + Don't lose debug information if the client hasn't set an errfunc in + the stp_vars_t; print it to stderr instead. + +2007-09-02 + + Files: src/cups/rastertoprinter.c (1.110) (+10 -5) + + Take care to explicitly flush all data, including the job end data, at + the end of a job. + +2007-09-02 + + Files: src/main/canon-modes.h (1.21) (+63 -62) + src/main/print-canon.c (1.214) (+5 -3) + + add per printmode quality option + +2007-08-29 + + Files: src/main/canon-printers.h (1.28) (+1 -1) + src/main/print-canon.c (1.213) (+13 -1) + + support for the ESC P) command on the iP4200 patch by Piotr Stachura + +2007-08-29 + + Files: src/main/canon-printers.h (1.27) (+9 -3) + + control commands for the PIXMA iP4200 from a patch by Piotr Stachura + +2007-08-29 + + Files: src/main/canon-inks.h (1.16) (+25 -0) + src/main/canon-modes.h (1.20) (+6 -1) + + 300dpi and 300dpi draft mode for the pixma iP4200, based on patch by Piotr Stachura + +2007-08-29 + + Files: src/main/canon-modes.h (1.19) (+6 -0) + src/main/canon-printers.h (1.26) (+12 -0) + src/main/printers.xml (1.190) (+2 -2) + + disable not working 1200x600 mode for the Canon i560 (#1732870) + +2007-08-29 + + Files: src/main/print-color.c (1.137) (+2 -2) + + buffer length for stp_image_get_row needs to honor the channel_depth (fixes #1754691) + +2007-08-28 + + Files: src/foomatic/foomatic-printermap (1.143) (+1 -0) + src/main/canon-inks.h (1.15) (+25 -0) + src/main/canon-modes.h (1.18) (+5 -0) + src/main/canon-printers.h (1.25) (+12 -0) + src/main/printers.xml (1.189) (+2 -1) + + support for the Canon PIXMA iX5000 (untested) + +2007-08-27 + + Files: src/main/print-pcl.c (1.147) (+1 -3) + + Don't print gratuitous message about duplex not being available. + +2007-08-27 + + Files: NEWS (1.332) (+5 -4) + include/gutenprint/printers.h (1.4) (+15 -2) + src/gutenprintui2/panel.c (1.15) (+71 -1) + src/gutenprintui2/plist.c (1.13) (+37 -8) + src/main/print-canon.c (1.212) (+3 -2) + src/main/print-escp2.c (1.378) (+4 -3) + src/main/print-lexmark.c (1.155) (+2 -1) + src/main/print-olympus.c (1.73) (+2 -1) + src/main/print-pcl.c (1.146) (+2 -1) + src/main/print-ps.c (1.97) (+106 -8) + src/main/print-raw.c (1.39) (+2 -1) + src/main/printers.c (1.81) (+12 -1) + + Send device settings to print command for Postscript driver + +2007-08-27 + + Files: src/cups/rastertoprinter.c (1.109) (+3 -3) + + Accept "true" as well as "True" for boolean options -- it appears that + in at least some cases CUPS is sending "true" rather than "True". + +2007-08-27 + + Files: src/cups/cups-genppdupdate.in (1.30) (+2 -2) + + Support PPD file upgrading only from Gutenprint 5.0 and beyond. + +2007-08-24 + + Files: src/escputil/escputil.c (1.90) (+14 -32) + + A few more fixes per Matt Broughton. + +2007-08-19 + + Files: src/escputil/escputil.c (1.89) (+61 -47) + + Recognize -m option for all subcommands. + +2007-08-11 + + Files: NEWS (1.331) (+12 -0) + + Add updates. + +2007-08-11 + + Files: NEWS (1.330) (+23 -16) + README (1.173) (+2 -2) + configure.ac (1.167) (+3 -3) + src/foomatic/foomatic-printermap (1.142) (+1 -0) + src/main/printers.xml (1.188) (+2 -1) + + Support Epson CX4400. + + Bump version. + +2007-08-07 + + Files: src/main/papers.xml (1.24) (+3 -3) + + Change CD - Custom to 120 mm rather than 118.8 mm. + +2007-08-05 + + Files: src/foomatic/foomatic-printermap (1.141) (+1 -0) + src/main/printers.xml (1.187) (+2 -1) + + Add HP LJ1022 + +2007-06-28 + + Files: src/foomatic/foomatic-printermap (1.140) (+2 -0) + src/main/canon-printers.h (1.24) (+12 -0) + src/main/printers.xml (1.186) (+3 -3) + + add mp710 and 740 to foomatic printermap, add extra entry for the mp710 and mp740 as they do not have duplex support + +2007-06-28 + + Files: src/main/print-canon.c (1.211) (+2 -2) + + always force unit to 600 for the extended p command, fixes borders for the 300dpi mode of the iP4000 + +2007-06-28 + + Files: src/main/printers.xml (1.185) (+4 -2) + + add Canon MP710 and MP740 printers that, according to Gernot Hassenpflug, should work with the iP4000 driver, make the i560 printer use the BJC7000 driver + +2007-06-21 + + Files: src/foomatic/foomatic-printermap (1.139) (+1 -0) + src/main/printers.xml (1.184) (+2 -1) + + Add Epson PM-670C. + +2007-06-21 + + Files: src/main/sequence.c (1.24) (+24 -5) + + Fix a compile problem on Solaris (reported by Norm Jacobs). + +=============================================================================== +Name: gutenprint-5_1_3 + +2007-06-17 + + Files: doc/gutenprint.dox.in (1.5) (+263 -84) + + Update doxygen input + +2007-06-17 + + Files: NEWS (1.329) (+30 -13) + README (1.172) (+2 -2) + configure.ac (1.166) (+3 -3) + + Prep for 5.1.3 + +2007-06-17 + + Files: src/main/printers.xml (1.183) (+8 -8) + + remove strange characters + +2007-06-16 + + Files: src/main/printers.xml (1.182) (+9 -2) + + some tweaking for the PIXMA iP4300, patch by Andreas Matthias + +2007-06-16 + + Files: src/main/canon-printers.h (1.23) (+6 -6) + + tweak margins for the pixma printers + +2007-06-16 + + Files: src/main/canon-media.h (1.9) (+0 -10) + + remove obsolete iP4200 slotlist + +2007-06-10 + + Files: src/main/printers.xml (1.181) (+11 -11) + + A number of Epson R-series printers do borderless better with the + RX400 settings than with the R300 settings. + +2007-06-04 + + Files: src/main/print-util.c (1.114) (+2 -2) + + Fix an overly enthusiastic conversion from ENABLE_NLS to HAVE_LOCALE_H + +=============================================================================== +Name: gutenprint-5_1_2 + +2007-06-02 + + Files: po/cs.po (1.42) (+729 -719) + po/da.po (1.77) (+729 -719) + po/de.po (1.56) (+729 -719) + po/el.po (1.57) (+729 -719) + po/en_GB.po (1.148) (+729 -719) + po/es.po (1.55) (+729 -719) + po/fr.po (1.81) (+729 -719) + po/hu.po (1.13) (+729 -719) + po/ja.po (1.51) (+729 -719) + po/nb.po (1.18) (+729 -719) + po/nl.po (1.59) (+729 -719) + po/pl.po (1.61) (+729 -719) + po/pt.po (1.56) (+729 -719) + po/sk.po (1.60) (+729 -719) + po/sv.po (1.87) (+730 -720) + po/zh_TW.po (1.16) (+729 -719) + + Gutenprint 5.1.2 release + +2007-06-01 + + Files: NEWS (1.328) (+9 -7) + src/main/print-ps.c (1.96) (+6 -1) + + Back out attempt to send device settings to printer. + +2007-05-29 + + Files: NEWS (1.327) (+3 -0) + + 8) Printing to CD's on Epson printers now works correctly if the + image is not placed at the top of the page. + +2007-05-29 + + Files: src/main/print-escp2.c (1.377) (+4 -4) + + Fix printing to CD if the image is not placed at the top of the page. + +2007-05-28 + + Files: NEWS (1.326) (+6 -0) + src/foomatic/foomatic-printermap (1.138) (+1 -0) + src/main/print-escp2-data.c (1.227) (+19 -1) + src/main/printers.xml (1.180) (+11 -10) + + Fix borderless printing on Epson RX400 and related printers + +2007-05-28 + + Files: NEWS (1.325) (+20 -0) + + Update release notes. + +2007-05-28 + + Files: src/main/print-canon.c (1.210) (+2 -2) + src/main/print-escp2.c (1.376) (+2 -2) + + Extend the custom CD size down to 65 mm. + +2007-05-28 + + Files: src/main/print-ps.c (1.95) (+95 -109) + + Print correctly in color. + + Add device settings. + +2007-05-28 + + Files: NEWS (1.324) (+14 -6) + README (1.171) (+2 -2) + + Update for 5.1.2. + +2007-05-28 + + Files: src/main/print-escp2.c (1.375) (+7 -2) + + Initialize the density parameters correctly. + +2007-05-28 + + Files: src/main/print-vars.c (1.80) (+4 -1) + + Print out debug info for raw parameters. + +2007-05-27 + + Files: src/main/dither-impl.h (1.27) (+1 -2) + src/main/dither-main.c (1.54) (+0 -2) + src/main/dither-ordered.c (1.19) (+1 -87) + + Back out unintended commit + +2007-05-27 + + Files: src/main/dither-impl.h (1.26) (+4 -3) + src/main/dither-main.c (1.53) (+3 -1) + src/main/dither-ordered.c (1.18) (+88 -2) + src/main/escp2-inks.c (1.58) (+21 -14) + src/main/escp2-resolutions.c (1.42) (+6 -1) + src/main/print-escp2-data.c (1.226) (+4 -4) + + Retune the R260 and 1400 + +2007-05-27 + + Files: src/main/print-vars.c (1.79) (+6 -10) + + Minor fix. + +2007-05-27 + + Files: src/main/print-util.c (1.113) (+4 -1) + src/main/print-vars.c (1.78) (+128 -32) + + Further increase debugging output + +2007-05-26 + + Files: src/main/escp2-inks.c (1.57) (+30 -26) + src/main/escp2-resolutions.c (1.41) (+4 -2) + src/main/print-escp2-data.c (1.225) (+5 -5) + + Improve tunings of R260 family based on Roy Harrington's measurements. + Also add 360x90 DPI mode for hyperfast printing. + +2007-05-26 + + Files: src/main/print-util.c (1.112) (+8 -2) + src/main/print-vars.c (1.77) (+87 -105) + src/main/printers.c (1.80) (+46 -12) + src/main/xml.c (1.38) (+13 -16) + + Improve debugging output + +2007-05-26 + + Files: src/main/escp2-inks.c (1.56) (+6 -6) + src/main/print-escp2-data.c (1.224) (+3 -3) + + Retuning for the RX580 + +2007-05-26 + + Files: src/main/print-escp2.c (1.374) (+4 -2) + + Don't change the drop size if the base resolutions don't match. + +2007-05-21 + + Files: configure.ac (1.165) (+3 -3) + + Bump version. + +2007-05-21 + + Files: po/cs.po (1.41) (+1297 -1133) + po/da.po (1.76) (+1306 -1133) + po/de.po (1.55) (+1272 -1124) + po/el.po (1.56) (+1298 -1134) + po/en_GB.po (1.147) (+1306 -1133) + po/es.po (1.54) (+1297 -1133) + po/fr.po (1.80) (+1308 -1135) + po/hu.po (1.12) (+1306 -1133) + po/ja.po (1.50) (+1297 -1133) + po/nb.po (1.17) (+1297 -1133) + po/nl.po (1.58) (+1306 -1133) + po/pl.po (1.60) (+1296 -1132) + po/pt.po (1.55) (+1297 -1133) + po/sk.po (1.59) (+1297 -1133) + po/sv.po (1.86) (+1307 -1134) + po/zh_TW.po (1.15) (+1304 -1131) + + Gutenprint 5.1.1 release + +2007-05-21 + + Files: NEWS (1.323) (+10 -10) + + Rename more Canon printers. + +2007-05-21 + + Files: src/escputil/escputil.c (1.88) (+2 -2) + src/gutenprintui2/plist.c (1.12) (+15 -16) + src/main/print-ps.c (1.94) (+14 -14) + src/main/print-util.c (1.111) (+3 -3) + src/main/xml.c (1.37) (+3 -3) + + Try again to get the locale stuff correct. + +2007-05-21 + + Files: NEWS (1.322) (+4 -0) + + Note updates to cups-genppdupdate. + +2007-05-21 + + Files: src/cups/cups-genppdupdate.in (1.29) (+102 -48) + + Handle -n correctly (go through the motions, but don't actually update + PPD files). + + Improve debugging granularity. + + Handle --help and --version. + +2007-05-20 + + Files: src/main/print-ps.c (1.93) (+7 -7) + src/main/xml.c (1.36) (+7 -4) + + Get the locale stuff really correct + +2007-05-20 + + Files: src/main/xml.c (1.35) (+7 -4) + + Fix up locale handling. + +2007-05-20 + + Files: NEWS (1.321) (+3 -0) + src/gutenprintui2/plist.c (1.11) (+28 -10) + src/main/ppd.c (1.3) (+8 -8) + src/main/print-ps.c (1.92) (+49 -42) + + Fix handling of locale. + + Remove unnecessary and inappropriate copyright notice from Postsript output. + + Use stp_strdup consistently. + +2007-05-17 + + Files: src/gutenprintui2/panel.c (1.14) (+2 -2) + src/gutenprintui2/plist.c (1.10) (+8 -3) + + Fix a few valgrind issues + +2007-05-17 + + Files: src/main/print-vars.c (1.76) (+4 -4) + + Translate during stp_fill_parameter_settings. From Alastair Robinson. + +2007-05-17 + + Files: src/main/print-ps.c (1.91) (+2 -1) + + Note memory leak in ps_list_parameters. + +2007-05-17 + + Files: src/main/print-escp2.c (1.373) (+1 -2) + + Remove stray debug printf. + +2007-05-16 + + Files: src/main/print-escp2-data.c (1.223) (+3 -3) + + Fix CD positioning on R260 (RX580) and 1400. + +2007-05-16 + + Files: src/main/escp2-inks.c (1.55) (+3 -4) + + Further improvements to 1400. + +2007-05-15 + + Files: src/cups/genppd.c (1.134) (+2 -4) + + Remove spurious debugging calls. + +2007-05-15 + + Files: src/main/escp2-inks.c (1.54) (+8 -5) + src/main/escp2-resolutions.c (1.40) (+78 -43) + src/main/print-escp2-data.c (1.222) (+8 -5) + src/main/print-escp2.c (1.372) (+30 -5) + src/main/print-escp2.h (1.112) (+4 -2) + + Further tunings for Stylus Photo 1400. + +2007-05-13 + + Files: src/main/escp2-papers.c (1.105) (+2 -2) + + Minor improvement for Claria-based printers. + +2007-05-13 + + Files: NEWS (1.320) (+10 -6) + + Update release notes. + +2007-05-13 + + Files: src/main/escp2-inks.c (1.53) (+29 -1) + src/main/print-escp2-data.c (1.221) (+8 -2) + src/main/printers.xml (1.179) (+3 -3) + + Initial tuning for Stylus Photo 1400. + +2007-05-12 + + Files: NEWS (1.319) (+8 -0) + + add some more canon changes + +2007-05-12 + + Files: src/main/canon-printers.h (1.22) (+8 -8) + src/main/print-canon.c (1.209) (+29 -3) + + switch to extended page margin command + fixes printing with PIXMA printers connected to windows hosts (#1625202) + based on a patch by Thilo Jeremias + +2007-05-12 + + Files: src/testpattern/testpatterny.y (1.28) (+2 -2) + + Add rule for parameter_curve. + +2007-05-12 + + Files: src/testpattern/testpatterny.y (1.27) (+6 -6) + + add missing fprintf format strings + +2007-05-12 + + Files: src/gutenprintui2/plist.c (1.9) (+3 -3) + + fix arguments for g_message (patch from the SUSE gutenprint patches) + +2007-05-12 + + Files: src/main/canon-printers.h (1.21) (+13 -0) + src/main/printers.xml (1.178) (+2 -2) + + Fix resolutions for Canon S300 (1200dpi mode is still missing) + + https://bugs.launchpad.net/ubuntu/+source/gutenprint/+bug/110945 + +2007-05-12 + + Files: src/main/canon-modes.h (1.17) (+2 -2) + + Disable high modes for the iP4000 and iP4200. They are not working properly yet and their output is worse than the output of the default modes + +2007-05-09 + + Files: src/main/escp2-inks.c (1.52) (+2 -2) + src/main/escp2-papers.c (1.104) (+5 -5) + src/main/print-escp2-data.c (1.219) (+5 -5) + src/main/print-escp2-data.c (1.220) (+2 -2) + + Further RX580 tuning + +2007-05-09 + + Files: src/main/escp2-inks.c (1.51) (+2 -2) + + Correct 720 DPI definitions. + +2007-05-08 + + Files: NEWS (1.318) (+1 -0) + src/foomatic/foomatic-printermap (1.137) (+1 -0) + src/main/printers.xml (1.177) (+2 -1) + + Add Epson PM-G4500. + +2007-05-08 + + Files: src/main/print-ps.c (1.90) (+66 -8) + + 1701954 postscript_always_rgb - Don't print the command line options on a single line in the debug - output; it causes OS X 10.2 to fail. +2007-05-06 -2007-12-31 + Files: NEWS (1.317) (+24 -9) - Files: src/cups/rastertoprinter.c (1.105.2.5) (+129 -105) + Update the 5.1.1 release notes. - Improve debugging output +2007-05-06 -2007-12-31 + Files: src/main/print-escp2-data.c (1.218) (+4 -4) - Files: NEWS (1.305.6.16) (+16 -7) + Fix the borders for the R800 so they definitely won't go over. - Re-prep for 5.0.2. +2007-05-06 -2007-12-31 + Files: src/foomatic/foomatic-generator.in (1.63) (+24 -24) + src/foomatic/printer_margins.c (1.21) (+2 -2) + src/foomatic/printer_options.c (1.52) (+135 -88) - Files: NEWS (1.305.6.15) (+11 -7) - src/main/buffer-image.c (1.1.2.3) (+3 -0) - src/testpattern/run-testpattern-2.in (1.2.4.4) (+32 -6) - src/testpattern/testpattern.c (1.44.8.2) (+120 -8) + Speed up foomatic data generation even more - [ 1844169 ] Severe per-page memory leak w/Canon driver, DuplexNoTumble +2007-05-06 - Test multi-page documents with duplex and tumble. + Files: src/main/escp2-papers.c (1.103) (+8 -8) - Fix data generation problems in test pattern generator. + Tweak papers a bit more. -2007-12-30 +2007-05-06 - Files: src/main/escp2-driver.c (1.30.6.3) (+2 -2) + Files: configure.ac (1.164) (+3 -2) - Fix compile problem on OS X. + List i18n status in configure output. -2007-12-29 +2007-05-05 - Files: NEWS (1.305.6.14) (+3 -4) + Files: src/main/escp2-channels.c (1.68) (+38 -24) + src/main/escp2-inks.c (1.50) (+20 -3) + src/main/escp2-papers.c (1.102) (+21 -20) + src/main/print-escp2-data.c (1.217) (+2 -2) + src/main/printers.xml (1.176) (+17 -13) - Prep for 5.0.2. + Preliminary tuning for RX580 and related printers. -2007-12-29 +2007-05-05 - Files: NEWS (1.305.6.13) (+4 -4) - README (1.165.6.5) (+16 -16) - configure.ac (1.151.2.5) (+4 -4) + Files: src/main/print-color.c (1.136) (+3 -1) - Bump version + Print out the GCR parameters when debugging is turned on. -2007-12-29 +2007-05-05 - Files: AUTHORS (1.21.10.3) (+3 -0) - Makefile.am (1.146.2.2) (+35 -35) - NEWS (1.305.6.12) (+42 -12) - src/cups/cups-genppdupdate.in (1.25.8.4) (+30 -26) - src/cups/rastertoprinter.c (1.105.2.4) (+12 -6) - src/escputil/d4lib.c (1.7.8.1) (+2 -2) - src/escputil/escputil.c (1.87.8.3) (+26 -18) - src/foomatic/foomatic-printermap (1.122.4.5) (+9 -0) - src/main/canon-inks.h (1.6.4.4) (+15 -0) - src/main/canon-modes.h (1.8.4.4) (+51 -2) - src/main/canon-printers.h (1.13.4.5) (+98 -5) - src/main/escp2-channels.c (1.62.8.3) (+269 -105) - src/main/escp2-driver.c (1.30.6.2) (+71 -25) - src/main/escp2-inks.c (1.46.10.3) (+29 -1) - src/main/escp2-papers.c (1.99.8.3) (+92 -1) - src/main/print-canon.c (1.190.2.5) (+69 -39) - src/main/print-escp2-data.c (1.202.6.4) (+114 -88) - src/main/print-escp2.c (1.355.2.4) (+65 -4) - src/main/print-escp2.h (1.105.6.4) (+16 -5) - src/main/print-olympus.c (1.61.2.3) (+2 -2) - src/main/printers.xml (1.157.4.8) (+17 -3) - src/testpattern/run-testpattern-2.in (1.2.4.3) (+20 -8) - - Merge relevant 5.1.5 changes + Files: src/main/escp2-inks.c (1.49) (+14 -12) + src/main/print-escp2-data.c (1.216) (+6 -6) -2007-12-24 + Initial ink drop tunings for RX580 - Files: src/main/mark.c (1.5) (removed) - src/main/page.c (1.4) (removed) - src/main/ppd.c (1.6) (removed) - src/main/ppd.h (1.5) (removed) - src/main/xmlppd.c (1.2) (+3 -3) - src/main/xmlppd.h (1.2) (+2 -2) +2007-05-05 - Replace Postscript PPD back end with XML-based one that's GPL2+. + Files: NEWS (1.316) (+3 -1) + src/foomatic/foomatic-printermap (1.136) (+3 -1) + src/main/escp2-channels.c (1.67) (+12 -1) + src/main/print-escp2-data.c (1.215) (+19 -1) + src/main/print-ps.c (1.89) (+29 -1) + src/main/printers.xml (1.175) (+3 -1) + src/main/xml.c (1.34) (+5 -1) -2007-12-24 + Preliminary support for Epson R240/R245. - Files: src/main/xmlppd.c (1.1) (added) - src/main/xmlppd.h (1.1) (added) + Don't call i18n stuff if ENABLE_NLS isn't set. - First checkin of replacement PPD code (compiles, does not run successfully) +2007-04-29 -2007-12-23 + Files: src/main/printers.xml (1.174) (+11 -11) - Files: src/cups/command.types (1.1.78.1) (+13 -21) - src/cups/commandtoepson.c (1.2.68.1) (+13 -21) - src/cups/cups-calibrate.c (1.5.18.1) (+11 -19) - src/cups/epson.c (1.7.8.2) (+13 -21) - src/cups/genppd.c (1.119.2.5) (+12 -20) - src/cups/rastertoprinter.c (1.105.2.3) (+12 -20) + rename MULTIPASS printers to PIXMA - Update copyright notice. +2007-04-17 -2007-12-16 + Files: po/de.po (1.54) (+317 -317) + po/el.po (1.55) (+419 -419) + po/es.po (1.53) (+416 -416) + po/fr.po (1.79) (+440 -440) + po/ja.po (1.49) (+777 -777) + po/nb.po (1.16) (+94 -94) + po/nl.po (1.57) (+1 -1) + po/pl.po (1.59) (+121 -121) + po/pt.po (1.54) (+351 -351) + po/sk.po (1.58) (+741 -741) - Files: po/cs.po (1.38.4.4) (+1373 -1237) - po/da.po (1.73.4.4) (+1383 -1234) - po/de.po (1.51.4.4) (+1380 -1252) - po/el.po (1.52.4.4) (+1372 -1237) - po/en_GB.po (1.144.4.4) (+1383 -1234) - po/es.po (1.50.4.4) (+1373 -1237) - po/fr.po (1.76.4.5) (+1383 -1234) - po/hu.po (1.9.4.4) (+1381 -1233) - po/ja.po (1.46.4.4) (+1373 -1237) - po/nb.po (1.13.4.4) (+1372 -1236) - po/nl.po (1.52.4.6) (+1383 -1234) - po/pl.po (1.56.4.4) (+1372 -1237) - po/pt.po (1.51.4.4) (+1373 -1237) - po/sk.po (1.55.4.4) (+1373 -1237) - po/sv.po (1.83.4.4) (+1384 -1238) - po/zh_TW.po (1.12.4.4) (+1380 -1236) - - Gutenprint 5.0.1-beta2 release + Message catalogs need to be in UTF-8 encoding so that the PPD files use + the correct encoding for CUPS. -2007-12-16 + nl.po is Dutch, not Norwegian... - Files: NEWS (1.305.6.11) (+1 -1) +2007-04-17 - Try again... + Files: po/nl.po (1.56) (+1 -1) + src/cups/Makefile.am (1.93) (+3 -3) + src/cups/cups-genppdconfig.in (1.14) (+2 -2) + src/cups/genppd.c (1.133) (+4 -3) -2007-12-16 + nl.po: "Engels" is "English" in Norwegian, right? Change to "Norwegian"... - Files: NEWS (1.305.6.10) (+2 -2) + Set LANG, LANGUAGE, and LC_ALL to get localization to work on all + platforms. - Prep for 5.0.2-beta1. + StpPPDLocation was wrong (need base filename inserted there, since we + are adding the locale subdirectory manually) -2007-12-16 +2007-04-16 - Files: configure.ac (1.151.2.4) (+8 -5) + Files: src/main/canon-media.h (1.8) (+1 -1) - Add AM_PROG_CC_C_O and improve some messages. + fix printing to cassette #1625202 -2007-12-16 +2007-04-16 - Files: README (1.165.6.4) (+4 -5) - - Use configuration summary from the actual release. - -2007-12-15 - - Files: Makefile.am (1.146.2.1) (+3 -3) - NEWS (1.305.6.9) (+118 -30) - README (1.165.6.3) (+81 -78) - configure.ac (1.151.2.3) (+9 -5) - include/gutenprint/printers.h (1.3.8.1) (+15 -2) - include/gutenprint/util.h (1.3.2.2) (+3 -2) - src/cups/Makefile.am (1.87.8.3) (+4 -3) - src/cups/cups-genppdupdate.in (1.25.8.3) (+77 -16) - src/cups/genppd.c (1.119.2.4) (+81 -20) - src/cups/rastertoprinter.c (1.105.2.2) (+192 -103) - src/cups/test-ppds (1.2.8.1) (+16 -52) - src/cups/test-rastertogutenprint.in (1.3.2.2) (+103 -0) - src/escputil/escputil.c (1.87.8.2) (+74 -78) - src/foomatic/foomatic-printermap (1.122.4.4) (+27 -0) - src/ghost/ijsgutenprint.c (1.18.8.1) (+3 -3) - src/gutenprintui/panel.c (1.9.6.2) (+71 -1) - src/gutenprintui/plist.c (1.3.6.2) (+34 -7) - src/gutenprintui2/panel.c (1.11.8.3) (+71 -1) - src/gutenprintui2/plist.c (1.6.10.4) (+37 -8) - src/main/canon-inks.h (1.6.4.3) (+111 -2) - src/main/canon-media.h (1.4.4.4) (+24 -30) - src/main/canon-modes.h (1.8.4.3) (+87 -59) - src/main/canon-printers.h (1.13.4.4) (+109 -42) - src/main/dither-impl.h (1.25.18.1) (+2 -2) - src/main/dither-main.c (1.52.8.1) (+1 -1) - src/main/dither-ordered.c (1.17.18.1) (+1 -1) - src/main/escp2-resolutions.c (1.33.8.3) (+5 -5) - src/main/papers.xml (1.21.8.2) (+3 -3) - src/main/print-canon.c (1.190.2.4) (+79 -28) - src/main/print-color.c (1.135.8.2) (+2 -2) - src/main/print-escp2-data.c (1.202.6.3) (+2 -2) - src/main/print-escp2.c (1.355.2.3) (+32 -16) - src/main/print-escp2.h (1.105.6.3) (+3 -2) - src/main/print-lexmark.c (1.154.8.1) (+2 -1) - src/main/print-olympus.c (1.61.2.2) (+254 -110) - src/main/print-pcl.c (1.145.2.1) (+2 -3) - src/main/print-ps.c (1.87.8.2) (+2 -1) - src/main/print-raw.c (1.38.8.1) (+2 -1) - src/main/print-util.c (1.109.4.4) (+14 -6) - src/main/printers.c (1.79.2.2) (+12 -1) - src/main/printers.xml (1.157.4.7) (+88 -48) - src/main/sequence.c (1.23.2.1) (+24 -5) - src/testpattern/Makefile.am (1.25.8.1) (+4 -2) - src/testpattern/run-testpattern (1.20.10.1) (+25 -7) - src/testpattern/run-testpattern-1 (1.6.10.1) (+37 -14) - src/testpattern/run-testpattern-2.in (1.2.4.2) (+70 -24) - src/testpattern/testpattern.c (1.44.8.1) (+47 -2) - src/testpattern/testpattern.h (1.15.18.1) (+3 -1) - src/testpattern/testpatternl.l (1.17.14.1) (+2 -1) - src/testpattern/testpatterny.y (1.26.18.3) (+21 -2) - test/pixma_parse.c (1.8.2.4) (+21 -7) - test/run-testdither (1.11.8.1) (+2 -2) - - Merge from 5.1.3 to 5.1.4; bump version + Files: src/main/canon-media.h (1.7) (+2 -1) + src/main/canon-modes.h (1.16) (+1 -1) + src/main/print-canon.c (1.208) (+5 -5) -2007-12-13 + workaround CD printing like it was done for Gutenprint 5.0 until the cd print mode works properly - Files: src/main/mark.c (1.4) (+17 -15) - src/main/page.c (1.3) (+17 -15) - src/main/ppd.c (1.5) (+17 -22) - src/main/ppd.h (1.4) (+17 -22) +2007-03-31 - [ 1848308 ] LICENSE.txt file missing + Files: src/foomatic/foomatic-generator.in (1.62) (+5 -3) + src/foomatic/printer_margins.c (1.20) (+8 -8) -2007-12-12 + Speed up foomatic data generation by printing each complete perl expression + on one line in printer_margins and eval'ing each line individually. - Files: src/cups/test-rastertogutenprint.in (1.3.2.1) (removed) + This was somewhat of a surprise; I expected that slurping the whole thing + in and doing one big eval would be faster (fewer calls to eval). In fact, + trying that with printer_options slightly increased user CPU time and + significantly increased system CPU time. Changing printer_margins to + allow individual eval's all but eliminated system CPU time and slightly + reduced user CPU time, with a net 25% improvement in data generation. - file test-rastertogutenprint.in was added on branch gutenprint-5_0-branch on 2007-12-15 20:35:37 +0000 +2007-03-29 -2007-12-12 + Files: test/parse-escp2 (1.19) (+22 -10) - Files: src/cups/test-rastertogutenprint.in (1.3) (+3 -6) + Print horizontal position in verbose mode. Also correct the number of dots. - Select pages from user manual rather than using saved PDF. +2007-03-24 -2007-12-11 + Files: src/foomatic/foomatic-generator.in (1.61) (+2 -0) - Files: src/cups/test-rastertogutenprint.in (1.2) (+8 -4) + Recognize some of the Canon mode names. - Try to make it work on OS X. +2007-03-24 -2007-12-11 + Files: configure.ac (1.163) (+3 -3) - Files: src/cups/test-rastertogutenprint.in (1.1) (added) + Enable dependency checking. - Add test for CUPS driver +2007-03-20 -2007-12-02 + Files: src/cups/genppd.c (1.132) (+6 -2) - Files: po/fr.po (1.76.4.4) (+6 -6) + Added forgotten "#ifdef ENABLE_NLS ... #endif". This prevented from compiling with "--disable-nls". - Fix some PPD issues. +2007-03-14 -2007-12-02 + Files: src/main/canon-inks.h (1.14) (+25 -0) + src/main/canon-modes.h (1.15) (+1 -0) + src/main/canon-printers.h (1.20) (+1 -1) - Files: po/nl.po (1.52.4.5) (+6 -6) + reenable CD printing for the PIXMA iP4200 - Fix up a few PPD-related problems. +2007-03-13 -2007-12-02 + Files: src/gutenprintui2/plist.c (1.8) (+8 -2) - Files: src/gutenprintui/Makefile.am (1.5.10.1) (+3 -1) - src/gutenprintui2/Makefile.am (1.6.10.1) (+3 -1) - src/main/gutenprint.pc.in (1.2.10.1) (+1 -1) + Always parse lpc/lpstat output in the C locale - Packaging fix from Greg Troxel +2007-03-13 -2007-09-09 + Files: test/pixma_parse.c (1.13) (+4 -3) + test/pixma_parse.h (1.6) (+2 -1) - Files: src/main/mark.c (1.3) (+3 -3) - src/main/ppd.c (1.4) (+80 -47) - src/main/ppd.h (1.3) (+14 -2) + parse iP4200 CD printjobs (ignore undiscovered 0xa3 and 0xad blocks for now, they don't seem to have a big impact on the final image) - Use Gutenprint option data where available rather than PPD file - enumerations. +2007-03-13 -2007-06-17 + Files: test/pixma_parse.c (1.12) (+6 -6) - Files: po/cs.po (1.38.4.3) (+1571 -1379) - po/da.po (1.73.4.3) (+1579 -1378) - po/de.po (1.51.4.3) (+1545 -1369) - po/el.po (1.52.4.3) (+1574 -1382) - po/en_GB.po (1.144.4.3) (+1579 -1378) - po/es.po (1.50.4.3) (+1571 -1379) - po/fr.po (1.76.4.3) (+1581 -1380) - po/hu.po (1.9.4.3) (+1579 -1378) - po/ja.po (1.46.4.3) (+1571 -1379) - po/nb.po (1.13.4.3) (+1571 -1379) - po/nl.po (1.52.4.4) (+1579 -1378) - po/pl.po (1.56.4.3) (+1569 -1377) - po/pt.po (1.51.4.3) (+1571 -1379) - po/sk.po (1.55.4.3) (+1571 -1379) - po/sv.po (1.83.4.3) (+1580 -1379) - po/zh_TW.po (1.12.4.3) (+1573 -1375) - - Gutenprint 5.0.1 release + margins seem to get ignored for cd printing, the bounding box should be + correct now + print page_right and length from the ESC p) command in gutenprint units, too -2007-06-17 +2007-03-13 - Files: doc/gutenprint.dox.in (1.4.18.1) (+263 -84) + Files: src/main/canon-inks.h (1.13) (+12 -0) + src/main/canon-modes.h (1.14) (+2 -0) + src/main/canon-printers.h (1.19) (+1 -1) + src/main/print-canon.c (1.207) (+259 -145) - Update doxygen input + Ported CD Fine Adjustment controls from print-escp2.c + (1549779) + Moved page_setup to an extra function + Fixed CD printing for the Canon PIXMA iP4000 + - added a new printmode that can print to cds (not tuned) + - modes that can print to cd need to have the MODE_FLAG_CD flag + - ESC l) has a 3rd byte for the newer printers + - removed sepcial cd handling from the ESC p) command + - set default margins to the max of duplex and noduplex -2007-06-17 +2007-03-11 - Files: NEWS (1.305.6.8) (+1 -1) + Files: src/main/print-escp2.c (1.371) (+7 -7) - Note that there "may be" issues with support for newer Canon - printers. + Fix up units interpretation and change defaults to match the normal CD + defaults. -2007-06-17 +2007-03-11 - Files: src/main/canon-media.h (1.4.4.3) (+0 -10) - src/main/canon-printers.h (1.13.4.3) (+6 -6) - src/main/printers.xml (1.157.4.6) (+9 -2) + Files: src/main/print-escp2.c (1.370) (+7 -7) - fix printing of black ink for the iP4300 + Make custom CD sizes accessible in CUPS driver. -2007-06-10 +2007-03-11 - Files: src/main/printers.xml (1.157.4.5) (+11 -11) + Files: src/gutenprintui2/panel.c (1.13) (+4 -3) - A number of Epson R-series printers do borderless better with the - RX400 settings than with the R300 settings. + Fix roundoff error for dimension parameters. -2007-06-04 +2007-03-11 - Files: src/main/print-util.c (1.109.4.3) (+2 -2) + Files: src/cups/genppd.c (1.131) (+4 -2) - Fix an overly enthusiastic conversion from ENABLE_NLS to HAVE_LOCALE_H + Clear the PageSize parameter before describing other options to ensure + that it doesn't incorrect affect the range of settings that can be + taken on. -2007-05-29 +2007-03-08 - Files: AUTHORS (1.21.10.2) (+0 -1) - NEWS (1.305.6.7) (+84 -22) - configure.ac (1.151.2.2) (+6 -5) - src/cups/Makefile.am (1.87.8.2) (+3 -3) - src/cups/cups-genppdconfig.in (1.13.8.1) (+2 -2) - src/cups/cups-genppdupdate.in (1.25.8.2) (+102 -48) - src/cups/genppd.c (1.119.2.3) (+6 -5) - src/escputil/escputil.c (1.87.8.1) (+2 -2) - src/foomatic/foomatic-generator.in (1.60.8.2) (+32 -28) - src/foomatic/foomatic-printermap (1.122.4.3) (+31 -1) - src/foomatic/printer_margins.c (1.17.8.2) (+9 -9) - src/foomatic/printer_options.c (1.50.8.2) (+135 -88) - src/gutenprintui2/panel.c (1.11.8.2) (+5 -4) - src/gutenprintui2/plist.c (1.6.10.3) (+41 -13) - src/main/escp2-channels.c (1.62.8.2) (+211 -1) - src/main/escp2-inks.c (1.46.10.2) (+87 -1) - src/main/escp2-papers.c (1.99.8.2) (+93 -1) - src/main/escp2-resolutions.c (1.33.8.2) (+85 -43) - src/main/print-canon.c (1.190.2.3) (+2 -2) - src/main/print-color.c (1.135.8.1) (+3 -1) - src/main/print-escp2-data.c (1.202.6.2) (+91 -4) - src/main/print-escp2.c (1.355.2.2) (+54 -23) - src/main/print-escp2.h (1.105.6.2) (+4 -2) - src/main/print-ps.c (1.87.8.1) (+136 -41) - src/main/print-util.c (1.109.4.2) (+12 -3) - src/main/print-vars.c (1.75.8.1) (+196 -119) - src/main/printers.c (1.79.2.1) (+46 -12) - src/main/printers.xml (1.157.4.4) (+44 -10) - src/main/xml.c (1.33.18.1) (+17 -10) - src/testpattern/testpatterny.y (1.26.18.2) (+2 -2) - test/parse-escp2 (1.11.8.2) (+22 -10) - test/pixma_parse.c (1.8.2.3) (+75 -8) - test/pixma_parse.h (1.3.2.3) (+9 -1) - - Merge changes from 5.1.1 and 5.1.2 + Files: test/pixma_parse.c (1.11) (+56 -3) + test/pixma_parse.h (1.5) (+7 -0) -2007-05-20 + output the parameters of the extended p) command and the area containing ink (usefull to find the cd position) - Files: src/main/ppd.c (1.3) (+8 -8) +2007-03-08 - Fix handling of locale. + Files: include/gutenprint/bit-ops.h (1.3) (+11 -2) + src/main/bit-ops.c (1.12) (+196 -1) + src/main/print-canon.c (1.206) (+3 -213) - Remove unnecessary and inappropriate copyright notice from Postsript output. + move 3bit and 4bit folding code to bit-opts.c - Use stp_strdup consistently. +2007-03-08 -2007-05-13 + Files: src/main/canon-inks.h (1.12) (+27 -12) + src/main/canon-modes.h (1.13) (+1 -0) + src/main/print-canon.c (1.205) (+75 -6) - Files: doc/gutenprint-users-manual.odt (1.1.6.2) (+284 -303) - doc/gutenprint-users-manual.pdf (1.1.6.1) (+5390 -7465) - po/cs.po (1.38.4.2) (+359 -371) - po/da.po (1.73.4.2) (+348 -362) - po/de.po (1.51.4.2) (+660 -674) - po/el.po (1.52.4.2) (+722 -733) - po/en_GB.po (1.144.4.2) (+348 -362) - po/es.po (1.50.4.2) (+761 -773) - po/fr.po (1.76.4.2) (+774 -788) - po/hu.po (1.9.4.2) (+349 -363) - po/ja.po (1.46.4.2) (+1108 -1120) - po/nb.po (1.13.4.2) (+392 -404) - po/nl.po (1.52.4.3) (+263 -277) - po/pl.po (1.56.4.2) (+415 -427) - po/pt.po (1.51.4.2) (+705 -717) - po/sk.po (1.55.4.2) (+1076 -1088) - po/sv.po (1.83.4.2) (+375 -389) - po/zh_TW.po (1.12.4.2) (+322 -337) - - Merge from 5.1.1 + Add inkset for the highest quality printmode on the PIXMA iP4000 (not enabled yet): + - implemented 4bit fold + - fixed a bug when adding the shades to the dither engine + - fixed 6 color inks to still produce the same md5sum after the bugfix -2007-05-12 +2007-03-07 - Files: NEWS (1.305.6.6) (+11 -0) + Files: test/pixma_parse.c (1.10) (+17 -4) + test/pixma_parse.h (1.4) (+1 -1) - added Canon fixes + correctly parse the highest quality mode for the PIXMA iP4000 -2007-05-12 +2007-03-07 - Files: src/cups/canon.c (1.5.56.1) (+136 -19) - src/cups/epson.c (1.7.8.1) (+138 -21) + Files: test/pixma_parse.c (1.9) (+1 -1) - Make canon and epson backends work on newer kernels - (gutenprint-5.0.0-sysfs.patch from SUSE) + fix some false positives for the iP6700 hack -2007-05-12 +2007-03-06 - Files: src/testpattern/testpatterny.y (1.26.18.1) (+6 -6) + Files: src/main/canon-inks.h (1.11) (+32 -0) - add format arguments to fprintf() + add some 4 bit dotsizes (will be used for the higher quality modes on the PIXMA iP4000) -2007-05-12 +2007-03-06 - Files: src/gutenprintui2/plist.c (1.6.10.2) (+3 -3) + Files: src/main/canon-inks.h (1.10) (+20 -17) - add format argument to g_message + reorder the inksets -2007-05-12 +2007-03-06 - Files: src/main/canon-inks.h (1.6.4.2) (+229 -116) - src/main/canon-media.h (1.4.4.2) (+3 -2) - src/main/canon-modes.h (1.8.4.2) (+63 -59) - src/main/canon-printers.h (1.13.4.2) (+22 -9) - src/main/print-canon.c (1.190.2.2) (+304 -305) - src/main/printers.xml (1.157.4.3) (+12 -12) - - Backport Canon fixes from 5.1 to 5.0 branch: - - fixed CD printing for PIXMA class printers - - reenabled CD tray for PIXMA iP4200 - - added CD fine adjustment controls - - fixed resolutions for S300 (https://bugs.launchpad.net/ubuntu/+source/gutenprint/+bug/110945) - - fixed printing with PIXMA printers connected to windows hosts (#1625202) - - renamed MULTIPASS printers to PIXMA + Files: src/main/canon-inks.h (1.9) (+30 -28) + src/main/canon-modes.h (1.12) (+59 -59) -2007-05-12 + rename the inksets to not contain the printer names as the inksets might be shared between different printers - Files: include/gutenprint/bit-ops.h (1.2.14.1) (+11 -2) - src/main/bit-ops.c (1.9.8.2) (+196 -1) +2007-03-06 - backport bit-ops changes (added 3 and 4 bit fold code) from 5.1 to 5.0 branch + Files: src/main/canon-inks.h (1.8) (+112 -88) -2007-03-20 + rename dotsizes and inks to contain the number of levels - Files: src/cups/genppd.c (1.119.2.2) (+6 -2) +2007-03-05 - Added forgotten "#ifdef ENABLE_NLS ... #endif". This prevented from compiling with "--disable-nls". + Files: src/foomatic/gutenprint-version.c (1.3) (+2 -2) + src/foomatic/paper_sizes.c (1.9) (+2 -2) + src/foomatic/printer_margins.c (1.19) (+2 -2) + src/foomatic/printer_options.c (1.51) (+2 -2) + src/foomatic/printers.c (1.11) (+2 -2) + src/testpattern/printer_options.c (1.4) (+2 -2) + src/testpattern/printers.c (1.7) (+2 -2) + + Update: Grant Taylor's *-omatic database -> OpenPrinting database 2007-03-04 - Files: AUTHORS (1.21.10.1) (+1 -1) - NEWS (1.305.6.5) (+2 -2) - README (1.165.6.2) (+1 -1) - doc/gutenprint-users-manual.odt (1.1.6.1) (+402 -360) - doc/users_guide/title.sgml (1.3.18.1) (+1 -1) - src/foomatic/gutenprint-version.c (1.2.18.1) (+2 -2) - src/foomatic/mk_printerlist.in (1.1.54.1) (+1 -1) - src/foomatic/paper_sizes.c (1.8.18.1) (+2 -2) - src/foomatic/printer_margins.c (1.17.8.1) (+3 -3) - src/foomatic/printer_options.c (1.50.8.1) (+2 -2) - src/foomatic/printers.c (1.10.18.1) (+2 -2) - src/testpattern/printer_options.c (1.2.8.2) (+2 -2) - src/testpattern/printers.c (1.6.18.1) (+2 -2) - - Updated linuxprinting.org -> openprinting.org + Files: doc/users_guide/title.sgml (1.4) (+1 -1) + + linuxprinting.org -> openprinting.org + +2007-03-04 + + Files: AUTHORS (1.23) (+1 -2) + NEWS (1.315) (+1 -1) + README (1.170) (+1 -1) + doc/gutenprint-users-manual.odt (1.2) (+383 -360) + doc/gutenprint-users-manual.pdf (1.2) (+5322 -7397) + src/foomatic/mk_printerlist.in (1.2) (+1 -1) + src/foomatic/printer_margins.c (1.18) (+2 -2) + + Update linuxprinting.org -> openprinting.org + +2007-03-03 + + Files: NEWS (1.314) (+46 -4) + README (1.169) (+2 -2) + configure.ac (1.162) (+3 -3) + src/foomatic/foomatic-printermap (1.135) (+26 -0) + src/main/escp2-channels.c (1.66) (+186 -1) + src/main/escp2-inks.c (1.48) (+27 -1) + src/main/escp2-papers.c (1.101) (+92 -1) + src/main/print-escp2-data.c (1.214) (+43 -1) + src/main/printers.xml (1.173) (+27 -1) + + Preliminary support for Claria printers -- untuned! + + Add support for some additional Epson printers. + +=============================================================================== +Name: gutenprint-5_1_0 2007-03-03 - Files: po/cs.po (1.38.4.1) (+2083 -1921) - po/da.po (1.73.4.1) (+1986 -1792) - po/de.po (1.51.4.1) (+2006 -1844) - po/el.po (1.52.4.1) (+1995 -1868) - po/en_GB.po (1.144.4.1) (+1987 -1792) - po/es.po (1.50.4.1) (+2060 -1892) - po/fr.po (1.76.4.1) (+1990 -1795) - po/hu.po (1.9.4.1) (+1988 -1795) - po/ja.po (1.46.4.1) (+2055 -1892) - po/nb.po (1.13.4.1) (+1984 -1863) - po/nl.po (1.52.4.2) (+2354 -2040) - po/pl.po (1.56.4.1) (+1934 -1844) - po/pt.po (1.51.4.1) (+2003 -1839) - po/sk.po (1.55.4.1) (+2048 -1888) - po/sv.po (1.83.4.1) (+2030 -1835) - po/zh_TW.po (1.12.4.1) (+1952 -1793) - - Gutenprint 5.0.0.99.1 release + Files: po/cs.po (1.40) (+1552 -1442) + po/da.po (1.75) (+1527 -1406) + po/de.po (1.53) (+1555 -1449) + po/el.po (1.54) (+1503 -1419) + po/en_GB.po (1.146) (+1526 -1404) + po/es.po (1.52) (+1554 -1441) + po/fr.po (1.78) (+1530 -1408) + po/hu.po (1.11) (+1527 -1407) + po/ja.po (1.48) (+1549 -1441) + po/nb.po (1.15) (+1491 -1416) + po/nl.po (1.55) (+2389 -2089) + po/pl.po (1.58) (+1489 -1418) + po/pt.po (1.53) (+1551 -1442) + po/sk.po (1.57) (+1552 -1444) + po/sv.po (1.85) (+1582 -1460) + po/zh_TW.po (1.14) (+1531 -1430) + + Gutenprint 5.1.0 release 2007-03-03 - Files: NEWS (1.305.6.4) (+7 -0) - src/foomatic/foomatic-printermap (1.122.4.2) (+4 -0) - src/main/printers.xml (1.157.4.2) (+5 -1) + Files: NEWS (1.313) (+7 -0) + src/foomatic/foomatic-printermap (1.134) (+4 -0) + src/main/printers.xml (1.172) (+5 -1) Added support for some new Epson derivatives 2007-03-03 - Files: po/nl.po (1.52.4.1) (+1963 -2874) + Files: po/nl.po (1.54) (+3133 -4078) Updated Dutch translation -2007-03-03 +2007-03-02 - Files: NEWS (1.305.6.3) (+28 -29) + Files: src/main/print-escp2.c (1.369) (+3 -2) - Minor release note updates + Set initial advance correctly for resolutions where the vertical unit + does not equal the vertical resolution. -2007-03-03 +2007-03-01 - Files: NEWS (1.305.6.2) (+3 -3) + Files: configure.ac (1.161) (+4 -3) + src/cups/Makefile.am (1.92) (+13 -8) + src/cups/genppd.c (1.130) (+9 -5) - Satisfy make dist. + Make translated and/or simplified PPD files work correctly with CUPS 1.2 + generator. -2007-03-02 +2007-02-28 - Files: NEWS (1.305.6.1) (+126 -411) - README (1.165.6.1) (+22 -22) - configure.ac (1.151.2.1) (+44 -23) - doc/README.maintaining (1.22.8.1) (+7 -7) - doc/developer/Makefile.am (1.19.6.1) (+2 -2) - doc/users_guide/Makefile.am (1.44.10.1) (+2 -2) - include/gutenprint/util.h (1.3.2.1) (+3 -2) - include/gutenprint/vars.h (1.3.8.1) (+4 -1) - scripts/autogen.sh (1.33.18.1) (+1 -1) - src/cups/Makefile.am (1.87.8.1) (+27 -7) - src/cups/cups-genppdupdate.in (1.25.8.1) (+82 -39) - src/cups/genppd.c (1.119.2.1) (+738 -453) - src/cups/rastertoprinter.c (1.105.2.1) (+99 -22) - src/foomatic/foomatic-generator.in (1.60.8.1) (+2 -2) - src/foomatic/foomatic-printermap (1.122.4.1) (+12 -1) - src/ghost/.cvsignore (1.12.10.1) (+0 -2) - src/gutenprintui/gutenprintui-internal.h (1.2.12.1) (+2 -2) - src/gutenprintui/panel.c (1.9.6.1) (+86 -13) - src/gutenprintui/plist.c (1.3.6.1) (+30 -19) - src/gutenprintui/printrcy.y (1.1.18.1) (+129 -80) - src/gutenprintui2/panel.c (1.11.8.1) (+86 -13) - src/gutenprintui2/plist.c (1.6.10.1) (+10 -3) - src/gutenprintui2/printrcy.y (1.1.18.1) (+129 -80) - src/main/Makefile.am (1.92.10.1) (+10 -2) - src/main/bit-ops.c (1.9.8.1) (+24 -21) - src/main/buffer-image.c (1.1.2.2) (+153 -0) - src/main/canon-inks.h (1.6.4.1) (+23 -0) - src/main/canon-media.h (1.4.4.1) (+55 -0) - src/main/canon-modes.h (1.8.4.1) (+91 -57) - src/main/canon-printers.h (1.13.4.1) (+62 -96) - src/main/escp2-channels.c (1.62.8.1) (+231 -7) - src/main/escp2-driver.c (1.30.6.1) (+16 -29) - src/main/escp2-inks.c (1.46.10.1) (+57 -17) - src/main/escp2-papers.c (1.99.8.1) (+480 -13) - src/main/escp2-resolutions.c (1.33.8.1) (+157 -84) - src/main/papers.xml (1.21.8.1) (+11 -4) - src/main/print-canon.c (1.190.2.1) (+364 -366) - src/main/print-canon.h (1.2.4.1) (+1 -1) - src/main/print-escp2-data.c (1.202.6.1) (+730 -1105) - src/main/print-escp2.c (1.355.2.1) (+271 -84) - src/main/print-escp2.h (1.105.6.1) (+54 -119) - src/main/print-olympus.c (1.61.2.1) (+1065 -839) - src/main/print-util.c (1.109.4.1) (+15 -1) - src/main/print-weave.c (1.65.8.1) (+3 -3) - src/main/printers.xml (1.157.4.1) (+23 -11) - src/main/util.h (1.33.10.1) (+5 -2) - src/testpattern/printer_options.c (1.2.8.1) (+16 -2) - src/testpattern/run-testpattern-2.in (1.2.4.1) (+75 -40) - test/.cvsignore (1.7.28.1) (+1 -0) - test/Makefile.am (1.46.8.1) (+4 -2) - test/parse-escp2 (1.11.8.1) (+261 -18) - test/pixma_parse.c (1.8.2.2) (+607 -0) - test/pixma_parse.h (1.3.2.2) (+256 -0) - test/unprint.c (1.37.8.1) (+5 -3) - - Backport mainline 5.1.0 (release candidate) to 5.0 branch. Omitted - changes to Postscript driver, and kept the name of the Olympus driver - the same (did not rename it to dyesub). + Files: configure.ac (1.160) (+3 -3) -2007-02-24 + cups-1.2-enhancements seems to be an illegal configure feature name. + +2007-02-27 + + Files: NEWS (1.312) (+0 -3) + + There is support for the Canon S200 now... + +2007-02-27 + + Files: src/main/print-canon.c (1.204) (+3 -1) + + Free the head offset where used. + +2007-02-27 + + Files: src/testpattern/run-testpattern-2.in (1.6) (+1 -1) + + Minor change to valgrind + +2007-02-27 + + Files: src/main/print-escp2.c (1.368) (+3 -5) + + Don't attempt to extend the top margin in non-borderless mode on older + borderless-capable printers (Ubuntu bug 82168, + https://launchpad.net/ubuntu/+source/cupsys/+bug/82186). + +2007-02-27 + + Files: test/parse-escp2 (1.18) (+4 -2) + + Remove unnecessary verbosity + +2007-02-27 + + Files: src/main/bit-ops.c (1.11) (+24 -23) + + Better way of avoiding overrun in unpack 16 mode. + +2007-02-27 + + Files: NEWS (1.311) (+5 -1) + src/main/bit-ops.c (1.10) (+3 -1) + src/main/escp2-resolutions.c (1.39) (+1 -69) + src/main/print-escp2-data.c (1.213) (+14 -14) + + Various minor fixes + +2007-02-25 + + Files: NEWS (1.310) (+93 -60) + src/cups/genppd.c (1.129) (+12 -2) + src/cups/rastertoprinter.c (1.108) (+82 -22) + test/unprint.c (1.38) (+5 -3) + + Add Shrink Page If Necessary to Fit Borders option to CUPS driver + +2007-02-25 + + Files: NEWS (1.309) (+17 -8) + + More updates. + +2007-02-25 + + Files: README (1.168) (+53 -40) + + Prep for 5.1.0 release. + +2007-02-25 - Files: src/main/buffer-image.c (1.1.2.1) (removed) + Files: src/cups/cups-genppdupdate.in (1.28) (+14 -10) + src/cups/genppd.c (1.128) (+200 -39) - file buffer-image.c was added on branch gutenprint-5_0-branch on 2007-03-02 12:01:21 +0000 + Add language support for driver interface. + + Add a list of language mappings to improve robustness of setlocale. + On some systems, setlocale(LC_ALL, "de") fails, but de_DE works. + + Add more default information to PPD files for future use in extracting + setting information. + + Change URI encoding to make the driver be the hostname and the + resource be everything else. + +2007-02-25 + + Files: src/main/print-canon.c (1.203) (+50 -69) + + merge init struct into privdata struct + +2007-02-25 + + Files: src/main/print-canon.c (1.202) (+17 -18) + + mark init data as const in canon_init_printer and canon_deinit_printer + +2007-02-25 + + Files: src/main/print-canon.c (1.201) (+1 -6) + + remove unused variables + +2007-02-25 + + Files: configure.ac (1.159) (+3 -2) + src/cups/cups-genppdupdate.in (1.27) (+76 -35) + src/cups/genppd.c (1.127) (+7 -2) + + Enable cups-genppdupdate for CUPS 1.2. 2007-02-24 - Files: src/main/buffer-image.c (1.1) (added) + Files: NEWS (1.308) (+4 -0) - add an internal function to buffer and rotate stp_images + add some more print-canon improvements -2007-02-24 +2007-02-24 + + Files: src/main/print-canon.c (1.200) (+2 -2) + + fix printers that do not support duplex + +2007-02-24 + + Files: src/main/print-canon.c (1.199) (+6 -17) + + add support for DuplexNoTumble - Files: test/pixma_parse.c (1.8.2.1) (removed) +2007-02-24 + + Files: src/main/Makefile.am (1.97) (+2 -1) + src/main/buffer-image.c (1.1) (added) + src/main/util.h (1.34) (+5 -2) - file pixma_parse.c was added on branch gutenprint-5_0-branch on 2007-03-02 12:01:35 +0000 + add an internal function to buffer and rotate stp_images 2007-02-24 @@ -608,6 +2811,18 @@ dump argument buffer for unknown bytes +2007-02-24 + + Files: src/cups/genppd.c (1.126) (+229 -246) + + Code cleanup + +2007-02-24 + + Files: test/parse-escp2 (1.17) (+16 -0) + + Add GPL header + 2007-02-23 Files: test/pixma_parse.c (1.6) (+4 -1) @@ -620,12 +2835,6 @@ add -y parameter to limit the height of the generated ppm -2007-02-23 - - Files: test/pixma_parse.h (1.3.2.1) (removed) - - file pixma_parse.h was added on branch gutenprint-5_0-branch on 2007-03-02 12:01:36 +0000 - 2007-02-23 Files: test/pixma_parse.c (1.4) (+3 -1) @@ -633,12 +2842,372 @@ print total number of dots +2007-02-23 + + Files: src/main/printers.xml (1.171) (+2 -2) + + ouch Gamma is stored as 1/Gamma in printers.xml => output should be ok for the newer canon printers now + +2007-02-23 + + Files: src/main/canon-printers.h (1.18) (+21 -67) + + remove broken hsl adjustment curve for the newer printers + +2007-02-20 + + Files: src/cups/genppd.c (1.125) (+25 -3) + src/cups/rastertoprinter.c (1.107) (+21 -4) + + Add CUPS 1.2 custom option parameters and code to handle them. + 2007-02-20 Files: test/pixma_parse.c (1.3) (+1 -0) fix handling of non extended ESC t) commands +2007-02-17 + + Files: doc/developer/Makefile.am (1.20) (+2 -2) + doc/users_guide/Makefile.am (1.45) (+2 -2) + + Remove CATALOG.local in make clean + +2007-02-13 + + Files: scripts/autogen.sh (1.34) (+1 -1) + + add alternative path for docbook 4.1 + +2007-02-12 + + Files: test/parse-escp2 (1.16) (+97 -49) + + Use -v to annotate the output and -V to print the detail. Also, don't + print empty rows. + +2007-02-11 + + Files: test/parse-escp2 (1.15) (+64 -16) + + Print out more data, and handle offset heads. + +2007-02-10 + + Files: src/cups/genppd.c (1.124) (+56 -14) + + Add additional key to tell Gutenprint Postscript driver what each + option really means. + +2007-02-10 + + Files: src/cups/Makefile.am (1.91) (+2 -2) + + Don't attempt to install PPD files unless we're actually building CUPS + driver. + +2007-02-10 + + Files: src/cups/cups-genppdupdate.in (1.26) (+3 -5) + + Clarify warning if existing setting is no longer valid (the old + message made it look like the PPD file wasn't being updated). + +2007-02-10 + + Files: src/main/print-escp2-data.c (1.212) (+2 -2) + + Fix paper feed definitions for R800. + +2007-02-05 + + Files: src/main/papers.xml (1.23) (+8 -1) + src/main/print-escp2.c (1.367) (+68 -8) + + Enable variable CD size. Submitted by wackojacko32@ntlworld.com. + +2007-02-04 + + Files: src/main/escp2-driver.c (1.36) (+2 -2) + src/main/print-escp2-data.c (1.211) (+2 -2) + src/main/print-escp2.c (1.366) (+19 -15) + + Try again to get borderless working. + +2007-02-02 + + Files: doc/README.maintaining (1.23) (+7 -7) + + Update build dependencies. + +2007-01-30 + + Files: src/main/print-escp2-data.c (1.210) (+83 -83) + src/main/print-escp2.c (1.365) (+28 -14) + src/main/print-escp2.h (1.111) (+23 -22) + + Another attempt at full bleed + +2007-01-29 + + Files: src/main/print-escp2-data.c (1.209) (+3 -3) + + Change CX4600 and friends to use normal 5760 resolutions. + +2007-01-29 + + Files: src/main/escp2-resolutions.c (1.38) (+1 -6) + + Remove transposed resolutions that largely duplicate others. + +2007-01-29 + + Files: src/main/escp2-driver.c (1.35) (+3 -2) + src/main/print-escp2-data.c (1.208) (+82 -82) + src/main/print-escp2.c (1.364) (+16 -5) + src/main/print-escp2.h (1.110) (+4 -2) + + Further zero-margin improvements + +2007-01-28 + + Files: src/main/print-escp2.c (1.363) (+11 -6) + + Allow vertical full bleed + +2007-01-28 + + Files: src/main/escp2-channels.c (1.65) (+9 -17) + + Back out incorrect checkin. + +2007-01-28 + + Files: src/main/escp2-driver.c (1.34) (+2 -2) + src/main/print-escp2.c (1.362) (+2 -2) + + Trying too hard to maximize print quality at the bottom of the page + leads to some passes not getting printed. + +2007-01-27 + + Files: NEWS (1.307) (+88 -1164) + README (1.167) (+2 -5) + + Prepare for 5.1.0. + +2007-01-27 + + Files: src/main/print-escp2-data.c (1.207) (+2 -2) + + Enable borderless printing for C82. + +2007-01-27 + + Files: src/main/escp2-resolutions.c (1.37) (+5 -1) + src/main/print-escp2-data.c (1.206) (+167 -86) + src/main/print-escp2.c (1.361) (+18 -9) + src/main/print-escp2.h (1.109) (+6 -3) + + It turns out that the requirement for fast printing on many of the + new printers is that the first column must be aligned to 1/180", not + to 8 dot positions per se. This means that we can offer 5760x2880 + by aligning printing to 32 columns, and 360 DPI by aligning to 2 columns. + The latter gives us better positioning accuracy (worst case error 1/360" + rather than 1/90"). + + Improve printing at top and bottom of page even in non-borderless mode + on borderless-capable printers. + +2007-01-27 + + Files: test/.cvsignore (1.8) (+1 -0) + + Ignore files + +2007-01-27 + + Files: test/parse-escp2 (1.14) (+36 -8) + + Print out a bit more detail. + +2007-01-27 + + Files: src/main/Makefile.am (1.96) (+5 -5) + + Complete renaming olympus driver to dyesub. + +2007-01-26 + + Files: src/main/Makefile.am (1.95) (+9 -2) + test/Makefile.am (1.48) (+2 -2) + + Add some missing files + +2007-01-26 + + Files: src/main/print-escp2.c (1.360) (+22 -5) + + Attempt to handle C8x-style printers correctly. Needs testing. + +2007-01-25 + + Files: src/main/escp2-driver.c (1.33) (+1 -16) + src/main/print-escp2.c (1.359) (+34 -14) + + Fix up full bleed printing for real (I hope!) + +2007-01-25 + + Files: src/main/escp2-driver.c (1.32) (+8 -3) + src/main/print-escp2-data.c (1.205) (+23 -23) + src/main/print-escp2.c (1.358) (+24 -16) + src/main/print-escp2.h (1.108) (+5 -4) + + Improve print quality in borderless mode + +2007-01-25 + + Files: test/parse-escp2 (1.13) (+15 -5) + + Handle negative values correctly. + +2007-01-24 + + Files: src/main/Makefile.am (1.94) (+2 -2) + + Add print-canon.h to the list of sources. + +2007-01-24 + + Files: src/foomatic/foomatic-printermap (1.133) (+1 -0) + src/main/printers.xml (1.170) (+2 -1) + + Add Xerox WorkCentre M118. + +2007-01-24 + + Files: configure.ac (1.158) (+5 -3) + + Clean up confusing wording. + +2007-01-23 + + Files: configure.ac (1.157) (+3 -3) + + Add a few more warnings. + +2007-01-23 + + Files: test/parse-escp2 (1.12) (+92 -1) + + Add a bit of explanation to the output. + +2007-01-23 + + Files: include/gutenprint/vars.h (1.4) (+4 -1) + + Add raw accessor. + +2007-01-23 + + Files: include/gutenprint/util.h (1.5) (+3 -2) + + Add stp_putraw. + +2007-01-23 + + Files: src/foomatic/foomatic-printermap (1.132) (+1 -0) + + Add Lexmark Optra E220. + +2007-01-23 + + Files: src/main/escp2-channels.c (1.64) (+17 -9) + src/main/escp2-driver.c (1.31) (+9 -13) + src/main/print-escp2-data.c (1.204) (+207 -105) + src/main/print-escp2.c (1.357) (+16 -13) + src/main/print-escp2.h (1.107) (+5 -2) + src/main/print-util.c (1.110) (+15 -1) + src/main/print-weave.c (1.66) (+3 -3) + src/main/printers.xml (1.169) (+10 -9) + + Fix borderless (bug 1588200). + + Add a few more Lexmark printers. + +2006-12-19 + + Files: src/main/printers.xml (1.168) (+2 -2) + + Correction. + +2006-12-19 + + Files: src/foomatic/foomatic-printermap (1.131) (+2 -0) + src/main/printers.xml (1.167) (+3 -1) + + Added the Lexmark X73 and the Compaq IJ1200 (both compatible with Lexmark Z42). + +2006-12-09 + + Files: src/foomatic/foomatic-printermap (1.130) (+1 -0) + src/main/printers.xml (1.166) (+2 -1) + + support for Canon PIXMA iP4300 + +2006-11-19 + + Files: src/main/print-canon.c (1.198) (+2 -2) + + replace hardcoded number of colors in the buffer calculation code for the I) raster mode, thanks to Karl Guenter Wuensch for tracking this down + +2006-11-15 + + Files: src/gutenprintui2/plist.c (1.7) (+10 -3) + + If an unknown printer model is found in the printrc file, convert it + to Postscript level 2. + +2006-11-15 + + Files: src/gutenprintui2/printrcy.y (1.2) (+129 -80) + + Don't die if for some reason there's no current printer (if + stpui_plist_create fails). + +2006-11-04 + + Files: src/main/printers.xml (1.165) (+2 -1) + + PIXMA iP6700 (untested) + +2006-11-04 + + Files: src/main/print-canon.c (1.197) (+2 -54) + + remove cruft + +2006-11-04 + + Files: src/foomatic/foomatic-printermap (1.129) (+1 -0) + src/main/canon-inks.h (1.7) (+23 -0) + src/main/canon-modes.h (1.11) (+91 -57) + src/main/canon-printers.h (1.17) (+12 -0) + src/main/print-canon.c (1.196) (+320 -239) + src/main/print-canon.h (1.3) (+1 -1) + + - some code to support the PIXMA iP6700 (untested) + - added Photo Black (k) support + - moved delay settings to canon-modes.h + - channel setup moved to a seperate function + - first attempts to clean up the duplicated variables all around the place + - more cleanup to do + - md5sum changed for some printers in CMYK+Color+360x360dmt mode + the printjob still look ok, only the amount of C,M,Y,K dots seem to + have changed a bit + 2006-11-01 Files: test/pixma_parse.c (1.2) (+34 -8) @@ -652,25 +3221,391 @@ Thanks to Karl Günter Wünsch for debugging these issues +2006-10-08 + + Files: src/testpattern/run-testpattern-2.in (1.5) (+13 -4) + + Correct exit status generation; generate useful status when creating + md5 checksums. + +2006-10-08 + + Files: src/testpattern/printer_options.c (1.3) (+16 -2) + src/testpattern/run-testpattern-2.in (1.4) (+27 -19) + + Only pass the desired printer names to printer_options. + + If not using md5 mode, use a single testpattern process to run everything. + This is much faster. Also, collect the exit status in that case. + +2006-10-08 + + Files: src/testpattern/run-testpattern-2.in (1.3) (+37 -19) + + Allow specifying different options to test. + +2006-10-07 + + Files: src/main/escp2-channels.c (1.63) (+231 -7) + src/main/escp2-inks.c (1.47) (+57 -17) + src/main/escp2-papers.c (1.100) (+480 -13) + src/main/escp2-resolutions.c (1.36) (+159 -17) + src/main/print-escp2-data.c (1.203) (+391 -949) + src/main/print-escp2.c (1.356) (+64 -27) + src/main/print-escp2.h (1.106) (+21 -96) + + Start converting Epson driver data into named data rather than + hard-coded struct references. Ultimately the goal is to make it + all into external data files. + +2006-10-01 + + Files: src/main/print-olympus.c (1.72) (+6 -3) + + code cleanup: + - fixed compiler warnings + +2006-10-01 + + Files: src/cups/genppd.c (1.123) (+64 -79) + + Generate PPD-compliant resolution names for Gutenprint 5.0 with CUPS + 1.2 and Gutenprint 5.1+ in all cases. Also ensure that the lower of + the two axial resolutions is correct so that programs that use the + lower resolution to determine how to render data will behave + correctly, and that the Gutenprint default resolution will be the + default in the PPD files. + +2006-10-01 + + Files: src/foomatic/foomatic-printermap (1.128) (+1 -0) + src/main/print-olympus.c (1.71) (+137 -194) + src/main/printers.xml (1.164) (+2 -1) + + new printer: + - Sony UP-DR100 + code cleanup: + - defined macro LIST to simplify list definition + - blocksize changed to constant SHRT_MAX for printers that don't use blocks + +2006-10-01 + + Files: src/foomatic/foomatic-printermap (1.127) (+1 -0) + src/main/print-olympus.c (1.70) (+100 -8) + src/main/printers.xml (1.163) (+4 -3) + + new printers: + - limited support for Sony DPP-EX5 and DPP-EX7 (4x6 pagesize only) + +2006-09-30 + + Files: src/foomatic/foomatic-printermap (1.126) (+1 -0) + src/main/print-olympus.c (1.69) (+246 -151) + src/main/printers.xml (1.162) (+3 -1) + + new printers: + - support for Kodak Easyshare Printer Dock & compatible, this include: + Kodak Printer Dock + Kodak Printer Dock Plus + Kodak Printer Dock 6000 + Kodak Printer Dock 4000 + Kodak Printer Dock Series 3 + Kodak Printer Dock Plus Series 3 + Kodak Photo Printer 500 + Kodak Photo Printer 300 + fixes: + - dyesub_media_size can redefine default pagesize to achieve more precise + measures + - Resolution parameters changed to correspond with manufacturer specs on all + printers + code cleanup: + - dyesub_print_bytes renamed to dyesub_nputc + +2006-09-30 + + Files: src/main/canon-media.h (1.6) (+8 -0) + src/main/canon-printers.h (1.16) (+1 -1) + + the PIXMA iP4200 does not have a cd tray + 2006-09-30 - Files: test/pixma_parse.c (1.1) (added) + Files: test/Makefile.am (1.47) (+4 -2) + test/pixma_parse.c (1.1) (added) test/pixma_parse.h (1.1) (added) add pixma_parse a parser for canon bjl printjobs that can also generate ppm images from the raster data +2006-09-30 + + Files: src/main/print-canon.c (1.195) (+7 -3) + + some fixes for the multiraster mode: when packing the pixels -128 can't be used for the repeate sequence because it means end of line in multiraster mode, ESC e) skips raster blocks not lines in mulitraster mode + +2006-09-30 + + Files: src/main/canon-printers.h (1.15) (+3 -3) + src/main/print-canon.c (1.194) (+3 -2) + + adjust borders and enable ESC p) for the PIXMA iP4000 + +2006-09-29 + + Files: src/main/print-canon.c (1.193) (+13 -6) + + enable MediaDetection when the cd slot is detected + +2006-09-29 + + Files: src/main/print-canon.c (1.192) (+15 -2) + + prepare for DuplexNoTumble support + +2006-09-28 + + Files: AUTHORS (1.22) (+1 -1) + include/gutenprint/util.h (1.4) (+3 -3) + src/cups/rastertoprinter.c (1.106) (+4 -4) + src/main/module.c (1.26) (+3 -3) + src/main/print-olympus.c (1.68) (+378 -378) + src/main/printers.xml (1.161) (+2 -2) + + rename olympus driver to dyesub + (i.e. all olympus_* func, struct and defs to dyesub_*) + +2006-09-28 + + Files: src/foomatic/foomatic-printermap (1.125) (+1 -0) + src/main/print-olympus.c (1.67) (+62 -1) + src/main/printers.xml (1.160) (+2 -1) + + support for: + - Fujifilm FinePix NX-500 + +2006-09-24 + + Files: src/foomatic/foomatic-printermap (1.124) (+1 -0) + src/main/papers.xml (1.22) (+5 -5) + src/main/print-olympus.c (1.66) (+102 -67) + src/main/printers.xml (1.159) (+2 -1) + + new printers: + - support for canon cp-10 + fixes: + - "Card" papersize is now portrait oriented + - olympus_describe_output returns right output type now + code cleanup: + - rewriten olympus_describe_resolution and removed all_res_list + - simplified of olympus_do_print's init part + +2006-09-22 + + Files: src/main/canon-media.h (1.5) (+47 -0) + src/main/canon-printers.h (1.14) (+29 -29) + src/main/print-canon.c (1.191) (+19 -41) + + Fix paper slot handling for the PIXMA iP4000 and other printers + +2006-09-22 + + Files: configure.ac (1.156) (+2 -3) + m4/stp_gimp.m4 (1.10) (+0 -43) + + Remove GIMP 1.2 autoconf code. + +2006-09-22 + + Files: include/gutenprintui/.cvsignore (1.2) (removed) + include/gutenprintui/Makefile.am (1.4) (removed) + include/gutenprintui/gutenprintui.h (1.3) (removed) + src/gutenprintui/.cvsignore (1.2) (removed) + + Remove last parts of gutenprintui. + +2006-09-22 + + Files: include/Makefile.am (1.8) (+2 -2) + + remove gutenprintui + +2006-09-22 + + Files: src/cups/.cvsignore (1.10) (+4 -4) + src/ghost/.cvsignore (1.13) (+1 -3) + + Update .cvsignore files + +2006-09-22 + + Files: Makefile.am (1.148) (+2 -2) + + Undo incorrect change. + +2006-09-22 + + Files: Makefile.am (1.147) (+2 -2) + src/main/print-olympus.c (1.65) (+1 -69) + + - fix: removed duplicated code (result of previous bad merge) + +2006-09-22 + + Files: configure.ac (1.155) (+38 -29) + src/cups/Makefile.am (1.90) (+5 -2) + + Check correctly for CUPS 1.2 and compile appropriate commands. + +2006-09-21 + + Files: src/foomatic/foomatic-printermap (1.123) (+1 -1) + src/main/print-olympus.c (1.64) (+515 -452) + src/main/printers.xml (1.158) (+2 -2) + + summary from olymp-reorg-branch: + - olympus_do_print splited into subroutines olympus_print_* + - new struct olympus_print_vars_t holds set of printing variables + - support for landscape page mode (per page option) + - bugfix [ 1242055 ] Sony UP-DR150 Support + - probably fix of unreported bug on Sony UP-DP10 (similar to UP-DR150) + +2006-09-19 + + Files: src/cups/genppd.c (1.122) (+75 -52) + src/main/canon-modes.h (1.10) (+42 -42) + src/main/escp2-resolutions.c (1.35) (+10 -10) + src/main/print-olympus.c (1.63) (+44 -44) + + Revert changes to resolution option names in core drivers. + + Update genppd to generate valid resolution option keywords and + do some more cleanup of the generated PPD files. + +2006-09-19 + + Files: src/cups/canon.c (1.7) (removed) + src/cups/epson.c (1.8) (removed) + + Remove old CUPS backends which are obsolete in CUPS 1.2 and beyond and + only cause user confusion... + +2006-09-19 + + Files: src/cups/Makefile.am (1.89) (+3 -2) + src/cups/genppd.c (1.121) (+96 -207) + + Use ALL_LINGUAS from configure.ac rather than scanning all of the locale + subdirectories to determine what languages are available. + + Move the locale/localization setup code to a new "set_language()" + function - this will be needed for the multi-language PPD support. + +2006-09-18 + + Files: configure.ac (1.154) (+12 -4) + po/cs.po (1.39) (+1500 -1460) + po/da.po (1.74) (+1453 -1394) + po/de.po (1.52) (+1463 -1421) + po/el.po (1.53) (+1488 -1456) + po/en_GB.po (1.145) (+1453 -1394) + po/es.po (1.51) (+1503 -1460) + po/fr.po (1.77) (+1453 -1394) + po/hu.po (1.10) (+1453 -1394) + po/ja.po (1.47) (+1503 -1460) + po/nb.po (1.14) (+1488 -1454) + po/nl.po (1.53) (+1492 -1458) + po/pl.po (1.57) (+1455 -1448) + po/pt.po (1.52) (+1503 -1460) + po/sk.po (1.56) (+1498 -1458) + po/sv.po (1.84) (+1454 -1395) + po/zh_TW.po (1.13) (+1490 -1447) + src/cups/Makefile.am (1.88) (+12 -10) + src/cups/canon.c (1.6) (+0 -693) + src/cups/genppd.c (1.120) (+452 -254) + src/main/canon-modes.h (1.9) (+42 -42) + src/main/escp2-resolutions.c (1.34) (+10 -10) + src/main/print-olympus.c (1.62) (+44 -44) + + Add CUPS 1.2 driver interface. + + Clean up resolution option names to stick to "NNNdpi" or "NNNxNNNdpi" + whenever possible. + + configure.ac: + - Only build CUPS PPDs by default if we are using CUPS 1.1.x. + + src/cups/Makefile.am: + - Drop canon and epson backends. + - Add gutenprint.M.m driver interface. + + src/cups/genppd.c: + - When CUPS_DRIVER_INTERFACE is defined, build as a CUPS driver + interface instead of a standalone PPD generator. + - Add cat_ppd(), generate_ppd(), and list_ppds() functions. + - Factor out the PPD creation code in write_ppd(), which is now + part of generate_ppd(), and then call write_ppd() from either + cat_ppd() or generate_ppd(), as needed. + + src/main/*: + - Fix resolution option names - the PPD spec requires the suffix + "dpi" and if the X and Y resolutions are the same only a single + number should be provided. I didn't mess with the Epson driver + suffixes (sw, mw, etc.) since they select the weave mode, but + most of the Epson PPD files will not pass a cupstestppd test and + probably won't work with Windows apps (you'll be stuck with the + default resolution in the PPD file...) + +2006-09-18 + + Files: po/POTFILES.in (1.22) (+0 -9) + + Remove GIMP 1.2 files + +2006-09-18 + + Files: NEWS (1.306) (+1 -1) + + Bump version so make snapshot works. Release notes still need to be + updated. + 2006-09-18 - Files: m4/stp_option.m4 (1.7.2.1) (+3 -2) + Files: README (1.166) (+24 -31) + configure.ac (1.153) (+8 -84) + src/Makefile.am (1.20) (+1 -3) + src/gimp/Makefile.am (1.37) (removed) + src/gimp/print-image-gimp.c (1.14) (removed) + src/gimp/print-intl.h (1.7) (removed) + src/gimp/print.c (1.67) (removed) + src/gimp/print_gimp.h (1.45) (removed) + src/gutenprintui/Makefile.am (1.6) (removed) + src/gutenprintui/gutenprintui-internal.h (1.3) (removed) + src/gutenprintui/gutenprintui.pc.in (1.3) (removed) + src/gutenprintui/panel.c (1.10) (removed) + src/gutenprintui/plist.c (1.4) (removed) + src/gutenprintui/print-image-thumbnail.c (1.2) (removed) + src/gutenprintui/printrc.h (1.2) (removed) + src/gutenprintui/printrcl.l (1.2) (removed) + src/gutenprintui/printrcy.y (1.2) (removed) + src/gutenprintui/ui-utils.c (1.3) (removed) + + Remove GIMP 1.2 support. + +2006-09-18 + + Files: m4/stp_option.m4 (1.8) (+3 -2) Fix STP_ADD_COMPILER_ARG correctly. 2006-09-18 - Files: src/main/mark.c (1.2) (+442 -0) + Files: include/gutenprint/Makefile.am (1.3) (+1 -1) + src/gutenprintui2/panel.c (1.12) (+86 -13) + src/main/Makefile.am (1.93) (+2 -2) + src/main/mark.c (1.2) (+442 -0) src/main/page.c (1.2) (+191 -0) src/main/ppd.c (1.2) (+2644 -0) src/main/ppd.h (1.2) (+345 -0) + src/main/print-ps.c (1.88) (+223 -281) First cut at new Postscript driver and changes to the UI code. @@ -679,12 +3614,21 @@ This driver parses PPD files for options and dynamically creates options based on the PPD files. +2006-09-18 + + Files: configure.ac (1.152) (+3 -3) + + Open up Gutenprint 5.1 branch + 2006-09-18 Files: src/main/ppd.c (1.1) (added) file ppd.c was initially added on branch new-ps-driver-branch. +=============================================================================== +Name: gutenprint-5_0-bp + 2006-09-14 Files: Makefile.am (1.146) (+1 -26) @@ -1085,94 +4029,12 @@ file canon-modes.h was initially added on branch canon_experimental. -2006-08-28 - - Files: src/main/print-canon.c (1.175.2.4) (+311 -1062) - - New mode setting code - - Remove EXPERIMENTAL STUFF - - Remove supported resolutions array - every printer can now support an unlimited amount of modes - - modedefintions can be found in canon-modes.h - - ink definitons can be found in canon-inks.h - - the inklist can be used to generate the values for the extended ESC (t command - - WEAVE and 5Pixelin1byte Flags are now possible for every mode - Although this looks like a complete rewrite all printers still support all modes they supported before - The md5sums for every parameter combination testable with run-testpattern-2 are identical. - Exceptions: - bjc-6000,bjc-6100,bjc-6200,bjc-6500: - CMYK+BW+360x360dmt - bjc-7000: - CMYK+BW+300x300dpi - Reason: - Before the change the printer was configured to print CMYK when we only used the K channel. - Now we configure the printer to print CcMmYK. - - bjc-s200: - Gray+BW+360x360dpi - Reason: - Before the change BW+360x360dpi and Gray+BW+360x360dpi produced different outputs. - Now they are the same. - - bjc-PIXMA-iP4000: - BW+600x600dpi - Reason: - Before the change the driver has been using uninitialized memory in this mode. - -2006-08-26 - - Files: src/main/print-olympus.c (1.59.2.3) (+126 -135) - - change: - - a lot of stuff moved from olympus_do_print into sub routine - olumpus_print_row - - simplified out_channels -> ink_channels conversion and 16bit -> 8 bit - conversion - -2006-08-25 - - Files: src/testpattern/run-testpattern-2.in (1.1.4.1) (+29 -16) - - add -m switch to print md5sum - -2006-08-24 - - Files: src/main/print-olympus.c (1.59.2.2) (+1 -50) - - - clean up all remains of olympus_get_cached_output code - -2006-08-24 - - Files: src/main/print-olympus.c (1.59.2.1) (+76 -1) - - changes: - - olympus_read_image now read whole image at once - - olympus_get_cached_output is no more used - -2006-08-09 - - Files: src/main/print-canon.c (1.175.2.3) (+3 -3) - - rename papercount->count move media related structs to canon_media.h - -2006-08-07 - - Files: src/main/print-canon.c (1.175.2.2) (+2 -158) - - move ink defintions to canon-inks.h - 2006-08-07 Files: src/main/canon-inks.h (1.1) (added) file canon-inks.h was initially added on branch canon_experimental. -2006-08-07 - - Files: src/foomatic/foomatic-printermap (1.113.4.1) (+1 -1) - src/main/printers.xml (1.146.4.1) (+2 -2) - - rename iP4000 to PIXMA-iP4000 to avoid confusion with the japanese PIXUS models - 2006-08-07 Files: src/main/print-canon.c (1.176) (+1 -5) @@ -1199,6 +4061,9 @@ doc/Makefile.am: Install documentation correctly when building in a VPATH. +=============================================================================== +Name: gutenprint-5_0_0 + 2006-07-30 Files: po/cs.po (1.38) (+287 -285) @@ -1226,12 +4091,6 @@ file canon-printers.h was initially added on branch canon_experimental. -2006-07-23 - - Files: src/main/print-canon.c (1.175.2.1) (+2 -486) - - Move printer capabilities to canon-printers.h - 2006-07-22 Files: src/main/canon-media.h (1.1) (added) @@ -1732,6 +4591,9 @@ First draft of Gutenprint 5.0 README. +=============================================================================== +Name: gutenprint-5_0_0-rc3 + 2006-05-18 Files: po/cs.po (1.36) (+42 -27) @@ -2572,6 +5434,9 @@ Print the log for files on the mainline that have been removed. This retains history when files are moved around. +=============================================================================== +Name: gutenprint-5_0_0-rc2 + 2006-01-21 Files: po/cs.po (1.31) (+1271 -960) @@ -3179,12 +6044,6 @@ Remove comment about initialize_stp_options (4.2 holdover). -2005-10-01 - - Files: test/unprint.c (1.35.8.1) (+7 -2) - - Start work on the R2400 - 2005-10-01 Files: NEWS (1.241) (+7 -24) @@ -3905,14 +6764,6 @@ Improve black generation on Ultrachrome printers, and green on 2200. -2005-06-18 - - Files: src/main/print-escp2.c (1.335.2.2) (+2 -2) - - Add Stylus RX425. - - Clean up a few minor glitches. - 2005-06-15 Files: src/main/string-list.c (1.19) (+13 -5) @@ -3951,12 +6802,6 @@ Fix unnecessary warnings. -2005-06-13 - - Files: src/main/print-escp2.c (1.335.2.1) (+254 -9) - - Attempt to improve red and blue generation on the R800 - 2005-06-07 Files: src/main/escp2-channels.c (1.51) (+15 -4) @@ -4075,6 +6920,9 @@ Back out non-portable gid check. +=============================================================================== +Name: gutenprint-5_0_0_beta4 + 2005-04-29 Files: po/cs.po (1.26) (+327 -278) @@ -4809,6 +7657,9 @@ Add Epson Stylus Photo R1800 +=============================================================================== +Name: gutenprint-5_0_0-beta3 + 2005-02-13 Files: po/cs.po (1.24) (+341 -318) @@ -5583,6 +8434,9 @@ Remove unused code. +=============================================================================== +Name: gimp-print-5_0_0-beta2 + 2004-08-26 Files: po/cs.po (1.22) (+797 -648) @@ -6108,14 +8962,6 @@ Support for Olympus P-200 -2004-07-22 - - Files: src/main/print-escp2.c (1.322.2.1) (+3 -3) - src/main/print-olympus.c (1.50.2.1) (+3 -3) - src/main/print-pcl.c (1.134.2.1) (+3 -3) - - Intermediate state - 2004-07-09 Files: NEWS (1.175) (+4 -1) @@ -6193,6 +9039,9 @@ code clean up in color layer "management" +=============================================================================== +Name: gimp-print-5_0_0-beta1 + 2004-06-26 Files: po/cs.po (1.21) (+457 -337) @@ -6481,12 +9330,6 @@ file Makefile.am was initially added on branch gtk2-20040615-branch. -2004-06-15 - - Files: configure.ac (1.106.2.1) (+7 -3) - - Add initial GTK+ 2.0 work on a separate branch. - 2004-06-13 Files: src/libgimpprintui/plist.c (1.39) (+3 -3) @@ -6818,6 +9661,9 @@ Support piecewise curves +=============================================================================== +Name: gimp-print-5_0_0-alpha3 + 2004-05-13 Files: po/cs.po (1.20) (+628 -650) @@ -7407,6 +10253,9 @@ Document with Doxygen. +=============================================================================== +Name: gimp-print-5_0_0-alpha2 + 2004-04-11 Files: po/cs.po (1.19) (+991 -778) @@ -7843,14 +10692,6 @@ still running, but thus far nothing has shown up. However, further testing will still be required, particularly on the IJS driver. -2004-03-28 - - Files: src/cups/rastertoprinter.c (1.79.2.4) (+22 -6) - - Support color-only printers. - - Log page percentage correctly. - 2004-03-28 Files: configure.ac (1.96) (+10 -3) @@ -7862,33 +10703,6 @@ Add support for generating API documentation with doxygen. Document the sequence and array modules as examples. -2004-03-28 - - Files: src/cups/genppd.c (1.89.2.2) (+15 -5) - src/cups/rastertoprinter.c (1.79.2.3) (+14 -3) - - Add KCMY, inverted grayscale, and CMY color spaces. - - Improve wording in PPD files. - -2004-03-26 - - Files: src/cups/genppd.c (1.89.2.1) (+31 -16) - src/cups/rastertoprinter.c (1.79.2.2) (+29 -94) - - Intermediate state, lots of things compile, genppd works - -2004-03-24 - - Files: configure.ac (1.95.2.1) (+9 -20) - m4/stp_option.m4 (1.3.2.1) (+42 -0) - - Add autoconf macro to safely add compiler options to command line. - - Ensure that aclocal.m4 is correctly rebuilt by autogen.sh. - - Reviewed by Roger Leigh. - 2004-03-22 Files: src/main/print-escp2-data.c (1.154) (+66 -66) @@ -8042,19 +10856,6 @@ Put int and float values in the options list. -2004-03-11 - - Files: src/main/print-canon.c (1.140.2.5) (+4 -4) - - More intermediate state - -2004-03-09 - - Files: src/main/print-canon.c (1.140.2.4) (+7 -1) - src/main/print-escp2.c (1.308.2.4) (+36 -1) - - Make all of the core parameters be string choices - 2004-03-03 Files: NEWS (1.157) (+1 -0) @@ -8075,20 +10876,6 @@ Per Mike Sweet, logged page numbers should be 1-based rather than 0-based. -2004-03-01 - - Files: src/main/sequence.c (1.11.2.1) (+12 -7) - - Clean up some const noise - -2004-03-01 - - Files: src/main/print-canon.c (1.140.2.3) (+23 -9) - src/main/print-escp2.c (1.308.2.3) (+30 -10) - src/main/printers.c (1.61.2.2) (+54 -30) - - Intermediate state - 2004-02-28 Files: NEWS (1.156) (+5 -5) @@ -8202,22 +10989,6 @@ Increase size of band printed -2004-02-22 - - Files: src/main/print-canon.c (1.140.2.2) (+26 -30) - src/main/print-escp2.c (1.308.2.2) (+40 -33) - src/main/printers.c (1.61.2.1) (+16 -8) - - Intermediate state - -2004-02-16 - - Files: src/cups/rastertoprinter.c (1.79.2.1) (+10 -2) - src/main/print-canon.c (1.140.2.1) (+2 -4) - src/main/print-escp2.c (1.308.2.1) (+3 -3) - - Branch for new API for color conversion - 2004-02-16 Files: src/cups/Makefile.am (1.74) (+2 -2) @@ -8406,6 +11177,9 @@ Fix install error when using the provided install-sh. +=============================================================================== +Name: gimp-print-5_0_0-alpha1 + 2004-01-11 Files: po/cs.po (1.17) (+17 -17) @@ -8678,6 +11452,9 @@ 9) Build the test pattern generator when we build tests. +=============================================================================== +Name: gimp-print-4_3_25 + 2003-12-03 Files: po/cs.po (1.16) (+73 -69) @@ -8762,12 +11539,6 @@ The CX-6300 and 6400 appear to actually be based on the C84, not the C64. -2003-11-27 - - Files: src/main/print-escp2.c (1.305.2.1) (+56 -66) - - Eliminate the use of the term 'Microweave' - 2003-11-25 Files: src/main/print-color.c (1.105) (+137 -98) @@ -8876,6 +11647,9 @@ Do not use built-in paths if user has set path variables +=============================================================================== +Name: gimp-print-4_3_24 + 2003-11-22 Files: po/cs.po (1.14) (+772 -623) @@ -9255,6 +12029,9 @@ Use staggered weave correctly +=============================================================================== +Name: gimp-print-4_3_23 + 2003-11-05 Files: po/cs.po (1.13) (+64 -35) @@ -9329,6 +12106,9 @@ where the number of nozzles and the inter-nozzle spacing are both multiples of 3. +=============================================================================== +Name: gimp-print-4_3_22 + 2003-11-02 Files: po/cs.po (1.12) (+524 -482) @@ -10134,6 +12914,9 @@ Put 1440x720 ink tunings for 777/680 back the way they were. +=============================================================================== +Name: gimp-print-4_3_21 + 2003-09-24 Files: po/cs.po (1.11) (+244 -215) @@ -10508,6 +13291,9 @@ Ignore some more files +=============================================================================== +Name: gimp-print-4_3_20 + 2003-09-01 Files: po/cs.po (1.10) (+124 -119) @@ -10578,13 +13364,6 @@ Add Matte Paper Heavyweight. -2003-08-31 - - Files: src/main/print-canon.c (1.129.2.2) (+6 -14) - src/main/print-escp2.c (1.285.2.2) (+8 -23) - - Intermediate state - 2003-08-31 Files: src/main/escp2-inks.c (1.20) (+2 -2) @@ -10775,16 +13554,8 @@ code update -2003-08-18 - - Files: src/main/print-canon.c (1.129.2.1) (+10 -8) - src/main/print-escp2.c (1.285.2.1) (+16 -11) - src/main/print-olympus.c (1.7.2.1) (+17 -20) - src/main/print-pcl.c (1.118.2.1) (+8 -6) - src/main/printers.c (1.59.2.1) (+3 -9) - src/main/sequence.c (1.9.2.1) (+2 -2) - - Some new color stuff +=============================================================================== +Name: gimp-print-4_3_19 2003-08-08 @@ -11231,6 +14002,9 @@ Correct the use of an uninitialised variable. +=============================================================================== +Name: gimp-print-4_3_18 + 2003-07-07 Files: po/cs.po (1.8) (+117 -107) @@ -11340,6 +14114,9 @@ Eliminate apparently unportable construct. +=============================================================================== +Name: gimp-print-4_3_17 + 2003-06-21 Files: po/cs.po (1.7) (+464 -373) @@ -11471,18 +14248,6 @@ Use mxml rather than libxml for XML parsing -2003-06-19 - - Files: src/main/printers.c (1.55.2.2) (+6 -6) - - Everything now compiles - -2003-06-19 - - Files: configure.ac (1.68.2.1) (+2 -8) - - Eliminate the rest of libxml except for sequence.c so far - 2003-06-19 Files: src/main/mxml.h (1.1) (added) @@ -11513,13 +14278,6 @@ file mxml-attr.c was initially added on branch mxml-branch. -2003-06-19 - - Files: src/main/printers.c (1.55.2.1) (+69 -64) - src/main/sequence.c (1.7.2.1) (+19 -28) - - Use mxml rather than libxml2 for XML parser - 2003-06-17 Files: src/main/print-pcl.c (1.113) (+8 -8) @@ -11756,6 +14514,9 @@ Remove much of the now-redundant shade code from Eventone dither. +=============================================================================== +Name: gimp-print-4_3_16 + 2003-06-08 Files: po/cs.po (1.6) (+261 -243) @@ -12031,6 +14792,9 @@ Tune a number of photo printers +=============================================================================== +Name: gimp-print-4_3_15 + 2003-06-01 Files: po/cs.po (1.5) (+357 -311) @@ -12374,32 +15138,6 @@ Note order dependency on module loading for future fix. -2003-05-25 - - Files: src/main/print-canon.c (1.120.2.4) (+127 -13) - src/main/print-escp2.c (1.259.2.4) (+146 -38) - - A number of fixes - -2003-05-25 - - Files: src/main/print-canon.c (1.120.2.3) (+12 -12) - src/main/print-olympus.c (1.2.2.3) (+3 -3) - - Tested more things - -2003-05-24 - - Files: src/main/print-olympus.c (1.2.2.2) (+3 -3) - - Fix raw printing - -2003-05-23 - - Files: src/main/print-escp2.c (1.259.2.3) (+4 -2) - - Runs, but not really tested and has some valgrind issues - 2003-05-23 Files: po/cs.po (1.4) (+25 -66) @@ -12426,14 +15164,6 @@ A few minor fixes for the Olympus driver -2003-05-23 - - Files: configure.ac (1.62.2.1) (+7 -6) - src/main/print-olympus.c (1.2.2.1) (+14 -13) - src/main/printers.xml (1.71.4.1) (+7 -1) - - Merge changes in from mainline - 2003-05-22 Files: NEWS (1.103) (+4 -0) @@ -12445,25 +15175,12 @@ Merge with olympus driver -2003-05-22 - - Files: src/main/print-canon.c (1.120.2.2) (+22 -81) - src/main/print-escp2.c (1.259.2.2) (+3 -6) - - Compiles - 2003-05-21 Files: src/main/print-olympus.c (1.1) (added) file print-olympus.c was initially added on branch olympus-driver-branch. -2003-05-21 - - Files: src/main/print-olympus.c (1.1.2.1) (+546 -0) - - Initial version of olympus driver added - 2003-05-20 Files: Makefile.am (1.135) (+2 -2) @@ -12500,13 +15217,8 @@ Over-zealously changed HP LJII to a IIP. -2003-05-12 - - Files: src/main/print-canon.c (1.120.2.1) (+4 -9) - src/main/print-escp2.c (1.259.2.1) (+6 -10) - src/main/print-pcl.c (1.104.2.1) (+4 -9) - - Start work on new channel architecture +=============================================================================== +Name: gimp-print-4_3_14 2003-05-11 @@ -12808,58 +15520,12 @@ Minor formatting cleanup for the doc. -2003-05-04 - - Files: src/main/print-escp2.c (1.255.2.4) (+77 -54) - - Start testing this mess - -2003-05-04 - - Files: configure.ac (1.60.2.3) (+3 -3) - po/cs.po (1.1.4.1) (+3348 -0) - - Add Czech translation - 2003-05-04 Files: po/cs.po (1.1) (added) file cs.po was initially added on branch gimp-print-4_2_branch. -2003-05-03 - - Files: configure.ac (1.60.2.2) (+3 -3) - - Bump the version number - -2003-05-03 - - Files: src/main/print-escp2.c (1.255.2.3) (+463 -503) - - More cleanup work - -2003-05-01 - - Files: configure.ac (1.60.2.1) (+2 -3) - - Don't try to generate printdef Makefile - -2003-05-01 - - Files: src/main/print-escp2.c (1.255.2.2) (+276 -250) - - More code cleanup - -2003-04-28 - - Files: src/cups/genppd.c (1.66.2.1) (+11 -11) - src/main/print-escp2.c (1.255.2.1) (+356 -407) - src/main/printers.c (1.49.2.1) (+4 -4) - src/main/sequence.c (1.5.2.1) (+52 -44) - - Start another thorny phase of cleanup - 2003-04-28 Files: src/testpattern/run-testpattern (1.4) (+11 -8) @@ -12918,6 +15584,9 @@ Clean up weave API a bit +=============================================================================== +Name: gimp-print-4_3_13 + 2003-04-18 Files: po/da.po (1.30) (+2007 -722) @@ -13437,6 +16106,9 @@ Nicer names for the UI groups +=============================================================================== +Name: gimp-print-4_3_12 + 2003-03-29 Files: po/da.po (1.29) (+455 -370) @@ -13780,6 +16452,9 @@ Some UI cleanup +=============================================================================== +Name: gimp-print-4_3_11 + 2003-03-01 Files: po/da.po (1.28) (+272 -252) @@ -13954,6 +16629,9 @@ Don't actually omit the list of options for a mandatory parameter; simply return an empty list. +=============================================================================== +Name: gimp-print-4_3_10 + 2003-02-16 Files: po/da.po (1.27) (+122 -122) @@ -14019,6 +16697,9 @@ Bump version +=============================================================================== +Name: gimp-print-4_3_9 + 2003-02-15 Files: po/da.po (1.26) (+852 -990) @@ -14181,38 +16862,12 @@ Valgrind the code. -2003-02-09 - - Files: src/main/print-canon.c (1.107.2.2) (+5 -3) - src/main/print-escp2.c (1.229.2.3) (+5 -3) - - Able to enable and disable individual options - 2003-02-09 Files: src/libgimpprintui/printrc.h (1.1) (added) file printrc.h was initially added on branch ui-20030201-branch. -2003-02-09 - - Files: src/main/print-escp2.c (1.229.2.2) (+3 -3) - - UI stubs for optional parameters - -2003-02-08 - - Files: src/main/print-canon.c (1.107.2.1) (+4 -4) - src/main/print-escp2.c (1.229.2.1) (+24 -24) - src/main/print-pcl.c (1.89.2.1) (+3 -3) - src/main/printers.c (1.38.2.1) (+9 -5) - - Allow UI to turn options on and off. - - Fix a few bugs in the UI. - - Valgrind the UI. - 2003-02-08 Files: src/libgimpprintui/printrcy.y (1.1) (added) @@ -14410,13 +17065,6 @@ Copy updated config.sub and config.guess to the correct location -2003-01-24 - - Files: Makefile.am (1.120.2.2) (+2 -2) - - Compute libgimpprint major version correctly - Copy updated config.sub and config.guess to the correct location - 2003-01-23 Files: debian/rules (1.45) (+2 -2) @@ -14894,18 +17542,6 @@ (for shaping the GCR curve), and for individual CMYK densities. This should simplify gray tuning. -2003-01-18 - - Files: src/main/print-util.c (1.85.4.1) (+52 -1) - - New color code appears to work more or less correctly. - -2003-01-18 - - Files: src/main/print-canon.c (1.101.2.5) (+6 -1) - - Works at least for Epson driver - 2003-01-18 Files: src/main/print-dither.c (1.116) (+15 -3) @@ -14918,32 +17554,6 @@ Make compute_a_curve work for steps != 256. -2003-01-18 - - Files: src/main/print-canon.c (1.101.2.4) (+12 -12) - - Get past coredumps - -2003-01-18 - - Files: src/main/print-escp2.c (1.220.2.4) (+36 -24) - - Intermediate - -2003-01-18 - - Files: src/main/print-escp2.c (1.220.2.3) (+5 -5) - src/main/print-pcl.c (1.82.2.1) (+38 -49) - - Compiles now - -2003-01-18 - - Files: src/main/print-canon.c (1.101.2.3) (+29 -35) - src/main/print-escp2.c (1.220.2.2) (+18 -34) - - Compiles now - 2003-01-17 Files: test/pcl-unprint.c (1.7) (+62 -19) @@ -14951,25 +17561,12 @@ Added parsing of more parameters. Updated "PJL" parsing to handle (but not act on) HPGL commands. -2003-01-17 - - Files: src/main/print-canon.c (1.101.2.2) (+5 -8) - src/main/print-escp2.c (1.220.2.1) (+74 -75) - - More work - 2003-01-15 Files: src/foomatic/foomatic-printermap (1.47) (+68 -5) Added missing HP DeskJet and OfficeJet printers (DJ6xx, DJ8xx, and DJ9xx series). -2003-01-15 - - Files: src/main/print-canon.c (1.101.2.1) (+20 -26) - - Minor progress - 2003-01-14 Files: include/gimp-print/gimp-print.h (1.15) (+5 -6) @@ -14993,15 +17590,6 @@ Implemented new EvenTone raw CMYK (untested). -2003-01-13 - - Files: src/cups/rastertoprinter.c (1.41.2.1) (+4 -3) - src/main/print-canon.c (1.100.2.1) (+7 -9) - src/main/print-escp2.c (1.219.2.1) (+3 -5) - src/main/print-pcl.c (1.81.2.1) (+9 -12) - - Remove monochrome mode to simplify color modifications - 2003-01-12 Files: include/gimp-print/gimp-print.h (1.14) (+3 -2) @@ -15495,14 +18083,6 @@ Cleaned up the code somewhat. -2003-01-05 - - Files: src/main/print-canon.c (1.94.2.2) (+22 -20) - src/main/print-escp2.c (1.212.2.2) (+2 -2) - src/main/printers.c (1.17.2.2) (+1 -2) - - More code changes - 2003-01-05 Files: po/da.po (1.25) (+1246 -1094) @@ -15577,15 +18157,6 @@ Link instead_of_main.o with everything except print.o, libgimp.so and libgimpui.so to create gimpprint-panel executable. dpace Jan 4, 2003. -2003-01-04 - - Files: src/main/print-canon.c (1.94.2.1) (+64 -2) - src/main/print-escp2.c (1.212.2.1) (+126 -10) - src/main/print-pcl.c (1.76.2.1) (+64 -2) - src/main/printers.c (1.17.2.1) (+9 -1) - - Work in progress - 2003-01-03 Files: src/escputil/escputil.c (1.49) (+26 -26) @@ -16158,6 +18729,9 @@ on the backchannel. Correct ink level calculation. +=============================================================================== +Name: gimp-print-4_3_6 + 2002-12-22 Files: po/da.po (1.24) (+1004 -1415) @@ -16221,14 +18795,6 @@ Use curves for HSL mapping -2002-12-21 - - Files: src/main/print-canon.c (1.84.2.1) (+67 -262) - src/main/print-escp2.c (1.197.2.1) (+22 -48) - src/main/print-pcl.c (1.67.2.1) (+38 -162) - - Use curves for HSL transformations - 2002-12-18 Files: src/foomatic/foomatic-generator.in (1.28) (+6 -3) @@ -17006,44 +19572,12 @@ Fix list function prototypes and header name -2002-11-17 - - Files: po/da.po (1.23.4.1) (+923 -1331) - po/de.po (1.8.4.1) (+942 -1165) - po/el.po (1.10.4.1) (+1077 -1362) - po/en_GB.po (1.90.4.1) (+969 -1125) - po/es.po (1.8.4.1) (+988 -1144) - po/fr.po (1.30.4.1) (+968 -1125) - po/ja.po (1.3.4.1) (+967 -1124) - po/nl.po (1.10.4.1) (+937 -1118) - po/pl.po (1.14.4.1) (+994 -1333) - po/pt.po (1.8.4.1) (+984 -1128) - po/sk.po (1.13.4.1) (+968 -1126) - po/sv.po (1.39.4.1) (+968 -1130) - src/main/printers.xml (1.56.4.1) (+9 -9) - - Bring over some mimnor changes from the mainline - 2002-11-16 Files: src/main/string-list.c (1.1) (added) file string-list.c was initially added on branch parameter-reorg-20021109-branch. -2002-11-16 - - Files: src/main/print-canon.c (1.83.2.3) (+2 -10) - - Cleanup - -2002-11-16 - - Files: src/cups/rastertoprinter.c (1.29.2.1) (+71 -123) - src/main/print-canon.c (1.83.2.2) (+51 -132) - src/main/print-escp2.c (1.193.2.3) (+100 -158) - - Revamp the API again, everything compiles, at least some things work - 2002-11-16 Files: src/cups/gimp-print-cups.h (1.1) (added) @@ -17056,12 +19590,6 @@ file gimp-print-cups.c was initially added on branch parameter-reorg-20021109-branch. -2002-11-16 - - Files: src/cups/genppd.c (1.49.2.2) (+50 -138) - - Revamp the API again, everything compiles, at least some things work - 2002-11-16 Files: src/main/print-pcl.c (1.62) (+7 -1) @@ -17076,12 +19604,6 @@ Document the new stp_list_t list type -2002-11-15 - - Files: src/main/print-escp2.c (1.193.2.2) (+2 -1) - - Basic operation of the print plugin - 2002-11-14 Files: src/foomatic/foomatic-templates-ijs/Brightness.xml (1.3) (+2 -2) @@ -17106,22 +19628,6 @@ Add SEE ALSO references to the libgimpprint man pages -2002-11-10 - - Files: src/cups/genppd.c (1.49.2.1) (+3 -4) - src/main/print-canon.c (1.83.2.1) (+112 -98) - src/main/print-escp2.c (1.193.2.1) (+135 -113) - src/main/print-pcl.c (1.61.2.1) (+74 -79) - src/main/printers.c (1.7.2.2) (+111 -79) - - The core library now compiles - -2002-11-10 - - Files: src/main/printers.c (1.7.2.1) (+31 -95) - - Starting work on second phase of parameter reorganization - 2002-11-09 Files: man/gimpprint-imagetypes.7.in (1.2) (+2 -2) @@ -17280,12 +19786,6 @@ file DitherAlgorithm.xml was initially added on branch parameter-reorg-20021102-branch. -2002-11-03 - - Files: src/main/print-util.c (1.75.4.1) (+8 -1) - - Test patternn generator now works - 2002-11-02 Files: src/gimp/gimp_main_window.c (1.80) (+3 -7) @@ -17423,12 +19923,6 @@ Tighten up some static declarations -2002-11-02 - - Files: src/main/print-canon.c (1.71.2.5) (+12 -12) - - 631498 Canon driver does not support A3 page size for large format - 2002-11-02 Files: src/main/print-canon.c (1.81) (+4 -4) @@ -17755,55 +20249,12 @@ Remove Ghostscript stp driver. -2002-10-26 - - Files: src/main/print-canon.c (1.77.2.5) (+4 -4) - - Fix some top/bottom confusion - -2002-10-24 - - Files: src/cups/genppd.c (1.43.2.1) (+5 -5) - src/cups/rastertoprinter.c (1.25.2.3) (+4 -4) - src/main/print-canon.c (1.77.2.4) (+3 -1) - src/main/print-escp2.c (1.188.2.4) (+3 -1) - - Fix up a lot of the width vs. height stuff - -2002-10-24 - - Files: configure.ac (1.27.2.1) (+11 -20) - src/cups/rastertoprinter.c (1.25.2.2) (+2 -3) - - Remove the old-style Ghostscript stp driver - -2002-10-22 - - Files: src/cups/rastertoprinter.c (1.25.2.1) (+4 -57) - src/main/print-canon.c (1.77.2.3) (+12 -4) - src/main/print-escp2.c (1.188.2.3) (+7 -13) - - Clean up the API, still need to fix the GIMP plugin - 2002-10-21 Files: src/main/vars.h (1.1) (added) file vars.h was initially added on branch reorg-20021020-branch. -2002-10-21 - - Files: src/main/print-canon.c (1.77.2.2) (+3 -3) - src/main/print-escp2.c (1.188.2.2) (+3 -3) - - A bit more cleanup - -2002-10-21 - - Files: src/main/printers.c (1.1.2.2) (+9 -67) - - More reorganization/cleanup - 2002-10-21 Files: src/main/printers.c (1.1) (added) @@ -17828,15 +20279,6 @@ file print-papers.c was initially added on branch reorg-20021020-branch. -2002-10-21 - - Files: src/main/print-canon.c (1.77.2.1) (+17 -39) - src/main/print-escp2.c (1.188.2.1) (+81 -68) - src/main/print-pcl.c (1.56.2.1) (+7 -28) - src/main/printers.c (1.1.2.1) (+142 -0) - - Start working on some reorganization - 2002-10-19 Files: src/foomatic/foomatic-templates-gs/gimp-print.xml (1.3) (+1 -1) @@ -17910,12 +20352,6 @@ Add Japanese translation -2002-10-13 - - Files: src/cups/genppd.c (1.36.2.5) (+28 -50) - - Mirror development branch changes by Robert in 4.2 branch. - 2002-10-13 Files: src/cups/genppd.c (1.43) (+28 -50) @@ -17929,13 +20365,6 @@ Mirror 4.2.x changes, although I am unable to test them do to configure script problems... -2002-10-13 - - Files: src/cups/genppd.c (1.36.2.4) (+62 -5) - - Preliminary fix for custom page size support - we still need to add an - API for getting the margins and limits of custom sizes. - 2002-10-12 Files: src/main/print-escp2-data.c (1.64) (+51 -3) @@ -18068,6 +20497,9 @@ Remove MJ-520C +=============================================================================== +Name: gimp-print-4_3_5 + 2002-10-03 Files: po/da.po (1.21) (+321 -296) @@ -18422,6 +20854,9 @@ Added "-f" option to calls of "foomatic-kitload" so that old Foomatic data is overwritten wheninstalling the new one. +=============================================================================== +Name: gimp-print-4_3_4 + 2002-08-21 Files: po/da.po (1.20) (+659 -193) @@ -18492,14 +20927,6 @@ Allow specification of individual physical input channels -2002-08-20 - - Files: src/main/print-escp2.c (1.180.2.4) (+23 -10) - - Coalesce some printers that are duplicates. - - Support fast 360 DPI mode on 7-color Epson printers. - 2002-08-13 Files: src/main/print-lexmark.c (1.75) (+4 -6) @@ -18549,52 +20976,18 @@ Make libgimpprint-doc a virtual package Generate libgimpprint-doc.doc-base to cope with package naming changes -2002-07-31 - - Files: configure.ac (1.17.2.4) (+21 -9) - - Still check for doc tools even if we're not in maintainer mode; just - don't warn if we don't find them. - 2002-07-26 Files: src/main/print-escp2-data.c (1.51) (+18 -7) Fixes for STP 2100/2200 -2002-07-23 - - Files: configure.ac (1.17.2.3) (+31 -29) - - Don't check for the doc tools if maintainer mode isn't turned on. - 2002-07-22 Files: po/en_GB.po (1.86) (+50 -53) Update en_GB translation (all fuzzy and unstranslated strings) -2002-07-22 - - Files: src/testpattern/testpattern.c (1.6.8.1) (+64 -41) - test/unprint.c (1.22.8.1) (+16 -5) - - Merge mainline into 4.2 branch - -2002-07-22 - - Files: src/main/print-escp2.c (1.180.2.3) (+27 -16) - - Support raw printing in color depths of 1, 2, 4, 6, and 7. The - color depth of 2 is used on 7 color printers to print using the - two blacks. - - In the Epson driver, don't show the pseudo-inksets that are used for - the raw printing, as these are of no use in normal printing. Instead, - convert whatever inkset is specified to the appropriate pseudo-inkset - when raw printing is detected. This is a much cleaner (and more - transparent) interface. - 2002-07-21 Files: src/main/print-color.c (1.28) (+3 -2) @@ -18607,18 +21000,6 @@ file extended.sample was initially added on branch generic_color_branch. -2002-07-21 - - Files: src/main/print-escp2.c (1.180.2.2) (+56 -12) - - Make raw mode work! - -2002-07-21 - - Files: configure.ac (1.17.2.2) (+3 -3) - - Don't use -ansi; it causes problems with getopt. - 2002-07-21 Files: man/escputil.1.in (1.6) (+1 -2) @@ -18632,15 +21013,6 @@ Updates from Thorsten. -2002-07-21 - - Files: configure.ac (1.17.2.1) (+3 -3) - src/main/print-canon.c (1.75.2.1) (+5 -3) - src/main/print-escp2.c (1.180.2.1) (+10 -6) - src/main/print-pcl.c (1.54.2.1) (+5 -3) - - Start working on n-color support - 2002-07-21 Files: src/main/print-escp2.c (1.180) (+17 -18) @@ -18746,6 +21118,9 @@ Bump the version +=============================================================================== +Name: gimp-print-4_3_3 + 2002-07-14 Files: NEWS (1.73) (+24 -1) @@ -18928,6 +21303,9 @@ Add quadtone support. +=============================================================================== +Name: gimp-print-4_3_2 + 2002-06-29 Files: po/da.po (1.18) (+179 -222) @@ -18967,6 +21345,9 @@ Fixed Eventone's handling of raw CMYK channels. +=============================================================================== +Name: gimp-print-4_3_1 + 2002-06-28 Files: NEWS (1.71) (+92 -45) @@ -19182,24 +21563,6 @@ Small GPL amendments (year 2000 date fixes) -2002-06-06 - - Files: po/es.po (1.1.4.2) (+19 -14) - - Merge with 4.2.2-pre2. - -2002-06-05 - - Files: src/main/print-canon.c (1.71.2.4) (+4 -6) - - Put _DEPENDENCIES back in Makefile.am; automake doesn't figure them out. - - Fix vasprintf (565092) - - Minor cleanup nit in print-canon.c - - Prepare for 4.2.2-pre2. - 2002-06-05 Files: src/testpattern/testpattern.c (1.7) (+64 -41) @@ -19267,15 +21630,6 @@ Fix off-by-one error in VASPRINTF -2002-05-25 - - Files: po/es.po (1.1.4.1) (+857 -647) - src/cups/rastertoprinter.c (1.8.2.5) (+8 -3) - src/main/print-escp2-data.c (1.15.6.1) (+1 -1) - src/main/print-escp2.h (1.7.6.1) (+1 -1) - - Sync debian-branch with 4.2.2-pre1. - 2002-05-19 Files: src/cups/Makefile.am (1.52) (+2 -2) @@ -19288,26 +21642,12 @@ Change non-square error-diffusion for eventone dither. -2002-05-18 - - Files: src/main/print-canon.c (1.71.2.3) (+2 -2) - - media_sources should be const - 2002-05-18 Files: src/main/print-util.c (1.65) (+32 -100) Minor typo -2002-05-18 - - Files: Makefile.am (1.120.2.1) (+3 -2) - - Update packaging to debhelper v4 - Versioned library development and documentation packages - Update package descriptions - 2002-05-18 Files: Makefile.am (1.129) (+3 -2) @@ -19422,13 +21762,6 @@ Move config.h back to the root; it fixes a gettext bug -2002-05-03 - - Files: src/main/print-canon.c (1.71.2.2) (+56 -62) - - Merge libgimpprint from the mainline to bring in Even Tone dither - and better channel architecture. - 2002-05-02 Files: debian/changelog (1.45) (+6 -0) @@ -19471,6 +21804,9 @@ Spanish translation +=============================================================================== +Name: gimp-print-4_3_0 + 2002-04-28 Files: po/da.po (1.17) (+1269 -624) @@ -19521,12 +21857,6 @@ Prep for 4.3.0 -2002-04-27 - - Files: src/cups/genppd.c (1.36.2.3) (+29 -48) - - BSD portability issue. - 2002-04-26 Files: src/main/print-dither.c (1.83) (+4 -3) @@ -19590,7 +21920,6 @@ 2002-04-14 Files: lib/vasprintf.c (1.4) (+4 -4) - src/cups/genppd.c (1.36.2.2) (+4 -2) src/cups/genppd.c (1.38) (+4 -2) src/main/print-util.c (1.59) (+8 -17) @@ -19726,12 +22055,6 @@ 540307 Syntax error in CloseUI in PPD files -2002-04-06 - - Files: src/cups/genppd.c (1.36.2.1) (+3 -3) - - 540307 Syntax error in CloseUI in PPD files - 2002-04-06 Files: src/foomatic/Makefile.am (1.22) (+6 -6) @@ -20343,12 +22666,6 @@ Roll feed on Stylus Pro printers does not allow borderless printing -2002-03-17 - - Files: src/main/print-escp2.c (1.147.2.4) (+16 -10) - - Improve pigment Stylus Pro print quality - 2002-03-17 Files: src/main/printers.xml (1.44) (+4 -1) @@ -20474,12 +22791,6 @@ Fix gs dependency Fix cupsys-driver-gimpprint to reload cupsys on configure/removal -2002-03-02 - - Files: src/main/print-canon.c (1.71.2.1) (+33 -9) - - Latest updates from Peter Missel, should fix a lot of the Canon problems - 2002-03-02 Files: src/main/print-canon.c (1.75) (+33 -9) @@ -20786,12 +23097,6 @@ Suggestions from Till -2002-01-30 - - Files: src/main/print-escp2.c (1.147.2.3) (+8 -8) - - Allow smaller paper sizes on Stylus Pro printers - 2002-01-30 Files: scripts/mkchlog (1.5) (+2 -1) @@ -20885,12 +23190,6 @@ Set the left and orientation correctly. -2002-01-23 - - Files: src/main/print-escp2.c (1.147.2.2) (+6 -6) - - Fix margins per manuals for old printers - 2002-01-23 Files: src/main/print-escp2-data.c (1.8) (+6 -6) @@ -21006,13 +23305,6 @@ 499200 ESP 1280/1290 need special deinit code 499203 ESP 780/820 have different paper codes -2002-01-04 - - Files: src/main/print-escp2.c (1.147.2.1) (+173 -58) - - 499203 ESP 780/820 have different paper codes - 499200 ESP 1280/1290 need special deinit code - 2002-01-03 Files: src/main/print-dither.c (1.53) (+304 -2) @@ -21435,6 +23727,10 @@ Kick off 4.3 development +=============================================================================== +Name: gimp-print-4_2_bp +Name: gimp-print-4_2_0 + 2001-11-24 Files: po/da.po (1.14) (+1 -1) @@ -21577,12 +23873,6 @@ Rebuild Foomatic database if the printermap changes. Reviewed by Till. -2001-11-18 - - Files: src/main/printers.xml (1.9.4.8) (+18 -4) - - Update debian branch to RC1 and prep for Debian upload. - 2001-11-18 Files: src/foomatic/foomatic-printermap (1.22) (+1 -1) @@ -21673,6 +23963,9 @@ Update Debian packaging to use the latest configure options +=============================================================================== +Name: gimp-print-4_1_99-rc1 + 2001-11-12 Files: po/da.po (1.12) (+94 -94) @@ -22171,12 +24464,6 @@ Added so that the date would actually appear in ps and pdf output. -2001-10-27 - - Files: src/main/printers.xml (1.9.4.7) (+95 -4) - - Sync debian branch with b4. - 2001-10-27 Files: src/main/print-escp2.c (1.139) (+2 -2) @@ -22250,6 +24537,9 @@ Improve 720 DPI quality on C80. +=============================================================================== +Name: gimp-print-4_1_99-b4 + 2001-10-26 Files: po/da.po (1.4) (+113 -113) @@ -22562,12 +24852,6 @@ file print-escp2-data.c was initially added on branch split-escp2-branch. -2001-10-17 - - Files: src/main/print-escp2.c (1.129.2.1) (+35 -2824) - - Split print-escp2.c into two. - 2001-10-17 Files: po/en_GB.po (1.61) (+876 -3) @@ -22868,6 +25152,9 @@ sets the print quality to 0-Normal. That should do as a quick fix for the upcoming release." +=============================================================================== +Name: gimp-print-4_1_99-b3 + 2001-10-07 Files: po/en_GB.po (1.56) (+1 -1) @@ -23417,6 +25704,9 @@ Empty strings should not be marked for translation. +=============================================================================== +Name: gimp-print-4_1_99-b2 + 2001-09-21 Files: po/en_GB.po (1.50) (+80 -80) @@ -23682,15 +25972,6 @@ Some reorg of Epson densities/drop sizes (mostly to make it easier to read) -2001-09-14 - - Files: src/cups/genppd.c (1.7.2.5) (+165 -272) - src/cups/rastertoprinter.c (1.8.2.4) (+20 -48) - src/main/printers.xml (1.9.4.6) (+33 -5) - - Merge in main trunk changes to bring the debian branch up to the beta1 - release. - 2001-09-11 Files: src/ghost/README (1.30) (+3 -4) @@ -23929,6 +26210,9 @@ Reduce flashing a bit more in the GUI. +=============================================================================== +Name: gimp-print-4_1_99-b1 + 2001-09-03 Files: po/en_GB.po (1.44) (+1 -1) @@ -24357,6 +26641,9 @@ Printer list name needs to match text for gimp_plist_callback to work correctly. +=============================================================================== +Name: gimp-print-4_1_99-a3 + 2001-08-14 Files: src/cups/Makefile.am (1.31) (+4 -3) @@ -24925,14 +27212,6 @@ Stylus Photo 1270 (and very likely every printer using the 1999 command set) can print more than 44" long. -2001-07-23 - - Files: src/cups/genppd.c (1.7.2.4) (+398 -181) - src/cups/rastertoprinter.c (1.8.2.3) (+227 -47) - src/main/printers.xml (1.9.4.5) (+56 -2) - - Merge in alpha 2 from the mainline. - 2001-07-22 Files: test/.cvsignore (1.3) (+1 -0) @@ -24976,6 +27255,9 @@ No longer supports 180x120. +=============================================================================== +Name: gimp-print-4_1_99-a2 + 2001-07-21 Files: po/en_GB.po (1.32) (+1 -1) @@ -25366,12 +27648,6 @@ made the source code being read), and second, the way how the lines were evaluated didn't support option names with spaces. -2001-07-10 - - Files: src/main/printers.xml (1.9.4.4) (+3 -3) - - Merging 4.1.99-a1 into the debian branch. - 2001-07-10 Files: NEWS (1.29) (+27 -2) @@ -25454,6 +27730,9 @@ New density for the BJC7000 in 300x300 (as suggested by Bodo Huckestein) +=============================================================================== +Name: gimp-print-4_1_99-a1 + 2001-07-06 Files: NEWS (1.28) (+43 -1) @@ -25658,16 +27937,6 @@ No need for unistd.h here. -2001-06-30 - - Files: po/en_GB.po (1.3.4.4) (+546 -378) - src/cups/genppd.c (1.7.2.3) (+84 -97) - src/main/print-escp2.c (1.24.2.4) (+803 -337) - src/main/print-util.c (1.8.4.4) (+189 -74) - src/main/printers.xml (1.9.4.3) (+50 -0) - - Merge in 4.1.10 for the 4.1.10-1 debian release. - 2001-06-24 Files: src/cups/Makefile.am (1.26) (+2 -8) @@ -25863,6 +28132,9 @@ Update debian package version +=============================================================================== +Name: gimp-print-4_1_10 + 2001-06-09 Files: NEWS (1.27) (+5 -2) @@ -25881,6 +28153,9 @@ Fix more sizing bugs in the weave code. +=============================================================================== +Name: gimp-print-4_1_9 + 2001-06-09 Files: NEWS (1.26) (+17 -1) @@ -25896,6 +28171,9 @@ Prep for 4.1.9 emergency release. +=============================================================================== +Name: gimp-print-4_1_8 + 2001-06-08 Files: po/en_GB.po (1.24) (+4 -4) @@ -26262,20 +28540,6 @@ file print-dither-matrices.c was initially added on branch stylus-pro-branch. -2001-05-28 - - Files: src/main/print-canon.c (1.43.2.2) (+7 -1) - src/main/print-pcl.c (1.28.2.1) (+7 -1) - - Verify in the drivers that the parameters have been checked prior to - attempting to print. - -2001-05-27 - - Files: src/main/print-canon.c (1.43.2.1) (+2 -2) - - Use stp_free rather than free everywhere. - 2001-05-27 Files: Makefile.am (1.98) (+5 -1) @@ -26286,41 +28550,6 @@ Automatically generate debian/changelog during 'make dist' -2001-05-27 - - Files: src/cups/genppd.c (1.14.2.1) (+83 -94) - - Much better support for roll-feed paper. - - The Gimp plugin now grays out page width & height boxes when they - can't be modified. - -2001-05-26 - - Files: src/main/print-escp2.c (1.68.2.4) (+23 -1) - - Add additional microweave modes. - - Add ID string to printers.xml. - -2001-05-25 - - Files: src/main/print-escp2.c (1.68.2.3) (+2 -2) - - Set the dot sizes correctly (per the manual) on Stylus Pro printers. - -2001-05-25 - - Files: src/main/print-escp2.c (1.68.2.2) (+13 -7) - - Some fixes - -2001-05-25 - - Files: src/main/print-escp2.c (1.68.2.1) (+165 -58) - - Stylus Pro mods - 2001-05-22 Files: src/main/print-canon.c (1.43) (+19 -31) @@ -26533,16 +28762,6 @@ Add html generation from Texinfo source Unify dist-hook in all directories -2001-05-09 - - Files: po/en_GB.po (1.3.4.3) (+381 -443) - src/cups/genppd.c (1.7.2.2) (+49 -16) - src/cups/rastertoprinter.c (1.8.2.2) (+29 -2) - src/main/print-escp2.c (1.24.2.3) (+667 -660) - src/main/print-util.c (1.8.4.3) (+207 -7) - - Merge 4.1.7, prepare for 4.1.7-1 debs. - 2001-05-09 Files: debian/control.in (1.4) (+1 -1) @@ -26567,6 +28786,9 @@ Remove redundant file +=============================================================================== +Name: gimp-print-4_1_7 + 2001-05-06 Files: configure.in.in (1.37) (+7 -7) @@ -26750,15 +28972,6 @@ Changed PCL_STP_PRINTER_TIFF back to PCL_PRINTER_TIFF (over zealous search and destroy!). -2001-04-30 - - Files: po/en_GB.po (1.3.4.2) (+287 -262) - src/main/print-escp2.c (1.24.2.2) (+508 -492) - src/main/print-util.c (1.8.4.2) (+191 -157) - src/main/printers.xml (1.9.4.2) (+0 -10) - - Finally get around to syncing debian-branch with 4.1.6. - 2001-04-29 Files: src/main/print-dither.c (1.26) (+15 -26) @@ -26921,6 +29134,9 @@ Document a few more remote mode commands +=============================================================================== +Name: gimp-print-4_1_6 + 2001-04-15 Files: src/main/print-ps.c (1.11) (+5 -1) @@ -27212,21 +29428,6 @@ CMYK computation (black generation) out of the dither code, and neither does it allow raw CMYK input. -2001-03-31 - - Files: src/main/print-canon.c (1.29.2.2) (+6 -5) - src/main/print-escp2.c (1.42.2.2) (+6 -5) - - Intermediate step - -2001-03-31 - - Files: src/main/print-canon.c (1.29.2.1) (+2 -1) - src/main/print-escp2.c (1.42.2.1) (+2 -1) - src/main/print-pcl.c (1.16.2.1) (+2 -1) - - Let's try again with CMY(K)... - 2001-03-26 Files: src/main/gimp-print-internal.h (1.24) (+14 -4) @@ -27299,18 +29500,6 @@ Start adding foomatic back in. -2001-03-24 - - Files: src/main/print-canon.c (1.18.2.2) (+549 -78) - - Merge up from mainline - -2001-03-24 - - Files: src/main/print-escp2.c (1.37.2.4) (+2 -2) - - Intermediate state - 2001-03-24 Files: src/ghost/README (1.11) (+6 -2) @@ -27465,15 +29654,6 @@ Switch the color mode to monochrome when printing to a black & white printer. -2001-03-10 - - Files: Makefile.am (1.91.2.1) (+23 -10) - src/main/print-canon.c (1.18.2.1) (+348 -288) - src/main/print-escp2.c (1.37.2.3) (+13 -13) - src/main/print-pcl.c (1.13.2.1) (+17 -17) - - Intermediate merge up with mainline - 2001-03-09 Files: acconfig.h (1.10) (+2 -1) @@ -27532,18 +29712,6 @@ Added feature "CANON_CAP_ACKSHORT" BJC8200: Uses new feature, try to use 3 bit for drop sizes instead of 2 -2001-03-06 - - Files: src/main/print-escp2.c (1.37.2.2) (+107 -107) - - More intermediate work on cmyk-ification. - -2001-03-05 - - Files: src/main/print-escp2.c (1.37.2.1) (+240 -241) - - Ongoing work on CMYK - 2001-03-05 Files: debian/control (1.10) (removed) @@ -27562,17 +29730,6 @@ Removed dead code ("empty" variable). -2001-03-05 - - Files: po/en_GB.po (1.3.4.1) (+274 -256) - src/cups/genppd.c (1.7.2.1) (+48 -37) - src/cups/rastertoprinter.c (1.8.2.1) (+50 -47) - src/main/print-escp2.c (1.24.2.1) (+548 -577) - src/main/print-util.c (1.8.4.1) (+456 -112) - src/main/printers.xml (1.9.4.1) (+1 -1) - - Update the debian branch to the 4.1.5 release. - 2001-03-05 Files: src/main/print-canon.c (1.18) (+5 -4) @@ -27617,6 +29774,9 @@ Reorganize how the dot sizes and densities are listed to make it easier to change things for multiple printers. +=============================================================================== +Name: gimp-print-4_1_5 + 2001-03-04 Files: NEWS (1.14) (+18 -13) @@ -27987,12 +30147,8 @@ Fix the page dimensions of some older Epson printers. -2001-02-23 - - Files: src/cups/rastertoprinter.c (1.9.2.5) (+4 -4) - src/main/print-canon.c (1.10.2.4) (+2 -1) - - Make verify function be printer-specific. +=============================================================================== +Name: gimp-print-4_1_4b 2001-02-22 @@ -28032,18 +30188,6 @@ Remove Debian specific files from the main trunk. -2001-02-22 - - Files: src/main/print-escp2.c (1.25.2.4) (+2 -2) - - Some tuning for Epson matte paper - -2001-02-21 - - Files: src/cups/rastertoprinter.c (1.9.2.4) (+3 -3) - - Fix up the new version of the Gimp plugin; clean up a few other things. - 2001-02-21 Files: Makefile.am (1.90) (+15 -2) @@ -28061,23 +30205,6 @@ Ignore a few new generated files. -2001-02-21 - - Files: src/cups/rastertoprinter.c (1.9.2.3) (+4 -4) - src/main/print-canon.c (1.10.2.3) (+16 -14) - src/main/print-escp2.c (1.25.2.3) (+10 -9) - - Clean up paper sizes in the same way. - -2001-02-21 - - Files: src/cups/genppd.c (1.8.2.2) (+35 -32) - src/cups/rastertoprinter.c (1.9.2.2) (+7 -7) - src/main/print-canon.c (1.10.2.2) (+12 -12) - src/main/print-escp2.c (1.25.2.2) (+48 -39) - - Hide stp_printer_t in the same way we hid stp_vars_t. - 2001-02-21 Files: debian/changelog (1.7) (+6 -0) @@ -28088,25 +30215,6 @@ Bump debian version Make scripts/autogen.sh aclocal magic portable -2001-02-20 - - Files: src/cups/genppd.c (1.8.2.1) (+23 -19) - src/cups/rastertoprinter.c (1.9.2.1) (+43 -44) - - Bump binary version info. - - Fix a few bugs. - - Convert CUPS programs, run genppd to smoke test. - -2001-02-20 - - Files: src/main/print-canon.c (1.10.2.1) (+54 -52) - src/main/print-escp2.c (1.25.2.1) (+132 -133) - src/main/print-pcl.c (1.8.2.1) (+45 -44) - - New print variable setup, on temporary branch - 2001-02-19 Files: configure.in.in (1.21) (+1 -4) @@ -28168,6 +30276,9 @@ Newest Stylus Photo printers can print to the edge on all sides. +=============================================================================== +Name: gimp-print-4_1_4 + 2001-02-19 Files: gimp.m4 (1.3) (+0 -0) @@ -28959,6 +31070,9 @@ Bump version. +=============================================================================== +Name: print-4_1_3 + 2001-01-30 Files: NEWS (1.5) (+2 -0) @@ -29624,6 +31738,9 @@ Remove obsolete files that will not work any longer +=============================================================================== +Name: print-4_1_2 + 2001-01-21 Files: ChangeLog (1.73) (+57 -0) @@ -30148,6 +32265,9 @@ Some tuning based on Gareth Watts's results. +=============================================================================== +Name: print-4_1_0 + 2000-12-18 Files: ChangeLog (1.65) (+57 -0) @@ -30697,17 +32817,11 @@ Copy escputil man page to Ghost directory -2000-10-31 - - Files: Makefile.am (1.70.2.2) (+5 -1) - configure.in (1.38) (+7 -1) - - escputil man page - 2000-10-31 Files: .cvsignore (1.10) (+1 -0) Makefile.am (1.72) (+3 -0) + configure.in (1.38) (+7 -1) escputil man page @@ -30734,15 +32848,6 @@ Bring over a few fixes from 4.0+ -2000-10-29 - - Files: Makefile.am (1.70.2.1) (+1 -1) - - 119667 INSTALL file is out of date - 119668 escputil will not compile on non-GNU system - 119669 escputil in Ghostscript in 4.0.0 is obsolete. - Bump version. - 2000-10-23 Files: print-pcl.c (1.89) (+45 -6) @@ -30803,6 +32908,11 @@ Tommy Schultz Lassen's CRET patch; initialize 4.1 branch +=============================================================================== +Name: print-4_0_0_rc1-gimpcvs +Name: print-4_0_bp +Name: print-4_0_0rc1 + 2000-10-20 Files: ChangeLog (1.56) (+9 -0) @@ -30914,6 +33024,9 @@ 116846 scaling doesn't reload properly in PPI mode 116851 escputil has unnecessary GNU library dependency +=============================================================================== +Name: print-4_0_b3 + 2000-10-13 Files: ChangeLog (1.54) (+6 -0) @@ -31024,6 +33137,9 @@ 116211 Ghostscript driver does not pass printer variables through. 116213 Ghostscript makefile fragments missing dependency. +=============================================================================== +Name: print-4_0_b2 + 2000-10-05 Files: ChangeLog (1.51) (+29 -0) @@ -31042,6 +33158,9 @@ Updates +=============================================================================== +Name: print-4_0_b1-gimpcvs + 2000-10-04 Files: ChangeLog (1.50) (+70 -0) @@ -31298,6 +33417,9 @@ Merged change from Robert. +=============================================================================== +Name: print-4_0_b1 + 2000-09-20 Files: ChangeLog (1.45) (+19 -0) @@ -32798,6 +34920,9 @@ Instructions for adding/tuning printers. +=============================================================================== +Name: print-4_0_a2 + 2000-08-15 Files: ChangeLog (1.31) (+17 -0) @@ -32821,6 +34946,9 @@ Prep for 4.0a2 +=============================================================================== +Name: print-4_0a1-gimpcvs + 2000-08-15 Files: gimp_main_window.c (1.38) (+19 -18) @@ -32966,6 +35094,9 @@ It is necessary to recompute the image height and width after compute_page_parameters; these will change if the image is rotated. +=============================================================================== +Name: print-4_0a1 + 2000-08-09 Files: ChangeLog (1.29) (+18 -0) @@ -33138,12 +35269,6 @@ Attempt to function on systems without GNU getopt. -2000-08-03 - - Files: Makefile.am (1.44.2.1) (+1 -1) - - Make stp driver work for all supported printers, not just Epson - 2000-08-02 Files: pcl-unprint.c (1.15) (+14 -7) @@ -33391,6 +35516,9 @@ Fine tuning for 4-color variable printers +=============================================================================== +Name: print-3_1_9 + 2000-07-18 Files: ChangeLog (1.25) (+18 -0) @@ -33498,6 +35626,9 @@ (slightly) More info on remote mode. +=============================================================================== +Name: print-3_1_8 + 2000-07-12 Files: ChangeLog (1.23) (+12 -0) @@ -34132,6 +36263,9 @@ Reduce the number of printers to slightly mitigate the excessive menu length. +=============================================================================== +Name: print-3_1_7 + 2000-06-18 Files: ChangeLog (1.18) (+12 -0) @@ -34160,6 +36294,9 @@ Add ink levels and ID string +=============================================================================== +Name: print-3_1_6 + 2000-06-17 Files: print_gimp.h (1.19) (+2 -2) @@ -34226,12 +36363,6 @@ Handle -r1440x720 correctly. -2000-06-17 - - Files: Makefile.am (1.36.2.1) (+2 -1) - - Branch cleanup - 2000-06-17 Files: README.escp2 (1.3) (+92 -8) @@ -38644,7 +40775,7 @@ Current best stuff -1999-09-12 + <@sourceforge.net> Files: Makefile.am (1.1) (added) Makefile.in (1.1) (added) diff --git a/Makefile.am b/Makefile.am index 01b5b4f..576eea8 100644 --- a/Makefile.am +++ b/Makefile.am @@ -1,5 +1,5 @@ ## Process this file with automake to produce Makefile.in -## $Id: Makefile.am,v 1.146.2.2 2007/12/29 20:42:25 rlk Exp $ +## $Id: Makefile.am,v 1.151 2008/04/12 22:41:01 rlk Exp $ ## Copyright (C) 2000-2004 Roger Leigh ## ## This program is free software; you can redistribute it and/or modify @@ -60,7 +60,7 @@ ChangeLog: ChangeLogStamp echo "ChangeLog: .noupdate found: NOT updating ChangeLog from CVS" ; \ elif test -d CVS ; then \ echo "ChangeLog: Updating ChangeLog from CVS" ; \ - cvs log -N | $(PERL) scripts/mkchlog > ChangeLog.tmp ; \ + cvs log | $(PERL) scripts/mkchlog > ChangeLog.tmp ; \ if test -s ChangeLog.tmp ; then \ mv ChangeLog.tmp ChangeLog ; \ else \ diff --git a/Makefile.in b/Makefile.in index 04c3c7e..bf25664 100644 --- a/Makefile.in +++ b/Makefile.in @@ -43,13 +43,12 @@ DIST_COMMON = README $(am__configure_deps) $(srcdir)/Makefile.am \ subdir = . 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/isc-posix.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 + $(top_srcdir)/m4/iconv.m4 $(top_srcdir)/m4/isc-posix.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) am__CONFIG_DISTCLEAN_FILES = config.status config.cache config.log \ @@ -130,27 +129,13 @@ 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@ GREP = @GREP@ 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@ @@ -158,13 +143,6 @@ 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@ @@ -269,16 +247,12 @@ docdir = @docdir@ dvidir = @dvidir@ 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@ @@ -308,6 +282,7 @@ top_builddir = @top_builddir@ top_srcdir = @top_srcdir@ ACLOCAL_AMFLAGS = -I m4 -I m4local AM_CPPFLAGS = -I$(top_srcdir)/include -I$(top_builddir)/include $(LOCAL_CPPFLAGS) $(GNUCFLAGS) +GUTENPRINTUI_LIBS = $(top_builddir)/src/gutenprintui/libgutenprintui.la SUBDIRS = include src samples test po man doc scripts DISTDIRS = m4 m4extra CLEANSCRIPTS = \ @@ -857,7 +832,7 @@ ChangeLog: ChangeLogStamp echo "ChangeLog: .noupdate found: NOT updating ChangeLog from CVS" ; \ elif test -d CVS ; then \ echo "ChangeLog: Updating ChangeLog from CVS" ; \ - cvs log -N | $(PERL) scripts/mkchlog > ChangeLog.tmp ; \ + cvs log | $(PERL) scripts/mkchlog > ChangeLog.tmp ; \ if test -s ChangeLog.tmp ; then \ mv ChangeLog.tmp ChangeLog ; \ else \ diff --git a/NEWS b/NEWS index 92e33f6..d992963 100644 --- a/NEWS +++ b/NEWS @@ -1,48 +1,32 @@ -Welcome to Gutenprint 5.0.2! Please read these release notes -carefully. - -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, 10.3, 10.4, -and 10.5) 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 an enhanced Print -plug-in for GIMP that replaces the plug-in packaged with 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 -GIMP. While this package started out as the original Print plugin -for GIMP, it has expanded into a collection of general purpose -printer drivers, and the new, enhanced Print plugin for 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.2 is a stable release of Gutenprint 5.0, with bug fixes -and new features. - -Gutenprint currently supports over 800 printer models. +Welcome to Gutenprint 5.2.0-beta2 (5.1.98.2)! Please read these +release notes carefully. + +Gutenprint 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, Linux, +and Macintosh OS X (10.2 and above) systems. Gutenprint includes CUPS +and Foomatic drivers, and an enhanced Print plug-in for GIMP that +replaces the print plug-in packaged with the GIMP distribution. + +Gutenprint currently supports almost 900 printer models. + +Gutenprint 5.2.0-beta1 is the first beta release of Gutenprint 5.2. + +*** NOTE TO PACKAGERS: This is a beta release of the forthcoming 5.2 + stable release. As of 5.2 and until further notice, Gutenprint + will no longer deliver separate "development" and "stable" release + series. These release notes contain the following sections: I) General Requirements II) Changes from Previous Releases - * New features and fixes in 5.0.2 - * New features and fixes in 5.0.1 -III) Overall changes from 4.2 to 5.0. - A) General user-visible changes - B) New Functionality - C) Changes to the Print plugin for the GIMP - D) Changes to the CUPS interface - E) Changes to the Ghostscript driver - F) Changes to the Foomatic data generator - G) Quality improvements - H) Architectural Changes -IV) Exceptions and Workarounds + * Changes from Gutenprint 5.2.0-beta1 + * General changes from Gutenprint 5.0 + * Changes from Gutenprint 5.0.2 and 5.1.7 + * Changes from Gutenprint 5.0.2 only + * Changes from Gutenprint 5.1.7 only +III) Exceptions and Workarounds A) General Issues B) Build/Installation Issues @@ -80,13 +64,13 @@ output with any of the printers supported by this package. We strongly recommend using CUPS with Gutenprint as a general-purpose printing solution. -The enhanced Print plug-in for GIMP requires either 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 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 GIMP requires GIMP 2.0 or above (GIMP +2.2 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 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 @@ -116,1043 +100,431 @@ for building and installing Gutenprint. II) MAJOR CHANGES FROM PREVIOUS RELEASES -*) NEW FEATURES AND FIXES IN GUTENPRINT 5.0.2: +* CHANGES FROM GUTENPRINT 5.2.0-BETA1: - 1) New printers supported in this release: + This release fixes a fatal bug that causes Gutenprint 5.2.0-beta1 + to not initialize correctly. - * Epson inkjet printers: +---------------- - Epson Stylus CX4400 - Epson Stylus CX4900 - Epson Stylus CX5600 - Epson Stylus CX7400 - Epson Stylus CX9400 - Epson Stylus DX4050 - Epson Stylus Photo RX595 - Epson Stylus C110 - Epson Stylus C120 - Epson Stylus D120 - Epson PM 670C - Epson PX V780 +* GENERAL CHANGES FROM GUTENPRINT 5.0: - * Canon inkjet printers: + 1) Gutenprint 5.2 and beyond no longer support GIMP 1.2. Please + ensure that you are using GIMP 2.0 or above. - Canon MP710 - Canon MP740 + 2) The PostScript driver has been rewritten, offering enhanced + functionality approaching that of the native printer drivers. + This driver is used by the enhanced Print plugin for the GIMP, + and by other packages (such as PhotoPrint) that utilize + Gutenprint. In particular, the following specific functionality + has been added: - * PCL laser printers: + - All PPD file options are now offered. - Sharp AR-M257 - HP LserJet 1022 + - CMYK input is now handled correctly. - 2) Preliminary support for the following printers: + - The PostScript driver recognizes Gutenprint PPD files (from + the native CUPS driver, not from Foomatic) and presents + floating point options correctly. - * Canon inkjet printers: + Note that this driver does not offer the curve options offered + by the native drivers. - Canon BJC5100 - Canon BJC5500 - Canon BJC8500 - Canon Pixma iP4500 - Canon Pixma iP5300 - Canon Pixma iP8500 - Canon Pixma iX5000 - Canon Pixma MP170 - Canon Pixma MP180 - Canon Pixma MP610 - Canon Pixma Pro 9500 - Canon i80 - - * Dye sublimation printers: - - Canon SELPHY ES1 (*) - Canon SELPHY ES2 (*) - Canon SELPHY ES20(*) - Shinko CHC S9045 - - (*) Note that these printers may not work on all systems due to - communication requirements. - - 3) All native CUPS PPD files are now perfectly compliant with the - PPD specification, as tested under CUPS 1.2. Fixing this - requires some changes to the internal resolution names. These - changes should be transparent if PPD files are updated with - cups-genppdupdate.5.1. - - 4) Borderless printing on the Epson Stylus Photo 2200 now works - correctly. - - 5) The printer maintenance utility for EPSON inkjet printers, - escputil, now reports status more reliably. Previously some - people reported errors of the form "Unknown IEEE 1284.4 error"; - these errors have been resolved. - - In addition, escputil now correctly reports the ink color for - certain printers (in particular, printers using Claria (TM) inks - and printers using alternate ink cartridges (for example, the - Stylus Photo 1400 that allows either a photo black or a matte - black ink cartridge to be installed). - - 6) A bug in which certain data was not printed correctly by Canon - inkjet printers was fixed (in areas where the entire area was - filled with maximum color density, some lines could be silently - discarded). - - 7) A bug involving excessive memory consumption in certain cases - has been fixed. Printing multiple page documents on Canon - inkjet printers with the Duplex option set to Long Edge resulted - in very large memory consumption on alternate pages, which was - not released until the job completed. For example, in color at - 600 DPI, the memory consumption would be about 120 megabytes on - alternate pages, so printing a 100 page document would result in - 6 GB of memory consumption. Depending upon the system, the - results might be that the job would fail to print or would only - partially print, the system might run very slowly while the job - was being processed, or other components of the system might - fail. - - 8) Various fixes for the Canon iP4000, iP4200, and i560. Color - improvements have been made on the iP4200. - - 9) The paper size for the CD - Custom paper size has been changed - to 120 mm from 118.8 mm to allow correct printing from CUPS. - - 10) A compile problem on Solaris has been fixed. - - 11) It is now possible to specify the printer model to all escputil - commands, via the -m option. It is no longer necessary to use - the -u option to specify a new printer vs. an old printer. - - 12) The Epson driver will not select resolutions higher than - 5760x1440 for the automatic quality settings, as we have - determined that many current printers offer poor quality at the - bottom of the page with resolutions of 2880x2880 and 5760x2880. - We have not removed these resolutions altogether, as they may - work well for certain applications, but they will not be - automatically selected by the Best or Ultra Photo quality - settings. - - 13) A problem where in some cases certain options were not handled - correctly by the CUPS driver has been fixed. In particular, - yes/no options such as borderless printing were not handled - correctly in all cases when the printing system is CUPS 1.2 or - 1.3. - - 14) The CUPS driver in Gutenprint, and all associated utilities, - are now licensed as GPL v2 or higher. That code was previously - licensed as GPL v2 only. While that did not cause any direct - problems, since the CUPS driver does not form a library that - other code may wish to link against, it was licensed differently - from the rest of the Gutenprint project. That is now resolved, - and the entire Gutenprint code base is now licensed as GPL v2 or - higher. - - -*) NEW FEATURES AND FIXES IN GUTENPRINT 5.0.1: - - 1) New printers supported in this release: - - * Dye sublimation printers using the Olympus driver: - - Canon CP-10 - Fujifilm FinePix NX-500 - Kodak Easyshare Printer - Olympus P-S100 - Sony DPP-EX5 - Sony UP-DR100 - - * Canon inkjet printers: - - The support for these printers is under development, and there - may be issues with these printers. Please check with the - mailing list (gimp-print-devel@lists.sourceforge.net) if you - have any questions. - - Canon PIXMA iP2000 - Canon PIXMA iP3000 - Canon PIXMA iP3100 - Canon PIXMA iP4100 - Canon PIXMA iP4200 - Canon PIXMA iP4300 - Canon PIXMA iP5000 - Canon PIXMA iP5200 - Canon PIXMA iP6700 - Canon PIXMA MP150 - Canon PIXMA MP500 - Canon PIXMA MP700 - Canon PIXMA MP730 - Canon PIXMA MP750 - Canon PIXMA MP760 - Canon PIXMA MP770 - Canon PIXMA MP780 - Canon PIXMA MP790 - Canon PIXMA MP830 - Canon PIXUS iP3100 - Canon PIXUS iP4100 - Canon i560 - Canon i850 - Canon i860 - Canon i865 - - * Epson inkjet printers: - - Epson Picturemate Flash - Epson Picturemate Pal - Epson Picturemate Snap - Epson Picturemate PM-200 - Epson Picturemate PM-210 - Epson Picturemate PM-240 - Epson Picturemate PM-250 - Epson Picturemate PM-280 - Epson Stylus C79+ - Epson Stylus C87+ - Epson Stylus Photo 1400 - Epson Stylus Photo 1410 - Epson Stylus Photo R230 - Epson Stylus Photo R240 (preliminary) - Epson Stylus Photo R245 (preliminary) - Epson Stylus Photo R260 - Epson Stylus Photo R265 - Epson Stylus Photo R270 - Epson Stylus Photo R350 - Epson Stylus Photo R360 - Epson Stylus Photo R380 - Epson Stylus Photo R390 - Epson Stylus Photo RX560 - Epson Stylus Photo RX580 - Epson Stylus Photo RX590 - Epson Stylus Photo RX640 - Epson PM A820 - Epson PM D870 - Epson PM G850 - Epson PM G4500 - Epson Stylus CX5000 - Epson Stylus CX5000F - Epson Stylus CX6000 - Epson Stylus CX7000F - - The driver for the Stylus Photo 1400 has two separate quality - settings for 720x360 and 720 DPI. The 720x360 DPI Enhanced and - 720 DPI High Quality options offer improved quality at some cost - in printing speed. The small format Claria-based printers (R260, - R390, RX580, and related printers) offer 720x360 and 720 DPI - modes approximately equal in quality to the Enhanced and High - Quality modes on the 1400 without a speed penalty. - - * Lexmark inkjet and compatible printers: - - Compaq IJ1200 - Lexmark X73 - - * PCL laser printers (monochrome only): - - Lexmark Optra E220 - Xerox WorkCentre M118 - - 2) CUPS 1.2 is now supported using on-the-fly PPD file generation. - In addition, the resolution names are all compliant with the PPD - specification. cups-genppdupdate correctly updates on-the-fly - PPD files. The PPD files now use the correct UTF-8 encoding. - - 3) The native CUPS driver offers a new Shrink Page If Necessary to - Fit Borders option, enabling the user to choose how to fit the - output to the imageable area of the page. This is useful when a - printer offers a choice of imageable areas, typically normal - (which has margins) and full bleed (which allows printing to the - edge of the paper, or even beyond). The following options are - available: - - * Shrink (default): the output is shrunk if necessary to fit the - imageable area of the page. If a printer is capable of - borderless operation but normal margins are selected, the - output will be shrunk. This will print the entire page - (nothing will be lost), but will not preserve the dimensions of - the printout. For example, a line intended to be 10 cm long - may print smaller than that. - - * Crop: the output is cropped if necessary to fit the imageable - area of the page. The dimensions of the page will be preserved - (a line intended to be 10 cm long will print out exactly 10 - cm), but the edges of the output may be truncated (cropped). - - * Expand: the output is expanded from the normal imageable area - to fit the maximum possible imageable area of the page. When - selected on printers capable of full bleed output, in - conjunction with any other necessary options, the output will - be expanded to match the maximum page dimension. The - dimensions of the page will be expanded if necessary beyond the - page size; a line intended to be 10 cm long may print longer - than that. - - This option has no effect on printers not capable of full bleed - or other expanded margins. It also has no effect when printing - to CD's or when printing to papers where the paper margin is - wider than the margin offered by the printer. - - This behavior is different from Gutenprint 5.0.0; the behavior in - Gutenprint 5.0.0 was equivalent to the Crop option in Gutenprint - 5.0.1. The change has been made due to extensive user feedback - that cropping the output leads to unexpected results in normal - printing operation. Users who need exact dimensional accuracy - should use the Crop option with borderless printing enabled. - - 4) Epson inkjet printers now correctly support borderless printing. - In addition, printing at the top and bottom of the page has been - improved on printers that support borderless printing, although - this is still not perfect in all cases. - - Certain printers (in particular the C/D8x and C6x series) do not - print correctly to the bottom of the page with all colors. This - problem is understood, but we do not know when a fix will be - available. - - 5) The list of resolutions supported on newer Epson printers has - been changed; resolutions of 2880x1440, 5760x1440, 2880x2880, and - 5760x2880 (as appropriate) have been added, replacing various - 1440x1440 and 1440x2880 enhanced resolutions. - - 6) The output for the Canon PIXMA printers has been improved. - - 7) The Canon driver now supports DuplexNoTumble for the PIXMA - iP4000. - - 8) Roll printing now works correctly on the Epson Stylus Photo - R800. - - 9) Printing with Canon PIXMA printers connected to windows hosts - (bug 1625202) has been fixed. - - 10) CD printing has been fixed for the Canon PIXMA iP4000 and iP4200. - - 11) The Canon driver now also supports the CD fine adjustment controls. - - 12) The Resolutions for the Canon S300 have been fixed. - - 13) Some Canon MULTIPASS printers have been renamed to PIXMA. +---------------- - 14) A minor border problem with the R800 and related printers has - been fixed. The standard bottom border is now slightly wider to - eliminate the very bottom of the print from being chopped off. +* CHANGES FROM GUTENPRINT 5.0.2 AND 5.1.7: - 15) A build problem with the CUPS driver on some systems (in - particular, OS X and any system where --disable-nls is used) has - been fixed. + 1) cups-genppdupdate is no longer versioned, as it was in 5.0 and + 5.1 (cups-genppdupdate.5.0 and cups-genppdupdate.5.1). It also + supports the following options: - 16) The Postscript driver now handles CMYK input correctly, fixing a - problem with Cinepaint (bug 1701954). + -r Specify the major.minor version to update to, e. g. 5.0 or + 5.1. - 17) The Postscript driver and UI library now handle setting the - locale correctly. + -f Bypass ownership/permissions checks on update PPD files. - 18) The PPD file updater, cups-genppdupdate.5.1, now handles the -n - (don't do anything) correctly. In addition, it handles --help - and --version. - - 19) The range of sizes for printing custom CD's has been extended - down to 65 mm in both the Epson and Canon drivers. - - 20) Printing to CD's on Epson printers now works correctly if the - image is not placed at the top of the page. + -i Interactively ask whether to update each PPD file. + 2) The performance of cups-genppdupdate has been improved + significantly. -================================================================ + 3) cups-genppdupdate no longer updates PPD files that differ only + in case of the file extension (e. g. printer.ppd and + printer.PPD). This avoids updating PPD files twice on + filesystems that are case insensitive, such as OS X. -III) OVERALL CHANGES BETWEEN GIMP-PRINT 4.2 AND GUTENPRINT 5.0: - -A) GENERAL USER-VISIBLE CHANGES: - - 1) Gutenprint offers many new options, which are described - separately below. Many other options that are present in both - 4.2 and 5.0 function differently between the two releases. - - 2) Options in the CUPS driver and GIMP plugin are now grouped - according to function. This work is still in progress, and - we expect to make further usability improvements. - - 3) Simplified bundles of settings are now offered for users who do - not need to customize the settings. The Print Quality and Image - Type controls offer a variety of settings optimized for common - printing tasks; these settings may be overridden by explicit user - choice. - - 4) Many of the color settings have changed effect. We recommend - starting with no color adjustments and making appropriate changes - only as required. Specific changes that you should be aware of - include: - - * The default operation of the contrast setting has changed to be - more in accord with other packages. In 4.2, reducing the - contrast resulted in changing the black and white setting. In - 5.0, reducing the contrast does not change the black and white - settings. As a result, it is possible to use the contrast - setting to improve highlight and shadow detail by reducing the - contrast. - - The previous behavior is available by turning on the "Linear - Contrast Adjustment" setting. - - * The brightness control now behaves more in accord with standard - practice, adjusting the image's overall brightness without - changing the black or white points. - - * The Cyan, Magenta, and Yellow settings have been replaced with - separate settings for gamma, density, and gray balance for - Cyan, Magenta, Yellow, and Black. The Cyan, Magenta, and - Yellow settings in Gimp-Print 4.2 most closely correspond to - the gamma settings in 5.0. - - The per-channel density settings do not affect the color - correction. They are applied after the color correction to - scale the individual channels. The per-channel gray balance - settings adjust gray balance without affecting per-channel - density settings (i. e. the adjust the amount of ink used to - generate gray), permitting increased color saturation without - compromising gray balance. - - 5) The Uncorrected color correction mode is recommended for users - who wish to use their own color (ICC or otherwise) profiles with - Gutenprint drivers. This will yield the maximum gamut and most - uniform response. If you are not using your own color - management, you will generally get best results from the High - Accuracy color correction setting. Users who wish to perform - their own linearization and ink limiting may wish to use the Raw - color correction mode, which does not adjust the density. - - Any profiles generated against Gimp-Print 4.2 are unlikely to - produce good results with Gutenprint 5.0. The color generation - is sufficiently different that you will need to create new - profiles against Gutenprint 5.0. In general, unless otherwise - noted in the release notes, color adjustment should not change - between Gutenprint 5.0 releases starting with release 5.0.0. - - 6) The old man pages, and src/ghost/README, have been withdrawn. - These pages, and the Ghostscript README file, were based on the - Gimp-Print 4.2 options, which were much less extensive than the - current option system. It is not practical to keep them up to - date in any meaningful way. Our recommendation is that people - use either the native CUPS driver or Foomatic to manage options - rather than attempt to create and manage printer queues by hand. - - 7) The source browser in the documentation package has been removed. - This information, which consists of color-coded annotation of the - source code, is of little interest to the vast majority of users - and consumes a significant amount of space in the installation. + 4) cups-genppdconfig has been removed from this release. This + command was used to configure CUPS printer queues, but is not + necessary as there are ample other tools available to configure + printer queues. + 5) Support for generic large format PCL laser printers has been + added. ----------------- + 6) Many translations have been updated. -B) NEW FUNCTIONALITY: + 7) The Canon iPixma 4500 has been fixed. - 1) This release offers a new "curve" data type, permitting very - precise adjustments of output. Currently the curves are only - accessible in the GIMP plugin. + 8) L-size photo paper (3 1/2x5 inches) has been added. - 2) This release offers many new output controls: +---------------- - + Balance (density) controls for each color channel, in addition - to the gamma controls present in 4.2. +* CHANGES FROM GUTENPRINT 5.0.2 ONLY: - + Gray balance controls for the cyan, magenta, and yellow - channels. These controls allow fine tuning of gray tones - without affecting color. + 1) New printers supported in this release: - + Black (GCR) transition, including the transition gamma and the - upper and lower limits. + * Epson inkjet printers: - + Transitions for photo (light cyan, light magenta, and gray) - inks. - - + Transfer curves for each channel (cyan, magenta, yellow, black, - and composite), allowing very precise control over the output. - - + Transfer curves for generation of additional channels where - applicable, such as red and blue inks for the Epson Stylus - Photo R800 and R1800. - - + Hue, saturation, and luminosity transfer curves permit tuning - of the color corrections utilized by Gutenprint. - - + Ink limit control. - - + The density control now permits setting density as high as 8.0, - vs. 2.0 in 4.2. - - 3) The Epson driver offers (almost) true full bleed for printers - that support it (but see the limitations below). - - 4) The PCL driver now offers duplex (two sided) printing support on - appropriate printers. - - 5) The package now includes support for a number of dye sublimation - photo printers made by Olympus, Canon, Sony, and Fujifilm. - - 6) The resolution list for Epson printers has been simplified; many - redundant resolutions have been removed. - - 7) Print head direction for Epson printers (unidirectional - vs. bidirectional) is now a separate control. In addition to - contributing to the simplification of the Epson printer - resolutions, this permits the choice of unidirectional - vs. bidirectional at all resolutions if desired. By default, the - driver picks the most appropriate choice for the situation. - - 8) The Epson driver now allows printing directly to CD's on printers - that support this functionality. In addition, a choice of center - hole size (16 mm or 43 mm) is now offered. A fine adjustment is - provided to permit control over positioning of the image on the - CD. This fine adjustment setting is not available in the - Foomatic interface at present. - - To print to a CD, you need to select the "Print to CD" media - source (input slot). You must also select the appropriate page - size (3" CD or 5" CD). Note that this is different from the - instructions Epson provides, which specify A4 media size. - - 9) The Epson driver now offers a choice of print head weave - patterns. In addition to simplifying the resolution choices for - Epson Stylus Pro printers, this offers an additional control for - fine tuning output quality. - - 10) The Epson driver offers an Ink Set control for printers taking - different choices of inks (such as the Epson Stylus Photo 2200, - which offers a choice of Matte Black and Photo Black inks). - - 11) Where practical, all controls offer a default setting for - simplicity of operation. This default value is intended to offer - the optimal choice given the printer and its other settings. For - example, if "Automatic" is selected for print head direction, the - print head motion will be unidirectional at high resolutions - (since unidirectional usually produces better output), but - bidirectional at low resolutions (for faster printing). - - The default is only offered for options that are not directly - controlled by the user's action. For example, there is no - default choice offered for paper type, since the correct value is - based on the paper type loaded by the user. Similarly, there is - no default for the input slot or ink set. - - 12) Support for a variety of input types, in both 8 and 16 bit - resolution, has been added. Gutenprint can now handle input in - grayscale, whitescale (inverted grayscale), RGB, CMY, CMYK, and - KCMY in 8 and 16 bit resolutions for all output types. - - 13) A new Threshold color correction mode has been added that - produces either all-on or all-off of each color. This is similar - to the Monochrome mode in 4.2, except that it works for color as - well as black. - - 14) A new Desaturated color correction mode has been added that - produces gray (desaturated) output using color inks. - - 15) A new Density color correction mode has been added that corrects - only for density. This will normally produce excessively dark - output. However, applications that wish to use their own - linearization curves may wish to use this interface to prevent - Gutenprint from performing its own linearization. - - 16) A new Raw color correction mode has been added that performs no - correction whatsoever on the input. This mode may be used by - applications that wish to perform their own ink limiting and - linearization, and use Gutenprint to perform dithering - (screening) and output generation only. - - 17) A new Predithered color correction mode has been added that - combines the effects of Raw and Threshold. This mode may be used - by applications that wish to perform their own dithering and use - Gutenprint to generate printer-specific output only. The input - value should be the size of the drop desired (for single-level - printers, it should be 0 or 1; for printers with three drop - sizes, it should be 0, 1, 2, or 3). - - 18) A new Correct Hue Only color correction mode has been added that - performs partial color correction (adjusts hue, but not - darkness). - - 19) The escputil command, which performs various printer - administration activities on Epson Stylus printers, has a number - of improvements: - - * A new extended ink information command has been added. This - command, which is supported on printers with separate - individual ink cartridges, prints additional information about - the ink cartridge in addition to the amount of ink present. On - older printers, it simply returns the standard ink - information. - - * The status command now prints status in a human-readable format - rather than simply reporting the raw information returned by - the printer. - - * Ink level detection now works on all known supported printers, - and may work on other non-supported printers. Previously it - did not work on some newer printers. However, it is somewhat - slower on these printers than it is on older printers that - support the faster ink detection method. - - * Ink level detection now prints the correct ink color names for - the printer model. - - * It is now no longer necessary to use the -u flag with certain - printers in most cases. The utility now autodetects the - printer model and generates appropriate commands in all cases. - - If you supply a printer queue (with the -P option) rather than - a raw device (with the -r option), you will still need to - provide the -u flag, as the utility cannot detect the actual - printer connected to a queue. However, commands that must be - run bidirectionally (ink level, identify, and printer status) - do not require the -u flag any more. - - * escputil now successfully detects ink level, printer model, and - status even if the printer is out of ink. - - 20) The Epson driver permits adjusting the dot size if required to - increase the amount of ink printed. For example, if 1440x720 DPI - is selected, but the density requested is very high, the printer - will switch to using drop sizes appropriate for 720 DPI. This - option is not normally required and is disabled by default. + EPSON PictureMate 100 + EPSON PictureMate 210 (Corrected) + EPSON PictureMate 240 (Corrected) + EPSON PictureMate 250 (Corrected) + EPSON PictureMate 260 + EPSON PictureMate 270 + EPSON PictureMate 280 (Corrected) + EPSON PictureMate 290 + EPSON PictureMate 500 + EPSON PictureMate 2005 + EPSON PictureMate Dash + EPSON PictureMate Flash (Corrected) + EPSON PictureMate Pal (Corrected) + EPSON PictureMate Snap (Corrected) + EPSON E 150 (Corrected) + EPSON E 300 + EPSON E 520 + EPSON E 500 + EPSON E 720 + EPSON E 700 + EPSON Stylus D92 + EPSON Stylus DX4400 + EPSON Stylus DX4450 + EPSON Stylus DX7000F + EPSON Stylus DX7400 + EPSON Stylus DX7450 + EPSON Stylus DX8400 + EPSON Stylus DX8450 + EPSON Stylus Photo R280 + EPSON Stylus Photo R285 + EPSON Stylus Photo RX585 + EPSON Stylus Photo RX680 + EPSON Stylus Photo RX685 + + (Note that a number of the PictureMate printers that were + previously included generated grossly incorrect output. Not + all of the PictureMate printers have been fully tuned at this + point.) + * Canon inkjet printers: + Canon PIXMA MP520 (#1872394) + Canon PIXMA iP6000D ----------------- + 2) Printing for the Canon PIXMA iP4500 has been fixed (#1834153). + + 3) Printing near the bottom of the page has been improved for many + modern Epson inkjet printers. In addition, we have determined + that most of these printers can print with consistent high + quality at 2880x2880 and 5760x2880 DPI. Therefore, these + resolutions will be used for Ultra Photo and Best qualities + respectively on these printers. -C) CHANGES TO THE ENHANCED PRINT PLUGIN FOR THE GIMP: + Printers affected include: - 1) A new plugin for the GIMP 2.x, enhanced with all new Gutenprint - 5.0 functionality, is now provided. + * Stylus Photo R800, R1800, PM-G820 - 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 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. + * Stylus Photo R2400 - 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 - preview as necessary to display landscape or portrait mode. + * All printers using Claria ink - 4) The positioning controls have been simplified. + 4) Full bleed printing now works properly on the Epson Stylus Photo + R2400. - 5) The printrc file format is different. Gutenprint 5.0 can read - printrc files created by Gimp-Print 4.2 and earlier, but it - writes out the printrc file in a format that earlier versions of - Gimp-Print cannot read. + 5) The Epson Stylus C120 now allows printing at 2880x2880 and + 5760x2880. However, print quality near the bottom of the page + may be poor, and these settings are therefore not used for Ultra + Photo and Best quality. - 6) Printer queue discovery and command specification are greatly - simplified over 4.2. The plugin now offers a default printing - command that is determined based on the characteristics of the - system, and also offers the choice of printing to a file or using - a custom print command for each printer defined in the printrc - file. The default printing command is correct whether the output - is Postscript or not; it is no longer necessary to remove "-oraw" - from the print command line. + 6) The ink drop sizes on the Epson Stylus Photo printers using + Claria ink have been retuned, yielding improved quality at lower + resolutions. - 7) The Print plugin now always displays all options relevant to - what's being printed, enabling and disabling options as - appropriate. + 7) A problem with determining the system printer queues in the GIMP + plugin on certain systems using languages other than English has + been fixed. - 8) The plugin now lists printers grouped by manufacturer, rather - than a single long list. + 8) Envelope paper sizes are now offered in both portrait and + landscape form factor, as some printers expect envelopes to be + fed long edge first while some expect them to be fed short edge + first. - 9) If you are using an older version of the GIMP 1.2, and the GIMP - is installed in a non-standard location on your system such that - you cannot run configure in Gutenprint without using - --with-gimp-prefix or --with-gimp-exec-prefix, please read item - (8) in Exceptions and Workarounds below. In addition, if you - have both the GIMP 1.3/2.0 and the GIMP 1.2 installed on your - system, you should read the same material. + 9) PCL laser printers now offer paper trays with adjustable guides. + Many laser printers use adjustable guides for manual feed of + papers narrower than letter size. + 10) The GIMP plugin now offers reset buttons for individual + settings, so it is possible to reset a single setting to its + default without resetting all settings. ----------------- + 11) A new dither algorithm, Ordered New, has been added. This + dither algorithm is most likely to improve output at low + resolutions, particularly when printing black and white. It + will only help on printers offering multiple drop sizes. -D) CHANGES TO THE CUPS INTERFACE: - - 1) The CUPS PPD files now offer both fine and coarse adjustments for - all color controls, permitting much finer control over output (in - steps of .005 rather than .05) without making the menus unwieldly. - - 2) The CUPS driver refuses to function with PPD files created for a - different version of Gutenprint or Gimp-Print, providing an error - message indicating the problem. This avoids problems caused by - mismatches between the PPD files and the driver. While - mismatches are potentially not harmful in all cases, they could - cause problems ranging from failures to print with poor - diagnostic messages to incorrect results. - - 3) The Gutenprint 5.0 CUPS driver can be installed concurrently with - the 4.2 driver. Both the PPD files and the driver carry - different names from their 4.2 counterparts, permitting a - parallel installation or gradual switchover between 4.2 and - 5.0-based releases. - - 4) An update script (cups-genppdupdate.5.0) is provided to update - PPD files between later 4.3 and 5.0-based releases, preserving - option values where possible. This script will not update PPD - files based on Gimp-Print 4.2, or Gimp-Print 4.3 releases prior - to 4.3.21. - - 5) On printers capable of borderless output, the CUPS driver now - advertises (via the *ImageableArea in PPD files) the full page - dimension, and crops the output if the borderless mode is not - selected. If borderless mode is selected, the full image (up to - the limits of the printer) will be printed. - - This compromise is necessitated by the fact that PPD files can - only supply a single imageable area for a particular page size, - so it was necessary to select which imageable area to provide. - In early prereleases of Gutenprint 5.0, we supplied the normal - page area, and stretched the output if the user selected full - bleed. This caused problems for many users, in that it was not - possible to print the full surface of the paper while preserving - dimensions. - - Based on user feedback, we determined that the best solution is - to provide the full page size as the imageable area and crop the - result if full bleed mode is not selected. - - 6) The CUPS driver now offers 16-bit printing as an option with ESP - Ghostscript 8.15, and Apple Macintosh OS X 10.4 ("Tiger"), using - the new Color Precision control. Setting Color Precision to - "Best" enables 16-bit printing if the system supports it; setting - it to "Normal" uses 8-bit printing. Setting Color Precision to - "Best" has no effect if the version of CUPS does not support - 16-bit printing; in that case, "Best" is still 8-bit. - - The higher precision may improve results with certain source - material, particularly if it contains smooth color gradients. - The result would be freedom from banding, particularly in - highlights where it might be visible with 8-bit color - computation. It may be somewhat slower than 8-bit printing. - - 7) Due to the implementation of CUPS, it is necessary on some - systems to link the programs associated with the CUPS driver (in - particular, cups-genppd and rastertogutenprint) statically - against the Gutenprint library. Please see bugs 865253 and - 865265 for full details. - - This fix works correctly unless --disable-static (to disable - building static libraries) is passed on the command line. - Normally, only people packaging up Gutenprint for distribution - use this option. If you wish to use this option, please read - item (6) in Exceptions and Workarounds *carefully* for a full - description of the problem along with suggested methods of - procedure. + 12) Various new controls and settings have been added to assist in + printer calibration. While the tools for using these controls + are not yet created, these tools will assist in calibrating + printers in the future. + * The Epson driver now offers additional controls for adjusting + the relationship between light and dark ink: ----------------- + + The Value parameters (such as Light Cyan Value) specify the + relative darkness of the light vs. dark inks. -E) CHANGES TO THE GHOSTSCRIPT DRIVER: - - 1) The stp driver, a monolithic (traditional) Ghostscript driver - used with Ghostscript 5.10, 5.50, and 6.51, has been withdrawn. - The only supported Ghostscript driver is the IJS-based driver, - for GNU Ghostscript 6.53 and above, ESP Ghostscript 7.05 and - above, and AFPL Ghostscript 7.04 and above. - - This change was made due to the difficulty of supporting the - monolithic driver and the complexity of building it. The - traditional monolithic driver architecture required that all - drivers be compiled into Ghostscript, requiring that program to - be recompiled whenever a driver is added. This is a rather - complicated operation that cannot easily be automated. The IJS - architecture, based on the open source HPIJS driver supplied by - Hewlett-Packard for HP inkjet printers, allows for drivers to be - compiled independently of the core Ghostscript. A - Gimp-Print/Gutenprint driver based on the IJS architecture was - introduced into Gimp-Print 4.2.1 and 4.3.0, and has been - recommended for use with Gimp-Print 4.2.2 and beyond. - - In addition to a greatly simplified build procedure and overall - cleaner architecture, the separation between Ghostscript and - driver imposed by the IJS architecture permits use of Gutenprint - with AFPL Ghostscript with no license conflict. + + The Cutoff parameters now specify the point at which the + darker ink is first used, relative to the value of the light + ink. + + The Scale parameters now specify the amount of light ink + used (essentially the density of the light ink). This is + the same as the parameters previously called Cutoff. ----------------- + * The Epson driver now exposes as defaults the actual GCR + settings used for the printer, paper, and ink combination in + use. -F) CHANGES TO FOOMATIC DATA GENERATION: - - 1) The Ghostscript IJS driver now functions only with Foomatic PPD - files created for the matching version of Gutenprint, providing - an error message indicating the problem if an incorrect PPD file - is used. This avoids problems caused by mismatches between the - PPD files and the driver. While mismatches are not harmful in - all cases, they could cause problems ranging from failures to - print with poor diagnostic messages to incorrect results. - - 2) The Gutenprint 5.0 Foomatic data and IJS driver can be installed - concurrently with the 4.2 driver. Both the PPD files and the - driver carry different names from their 4.2 counterparts, - permitting a parallel installation or gradual switchover between - 4.2 and 5.0-based releases. - - 3) On printers capable of borderless output, the Foomatic driver now - advertises (via the *ImageableArea in PPD files) the full page - dimension, and crops the output if the borderless mode is not - selected. If borderless mode is selected, the full image (up to - the limits of the printer) will be printed. - - This compromise is necessitated by the fact that PPD files can - only supply a single imageable area for a particular page size, - so it was necessary to select which imageable area to provide. - In early prereleases of Gutenprint 5.0, we supplied the normal - page area, and stretched the output if the user selected full - bleed. This caused problems for many users, in that it was not - possible to print the full surface of the paper while preserving - dimensions. - - Based on user feedback, we determined that the best solution is - to provide the full page size as the imageable area and crop the - result if full bleed mode is not selected. + * The Epson driver now allows passing low level settings such as + printer base resolution, ink drop size selection, and relative + ink drop size as parameters. The ink drop size can be + accessed in the GIMP plugin, while the base resolution and ink + drop size selection can only be used via the test pattern + generator or other application that allows setting integer + parameters. + * Two new dither algorithms, Segmented and Segmented New, have + been added. These are not intended for normal use, and will + normally behave like Ordered and Ordered New. However, if Raw + color correction is selected and a printer with multiple drop + sizes is used, the range of input will be divided up such that + the high order bits will select the drop size to be used and + the lower bits will specify the amount of ink. High order + bits of 0 indicate that all drop sizes should be used. ----------------- + For example, if a printer offers 3 drop sizes (2 bits), the + range of 0-16383 will print all drop sizes normally (with the + range of 0-16383 being scaled to 0-65535), 16384-32767 will + use the small drop size, and so forth. -G) QUALITY IMPROVEMENTS: - - 1) Color and tonal accuracy is greatly improved compared to 4.2 - while the gamut (range of printable colors) has been increased. - This particularly improves the hue accuracy of red, magenta, and - blue, and the tonal accuracy of cyan and green. Most Epson - printers have been fully tuned for the new color correction - algorithms introduced for this release. - - The default gamma has been changed to produce lighter midtones - with all Epson printers. - - 2) The handling of variable drop sizes and photo inks (6 and 7 color - printers) has been completely revised, with the result being that - variable drop size printers with photo inks (such as most Epson - Stylus Photo and Stylus Pro printers) give much more consistent - results with fewer artifacts. In particular, colors match - correctly across all resolutions, which was not the case in 4.2. - - In 4.2, variable size drops and light inks were treated the same - way; an "effective drop size" based on the relative size of the - drops and the darkness of the inks was used to decide what kind - of drop to print. While this method has some advantages (it - ensures that dark and light inks are never printed at the same - place, and also that dark dots are optimally dispersed among - light dots), it has some serious disadvantages as well: the - properties of a small dark dot and a large light dot are not - really the same, particularly when inks are mixed. The - combination of different drop sizes being used at different - resolutions meant that the transition between light and dark inks - differed depending upon the resolution chosen, and if more than - one drop size was required at a given resolution, the transition - tended to be quite marked. - - The new method of handling variable size drops and light inks is - to first separate each of the four channels (cyan, magenta, - yellow, and black) into the appropriate light and dark inks, if - needed. This separation is performed based on the relative - darkness of the different ink sub-colors (such as light and dark - cyan) and specific characteristics of the printer, ink type, and - paper chosen. Following this, each sub-color is screened - separately, and the appropriate combination of drop sizes is - chosen. - - The drop size selection in this release has also been changed to - fill the page with as many small drops as possible before - switching to larger drops. This ensures that the largest number - of the smallest possible drops is printed, which yields a - smoother texture in the midtones. - - Finally, new dither algorithms described below allow drops of ink - of different colors to be dispersed, avoiding clumping or - overprinting of drops. - - 3) The EvenTone dither algorithm has been extensively reworked in - this release, offering many improvements. - - First, it has been rewritten to work correctly with variable drop - size and photo printers. This algorithm, which offers - significant improvements over the standard Adaptive Hybrid - algorithm, does not work optimally with variable drop sizes or - photo printers in 4.2. - - Secondly, a variation called Hybrid EvenTone has been added. - This dither algorithm perturbs the dot positions slightly to - break up some patterning seen in standard EvenTone dithering in - solid regions of pale tones, particularly when printing with - black ink only. This very slightly reduces the smoothness of - texture in exchange for largely eliminating this undesirable - patterning. This algorithm is also expected to be more resistant - to microbanding effects. - - 4) The conversion between black and composite (CMY) gray has been - improved in this release, yielding more neutral grays on most - printers. - - 5) Epson printers have been completely retuned, in most cases - yielding much better density, more accurate gray scale, and - darker black on all paper types. + This is intended to assist in tuning ink drop sizes and is not + normally useful otherwise. + + * A new parameter allowing dumping out of color correction state + (lookup tables, GCR data, curves, etc.) has been added, and is + accessible in the GIMP plugin. At present, this data cannot + be used directly, but it is intended that in the future this + mechanism be used to allow calibration information to be saved + and restored. ---------------- -H) ARCHITECTURAL CHANGES: - - 1) Family drivers are now modular. A "family driver" is a - collection of printer drivers for one group of printers sharing a - common programming architecture, e. g. ESC/P2, PCL, Lexmark, - Canon. The drivers can be built as separate modules and loaded - at runtime as needed. - - 2) Color processing is now partially modularized. This architecture - will enable us, or others, to provide color management without - having to change the internal interfaces within Gutenprint. - - 3) New composite data types. Gutenprint 5.0 defines additional data - types. These types include: - - * Sequences, curves, and arrays. A sequence is a primitive - vector of numbers data type; curves and arrays provide - additional capabilities such as interpolation (for curves) and - multiple dimensions (for arrays). - - * Lists are a general ordered container of named objects of - arbitrary type. They are used throughout the core library in a - variety of ways. The creator of a list can specify - constructor, destructor, name comparison, copy, and sort - operations on list members. - - * Parameters, which are part of the options system described - below. In addition to storing values and descriptions of the - parameter, parameters can be queried to determine defaults and - constraints. Parameter lists (which use the list container - internally) are also defined as part of this. - - * String lists are used in various ways; in particular, they are - used by the parameter system to inform programs of the - available choices of values for string-valued parameters. - - 4) Complete overhaul of the options system. Rather than offering a - fixed set of operations, family drivers, color modules, etc. can - now offer a wide variety of options using a predefined set of - data types. The data types currently supported are strings - picked from a list, floating point numbers, integers, curves, - arrays, Boolean values, dimensions, and filenames. - - The new options system provides a flexible way for drivers to - inform applications of default values and UI hints, the ability - to selectively enable and disable options, and a generalized way - of verifying legality of option choices. - - 5) The coordinate system has been changed from bottom left to top - left of the page, and the printable area can now extend beyond - the edge of the page. The result is a more intuitive coordinate - system for driver writers that matches the coordinate system of - printers, and the ability to do true full bleed. - - 6) The specification of color correction, input, and output modes - has been completely revised, permitting applications to specify - input mode, output mode, channel bit depth, and color correction - completely independently. This architecture is also more - extensible. - - 7) Complete overhaul of the black generation in CMYK output. Black - generation is now performed in the color code rather than the - dither code. This simplifies the dither code, puts the CMYK - generation where it should be, and improves overall flexibility. - - 8) Complete overhaul of the multi-tone (photo or quadtone) ink - processing architecture (channels). Instead of being processed - as part of the dithering code as in 4.2, where ink drops of - lighter inks were assigned virtual values proportional to their - darkness as well as their size, this is now processed after the - initial color conversion. This has a number of major advantages: - - * As the actual amount of ink to be printed is visible to the - color code, the color code can do ink limiting without fear - that the dither code will change the amount of ink to be - printed. - - * It ensures that the same proportions of inks will be printed at - any density and resolution. In 4.2, the ramp from light to - dark ink varied depending upon the dot sizes available and - hence the resolution. This has already been demonstrated to - yield much better linearity and much more neutral gray scale - with even very modest tuning effort. - - * It enables use of all drop sizes of all ink tones. In 4.2, we - could not use the smallest drop size of dark ink, because the - virtual dot size of a small dot of dark ink is typically close - to the virtual dot size of a large dot of small ink. This - would yield very sharp transition, and perhaps even result in - more light ink printed in darker regions than in lighter - regions. With channel processing separate from dithering, this - concern no longer exists; we can safely use small drops of dark - ink, improving smoothness. - - * It enables the color code to do ink limiting intelligently - without concern that the dither code will rearrange things - behind its back. - - * It greatly simplifies the specification of inks. With drop - size and darkness orthogonal, family drivers can greatly - simplify their tables of inks. - - * Dither algorithms can choose to ignore smaller drop sizes if - they wish to offer fast operation. - - * Applications with special requirements can now access the raw - ink channels directly. This facility was used to create a - mechanism to more accurately tune printer inks. - - 9) The color system can now generate arbitrary ink colors, lifting - the CMYK-only restriction in previous versions of the package. - This permits full support for the Epson Stylus Photo R800 and - R1800, which use red and blue ink in addition to the traditional - CMYK. - - 10) Use of true XML to store data about printers and paper sizes, and - to represent new data types (sequences, curves, and arrays). - This uses the "mxml" XML library, a fast, lightweight XML parser - written by Mike Sweet for this project. Currently, the use of - XML (as opposed to compiled-in data) is limited, but we expect - that this will change beyond the initial 5.0 release. - - 11) In addition to parameters, internal components such as family - drivers, color drivers, etc. can store arbitrary data in the - basic stp_vars_t object. This facility is used to simplify the - internal driver API; the family driver no longer needs to keep - track of dither, color, etc. information itself. - - 12) The Epson Stylus family driver has been decomposed into more - functionally distinct units. The data schema has been - considerably improved, and the code itself broken into more - easily maintained units. - - 13) The build system has been updated with a more contemporary - toolchain based on autoconf 2.5 and gettext 0.11. - - 14) The Print plugin for the GIMP has been decomposed into a UI - library and the core plugin. The user interface library is a - pure GTK-based library; the tiny GIMP plugin is a client of this - library. - - 15) Printer characteristics are exposed to the application level as - read-only parameters. This permits the escputil utility to not - duplicate information stored in the printer driver. +* CHANGES FROM GUTENPRINT 5.1.7 ONLY: + + 1) The following HP inkjet printers are now supported. Support for + these printers was dropped in 5.1.4, but is now restored as some + users have no alternative options. We recommend that where + possible users switch to the HPIJS driver package (the printer + part of HPLIP), available from http://hplip.sourceforge.net. + The HPIJS package is licensed under the GPL and BSD licenses. + + HP Business Inkjet 2200 + HP Business Inkjet 2230 + HP Business Inkjet 2250 + HP Business Inkjet 2250TN + HP Business Inkjet 2280 + HP Color Inkjet Printer CP1160 + HP Color Inkjet Printer CP1700 + HP Color LaserJet 2500 + HP Color LaserJet 4500 + HP Color LaserJet 4550 + HP Color LaserJet 4600 + HP Color LaserJet 5 + HP Color LaserJet 5000 + HP Color LaserJet 5500 + HP Color LaserJet 8550GN + HP DeskJet 400 + HP DeskJet 420C + HP DeskJet 450 + HP DeskJet 500 + HP DeskJet 500C + HP DeskJet 505J Plus + HP DeskJet 510 + HP DeskJet 520 + HP DeskJet 540C + HP DeskJet 550C + HP DeskJet 5550 + HP DeskJet 5551 + HP DeskJet 560C + HP DeskJet 600 + HP DeskJet 600C + HP DeskJet 610C + HP DeskJet 610CL + HP DeskJet 6122 + HP DeskJet 6127 + HP DeskJet 612C + HP DeskJet 640C + HP DeskJet 648C + HP DeskJet 660C + HP DeskJet 670C + HP DeskJet 670TV + HP DeskJet 672C + HP DeskJet 680C + HP DeskJet 682C + HP DeskJet 690C + HP DeskJet 692C + HP DeskJet 693C + HP DeskJet 694C + HP DeskJet 695C + HP DeskJet 697C + HP DeskJet 810C + HP DeskJet 812C + HP DeskJet 815C + HP DeskJet 816C + HP DeskJet 825C + HP DeskJet 830C + HP DeskJet 832C + HP DeskJet 840C + HP DeskJet 841C + HP DeskJet 842C + HP DeskJet 843C + HP DeskJet 845C + HP DeskJet 850C + HP DeskJet 855C + HP DeskJet 870C + HP DeskJet 880C + HP DeskJet 882C + HP DeskJet 890C + HP DeskJet 895C + HP DeskJet 916C + HP DeskJet 920C + HP DeskJet 9300 + HP DeskJet 930C + HP DeskJet 932C + HP DeskJet 933C + HP DeskJet 934C + HP DeskJet 935C + HP DeskJet 940C + HP DeskJet 948C + HP DeskJet 950C + HP DeskJet 952C + HP DeskJet 955C + HP DeskJet 957C + HP DeskJet 959C + HP DeskJet 960C + HP DeskJet 970C + HP DeskJet 975C + HP DeskJet 980C + HP DeskJet 990C + HP DeskJet 995C + HP DeskJet 1100C + HP DeskJet 1120C + HP DeskJet 1125C + HP DeskJet 1200C + HP DeskJet 1220C + HP DeskJet 1600C + HP DeskJet 1600CM + HP DeskJet 2000 + HP DeskJet 2500 + HP DeskJet 2500CM + HP DeskJet 340C + HP DeskJet 3810 + HP DeskJet 3816 + HP DeskJet 3820 + HP DeskJet 3822 + HP OfficeJet 300 + HP OfficeJet 330 + HP OfficeJet 350 + HP OfficeJet 500 + HP OfficeJet 520 + HP OfficeJet 570 + HP OfficeJet 580 + HP OfficeJet 590 + HP OfficeJet 600 + HP OfficeJet 610 + HP OfficeJet 625 + HP OfficeJet 630 + HP OfficeJet 635 + HP OfficeJet 700 + HP OfficeJet 710 + HP OfficeJet 720 + HP OfficeJet 725 + HP OfficeJet 5105 + HP OfficeJet 5110 + HP OfficeJet 5110xi + HP OfficeJet 6105 + HP OfficeJet 6110 + HP OfficeJet 7110 + HP OfficeJet 7130 + HP OfficeJet 7140 + HP OfficeJet D125 + HP OfficeJet D135 + HP OfficeJet D145 + HP OfficeJet D155 + HP OfficeJet G55 + HP OfficeJet G85 + HP OfficeJet G95 + HP OfficeJet K60 + HP OfficeJet K60xi + HP OfficeJet K80 + HP OfficeJet K80xi + HP OfficeJet LX + HP OfficeJet Pro 1150C + HP OfficeJet Pro 1170C + HP OfficeJet Pro 1175C + HP OfficeJet R40 + HP OfficeJet R45 + HP OfficeJet R60 + HP OfficeJet R65 + HP OfficeJet R80 + HP OfficeJet T45 + HP OfficeJet T65 + HP OfficeJet V40 + HP OfficeJet V40xi + HP OfficeJet + HP PSC 370 + HP PSC 380 + HP PSC 500 + HP PSC 750 + HP PSC 950 + HP PSC 950xi + HP PSC 2110 + HP PSC 2150 + HP PSC 2210 + HP PhotoSmart 7150 + HP PhotoSmart 7345 + HP PhotoSmart 7350 + HP PhotoSmart 7550 + HP PhotoSmart P100 + HP PhotoSmart P130 + HP PhotoSmart P230 + HP PhotoSmart P1000 + HP PhotoSmart P1100 + HP PhotoSmart P1115 + HP PhotoSmart P1215 + HP PhotoSmart P1218 + HP PhotoSmart P1315 + HP e-printer e20 ================================================================ -IV) EXCEPTIONS AND WORKAROUNDS +III) EXCEPTIONS AND WORKAROUNDS A) GENERAL ISSUES - 1) The Canon, Hewlett-Packard, and Lexmark drivers do not offer all - of the additional options and improvements that the Epson driver - does. We do not have an estimated time for fix. Please contact - us if you would like to assist with this. - - 2) This release is slower than 4.2 in many cases, particularly when - using High Accuracy (which is the default color correction in - most cases) or Bright color correction. It is possible that this - release will not be able to drive some printers at full speed, - particularly if your computer has a slow processor. Performance - has been only partially analyzed or tuned at present. + 1) The Canon, Hewlett-Packard, Lexmark, and dye sublimation drivers + do not offer all of the additional options and improvements that + the Epson driver does. Please contact us if you would like to + assist with this. ---------------- @@ -1256,10 +628,10 @@ B) BUILD/INSTALLATION ISSUES version, the genppd program operated correctly. If instead the output looks like this: - src/cups$ zgrep LanguageVersion ppd/*/stp-pcl-4.5.0.ppd.gz - ppd/C/stp-pcl-4.5.0.ppd.gz:*LanguageVersion: English - ppd/da/stp-pcl-4.5.0.ppd.gz:*LanguageVersion: English - ppd/en_GB/stp-pcl-4.5.0.ppd.gz:*LanguageVersion: English + src/cups$ zgrep LanguageVersion ppd/*/stp-pcl-4.5.1.ppd.gz + ppd/C/stp-pcl-4.5.1.ppd.gz:*LanguageVersion: English + ppd/da/stp-pcl-4.5.1.ppd.gz:*LanguageVersion: English + ppd/en_GB/stp-pcl-4.5.1.ppd.gz:*LanguageVersion: English ... the program did not operate correctly. @@ -1267,7 +639,7 @@ B) BUILD/INSTALLATION ISSUES If you do not have 'zgrep' on your system, you can gunzip the PPD files, and use - grep LanguageVersion ppd/*/stp-pcl-4.5.0.ppd + grep LanguageVersion ppd/*/stp-pcl-4.5.1.ppd to accomplish the same test. @@ -1374,7 +746,7 @@ B) BUILD/INSTALLATION ISSUES 3) There are multiple issues that one must be aware of when using Foomatic with Gutenprint. - i) Before installing any new release of Gutenprint 5.0, you must + i) Before installing any new release of Gutenprint 5.1, you must manually remove any existing Foomatic option files. This is because the Foomatic utility to load data kits (foomatic-kitload) does not remove obsolete data files from @@ -1418,7 +790,7 @@ B) BUILD/INSTALLATION ISSUES Please check the Foomatic site (http://www.openprinting.org/foomatic.html) and the Gutenprint - site (http://gutenprint.sourceforge.net) for updated + site (http://gimp-print.sourceforge.net) for updated instructions about this. ii) Unlike with the CUPS native driver, there is no simple way to @@ -1431,8 +803,8 @@ B) BUILD/INSTALLATION ISSUES iii) The Foomatic data is version locked to the Gutenprint release installed on the system. For example, PPD files generated - with the Foomatic data for release 5.0.0 will not work with - the ijsgutenprint in release 5.0.1. This is to prevent + with the Foomatic data for release 5.1.0 will not work with + the ijsgutenprint in release 5.1.1. This is to prevent accidentally using incorrect data, which could cause incorrect function to take place. @@ -1483,8 +855,8 @@ B) BUILD/INSTALLATION ISSUES ./configure --with-readline=libs (specifies the libraries to be linked against) - An hypothetical (this won't work anywhere!) example of the - latter would be + A hypothetical (this won't work anywhere!) example of the latter + would be ./configure --with-readline='-lncurses -ltermcap' @@ -1494,47 +866,3 @@ B) BUILD/INSTALLATION ISSUES to build, we suggest using --with-readline=no. The commands used within escputil are very short and seldom require significant editing. - - 5) The fix for bug 929227 (Gimp-Print incorrectly attempts to build - against GIMP 2.0) requires special build instructions if you are - using a very old version of the GIMP 1.2 (1.2.0, 1.2.1, or - 1.2.2). Specifically, you must set GIMPTOOL in the environment - to point to the proper version of gimptool when running - Gutenprint's configure script. For example: - - GIMPTOOL=/usr/bin/gimptool ./configure - - The bug fix involves checking for the presence of the GIMP - slightly differently from how it was previously done. - Previously, Gimp-Print checked for the presence of a program - named "gimptool", which provides information about how to build - plugins against the GIMP. This worked correctly when only the - GIMP 1.2 was installed, but not when the GIMP 2.0 was installed. - - The GIMP 2.0 actually installs a program named "gimptool-2.0", - and creates a symbolic link named "gimptool" pointing to it. - Later versions of the GIMP 1.2 (1.2.3, 1.2.4, 1.2.5, and any - later versions that may be released) similarly create a program - named "gimptool-1.2" and a symbolic link named "gimptool". As - the configure script prior to this bug fix simply checked for - gimptool, it incorrectly detected a gimptool from the GIMP 2.0. - - The current configure script checks first for gimptool-1.2 and - then for gimptool, and only accepts the use of a GIMP 1.2 version - of one of these programs. However, if you have one of the older - versions of the GIMP 1.2 installed in a non-standard location, - and you use --with-gimp-prefix or --with-gimp-exec-prefix to - specify its location, the configure script will not automatically - detect the correct location of gimptool, and you must specify it - as described above. Note that you must specify a copy of - gimptool from the GIMP 1.2, not from the GIMP 2.0. If your copy - of the GIMP is installed in a standard location (typically - /usr/bin or /usr/local/bin), you do not need to use - --with-gimp-prefix or --with-gimp-exec-prefix, and therefore do - not need to use this workaround. - - If you cannot upgrade to the GIMP 2.x, the Gutenprint and GIMP - projects recommend upgrading to revision of the GIMP 1.2.5, which - 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. diff --git a/README b/README index dc2d1bb..6dda7b8 100644 --- a/README +++ b/README @@ -1,21 +1,26 @@ -Welcome to Gutenprint 5.0.2! Please read these notes carefully. +Welcome to Gutenprint 5.2.0-beta2! Please read these notes carefully. + +*** NOTE TO PACKAGERS: This is a beta release of the forthcoming 5.2 + stable release. As of 5.2 and until further notice, Gutenprint + will no longer deliver separate "development" and "stable" release + series. ================================================================ I) INTRODUCTION - This is Gutenprint version 5.0.2, a 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. + This is Gutenprint version 5.2.0-beta2, a beta release of + Gutenprint 5.2. 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 GIMP. While this package started out as the Print plugin for @@ -115,7 +120,7 @@ A) OVERVIEW gimp-print-devel@lists.sourceforge.net ================================================================ - Release: gutenprint 5.0.2 generated on 29 Dec 2007 + Release: gutenprint 5.1.98.1 generated on 12 Apr 2008 Features: Build CUPS: yes, installing in /usr @@ -127,9 +132,7 @@ A) OVERVIEW Build Foomatic data: yes Build Foomatic 3.x data: yes Build enhanced Print plugin for GIMP: yes - Build GIMP 1.2 plugin: yes - Build GIMP 2.x plugin: yes - GIMP 2.x plugin will be named: gutenprint + GIMP plugin will be named: gutenprint Install plugin(s) in home directory: no Build EPSON Stylus utility: yes Build test programs: yes @@ -139,12 +142,12 @@ A) OVERVIEW 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.2/xml - Module directory: /usr/local/lib/gutenprint/5.0.2/modules + XML data directory: /usr/local/share/gutenprint/5.1/xml + Module directory: /usr/local/lib/gutenprint/5.1/modules Install sample images: yes General configuration: - Compiler options: -Disfinite=finite -O6 -Wall -Wcast-align -Wstrict-prototypes -Wmissing-prototypes -Wmissing-declarations -Wnested-externs -Wwrite-strings -Werror-implicit-function-declaration -Winline -Wformat=2 -finline-limit=1048576 -pedantic -Waggregate-return -Wcast-qual -Wshadow -Wredundant-decls + Compiler options: -Disfinite=finite -O6 -Wall -Wcast-align -Wstrict-prototypes -Wmissing-prototypes -Wmissing-declarations -Wnested-externs -Wwrite-strings -Werror-implicit-function-declaration -Winline -Wformat=2 -finline-limit=131072 -pedantic -Waggregate-return -Wcast-qual -Wshadow -Wredundant-decls Build static libraries: yes Build shared libraries: no Maintainer mode: yes @@ -155,7 +158,6 @@ A) OVERVIEW 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 @@ -195,14 +197,12 @@ B) CORE DRIVER LIBRARY 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. + * Gutenprint permits installation of Gimp-Print 4.2 and Gutenprint + 5.0 alongside Gutenprint 5.2, and in the future will permit + concurrent installation of different stable versions of + Gutenprint with different minor version numbers. Therefore, you + should consider allowing Gutenprint 5.0, Gutenprint 5.2, and + Gimp-Print 4.2 to be installed concurrently. * The core driver library component also includes locale files for the libary and documentation. @@ -215,7 +215,7 @@ 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 + information may be found at http://www.cups.org. Gutenprint 5.2 requires CUPS 1.1.9 or higher. We recommend use of 1.1.15 or above; that release of CUPS fixes some important bugs. Gutenprint supports CUPS 1.2, and supports the CUPS 1.2 enhancements, @@ -233,13 +233,13 @@ B) CUPS (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. + Installing the CUPS driver for Gutenprint 5.2 will not interfere + with your ability to continue using the Gutenprint 5.0 or + Gimp-Print 4.2 CUPS driver. The Gutenprint CUPS driver consists of the following components: - * The core Gutenprint CUPS driver, rastertogutenprint.5.0. This + * The core Gutenprint CUPS driver, rastertogutenprint.5.2. This is a CUPS filter that converts CUPS raster data into printer-specific data. This is most commonly installed in /usr/lib/cups/filter. @@ -256,16 +256,25 @@ B) CUPS /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.2 with Gutenprint 5.0.1. + Gutenprint 5.0.0 with Gutenprint 5.2.0. + + If you are using CUPS 1.2 or above, these PPD files are not + actually installed by default. Instead, a CUPS driver generates + these PPD files on demand. * A utility to update PPD files from an earlier release of - Gutenprint, cups-genppdupdate.5.0. This utility may be used to + Gutenprint, cups-genppdupdate. 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 generate PPD files, cups-genppd.5.2. Normally this + is only required when the package is built, and only with CUPS + 1.1. + + * A driver to generate PPD files on the fly, gutenprint.5.2. This + is normally used to generate PPD files on the fly with CUPS 1.2 + and above. * A utility to permit additional color calibration for Gutenprint-supported printers, cups-calibrate. This is normally @@ -357,14 +366,14 @@ B) CUPS sudo /System/Library/StartupItems/PrintingServices/PrintingServices.sh restart You may optionally choose to update your existing PPD files using - the command cups-genppdupdate.5.0, after which you should restart - CUPS as described above. We strongly recommend use of this update + the command cups-genppdupdate, 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 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 + Gimp-Print 4.2 PPD files. However, you may install Gutenprint 5.2 alongside Gimp-Print 4.2, and use both Gimp-Print 4.2 and - Gutenprint 5.0 drivers concurrently in separate printer queues. + Gutenprint 5.2 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 permanently use both drivers for different printer queues. @@ -387,7 +396,7 @@ B) CUPS --enable-simplified-cups-ppds - Gutenprint 5.0 offers an option of creating simplified PPD + Gutenprint 5.2 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 @@ -395,6 +404,9 @@ B) CUPS If --enable-simplified-cups-ppds=only is specified, only the simplified PPD files are built. + If the new dynamic PPD file generation is used with CUPS 1.2, + the simplified PPD files are always offered. + --disable-cups-level3-ppds By default, the Gutenprint PPD files are configured for @@ -408,7 +420,7 @@ B) CUPS --disable-cups-ppds-at-top-level Normally, the PPD files are placed in - /usr/share/cups/model/gutenprint/5.0. If this option is used, + /usr/share/cups/model/gutenprint/5.2. 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. @@ -424,16 +436,16 @@ B) CUPS NOTES TO PACKAGERS: * We recommend that your installation package run - cups-genppdupdate.5.0 and restart CUPS as part of the - installation process. + cups-genppdupdate and restart CUPS as part of the installation + process. * 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. + (e. g. rastertogutenprint and 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. ---------------- @@ -469,7 +481,7 @@ C) FOOMATIC 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 + The Ghostscript driver in Gutenprint 5.2 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 @@ -480,11 +492,11 @@ C) FOOMATIC maintain and required a complex procedure to integrate with Ghostscript. - Gutenprint 5.0 offers two Foomatic drivers, one supporting the + Gutenprint 5.2 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 + "gutenprint-ijs.5.2"; the simplified driver is named + "gutenprint-ijs-simplified.5.2". This allows Gutenprint 5.2 to coexist with Gimp-Print 4.2; both drivers may be installed and used (on separate printer queues, of course) on the same system. @@ -506,7 +518,7 @@ C) FOOMATIC NOTES TO PACKAGERS: * We recommend packaging the IJS driver - (/usr/bin/ijsgutenprint.5.0) and its man page + (/usr/bin/ijsgutenprint.5.2) and its man page (/usr/man/man1/ijsgutenprint.1.gz) together with the Foomatic data. @@ -520,19 +532,18 @@ C) FOOMATIC D) GIMP - Gutenprint may be used with an enhanced Print plug-in for GIMP, - providing the ability to print images. If you wish to do so, you - must use 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 GIMP. + Gutenprint may be used with an enhanced Print plug-in for GIMP + (2.0 and above), providing the ability to print images. 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 GIMP. Gutenprint 5.2 no longer supports + GIMP 1.2. The enhanced Print plugin for GIMP replaces the Gimp-Print 4.2-based plugin provided with GIMP 2.0 and 2.2. As of the GIMP 2.4, 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. + but does not provide all of the new Gutenprint 5.2 features. Therefore, the enhanced Print plugin for GIMP distributed with Gutenprint does not replace that plugin, but is installed alongside that plugin. @@ -554,25 +565,18 @@ D) GIMP ./configure --enable-user-install - It is not possible for Gimp-Print 4.2 and Gutenprint 5.1 (or any + It is not possible for Gimp-Print 4.2 and Gutenprint 5.2 (or any future release) to coexist in the same installation of GIMP. The - Gutenprint 5.0-based plugin can read settings from previous + Gutenprint 5.2-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. - - 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 and be removed from the Gutenprint - distribution. + Gutenprint 5.2 cannot be read by older versions of Gimp-Print. NOTE TO PACKAGERS: * The enhanced 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.1 version of the Print + Gimp-Print 4.2 and the Gutenprint 5.2 version of the Print plugin, as they use different configuration file formats. @@ -629,10 +633,10 @@ A) PRINTER INSTALLATION driver, so you may find more than one PPD file for your printer. Gutenprint PPD files are described as - 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.2 - Epson Stylus Photo R300 - CUPS+Gutenprint v5.0.2 Simplified + Epson Stylus Photo R300 Foomatic/gutenprint-ijs.5.2 + Epson Stylus Photo R300 Foomatic/gutenprint-ijs-simplified.5.2 + Epson Stylus Photo R300 - CUPS+Gutenprint v5.2.0 + Epson Stylus Photo R300 - CUPS+Gutenprint v5.2.0 Simplified The "simplified" PPD files offer a basic set of options only, for selecting printer options, standard paper sizes, and basic quality @@ -644,7 +648,7 @@ A) PRINTER INSTALLATION 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. + updated with cups-genppdupdate. Other PPD files are described differently, such as @@ -662,20 +666,20 @@ A) PRINTER INSTALLATION 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.1 will not - work with driver version 5.0.2. You can identify printers using + 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.2(en) + EPSON Stylus Photo EX - CUPS+Gutenprint v5.2.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. + wish to update PPD files manually; if you use cups-genppdupdate, + you do not need to do this. Starting with CUPS 1.1.11, you cannot choose an AppSocket connection and enter "usb:/dev/usblp0" or the like as the URI; you diff --git a/aclocal.m4 b/aclocal.m4 index eb3d8af..d7f1202 100644 --- a/aclocal.m4 +++ b/aclocal.m4 @@ -16,398 +16,6 @@ m4_if(m4_PACKAGE_VERSION, [2.61],, You have another version of autoconf. If you want to use that, you should regenerate the build system entirely.], [63])]) -# Configure paths for GLIB -# Owen Taylor 97-11-3 - -dnl AM_PATH_GLIB([MINIMUM-VERSION, [ACTION-IF-FOUND [, ACTION-IF-NOT-FOUND [, MODULES]]]]) -dnl Test for GLIB, and define GLIB_CFLAGS and GLIB_LIBS, if "gmodule" or -dnl gthread is specified in MODULES, pass to glib-config -dnl -AC_DEFUN([AM_PATH_GLIB], -[dnl -dnl Get the cflags and libraries from the glib-config script -dnl -AC_ARG_WITH(glib-prefix,[ --with-glib-prefix=PFX Prefix where GLIB is installed (optional)], - glib_config_prefix="$withval", glib_config_prefix="") -AC_ARG_WITH(glib-exec-prefix,[ --with-glib-exec-prefix=PFX Exec prefix where GLIB is installed (optional)], - glib_config_exec_prefix="$withval", glib_config_exec_prefix="") -AC_ARG_ENABLE(glibtest, [ --disable-glibtest Do not try to compile and run a test GLIB program], - , enable_glibtest=yes) - - if test x$glib_config_exec_prefix != x ; then - glib_config_args="$glib_config_args --exec-prefix=$glib_config_exec_prefix" - if test x${GLIB_CONFIG+set} != xset ; then - GLIB_CONFIG=$glib_config_exec_prefix/bin/glib-config - fi - fi - if test x$glib_config_prefix != x ; then - glib_config_args="$glib_config_args --prefix=$glib_config_prefix" - if test x${GLIB_CONFIG+set} != xset ; then - GLIB_CONFIG=$glib_config_prefix/bin/glib-config - fi - fi - - for module in . $4 - do - case "$module" in - gmodule) - glib_config_args="$glib_config_args gmodule" - ;; - gthread) - glib_config_args="$glib_config_args gthread" - ;; - esac - done - - AC_PATH_PROG(GLIB_CONFIG, glib-config, no) - min_glib_version=ifelse([$1], ,0.99.7,$1) - AC_MSG_CHECKING(for GLIB - version >= $min_glib_version) - no_glib="" - if test "$GLIB_CONFIG" = "no" ; then - no_glib=yes - else - GLIB_CFLAGS=`$GLIB_CONFIG $glib_config_args --cflags` - GLIB_LIBS=`$GLIB_CONFIG $glib_config_args --libs` - glib_config_major_version=`$GLIB_CONFIG $glib_config_args --version | \ - sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\1/'` - glib_config_minor_version=`$GLIB_CONFIG $glib_config_args --version | \ - sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\2/'` - glib_config_micro_version=`$GLIB_CONFIG $glib_config_args --version | \ - sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\3/'` - if test "x$enable_glibtest" = "xyes" ; then - ac_save_CFLAGS="$CFLAGS" - ac_save_LIBS="$LIBS" - CFLAGS="$CFLAGS $GLIB_CFLAGS" - LIBS="$GLIB_LIBS $LIBS" -dnl -dnl Now check if the installed GLIB is sufficiently new. (Also sanity -dnl checks the results of glib-config to some extent -dnl - rm -f conf.glibtest - AC_TRY_RUN([ -#include -#include -#include - -int -main () -{ - int major, minor, micro; - char *tmp_version; - - system ("touch conf.glibtest"); - - /* HP/UX 9 (%@#!) writes to sscanf strings */ - tmp_version = g_strdup("$min_glib_version"); - if (sscanf(tmp_version, "%d.%d.%d", &major, &minor, µ) != 3) { - printf("%s, bad version string\n", "$min_glib_version"); - exit(1); - } - - if ((glib_major_version != $glib_config_major_version) || - (glib_minor_version != $glib_config_minor_version) || - (glib_micro_version != $glib_config_micro_version)) - { - printf("\n*** 'glib-config --version' returned %d.%d.%d, but GLIB (%d.%d.%d)\n", - $glib_config_major_version, $glib_config_minor_version, $glib_config_micro_version, - glib_major_version, glib_minor_version, glib_micro_version); - printf ("*** was found! If glib-config was correct, then it is best\n"); - printf ("*** to remove the old version of GLIB. You may also be able to fix the error\n"); - printf("*** by modifying your LD_LIBRARY_PATH enviroment variable, or by editing\n"); - printf("*** /etc/ld.so.conf. Make sure you have run ldconfig if that is\n"); - printf("*** required on your system.\n"); - printf("*** If glib-config was wrong, set the environment variable GLIB_CONFIG\n"); - printf("*** to point to the correct copy of glib-config, and remove the file config.cache\n"); - printf("*** before re-running configure\n"); - } - else if ((glib_major_version != GLIB_MAJOR_VERSION) || - (glib_minor_version != GLIB_MINOR_VERSION) || - (glib_micro_version != GLIB_MICRO_VERSION)) - { - printf("*** GLIB header files (version %d.%d.%d) do not match\n", - GLIB_MAJOR_VERSION, GLIB_MINOR_VERSION, GLIB_MICRO_VERSION); - printf("*** library (version %d.%d.%d)\n", - glib_major_version, glib_minor_version, glib_micro_version); - } - else - { - if ((glib_major_version > major) || - ((glib_major_version == major) && (glib_minor_version > minor)) || - ((glib_major_version == major) && (glib_minor_version == minor) && (glib_micro_version >= micro))) - { - return 0; - } - else - { - printf("\n*** An old version of GLIB (%d.%d.%d) was found.\n", - glib_major_version, glib_minor_version, glib_micro_version); - printf("*** You need a version of GLIB newer than %d.%d.%d. The latest version of\n", - major, minor, micro); - printf("*** GLIB is always available from ftp://ftp.gtk.org.\n"); - printf("***\n"); - printf("*** If you have already installed a sufficiently new version, this error\n"); - printf("*** probably means that the wrong copy of the glib-config shell script is\n"); - printf("*** being found. The easiest way to fix this is to remove the old version\n"); - printf("*** of GLIB, but you can also set the GLIB_CONFIG environment to point to the\n"); - printf("*** correct copy of glib-config. (In this case, you will have to\n"); - printf("*** modify your LD_LIBRARY_PATH enviroment variable, or edit /etc/ld.so.conf\n"); - printf("*** so that the correct libraries are found at run-time))\n"); - } - } - return 1; -} -],, no_glib=yes,[echo $ac_n "cross compiling; assumed OK... $ac_c"]) - CFLAGS="$ac_save_CFLAGS" - LIBS="$ac_save_LIBS" - fi - fi - if test "x$no_glib" = x ; then - AC_MSG_RESULT(yes) - ifelse([$2], , :, [$2]) - else - AC_MSG_RESULT(no) - if test "$GLIB_CONFIG" = "no" ; then - echo "*** The glib-config script installed by GLIB could not be found" - echo "*** If GLIB was installed in PREFIX, make sure PREFIX/bin is in" - echo "*** your path, or set the GLIB_CONFIG environment variable to the" - echo "*** full path to glib-config." - else - if test -f conf.glibtest ; then - : - else - echo "*** Could not run GLIB test program, checking why..." - CFLAGS="$CFLAGS $GLIB_CFLAGS" - LIBS="$LIBS $GLIB_LIBS" - AC_TRY_LINK([ -#include -#include -], [ return ((glib_major_version) || (glib_minor_version) || (glib_micro_version)); ], - [ echo "*** The test program compiled, but did not run. This usually means" - echo "*** that the run-time linker is not finding GLIB or finding the wrong" - echo "*** version of GLIB. If it is not finding GLIB, you'll need to set your" - echo "*** LD_LIBRARY_PATH environment variable, or edit /etc/ld.so.conf to point" - echo "*** to the installed location Also, make sure you have run ldconfig if that" - echo "*** is required on your system" - echo "***" - echo "*** If you have an old version installed, it is best to remove it, although" - echo "*** you may also be able to get things to work by modifying LD_LIBRARY_PATH" - echo "***" - echo "*** If you have a RedHat 5.0 system, you should remove the GTK package that" - echo "*** came with the system with the command" - echo "***" - echo "*** rpm --erase --nodeps gtk gtk-devel" ], - [ echo "*** The test program failed to compile or link. See the file config.log for the" - echo "*** exact error that occured. This usually means GLIB was incorrectly installed" - echo "*** or that you have moved GLIB since it was installed. In the latter case, you" - echo "*** may want to edit the glib-config script: $GLIB_CONFIG" ]) - CFLAGS="$ac_save_CFLAGS" - LIBS="$ac_save_LIBS" - fi - fi - GLIB_CFLAGS="" - GLIB_LIBS="" - ifelse([$3], , :, [$3]) - fi - AC_SUBST(GLIB_CFLAGS) - AC_SUBST(GLIB_LIBS) - rm -f conf.glibtest -]) - -# Configure paths for GTK+ -# Owen Taylor 97-11-3 - -dnl AM_PATH_GTK([MINIMUM-VERSION, [ACTION-IF-FOUND [, ACTION-IF-NOT-FOUND [, MODULES]]]]) -dnl Test for GTK, and define GTK_CFLAGS and GTK_LIBS -dnl -AC_DEFUN([AM_PATH_GTK], -[dnl -dnl Get the cflags and libraries from the gtk-config script -dnl -AC_ARG_WITH(gtk-prefix,[ --with-gtk-prefix=PFX Prefix where GTK is installed (optional)], - gtk_config_prefix="$withval", gtk_config_prefix="") -AC_ARG_WITH(gtk-exec-prefix,[ --with-gtk-exec-prefix=PFX Exec prefix where GTK is installed (optional)], - gtk_config_exec_prefix="$withval", gtk_config_exec_prefix="") -AC_ARG_ENABLE(gtktest, [ --disable-gtktest Do not try to compile and run a test GTK program], - , enable_gtktest=yes) - - for module in . $4 - do - case "$module" in - gthread) - gtk_config_args="$gtk_config_args gthread" - ;; - esac - done - - if test x$gtk_config_exec_prefix != x ; then - gtk_config_args="$gtk_config_args --exec-prefix=$gtk_config_exec_prefix" - if test x${GTK_CONFIG+set} != xset ; then - GTK_CONFIG=$gtk_config_exec_prefix/bin/gtk-config - fi - fi - if test x$gtk_config_prefix != x ; then - gtk_config_args="$gtk_config_args --prefix=$gtk_config_prefix" - if test x${GTK_CONFIG+set} != xset ; then - GTK_CONFIG=$gtk_config_prefix/bin/gtk-config - fi - fi - - AC_PATH_PROG(GTK_CONFIG, gtk-config, no) - min_gtk_version=ifelse([$1], ,0.99.7,$1) - AC_MSG_CHECKING(for GTK - version >= $min_gtk_version) - no_gtk="" - if test "$GTK_CONFIG" = "no" ; then - no_gtk=yes - else - GTK_CFLAGS=`$GTK_CONFIG $gtk_config_args --cflags` - GTK_LIBS=`$GTK_CONFIG $gtk_config_args --libs` - gtk_config_major_version=`$GTK_CONFIG $gtk_config_args --version | \ - sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\1/'` - gtk_config_minor_version=`$GTK_CONFIG $gtk_config_args --version | \ - sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\2/'` - gtk_config_micro_version=`$GTK_CONFIG $gtk_config_args --version | \ - sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\3/'` - if test "x$enable_gtktest" = "xyes" ; then - ac_save_CFLAGS="$CFLAGS" - ac_save_LIBS="$LIBS" - CFLAGS="$CFLAGS $GTK_CFLAGS" - LIBS="$GTK_LIBS $LIBS" -dnl -dnl Now check if the installed GTK is sufficiently new. (Also sanity -dnl checks the results of gtk-config to some extent -dnl - rm -f conf.gtktest - AC_TRY_RUN([ -#include -#include -#include - -int -main () -{ - int major, minor, micro; - char *tmp_version; - - system ("touch conf.gtktest"); - - /* HP/UX 9 (%@#!) writes to sscanf strings */ - tmp_version = g_strdup("$min_gtk_version"); - if (sscanf(tmp_version, "%d.%d.%d", &major, &minor, µ) != 3) { - printf("%s, bad version string\n", "$min_gtk_version"); - exit(1); - } - - if ((gtk_major_version != $gtk_config_major_version) || - (gtk_minor_version != $gtk_config_minor_version) || - (gtk_micro_version != $gtk_config_micro_version)) - { - printf("\n*** 'gtk-config --version' returned %d.%d.%d, but GTK+ (%d.%d.%d)\n", - $gtk_config_major_version, $gtk_config_minor_version, $gtk_config_micro_version, - gtk_major_version, gtk_minor_version, gtk_micro_version); - printf ("*** was found! If gtk-config was correct, then it is best\n"); - printf ("*** to remove the old version of GTK+. You may also be able to fix the error\n"); - printf("*** by modifying your LD_LIBRARY_PATH enviroment variable, or by editing\n"); - printf("*** /etc/ld.so.conf. Make sure you have run ldconfig if that is\n"); - printf("*** required on your system.\n"); - printf("*** If gtk-config was wrong, set the environment variable GTK_CONFIG\n"); - printf("*** to point to the correct copy of gtk-config, and remove the file config.cache\n"); - printf("*** before re-running configure\n"); - } -#if defined (GTK_MAJOR_VERSION) && defined (GTK_MINOR_VERSION) && defined (GTK_MICRO_VERSION) - else if ((gtk_major_version != GTK_MAJOR_VERSION) || - (gtk_minor_version != GTK_MINOR_VERSION) || - (gtk_micro_version != GTK_MICRO_VERSION)) - { - printf("*** GTK+ header files (version %d.%d.%d) do not match\n", - GTK_MAJOR_VERSION, GTK_MINOR_VERSION, GTK_MICRO_VERSION); - printf("*** library (version %d.%d.%d)\n", - gtk_major_version, gtk_minor_version, gtk_micro_version); - } -#endif /* defined (GTK_MAJOR_VERSION) ... */ - else - { - if ((gtk_major_version > major) || - ((gtk_major_version == major) && (gtk_minor_version > minor)) || - ((gtk_major_version == major) && (gtk_minor_version == minor) && (gtk_micro_version >= micro))) - { - return 0; - } - else - { - printf("\n*** An old version of GTK+ (%d.%d.%d) was found.\n", - gtk_major_version, gtk_minor_version, gtk_micro_version); - printf("*** You need a version of GTK+ newer than %d.%d.%d. The latest version of\n", - major, minor, micro); - printf("*** GTK+ is always available from ftp://ftp.gtk.org.\n"); - printf("***\n"); - printf("*** If you have already installed a sufficiently new version, this error\n"); - printf("*** probably means that the wrong copy of the gtk-config shell script is\n"); - printf("*** being found. The easiest way to fix this is to remove the old version\n"); - printf("*** of GTK+, but you can also set the GTK_CONFIG environment to point to the\n"); - printf("*** correct copy of gtk-config. (In this case, you will have to\n"); - printf("*** modify your LD_LIBRARY_PATH enviroment variable, or edit /etc/ld.so.conf\n"); - printf("*** so that the correct libraries are found at run-time))\n"); - } - } - return 1; -} -],, no_gtk=yes,[echo $ac_n "cross compiling; assumed OK... $ac_c"]) - CFLAGS="$ac_save_CFLAGS" - LIBS="$ac_save_LIBS" - fi - fi - if test "x$no_gtk" = x ; then - AC_MSG_RESULT(yes) - ifelse([$2], , :, [$2]) - else - AC_MSG_RESULT(no) - if test "$GTK_CONFIG" = "no" ; then - echo "*** The gtk-config script installed by GTK could not be found" - echo "*** If GTK was installed in PREFIX, make sure PREFIX/bin is in" - echo "*** your path, or set the GTK_CONFIG environment variable to the" - echo "*** full path to gtk-config." - else - if test -f conf.gtktest ; then - : - else - echo "*** Could not run GTK test program, checking why..." - CFLAGS="$CFLAGS $GTK_CFLAGS" - LIBS="$LIBS $GTK_LIBS" - AC_TRY_LINK([ -#include -#include -], [ return ((gtk_major_version) || (gtk_minor_version) || (gtk_micro_version)); ], - [ echo "*** The test program compiled, but did not run. This usually means" - echo "*** that the run-time linker is not finding GTK or finding the wrong" - echo "*** version of GTK. If it is not finding GTK, you'll need to set your" - echo "*** LD_LIBRARY_PATH environment variable, or edit /etc/ld.so.conf to point" - echo "*** to the installed location Also, make sure you have run ldconfig if that" - echo "*** is required on your system" - echo "***" - echo "*** If you have an old version installed, it is best to remove it, although" - echo "*** you may also be able to get things to work by modifying LD_LIBRARY_PATH" - echo "***" - echo "*** If you have a RedHat 5.0 system, you should remove the GTK package that" - echo "*** came with the system with the command" - echo "***" - echo "*** rpm --erase --nodeps gtk gtk-devel" ], - [ echo "*** The test program failed to compile or link. See the file config.log for the" - echo "*** exact error that occured. This usually means GTK was incorrectly installed" - echo "*** or that you have moved GTK since it was installed. In the latter case, you" - echo "*** may want to edit the gtk-config script: $GTK_CONFIG" ]) - CFLAGS="$ac_save_CFLAGS" - LIBS="$ac_save_LIBS" - fi - fi - GTK_CFLAGS="" - GTK_LIBS="" - ifelse([$3], , :, [$3]) - fi - AC_SUBST(GTK_CFLAGS) - AC_SUBST(GTK_LIBS) - rm -f conf.gtktest -]) - # libtool.m4 - Configure libtool for the host system. -*-Autoconf-*- # serial 51 AC_PROG_LIBTOOL @@ -7041,16 +6649,14 @@ 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 +[if test -n "$$1"; then + pkg_cv_[]$1="$$1" + elif test -n "$PKG_CONFIG"; then + PKG_CHECK_EXISTS([$3], + [pkg_cv_[]$1=`$PKG_CONFIG --[]$2 "$3" 2>/dev/null`], + [pkg_failed=yes]) + else + pkg_failed=untried fi[]dnl ])# _PKG_CONFIG @@ -7094,9 +6700,9 @@ 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"` + $1[]_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "$2" 2>&1` else - $1[]_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "$2"` + $1[]_PKG_ERRORS=`$PKG_CONFIG --print-errors "$2" 2>&1` fi # Put the nasty error message in config.log where it belongs echo "$$1[]_PKG_ERRORS" >&AS_MESSAGE_LOG_FD @@ -7121,7 +6727,7 @@ path to pkg-config. _PKG_TEXT -To get pkg-config, see .])], +To get pkg-config, see .])], [$4]) else $1[]_CFLAGS=$pkg_cv_[]$1[]_CFLAGS @@ -8112,7 +7718,6 @@ AC_SUBST([am__untar]) ]) # _AM_PROG_TAR m4_include([m4/gettext.m4]) -m4_include([m4/gimp.m4]) m4_include([m4/iconv.m4]) m4_include([m4/isc-posix.m4]) m4_include([m4/lib-ld.m4]) diff --git a/configure b/configure index f435330..de9cde8 100755 --- a/configure +++ b/configure @@ -1,7 +1,7 @@ #! /bin/sh -# From configure.ac Revision: 1.151.2.5 . +# From configure.ac Revision: 1.180 . # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.61 for gutenprint 5.0.2. +# Generated by GNU Autoconf 2.61 for gutenprint 5.1.98.2. # # Report bugs to . # @@ -746,8 +746,8 @@ SHELL=${CONFIG_SHELL-/bin/sh} # Identity of this package. PACKAGE_NAME='gutenprint' PACKAGE_TARNAME='gutenprint' -PACKAGE_VERSION='5.0.2' -PACKAGE_STRING='gutenprint 5.0.2' +PACKAGE_VERSION='5.1.98.2' +PACKAGE_STRING='gutenprint 5.1.98.2' PACKAGE_BUGREPORT='gimp-print-devel@lists.sourceforge.net' ac_unique_file="src/main/print-vars.c" @@ -831,9 +831,6 @@ 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 @@ -911,10 +908,6 @@ CUPS_CONFIG FOOMATIC_CONFIGURE FOOMATIC_PPDFILE IJS_CONFIG -GIMPTOOL_CHECK -GTK_CONFIG -GTK_CFLAGS -GTK_LIBS GIMPTOOL2_CHECK PKG_CONFIG GTK2_CFLAGS @@ -954,16 +947,6 @@ 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 @@ -990,12 +973,8 @@ 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 @@ -1025,15 +1004,10 @@ 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 @@ -1041,9 +1015,6 @@ GUTENPRINTUI2_VERSION gutenprint_cflags gutenprint_libs gutenprint_libdeps -gutenprintui_cflags -gutenprintui_libs -gutenprintui_libdeps gutenprintui2_cflags gutenprintui2_libs gutenprintui2_libdeps @@ -1580,7 +1551,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.2 to adapt to many kinds of systems. +\`configure' configures gutenprint 5.1.98.2 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1650,7 +1621,7 @@ fi if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of gutenprint 5.0.2:";; + short | recursive ) echo "Configuration of gutenprint 5.1.98.2:";; esac cat <<\_ACEOF @@ -1684,10 +1655,6 @@ Optional Features: --disable-static-genppd! [(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 - --enable-libgutenprintui - build Gutenprint GTK+-1.2 user interface library - [(automatic)] --enable-libgutenprintui2 build Gutenprint GTK+-2.0 user interface library [(automatic)] @@ -1698,8 +1665,6 @@ Optional Features: --enable-user-install install GIMP plugin in home directory [no] --disable-rpath do not hardcode runtime library paths --disable-nls do not use Native Language Support - --disable-glibtest Do not try to compile and run a test GLIB program - --disable-gimptest Do not try to compile and run a test GIMP 1.2 program Optional Packages: --with-PACKAGE[=ARG] use PACKAGE [ARG=yes] @@ -1717,9 +1682,6 @@ Optional Packages: static) [(automatic)] --with-readline use readline (default tries -lncurses, -lcurses, -ltermcap) [yes] - --with-gtk-prefix=PFX Prefix where GTK is installed (optional) - --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.x Print plugin [(automatic)] --with-gimp2-as-gutenprint name GIMP 2.x Print plugin gutenprint (requires GIMP @@ -1730,10 +1692,6 @@ Optional Packages: --without-libiconv-prefix don't search for libiconv in includedir and libdir --with-libintl-prefix=DIR search for libintl in DIR/include and DIR/lib --without-libintl-prefix don't search for libintl in includedir and libdir - --with-glib-prefix=PFX Prefix where GLIB is installed (optional) - --with-glib-exec-prefix=PFX Exec prefix where GLIB is installed (optional) - --with-gimp-prefix=PFX Prefix where GIMP 1.2 is installed (optional) - --with-gimp-exec-prefix=PFX Exec prefix where GIMP 1.2 is installed (optional) Some influential environment variables: CC C compiler command @@ -1825,7 +1783,7 @@ fi test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -gutenprint configure 5.0.2 +gutenprint configure 5.1.98.2 generated by GNU Autoconf 2.61 Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001, @@ -1856,7 +1814,7 @@ cat >config.log <<_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.2, which was +It was created by gutenprint $as_me 5.1.98.2, which was generated by GNU Autoconf 2.61. Invocation command line was $ $0 $@ @@ -2247,16 +2205,13 @@ ac_configure="$SHELL $ac_aux_dir/configure" # Please don't use this var. GUTENPRINT_MAJOR_VERSION=5 -GUTENPRINT_MINOR_VERSION=0 -GUTENPRINT_MICRO_VERSION=2 -GUTENPRINT_EXTRA_VERSION= +GUTENPRINT_MINOR_VERSION=1 +GUTENPRINT_MICRO_VERSION=98 +GUTENPRINT_EXTRA_VERSION=.2 GUTENPRINT_CURRENT_INTERFACE=2 GUTENPRINT_INTERFACE_AGE=0 GUTENPRINT_BINARY_AGE=0 -GUTENPRINT_VERSION=5.0.2 -GUTENPRINTUI_CURRENT_INTERFACE=1 -GUTENPRINTUI_INTERFACE_AGE=0 -GUTENPRINTUI_BINARY_AGE=0 +GUTENPRINT_VERSION=5.1.98.2 GUTENPRINTUI2_CURRENT_INTERFACE=1 GUTENPRINTUI2_INTERFACE_AGE=0 GUTENPRINTUI2_BINARY_AGE=0 @@ -2275,12 +2230,6 @@ GUTENPRINTUI2_BINARY_AGE=0 - - - - - - @@ -2600,7 +2549,7 @@ fi # Define the identity of the package. PACKAGE='gutenprint' - VERSION='5.0.2' + VERSION='5.1.98.2' cat >>confdefs.h <<_ACEOF @@ -2833,13 +2782,10 @@ echo "${ECHO_T}$am_cv_prog_tar_ustar" >&6; } GUTENPRINT_LIBS="-lgutenprint" -GUTENPRINTUI_LIBS="-lgutenprintui" GUTENPRINTUI2_LIBS="-lgutenprintui2" gutenprint_version=${GUTENPRINT_VERSION} -gutenprintui_version=${GUTENPRINT_VERSION} gutenprintui2_version=${GUTENPRINT_VERSION} -GUTENPRINTUI_LIBDEPS="${GUTENPRINTUI_LIBDEPS} \$(GUTENPRINT_LIBS)" GUTENPRINTUI2_LIBDEPS="${GUTENPRINTUI2_LIBDEPS} \$(GUTENPRINT_LIBS)" ac_config_headers="$ac_config_headers config.h" @@ -4750,7 +4696,7 @@ ia64-*-hpux*) ;; *-*-irix6*) # Find out which ABI we are using. - echo '#line 4753 "configure"' > conftest.$ac_ext + echo '#line 4699 "configure"' > conftest.$ac_ext if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? @@ -7492,11 +7438,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:7495: $lt_compile\"" >&5) + (eval echo "\"\$as_me:7441: $lt_compile\"" >&5) (eval "$lt_compile" 2>conftest.err) ac_status=$? cat conftest.err >&5 - echo "$as_me:7499: \$? = $ac_status" >&5 + echo "$as_me:7445: \$? = $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. @@ -7782,11 +7728,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:7785: $lt_compile\"" >&5) + (eval echo "\"\$as_me:7731: $lt_compile\"" >&5) (eval "$lt_compile" 2>conftest.err) ac_status=$? cat conftest.err >&5 - echo "$as_me:7789: \$? = $ac_status" >&5 + echo "$as_me:7735: \$? = $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. @@ -7886,11 +7832,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:7889: $lt_compile\"" >&5) + (eval echo "\"\$as_me:7835: $lt_compile\"" >&5) (eval "$lt_compile" 2>out/conftest.err) ac_status=$? cat out/conftest.err >&5 - echo "$as_me:7893: \$? = $ac_status" >&5 + echo "$as_me:7839: \$? = $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 @@ -10235,7 +10181,7 @@ else lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext < conftest.$ac_ext <&5) + (eval echo "\"\$as_me:12704: $lt_compile\"" >&5) (eval "$lt_compile" 2>conftest.err) ac_status=$? cat conftest.err >&5 - echo "$as_me:12762: \$? = $ac_status" >&5 + echo "$as_me:12708: \$? = $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. @@ -12859,11 +12805,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:12862: $lt_compile\"" >&5) + (eval echo "\"\$as_me:12808: $lt_compile\"" >&5) (eval "$lt_compile" 2>out/conftest.err) ac_status=$? cat out/conftest.err >&5 - echo "$as_me:12866: \$? = $ac_status" >&5 + echo "$as_me:12812: \$? = $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 @@ -14421,11 +14367,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:14424: $lt_compile\"" >&5) + (eval echo "\"\$as_me:14370: $lt_compile\"" >&5) (eval "$lt_compile" 2>conftest.err) ac_status=$? cat conftest.err >&5 - echo "$as_me:14428: \$? = $ac_status" >&5 + echo "$as_me:14374: \$? = $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. @@ -14525,11 +14471,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:14528: $lt_compile\"" >&5) + (eval echo "\"\$as_me:14474: $lt_compile\"" >&5) (eval "$lt_compile" 2>out/conftest.err) ac_status=$? cat out/conftest.err >&5 - echo "$as_me:14532: \$? = $ac_status" >&5 + echo "$as_me:14478: \$? = $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 @@ -16712,11 +16658,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:16715: $lt_compile\"" >&5) + (eval echo "\"\$as_me:16661: $lt_compile\"" >&5) (eval "$lt_compile" 2>conftest.err) ac_status=$? cat conftest.err >&5 - echo "$as_me:16719: \$? = $ac_status" >&5 + echo "$as_me:16665: \$? = $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. @@ -17002,11 +16948,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:17005: $lt_compile\"" >&5) + (eval echo "\"\$as_me:16951: $lt_compile\"" >&5) (eval "$lt_compile" 2>conftest.err) ac_status=$? cat conftest.err >&5 - echo "$as_me:17009: \$? = $ac_status" >&5 + echo "$as_me:16955: \$? = $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. @@ -17106,11 +17052,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:17109: $lt_compile\"" >&5) + (eval echo "\"\$as_me:17055: $lt_compile\"" >&5) (eval "$lt_compile" 2>out/conftest.err) ac_status=$? cat out/conftest.err >&5 - echo "$as_me:17113: \$? = $ac_status" >&5 + echo "$as_me:17059: \$? = $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 @@ -20522,453 +20468,6 @@ if test -z "${USE_READLINE}" ; then fi -for ac_prog in gimptool-1.2 gimptool -do - # Extract the first word of "$ac_prog", so it can be a program name with args. -set dummy $ac_prog; ac_word=$2 -{ echo "$as_me:$LINENO: checking for $ac_word" >&5 -echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } -if test "${ac_cv_path_GIMPTOOL_CHECK+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - case $GIMPTOOL_CHECK in - [\\/]* | ?:[\\/]*) - ac_cv_path_GIMPTOOL_CHECK="$GIMPTOOL_CHECK" # Let the user override the test with a path. - ;; - *) - as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -for as_dir in $PATH -do - IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then - ac_cv_path_GIMPTOOL_CHECK="$as_dir/$ac_word$ac_exec_ext" - echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 - fi -done -done -IFS=$as_save_IFS - - ;; -esac -fi -GIMPTOOL_CHECK=$ac_cv_path_GIMPTOOL_CHECK -if test -n "$GIMPTOOL_CHECK"; then - { echo "$as_me:$LINENO: result: $GIMPTOOL_CHECK" >&5 -echo "${ECHO_T}$GIMPTOOL_CHECK" >&6; } -else - { echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6; } -fi - - - test -n "$GIMPTOOL_CHECK" && break -done - -if test -z "${GIMPTOOL_CHECK}" ; then - BUILD_GIMP="no" -else - # Check we have version 1.2 - gimptool_check_version=`${GIMPTOOL_CHECK} --version` - gimptool_check_major=`echo "$gimptool_check_version" | sed -e 's/\([0-9][0-9]*\).\([0-9][0-9]*\).\([0-9][0-9]*\).*/\1/'` - 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 1 -a "$gimptool_check_minor" -eq 2; then - BUILD_GIMP="yes" - else - BUILD_GIMP="no" - fi -fi - - -# Check whether --with-gtk-prefix was given. -if test "${with_gtk_prefix+set}" = set; then - withval=$with_gtk_prefix; gtk_config_prefix="$withval" -else - gtk_config_prefix="" -fi - - -# Check whether --with-gtk-exec-prefix was given. -if test "${with_gtk_exec_prefix+set}" = set; then - withval=$with_gtk_exec_prefix; gtk_config_exec_prefix="$withval" -else - gtk_config_exec_prefix="" -fi - -# Check whether --enable-gtktest was given. -if test "${enable_gtktest+set}" = set; then - enableval=$enable_gtktest; -else - enable_gtktest=yes -fi - - - for module in . - do - case "$module" in - gthread) - gtk_config_args="$gtk_config_args gthread" - ;; - esac - done - - if test x$gtk_config_exec_prefix != x ; then - gtk_config_args="$gtk_config_args --exec-prefix=$gtk_config_exec_prefix" - if test x${GTK_CONFIG+set} != xset ; then - GTK_CONFIG=$gtk_config_exec_prefix/bin/gtk-config - fi - fi - if test x$gtk_config_prefix != x ; then - gtk_config_args="$gtk_config_args --prefix=$gtk_config_prefix" - if test x${GTK_CONFIG+set} != xset ; then - GTK_CONFIG=$gtk_config_prefix/bin/gtk-config - fi - fi - - # Extract the first word of "gtk-config", so it can be a program name with args. -set dummy gtk-config; ac_word=$2 -{ echo "$as_me:$LINENO: checking for $ac_word" >&5 -echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } -if test "${ac_cv_path_GTK_CONFIG+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - case $GTK_CONFIG in - [\\/]* | ?:[\\/]*) - ac_cv_path_GTK_CONFIG="$GTK_CONFIG" # Let the user override the test with a path. - ;; - *) - as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -for as_dir in $PATH -do - IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then - ac_cv_path_GTK_CONFIG="$as_dir/$ac_word$ac_exec_ext" - echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 - fi -done -done -IFS=$as_save_IFS - - test -z "$ac_cv_path_GTK_CONFIG" && ac_cv_path_GTK_CONFIG="no" - ;; -esac -fi -GTK_CONFIG=$ac_cv_path_GTK_CONFIG -if test -n "$GTK_CONFIG"; then - { echo "$as_me:$LINENO: result: $GTK_CONFIG" >&5 -echo "${ECHO_T}$GTK_CONFIG" >&6; } -else - { echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6; } -fi - - - min_gtk_version=1.2.0 - { echo "$as_me:$LINENO: checking for GTK - version >= $min_gtk_version" >&5 -echo $ECHO_N "checking for GTK - version >= $min_gtk_version... $ECHO_C" >&6; } - no_gtk="" - if test "$GTK_CONFIG" = "no" ; then - no_gtk=yes - else - GTK_CFLAGS=`$GTK_CONFIG $gtk_config_args --cflags` - GTK_LIBS=`$GTK_CONFIG $gtk_config_args --libs` - gtk_config_major_version=`$GTK_CONFIG $gtk_config_args --version | \ - sed 's/\([0-9]*\).\([0-9]*\).\([0-9]*\)/\1/'` - gtk_config_minor_version=`$GTK_CONFIG $gtk_config_args --version | \ - sed 's/\([0-9]*\).\([0-9]*\).\([0-9]*\)/\2/'` - gtk_config_micro_version=`$GTK_CONFIG $gtk_config_args --version | \ - sed 's/\([0-9]*\).\([0-9]*\).\([0-9]*\)/\3/'` - if test "x$enable_gtktest" = "xyes" ; then - ac_save_CFLAGS="$CFLAGS" - ac_save_LIBS="$LIBS" - CFLAGS="$CFLAGS $GTK_CFLAGS" - LIBS="$GTK_LIBS $LIBS" - rm -f conf.gtktest - if test "$cross_compiling" = yes; then - echo $ac_n "cross compiling; assumed OK... $ac_c" -else - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ - -#include -#include -#include - -int -main () -{ - int major, minor, micro; - char *tmp_version; - - system ("touch conf.gtktest"); - - /* HP/UX 9 (%@#!) writes to sscanf strings */ - tmp_version = g_strdup("$min_gtk_version"); - if (sscanf(tmp_version, "%d.%d.%d", &major, &minor, µ) != 3) { - printf("%s, bad version string\n", "$min_gtk_version"); - exit(1); - } - - if ((gtk_major_version != $gtk_config_major_version) || - (gtk_minor_version != $gtk_config_minor_version) || - (gtk_micro_version != $gtk_config_micro_version)) - { - printf("\n*** 'gtk-config --version' returned %d.%d.%d, but GTK+ (%d.%d.%d)\n", - $gtk_config_major_version, $gtk_config_minor_version, $gtk_config_micro_version, - gtk_major_version, gtk_minor_version, gtk_micro_version); - printf ("*** was found! If gtk-config was correct, then it is best\n"); - printf ("*** to remove the old version of GTK+. You may also be able to fix the error\n"); - printf("*** by modifying your LD_LIBRARY_PATH enviroment variable, or by editing\n"); - printf("*** /etc/ld.so.conf. Make sure you have run ldconfig if that is\n"); - printf("*** required on your system.\n"); - printf("*** If gtk-config was wrong, set the environment variable GTK_CONFIG\n"); - printf("*** to point to the correct copy of gtk-config, and remove the file config.cache\n"); - printf("*** before re-running configure\n"); - } -#if defined (GTK_MAJOR_VERSION) && defined (GTK_MINOR_VERSION) && defined (GTK_MICRO_VERSION) - else if ((gtk_major_version != GTK_MAJOR_VERSION) || - (gtk_minor_version != GTK_MINOR_VERSION) || - (gtk_micro_version != GTK_MICRO_VERSION)) - { - printf("*** GTK+ header files (version %d.%d.%d) do not match\n", - GTK_MAJOR_VERSION, GTK_MINOR_VERSION, GTK_MICRO_VERSION); - printf("*** library (version %d.%d.%d)\n", - gtk_major_version, gtk_minor_version, gtk_micro_version); - } -#endif /* defined (GTK_MAJOR_VERSION) ... */ - else - { - if ((gtk_major_version > major) || - ((gtk_major_version == major) && (gtk_minor_version > minor)) || - ((gtk_major_version == major) && (gtk_minor_version == minor) && (gtk_micro_version >= micro))) - { - return 0; - } - else - { - printf("\n*** An old version of GTK+ (%d.%d.%d) was found.\n", - gtk_major_version, gtk_minor_version, gtk_micro_version); - printf("*** You need a version of GTK+ newer than %d.%d.%d. The latest version of\n", - major, minor, micro); - printf("*** GTK+ is always available from ftp://ftp.gtk.org.\n"); - printf("***\n"); - printf("*** If you have already installed a sufficiently new version, this error\n"); - printf("*** probably means that the wrong copy of the gtk-config shell script is\n"); - printf("*** being found. The easiest way to fix this is to remove the old version\n"); - printf("*** of GTK+, but you can also set the GTK_CONFIG environment to point to the\n"); - printf("*** correct copy of gtk-config. (In this case, you will have to\n"); - printf("*** modify your LD_LIBRARY_PATH enviroment variable, or edit /etc/ld.so.conf\n"); - printf("*** so that the correct libraries are found at run-time))\n"); - } - } - return 1; -} - -_ACEOF -rm -f conftest$ac_exeext -if { (ac_try="$ac_link" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_link") 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { ac_try='./conftest$ac_exeext' - { (case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_try") 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then - : -else - echo "$as_me: program exited with status $ac_status" >&5 -echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - -( exit $ac_status ) -no_gtk=yes -fi -rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext -fi - - - CFLAGS="$ac_save_CFLAGS" - LIBS="$ac_save_LIBS" - fi - fi - if test "x$no_gtk" = x ; then - { echo "$as_me:$LINENO: result: yes" >&5 -echo "${ECHO_T}yes" >&6; } - BUILD_LIBGUTENPRINTUI="yes" - GUTENPRINTUI_LIBDEPS="${GUTENPRINTUI_LIBDEPS} ${GTK_LIBS}" - else - { echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6; } - if test "$GTK_CONFIG" = "no" ; then - echo "*** The gtk-config script installed by GTK could not be found" - echo "*** If GTK was installed in PREFIX, make sure PREFIX/bin is in" - echo "*** your path, or set the GTK_CONFIG environment variable to the" - echo "*** full path to gtk-config." - else - if test -f conf.gtktest ; then - : - else - echo "*** Could not run GTK test program, checking why..." - CFLAGS="$CFLAGS $GTK_CFLAGS" - LIBS="$LIBS $GTK_LIBS" - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ - -#include -#include - -int -main () -{ - return ((gtk_major_version) || (gtk_minor_version) || (gtk_micro_version)); - ; - return 0; -} -_ACEOF -rm -f conftest.$ac_objext conftest$ac_exeext -if { (ac_try="$ac_link" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_link") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest$ac_exeext && - $as_test_x conftest$ac_exeext; then - echo "*** The test program compiled, but did not run. This usually means" - echo "*** that the run-time linker is not finding GTK or finding the wrong" - echo "*** version of GTK. If it is not finding GTK, you'll need to set your" - echo "*** LD_LIBRARY_PATH environment variable, or edit /etc/ld.so.conf to point" - echo "*** to the installed location Also, make sure you have run ldconfig if that" - echo "*** is required on your system" - echo "***" - echo "*** If you have an old version installed, it is best to remove it, although" - echo "*** you may also be able to get things to work by modifying LD_LIBRARY_PATH" - echo "***" - echo "*** If you have a RedHat 5.0 system, you should remove the GTK package that" - echo "*** came with the system with the command" - echo "***" - echo "*** rpm --erase --nodeps gtk gtk-devel" -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - echo "*** The test program failed to compile or link. See the file config.log for the" - echo "*** exact error that occured. This usually means GTK was incorrectly installed" - echo "*** or that you have moved GTK since it was installed. In the latter case, you" - echo "*** may want to edit the gtk-config script: $GTK_CONFIG" -fi - -rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ - conftest$ac_exeext conftest.$ac_ext - CFLAGS="$ac_save_CFLAGS" - LIBS="$ac_save_LIBS" - fi - fi - GTK_CFLAGS="" - GTK_LIBS="" - BUILD_LIBGUTENPRINTUI="no" - fi - - - rm -f conf.gtktest - - -# create custom command-line --with option -{ echo "$as_me:$LINENO: checking whether to build GIMP 1.2 Print plugin" >&5 -echo $ECHO_N "checking whether to build GIMP 1.2 Print plugin... $ECHO_C" >&6; } - -# Check whether --with-gimp was given. -if test "${with_gimp+set}" = set; then - withval=$with_gimp; case "${withval}" in - - yes) BUILD_GIMP="yes" ; { echo "$as_me:$LINENO: result: ${BUILD_GIMP}" >&5 -echo "${ECHO_T}${BUILD_GIMP}" >&6; } ;; - no) BUILD_GIMP="no" ; { echo "$as_me:$LINENO: result: ${BUILD_GIMP}" >&5 -echo "${ECHO_T}${BUILD_GIMP}" >&6; } ;; - *) { echo "$as_me:$LINENO: result: unknown" >&5 -echo "${ECHO_T}unknown" >&6; } - { { echo "$as_me:$LINENO: error: bad value ${withval} for --with-gimp" >&5 -echo "$as_me: error: bad value ${withval} for --with-gimp" >&2;} - { (exit 1); exit 1; }; } ;; - - esac -else - if test -z "${BUILD_GIMP}" ; then - BUILD_GIMP="(automatic)" - fi - { echo "$as_me:$LINENO: result: ${BUILD_GIMP}" >&5 -echo "${ECHO_T}${BUILD_GIMP}" >&6; } ; -fi - -if test -z "${BUILD_GIMP}" ; then - BUILD_GIMP="(automatic)" -fi - - -# create custom command-line --enable option -{ echo "$as_me:$LINENO: checking whether to build Gutenprint GTK+-1.2 user interface library" >&5 -echo $ECHO_N "checking whether to build Gutenprint GTK+-1.2 user interface library... $ECHO_C" >&6; } -# Check whether --enable-libgutenprintui was given. -if test "${enable_libgutenprintui+set}" = set; then - enableval=$enable_libgutenprintui; case "${enableval}" in - - yes) BUILD_LIBGUTENPRINTUI="yes" ; { echo "$as_me:$LINENO: result: ${BUILD_LIBGUTENPRINTUI}" >&5 -echo "${ECHO_T}${BUILD_LIBGUTENPRINTUI}" >&6; } ;; - no) BUILD_LIBGUTENPRINTUI="no" ; { echo "$as_me:$LINENO: result: ${BUILD_LIBGUTENPRINTUI}" >&5 -echo "${ECHO_T}${BUILD_LIBGUTENPRINTUI}" >&6; } ;; - *) { echo "$as_me:$LINENO: result: unknown" >&5 -echo "${ECHO_T}unknown" >&6; } - { { echo "$as_me:$LINENO: error: bad value ${enableval} for --enable-libgutenprintui" >&5 -echo "$as_me: error: bad value ${enableval} for --enable-libgutenprintui" >&2;} - { (exit 1); exit 1; }; } ;; - - esac -else - if test -z "${BUILD_LIBGUTENPRINTUI}" ; then - BUILD_LIBGUTENPRINTUI="(automatic)" - fi - { echo "$as_me:$LINENO: result: ${BUILD_LIBGUTENPRINTUI}" >&5 -echo "${ECHO_T}${BUILD_LIBGUTENPRINTUI}" >&6; } ; -fi - -if test -z "${BUILD_LIBGUTENPRINTUI}" ; then - BUILD_LIBGUTENPRINTUI="(automatic)" -fi - - for ac_prog in gimptool-2.0 gimptool do # Extract the first word of "$ac_prog", so it can be a program name with args. @@ -21159,11 +20658,10 @@ pkg_failed=no { echo "$as_me:$LINENO: checking for GTK2" >&5 echo $ECHO_N "checking for GTK2... $ECHO_C" >&6; } -if test -n "$PKG_CONFIG"; then - if test -n "$GTK2_CFLAGS"; then - pkg_cv_GTK2_CFLAGS="$GTK2_CFLAGS" - else - if test -n "$PKG_CONFIG" && \ +if test -n "$GTK2_CFLAGS"; then + pkg_cv_GTK2_CFLAGS="$GTK2_CFLAGS" + elif test -n "$PKG_CONFIG"; then + if test -n "$PKG_CONFIG" && \ { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"gtk+-2.0\"") >&5 ($PKG_CONFIG --exists --print-errors "gtk+-2.0") 2>&5 ac_status=$? @@ -21173,15 +20671,13 @@ if test -n "$PKG_CONFIG"; then else pkg_failed=yes fi - fi -else - pkg_failed=untried + else + pkg_failed=untried fi -if test -n "$PKG_CONFIG"; then - if test -n "$GTK2_LIBS"; then - pkg_cv_GTK2_LIBS="$GTK2_LIBS" - else - if test -n "$PKG_CONFIG" && \ +if test -n "$GTK2_LIBS"; then + pkg_cv_GTK2_LIBS="$GTK2_LIBS" + elif test -n "$PKG_CONFIG"; then + if test -n "$PKG_CONFIG" && \ { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"gtk+-2.0\"") >&5 ($PKG_CONFIG --exists --print-errors "gtk+-2.0") 2>&5 ac_status=$? @@ -21191,9 +20687,8 @@ if test -n "$PKG_CONFIG"; then else pkg_failed=yes fi - fi -else - pkg_failed=untried + else + pkg_failed=untried fi @@ -21206,9 +20701,9 @@ else _pkg_short_errors_supported=no fi if test $_pkg_short_errors_supported = yes; then - GTK2_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "gtk+-2.0"` + GTK2_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "gtk+-2.0" 2>&1` else - GTK2_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "gtk+-2.0"` + GTK2_PKG_ERRORS=`$PKG_CONFIG --print-errors "gtk+-2.0" 2>&1` fi # Put the nasty error message in config.log where it belongs echo "$GTK2_PKG_ERRORS" >&5 @@ -21236,11 +20731,10 @@ pkg_failed=no { echo "$as_me:$LINENO: checking for GIMP2" >&5 echo $ECHO_N "checking for GIMP2... $ECHO_C" >&6; } -if test -n "$PKG_CONFIG"; then - if test -n "$GIMP2_CFLAGS"; then - pkg_cv_GIMP2_CFLAGS="$GIMP2_CFLAGS" - else - if test -n "$PKG_CONFIG" && \ +if test -n "$GIMP2_CFLAGS"; then + pkg_cv_GIMP2_CFLAGS="$GIMP2_CFLAGS" + elif test -n "$PKG_CONFIG"; then + if test -n "$PKG_CONFIG" && \ { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"gimpui-2.0\"") >&5 ($PKG_CONFIG --exists --print-errors "gimpui-2.0") 2>&5 ac_status=$? @@ -21250,15 +20744,13 @@ if test -n "$PKG_CONFIG"; then else pkg_failed=yes fi - fi -else - pkg_failed=untried + else + pkg_failed=untried fi -if test -n "$PKG_CONFIG"; then - if test -n "$GIMP2_LIBS"; then - pkg_cv_GIMP2_LIBS="$GIMP2_LIBS" - else - if test -n "$PKG_CONFIG" && \ +if test -n "$GIMP2_LIBS"; then + pkg_cv_GIMP2_LIBS="$GIMP2_LIBS" + elif test -n "$PKG_CONFIG"; then + if test -n "$PKG_CONFIG" && \ { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"gimpui-2.0\"") >&5 ($PKG_CONFIG --exists --print-errors "gimpui-2.0") 2>&5 ac_status=$? @@ -21268,9 +20760,8 @@ if test -n "$PKG_CONFIG"; then else pkg_failed=yes fi - fi -else - pkg_failed=untried + else + pkg_failed=untried fi @@ -21283,9 +20774,9 @@ else _pkg_short_errors_supported=no fi if test $_pkg_short_errors_supported = yes; then - GIMP2_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "gimpui-2.0"` + GIMP2_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "gimpui-2.0" 2>&1` else - GIMP2_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "gimpui-2.0"` + GIMP2_PKG_ERRORS=`$PKG_CONFIG --print-errors "gimpui-2.0" 2>&1` fi # Put the nasty error message in config.log where it belongs echo "$GIMP2_PKG_ERRORS" >&5 @@ -26030,7 +25521,7 @@ _ACEOF -PKGXMLDATADIR="${PACKAGE_DATA_DIR}/${PACKAGE_VERSION}/xml" +PKGXMLDATADIR="${PACKAGE_DATA_DIR}/${GUTENPRINT_RELEASE_VERSION}/xml" cat >>confdefs.h <<_ACEOF #define PKGXMLDATADIR "$PKGXMLDATADIR" _ACEOF @@ -26038,7 +25529,7 @@ _ACEOF -PKGMODULEDIR="${PACKAGE_LIB_DIR}/${PACKAGE_VERSION}/modules" +PKGMODULEDIR="${PACKAGE_LIB_DIR}/${GUTENPRINT_RELEASE_VERSION}/modules" cat >>confdefs.h <<_ACEOF #define PKGMODULEDIR "$PKGMODULEDIR" _ACEOF @@ -26046,7 +25537,7 @@ _ACEOF if test x$ac_compiler_gnu = "xyes"; then - for stp_ac_arg in -Wall -Wcast-align -Wstrict-prototypes -Wmissing-prototypes -Wmissing-declarations -Wnested-externs -Wwrite-strings -Werror-implicit-function-declaration -Winline -Wformat=2 -finline-limit=1048576 ; do + for stp_ac_arg in -Wall -Wcast-align -Wstrict-prototypes -Wmissing-prototypes -Wmissing-declarations -Wnested-externs -Wwrite-strings -Werror-implicit-function-declaration -Winline -Wformat=2 -finline-limit=131072 ; do { echo "$as_me:$LINENO: checking if ${CC} supports ${stp_ac_arg}" >&5 echo $ECHO_N "checking if ${CC} supports ${stp_ac_arg}... $ECHO_C" >&6; } @@ -27800,117 +27291,110 @@ fi fi -if test x$BUILD_LEXMARKUTIL = xyes -o x$BUILD_GUTENPRINTUI = xyes ; then - -# Check whether --with-gtk-prefix was given. -if test "${with_gtk_prefix+set}" = set; then - withval=$with_gtk_prefix; gtk_config_prefix="$withval" -else - gtk_config_prefix="" +if test x${BUILD_GIMP2} = xyes ; then + GIMP2_DATA_DIR=`$PKG_CONFIG gimp-2.0 --variable=gimpdatadir` + GIMP2_PLUGIN_DIR=`$PKG_CONFIG gimp-2.0 --variable=gimplibdir`/plug-ins + gimp2_plug_indir="${GIMP2_PLUGIN_DIR}" fi -# Check whether --with-gtk-exec-prefix was given. -if test "${with_gtk_exec_prefix+set}" = set; then - withval=$with_gtk_exec_prefix; gtk_config_exec_prefix="$withval" +{ echo "$as_me:$LINENO: checking for ANSI C header files" >&5 +echo $ECHO_N "checking for ANSI C header files... $ECHO_C" >&6; } +if test "${ac_cv_header_stdc+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 else - gtk_config_exec_prefix="" -fi + cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ +#include +#include +#include +#include + +int +main () +{ -# Check whether --enable-gtktest was given. -if test "${enable_gtktest+set}" = set; then - enableval=$enable_gtktest; + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext +if { (ac_try="$ac_compile" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_compile") 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err + } && test -s conftest.$ac_objext; then + ac_cv_header_stdc=yes else - enable_gtktest=yes -fi + echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + ac_cv_header_stdc=no +fi - for module in . - do - case "$module" in - gthread) - gtk_config_args="$gtk_config_args gthread" - ;; - esac - done +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext - if test x$gtk_config_exec_prefix != x ; then - gtk_config_args="$gtk_config_args --exec-prefix=$gtk_config_exec_prefix" - if test x${GTK_CONFIG+set} != xset ; then - GTK_CONFIG=$gtk_config_exec_prefix/bin/gtk-config - fi - fi - if test x$gtk_config_prefix != x ; then - gtk_config_args="$gtk_config_args --prefix=$gtk_config_prefix" - if test x${GTK_CONFIG+set} != xset ; then - GTK_CONFIG=$gtk_config_prefix/bin/gtk-config - fi - fi +if test $ac_cv_header_stdc = yes; then + # SunOS 4.x string.h does not declare mem*, contrary to ANSI. + cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ +#include - # Extract the first word of "gtk-config", so it can be a program name with args. -set dummy gtk-config; ac_word=$2 -{ echo "$as_me:$LINENO: checking for $ac_word" >&5 -echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } -if test "${ac_cv_path_GTK_CONFIG+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 +_ACEOF +if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | + $EGREP "memchr" >/dev/null 2>&1; then + : else - case $GTK_CONFIG in - [\\/]* | ?:[\\/]*) - ac_cv_path_GTK_CONFIG="$GTK_CONFIG" # Let the user override the test with a path. - ;; - *) - as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -for as_dir in $PATH -do - IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then - ac_cv_path_GTK_CONFIG="$as_dir/$ac_word$ac_exec_ext" - echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 - fi -done -done -IFS=$as_save_IFS + ac_cv_header_stdc=no +fi +rm -f conftest* - test -z "$ac_cv_path_GTK_CONFIG" && ac_cv_path_GTK_CONFIG="no" - ;; -esac fi -GTK_CONFIG=$ac_cv_path_GTK_CONFIG -if test -n "$GTK_CONFIG"; then - { echo "$as_me:$LINENO: result: $GTK_CONFIG" >&5 -echo "${ECHO_T}$GTK_CONFIG" >&6; } + +if test $ac_cv_header_stdc = yes; then + # ISC 2.0.2 stdlib.h does not declare free, contrary to ANSI. + cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ +#include + +_ACEOF +if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | + $EGREP "free" >/dev/null 2>&1; then + : else - { echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6; } + ac_cv_header_stdc=no fi +rm -f conftest* +fi - min_gtk_version=1.2.0 - { echo "$as_me:$LINENO: checking for GTK - version >= $min_gtk_version" >&5 -echo $ECHO_N "checking for GTK - version >= $min_gtk_version... $ECHO_C" >&6; } - no_gtk="" - if test "$GTK_CONFIG" = "no" ; then - no_gtk=yes - else - GTK_CFLAGS=`$GTK_CONFIG $gtk_config_args --cflags` - GTK_LIBS=`$GTK_CONFIG $gtk_config_args --libs` - gtk_config_major_version=`$GTK_CONFIG $gtk_config_args --version | \ - sed 's/\([0-9]*\).\([0-9]*\).\([0-9]*\)/\1/'` - gtk_config_minor_version=`$GTK_CONFIG $gtk_config_args --version | \ - sed 's/\([0-9]*\).\([0-9]*\).\([0-9]*\)/\2/'` - gtk_config_micro_version=`$GTK_CONFIG $gtk_config_args --version | \ - sed 's/\([0-9]*\).\([0-9]*\).\([0-9]*\)/\3/'` - if test "x$enable_gtktest" = "xyes" ; then - ac_save_CFLAGS="$CFLAGS" - ac_save_LIBS="$LIBS" - CFLAGS="$CFLAGS $GTK_CFLAGS" - LIBS="$GTK_LIBS $LIBS" - rm -f conf.gtktest - if test "$cross_compiling" = yes; then - echo $ac_n "cross compiling; assumed OK... $ac_c" +if test $ac_cv_header_stdc = yes; then + # /bin/cc in Irix-4.0.5 gets non-ANSI ctype macros unless using -ansi. + if test "$cross_compiling" = yes; then + : else cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ @@ -27918,81 +27402,30 @@ _ACEOF cat confdefs.h >>conftest.$ac_ext cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ - -#include -#include +#include #include +#if ((' ' & 0x0FF) == 0x020) +# define ISLOWER(c) ('a' <= (c) && (c) <= 'z') +# define TOUPPER(c) (ISLOWER(c) ? 'A' + ((c) - 'a') : (c)) +#else +# define ISLOWER(c) \ + (('a' <= (c) && (c) <= 'i') \ + || ('j' <= (c) && (c) <= 'r') \ + || ('s' <= (c) && (c) <= 'z')) +# define TOUPPER(c) (ISLOWER(c) ? ((c) | 0x40) : (c)) +#endif +#define XOR(e, f) (((e) && !(f)) || (!(e) && (f))) int main () { - int major, minor, micro; - char *tmp_version; - - system ("touch conf.gtktest"); - - /* HP/UX 9 (%@#!) writes to sscanf strings */ - tmp_version = g_strdup("$min_gtk_version"); - if (sscanf(tmp_version, "%d.%d.%d", &major, &minor, µ) != 3) { - printf("%s, bad version string\n", "$min_gtk_version"); - exit(1); - } - - if ((gtk_major_version != $gtk_config_major_version) || - (gtk_minor_version != $gtk_config_minor_version) || - (gtk_micro_version != $gtk_config_micro_version)) - { - printf("\n*** 'gtk-config --version' returned %d.%d.%d, but GTK+ (%d.%d.%d)\n", - $gtk_config_major_version, $gtk_config_minor_version, $gtk_config_micro_version, - gtk_major_version, gtk_minor_version, gtk_micro_version); - printf ("*** was found! If gtk-config was correct, then it is best\n"); - printf ("*** to remove the old version of GTK+. You may also be able to fix the error\n"); - printf("*** by modifying your LD_LIBRARY_PATH enviroment variable, or by editing\n"); - printf("*** /etc/ld.so.conf. Make sure you have run ldconfig if that is\n"); - printf("*** required on your system.\n"); - printf("*** If gtk-config was wrong, set the environment variable GTK_CONFIG\n"); - printf("*** to point to the correct copy of gtk-config, and remove the file config.cache\n"); - printf("*** before re-running configure\n"); - } -#if defined (GTK_MAJOR_VERSION) && defined (GTK_MINOR_VERSION) && defined (GTK_MICRO_VERSION) - else if ((gtk_major_version != GTK_MAJOR_VERSION) || - (gtk_minor_version != GTK_MINOR_VERSION) || - (gtk_micro_version != GTK_MICRO_VERSION)) - { - printf("*** GTK+ header files (version %d.%d.%d) do not match\n", - GTK_MAJOR_VERSION, GTK_MINOR_VERSION, GTK_MICRO_VERSION); - printf("*** library (version %d.%d.%d)\n", - gtk_major_version, gtk_minor_version, gtk_micro_version); - } -#endif /* defined (GTK_MAJOR_VERSION) ... */ - else - { - if ((gtk_major_version > major) || - ((gtk_major_version == major) && (gtk_minor_version > minor)) || - ((gtk_major_version == major) && (gtk_minor_version == minor) && (gtk_micro_version >= micro))) - { - return 0; - } - else - { - printf("\n*** An old version of GTK+ (%d.%d.%d) was found.\n", - gtk_major_version, gtk_minor_version, gtk_micro_version); - printf("*** You need a version of GTK+ newer than %d.%d.%d. The latest version of\n", - major, minor, micro); - printf("*** GTK+ is always available from ftp://ftp.gtk.org.\n"); - printf("***\n"); - printf("*** If you have already installed a sufficiently new version, this error\n"); - printf("*** probably means that the wrong copy of the gtk-config shell script is\n"); - printf("*** being found. The easiest way to fix this is to remove the old version\n"); - printf("*** of GTK+, but you can also set the GTK_CONFIG environment to point to the\n"); - printf("*** correct copy of gtk-config. (In this case, you will have to\n"); - printf("*** modify your LD_LIBRARY_PATH enviroment variable, or edit /etc/ld.so.conf\n"); - printf("*** so that the correct libraries are found at run-time))\n"); - } - } - return 1; + int i; + for (i = 0; i < 256; i++) + if (XOR (islower (i), ISLOWER (i)) + || toupper (i) != TOUPPER (i)) + return 2; + return 0; } - _ACEOF rm -f conftest$ac_exeext if { (ac_try="$ac_link" @@ -28021,61 +27454,58 @@ echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 ( exit $ac_status ) -no_gtk=yes +ac_cv_header_stdc=no fi rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext fi - CFLAGS="$ac_save_CFLAGS" - LIBS="$ac_save_LIBS" - fi - fi - if test "x$no_gtk" = x ; then - { echo "$as_me:$LINENO: result: yes" >&5 -echo "${ECHO_T}yes" >&6; } - : - else - { echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6; } - if test "$GTK_CONFIG" = "no" ; then - echo "*** The gtk-config script installed by GTK could not be found" - echo "*** If GTK was installed in PREFIX, make sure PREFIX/bin is in" - echo "*** your path, or set the GTK_CONFIG environment variable to the" - echo "*** full path to gtk-config." - else - if test -f conf.gtktest ; then - : - else - echo "*** Could not run GTK test program, checking why..." - CFLAGS="$CFLAGS $GTK_CFLAGS" - LIBS="$LIBS $GTK_LIBS" - cat >conftest.$ac_ext <<_ACEOF +fi +fi +{ echo "$as_me:$LINENO: result: $ac_cv_header_stdc" >&5 +echo "${ECHO_T}$ac_cv_header_stdc" >&6; } +if test $ac_cv_header_stdc = yes; then + +cat >>confdefs.h <<\_ACEOF +#define STDC_HEADERS 1 +_ACEOF + +fi + + +for ac_header in getopt.h +do +as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh` +if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then + { echo "$as_me:$LINENO: checking for $ac_header" >&5 +echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; } +if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +fi +ac_res=`eval echo '${'$as_ac_Header'}'` + { echo "$as_me:$LINENO: result: $ac_res" >&5 +echo "${ECHO_T}$ac_res" >&6; } +else + # Is the header compilable? +{ echo "$as_me:$LINENO: checking $ac_header usability" >&5 +echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6; } +cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ _ACEOF cat confdefs.h >>conftest.$ac_ext cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ - -#include -#include - -int -main () -{ - return ((gtk_major_version) || (gtk_minor_version) || (gtk_micro_version)); - ; - return 0; -} +$ac_includes_default +#include <$ac_header> _ACEOF -rm -f conftest.$ac_objext conftest$ac_exeext -if { (ac_try="$ac_link" +rm -f conftest.$ac_objext +if { (ac_try="$ac_compile" case "(($ac_try" in *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; *) ac_try_echo=$ac_try;; esac eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_link") 2>conftest.er1 + (eval "$ac_compile") 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 @@ -28084,1304 +27514,18 @@ eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 (exit $ac_status); } && { test -z "$ac_c_werror_flag" || test ! -s conftest.err - } && test -s conftest$ac_exeext && - $as_test_x conftest$ac_exeext; then - echo "*** The test program compiled, but did not run. This usually means" - echo "*** that the run-time linker is not finding GTK or finding the wrong" - echo "*** version of GTK. If it is not finding GTK, you'll need to set your" - echo "*** LD_LIBRARY_PATH environment variable, or edit /etc/ld.so.conf to point" - echo "*** to the installed location Also, make sure you have run ldconfig if that" - echo "*** is required on your system" - echo "***" - echo "*** If you have an old version installed, it is best to remove it, although" - echo "*** you may also be able to get things to work by modifying LD_LIBRARY_PATH" - echo "***" - echo "*** If you have a RedHat 5.0 system, you should remove the GTK package that" - echo "*** came with the system with the command" - echo "***" - echo "*** rpm --erase --nodeps gtk gtk-devel" + } && test -s conftest.$ac_objext; then + ac_header_compiler=yes else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 - echo "*** The test program failed to compile or link. See the file config.log for the" - echo "*** exact error that occured. This usually means GTK was incorrectly installed" - echo "*** or that you have moved GTK since it was installed. In the latter case, you" - echo "*** may want to edit the gtk-config script: $GTK_CONFIG" -fi - -rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ - conftest$ac_exeext conftest.$ac_ext - CFLAGS="$ac_save_CFLAGS" - LIBS="$ac_save_LIBS" - fi - fi - GTK_CFLAGS="" - GTK_LIBS="" - { { echo "$as_me:$LINENO: error: Cannot find GTK: Is gtk-config in path?" >&5 -echo "$as_me: error: Cannot find GTK: Is gtk-config in path?" >&2;} - { (exit 1); exit 1; }; } - fi - - - rm -f conf.gtktest - -fi - -if test x${BUILD_GIMP} = xyes ; then - if test x$GIMP_SOURCE_TREE_SUBDIR = xyes ; then - -# Check whether --with-gtk-prefix was given. -if test "${with_gtk_prefix+set}" = set; then - withval=$with_gtk_prefix; gtk_config_prefix="$withval" -else - gtk_config_prefix="" -fi - - -# Check whether --with-gtk-exec-prefix was given. -if test "${with_gtk_exec_prefix+set}" = set; then - withval=$with_gtk_exec_prefix; gtk_config_exec_prefix="$withval" -else - gtk_config_exec_prefix="" -fi - -# Check whether --enable-gtktest was given. -if test "${enable_gtktest+set}" = set; then - enableval=$enable_gtktest; -else - enable_gtktest=yes + ac_header_compiler=no fi - - for module in . - do - case "$module" in - gthread) - gtk_config_args="$gtk_config_args gthread" - ;; - esac - done - - if test x$gtk_config_exec_prefix != x ; then - gtk_config_args="$gtk_config_args --exec-prefix=$gtk_config_exec_prefix" - if test x${GTK_CONFIG+set} != xset ; then - GTK_CONFIG=$gtk_config_exec_prefix/bin/gtk-config - fi - fi - if test x$gtk_config_prefix != x ; then - gtk_config_args="$gtk_config_args --prefix=$gtk_config_prefix" - if test x${GTK_CONFIG+set} != xset ; then - GTK_CONFIG=$gtk_config_prefix/bin/gtk-config - fi - fi - - # Extract the first word of "gtk-config", so it can be a program name with args. -set dummy gtk-config; ac_word=$2 -{ echo "$as_me:$LINENO: checking for $ac_word" >&5 -echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } -if test "${ac_cv_path_GTK_CONFIG+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - case $GTK_CONFIG in - [\\/]* | ?:[\\/]*) - ac_cv_path_GTK_CONFIG="$GTK_CONFIG" # Let the user override the test with a path. - ;; - *) - as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -for as_dir in $PATH -do - IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then - ac_cv_path_GTK_CONFIG="$as_dir/$ac_word$ac_exec_ext" - echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 - fi -done -done -IFS=$as_save_IFS - - test -z "$ac_cv_path_GTK_CONFIG" && ac_cv_path_GTK_CONFIG="no" - ;; -esac -fi -GTK_CONFIG=$ac_cv_path_GTK_CONFIG -if test -n "$GTK_CONFIG"; then - { echo "$as_me:$LINENO: result: $GTK_CONFIG" >&5 -echo "${ECHO_T}$GTK_CONFIG" >&6; } -else - { echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6; } -fi - - - min_gtk_version=0.99.7 - { echo "$as_me:$LINENO: checking for GTK - version >= $min_gtk_version" >&5 -echo $ECHO_N "checking for GTK - version >= $min_gtk_version... $ECHO_C" >&6; } - no_gtk="" - if test "$GTK_CONFIG" = "no" ; then - no_gtk=yes - else - GTK_CFLAGS=`$GTK_CONFIG $gtk_config_args --cflags` - GTK_LIBS=`$GTK_CONFIG $gtk_config_args --libs` - gtk_config_major_version=`$GTK_CONFIG $gtk_config_args --version | \ - sed 's/\([0-9]*\).\([0-9]*\).\([0-9]*\)/\1/'` - gtk_config_minor_version=`$GTK_CONFIG $gtk_config_args --version | \ - sed 's/\([0-9]*\).\([0-9]*\).\([0-9]*\)/\2/'` - gtk_config_micro_version=`$GTK_CONFIG $gtk_config_args --version | \ - sed 's/\([0-9]*\).\([0-9]*\).\([0-9]*\)/\3/'` - if test "x$enable_gtktest" = "xyes" ; then - ac_save_CFLAGS="$CFLAGS" - ac_save_LIBS="$LIBS" - CFLAGS="$CFLAGS $GTK_CFLAGS" - LIBS="$GTK_LIBS $LIBS" - rm -f conf.gtktest - if test "$cross_compiling" = yes; then - echo $ac_n "cross compiling; assumed OK... $ac_c" -else - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ - -#include -#include -#include - -int -main () -{ - int major, minor, micro; - char *tmp_version; - - system ("touch conf.gtktest"); - - /* HP/UX 9 (%@#!) writes to sscanf strings */ - tmp_version = g_strdup("$min_gtk_version"); - if (sscanf(tmp_version, "%d.%d.%d", &major, &minor, µ) != 3) { - printf("%s, bad version string\n", "$min_gtk_version"); - exit(1); - } - - if ((gtk_major_version != $gtk_config_major_version) || - (gtk_minor_version != $gtk_config_minor_version) || - (gtk_micro_version != $gtk_config_micro_version)) - { - printf("\n*** 'gtk-config --version' returned %d.%d.%d, but GTK+ (%d.%d.%d)\n", - $gtk_config_major_version, $gtk_config_minor_version, $gtk_config_micro_version, - gtk_major_version, gtk_minor_version, gtk_micro_version); - printf ("*** was found! If gtk-config was correct, then it is best\n"); - printf ("*** to remove the old version of GTK+. You may also be able to fix the error\n"); - printf("*** by modifying your LD_LIBRARY_PATH enviroment variable, or by editing\n"); - printf("*** /etc/ld.so.conf. Make sure you have run ldconfig if that is\n"); - printf("*** required on your system.\n"); - printf("*** If gtk-config was wrong, set the environment variable GTK_CONFIG\n"); - printf("*** to point to the correct copy of gtk-config, and remove the file config.cache\n"); - printf("*** before re-running configure\n"); - } -#if defined (GTK_MAJOR_VERSION) && defined (GTK_MINOR_VERSION) && defined (GTK_MICRO_VERSION) - else if ((gtk_major_version != GTK_MAJOR_VERSION) || - (gtk_minor_version != GTK_MINOR_VERSION) || - (gtk_micro_version != GTK_MICRO_VERSION)) - { - printf("*** GTK+ header files (version %d.%d.%d) do not match\n", - GTK_MAJOR_VERSION, GTK_MINOR_VERSION, GTK_MICRO_VERSION); - printf("*** library (version %d.%d.%d)\n", - gtk_major_version, gtk_minor_version, gtk_micro_version); - } -#endif /* defined (GTK_MAJOR_VERSION) ... */ - else - { - if ((gtk_major_version > major) || - ((gtk_major_version == major) && (gtk_minor_version > minor)) || - ((gtk_major_version == major) && (gtk_minor_version == minor) && (gtk_micro_version >= micro))) - { - return 0; - } - else - { - printf("\n*** An old version of GTK+ (%d.%d.%d) was found.\n", - gtk_major_version, gtk_minor_version, gtk_micro_version); - printf("*** You need a version of GTK+ newer than %d.%d.%d. The latest version of\n", - major, minor, micro); - printf("*** GTK+ is always available from ftp://ftp.gtk.org.\n"); - printf("***\n"); - printf("*** If you have already installed a sufficiently new version, this error\n"); - printf("*** probably means that the wrong copy of the gtk-config shell script is\n"); - printf("*** being found. The easiest way to fix this is to remove the old version\n"); - printf("*** of GTK+, but you can also set the GTK_CONFIG environment to point to the\n"); - printf("*** correct copy of gtk-config. (In this case, you will have to\n"); - printf("*** modify your LD_LIBRARY_PATH enviroment variable, or edit /etc/ld.so.conf\n"); - printf("*** so that the correct libraries are found at run-time))\n"); - } - } - return 1; -} - -_ACEOF -rm -f conftest$ac_exeext -if { (ac_try="$ac_link" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_link") 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { ac_try='./conftest$ac_exeext' - { (case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_try") 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then - : -else - echo "$as_me: program exited with status $ac_status" >&5 -echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - -( exit $ac_status ) -no_gtk=yes -fi -rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext -fi - - - CFLAGS="$ac_save_CFLAGS" - LIBS="$ac_save_LIBS" - fi - fi - if test "x$no_gtk" = x ; then - { echo "$as_me:$LINENO: result: yes" >&5 -echo "${ECHO_T}yes" >&6; } - : - else - { echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6; } - if test "$GTK_CONFIG" = "no" ; then - echo "*** The gtk-config script installed by GTK could not be found" - echo "*** If GTK was installed in PREFIX, make sure PREFIX/bin is in" - echo "*** your path, or set the GTK_CONFIG environment variable to the" - echo "*** full path to gtk-config." - else - if test -f conf.gtktest ; then - : - else - echo "*** Could not run GTK test program, checking why..." - CFLAGS="$CFLAGS $GTK_CFLAGS" - LIBS="$LIBS $GTK_LIBS" - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ - -#include -#include - -int -main () -{ - return ((gtk_major_version) || (gtk_minor_version) || (gtk_micro_version)); - ; - return 0; -} -_ACEOF -rm -f conftest.$ac_objext conftest$ac_exeext -if { (ac_try="$ac_link" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_link") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest$ac_exeext && - $as_test_x conftest$ac_exeext; then - echo "*** The test program compiled, but did not run. This usually means" - echo "*** that the run-time linker is not finding GTK or finding the wrong" - echo "*** version of GTK. If it is not finding GTK, you'll need to set your" - echo "*** LD_LIBRARY_PATH environment variable, or edit /etc/ld.so.conf to point" - echo "*** to the installed location Also, make sure you have run ldconfig if that" - echo "*** is required on your system" - echo "***" - echo "*** If you have an old version installed, it is best to remove it, although" - echo "*** you may also be able to get things to work by modifying LD_LIBRARY_PATH" - echo "***" - echo "*** If you have a RedHat 5.0 system, you should remove the GTK package that" - echo "*** came with the system with the command" - echo "***" - echo "*** rpm --erase --nodeps gtk gtk-devel" -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - echo "*** The test program failed to compile or link. See the file config.log for the" - echo "*** exact error that occured. This usually means GTK was incorrectly installed" - echo "*** or that you have moved GTK since it was installed. In the latter case, you" - echo "*** may want to edit the gtk-config script: $GTK_CONFIG" -fi - -rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ - conftest$ac_exeext conftest.$ac_ext - CFLAGS="$ac_save_CFLAGS" - LIBS="$ac_save_LIBS" - fi - fi - GTK_CFLAGS="" - GTK_LIBS="" - : - fi - - - rm -f conf.gtktest - - -# Check whether --with-glib-prefix was given. -if test "${with_glib_prefix+set}" = set; then - withval=$with_glib_prefix; glib_config_prefix="$withval" -else - glib_config_prefix="" -fi - - -# Check whether --with-glib-exec-prefix was given. -if test "${with_glib_exec_prefix+set}" = set; then - withval=$with_glib_exec_prefix; glib_config_exec_prefix="$withval" -else - glib_config_exec_prefix="" -fi - -# Check whether --enable-glibtest was given. -if test "${enable_glibtest+set}" = set; then - enableval=$enable_glibtest; -else - enable_glibtest=yes -fi - - - if test x$glib_config_exec_prefix != x ; then - glib_config_args="$glib_config_args --exec-prefix=$glib_config_exec_prefix" - if test x${GLIB_CONFIG+set} != xset ; then - GLIB_CONFIG=$glib_config_exec_prefix/bin/glib-config - fi - fi - if test x$glib_config_prefix != x ; then - glib_config_args="$glib_config_args --prefix=$glib_config_prefix" - if test x${GLIB_CONFIG+set} != xset ; then - GLIB_CONFIG=$glib_config_prefix/bin/glib-config - fi - fi - - for module in . - do - case "$module" in - gmodule) - glib_config_args="$glib_config_args gmodule" - ;; - gthread) - glib_config_args="$glib_config_args gthread" - ;; - esac - done - - # Extract the first word of "glib-config", so it can be a program name with args. -set dummy glib-config; ac_word=$2 -{ echo "$as_me:$LINENO: checking for $ac_word" >&5 -echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } -if test "${ac_cv_path_GLIB_CONFIG+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - case $GLIB_CONFIG in - [\\/]* | ?:[\\/]*) - ac_cv_path_GLIB_CONFIG="$GLIB_CONFIG" # Let the user override the test with a path. - ;; - *) - as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -for as_dir in $PATH -do - IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then - ac_cv_path_GLIB_CONFIG="$as_dir/$ac_word$ac_exec_ext" - echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 - fi -done -done -IFS=$as_save_IFS - - test -z "$ac_cv_path_GLIB_CONFIG" && ac_cv_path_GLIB_CONFIG="no" - ;; -esac -fi -GLIB_CONFIG=$ac_cv_path_GLIB_CONFIG -if test -n "$GLIB_CONFIG"; then - { echo "$as_me:$LINENO: result: $GLIB_CONFIG" >&5 -echo "${ECHO_T}$GLIB_CONFIG" >&6; } -else - { echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6; } -fi - - - min_glib_version=0.99.7 - { echo "$as_me:$LINENO: checking for GLIB - version >= $min_glib_version" >&5 -echo $ECHO_N "checking for GLIB - version >= $min_glib_version... $ECHO_C" >&6; } - no_glib="" - if test "$GLIB_CONFIG" = "no" ; then - no_glib=yes - else - GLIB_CFLAGS=`$GLIB_CONFIG $glib_config_args --cflags` - GLIB_LIBS=`$GLIB_CONFIG $glib_config_args --libs` - glib_config_major_version=`$GLIB_CONFIG $glib_config_args --version | \ - sed 's/\([0-9]*\).\([0-9]*\).\([0-9]*\)/\1/'` - glib_config_minor_version=`$GLIB_CONFIG $glib_config_args --version | \ - sed 's/\([0-9]*\).\([0-9]*\).\([0-9]*\)/\2/'` - glib_config_micro_version=`$GLIB_CONFIG $glib_config_args --version | \ - sed 's/\([0-9]*\).\([0-9]*\).\([0-9]*\)/\3/'` - if test "x$enable_glibtest" = "xyes" ; then - ac_save_CFLAGS="$CFLAGS" - ac_save_LIBS="$LIBS" - CFLAGS="$CFLAGS $GLIB_CFLAGS" - LIBS="$GLIB_LIBS $LIBS" - rm -f conf.glibtest - if test "$cross_compiling" = yes; then - echo $ac_n "cross compiling; assumed OK... $ac_c" -else - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ - -#include -#include -#include - -int -main () -{ - int major, minor, micro; - char *tmp_version; - - system ("touch conf.glibtest"); - - /* HP/UX 9 (%@#!) writes to sscanf strings */ - tmp_version = g_strdup("$min_glib_version"); - if (sscanf(tmp_version, "%d.%d.%d", &major, &minor, µ) != 3) { - printf("%s, bad version string\n", "$min_glib_version"); - exit(1); - } - - if ((glib_major_version != $glib_config_major_version) || - (glib_minor_version != $glib_config_minor_version) || - (glib_micro_version != $glib_config_micro_version)) - { - printf("\n*** 'glib-config --version' returned %d.%d.%d, but GLIB (%d.%d.%d)\n", - $glib_config_major_version, $glib_config_minor_version, $glib_config_micro_version, - glib_major_version, glib_minor_version, glib_micro_version); - printf ("*** was found! If glib-config was correct, then it is best\n"); - printf ("*** to remove the old version of GLIB. You may also be able to fix the error\n"); - printf("*** by modifying your LD_LIBRARY_PATH enviroment variable, or by editing\n"); - printf("*** /etc/ld.so.conf. Make sure you have run ldconfig if that is\n"); - printf("*** required on your system.\n"); - printf("*** If glib-config was wrong, set the environment variable GLIB_CONFIG\n"); - printf("*** to point to the correct copy of glib-config, and remove the file config.cache\n"); - printf("*** before re-running configure\n"); - } - else if ((glib_major_version != GLIB_MAJOR_VERSION) || - (glib_minor_version != GLIB_MINOR_VERSION) || - (glib_micro_version != GLIB_MICRO_VERSION)) - { - printf("*** GLIB header files (version %d.%d.%d) do not match\n", - GLIB_MAJOR_VERSION, GLIB_MINOR_VERSION, GLIB_MICRO_VERSION); - printf("*** library (version %d.%d.%d)\n", - glib_major_version, glib_minor_version, glib_micro_version); - } - else - { - if ((glib_major_version > major) || - ((glib_major_version == major) && (glib_minor_version > minor)) || - ((glib_major_version == major) && (glib_minor_version == minor) && (glib_micro_version >= micro))) - { - return 0; - } - else - { - printf("\n*** An old version of GLIB (%d.%d.%d) was found.\n", - glib_major_version, glib_minor_version, glib_micro_version); - printf("*** You need a version of GLIB newer than %d.%d.%d. The latest version of\n", - major, minor, micro); - printf("*** GLIB is always available from ftp://ftp.gtk.org.\n"); - printf("***\n"); - printf("*** If you have already installed a sufficiently new version, this error\n"); - printf("*** probably means that the wrong copy of the glib-config shell script is\n"); - printf("*** being found. The easiest way to fix this is to remove the old version\n"); - printf("*** of GLIB, but you can also set the GLIB_CONFIG environment to point to the\n"); - printf("*** correct copy of glib-config. (In this case, you will have to\n"); - printf("*** modify your LD_LIBRARY_PATH enviroment variable, or edit /etc/ld.so.conf\n"); - printf("*** so that the correct libraries are found at run-time))\n"); - } - } - return 1; -} - -_ACEOF -rm -f conftest$ac_exeext -if { (ac_try="$ac_link" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_link") 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { ac_try='./conftest$ac_exeext' - { (case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_try") 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then - : -else - echo "$as_me: program exited with status $ac_status" >&5 -echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - -( exit $ac_status ) -no_glib=yes -fi -rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext -fi - - - CFLAGS="$ac_save_CFLAGS" - LIBS="$ac_save_LIBS" - fi - fi - if test "x$no_glib" = x ; then - { echo "$as_me:$LINENO: result: yes" >&5 -echo "${ECHO_T}yes" >&6; } - : - else - { echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6; } - if test "$GLIB_CONFIG" = "no" ; then - echo "*** The glib-config script installed by GLIB could not be found" - echo "*** If GLIB was installed in PREFIX, make sure PREFIX/bin is in" - echo "*** your path, or set the GLIB_CONFIG environment variable to the" - echo "*** full path to glib-config." - else - if test -f conf.glibtest ; then - : - else - echo "*** Could not run GLIB test program, checking why..." - CFLAGS="$CFLAGS $GLIB_CFLAGS" - LIBS="$LIBS $GLIB_LIBS" - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ - -#include -#include - -int -main () -{ - return ((glib_major_version) || (glib_minor_version) || (glib_micro_version)); - ; - return 0; -} -_ACEOF -rm -f conftest.$ac_objext conftest$ac_exeext -if { (ac_try="$ac_link" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_link") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest$ac_exeext && - $as_test_x conftest$ac_exeext; then - echo "*** The test program compiled, but did not run. This usually means" - echo "*** that the run-time linker is not finding GLIB or finding the wrong" - echo "*** version of GLIB. If it is not finding GLIB, you'll need to set your" - echo "*** LD_LIBRARY_PATH environment variable, or edit /etc/ld.so.conf to point" - echo "*** to the installed location Also, make sure you have run ldconfig if that" - echo "*** is required on your system" - echo "***" - echo "*** If you have an old version installed, it is best to remove it, although" - echo "*** you may also be able to get things to work by modifying LD_LIBRARY_PATH" - echo "***" - echo "*** If you have a RedHat 5.0 system, you should remove the GTK package that" - echo "*** came with the system with the command" - echo "***" - echo "*** rpm --erase --nodeps gtk gtk-devel" -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - echo "*** The test program failed to compile or link. See the file config.log for the" - echo "*** exact error that occured. This usually means GLIB was incorrectly installed" - echo "*** or that you have moved GLIB since it was installed. In the latter case, you" - echo "*** may want to edit the glib-config script: $GLIB_CONFIG" -fi - -rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ - conftest$ac_exeext conftest.$ac_ext - CFLAGS="$ac_save_CFLAGS" - LIBS="$ac_save_LIBS" - fi - fi - GLIB_CFLAGS="" - GLIB_LIBS="" - : - fi - - - rm -f conf.glibtest - - GIMP_CFLAGS="-I\$(top_srcdir)/../.. \$(GTK_CFLAGS) \$(GLIB_CFLAGS)" - GIMP_LIBS="\$(GTK_LIBS) \$(GLIB_LIBS) \$(top_builddir)/../../libgimp/libgimp.la \$(top_builddir)/../../libgimp/libgimpui.la" - else - -# Check whether --with-gimp-prefix was given. -if test "${with_gimp_prefix+set}" = set; then - withval=$with_gimp_prefix; gimptool_prefix="$withval" -else - gimptool_prefix="" -fi - - -# Check whether --with-gimp-exec-prefix was given. -if test "${with_gimp_exec_prefix+set}" = set; then - withval=$with_gimp_exec_prefix; gimptool_exec_prefix="$withval" -else - gimptool_exec_prefix="" -fi - -# Check whether --enable-gimptest was given. -if test "${enable_gimptest+set}" = set; then - enableval=$enable_gimptest; -else - enable_gimptest=yes -fi - - - if test x$gimptool_exec_prefix != x ; then - gimptool_args="$gimptool_args --exec-prefix=$gimptool_exec_prefix" - if test x${GIMPTOOL+set} != xset ; then - GIMPTOOL=$gimptool_exec_prefix/bin/gimptool-1.2 - fi - fi - if test x$gimptool_prefix != x ; then - gimptool_args="$gimptool_args --prefix=$gimptool_prefix" - if test x${GIMPTOOL+set} != xset ; then - GIMPTOOL=$gimptool_prefix/bin/gimptool-1.2 - fi - fi - - for ac_prog in gimptool-1.2 gimptool -do - # Extract the first word of "$ac_prog", so it can be a program name with args. -set dummy $ac_prog; ac_word=$2 -{ echo "$as_me:$LINENO: checking for $ac_word" >&5 -echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } -if test "${ac_cv_path_GIMPTOOL+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - case $GIMPTOOL in - [\\/]* | ?:[\\/]*) - ac_cv_path_GIMPTOOL="$GIMPTOOL" # Let the user override the test with a path. - ;; - *) - as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -for as_dir in $PATH -do - IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then - ac_cv_path_GIMPTOOL="$as_dir/$ac_word$ac_exec_ext" - echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 - fi -done -done -IFS=$as_save_IFS - - ;; -esac -fi -GIMPTOOL=$ac_cv_path_GIMPTOOL -if test -n "$GIMPTOOL"; then - { echo "$as_me:$LINENO: result: $GIMPTOOL" >&5 -echo "${ECHO_T}$GIMPTOOL" >&6; } -else - { echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6; } -fi - - - test -n "$GIMPTOOL" && break -done -test -n "$GIMPTOOL" || GIMPTOOL="no" - - min_gimp_version=1.2.0 - { echo "$as_me:$LINENO: checking for GIMP 1.2 - version >= $min_gimp_version" >&5 -echo $ECHO_N "checking for GIMP 1.2 - version >= $min_gimp_version... $ECHO_C" >&6; } - no_gimp="" - if test "$GIMPTOOL" = "no" ; then - no_gimp=yes - else - GIMP_CFLAGS=`$GIMPTOOL $gimptool_args --cflags` - GIMP_LIBS=`$GIMPTOOL $gimptool_args --libs` - - GIMP_CFLAGS_NOUI=`$GIMPTOOL $gimptool_args --cflags-noui` - noui_test=`echo $GIMP_CFLAGS_NOUI | sed 's/^\(Usage\).*/\1/'` - if test "$noui_test" = "Usage" ; then - GIMP_CFLAGS_NOUI=$GIMP_CFLAGS - GIMP_LIBS_NOUI=$GIMP_LIBS - else - GIMP_LIBS_NOUI=`$GIMPTOOL $gimptool_args --libs-noui` - fi - - GIMP_DATA_DIR=`$GIMPTOOL $gimptool_args --gimpdatadir` - GIMP_PLUGIN_DIR=`$GIMPTOOL $gimptool_args --gimpplugindir` - nodatadir_test=`echo $GIMP_DATA_DIR | sed 's/^\(Usage\).*/\1/'` - if test "$nodatadir_test" = "Usage" ; then - GIMP_DATA_DIR="" - GIMP_PLUGIN_DIR="" - fi - - gimptool_major_version=`$GIMPTOOL $gimptool_args --version | \ - sed 's/\([0-9]*\).\([0-9]*\).\([0-9]*\)/\1/'` - gimptool_minor_version=`$GIMPTOOL $gimptool_args --version | \ - sed 's/\([0-9]*\).\([0-9]*\).\([0-9]*\)/\2/'` - gimptool_micro_version=`$GIMPTOOL $gimptool_args --version | \ - sed 's/\([0-9]*\).\([0-9]*\).\([0-9]*\)/\3/'` - if test "x$enable_gimptest" = "xyes" ; then - ac_save_CFLAGS="$CFLAGS" - ac_save_LIBS="$LIBS" - CFLAGS="$CFLAGS $GIMP_CFLAGS" - LIBS="$LIBS $GIMP_LIBS" - rm -f conf.gimptest - if test "$cross_compiling" = yes; then - echo $ac_n "cross compiling; assumed OK... $ac_c" -else - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ - -#include -#include - -#include - -#ifndef GIMP_CHECK_VERSION -#define GIMP_CHECK_VERSION(major, minor, micro) \ - (GIMP_MAJOR_VERSION == (major) && \ - GIMP_MINOR_VERSION == (minor) && \ - GIMP_MICRO_VERSION >= (micro)) -#endif - -#if GIMP_CHECK_VERSION(1,2,0) -GimpPlugInInfo -#else -GPlugInInfo -#endif -PLUG_IN_INFO = -{ - NULL, /* init_proc */ - NULL, /* quit_proc */ - NULL, /* query_proc */ - NULL /* run_proc */ -}; - -int main () -{ - int major, minor, micro; - char *tmp_version; - - system ("touch conf.gimptest"); - - /* HP/UX 9 (%@#!) writes to sscanf strings */ - tmp_version = g_strdup("$min_gimp_version"); - if (sscanf(tmp_version, "%d.%d.%d", &major, &minor, µ) != 3) { - printf("%s, bad version string\n", "$min_gimp_version"); - exit(1); - } - - if (($gimptool_major_version == major) && - ($gimptool_minor_version == minor) && - ($gimptool_micro_version >= micro)) - { - return 0; - } - else - { - printf("\n*** 'gimptool --version' returned %d.%d.%d, but the version\n", $gimptool_major_version, $gimptool_minor_version, $gimptool_micro_version); - printf("*** of GIMP 1.2 required is at least %d.%d.%d. If gimptool is\n", major, minor, micro); - printf("*** correct, then it is best to upgrade to the required version.\n"); - printf("*** If gimptool was wrong, set the environment variable GIMPTOOL\n"); - printf("*** to point to the correct copy of gimptool, and remove the file\n"); - printf("*** config.cache before re-running configure\n"); - return 1; - } -} - - -_ACEOF -rm -f conftest$ac_exeext -if { (ac_try="$ac_link" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_link") 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { ac_try='./conftest$ac_exeext' - { (case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_try") 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then - : -else - echo "$as_me: program exited with status $ac_status" >&5 -echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - -( exit $ac_status ) -no_gimp=yes -fi -rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext -fi - - - CFLAGS="$ac_save_CFLAGS" - LIBS="$ac_save_LIBS" - fi - fi - if test "x$no_gimp" = x ; then - { echo "$as_me:$LINENO: result: yes" >&5 -echo "${ECHO_T}yes" >&6; } - SAVE_GTK_LIBS="$GIMP_LIBS" - SAVE_GTK_CFLAGS="$GIMP_CFLAGS" - else - { echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6; } - if test "$GIMPTOOL" = "no" ; then - echo "*** The gimptool script installed by GIMP 1.2 could not be" - echo "*** found. If GIMP 1.2 was installed in PREFIX, make sure" - echo "*** PREFIX/bin is in your path, or set the GIMPTOOL" - echo "*** environment variable to the full path to gimptool." - else - if test -f conf.gimptest ; then - : - else - echo "*** Could not run GIMP 1.2 test program, checking why..." - CFLAGS="$CFLAGS $GIMP_CFLAGS" - LIBS="$LIBS $GIMP_LIBS" - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ - -#include -#include - -#ifndef GIMP_CHECK_VERSION -#define GIMP_CHECK_VERSION(major, minor, micro) \ - (GIMP_MAJOR_VERSION == (major) && \ - GIMP_MINOR_VERSION == (minor) && \ - GIMP_MICRO_VERSION >= (micro)) -#endif - -#if GIMP_CHECK_VERSION(1,2,0) -GimpPlugInInfo -#else -GPlugInInfo -#endif -PLUG_IN_INFO = -{ - NULL, /* init_proc */ - NULL, /* quit_proc */ - NULL, /* query_proc */ - NULL /* run_proc */ -}; - -int -main () -{ - return 0; - ; - return 0; -} -_ACEOF -rm -f conftest.$ac_objext conftest$ac_exeext -if { (ac_try="$ac_link" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_link") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest$ac_exeext && - $as_test_x conftest$ac_exeext; then - echo "*** The test program compiled, but did not run. This usually means that" - echo "*** the run-time linker is not finding GIMP 1.2 or is finding the wrong" - echo "*** version of GIMP. If it is not finding GIMP 1.2, you'll need to set" - echo "*** your LD_LIBRARY_PATH environment variable, or edit /etc/ld.so.conf" - echo "*** to point to the installed location. Also, make sure you have run" - echo "*** ldconfig if that is required on your system." - echo "***" - echo "*** If you have an old version installed, it is best to remove it," - echo "*** although you may also be able to get things to work by modifying" - echo "*** LD_LIBRARY_PATH." -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - echo "*** The test program failed to compile or link. See the file config.log" - echo "*** for the exact error that occured. This usually means GIMP 1.2 was" - echo "*** incorrectly installed or that you have moved GIMP 1.2 since it was" - echo "*** installed. In the latter case, you may want to edit the gimptool" - echo "*** gimptool script: $GIMPTOOL" -fi - -rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ - conftest$ac_exeext conftest.$ac_ext - CFLAGS="$ac_save_CFLAGS" - LIBS="$ac_save_LIBS" - fi - fi - GIMP_CFLAGS="" - GIMP_LIBS="" - GIMP_CFLAGS_NOUI="" - GIMP_LIBS_NOUI="" - { { echo "$as_me:$LINENO: error: Cannot find GIMP 1.2 libraries: Please run ldconfig as root, make sure gimptool is on your PATH, and if applicable ensure that you have the GIMP, GTK, and GLIB development packages installed." >&5 -echo "$as_me: error: Cannot find GIMP 1.2 libraries: Please run ldconfig as root, make sure gimptool is on your PATH, and if applicable ensure that you have the GIMP, GTK, and GLIB development packages installed." >&2;} - { (exit 1); exit 1; }; } - - fi - - - - - - - rm -f conf.gimptest - - fi -fi - - -if test x${BUILD_GIMP} = xyes ; then - { echo "$as_me:$LINENO: checking for GIMP 1.2 plug-in directory" >&5 -echo $ECHO_N "checking for GIMP 1.2 plug-in directory... $ECHO_C" >&6; } -# create temporary "plug-in" to install - touch print - chmod 755 print - GIMPTOOL_OUTPUT=`$GIMPTOOL --dry-run --install-${PLUG_IN_PATH} print` - rm print - gimp_plug_indir=`echo "$GIMPTOOL_OUTPUT" | sed -e 's/.* \(.*\)\/print/\1/'` - { echo "$as_me:$LINENO: result: $gimp_plug_indir" >&5 -echo "${ECHO_T}$gimp_plug_indir" >&6; } -else - gimp_plug_indir="$libdir/gimp/1.2/plug-ins" -fi - -if test x${BUILD_GIMP2} = xyes ; then - GIMP2_DATA_DIR=`$PKG_CONFIG gimp-2.0 --variable=gimpdatadir` - GIMP2_PLUGIN_DIR=`$PKG_CONFIG gimp-2.0 --variable=gimplibdir`/plug-ins - gimp2_plug_indir="${GIMP2_PLUGIN_DIR}" -fi - - -{ echo "$as_me:$LINENO: checking for ANSI C header files" >&5 -echo $ECHO_N "checking for ANSI C header files... $ECHO_C" >&6; } -if test "${ac_cv_header_stdc+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ -#include -#include -#include -#include - -int -main () -{ - - ; - return 0; -} -_ACEOF -rm -f conftest.$ac_objext -if { (ac_try="$ac_compile" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_compile") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest.$ac_objext; then - ac_cv_header_stdc=yes -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - ac_cv_header_stdc=no -fi - -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext - -if test $ac_cv_header_stdc = yes; then - # SunOS 4.x string.h does not declare mem*, contrary to ANSI. - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ -#include - -_ACEOF -if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | - $EGREP "memchr" >/dev/null 2>&1; then - : -else - ac_cv_header_stdc=no -fi -rm -f conftest* - -fi - -if test $ac_cv_header_stdc = yes; then - # ISC 2.0.2 stdlib.h does not declare free, contrary to ANSI. - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ -#include - -_ACEOF -if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | - $EGREP "free" >/dev/null 2>&1; then - : -else - ac_cv_header_stdc=no -fi -rm -f conftest* - -fi - -if test $ac_cv_header_stdc = yes; then - # /bin/cc in Irix-4.0.5 gets non-ANSI ctype macros unless using -ansi. - if test "$cross_compiling" = yes; then - : -else - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ -#include -#include -#if ((' ' & 0x0FF) == 0x020) -# define ISLOWER(c) ('a' <= (c) && (c) <= 'z') -# define TOUPPER(c) (ISLOWER(c) ? 'A' + ((c) - 'a') : (c)) -#else -# define ISLOWER(c) \ - (('a' <= (c) && (c) <= 'i') \ - || ('j' <= (c) && (c) <= 'r') \ - || ('s' <= (c) && (c) <= 'z')) -# define TOUPPER(c) (ISLOWER(c) ? ((c) | 0x40) : (c)) -#endif - -#define XOR(e, f) (((e) && !(f)) || (!(e) && (f))) -int -main () -{ - int i; - for (i = 0; i < 256; i++) - if (XOR (islower (i), ISLOWER (i)) - || toupper (i) != TOUPPER (i)) - return 2; - return 0; -} -_ACEOF -rm -f conftest$ac_exeext -if { (ac_try="$ac_link" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_link") 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { ac_try='./conftest$ac_exeext' - { (case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_try") 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then - : -else - echo "$as_me: program exited with status $ac_status" >&5 -echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - -( exit $ac_status ) -ac_cv_header_stdc=no -fi -rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext -fi - - -fi -fi -{ echo "$as_me:$LINENO: result: $ac_cv_header_stdc" >&5 -echo "${ECHO_T}$ac_cv_header_stdc" >&6; } -if test $ac_cv_header_stdc = yes; then - -cat >>confdefs.h <<\_ACEOF -#define STDC_HEADERS 1 -_ACEOF - -fi - - -for ac_header in getopt.h -do -as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh` -if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then - { echo "$as_me:$LINENO: checking for $ac_header" >&5 -echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; } -if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -fi -ac_res=`eval echo '${'$as_ac_Header'}'` - { echo "$as_me:$LINENO: result: $ac_res" >&5 -echo "${ECHO_T}$ac_res" >&6; } -else - # Is the header compilable? -{ echo "$as_me:$LINENO: checking $ac_header usability" >&5 -echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6; } -cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ -$ac_includes_default -#include <$ac_header> -_ACEOF -rm -f conftest.$ac_objext -if { (ac_try="$ac_compile" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_compile") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest.$ac_objext; then - ac_header_compiler=yes -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - ac_header_compiler=no -fi - -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext -{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 -echo "${ECHO_T}$ac_header_compiler" >&6; } +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 +echo "${ECHO_T}$ac_header_compiler" >&6; } # Is the header present? { echo "$as_me:$LINENO: checking $ac_header presence" >&5 @@ -31686,15 +29830,6 @@ else fi - if test x${BUILD_LIBGUTENPRINTUI} = xyes; then - BUILD_LIBGUTENPRINTUI_TRUE= - BUILD_LIBGUTENPRINTUI_FALSE='#' -else - BUILD_LIBGUTENPRINTUI_TRUE='#' - BUILD_LIBGUTENPRINTUI_FALSE= -fi - - if test x${BUILD_LIBGUTENPRINTUI2} = xyes; then BUILD_LIBGUTENPRINTUI2_TRUE= BUILD_LIBGUTENPRINTUI2_FALSE='#' @@ -31704,15 +29839,6 @@ else fi - if test x${BUILD_GIMP} = xyes; then - BUILD_GIMP_TRUE= - BUILD_GIMP_FALSE='#' -else - BUILD_GIMP_TRUE='#' - BUILD_GIMP_FALSE= -fi - - if test x${BUILD_GIMP2} = xyes; then BUILD_GIMP2_TRUE= BUILD_GIMP2_FALSE='#' @@ -31933,7 +30059,7 @@ cat >>confdefs.h <<_ACEOF #define CUPS_PPD_PS_LEVEL ${CUPS_PPD_PS_LEVEL} _ACEOF -RELEASE_DATE="01 Jan 2008" +RELEASE_DATE="27 Apr 2008" cat >>confdefs.h <<_ACEOF #define RELEASE_DATE "${RELEASE_DATE}" @@ -31962,13 +30088,6 @@ RM='rm' - - - - - - - @@ -31981,10 +30100,6 @@ gutenprint_libs="${GUTENPRINT_LIBS} ${gutenprint_libdeps}" -gutenprintui_libs="${GUTENPRINTUI_LIBS} ${gutenprintui_libdeps}" - - - gutenprintui2_libs="${GUTENPRINTUI2_LIBS} ${gutenprintui2_libdeps}" @@ -32009,8 +30124,6 @@ ac_config_files="$ac_config_files include/Makefile" ac_config_files="$ac_config_files include/gutenprint/Makefile" -ac_config_files="$ac_config_files include/gutenprintui/Makefile" - ac_config_files="$ac_config_files include/gutenprintui2/Makefile" ac_config_files="$ac_config_files include/gutenprint/gutenprint-version.h" @@ -32021,8 +30134,6 @@ ac_config_files="$ac_config_files man/cups-calibrate.8" ac_config_files="$ac_config_files man/cups-genppd.8" -ac_config_files="$ac_config_files man/cups-genppdconfig.8" - ac_config_files="$ac_config_files man/cups-genppdupdate.8" ac_config_files="$ac_config_files man/escputil.1" @@ -32037,8 +30148,6 @@ ac_config_files="$ac_config_files src/Makefile" ac_config_files="$ac_config_files src/cups/Makefile" -ac_config_files="$ac_config_files src/cups/cups-genppdconfig" - ac_config_files="$ac_config_files src/cups/cups-genppdupdate" ac_config_files="$ac_config_files src/escputil/Makefile" @@ -32057,18 +30166,12 @@ ac_config_files="$ac_config_files src/ghost/Makefile" ac_config_files="$ac_config_files src/testpattern/Makefile" -ac_config_files="$ac_config_files src/gimp/Makefile" - ac_config_files="$ac_config_files src/gimp2/Makefile" ac_config_files="$ac_config_files src/main/Makefile" ac_config_files="$ac_config_files src/main/gutenprint.pc" -ac_config_files="$ac_config_files src/gutenprintui/Makefile" - -ac_config_files="$ac_config_files src/gutenprintui/gutenprintui.pc" - ac_config_files="$ac_config_files src/gutenprintui2/Makefile" ac_config_files="$ac_config_files src/gutenprintui2/gutenprintui2.pc" @@ -32309,13 +30412,6 @@ echo "$as_me: error: conditional \"BUILD_TESTPATTERN\" was never defined. Usually this means the macro was only invoked conditionally." >&2;} { (exit 1); exit 1; }; } fi -if test -z "${BUILD_LIBGUTENPRINTUI_TRUE}" && test -z "${BUILD_LIBGUTENPRINTUI_FALSE}"; then - { { echo "$as_me:$LINENO: error: conditional \"BUILD_LIBGUTENPRINTUI\" was never defined. -Usually this means the macro was only invoked conditionally." >&5 -echo "$as_me: error: conditional \"BUILD_LIBGUTENPRINTUI\" was never defined. -Usually this means the macro was only invoked conditionally." >&2;} - { (exit 1); exit 1; }; } -fi if test -z "${BUILD_LIBGUTENPRINTUI2_TRUE}" && test -z "${BUILD_LIBGUTENPRINTUI2_FALSE}"; then { { echo "$as_me:$LINENO: error: conditional \"BUILD_LIBGUTENPRINTUI2\" was never defined. Usually this means the macro was only invoked conditionally." >&5 @@ -32323,13 +30419,6 @@ echo "$as_me: error: conditional \"BUILD_LIBGUTENPRINTUI2\" was never defined. Usually this means the macro was only invoked conditionally." >&2;} { (exit 1); exit 1; }; } fi -if test -z "${BUILD_GIMP_TRUE}" && test -z "${BUILD_GIMP_FALSE}"; then - { { echo "$as_me:$LINENO: error: conditional \"BUILD_GIMP\" was never defined. -Usually this means the macro was only invoked conditionally." >&5 -echo "$as_me: error: conditional \"BUILD_GIMP\" was never defined. -Usually this means the macro was only invoked conditionally." >&2;} - { (exit 1); exit 1; }; } -fi if test -z "${BUILD_GIMP2_TRUE}" && test -z "${BUILD_GIMP2_FALSE}"; then { { echo "$as_me:$LINENO: error: conditional \"BUILD_GIMP2\" was never defined. Usually this means the macro was only invoked conditionally." >&5 @@ -32683,7 +30772,7 @@ exec 6>&1 # report actual input values of CONFIG_FILES etc. instead of their # values after options handling. ac_log=" -This file was extended by gutenprint $as_me 5.0.2, which was +This file was extended by gutenprint $as_me 5.1.98.2, which was generated by GNU Autoconf 2.61. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -32736,7 +30825,7 @@ Report bugs to ." _ACEOF cat >>$CONFIG_STATUS <<_ACEOF ac_cs_version="\\ -gutenprint config.status 5.0.2 +gutenprint config.status 5.1.98.2 configured by $0, generated by GNU Autoconf 2.61, with options \\"`echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`\\" @@ -32869,13 +30958,11 @@ do "doc/developer/Makefile") CONFIG_FILES="$CONFIG_FILES doc/developer/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" ;; "include/gutenprintui2/Makefile") CONFIG_FILES="$CONFIG_FILES include/gutenprintui2/Makefile" ;; "include/gutenprint/gutenprint-version.h") CONFIG_FILES="$CONFIG_FILES include/gutenprint/gutenprint-version.h" ;; "man/Makefile") CONFIG_FILES="$CONFIG_FILES man/Makefile" ;; "man/cups-calibrate.8") CONFIG_FILES="$CONFIG_FILES man/cups-calibrate.8" ;; "man/cups-genppd.8") CONFIG_FILES="$CONFIG_FILES man/cups-genppd.8" ;; - "man/cups-genppdconfig.8") CONFIG_FILES="$CONFIG_FILES man/cups-genppdconfig.8" ;; "man/cups-genppdupdate.8") CONFIG_FILES="$CONFIG_FILES man/cups-genppdupdate.8" ;; "man/escputil.1") CONFIG_FILES="$CONFIG_FILES man/escputil.1" ;; "man/ijsgutenprint.1") CONFIG_FILES="$CONFIG_FILES man/ijsgutenprint.1" ;; @@ -32883,7 +30970,6 @@ do "samples/Makefile") CONFIG_FILES="$CONFIG_FILES samples/Makefile" ;; "src/Makefile") CONFIG_FILES="$CONFIG_FILES src/Makefile" ;; "src/cups/Makefile") CONFIG_FILES="$CONFIG_FILES src/cups/Makefile" ;; - "src/cups/cups-genppdconfig") CONFIG_FILES="$CONFIG_FILES src/cups/cups-genppdconfig" ;; "src/cups/cups-genppdupdate") CONFIG_FILES="$CONFIG_FILES src/cups/cups-genppdupdate" ;; "src/escputil/Makefile") CONFIG_FILES="$CONFIG_FILES src/escputil/Makefile" ;; "src/foomatic/Makefile") CONFIG_FILES="$CONFIG_FILES src/foomatic/Makefile" ;; @@ -32893,12 +30979,9 @@ do "src/cups/test-rastertogutenprint") CONFIG_FILES="$CONFIG_FILES src/cups/test-rastertogutenprint" ;; "src/ghost/Makefile") CONFIG_FILES="$CONFIG_FILES src/ghost/Makefile" ;; "src/testpattern/Makefile") CONFIG_FILES="$CONFIG_FILES src/testpattern/Makefile" ;; - "src/gimp/Makefile") CONFIG_FILES="$CONFIG_FILES src/gimp/Makefile" ;; "src/gimp2/Makefile") CONFIG_FILES="$CONFIG_FILES src/gimp2/Makefile" ;; "src/main/Makefile") CONFIG_FILES="$CONFIG_FILES src/main/Makefile" ;; "src/main/gutenprint.pc") CONFIG_FILES="$CONFIG_FILES src/main/gutenprint.pc" ;; - "src/gutenprintui/Makefile") CONFIG_FILES="$CONFIG_FILES src/gutenprintui/Makefile" ;; - "src/gutenprintui/gutenprintui.pc") CONFIG_FILES="$CONFIG_FILES src/gutenprintui/gutenprintui.pc" ;; "src/gutenprintui2/Makefile") CONFIG_FILES="$CONFIG_FILES src/gutenprintui2/Makefile" ;; "src/gutenprintui2/gutenprintui2.pc") CONFIG_FILES="$CONFIG_FILES src/gutenprintui2/gutenprintui2.pc" ;; "test/Makefile") CONFIG_FILES="$CONFIG_FILES test/Makefile" ;; @@ -33010,9 +31093,6 @@ GUTENPRINT_CURRENT_INTERFACE!$GUTENPRINT_CURRENT_INTERFACE$ac_delim GUTENPRINT_INTERFACE_AGE!$GUTENPRINT_INTERFACE_AGE$ac_delim GUTENPRINT_BINARY_AGE!$GUTENPRINT_BINARY_AGE$ac_delim GUTENPRINT_VERSION!$GUTENPRINT_VERSION$ac_delim -GUTENPRINTUI_CURRENT_INTERFACE!$GUTENPRINTUI_CURRENT_INTERFACE$ac_delim -GUTENPRINTUI_INTERFACE_AGE!$GUTENPRINTUI_INTERFACE_AGE$ac_delim -GUTENPRINTUI_BINARY_AGE!$GUTENPRINTUI_BINARY_AGE$ac_delim GUTENPRINTUI2_CURRENT_INTERFACE!$GUTENPRINTUI2_CURRENT_INTERFACE$ac_delim GUTENPRINTUI2_INTERFACE_AGE!$GUTENPRINTUI2_INTERFACE_AGE$ac_delim GUTENPRINTUI2_BINARY_AGE!$GUTENPRINTUI2_BINARY_AGE$ac_delim @@ -33063,6 +31143,9 @@ AMDEPBACKSLASH!$AMDEPBACKSLASH$ac_delim CCDEPMODE!$CCDEPMODE$ac_delim am__fastdepCC_TRUE!$am__fastdepCC_TRUE$ac_delim am__fastdepCC_FALSE!$am__fastdepCC_FALSE$ac_delim +SED!$SED$ac_delim +GREP!$GREP$ac_delim +EGREP!$EGREP$ac_delim _ACEOF if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 97; then @@ -33104,9 +31187,6 @@ _ACEOF ac_delim='%!_!# ' for ac_last_try in false false false false false :; do cat >conf$$subs.sed <<_ACEOF -SED!$SED$ac_delim -GREP!$GREP$ac_delim -EGREP!$EGREP$ac_delim LN_S!$LN_S$ac_delim ECHO!$ECHO$ac_delim AR!$AR$ac_delim @@ -33131,10 +31211,6 @@ CUPS_CONFIG!$CUPS_CONFIG$ac_delim FOOMATIC_CONFIGURE!$FOOMATIC_CONFIGURE$ac_delim FOOMATIC_PPDFILE!$FOOMATIC_PPDFILE$ac_delim IJS_CONFIG!$IJS_CONFIG$ac_delim -GIMPTOOL_CHECK!$GIMPTOOL_CHECK$ac_delim -GTK_CONFIG!$GTK_CONFIG$ac_delim -GTK_CFLAGS!$GTK_CFLAGS$ac_delim -GTK_LIBS!$GTK_LIBS$ac_delim GIMPTOOL2_CHECK!$GIMPTOOL2_CHECK$ac_delim PKG_CONFIG!$PKG_CONFIG$ac_delim GTK2_CFLAGS!$GTK2_CFLAGS$ac_delim @@ -33174,16 +31250,6 @@ LIBINTL!$LIBINTL$ac_delim LTLIBINTL!$LTLIBINTL$ac_delim POSUB!$POSUB$ac_delim GNUCFLAGS!$GNUCFLAGS$ac_delim -GLIB_CONFIG!$GLIB_CONFIG$ac_delim -GLIB_CFLAGS!$GLIB_CFLAGS$ac_delim -GLIB_LIBS!$GLIB_LIBS$ac_delim -GIMPTOOL!$GIMPTOOL$ac_delim -GIMP_CFLAGS!$GIMP_CFLAGS$ac_delim -GIMP_LIBS!$GIMP_LIBS$ac_delim -GIMP_CFLAGS_NOUI!$GIMP_CFLAGS_NOUI$ac_delim -GIMP_LIBS_NOUI!$GIMP_LIBS_NOUI$ac_delim -GIMP_DATA_DIR!$GIMP_DATA_DIR$ac_delim -GIMP_PLUGIN_DIR!$GIMP_PLUGIN_DIR$ac_delim BUILD_FOOMATIC_TRUE!$BUILD_FOOMATIC_TRUE$ac_delim BUILD_FOOMATIC_FALSE!$BUILD_FOOMATIC_FALSE$ac_delim BUILD_FOOMATIC_3_TRUE!$BUILD_FOOMATIC_3_TRUE$ac_delim @@ -33201,6 +31267,23 @@ CUPS_PPDS_AT_TOP_LEVEL_FALSE!$CUPS_PPDS_AT_TOP_LEVEL_FALSE$ac_delim BUILD_TRANSLATED_CUPS_PPDS_TRUE!$BUILD_TRANSLATED_CUPS_PPDS_TRUE$ac_delim BUILD_TRANSLATED_CUPS_PPDS_FALSE!$BUILD_TRANSLATED_CUPS_PPDS_FALSE$ac_delim BUILD_SIMPLIFIED_CUPS_PPDS_TRUE!$BUILD_SIMPLIFIED_CUPS_PPDS_TRUE$ac_delim +BUILD_SIMPLIFIED_CUPS_PPDS_FALSE!$BUILD_SIMPLIFIED_CUPS_PPDS_FALSE$ac_delim +USE_LEVEL3_PS_TRUE!$USE_LEVEL3_PS_TRUE$ac_delim +USE_LEVEL3_PS_FALSE!$USE_LEVEL3_PS_FALSE$ac_delim +BUILD_ESCPUTIL_TRUE!$BUILD_ESCPUTIL_TRUE$ac_delim +BUILD_ESCPUTIL_FALSE!$BUILD_ESCPUTIL_FALSE$ac_delim +BUILD_TEST_TRUE!$BUILD_TEST_TRUE$ac_delim +BUILD_TEST_FALSE!$BUILD_TEST_FALSE$ac_delim +BUILD_TESTPATTERN_TRUE!$BUILD_TESTPATTERN_TRUE$ac_delim +BUILD_TESTPATTERN_FALSE!$BUILD_TESTPATTERN_FALSE$ac_delim +BUILD_LIBGUTENPRINTUI2_TRUE!$BUILD_LIBGUTENPRINTUI2_TRUE$ac_delim +BUILD_LIBGUTENPRINTUI2_FALSE!$BUILD_LIBGUTENPRINTUI2_FALSE$ac_delim +BUILD_GIMP2_TRUE!$BUILD_GIMP2_TRUE$ac_delim +BUILD_GIMP2_FALSE!$BUILD_GIMP2_FALSE$ac_delim +BUILD_GIMP2_AS_GUTENPRINT_TRUE!$BUILD_GIMP2_AS_GUTENPRINT_TRUE$ac_delim +BUILD_GIMP2_AS_GUTENPRINT_FALSE!$BUILD_GIMP2_AS_GUTENPRINT_FALSE$ac_delim +INSTALL_SAMPLES_TRUE!$INSTALL_SAMPLES_TRUE$ac_delim +INSTALL_SAMPLES_FALSE!$INSTALL_SAMPLES_FALSE$ac_delim _ACEOF if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 97; then @@ -33242,27 +31325,6 @@ _ACEOF ac_delim='%!_!# ' for ac_last_try in false false false false false :; do cat >conf$$subs.sed <<_ACEOF -BUILD_SIMPLIFIED_CUPS_PPDS_FALSE!$BUILD_SIMPLIFIED_CUPS_PPDS_FALSE$ac_delim -USE_LEVEL3_PS_TRUE!$USE_LEVEL3_PS_TRUE$ac_delim -USE_LEVEL3_PS_FALSE!$USE_LEVEL3_PS_FALSE$ac_delim -BUILD_ESCPUTIL_TRUE!$BUILD_ESCPUTIL_TRUE$ac_delim -BUILD_ESCPUTIL_FALSE!$BUILD_ESCPUTIL_FALSE$ac_delim -BUILD_TEST_TRUE!$BUILD_TEST_TRUE$ac_delim -BUILD_TEST_FALSE!$BUILD_TEST_FALSE$ac_delim -BUILD_TESTPATTERN_TRUE!$BUILD_TESTPATTERN_TRUE$ac_delim -BUILD_TESTPATTERN_FALSE!$BUILD_TESTPATTERN_FALSE$ac_delim -BUILD_LIBGUTENPRINTUI_TRUE!$BUILD_LIBGUTENPRINTUI_TRUE$ac_delim -BUILD_LIBGUTENPRINTUI_FALSE!$BUILD_LIBGUTENPRINTUI_FALSE$ac_delim -BUILD_LIBGUTENPRINTUI2_TRUE!$BUILD_LIBGUTENPRINTUI2_TRUE$ac_delim -BUILD_LIBGUTENPRINTUI2_FALSE!$BUILD_LIBGUTENPRINTUI2_FALSE$ac_delim -BUILD_GIMP_TRUE!$BUILD_GIMP_TRUE$ac_delim -BUILD_GIMP_FALSE!$BUILD_GIMP_FALSE$ac_delim -BUILD_GIMP2_TRUE!$BUILD_GIMP2_TRUE$ac_delim -BUILD_GIMP2_FALSE!$BUILD_GIMP2_FALSE$ac_delim -BUILD_GIMP2_AS_GUTENPRINT_TRUE!$BUILD_GIMP2_AS_GUTENPRINT_TRUE$ac_delim -BUILD_GIMP2_AS_GUTENPRINT_FALSE!$BUILD_GIMP2_AS_GUTENPRINT_FALSE$ac_delim -INSTALL_SAMPLES_TRUE!$INSTALL_SAMPLES_TRUE$ac_delim -INSTALL_SAMPLES_FALSE!$INSTALL_SAMPLES_FALSE$ac_delim INSTALL_USER_GUIDE_TRUE!$INSTALL_USER_GUIDE_TRUE$ac_delim INSTALL_USER_GUIDE_FALSE!$INSTALL_USER_GUIDE_FALSE$ac_delim USE_NLS_TRUE!$USE_NLS_TRUE$ac_delim @@ -33286,15 +31348,10 @@ GENPPD_LIBS!$GENPPD_LIBS$ac_delim IJS_CFLAGS!$IJS_CFLAGS$ac_delim IJS_LIBS!$IJS_LIBS$ac_delim RM!$RM$ac_delim -gimp_plug_indir!$gimp_plug_indir$ac_delim gimp2_plug_indir!$gimp2_plug_indir$ac_delim GUTENPRINT_CFLAGS!$GUTENPRINT_CFLAGS$ac_delim GUTENPRINT_LIBS!$GUTENPRINT_LIBS$ac_delim GUTENPRINT_LIBDEPS!$GUTENPRINT_LIBDEPS$ac_delim -GUTENPRINTUI_CFLAGS!$GUTENPRINTUI_CFLAGS$ac_delim -GUTENPRINTUI_LIBS!$GUTENPRINTUI_LIBS$ac_delim -GUTENPRINTUI_LIBDEPS!$GUTENPRINTUI_LIBDEPS$ac_delim -GUTENPRINTUI_VERSION!$GUTENPRINTUI_VERSION$ac_delim GUTENPRINTUI2_CFLAGS!$GUTENPRINTUI2_CFLAGS$ac_delim GUTENPRINTUI2_LIBS!$GUTENPRINTUI2_LIBS$ac_delim GUTENPRINTUI2_LIBDEPS!$GUTENPRINTUI2_LIBDEPS$ac_delim @@ -33302,9 +31359,6 @@ GUTENPRINTUI2_VERSION!$GUTENPRINTUI2_VERSION$ac_delim gutenprint_cflags!$gutenprint_cflags$ac_delim gutenprint_libs!$gutenprint_libs$ac_delim gutenprint_libdeps!$gutenprint_libdeps$ac_delim -gutenprintui_cflags!$gutenprintui_cflags$ac_delim -gutenprintui_libs!$gutenprintui_libs$ac_delim -gutenprintui_libdeps!$gutenprintui_libdeps$ac_delim gutenprintui2_cflags!$gutenprintui2_cflags$ac_delim gutenprintui2_libs!$gutenprintui2_libs$ac_delim gutenprintui2_libdeps!$gutenprintui2_libdeps$ac_delim @@ -33318,7 +31372,7 @@ LTLIBOBJS!$LTLIBOBJS$ac_delim LTALLOCA!$LTALLOCA$ac_delim _ACEOF - if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 74; then + if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 45; then break elif $ac_last_try; then { { echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5 @@ -33980,14 +32034,7 @@ done ;; esac done ;; - "src/cups/cups-genppdconfig":F) chmod +x src/cups/cups-genppdconfig; - rm -f src/cups/cups-genppdconfig.${GUTENPRINT_RELEASE_VERSION}; - mv src/cups/cups-genppdconfig src/cups/cups-genppdconfig.${GUTENPRINT_RELEASE_VERSION}; - echo " *** Ignore any warning that may follow that sed can't read src/cups/cups-genppdconfig" ;; - "src/cups/cups-genppdupdate":F) chmod +x src/cups/cups-genppdupdate; - rm -f src/cups/cups-genppdupdate.${GUTENPRINT_RELEASE_VERSION}; - mv src/cups/cups-genppdupdate src/cups/cups-genppdupdate.${GUTENPRINT_RELEASE_VERSION}; - echo " *** Ignore any warning that may follow that sed can't read src/cups/cups-genppdupdate" ;; + "src/cups/cups-genppdupdate":F) chmod +x src/cups/cups-genppdupdate ;; "src/foomatic/foomatic-generator":F) chmod +x src/foomatic/foomatic-generator ;; "src/foomatic/mk_printerlist":F) chmod +x src/foomatic/mk_printerlist ;; "src/testpattern/run-testpattern-2":F) chmod +x src/testpattern/run-testpattern-2 ;; @@ -34070,16 +32117,12 @@ echo " Build Foomatic data: $BUILD_FOOMATIC" if test "$BUILD_FOOMATIC" != "no" ; then echo " Build Foomatic 3.x data: $BUILD_FOOMATIC_3" fi -if test "$BUILD_GIMP" != "no" -o "$BUILD_GIMP2" != "no" ; then +if test "$BUILD_GIMP2" != "no" ; then echo " Build enhanced Print plugin for 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 + if test "$BUILD_GIMP2_AS_GUTENPRINT" != "no" ; then + echo " GIMP plugin will be named: gutenprint" + else + echo " GIMP plugin will be named: print" fi echo " Install plugin(s) in home directory: $USER_INSTALL" else diff --git a/configure.ac b/configure.ac index 6be334f..981fbc9 100644 --- a/configure.ac +++ b/configure.ac @@ -1,4 +1,4 @@ -dnl $Id: configure.ac,v 1.151.2.5 2007/12/29 20:46:10 rlk Exp $ +dnl $Id: configure.ac,v 1.180 2008/04/28 02:06:43 rlk Exp $ dnl Copyright (C) 2001-2004 Roger Leigh dnl dnl This program is free software; you can redistribute it and/or modify @@ -36,15 +36,12 @@ dnl For more detailed information, see the libtool info documentation. dnl pushdef([GUTENPRINT_NAME], [gutenprint]) pushdef([GUTENPRINT_MAJOR_VERSION], [5]) -pushdef([GUTENPRINT_MINOR_VERSION], [0]) -pushdef([GUTENPRINT_MICRO_VERSION], [2]) -pushdef([GUTENPRINT_EXTRA_VERSION], []) +pushdef([GUTENPRINT_MINOR_VERSION], [1]) +pushdef([GUTENPRINT_MICRO_VERSION], [98]) +pushdef([GUTENPRINT_EXTRA_VERSION], [.2]) pushdef([GUTENPRINT_CURRENT_INTERFACE], [2]) pushdef([GUTENPRINT_INTERFACE_AGE], [0]) pushdef([GUTENPRINT_BINARY_AGE], [0]) -pushdef([GUTENPRINTUI_CURRENT_INTERFACE], [1]) -pushdef([GUTENPRINTUI_INTERFACE_AGE], [0]) -pushdef([GUTENPRINTUI_BINARY_AGE], [0]) pushdef([GUTENPRINTUI2_CURRENT_INTERFACE], [1]) pushdef([GUTENPRINTUI2_INTERFACE_AGE], [0]) pushdef([GUTENPRINTUI2_BINARY_AGE], [0]) @@ -52,7 +49,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.151.2.5 $) +AC_REVISION($Revision: 1.180 $) AC_CONFIG_SRCDIR(src/main/print-vars.c) AC_CONFIG_AUX_DIR(scripts) STP_INIT @@ -82,9 +79,6 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. [GUTENPRINT_INTERFACE_AGE]=GUTENPRINT_INTERFACE_AGE [GUTENPRINT_BINARY_AGE]=GUTENPRINT_BINARY_AGE [GUTENPRINT_VERSION]=GUTENPRINT_VERSION -[GUTENPRINTUI_CURRENT_INTERFACE]=GUTENPRINTUI_CURRENT_INTERFACE -[GUTENPRINTUI_INTERFACE_AGE]=GUTENPRINTUI_INTERFACE_AGE -[GUTENPRINTUI_BINARY_AGE]=GUTENPRINTUI_BINARY_AGE [GUTENPRINTUI2_CURRENT_INTERFACE]=GUTENPRINTUI2_CURRENT_INTERFACE [GUTENPRINTUI2_INTERFACE_AGE]=GUTENPRINTUI2_INTERFACE_AGE [GUTENPRINTUI2_BINARY_AGE]=GUTENPRINTUI2_BINARY_AGE @@ -95,9 +89,6 @@ popdef([GUTENPRINT_EXTRA_VERSION]) popdef([GUTENPRINT_CURRENT_INTERFACE]) popdef([GUTENPRINT_INTERFACE_AGE]) popdef([GUTENPRINT_BINARY_AGE]) -popdef([GUTENPRINTUI_CURRENT_INTERFACE]) -popdef([GUTENPRINTUI_INTERFACE_AGE]) -popdef([GUTENPRINTUI_BINARY_AGE]) popdef([GUTENPRINTUI2_CURRENT_INTERFACE]) popdef([GUTENPRINTUI2_INTERFACE_AGE]) popdef([GUTENPRINTUI2_BINARY_AGE]) @@ -109,9 +100,6 @@ AC_SUBST([GUTENPRINT_CURRENT_INTERFACE]) AC_SUBST([GUTENPRINT_INTERFACE_AGE]) AC_SUBST([GUTENPRINT_BINARY_AGE]) AC_SUBST([GUTENPRINT_VERSION]) -AC_SUBST([GUTENPRINTUI_CURRENT_INTERFACE]) -AC_SUBST([GUTENPRINTUI_INTERFACE_AGE]) -AC_SUBST([GUTENPRINTUI_BINARY_AGE]) AC_SUBST([GUTENPRINTUI2_CURRENT_INTERFACE]) AC_SUBST([GUTENPRINTUI2_INTERFACE_AGE]) AC_SUBST([GUTENPRINTUI2_BINARY_AGE]) @@ -141,13 +129,10 @@ dnl *_cflags: cflags for pkg-config dnl *_libs: libs for pkg-config GUTENPRINT_LIBS="-lgutenprint" -GUTENPRINTUI_LIBS="-lgutenprintui" GUTENPRINTUI2_LIBS="-lgutenprintui2" gutenprint_version=${GUTENPRINT_VERSION} -gutenprintui_version=${GUTENPRINT_VERSION} gutenprintui2_version=${GUTENPRINT_VERSION} -GUTENPRINTUI_LIBDEPS="${GUTENPRINTUI_LIBDEPS} \$(GUTENPRINT_LIBS)" GUTENPRINTUI2_LIBDEPS="${GUTENPRINTUI2_LIBDEPS} \$(GUTENPRINT_LIBS)" dnl Specify a configuration file. @@ -379,37 +364,6 @@ dnl if test -z "${[EXTRA_LIBREADLINE_DEPS]}" ; then dnl [EXTRA_LIBREADLINE_DEPS]="" dnl fi -AC_PATH_PROGS([GIMPTOOL_CHECK], [gimptool-1.2 gimptool]) -if test -z "${GIMPTOOL_CHECK}" ; then - BUILD_GIMP="no" -else - # Check we have version 1.2 - gimptool_check_version=`${GIMPTOOL_CHECK} --version` -dnl Quote to protect sed regexes - [gimptool_check_major=`echo "$gimptool_check_version" | sed -e 's/\([0-9][0-9]*\).\([0-9][0-9]*\).\([0-9][0-9]*\).*/\1/'`] - [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 1 -a "$gimptool_check_minor" -eq 2; then - BUILD_GIMP="yes" - else - BUILD_GIMP="no" - fi -fi - -AM_PATH_GTK(1.2.0, - BUILD_LIBGUTENPRINTUI="yes" - GUTENPRINTUI_LIBDEPS="${GUTENPRINTUI_LIBDEPS} ${GTK_LIBS}", - BUILD_LIBGUTENPRINTUI="no") - -STP_ARG_WITH([gimp], - [build GIMP 1.2 Print plugin], - [BUILD_GIMP], - [(automatic)]) - -STP_ARG_ENABLE([libgutenprintui], - [build Gutenprint GTK+-1.2 user interface library], - [BUILD_LIBGUTENPRINTUI], - [(automatic)]) - AC_PATH_PROGS([GIMPTOOL2_CHECK], [gimptool-2.0 gimptool]) if test -z "${GIMPTOOL2_CHECK}" ; then BUILD_GIMP2="no" @@ -641,16 +595,16 @@ fi AC_DEFINE_UNQUOTED(PACKAGE_LIB_DIR, "${PACKAGE_LIB_DIR}") AH_TEMPLATE(PKGXMLDATADIR,, [Package XML data directory]) -PKGXMLDATADIR="${PACKAGE_DATA_DIR}/${PACKAGE_VERSION}/xml" +PKGXMLDATADIR="${PACKAGE_DATA_DIR}/${GUTENPRINT_RELEASE_VERSION}/xml" AC_DEFINE_UNQUOTED(PKGXMLDATADIR, ["$PKGXMLDATADIR"], ) AH_TEMPLATE(PKGMODULEDIR,, [Package module directory]) -PKGMODULEDIR="${PACKAGE_LIB_DIR}/${PACKAGE_VERSION}/modules" +PKGMODULEDIR="${PACKAGE_LIB_DIR}/${GUTENPRINT_RELEASE_VERSION}/modules" AC_DEFINE_UNQUOTED(PKGMODULEDIR, ["$PKGMODULEDIR"]) dnl Compiler flags if test x$ac_compiler_gnu = "xyes"; then - STP_ADD_COMPILER_ARGS([-Wall -Wcast-align -Wstrict-prototypes -Wmissing-prototypes -Wmissing-declarations -Wnested-externs -Wwrite-strings -Werror-implicit-function-declaration -Winline -Wformat=2 -finline-limit=1048576],, [GNUCFLAGS]) + STP_ADD_COMPILER_ARGS([-Wall -Wcast-align -Wstrict-prototypes -Wmissing-prototypes -Wmissing-declarations -Wnested-externs -Wwrite-strings -Werror-implicit-function-declaration -Winline -Wformat=2 -finline-limit=131072],, [GNUCFLAGS]) if test x${USE_MAINTAINER_MODE} = xyes ; then STP_ADD_COMPILER_ARGS([-pedantic -Waggregate-return -Wcast-qual -Wshadow -Wredundant-decls],, [GNUCFLAGS]) fi @@ -759,15 +713,7 @@ AC_CHECK_LIB(m,pow, STP_CUPS_LIBS -if test x$BUILD_LEXMARKUTIL = xyes -o x$BUILD_GUTENPRINTUI = xyes ; then -AM_PATH_GTK(1.2.0, , - AC_MSG_ERROR(Cannot find GTK: Is gtk-config in path?)) -fi - -STP_GIMP_LIBS -STP_GIMP_PLUG_IN_DIR STP_GIMP2_LIBS -dnl STP_GIMP2_PLUG_IN_DIR is obsolete dnl Checks for header files. AC_HEADER_STDC @@ -839,12 +785,8 @@ AM_CONDITIONAL(BUILD_TEST, test x${BUILD_TEST} = xyes) AM_CONDITIONAL(BUILD_TESTPATTERN, test x${BUILD_TESTPATTERN} = xyes) -AM_CONDITIONAL(BUILD_LIBGUTENPRINTUI, test x${BUILD_LIBGUTENPRINTUI} = xyes) - AM_CONDITIONAL(BUILD_LIBGUTENPRINTUI2, test x${BUILD_LIBGUTENPRINTUI2} = xyes) -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) @@ -953,20 +895,13 @@ AC_SUBST(GENPPD_LIBS) AC_SUBST(IJS_CFLAGS) AC_SUBST(IJS_LIBS) AC_SUBST(RM) -AC_SUBST(GIMP_CFLAGS) -AC_SUBST(GIMP_LIBS) AC_SUBST(GIMP2_CFLAGS) AC_SUBST(GIMP2_LIBS) -AC_SUBST(gimp_plug_indir) AC_SUBST(gimp2_plug_indir) AC_SUBST(GUTENPRINT_CFLAGS) AC_SUBST(GUTENPRINT_LIBS) AC_SUBST(GUTENPRINT_LIBDEPS) AC_SUBST(GUTENPRINT_VERSION) -AC_SUBST(GUTENPRINTUI_CFLAGS) -AC_SUBST(GUTENPRINTUI_LIBS) -AC_SUBST(GUTENPRINTUI_LIBDEPS) -AC_SUBST(GUTENPRINTUI_VERSION) AC_SUBST(GUTENPRINTUI2_CFLAGS) AC_SUBST(GUTENPRINTUI2_LIBS) AC_SUBST(GUTENPRINTUI2_LIBDEPS) @@ -975,10 +910,6 @@ AC_SUBST(gutenprint_cflags) gutenprint_libs="${GUTENPRINT_LIBS} ${gutenprint_libdeps}" AC_SUBST(gutenprint_libs) AC_SUBST(gutenprint_libdeps) -AC_SUBST(gutenprintui_cflags) -gutenprintui_libs="${GUTENPRINTUI_LIBS} ${gutenprintui_libdeps}" -AC_SUBST(gutenprintui_libs) -AC_SUBST(gutenprintui_libdeps) AC_SUBST(gutenprintui2_cflags) gutenprintui2_libs="${GUTENPRINTUI2_LIBS} ${gutenprintui2_libdeps}" AC_SUBST(gutenprintui2_libs) @@ -998,13 +929,11 @@ AC_CONFIG_FILES([doc/gutenprintui2.dox]) AC_CONFIG_FILES([doc/developer/Makefile]) AC_CONFIG_FILES([include/Makefile]) AC_CONFIG_FILES([include/gutenprint/Makefile]) -AC_CONFIG_FILES([include/gutenprintui/Makefile]) AC_CONFIG_FILES([include/gutenprintui2/Makefile]) AC_CONFIG_FILES([include/gutenprint/gutenprint-version.h]) AC_CONFIG_FILES([man/Makefile]) AC_CONFIG_FILES([man/cups-calibrate.8]) AC_CONFIG_FILES([man/cups-genppd.8]) -AC_CONFIG_FILES([man/cups-genppdconfig.8]) AC_CONFIG_FILES([man/cups-genppdupdate.8]) AC_CONFIG_FILES([man/escputil.1]) AC_CONFIG_FILES([man/ijsgutenprint.1]) @@ -1012,16 +941,8 @@ AC_CONFIG_FILES([po/Makefile.in]) AC_CONFIG_FILES([samples/Makefile]) AC_CONFIG_FILES([src/Makefile]) AC_CONFIG_FILES([src/cups/Makefile]) -AC_CONFIG_FILES([src/cups/cups-genppdconfig], - [chmod +x src/cups/cups-genppdconfig; - rm -f src/cups/cups-genppdconfig.${GUTENPRINT_RELEASE_VERSION}; - mv src/cups/cups-genppdconfig src/cups/cups-genppdconfig.${GUTENPRINT_RELEASE_VERSION}; - echo " *** Ignore any warning that may follow that sed can't read src/cups/cups-genppdconfig"]) AC_CONFIG_FILES([src/cups/cups-genppdupdate], - [chmod +x src/cups/cups-genppdupdate; - rm -f src/cups/cups-genppdupdate.${GUTENPRINT_RELEASE_VERSION}; - mv src/cups/cups-genppdupdate src/cups/cups-genppdupdate.${GUTENPRINT_RELEASE_VERSION}; - echo " *** Ignore any warning that may follow that sed can't read src/cups/cups-genppdupdate"]) + [chmod +x src/cups/cups-genppdupdate]) AC_CONFIG_FILES([src/escputil/Makefile]) AC_CONFIG_FILES([src/foomatic/Makefile]) AC_CONFIG_FILES([src/foomatic/foomatic-generator], @@ -1034,12 +955,9 @@ AC_CONFIG_FILES([src/cups/test-rastertogutenprint], [chmod +x src/cups/test-rastertogutenprint]) AC_CONFIG_FILES([src/ghost/Makefile]) AC_CONFIG_FILES([src/testpattern/Makefile]) -AC_CONFIG_FILES([src/gimp/Makefile]) AC_CONFIG_FILES([src/gimp2/Makefile]) AC_CONFIG_FILES([src/main/Makefile]) AC_CONFIG_FILES([src/main/gutenprint.pc]) -AC_CONFIG_FILES([src/gutenprintui/Makefile]) -AC_CONFIG_FILES([src/gutenprintui/gutenprintui.pc]) AC_CONFIG_FILES([src/gutenprintui2/Makefile]) AC_CONFIG_FILES([src/gutenprintui2/gutenprintui2.pc]) AC_CONFIG_FILES([test/Makefile]) @@ -1094,16 +1012,12 @@ echo " Build Foomatic data: $BUILD_FOOMATIC" if test "$BUILD_FOOMATIC" != "no" ; then echo " Build Foomatic 3.x data: $BUILD_FOOMATIC_3" fi -if test "$BUILD_GIMP" != "no" -o "$BUILD_GIMP2" != "no" ; then +if test "$BUILD_GIMP2" != "no" ; then echo " Build enhanced Print plugin for 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 + if test "$BUILD_GIMP2_AS_GUTENPRINT" != "no" ; then + echo " GIMP plugin will be named: gutenprint" + else + echo " GIMP plugin will be named: print" fi echo " Install plugin(s) in home directory: $USER_INSTALL" else diff --git a/doc/Makefile.in b/doc/Makefile.in index f06e872..d574cd8 100644 --- a/doc/Makefile.in +++ b/doc/Makefile.in @@ -42,13 +42,12 @@ DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \ subdir = doc 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/isc-posix.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 + $(top_srcdir)/m4/iconv.m4 $(top_srcdir)/m4/isc-posix.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 @@ -117,27 +116,13 @@ 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@ GREP = @GREP@ 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@ @@ -145,13 +130,6 @@ 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@ @@ -256,16 +234,12 @@ docdir = $(datadir)/$(PACKAGE)/doc dvidir = @dvidir@ 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@ @@ -295,6 +269,7 @@ top_builddir = @top_builddir@ top_srcdir = @top_srcdir@ SUBDIRS = developer AM_CPPFLAGS = -I$(top_srcdir)/include -I$(top_builddir)/include $(LOCAL_CPPFLAGS) $(GNUCFLAGS) +GUTENPRINTUI_LIBS = $(top_builddir)/src/gutenprintui/libgutenprintui.la MAINTAINERCLEANFILES = \ Makefile.in \ gutenprint-stamp diff --git a/doc/README.maintaining b/doc/README.maintaining index 2ae7782..cab861b 100644 --- a/doc/README.maintaining +++ b/doc/README.maintaining @@ -49,7 +49,7 @@ something that you would like covering, please let me know! -- Roger Leigh - $Id: README.maintaining,v 1.22.8.1 2007/03/02 12:01:12 rlk Exp $ + $Id: README.maintaining,v 1.24 2008/02/28 01:22:13 rlk Exp $ 1. Setting up the autotools @@ -68,43 +68,6 @@ and also vi. pkg-config (at least 0.18.0) -GNU autoconf made some incompatible changes between the 2.13 and 2.50 -stable releases. You cannot use a configure.in written for 2.13 with -2.5x releases. This means that to build the 4.2-branch and the -mainline on the same machine, you need to install multiple versions of -the autotools. You can do this by running configure with the same ---prefix, but also use --program-suffix=VERSION where VERSION is the -autoconf version you are building. - -Debian GNU/Linux has an autoconf2.13 package with a wrapper script -which can correctly invoke the right autoconf version. This makes -using the old and new versions together very easy. To get it, - -1. download the Debian (.deb) package from - ftp://ftp.debian.org/debian/pool/main/a/autoconf2.13/ -2. extract the file with - ar -xv autoconf2.13_2.13-43_all.deb data.tar.gz - ==> x - data.tar.gz - tar -xzf data.tar.gz ./usr/bin -3. copy ./usr/bin/autoconf-wrapper to /usr/bin -4. symlink `autoconf', `autoreconf' and `autoheader' to - `autoconf-wrapper' (your real autoconf versions are named - autoconfVERSION). -5. You may have to edit the wrapper to get in to invoke the right 2.5x - version. - -Similar problems may be seen with GNU automake, but you can again -configure with a program suffix. You will, however, need to update a -symlink manually, perhaps using one in your home bindir. automake 1.4 -works with autoconf2.13; automake1.5 works with autoconf2.13 and 2.5x -but is old; automake1.6+ will only work with new 2.5x autoconf -versions but are the current releases. I suggest using 1.4 and 1.7 -together. Different versions of autoconf need separate aclocal -directories, to prevent m4 macros clashing. - -Hopefully these compatibility problems will not be as bad in the -future... - 2. Integration of the autotools ------------------------------- @@ -200,10 +163,11 @@ list of options one can use. 3.3 Building the package ------------------------ -The normal method is to run the `configure' script, and then `make'. -The package can then be installed with 'make install': +The normal method for building from CVS is to run the `autogen.sh' +script, and then `make'. The package can then be installed with 'make +install': - $ ./configure + $ ./autogen.sh [options] $ make $ make [DESTDIR=... VAR1=val1 VARn=valn] install @@ -225,8 +189,8 @@ is enabled, and should be present in the release tarball. Other packages (including the extra development packages on some systems) must be installed on your system to build correctly. These -include: autoconf, automake, libtool, gtk, gdk, gimp 1.2, gimp 2.0, -cups, foomatic, readline, and a DocBook processor (db2html, db2pdf, +include: autoconf, automake, libtool, gtk, gdk, gimp 2.x, cups, +foomatic, readline, and a DocBook processor (db2html, db2pdf, db2html). Not all these need to be installed, depending on the configure options used (GIMP, CUPS, Foomatic and readline are optional). It might be necessary to get the latest releases of some @@ -253,7 +217,7 @@ Some of the targets available are: dist make a distribution distcheck as dist, but test it as well -Other targets are available. See Makefile.in for details. +Other targets are available. See Makefile for details. 4. configure.ac @@ -418,15 +382,14 @@ If a Makefile.am has a SUBDIRS macro, make will recurse through these subdirectories, running make in each one. e.g. in the top-level Makefile.am: - SUBDIRS = intl lib man src test po + SUBDIRS = include src samples test po man doc scripts In this case the order of directories is critical: lib, src and test -depend on intl being built and src and test depend on lib being built. -Also, test depends on libgutenprint in src and po must be run after all -the source has been built (as it parses all C source, possibly -including dynamically generated code). The same applies in -src/Makefile.am: most directories require libgutenprint for linking -with, and libgutenprint requires printdef. +depend on include being built. Also, test depends on libgutenprint in +src and po must be run after all the source has been built (as it +parses all C source, possibly including dynamically generated code). +The same applies in src/Makefile.am: most directories require +libgutenprint for linking with, and libgutenprint requires printdef. Therefore the order of building is critical! It should be technically possible to run make in any subdirectory and have all the dependencies @@ -548,16 +511,16 @@ is that if a program is linked with a libtool shared library in the build tree, then it is actually created in '.libs/program', and not 'program'. However, if it is statically linked (e.g. the platform does not support shared libraries, or you used --disable-shared with -configure, perhaps to make the build faster), then it will be created -as 'program'. This is so that you can run the program before you -install it. If it is linked with shared libraries, a wrapper script -does some magic with LD_LIBRARY_PATH. However, this means that your -install rules must take this into account by checking that -'.libs/program exists', and installing it if it is present, but -otherwise installing 'program'. Automake install rules do this -automatically, but it you write your own, you must take this into -consideration. The best option is to not use custom install rules for -binaries. +configure, perhaps to make the build faster or to be able to use +`valgrind' usefully), then it will be created as 'program'. This is +so that you can run the program before you install it. If it is +linked with shared libraries, a wrapper script does some magic with +LD_LIBRARY_PATH. However, this means that your install rules must +take this into account by checking that '.libs/program exists', and +installing it if it is present, but otherwise installing 'program'. +Automake install rules do this automatically, but it you write your +own, you must take this into consideration. The best option is to not +use custom install rules for binaries. 11. Testing changes to the build scripts @@ -592,17 +555,6 @@ libtool: libtool.info make: make.info -13. Known problems ------------------- - -If you have a version of the Gimp older than about 1.1.27, your -gimp.m4 (in /usr/share/aclocal or equivalent) will be incorrect. You -should install the version of gimp.m4 from scripts/ prior to use. -This should only be a problem when building from CVS; the configure -script included in released versions will not have this problem. - - - Local Variables: mode: text diff --git a/doc/developer/Makefile.am b/doc/developer/Makefile.am index ec1232f..61f9a2c 100644 --- a/doc/developer/Makefile.am +++ b/doc/developer/Makefile.am @@ -1,4 +1,4 @@ -## $Id: Makefile.am,v 1.19.6.1 2007/03/02 12:01:12 rlk Exp $ +## $Id: Makefile.am,v 1.22 2008/02/27 12:28:06 rlk Exp $ ## Copyright (C) 2001 Andy Stewart and Roger Leigh ## ## This program is free software; you can redistribute it and/or modify @@ -85,6 +85,10 @@ docs: html pdf pdf: gutenprint.pdf gutenprint.pdf: $(MANUAL_SRC_FILES) + @if [ -z "$(DB2PDF)" ] ; then \ + echo "No db2pdf: cannot build documentation!"; \ + exit 1; \ + fi if test $(srcdir) = '.' ; then \ : ; \ else \ @@ -104,6 +108,10 @@ html: html-stamp # html-stamp should *only* be called by html--it's just a timestamp! html-stamp: $(MANUAL_SRC_FILES) + @if [ -z "$(DB2HTML)" ] ; then \ + echo "No db2html: cannot build documentation!"; \ + exit 1; \ + fi if test $(srcdir) = '.' ; then \ : ; \ else \ diff --git a/doc/developer/Makefile.in b/doc/developer/Makefile.in index addd7ee..0dc93c1 100644 --- a/doc/developer/Makefile.in +++ b/doc/developer/Makefile.in @@ -41,13 +41,12 @@ DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \ subdir = doc/developer 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/isc-posix.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 + $(top_srcdir)/m4/iconv.m4 $(top_srcdir)/m4/isc-posix.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 @@ -104,27 +103,13 @@ 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@ GREP = @GREP@ 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@ @@ -132,13 +117,6 @@ 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@ @@ -243,16 +221,12 @@ docdir = @docdir@ dvidir = @dvidir@ 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@ @@ -281,6 +255,7 @@ target_alias = @target_alias@ top_builddir = @top_builddir@ top_srcdir = @top_srcdir@ AM_CPPFLAGS = -I$(top_srcdir)/include -I$(top_builddir)/include $(LOCAL_CPPFLAGS) $(GNUCFLAGS) +GUTENPRINTUI_LIBS = $(top_builddir)/src/gutenprintui/libgutenprintui.la MANUAL_SRC_FILES = \ copying.xml \ dither.xml \ @@ -523,6 +498,10 @@ docs: html pdf pdf: gutenprint.pdf gutenprint.pdf: $(MANUAL_SRC_FILES) + @if [ -z "$(DB2PDF)" ] ; then \ + echo "No db2pdf: cannot build documentation!"; \ + exit 1; \ + fi if test $(srcdir) = '.' ; then \ : ; \ else \ @@ -542,6 +521,10 @@ html: html-stamp # html-stamp should *only* be called by html--it's just a timestamp! html-stamp: $(MANUAL_SRC_FILES) + @if [ -z "$(DB2HTML)" ] ; then \ + echo "No db2html: cannot build documentation!"; \ + exit 1; \ + fi if test $(srcdir) = '.' ; then \ : ; \ else \ diff --git a/doc/developer/gutenprint.pdf b/doc/developer/gutenprint.pdf index 04d397d..895b771 100644 Binary files a/doc/developer/gutenprint.pdf and b/doc/developer/gutenprint.pdf differ diff --git a/doc/gutenprint/gutenprint.tag b/doc/gutenprint/gutenprint.tag index 1ff63e4..917e861 100644 --- a/doc/gutenprint/gutenprint.tag +++ b/doc/gutenprint/gutenprint.tag @@ -2,7 +2,7 @@ array.h - /home/rlk/sandbox/print-5.0/include/gutenprint/ + /home/rlk/sandbox/print-5.1/include/gutenprint/ array_8h gutenprint/sequence.h @@ -92,7 +92,7 @@ bit-ops.h - /home/rlk/sandbox/print-5.0/include/gutenprint/ + /home/rlk/sandbox/print-5.1/include/gutenprint/ bit-ops_8h void @@ -167,7 +167,7 @@ channel.h - /home/rlk/sandbox/print-5.0/include/gutenprint/ + /home/rlk/sandbox/print-5.1/include/gutenprint/ channel_8h void @@ -340,7 +340,7 @@ color.h - /home/rlk/sandbox/print-5.0/include/gutenprint/ + /home/rlk/sandbox/print-5.1/include/gutenprint/ color_8h stp_colorfuncs_t stp_color_t @@ -431,7 +431,7 @@ curve-cache.h - /home/rlk/sandbox/print-5.0/include/gutenprint/ + /home/rlk/sandbox/print-5.1/include/gutenprint/ curve-cache_8h gutenprint/curve.h stp_cached_curve_t @@ -529,7 +529,7 @@ curve.h - /home/rlk/sandbox/print-5.0/include/gutenprint/ + /home/rlk/sandbox/print-5.1/include/gutenprint/ curve_8h gutenprint/sequence.h stp_curve_point_t @@ -631,6 +631,20 @@ gcd7861bf1c9d61ac4ec87844a15ab9d3 (stp_curve_t *dest, const stp_curve_t *source) + + stp_curve_t * + stp_curve_create_reverse + group__curve.html + g8c2aed234d3e4ddc4c239801be17bb73 + (const stp_curve_t *curve) + + + void + stp_curve_reverse + group__curve.html + g3416157017287eae136fb928802be234 + (stp_curve_t *dest, const stp_curve_t *source) + void stp_curve_destroy @@ -935,7 +949,7 @@ dither.h - /home/rlk/sandbox/print-5.0/include/gutenprint/ + /home/rlk/sandbox/print-5.1/include/gutenprint/ dither_8h stp_dither_matrix_short_t stp_dither_matrix_normal_t @@ -1198,7 +1212,7 @@ gutenprint-intl-internal.h - /home/rlk/sandbox/print-5.0/include/gutenprint/ + /home/rlk/sandbox/print-5.1/include/gutenprint/ gutenprint-intl-internal_8h #define @@ -1252,7 +1266,7 @@ gutenprint-intl.h - /home/rlk/sandbox/print-5.0/include/gutenprint/ + /home/rlk/sandbox/print-5.1/include/gutenprint/ gutenprint-intl_8h #define @@ -1306,7 +1320,7 @@ gutenprint-module.h - /home/rlk/sandbox/print-5.0/include/gutenprint/ + /home/rlk/sandbox/print-5.1/include/gutenprint/ gutenprint-module_8h gutenprint/gutenprint.h gutenprint/bit-ops.h @@ -1328,7 +1342,7 @@ gutenprint-version.h - /home/rlk/sandbox/print-5.0/include/gutenprint/ + /home/rlk/sandbox/print-5.1/include/gutenprint/ gutenprint-version_8h #define @@ -1431,7 +1445,7 @@ gutenprint.h - /home/rlk/sandbox/print-5.0/include/gutenprint/ + /home/rlk/sandbox/print-5.1/include/gutenprint/ gutenprint_8h gutenprint/array.h gutenprint/curve.h @@ -1446,7 +1460,7 @@ image.h - /home/rlk/sandbox/print-5.0/include/gutenprint/ + /home/rlk/sandbox/print-5.1/include/gutenprint/ image_8h stp_image_t @@ -1523,7 +1537,7 @@ list.h - /home/rlk/sandbox/print-5.0/include/gutenprint/ + /home/rlk/sandbox/print-5.1/include/gutenprint/ list_8h struct stp_list_item @@ -1752,7 +1766,7 @@ module.h - /home/rlk/sandbox/print-5.0/include/gutenprint/ + /home/rlk/sandbox/print-5.1/include/gutenprint/ module_8h gutenprint/list.h stp_module_version_t @@ -1832,7 +1846,7 @@ mxml.h - /home/rlk/sandbox/print-5.0/include/gutenprint/ + /home/rlk/sandbox/print-5.1/include/gutenprint/ mxml_8h stp_mxml_attr_t stp_mxml_element_t @@ -2110,7 +2124,7 @@ paper.h - /home/rlk/sandbox/print-5.0/include/gutenprint/ + /home/rlk/sandbox/print-5.1/include/gutenprint/ paper_8h gutenprint/vars.h stp_papersize_t @@ -2139,6 +2153,21 @@ gg72e4619e373e38dc02dc452813b7b95862e2906a87fa4bcf32913943fd5b225a + + stp_papersize_type_t + g31255c4eebfaaf5cd319e5638a6a3069 + + + + PAPERSIZE_TYPE_STANDARD + gg31255c4eebfaaf5cd319e5638a6a306999d27f84f91d583c3e465e56c83fff2f + + + + PAPERSIZE_TYPE_ENVELOPE + gg31255c4eebfaaf5cd319e5638a6a3069660290248a563e7590202afd3ba68fb4 + + int stp_known_papersizes @@ -2177,7 +2206,7 @@ path.h - /home/rlk/sandbox/print-5.0/include/gutenprint/ + /home/rlk/sandbox/print-5.1/include/gutenprint/ path_8h stp_list_t * @@ -2196,7 +2225,7 @@ printers.h - /home/rlk/sandbox/print-5.0/include/gutenprint/ + /home/rlk/sandbox/print-5.1/include/gutenprint/ printers_8h gutenprint/string-list.h gutenprint/list.h @@ -2388,7 +2417,7 @@ sequence.h - /home/rlk/sandbox/print-5.0/include/gutenprint/ + /home/rlk/sandbox/print-5.1/include/gutenprint/ sequence_8h struct stp_sequence @@ -2425,6 +2454,20 @@ gb03a34a03ffd4163f51126916d737df7 (const stp_sequence_t *sequence) + + void + stp_sequence_reverse + group__sequence.html + g51f0d093b1b7c1bafe068dcbf172ac26 + (stp_sequence_t *dest, const stp_sequence_t *source) + + + stp_sequence_t * + stp_sequence_create_reverse + group__sequence.html + gde64193f944aaba0365a96691d479974 + (const stp_sequence_t *sequence) + int stp_sequence_set_bounds @@ -2596,7 +2639,7 @@ string-list.h - /home/rlk/sandbox/print-5.0/include/gutenprint/ + /home/rlk/sandbox/print-5.1/include/gutenprint/ string-list_8h stp_param_string_t @@ -2679,7 +2722,7 @@ util.h - /home/rlk/sandbox/print-5.0/include/gutenprint/ + /home/rlk/sandbox/print-5.1/include/gutenprint/ util_8h gutenprint/curve.h gutenprint/vars.h @@ -2818,9 +2861,9 @@ #define - STP_DBG_OLYMPUS + STP_DBG_DYESUB group__util.html - g574664feccffc4527df73e32c7e863bf + g31234d4cc42f026f39ea32ee3dd7b0a1 @@ -3092,7 +3135,7 @@ vars.h - /home/rlk/sandbox/print-5.0/include/gutenprint/ + /home/rlk/sandbox/print-5.1/include/gutenprint/ vars_8h gutenprint/array.h gutenprint/curve.h @@ -4219,7 +4262,7 @@ weave.h - /home/rlk/sandbox/print-5.0/include/gutenprint/ + /home/rlk/sandbox/print-5.1/include/gutenprint/ weave_8h stp_weave_t stp_pass_t @@ -4406,7 +4449,7 @@ xml.h - /home/rlk/sandbox/print-5.0/include/gutenprint/ + /home/rlk/sandbox/print-5.1/include/gutenprint/ xml_8h gutenprint/mxml.h @@ -4847,6 +4890,20 @@ gcd7861bf1c9d61ac4ec87844a15ab9d3 (stp_curve_t *dest, const stp_curve_t *source) + + stp_curve_t * + stp_curve_create_reverse + group__curve.html + g8c2aed234d3e4ddc4c239801be17bb73 + (const stp_curve_t *curve) + + + void + stp_curve_reverse + group__curve.html + g3416157017287eae136fb928802be234 + (stp_curve_t *dest, const stp_curve_t *source) + void stp_curve_destroy @@ -5696,6 +5753,21 @@ gg72e4619e373e38dc02dc452813b7b95862e2906a87fa4bcf32913943fd5b225a + + stp_papersize_type_t + g31255c4eebfaaf5cd319e5638a6a3069 + + + + PAPERSIZE_TYPE_STANDARD + gg31255c4eebfaaf5cd319e5638a6a306999d27f84f91d583c3e465e56c83fff2f + + + + PAPERSIZE_TYPE_ENVELOPE + gg31255c4eebfaaf5cd319e5638a6a3069660290248a563e7590202afd3ba68fb4 + + int stp_known_papersizes @@ -5960,6 +6032,20 @@ gb03a34a03ffd4163f51126916d737df7 (const stp_sequence_t *sequence) + + void + stp_sequence_reverse + group__sequence.html + g51f0d093b1b7c1bafe068dcbf172ac26 + (stp_sequence_t *dest, const stp_sequence_t *source) + + + stp_sequence_t * + stp_sequence_create_reverse + group__sequence.html + gde64193f944aaba0365a96691d479974 + (const stp_sequence_t *sequence) + int stp_sequence_set_bounds @@ -6261,9 +6347,9 @@ #define - STP_DBG_OLYMPUS + STP_DBG_DYESUB group__util.html - g574664feccffc4527df73e32c7e863bf + g31234d4cc42f026f39ea32ee3dd7b0a1 @@ -8523,6 +8609,13 @@ 5692b27332297abca9e4715e3e9e3ce8 + + stp_papersize_type_t + paper_size_type + structstp__papersize__t.html + 35412f4b1f65ab4697a6b2fb640d4576 + + stp_param_string_t diff --git a/doc/gutenprint/html/annotated.html b/doc/gutenprint/html/annotated.html index 4170ab4..5245839 100644 --- a/doc/gutenprint/html/annotated.html +++ b/doc/gutenprint/html/annotated.html @@ -56,7 +56,7 @@ stp_shade_t stp_weave_t -
Generated on Tue Jan 1 21:37:39 2008 for libgutenprint API Reference by  +
Generated on Sun Apr 27 22:08:01 2008 for libgutenprint API Reference by  doxygen 1.5.3
diff --git a/doc/gutenprint/html/array_8h.html b/doc/gutenprint/html/array_8h.html index c74e5b0..926b2cd 100644 --- a/doc/gutenprint/html/array_8h.html +++ b/doc/gutenprint/html/array_8h.html @@ -57,7 +57,7 @@  Get the underlying stp_sequence_t.

Detailed Description

-Array functions.
Generated on Tue Jan 1 21:37:38 2008 for libgutenprint API Reference by  +Array functions.
Generated on Sun Apr 27 22:08:01 2008 for libgutenprint API Reference by  doxygen 1.5.3
diff --git a/doc/gutenprint/html/bit-ops_8h.html b/doc/gutenprint/html/bit-ops_8h.html index 916eca1..1d548ab 100644 --- a/doc/gutenprint/html/bit-ops_8h.html +++ b/doc/gutenprint/html/bit-ops_8h.html @@ -606,7 +606,7 @@ Bit operations.

Function Documentation

-

Generated on Tue Jan 1 21:37:38 2008 for libgutenprint API Reference by  +
Generated on Sun Apr 27 22:08:01 2008 for libgutenprint API Reference by  doxygen 1.5.3
diff --git a/doc/gutenprint/html/channel_8h.html b/doc/gutenprint/html/channel_8h.html index 9b2c5d7..dcbb486 100644 --- a/doc/gutenprint/html/channel_8h.html +++ b/doc/gutenprint/html/channel_8h.html @@ -758,7 +758,7 @@ Channel functions.

Function Documentation

-

Generated on Tue Jan 1 21:37:38 2008 for libgutenprint API Reference by  +
Generated on Sun Apr 27 22:08:01 2008 for libgutenprint API Reference by  doxygen 1.5.3
diff --git a/doc/gutenprint/html/classes.html b/doc/gutenprint/html/classes.html index 7b233cc..1f298f8 100644 --- a/doc/gutenprint/html/classes.html +++ b/doc/gutenprint/html/classes.html @@ -25,7 +25,7 @@
  S  
stp_dither_matrix_normal_t   stp_lineactive_t   stp_mxml_attr_t   stp_parameter_t   
stp_cached_curve_t   stp_dither_matrix_short_t   stp_linebounds_t   stp_mxml_element_t   stp_pass_t   
stp_color_t   stp_dotsize_t   stp_linebufs_t   stp_mxml_node_s   stp_printfuncs_t   
stp_colorfuncs_t   stp_double_bound_t   stp_linecount_t   stp_mxml_text_t   stp_raw_t   
stp_curve_point_t   stp_family_t   stp_lineoff_t   stp_mxml_value_t   stp_shade_t   
stp_dither_matrix_generic_t   stp_image_t   stp_module_t   stp_papersize_t   stp_weave_t   
stp_dither_matrix_impl_t   stp_int_bound_t   stp_module_version_t   stp_param_string_t   

S

-

Generated on Tue Jan 1 21:37:39 2008 for libgutenprint API Reference by  +
Generated on Sun Apr 27 22:08:01 2008 for libgutenprint API Reference by  doxygen 1.5.3
diff --git a/doc/gutenprint/html/color_8h.html b/doc/gutenprint/html/color_8h.html index 3a78ea5..146252a 100644 --- a/doc/gutenprint/html/color_8h.html +++ b/doc/gutenprint/html/color_8h.html @@ -53,7 +53,7 @@  Get the long (translated) name of a color module.

Detailed Description

-Color functions.
Generated on Tue Jan 1 21:37:38 2008 for libgutenprint API Reference by  +Color functions.
Generated on Sun Apr 27 22:08:01 2008 for libgutenprint API Reference by  doxygen 1.5.3
diff --git a/doc/gutenprint/html/curve-cache_8h.html b/doc/gutenprint/html/curve-cache_8h.html index 3797fb4..68f0edf 100644 --- a/doc/gutenprint/html/curve-cache_8h.html +++ b/doc/gutenprint/html/curve-cache_8h.html @@ -339,7 +339,7 @@ Curve caching functions.

Define Documentation

-

Generated on Tue Jan 1 21:37:38 2008 for libgutenprint API Reference by  +
Generated on Sun Apr 27 22:08:01 2008 for libgutenprint API Reference by  doxygen 1.5.3
diff --git a/doc/gutenprint/html/curve_8h.html b/doc/gutenprint/html/curve_8h.html index 50ec8b6..7e6177a 100644 --- a/doc/gutenprint/html/curve_8h.html +++ b/doc/gutenprint/html/curve_8h.html @@ -56,10 +56,16 @@  Create a new curve.
stp_curve_t * stp_curve_create_copy (const stp_curve_t *curve) - Copy and allocate an curve.
+ Copy and allocate a curve.
void stp_curve_copy (stp_curve_t *dest, const stp_curve_t *source) - Copy an curve.
+ Copy a curve.
+stp_curve_t * stp_curve_create_reverse (const stp_curve_t *curve) + + Reverse and allocate a curve.
+void stp_curve_reverse (stp_curve_t *dest, const stp_curve_t *source) + + Reverse a curve.
void stp_curve_destroy (stp_curve_t *curve)  Destroy an curve.
@@ -189,7 +195,7 @@  Compose two curves, creating a third curve.

Detailed Description

-Curve functions.
Generated on Tue Jan 1 21:37:38 2008 for libgutenprint API Reference by  +Curve functions.
Generated on Sun Apr 27 22:08:01 2008 for libgutenprint API Reference by  doxygen 1.5.3
diff --git a/doc/gutenprint/html/deprecated.html b/doc/gutenprint/html/deprecated.html index 9d7e2fc..87b8b63 100644 --- a/doc/gutenprint/html/deprecated.html +++ b/doc/gutenprint/html/deprecated.html @@ -23,7 +23,7 @@
Global stp_merge_printvars
This is likely to go away.
-
Generated on Tue Jan 1 21:37:39 2008 for libgutenprint API Reference by  +
Generated on Sun Apr 27 22:08:01 2008 for libgutenprint API Reference by  doxygen 1.5.3
diff --git a/doc/gutenprint/html/dither_8h.html b/doc/gutenprint/html/dither_8h.html index 95f2d99..97256dc 100644 --- a/doc/gutenprint/html/dither_8h.html +++ b/doc/gutenprint/html/dither_8h.html @@ -1378,7 +1378,7 @@ Dither functions.

Define Documentation

-

Generated on Tue Jan 1 21:37:38 2008 for libgutenprint API Reference by  +
Generated on Sun Apr 27 22:08:01 2008 for libgutenprint API Reference by  doxygen 1.5.3
diff --git a/doc/gutenprint/html/files.html b/doc/gutenprint/html/files.html index 708a0bc..5aad9f0 100644 --- a/doc/gutenprint/html/files.html +++ b/doc/gutenprint/html/files.html @@ -47,7 +47,7 @@ include/gutenprint/weave.h include/gutenprint/xml.h -
Generated on Tue Jan 1 21:37:39 2008 for libgutenprint API Reference by  +
Generated on Sun Apr 27 22:08:01 2008 for libgutenprint API Reference by  doxygen 1.5.3
diff --git a/doc/gutenprint/html/functions.html b/doc/gutenprint/html/functions.html index aa798e3..c8a491c 100644 --- a/doc/gutenprint/html/functions.html +++ b/doc/gutenprint/html/functions.html @@ -257,6 +257,8 @@ Here is a list of all struct and union fields with links to the structures/union : stp_parameter_t
  • p_type : stp_parameter_t +
  • paper_size_type +: stp_papersize_t
  • paper_unit : stp_papersize_t
  • parameters @@ -264,8 +266,8 @@ Here is a list of all struct and union fields with links to the structures/union
  • parent : stp_mxml_node_s
  • pass -: stp_pass_t -, stp_weave_t +: stp_weave_t +, stp_pass_t
  • physpassend : stp_weave_t , stp_pass_t @@ -273,8 +275,8 @@ Here is a list of all struct and union fields with links to the structures/union : stp_weave_t , stp_pass_t
  • prescaled -: stp_dither_matrix_normal_t -, stp_dither_matrix_generic_t +: stp_dither_matrix_generic_t +, stp_dither_matrix_normal_t , stp_dither_matrix_short_t
  • prev : stp_mxml_node_s @@ -382,7 +384,7 @@ Here is a list of all struct and union fields with links to the structures/union
  • y_size : stp_dither_matrix_impl_t -
    Generated on Tue Jan 1 21:37:39 2008 for libgutenprint API Reference by  +
    Generated on Sun Apr 27 22:08:01 2008 for libgutenprint API Reference by  doxygen 1.5.3
    diff --git a/doc/gutenprint/html/functions_vars.html b/doc/gutenprint/html/functions_vars.html index 31dd8b7..ab6d80d 100644 --- a/doc/gutenprint/html/functions_vars.html +++ b/doc/gutenprint/html/functions_vars.html @@ -257,6 +257,8 @@ : stp_parameter_t
  • p_type : stp_parameter_t +
  • paper_size_type +: stp_papersize_t
  • paper_unit : stp_papersize_t
  • parameters @@ -264,8 +266,8 @@
  • parent : stp_mxml_node_s
  • pass -: stp_pass_t -, stp_weave_t +: stp_weave_t +, stp_pass_t
  • physpassend : stp_weave_t , stp_pass_t @@ -273,8 +275,8 @@ : stp_weave_t , stp_pass_t
  • prescaled -: stp_dither_matrix_normal_t -, stp_dither_matrix_generic_t +: stp_dither_matrix_generic_t +, stp_dither_matrix_normal_t , stp_dither_matrix_short_t
  • prev : stp_mxml_node_s @@ -382,7 +384,7 @@
  • y_size : stp_dither_matrix_impl_t -
    Generated on Tue Jan 1 21:37:39 2008 for libgutenprint API Reference by  +
    Generated on Sun Apr 27 22:08:01 2008 for libgutenprint API Reference by  doxygen 1.5.3
    diff --git a/doc/gutenprint/html/globals.html b/doc/gutenprint/html/globals.html index 35d388b..713285d 100644 --- a/doc/gutenprint/html/globals.html +++ b/doc/gutenprint/html/globals.html @@ -55,7 +55,7 @@ Here is a list of all functions, variables, defines, enums, and typedefs with li
  • __attribute__ : util.h -
    Generated on Tue Jan 1 21:37:39 2008 for libgutenprint API Reference by  +
    Generated on Sun Apr 27 22:08:01 2008 for libgutenprint API Reference by  doxygen 1.5.3
    diff --git a/doc/gutenprint/html/globals_0x62.html b/doc/gutenprint/html/globals_0x62.html index 806b909..363ac70 100644 --- a/doc/gutenprint/html/globals_0x62.html +++ b/doc/gutenprint/html/globals_0x62.html @@ -53,7 +53,7 @@ Here is a list of all functions, variables, defines, enums, and typedefs with li : gutenprint-intl-internal.h , gutenprint-intl.h -
    Generated on Tue Jan 1 21:37:39 2008 for libgutenprint API Reference by  +
    Generated on Sun Apr 27 22:08:01 2008 for libgutenprint API Reference by  doxygen 1.5.3
    diff --git a/doc/gutenprint/html/globals_0x63.html b/doc/gutenprint/html/globals_0x63.html index e011caf..9af9865 100644 --- a/doc/gutenprint/html/globals_0x63.html +++ b/doc/gutenprint/html/globals_0x63.html @@ -58,7 +58,7 @@ Here is a list of all functions, variables, defines, enums, and typedefs with li
  • CURVE_CACHE_FAST_USHORT : curve-cache.h -
    Generated on Tue Jan 1 21:37:39 2008 for libgutenprint API Reference by  +
    Generated on Sun Apr 27 22:08:01 2008 for libgutenprint API Reference by  doxygen 1.5.3
    diff --git a/doc/gutenprint/html/globals_0x64.html b/doc/gutenprint/html/globals_0x64.html index b89ea5e..a88771e 100644 --- a/doc/gutenprint/html/globals_0x64.html +++ b/doc/gutenprint/html/globals_0x64.html @@ -56,7 +56,7 @@ Here is a list of all functions, variables, defines, enums, and typedefs with li : gutenprint-intl-internal.h , gutenprint-intl.h -
    Generated on Tue Jan 1 21:37:39 2008 for libgutenprint API Reference by  +
    Generated on Sun Apr 27 22:08:01 2008 for libgutenprint API Reference by  doxygen 1.5.3
    diff --git a/doc/gutenprint/html/globals_0x67.html b/doc/gutenprint/html/globals_0x67.html index eb0e70e..e6f8345 100644 --- a/doc/gutenprint/html/globals_0x67.html +++ b/doc/gutenprint/html/globals_0x67.html @@ -53,7 +53,7 @@ Here is a list of all functions, variables, defines, enums, and typedefs with li : gutenprint-intl-internal.h , gutenprint-intl.h -
    Generated on Tue Jan 1 21:37:39 2008 for libgutenprint API Reference by  +
    Generated on Sun Apr 27 22:08:01 2008 for libgutenprint API Reference by  doxygen 1.5.3
    diff --git a/doc/gutenprint/html/globals_0x6e.html b/doc/gutenprint/html/globals_0x6e.html index 9242edc..500e25e 100644 --- a/doc/gutenprint/html/globals_0x6e.html +++ b/doc/gutenprint/html/globals_0x6e.html @@ -53,7 +53,7 @@ Here is a list of all functions, variables, defines, enums, and typedefs with li : gutenprint-intl-internal.h , gutenprint-intl.h -
    Generated on Tue Jan 1 21:37:39 2008 for libgutenprint API Reference by  +
    Generated on Sun Apr 27 22:08:01 2008 for libgutenprint API Reference by  doxygen 1.5.3
    diff --git a/doc/gutenprint/html/globals_0x70.html b/doc/gutenprint/html/globals_0x70.html index 8489e15..2fa4b54 100644 --- a/doc/gutenprint/html/globals_0x70.html +++ b/doc/gutenprint/html/globals_0x70.html @@ -57,6 +57,10 @@ Here is a list of all functions, variables, defines, enums, and typedefs with li : paper.h
  • PAPERSIZE_METRIC_STANDARD : paper.h +
  • PAPERSIZE_TYPE_ENVELOPE +: paper.h +
  • PAPERSIZE_TYPE_STANDARD +: paper.h
  • PARAMETER_BAD : vars.h
  • PARAMETER_INACTIVE @@ -64,7 +68,7 @@ Here is a list of all functions, variables, defines, enums, and typedefs with li
  • PARAMETER_OK : vars.h -
    Generated on Tue Jan 1 21:37:39 2008 for libgutenprint API Reference by  +
    Generated on Sun Apr 27 22:08:01 2008 for libgutenprint API Reference by  doxygen 1.5.3
    diff --git a/doc/gutenprint/html/globals_0x73.html b/doc/gutenprint/html/globals_0x73.html index 5d9461f..04da563 100644 --- a/doc/gutenprint/html/globals_0x73.html +++ b/doc/gutenprint/html/globals_0x73.html @@ -263,6 +263,8 @@ Here is a list of all functions, variables, defines, enums, and typedefs with li : curve.h
  • stp_curve_create_from_xmltree() : xml.h +
  • stp_curve_create_reverse() +: curve.h
  • stp_curve_destroy() : curve.h
  • stp_curve_free_curve_cache() @@ -309,6 +311,8 @@ Here is a list of all functions, variables, defines, enums, and typedefs with li : curve.h
  • stp_curve_rescale() : curve.h +
  • stp_curve_reverse() +: curve.h
  • stp_curve_set_bounds() : curve.h
  • stp_curve_set_data() @@ -363,6 +367,8 @@ Here is a list of all functions, variables, defines, enums, and typedefs with li : util.h
  • STP_DBG_CURVE_ERRORS : util.h +
  • STP_DBG_DYESUB +: util.h
  • STP_DBG_ESCP2 : util.h
  • STP_DBG_INK @@ -377,8 +383,6 @@ Here is a list of all functions, variables, defines, enums, and typedefs with li : util.h
  • STP_DBG_MODULE : util.h -
  • STP_DBG_OLYMPUS -: util.h
  • STP_DBG_PAPER : util.h
  • STP_DBG_PATH @@ -667,10 +671,10 @@ Here is a list of all functions, variables, defines, enums, and typedefs with li : printers.h
  • stp_initialize_weave() : weave.h -
  • stp_interface_age -: gutenprint-version.h
  • STP_INTERFACE_AGE : gutenprint-version.h +
  • stp_interface_age +: gutenprint-version.h
  • stp_known_papersizes() : paper.h
  • stp_list_copy() @@ -743,10 +747,10 @@ Here is a list of all functions, variables, defines, enums, and typedefs with li : gutenprint-version.h
  • stp_micro_version : gutenprint-version.h -
  • STP_MINOR_VERSION -: gutenprint-version.h
  • stp_minor_version : gutenprint-version.h +
  • STP_MINOR_VERSION +: gutenprint-version.h
  • STP_MODULE : gutenprint-module.h
  • STP_MODULE_CLASS_COLOR @@ -871,6 +875,8 @@ Here is a list of all functions, variables, defines, enums, and typedefs with li : weave.h
  • stp_packfunc : weave.h +
  • stp_papersize_type_t +: paper.h
  • stp_papersize_unit_t : paper.h
  • STP_PARAMETER_ACTIVE @@ -1025,6 +1031,8 @@ Here is a list of all functions, variables, defines, enums, and typedefs with li : sequence.h
  • stp_sequence_create_from_xmltree() : xml.h +
  • stp_sequence_create_reverse() +: sequence.h
  • stp_sequence_destroy() : sequence.h
  • stp_sequence_get_bounds() @@ -1051,6 +1059,8 @@ Here is a list of all functions, variables, defines, enums, and typedefs with li : sequence.h
  • stp_sequence_get_ushort_data() : sequence.h +
  • stp_sequence_reverse() +: sequence.h
  • stp_sequence_set_bounds() : sequence.h
  • stp_sequence_set_data() @@ -1290,7 +1300,7 @@ Here is a list of all functions, variables, defines, enums, and typedefs with li
  • stp_zprintf() : util.h -
    Generated on Tue Jan 1 21:37:39 2008 for libgutenprint API Reference by  +
    Generated on Sun Apr 27 22:08:01 2008 for libgutenprint API Reference by  doxygen 1.5.3
    diff --git a/doc/gutenprint/html/globals_0x74.html b/doc/gutenprint/html/globals_0x74.html index c732eb7..e1de8fc 100644 --- a/doc/gutenprint/html/globals_0x74.html +++ b/doc/gutenprint/html/globals_0x74.html @@ -53,7 +53,7 @@ Here is a list of all functions, variables, defines, enums, and typedefs with li : gutenprint-intl-internal.h , gutenprint-intl.h -
    Generated on Tue Jan 1 21:37:39 2008 for libgutenprint API Reference by  +
    Generated on Sun Apr 27 22:08:01 2008 for libgutenprint API Reference by  doxygen 1.5.3
    diff --git a/doc/gutenprint/html/globals_defs.html b/doc/gutenprint/html/globals_defs.html index 480e08e..e1657c0 100644 --- a/doc/gutenprint/html/globals_defs.html +++ b/doc/gutenprint/html/globals_defs.html @@ -102,6 +102,8 @@ : util.h
  • STP_DBG_CURVE_ERRORS : util.h +
  • STP_DBG_DYESUB +: util.h
  • STP_DBG_ESCP2 : util.h
  • STP_DBG_INK @@ -116,8 +118,6 @@ : util.h
  • STP_DBG_MODULE : util.h -
  • STP_DBG_OLYMPUS -: util.h
  • STP_DBG_PAPER : util.h
  • STP_DBG_PATH @@ -200,7 +200,7 @@ : gutenprint-intl-internal.h , gutenprint-intl.h -
    Generated on Tue Jan 1 21:37:39 2008 for libgutenprint API Reference by  +
    Generated on Sun Apr 27 22:08:01 2008 for libgutenprint API Reference by  doxygen 1.5.3
    diff --git a/doc/gutenprint/html/globals_enum.html b/doc/gutenprint/html/globals_enum.html index e03e4e0..ae8b506 100644 --- a/doc/gutenprint/html/globals_enum.html +++ b/doc/gutenprint/html/globals_enum.html @@ -48,6 +48,8 @@ : module.h
  • stp_mxml_type_e : mxml.h +
  • stp_papersize_type_t +: paper.h
  • stp_papersize_unit_t : paper.h
  • stp_parameter_activity_t @@ -63,7 +65,7 @@
  • stp_weave_strategy_t : weave.h -
    Generated on Tue Jan 1 21:37:39 2008 for libgutenprint API Reference by  +
    Generated on Sun Apr 27 22:08:01 2008 for libgutenprint API Reference by  doxygen 1.5.3
    diff --git a/doc/gutenprint/html/globals_eval.html b/doc/gutenprint/html/globals_eval.html index 553f309..b54fead 100644 --- a/doc/gutenprint/html/globals_eval.html +++ b/doc/gutenprint/html/globals_eval.html @@ -50,6 +50,10 @@ : paper.h
  • PAPERSIZE_METRIC_STANDARD : paper.h +
  • PAPERSIZE_TYPE_ENVELOPE +: paper.h +
  • PAPERSIZE_TYPE_STANDARD +: paper.h
  • PARAMETER_BAD : vars.h
  • PARAMETER_INACTIVE @@ -167,7 +171,7 @@
  • STP_WEAVE_ZIGZAG : weave.h -
    Generated on Tue Jan 1 21:37:39 2008 for libgutenprint API Reference by  +
    Generated on Sun Apr 27 22:08:01 2008 for libgutenprint API Reference by  doxygen 1.5.3
    diff --git a/doc/gutenprint/html/globals_func.html b/doc/gutenprint/html/globals_func.html index 4c72e29..42178e1 100644 --- a/doc/gutenprint/html/globals_func.html +++ b/doc/gutenprint/html/globals_func.html @@ -215,6 +215,8 @@ : curve.h
  • stp_curve_create_from_xmltree() : xml.h +
  • stp_curve_create_reverse() +: curve.h
  • stp_curve_destroy() : curve.h
  • stp_curve_free_curve_cache() @@ -261,6 +263,8 @@ : curve.h
  • stp_curve_rescale() : curve.h +
  • stp_curve_reverse() +: curve.h
  • stp_curve_set_bounds() : curve.h
  • stp_curve_set_data() @@ -723,6 +727,8 @@ : sequence.h
  • stp_sequence_create_from_xmltree() : xml.h +
  • stp_sequence_create_reverse() +: sequence.h
  • stp_sequence_destroy() : sequence.h
  • stp_sequence_get_bounds() @@ -749,6 +755,8 @@ : sequence.h
  • stp_sequence_get_ushort_data() : sequence.h +
  • stp_sequence_reverse() +: sequence.h
  • stp_sequence_set_bounds() : sequence.h
  • stp_sequence_set_data() @@ -966,7 +974,7 @@
  • stp_zprintf() : util.h -
    Generated on Tue Jan 1 21:37:39 2008 for libgutenprint API Reference by  +
    Generated on Sun Apr 27 22:08:01 2008 for libgutenprint API Reference by  doxygen 1.5.3
    diff --git a/doc/gutenprint/html/globals_type.html b/doc/gutenprint/html/globals_type.html index 52d6d94..ad226bf 100644 --- a/doc/gutenprint/html/globals_type.html +++ b/doc/gutenprint/html/globals_type.html @@ -85,7 +85,7 @@
  • stp_xml_parse_func : xml.h -
    Generated on Tue Jan 1 21:37:39 2008 for libgutenprint API Reference by  +
    Generated on Sun Apr 27 22:08:01 2008 for libgutenprint API Reference by  doxygen 1.5.3
    diff --git a/doc/gutenprint/html/globals_vars.html b/doc/gutenprint/html/globals_vars.html index af0fae2..f037ffd 100644 --- a/doc/gutenprint/html/globals_vars.html +++ b/doc/gutenprint/html/globals_vars.html @@ -59,7 +59,7 @@
  • stp_pack_uncompressed : weave.h -
    Generated on Tue Jan 1 21:37:39 2008 for libgutenprint API Reference by  +
    Generated on Sun Apr 27 22:08:01 2008 for libgutenprint API Reference by  doxygen 1.5.3
    diff --git a/doc/gutenprint/html/group__array.html b/doc/gutenprint/html/group__array.html index 8ee1862..76c4605 100644 --- a/doc/gutenprint/html/group__array.html +++ b/doc/gutenprint/html/group__array.html @@ -513,7 +513,7 @@ Resizing an array will destroy all data stored in the array.

    -

    Generated on Tue Jan 1 21:37:39 2008 for libgutenprint API Reference by  +
    Generated on Sun Apr 27 22:08:01 2008 for libgutenprint API Reference by  doxygen 1.5.3
    diff --git a/doc/gutenprint/html/group__color.html b/doc/gutenprint/html/group__color.html index cd86269..30179fb 100644 --- a/doc/gutenprint/html/group__color.html +++ b/doc/gutenprint/html/group__color.html @@ -383,7 +383,7 @@ Get a color module by its name.

    -

    Generated on Tue Jan 1 21:37:39 2008 for libgutenprint API Reference by  +
    Generated on Sun Apr 27 22:08:01 2008 for libgutenprint API Reference by  doxygen 1.5.3
    diff --git a/doc/gutenprint/html/group__curve.html b/doc/gutenprint/html/group__curve.html index d03aded..49b1107 100644 --- a/doc/gutenprint/html/group__curve.html +++ b/doc/gutenprint/html/group__curve.html @@ -54,10 +54,16 @@  Create a new curve.
    stp_curve_t * stp_curve_create_copy (const stp_curve_t *curve) - Copy and allocate an curve.
    + Copy and allocate a curve.
    void stp_curve_copy (stp_curve_t *dest, const stp_curve_t *source) - Copy an curve.
    + Copy a curve.
    +stp_curve_t * stp_curve_create_reverse (const stp_curve_t *curve) + + Reverse and allocate a curve.
    +void stp_curve_reverse (stp_curve_t *dest, const stp_curve_t *source) + + Reverse a curve.
    void stp_curve_destroy (stp_curve_t *curve)  Destroy an curve.
    @@ -417,7 +423,7 @@ Only add and multiply composition is currently supported. If both curves are gam

    -Copy an curve. +Copy a curve.

    Both dest and source must be valid curves previously created with stp_curve_create().

    Parameters:
    @@ -502,7 +508,7 @@ A wrapped curve has the same value at x=0 and x=1. The wrap mode of a curve cann

    -Copy and allocate an curve. +Copy and allocate a curve.

    dest will be created, and then the contents of source will be copied into it. dest must not have been previously allocated with stp_curve_create().

    Parameters:
    @@ -598,6 +604,34 @@ Create a curve from a string.
    Returns:
    the newly created curve, or NULL if an error occured.
    + +

    + +

    +
    +
    + + + + + + + + +
    stp_curve_t* stp_curve_create_reverse (const stp_curve_t *  curve  ) 
    +
    +
    + +

    +Reverse and allocate a curve. +

    +dest will be created, and then the contents of source will be copied into it. dest must not have been previously allocated with stp_curve_create().

    Parameters:
    + + +
    curve the source curve.
    +
    +
    Returns:
    the new copy of the curve.
    +

    @@ -1406,6 +1440,43 @@ This also rescales the bounds. Note that this currently destroys the gamma prope

    Returns:
    FALSE if this would exceed floating point limits
    + +

    + +

    +
    + + + + + + + + + + + + + + + + + + +
    void stp_curve_reverse (stp_curve_t *  dest,
    const stp_curve_t *  source 
    )
    +
    +
    + +

    +Reverse a curve. +

    +Both dest and source must be valid curves previously created with stp_curve_create().

    Parameters:
    + + + +
    dest the destination curve.
    source the source curve.
    +
    +

    @@ -2082,7 +2153,7 @@ The printable representation is guaranteed to contain only 7-bit printable ASCII

    -

    Generated on Tue Jan 1 21:37:39 2008 for libgutenprint API Reference by  +
    Generated on Sun Apr 27 22:08:01 2008 for libgutenprint API Reference by  doxygen 1.5.3
    diff --git a/doc/gutenprint/html/group__image.html b/doc/gutenprint/html/group__image.html index c6adab5..dd7de37 100644 --- a/doc/gutenprint/html/group__image.html +++ b/doc/gutenprint/html/group__image.html @@ -253,7 +253,7 @@ An error occured, or the job was aborted.

    -

    Generated on Tue Jan 1 21:37:39 2008 for libgutenprint API Reference by  +
    Generated on Sun Apr 27 22:08:01 2008 for libgutenprint API Reference by  doxygen 1.5.3
    diff --git a/doc/gutenprint/html/group__intl.html b/doc/gutenprint/html/group__intl.html index 37996a1..556b80b 100644 --- a/doc/gutenprint/html/group__intl.html +++ b/doc/gutenprint/html/group__intl.html @@ -189,7 +189,7 @@ The macros defined in this header are convenience wrappers around the gettext fu

    -

    Generated on Tue Jan 1 21:37:39 2008 for libgutenprint API Reference by  +
    Generated on Sun Apr 27 22:08:01 2008 for libgutenprint API Reference by  doxygen 1.5.3
    diff --git a/doc/gutenprint/html/group__intl__internal.html b/doc/gutenprint/html/group__intl__internal.html index 77309c1..231fea0 100644 --- a/doc/gutenprint/html/group__intl__internal.html +++ b/doc/gutenprint/html/group__intl__internal.html @@ -189,7 +189,7 @@ The macros defined in this header are convenience wrappers around the gettext fu

    -

    Generated on Tue Jan 1 21:37:39 2008 for libgutenprint API Reference by  +
    Generated on Sun Apr 27 22:08:01 2008 for libgutenprint API Reference by  doxygen 1.5.3
    diff --git a/doc/gutenprint/html/group__list.html b/doc/gutenprint/html/group__list.html index 1092d45..9b13585 100644 --- a/doc/gutenprint/html/group__list.html +++ b/doc/gutenprint/html/group__list.html @@ -1059,7 +1059,7 @@ This callback function will be called to determine the sort order for list items

    -

    Generated on Tue Jan 1 21:37:39 2008 for libgutenprint API Reference by  +
    Generated on Sun Apr 27 22:08:01 2008 for libgutenprint API Reference by  doxygen 1.5.3
    diff --git a/doc/gutenprint/html/group__papersize.html b/doc/gutenprint/html/group__papersize.html index 6eef787..4d3db0b 100644 --- a/doc/gutenprint/html/group__papersize.html +++ b/doc/gutenprint/html/group__papersize.html @@ -29,6 +29,10 @@ }  Units of measurement. More...
    +enum  stp_papersize_type_t { PAPERSIZE_TYPE_STANDARD = 0, +PAPERSIZE_TYPE_ENVELOPE + } +

    Functions

    int stp_known_papersizes (void) @@ -49,6 +53,29 @@ The papersize describes the dimensions of a paper.

    Enumeration Type Documentation

    + +
    +
    + + + + +
    enum stp_papersize_type_t
    +
    +
    + +

    +

    Enumerator:
    + + + +
    PAPERSIZE_TYPE_STANDARD  +Standard paper size.
    PAPERSIZE_TYPE_ENVELOPE  +Envelope.
    +
    + +
    +

    @@ -239,7 +266,7 @@ Get the number of available papersizes.

    -

    Generated on Tue Jan 1 21:37:39 2008 for libgutenprint API Reference by  +
    Generated on Sun Apr 27 22:08:01 2008 for libgutenprint API Reference by  doxygen 1.5.3
    diff --git a/doc/gutenprint/html/group__printer.html b/doc/gutenprint/html/group__printer.html index 31e0c61..977f4dd 100644 --- a/doc/gutenprint/html/group__printer.html +++ b/doc/gutenprint/html/group__printer.html @@ -806,7 +806,7 @@ Start a print job.

    -

    Generated on Tue Jan 1 21:37:39 2008 for libgutenprint API Reference by  +
    Generated on Sun Apr 27 22:08:01 2008 for libgutenprint API Reference by  doxygen 1.5.3
    diff --git a/doc/gutenprint/html/group__sequence.html b/doc/gutenprint/html/group__sequence.html index 6832c4b..b2eedc6 100644 --- a/doc/gutenprint/html/group__sequence.html +++ b/doc/gutenprint/html/group__sequence.html @@ -31,10 +31,16 @@ stp_sequence  Destroy a sequence.
    void stp_sequence_copy (stp_sequence_t *dest, const stp_sequence_t *source) - Copy an sequence.
    + Copy a sequence.
    stp_sequence_t * stp_sequence_create_copy (const stp_sequence_t *sequence) - Copy and allocate an sequence.
    + Copy and allocate a sequence.
    +void stp_sequence_reverse (stp_sequence_t *dest, const stp_sequence_t *source) + + Reverse a sequence.
    +stp_sequence_t * stp_sequence_create_reverse (const stp_sequence_t *sequence) + + Reverse and allocate a sequence.
    int stp_sequence_set_bounds (stp_sequence_t *sequence, double low, double high)  Set the lower and upper bounds.
    @@ -156,7 +162,7 @@ The sequence opaque data type.

    -Copy an sequence. +Copy a sequence.

    Both dest and source must be valid sequences previously created with stp_sequence_create().

    Parameters:
    @@ -207,7 +213,35 @@ Create a new sequence.

    -Copy and allocate an sequence. +Copy and allocate a sequence. +

    +A new sequence will be created, and then the contents of source will be copied into it. The destination must not have been previously allocated with stp_sequence_create().

    Parameters:
    +
    + +
    sequence the source sequence.
    +
    +
    Returns:
    the new copy of the sequence.
    + +
    +

    + +

    +
    + + + + + + + + + +
    stp_sequence_t* stp_sequence_create_reverse (const stp_sequence_t *  sequence  ) 
    +
    +
    + +

    +Reverse and allocate a sequence.

    A new sequence will be created, and then the contents of source will be copied into it. The destination must not have been previously allocated with stp_sequence_create().

    Parameters:
    @@ -713,6 +747,43 @@ The pointer returned is owned by the curve, and is not guaranteed to be valid be
    Returns:
    a pointer to the first element of an sequence of unsigned shorts is stored in a pointer to unsigned short*.
    + +

    + +

    +
    +
    + + + + + + + + + + + + + + + + + +
    void stp_sequence_reverse (stp_sequence_t *  dest,
    const stp_sequence_t *  source 
    )
    +
    +
    + +

    +Reverse a sequence. +

    +Both dest and source must be valid sequences previously created with stp_sequence_create().

    Parameters:
    + + + +
    dest the destination sequence.
    source the source sequence.
    +
    +

    @@ -1255,7 +1326,7 @@ Set the data in a sequence from unsigned short values.

    -

    Generated on Tue Jan 1 21:37:39 2008 for libgutenprint API Reference by  +
    Generated on Sun Apr 27 22:08:01 2008 for libgutenprint API Reference by  doxygen 1.5.3
    diff --git a/doc/gutenprint/html/group__util.html b/doc/gutenprint/html/group__util.html index 3798a03..94f21b3 100644 --- a/doc/gutenprint/html/group__util.html +++ b/doc/gutenprint/html/group__util.html @@ -54,7 +54,7 @@ #define STP_DBG_VARS   0x20000 -#define STP_DBG_OLYMPUS   0x40000 +#define STP_DBG_DYESUB   0x40000 #define STP_DBG_CURVE   0x80000 @@ -200,6 +200,21 @@ Utility functions.

    + +

    + +

    +
    + + + + +
    #define STP_DBG_DYESUB   0x40000
    +
    +
    + +

    +

    @@ -305,21 +320,6 @@ Utility functions.

    - -

    - -

    -
    - - - - -
    #define STP_DBG_OLYMPUS   0x40000
    -
    -
    - -

    -

    @@ -1445,7 +1445,7 @@ This function sets the encoding that all strings translated by gettext are outpu

    -

    Generated on Tue Jan 1 21:37:39 2008 for libgutenprint API Reference by  +
    Generated on Sun Apr 27 22:08:01 2008 for libgutenprint API Reference by  doxygen 1.5.3
    diff --git a/doc/gutenprint/html/group__vars.html b/doc/gutenprint/html/group__vars.html index 6c81a98..99cc1d4 100644 --- a/doc/gutenprint/html/group__vars.html +++ b/doc/gutenprint/html/group__vars.html @@ -5611,7 +5611,7 @@ Verify that the parameters selected are consistent with those allowed by the dri

    -

    Generated on Tue Jan 1 21:37:39 2008 for libgutenprint API Reference by  +
    Generated on Sun Apr 27 22:08:01 2008 for libgutenprint API Reference by  doxygen 1.5.3
    diff --git a/doc/gutenprint/html/group__version.html b/doc/gutenprint/html/group__version.html index 686e14c..a2fa187 100644 --- a/doc/gutenprint/html/group__version.html +++ b/doc/gutenprint/html/group__version.html @@ -20,9 +20,9 @@

    Defines

    #define STP_MAJOR_VERSION   (5) -#define STP_MINOR_VERSION   (0) +#define STP_MINOR_VERSION   (1) -#define STP_MICRO_VERSION   (2) +#define STP_MICRO_VERSION   (98) #define STP_CURRENT_INTERFACE   (2) @@ -157,7 +157,7 @@ Version information may be used to check the library version at compile-time, us
    - +
    #define STP_MICRO_VERSION   (2) #define STP_MICRO_VERSION   (98)
    @@ -172,7 +172,7 @@ Version information may be used to check the library version at compile-time, us
    - +
    #define STP_MINOR_VERSION   (0) #define STP_MINOR_VERSION   (1)
    @@ -331,7 +331,7 @@ The library minor version number.

    -

    Generated on Tue Jan 1 21:37:39 2008 for libgutenprint API Reference by  +
    Generated on Sun Apr 27 22:08:01 2008 for libgutenprint API Reference by  doxygen 1.5.3
    diff --git a/doc/gutenprint/html/gutenprint-intl-internal_8h.html b/doc/gutenprint/html/gutenprint-intl-internal_8h.html index 3b2906d..b798049 100644 --- a/doc/gutenprint/html/gutenprint-intl-internal_8h.html +++ b/doc/gutenprint/html/gutenprint-intl-internal_8h.html @@ -34,7 +34,7 @@

    Detailed Description

    -Internationalisation functions.
    Generated on Tue Jan 1 21:37:38 2008 for libgutenprint API Reference by  +Internationalisation functions.
    Generated on Sun Apr 27 22:08:01 2008 for libgutenprint API Reference by  doxygen 1.5.3
    diff --git a/doc/gutenprint/html/gutenprint-intl_8h.html b/doc/gutenprint/html/gutenprint-intl_8h.html index ad75314..a4c9aab 100644 --- a/doc/gutenprint/html/gutenprint-intl_8h.html +++ b/doc/gutenprint/html/gutenprint-intl_8h.html @@ -34,7 +34,7 @@

    Detailed Description

    -Internationalisation functions.
    Generated on Tue Jan 1 21:37:38 2008 for libgutenprint API Reference by  +Internationalisation functions.
    Generated on Sun Apr 27 22:08:01 2008 for libgutenprint API Reference by  doxygen 1.5.3
    diff --git a/doc/gutenprint/html/gutenprint-module_8h.html b/doc/gutenprint/html/gutenprint-module_8h.html index caeb836..28650a4 100644 --- a/doc/gutenprint/html/gutenprint-module_8h.html +++ b/doc/gutenprint/html/gutenprint-module_8h.html @@ -47,7 +47,7 @@ Gutenprint module header. This header includes all of the public headers used by

    -

    Generated on Tue Jan 1 21:37:38 2008 for libgutenprint API Reference by  +
    Generated on Sun Apr 27 22:08:01 2008 for libgutenprint API Reference by  doxygen 1.5.3
    diff --git a/doc/gutenprint/html/gutenprint-version_8h.html b/doc/gutenprint/html/gutenprint-version_8h.html index ad45bac..fc82c4f 100644 --- a/doc/gutenprint/html/gutenprint-version_8h.html +++ b/doc/gutenprint/html/gutenprint-version_8h.html @@ -19,9 +19,9 @@

    Defines

    #define STP_MAJOR_VERSION   (5) -#define STP_MINOR_VERSION   (0) +#define STP_MINOR_VERSION   (1) -#define STP_MICRO_VERSION   (2) +#define STP_MICRO_VERSION   (98) #define STP_CURRENT_INTERFACE   (2) @@ -56,7 +56,7 @@  The library ABI interface age number (number of revisions of this ABI).

    Detailed Description

    -Version functions.
    Generated on Tue Jan 1 21:37:38 2008 for libgutenprint API Reference by  +Version functions.
    Generated on Sun Apr 27 22:08:01 2008 for libgutenprint API Reference by  doxygen 1.5.3
    diff --git a/doc/gutenprint/html/gutenprint_8h.html b/doc/gutenprint/html/gutenprint_8h.html index 9570b53..52edc32 100644 --- a/doc/gutenprint/html/gutenprint_8h.html +++ b/doc/gutenprint/html/gutenprint_8h.html @@ -30,7 +30,7 @@

    Detailed Description

    -Gutenprint master header. This header includes all of the public headers.
    Generated on Tue Jan 1 21:37:38 2008 for libgutenprint API Reference by  +Gutenprint master header. This header includes all of the public headers.
    Generated on Sun Apr 27 22:08:01 2008 for libgutenprint API Reference by  doxygen 1.5.3
    diff --git a/doc/gutenprint/html/image_8h.html b/doc/gutenprint/html/image_8h.html index 6f2c5dc..efaea41 100644 --- a/doc/gutenprint/html/image_8h.html +++ b/doc/gutenprint/html/image_8h.html @@ -46,7 +46,7 @@

    Detailed Description

    -Image functions.
    Generated on Tue Jan 1 21:37:38 2008 for libgutenprint API Reference by  +Image functions.
    Generated on Sun Apr 27 22:08:01 2008 for libgutenprint API Reference by  doxygen 1.5.3
    diff --git a/doc/gutenprint/html/index.html b/doc/gutenprint/html/index.html index da85442..37abafd 100644 --- a/doc/gutenprint/html/index.html +++ b/doc/gutenprint/html/index.html @@ -16,7 +16,7 @@

    libgutenprint API Reference Documentation

    -

    5.0.2

    Generated on Tue Jan 1 21:37:38 2008 for libgutenprint API Reference by  +

    5.1.98.2

    Generated on Sun Apr 27 22:08:01 2008 for libgutenprint API Reference by  doxygen 1.5.3
    diff --git a/doc/gutenprint/html/list_8h.html b/doc/gutenprint/html/list_8h.html index 40d39e6..dff2909 100644 --- a/doc/gutenprint/html/list_8h.html +++ b/doc/gutenprint/html/list_8h.html @@ -117,7 +117,7 @@ stp_list_item  Set the data associated with a list item.

    Detailed Description

    -Generic list functions.
    Generated on Tue Jan 1 21:37:38 2008 for libgutenprint API Reference by  +Generic list functions.
    Generated on Sun Apr 27 22:08:01 2008 for libgutenprint API Reference by  doxygen 1.5.3
    diff --git a/doc/gutenprint/html/module_8h.html b/doc/gutenprint/html/module_8h.html index cc0622f..1a4992e 100644 --- a/doc/gutenprint/html/module_8h.html +++ b/doc/gutenprint/html/module_8h.html @@ -199,7 +199,7 @@ Module functions.

    Enumeration Type Documentation

    -

    Generated on Tue Jan 1 21:37:38 2008 for libgutenprint API Reference by  +
    Generated on Sun Apr 27 22:08:01 2008 for libgutenprint API Reference by  doxygen 1.5.3
    diff --git a/doc/gutenprint/html/modules.html b/doc/gutenprint/html/modules.html index c238bcc..acb48c4 100644 --- a/doc/gutenprint/html/modules.html +++ b/doc/gutenprint/html/modules.html @@ -29,7 +29,7 @@
  • util
  • vars -
    Generated on Tue Jan 1 21:37:39 2008 for libgutenprint API Reference by  +
    Generated on Sun Apr 27 22:08:01 2008 for libgutenprint API Reference by  doxygen 1.5.3
    diff --git a/doc/gutenprint/html/mxml_8h.html b/doc/gutenprint/html/mxml_8h.html index afb05dd..1df8b83 100644 --- a/doc/gutenprint/html/mxml_8h.html +++ b/doc/gutenprint/html/mxml_8h.html @@ -985,7 +985,7 @@ Mini-XML XML parsing functions.

    Define Documentation

    -

    Generated on Tue Jan 1 21:37:38 2008 for libgutenprint API Reference by  +
    Generated on Sun Apr 27 22:08:01 2008 for libgutenprint API Reference by  doxygen 1.5.3
    diff --git a/doc/gutenprint/html/pages.html b/doc/gutenprint/html/pages.html index db98121..c4f1473 100644 --- a/doc/gutenprint/html/pages.html +++ b/doc/gutenprint/html/pages.html @@ -18,7 +18,7 @@
  • Deprecated List -
    Generated on Tue Jan 1 21:37:39 2008 for libgutenprint API Reference by  +
    Generated on Sun Apr 27 22:08:01 2008 for libgutenprint API Reference by  doxygen 1.5.3
    diff --git a/doc/gutenprint/html/paper_8h.html b/doc/gutenprint/html/paper_8h.html index 8c1c17c..ff288ca 100644 --- a/doc/gutenprint/html/paper_8h.html +++ b/doc/gutenprint/html/paper_8h.html @@ -29,6 +29,10 @@ }  Units of measurement. More...
    +enum  stp_papersize_type_t { PAPERSIZE_TYPE_STANDARD = 0, +PAPERSIZE_TYPE_ENVELOPE + } +

    Functions

    int stp_known_papersizes (void) @@ -46,7 +50,7 @@

    Detailed Description

    -Paper size functions.
    Generated on Tue Jan 1 21:37:38 2008 for libgutenprint API Reference by  +Paper size functions.
    Generated on Sun Apr 27 22:08:01 2008 for libgutenprint API Reference by  doxygen 1.5.3
    diff --git a/doc/gutenprint/html/path_8h.html b/doc/gutenprint/html/path_8h.html index b0e024a..477cbe2 100644 --- a/doc/gutenprint/html/path_8h.html +++ b/doc/gutenprint/html/path_8h.html @@ -82,7 +82,7 @@ Simple directory path functions.

    Function Documentation

    -

    Generated on Tue Jan 1 21:37:38 2008 for libgutenprint API Reference by  +
    Generated on Sun Apr 27 22:08:01 2008 for libgutenprint API Reference by  doxygen 1.5.3
    diff --git a/doc/gutenprint/html/printers_8h.html b/doc/gutenprint/html/printers_8h.html index 2e7a25c..97d1d4a 100644 --- a/doc/gutenprint/html/printers_8h.html +++ b/doc/gutenprint/html/printers_8h.html @@ -99,7 +99,7 @@ stp_printer 

    Detailed Description

    -Printer functions.
    Generated on Tue Jan 1 21:37:38 2008 for libgutenprint API Reference by  +Printer functions.
    Generated on Sun Apr 27 22:08:01 2008 for libgutenprint API Reference by  doxygen 1.5.3
    diff --git a/doc/gutenprint/html/sequence_8h.html b/doc/gutenprint/html/sequence_8h.html index 98ef99d..ea91a17 100644 --- a/doc/gutenprint/html/sequence_8h.html +++ b/doc/gutenprint/html/sequence_8h.html @@ -30,10 +30,16 @@ stp_sequence  Destroy a sequence.
    void stp_sequence_copy (stp_sequence_t *dest, const stp_sequence_t *source) - Copy an sequence.
    + Copy a sequence.
    stp_sequence_t * stp_sequence_create_copy (const stp_sequence_t *sequence) - Copy and allocate an sequence.
    + Copy and allocate a sequence.
    +void stp_sequence_reverse (stp_sequence_t *dest, const stp_sequence_t *source) + + Reverse a sequence.
    +stp_sequence_t * stp_sequence_create_reverse (const stp_sequence_t *sequence) + + Reverse and allocate a sequence.
    int stp_sequence_set_bounds (stp_sequence_t *sequence, double low, double high)  Set the lower and upper bounds.
    @@ -108,7 +114,7 @@ stp_sequence  Get the data in a sequence as unsigned short data.

    Detailed Description

    -Sequence functions.
    Generated on Tue Jan 1 21:37:38 2008 for libgutenprint API Reference by  +Sequence functions.
    Generated on Sun Apr 27 22:08:01 2008 for libgutenprint API Reference by  doxygen 1.5.3
    diff --git a/doc/gutenprint/html/string-list_8h.html b/doc/gutenprint/html/string-list_8h.html index 7aaab01..4447ecd 100644 --- a/doc/gutenprint/html/string-list_8h.html +++ b/doc/gutenprint/html/string-list_8h.html @@ -327,7 +327,7 @@ The string_list opaque data type.

    -

    Generated on Tue Jan 1 21:37:38 2008 for libgutenprint API Reference by  +
    Generated on Sun Apr 27 22:08:01 2008 for libgutenprint API Reference by  doxygen 1.5.3
    diff --git a/doc/gutenprint/html/structstp__cached__curve__t.html b/doc/gutenprint/html/structstp__cached__curve__t.html index 5d655df..ad1b34c 100644 --- a/doc/gutenprint/html/structstp__cached__curve__t.html +++ b/doc/gutenprint/html/structstp__cached__curve__t.html @@ -98,7 +98,7 @@

    The documentation for this struct was generated from the following file: -
    Generated on Tue Jan 1 21:37:39 2008 for libgutenprint API Reference by  +
    Generated on Sun Apr 27 22:08:01 2008 for libgutenprint API Reference by  doxygen 1.5.3
    diff --git a/doc/gutenprint/html/structstp__color__t.html b/doc/gutenprint/html/structstp__color__t.html index 5dfeafa..fe30a91 100644 --- a/doc/gutenprint/html/structstp__color__t.html +++ b/doc/gutenprint/html/structstp__color__t.html @@ -84,7 +84,7 @@

    The documentation for this struct was generated from the following file: -
    Generated on Tue Jan 1 21:37:39 2008 for libgutenprint API Reference by  +
    Generated on Sun Apr 27 22:08:01 2008 for libgutenprint API Reference by  doxygen 1.5.3
    diff --git a/doc/gutenprint/html/structstp__colorfuncs__t.html b/doc/gutenprint/html/structstp__colorfuncs__t.html index 6a0a66c..2683398 100644 --- a/doc/gutenprint/html/structstp__colorfuncs__t.html +++ b/doc/gutenprint/html/structstp__colorfuncs__t.html @@ -101,7 +101,7 @@

    The documentation for this struct was generated from the following file: -
    Generated on Tue Jan 1 21:37:39 2008 for libgutenprint API Reference by  +
    Generated on Sun Apr 27 22:08:01 2008 for libgutenprint API Reference by  doxygen 1.5.3
    diff --git a/doc/gutenprint/html/structstp__curve__point__t.html b/doc/gutenprint/html/structstp__curve__point__t.html index ab93c29..8927cb3 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.

    The documentation for this struct was generated from the following file: -
    Generated on Tue Jan 1 21:37:39 2008 for libgutenprint API Reference by  +
    Generated on Sun Apr 27 22:08:01 2008 for libgutenprint API Reference by  doxygen 1.5.3
    diff --git a/doc/gutenprint/html/structstp__dither__matrix__generic__t.html b/doc/gutenprint/html/structstp__dither__matrix__generic__t.html index 782b81c..87d4704 100644 --- a/doc/gutenprint/html/structstp__dither__matrix__generic__t.html +++ b/doc/gutenprint/html/structstp__dither__matrix__generic__t.html @@ -115,7 +115,7 @@

    The documentation for this struct was generated from the following file: -
    Generated on Tue Jan 1 21:37:39 2008 for libgutenprint API Reference by  +
    Generated on Sun Apr 27 22:08:01 2008 for libgutenprint API Reference by  doxygen 1.5.3
    diff --git a/doc/gutenprint/html/structstp__dither__matrix__impl__t.html b/doc/gutenprint/html/structstp__dither__matrix__impl__t.html index e3b215d..e16a09a 100644 --- a/doc/gutenprint/html/structstp__dither__matrix__impl__t.html +++ b/doc/gutenprint/html/structstp__dither__matrix__impl__t.html @@ -285,7 +285,7 @@

    The documentation for this struct was generated from the following file: -
    Generated on Tue Jan 1 21:37:39 2008 for libgutenprint API Reference by  +
    Generated on Sun Apr 27 22:08:01 2008 for libgutenprint API Reference by  doxygen 1.5.3
    diff --git a/doc/gutenprint/html/structstp__dither__matrix__normal__t.html b/doc/gutenprint/html/structstp__dither__matrix__normal__t.html index 638b58c..cd35790 100644 --- a/doc/gutenprint/html/structstp__dither__matrix__normal__t.html +++ b/doc/gutenprint/html/structstp__dither__matrix__normal__t.html @@ -115,7 +115,7 @@

    The documentation for this struct was generated from the following file: -
    Generated on Tue Jan 1 21:37:39 2008 for libgutenprint API Reference by  +
    Generated on Sun Apr 27 22:08:01 2008 for libgutenprint API Reference by  doxygen 1.5.3
    diff --git a/doc/gutenprint/html/structstp__dither__matrix__short__t.html b/doc/gutenprint/html/structstp__dither__matrix__short__t.html index dabfa23..fe15461 100644 --- a/doc/gutenprint/html/structstp__dither__matrix__short__t.html +++ b/doc/gutenprint/html/structstp__dither__matrix__short__t.html @@ -115,7 +115,7 @@

    The documentation for this struct was generated from the following file: -
    Generated on Tue Jan 1 21:37:39 2008 for libgutenprint API Reference by  +
    Generated on Sun Apr 27 22:08:01 2008 for libgutenprint API Reference by  doxygen 1.5.3
    diff --git a/doc/gutenprint/html/structstp__dotsize__t.html b/doc/gutenprint/html/structstp__dotsize__t.html index 5ae4d72..17ff67d 100644 --- a/doc/gutenprint/html/structstp__dotsize__t.html +++ b/doc/gutenprint/html/structstp__dotsize__t.html @@ -64,7 +64,7 @@

    The documentation for this struct was generated from the following file: -
    Generated on Tue Jan 1 21:37:39 2008 for libgutenprint API Reference by  +
    Generated on Sun Apr 27 22:08:01 2008 for libgutenprint API Reference by  doxygen 1.5.3
    diff --git a/doc/gutenprint/html/structstp__double__bound__t.html b/doc/gutenprint/html/structstp__double__bound__t.html index e121069..c526ea0 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.

    The documentation for this struct was generated from the following file: -
    Generated on Tue Jan 1 21:37:39 2008 for libgutenprint API Reference by  +
    Generated on Sun Apr 27 22:08:01 2008 for libgutenprint API Reference by  doxygen 1.5.3
    diff --git a/doc/gutenprint/html/structstp__family__t.html b/doc/gutenprint/html/structstp__family__t.html index 6814bd3..aff6bb2 100644 --- a/doc/gutenprint/html/structstp__family__t.html +++ b/doc/gutenprint/html/structstp__family__t.html @@ -67,7 +67,7 @@

    The documentation for this struct was generated from the following file: -
    Generated on Tue Jan 1 21:37:39 2008 for libgutenprint API Reference by  +
    Generated on Sun Apr 27 22:08:01 2008 for libgutenprint API Reference by  doxygen 1.5.3
    diff --git a/doc/gutenprint/html/structstp__image__t.html b/doc/gutenprint/html/structstp__image__t.html index 165b008..7543d00 100644 --- a/doc/gutenprint/html/structstp__image__t.html +++ b/doc/gutenprint/html/structstp__image__t.html @@ -228,7 +228,7 @@ A pointer to an application-specific state information that might need to be ass

    The documentation for this struct was generated from the following file: -
    Generated on Tue Jan 1 21:37:39 2008 for libgutenprint API Reference by  +
    Generated on Sun Apr 27 22:08:01 2008 for libgutenprint API Reference by  doxygen 1.5.3
    diff --git a/doc/gutenprint/html/structstp__int__bound__t.html b/doc/gutenprint/html/structstp__int__bound__t.html index 5946bcc..84137f0 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.

    The documentation for this struct was generated from the following file: -
    Generated on Tue Jan 1 21:37:39 2008 for libgutenprint API Reference by  +
    Generated on Sun Apr 27 22:08:01 2008 for libgutenprint API Reference by  doxygen 1.5.3
    diff --git a/doc/gutenprint/html/structstp__lineactive__t.html b/doc/gutenprint/html/structstp__lineactive__t.html index e508854..bd2b84f 100644 --- a/doc/gutenprint/html/structstp__lineactive__t.html +++ b/doc/gutenprint/html/structstp__lineactive__t.html @@ -64,7 +64,7 @@

    The documentation for this struct was generated from the following file: -
    Generated on Tue Jan 1 21:37:39 2008 for libgutenprint API Reference by  +
    Generated on Sun Apr 27 22:08:01 2008 for libgutenprint API Reference by  doxygen 1.5.3
    diff --git a/doc/gutenprint/html/structstp__linebounds__t.html b/doc/gutenprint/html/structstp__linebounds__t.html index 677b8be..ba498ad 100644 --- a/doc/gutenprint/html/structstp__linebounds__t.html +++ b/doc/gutenprint/html/structstp__linebounds__t.html @@ -81,7 +81,7 @@

    The documentation for this struct was generated from the following file: -
    Generated on Tue Jan 1 21:37:39 2008 for libgutenprint API Reference by  +
    Generated on Sun Apr 27 22:08:01 2008 for libgutenprint API Reference by  doxygen 1.5.3
    diff --git a/doc/gutenprint/html/structstp__linebufs__t.html b/doc/gutenprint/html/structstp__linebufs__t.html index 6c1105c..6a69210 100644 --- a/doc/gutenprint/html/structstp__linebufs__t.html +++ b/doc/gutenprint/html/structstp__linebufs__t.html @@ -64,7 +64,7 @@

    The documentation for this struct was generated from the following file: -
    Generated on Tue Jan 1 21:37:39 2008 for libgutenprint API Reference by  +
    Generated on Sun Apr 27 22:08:01 2008 for libgutenprint API Reference by  doxygen 1.5.3
    diff --git a/doc/gutenprint/html/structstp__linecount__t.html b/doc/gutenprint/html/structstp__linecount__t.html index fd3ad2f..a0807bd 100644 --- a/doc/gutenprint/html/structstp__linecount__t.html +++ b/doc/gutenprint/html/structstp__linecount__t.html @@ -64,7 +64,7 @@

    The documentation for this struct was generated from the following file: -
    Generated on Tue Jan 1 21:37:39 2008 for libgutenprint API Reference by  +
    Generated on Sun Apr 27 22:08:01 2008 for libgutenprint API Reference by  doxygen 1.5.3
    diff --git a/doc/gutenprint/html/structstp__lineoff__t.html b/doc/gutenprint/html/structstp__lineoff__t.html index 8754520..4b6624b 100644 --- a/doc/gutenprint/html/structstp__lineoff__t.html +++ b/doc/gutenprint/html/structstp__lineoff__t.html @@ -64,7 +64,7 @@

    The documentation for this struct was generated from the following file: -
    Generated on Tue Jan 1 21:37:39 2008 for libgutenprint API Reference by  +
    Generated on Sun Apr 27 22:08:01 2008 for libgutenprint API Reference by  doxygen 1.5.3
    diff --git a/doc/gutenprint/html/structstp__module__t.html b/doc/gutenprint/html/structstp__module__t.html index f1f2bef..ce0f4ed 100644 --- a/doc/gutenprint/html/structstp__module__t.html +++ b/doc/gutenprint/html/structstp__module__t.html @@ -166,7 +166,7 @@

    The documentation for this struct was generated from the following file: -
    Generated on Tue Jan 1 21:37:39 2008 for libgutenprint API Reference by  +
    Generated on Sun Apr 27 22:08:01 2008 for libgutenprint API Reference by  doxygen 1.5.3
    diff --git a/doc/gutenprint/html/structstp__module__version__t.html b/doc/gutenprint/html/structstp__module__version__t.html index 1f22265..699447e 100644 --- a/doc/gutenprint/html/structstp__module__version__t.html +++ b/doc/gutenprint/html/structstp__module__version__t.html @@ -64,7 +64,7 @@

    The documentation for this struct was generated from the following file: -
    Generated on Tue Jan 1 21:37:39 2008 for libgutenprint API Reference by  +
    Generated on Sun Apr 27 22:08:01 2008 for libgutenprint API Reference by  doxygen 1.5.3
    diff --git a/doc/gutenprint/html/structstp__mxml__attr__t.html b/doc/gutenprint/html/structstp__mxml__attr__t.html index ebb0d06..b224ab1 100644 --- a/doc/gutenprint/html/structstp__mxml__attr__t.html +++ b/doc/gutenprint/html/structstp__mxml__attr__t.html @@ -64,7 +64,7 @@

    The documentation for this struct was generated from the following file: -
    Generated on Tue Jan 1 21:37:39 2008 for libgutenprint API Reference by  +
    Generated on Sun Apr 27 22:08:01 2008 for libgutenprint API Reference by  doxygen 1.5.3
    diff --git a/doc/gutenprint/html/structstp__mxml__element__t.html b/doc/gutenprint/html/structstp__mxml__element__t.html index 007edbe..ec0a2bb 100644 --- a/doc/gutenprint/html/structstp__mxml__element__t.html +++ b/doc/gutenprint/html/structstp__mxml__element__t.html @@ -81,7 +81,7 @@

    The documentation for this struct was generated from the following file: -
    Generated on Tue Jan 1 21:37:39 2008 for libgutenprint API Reference by  +
    Generated on Sun Apr 27 22:08:01 2008 for libgutenprint API Reference by  doxygen 1.5.3
    diff --git a/doc/gutenprint/html/structstp__mxml__node__s.html b/doc/gutenprint/html/structstp__mxml__node__s.html index 41a7074..2a4c044 100644 --- a/doc/gutenprint/html/structstp__mxml__node__s.html +++ b/doc/gutenprint/html/structstp__mxml__node__s.html @@ -149,7 +149,7 @@

    The documentation for this struct was generated from the following file: -
    Generated on Tue Jan 1 21:37:39 2008 for libgutenprint API Reference by  +
    Generated on Sun Apr 27 22:08:01 2008 for libgutenprint API Reference by  doxygen 1.5.3
    diff --git a/doc/gutenprint/html/structstp__mxml__text__t.html b/doc/gutenprint/html/structstp__mxml__text__t.html index 19b0aee..5383a74 100644 --- a/doc/gutenprint/html/structstp__mxml__text__t.html +++ b/doc/gutenprint/html/structstp__mxml__text__t.html @@ -64,7 +64,7 @@

    The documentation for this struct was generated from the following file: -
    Generated on Tue Jan 1 21:37:39 2008 for libgutenprint API Reference by  +
    Generated on Sun Apr 27 22:08:01 2008 for libgutenprint API Reference by  doxygen 1.5.3
    diff --git a/doc/gutenprint/html/structstp__papersize__t.html b/doc/gutenprint/html/structstp__papersize__t.html index f0b053b..0e06248 100644 --- a/doc/gutenprint/html/structstp__papersize__t.html +++ b/doc/gutenprint/html/structstp__papersize__t.html @@ -62,6 +62,9 @@ stp_papersize_unit_t paper_unit  Units of measurement.
    +stp_papersize_type_t paper_size_type + + Paper size type.

    Detailed Description

    The papersize data type. @@ -235,11 +238,28 @@ Right margin. Units of measurement.

    + +

    + +

    +
    + + + + +
    stp_papersize_type_t stp_papersize_t::paper_size_type
    +
    +
    + +

    +Paper size type. +

    +

    The documentation for this struct was generated from the following file: -
    Generated on Tue Jan 1 21:37:39 2008 for libgutenprint API Reference by  +
    Generated on Sun Apr 27 22:08:01 2008 for libgutenprint API Reference by  doxygen 1.5.3
    diff --git a/doc/gutenprint/html/structstp__param__string__t.html b/doc/gutenprint/html/structstp__param__string__t.html index fd47b17..6866a04 100644 --- a/doc/gutenprint/html/structstp__param__string__t.html +++ b/doc/gutenprint/html/structstp__param__string__t.html @@ -70,7 +70,7 @@ Human-readable (translated) text.

    The documentation for this struct was generated from the following file: -
    Generated on Tue Jan 1 21:37:39 2008 for libgutenprint API Reference by  +
    Generated on Sun Apr 27 22:08:01 2008 for libgutenprint API Reference by  doxygen 1.5.3
    diff --git a/doc/gutenprint/html/structstp__parameter__t.html b/doc/gutenprint/html/structstp__parameter__t.html index dd7553f..aed202f 100644 --- a/doc/gutenprint/html/structstp__parameter__t.html +++ b/doc/gutenprint/html/structstp__parameter__t.html @@ -502,7 +502,7 @@ Default value of the parameter.

    The documentation for this struct was generated from the following file: -
    Generated on Tue Jan 1 21:37:39 2008 for libgutenprint API Reference by  +
    Generated on Sun Apr 27 22:08:01 2008 for libgutenprint API Reference by  doxygen 1.5.3
    diff --git a/doc/gutenprint/html/structstp__pass__t.html b/doc/gutenprint/html/structstp__pass__t.html index baa7912..fab04eb 100644 --- a/doc/gutenprint/html/structstp__pass__t.html +++ b/doc/gutenprint/html/structstp__pass__t.html @@ -132,7 +132,7 @@

    The documentation for this struct was generated from the following file: -
    Generated on Tue Jan 1 21:37:39 2008 for libgutenprint API Reference by  +
    Generated on Sun Apr 27 22:08:01 2008 for libgutenprint API Reference by  doxygen 1.5.3
    diff --git a/doc/gutenprint/html/structstp__printfuncs__t.html b/doc/gutenprint/html/structstp__printfuncs__t.html index 72ff1b4..076be2e 100644 --- a/doc/gutenprint/html/structstp__printfuncs__t.html +++ b/doc/gutenprint/html/structstp__printfuncs__t.html @@ -254,7 +254,7 @@

    The documentation for this struct was generated from the following file: -
    Generated on Tue Jan 1 21:37:39 2008 for libgutenprint API Reference by  +
    Generated on Sun Apr 27 22:08:01 2008 for libgutenprint API Reference by  doxygen 1.5.3
    diff --git a/doc/gutenprint/html/structstp__raw__t.html b/doc/gutenprint/html/structstp__raw__t.html index ea2db71..b1913ec 100644 --- a/doc/gutenprint/html/structstp__raw__t.html +++ b/doc/gutenprint/html/structstp__raw__t.html @@ -73,7 +73,7 @@ Raw data.

    The documentation for this struct was generated from the following file: -
    Generated on Tue Jan 1 21:37:39 2008 for libgutenprint API Reference by  +
    Generated on Sun Apr 27 22:08:01 2008 for libgutenprint API Reference by  doxygen 1.5.3
    diff --git a/doc/gutenprint/html/structstp__shade__t.html b/doc/gutenprint/html/structstp__shade__t.html index 65ac4c1..5f0b641 100644 --- a/doc/gutenprint/html/structstp__shade__t.html +++ b/doc/gutenprint/html/structstp__shade__t.html @@ -81,7 +81,7 @@

    The documentation for this struct was generated from the following file: -
    Generated on Tue Jan 1 21:37:39 2008 for libgutenprint API Reference by  +
    Generated on Sun Apr 27 22:08:01 2008 for libgutenprint API Reference by  doxygen 1.5.3
    diff --git a/doc/gutenprint/html/structstp__weave__t.html b/doc/gutenprint/html/structstp__weave__t.html index 73f7966..439e1ef 100644 --- a/doc/gutenprint/html/structstp__weave__t.html +++ b/doc/gutenprint/html/structstp__weave__t.html @@ -149,7 +149,7 @@

    The documentation for this struct was generated from the following file: -
    Generated on Tue Jan 1 21:37:39 2008 for libgutenprint API Reference by  +
    Generated on Sun Apr 27 22:08:01 2008 for libgutenprint API Reference by  doxygen 1.5.3
    diff --git a/doc/gutenprint/html/unionstp__mxml__value__t.html b/doc/gutenprint/html/unionstp__mxml__value__t.html index b4d25d4..17db531 100644 --- a/doc/gutenprint/html/unionstp__mxml__value__t.html +++ b/doc/gutenprint/html/unionstp__mxml__value__t.html @@ -115,7 +115,7 @@

    The documentation for this union was generated from the following file: -
    Generated on Tue Jan 1 21:37:39 2008 for libgutenprint API Reference by  +
    Generated on Sun Apr 27 22:08:01 2008 for libgutenprint API Reference by  doxygen 1.5.3
    diff --git a/doc/gutenprint/html/util_8h.html b/doc/gutenprint/html/util_8h.html index 3d1cc52..44fe25c 100644 --- a/doc/gutenprint/html/util_8h.html +++ b/doc/gutenprint/html/util_8h.html @@ -57,7 +57,7 @@ #define STP_DBG_VARS   0x20000 -#define STP_DBG_OLYMPUS   0x40000 +#define STP_DBG_DYESUB   0x40000 #define STP_DBG_CURVE   0x80000 @@ -163,7 +163,7 @@ Utility functions.

    Define Documentation

    -

    Generated on Tue Jan 1 21:37:38 2008 for libgutenprint API Reference by  +
    Generated on Sun Apr 27 22:08:01 2008 for libgutenprint API Reference by  doxygen 1.5.3
    diff --git a/doc/gutenprint/html/vars_8h.html b/doc/gutenprint/html/vars_8h.html index 0ed7426..38b16ce 100644 --- a/doc/gutenprint/html/vars_8h.html +++ b/doc/gutenprint/html/vars_8h.html @@ -482,7 +482,7 @@ stp_compdata 

    Detailed Description

    -Print job functions.
    Generated on Tue Jan 1 21:37:38 2008 for libgutenprint API Reference by  +Print job functions.
    Generated on Sun Apr 27 22:08:01 2008 for libgutenprint API Reference by  doxygen 1.5.3
    diff --git a/doc/gutenprint/html/weave_8h.html b/doc/gutenprint/html/weave_8h.html index c9204f2..bdb0475 100644 --- a/doc/gutenprint/html/weave_8h.html +++ b/doc/gutenprint/html/weave_8h.html @@ -650,7 +650,7 @@ Softweave functions.

    Define Documentation

    -

    Generated on Tue Jan 1 21:37:38 2008 for libgutenprint API Reference by  +
    Generated on Sun Apr 27 22:08:01 2008 for libgutenprint API Reference by  doxygen 1.5.3
    diff --git a/doc/gutenprint/html/xml_8h.html b/doc/gutenprint/html/xml_8h.html index 7cca6b4..3077302 100644 --- a/doc/gutenprint/html/xml_8h.html +++ b/doc/gutenprint/html/xml_8h.html @@ -520,7 +520,7 @@ XML tree functions.

    Typedef Documentation

    -

    Generated on Tue Jan 1 21:37:39 2008 for libgutenprint API Reference by  +
    Generated on Sun Apr 27 22:08:01 2008 for libgutenprint API Reference by  doxygen 1.5.3
    diff --git a/doc/gutenprintui2/gutenprintui2.tag b/doc/gutenprintui2/gutenprintui2.tag index cf0dd53..b8ab324 100644 --- a/doc/gutenprintui2/gutenprintui2.tag +++ b/doc/gutenprintui2/gutenprintui2.tag @@ -2,7 +2,7 @@ curve.h - /home/rlk/sandbox/print-5.0/include/gutenprintui2/ + /home/rlk/sandbox/print-5.1/include/gutenprintui2/ curve_8h _StpuiCurve _StpuiCurveClass @@ -141,7 +141,7 @@ gammacurve.h - /home/rlk/sandbox/print-5.0/include/gutenprintui2/ + /home/rlk/sandbox/print-5.1/include/gutenprintui2/ gammacurve_8h _StpuiGammaCurve _StpuiGammaCurveClass @@ -218,7 +218,7 @@ gutenprintui.h - /home/rlk/sandbox/print-5.0/include/gutenprintui2/ + /home/rlk/sandbox/print-5.1/include/gutenprintui2/ gutenprintui_8h gutenprintui2/curve.h gutenprintui2/gammacurve.h @@ -649,7 +649,7 @@ typebuiltins.h - /home/rlk/sandbox/print-5.0/include/gutenprintui2/ + /home/rlk/sandbox/print-5.1/include/gutenprintui2/ typebuiltins_8h #define diff --git a/doc/gutenprintui2/html/annotated.html b/doc/gutenprintui2/html/annotated.html index 8c7c5b2..e8f3737 100644 --- a/doc/gutenprintui2/html/annotated.html +++ b/doc/gutenprintui2/html/annotated.html @@ -27,7 +27,7 @@ stpui_image_t stpui_plist_t -
    Generated on Tue Jan 1 21:37:39 2008 for libgutenprintui2 API Reference by  +
    Generated on Sun Apr 27 22:08:01 2008 for libgutenprintui2 API Reference by  doxygen 1.5.3
    diff --git a/doc/gutenprintui2/html/classes.html b/doc/gutenprintui2/html/classes.html index 3c70db9..1800e7b 100644 --- a/doc/gutenprintui2/html/classes.html +++ b/doc/gutenprintui2/html/classes.html @@ -24,7 +24,7 @@
      S  
    stpui_plist_t   _StpuiCurve   _StpuiGammaCurve   _StpuiGammaCurveClass   stpui_image_t   
      _  
    _StpuiCurveClass   

    S | _

    -

    Generated on Tue Jan 1 21:37:39 2008 for libgutenprintui2 API Reference by  +
    Generated on Sun Apr 27 22:08:01 2008 for libgutenprintui2 API Reference by  doxygen 1.5.3
    diff --git a/doc/gutenprintui2/html/curve_8h.html b/doc/gutenprintui2/html/curve_8h.html index 6ae06e1..a698160 100644 --- a/doc/gutenprintui2/html/curve_8h.html +++ b/doc/gutenprintui2/html/curve_8h.html @@ -474,7 +474,7 @@

    -

    Generated on Tue Jan 1 21:37:39 2008 for libgutenprintui2 API Reference by  +
    Generated on Sun Apr 27 22:08:01 2008 for libgutenprintui2 API Reference by  doxygen 1.5.3
    diff --git a/doc/gutenprintui2/html/files.html b/doc/gutenprintui2/html/files.html index 72e7ebe..56ad89a 100644 --- a/doc/gutenprintui2/html/files.html +++ b/doc/gutenprintui2/html/files.html @@ -24,7 +24,7 @@ include/gutenprintui2/gutenprintui.h include/gutenprintui2/typebuiltins.h -
    Generated on Tue Jan 1 21:37:39 2008 for libgutenprintui2 API Reference by  +
    Generated on Sun Apr 27 22:08:01 2008 for libgutenprintui2 API Reference by  doxygen 1.5.3
    diff --git a/doc/gutenprintui2/html/functions.html b/doc/gutenprintui2/html/functions.html index 76a00d3..978d121 100644 --- a/doc/gutenprintui2/html/functions.html +++ b/doc/gutenprintui2/html/functions.html @@ -193,7 +193,7 @@ Here is a list of all struct and union fields with links to the structures/union
  • vflip : stpui_image_t -
    Generated on Tue Jan 1 21:37:39 2008 for libgutenprintui2 API Reference by  +
    Generated on Sun Apr 27 22:08:01 2008 for libgutenprintui2 API Reference by  doxygen 1.5.3
    diff --git a/doc/gutenprintui2/html/functions_vars.html b/doc/gutenprintui2/html/functions_vars.html index 1fd1c73..718aa35 100644 --- a/doc/gutenprintui2/html/functions_vars.html +++ b/doc/gutenprintui2/html/functions_vars.html @@ -193,7 +193,7 @@
  • vflip : stpui_image_t -
    Generated on Tue Jan 1 21:37:39 2008 for libgutenprintui2 API Reference by  +
    Generated on Sun Apr 27 22:08:01 2008 for libgutenprintui2 API Reference by  doxygen 1.5.3
    diff --git a/doc/gutenprintui2/html/gammacurve_8h.html b/doc/gutenprintui2/html/gammacurve_8h.html index b64990c..f7049a2 100644 --- a/doc/gutenprintui2/html/gammacurve_8h.html +++ b/doc/gutenprintui2/html/gammacurve_8h.html @@ -235,7 +235,7 @@

    -

    Generated on Tue Jan 1 21:37:39 2008 for libgutenprintui2 API Reference by  +
    Generated on Sun Apr 27 22:08:01 2008 for libgutenprintui2 API Reference by  doxygen 1.5.3
    diff --git a/doc/gutenprintui2/html/globals.html b/doc/gutenprintui2/html/globals.html index 6efd89e..94ecad6 100644 --- a/doc/gutenprintui2/html/globals.html +++ b/doc/gutenprintui2/html/globals.html @@ -246,7 +246,7 @@ Here is a list of all functions, variables, defines, enums, and typedefs with li
  • StpuiGammaCurveClass : gammacurve.h -
    Generated on Tue Jan 1 21:37:39 2008 for libgutenprintui2 API Reference by  +
    Generated on Sun Apr 27 22:08:01 2008 for libgutenprintui2 API Reference by  doxygen 1.5.3
    diff --git a/doc/gutenprintui2/html/globals_defs.html b/doc/gutenprintui2/html/globals_defs.html index b76e10a..1220351 100644 --- a/doc/gutenprintui2/html/globals_defs.html +++ b/doc/gutenprintui2/html/globals_defs.html @@ -62,7 +62,7 @@
  • STPUI_TYPE_ORIENT_T : typebuiltins.h -
    Generated on Tue Jan 1 21:37:39 2008 for libgutenprintui2 API Reference by  +
    Generated on Sun Apr 27 22:08:01 2008 for libgutenprintui2 API Reference by  doxygen 1.5.3
    diff --git a/doc/gutenprintui2/html/globals_enum.html b/doc/gutenprintui2/html/globals_enum.html index 7bff3dd..08b83db 100644 --- a/doc/gutenprintui2/html/globals_enum.html +++ b/doc/gutenprintui2/html/globals_enum.html @@ -38,7 +38,7 @@
  • StpuiCurveType : curve.h -
    Generated on Tue Jan 1 21:37:39 2008 for libgutenprintui2 API Reference by  +
    Generated on Sun Apr 27 22:08:01 2008 for libgutenprintui2 API Reference by  doxygen 1.5.3
    diff --git a/doc/gutenprintui2/html/globals_eval.html b/doc/gutenprintui2/html/globals_eval.html index 8ab9bad..2b9f667 100644 --- a/doc/gutenprintui2/html/globals_eval.html +++ b/doc/gutenprintui2/html/globals_eval.html @@ -54,7 +54,7 @@
  • STPUI_CURVE_TYPE_SPLINE : curve.h -
    Generated on Tue Jan 1 21:37:39 2008 for libgutenprintui2 API Reference by  +
    Generated on Sun Apr 27 22:08:01 2008 for libgutenprintui2 API Reference by  doxygen 1.5.3
    diff --git a/doc/gutenprintui2/html/globals_func.html b/doc/gutenprintui2/html/globals_func.html index 0f894aa..a8fcf62 100644 --- a/doc/gutenprintui2/html/globals_func.html +++ b/doc/gutenprintui2/html/globals_func.html @@ -175,7 +175,7 @@
  • stpui_set_thumbnail_func() : gutenprintui.h -
    Generated on Tue Jan 1 21:37:39 2008 for libgutenprintui2 API Reference by  +
    Generated on Sun Apr 27 22:08:01 2008 for libgutenprintui2 API Reference by  doxygen 1.5.3
    diff --git a/doc/gutenprintui2/html/globals_type.html b/doc/gutenprintui2/html/globals_type.html index e5d96a3..752d98a 100644 --- a/doc/gutenprintui2/html/globals_type.html +++ b/doc/gutenprintui2/html/globals_type.html @@ -42,7 +42,7 @@
  • StpuiGammaCurveClass : gammacurve.h -
    Generated on Tue Jan 1 21:37:39 2008 for libgutenprintui2 API Reference by  +
    Generated on Sun Apr 27 22:08:01 2008 for libgutenprintui2 API Reference by  doxygen 1.5.3
    diff --git a/doc/gutenprintui2/html/gutenprintui_8h.html b/doc/gutenprintui2/html/gutenprintui_8h.html index 2a6d3ad..3467383 100644 --- a/doc/gutenprintui2/html/gutenprintui_8h.html +++ b/doc/gutenprintui2/html/gutenprintui_8h.html @@ -1486,7 +1486,7 @@

    -

    Generated on Tue Jan 1 21:37:39 2008 for libgutenprintui2 API Reference by  +
    Generated on Sun Apr 27 22:08:01 2008 for libgutenprintui2 API Reference by  doxygen 1.5.3
    diff --git a/doc/gutenprintui2/html/index.html b/doc/gutenprintui2/html/index.html index f8a1d03..9597dff 100644 --- a/doc/gutenprintui2/html/index.html +++ b/doc/gutenprintui2/html/index.html @@ -14,7 +14,7 @@

    libgutenprintui2 API Reference Documentation

    -

    5.0.2

    Generated on Tue Jan 1 21:37:39 2008 for libgutenprintui2 API Reference by  +

    5.1.98.2

    Generated on Sun Apr 27 22:08:01 2008 for libgutenprintui2 API Reference by  doxygen 1.5.3
    diff --git a/doc/gutenprintui2/html/struct__StpuiCurve.html b/doc/gutenprintui2/html/struct__StpuiCurve.html index be8aa89..c239ece 100644 --- a/doc/gutenprintui2/html/struct__StpuiCurve.html +++ b/doc/gutenprintui2/html/struct__StpuiCurve.html @@ -283,7 +283,7 @@

    The documentation for this struct was generated from the following file: -
    Generated on Tue Jan 1 21:37:39 2008 for libgutenprintui2 API Reference by  +
    Generated on Sun Apr 27 22:08:01 2008 for libgutenprintui2 API Reference by  doxygen 1.5.3
    diff --git a/doc/gutenprintui2/html/struct__StpuiCurveClass.html b/doc/gutenprintui2/html/struct__StpuiCurveClass.html index 7eb8a37..2a4677c 100644 --- a/doc/gutenprintui2/html/struct__StpuiCurveClass.html +++ b/doc/gutenprintui2/html/struct__StpuiCurveClass.html @@ -130,7 +130,7 @@

    The documentation for this struct was generated from the following file: -
    Generated on Tue Jan 1 21:37:39 2008 for libgutenprintui2 API Reference by  +
    Generated on Sun Apr 27 22:08:01 2008 for libgutenprintui2 API Reference by  doxygen 1.5.3
    diff --git a/doc/gutenprintui2/html/struct__StpuiGammaCurve.html b/doc/gutenprintui2/html/struct__StpuiGammaCurve.html index 94388b6..4b2e73e 100644 --- a/doc/gutenprintui2/html/struct__StpuiGammaCurve.html +++ b/doc/gutenprintui2/html/struct__StpuiGammaCurve.html @@ -147,7 +147,7 @@

    The documentation for this struct was generated from the following file: -
    Generated on Tue Jan 1 21:37:39 2008 for libgutenprintui2 API Reference by  +
    Generated on Sun Apr 27 22:08:01 2008 for libgutenprintui2 API Reference by  doxygen 1.5.3
    diff --git a/doc/gutenprintui2/html/struct__StpuiGammaCurveClass.html b/doc/gutenprintui2/html/struct__StpuiGammaCurveClass.html index 6fcc84d..9f53ba9 100644 --- a/doc/gutenprintui2/html/struct__StpuiGammaCurveClass.html +++ b/doc/gutenprintui2/html/struct__StpuiGammaCurveClass.html @@ -113,7 +113,7 @@

    The documentation for this struct was generated from the following file: -
    Generated on Tue Jan 1 21:37:39 2008 for libgutenprintui2 API Reference by  +
    Generated on Sun Apr 27 22:08:01 2008 for libgutenprintui2 API Reference by  doxygen 1.5.3
    diff --git a/doc/gutenprintui2/html/structstpui__image__t.html b/doc/gutenprintui2/html/structstpui__image__t.html index ea6c7c1..d2b1878 100644 --- a/doc/gutenprintui2/html/structstpui__image__t.html +++ b/doc/gutenprintui2/html/structstpui__image__t.html @@ -164,7 +164,7 @@

    The documentation for this struct was generated from the following file: -
    Generated on Tue Jan 1 21:37:39 2008 for libgutenprintui2 API Reference by  +
    Generated on Sun Apr 27 22:08:01 2008 for libgutenprintui2 API Reference by  doxygen 1.5.3
    diff --git a/doc/gutenprintui2/html/structstpui__plist__t.html b/doc/gutenprintui2/html/structstpui__plist__t.html index 1c465dd..73ec899 100644 --- a/doc/gutenprintui2/html/structstpui__plist__t.html +++ b/doc/gutenprintui2/html/structstpui__plist__t.html @@ -249,7 +249,7 @@

    The documentation for this struct was generated from the following file: -
    Generated on Tue Jan 1 21:37:39 2008 for libgutenprintui2 API Reference by  +
    Generated on Sun Apr 27 22:08:01 2008 for libgutenprintui2 API Reference by  doxygen 1.5.3
    diff --git a/doc/gutenprintui2/html/typebuiltins_8h.html b/doc/gutenprintui2/html/typebuiltins_8h.html index 1a46a02..50570f9 100644 --- a/doc/gutenprintui2/html/typebuiltins_8h.html +++ b/doc/gutenprintui2/html/typebuiltins_8h.html @@ -137,7 +137,7 @@

    -

    Generated on Tue Jan 1 21:37:39 2008 for libgutenprintui2 API Reference by  +
    Generated on Sun Apr 27 22:08:01 2008 for libgutenprintui2 API Reference by  doxygen 1.5.3
    diff --git a/include/Makefile.am b/include/Makefile.am index 732394a..77e03c9 100644 --- a/include/Makefile.am +++ b/include/Makefile.am @@ -1,4 +1,4 @@ -## $Id: Makefile.am,v 1.7 2005/11/21 11:16:22 rleigh Exp $ +## $Id: Makefile.am,v 1.8 2006/09/22 13:29:50 faust3 Exp $ ## Copyright (C) 2000,2004 Roger Leigh ## ## This program is free software; you can redistribute it and/or modify @@ -19,7 +19,7 @@ @SET_MAKE@ -SUBDIRS = gutenprint gutenprintui gutenprintui2 +SUBDIRS = gutenprint gutenprintui2 include $(top_srcdir)/scripts/global.mk diff --git a/include/Makefile.in b/include/Makefile.in index fe19904..24e5758 100644 --- a/include/Makefile.in +++ b/include/Makefile.in @@ -41,13 +41,12 @@ DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \ subdir = include 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/isc-posix.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 + $(top_srcdir)/m4/iconv.m4 $(top_srcdir)/m4/isc-posix.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 @@ -116,27 +115,13 @@ 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@ GREP = @GREP@ 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@ @@ -144,13 +129,6 @@ 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@ @@ -255,16 +233,12 @@ docdir = @docdir@ dvidir = @dvidir@ 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@ @@ -292,8 +266,9 @@ sysconfdir = @sysconfdir@ target_alias = @target_alias@ top_builddir = @top_builddir@ top_srcdir = @top_srcdir@ -SUBDIRS = gutenprint gutenprintui gutenprintui2 +SUBDIRS = gutenprint gutenprintui2 AM_CPPFLAGS = -I$(top_srcdir)/include -I$(top_builddir)/include $(LOCAL_CPPFLAGS) $(GNUCFLAGS) +GUTENPRINTUI_LIBS = $(top_builddir)/src/gutenprintui/libgutenprintui.la MAINTAINERCLEANFILES = Makefile.in all: all-recursive diff --git a/include/gutenprint/Makefile.am b/include/gutenprint/Makefile.am index 28bc158..bb0024c 100644 --- a/include/gutenprint/Makefile.am +++ b/include/gutenprint/Makefile.am @@ -1,4 +1,4 @@ -## $Id: Makefile.am,v 1.2 2005/11/21 11:16:22 rleigh Exp $ +## $Id: Makefile.am,v 1.3 2006/09/18 01:48:58 rlk Exp $ ## Copyright (C) 2000 Roger Leigh ## ## This program is free software; you can redistribute it and/or modify diff --git a/include/gutenprint/Makefile.in b/include/gutenprint/Makefile.in index d2a08b8..eb13929 100644 --- a/include/gutenprint/Makefile.in +++ b/include/gutenprint/Makefile.in @@ -44,13 +44,12 @@ DIST_COMMON = $(noinst_HEADERS) $(pkginclude_HEADERS) \ subdir = include/gutenprint 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/isc-posix.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 + $(top_srcdir)/m4/iconv.m4 $(top_srcdir)/m4/isc-posix.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 @@ -121,27 +120,13 @@ 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@ GREP = @GREP@ 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@ @@ -149,13 +134,6 @@ 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@ @@ -260,16 +238,12 @@ docdir = @docdir@ dvidir = @dvidir@ 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@ @@ -298,6 +272,7 @@ target_alias = @target_alias@ top_builddir = @top_builddir@ top_srcdir = @top_srcdir@ AM_CPPFLAGS = -I$(top_srcdir)/include -I$(top_builddir)/include $(LOCAL_CPPFLAGS) $(GNUCFLAGS) +GUTENPRINTUI_LIBS = $(top_builddir)/src/gutenprintui/libgutenprintui.la noinst_HEADERS = gutenprint-intl.h gutenprint-intl-internal.h pkginclude_HEADERS = \ gutenprint.h \ diff --git a/include/gutenprint/bit-ops.h b/include/gutenprint/bit-ops.h index d779b74..b1a67e1 100644 --- a/include/gutenprint/bit-ops.h +++ b/include/gutenprint/bit-ops.h @@ -1,5 +1,5 @@ /* - * "$Id: bit-ops.h,v 1.2.14.1 2007/05/12 19:14:27 faust3 Exp $" + * "$Id: bit-ops.h,v 1.3 2007/03/08 13:34:27 faust3 Exp $" * * Softweave calculator for gimp-print. * diff --git a/include/gutenprint/curve.h b/include/gutenprint/curve.h index fbdeab3..d763aa1 100644 --- a/include/gutenprint/curve.h +++ b/include/gutenprint/curve.h @@ -1,5 +1,5 @@ /* - * "$Id: curve.h,v 1.1 2004/09/17 18:38:01 rleigh Exp $" + * "$Id: curve.h,v 1.2 2008/01/21 23:19:37 rlk Exp $" * * libgimpprint curve functions. * @@ -126,7 +126,7 @@ typedef struct extern stp_curve_t *stp_curve_create(stp_curve_wrap_mode_t wrap); /** - * Copy and allocate an curve. + * Copy and allocate a curve. * dest will be created, and then the contents of source will be * copied into it. dest must not have been previously allocated * with stp_curve_create(). @@ -136,7 +136,7 @@ extern stp_curve_t *stp_curve_create(stp_curve_wrap_mode_t wrap); extern stp_curve_t *stp_curve_create_copy(const stp_curve_t *curve); /** - * Copy an curve. + * Copy a curve. * Both dest and source must be valid curves previously created with * stp_curve_create(). * @param dest the destination curve. @@ -144,6 +144,25 @@ extern stp_curve_t *stp_curve_create_copy(const stp_curve_t *curve); */ extern void stp_curve_copy(stp_curve_t *dest, const stp_curve_t *source); + /** + * Reverse and allocate a curve. + * dest will be created, and then the contents of source will be + * copied into it. dest must not have been previously allocated + * with stp_curve_create(). + * @param curve the source curve. + * @returns the new copy of the curve. + */ +extern stp_curve_t *stp_curve_create_reverse(const stp_curve_t *curve); + + /** + * Reverse a curve. + * Both dest and source must be valid curves previously created with + * stp_curve_create(). + * @param dest the destination curve. + * @param source the source curve. + */ +extern void stp_curve_reverse(stp_curve_t *dest, const stp_curve_t *source); + /** * Destroy an curve. * It is an error to destroy the curve more than once. @@ -682,5 +701,5 @@ extern int stp_curve_compose(stp_curve_t **retval, #endif /* GUTENPRINT_CURVE_H */ /* - * End of "$Id: curve.h,v 1.1 2004/09/17 18:38:01 rleigh Exp $". + * End of "$Id: curve.h,v 1.2 2008/01/21 23:19:37 rlk Exp $". */ diff --git a/include/gutenprint/paper.h b/include/gutenprint/paper.h index 876e1f8..e9c14ed 100644 --- a/include/gutenprint/paper.h +++ b/include/gutenprint/paper.h @@ -1,5 +1,5 @@ /* - * "$Id: paper.h,v 1.1 2004/09/17 18:38:01 rleigh Exp $" + * "$Id: paper.h,v 1.2 2008/01/15 03:48:45 rlk Exp $" * * libgimpprint paper functions. * @@ -59,6 +59,14 @@ typedef enum PAPERSIZE_METRIC_EXTENDED } stp_papersize_unit_t; +typedef enum +{ + /** Standard paper size */ + PAPERSIZE_TYPE_STANDARD = 0, + /** Envelope */ + PAPERSIZE_TYPE_ENVELOPE +} stp_papersize_type_t; + /** The papersize data type. */ typedef struct { @@ -82,6 +90,8 @@ typedef struct unsigned right; /** Units of measurement. */ stp_papersize_unit_t paper_unit; + /** Paper size type. */ + stp_papersize_type_t paper_size_type; } stp_papersize_t; /** @@ -129,5 +139,5 @@ extern void stp_default_media_size(const stp_vars_t *v, #endif /* GUTENPRINT_PAPER_H */ /* - * End of "$Id: paper.h,v 1.1 2004/09/17 18:38:01 rleigh Exp $". + * End of "$Id: paper.h,v 1.2 2008/01/15 03:48:45 rlk Exp $". */ diff --git a/include/gutenprint/printers.h b/include/gutenprint/printers.h index 97aae75..6b99642 100644 --- a/include/gutenprint/printers.h +++ b/include/gutenprint/printers.h @@ -1,5 +1,5 @@ /* - * "$Id: printers.h,v 1.3.8.1 2007/12/15 20:35:35 rlk Exp $" + * "$Id: printers.h,v 1.4 2007/08/27 00:44:12 rlk Exp $" * * libgimpprint printer functions. * @@ -247,5 +247,5 @@ const char *stp_describe_output(const stp_vars_t *v); #endif /* GUTENPRINT_PRINTERS_H */ /* - * End of "$Id: printers.h,v 1.3.8.1 2007/12/15 20:35:35 rlk Exp $". + * End of "$Id: printers.h,v 1.4 2007/08/27 00:44:12 rlk Exp $". */ diff --git a/include/gutenprint/sequence.h b/include/gutenprint/sequence.h index 02789df..0f8669d 100644 --- a/include/gutenprint/sequence.h +++ b/include/gutenprint/sequence.h @@ -1,5 +1,5 @@ /* - * "$Id: sequence.h,v 1.1 2004/09/17 18:38:01 rleigh Exp $" + * "$Id: sequence.h,v 1.2 2008/01/21 23:19:38 rlk Exp $" * * libgimpprint sequence functions. * @@ -63,7 +63,7 @@ extern stp_sequence_t *stp_sequence_create(void); extern void stp_sequence_destroy(stp_sequence_t *sequence); /** - * Copy an sequence. + * Copy a sequence. * Both dest and source must be valid sequences previously created * with stp_sequence_create(). * @param dest the destination sequence. @@ -73,7 +73,7 @@ extern void stp_sequence_copy(stp_sequence_t *dest, const stp_sequence_t *source); /** - * Copy and allocate an sequence. + * Copy and allocate a sequence. * A new sequence will be created, and then the contents of source will * be copied into it. The destination must not have been previously * allocated with stp_sequence_create(). @@ -82,6 +82,26 @@ extern void stp_sequence_copy(stp_sequence_t *dest, */ extern stp_sequence_t *stp_sequence_create_copy(const stp_sequence_t *sequence); + /** + * Reverse a sequence. + * Both dest and source must be valid sequences previously created + * with stp_sequence_create(). + * @param dest the destination sequence. + * @param source the source sequence. + */ +extern void stp_sequence_reverse(stp_sequence_t *dest, + const stp_sequence_t *source); + + /** + * Reverse and allocate a sequence. + * A new sequence will be created, and then the contents of source will + * be copied into it. The destination must not have been previously + * allocated with stp_sequence_create(). + * @param sequence the source sequence. + * @returns the new copy of the sequence. + */ +extern stp_sequence_t *stp_sequence_create_reverse(const stp_sequence_t *sequence); + /** * Set the lower and upper bounds. * The lower and upper bounds set the minimum and maximum values diff --git a/include/gutenprint/util.h b/include/gutenprint/util.h index a3089bb..1174d59 100644 --- a/include/gutenprint/util.h +++ b/include/gutenprint/util.h @@ -1,5 +1,5 @@ /* - * "$Id: util.h,v 1.3.2.2 2007/12/15 20:35:35 rlk Exp $" + * "$Id: util.h,v 1.6 2007/09/09 21:13:55 rlk Exp $" * * libgimpprint utility and miscellaneous functions. * @@ -125,7 +125,7 @@ extern void stp_catprintf(char **strp, const char *format, ...) #define STP_DBG_PRINTERS 0x8000 #define STP_DBG_XML 0x10000 #define STP_DBG_VARS 0x20000 -#define STP_DBG_OLYMPUS 0x40000 +#define STP_DBG_DYESUB 0x40000 #define STP_DBG_CURVE 0x80000 #define STP_DBG_CURVE_ERRORS 0x100000 #define STP_DBG_PPD 0x200000 @@ -179,5 +179,5 @@ extern const char *stp_get_release_version(void); #endif /* GUTENPRINT_UTIL_H */ /* - * End of "$Id: util.h,v 1.3.2.2 2007/12/15 20:35:35 rlk Exp $". + * End of "$Id: util.h,v 1.6 2007/09/09 21:13:55 rlk Exp $". */ diff --git a/include/gutenprint/vars.h b/include/gutenprint/vars.h index de6eb25..774876a 100644 --- a/include/gutenprint/vars.h +++ b/include/gutenprint/vars.h @@ -1383,5 +1383,5 @@ stp_fill_parameter_settings(stp_parameter_t *desc, #endif /* GUTENPRINT_VARS_H */ /* - * End of "$Id: vars.h,v 1.3.8.1 2007/03/02 12:01:14 rlk Exp $". + * End of "$Id: vars.h,v 1.4 2007/01/23 01:18:16 rlk Exp $". */ diff --git a/include/gutenprintui/Makefile.am b/include/gutenprintui/Makefile.am deleted file mode 100644 index b112e84..0000000 --- a/include/gutenprintui/Makefile.am +++ /dev/null @@ -1,37 +0,0 @@ -## $Id: Makefile.am,v 1.3 2005/11/21 11:16:22 rleigh Exp $ -## Copyright (C) 2000 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 - - -pkgincludedir = $(includedir)/gutenprintui - - -## Data - -if BUILD_LIBGUTENPRINTUI -pkginclude_HEADERS = \ - gutenprintui.h -endif - -## Clean - -MAINTAINERCLEANFILES = Makefile.in diff --git a/include/gutenprintui/Makefile.in b/include/gutenprintui/Makefile.in deleted file mode 100644 index ed28bd4..0000000 --- a/include/gutenprintui/Makefile.in +++ /dev/null @@ -1,550 +0,0 @@ -# Makefile.in generated by automake 1.10 from Makefile.am. -# @configure_input@ - -# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006 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 - -VPATH = @srcdir@ -pkgdatadir = $(datadir)/@PACKAGE@ -pkglibdir = $(libdir)/@PACKAGE@ -am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd -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 = $(am__pkginclude_HEADERS_DIST) $(srcdir)/Makefile.am \ - $(srcdir)/Makefile.in $(top_srcdir)/scripts/global.mk -subdir = include/gutenprintui -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/isc-posix.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 = -SOURCES = -DIST_SOURCES = -am__pkginclude_HEADERS_DIST = gutenprintui.h -am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; -am__vpath_adj = case $$p in \ - $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \ - *) f=$$p;; \ - esac; -am__strip_dir = `echo $$p | sed -e 's|^.*/||'`; -am__installdirs = "$(DESTDIR)$(pkgincludedir)" -pkgincludeHEADERS_INSTALL = $(INSTALL_HEADER) -HEADERS = $(pkginclude_HEADERS) -ETAGS = etags -CTAGS = ctags -DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) -pkgincludedir = $(includedir)/gutenprintui -ACLOCAL = @ACLOCAL@ -ALL_LINGUAS = @ALL_LINGUAS@ -AMTAR = @AMTAR@ -AR = @AR@ -AUTOCONF = @AUTOCONF@ -AUTOHEADER = @AUTOHEADER@ -AUTOMAKE = @AUTOMAKE@ -AWK = @AWK@ -BUILD_CUPS_PPDS = @BUILD_CUPS_PPDS@ -CC = @CC@ -CCDEPMODE = @CCDEPMODE@ -CFLAGS = @CFLAGS@ -CONVERT = @CONVERT@ -CPP = @CPP@ -CPPFLAGS = @CPPFLAGS@ -CUPS_CFLAGS = @CUPS_CFLAGS@ -CUPS_CONFIG = @CUPS_CONFIG@ -CUPS_LIBS = @CUPS_LIBS@ -CUPS_PPD_PS_LEVEL = @CUPS_PPD_PS_LEVEL@ -CXX = @CXX@ -CXXCPP = @CXXCPP@ -CXXDEPMODE = @CXXDEPMODE@ -CXXFLAGS = @CXXFLAGS@ -CYGPATH_W = @CYGPATH_W@ -DB2HTML = @DB2HTML@ -DB2PDF = @DB2PDF@ -DB2PS = @DB2PS@ -DEFS = @DEFS@ -DEPDIR = @DEPDIR@ -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@ -GREP = @GREP@ -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 = @INSTALL@ -INSTALL_DATA = @INSTALL_DATA@ -INSTALL_PROGRAM = @INSTALL_PROGRAM@ -INSTALL_SCRIPT = @INSTALL_SCRIPT@ -INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ -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@ -MAKEINFO = @MAKEINFO@ -MKDIR_P = @MKDIR_P@ -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@ -SED = @SED@ -SET_MAKE = @SET_MAKE@ -SHELL = @SHELL@ -STRIP = @STRIP@ -TEST = @TEST@ -TEXI2HTML = @TEXI2HTML@ -TRUE = @TRUE@ -USE_NLS = @USE_NLS@ -VERSION = @VERSION@ -WHICH_PPDS = @WHICH_PPDS@ -XGETTEXT = @XGETTEXT@ -YACC = @YACC@ -YFLAGS = @YFLAGS@ -abs_builddir = @abs_builddir@ -abs_srcdir = @abs_srcdir@ -abs_top_builddir = @abs_top_builddir@ -abs_top_srcdir = @abs_top_srcdir@ -ac_ct_CC = @ac_ct_CC@ -ac_ct_CXX = @ac_ct_CXX@ -ac_ct_F77 = @ac_ct_F77@ -am__include = @am__include@ -am__leading_dot = @am__leading_dot@ -am__quote = @am__quote@ -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@ -builddir = @builddir@ -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@ -datarootdir = @datarootdir@ -docdir = @docdir@ -dvidir = @dvidir@ -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@ -htmldir = @htmldir@ -includedir = @includedir@ -infodir = @infodir@ -install_sh = @install_sh@ -libdir = @libdir@ -libexecdir = @libexecdir@ -localedir = @localedir@ -localstatedir = @localstatedir@ -mandir = @mandir@ -mkdir_p = @mkdir_p@ -oldincludedir = @oldincludedir@ -pdfdir = @pdfdir@ -prefix = @prefix@ -program_transform_name = @program_transform_name@ -psdir = @psdir@ -sbindir = @sbindir@ -sharedstatedir = @sharedstatedir@ -srcdir = @srcdir@ -sysconfdir = @sysconfdir@ -target_alias = @target_alias@ -top_builddir = @top_builddir@ -top_srcdir = @top_srcdir@ -AM_CPPFLAGS = -I$(top_srcdir)/include -I$(top_builddir)/include $(LOCAL_CPPFLAGS) $(GNUCFLAGS) -@BUILD_LIBGUTENPRINTUI_TRUE@pkginclude_HEADERS = \ -@BUILD_LIBGUTENPRINTUI_TRUE@ gutenprintui.h - -MAINTAINERCLEANFILES = Makefile.in -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 include/gutenprintui/Makefile'; \ - cd $(top_srcdir) && \ - $(AUTOMAKE) --gnu include/gutenprintui/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 -install-pkgincludeHEADERS: $(pkginclude_HEADERS) - @$(NORMAL_INSTALL) - test -z "$(pkgincludedir)" || $(MKDIR_P) "$(DESTDIR)$(pkgincludedir)" - @list='$(pkginclude_HEADERS)'; for p in $$list; do \ - if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ - f=$(am__strip_dir) \ - echo " $(pkgincludeHEADERS_INSTALL) '$$d$$p' '$(DESTDIR)$(pkgincludedir)/$$f'"; \ - $(pkgincludeHEADERS_INSTALL) "$$d$$p" "$(DESTDIR)$(pkgincludedir)/$$f"; \ - done - -uninstall-pkgincludeHEADERS: - @$(NORMAL_UNINSTALL) - @list='$(pkginclude_HEADERS)'; for p in $$list; do \ - f=$(am__strip_dir) \ - echo " rm -f '$(DESTDIR)$(pkgincludedir)/$$f'"; \ - rm -f "$(DESTDIR)$(pkgincludedir)/$$f"; \ - done - -ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ - mkid -fID $$unique -tags: TAGS - -TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $(TAGS_FILES) $(LISP) - tags=; \ - here=`pwd`; \ - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ - if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \ - test -n "$$unique" || unique=$$empty_fix; \ - $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ - $$tags $$unique; \ - fi -ctags: CTAGS -CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $(TAGS_FILES) $(LISP) - tags=; \ - here=`pwd`; \ - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ - test -z "$(CTAGS_ARGS)$$tags$$unique" \ - || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ - $$tags $$unique - -GTAGS: - here=`$(am__cd) $(top_builddir) && pwd` \ - && cd $(top_srcdir) \ - && gtags -i $(GTAGS_ARGS) $$here - -distclean-tags: - -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags - -distdir: $(DISTFILES) - @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ - topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ - list='$(DISTFILES)'; \ - dist_files=`for file in $$list; do echo $$file; done | \ - sed -e "s|^$$srcdirstrip/||;t" \ - -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \ - case $$dist_files in \ - */*) $(MKDIR_P) `echo "$$dist_files" | \ - sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \ - sort -u` ;; \ - esac; \ - for file in $$dist_files; do \ - if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \ - if test -d $$d/$$file; then \ - dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \ - 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 -check-am: all-am -check: check-am -all-am: Makefile $(HEADERS) -installdirs: - for dir in "$(DESTDIR)$(pkgincludedir)"; do \ - test -z "$$dir" || $(MKDIR_P) "$$dir"; \ - done -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 mostlyclean-am - -distclean: distclean-am - -rm -f Makefile -distclean-am: clean-am distclean-generic distclean-tags - -dvi: dvi-am - -dvi-am: - -html: html-am - -info: info-am - -info-am: - -install-data-am: install-pkgincludeHEADERS - -install-dvi: install-dvi-am - -install-exec-am: - -install-html: install-html-am - -install-info: install-info-am - -install-man: - -install-pdf: install-pdf-am - -install-ps: install-ps-am - -installcheck-am: - -maintainer-clean: maintainer-clean-am - -rm -f Makefile -maintainer-clean-am: distclean-am maintainer-clean-generic - -mostlyclean: mostlyclean-am - -mostlyclean-am: mostlyclean-generic mostlyclean-libtool - -pdf: pdf-am - -pdf-am: - -ps: ps-am - -ps-am: - -uninstall-am: uninstall-pkgincludeHEADERS - -.MAKE: install-am install-strip - -.PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \ - clean-libtool ctags distclean distclean-generic \ - distclean-libtool distclean-tags distdir dvi dvi-am html \ - html-am info info-am install install-am install-data \ - install-data-am install-dvi install-dvi-am install-exec \ - install-exec-am install-html install-html-am install-info \ - install-info-am install-man install-pdf install-pdf-am \ - install-pkgincludeHEADERS install-ps install-ps-am \ - install-strip installcheck installcheck-am installdirs \ - maintainer-clean maintainer-clean-generic mostlyclean \ - mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \ - tags uninstall uninstall-am uninstall-pkgincludeHEADERS - - -@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) -# 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/include/gutenprintui/gutenprintui.h b/include/gutenprintui/gutenprintui.h deleted file mode 100644 index 2b40d70..0000000 --- a/include/gutenprintui/gutenprintui.h +++ /dev/null @@ -1,178 +0,0 @@ -/* - * "$Id: gutenprintui.h,v 1.2 2005/01/28 03:02:18 rlk Exp $" - * - * Print plug-in for the GIMP. - * - * Copyright 1997-2000 Michael Sweet (mike@easysw.com), - * Robert Krawitz (rlk@alum.mit.edu). and Steve Miller (smiller@rni.net - * - * 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. - * - * - * Revision History: - * - * See ChangeLog - */ - -#ifndef GUTENPRINTUI -#define GUTENPRINTUI - -#ifdef __cplusplus -extern "C" { -#endif - - -#ifdef __GNUC__ -#define inline __inline__ -#endif - -#include - -#include - -/* - * All Gimp-specific code is in this file. - */ - -typedef enum -{ - ORIENT_AUTO = -1, - ORIENT_PORTRAIT = 0, - ORIENT_LANDSCAPE = 1, - ORIENT_UPSIDEDOWN = 2, - ORIENT_SEASCAPE = 3 -} orient_t; - -/* - * If this is changed, command_options[] in panel.c must be appropriately - * updated. - */ -typedef enum -{ - COMMAND_TYPE_DEFAULT, - COMMAND_TYPE_CUSTOM, - COMMAND_TYPE_FILE -} command_t; - -typedef struct /**** Printer List ****/ -{ - char *name; /* Name of printer */ - command_t command_type; - char *queue_name; - char *extra_printer_options; - char *custom_command; - char *current_standard_command; - char *output_filename; - float scaling; /* Scaling, percent of printable area */ - orient_t orientation; - int unit; /* Units for preview area 0=Inch 1=Metric */ - int auto_size_roll_feed_paper; - int invalid_mask; - stp_vars_t *v; -} stpui_plist_t; - -typedef struct stpui_image -{ - stp_image_t im; - void (*transpose)(struct stpui_image *image); - void (*hflip)(struct stpui_image *image); - void (*vflip)(struct stpui_image *image); - void (*rotate_ccw)(struct stpui_image *image); - void (*rotate_cw)(struct stpui_image *image); - void (*rotate_180)(struct stpui_image *image); - void (*crop)(struct stpui_image *image, int left, int top, - int right, int bottom); -} stpui_image_t; - -/* - * Function prototypes - */ -extern void stpui_plist_set_name(stpui_plist_t *p, const char *val); -extern void stpui_plist_set_name_n(stpui_plist_t *p, const char *val, int n); -extern const char *stpui_plist_get_name(const stpui_plist_t *p); - -extern void stpui_plist_set_queue_name(stpui_plist_t *p, const char *val); -extern void stpui_plist_set_queue_name_n(stpui_plist_t *p, const char *val, int n); -extern const char *stpui_plist_get_queue_name(const stpui_plist_t *p); - -extern void stpui_plist_set_output_filename(stpui_plist_t *p, const char *val); -extern void stpui_plist_set_output_filename_n(stpui_plist_t *p, const char *val, int n); -extern const char *stpui_plist_get_output_filename(const stpui_plist_t *p); - -extern void stpui_plist_set_extra_printer_options(stpui_plist_t *p, const char *val); -extern void stpui_plist_set_extra_printer_options_n(stpui_plist_t *p, const char *val, int n); -extern const char *stpui_plist_get_extra_printer_options(const stpui_plist_t *p); - -extern void stpui_plist_set_custom_command(stpui_plist_t *p, const char *val); -extern void stpui_plist_set_custom_command_n(stpui_plist_t *p, const char *val, int n); -extern const char *stpui_plist_get_custom_command(const stpui_plist_t *p); - -extern void stpui_plist_set_copy_count(stpui_plist_t *p, gint count); -extern int stpui_plist_get_copy_count(const stpui_plist_t *p); - -extern void stpui_plist_set_current_standard_command(stpui_plist_t *p, const char *val); -extern void stpui_plist_set_current_standard_command_n(stpui_plist_t *p, const char *val, int n); -extern const char *stpui_plist_get_current_standard_command(const stpui_plist_t *p); - -extern void stpui_plist_set_command_type(stpui_plist_t *p, command_t val); -extern command_t stpui_plist_get_command_type(const stpui_plist_t *p); - -extern void stpui_set_global_parameter(const char *param, const char *value); -extern const char *stpui_get_global_parameter(const char *param); - -extern void stpui_plist_copy(stpui_plist_t *vd, const stpui_plist_t *vs); -extern int stpui_plist_add(const stpui_plist_t *key, int add_only); -extern void stpui_printer_initialize(stpui_plist_t *printer); -extern const stpui_plist_t *stpui_get_current_printer(void); - -extern char *stpui_build_standard_print_command(const stpui_plist_t *plist, - const stp_printer_t *printer); - -extern void stpui_set_printrc_file(const char *name); -extern const char * stpui_get_printrc_file(void); -extern void stpui_printrc_load (void); -extern void stpui_get_system_printers (void); -extern void stpui_printrc_save (void); -extern void stpui_set_image_filename(const char *); -extern const char *stpui_get_image_filename(void); -extern void stpui_set_errfunc(stp_outfunc_t wfunc); -extern stp_outfunc_t stpui_get_errfunc(void); -extern void stpui_set_errdata(void *errdata); -extern void *stpui_get_errdata(void); - -extern gint stpui_do_print_dialog (void); - -extern gint stpui_compute_orientation(void); -extern void stpui_set_image_dimensions(gint width, gint height); -extern void stpui_set_image_resolution(gdouble xres, gdouble yres); -extern void stpui_set_image_type(const char *image_type); -extern void stpui_set_image_raw_channels(gint channels); -extern void stpui_set_image_channel_depth(gint bit_depth); - -typedef guchar *(*get_thumbnail_func_t)(void *data, gint *width, gint *height, - gint *bpp, gint page); -extern void stpui_set_thumbnail_func(get_thumbnail_func_t); -extern get_thumbnail_func_t stpui_get_thumbnail_func(void); -extern void stpui_set_thumbnail_data(void *); -extern void *stpui_get_thumbnail_data(void); - -extern int stpui_print(const stpui_plist_t *printer, stpui_image_t *im); - - -#ifdef __cplusplus - } -#endif - -#endif /* GUTENPRINTUI */ diff --git a/include/gutenprintui2/Makefile.in b/include/gutenprintui2/Makefile.in index 772de63..b9626db 100644 --- a/include/gutenprintui2/Makefile.in +++ b/include/gutenprintui2/Makefile.in @@ -41,13 +41,12 @@ DIST_COMMON = $(am__pkginclude_HEADERS_DIST) $(srcdir)/Makefile.am \ subdir = include/gutenprintui2 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/isc-posix.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 + $(top_srcdir)/m4/iconv.m4 $(top_srcdir)/m4/isc-posix.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 @@ -118,27 +117,13 @@ 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@ GREP = @GREP@ 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@ @@ -146,13 +131,6 @@ 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@ @@ -257,16 +235,12 @@ docdir = @docdir@ dvidir = @dvidir@ 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@ @@ -295,6 +269,7 @@ target_alias = @target_alias@ top_builddir = @top_builddir@ top_srcdir = @top_srcdir@ AM_CPPFLAGS = -I$(top_srcdir)/include -I$(top_builddir)/include $(LOCAL_CPPFLAGS) $(GNUCFLAGS) +GUTENPRINTUI_LIBS = $(top_builddir)/src/gutenprintui/libgutenprintui.la stpui_public_h_sources = \ gutenprintui.h \ curve.h \ diff --git a/m4/stp_gimp.m4 b/m4/stp_gimp.m4 index 797715b..69b5a41 100644 --- a/m4/stp_gimp.m4 +++ b/m4/stp_gimp.m4 @@ -28,29 +28,6 @@ ## ---------------------- ## -# STP_GIMP_LIBS -# ------------- -# GIMP library checks -AC_DEFUN([STP_GIMP_LIBS], -[dnl GIMP library checks -if test x${BUILD_GIMP} = xyes ; then - if test x$GIMP_SOURCE_TREE_SUBDIR = xyes ; then - AM_PATH_GTK - AM_PATH_GLIB - GIMP_CFLAGS="-I\$(top_srcdir)/../.. \$(GTK_CFLAGS) \$(GLIB_CFLAGS)" - GIMP_LIBS="\$(GTK_LIBS) \$(GLIB_LIBS) \$(top_builddir)/../../libgimp/libgimp.la \$(top_builddir)/../../libgimp/libgimpui.la" - else - STP_PATH_GIMP(1.2.0, - [SAVE_GTK_LIBS="$GIMP_LIBS" - SAVE_GTK_CFLAGS="$GIMP_CFLAGS"], - [AC_MSG_ERROR([Cannot find GIMP 1.2 libraries: Please run ldconfig as root, make sure gimptool is on your PATH, and if applicable ensure that you have the GIMP, GTK, and GLIB development packages installed.]) - ]) - fi -fi - -]) - - # STP_GIMP2_LIBS # -------------- # GIMP library checks @@ -70,26 +47,6 @@ fi ## ------------------- ## -# STP_GIMP_PLUG_IN_DIR -# -------------------- -# Locate the GIMP plugin directory using libtool -AC_DEFUN([STP_GIMP_PLUG_IN_DIR], -[dnl Extract directory using --dry-run and sed -if test x${BUILD_GIMP} = xyes ; then - AC_MSG_CHECKING([for GIMP 1.2 plug-in directory]) -# create temporary "plug-in" to install - touch print - chmod 755 print - GIMPTOOL_OUTPUT=`$GIMPTOOL --dry-run --install-${PLUG_IN_PATH} print` - rm print - gimp_plug_indir=`echo "$GIMPTOOL_OUTPUT" | sed -e 's/.* \(.*\)\/print/\1/'` - AC_MSG_RESULT([$gimp_plug_indir]) -else - gimp_plug_indir="$libdir/gimp/1.2/plug-ins" -fi -]) - - # STP_GIMP2_PLUG_IN_DIR # --------------------- # Locate the GIMP plugin directory using libtool diff --git a/m4/stp_release.m4 b/m4/stp_release.m4 index 144e67c..625171b 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="01 Jan 2008" +RELEASE_DATE="27 Apr 2008" AC_DEFINE_UNQUOTED(RELEASE_DATE, "${RELEASE_DATE}", [Package release date.]) AC_SUBST(RELEASE_DATE)]) diff --git a/man/Makefile.am b/man/Makefile.am index 8c75859..ed7cf3f 100644 --- a/man/Makefile.am +++ b/man/Makefile.am @@ -1,4 +1,4 @@ -## $Id: Makefile.am,v 1.22 2005/11/21 11:16:22 rleigh Exp $ +## $Id: Makefile.am,v 1.23 2008/04/01 00:53:41 rlk Exp $ ## Copyright (C) 2000 Roger Leigh ## ## This program is free software; you can redistribute it and/or modify @@ -30,7 +30,6 @@ if BUILD_CUPS CUPS_MAN = \ cups-calibrate.8 \ cups-genppd.8 \ - cups-genppdconfig.8 \ cups-genppdupdate.8 endif @@ -47,7 +46,6 @@ man_MANS = $(CUPS_MAN) $(ESCPUTIL_MAN) $(GHOSTSCRIPT_MAN) EXTRA_man_MANS = \ cups-calibrate.8 \ cups-genppd.8 \ - cups-genppdconfig.8 \ cups-genppdupdate.8 \ escputil.1 \ ijsgutenprint.1 diff --git a/man/Makefile.in b/man/Makefile.in index 5ed9567..1315e57 100644 --- a/man/Makefile.in +++ b/man/Makefile.in @@ -38,26 +38,23 @@ build_triplet = @build@ host_triplet = @host@ DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \ $(srcdir)/cups-calibrate.8.in $(srcdir)/cups-genppd.8.in \ - $(srcdir)/cups-genppdconfig.8.in \ $(srcdir)/cups-genppdupdate.8.in $(srcdir)/escputil.1.in \ $(srcdir)/ijsgutenprint.1.in $(top_srcdir)/scripts/global.mk subdir = man 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/isc-posix.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 + $(top_srcdir)/m4/iconv.m4 $(top_srcdir)/m4/isc-posix.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 = cups-calibrate.8 cups-genppd.8 \ - cups-genppdconfig.8 cups-genppdupdate.8 escputil.1 \ - ijsgutenprint.1 + cups-genppdupdate.8 escputil.1 ijsgutenprint.1 SOURCES = DIST_SOURCES = man1dir = $(mandir)/man1 @@ -114,27 +111,13 @@ 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@ GREP = @GREP@ 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@ @@ -142,13 +125,6 @@ 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@ @@ -253,16 +229,12 @@ docdir = @docdir@ dvidir = @dvidir@ 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@ @@ -291,12 +263,12 @@ target_alias = @target_alias@ top_builddir = @top_builddir@ top_srcdir = @top_srcdir@ AM_CPPFLAGS = -I$(top_srcdir)/include -I$(top_builddir)/include $(LOCAL_CPPFLAGS) $(GNUCFLAGS) +GUTENPRINTUI_LIBS = $(top_builddir)/src/gutenprintui/libgutenprintui.la # Conditional installation of manpages is currently broken in automake... @BUILD_CUPS_TRUE@CUPS_MAN = \ @BUILD_CUPS_TRUE@ cups-calibrate.8 \ @BUILD_CUPS_TRUE@ cups-genppd.8 \ -@BUILD_CUPS_TRUE@ cups-genppdconfig.8 \ @BUILD_CUPS_TRUE@ cups-genppdupdate.8 @BUILD_ESCPUTIL_TRUE@ESCPUTIL_MAN = escputil.1 @@ -305,7 +277,6 @@ man_MANS = $(CUPS_MAN) $(ESCPUTIL_MAN) $(GHOSTSCRIPT_MAN) EXTRA_man_MANS = \ cups-calibrate.8 \ cups-genppd.8 \ - cups-genppdconfig.8 \ cups-genppdupdate.8 \ escputil.1 \ ijsgutenprint.1 @@ -348,8 +319,6 @@ cups-calibrate.8: $(top_builddir)/config.status $(srcdir)/cups-calibrate.8.in cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ cups-genppd.8: $(top_builddir)/config.status $(srcdir)/cups-genppd.8.in cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ -cups-genppdconfig.8: $(top_builddir)/config.status $(srcdir)/cups-genppdconfig.8.in - cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ cups-genppdupdate.8: $(top_builddir)/config.status $(srcdir)/cups-genppdupdate.8.in cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ escputil.1: $(top_builddir)/config.status $(srcdir)/escputil.1.in diff --git a/man/cups-genppdconfig.8.in b/man/cups-genppdconfig.8.in deleted file mode 100644 index 946f5c0..0000000 --- a/man/cups-genppdconfig.8.in +++ /dev/null @@ -1,63 +0,0 @@ -.\" $Id: cups-genppdconfig.8.in,v 1.6 2004/09/17 18:38:02 rleigh Exp $ -.\" Copyright (C) 2000-2004 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. -.TH CUPS\-GENPPDCONFIG "8" "@RELEASE_DATE@" "Version @GUTENPRINT_VERSION@" "Gutenprint Manual Pages" -.SH NAME -cups\-genppdconfig \- a user-friendly interface to generate Gutenprint PPD files for use with CUPS -.SH SYNOPSIS -.B cups\-genppdconfig -[\fI\-d ppd_directory\fR] -.br -.B update\-cups\-genppd -[\fI\-d pdd_directory\fR] -.SH DESCRIPTION -\fBcups\-genppdconfig\fR generates \fIGutenprint\fR PPD files for use with CUPS. -The program allows the selection of the base directory to create the PPDs in, -and the printers and languages desired. The default settings are taken from -the contents of the base directory. Note that unselecting an item will -\fBnot\fP remove it from the disk; you must remove unwanted printers and -languages by deleting the files and directories respectively. -.PP -If \fBdialog\fP is installed, it will be used to create the user interface, -using colour, 3D-look dialog boxes etc. If dialog cannot be found, perlmenu -will be used instead to create a simpler, though functionally identical, -interface. -.SH OPTIONS -.TP -.B \-d \fIppd-directory\fP -Use \fIppd-directory\fP as the base directory to create PPD files in. The -default printer and language selections will also be obtained from this -directory. By default, the base directory is -\fP@cups_conf_datadir@/model/gutenprint\fP. -.SH SEE ALSO -.BR cups\-genppd (8), -.BR cups\-genppdupdate (8), -.BR dialog (1), -CUPS Software Administrators Manual, http://localhost:631/documentation.html -.SH COPYRIGHT -Copyright \(co 2002\-2003 Roger Leigh (rleigh@debian.org) -.PP -This program is free software; you can redistribute it and/or modify -it under the terms of the GNU General Public License, version 2, as -published by the Free Software Foundation. -.PP -This manual page was written by Roger Leigh (rleigh@debian.org). -.\"# -.\"# The following sets edit modes for GNU EMACS -.\"# Local Variables: -.\"# mode:nroff -.\"# fill-column:79 -.\"# End: diff --git a/po/POTFILES.in b/po/POTFILES.in index c791778..b794d85 100644 --- a/po/POTFILES.in +++ b/po/POTFILES.in @@ -57,11 +57,6 @@ src/main/color-conversion.h src/main/dither-impl.h # UI library sources -src/gutenprintui/panel.c -src/gutenprintui/plist.c -src/gutenprintui/print-image-thumbnail.c -src/gutenprintui/ui-utils.c - src/gutenprintui2/curve.c src/gutenprintui2/gammacurve.c src/gutenprintui2/panel.c @@ -75,10 +70,6 @@ src/cups/genppd.c # escputil sources src/escputil/escputil.c -# GIMP sources -src/gimp/print-image-gimp.c -src/gimp/print.c - # GIMP sources src/gimp2/print-image-gimp.c src/gimp2/print.c diff --git a/po/cs.gmo b/po/cs.gmo index 7b2cde3..57cc043 100644 Binary files a/po/cs.gmo and b/po/cs.gmo differ diff --git a/po/cs.po b/po/cs.po index 6628e35..416a16b 100644 --- a/po/cs.po +++ b/po/cs.po @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: gimp-print 4.2.6-pre1\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2008-01-01 20:47-0500\n" -"PO-Revision-Date: 2006-05-04 07:18-0400\n" +"POT-Creation-Date: 2008-04-25 21:19-0400\n" +"PO-Revision-Date: 2003-05-03 19:43+0200\n" "Last-Translator: Miloslav Trmac \n" "Language-Team: Czech \n" "MIME-Version: 1.0\n" @@ -18,7 +18,7 @@ msgstr "" #. 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:1752 +#: src/main/print-escp2.c:2116 #, fuzzy msgid "Default" msgstr "Nastavit implicitní" @@ -63,42 +63,54 @@ msgid "Ordered" msgstr "" #: src/main/dither-main.c:65 +msgid "Ordered New" +msgstr "" + +#: src/main/dither-main.c:66 msgid "Fast" msgstr "Rychlé" -#: src/main/dither-main.c:66 +#: src/main/dither-main.c:67 msgid "Very Fast" msgstr "Velmi rychlé" -#: src/main/dither-main.c:67 +#: src/main/dither-main.c:68 msgid "Hybrid Floyd-Steinberg" msgstr "Hybridní Floid-Steinbergovo" -#: src/main/dither-main.c:68 +#: src/main/dither-main.c:69 msgid "Predithered Input" msgstr "" -#: src/main/dither-main.c:88 src/main/print-color.c:56 +#: src/main/dither-main.c:70 +msgid "Drop Size Segmented" +msgstr "" + +#: src/main/dither-main.c:71 +msgid "Drop Size Segmented New" +msgstr "" + +#: src/main/dither-main.c:91 src/main/print-color.c:56 #, fuzzy msgid "Density" msgstr "Hustota:" -#: src/main/dither-main.c:88 src/main/print-canon.c:295 +#: src/main/dither-main.c:91 src/main/print-canon.c:295 #: src/main/print-canon.c:303 src/main/print-canon.c:311 -#: src/main/print-canon.c:319 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-escp2.c:471 -#: src/main/print-escp2.c:479 src/main/print-escp2.c:487 +#: src/main/print-canon.c:319 src/main/print-escp2.c:446 +#: src/main/print-escp2.c:454 src/main/print-escp2.c:462 +#: src/main/print-escp2.c:470 src/main/print-escp2.c:478 +#: src/main/print-escp2.c:486 src/main/print-escp2.c:494 #: 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:1764 src/main/print-olympus.c:1772 -#: src/main/print-olympus.c:1780 src/main/print-olympus.c:1788 -#: src/main/print-pcl.c:1261 src/main/print-pcl.c:1269 -#: src/main/print-pcl.c:1277 src/main/print-pcl.c:1285 +#: src/main/print-olympus.c:1762 src/main/print-olympus.c:1770 +#: src/main/print-olympus.c:1778 src/main/print-olympus.c:1786 +#: src/main/print-pcl.c:1329 src/main/print-pcl.c:1337 +#: src/main/print-pcl.c:1345 src/main/print-pcl.c:1353 msgid "Output Level Adjustment" msgstr "" -#: src/main/dither-main.c:89 +#: src/main/dither-main.c:92 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 " @@ -108,15 +120,15 @@ msgstr "" "rozpíjí po papíře nebo se rozmazává; zvyÅ¡te hustotu, pokud Äerné oblasti " "nejsou jednolité." -#: src/main/dither-main.c:97 +#: src/main/dither-main.c:100 msgid "Dither Algorithm" msgstr "Algoritmus rozkladu barev" -#: src/main/dither-main.c:97 +#: src/main/dither-main.c:100 msgid "Screening Adjustment" msgstr "" -#: src/main/dither-main.c:98 +#: src/main/dither-main.c:101 msgid "" "Choose the dither algorithm to be used.\n" "Adaptive Hybrid usually produces the best all-around quality.\n" @@ -145,9 +157,9 @@ msgstr "" msgid "Dither algorithm" msgstr "Algoritmus rozkladu barev" -#: src/main/print-canon.c:200 src/main/print-escp2.c:180 -#: src/main/print-lexmark.c:266 src/main/print-olympus.c:1699 -#: src/main/print-pcl.c:1196 src/main/print-ps.c:67 +#: src/main/print-canon.c:200 src/main/print-escp2.c:182 +#: src/main/print-lexmark.c:266 src/main/print-olympus.c:1697 +#: src/main/print-pcl.c:1264 #, fuzzy msgid "Page Size" msgstr "Velikost" @@ -156,249 +168,258 @@ msgstr "Velikost" #: src/main/print-canon.c:212 src/main/print-canon.c:218 #: src/main/print-canon.c:224 src/main/print-canon.c:230 #: src/main/print-canon.c:248 src/main/print-canon.c:272 -#: src/main/print-escp2.c:180 src/main/print-escp2.c:186 -#: src/main/print-escp2.c:192 src/main/print-escp2.c:198 -#: src/main/print-escp2.c:204 src/main/print-escp2.c:210 -#: src/main/print-escp2.c:228 src/main/print-escp2.c:245 -#: src/main/print-escp2.c:251 src/main/print-escp2.c:263 -#: src/main/print-escp2.c:281 src/main/print-lexmark.c:266 +#: src/main/print-escp2.c:182 src/main/print-escp2.c:188 +#: src/main/print-escp2.c:194 src/main/print-escp2.c:200 +#: src/main/print-escp2.c:206 src/main/print-escp2.c:212 +#: src/main/print-escp2.c:230 src/main/print-escp2.c:247 +#: src/main/print-escp2.c:253 src/main/print-escp2.c:265 +#: src/main/print-escp2.c:283 src/main/print-lexmark.c:266 #: src/main/print-lexmark.c:272 src/main/print-lexmark.c:278 -#: src/main/print-lexmark.c:284 src/main/print-olympus.c:1699 -#: src/main/print-olympus.c:1705 src/main/print-olympus.c:1711 -#: src/main/print-olympus.c:1717 src/main/print-pcl.c:1196 -#: src/main/print-pcl.c:1202 src/main/print-pcl.c:1208 -#: src/main/print-pcl.c:1214 src/main/print-pcl.c:1238 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 +#: src/main/print-lexmark.c:284 src/main/print-olympus.c:1697 +#: src/main/print-olympus.c:1703 src/main/print-olympus.c:1709 +#: src/main/print-olympus.c:1715 src/main/print-pcl.c:1264 +#: src/main/print-pcl.c:1270 src/main/print-pcl.c:1276 +#: src/main/print-pcl.c:1282 src/main/print-pcl.c:1306 src/main/print-ps.c:68 +#: src/main/print-ps.c:74 #, fuzzy msgid "Basic Printer Setup" msgstr "Název tiskárny:" -#: src/main/print-canon.c:201 src/main/print-escp2.c:181 -#: src/main/print-lexmark.c:267 src/main/print-olympus.c:1700 -#: src/main/print-pcl.c:1197 src/main/print-ps.c:68 +#: src/main/print-canon.c:201 src/main/print-escp2.c:183 +#: src/main/print-lexmark.c:267 src/main/print-olympus.c:1698 +#: src/main/print-pcl.c:1265 #, fuzzy msgid "Size of the paper being printed to" msgstr "Velikost papíru, na který chcete tisknout" -#: src/main/print-canon.c:206 src/main/print-escp2.c:186 -#: src/main/print-lexmark.c:272 src/main/print-olympus.c:1705 -#: src/main/print-pcl.c:1202 src/main/print-ps.c:73 src/cups/genppd.c:1417 +#: src/main/print-canon.c:206 src/main/print-escp2.c:188 +#: src/main/print-lexmark.c:272 src/main/print-olympus.c:1703 +#: src/main/print-pcl.c:1270 src/cups/genppd.c:1422 msgid "Media Type" msgstr "Typ média" -#: src/main/print-canon.c:207 src/main/print-escp2.c:187 -#: src/main/print-lexmark.c:273 src/main/print-olympus.c:1706 -#: src/main/print-pcl.c:1203 src/main/print-ps.c:74 +#: src/main/print-canon.c:207 src/main/print-escp2.c:189 +#: src/main/print-lexmark.c:273 src/main/print-olympus.c:1704 +#: src/main/print-pcl.c:1271 msgid "Type of media (plain paper, photo paper, etc.)" msgstr "" -#: src/main/print-canon.c:212 src/main/print-escp2.c:192 -#: src/main/print-lexmark.c:278 src/main/print-olympus.c:1711 -#: src/main/print-pcl.c:1208 src/main/print-ps.c:79 src/cups/genppd.c:1445 +#: src/main/print-canon.c:212 src/main/print-escp2.c:194 +#: src/main/print-lexmark.c:278 src/main/print-olympus.c:1709 +#: src/main/print-pcl.c:1276 src/cups/genppd.c:1450 msgid "Media Source" msgstr "Zdroj média" -#: src/main/print-canon.c:213 src/main/print-escp2.c:193 -#: src/main/print-lexmark.c:279 src/main/print-olympus.c:1712 -#: src/main/print-pcl.c:1209 src/main/print-ps.c:80 +#: src/main/print-canon.c:213 src/main/print-escp2.c:195 +#: src/main/print-lexmark.c:279 src/main/print-olympus.c:1710 +#: src/main/print-pcl.c:1277 #, fuzzy msgid "Source (input slot) of the media" msgstr "Zdroj (vstupní otvor) média, na které tisknete" -#: src/main/print-canon.c:218 src/main/print-escp2.c:198 +#: src/main/print-canon.c:218 src/main/print-escp2.c:200 msgid "CD Hub Size" msgstr "" -#: src/main/print-canon.c:219 src/main/print-escp2.c:199 +#: src/main/print-canon.c:219 src/main/print-escp2.c:201 msgid "Print only outside of the hub of the CD, or all the way to the hole" msgstr "" -#: src/main/print-canon.c:224 src/main/print-escp2.c:204 +#: src/main/print-canon.c:224 src/main/print-escp2.c:206 msgid "CD Size (Custom)" msgstr "" -#: src/main/print-canon.c:225 src/main/print-escp2.c:205 +#: src/main/print-canon.c:225 src/main/print-escp2.c:207 msgid "Variable adjustment for the outer diameter of CD" msgstr "" -#: src/main/print-canon.c:230 src/main/print-escp2.c:210 +#: src/main/print-canon.c:230 src/main/print-escp2.c:212 msgid "CD Hub Size (Custom)" msgstr "" -#: src/main/print-canon.c:231 src/main/print-escp2.c:211 +#: src/main/print-canon.c:231 src/main/print-escp2.c:213 #, fuzzy msgid "Variable adjustment to the inner hub of the CD" msgstr "Upravit tisk na velikost stránky" -#: src/main/print-canon.c:236 src/main/print-escp2.c:216 +#: src/main/print-canon.c:236 src/main/print-escp2.c:218 msgid "CD Horizontal Fine Adjustment" msgstr "" #: src/main/print-canon.c:236 src/main/print-canon.c:242 -#: src/main/print-canon.c:254 src/main/print-escp2.c:216 -#: src/main/print-escp2.c:222 src/main/print-escp2.c:239 -#: src/main/print-escp2.c:275 src/main/print-lexmark.c:290 -#: src/main/print-olympus.c:1723 src/main/print-olympus.c:1729 -#: src/main/print-olympus.c:1735 src/main/print-pcl.c:1220 -#: src/main/print-ps.c:91 src/main/print-raw.c:80 +#: src/main/print-canon.c:254 src/main/print-escp2.c:218 +#: src/main/print-escp2.c:224 src/main/print-escp2.c:241 +#: src/main/print-escp2.c:277 src/main/print-lexmark.c:290 +#: src/main/print-olympus.c:1721 src/main/print-olympus.c:1727 +#: src/main/print-olympus.c:1733 src/main/print-pcl.c:1288 +#: src/main/print-raw.c:80 msgid "Advanced Printer Setup" msgstr "" #: src/main/print-canon.c:237 src/main/print-canon.c:243 -#: src/main/print-escp2.c:217 src/main/print-escp2.c:223 +#: src/main/print-escp2.c:219 src/main/print-escp2.c:225 msgid "Fine adjustment to horizontal position for CD printing" msgstr "" -#: src/main/print-canon.c:242 src/main/print-escp2.c:222 +#: src/main/print-canon.c:242 src/main/print-escp2.c:224 msgid "CD Vertical Fine Adjustment" msgstr "" -#: src/main/print-canon.c:248 src/main/print-escp2.c:228 -#: src/main/print-lexmark.c:284 src/main/print-olympus.c:1717 -#: src/main/print-pcl.c:1214 src/main/print-ps.c:85 src/cups/genppd.c:1518 +#: src/main/print-canon.c:248 src/main/print-escp2.c:230 +#: src/main/print-lexmark.c:284 src/main/print-olympus.c:1715 +#: src/main/print-pcl.c:1282 src/cups/genppd.c:1523 msgid "Resolution" msgstr "RozliÅ¡ení" #: src/main/print-canon.c:249 src/main/print-lexmark.c:285 -#: src/main/print-olympus.c:1718 src/main/print-pcl.c:1215 -#: src/main/print-ps.c:86 +#: src/main/print-olympus.c:1716 src/main/print-pcl.c:1283 msgid "Resolution and quality of the print" msgstr "RozliÅ¡ení a kvalita tisku" -#: src/main/print-canon.c:254 src/main/print-escp2.c:239 -#: src/main/print-lexmark.c:290 src/main/print-olympus.c:1723 -#: src/main/print-pcl.c:1220 src/main/print-ps.c:91 src/main/print-raw.c:80 +#: src/main/print-canon.c:254 src/main/print-escp2.c:241 +#: src/main/print-lexmark.c:290 src/main/print-olympus.c:1721 +#: src/main/print-pcl.c:1288 src/main/print-raw.c:80 msgid "Ink Type" msgstr "Typ inkoustu" -#: src/main/print-canon.c:255 src/main/print-escp2.c:240 -#: src/main/print-escp2.c:252 src/main/print-lexmark.c:291 -#: src/main/print-olympus.c:1724 src/main/print-pcl.c:1221 -#: src/main/print-ps.c:92 src/main/print-raw.c:81 +#: src/main/print-canon.c:255 src/main/print-escp2.c:242 +#: src/main/print-escp2.c:254 src/main/print-lexmark.c:291 +#: src/main/print-olympus.c:1722 src/main/print-pcl.c:1289 +#: src/main/print-raw.c:81 msgid "Type of ink in the printer" msgstr "Typ inkoustu v tiskárnÄ›" #: src/main/print-canon.c:260 src/main/print-canon.c:261 -#: src/main/print-escp2.c:329 src/main/print-escp2.c:330 +#: src/main/print-escp2.c:331 src/main/print-escp2.c:332 #: src/main/print-lexmark.c:296 src/main/print-lexmark.c:297 -#: src/main/print-pcl.c:1226 src/main/print-pcl.c:1227 +#: src/main/print-pcl.c:1294 src/main/print-pcl.c:1295 msgid "Ink Channels" msgstr "" -#: src/main/print-canon.c:260 src/main/print-escp2.c:130 -#: src/main/print-escp2.c:137 src/main/print-escp2.c:144 -#: src/main/print-escp2.c:287 src/main/print-escp2.c:293 -#: src/main/print-escp2.c:299 src/main/print-escp2.c:305 -#: src/main/print-escp2.c:311 src/main/print-escp2.c:317 -#: src/main/print-escp2.c:323 src/main/print-escp2.c:329 -#: src/main/print-escp2.c:335 src/main/print-lexmark.c:296 -#: src/main/print-pcl.c:1226 +#: src/main/print-canon.c:260 src/main/print-escp2.c:132 +#: src/main/print-escp2.c:139 src/main/print-escp2.c:146 +#: src/main/print-escp2.c:289 src/main/print-escp2.c:295 +#: src/main/print-escp2.c:301 src/main/print-escp2.c:307 +#: src/main/print-escp2.c:313 src/main/print-escp2.c:319 +#: src/main/print-escp2.c:325 src/main/print-escp2.c:331 +#: src/main/print-escp2.c:337 src/main/print-lexmark.c:296 +#: src/main/print-pcl.c:1294 msgid "Advanced Printer Functionality" msgstr "" -#: src/main/print-canon.c:266 src/main/print-escp2.c:341 -#: src/main/print-lexmark.c:302 src/main/print-olympus.c:1741 -#: src/main/print-pcl.c:1232 src/main/print-ps.c:103 src/main/print-raw.c:86 +#: src/main/print-canon.c:266 src/main/print-escp2.c:343 +#: src/main/print-lexmark.c:302 src/main/print-olympus.c:1739 +#: src/main/print-pcl.c:1300 src/main/print-ps.c:80 src/main/print-raw.c:86 #, fuzzy msgid "Printing Mode" msgstr "Model tiskárny:" #: src/main/print-canon.c:266 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:341 -#: src/main/print-escp2.c:347 src/main/print-lexmark.c:302 -#: src/main/print-olympus.c:1741 src/main/print-pcl.c:1232 -#: src/main/print-ps.c:103 src/main/print-raw.c:86 +#: src/main/print-color.c:208 src/main/print-escp2.c:343 +#: src/main/print-escp2.c:349 src/main/print-lexmark.c:302 +#: src/main/print-olympus.c:1739 src/main/print-pcl.c:1300 +#: src/main/print-ps.c:80 src/main/print-raw.c:86 #, fuzzy msgid "Core Parameter" msgstr "Papír ColorLife" -#: src/main/print-canon.c:267 src/main/print-escp2.c:342 -#: src/main/print-lexmark.c:303 src/main/print-olympus.c:1742 -#: src/main/print-pcl.c:1233 src/main/print-ps.c:104 src/main/print-raw.c:87 +#: src/main/print-canon.c:267 src/main/print-escp2.c:344 +#: src/main/print-lexmark.c:303 src/main/print-olympus.c:1740 +#: src/main/print-pcl.c:1301 src/main/print-ps.c:81 src/main/print-raw.c:87 msgid "Printing Output Mode" msgstr "" -#: src/main/print-canon.c:272 src/main/print-pcl.c:1238 +#: src/main/print-canon.c:272 src/main/print-pcl.c:1306 msgid "Double-Sided Printing" msgstr "" -#: src/main/print-canon.c:273 src/main/print-pcl.c:1239 +#: src/main/print-canon.c:273 src/main/print-pcl.c:1307 msgid "Duplex/Tumble Setting" msgstr "" -#: src/main/print-canon.c:295 src/main/print-escp2.c:439 -#: src/main/print-lexmark.c:325 src/main/print-pcl.c:1261 +#: src/main/print-canon.c:295 src/main/print-escp2.c:446 +#: src/main/print-lexmark.c:325 src/main/print-pcl.c:1329 #, fuzzy msgid "Cyan Density" msgstr "Hustota:" -#: src/main/print-canon.c:296 src/main/print-escp2.c:440 -#: src/main/print-lexmark.c:326 src/main/print-pcl.c:1262 +#: src/main/print-canon.c:296 src/main/print-escp2.c:447 +#: src/main/print-lexmark.c:326 src/main/print-pcl.c:1330 #, fuzzy msgid "Adjust the cyan density" msgstr "Upravit vyrovnání modrozelené tisku" -#: src/main/print-canon.c:303 src/main/print-escp2.c:447 -#: src/main/print-lexmark.c:333 src/main/print-pcl.c:1269 +#: src/main/print-canon.c:303 src/main/print-escp2.c:454 +#: src/main/print-lexmark.c:333 src/main/print-pcl.c:1337 #, fuzzy msgid "Magenta Density" msgstr "Fialová" -#: src/main/print-canon.c:304 src/main/print-escp2.c:448 -#: src/main/print-lexmark.c:334 src/main/print-pcl.c:1270 +#: src/main/print-canon.c:304 src/main/print-escp2.c:455 +#: src/main/print-lexmark.c:334 src/main/print-pcl.c:1338 #, fuzzy msgid "Adjust the magenta density" msgstr "Upravit vyrovnání fialové tisku" -#: src/main/print-canon.c:311 src/main/print-escp2.c:455 -#: src/main/print-lexmark.c:341 src/main/print-pcl.c:1277 +#: src/main/print-canon.c:311 src/main/print-escp2.c:462 +#: src/main/print-lexmark.c:341 src/main/print-pcl.c:1345 #, fuzzy msgid "Yellow Density" msgstr "Hustota:" -#: src/main/print-canon.c:312 src/main/print-escp2.c:456 -#: src/main/print-lexmark.c:342 src/main/print-pcl.c:1278 +#: src/main/print-canon.c:312 src/main/print-escp2.c:463 +#: src/main/print-lexmark.c:342 src/main/print-pcl.c:1346 #, fuzzy msgid "Adjust the yellow density" msgstr "Upravit vyrovnání žluté tisku" -#: src/main/print-canon.c:319 src/main/print-escp2.c:463 -#: src/main/print-lexmark.c:349 src/main/print-pcl.c:1285 +#: src/main/print-canon.c:319 src/main/print-escp2.c:470 +#: src/main/print-lexmark.c:349 src/main/print-pcl.c:1353 #, fuzzy msgid "Black Density" msgstr "Hustota:" -#: src/main/print-canon.c:320 src/main/print-escp2.c:464 -#: src/main/print-lexmark.c:350 src/main/print-pcl.c:1286 +#: src/main/print-canon.c:320 src/main/print-escp2.c:471 +#: src/main/print-lexmark.c:350 src/main/print-pcl.c:1354 #, fuzzy msgid "Adjust the black density" msgstr "Upravit vyrovnání modrozelené tisku" #: src/main/print-canon.c:327 src/main/print-canon.c:328 -#: src/main/print-escp2.c:495 src/main/print-escp2.c:496 +#: src/main/print-escp2.c:534 src/main/print-escp2.c:535 #: src/main/print-lexmark.c:357 src/main/print-lexmark.c:358 -#: src/main/print-pcl.c:1293 src/main/print-pcl.c:1294 +#: src/main/print-pcl.c:1361 src/main/print-pcl.c:1362 #, fuzzy msgid "Light Cyan Transition" msgstr "SvÄ›tle modrozelená" #: src/main/print-canon.c:327 src/main/print-canon.c:335 -#: src/main/print-canon.c:343 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-escp2.c:543 -#: src/main/print-escp2.c:551 src/main/print-escp2.c:559 -#: src/main/print-lexmark.c:357 src/main/print-lexmark.c:365 -#: src/main/print-pcl.c:1293 src/main/print-pcl.c:1301 +#: src/main/print-canon.c:343 src/main/print-escp2.c:502 +#: src/main/print-escp2.c:510 src/main/print-escp2.c:518 +#: src/main/print-escp2.c:526 src/main/print-escp2.c:534 +#: src/main/print-escp2.c:542 src/main/print-escp2.c:550 +#: src/main/print-escp2.c:558 src/main/print-escp2.c:566 +#: src/main/print-escp2.c:574 src/main/print-escp2.c:582 +#: src/main/print-escp2.c:590 src/main/print-escp2.c:598 +#: src/main/print-escp2.c:606 src/main/print-escp2.c:614 +#: src/main/print-escp2.c:622 src/main/print-escp2.c:630 +#: src/main/print-escp2.c:638 src/main/print-escp2.c:646 +#: src/main/print-escp2.c:654 src/main/print-escp2.c:662 +#: src/main/print-escp2.c:670 src/main/print-escp2.c:678 +#: src/main/print-escp2.c:686 src/main/print-escp2.c:694 +#: src/main/print-escp2.c:702 src/main/print-escp2.c:710 +#: src/main/print-escp2.c:718 src/main/print-escp2.c:726 +#: src/main/print-escp2.c:734 src/main/print-lexmark.c:357 +#: src/main/print-lexmark.c:365 src/main/print-pcl.c:1361 +#: src/main/print-pcl.c:1369 msgid "Advanced Ink Adjustment" msgstr "" #: src/main/print-canon.c:335 src/main/print-canon.c:336 -#: src/main/print-escp2.c:503 src/main/print-escp2.c:504 +#: src/main/print-escp2.c:566 src/main/print-escp2.c:567 #: src/main/print-lexmark.c:365 src/main/print-lexmark.c:366 -#: src/main/print-pcl.c:1301 src/main/print-pcl.c:1302 +#: src/main/print-pcl.c:1369 src/main/print-pcl.c:1370 #, fuzzy msgid "Light Magenta Transition" msgstr "SvÄ›tle fialová" @@ -408,55 +429,55 @@ msgstr "SvÄ›tle fialová" msgid "Light Yellow Transition" msgstr "SvÄ›tle modrozelená" -#: src/main/print-canon.c:363 src/main/print-pcl.c:1482 +#: src/main/print-canon.c:363 src/main/print-pcl.c:1550 #: src/main/escp2-resolutions.c:557 src/main/escp2-resolutions.c:565 #: src/main/escp2-resolutions.c:576 src/main/escp2-resolutions.c:588 msgid "Off" msgstr "" -#: src/main/print-canon.c:364 src/main/print-pcl.c:1483 +#: src/main/print-canon.c:364 src/main/print-pcl.c:1551 msgid "Long Edge (Standard)" msgstr "" -#: src/main/print-canon.c:365 src/main/print-pcl.c:1484 +#: src/main/print-canon.c:365 src/main/print-pcl.c:1552 msgid "Short Edge (Flip)" msgstr "" -#: src/main/print-canon.c:629 src/main/print-escp2.c:1648 +#: src/main/print-canon.c:629 src/main/print-escp2.c:2012 #: src/main/xmli18n-tmp.h:6 msgid "CD - 5 inch" msgstr "" -#: src/main/print-canon.c:631 src/main/print-escp2.c:1650 +#: src/main/print-canon.c:631 src/main/print-escp2.c:2014 #: src/main/xmli18n-tmp.h:7 msgid "CD - 3 inch" msgstr "" -#: src/main/print-canon.c:633 src/main/print-escp2.c:1652 +#: src/main/print-canon.c:633 src/main/print-escp2.c:2016 #: src/main/xmli18n-tmp.h:8 #, fuzzy msgid "CD - Custom" msgstr "Vlastní" -#: src/main/print-canon.c:656 src/main/print-escp2.c:1677 +#: src/main/print-canon.c:656 src/main/print-escp2.c:2041 msgid "Normal" msgstr "" -#: src/main/print-canon.c:658 src/main/print-escp2.c:1679 +#: src/main/print-canon.c:658 src/main/print-escp2.c:2043 #, fuzzy msgid "Print To Hub" msgstr "Tisknout do souboru?" -#: src/main/print-canon.c:773 src/main/print-escp2.c:2011 -#: src/main/print-lexmark.c:1279 src/main/print-olympus.c:1996 -#: src/main/print-pcl.c:1776 src/main/print-ps.c:170 src/main/print-raw.c:135 -#: src/gutenprintui/panel.c:289 src/gutenprintui2/panel.c:289 +#: src/main/print-canon.c:773 src/main/print-escp2.c:2450 +#: src/main/print-lexmark.c:1279 src/main/print-olympus.c:1994 +#: src/main/print-pcl.c:1844 src/main/print-ps.c:310 src/main/print-raw.c:135 +#: src/gutenprintui2/panel.c:290 msgid "Color" msgstr "Barva" -#: src/main/print-canon.c:775 src/main/print-escp2.c:2013 -#: src/main/print-lexmark.c:1281 src/main/print-pcl.c:1778 -#: src/main/print-ps.c:172 src/main/print-raw.c:137 +#: src/main/print-canon.c:775 src/main/print-escp2.c:2452 +#: src/main/print-lexmark.c:1281 src/main/print-pcl.c:1846 +#: src/main/print-ps.c:312 src/main/print-raw.c:137 #, fuzzy msgid "Black and White" msgstr "ÄŒernobíle" @@ -497,7 +518,7 @@ msgstr "Vytisknout" #: src/main/print-color.c:121 src/main/escp2-channels.c:916 #: src/main/escp2-channels.c:929 src/main/escp2-channels.c:943 -#: src/gutenprintui/panel.c:290 src/gutenprintui2/panel.c:290 +#: src/gutenprintui2/panel.c:291 msgid "Grayscale" msgstr "Odstíny Å¡edi" @@ -522,7 +543,7 @@ msgstr "" msgid "KCMY" msgstr "" -#: src/main/print-color.c:165 src/main/print-color.c:446 +#: src/main/print-color.c:165 src/main/print-color.c:454 #, fuzzy msgid "Channel " msgstr "ZruÅ¡it" @@ -584,7 +605,7 @@ msgid "Output image type" msgstr "Typ výstupu:" #: src/main/print-color.c:208 src/main/print-color.c:209 -#: src/main/print-escp2.c:347 +#: src/main/print-escp2.c:349 msgid "Raw Channels" msgstr "" @@ -652,14 +673,14 @@ msgstr "Gama:" msgid "Gamma value assumed by application" msgstr "" -#: src/main/print-color.c:266 src/main/escp2-channels.c:3048 -#: src/main/escp2-channels.c:3060 src/main/escp2-channels.c:3068 -#: src/main/escp2-channels.c:3078 src/main/escp2-channels.c:3089 -#: src/main/escp2-channels.c:3101 src/main/escp2-channels.c:3117 -#: src/main/escp2-channels.c:3125 src/main/escp2-channels.c:3138 -#: src/main/escp2-channels.c:3151 src/main/escp2-channels.c:3165 -#: src/main/escp2-channels.c:3179 src/main/escp2-channels.c:3194 -#: src/gutenprintui/panel.c:2152 src/gutenprintui2/panel.c:2153 +#: src/main/print-color.c:266 src/main/escp2-channels.c:3087 +#: src/main/escp2-channels.c:3099 src/main/escp2-channels.c:3107 +#: src/main/escp2-channels.c:3117 src/main/escp2-channels.c:3128 +#: src/main/escp2-channels.c:3140 src/main/escp2-channels.c:3156 +#: src/main/escp2-channels.c:3164 src/main/escp2-channels.c:3177 +#: src/main/escp2-channels.c:3190 src/main/escp2-channels.c:3204 +#: src/main/escp2-channels.c:3218 src/main/escp2-channels.c:3230 +#: src/main/escp2-channels.c:3243 src/gutenprintui2/panel.c:2328 #: src/escputil/escputil.c:978 src/escputil/escputil.c:997 #: src/escputil/escputil.c:1201 msgid "Cyan" @@ -670,14 +691,14 @@ msgstr "Modrozelená" msgid "Adjust the cyan gamma" msgstr "Upravit vyrovnání modrozelené tisku" -#: src/main/print-color.c:274 src/main/escp2-channels.c:3049 -#: src/main/escp2-channels.c:3059 src/main/escp2-channels.c:3070 -#: src/main/escp2-channels.c:3079 src/main/escp2-channels.c:3090 -#: src/main/escp2-channels.c:3103 src/main/escp2-channels.c:3116 -#: src/main/escp2-channels.c:3126 src/main/escp2-channels.c:3139 -#: src/main/escp2-channels.c:3152 src/main/escp2-channels.c:3164 -#: src/main/escp2-channels.c:3178 src/main/escp2-channels.c:3195 -#: src/gutenprintui/panel.c:2159 src/gutenprintui2/panel.c:2160 +#: src/main/print-color.c:274 src/main/escp2-channels.c:3088 +#: src/main/escp2-channels.c:3098 src/main/escp2-channels.c:3109 +#: src/main/escp2-channels.c:3118 src/main/escp2-channels.c:3129 +#: src/main/escp2-channels.c:3142 src/main/escp2-channels.c:3155 +#: src/main/escp2-channels.c:3165 src/main/escp2-channels.c:3178 +#: src/main/escp2-channels.c:3191 src/main/escp2-channels.c:3203 +#: src/main/escp2-channels.c:3217 src/main/escp2-channels.c:3229 +#: src/main/escp2-channels.c:3244 src/gutenprintui2/panel.c:2335 #: src/escputil/escputil.c:979 src/escputil/escputil.c:998 #: src/escputil/escputil.c:1202 msgid "Magenta" @@ -688,14 +709,14 @@ msgstr "Fialová" msgid "Adjust the magenta gamma" msgstr "Upravit vyrovnání fialové tisku" -#: src/main/print-color.c:282 src/main/escp2-channels.c:3050 -#: src/main/escp2-channels.c:3061 src/main/escp2-channels.c:3069 -#: src/main/escp2-channels.c:3080 src/main/escp2-channels.c:3091 -#: src/main/escp2-channels.c:3105 src/main/escp2-channels.c:3112 -#: src/main/escp2-channels.c:3127 src/main/escp2-channels.c:3140 -#: src/main/escp2-channels.c:3153 src/main/escp2-channels.c:3163 -#: src/main/escp2-channels.c:3177 src/main/escp2-channels.c:3196 -#: src/gutenprintui/panel.c:2166 src/gutenprintui2/panel.c:2167 +#: src/main/print-color.c:282 src/main/escp2-channels.c:3089 +#: src/main/escp2-channels.c:3100 src/main/escp2-channels.c:3108 +#: src/main/escp2-channels.c:3119 src/main/escp2-channels.c:3130 +#: src/main/escp2-channels.c:3144 src/main/escp2-channels.c:3151 +#: src/main/escp2-channels.c:3166 src/main/escp2-channels.c:3179 +#: src/main/escp2-channels.c:3192 src/main/escp2-channels.c:3202 +#: src/main/escp2-channels.c:3216 src/main/escp2-channels.c:3228 +#: src/main/escp2-channels.c:3245 src/gutenprintui2/panel.c:2342 #: src/escputil/escputil.c:980 src/escputil/escputil.c:999 #: src/escputil/escputil.c:1203 msgid "Yellow" @@ -706,10 +727,9 @@ msgstr "Žlutá" msgid "Adjust the yellow gamma" msgstr "Upravit vyrovnání žluté tisku" -#: src/main/print-color.c:290 src/main/escp2-channels.c:3168 -#: src/main/escp2-channels.c:3181 src/gutenprintui/panel.c:2180 -#: src/gutenprintui2/panel.c:2181 src/escputil/escputil.c:987 -#: src/escputil/escputil.c:1005 +#: src/main/print-color.c:290 src/main/escp2-channels.c:3207 +#: src/main/escp2-channels.c:3220 src/gutenprintui2/panel.c:2356 +#: src/escputil/escputil.c:987 src/escputil/escputil.c:1005 msgid "Red" msgstr "" @@ -718,8 +738,7 @@ msgstr "" msgid "Adjust the red gamma" msgstr "Upravit vyrovnání žluté tisku" -#: src/main/print-color.c:298 src/gutenprintui/panel.c:2187 -#: src/gutenprintui2/panel.c:2188 +#: src/main/print-color.c:298 src/gutenprintui2/panel.c:2363 msgid "Green" msgstr "" @@ -728,10 +747,9 @@ msgstr "" msgid "Adjust the green gamma" msgstr "Upravit vyrovnání fialové tisku" -#: src/main/print-color.c:306 src/main/escp2-channels.c:3169 -#: src/main/escp2-channels.c:3182 src/gutenprintui/panel.c:2194 -#: src/gutenprintui2/panel.c:2195 src/escputil/escputil.c:988 -#: src/escputil/escputil.c:1006 +#: src/main/print-color.c:306 src/main/escp2-channels.c:3208 +#: src/main/escp2-channels.c:3221 src/gutenprintui2/panel.c:2370 +#: src/escputil/escputil.c:988 src/escputil/escputil.c:1006 msgid "Blue" msgstr "" @@ -741,14 +759,14 @@ msgid "Adjust the blue gamma" msgstr "Upravit vyrovnání žluté tisku" #: src/main/print-color.c:314 src/main/print-lexmark.c:613 -#: src/main/escp2-channels.c:3047 src/main/escp2-channels.c:3057 -#: src/main/escp2-channels.c:3058 src/main/escp2-channels.c:3071 -#: src/main/escp2-channels.c:3081 src/main/escp2-channels.c:3088 -#: src/main/escp2-channels.c:3100 src/main/escp2-channels.c:3113 -#: src/main/escp2-channels.c:3124 src/main/escp2-channels.c:3137 -#: src/main/escp2-channels.c:3150 src/main/escp2-channels.c:3156 -#: src/main/escp2-channels.c:3180 src/main/escp2-channels.c:3193 -#: src/gutenprintui/panel.c:2173 src/gutenprintui2/panel.c:2174 +#: src/main/escp2-channels.c:3086 src/main/escp2-channels.c:3096 +#: src/main/escp2-channels.c:3097 src/main/escp2-channels.c:3110 +#: src/main/escp2-channels.c:3120 src/main/escp2-channels.c:3127 +#: src/main/escp2-channels.c:3139 src/main/escp2-channels.c:3152 +#: src/main/escp2-channels.c:3163 src/main/escp2-channels.c:3176 +#: src/main/escp2-channels.c:3189 src/main/escp2-channels.c:3195 +#: src/main/escp2-channels.c:3219 src/main/escp2-channels.c:3231 +#: src/main/escp2-channels.c:3242 src/gutenprintui2/panel.c:2349 #: src/escputil/escputil.c:975 src/escputil/escputil.c:996 #: src/escputil/escputil.c:1200 msgid "Black" @@ -759,7 +777,7 @@ msgstr "ÄŒerná" msgid "Adjust the black gamma" msgstr "Upravit vyrovnání žluté tisku" -#: src/main/print-color.c:322 src/main/print-olympus.c:1764 +#: src/main/print-color.c:322 src/main/print-olympus.c:1762 msgid "Cyan Balance" msgstr "" @@ -774,7 +792,7 @@ msgstr "Odstíny Å¡edi" msgid "Adjust the cyan gray balance" msgstr "Upravit vyrovnání modrozelené tisku" -#: src/main/print-color.c:330 src/main/print-olympus.c:1772 +#: src/main/print-color.c:330 src/main/print-olympus.c:1770 #, fuzzy msgid "Magenta Balance" msgstr "Fialová" @@ -784,7 +802,7 @@ msgstr "Fialová" msgid "Adjust the magenta gray balance" msgstr "Upravit vyrovnání fialové tisku" -#: src/main/print-color.c:338 src/main/print-olympus.c:1780 +#: src/main/print-color.c:338 src/main/print-olympus.c:1778 #, fuzzy msgid "Yellow Balance" msgstr "Žlutá" @@ -815,9 +833,11 @@ msgstr "Typ inkoustu" #: 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:353 -#: src/main/print-escp2.c:359 src/main/print-escp2.c:365 -#: src/main/print-escp2.c:371 src/main/print-escp2.c:377 +#: src/main/print-color.c:421 src/main/print-color.c:553 +#: src/main/print-escp2.c:355 src/main/print-escp2.c:361 +#: src/main/print-escp2.c:367 src/main/print-escp2.c:373 +#: src/main/print-escp2.c:379 src/main/print-escp2.c:742 +#: src/main/print-escp2.c:750 src/main/print-escp2.c:758 msgid "Advanced Output Control" msgstr "" @@ -825,552 +845,669 @@ msgstr "" msgid "Limit the total ink printed to the page" msgstr "" -#: src/main/print-color.c:365 +#: src/main/print-color.c:365 src/main/print-escp2.c:742 msgid "GCR Transition" msgstr "" -#: src/main/print-color.c:366 +#: src/main/print-color.c:366 src/main/print-escp2.c:743 msgid "Adjust the gray component transition rate" msgstr "" -#: src/main/print-color.c:373 +#: src/main/print-color.c:373 src/main/print-escp2.c:750 msgid "GCR Lower Bound" msgstr "" -#: src/main/print-color.c:374 +#: src/main/print-color.c:374 src/main/print-escp2.c:751 msgid "Lower bound of gray component reduction" msgstr "" -#: src/main/print-color.c:381 +#: src/main/print-color.c:381 src/main/print-escp2.c:758 msgid "GCR Upper Bound" msgstr "" -#: src/main/print-color.c:382 +#: src/main/print-color.c:382 src/main/print-escp2.c:759 msgid "Upper bound of gray component reduction" msgstr "" -#: src/main/print-color.c:447 src/main/print-color.c:457 -#: src/main/print-color.c:465 src/main/print-color.c:473 -#: src/main/print-color.c:481 src/main/print-color.c:489 -#: src/main/print-color.c:497 src/main/print-color.c:505 -#: src/main/print-color.c:513 +#: src/main/print-color.c:421 +msgid "LUT dump file" +msgstr "" + +#: src/main/print-color.c:422 +msgid "Dump file for LUT for external color adjustment" +msgstr "" + +#: src/main/print-color.c:455 src/main/print-color.c:465 +#: src/main/print-color.c:473 src/main/print-color.c:481 +#: src/main/print-color.c:489 src/main/print-color.c:497 +#: src/main/print-color.c:505 src/main/print-color.c:513 +#: src/main/print-color.c:521 #, fuzzy msgid "Output Curves" msgstr "Typ výstupu:" -#: src/main/print-color.c:447 +#: src/main/print-color.c:455 msgid "Curve for raw channel " msgstr "" -#: src/main/print-color.c:457 +#: src/main/print-color.c:465 msgid "Cyan Curve" msgstr "" -#: src/main/print-color.c:458 +#: src/main/print-color.c:466 #, fuzzy msgid "Cyan curve" msgstr "ZruÅ¡it" -#: src/main/print-color.c:465 +#: src/main/print-color.c:473 #, fuzzy msgid "Magenta Curve" msgstr "Fialová" -#: src/main/print-color.c:466 +#: src/main/print-color.c:474 #, fuzzy msgid "Magenta curve" msgstr "Fialová" -#: src/main/print-color.c:473 +#: src/main/print-color.c:481 #, fuzzy msgid "Yellow Curve" msgstr "Žlutá" -#: src/main/print-color.c:474 +#: src/main/print-color.c:482 #, fuzzy msgid "Yellow curve" msgstr "Žlutá" -#: src/main/print-color.c:481 +#: src/main/print-color.c:489 #, fuzzy msgid "Black Curve" msgstr "ÄŒerná" -#: src/main/print-color.c:482 +#: src/main/print-color.c:490 #, fuzzy msgid "Black curve" msgstr "ÄŒerná" -#: src/main/print-color.c:489 +#: src/main/print-color.c:497 #, fuzzy msgid "Red Curve" msgstr "Žlutá" -#: src/main/print-color.c:490 +#: src/main/print-color.c:498 #, fuzzy msgid "Red curve" msgstr "Žlutá" -#: src/main/print-color.c:497 +#: src/main/print-color.c:505 #, fuzzy msgid "Green Curve" msgstr "Fialová" -#: src/main/print-color.c:498 +#: src/main/print-color.c:506 #, fuzzy msgid "Green curve" msgstr "Fialová" -#: src/main/print-color.c:505 +#: src/main/print-color.c:513 #, fuzzy msgid "Blue Curve" msgstr "ÄŒerná" -#: src/main/print-color.c:506 +#: src/main/print-color.c:514 #, fuzzy msgid "Blue curve" msgstr "ÄŒerná" -#: src/main/print-color.c:513 +#: src/main/print-color.c:521 #, fuzzy msgid "White Curve" msgstr "Žlutá" -#: src/main/print-color.c:514 +#: src/main/print-color.c:522 #, fuzzy msgid "White curve" msgstr "Žlutá" -#: src/main/print-color.c:521 +#: src/main/print-color.c:529 msgid "Hue Map" msgstr "" -#: src/main/print-color.c:521 src/main/print-color.c:529 -#: src/main/print-color.c:537 +#: src/main/print-color.c:529 src/main/print-color.c:537 +#: src/main/print-color.c:545 msgid "Advanced HSL Curves" msgstr "" -#: src/main/print-color.c:522 +#: src/main/print-color.c:530 msgid "Hue adjustment curve" msgstr "" -#: src/main/print-color.c:529 +#: src/main/print-color.c:537 #, fuzzy msgid "Saturation Map" msgstr "Sytost:" -#: src/main/print-color.c:530 +#: src/main/print-color.c:538 msgid "Saturation adjustment curve" msgstr "" -#: src/main/print-color.c:537 +#: src/main/print-color.c:545 msgid "Luminosity Map" msgstr "" -#: src/main/print-color.c:538 +#: src/main/print-color.c:546 msgid "Luminosity adjustment curve" msgstr "" -#: src/main/print-color.c:545 +#: src/main/print-color.c:553 msgid "Gray Component Reduction" msgstr "" -#: src/main/print-color.c:546 +#: src/main/print-color.c:554 msgid "Gray component reduction curve" msgstr "" -#: src/main/print-color.c:1670 +#: src/main/print-color.c:1743 msgid "Traditional Gutenprint color conversion" msgstr "" -#: src/main/printers.c:517 +#: src/main/printers.c:514 #, c-format msgid "Value must be set for %s\n" msgstr "" -#: src/main/printers.c:530 src/main/printers.c:535 +#: src/main/printers.c:527 src/main/printers.c:532 #, fuzzy, c-format msgid "`%s' is not a valid %s\n" msgstr "%s není platný parametr typu %s\n" -#: src/main/printers.c:554 +#: src/main/printers.c:551 #, c-format msgid "%s must be between %f and %f (is %f)\n" msgstr "" -#: src/main/printers.c:576 src/main/printers.c:600 +#: src/main/printers.c:573 src/main/printers.c:597 #, c-format msgid "%s must be between %d and %d (is %d)\n" msgstr "" -#: src/main/printers.c:631 +#: src/main/printers.c:628 #, c-format msgid "%s bounds must be between %f and %f\n" msgstr "" -#: src/main/printers.c:639 +#: src/main/printers.c:636 #, c-format msgid "%s wrap mode must be %s\n" msgstr "" -#: src/main/printers.c:643 +#: src/main/printers.c:640 msgid "no wrap" msgstr "" -#: src/main/printers.c:643 +#: src/main/printers.c:640 msgid "wrap around" msgstr "" -#: src/main/printers.c:687 +#: src/main/printers.c:684 #, fuzzy, c-format msgid "Unknown type parameter %s (%d)\n" msgstr "Neznámá tiskárna %s\n" -#: src/main/printers.c:700 src/main/printers.c:711 +#: src/main/printers.c:697 src/main/printers.c:708 #, c-format msgid "%s out of range (value %d, min %d, max %d)\n" msgstr "%s mimo rozsah (hodnota %d, min %d, max %d)\n" -#: src/main/printers.c:772 +#: src/main/printers.c:768 #, fuzzy msgid "Page size is not valid\n" msgstr "Velikost obrázku není platná\n" -#: src/main/printers.c:793 +#: src/main/printers.c:789 #, fuzzy, c-format msgid "Top margin must not be less than %d\n" msgstr "Horní okraj nesmí být ménÄ› než nula\n" -#: src/main/printers.c:799 +#: src/main/printers.c:795 #, fuzzy, c-format msgid "Left margin must not be less than %d\n" msgstr "Levý okraj nesmí být ménÄ› než nula\n" -#: src/main/printers.c:805 +#: src/main/printers.c:801 #, fuzzy msgid "Height must be greater than zero\n" msgstr "Levý okraj nesmí být ménÄ› než nula\n" -#: src/main/printers.c:811 +#: src/main/printers.c:807 #, fuzzy msgid "Width must be greater than zero\n" msgstr "Horní okraj nesmí být ménÄ› než nula\n" -#: src/main/printers.c:817 +#: src/main/printers.c:813 #, c-format msgid "" "Image is too wide for the page: left margin is %d, width %d, right edge is %" "d\n" msgstr "" -#: src/main/printers.c:824 +#: src/main/printers.c:820 #, c-format msgid "" "Image is too long for the page: top margin is %d, height %d, bottom edge is %" "d\n" msgstr "" -#: src/main/print-escp2.c:162 +#: src/main/print-escp2.c:164 msgid "Automatic Printing Mode" msgstr "" -#: src/main/print-escp2.c:162 src/main/print-escp2.c:174 +#: src/main/print-escp2.c:164 src/main/print-escp2.c:176 #: src/main/generic-options.c:62 msgid "Basic Output Adjustment" msgstr "" -#: src/main/print-escp2.c:163 +#: src/main/print-escp2.c:165 msgid "Automatic printing mode" msgstr "" -#: src/main/print-escp2.c:174 src/main/print-escp2.c:175 +#: src/main/print-escp2.c:176 src/main/print-escp2.c:177 #: src/main/generic-options.c:62 src/main/generic-options.c:63 #, fuzzy msgid "Print Quality" msgstr "720 DPI Nejvyšší kvalita" -#: src/main/print-escp2.c:229 +#: src/main/print-escp2.c:231 #, fuzzy msgid "Resolution of the print" msgstr "RozliÅ¡ení a kvalita tisku" -#: src/main/print-escp2.c:245 +#: src/main/print-escp2.c:247 msgid "Enhanced Gloss" msgstr "" -#: src/main/print-escp2.c:246 +#: src/main/print-escp2.c:248 msgid "Add gloss enhancement" msgstr "" -#: src/main/print-escp2.c:251 +#: src/main/print-escp2.c:253 #, fuzzy msgid "Ink Set" msgstr "Typ inkoustu" -#: src/main/print-escp2.c:257 +#: src/main/print-escp2.c:259 msgid "Printing Direction" msgstr "" -#: src/main/print-escp2.c:257 src/main/print-escp2.c:269 +#: src/main/print-escp2.c:259 src/main/print-escp2.c:271 msgid "Advanced Output Adjustment" msgstr "" -#: src/main/print-escp2.c:258 +#: src/main/print-escp2.c:260 msgid "Printing direction (unidirectional is higher quality, but slower)" msgstr "" -#: src/main/print-escp2.c:263 src/main/print-olympus.c:1735 +#: src/main/print-escp2.c:265 src/main/print-olympus.c:1733 msgid "Borderless" msgstr "" -#: src/main/print-escp2.c:264 src/main/print-olympus.c:1736 +#: src/main/print-escp2.c:266 src/main/print-olympus.c:1734 msgid "Print without borders" msgstr "" -#: src/main/print-escp2.c:269 +#: src/main/print-escp2.c:271 msgid "Interleave Method" msgstr "" -#: src/main/print-escp2.c:270 +#: src/main/print-escp2.c:272 msgid "Interleave pattern to use" msgstr "" -#: src/main/print-escp2.c:275 +#: src/main/print-escp2.c:277 msgid "Adjust dot size as necessary" msgstr "" -#: src/main/print-escp2.c:276 +#: src/main/print-escp2.c:278 msgid "Adjust dot size as necessary to achieve desired density" msgstr "" -#: src/main/print-escp2.c:281 src/main/print-escp2.c:282 +#: src/main/print-escp2.c:283 src/main/print-escp2.c:284 #, fuzzy msgid "Output Order" msgstr "Typ výstupu:" -#: src/main/print-escp2.c:287 src/main/print-escp2.c:288 +#: src/main/print-escp2.c:289 src/main/print-escp2.c:290 msgid "Alignment Passes" msgstr "" -#: src/main/print-escp2.c:293 src/main/print-escp2.c:294 +#: src/main/print-escp2.c:295 src/main/print-escp2.c:296 msgid "Alignment Choices" msgstr "" -#: src/main/print-escp2.c:299 src/main/print-escp2.c:300 +#: src/main/print-escp2.c:301 src/main/print-escp2.c:302 #, fuzzy msgid "Ink change command" msgstr "Nerozpoznaný příkaz.\n" -#: src/main/print-escp2.c:305 src/main/print-escp2.c:306 +#: src/main/print-escp2.c:307 src/main/print-escp2.c:308 msgid "Alternate Alignment Passes" msgstr "" -#: src/main/print-escp2.c:311 src/main/print-escp2.c:312 +#: src/main/print-escp2.c:313 src/main/print-escp2.c:314 #, fuzzy msgid "Alternate Alignment Choices" msgstr "Opakuji proces zarovnávání.\n" -#: src/main/print-escp2.c:317 +#: src/main/print-escp2.c:319 msgid "Supports Packet Mode" msgstr "" -#: src/main/print-escp2.c:318 +#: src/main/print-escp2.c:320 msgid "Supports D4 Packet Mode" msgstr "" -#: src/main/print-escp2.c:323 +#: src/main/print-escp2.c:325 msgid "Has Interchangeable Ink Cartridges" msgstr "" -#: src/main/print-escp2.c:324 +#: src/main/print-escp2.c:326 msgid "Has multiple choices of ink cartridges" msgstr "" -#: src/main/print-escp2.c:335 src/main/print-escp2.c:336 +#: src/main/print-escp2.c:337 src/main/print-escp2.c:338 #, fuzzy msgid "Channel Names" msgstr "ZruÅ¡it" -#: src/main/print-escp2.c:348 +#: src/main/print-escp2.c:350 msgid "Raw Channel Count" msgstr "" -#: src/main/print-escp2.c:353 +#: src/main/print-escp2.c:355 #, fuzzy msgid "Cyan Map" msgstr "Modrozelená" -#: src/main/print-escp2.c:354 +#: src/main/print-escp2.c:356 #, fuzzy msgid "Adjust the cyan map" msgstr "Upravit vyrovnání modrozelené tisku" -#: src/main/print-escp2.c:359 +#: src/main/print-escp2.c:361 #, fuzzy msgid "Magenta Map" msgstr "Fialová" -#: src/main/print-escp2.c:360 +#: src/main/print-escp2.c:362 #, fuzzy msgid "Adjust the magenta map" msgstr "Upravit vyrovnání fialové tisku" -#: src/main/print-escp2.c:365 +#: src/main/print-escp2.c:367 #, fuzzy msgid "Yellow Map" msgstr "Žlutá" -#: src/main/print-escp2.c:366 +#: src/main/print-escp2.c:368 #, fuzzy msgid "Adjust the yellow map" msgstr "Upravit vyrovnání žluté tisku" -#: src/main/print-escp2.c:371 +#: src/main/print-escp2.c:373 #, fuzzy msgid "Blue Map" msgstr "ÄŒernobíle" -#: src/main/print-escp2.c:372 +#: src/main/print-escp2.c:374 #, fuzzy msgid "Adjust the blue map" msgstr "Upravit vyrovnání žluté tisku" -#: src/main/print-escp2.c:377 +#: src/main/print-escp2.c:379 msgid "Red Map" msgstr "" -#: src/main/print-escp2.c:378 +#: src/main/print-escp2.c:380 #, fuzzy msgid "Adjust the red map" msgstr "Upravit vyrovnání žluté tisku" -#: src/main/print-escp2.c:471 +#: src/main/print-escp2.c:478 #, fuzzy msgid "Red Density" msgstr "Hustota:" -#: src/main/print-escp2.c:472 +#: src/main/print-escp2.c:479 #, fuzzy msgid "Adjust the red density" msgstr "Upravit vyrovnání žluté tisku" -#: src/main/print-escp2.c:479 +#: src/main/print-escp2.c:486 #, fuzzy msgid "Blue Density" msgstr "Hustota:" -#: src/main/print-escp2.c:480 +#: src/main/print-escp2.c:487 #, fuzzy msgid "Adjust the blue density" msgstr "Upravit vyrovnání modrozelené tisku" -#: src/main/print-escp2.c:487 +#: src/main/print-escp2.c:494 #, fuzzy msgid "Gloss Level" msgstr "Lesklý potah" -#: src/main/print-escp2.c:488 +#: src/main/print-escp2.c:495 #, fuzzy msgid "Adjust the gloss level" msgstr "Upravit vyrovnání žluté tisku" -#: src/main/print-escp2.c:511 src/main/print-escp2.c:512 +#: src/main/print-escp2.c:502 +msgid "Drop Size Small" +msgstr "" + +#: src/main/print-escp2.c:503 +msgid "Drop Size 1 (small)" +msgstr "" + +#: src/main/print-escp2.c:510 +msgid "Drop Size Medium" +msgstr "" + +#: src/main/print-escp2.c:511 +msgid "Drop Size 2 (medium)" +msgstr "" + +#: src/main/print-escp2.c:518 +msgid "Drop Size Large" +msgstr "" + +#: src/main/print-escp2.c:519 +msgid "Drop Size 3 (large)" +msgstr "" + +#: src/main/print-escp2.c:526 src/main/print-escp2.c:527 +#, fuzzy +msgid "Light Cyan Value" +msgstr "SvÄ›tle modrozelená" + +#: src/main/print-escp2.c:542 src/main/print-escp2.c:543 +#, fuzzy +msgid "Light Cyan Density Scale" +msgstr "SvÄ›tle modrozelená" + +#: src/main/print-escp2.c:550 src/main/print-escp2.c:551 +#, fuzzy +msgid "Light Magenta Value" +msgstr "SvÄ›tle fialová" + +#: src/main/print-escp2.c:558 src/main/print-escp2.c:559 +#, fuzzy +msgid "Light Magenta Density Scale" +msgstr "SvÄ›tle fialová" + +#: src/main/print-escp2.c:574 src/main/print-escp2.c:575 +#, fuzzy +msgid "Dark Yellow Value" +msgstr "ÄŒerná/tmavá žlutá" + +#: src/main/print-escp2.c:582 src/main/print-escp2.c:583 msgid "Dark Yellow Transition" msgstr "" -#: src/main/print-escp2.c:519 src/main/print-escp2.c:520 -#: src/main/print-escp2.c:527 src/main/print-escp2.c:528 +#: src/main/print-escp2.c:590 src/main/print-escp2.c:591 +#, fuzzy +msgid "Dark Yellow Density Scale" +msgstr "ÄŒerná/tmavá žlutá" + +#: src/main/print-escp2.c:598 src/main/print-escp2.c:599 +#: src/main/print-escp2.c:622 src/main/print-escp2.c:623 +#, fuzzy +msgid "Gray Value" +msgstr "Odstíny Å¡edi" + +#: src/main/print-escp2.c:606 src/main/print-escp2.c:607 +#: src/main/print-escp2.c:630 src/main/print-escp2.c:631 msgid "Gray Transition" msgstr "" -#: src/main/print-escp2.c:535 src/main/print-escp2.c:536 -#: src/main/print-escp2.c:559 src/main/print-escp2.c:560 +#: src/main/print-escp2.c:614 src/main/print-escp2.c:615 +#: src/main/print-escp2.c:638 src/main/print-escp2.c:639 +#, fuzzy +msgid "Gray Density Scale" +msgstr "Odstíny Å¡edi" + +#: src/main/print-escp2.c:646 src/main/print-escp2.c:647 +#: src/main/print-escp2.c:718 src/main/print-escp2.c:719 +#, fuzzy +msgid "Light Gray Value" +msgstr "SvÄ›tle modrozelená" + +#: src/main/print-escp2.c:654 src/main/print-escp2.c:655 +#: src/main/print-escp2.c:726 src/main/print-escp2.c:727 #, fuzzy msgid "Light Gray Transition" msgstr "SvÄ›tle modrozelená" -#: src/main/print-escp2.c:543 src/main/print-escp2.c:544 +#: src/main/print-escp2.c:662 src/main/print-escp2.c:663 +#: src/main/print-escp2.c:734 src/main/print-escp2.c:735 +#, fuzzy +msgid "Light Gray Density Scale" +msgstr "SvÄ›tle modrozelená" + +#: src/main/print-escp2.c:670 src/main/print-escp2.c:671 +#, fuzzy +msgid "Dark Gray Value" +msgstr "SvÄ›tle modrozelená" + +#: src/main/print-escp2.c:678 src/main/print-escp2.c:679 #, fuzzy msgid "Dark Gray Transition" msgstr "SvÄ›tle modrozelená" -#: src/main/print-escp2.c:551 +#: src/main/print-escp2.c:686 src/main/print-escp2.c:687 +#, fuzzy +msgid "Dark Gray Density Scale" +msgstr "SvÄ›tle modrozelená" + +#: src/main/print-escp2.c:694 +#, fuzzy +msgid "Mid Gray Value" +msgstr "Odstíny Å¡edi" + +#: src/main/print-escp2.c:695 +#, fuzzy +msgid "Medium Gray Value" +msgstr "SvÄ›tle modrozelená" + +#: src/main/print-escp2.c:702 #, fuzzy msgid "Mid Gray Transition" msgstr "SvÄ›tle modrozelená" -#: src/main/print-escp2.c:552 +#: src/main/print-escp2.c:703 #, fuzzy msgid "Medium Gray Transition" msgstr "SvÄ›tle modrozelená" -#: src/main/print-escp2.c:1635 +#: src/main/print-escp2.c:710 +#, fuzzy +msgid "Mid Gray Density Scale" +msgstr "SvÄ›tle modrozelená" + +#: src/main/print-escp2.c:711 +#, fuzzy +msgid "Medium Gray Density Scale" +msgstr "SvÄ›tle modrozelená" + +#: src/main/print-escp2.c:1999 msgid "Full Manual Control" msgstr "" -#: src/main/print-escp2.c:1637 +#: src/main/print-escp2.c:2001 msgid "Automatic Setting Control" msgstr "" -#: src/main/print-escp2.c:1732 src/main/generic-options.c:213 +#: src/main/print-escp2.c:2096 src/main/generic-options.c:213 #: src/main/generic-options.c:230 #, fuzzy msgid "Manual Control" msgstr "RuÄní" -#: src/main/print-escp2.c:1771 src/main/print-escp2.c:1863 -#: src/main/print-escp2.c:1875 src/main/print-pcl.c:230 -#: src/main/escp2-channels.c:2805 src/main/escp2-papers.c:1707 -#: src/main/escp2-papers.c:1731 src/main/escp2-papers.c:1764 -#: src/main/escp2-papers.c:1815 src/main/escp2-papers.c:1857 -#: src/main/escp2-papers.c:1899 src/main/escp2-papers.c:1992 -#: src/main/escp2-resolutions.c:640 src/main/escp2-resolutions.c:655 -#: src/main/escp2-resolutions.c:668 src/main/generic-options.c:36 -#: src/gutenprintui/panel.c:2613 src/gutenprintui2/panel.c:2639 +#: src/main/print-escp2.c:2139 src/main/print-escp2.c:2231 +#: src/main/print-escp2.c:2243 src/main/print-pcl.c:237 +#: src/main/escp2-channels.c:2827 src/main/escp2-channels.c:2836 +#: src/main/escp2-papers.c:1718 src/main/escp2-papers.c:1742 +#: src/main/escp2-papers.c:1775 src/main/escp2-papers.c:1826 +#: src/main/escp2-papers.c:1868 src/main/escp2-papers.c:1910 +#: src/main/escp2-papers.c:2003 src/main/escp2-resolutions.c:640 +#: src/main/escp2-resolutions.c:655 src/main/escp2-resolutions.c:670 +#: src/main/escp2-resolutions.c:683 src/main/generic-options.c:36 +#: src/gutenprintui2/panel.c:2814 msgid "Standard" msgstr "Standardní" -#: src/main/print-escp2.c:1842 +#: src/main/print-escp2.c:2210 #, fuzzy msgid "Automatic" msgstr "Automaticky" -#: src/main/print-escp2.c:1844 +#: src/main/print-escp2.c:2212 #, fuzzy msgid "Bidirectional" msgstr "600 DPI JednosmÄ›rnÄ›" -#: src/main/print-escp2.c:1846 +#: src/main/print-escp2.c:2214 #, fuzzy msgid "Unidirectional" msgstr "600 DPI JednosmÄ›rnÄ›" -#: src/main/print-escp2.c:1877 +#: src/main/print-escp2.c:2245 msgid "Alternate Fill" msgstr "" -#: src/main/print-escp2.c:1879 +#: src/main/print-escp2.c:2247 msgid "Ascending Fill" msgstr "" -#: src/main/print-escp2.c:1881 +#: src/main/print-escp2.c:2249 msgid "Descending Fill" msgstr "" -#: src/main/print-escp2.c:1883 +#: src/main/print-escp2.c:2251 msgid "Ascending Double" msgstr "" -#: src/main/print-escp2.c:1885 +#: src/main/print-escp2.c:2253 msgid "Nearest Neighbor Avoidance" msgstr "" -#: src/main/print-escp2.c:2328 +#: src/main/print-escp2.c:2771 #, 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:3436 src/main/print-olympus.c:2451 +#: src/main/print-escp2.c:3934 src/main/print-olympus.c:2449 #: src/main/print-raw.c:217 msgid "Print options not verified; cannot print.\n" msgstr "" @@ -1444,109 +1581,109 @@ msgid "Three Color Composite" msgstr "TÅ™i barvy kompozitní" #: src/main/print-lexmark.c:607 src/main/print-lexmark.c:677 -#: src/main/escp2-channels.c:1540 src/main/escp2-channels.c:1554 -#: src/main/escp2-channels.c:1568 src/main/escp2-channels.c:1582 -#: src/main/escp2-channels.c:1808 src/main/escp2-channels.c:1823 -#: src/main/escp2-channels.c:1838 src/main/escp2-channels.c:1855 +#: src/main/escp2-channels.c:1554 src/main/escp2-channels.c:1568 +#: src/main/escp2-channels.c:1582 src/main/escp2-channels.c:1596 +#: src/main/escp2-channels.c:1822 src/main/escp2-channels.c:1837 +#: src/main/escp2-channels.c:1852 src/main/escp2-channels.c:1869 msgid "Six Color Photo" msgstr "Å est barev foto" #: src/main/print-lexmark.c:610 src/main/print-lexmark.c:680 -#: src/main/escp2-channels.c:1475 src/main/escp2-channels.c:1489 -#: src/main/escp2-channels.c:1503 src/main/escp2-channels.c:1517 -#: src/main/escp2-channels.c:1752 src/main/escp2-channels.c:1767 -#: src/main/escp2-channels.c:1784 +#: src/main/escp2-channels.c:1489 src/main/escp2-channels.c:1503 +#: src/main/escp2-channels.c:1517 src/main/escp2-channels.c:1531 +#: src/main/escp2-channels.c:1766 src/main/escp2-channels.c:1781 +#: src/main/escp2-channels.c:1798 msgid "Five Color Photo Composite" msgstr "PÄ›t barev foto kompozitní" -#: src/main/print-lexmark.c:856 src/main/escp2-papers.c:1341 -#: src/main/escp2-papers.c:1385 src/main/escp2-papers.c:1429 -#: src/main/escp2-papers.c:1477 src/main/escp2-papers.c:1525 -#: src/main/escp2-papers.c:1569 +#: src/main/print-lexmark.c:856 src/main/escp2-papers.c:1351 +#: src/main/escp2-papers.c:1395 src/main/escp2-papers.c:1439 +#: src/main/escp2-papers.c:1487 src/main/escp2-papers.c:1535 +#: src/main/escp2-papers.c:1579 msgid "Plain Paper" msgstr "Normální papír" -#: src/main/print-lexmark.c:860 src/main/escp2-papers.c:1347 -#: src/main/escp2-papers.c:1391 src/main/escp2-papers.c:1435 -#: src/main/escp2-papers.c:1483 src/main/escp2-papers.c:1531 -#: src/main/escp2-papers.c:1575 +#: src/main/print-lexmark.c:860 src/main/escp2-papers.c:1357 +#: src/main/escp2-papers.c:1401 src/main/escp2-papers.c:1445 +#: src/main/escp2-papers.c:1493 src/main/escp2-papers.c:1541 +#: src/main/escp2-papers.c:1585 msgid "Glossy Film" msgstr "Lesklý potah" -#: src/main/print-lexmark.c:864 src/main/escp2-papers.c:1349 -#: src/main/escp2-papers.c:1393 src/main/escp2-papers.c:1437 -#: src/main/escp2-papers.c:1485 src/main/escp2-papers.c:1533 -#: src/main/escp2-papers.c:1577 +#: src/main/print-lexmark.c:864 src/main/escp2-papers.c:1359 +#: src/main/escp2-papers.c:1403 src/main/escp2-papers.c:1447 +#: src/main/escp2-papers.c:1495 src/main/escp2-papers.c:1543 +#: src/main/escp2-papers.c:1587 msgid "Transparencies" msgstr "Fólie" -#: src/main/print-lexmark.c:868 src/main/escp2-papers.c:1351 -#: src/main/escp2-papers.c:1395 src/main/escp2-papers.c:1439 -#: src/main/escp2-papers.c:1487 src/main/escp2-papers.c:1535 -#: src/main/escp2-papers.c:1579 +#: src/main/print-lexmark.c:868 src/main/escp2-papers.c:1361 +#: src/main/escp2-papers.c:1405 src/main/escp2-papers.c:1449 +#: src/main/escp2-papers.c:1497 src/main/escp2-papers.c:1545 +#: src/main/escp2-papers.c:1589 msgid "Envelopes" msgstr "Obálky" -#: src/main/print-lexmark.c:872 src/main/escp2-papers.c:1355 -#: src/main/escp2-papers.c:1399 src/main/escp2-papers.c:1443 -#: src/main/escp2-papers.c:1491 src/main/escp2-papers.c:1539 -#: src/main/escp2-papers.c:1583 +#: src/main/print-lexmark.c:872 src/main/escp2-papers.c:1365 +#: src/main/escp2-papers.c:1409 src/main/escp2-papers.c:1453 +#: src/main/escp2-papers.c:1501 src/main/escp2-papers.c:1549 +#: src/main/escp2-papers.c:1593 msgid "Matte Paper" msgstr "Matný papír" -#: src/main/print-lexmark.c:876 src/main/escp2-papers.c:1359 -#: src/main/escp2-papers.c:1403 src/main/escp2-papers.c:1447 -#: src/main/escp2-papers.c:1495 src/main/escp2-papers.c:1543 -#: src/main/escp2-papers.c:1587 +#: src/main/print-lexmark.c:876 src/main/escp2-papers.c:1369 +#: src/main/escp2-papers.c:1413 src/main/escp2-papers.c:1457 +#: src/main/escp2-papers.c:1505 src/main/escp2-papers.c:1553 +#: src/main/escp2-papers.c:1597 msgid "Inkjet Paper" msgstr "Papír pro inkoustové tiskárny" -#: src/main/print-lexmark.c:880 src/main/escp2-papers.c:1361 -#: src/main/escp2-papers.c:1405 src/main/escp2-papers.c:1449 -#: src/main/escp2-papers.c:1497 src/main/escp2-papers.c:1545 -#: src/main/escp2-papers.c:1589 +#: src/main/print-lexmark.c:880 src/main/escp2-papers.c:1371 +#: src/main/escp2-papers.c:1415 src/main/escp2-papers.c:1459 +#: src/main/escp2-papers.c:1507 src/main/escp2-papers.c:1555 +#: src/main/escp2-papers.c:1599 msgid "Photo Quality Inkjet Paper" msgstr "Papír pro inkoustové tiskárny ve foto kvalitÄ›" -#: src/main/print-lexmark.c:884 src/main/escp2-papers.c:1363 -#: src/main/escp2-papers.c:1407 src/main/escp2-papers.c:1451 -#: src/main/escp2-papers.c:1499 src/main/escp2-papers.c:1547 -#: src/main/escp2-papers.c:1591 +#: src/main/print-lexmark.c:884 src/main/escp2-papers.c:1373 +#: src/main/escp2-papers.c:1417 src/main/escp2-papers.c:1461 +#: src/main/escp2-papers.c:1509 src/main/escp2-papers.c:1557 +#: src/main/escp2-papers.c:1601 msgid "Photo Paper" msgstr "Fotopapír" -#: src/main/print-lexmark.c:888 src/main/escp2-papers.c:1365 -#: src/main/escp2-papers.c:1409 src/main/escp2-papers.c:1453 -#: src/main/escp2-papers.c:1501 src/main/escp2-papers.c:1549 -#: src/main/escp2-papers.c:1593 src/main/escp2-papers.c:1617 +#: src/main/print-lexmark.c:888 src/main/escp2-papers.c:1375 +#: src/main/escp2-papers.c:1419 src/main/escp2-papers.c:1463 +#: src/main/escp2-papers.c:1511 src/main/escp2-papers.c:1559 +#: src/main/escp2-papers.c:1603 src/main/escp2-papers.c:1627 msgid "Premium Glossy Photo Paper" msgstr "Extra lesklý fotopapír" -#: src/main/print-lexmark.c:892 src/main/escp2-papers.c:1369 -#: src/main/escp2-papers.c:1413 src/main/escp2-papers.c:1457 -#: src/main/escp2-papers.c:1505 src/main/escp2-papers.c:1553 -#: src/main/escp2-papers.c:1597 +#: src/main/print-lexmark.c:892 src/main/escp2-papers.c:1379 +#: src/main/escp2-papers.c:1423 src/main/escp2-papers.c:1467 +#: src/main/escp2-papers.c:1515 src/main/escp2-papers.c:1563 +#: src/main/escp2-papers.c:1607 msgid "Premium Luster Photo Paper" msgstr "" -#: src/main/print-lexmark.c:896 src/main/escp2-papers.c:1371 -#: src/main/escp2-papers.c:1415 src/main/escp2-papers.c:1463 -#: src/main/escp2-papers.c:1511 src/main/escp2-papers.c:1555 -#: src/main/escp2-papers.c:1603 +#: src/main/print-lexmark.c:896 src/main/escp2-papers.c:1381 +#: src/main/escp2-papers.c:1425 src/main/escp2-papers.c:1473 +#: src/main/escp2-papers.c:1521 src/main/escp2-papers.c:1565 +#: src/main/escp2-papers.c:1613 msgid "Photo Quality Glossy Paper" msgstr "Lesklý papír ve foto kvalitÄ›" -#: src/main/print-lexmark.c:900 src/main/escp2-papers.c:1373 -#: src/main/escp2-papers.c:1417 src/main/escp2-papers.c:1465 -#: src/main/escp2-papers.c:1513 src/main/escp2-papers.c:1557 -#: src/main/escp2-papers.c:1605 +#: src/main/print-lexmark.c:900 src/main/escp2-papers.c:1383 +#: src/main/escp2-papers.c:1427 src/main/escp2-papers.c:1475 +#: src/main/escp2-papers.c:1523 src/main/escp2-papers.c:1567 +#: src/main/escp2-papers.c:1615 msgid "Ilford Heavy Paper" msgstr "" -#: src/main/print-lexmark.c:904 src/main/escp2-papers.c:1377 -#: src/main/escp2-papers.c:1421 src/main/escp2-papers.c:1469 -#: src/main/escp2-papers.c:1517 src/main/escp2-papers.c:1561 -#: src/main/escp2-papers.c:1609 src/main/escp2-papers.c:1619 +#: src/main/print-lexmark.c:904 src/main/escp2-papers.c:1387 +#: src/main/escp2-papers.c:1431 src/main/escp2-papers.c:1479 +#: src/main/escp2-papers.c:1527 src/main/escp2-papers.c:1571 +#: src/main/escp2-papers.c:1619 src/main/escp2-papers.c:1629 msgid "Other" msgstr "Jiný" @@ -1562,56 +1699,56 @@ msgstr "RuÄní s pÅ™estávkou" msgid "Manual without Pause" msgstr "RuÄní bez pÅ™estávky" -#: src/main/print-olympus.c:277 +#: src/main/print-olympus.c:275 msgid "Coated" msgstr "" -#: src/main/print-olympus.c:278 src/cups/genppd.c:1726 src/cups/genppd.c:1753 -#: src/cups/genppd.c:1834 +#: src/main/print-olympus.c:276 src/cups/genppd.c:1732 src/cups/genppd.c:1759 +#: src/cups/genppd.c:1840 msgid "None" msgstr "" -#: src/main/print-olympus.c:963 src/main/print-olympus.c:1023 -#: src/main/print-olympus.c:1127 +#: src/main/print-olympus.c:961 src/main/print-olympus.c:1021 +#: src/main/print-olympus.c:1125 #, fuzzy msgid "Glossy" msgstr "Lesklý potah" -#: src/main/print-olympus.c:964 src/main/print-olympus.c:1024 -#: src/main/print-olympus.c:1128 +#: src/main/print-olympus.c:962 src/main/print-olympus.c:1022 +#: src/main/print-olympus.c:1126 msgid "Texture" msgstr "" -#: src/main/print-olympus.c:1025 src/main/print-olympus.c:1129 +#: src/main/print-olympus.c:1023 src/main/print-olympus.c:1127 #, fuzzy msgid "Matte" msgstr "Matný papír" -#: src/main/print-olympus.c:1729 src/main/print-olympus.c:1730 +#: src/main/print-olympus.c:1727 src/main/print-olympus.c:1728 msgid "Laminate Pattern" msgstr "" -#: src/main/print-olympus.c:1765 +#: src/main/print-olympus.c:1763 #, fuzzy msgid "Adjust the cyan balance" msgstr "Upravit vyrovnání modrozelené tisku" -#: src/main/print-olympus.c:1773 +#: src/main/print-olympus.c:1771 #, fuzzy msgid "Adjust the magenta balance" msgstr "Upravit vyrovnání fialové tisku" -#: src/main/print-olympus.c:1781 +#: src/main/print-olympus.c:1779 #, fuzzy msgid "Adjust the yellow balance" msgstr "Upravit vyrovnání žluté tisku" -#: src/main/print-olympus.c:1788 +#: src/main/print-olympus.c:1786 #, fuzzy msgid "Black Balance" msgstr "ÄŒernobíle" -#: src/main/print-olympus.c:1789 +#: src/main/print-olympus.c:1787 #, fuzzy msgid "Adjust the black balance" msgstr "Upravit vyrovnání modrozelené tisku" @@ -1644,93 +1781,117 @@ msgstr "Rychleschnoucí foto" msgid "Quick-dry Transparency" msgstr "Rychleschnoucí fólie" -#: src/main/print-pcl.c:231 src/main/xmli18n-tmp.h:16 +#: src/main/print-pcl.c:238 src/main/xmli18n-tmp.h:17 msgid "Manual" msgstr "RuÄní" -#: src/main/print-pcl.c:233 +#: src/main/print-pcl.c:240 +msgid "Tray 1 - Movable Guides" +msgstr "" + +#: src/main/print-pcl.c:241 msgid "Tray 1" msgstr "PodavaÄ 1" -#: src/main/print-pcl.c:234 src/main/print-pcl.c:240 +#: src/main/print-pcl.c:242 +msgid "Tray 2 - Movable Guides" +msgstr "" + +#: src/main/print-pcl.c:243 src/main/print-pcl.c:251 msgid "Tray 2" msgstr "PodavaÄ 2" -#: src/main/print-pcl.c:235 +#: src/main/print-pcl.c:244 +msgid "Tray 3 - Movable Guides" +msgstr "" + +#: src/main/print-pcl.c:245 msgid "Tray 3" msgstr "PodavaÄ 3" -#: src/main/print-pcl.c:236 +#: src/main/print-pcl.c:246 +msgid "Tray 4 - Movable Guides" +msgstr "" + +#: src/main/print-pcl.c:247 msgid "Tray 4" msgstr "PodavaÄ 4" -#: src/main/print-pcl.c:237 +#: src/main/print-pcl.c:248 msgid "Portable Sheet Feeder" msgstr "PÅ™enosný podavaÄ papíru" -#: src/main/print-pcl.c:238 +#: src/main/print-pcl.c:249 msgid "Desktop Sheet Feeder" msgstr "PodavaÄ papíru na stole" -#: src/main/print-pcl.c:239 +#: src/main/print-pcl.c:250 msgid "Tray" msgstr "PodavaÄ" -#: src/main/print-pcl.c:241 +#: src/main/print-pcl.c:252 msgid "Optional Source" msgstr "Nepovinný zdroj" -#: src/main/print-pcl.c:242 +#: src/main/print-pcl.c:253 msgid "Autoselect" msgstr "Automaticky vybrat" -#: src/main/print-pcl.c:256 +#: src/main/print-pcl.c:267 msgid "150x150 DPI" msgstr "150×150 DPI" -#: src/main/print-pcl.c:257 +#: src/main/print-pcl.c:268 msgid "300x300 DPI" msgstr "300×300 DPI" -#: src/main/print-pcl.c:258 +#: src/main/print-pcl.c:269 msgid "600x300 DPI" msgstr "600×300 DPI" -#: src/main/print-pcl.c:259 +#: src/main/print-pcl.c:270 msgid "600x600 DPI monochrome" msgstr "600×600 DPI Äernobíle" -#: src/main/print-pcl.c:260 +#: src/main/print-pcl.c:271 msgid "600x600 DPI" msgstr "600×600 DPI" -#: src/main/print-pcl.c:261 +#: src/main/print-pcl.c:272 msgid "1200x600 DPI" msgstr "1200×600 DPI" -#: src/main/print-pcl.c:262 +#: src/main/print-pcl.c:273 msgid "2400x600 DPI" msgstr "2400×600 DPI" -#: src/main/print-pcl.c:1470 +#: src/main/print-pcl.c:1538 msgid "Color + Black Cartridges" msgstr "Barevná a Äerná cartridge" -#: src/main/print-pcl.c:1471 +#: src/main/print-pcl.c:1539 msgid "Color + Photo Cartridges" msgstr "Barevná a foto cartridge" -#: src/main/print-ps.c:97 +#: src/main/print-ps.c:68 #, fuzzy msgid "PPDFile" msgstr "Soubor PPD:" -#: src/main/print-ps.c:98 src/gutenprintui/panel.c:1768 -#: src/gutenprintui2/panel.c:1768 +#: src/main/print-ps.c:69 src/gutenprintui2/panel.c:1943 #, fuzzy msgid "PPD File" msgstr "Soubor PPD?" +#: src/main/print-ps.c:74 +#, fuzzy +msgid "Model Name" +msgstr "ZruÅ¡it" + +#: src/main/print-ps.c:75 +msgid "PPD File Model Name" +msgstr "" + #: src/main/print-raw.c:223 msgid "Image dimensions must match paper dimensions" msgstr "" @@ -1747,289 +1908,295 @@ msgstr "Dva úrovnÄ› stupňů Å¡edi" #: src/main/escp2-channels.c:1035 src/main/escp2-channels.c:1048 #: src/main/escp2-channels.c:1061 src/main/escp2-channels.c:1074 #: src/main/escp2-channels.c:1087 src/main/escp2-channels.c:1100 -#: src/main/escp2-channels.c:2505 src/main/escp2-channels.c:2528 -#: src/main/escp2-channels.c:2548 src/main/escp2-channels.c:2568 -#: src/main/escp2-channels.c:2588 src/main/escp2-channels.c:2608 +#: src/main/escp2-channels.c:2525 src/main/escp2-channels.c:2548 +#: src/main/escp2-channels.c:2568 src/main/escp2-channels.c:2588 +#: src/main/escp2-channels.c:2608 src/main/escp2-channels.c:2628 msgid "Quadtone" msgstr "Quadtone" -#: src/main/escp2-channels.c:1604 src/main/escp2-channels.c:1618 +#: src/main/escp2-channels.c:1466 +#, fuzzy +msgid "Four Color Photo" +msgstr "Å est barev foto" + +#: src/main/escp2-channels.c:1618 src/main/escp2-channels.c:1632 msgid "Six Color Enhanced Composite" msgstr "Å et barev rozšířené kompozitní" -#: src/main/escp2-channels.c:1641 src/main/escp2-channels.c:1655 -#: src/main/escp2-channels.c:1669 src/main/escp2-channels.c:1705 +#: src/main/escp2-channels.c:1655 src/main/escp2-channels.c:1669 +#: src/main/escp2-channels.c:1683 src/main/escp2-channels.c:1719 msgid "Seven Color Photo" msgstr "Sedm barev foto" -#: src/main/escp2-channels.c:1691 +#: src/main/escp2-channels.c:1705 msgid "Seven Color Enhanced" msgstr "Sedm barev rozšířené" -#: src/main/escp2-channels.c:1728 +#: src/main/escp2-channels.c:1742 #, fuzzy msgid "Eight Color Photo" msgstr "Å est barev foto" -#: src/main/escp2-channels.c:1876 src/main/escp2-channels.c:1888 -#: src/main/escp2-channels.c:1894 +#: src/main/escp2-channels.c:1890 src/main/escp2-channels.c:1902 +#: src/main/escp2-channels.c:1908 msgid "One Color Raw" msgstr "" -#: src/main/escp2-channels.c:1900 +#: src/main/escp2-channels.c:1914 #, fuzzy msgid "One Color Raw Enhanced Gloss" msgstr "Sedm barev rozšířené" -#: src/main/escp2-channels.c:1913 src/main/escp2-channels.c:1925 +#: src/main/escp2-channels.c:1927 src/main/escp2-channels.c:1939 msgid "Two Color Raw" msgstr "" -#: src/main/escp2-channels.c:1939 src/main/escp2-channels.c:1953 -#: src/main/escp2-channels.c:1980 src/main/escp2-channels.c:1993 -#: src/main/escp2-channels.c:2006 src/main/escp2-channels.c:2019 -#: src/main/escp2-channels.c:2033 src/main/escp2-channels.c:2047 -#: src/main/escp2-channels.c:2060 +#: src/main/escp2-channels.c:1953 src/main/escp2-channels.c:1967 +#: src/main/escp2-channels.c:1994 src/main/escp2-channels.c:2007 +#: src/main/escp2-channels.c:2020 src/main/escp2-channels.c:2033 +#: src/main/escp2-channels.c:2047 src/main/escp2-channels.c:2061 +#: src/main/escp2-channels.c:2074 #, fuzzy msgid "Three Color Raw" msgstr "TÅ™i barvy kompozitní" -#: src/main/escp2-channels.c:1967 +#: src/main/escp2-channels.c:1981 #, fuzzy msgid "Three Color Raw Gloss" msgstr "TÅ™i barvy kompozitní" -#: src/main/escp2-channels.c:2067 src/main/escp2-channels.c:2073 -#: src/main/escp2-channels.c:2079 src/main/escp2-channels.c:2085 -#: src/main/escp2-channels.c:2091 src/main/escp2-channels.c:2097 -#: src/main/escp2-channels.c:2103 src/main/escp2-channels.c:2109 -#: src/main/escp2-channels.c:2115 src/main/escp2-channels.c:2121 +#: src/main/escp2-channels.c:2081 src/main/escp2-channels.c:2087 +#: src/main/escp2-channels.c:2093 src/main/escp2-channels.c:2099 +#: src/main/escp2-channels.c:2105 src/main/escp2-channels.c:2111 +#: src/main/escp2-channels.c:2117 src/main/escp2-channels.c:2123 +#: src/main/escp2-channels.c:2129 src/main/escp2-channels.c:2135 +#: src/main/escp2-channels.c:2141 #, fuzzy msgid "Four Color Raw" msgstr "ÄŒtyÅ™i barvy standardní" -#: src/main/escp2-channels.c:2127 +#: src/main/escp2-channels.c:2147 #, fuzzy msgid "Four Color Raw Gloss" msgstr "ÄŒtyÅ™i barvy standardní" -#: src/main/escp2-channels.c:2142 src/main/escp2-channels.c:2156 +#: src/main/escp2-channels.c:2162 src/main/escp2-channels.c:2176 msgid "Five Color Raw" msgstr "" -#: src/main/escp2-channels.c:2170 src/main/escp2-channels.c:2186 -#: src/main/escp2-channels.c:2192 src/main/escp2-channels.c:2198 -#: src/main/escp2-channels.c:2213 src/main/escp2-channels.c:2234 +#: src/main/escp2-channels.c:2190 src/main/escp2-channels.c:2206 +#: src/main/escp2-channels.c:2212 src/main/escp2-channels.c:2218 +#: src/main/escp2-channels.c:2233 src/main/escp2-channels.c:2254 #, fuzzy msgid "Six Color Raw" msgstr "Å est barev foto" -#: src/main/escp2-channels.c:2219 +#: src/main/escp2-channels.c:2239 #, fuzzy msgid "Six Color Enhanced Gloss Raw" msgstr "Å et barev rozšířené kompozitní" -#: src/main/escp2-channels.c:2250 src/main/escp2-channels.c:2265 -#: src/main/escp2-channels.c:2280 +#: src/main/escp2-channels.c:2270 src/main/escp2-channels.c:2285 +#: src/main/escp2-channels.c:2300 #, fuzzy msgid "Seven Color Raw" msgstr "Sedm barev foto" -#: src/main/escp2-channels.c:2297 +#: src/main/escp2-channels.c:2317 #, fuzzy msgid "Seven Color Enhanced Gloss Raw" msgstr "Sedm barev rozšířené" -#: src/main/escp2-channels.c:2315 +#: src/main/escp2-channels.c:2335 #, fuzzy msgid "Eight Color Raw" msgstr "Å est barev foto" -#: src/main/escp2-channels.c:2482 src/main/escp2-channels.c:2495 -#: src/main/escp2-channels.c:2497 src/main/escp2-channels.c:2517 -#: src/main/escp2-channels.c:2520 src/main/escp2-channels.c:2540 -#: src/main/escp2-channels.c:2560 src/main/escp2-channels.c:2580 -#: src/main/escp2-channels.c:2600 src/main/escp2-channels.c:2620 -#: src/main/escp2-channels.c:2636 src/main/escp2-channels.c:2638 -#: src/main/escp2-channels.c:2640 src/main/escp2-channels.c:2642 -#: src/main/escp2-channels.c:2658 src/main/escp2-channels.c:2674 -#: src/main/escp2-channels.c:2694 +#: src/main/escp2-channels.c:2502 src/main/escp2-channels.c:2515 +#: src/main/escp2-channels.c:2517 src/main/escp2-channels.c:2537 +#: src/main/escp2-channels.c:2540 src/main/escp2-channels.c:2560 +#: src/main/escp2-channels.c:2580 src/main/escp2-channels.c:2600 +#: src/main/escp2-channels.c:2620 src/main/escp2-channels.c:2640 +#: src/main/escp2-channels.c:2656 src/main/escp2-channels.c:2658 +#: src/main/escp2-channels.c:2660 src/main/escp2-channels.c:2662 +#: src/main/escp2-channels.c:2678 src/main/escp2-channels.c:2694 +#: src/main/escp2-channels.c:2714 msgid "EPSON Standard Inks" msgstr "" -#: src/main/escp2-channels.c:2714 src/main/escp2-channels.c:2739 +#: src/main/escp2-channels.c:2734 src/main/escp2-channels.c:2759 #, fuzzy msgid "UltraChrome Photo Black" msgstr "Å est barev foto" -#: src/main/escp2-channels.c:2718 src/main/escp2-channels.c:2743 +#: src/main/escp2-channels.c:2738 src/main/escp2-channels.c:2763 msgid "UltraChrome Matte Black" msgstr "" -#: src/main/escp2-channels.c:2758 src/main/escp2-channels.c:2796 -#: src/main/escp2-channels.c:3167 src/escputil/escputil.c:976 +#: src/main/escp2-channels.c:2778 src/main/escp2-channels.c:2816 +#: src/main/escp2-channels.c:3206 src/escputil/escputil.c:976 #, fuzzy msgid "Photo Black" msgstr "Fotopapír" -#: src/main/escp2-channels.c:2762 src/main/escp2-channels.c:2778 -#: src/main/escp2-channels.c:3166 src/escputil/escputil.c:986 +#: src/main/escp2-channels.c:2782 src/main/escp2-channels.c:2798 +#: src/main/escp2-channels.c:3205 src/escputil/escputil.c:986 #, fuzzy msgid "Matte Black" msgstr "Matný papír" -#: src/main/escp2-channels.c:3092 src/main/escp2-channels.c:3102 -#: src/main/escp2-channels.c:3114 src/main/escp2-channels.c:3128 -#: src/main/escp2-channels.c:3141 src/main/escp2-channels.c:3154 -#: src/main/escp2-channels.c:3191 src/escputil/escputil.c:981 +#: src/main/escp2-channels.c:3131 src/main/escp2-channels.c:3141 +#: src/main/escp2-channels.c:3153 src/main/escp2-channels.c:3167 +#: src/main/escp2-channels.c:3180 src/main/escp2-channels.c:3193 +#: src/main/escp2-channels.c:3240 src/escputil/escputil.c:981 #: src/escputil/escputil.c:1204 #, fuzzy msgid "Light Cyan" msgstr "SvÄ›tle modrozelená" -#: src/main/escp2-channels.c:3093 src/main/escp2-channels.c:3104 -#: src/main/escp2-channels.c:3115 src/main/escp2-channels.c:3129 -#: src/main/escp2-channels.c:3142 src/main/escp2-channels.c:3155 -#: src/main/escp2-channels.c:3190 src/escputil/escputil.c:982 +#: src/main/escp2-channels.c:3132 src/main/escp2-channels.c:3143 +#: src/main/escp2-channels.c:3154 src/main/escp2-channels.c:3168 +#: src/main/escp2-channels.c:3181 src/main/escp2-channels.c:3194 +#: src/main/escp2-channels.c:3239 src/escputil/escputil.c:982 #: src/escputil/escputil.c:1205 #, fuzzy msgid "Light Magenta" msgstr "SvÄ›tle fialová" -#: src/main/escp2-channels.c:3130 src/main/escp2-channels.c:3192 +#: src/main/escp2-channels.c:3169 src/main/escp2-channels.c:3241 #: src/escputil/escputil.c:985 #, fuzzy msgid "Light Black" msgstr "ÄŒerná" -#: src/main/escp2-channels.c:3143 +#: src/main/escp2-channels.c:3182 #, fuzzy msgid "Dark Yellow" msgstr "ÄŒerná/tmavá žlutá" -#: src/main/escp2-channels.c:3170 src/escputil/escputil.c:989 +#: src/main/escp2-channels.c:3209 src/escputil/escputil.c:989 #, fuzzy msgid "Gloss Optimizer" msgstr "Lesklý potah" -#: src/main/escp2-channels.c:3189 src/escputil/escputil.c:990 +#: src/main/escp2-channels.c:3238 src/escputil/escputil.c:990 #, fuzzy msgid "Light Light Black" msgstr "ÄŒerná" -#: src/main/escp2-papers.c:1343 src/main/escp2-papers.c:1387 -#: src/main/escp2-papers.c:1431 src/main/escp2-papers.c:1479 -#: src/main/escp2-papers.c:1527 src/main/escp2-papers.c:1571 +#: src/main/escp2-papers.c:1353 src/main/escp2-papers.c:1397 +#: src/main/escp2-papers.c:1441 src/main/escp2-papers.c:1489 +#: src/main/escp2-papers.c:1537 src/main/escp2-papers.c:1581 msgid "Plain Paper Fast Load" msgstr "Rychlé podávání normálního papíru" -#: src/main/escp2-papers.c:1345 src/main/escp2-papers.c:1389 -#: src/main/escp2-papers.c:1433 src/main/escp2-papers.c:1481 -#: src/main/escp2-papers.c:1529 src/main/escp2-papers.c:1573 +#: src/main/escp2-papers.c:1355 src/main/escp2-papers.c:1399 +#: src/main/escp2-papers.c:1443 src/main/escp2-papers.c:1491 +#: src/main/escp2-papers.c:1539 src/main/escp2-papers.c:1583 #: src/main/xmli18n-tmp.h:5 msgid "Postcard" msgstr "Pohlednice" -#: src/main/escp2-papers.c:1353 src/main/escp2-papers.c:1397 -#: src/main/escp2-papers.c:1441 src/main/escp2-papers.c:1489 -#: src/main/escp2-papers.c:1537 src/main/escp2-papers.c:1581 +#: src/main/escp2-papers.c:1363 src/main/escp2-papers.c:1407 +#: src/main/escp2-papers.c:1451 src/main/escp2-papers.c:1499 +#: src/main/escp2-papers.c:1547 src/main/escp2-papers.c:1591 msgid "Back Light Film" msgstr "" -#: src/main/escp2-papers.c:1357 src/main/escp2-papers.c:1401 -#: src/main/escp2-papers.c:1445 src/main/escp2-papers.c:1493 -#: src/main/escp2-papers.c:1541 src/main/escp2-papers.c:1585 +#: src/main/escp2-papers.c:1367 src/main/escp2-papers.c:1411 +#: src/main/escp2-papers.c:1455 src/main/escp2-papers.c:1503 +#: src/main/escp2-papers.c:1551 src/main/escp2-papers.c:1595 #, fuzzy msgid "Matte Paper Heavyweight" msgstr "Matný papír" -#: src/main/escp2-papers.c:1367 src/main/escp2-papers.c:1411 -#: src/main/escp2-papers.c:1455 src/main/escp2-papers.c:1503 -#: src/main/escp2-papers.c:1551 src/main/escp2-papers.c:1595 +#: src/main/escp2-papers.c:1377 src/main/escp2-papers.c:1421 +#: src/main/escp2-papers.c:1465 src/main/escp2-papers.c:1513 +#: src/main/escp2-papers.c:1561 src/main/escp2-papers.c:1605 #, fuzzy msgid "Premium Semigloss Photo Paper" msgstr "Extra lesklý fotopapír" -#: src/main/escp2-papers.c:1375 src/main/escp2-papers.c:1419 -#: src/main/escp2-papers.c:1467 src/main/escp2-papers.c:1515 -#: src/main/escp2-papers.c:1559 src/main/escp2-papers.c:1607 +#: src/main/escp2-papers.c:1385 src/main/escp2-papers.c:1429 +#: src/main/escp2-papers.c:1477 src/main/escp2-papers.c:1525 +#: src/main/escp2-papers.c:1569 src/main/escp2-papers.c:1617 #, fuzzy msgid "ColorLife Paper" msgstr "Papír ColorLife" -#: src/main/escp2-papers.c:1459 src/main/escp2-papers.c:1507 -#: src/main/escp2-papers.c:1599 +#: src/main/escp2-papers.c:1469 src/main/escp2-papers.c:1517 +#: src/main/escp2-papers.c:1609 #, fuzzy msgid "Archival Matte Paper" msgstr "Matný papír" -#: src/main/escp2-papers.c:1461 src/main/escp2-papers.c:1509 -#: src/main/escp2-papers.c:1601 +#: src/main/escp2-papers.c:1471 src/main/escp2-papers.c:1519 +#: src/main/escp2-papers.c:1611 msgid "Watercolor Paper - Radiant White" msgstr "" -#: src/main/escp2-papers.c:1716 src/main/escp2-papers.c:1842 -#: src/main/escp2-papers.c:1884 src/main/escp2-papers.c:1926 -#: src/main/escp2-papers.c:2001 +#: src/main/escp2-papers.c:1727 src/main/escp2-papers.c:1853 +#: src/main/escp2-papers.c:1895 src/main/escp2-papers.c:1937 +#: src/main/escp2-papers.c:2012 msgid "Roll Feed" msgstr "Podávací válec" -#: src/main/escp2-papers.c:1740 src/main/escp2-papers.c:1791 +#: src/main/escp2-papers.c:1751 src/main/escp2-papers.c:1802 msgid "Roll Feed (cut each page)" msgstr "Podávací válec (odříznout každou stranu)" -#: src/main/escp2-papers.c:1749 src/main/escp2-papers.c:1800 +#: src/main/escp2-papers.c:1760 src/main/escp2-papers.c:1811 msgid "Roll Feed (do not cut)" msgstr "Podávací válec (neodÅ™ezávat)" -#: src/main/escp2-papers.c:1773 src/main/escp2-papers.c:1824 +#: src/main/escp2-papers.c:1784 src/main/escp2-papers.c:1835 #, fuzzy msgid "Manual Feed" msgstr "RuÄní" -#: src/main/escp2-papers.c:1782 src/main/escp2-papers.c:1833 -#: src/main/escp2-papers.c:1935 src/main/escp2-papers.c:1968 +#: src/main/escp2-papers.c:1793 src/main/escp2-papers.c:1844 +#: src/main/escp2-papers.c:1946 src/main/escp2-papers.c:1979 #, fuzzy msgid "Print to CD" msgstr "Tisknout do souboru?" -#: src/main/escp2-papers.c:1866 src/main/escp2-papers.c:1908 +#: src/main/escp2-papers.c:1877 src/main/escp2-papers.c:1919 #, fuzzy msgid "Manual Sheet Guide" msgstr "RuÄní výbÄ›r" -#: src/main/escp2-papers.c:1875 src/main/escp2-papers.c:1917 +#: src/main/escp2-papers.c:1886 src/main/escp2-papers.c:1928 #, fuzzy msgid "Manual Feed (Front)" msgstr "RuÄní" -#: src/main/escp2-papers.c:1950 +#: src/main/escp2-papers.c:1961 #, fuzzy msgid "Rear Tray" msgstr "PodavaÄ" -#: src/main/escp2-papers.c:1959 +#: src/main/escp2-papers.c:1970 msgid "Front Tray" msgstr "" -#: src/main/escp2-papers.c:1977 +#: src/main/escp2-papers.c:1988 #, fuzzy msgid "Photo Board" msgstr "Fotopapír" -#: src/main/escp2-papers.c:2016 +#: src/main/escp2-papers.c:2027 msgid "Cut Sheet Bin 1" msgstr "PÅ™ihrádka Å™ezaných listů 1" -#: src/main/escp2-papers.c:2025 +#: src/main/escp2-papers.c:2036 msgid "Cut Sheet Bin 2" msgstr "PÅ™ihrádka Å™ezaných listů 2" -#: src/main/escp2-papers.c:2034 +#: src/main/escp2-papers.c:2045 msgid "Cut Sheet Autoselect" msgstr "Automatický výbÄ›r Å™ezaných listů" -#: src/main/escp2-papers.c:2043 +#: src/main/escp2-papers.c:2054 msgid "Manual Selection" msgstr "RuÄní výbÄ›r" @@ -2191,46 +2358,52 @@ msgid "Eight Pass" msgstr "Jas:" #: src/main/escp2-resolutions.c:637 src/main/escp2-resolutions.c:652 -#: src/main/generic-options.c:33 +#: src/main/escp2-resolutions.c:667 src/main/generic-options.c:33 msgid "Fast Economy" msgstr "" #: src/main/escp2-resolutions.c:638 src/main/escp2-resolutions.c:653 -#: src/main/generic-options.c:34 +#: src/main/escp2-resolutions.c:668 src/main/generic-options.c:34 msgid "Economy" msgstr "" #: src/main/escp2-resolutions.c:639 src/main/escp2-resolutions.c:654 -#: src/main/escp2-resolutions.c:667 src/main/generic-options.c:35 +#: src/main/escp2-resolutions.c:669 src/main/escp2-resolutions.c:682 +#: src/main/generic-options.c:35 msgid "Draft" msgstr "" #: src/main/escp2-resolutions.c:641 src/main/escp2-resolutions.c:656 -#: src/main/escp2-resolutions.c:670 src/main/generic-options.c:37 +#: src/main/escp2-resolutions.c:671 src/main/escp2-resolutions.c:685 +#: src/main/generic-options.c:37 #, fuzzy msgid "High" msgstr "Výška:" #: src/main/escp2-resolutions.c:642 src/main/escp2-resolutions.c:657 -#: src/main/escp2-resolutions.c:669 src/main/generic-options.c:38 +#: src/main/escp2-resolutions.c:672 src/main/escp2-resolutions.c:684 +#: src/main/generic-options.c:38 #, fuzzy msgid "Photo" msgstr "Fotografie" #: src/main/escp2-resolutions.c:643 src/main/escp2-resolutions.c:658 -#: src/main/escp2-resolutions.c:671 src/main/generic-options.c:39 +#: src/main/escp2-resolutions.c:673 src/main/escp2-resolutions.c:686 +#: src/main/generic-options.c:39 #, fuzzy msgid "Super Photo" msgstr "Stylus Photo" #: src/main/escp2-resolutions.c:644 src/main/escp2-resolutions.c:659 -#: src/main/escp2-resolutions.c:672 src/main/generic-options.c:40 +#: src/main/escp2-resolutions.c:674 src/main/escp2-resolutions.c:687 +#: src/main/generic-options.c:40 #, fuzzy msgid "Ultra Photo" msgstr "Å est barev foto" #: src/main/escp2-resolutions.c:645 src/main/escp2-resolutions.c:660 -#: src/main/escp2-resolutions.c:673 src/main/generic-options.c:41 +#: src/main/escp2-resolutions.c:675 src/main/escp2-resolutions.c:688 +#: src/main/generic-options.c:41 msgid "Best" msgstr "" @@ -2313,4349 +2486,4603 @@ msgid "3x5" msgstr "3×5" #: src/main/xmli18n-tmp.h:10 +msgid "3 1/2 x5" +msgstr "" + +#: src/main/xmli18n-tmp.h:11 msgid "4x6" msgstr "4×6" -#: src/main/xmli18n-tmp.h:11 +#: src/main/xmli18n-tmp.h:12 #, fuzzy msgid "Epson 4x6 Photo Paper (tear-off borders)" msgstr "Epson fotopapír 4×6" -#: src/main/xmli18n-tmp.h:12 +#: src/main/xmli18n-tmp.h:13 msgid "5x7" msgstr "5×7" -#: src/main/xmli18n-tmp.h:13 +#: src/main/xmli18n-tmp.h:14 msgid "5x8" msgstr "5×8" -#: src/main/xmli18n-tmp.h:14 +#: src/main/xmli18n-tmp.h:15 msgid "6x8" msgstr "6×8" -#: src/main/xmli18n-tmp.h:15 +#: src/main/xmli18n-tmp.h:16 msgid "8x10" msgstr "8×10" -#: src/main/xmli18n-tmp.h:17 +#: src/main/xmli18n-tmp.h:18 msgid "12x18" msgstr "12×18" -#: src/main/xmli18n-tmp.h:18 +#: src/main/xmli18n-tmp.h:19 msgid "Super B 13x19" msgstr "Super B 13×19" -#: src/main/xmli18n-tmp.h:19 +#: src/main/xmli18n-tmp.h:20 msgid "Engineering C 17x22" msgstr "" -#: src/main/xmli18n-tmp.h:20 +#: src/main/xmli18n-tmp.h:21 msgid "8x12" msgstr "8×12" -#: src/main/xmli18n-tmp.h:21 +#: src/main/xmli18n-tmp.h:22 msgid "11x14" msgstr "11×14" -#: src/main/xmli18n-tmp.h:22 +#: src/main/xmli18n-tmp.h:23 msgid "16x20" msgstr "16×20" -#: src/main/xmli18n-tmp.h:23 +#: src/main/xmli18n-tmp.h:24 msgid "16x24" msgstr "16×24" -#: src/main/xmli18n-tmp.h:24 +#: src/main/xmli18n-tmp.h:25 msgid "20x24" msgstr "20×24" -#: src/main/xmli18n-tmp.h:25 +#: src/main/xmli18n-tmp.h:26 msgid "20x30" msgstr "20×30" -#: src/main/xmli18n-tmp.h:26 +#: src/main/xmli18n-tmp.h:27 msgid "22x30" msgstr "22×30" -#: src/main/xmli18n-tmp.h:27 +#: src/main/xmli18n-tmp.h:28 msgid "24x30" msgstr "24×30" -#: src/main/xmli18n-tmp.h:28 +#: src/main/xmli18n-tmp.h:29 msgid "Super A1 24x36" msgstr "" -#: src/main/xmli18n-tmp.h:29 +#: src/main/xmli18n-tmp.h:30 msgid "30x40" msgstr "30×40" -#: src/main/xmli18n-tmp.h:30 +#: src/main/xmli18n-tmp.h:31 msgid "4A" msgstr "4A" -#: src/main/xmli18n-tmp.h:31 +#: src/main/xmli18n-tmp.h:32 msgid "2A" msgstr "2A" -#: src/main/xmli18n-tmp.h:32 +#: src/main/xmli18n-tmp.h:33 #, fuzzy msgid "Super A0" msgstr "Stylus Photo" -#: src/main/xmli18n-tmp.h:33 +#: src/main/xmli18n-tmp.h:34 msgid "A0" msgstr "A0" -#: src/main/xmli18n-tmp.h:34 +#: src/main/xmli18n-tmp.h:35 msgid "A1" msgstr "A1" -#: src/main/xmli18n-tmp.h:35 +#: src/main/xmli18n-tmp.h:36 msgid "A2" msgstr "A2" -#: src/main/xmli18n-tmp.h:36 +#: src/main/xmli18n-tmp.h:37 msgid "A3" msgstr "A3" -#: src/main/xmli18n-tmp.h:37 +#: src/main/xmli18n-tmp.h:38 msgid "A4" msgstr "A4" -#: src/main/xmli18n-tmp.h:38 +#: src/main/xmli18n-tmp.h:39 msgid "A5" msgstr "A5" -#: src/main/xmli18n-tmp.h:39 +#: src/main/xmli18n-tmp.h:40 msgid "A6" msgstr "A6" -#: src/main/xmli18n-tmp.h:40 +#: src/main/xmli18n-tmp.h:41 msgid "A7" msgstr "A7" -#: src/main/xmli18n-tmp.h:41 +#: src/main/xmli18n-tmp.h:42 msgid "A8" msgstr "A8" -#: src/main/xmli18n-tmp.h:42 +#: src/main/xmli18n-tmp.h:43 msgid "A9" msgstr "A9" -#: src/main/xmli18n-tmp.h:43 +#: src/main/xmli18n-tmp.h:44 msgid "A10" msgstr "A10" -#: src/main/xmli18n-tmp.h:44 +#: src/main/xmli18n-tmp.h:45 msgid "RA0" msgstr "RA0" -#: src/main/xmli18n-tmp.h:45 +#: src/main/xmli18n-tmp.h:46 msgid "RA1" msgstr "RA1" -#: src/main/xmli18n-tmp.h:46 +#: src/main/xmli18n-tmp.h:47 msgid "RA2" msgstr "RA2" -#: src/main/xmli18n-tmp.h:47 +#: src/main/xmli18n-tmp.h:48 msgid "RA3" msgstr "RA3" -#: src/main/xmli18n-tmp.h:48 +#: src/main/xmli18n-tmp.h:49 msgid "RA4" msgstr "RA4" -#: src/main/xmli18n-tmp.h:49 +#: src/main/xmli18n-tmp.h:50 msgid "SRA0" msgstr "SRA0" -#: src/main/xmli18n-tmp.h:50 +#: src/main/xmli18n-tmp.h:51 msgid "SRA1" msgstr "SRA1" -#: src/main/xmli18n-tmp.h:51 +#: src/main/xmli18n-tmp.h:52 msgid "SRA2" msgstr "SRA2" -#: src/main/xmli18n-tmp.h:52 +#: src/main/xmli18n-tmp.h:53 msgid "SRA3" msgstr "SRA3" -#: src/main/xmli18n-tmp.h:53 +#: src/main/xmli18n-tmp.h:54 msgid "SRA4" msgstr "SRA4" -#: src/main/xmli18n-tmp.h:54 +#: src/main/xmli18n-tmp.h:55 msgid "4B ISO" msgstr "4B ISO" -#: src/main/xmli18n-tmp.h:55 +#: src/main/xmli18n-tmp.h:56 msgid "2B ISO" msgstr "2B ISO" -#: src/main/xmli18n-tmp.h:56 +#: src/main/xmli18n-tmp.h:57 msgid "B0 ISO" msgstr "B0 ISO" -#: src/main/xmli18n-tmp.h:57 +#: src/main/xmli18n-tmp.h:58 msgid "B1 ISO" msgstr "B1 ISO" -#: src/main/xmli18n-tmp.h:58 +#: src/main/xmli18n-tmp.h:59 msgid "B2 ISO" msgstr "B2 ISO" -#: src/main/xmli18n-tmp.h:59 +#: src/main/xmli18n-tmp.h:60 msgid "B3 ISO" msgstr "B3 ISO" -#: src/main/xmli18n-tmp.h:60 +#: src/main/xmli18n-tmp.h:61 msgid "B4 ISO" msgstr "B4 ISO" -#: src/main/xmli18n-tmp.h:61 +#: src/main/xmli18n-tmp.h:62 msgid "B5 ISO" msgstr "B5 ISO" -#: src/main/xmli18n-tmp.h:62 +#: src/main/xmli18n-tmp.h:63 msgid "B6 ISO" msgstr "B6 ISO" -#: src/main/xmli18n-tmp.h:63 +#: src/main/xmli18n-tmp.h:64 msgid "B7 ISO" msgstr "B7 ISO" -#: src/main/xmli18n-tmp.h:64 +#: src/main/xmli18n-tmp.h:65 msgid "B8 ISO" msgstr "B8 ISO" -#: src/main/xmli18n-tmp.h:65 +#: src/main/xmli18n-tmp.h:66 msgid "B9 ISO" msgstr "B9 ISO" -#: src/main/xmli18n-tmp.h:66 +#: src/main/xmli18n-tmp.h:67 msgid "B10 ISO" msgstr "B10 ISO" -#: src/main/xmli18n-tmp.h:67 +#: src/main/xmli18n-tmp.h:68 #, fuzzy msgid "Super B0 JIS" msgstr "B0 JIS" -#: src/main/xmli18n-tmp.h:68 +#: src/main/xmli18n-tmp.h:69 msgid "B0 JIS" msgstr "B0 JIS" -#: src/main/xmli18n-tmp.h:69 +#: src/main/xmli18n-tmp.h:70 msgid "B1 JIS" msgstr "B1 JIS" -#: src/main/xmli18n-tmp.h:70 +#: src/main/xmli18n-tmp.h:71 msgid "B2 JIS" msgstr "B2 JIS" -#: src/main/xmli18n-tmp.h:71 +#: src/main/xmli18n-tmp.h:72 msgid "B3 JIS" msgstr "B3 JIS" -#: src/main/xmli18n-tmp.h:72 +#: src/main/xmli18n-tmp.h:73 msgid "B4 JIS" msgstr "B4 JIS" -#: src/main/xmli18n-tmp.h:73 +#: src/main/xmli18n-tmp.h:74 msgid "B5 JIS" msgstr "B5 JIS" -#: src/main/xmli18n-tmp.h:74 +#: src/main/xmli18n-tmp.h:75 msgid "B6 JIS" msgstr "B6 JIS" -#: src/main/xmli18n-tmp.h:75 +#: src/main/xmli18n-tmp.h:76 msgid "B7 JIS" msgstr "B7 JIS" -#: src/main/xmli18n-tmp.h:76 +#: src/main/xmli18n-tmp.h:77 msgid "B8 JIS" msgstr "B8 JIS" -#: src/main/xmli18n-tmp.h:77 +#: src/main/xmli18n-tmp.h:78 msgid "B9 JIS" msgstr "B9 JIS" -#: src/main/xmli18n-tmp.h:78 +#: src/main/xmli18n-tmp.h:79 msgid "B10 JIS" msgstr "B10 JIS" -#: src/main/xmli18n-tmp.h:79 +#: src/main/xmli18n-tmp.h:80 msgid "C0" msgstr "C0" -#: src/main/xmli18n-tmp.h:80 +#: src/main/xmli18n-tmp.h:81 +#, fuzzy +msgid "C0 landscape" +msgstr "Na šířku" + +#: src/main/xmli18n-tmp.h:82 msgid "C1" msgstr "C1" -#: src/main/xmli18n-tmp.h:81 +#: src/main/xmli18n-tmp.h:83 +#, fuzzy +msgid "C1 landscape" +msgstr "Na šířku" + +#: src/main/xmli18n-tmp.h:84 msgid "C2" msgstr "C2" -#: src/main/xmli18n-tmp.h:82 +#: src/main/xmli18n-tmp.h:85 +#, fuzzy +msgid "C2 landscape" +msgstr "Na šířku" + +#: src/main/xmli18n-tmp.h:86 msgid "C3" msgstr "C3" -#: src/main/xmli18n-tmp.h:83 +#: src/main/xmli18n-tmp.h:87 +#, fuzzy +msgid "C3 landscape" +msgstr "Na šířku" + +#: src/main/xmli18n-tmp.h:88 msgid "C4" msgstr "C4" -#: src/main/xmli18n-tmp.h:84 +#: src/main/xmli18n-tmp.h:89 +#, fuzzy +msgid "C4 landscape" +msgstr "Na šířku" + +#: src/main/xmli18n-tmp.h:90 msgid "C5" msgstr "C5" -#: src/main/xmli18n-tmp.h:85 +#: src/main/xmli18n-tmp.h:91 +#, fuzzy +msgid "C5 landscape" +msgstr "Na šířku" + +#: src/main/xmli18n-tmp.h:92 msgid "B6-C4" msgstr "B6-C4" -#: src/main/xmli18n-tmp.h:86 +#: src/main/xmli18n-tmp.h:93 +#, fuzzy +msgid "B6-C4 landscape" +msgstr "Na šířku" + +#: src/main/xmli18n-tmp.h:94 msgid "C6" msgstr "C6" -#: src/main/xmli18n-tmp.h:87 +#: src/main/xmli18n-tmp.h:95 +#, fuzzy +msgid "C6 landscape" +msgstr "Na šířku" + +#: src/main/xmli18n-tmp.h:96 msgid "DL" msgstr "DL" -#: src/main/xmli18n-tmp.h:88 +#: src/main/xmli18n-tmp.h:97 +#, fuzzy +msgid "DL landscape" +msgstr "Na šířku" + +#: src/main/xmli18n-tmp.h:98 msgid "C7-6" msgstr "C7-6" -#: src/main/xmli18n-tmp.h:89 +#: src/main/xmli18n-tmp.h:99 +#, fuzzy +msgid "C7-6 landscape" +msgstr "Na šířku" + +#: src/main/xmli18n-tmp.h:100 msgid "C7" msgstr "C7" -#: src/main/xmli18n-tmp.h:90 +#: src/main/xmli18n-tmp.h:101 +#, fuzzy +msgid "C7 landscape" +msgstr "Na šířku" + +#: src/main/xmli18n-tmp.h:102 msgid "C8" msgstr "C8" -#: src/main/xmli18n-tmp.h:91 +#: src/main/xmli18n-tmp.h:103 +#, fuzzy +msgid "C8 landscape" +msgstr "Na šířku" + +#: src/main/xmli18n-tmp.h:104 msgid "C9" msgstr "C9" -#: src/main/xmli18n-tmp.h:92 +#: src/main/xmli18n-tmp.h:105 +#, fuzzy +msgid "C9 landscape" +msgstr "Na šířku" + +#: src/main/xmli18n-tmp.h:106 msgid "C10" msgstr "C10" -#: src/main/xmli18n-tmp.h:93 +#: src/main/xmli18n-tmp.h:107 +#, fuzzy +msgid "C10 landscape" +msgstr "Na šířku" + +#: src/main/xmli18n-tmp.h:108 msgid "ArchA" msgstr "ArchA" -#: src/main/xmli18n-tmp.h:94 +#: src/main/xmli18n-tmp.h:109 #, fuzzy msgid "ArchA transposed" msgstr "ArchA příÄnÄ›" -#: src/main/xmli18n-tmp.h:95 +#: src/main/xmli18n-tmp.h:110 msgid "ArchB" msgstr "ArchB" -#: src/main/xmli18n-tmp.h:96 +#: src/main/xmli18n-tmp.h:111 #, fuzzy msgid "ArchB transposed" msgstr "ArchB příÄnÄ›" -#: src/main/xmli18n-tmp.h:97 +#: src/main/xmli18n-tmp.h:112 msgid "ArchC" msgstr "ArchC" -#: src/main/xmli18n-tmp.h:98 +#: src/main/xmli18n-tmp.h:113 #, fuzzy msgid "ArchC transposed" msgstr "ArchC příÄnÄ›" -#: src/main/xmli18n-tmp.h:99 +#: src/main/xmli18n-tmp.h:114 msgid "ArchD" msgstr "ArchD" -#: src/main/xmli18n-tmp.h:100 +#: src/main/xmli18n-tmp.h:115 #, fuzzy msgid "ArchD transposed" msgstr "ArchD příÄnÄ›" -#: src/main/xmli18n-tmp.h:101 +#: src/main/xmli18n-tmp.h:116 msgid "ArchE" msgstr "ArchE" -#: src/main/xmli18n-tmp.h:102 +#: src/main/xmli18n-tmp.h:117 #, fuzzy msgid "ArchE transposed" msgstr "ArchE příÄnÄ›" -#: src/main/xmli18n-tmp.h:103 +#: src/main/xmli18n-tmp.h:118 msgid "American foolscap" msgstr "Americký foolscap" -#: src/main/xmli18n-tmp.h:104 +#: src/main/xmli18n-tmp.h:119 msgid "European foolscap" msgstr "Evropský foolscap" -#: src/main/xmli18n-tmp.h:105 +#: src/main/xmli18n-tmp.h:120 msgid "Crown Quarto" msgstr "Crown Quarto" -#: src/main/xmli18n-tmp.h:106 +#: src/main/xmli18n-tmp.h:121 msgid "Large Crown Quarto" msgstr "Large Crown Quarto" -#: src/main/xmli18n-tmp.h:107 +#: src/main/xmli18n-tmp.h:122 msgid "Demy Quarto" msgstr "Demy Quarto" -#: src/main/xmli18n-tmp.h:108 +#: src/main/xmli18n-tmp.h:123 msgid "Royal Quarto" msgstr "Royal Quarto" -#: src/main/xmli18n-tmp.h:109 +#: src/main/xmli18n-tmp.h:124 #, fuzzy msgid "ISO A4" msgstr "SRA4" -#: src/main/xmli18n-tmp.h:110 +#: src/main/xmli18n-tmp.h:125 msgid "Crown Octavo" msgstr "Crown Octavo" -#: src/main/xmli18n-tmp.h:111 +#: src/main/xmli18n-tmp.h:126 msgid "Large Crown Octavo" msgstr "Large Crown Octavo" -#: src/main/xmli18n-tmp.h:112 +#: src/main/xmli18n-tmp.h:127 msgid "Demy Octavo" msgstr "Demy Octavo" -#: src/main/xmli18n-tmp.h:113 +#: src/main/xmli18n-tmp.h:128 msgid "Royal Octavo" msgstr "Royal Octavo" -#: src/main/xmli18n-tmp.h:114 +#: src/main/xmli18n-tmp.h:129 msgid "ISO A5" msgstr "" -#: src/main/xmli18n-tmp.h:115 +#: src/main/xmli18n-tmp.h:130 msgid "Small paperback" msgstr "Malá brožura" -#: src/main/xmli18n-tmp.h:116 +#: src/main/xmli18n-tmp.h:131 msgid "Penguin small paperback" msgstr "Malá brožura Penguin" -#: src/main/xmli18n-tmp.h:117 +#: src/main/xmli18n-tmp.h:132 msgid "Penguin large paperback" msgstr "Velká brožura Penguin" -#: src/main/xmli18n-tmp.h:118 +#: src/main/xmli18n-tmp.h:133 msgid "10cm x 15cm" msgstr "" -#: src/main/xmli18n-tmp.h:119 +#: src/main/xmli18n-tmp.h:134 msgid "Hagaki Card" msgstr "Karta Hagaki" -#: src/main/xmli18n-tmp.h:120 +#: src/main/xmli18n-tmp.h:135 msgid "Oufuku Card" msgstr "Karta Oufuku" -#: src/main/xmli18n-tmp.h:121 +#: src/main/xmli18n-tmp.h:136 msgid "Japanese long envelope #3" msgstr "Japonská dlouhá obálka #3" -#: src/main/xmli18n-tmp.h:122 +#: src/main/xmli18n-tmp.h:137 +#, fuzzy +msgid "Japanese long envelope #3 landscape" +msgstr "Japonská dlouhá obálka #3" + +#: src/main/xmli18n-tmp.h:138 msgid "Japanese long envelope #4" msgstr "Japonská dlouhá obálka #4" -#: src/main/xmli18n-tmp.h:123 +#: src/main/xmli18n-tmp.h:139 +#, fuzzy +msgid "Japanese long envelope #4 landscape" +msgstr "Japonská dlouhá obálka #4" + +#: src/main/xmli18n-tmp.h:140 msgid "Japanese Kaku envelope #4" msgstr "Japonská obálka Kaku #4" -#: src/main/xmli18n-tmp.h:124 +#: src/main/xmli18n-tmp.h:141 +#, fuzzy +msgid "Japanese Kaku envelope #4 landscape" +msgstr "Japonská obálka Kaku #4" + +#: src/main/xmli18n-tmp.h:142 msgid "Commercial 10" msgstr "Commercial 10" -#: src/main/xmli18n-tmp.h:125 +#: src/main/xmli18n-tmp.h:143 +#, fuzzy +msgid "Commercial 10 landscape" +msgstr "Commercial 10" + +#: src/main/xmli18n-tmp.h:144 msgid "A2 Invitation" msgstr "Pozvánka A2" -#: src/main/xmli18n-tmp.h:126 +#: src/main/xmli18n-tmp.h:145 msgid "Monarch Envelope" msgstr "Obálka Monarch" -#: src/main/xmli18n-tmp.h:127 +#: src/main/xmli18n-tmp.h:146 +#, fuzzy +msgid "Monarch Envelope landscape" +msgstr "Obálka Monarch" + +#: src/main/xmli18n-tmp.h:147 msgid "4x5 3/8" msgstr "" -#: src/main/xmli18n-tmp.h:128 +#: src/main/xmli18n-tmp.h:148 #, fuzzy msgid "4x7" msgstr "5×7" -#: src/main/xmli18n-tmp.h:129 +#: src/main/xmli18n-tmp.h:149 msgid "CP_L" msgstr "" -#: src/main/xmli18n-tmp.h:130 +#: src/main/xmli18n-tmp.h:150 msgid "Card" msgstr "" -#: src/main/xmli18n-tmp.h:131 +#: src/main/xmli18n-tmp.h:151 #, fuzzy msgid "Wide Postcard" msgstr "Pohlednice" -#: src/main/xmli18n-tmp.h:132 +#: src/main/xmli18n-tmp.h:152 msgid "Chilean Office" msgstr "" -#: src/main/xmli18n-tmp.h:133 +#: src/main/xmli18n-tmp.h:153 msgid "Chilean Double Letter" msgstr "" -#: src/main/xmli18n-tmp.h:134 +#: src/main/xmli18n-tmp.h:154 msgid "Chilean Double Office" msgstr "" -#: src/main/xmli18n-tmp.h:135 +#: src/main/xmli18n-tmp.h:155 msgid "Custom" msgstr "Vlastní" -#: src/main/xmli18n-tmp.h:136 +#: src/main/xmli18n-tmp.h:156 msgid "89 mm Roll Paper" msgstr "Rolovaný papír 89 mm" -#: src/main/xmli18n-tmp.h:137 +#: src/main/xmli18n-tmp.h:157 msgid "4 Inch Roll Paper" msgstr "Rolovaný papír 4 palce" -#: src/main/xmli18n-tmp.h:138 +#: src/main/xmli18n-tmp.h:158 msgid "5 Inch Roll Paper" msgstr "Rolovaný papír 5 palců" -#: src/main/xmli18n-tmp.h:139 +#: src/main/xmli18n-tmp.h:159 msgid "210 mm Roll Paper" msgstr "Rolovaný papír 210 mm" -#: src/main/xmli18n-tmp.h:140 +#: src/main/xmli18n-tmp.h:160 msgid "13 Inch Roll Paper" msgstr "Rolovaný papír 13 palců" -#: src/main/xmli18n-tmp.h:141 +#: src/main/xmli18n-tmp.h:161 msgid "22 Inch Roll Paper" msgstr "Rolovaný papír 22 palce" -#: src/main/xmli18n-tmp.h:142 +#: src/main/xmli18n-tmp.h:162 msgid "24 Inch Roll Paper" msgstr "Rolovaný papír 24 palce" -#: src/main/xmli18n-tmp.h:143 +#: src/main/xmli18n-tmp.h:163 msgid "36 Inch Roll Paper" msgstr "Rolovaný papír 36 palců" -#: src/main/xmli18n-tmp.h:144 +#: src/main/xmli18n-tmp.h:164 msgid "44 Inch Roll Paper" msgstr "Rolovaný papír 44 palce" -#: src/main/xmli18n-tmp.h:145 +#: src/main/xmli18n-tmp.h:165 msgid "PostScript Level 1" msgstr "" -#: src/main/xmli18n-tmp.h:146 +#: src/main/xmli18n-tmp.h:166 msgid "PostScript Level 2" msgstr "" -#: src/main/xmli18n-tmp.h:147 +#: src/main/xmli18n-tmp.h:167 msgid "Canon BJ-30" msgstr "" -#: src/main/xmli18n-tmp.h:148 +#: src/main/xmli18n-tmp.h:168 msgid "Canon BJC-50" msgstr "" -#: src/main/xmli18n-tmp.h:149 +#: src/main/xmli18n-tmp.h:169 msgid "Canon BJC-55" msgstr "" -#: src/main/xmli18n-tmp.h:150 +#: src/main/xmli18n-tmp.h:170 msgid "Canon BJC-80" msgstr "" -#: src/main/xmli18n-tmp.h:151 +#: src/main/xmli18n-tmp.h:171 msgid "Canon BJC-85" msgstr "" -#: src/main/xmli18n-tmp.h:152 +#: src/main/xmli18n-tmp.h:172 msgid "Canon BJC-210" msgstr "" -#: src/main/xmli18n-tmp.h:153 +#: src/main/xmli18n-tmp.h:173 msgid "Canon BJC-240" msgstr "" -#: src/main/xmli18n-tmp.h:154 +#: src/main/xmli18n-tmp.h:174 msgid "Canon BJC-250" msgstr "" -#: src/main/xmli18n-tmp.h:155 +#: src/main/xmli18n-tmp.h:175 msgid "Canon BJC-1000" msgstr "" -#: src/main/xmli18n-tmp.h:156 +#: src/main/xmli18n-tmp.h:176 msgid "Canon BJC-2000" msgstr "" -#: src/main/xmli18n-tmp.h:157 +#: src/main/xmli18n-tmp.h:177 msgid "Canon BJC-2010" msgstr "" -#: src/main/xmli18n-tmp.h:158 +#: src/main/xmli18n-tmp.h:178 msgid "Canon BJC-2100" msgstr "" -#: src/main/xmli18n-tmp.h:159 +#: src/main/xmli18n-tmp.h:179 msgid "Canon BJC-2110" msgstr "" -#: src/main/xmli18n-tmp.h:160 +#: src/main/xmli18n-tmp.h:180 msgid "Canon BJC-3000" msgstr "" -#: src/main/xmli18n-tmp.h:161 +#: src/main/xmli18n-tmp.h:181 msgid "Canon BJC-4000" msgstr "" -#: src/main/xmli18n-tmp.h:162 +#: src/main/xmli18n-tmp.h:182 msgid "Canon BJC-4300" msgstr "" -#: src/main/xmli18n-tmp.h:163 +#: src/main/xmli18n-tmp.h:183 msgid "Canon BJC-4400" msgstr "" -#: src/main/xmli18n-tmp.h:164 +#: src/main/xmli18n-tmp.h:184 msgid "Canon BJC-5100" msgstr "" -#: src/main/xmli18n-tmp.h:165 +#: src/main/xmli18n-tmp.h:185 msgid "Canon BJC-5500" msgstr "" -#: src/main/xmli18n-tmp.h:166 +#: src/main/xmli18n-tmp.h:186 msgid "Canon BJC-6000" msgstr "" -#: src/main/xmli18n-tmp.h:167 +#: src/main/xmli18n-tmp.h:187 msgid "Canon BJC-6100" msgstr "" -#: src/main/xmli18n-tmp.h:168 +#: src/main/xmli18n-tmp.h:188 msgid "Canon BJC-6200" msgstr "" -#: src/main/xmli18n-tmp.h:169 +#: src/main/xmli18n-tmp.h:189 msgid "Canon BJC-6500" msgstr "" -#: src/main/xmli18n-tmp.h:170 +#: src/main/xmli18n-tmp.h:190 msgid "Canon BJC-7000" msgstr "" -#: src/main/xmli18n-tmp.h:171 +#: src/main/xmli18n-tmp.h:191 msgid "Canon BJC-7100" msgstr "" -#: src/main/xmli18n-tmp.h:172 +#: src/main/xmli18n-tmp.h:192 msgid "Canon BJC-8200" msgstr "" -#: src/main/xmli18n-tmp.h:173 +#: src/main/xmli18n-tmp.h:193 msgid "Canon BJC-8500" msgstr "" -#: src/main/xmli18n-tmp.h:174 +#: src/main/xmli18n-tmp.h:194 msgid "Canon S100" msgstr "" -#: src/main/xmli18n-tmp.h:175 +#: src/main/xmli18n-tmp.h:195 msgid "Canon S200" msgstr "" -#: src/main/xmli18n-tmp.h:176 +#: src/main/xmli18n-tmp.h:196 msgid "Canon S300" msgstr "" -#: src/main/xmli18n-tmp.h:177 +#: src/main/xmli18n-tmp.h:197 msgid "Canon S400" msgstr "" -#: src/main/xmli18n-tmp.h:178 +#: src/main/xmli18n-tmp.h:198 msgid "Canon S450" msgstr "" -#: src/main/xmli18n-tmp.h:179 +#: src/main/xmli18n-tmp.h:199 msgid "Canon S500" msgstr "" -#: src/main/xmli18n-tmp.h:180 +#: src/main/xmli18n-tmp.h:200 msgid "Canon S600" msgstr "" -#: src/main/xmli18n-tmp.h:181 +#: src/main/xmli18n-tmp.h:201 msgid "Canon S630" msgstr "" -#: src/main/xmli18n-tmp.h:182 +#: src/main/xmli18n-tmp.h:202 msgid "Canon S800" msgstr "" -#: src/main/xmli18n-tmp.h:183 +#: src/main/xmli18n-tmp.h:203 msgid "Canon S4500" msgstr "" -#: src/main/xmli18n-tmp.h:184 +#: src/main/xmli18n-tmp.h:204 msgid "Canon PIXMA iP2000" msgstr "" -#: src/main/xmli18n-tmp.h:185 +#: src/main/xmli18n-tmp.h:205 msgid "Canon PIXMA iP3000" msgstr "" -#: src/main/xmli18n-tmp.h:186 +#: src/main/xmli18n-tmp.h:206 msgid "Canon PIXMA iP3100" msgstr "" -#: src/main/xmli18n-tmp.h:187 +#: src/main/xmli18n-tmp.h:207 msgid "Canon PIXMA iP4000" msgstr "" -#: src/main/xmli18n-tmp.h:188 +#: src/main/xmli18n-tmp.h:208 msgid "Canon PIXMA iP4100" msgstr "" -#: src/main/xmli18n-tmp.h:189 +#: src/main/xmli18n-tmp.h:209 msgid "Canon PIXMA iP4200" msgstr "" -#: src/main/xmli18n-tmp.h:190 -#, fuzzy +#: src/main/xmli18n-tmp.h:210 msgid "Canon PIXMA iP4300" -msgstr "Stylus C50" +msgstr "" -#: src/main/xmli18n-tmp.h:191 -#, fuzzy +#: src/main/xmli18n-tmp.h:211 msgid "Canon PIXMA iP4500" -msgstr "Stylus C50" +msgstr "" -#: src/main/xmli18n-tmp.h:192 -#, fuzzy +#: src/main/xmli18n-tmp.h:212 msgid "Canon PIXMA iP5000" -msgstr "Stylus C50" +msgstr "" -#: src/main/xmli18n-tmp.h:193 +#: src/main/xmli18n-tmp.h:213 msgid "Canon PIXMA iP5200" msgstr "" -#: src/main/xmli18n-tmp.h:194 -#, fuzzy +#: src/main/xmli18n-tmp.h:214 msgid "Canon PIXMA iP5300" -msgstr "Stylus C50" +msgstr "" -#: src/main/xmli18n-tmp.h:195 -#, fuzzy +#: src/main/xmli18n-tmp.h:215 +msgid "Canon PIXMA iP6000D" +msgstr "" + +#: src/main/xmli18n-tmp.h:216 msgid "Canon PIXMA iP6700" -msgstr "Stylus C50" +msgstr "" -#: src/main/xmli18n-tmp.h:196 -#, fuzzy +#: src/main/xmli18n-tmp.h:217 msgid "Canon PIXMA iP8500" -msgstr "Stylus C50" +msgstr "" -#: src/main/xmli18n-tmp.h:197 -#, fuzzy +#: src/main/xmli18n-tmp.h:218 msgid "Canon PIXMA iX5000" -msgstr "Stylus C50" +msgstr "" -#: src/main/xmli18n-tmp.h:198 -#, fuzzy +#: src/main/xmli18n-tmp.h:219 msgid "Canon PIXMA Pro9500" -msgstr "Stylus C50" +msgstr "" -#: src/main/xmli18n-tmp.h:199 -#, fuzzy +#: src/main/xmli18n-tmp.h:220 msgid "Canon PIXMA MP150" -msgstr "Stylus C50" +msgstr "" -#: src/main/xmli18n-tmp.h:200 -#, fuzzy +#: src/main/xmli18n-tmp.h:221 msgid "Canon PIXMA MP170" -msgstr "Stylus C50" +msgstr "" -#: src/main/xmli18n-tmp.h:201 -#, fuzzy +#: src/main/xmli18n-tmp.h:222 msgid "Canon PIXMA MP180" -msgstr "Stylus C50" +msgstr "" -#: src/main/xmli18n-tmp.h:202 -#, fuzzy +#: src/main/xmli18n-tmp.h:223 msgid "Canon PIXMA MP500" -msgstr "Stylus C50" +msgstr "" -#: src/main/xmli18n-tmp.h:203 -#, fuzzy +#: src/main/xmli18n-tmp.h:224 +msgid "Canon PIXMA MP520" +msgstr "" + +#: src/main/xmli18n-tmp.h:225 msgid "Canon PIXMA MP610" -msgstr "Stylus C50" +msgstr "" -#: src/main/xmli18n-tmp.h:204 -#, fuzzy +#: src/main/xmli18n-tmp.h:226 msgid "Canon PIXMA MP700" -msgstr "Stylus C50" +msgstr "" -#: src/main/xmli18n-tmp.h:205 -#, fuzzy +#: src/main/xmli18n-tmp.h:227 msgid "Canon PIXMA MP710" -msgstr "Stylus C50" +msgstr "" -#: src/main/xmli18n-tmp.h:206 -#, fuzzy +#: src/main/xmli18n-tmp.h:228 msgid "Canon PIXMA MP730" -msgstr "Stylus C50" +msgstr "" -#: src/main/xmli18n-tmp.h:207 -#, fuzzy +#: src/main/xmli18n-tmp.h:229 msgid "Canon PIXMA MP740" -msgstr "Stylus C50" +msgstr "" -#: src/main/xmli18n-tmp.h:208 -#, fuzzy +#: src/main/xmli18n-tmp.h:230 msgid "Canon PIXMA MP750" -msgstr "Stylus C50" +msgstr "" -#: src/main/xmli18n-tmp.h:209 -#, fuzzy +#: src/main/xmli18n-tmp.h:231 msgid "Canon PIXMA MP760" -msgstr "Stylus C50" +msgstr "" -#: src/main/xmli18n-tmp.h:210 -#, fuzzy +#: src/main/xmli18n-tmp.h:232 msgid "Canon PIXMA MP770" -msgstr "Stylus C50" +msgstr "" -#: src/main/xmli18n-tmp.h:211 -#, fuzzy +#: src/main/xmli18n-tmp.h:233 msgid "Canon PIXMA MP780" -msgstr "Stylus C50" +msgstr "" -#: src/main/xmli18n-tmp.h:212 -#, fuzzy +#: src/main/xmli18n-tmp.h:234 msgid "Canon PIXMA MP790" -msgstr "Stylus C50" +msgstr "" -#: src/main/xmli18n-tmp.h:213 -#, fuzzy +#: src/main/xmli18n-tmp.h:235 msgid "Canon PIXMA MP830" -msgstr "Stylus C50" +msgstr "" -#: src/main/xmli18n-tmp.h:214 +#: src/main/xmli18n-tmp.h:236 msgid "Canon PIXUS iP3100" msgstr "" -#: src/main/xmli18n-tmp.h:215 +#: src/main/xmli18n-tmp.h:237 msgid "Canon PIXUS iP4100" msgstr "" - -#: src/main/xmli18n-tmp.h:216 -#, fuzzy + +#: src/main/xmli18n-tmp.h:238 msgid "Canon i80" -msgstr "Stylus C50" +msgstr "" -#: src/main/xmli18n-tmp.h:217 +#: src/main/xmli18n-tmp.h:239 msgid "Canon i560" msgstr "" -#: src/main/xmli18n-tmp.h:218 +#: src/main/xmli18n-tmp.h:240 msgid "Canon i850" msgstr "" -#: src/main/xmli18n-tmp.h:219 +#: src/main/xmli18n-tmp.h:241 msgid "Canon i860" msgstr "" -#: src/main/xmli18n-tmp.h:220 +#: src/main/xmli18n-tmp.h:242 msgid "Canon i865" msgstr "" -#: src/main/xmli18n-tmp.h:221 +#: src/main/xmli18n-tmp.h:243 #, fuzzy msgid "Epson Stylus C20" -msgstr "Stylus C20ux" +msgstr "Stylus C20sx" -#: src/main/xmli18n-tmp.h:222 +#: src/main/xmli18n-tmp.h:244 #, fuzzy msgid "Epson Stylus C20SX" msgstr "Stylus C20ux" -#: src/main/xmli18n-tmp.h:223 +#: src/main/xmli18n-tmp.h:245 #, fuzzy msgid "Epson Stylus C20UX" msgstr "Stylus C20ux" -#: src/main/xmli18n-tmp.h:224 +#: src/main/xmli18n-tmp.h:246 #, fuzzy msgid "Epson Stylus C40" -msgstr "Stylus C40ux" +msgstr "Stylus C40sx" -#: src/main/xmli18n-tmp.h:225 +#: src/main/xmli18n-tmp.h:247 #, fuzzy msgid "Epson Stylus C40SX" msgstr "Stylus C40ux" -#: src/main/xmli18n-tmp.h:226 +#: src/main/xmli18n-tmp.h:248 #, fuzzy msgid "Epson Stylus C40UX" msgstr "Stylus C40ux" -#: src/main/xmli18n-tmp.h:227 +#: src/main/xmli18n-tmp.h:249 #, fuzzy msgid "Epson Stylus C41" -msgstr "Stylus C41ux" +msgstr "Stylus C41sx" -#: src/main/xmli18n-tmp.h:228 +#: src/main/xmli18n-tmp.h:250 #, fuzzy msgid "Epson Stylus C41SX" msgstr "Stylus C41ux" -#: src/main/xmli18n-tmp.h:229 +#: src/main/xmli18n-tmp.h:251 #, fuzzy msgid "Epson Stylus C41UX" msgstr "Stylus C41ux" -#: src/main/xmli18n-tmp.h:230 +#: src/main/xmli18n-tmp.h:252 #, fuzzy msgid "Epson Stylus C42" -msgstr "Stylus C42ux" +msgstr "Stylus C42sx" -#: src/main/xmli18n-tmp.h:231 +#: src/main/xmli18n-tmp.h:253 #, fuzzy msgid "Epson Stylus C42SX" msgstr "Stylus C42ux" -#: src/main/xmli18n-tmp.h:232 +#: src/main/xmli18n-tmp.h:254 #, fuzzy msgid "Epson Stylus C42UX" msgstr "Stylus C42ux" -#: src/main/xmli18n-tmp.h:233 +#: src/main/xmli18n-tmp.h:255 #, fuzzy msgid "Epson Stylus C43" msgstr "Stylus C42ux" -#: src/main/xmli18n-tmp.h:234 +#: src/main/xmli18n-tmp.h:256 #, fuzzy msgid "Epson Stylus C43SX" msgstr "Stylus C42ux" -#: src/main/xmli18n-tmp.h:235 +#: src/main/xmli18n-tmp.h:257 #, fuzzy msgid "Epson Stylus C43UX" msgstr "Stylus C42ux" -#: src/main/xmli18n-tmp.h:236 +#: src/main/xmli18n-tmp.h:258 #, fuzzy msgid "Epson Stylus C44" msgstr "Stylus C42ux" -#: src/main/xmli18n-tmp.h:237 +#: src/main/xmli18n-tmp.h:259 #, fuzzy msgid "Epson Stylus C44SX" msgstr "Stylus C42ux" -#: src/main/xmli18n-tmp.h:238 +#: src/main/xmli18n-tmp.h:260 #, fuzzy msgid "Epson Stylus C44UX" msgstr "Stylus C42ux" -#: src/main/xmli18n-tmp.h:239 +#: src/main/xmli18n-tmp.h:261 #, fuzzy msgid "Epson Stylus C45" msgstr "Stylus C50" -#: src/main/xmli18n-tmp.h:240 +#: src/main/xmli18n-tmp.h:262 #, fuzzy msgid "Epson Stylus C46" msgstr "Stylus C60" -#: src/main/xmli18n-tmp.h:241 +#: src/main/xmli18n-tmp.h:263 #, fuzzy msgid "Epson Stylus C48" -msgstr "Stylus C50" +msgstr "Stylus C80" -#: src/main/xmli18n-tmp.h:242 +#: src/main/xmli18n-tmp.h:264 #, fuzzy msgid "Epson Stylus C50" msgstr "Stylus C50" -#: src/main/xmli18n-tmp.h:243 +#: src/main/xmli18n-tmp.h:265 #, fuzzy msgid "Epson Stylus C60" msgstr "Stylus C60" -#: src/main/xmli18n-tmp.h:244 +#: src/main/xmli18n-tmp.h:266 #, fuzzy msgid "Epson Stylus C61" msgstr "Stylus C61" -#: src/main/xmli18n-tmp.h:245 +#: src/main/xmli18n-tmp.h:267 #, fuzzy msgid "Epson Stylus C62" msgstr "Stylus C62" -#: src/main/xmli18n-tmp.h:246 +#: src/main/xmli18n-tmp.h:268 #, fuzzy msgid "Epson Stylus C63" msgstr "Stylus C60" -#: src/main/xmli18n-tmp.h:247 +#: src/main/xmli18n-tmp.h:269 #, fuzzy msgid "Epson Stylus C64" msgstr "Stylus C60" -#: src/main/xmli18n-tmp.h:248 +#: src/main/xmli18n-tmp.h:270 #, fuzzy msgid "Epson Stylus C65" msgstr "Stylus C50" -#: src/main/xmli18n-tmp.h:249 +#: src/main/xmli18n-tmp.h:271 #, fuzzy msgid "Epson Stylus C66" msgstr "Stylus C60" -#: src/main/xmli18n-tmp.h:250 +#: src/main/xmli18n-tmp.h:272 #, fuzzy msgid "Epson Stylus C68" msgstr "Stylus C60" -#: src/main/xmli18n-tmp.h:251 +#: src/main/xmli18n-tmp.h:273 #, fuzzy msgid "Epson Stylus C70" msgstr "Stylus C70" -#: src/main/xmli18n-tmp.h:252 +#: src/main/xmli18n-tmp.h:274 #, fuzzy msgid "Epson Stylus C79" msgstr "Stylus C70" -#: src/main/xmli18n-tmp.h:253 +#: src/main/xmli18n-tmp.h:275 #, fuzzy msgid "Epson Stylus C80" msgstr "Stylus C80" -#: src/main/xmli18n-tmp.h:254 +#: src/main/xmli18n-tmp.h:276 #, fuzzy msgid "Epson Stylus C82" msgstr "Stylus C82" -#: src/main/xmli18n-tmp.h:255 +#: src/main/xmli18n-tmp.h:277 #, fuzzy msgid "Epson Stylus C83" msgstr "Stylus C80" -#: src/main/xmli18n-tmp.h:256 +#: src/main/xmli18n-tmp.h:278 #, fuzzy msgid "Epson Stylus C84" msgstr "Stylus C80" -#: src/main/xmli18n-tmp.h:257 +#: src/main/xmli18n-tmp.h:279 #, fuzzy msgid "Epson Stylus C85" msgstr "Stylus C50" -#: src/main/xmli18n-tmp.h:258 +#: src/main/xmli18n-tmp.h:280 #, fuzzy msgid "Epson Stylus C86" msgstr "Stylus C60" -#: src/main/xmli18n-tmp.h:259 +#: src/main/xmli18n-tmp.h:281 #, fuzzy msgid "Epson Stylus C87" -msgstr "Stylus C50" +msgstr "Stylus C70" -#: src/main/xmli18n-tmp.h:260 +#: src/main/xmli18n-tmp.h:282 #, fuzzy msgid "Epson Stylus C88" msgstr "Stylus C80" -#: src/main/xmli18n-tmp.h:261 +#: src/main/xmli18n-tmp.h:283 #, fuzzy msgid "Epson Stylus C110" -msgstr "Stylus C20ux" +msgstr "Stylus C50" -#: src/main/xmli18n-tmp.h:262 +#: src/main/xmli18n-tmp.h:284 #, fuzzy msgid "Epson Stylus C120" -msgstr "Stylus C20ux" +msgstr "Stylus C20sx" -#: src/main/xmli18n-tmp.h:263 +#: src/main/xmli18n-tmp.h:285 #, fuzzy msgid "Epson Stylus Color" msgstr "Stylus Color" -#: src/main/xmli18n-tmp.h:264 +#: src/main/xmli18n-tmp.h:286 #, fuzzy msgid "Epson Stylus Color I" msgstr "Stylus Color" -#: src/main/xmli18n-tmp.h:265 +#: src/main/xmli18n-tmp.h:287 #, fuzzy msgid "Epson Stylus Color II" msgstr "Stylus Color" -#: src/main/xmli18n-tmp.h:266 +#: src/main/xmli18n-tmp.h:288 #, fuzzy msgid "Epson Stylus Color IIs" msgstr "Stylus Color" -#: src/main/xmli18n-tmp.h:267 +#: src/main/xmli18n-tmp.h:289 #, fuzzy msgid "Epson Stylus Color PRO" msgstr "Stylus Color Pro" -#: src/main/xmli18n-tmp.h:268 +#: src/main/xmli18n-tmp.h:290 #, fuzzy msgid "Epson Stylus Pro XL" msgstr "Stylus Color Pro XL" -#: src/main/xmli18n-tmp.h:269 +#: src/main/xmli18n-tmp.h:291 #, fuzzy msgid "Epson Stylus Color 400" msgstr "Stylus Color 400" -#: src/main/xmli18n-tmp.h:270 +#: src/main/xmli18n-tmp.h:292 #, fuzzy msgid "Epson Stylus Color 440" msgstr "Stylus Color 440" -#: src/main/xmli18n-tmp.h:271 +#: src/main/xmli18n-tmp.h:293 #, fuzzy msgid "Epson Stylus Color 460" msgstr "Stylus Color 460" -#: src/main/xmli18n-tmp.h:272 +#: src/main/xmli18n-tmp.h:294 #, fuzzy msgid "Epson Stylus Color 480" msgstr "Stylus Color 480" -#: src/main/xmli18n-tmp.h:273 +#: src/main/xmli18n-tmp.h:295 #, fuzzy msgid "Epson Stylus Color 500" msgstr "Stylus Color 500" -#: src/main/xmli18n-tmp.h:274 +#: src/main/xmli18n-tmp.h:296 #, fuzzy msgid "Epson Stylus Color 580" msgstr "Stylus Color 580" -#: src/main/xmli18n-tmp.h:275 +#: src/main/xmli18n-tmp.h:297 #, fuzzy msgid "Epson Stylus Color 600" msgstr "Stylus Color 600" -#: src/main/xmli18n-tmp.h:276 +#: src/main/xmli18n-tmp.h:298 #, fuzzy msgid "Epson Stylus Color 640" msgstr "Stylus Color 640" -#: src/main/xmli18n-tmp.h:277 +#: src/main/xmli18n-tmp.h:299 #, fuzzy msgid "Epson Stylus Color 660" msgstr "Stylus Color 660" -#: src/main/xmli18n-tmp.h:278 +#: src/main/xmli18n-tmp.h:300 #, fuzzy msgid "Epson Stylus Color 670" msgstr "Stylus Color 670" -#: src/main/xmli18n-tmp.h:279 +#: src/main/xmli18n-tmp.h:301 #, fuzzy msgid "Epson Stylus Color 680" msgstr "Stylus Color 680" -#: src/main/xmli18n-tmp.h:280 +#: src/main/xmli18n-tmp.h:302 #, fuzzy msgid "Epson Stylus Color 740" msgstr "Stylus Color 740" -#: src/main/xmli18n-tmp.h:281 +#: src/main/xmli18n-tmp.h:303 #, fuzzy msgid "Epson Stylus Color 760" msgstr "Stylus Color 760" -#: src/main/xmli18n-tmp.h:282 +#: src/main/xmli18n-tmp.h:304 #, fuzzy msgid "Epson Stylus Color 777" msgstr "Stylus Color 777" -#: src/main/xmli18n-tmp.h:283 +#: src/main/xmli18n-tmp.h:305 #, fuzzy msgid "Epson Stylus Color 800" msgstr "Stylus Color 800" -#: src/main/xmli18n-tmp.h:284 +#: src/main/xmli18n-tmp.h:306 #, fuzzy msgid "Epson Stylus Color 850" msgstr "Stylus Color 850" -#: src/main/xmli18n-tmp.h:285 +#: src/main/xmli18n-tmp.h:307 #, fuzzy msgid "Epson Stylus Color 860" msgstr "Stylus Color 860" -#: src/main/xmli18n-tmp.h:286 +#: src/main/xmli18n-tmp.h:308 #, fuzzy msgid "Epson Stylus Color 880" msgstr "Stylus Color 880" -#: src/main/xmli18n-tmp.h:287 +#: src/main/xmli18n-tmp.h:309 #, fuzzy msgid "Epson Stylus Color 8 3" msgstr "Stylus Color 83" -#: src/main/xmli18n-tmp.h:288 +#: src/main/xmli18n-tmp.h:310 #, fuzzy msgid "Epson Stylus Color 900" msgstr "Stylus Color 900" -#: src/main/xmli18n-tmp.h:289 +#: src/main/xmli18n-tmp.h:311 #, fuzzy msgid "Epson Stylus Color 980" msgstr "Stylus Color 980" -#: src/main/xmli18n-tmp.h:290 +#: src/main/xmli18n-tmp.h:312 #, fuzzy msgid "Epson Stylus Color 1160" msgstr "Stylus Color 1160" -#: src/main/xmli18n-tmp.h:291 +#: src/main/xmli18n-tmp.h:313 #, fuzzy msgid "Epson Stylus Color 1500" msgstr "Stylus Color 1500" -#: src/main/xmli18n-tmp.h:292 +#: src/main/xmli18n-tmp.h:314 #, fuzzy msgid "Epson Stylus Color 1520" msgstr "Stylus Color 1520" -#: src/main/xmli18n-tmp.h:293 +#: src/main/xmli18n-tmp.h:315 #, fuzzy msgid "Epson Stylus Color 3000" msgstr "Stylus Color 3000" -#: src/main/xmli18n-tmp.h:294 +#: src/main/xmli18n-tmp.h:316 #, fuzzy msgid "Epson Stylus Photo" msgstr "Stylus Photo" -#: src/main/xmli18n-tmp.h:295 +#: src/main/xmli18n-tmp.h:317 #, fuzzy msgid "Epson Stylus Photo 700" msgstr "Stylus Photo 700" -#: src/main/xmli18n-tmp.h:296 +#: src/main/xmli18n-tmp.h:318 #, fuzzy msgid "Epson Stylus Photo EX" msgstr "Stylus Photo EX" -#: src/main/xmli18n-tmp.h:297 +#: src/main/xmli18n-tmp.h:319 #, fuzzy msgid "Epson Stylus Photo EX3" msgstr "Stylus Photo EX" -#: src/main/xmli18n-tmp.h:298 +#: src/main/xmli18n-tmp.h:320 #, fuzzy msgid "Epson Stylus Photo 720" msgstr "Stylus Photo 720" -#: src/main/xmli18n-tmp.h:299 +#: src/main/xmli18n-tmp.h:321 #, fuzzy msgid "Epson Stylus Photo 750" msgstr "Stylus Photo 750" -#: src/main/xmli18n-tmp.h:300 +#: src/main/xmli18n-tmp.h:322 #, fuzzy msgid "Epson Stylus Photo 780" msgstr "Stylus Photo 780" -#: src/main/xmli18n-tmp.h:301 +#: src/main/xmli18n-tmp.h:323 #, fuzzy msgid "Epson Stylus Photo 785" msgstr "Stylus Photo 785" -#: src/main/xmli18n-tmp.h:302 +#: src/main/xmli18n-tmp.h:324 #, fuzzy msgid "Epson Stylus Photo 790" msgstr "Stylus Photo 790" -#: src/main/xmli18n-tmp.h:303 +#: src/main/xmli18n-tmp.h:325 #, fuzzy msgid "Epson Stylus Photo 810" msgstr "Stylus Photo 810" -#: src/main/xmli18n-tmp.h:304 +#: src/main/xmli18n-tmp.h:326 #, fuzzy msgid "Epson Stylus Photo 820" msgstr "Stylus Photo 820" -#: src/main/xmli18n-tmp.h:305 +#: src/main/xmli18n-tmp.h:327 #, fuzzy msgid "Epson Stylus Photo 825" msgstr "Stylus Photo 785" -#: src/main/xmli18n-tmp.h:306 +#: src/main/xmli18n-tmp.h:328 #, fuzzy msgid "Epson Stylus Photo 830" msgstr "Stylus Photo 830" -#: src/main/xmli18n-tmp.h:307 +#: src/main/xmli18n-tmp.h:329 #, fuzzy msgid "Epson Stylus Photo 830U" msgstr "Stylus Photo 830" -#: src/main/xmli18n-tmp.h:308 +#: src/main/xmli18n-tmp.h:330 #, fuzzy msgid "Epson Stylus Photo 870" msgstr "Stylus Photo 870" -#: src/main/xmli18n-tmp.h:309 +#: src/main/xmli18n-tmp.h:331 #, fuzzy msgid "Epson Stylus Photo 875" msgstr "Stylus Photo 875" -#: src/main/xmli18n-tmp.h:310 +#: src/main/xmli18n-tmp.h:332 #, fuzzy msgid "Epson Stylus Photo 890" msgstr "Stylus Photo 890" -#: src/main/xmli18n-tmp.h:311 +#: src/main/xmli18n-tmp.h:333 #, fuzzy msgid "Epson Stylus Photo 895" msgstr "Stylus Photo 895" -#: src/main/xmli18n-tmp.h:312 +#: src/main/xmli18n-tmp.h:334 #, fuzzy msgid "Epson Stylus Photo 900" msgstr "Stylus Photo 700" -#: src/main/xmli18n-tmp.h:313 +#: src/main/xmli18n-tmp.h:335 #, fuzzy msgid "Epson Stylus Photo 915" msgstr "Stylus Photo 915" -#: src/main/xmli18n-tmp.h:314 +#: src/main/xmli18n-tmp.h:336 #, fuzzy msgid "Epson Stylus Photo 925" msgstr "Stylus Photo 925" -#: src/main/xmli18n-tmp.h:315 +#: src/main/xmli18n-tmp.h:337 #, fuzzy msgid "Epson Stylus Photo 935" msgstr "Stylus Photo 895" -#: src/main/xmli18n-tmp.h:316 +#: src/main/xmli18n-tmp.h:338 #, fuzzy msgid "Epson Stylus Photo 950" msgstr "Stylus Photo 950" -#: src/main/xmli18n-tmp.h:317 +#: src/main/xmli18n-tmp.h:339 #, fuzzy msgid "Epson Stylus Photo 960" msgstr "Stylus Photo 960" -#: src/main/xmli18n-tmp.h:318 +#: src/main/xmli18n-tmp.h:340 #, fuzzy msgid "Epson Stylus Photo 1200" msgstr "Stylus Photo 1200" -#: src/main/xmli18n-tmp.h:319 +#: src/main/xmli18n-tmp.h:341 #, fuzzy msgid "Epson Stylus Photo 1270" msgstr "Stylus Photo 1270" -#: src/main/xmli18n-tmp.h:320 +#: src/main/xmli18n-tmp.h:342 #, fuzzy msgid "Epson Stylus Photo 1280" msgstr "Stylus Photo 1280" -#: src/main/xmli18n-tmp.h:321 +#: src/main/xmli18n-tmp.h:343 #, fuzzy msgid "Epson Stylus Photo 1290" msgstr "Stylus Photo 1290" -#: src/main/xmli18n-tmp.h:322 +#: src/main/xmli18n-tmp.h:344 #, fuzzy msgid "Epson Stylus Photo 1400" msgstr "Stylus Photo 1200" -#: src/main/xmli18n-tmp.h:323 +#: src/main/xmli18n-tmp.h:345 #, fuzzy msgid "Epson Stylus Photo 1410" msgstr "Stylus Photo 810" -#: src/main/xmli18n-tmp.h:324 +#: src/main/xmli18n-tmp.h:346 #, fuzzy msgid "Epson Stylus Photo 2000P" msgstr "Stylus Photo 2000P" -#: src/main/xmli18n-tmp.h:325 +#: src/main/xmli18n-tmp.h:347 #, fuzzy msgid "Epson Stylus Photo 2100" msgstr "Stylus Photo 2100" -#: src/main/xmli18n-tmp.h:326 +#: src/main/xmli18n-tmp.h:348 #, fuzzy msgid "Epson Stylus Photo 2200" msgstr "Stylus Photo 2200" -#: src/main/xmli18n-tmp.h:327 +#: src/main/xmli18n-tmp.h:349 #, fuzzy msgid "Epson Stylus Photo R200" msgstr "Stylus Photo 1200" -#: src/main/xmli18n-tmp.h:328 +#: src/main/xmli18n-tmp.h:350 #, fuzzy msgid "Epson Stylus Photo R210" msgstr "Stylus Photo 2100" -#: src/main/xmli18n-tmp.h:329 +#: src/main/xmli18n-tmp.h:351 #, fuzzy msgid "Epson Stylus Photo R220" msgstr "Stylus Photo 2200" -#: src/main/xmli18n-tmp.h:330 +#: src/main/xmli18n-tmp.h:352 #, fuzzy msgid "Epson Stylus Photo R230" msgstr "Stylus Photo 1200" -#: src/main/xmli18n-tmp.h:331 +#: src/main/xmli18n-tmp.h:353 #, fuzzy msgid "Epson Stylus Photo R240" msgstr "Stylus Photo 1200" -#: src/main/xmli18n-tmp.h:332 +#: src/main/xmli18n-tmp.h:354 #, fuzzy msgid "Epson Stylus Photo R245" -msgstr "Stylus Photo 1200" +msgstr "Stylus Photo 925" -#: src/main/xmli18n-tmp.h:333 +#: src/main/xmli18n-tmp.h:355 #, fuzzy msgid "Epson Stylus Photo R260" msgstr "Stylus Photo 1200" -#: src/main/xmli18n-tmp.h:334 +#: src/main/xmli18n-tmp.h:356 #, fuzzy msgid "Epson Stylus Photo R265" -msgstr "Stylus Photo 1200" +msgstr "Stylus Photo 925" -#: src/main/xmli18n-tmp.h:335 +#: src/main/xmli18n-tmp.h:357 #, fuzzy msgid "Epson Stylus Photo R270" msgstr "Stylus Photo 1270" -#: src/main/xmli18n-tmp.h:336 +#: src/main/xmli18n-tmp.h:358 +#, fuzzy +msgid "Epson Stylus Photo R280" +msgstr "Stylus Photo 1280" + +#: src/main/xmli18n-tmp.h:359 +#, fuzzy +msgid "Epson Stylus Photo R285" +msgstr "Stylus Photo 785" + +#: src/main/xmli18n-tmp.h:360 #, fuzzy msgid "Epson Stylus Photo R300" msgstr "Stylus Photo 700" -#: src/main/xmli18n-tmp.h:337 +#: src/main/xmli18n-tmp.h:361 #, fuzzy msgid "Epson Stylus Photo R310" msgstr "Stylus Photo 700" -#: src/main/xmli18n-tmp.h:338 +#: src/main/xmli18n-tmp.h:362 #, fuzzy msgid "Epson Stylus Photo R320" msgstr "Stylus Photo 1200" -#: src/main/xmli18n-tmp.h:339 +#: src/main/xmli18n-tmp.h:363 #, fuzzy msgid "Epson Stylus Photo R340" msgstr "Stylus Photo 700" -#: src/main/xmli18n-tmp.h:340 +#: src/main/xmli18n-tmp.h:364 #, fuzzy msgid "Epson Stylus Photo R350" msgstr "Stylus Photo 700" -#: src/main/xmli18n-tmp.h:341 +#: src/main/xmli18n-tmp.h:365 #, fuzzy msgid "Epson Stylus Photo R360" msgstr "Stylus Photo 700" -#: src/main/xmli18n-tmp.h:342 +#: src/main/xmli18n-tmp.h:366 #, fuzzy msgid "Epson Stylus Photo R380" msgstr "Stylus Photo 700" -#: src/main/xmli18n-tmp.h:343 +#: src/main/xmli18n-tmp.h:367 #, fuzzy msgid "Epson Stylus Photo R390" msgstr "Stylus Photo 700" -#: src/main/xmli18n-tmp.h:344 +#: src/main/xmli18n-tmp.h:368 #, fuzzy msgid "Epson Stylus Photo RX400" msgstr "Stylus Photo 700" -#: src/main/xmli18n-tmp.h:345 +#: src/main/xmli18n-tmp.h:369 #, fuzzy msgid "Epson Stylus Photo RX420" msgstr "Stylus Photo 1200" -#: src/main/xmli18n-tmp.h:346 +#: src/main/xmli18n-tmp.h:370 #, fuzzy msgid "Epson Stylus Photo RX425" msgstr "Stylus Photo 1200" -#: src/main/xmli18n-tmp.h:347 +#: src/main/xmli18n-tmp.h:371 #, fuzzy msgid "Epson Stylus Photo RX430" msgstr "Stylus Photo 700" -#: src/main/xmli18n-tmp.h:348 +#: src/main/xmli18n-tmp.h:372 #, fuzzy msgid "Epson Stylus Photo RX500" msgstr "Stylus Photo 700" -#: src/main/xmli18n-tmp.h:349 +#: src/main/xmli18n-tmp.h:373 #, fuzzy msgid "Epson Stylus Photo RX510" msgstr "Stylus Photo 700" -#: src/main/xmli18n-tmp.h:350 +#: src/main/xmli18n-tmp.h:374 #, fuzzy msgid "Epson Stylus Photo RX560" msgstr "Stylus Photo 700" -#: src/main/xmli18n-tmp.h:351 +#: src/main/xmli18n-tmp.h:375 #, fuzzy msgid "Epson Stylus Photo RX580" msgstr "Stylus Photo 700" -#: src/main/xmli18n-tmp.h:352 +#: src/main/xmli18n-tmp.h:376 +#, fuzzy +msgid "Epson Stylus Photo RX585" +msgstr "Stylus Photo 700" + +#: src/main/xmli18n-tmp.h:377 #, fuzzy msgid "Epson Stylus Photo RX590" msgstr "Stylus Photo 700" -#: src/main/xmli18n-tmp.h:353 +#: src/main/xmli18n-tmp.h:378 #, fuzzy msgid "Epson Stylus Photo RX595" msgstr "Stylus Photo 700" -#: src/main/xmli18n-tmp.h:354 +#: src/main/xmli18n-tmp.h:379 #, fuzzy msgid "Epson Stylus Photo RX600" msgstr "Stylus Photo 700" -#: src/main/xmli18n-tmp.h:355 +#: src/main/xmli18n-tmp.h:380 #, fuzzy msgid "Epson Stylus Photo RX620" msgstr "Stylus Photo 700" -#: src/main/xmli18n-tmp.h:356 +#: src/main/xmli18n-tmp.h:381 #, fuzzy msgid "Epson Stylus Photo RX630" msgstr "Stylus Photo 700" -#: src/main/xmli18n-tmp.h:357 +#: src/main/xmli18n-tmp.h:382 #, fuzzy msgid "Epson Stylus Photo RX640" msgstr "Stylus Photo 700" -#: src/main/xmli18n-tmp.h:358 +#: src/main/xmli18n-tmp.h:383 +#, fuzzy +msgid "Epson Stylus Photo RX680" +msgstr "Stylus Photo 700" + +#: src/main/xmli18n-tmp.h:384 +#, fuzzy +msgid "Epson Stylus Photo RX685" +msgstr "Stylus Photo 700" + +#: src/main/xmli18n-tmp.h:385 #, fuzzy msgid "Epson Stylus Photo RX700" msgstr "Stylus Photo 700" -#: src/main/xmli18n-tmp.h:359 +#: src/main/xmli18n-tmp.h:386 #, fuzzy msgid "Epson Stylus Photo R800" msgstr "Stylus Photo 700" -#: src/main/xmli18n-tmp.h:360 +#: src/main/xmli18n-tmp.h:387 #, fuzzy msgid "Epson Stylus Photo R1800" msgstr "Stylus Photo 700" -#: src/main/xmli18n-tmp.h:361 +#: src/main/xmli18n-tmp.h:388 #, fuzzy msgid "Epson Stylus Photo R2400" msgstr "Stylus Photo 1200" -#: src/main/xmli18n-tmp.h:362 +#: src/main/xmli18n-tmp.h:389 #, fuzzy msgid "Epson Stylus Pro 5000" msgstr "Stylus Pro 5000" -#: src/main/xmli18n-tmp.h:363 +#: src/main/xmli18n-tmp.h:390 #, fuzzy msgid "Epson Stylus Pro 5500" msgstr "Stylus Pro 5500" -#: src/main/xmli18n-tmp.h:364 +#: src/main/xmli18n-tmp.h:391 #, fuzzy msgid "Epson Stylus Pro 7000" msgstr "Stylus Pro 7000" -#: src/main/xmli18n-tmp.h:365 +#: src/main/xmli18n-tmp.h:392 #, fuzzy msgid "Epson Stylus Pro 7500" msgstr "Stylus Pro 7500" -#: src/main/xmli18n-tmp.h:366 +#: src/main/xmli18n-tmp.h:393 #, fuzzy msgid "Epson Stylus Pro 7600" msgstr "Stylus Pro 7600" -#: src/main/xmli18n-tmp.h:367 +#: src/main/xmli18n-tmp.h:394 #, fuzzy msgid "Epson Stylus Pro 9000" msgstr "Stylus Pro 9000" -#: src/main/xmli18n-tmp.h:368 +#: src/main/xmli18n-tmp.h:395 #, fuzzy msgid "Epson Stylus Pro 9500" msgstr "Stylus Pro 9500" -#: src/main/xmli18n-tmp.h:369 +#: src/main/xmli18n-tmp.h:396 #, fuzzy msgid "Epson Stylus Pro 9600" msgstr "Stylus Pro 9600" -#: src/main/xmli18n-tmp.h:370 +#: src/main/xmli18n-tmp.h:397 #, fuzzy msgid "Epson Stylus Pro 10000" msgstr "Stylus Pro 10000" -#: src/main/xmli18n-tmp.h:371 +#: src/main/xmli18n-tmp.h:398 #, fuzzy msgid "Epson Stylus Scan 2000" msgstr "Stylus Scan 2000" -#: src/main/xmli18n-tmp.h:372 +#: src/main/xmli18n-tmp.h:399 #, fuzzy msgid "Epson Stylus Scan 2500" msgstr "Stylus Scan 2500" -#: src/main/xmli18n-tmp.h:373 +#: src/main/xmli18n-tmp.h:400 #, fuzzy msgid "Epson Stylus CX1500" msgstr "Stylus C20sx" -#: src/main/xmli18n-tmp.h:374 +#: src/main/xmli18n-tmp.h:401 #, fuzzy msgid "Epson Stylus CX3100" msgstr "Stylus C20sx" -#: src/main/xmli18n-tmp.h:375 +#: src/main/xmli18n-tmp.h:402 #, fuzzy msgid "Epson Stylus CX3200" msgstr "Stylus C20sx" -#: src/main/xmli18n-tmp.h:376 +#: src/main/xmli18n-tmp.h:403 #, fuzzy msgid "Epson Stylus CX3500" msgstr "Stylus C20sx" -#: src/main/xmli18n-tmp.h:377 +#: src/main/xmli18n-tmp.h:404 #, fuzzy msgid "Epson Stylus CX3600" msgstr "Stylus C20sx" -#: src/main/xmli18n-tmp.h:378 +#: src/main/xmli18n-tmp.h:405 #, fuzzy msgid "Epson Stylus CX3650" msgstr "Stylus C20sx" -#: src/main/xmli18n-tmp.h:379 +#: src/main/xmli18n-tmp.h:406 #, fuzzy msgid "Epson Stylus CX3700" msgstr "Stylus C20sx" -#: src/main/xmli18n-tmp.h:380 +#: src/main/xmli18n-tmp.h:407 #, fuzzy msgid "Epson Stylus CX3800" msgstr "Stylus C20sx" -#: src/main/xmli18n-tmp.h:381 +#: src/main/xmli18n-tmp.h:408 #, fuzzy msgid "Epson Stylus CX3805" -msgstr "Stylus C50" +msgstr "Stylus C80" -#: src/main/xmli18n-tmp.h:382 +#: src/main/xmli18n-tmp.h:409 #, fuzzy msgid "Epson Stylus CX3810" msgstr "Stylus C20sx" -#: src/main/xmli18n-tmp.h:383 +#: src/main/xmli18n-tmp.h:410 #, fuzzy msgid "Epson Stylus CX4100" msgstr "Stylus C20sx" -#: src/main/xmli18n-tmp.h:384 +#: src/main/xmli18n-tmp.h:411 #, fuzzy msgid "Epson Stylus CX4200" msgstr "Stylus C20sx" -#: src/main/xmli18n-tmp.h:385 +#: src/main/xmli18n-tmp.h:412 #, fuzzy msgid "Epson Stylus CX4400" msgstr "Stylus C20sx" -#: src/main/xmli18n-tmp.h:386 +#: src/main/xmli18n-tmp.h:413 #, fuzzy msgid "Epson Stylus CX4500" msgstr "Stylus C20sx" -#: src/main/xmli18n-tmp.h:387 +#: src/main/xmli18n-tmp.h:414 #, fuzzy msgid "Epson Stylus CX4600" msgstr "Stylus C20sx" -#: src/main/xmli18n-tmp.h:388 +#: src/main/xmli18n-tmp.h:415 #, fuzzy msgid "Epson Stylus CX4700" msgstr "Stylus C20sx" -#: src/main/xmli18n-tmp.h:389 +#: src/main/xmli18n-tmp.h:416 #, fuzzy msgid "Epson Stylus CX4800" msgstr "Stylus C20sx" -#: src/main/xmli18n-tmp.h:390 +#: src/main/xmli18n-tmp.h:417 #, fuzzy msgid "Epson Stylus CX4900" msgstr "Stylus C20sx" -#: src/main/xmli18n-tmp.h:391 +#: src/main/xmli18n-tmp.h:418 #, fuzzy msgid "Epson Stylus CX5000" msgstr "Stylus C20sx" -#: src/main/xmli18n-tmp.h:392 +#: src/main/xmli18n-tmp.h:419 #, fuzzy msgid "Epson Stylus CX5000F" msgstr "Stylus C20sx" -#: src/main/xmli18n-tmp.h:393 +#: src/main/xmli18n-tmp.h:420 #, fuzzy msgid "Epson Stylus CX5100" msgstr "Stylus C50" -#: src/main/xmli18n-tmp.h:394 +#: src/main/xmli18n-tmp.h:421 #, fuzzy msgid "Epson Stylus CX5200" msgstr "Stylus C50" -#: src/main/xmli18n-tmp.h:395 +#: src/main/xmli18n-tmp.h:422 #, fuzzy msgid "Epson Stylus CX5300" msgstr "Stylus C20sx" -#: src/main/xmli18n-tmp.h:396 +#: src/main/xmli18n-tmp.h:423 #, fuzzy msgid "Epson Stylus CX5400" msgstr "Stylus C20sx" -#: src/main/xmli18n-tmp.h:397 +#: src/main/xmli18n-tmp.h:424 #, fuzzy msgid "Epson Stylus CX5600" msgstr "Stylus C20sx" -#: src/main/xmli18n-tmp.h:398 +#: src/main/xmli18n-tmp.h:425 #, fuzzy msgid "Epson Stylus CX5700" msgstr "Stylus C20sx" -#: src/main/xmli18n-tmp.h:399 +#: src/main/xmli18n-tmp.h:426 #, fuzzy msgid "Epson Stylus CX5800" msgstr "Stylus C20sx" -#: src/main/xmli18n-tmp.h:400 +#: src/main/xmli18n-tmp.h:427 #, fuzzy msgid "Epson Stylus CX6000" msgstr "Stylus C20sx" -#: src/main/xmli18n-tmp.h:401 +#: src/main/xmli18n-tmp.h:428 #, fuzzy msgid "Epson Stylus CX6300" msgstr "Stylus C20sx" -#: src/main/xmli18n-tmp.h:402 +#: src/main/xmli18n-tmp.h:429 #, fuzzy msgid "Epson Stylus CX6400" msgstr "Stylus C20sx" -#: src/main/xmli18n-tmp.h:403 +#: src/main/xmli18n-tmp.h:430 #, fuzzy msgid "Epson Stylus CX6500" msgstr "Stylus C20sx" -#: src/main/xmli18n-tmp.h:404 +#: src/main/xmli18n-tmp.h:431 #, fuzzy msgid "Epson Stylus CX6600" msgstr "Stylus C20sx" -#: src/main/xmli18n-tmp.h:405 +#: src/main/xmli18n-tmp.h:432 #, fuzzy msgid "Epson Stylus CX7000F" -msgstr "Stylus C20sx" +msgstr "Stylus C70" -#: src/main/xmli18n-tmp.h:406 +#: src/main/xmli18n-tmp.h:433 #, fuzzy msgid "Epson Stylus CX7400" msgstr "Stylus C20sx" -#: src/main/xmli18n-tmp.h:407 +#: src/main/xmli18n-tmp.h:434 #, fuzzy msgid "Epson Stylus CX7700" msgstr "Stylus C70" -#: src/main/xmli18n-tmp.h:408 +#: src/main/xmli18n-tmp.h:435 #, fuzzy msgid "Epson Stylus CX7800" msgstr "Stylus C20sx" -#: src/main/xmli18n-tmp.h:409 +#: src/main/xmli18n-tmp.h:436 #, fuzzy msgid "Epson Stylus CX8300" msgstr "Stylus C20sx" -#: src/main/xmli18n-tmp.h:410 +#: src/main/xmli18n-tmp.h:437 #, fuzzy msgid "Epson Stylus CX8400" msgstr "Stylus C20sx" -#: src/main/xmli18n-tmp.h:411 +#: src/main/xmli18n-tmp.h:438 #, fuzzy msgid "Epson Stylus CX9400" msgstr "Stylus C20sx" -#: src/main/xmli18n-tmp.h:412 +#: src/main/xmli18n-tmp.h:439 #, fuzzy msgid "Epson Stylus D68" msgstr "Stylus C60" -#: src/main/xmli18n-tmp.h:413 +#: src/main/xmli18n-tmp.h:440 #, fuzzy msgid "Epson Stylus D88" msgstr "Stylus C80" -#: src/main/xmli18n-tmp.h:414 +#: src/main/xmli18n-tmp.h:441 +#, fuzzy +msgid "Epson Stylus D92" +msgstr "Stylus C62" + +#: src/main/xmli18n-tmp.h:442 #, fuzzy msgid "Epson Stylus D120" msgstr "Stylus C20ux" -#: src/main/xmli18n-tmp.h:415 +#: src/main/xmli18n-tmp.h:443 #, fuzzy msgid "Epson Stylus DX3800" msgstr "Stylus C20sx" -#: src/main/xmli18n-tmp.h:416 +#: src/main/xmli18n-tmp.h:444 #, fuzzy msgid "Epson Stylus DX3850" msgstr "Stylus C20sx" -#: src/main/xmli18n-tmp.h:417 +#: src/main/xmli18n-tmp.h:445 #, fuzzy msgid "Epson Stylus DX4050" msgstr "Stylus C20sx" -#: src/main/xmli18n-tmp.h:418 +#: src/main/xmli18n-tmp.h:446 #, fuzzy msgid "Epson Stylus DX4200" msgstr "Stylus C20sx" -#: src/main/xmli18n-tmp.h:419 +#: src/main/xmli18n-tmp.h:447 #, fuzzy msgid "Epson Stylus DX4250" -msgstr "Stylus C50" +msgstr "Stylus C20sx" -#: src/main/xmli18n-tmp.h:420 +#: src/main/xmli18n-tmp.h:448 +#, fuzzy +msgid "Epson Stylus DX4400" +msgstr "Stylus C20sx" + +#: src/main/xmli18n-tmp.h:449 +#, fuzzy +msgid "Epson Stylus DX4450" +msgstr "Stylus C20sx" + +#: src/main/xmli18n-tmp.h:450 #, fuzzy msgid "Epson Stylus DX4800" msgstr "Stylus C20sx" -#: src/main/xmli18n-tmp.h:421 +#: src/main/xmli18n-tmp.h:451 +#, fuzzy +msgid "Epson Stylus DX7000F" +msgstr "Stylus Pro 7000" + +#: src/main/xmli18n-tmp.h:452 +#, fuzzy +msgid "Epson Stylus DX7400" +msgstr "Stylus C20sx" + +#: src/main/xmli18n-tmp.h:453 +#, fuzzy +msgid "Epson Stylus DX7450" +msgstr "Stylus C20sx" + +#: src/main/xmli18n-tmp.h:454 +#, fuzzy +msgid "Epson Stylus DX8400" +msgstr "Stylus C20sx" + +#: src/main/xmli18n-tmp.h:455 +#, fuzzy +msgid "Epson Stylus DX8450" +msgstr "Stylus C20sx" + +#: src/main/xmli18n-tmp.h:456 msgid "Epson PictureMate" msgstr "" -#: src/main/xmli18n-tmp.h:422 +#: src/main/xmli18n-tmp.h:457 +msgid "Epson PictureMate Dash" +msgstr "" + +#: src/main/xmli18n-tmp.h:458 msgid "Epson PictureMate Deluxe" msgstr "" -#: src/main/xmli18n-tmp.h:423 +#: src/main/xmli18n-tmp.h:459 msgid "Epson PictureMate Flash" msgstr "" -#: src/main/xmli18n-tmp.h:424 +#: src/main/xmli18n-tmp.h:460 msgid "Epson PictureMate Pal" msgstr "" -#: src/main/xmli18n-tmp.h:425 +#: src/main/xmli18n-tmp.h:461 msgid "Epson PictureMate Snap" msgstr "" -#: src/main/xmli18n-tmp.h:426 -#, fuzzy +#: src/main/xmli18n-tmp.h:462 +msgid "Epson PictureMate 100" +msgstr "" + +#: src/main/xmli18n-tmp.h:463 msgid "Epson PictureMate 200" -msgstr "Stylus C50" +msgstr "" -#: src/main/xmli18n-tmp.h:427 -#, fuzzy +#: src/main/xmli18n-tmp.h:464 msgid "Epson PictureMate 210" -msgstr "Stylus C50" +msgstr "" -#: src/main/xmli18n-tmp.h:428 -#, fuzzy +#: src/main/xmli18n-tmp.h:465 msgid "Epson PictureMate 240" -msgstr "Stylus C50" +msgstr "" -#: src/main/xmli18n-tmp.h:429 -#, fuzzy +#: src/main/xmli18n-tmp.h:466 msgid "Epson PictureMate 250" -msgstr "Stylus C50" +msgstr "" -#: src/main/xmli18n-tmp.h:430 -#, fuzzy +#: src/main/xmli18n-tmp.h:467 +msgid "Epson PictureMate 260" +msgstr "" + +#: src/main/xmli18n-tmp.h:468 +msgid "Epson PictureMate 270" +msgstr "" + +#: src/main/xmli18n-tmp.h:469 msgid "Epson PictureMate 280" -msgstr "Stylus C50" +msgstr "" -#: src/main/xmli18n-tmp.h:431 +#: src/main/xmli18n-tmp.h:470 +msgid "Epson PictureMate 290" +msgstr "" + +#: src/main/xmli18n-tmp.h:471 +msgid "Epson PictureMate 500" +msgstr "" + +#: src/main/xmli18n-tmp.h:472 +msgid "Epson PictureMate 2005" +msgstr "" + +#: src/main/xmli18n-tmp.h:473 msgid "Epson CL 700" msgstr "" -#: src/main/xmli18n-tmp.h:432 +#: src/main/xmli18n-tmp.h:474 msgid "Epson CL 750" msgstr "" -#: src/main/xmli18n-tmp.h:433 +#: src/main/xmli18n-tmp.h:475 msgid "Epson CL 760" msgstr "" -#: src/main/xmli18n-tmp.h:434 +#: src/main/xmli18n-tmp.h:476 msgid "Epson E 100" msgstr "" -#: src/main/xmli18n-tmp.h:435 +#: src/main/xmli18n-tmp.h:477 msgid "Epson E 150" msgstr "" -#: src/main/xmli18n-tmp.h:436 +#: src/main/xmli18n-tmp.h:478 msgid "Epson E 200" msgstr "" -#: src/main/xmli18n-tmp.h:437 +#: src/main/xmli18n-tmp.h:479 +msgid "Epson E 300" +msgstr "" + +#: src/main/xmli18n-tmp.h:480 +msgid "Epson E 500" +msgstr "" + +#: src/main/xmli18n-tmp.h:481 +msgid "Epson E 520" +msgstr "" + +#: src/main/xmli18n-tmp.h:482 +msgid "Epson E 700" +msgstr "" + +#: src/main/xmli18n-tmp.h:483 +msgid "Epson E 720" +msgstr "" + +#: src/main/xmli18n-tmp.h:484 msgid "Epson EM 900C" msgstr "" -#: src/main/xmli18n-tmp.h:438 +#: src/main/xmli18n-tmp.h:485 msgid "Epson EM 930C" msgstr "" -#: src/main/xmli18n-tmp.h:439 +#: src/main/xmli18n-tmp.h:486 msgid "Epson MC 2000" msgstr "" -#: src/main/xmli18n-tmp.h:440 +#: src/main/xmli18n-tmp.h:487 msgid "Epson MC 5000" msgstr "" -#: src/main/xmli18n-tmp.h:441 +#: src/main/xmli18n-tmp.h:488 msgid "Epson MC 7000" msgstr "" -#: src/main/xmli18n-tmp.h:442 +#: src/main/xmli18n-tmp.h:489 msgid "Epson MC 9000" msgstr "" -#: src/main/xmli18n-tmp.h:443 +#: src/main/xmli18n-tmp.h:490 msgid "Epson MC 10000" msgstr "" -#: src/main/xmli18n-tmp.h:444 +#: src/main/xmli18n-tmp.h:491 msgid "Epson MJ 930C" msgstr "" -#: src/main/xmli18n-tmp.h:445 +#: src/main/xmli18n-tmp.h:492 msgid "Epson MJ 5100C" msgstr "" -#: src/main/xmli18n-tmp.h:446 +#: src/main/xmli18n-tmp.h:493 msgid "Epson MJ 6000C" msgstr "" -#: src/main/xmli18n-tmp.h:447 +#: src/main/xmli18n-tmp.h:494 msgid "Epson MJ 8000C" msgstr "" -#: src/main/xmli18n-tmp.h:448 -#, fuzzy +#: src/main/xmli18n-tmp.h:495 msgid "Epson PM 670C" -msgstr "Stylus C50" +msgstr "" -#: src/main/xmli18n-tmp.h:449 +#: src/main/xmli18n-tmp.h:496 msgid "Epson PM 700C" msgstr "" -#: src/main/xmli18n-tmp.h:450 +#: src/main/xmli18n-tmp.h:497 msgid "Epson PM 730C" msgstr "" -#: src/main/xmli18n-tmp.h:451 +#: src/main/xmli18n-tmp.h:498 msgid "Epson PM 740C" msgstr "" -#: src/main/xmli18n-tmp.h:452 +#: src/main/xmli18n-tmp.h:499 msgid "Epson PM 750C" msgstr "" -#: src/main/xmli18n-tmp.h:453 +#: src/main/xmli18n-tmp.h:500 msgid "Epson PM 760C" msgstr "" -#: src/main/xmli18n-tmp.h:454 +#: src/main/xmli18n-tmp.h:501 msgid "Epson PM 770C" msgstr "" -#: src/main/xmli18n-tmp.h:455 +#: src/main/xmli18n-tmp.h:502 msgid "Epson PM 780C" msgstr "" -#: src/main/xmli18n-tmp.h:456 +#: src/main/xmli18n-tmp.h:503 msgid "Epson PM 790PT" msgstr "" -#: src/main/xmli18n-tmp.h:457 +#: src/main/xmli18n-tmp.h:504 msgid "Epson PM 800C" msgstr "" -#: src/main/xmli18n-tmp.h:458 +#: src/main/xmli18n-tmp.h:505 msgid "Epson PM 850PT" msgstr "" -#: src/main/xmli18n-tmp.h:459 +#: src/main/xmli18n-tmp.h:506 msgid "Epson PM 870C" msgstr "" -#: src/main/xmli18n-tmp.h:460 +#: src/main/xmli18n-tmp.h:507 msgid "Epson PM 880C" msgstr "" -#: src/main/xmli18n-tmp.h:461 +#: src/main/xmli18n-tmp.h:508 msgid "Epson PM 930C" msgstr "" -#: src/main/xmli18n-tmp.h:462 +#: src/main/xmli18n-tmp.h:509 msgid "Epson PM 940C" msgstr "" -#: src/main/xmli18n-tmp.h:463 +#: src/main/xmli18n-tmp.h:510 msgid "Epson PM 950C" msgstr "" -#: src/main/xmli18n-tmp.h:464 +#: src/main/xmli18n-tmp.h:511 msgid "Epson PM 970C" msgstr "" -#: src/main/xmli18n-tmp.h:465 +#: src/main/xmli18n-tmp.h:512 msgid "Epson PM 980C" msgstr "" -#: src/main/xmli18n-tmp.h:466 +#: src/main/xmli18n-tmp.h:513 msgid "Epson PM 2000C" msgstr "" -#: src/main/xmli18n-tmp.h:467 +#: src/main/xmli18n-tmp.h:514 msgid "Epson PM 2200C" msgstr "" -#: src/main/xmli18n-tmp.h:468 +#: src/main/xmli18n-tmp.h:515 msgid "Epson PM 3000C" msgstr "" -#: src/main/xmli18n-tmp.h:469 +#: src/main/xmli18n-tmp.h:516 msgid "Epson PM 3300C" msgstr "" -#: src/main/xmli18n-tmp.h:470 +#: src/main/xmli18n-tmp.h:517 msgid "Epson PM 3500C" msgstr "" -#: src/main/xmli18n-tmp.h:471 +#: src/main/xmli18n-tmp.h:518 msgid "Epson PM 3700C" msgstr "" -#: src/main/xmli18n-tmp.h:472 +#: src/main/xmli18n-tmp.h:519 msgid "Epson PM 4000PX" msgstr "" -#: src/main/xmli18n-tmp.h:473 +#: src/main/xmli18n-tmp.h:520 msgid "Epson PM 5000C" msgstr "" -#: src/main/xmli18n-tmp.h:474 +#: src/main/xmli18n-tmp.h:521 msgid "Epson PM 7000C" msgstr "" -#: src/main/xmli18n-tmp.h:475 +#: src/main/xmli18n-tmp.h:522 msgid "Epson PM 9000C" msgstr "" -#: src/main/xmli18n-tmp.h:476 +#: src/main/xmli18n-tmp.h:523 #, fuzzy msgid "Epson PM 10000" msgstr "Stylus Pro 10000" -#: src/main/xmli18n-tmp.h:477 +#: src/main/xmli18n-tmp.h:524 msgid "Epson PM A650" msgstr "" -#: src/main/xmli18n-tmp.h:478 +#: src/main/xmli18n-tmp.h:525 msgid "Epson PM A750" msgstr "" -#: src/main/xmli18n-tmp.h:479 -#, fuzzy +#: src/main/xmli18n-tmp.h:526 msgid "Epson PM A820" -msgstr "Stylus C50" +msgstr "" -#: src/main/xmli18n-tmp.h:480 +#: src/main/xmli18n-tmp.h:527 msgid "Epson PM A890" msgstr "" -#: src/main/xmli18n-tmp.h:481 -#, fuzzy +#: src/main/xmli18n-tmp.h:528 msgid "Epson PM A900" -msgstr "Stylus C50" +msgstr "" -#: src/main/xmli18n-tmp.h:482 +#: src/main/xmli18n-tmp.h:529 msgid "Epson PM A950" msgstr "" -#: src/main/xmli18n-tmp.h:483 +#: src/main/xmli18n-tmp.h:530 msgid "Epson PM D600" msgstr "" -#: src/main/xmli18n-tmp.h:484 +#: src/main/xmli18n-tmp.h:531 #, fuzzy msgid "Epson PM D750" msgstr "Stylus C50" -#: src/main/xmli18n-tmp.h:485 +#: src/main/xmli18n-tmp.h:532 #, fuzzy msgid "Epson PM D770" msgstr "Stylus C50" -#: src/main/xmli18n-tmp.h:486 +#: src/main/xmli18n-tmp.h:533 msgid "Epson PM D800" msgstr "" -#: src/main/xmli18n-tmp.h:487 -#, fuzzy +#: src/main/xmli18n-tmp.h:534 msgid "Epson PM D870" -msgstr "Stylus C50" +msgstr "" -#: src/main/xmli18n-tmp.h:488 +#: src/main/xmli18n-tmp.h:535 #, fuzzy msgid "Epson PM D1000" msgstr "Stylus C50" -#: src/main/xmli18n-tmp.h:489 +#: src/main/xmli18n-tmp.h:536 #, fuzzy msgid "Epson PM G700" msgstr "Stylus C50" -#: src/main/xmli18n-tmp.h:490 +#: src/main/xmli18n-tmp.h:537 #, fuzzy msgid "Epson PM G720" msgstr "Stylus C50" -#: src/main/xmli18n-tmp.h:491 +#: src/main/xmli18n-tmp.h:538 msgid "Epson PM G730" msgstr "" -#: src/main/xmli18n-tmp.h:492 +#: src/main/xmli18n-tmp.h:539 #, fuzzy msgid "Epson PM G800" msgstr "Stylus C50" -#: src/main/xmli18n-tmp.h:493 +#: src/main/xmli18n-tmp.h:540 #, fuzzy msgid "Epson PM G820" msgstr "Stylus C50" -#: src/main/xmli18n-tmp.h:494 -#, fuzzy +#: src/main/xmli18n-tmp.h:541 msgid "Epson PM G850" -msgstr "Stylus C50" +msgstr "" -#: src/main/xmli18n-tmp.h:495 -#, fuzzy +#: src/main/xmli18n-tmp.h:542 msgid "Epson PM G4500" -msgstr "Stylus C50" +msgstr "" -#: src/main/xmli18n-tmp.h:496 -#, fuzzy +#: src/main/xmli18n-tmp.h:543 msgid "Epson PX A650" -msgstr "Stylus C50" +msgstr "" -#: src/main/xmli18n-tmp.h:497 +#: src/main/xmli18n-tmp.h:544 #, fuzzy msgid "Epson PX G900" msgstr "Stylus C50" -#: src/main/xmli18n-tmp.h:498 +#: src/main/xmli18n-tmp.h:545 #, fuzzy msgid "Epson PX G920" msgstr "Stylus C50" -#: src/main/xmli18n-tmp.h:499 +#: src/main/xmli18n-tmp.h:546 #, fuzzy msgid "Epson PX G5000" msgstr "Stylus C50" -#: src/main/xmli18n-tmp.h:500 +#: src/main/xmli18n-tmp.h:547 #, fuzzy msgid "Epson PX V500" msgstr "Stylus C50" -#: src/main/xmli18n-tmp.h:501 +#: src/main/xmli18n-tmp.h:548 #, fuzzy msgid "Epson PX V600" msgstr "Stylus C50" -#: src/main/xmli18n-tmp.h:502 +#: src/main/xmli18n-tmp.h:549 msgid "Epson PX V630" msgstr "" -#: src/main/xmli18n-tmp.h:503 -#, fuzzy +#: src/main/xmli18n-tmp.h:550 msgid "Epson PX V780" -msgstr "Stylus C50" +msgstr "" -#: src/main/xmli18n-tmp.h:504 -#, fuzzy +#: src/main/xmli18n-tmp.h:551 msgid "Epson PX 5500" -msgstr "Stylus C50" +msgstr "" -#: src/main/xmli18n-tmp.h:505 +#: src/main/xmli18n-tmp.h:552 msgid "Epson PX 7000" msgstr "" -#: src/main/xmli18n-tmp.h:506 +#: src/main/xmli18n-tmp.h:553 msgid "Epson PX 9000" msgstr "" -#: src/main/xmli18n-tmp.h:507 +#: src/main/xmli18n-tmp.h:554 msgid "Apollo P-2100" msgstr "" -#: src/main/xmli18n-tmp.h:508 +#: src/main/xmli18n-tmp.h:555 msgid "Apollo P-2150" msgstr "" -#: src/main/xmli18n-tmp.h:509 +#: src/main/xmli18n-tmp.h:556 msgid "Apollo P-2200" msgstr "" -#: src/main/xmli18n-tmp.h:510 +#: src/main/xmli18n-tmp.h:557 msgid "Apollo P-2250" msgstr "" -#: src/main/xmli18n-tmp.h:511 +#: src/main/xmli18n-tmp.h:558 msgid "Apollo P-2500" msgstr "" -#: src/main/xmli18n-tmp.h:512 +#: src/main/xmli18n-tmp.h:559 msgid "Apollo P-2550" msgstr "" -#: src/main/xmli18n-tmp.h:513 +#: src/main/xmli18n-tmp.h:560 msgid "Apollo P-2600" msgstr "" -#: src/main/xmli18n-tmp.h:514 +#: src/main/xmli18n-tmp.h:561 msgid "Apollo P-2650" msgstr "" -#: src/main/xmli18n-tmp.h:515 +#: src/main/xmli18n-tmp.h:562 msgid "Apple Color StyleWriter 4100" msgstr "" -#: src/main/xmli18n-tmp.h:516 +#: src/main/xmli18n-tmp.h:563 msgid "Apple Color StyleWriter 4500" msgstr "" -#: src/main/xmli18n-tmp.h:517 +#: src/main/xmli18n-tmp.h:564 msgid "Apple Color StyleWriter 6500" msgstr "" -#: src/main/xmli18n-tmp.h:518 +#: src/main/xmli18n-tmp.h:565 msgid "Apple LaserWriter Select 360" msgstr "" -#: src/main/xmli18n-tmp.h:519 +#: src/main/xmli18n-tmp.h:566 msgid "Brother DCP-1200" msgstr "" -#: src/main/xmli18n-tmp.h:520 +#: src/main/xmli18n-tmp.h:567 msgid "Brother HL-4Ve" msgstr "" -#: src/main/xmli18n-tmp.h:521 +#: src/main/xmli18n-tmp.h:568 msgid "Brother HL-10V" msgstr "" -#: src/main/xmli18n-tmp.h:522 +#: src/main/xmli18n-tmp.h:569 msgid "Brother HL-10h" msgstr "" -#: src/main/xmli18n-tmp.h:523 +#: src/main/xmli18n-tmp.h:570 msgid "Brother HL-630" msgstr "" -#: src/main/xmli18n-tmp.h:524 +#: src/main/xmli18n-tmp.h:571 msgid "Brother HL-660" msgstr "" -#: src/main/xmli18n-tmp.h:525 +#: src/main/xmli18n-tmp.h:572 msgid "Brother HL-760" msgstr "" -#: src/main/xmli18n-tmp.h:526 +#: src/main/xmli18n-tmp.h:573 msgid "Brother HL-960" msgstr "" -#: src/main/xmli18n-tmp.h:527 +#: src/main/xmli18n-tmp.h:574 msgid "Brother HL-1040" msgstr "" -#: src/main/xmli18n-tmp.h:528 +#: src/main/xmli18n-tmp.h:575 msgid "Brother HL-1050" msgstr "" -#: src/main/xmli18n-tmp.h:529 +#: src/main/xmli18n-tmp.h:576 msgid "Brother HL-1060" msgstr "" -#: src/main/xmli18n-tmp.h:530 +#: src/main/xmli18n-tmp.h:577 msgid "Brother HL-1070" msgstr "" -#: src/main/xmli18n-tmp.h:531 +#: src/main/xmli18n-tmp.h:578 msgid "Brother HL-1240" msgstr "" -#: src/main/xmli18n-tmp.h:532 +#: src/main/xmli18n-tmp.h:579 msgid "Brother HL-1250" msgstr "" -#: src/main/xmli18n-tmp.h:533 +#: src/main/xmli18n-tmp.h:580 msgid "Brother HL-1260" msgstr "" -#: src/main/xmli18n-tmp.h:534 +#: src/main/xmli18n-tmp.h:581 msgid "Brother HL-1270N" msgstr "" -#: src/main/xmli18n-tmp.h:535 +#: src/main/xmli18n-tmp.h:582 msgid "Brother HL-1440" msgstr "" -#: src/main/xmli18n-tmp.h:536 +#: src/main/xmli18n-tmp.h:583 msgid "Brother HL-1660e" msgstr "" -#: src/main/xmli18n-tmp.h:537 +#: src/main/xmli18n-tmp.h:584 msgid "Brother HL-2060" msgstr "" -#: src/main/xmli18n-tmp.h:538 +#: src/main/xmli18n-tmp.h:585 msgid "Brother MFC-6550MC" msgstr "" -#: src/main/xmli18n-tmp.h:539 +#: src/main/xmli18n-tmp.h:586 msgid "Brother MFC-8300" msgstr "" -#: src/main/xmli18n-tmp.h:540 +#: src/main/xmli18n-tmp.h:587 msgid "Brother MFC-9500" msgstr "" -#: src/main/xmli18n-tmp.h:541 +#: src/main/xmli18n-tmp.h:588 msgid "Brother MFC-9600" msgstr "" -#: src/main/xmli18n-tmp.h:542 +#: src/main/xmli18n-tmp.h:589 msgid "Canon GP 335" msgstr "" -#: src/main/xmli18n-tmp.h:543 +#: src/main/xmli18n-tmp.h:590 msgid "Canon LBP-4sx" msgstr "" -#: src/main/xmli18n-tmp.h:544 +#: src/main/xmli18n-tmp.h:591 msgid "Canon LBP-430" msgstr "" -#: src/main/xmli18n-tmp.h:545 +#: src/main/xmli18n-tmp.h:592 msgid "Canon LBP-1000" msgstr "" -#: src/main/xmli18n-tmp.h:546 +#: src/main/xmli18n-tmp.h:593 msgid "Canon LBP-1260" msgstr "" -#: src/main/xmli18n-tmp.h:547 +#: src/main/xmli18n-tmp.h:594 msgid "Canon LBP-1760" msgstr "" -#: src/main/xmli18n-tmp.h:548 +#: src/main/xmli18n-tmp.h:595 msgid "Canon imageRunner 330s" msgstr "" -#: src/main/xmli18n-tmp.h:549 +#: src/main/xmli18n-tmp.h:596 msgid "Citizen ProJet II" msgstr "" -#: src/main/xmli18n-tmp.h:550 +#: src/main/xmli18n-tmp.h:597 msgid "DEC 1800" msgstr "" -#: src/main/xmli18n-tmp.h:551 +#: src/main/xmli18n-tmp.h:598 msgid "DEC LN17" msgstr "" -#: src/main/xmli18n-tmp.h:552 +#: src/main/xmli18n-tmp.h:599 msgid "Epson ActionLaser 1100" msgstr "" -#: src/main/xmli18n-tmp.h:553 +#: src/main/xmli18n-tmp.h:600 msgid "Epson ActionLaser II" msgstr "" -#: src/main/xmli18n-tmp.h:554 +#: src/main/xmli18n-tmp.h:601 msgid "Epson AcuLaser C2000" msgstr "" -#: src/main/xmli18n-tmp.h:555 +#: src/main/xmli18n-tmp.h:602 msgid "Epson AcuLaser C2000PS" msgstr "" -#: src/main/xmli18n-tmp.h:556 +#: src/main/xmli18n-tmp.h:603 msgid "Epson AcuLaser C8500" msgstr "" -#: src/main/xmli18n-tmp.h:557 +#: src/main/xmli18n-tmp.h:604 msgid "Epson AcuLaser C8500PS" msgstr "" -#: src/main/xmli18n-tmp.h:558 +#: src/main/xmli18n-tmp.h:605 msgid "Epson AcuLaser C8600" msgstr "" -#: src/main/xmli18n-tmp.h:559 +#: src/main/xmli18n-tmp.h:606 msgid "Epson AcuLaser C8600PS" msgstr "" -#: src/main/xmli18n-tmp.h:560 +#: src/main/xmli18n-tmp.h:607 msgid "Epson EPL-5200" msgstr "" -#: src/main/xmli18n-tmp.h:561 +#: src/main/xmli18n-tmp.h:608 msgid "Epson EPL-5200+" msgstr "" -#: src/main/xmli18n-tmp.h:562 +#: src/main/xmli18n-tmp.h:609 msgid "Epson EPL-5700" msgstr "" -#: src/main/xmli18n-tmp.h:563 +#: src/main/xmli18n-tmp.h:610 msgid "Epson EPL-5700PS" msgstr "" -#: src/main/xmli18n-tmp.h:564 +#: src/main/xmli18n-tmp.h:611 msgid "Epson EPL-5800" msgstr "" -#: src/main/xmli18n-tmp.h:565 +#: src/main/xmli18n-tmp.h:612 msgid "Epson EPL-5800PS" msgstr "" -#: src/main/xmli18n-tmp.h:566 +#: src/main/xmli18n-tmp.h:613 msgid "Epson EPL-5900" msgstr "" -#: src/main/xmli18n-tmp.h:567 +#: src/main/xmli18n-tmp.h:614 msgid "Epson EPL-5900PS" msgstr "" -#: src/main/xmli18n-tmp.h:568 +#: src/main/xmli18n-tmp.h:615 msgid "Epson EPL-6100" msgstr "" -#: src/main/xmli18n-tmp.h:569 +#: src/main/xmli18n-tmp.h:616 msgid "Epson EPL-6100PS" msgstr "" -#: src/main/xmli18n-tmp.h:570 +#: src/main/xmli18n-tmp.h:617 msgid "Epson EPL-7100" msgstr "" -#: src/main/xmli18n-tmp.h:571 +#: src/main/xmli18n-tmp.h:618 msgid "Fujitsu PrintPartner 10V" msgstr "" -#: src/main/xmli18n-tmp.h:572 +#: src/main/xmli18n-tmp.h:619 msgid "Fujitsu PrintPartner 16DV" msgstr "" -#: src/main/xmli18n-tmp.h:573 +#: src/main/xmli18n-tmp.h:620 msgid "Fujitsu PrintPartner 20W" msgstr "" -#: src/main/xmli18n-tmp.h:574 +#: src/main/xmli18n-tmp.h:621 msgid "Fujitsu PrintPartner 8000" msgstr "" -#: src/main/xmli18n-tmp.h:575 +#: src/main/xmli18n-tmp.h:622 #, fuzzy msgid "Generic PCL 4 Printer" msgstr "Definovat novou tiskárnu" -#: src/main/xmli18n-tmp.h:576 +#: src/main/xmli18n-tmp.h:623 +#, fuzzy +msgid "Generic PCL 4 LF Printer" +msgstr "Definovat novou tiskárnu" + +#: src/main/xmli18n-tmp.h:624 #, fuzzy msgid "Generic PCL 5 Printer" msgstr "Definovat novou tiskárnu" -#: src/main/xmli18n-tmp.h:577 +#: src/main/xmli18n-tmp.h:625 +#, fuzzy +msgid "Generic PCL 5 LF Printer" +msgstr "Definovat novou tiskárnu" + +#: src/main/xmli18n-tmp.h:626 #, fuzzy msgid "Generic PCL 5c Printer" msgstr "Definovat novou tiskárnu" -#: src/main/xmli18n-tmp.h:578 +#: src/main/xmli18n-tmp.h:627 +#, fuzzy +msgid "Generic PCL 5c LF Printer" +msgstr "Definovat novou tiskárnu" + +#: src/main/xmli18n-tmp.h:628 #, fuzzy msgid "Generic PCL 5e Printer" msgstr "Definovat novou tiskárnu" -#: src/main/xmli18n-tmp.h:579 +#: src/main/xmli18n-tmp.h:629 +#, fuzzy +msgid "Generic PCL 5e LF Printer" +msgstr "Definovat novou tiskárnu" + +#: src/main/xmli18n-tmp.h:630 msgid "Generic PCL 6/PCL XL Printer" msgstr "" -#: src/main/xmli18n-tmp.h:580 +#: src/main/xmli18n-tmp.h:631 +#, fuzzy +msgid "Generic PCL 6/PCL XL LF Printer" +msgstr "Definovat novou tiskárnu" + +#: src/main/xmli18n-tmp.h:632 msgid "HP Business Inkjet 2200" msgstr "" -#: src/main/xmli18n-tmp.h:581 +#: src/main/xmli18n-tmp.h:633 msgid "HP Business Inkjet 2230" msgstr "" -#: src/main/xmli18n-tmp.h:582 +#: src/main/xmli18n-tmp.h:634 msgid "HP Business Inkjet 2250" msgstr "" -#: src/main/xmli18n-tmp.h:583 +#: src/main/xmli18n-tmp.h:635 msgid "HP Business Inkjet 2250TN" msgstr "" -#: src/main/xmli18n-tmp.h:584 +#: src/main/xmli18n-tmp.h:636 msgid "HP Business Inkjet 2280" msgstr "" -#: src/main/xmli18n-tmp.h:585 +#: src/main/xmli18n-tmp.h:637 msgid "HP Color Inkjet Printer CP1160" msgstr "" -#: src/main/xmli18n-tmp.h:586 +#: src/main/xmli18n-tmp.h:638 msgid "HP Color Inkjet Printer CP1700" msgstr "" -#: src/main/xmli18n-tmp.h:587 +#: src/main/xmli18n-tmp.h:639 msgid "HP Color LaserJet 2500" msgstr "" -#: src/main/xmli18n-tmp.h:588 +#: src/main/xmli18n-tmp.h:640 msgid "HP Color LaserJet 4500" msgstr "" -#: src/main/xmli18n-tmp.h:589 +#: src/main/xmli18n-tmp.h:641 msgid "HP Color LaserJet 4550" msgstr "" -#: src/main/xmli18n-tmp.h:590 +#: src/main/xmli18n-tmp.h:642 msgid "HP Color LaserJet 4600" msgstr "" -#: src/main/xmli18n-tmp.h:591 +#: src/main/xmli18n-tmp.h:643 msgid "HP Color LaserJet 5" msgstr "" -#: src/main/xmli18n-tmp.h:592 +#: src/main/xmli18n-tmp.h:644 msgid "HP Color LaserJet 5000" msgstr "" -#: src/main/xmli18n-tmp.h:593 +#: src/main/xmli18n-tmp.h:645 msgid "HP Color LaserJet 5500" msgstr "" -#: src/main/xmli18n-tmp.h:594 +#: src/main/xmli18n-tmp.h:646 msgid "HP Color LaserJet 8550GN" msgstr "" -#: src/main/xmli18n-tmp.h:595 +#: src/main/xmli18n-tmp.h:647 msgid "HP DesignJet 230" msgstr "" -#: src/main/xmli18n-tmp.h:596 +#: src/main/xmli18n-tmp.h:648 msgid "HP DesignJet 250C" msgstr "" -#: src/main/xmli18n-tmp.h:597 +#: src/main/xmli18n-tmp.h:649 msgid "HP DesignJet 430" msgstr "" -#: src/main/xmli18n-tmp.h:598 +#: src/main/xmli18n-tmp.h:650 msgid "HP DesignJet 450C" msgstr "" -#: src/main/xmli18n-tmp.h:599 +#: src/main/xmli18n-tmp.h:651 msgid "HP DesignJet 455CA" msgstr "" -#: src/main/xmli18n-tmp.h:600 +#: src/main/xmli18n-tmp.h:652 msgid "HP DesignJet 488CA" msgstr "" -#: src/main/xmli18n-tmp.h:601 +#: src/main/xmli18n-tmp.h:653 msgid "HP DesignJet 700" msgstr "" -#: src/main/xmli18n-tmp.h:602 +#: src/main/xmli18n-tmp.h:654 msgid "HP DesignJet 750C Plus" msgstr "" -#: src/main/xmli18n-tmp.h:603 +#: src/main/xmli18n-tmp.h:655 msgid "HP DesignJet 750C" msgstr "" -#: src/main/xmli18n-tmp.h:604 +#: src/main/xmli18n-tmp.h:656 msgid "HP DesignJet 2500CP" msgstr "" -#: src/main/xmli18n-tmp.h:605 +#: src/main/xmli18n-tmp.h:657 msgid "HP DesignJet 3500CP" msgstr "" -#: src/main/xmli18n-tmp.h:606 +#: src/main/xmli18n-tmp.h:658 msgid "HP DesignJet ColorPro CAD" msgstr "" -#: src/main/xmli18n-tmp.h:607 +#: src/main/xmli18n-tmp.h:659 msgid "HP DeskJet 400" msgstr "" -#: src/main/xmli18n-tmp.h:608 +#: src/main/xmli18n-tmp.h:660 msgid "HP DeskJet 420C" msgstr "" -#: src/main/xmli18n-tmp.h:609 +#: src/main/xmli18n-tmp.h:661 msgid "HP DeskJet 450" msgstr "" -#: src/main/xmli18n-tmp.h:610 +#: src/main/xmli18n-tmp.h:662 msgid "HP DeskJet 500" msgstr "" -#: src/main/xmli18n-tmp.h:611 +#: src/main/xmli18n-tmp.h:663 msgid "HP DeskJet 500C" msgstr "" -#: src/main/xmli18n-tmp.h:612 +#: src/main/xmli18n-tmp.h:664 msgid "HP DeskJet 505J Plus" msgstr "" -#: src/main/xmli18n-tmp.h:613 +#: src/main/xmli18n-tmp.h:665 msgid "HP DeskJet 510" msgstr "" -#: src/main/xmli18n-tmp.h:614 +#: src/main/xmli18n-tmp.h:666 msgid "HP DeskJet 520" msgstr "" -#: src/main/xmli18n-tmp.h:615 +#: src/main/xmli18n-tmp.h:667 msgid "HP DeskJet 540C" msgstr "" -#: src/main/xmli18n-tmp.h:616 +#: src/main/xmli18n-tmp.h:668 msgid "HP DeskJet 550C" msgstr "" -#: src/main/xmli18n-tmp.h:617 +#: src/main/xmli18n-tmp.h:669 msgid "HP DeskJet 5550" msgstr "" -#: src/main/xmli18n-tmp.h:618 +#: src/main/xmli18n-tmp.h:670 msgid "HP DeskJet 5551" msgstr "" -#: src/main/xmli18n-tmp.h:619 +#: src/main/xmli18n-tmp.h:671 msgid "HP DeskJet 560C" msgstr "" -#: src/main/xmli18n-tmp.h:620 +#: src/main/xmli18n-tmp.h:672 msgid "HP DeskJet 600" msgstr "" -#: src/main/xmli18n-tmp.h:621 +#: src/main/xmli18n-tmp.h:673 msgid "HP DeskJet 600C" msgstr "" -#: src/main/xmli18n-tmp.h:622 +#: src/main/xmli18n-tmp.h:674 msgid "HP DeskJet 610C" msgstr "" -#: src/main/xmli18n-tmp.h:623 +#: src/main/xmli18n-tmp.h:675 msgid "HP DeskJet 610CL" msgstr "" -#: src/main/xmli18n-tmp.h:624 +#: src/main/xmli18n-tmp.h:676 msgid "HP DeskJet 6122" msgstr "" -#: src/main/xmli18n-tmp.h:625 +#: src/main/xmli18n-tmp.h:677 msgid "HP DeskJet 6127" msgstr "" -#: src/main/xmli18n-tmp.h:626 +#: src/main/xmli18n-tmp.h:678 msgid "HP DeskJet 612C" msgstr "" -#: src/main/xmli18n-tmp.h:627 +#: src/main/xmli18n-tmp.h:679 msgid "HP DeskJet 640C" msgstr "" -#: src/main/xmli18n-tmp.h:628 +#: src/main/xmli18n-tmp.h:680 msgid "HP DeskJet 648C" msgstr "" -#: src/main/xmli18n-tmp.h:629 +#: src/main/xmli18n-tmp.h:681 msgid "HP DeskJet 660C" msgstr "" -#: src/main/xmli18n-tmp.h:630 +#: src/main/xmli18n-tmp.h:682 msgid "HP DeskJet 670C" msgstr "" -#: src/main/xmli18n-tmp.h:631 +#: src/main/xmli18n-tmp.h:683 msgid "HP DeskJet 670TV" msgstr "" -#: src/main/xmli18n-tmp.h:632 +#: src/main/xmli18n-tmp.h:684 msgid "HP DeskJet 672C" msgstr "" -#: src/main/xmli18n-tmp.h:633 +#: src/main/xmli18n-tmp.h:685 msgid "HP DeskJet 680C" msgstr "" -#: src/main/xmli18n-tmp.h:634 +#: src/main/xmli18n-tmp.h:686 msgid "HP DeskJet 682C" msgstr "" -#: src/main/xmli18n-tmp.h:635 +#: src/main/xmli18n-tmp.h:687 msgid "HP DeskJet 690C" msgstr "" -#: src/main/xmli18n-tmp.h:636 +#: src/main/xmli18n-tmp.h:688 msgid "HP DeskJet 692C" msgstr "" -#: src/main/xmli18n-tmp.h:637 +#: src/main/xmli18n-tmp.h:689 msgid "HP DeskJet 693C" msgstr "" -#: src/main/xmli18n-tmp.h:638 +#: src/main/xmli18n-tmp.h:690 msgid "HP DeskJet 694C" msgstr "" -#: src/main/xmli18n-tmp.h:639 +#: src/main/xmli18n-tmp.h:691 msgid "HP DeskJet 695C" msgstr "" -#: src/main/xmli18n-tmp.h:640 +#: src/main/xmli18n-tmp.h:692 msgid "HP DeskJet 697C" msgstr "" -#: src/main/xmli18n-tmp.h:641 +#: src/main/xmli18n-tmp.h:693 msgid "HP DeskJet 810C" msgstr "" -#: src/main/xmli18n-tmp.h:642 +#: src/main/xmli18n-tmp.h:694 msgid "HP DeskJet 812C" msgstr "" -#: src/main/xmli18n-tmp.h:643 +#: src/main/xmli18n-tmp.h:695 msgid "HP DeskJet 815C" msgstr "" -#: src/main/xmli18n-tmp.h:644 +#: src/main/xmli18n-tmp.h:696 msgid "HP DeskJet 816C" msgstr "" -#: src/main/xmli18n-tmp.h:645 +#: src/main/xmli18n-tmp.h:697 msgid "HP DeskJet 825C" msgstr "" -#: src/main/xmli18n-tmp.h:646 +#: src/main/xmli18n-tmp.h:698 msgid "HP DeskJet 830C" msgstr "" -#: src/main/xmli18n-tmp.h:647 +#: src/main/xmli18n-tmp.h:699 msgid "HP DeskJet 832C" msgstr "" -#: src/main/xmli18n-tmp.h:648 +#: src/main/xmli18n-tmp.h:700 msgid "HP DeskJet 840C" msgstr "" -#: src/main/xmli18n-tmp.h:649 +#: src/main/xmli18n-tmp.h:701 msgid "HP DeskJet 841C" msgstr "" -#: src/main/xmli18n-tmp.h:650 +#: src/main/xmli18n-tmp.h:702 msgid "HP DeskJet 842C" msgstr "" -#: src/main/xmli18n-tmp.h:651 +#: src/main/xmli18n-tmp.h:703 msgid "HP DeskJet 843C" msgstr "" -#: src/main/xmli18n-tmp.h:652 +#: src/main/xmli18n-tmp.h:704 msgid "HP DeskJet 845C" msgstr "" -#: src/main/xmli18n-tmp.h:653 +#: src/main/xmli18n-tmp.h:705 msgid "HP DeskJet 850C" msgstr "" -#: src/main/xmli18n-tmp.h:654 +#: src/main/xmli18n-tmp.h:706 msgid "HP DeskJet 855C" msgstr "" -#: src/main/xmli18n-tmp.h:655 +#: src/main/xmli18n-tmp.h:707 msgid "HP DeskJet 870C" msgstr "" -#: src/main/xmli18n-tmp.h:656 +#: src/main/xmli18n-tmp.h:708 msgid "HP DeskJet 880C" msgstr "" -#: src/main/xmli18n-tmp.h:657 +#: src/main/xmli18n-tmp.h:709 msgid "HP DeskJet 882C" msgstr "" -#: src/main/xmli18n-tmp.h:658 +#: src/main/xmli18n-tmp.h:710 msgid "HP DeskJet 890C" msgstr "" -#: src/main/xmli18n-tmp.h:659 +#: src/main/xmli18n-tmp.h:711 msgid "HP DeskJet 895C" msgstr "" -#: src/main/xmli18n-tmp.h:660 +#: src/main/xmli18n-tmp.h:712 msgid "HP DeskJet 916C" msgstr "" -#: src/main/xmli18n-tmp.h:661 +#: src/main/xmli18n-tmp.h:713 msgid "HP DeskJet 920C" msgstr "" -#: src/main/xmli18n-tmp.h:662 +#: src/main/xmli18n-tmp.h:714 msgid "HP DeskJet 9300" msgstr "" -#: src/main/xmli18n-tmp.h:663 +#: src/main/xmli18n-tmp.h:715 msgid "HP DeskJet 930C" msgstr "" -#: src/main/xmli18n-tmp.h:664 +#: src/main/xmli18n-tmp.h:716 msgid "HP DeskJet 932C" msgstr "" -#: src/main/xmli18n-tmp.h:665 +#: src/main/xmli18n-tmp.h:717 msgid "HP DeskJet 933C" msgstr "" -#: src/main/xmli18n-tmp.h:666 +#: src/main/xmli18n-tmp.h:718 msgid "HP DeskJet 934C" msgstr "" -#: src/main/xmli18n-tmp.h:667 +#: src/main/xmli18n-tmp.h:719 msgid "HP DeskJet 935C" msgstr "" -#: src/main/xmli18n-tmp.h:668 +#: src/main/xmli18n-tmp.h:720 msgid "HP DeskJet 940C" msgstr "" -#: src/main/xmli18n-tmp.h:669 +#: src/main/xmli18n-tmp.h:721 msgid "HP DeskJet 948C" msgstr "" -#: src/main/xmli18n-tmp.h:670 +#: src/main/xmli18n-tmp.h:722 msgid "HP DeskJet 950C" msgstr "" -#: src/main/xmli18n-tmp.h:671 +#: src/main/xmli18n-tmp.h:723 msgid "HP DeskJet 952C" msgstr "" -#: src/main/xmli18n-tmp.h:672 +#: src/main/xmli18n-tmp.h:724 msgid "HP DeskJet 955C" msgstr "" -#: src/main/xmli18n-tmp.h:673 +#: src/main/xmli18n-tmp.h:725 msgid "HP DeskJet 957C" msgstr "" -#: src/main/xmli18n-tmp.h:674 +#: src/main/xmli18n-tmp.h:726 msgid "HP DeskJet 959C" msgstr "" -#: src/main/xmli18n-tmp.h:675 +#: src/main/xmli18n-tmp.h:727 msgid "HP DeskJet 960C" msgstr "" -#: src/main/xmli18n-tmp.h:676 +#: src/main/xmli18n-tmp.h:728 msgid "HP DeskJet 970C" msgstr "" -#: src/main/xmli18n-tmp.h:677 +#: src/main/xmli18n-tmp.h:729 msgid "HP DeskJet 975C" msgstr "" -#: src/main/xmli18n-tmp.h:678 +#: src/main/xmli18n-tmp.h:730 msgid "HP DeskJet 980C" msgstr "" -#: src/main/xmli18n-tmp.h:679 +#: src/main/xmli18n-tmp.h:731 msgid "HP DeskJet 990C" msgstr "" -#: src/main/xmli18n-tmp.h:680 +#: src/main/xmli18n-tmp.h:732 msgid "HP DeskJet 995C" msgstr "" -#: src/main/xmli18n-tmp.h:681 +#: src/main/xmli18n-tmp.h:733 msgid "HP DeskJet 1100C" msgstr "" -#: src/main/xmli18n-tmp.h:682 +#: src/main/xmli18n-tmp.h:734 msgid "HP DeskJet 1120C" msgstr "" -#: src/main/xmli18n-tmp.h:683 +#: src/main/xmli18n-tmp.h:735 msgid "HP DeskJet 1125C" msgstr "" -#: src/main/xmli18n-tmp.h:684 +#: src/main/xmli18n-tmp.h:736 msgid "HP DeskJet 1200C" msgstr "" -#: src/main/xmli18n-tmp.h:685 +#: src/main/xmli18n-tmp.h:737 msgid "HP DeskJet 1220C" msgstr "" -#: src/main/xmli18n-tmp.h:686 +#: src/main/xmli18n-tmp.h:738 msgid "HP DeskJet 1600C" msgstr "" -#: src/main/xmli18n-tmp.h:687 +#: src/main/xmli18n-tmp.h:739 msgid "HP DeskJet 1600CM" msgstr "" -#: src/main/xmli18n-tmp.h:688 +#: src/main/xmli18n-tmp.h:740 msgid "HP DeskJet 2000" msgstr "" -#: src/main/xmli18n-tmp.h:689 +#: src/main/xmli18n-tmp.h:741 msgid "HP DeskJet 2500" msgstr "" -#: src/main/xmli18n-tmp.h:690 +#: src/main/xmli18n-tmp.h:742 msgid "HP DeskJet 2500CM" msgstr "" -#: src/main/xmli18n-tmp.h:691 +#: src/main/xmli18n-tmp.h:743 msgid "HP DeskJet 340C" msgstr "" -#: src/main/xmli18n-tmp.h:692 +#: src/main/xmli18n-tmp.h:744 msgid "HP DeskJet 3810" msgstr "" -#: src/main/xmli18n-tmp.h:693 +#: src/main/xmli18n-tmp.h:745 msgid "HP DeskJet 3816" msgstr "" -#: src/main/xmli18n-tmp.h:694 +#: src/main/xmli18n-tmp.h:746 msgid "HP DeskJet 3820" msgstr "" -#: src/main/xmli18n-tmp.h:695 +#: src/main/xmli18n-tmp.h:747 msgid "HP DeskJet 3822" msgstr "" -#: src/main/xmli18n-tmp.h:696 +#: src/main/xmli18n-tmp.h:748 msgid "HP LaserJet 2" msgstr "" -#: src/main/xmli18n-tmp.h:697 +#: src/main/xmli18n-tmp.h:749 msgid "HP LaserJet 2D" msgstr "" -#: src/main/xmli18n-tmp.h:698 +#: src/main/xmli18n-tmp.h:750 msgid "HP LaserJet 2P Plus" msgstr "" -#: src/main/xmli18n-tmp.h:699 +#: src/main/xmli18n-tmp.h:751 msgid "HP LaserJet 2P" msgstr "" -#: src/main/xmli18n-tmp.h:700 +#: src/main/xmli18n-tmp.h:752 msgid "HP LaserJet 3" msgstr "" -#: src/main/xmli18n-tmp.h:701 +#: src/main/xmli18n-tmp.h:753 msgid "HP LaserJet 3D" msgstr "" -#: src/main/xmli18n-tmp.h:702 +#: src/main/xmli18n-tmp.h:754 msgid "HP LaserJet 3P w/ PCL5" msgstr "" -#: src/main/xmli18n-tmp.h:703 +#: src/main/xmli18n-tmp.h:755 msgid "HP LaserJet 3P w/PS" msgstr "" -#: src/main/xmli18n-tmp.h:704 +#: src/main/xmli18n-tmp.h:756 msgid "HP LaserJet 4 Plus" msgstr "" -#: src/main/xmli18n-tmp.h:705 +#: src/main/xmli18n-tmp.h:757 msgid "HP LaserJet 4" msgstr "" -#: src/main/xmli18n-tmp.h:706 +#: src/main/xmli18n-tmp.h:758 msgid "HP LaserJet 4L" msgstr "" -#: src/main/xmli18n-tmp.h:707 +#: src/main/xmli18n-tmp.h:759 msgid "HP LaserJet 4M" msgstr "" -#: src/main/xmli18n-tmp.h:708 +#: src/main/xmli18n-tmp.h:760 msgid "HP LaserJet 4ML" msgstr "" -#: src/main/xmli18n-tmp.h:709 +#: src/main/xmli18n-tmp.h:761 msgid "HP LaserJet 4P" msgstr "" -#: src/main/xmli18n-tmp.h:710 +#: src/main/xmli18n-tmp.h:762 msgid "HP LaserJet 4Si" msgstr "" -#: src/main/xmli18n-tmp.h:711 +#: src/main/xmli18n-tmp.h:763 msgid "HP LaserJet 4V" msgstr "" -#: src/main/xmli18n-tmp.h:712 +#: src/main/xmli18n-tmp.h:764 msgid "HP LaserJet 5" msgstr "" -#: src/main/xmli18n-tmp.h:713 +#: src/main/xmli18n-tmp.h:765 msgid "HP LaserJet 5L" msgstr "" -#: src/main/xmli18n-tmp.h:714 +#: src/main/xmli18n-tmp.h:766 msgid "HP LaserJet 5M" msgstr "" -#: src/main/xmli18n-tmp.h:715 +#: src/main/xmli18n-tmp.h:767 msgid "HP LaserJet 5MP" msgstr "" -#: src/main/xmli18n-tmp.h:716 +#: src/main/xmli18n-tmp.h:768 msgid "HP LaserJet 5P" msgstr "" -#: src/main/xmli18n-tmp.h:717 +#: src/main/xmli18n-tmp.h:769 msgid "HP LaserJet 5Si" msgstr "" -#: src/main/xmli18n-tmp.h:718 +#: src/main/xmli18n-tmp.h:770 msgid "HP LaserJet 6" msgstr "" -#: src/main/xmli18n-tmp.h:719 +#: src/main/xmli18n-tmp.h:771 msgid "HP LaserJet 6L" msgstr "" -#: src/main/xmli18n-tmp.h:720 +#: src/main/xmli18n-tmp.h:772 msgid "HP LaserJet 6MP" msgstr "" -#: src/main/xmli18n-tmp.h:721 +#: src/main/xmli18n-tmp.h:773 msgid "HP LaserJet 6P" msgstr "" -#: src/main/xmli18n-tmp.h:722 +#: src/main/xmli18n-tmp.h:774 msgid "HP LaserJet 1010" msgstr "" -#: src/main/xmli18n-tmp.h:723 +#: src/main/xmli18n-tmp.h:775 msgid "HP LaserJet 1012" msgstr "" -#: src/main/xmli18n-tmp.h:724 +#: src/main/xmli18n-tmp.h:776 msgid "HP LaserJet 1015" msgstr "" -#: src/main/xmli18n-tmp.h:725 +#: src/main/xmli18n-tmp.h:777 msgid "HP LaserJet 1022" msgstr "" -#: src/main/xmli18n-tmp.h:726 +#: src/main/xmli18n-tmp.h:778 msgid "HP LaserJet 1100" msgstr "" -#: src/main/xmli18n-tmp.h:727 +#: src/main/xmli18n-tmp.h:779 msgid "HP LaserJet 1100A" msgstr "" -#: src/main/xmli18n-tmp.h:728 +#: src/main/xmli18n-tmp.h:780 msgid "HP LaserJet 1150" msgstr "" -#: src/main/xmli18n-tmp.h:729 +#: src/main/xmli18n-tmp.h:781 msgid "HP LaserJet 1200" msgstr "" -#: src/main/xmli18n-tmp.h:730 +#: src/main/xmli18n-tmp.h:782 msgid "HP LaserJet 1220" msgstr "" -#: src/main/xmli18n-tmp.h:731 +#: src/main/xmli18n-tmp.h:783 msgid "HP LaserJet 1300" msgstr "" -#: src/main/xmli18n-tmp.h:732 +#: src/main/xmli18n-tmp.h:784 msgid "HP LaserJet 2100" msgstr "" -#: src/main/xmli18n-tmp.h:733 +#: src/main/xmli18n-tmp.h:785 msgid "HP LaserJet 2100M" msgstr "" -#: src/main/xmli18n-tmp.h:734 +#: src/main/xmli18n-tmp.h:786 msgid "HP LaserJet 2200" msgstr "" -#: src/main/xmli18n-tmp.h:735 +#: src/main/xmli18n-tmp.h:787 msgid "HP LaserJet 2300" msgstr "" -#: src/main/xmli18n-tmp.h:736 +#: src/main/xmli18n-tmp.h:788 msgid "HP LaserJet 3200" msgstr "" -#: src/main/xmli18n-tmp.h:737 +#: src/main/xmli18n-tmp.h:789 msgid "HP LaserJet 3200m" msgstr "" -#: src/main/xmli18n-tmp.h:738 +#: src/main/xmli18n-tmp.h:790 msgid "HP LaserJet 3200se" msgstr "" -#: src/main/xmli18n-tmp.h:739 +#: src/main/xmli18n-tmp.h:791 msgid "HP LaserJet 3300 MFP" msgstr "" -#: src/main/xmli18n-tmp.h:740 +#: src/main/xmli18n-tmp.h:792 msgid "HP LaserJet 3310 MFP" msgstr "" -#: src/main/xmli18n-tmp.h:741 +#: src/main/xmli18n-tmp.h:793 msgid "HP LaserJet 3320 MFP" msgstr "" -#: src/main/xmli18n-tmp.h:742 +#: src/main/xmli18n-tmp.h:794 msgid "HP LaserJet 3320N MFP" msgstr "" -#: src/main/xmli18n-tmp.h:743 +#: src/main/xmli18n-tmp.h:795 msgid "HP LaserJet 3330 MFP" msgstr "" -#: src/main/xmli18n-tmp.h:744 +#: src/main/xmli18n-tmp.h:796 msgid "HP LaserJet 4000" msgstr "" -#: src/main/xmli18n-tmp.h:745 +#: src/main/xmli18n-tmp.h:797 msgid "HP LaserJet 4050" msgstr "" -#: src/main/xmli18n-tmp.h:746 +#: src/main/xmli18n-tmp.h:798 msgid "HP LaserJet 4100" msgstr "" -#: src/main/xmli18n-tmp.h:747 +#: src/main/xmli18n-tmp.h:799 msgid "HP LaserJet 4200" msgstr "" -#: src/main/xmli18n-tmp.h:748 +#: src/main/xmli18n-tmp.h:800 msgid "HP LaserJet 4300" msgstr "" -#: src/main/xmli18n-tmp.h:749 +#: src/main/xmli18n-tmp.h:801 msgid "HP LaserJet 5000" msgstr "" -#: src/main/xmli18n-tmp.h:750 +#: src/main/xmli18n-tmp.h:802 msgid "HP LaserJet 5100" msgstr "" -#: src/main/xmli18n-tmp.h:751 +#: src/main/xmli18n-tmp.h:803 msgid "HP LaserJet 8000" msgstr "" -#: src/main/xmli18n-tmp.h:752 +#: src/main/xmli18n-tmp.h:804 msgid "HP LaserJet 8100" msgstr "" -#: src/main/xmli18n-tmp.h:753 +#: src/main/xmli18n-tmp.h:805 msgid "HP LaserJet 8150" msgstr "" -#: src/main/xmli18n-tmp.h:754 +#: src/main/xmli18n-tmp.h:806 msgid "HP LaserJet 9000" msgstr "" -#: src/main/xmli18n-tmp.h:755 +#: src/main/xmli18n-tmp.h:807 msgid "HP Mopier 240" msgstr "" -#: src/main/xmli18n-tmp.h:756 +#: src/main/xmli18n-tmp.h:808 msgid "HP Mopier 320" msgstr "" -#: src/main/xmli18n-tmp.h:757 +#: src/main/xmli18n-tmp.h:809 msgid "HP OfficeJet 300" msgstr "" -#: src/main/xmli18n-tmp.h:758 +#: src/main/xmli18n-tmp.h:810 msgid "HP OfficeJet 330" msgstr "" -#: src/main/xmli18n-tmp.h:759 +#: src/main/xmli18n-tmp.h:811 msgid "HP OfficeJet 350" msgstr "" -#: src/main/xmli18n-tmp.h:760 +#: src/main/xmli18n-tmp.h:812 msgid "HP OfficeJet 500" msgstr "" -#: src/main/xmli18n-tmp.h:761 +#: src/main/xmli18n-tmp.h:813 msgid "HP OfficeJet 520" msgstr "" -#: src/main/xmli18n-tmp.h:762 +#: src/main/xmli18n-tmp.h:814 msgid "HP OfficeJet 570" msgstr "" -#: src/main/xmli18n-tmp.h:763 +#: src/main/xmli18n-tmp.h:815 msgid "HP OfficeJet 580" msgstr "" -#: src/main/xmli18n-tmp.h:764 +#: src/main/xmli18n-tmp.h:816 msgid "HP OfficeJet 590" msgstr "" -#: src/main/xmli18n-tmp.h:765 +#: src/main/xmli18n-tmp.h:817 msgid "HP OfficeJet 600" msgstr "" -#: src/main/xmli18n-tmp.h:766 +#: src/main/xmli18n-tmp.h:818 msgid "HP OfficeJet 610" msgstr "" -#: src/main/xmli18n-tmp.h:767 +#: src/main/xmli18n-tmp.h:819 msgid "HP OfficeJet 625" msgstr "" -#: src/main/xmli18n-tmp.h:768 +#: src/main/xmli18n-tmp.h:820 msgid "HP OfficeJet 630" msgstr "" -#: src/main/xmli18n-tmp.h:769 +#: src/main/xmli18n-tmp.h:821 msgid "HP OfficeJet 635" msgstr "" -#: src/main/xmli18n-tmp.h:770 +#: src/main/xmli18n-tmp.h:822 msgid "HP OfficeJet 700" msgstr "" -#: src/main/xmli18n-tmp.h:771 +#: src/main/xmli18n-tmp.h:823 msgid "HP OfficeJet 710" msgstr "" -#: src/main/xmli18n-tmp.h:772 +#: src/main/xmli18n-tmp.h:824 msgid "HP OfficeJet 720" msgstr "" -#: src/main/xmli18n-tmp.h:773 +#: src/main/xmli18n-tmp.h:825 msgid "HP OfficeJet 725" msgstr "" -#: src/main/xmli18n-tmp.h:774 +#: src/main/xmli18n-tmp.h:826 msgid "HP OfficeJet 5105" msgstr "" -#: src/main/xmli18n-tmp.h:775 +#: src/main/xmli18n-tmp.h:827 msgid "HP OfficeJet 5110" msgstr "" -#: src/main/xmli18n-tmp.h:776 +#: src/main/xmli18n-tmp.h:828 msgid "HP OfficeJet 5110xi" msgstr "" -#: src/main/xmli18n-tmp.h:777 +#: src/main/xmli18n-tmp.h:829 msgid "HP OfficeJet 6105" msgstr "" -#: src/main/xmli18n-tmp.h:778 +#: src/main/xmli18n-tmp.h:830 msgid "HP OfficeJet 6110" msgstr "" -#: src/main/xmli18n-tmp.h:779 +#: src/main/xmli18n-tmp.h:831 msgid "HP OfficeJet 7110" msgstr "" -#: src/main/xmli18n-tmp.h:780 +#: src/main/xmli18n-tmp.h:832 msgid "HP OfficeJet 7130" msgstr "" -#: src/main/xmli18n-tmp.h:781 +#: src/main/xmli18n-tmp.h:833 msgid "HP OfficeJet 7140" msgstr "" -#: src/main/xmli18n-tmp.h:782 +#: src/main/xmli18n-tmp.h:834 msgid "HP OfficeJet D125" msgstr "" -#: src/main/xmli18n-tmp.h:783 +#: src/main/xmli18n-tmp.h:835 msgid "HP OfficeJet D135" msgstr "" -#: src/main/xmli18n-tmp.h:784 +#: src/main/xmli18n-tmp.h:836 msgid "HP OfficeJet D145" msgstr "" -#: src/main/xmli18n-tmp.h:785 +#: src/main/xmli18n-tmp.h:837 msgid "HP OfficeJet D155" msgstr "" -#: src/main/xmli18n-tmp.h:786 +#: src/main/xmli18n-tmp.h:838 msgid "HP OfficeJet G55" msgstr "" -#: src/main/xmli18n-tmp.h:787 +#: src/main/xmli18n-tmp.h:839 msgid "HP OfficeJet G85" msgstr "" -#: src/main/xmli18n-tmp.h:788 +#: src/main/xmli18n-tmp.h:840 msgid "HP OfficeJet G95" msgstr "" -#: src/main/xmli18n-tmp.h:789 +#: src/main/xmli18n-tmp.h:841 msgid "HP OfficeJet K60" msgstr "" -#: src/main/xmli18n-tmp.h:790 +#: src/main/xmli18n-tmp.h:842 msgid "HP OfficeJet K60xi" msgstr "" -#: src/main/xmli18n-tmp.h:791 +#: src/main/xmli18n-tmp.h:843 msgid "HP OfficeJet K80" msgstr "" -#: src/main/xmli18n-tmp.h:792 +#: src/main/xmli18n-tmp.h:844 msgid "HP OfficeJet K80xi" msgstr "" -#: src/main/xmli18n-tmp.h:793 +#: src/main/xmli18n-tmp.h:845 msgid "HP OfficeJet LX" msgstr "" -#: src/main/xmli18n-tmp.h:794 +#: src/main/xmli18n-tmp.h:846 msgid "HP OfficeJet Pro 1150C" msgstr "" -#: src/main/xmli18n-tmp.h:795 +#: src/main/xmli18n-tmp.h:847 msgid "HP OfficeJet Pro 1170C" msgstr "" -#: src/main/xmli18n-tmp.h:796 +#: src/main/xmli18n-tmp.h:848 msgid "HP OfficeJet Pro 1175C" msgstr "" -#: src/main/xmli18n-tmp.h:797 +#: src/main/xmli18n-tmp.h:849 msgid "HP OfficeJet R40" msgstr "" -#: src/main/xmli18n-tmp.h:798 +#: src/main/xmli18n-tmp.h:850 msgid "HP OfficeJet R45" msgstr "" -#: src/main/xmli18n-tmp.h:799 +#: src/main/xmli18n-tmp.h:851 msgid "HP OfficeJet R60" msgstr "" -#: src/main/xmli18n-tmp.h:800 +#: src/main/xmli18n-tmp.h:852 msgid "HP OfficeJet R65" msgstr "" -#: src/main/xmli18n-tmp.h:801 +#: src/main/xmli18n-tmp.h:853 msgid "HP OfficeJet R80" msgstr "" -#: src/main/xmli18n-tmp.h:802 +#: src/main/xmli18n-tmp.h:854 msgid "HP OfficeJet T45" msgstr "" -#: src/main/xmli18n-tmp.h:803 +#: src/main/xmli18n-tmp.h:855 msgid "HP OfficeJet T65" msgstr "" -#: src/main/xmli18n-tmp.h:804 +#: src/main/xmli18n-tmp.h:856 msgid "HP OfficeJet V40" msgstr "" -#: src/main/xmli18n-tmp.h:805 +#: src/main/xmli18n-tmp.h:857 msgid "HP OfficeJet V40xi" msgstr "" -#: src/main/xmli18n-tmp.h:806 +#: src/main/xmli18n-tmp.h:858 msgid "HP OfficeJet" msgstr "" -#: src/main/xmli18n-tmp.h:807 +#: src/main/xmli18n-tmp.h:859 msgid "HP PSC 370" msgstr "" -#: src/main/xmli18n-tmp.h:808 +#: src/main/xmli18n-tmp.h:860 msgid "HP PSC 380" msgstr "" -#: src/main/xmli18n-tmp.h:809 +#: src/main/xmli18n-tmp.h:861 msgid "HP PSC 500" msgstr "" -#: src/main/xmli18n-tmp.h:810 +#: src/main/xmli18n-tmp.h:862 msgid "HP PSC 750" msgstr "" -#: src/main/xmli18n-tmp.h:811 +#: src/main/xmli18n-tmp.h:863 msgid "HP PSC 950" msgstr "" -#: src/main/xmli18n-tmp.h:812 +#: src/main/xmli18n-tmp.h:864 msgid "HP PSC 950xi" msgstr "" -#: src/main/xmli18n-tmp.h:813 +#: src/main/xmli18n-tmp.h:865 msgid "HP PSC 2110" msgstr "" -#: src/main/xmli18n-tmp.h:814 +#: src/main/xmli18n-tmp.h:866 msgid "HP PSC 2150" msgstr "" -#: src/main/xmli18n-tmp.h:815 +#: src/main/xmli18n-tmp.h:867 msgid "HP PSC 2210" msgstr "" -#: src/main/xmli18n-tmp.h:816 +#: src/main/xmli18n-tmp.h:868 msgid "HP PhotoSmart 7150" msgstr "" -#: src/main/xmli18n-tmp.h:817 +#: src/main/xmli18n-tmp.h:869 msgid "HP PhotoSmart 7345" msgstr "" -#: src/main/xmli18n-tmp.h:818 +#: src/main/xmli18n-tmp.h:870 msgid "HP PhotoSmart 7350" msgstr "" -#: src/main/xmli18n-tmp.h:819 +#: src/main/xmli18n-tmp.h:871 msgid "HP PhotoSmart 7550" msgstr "" -#: src/main/xmli18n-tmp.h:820 +#: src/main/xmli18n-tmp.h:872 msgid "HP PhotoSmart P100" msgstr "" -#: src/main/xmli18n-tmp.h:821 +#: src/main/xmli18n-tmp.h:873 msgid "HP PhotoSmart P130" msgstr "" -#: src/main/xmli18n-tmp.h:822 +#: src/main/xmli18n-tmp.h:874 msgid "HP PhotoSmart P230" msgstr "" -#: src/main/xmli18n-tmp.h:823 +#: src/main/xmli18n-tmp.h:875 msgid "HP PhotoSmart P1000" msgstr "" -#: src/main/xmli18n-tmp.h:824 +#: src/main/xmli18n-tmp.h:876 msgid "HP PhotoSmart P1100" msgstr "" -#: src/main/xmli18n-tmp.h:825 +#: src/main/xmli18n-tmp.h:877 msgid "HP PhotoSmart P1115" msgstr "" -#: src/main/xmli18n-tmp.h:826 +#: src/main/xmli18n-tmp.h:878 msgid "HP PhotoSmart P1215" msgstr "" -#: src/main/xmli18n-tmp.h:827 +#: src/main/xmli18n-tmp.h:879 msgid "HP PhotoSmart P1218" msgstr "" -#: src/main/xmli18n-tmp.h:828 +#: src/main/xmli18n-tmp.h:880 msgid "HP PhotoSmart P1315" msgstr "" -#: src/main/xmli18n-tmp.h:829 +#: src/main/xmli18n-tmp.h:881 #, fuzzy msgid "HP e-printer e20" msgstr "Název tiskárny:" -#: src/main/xmli18n-tmp.h:830 +#: src/main/xmli18n-tmp.h:882 msgid "IBM 4019" msgstr "" -#: src/main/xmli18n-tmp.h:831 +#: src/main/xmli18n-tmp.h:883 msgid "IBM 4029 030 LaserPrinter 10" msgstr "" -#: src/main/xmli18n-tmp.h:832 +#: src/main/xmli18n-tmp.h:884 msgid "IBM 4312" msgstr "" -#: src/main/xmli18n-tmp.h:833 +#: src/main/xmli18n-tmp.h:885 msgid "IBM Infoprint 12" msgstr "" -#: src/main/xmli18n-tmp.h:834 +#: src/main/xmli18n-tmp.h:886 msgid "IBM Page Printer 3112" msgstr "" -#: src/main/xmli18n-tmp.h:835 +#: src/main/xmli18n-tmp.h:887 msgid "Infotec 4651 MF" msgstr "" -#: src/main/xmli18n-tmp.h:836 +#: src/main/xmli18n-tmp.h:888 msgid "Kyocera F-1010" msgstr "" -#: src/main/xmli18n-tmp.h:837 +#: src/main/xmli18n-tmp.h:889 msgid "Kyocera FS-600 - KPDL-2" msgstr "" -#: src/main/xmli18n-tmp.h:838 +#: src/main/xmli18n-tmp.h:890 msgid "Kyocera FS-600" msgstr "" -#: src/main/xmli18n-tmp.h:839 +#: src/main/xmli18n-tmp.h:891 msgid "Kyocera FS-680" msgstr "" -#: src/main/xmli18n-tmp.h:840 +#: src/main/xmli18n-tmp.h:892 msgid "Kyocera FS-800" msgstr "" -#: src/main/xmli18n-tmp.h:841 +#: src/main/xmli18n-tmp.h:893 msgid "Kyocera FS-1000" msgstr "" -#: src/main/xmli18n-tmp.h:842 +#: src/main/xmli18n-tmp.h:894 msgid "Kyocera FS-1000+" msgstr "" -#: src/main/xmli18n-tmp.h:843 +#: src/main/xmli18n-tmp.h:895 msgid "Kyocera FS-1010" msgstr "" -#: src/main/xmli18n-tmp.h:844 +#: src/main/xmli18n-tmp.h:896 msgid "Kyocera FS-1050" msgstr "" -#: src/main/xmli18n-tmp.h:845 +#: src/main/xmli18n-tmp.h:897 msgid "Kyocera FS-1200" msgstr "" -#: src/main/xmli18n-tmp.h:846 +#: src/main/xmli18n-tmp.h:898 msgid "Kyocera FS-1600" msgstr "" -#: src/main/xmli18n-tmp.h:847 +#: src/main/xmli18n-tmp.h:899 msgid "Kyocera FS-1600+" msgstr "" -#: src/main/xmli18n-tmp.h:848 +#: src/main/xmli18n-tmp.h:900 msgid "Kyocera FS-1700" msgstr "" -#: src/main/xmli18n-tmp.h:849 +#: src/main/xmli18n-tmp.h:901 msgid "Kyocera FS-1700+" msgstr "" -#: src/main/xmli18n-tmp.h:850 +#: src/main/xmli18n-tmp.h:902 msgid "Kyocera FS-1750" msgstr "" -#: src/main/xmli18n-tmp.h:851 +#: src/main/xmli18n-tmp.h:903 msgid "Kyocera FS-1800" msgstr "" -#: src/main/xmli18n-tmp.h:852 +#: src/main/xmli18n-tmp.h:904 msgid "Kyocera FS-1800+" msgstr "" -#: src/main/xmli18n-tmp.h:853 +#: src/main/xmli18n-tmp.h:905 msgid "Kyocera FS-1900" msgstr "" -#: src/main/xmli18n-tmp.h:854 +#: src/main/xmli18n-tmp.h:906 msgid "Kyocera FS-3500" msgstr "" -#: src/main/xmli18n-tmp.h:855 +#: src/main/xmli18n-tmp.h:907 msgid "Kyocera FS-3600" msgstr "" -#: src/main/xmli18n-tmp.h:856 +#: src/main/xmli18n-tmp.h:908 msgid "Kyocera FS-3600+" msgstr "" -#: src/main/xmli18n-tmp.h:857 +#: src/main/xmli18n-tmp.h:909 msgid "Kyocera FS-3700" msgstr "" -#: src/main/xmli18n-tmp.h:858 +#: src/main/xmli18n-tmp.h:910 msgid "Kyocera FS-3700+" msgstr "" -#: src/main/xmli18n-tmp.h:859 +#: src/main/xmli18n-tmp.h:911 msgid "Kyocera FS-3750" msgstr "" -#: src/main/xmli18n-tmp.h:860 +#: src/main/xmli18n-tmp.h:912 msgid "Kyocera FS-3800" msgstr "" -#: src/main/xmli18n-tmp.h:861 +#: src/main/xmli18n-tmp.h:913 msgid "Kyocera FS-5800C" msgstr "" -#: src/main/xmli18n-tmp.h:862 +#: src/main/xmli18n-tmp.h:914 msgid "Kyocera FS-5900C" msgstr "" -#: src/main/xmli18n-tmp.h:863 +#: src/main/xmli18n-tmp.h:915 msgid "Kyocera FS-6500" msgstr "" -#: src/main/xmli18n-tmp.h:864 +#: src/main/xmli18n-tmp.h:916 msgid "Kyocera FS-6500+" msgstr "" -#: src/main/xmli18n-tmp.h:865 +#: src/main/xmli18n-tmp.h:917 msgid "Kyocera FS-6700" msgstr "" -#: src/main/xmli18n-tmp.h:866 +#: src/main/xmli18n-tmp.h:918 msgid "Kyocera FS-7000" msgstr "" -#: src/main/xmli18n-tmp.h:867 +#: src/main/xmli18n-tmp.h:919 msgid "Kyocera FS-7000+" msgstr "" -#: src/main/xmli18n-tmp.h:868 +#: src/main/xmli18n-tmp.h:920 msgid "Kyocera FS-8000C" msgstr "" -#: src/main/xmli18n-tmp.h:869 +#: src/main/xmli18n-tmp.h:921 msgid "Kyocera FS-9000" msgstr "" -#: src/main/xmli18n-tmp.h:870 +#: src/main/xmli18n-tmp.h:922 msgid "Kyocera FS-9100DN" msgstr "" -#: src/main/xmli18n-tmp.h:871 +#: src/main/xmli18n-tmp.h:923 msgid "Kyocera FS-9500DN" msgstr "" -#: src/main/xmli18n-tmp.h:872 +#: src/main/xmli18n-tmp.h:924 msgid "Kyocera KM-1530" msgstr "" -#: src/main/xmli18n-tmp.h:873 +#: src/main/xmli18n-tmp.h:925 msgid "Kyocera KM-1810" msgstr "" -#: src/main/xmli18n-tmp.h:874 +#: src/main/xmli18n-tmp.h:926 msgid "Kyocera KM-2030" msgstr "" -#: src/main/xmli18n-tmp.h:875 +#: src/main/xmli18n-tmp.h:927 msgid "Kyocera KM-2530" msgstr "" -#: src/main/xmli18n-tmp.h:876 +#: src/main/xmli18n-tmp.h:928 msgid "Kyocera KM-3530" msgstr "" -#: src/main/xmli18n-tmp.h:877 +#: src/main/xmli18n-tmp.h:929 msgid "Kyocera KM-4230" msgstr "" -#: src/main/xmli18n-tmp.h:878 +#: src/main/xmli18n-tmp.h:930 msgid "Kyocera KM-4530" msgstr "" -#: src/main/xmli18n-tmp.h:879 +#: src/main/xmli18n-tmp.h:931 msgid "Kyocera KM-5230" msgstr "" -#: src/main/xmli18n-tmp.h:880 +#: src/main/xmli18n-tmp.h:932 msgid "Kyocera KM-5530" msgstr "" -#: src/main/xmli18n-tmp.h:881 +#: src/main/xmli18n-tmp.h:933 msgid "Kyocera KM-6230" msgstr "" -#: src/main/xmli18n-tmp.h:882 +#: src/main/xmli18n-tmp.h:934 msgid "Lexmark 4076" msgstr "" -#: src/main/xmli18n-tmp.h:883 +#: src/main/xmli18n-tmp.h:935 msgid "Lexmark Optra E" msgstr "" -#: src/main/xmli18n-tmp.h:884 +#: src/main/xmli18n-tmp.h:936 msgid "Lexmark Optra E+" msgstr "" -#: src/main/xmli18n-tmp.h:885 +#: src/main/xmli18n-tmp.h:937 msgid "Lexmark Optra E220" msgstr "" -#: src/main/xmli18n-tmp.h:886 +#: src/main/xmli18n-tmp.h:938 msgid "Lexmark Valuewriter 300" msgstr "" -#: src/main/xmli18n-tmp.h:887 +#: src/main/xmli18n-tmp.h:939 msgid "Minolta PagePro 6" msgstr "" -#: src/main/xmli18n-tmp.h:888 +#: src/main/xmli18n-tmp.h:940 msgid "Minolta PagePro 6e" msgstr "" -#: src/main/xmli18n-tmp.h:889 +#: src/main/xmli18n-tmp.h:941 msgid "Minolta PagePro 6ex" msgstr "" -#: src/main/xmli18n-tmp.h:890 +#: src/main/xmli18n-tmp.h:942 msgid "Minolta PagePro 8" msgstr "" -#: src/main/xmli18n-tmp.h:891 +#: src/main/xmli18n-tmp.h:943 msgid "Minolta PagePro 8L" msgstr "" -#: src/main/xmli18n-tmp.h:892 +#: src/main/xmli18n-tmp.h:944 msgid "Minolta PagePro 1100" msgstr "" -#: src/main/xmli18n-tmp.h:893 +#: src/main/xmli18n-tmp.h:945 msgid "NEC SuperScript 660i" msgstr "" -#: src/main/xmli18n-tmp.h:894 +#: src/main/xmli18n-tmp.h:946 msgid "NEC SuperScript 860" msgstr "" -#: src/main/xmli18n-tmp.h:895 +#: src/main/xmli18n-tmp.h:947 msgid "NEC SuperScript 870" msgstr "" -#: src/main/xmli18n-tmp.h:896 +#: src/main/xmli18n-tmp.h:948 msgid "NEC SuperScript 1260" msgstr "" -#: src/main/xmli18n-tmp.h:897 +#: src/main/xmli18n-tmp.h:949 msgid "NEC SuperScript 1400" msgstr "" -#: src/main/xmli18n-tmp.h:898 +#: src/main/xmli18n-tmp.h:950 msgid "NEC SuperScript 1800" msgstr "" -#: src/main/xmli18n-tmp.h:899 +#: src/main/xmli18n-tmp.h:951 msgid "Okidata OL400" msgstr "" -#: src/main/xmli18n-tmp.h:900 +#: src/main/xmli18n-tmp.h:952 msgid "Okidata OL400e" msgstr "" -#: src/main/xmli18n-tmp.h:901 +#: src/main/xmli18n-tmp.h:953 msgid "Okidata OL400ex" msgstr "" -#: src/main/xmli18n-tmp.h:902 +#: src/main/xmli18n-tmp.h:954 msgid "Okidata OL410e" msgstr "" -#: src/main/xmli18n-tmp.h:903 +#: src/main/xmli18n-tmp.h:955 msgid "Okidata OL600e" msgstr "" -#: src/main/xmli18n-tmp.h:904 +#: src/main/xmli18n-tmp.h:956 msgid "Okidata OL610e/S" msgstr "" -#: src/main/xmli18n-tmp.h:905 +#: src/main/xmli18n-tmp.h:957 msgid "Okidata OL800" msgstr "" -#: src/main/xmli18n-tmp.h:906 +#: src/main/xmli18n-tmp.h:958 msgid "Okidata OL810ex" msgstr "" -#: src/main/xmli18n-tmp.h:907 +#: src/main/xmli18n-tmp.h:959 msgid "Okidata Okipage 6e" msgstr "" -#: src/main/xmli18n-tmp.h:908 +#: src/main/xmli18n-tmp.h:960 msgid "Okidata Okipage 6ex" msgstr "" -#: src/main/xmli18n-tmp.h:909 +#: src/main/xmli18n-tmp.h:961 msgid "Okidata Okipage 8p" msgstr "" -#: src/main/xmli18n-tmp.h:910 +#: src/main/xmli18n-tmp.h:962 msgid "Okidata Okipage 10e" msgstr "" -#: src/main/xmli18n-tmp.h:911 +#: src/main/xmli18n-tmp.h:963 msgid "Okidata Okipage 10ex" msgstr "" -#: src/main/xmli18n-tmp.h:912 +#: src/main/xmli18n-tmp.h:964 msgid "Okidata Okipage 14ex" msgstr "" -#: src/main/xmli18n-tmp.h:913 +#: src/main/xmli18n-tmp.h:965 msgid "Okidata Super 6e" msgstr "" -#: src/main/xmli18n-tmp.h:914 +#: src/main/xmli18n-tmp.h:966 msgid "Olivetti JP350S" msgstr "" -#: src/main/xmli18n-tmp.h:915 +#: src/main/xmli18n-tmp.h:967 msgid "Olivetti PG 306" msgstr "" -#: src/main/xmli18n-tmp.h:916 +#: src/main/xmli18n-tmp.h:968 msgid "PCPI 1030" msgstr "" -#: src/main/xmli18n-tmp.h:917 +#: src/main/xmli18n-tmp.h:969 msgid "Panasonic KX-P4410" msgstr "" -#: src/main/xmli18n-tmp.h:918 +#: src/main/xmli18n-tmp.h:970 msgid "Panasonic KX-P4450" msgstr "" -#: src/main/xmli18n-tmp.h:919 +#: src/main/xmli18n-tmp.h:971 msgid "Panasonic KX-P6150" msgstr "" -#: src/main/xmli18n-tmp.h:920 +#: src/main/xmli18n-tmp.h:972 msgid "Panasonic KX-P6500" msgstr "" -#: src/main/xmli18n-tmp.h:921 +#: src/main/xmli18n-tmp.h:973 msgid "Raven LP-410" msgstr "" -#: src/main/xmli18n-tmp.h:922 +#: src/main/xmli18n-tmp.h:974 msgid "Ricoh Aficio 220" msgstr "" -#: src/main/xmli18n-tmp.h:923 +#: src/main/xmli18n-tmp.h:975 msgid "Ricoh Aficio 401" msgstr "" -#: src/main/xmli18n-tmp.h:924 +#: src/main/xmli18n-tmp.h:976 msgid "Ricoh Aficio 700" msgstr "" -#: src/main/xmli18n-tmp.h:925 +#: src/main/xmli18n-tmp.h:977 msgid "Samsung ML-85" msgstr "" -#: src/main/xmli18n-tmp.h:926 +#: src/main/xmli18n-tmp.h:978 msgid "Samsung ML-4600" msgstr "" -#: src/main/xmli18n-tmp.h:927 +#: src/main/xmli18n-tmp.h:979 msgid "Samsung ML-5000a" msgstr "" -#: src/main/xmli18n-tmp.h:928 +#: src/main/xmli18n-tmp.h:980 msgid "Samsung ML-6000" msgstr "" -#: src/main/xmli18n-tmp.h:929 +#: src/main/xmli18n-tmp.h:981 msgid "Samsung ML-6100" msgstr "" -#: src/main/xmli18n-tmp.h:930 +#: src/main/xmli18n-tmp.h:982 msgid "Samsung ML-7000" msgstr "" -#: src/main/xmli18n-tmp.h:931 +#: src/main/xmli18n-tmp.h:983 msgid "Samsung ML-7000N" msgstr "" -#: src/main/xmli18n-tmp.h:932 +#: src/main/xmli18n-tmp.h:984 msgid "Samsung ML-7000P" msgstr "" -#: src/main/xmli18n-tmp.h:933 +#: src/main/xmli18n-tmp.h:985 msgid "Samsung ML-7050" msgstr "" -#: src/main/xmli18n-tmp.h:934 +#: src/main/xmli18n-tmp.h:986 msgid "Samsung QL-5100A" msgstr "" -#: src/main/xmli18n-tmp.h:935 +#: src/main/xmli18n-tmp.h:987 msgid "Samsung QL-6050" msgstr "" -#: src/main/xmli18n-tmp.h:936 +#: src/main/xmli18n-tmp.h:988 msgid "Seiko SpeedJET 200" msgstr "" -#: src/main/xmli18n-tmp.h:937 +#: src/main/xmli18n-tmp.h:989 msgid "Sharp AR-161" msgstr "" -#: src/main/xmli18n-tmp.h:938 +#: src/main/xmli18n-tmp.h:990 msgid "Sharp AR-M257" msgstr "" -#: src/main/xmli18n-tmp.h:939 +#: src/main/xmli18n-tmp.h:991 msgid "Sony IJP-V100" msgstr "" -#: src/main/xmli18n-tmp.h:940 +#: src/main/xmli18n-tmp.h:992 msgid "Star LS-04" msgstr "" -#: src/main/xmli18n-tmp.h:941 +#: src/main/xmli18n-tmp.h:993 #, fuzzy msgid "Star LaserPrinter 8" msgstr "Nastavit tiskárnu" -#: src/main/xmli18n-tmp.h:942 +#: src/main/xmli18n-tmp.h:994 msgid "Tally MT908" msgstr "" -#: src/main/xmli18n-tmp.h:943 +#: src/main/xmli18n-tmp.h:995 msgid "Xerox Able 1406" msgstr "" -#: src/main/xmli18n-tmp.h:944 +#: src/main/xmli18n-tmp.h:996 msgid "Xerox DocuPrint 4508" msgstr "" -#: src/main/xmli18n-tmp.h:945 +#: src/main/xmli18n-tmp.h:997 msgid "Xerox DocuPrint C20" msgstr "" -#: src/main/xmli18n-tmp.h:946 +#: src/main/xmli18n-tmp.h:998 msgid "Xerox DocuPrint N4512" msgstr "" -#: src/main/xmli18n-tmp.h:947 +#: src/main/xmli18n-tmp.h:999 msgid "Xerox DocuPrint N4512PS" msgstr "" -#: src/main/xmli18n-tmp.h:948 +#: src/main/xmli18n-tmp.h:1000 msgid "Xerox DocuPrint P12" msgstr "" -#: src/main/xmli18n-tmp.h:949 +#: src/main/xmli18n-tmp.h:1001 msgid "Xerox DocuPrint P1202" msgstr "" -#: src/main/xmli18n-tmp.h:950 +#: src/main/xmli18n-tmp.h:1002 msgid "Xerox DocuPrint P8e" msgstr "" -#: src/main/xmli18n-tmp.h:951 +#: src/main/xmli18n-tmp.h:1003 msgid "Xerox Document Centre 400" msgstr "" -#: src/main/xmli18n-tmp.h:952 +#: src/main/xmli18n-tmp.h:1004 msgid "Xerox WorkCentre M118" msgstr "" -#: src/main/xmli18n-tmp.h:953 +#: src/main/xmli18n-tmp.h:1005 msgid "Compaq IJ1200" msgstr "" -#: src/main/xmli18n-tmp.h:954 +#: src/main/xmli18n-tmp.h:1006 msgid "Lexmark X73" msgstr "" -#: src/main/xmli18n-tmp.h:955 +#: src/main/xmli18n-tmp.h:1007 msgid "Lexmark Z42" msgstr "" -#: src/main/xmli18n-tmp.h:956 +#: src/main/xmli18n-tmp.h:1008 msgid "Lexmark Z43" msgstr "" -#: src/main/xmli18n-tmp.h:957 +#: src/main/xmli18n-tmp.h:1009 msgid "Lexmark Z52" msgstr "" -#: src/main/xmli18n-tmp.h:958 +#: src/main/xmli18n-tmp.h:1010 msgid "Lexmark Z53" msgstr "" -#: src/main/xmli18n-tmp.h:959 +#: src/main/xmli18n-tmp.h:1011 msgid "Olympus P-10" msgstr "" -#: src/main/xmli18n-tmp.h:960 +#: src/main/xmli18n-tmp.h:1012 msgid "Olympus P-11" msgstr "" -#: src/main/xmli18n-tmp.h:961 +#: src/main/xmli18n-tmp.h:1013 msgid "Olympus P-200" msgstr "" -#: src/main/xmli18n-tmp.h:962 +#: src/main/xmli18n-tmp.h:1014 msgid "Olympus P-300" msgstr "" -#: src/main/xmli18n-tmp.h:963 +#: src/main/xmli18n-tmp.h:1015 msgid "Olympus P-300E" msgstr "" -#: src/main/xmli18n-tmp.h:964 +#: src/main/xmli18n-tmp.h:1016 msgid "Olympus P-300U" msgstr "" -#: src/main/xmli18n-tmp.h:965 +#: src/main/xmli18n-tmp.h:1017 msgid "Olympus P-330E" msgstr "" -#: src/main/xmli18n-tmp.h:966 +#: src/main/xmli18n-tmp.h:1018 msgid "Olympus P-330NE" msgstr "" -#: src/main/xmli18n-tmp.h:967 +#: src/main/xmli18n-tmp.h:1019 msgid "Olympus P-400" msgstr "" -#: src/main/xmli18n-tmp.h:968 +#: src/main/xmli18n-tmp.h:1020 msgid "Olympus P-440" msgstr "" -#: src/main/xmli18n-tmp.h:969 +#: src/main/xmli18n-tmp.h:1021 msgid "Olympus P-S100" msgstr "" -#: src/main/xmli18n-tmp.h:970 +#: src/main/xmli18n-tmp.h:1022 msgid "Canon CP-10" msgstr "" -#: src/main/xmli18n-tmp.h:971 +#: src/main/xmli18n-tmp.h:1023 msgid "Canon CP-100" msgstr "" -#: src/main/xmli18n-tmp.h:972 +#: src/main/xmli18n-tmp.h:1024 msgid "Canon CP-200" msgstr "" -#: src/main/xmli18n-tmp.h:973 +#: src/main/xmli18n-tmp.h:1025 msgid "Canon CP-220" msgstr "" -#: src/main/xmli18n-tmp.h:974 +#: src/main/xmli18n-tmp.h:1026 msgid "Canon CP-300" msgstr "" -#: src/main/xmli18n-tmp.h:975 +#: src/main/xmli18n-tmp.h:1027 msgid "Canon CP-330" msgstr "" -#: src/main/xmli18n-tmp.h:976 +#: src/main/xmli18n-tmp.h:1028 msgid "Canon SELPHY-CP-400" msgstr "" -#: src/main/xmli18n-tmp.h:977 +#: src/main/xmli18n-tmp.h:1029 msgid "Canon SELPHY-CP-500" msgstr "" -#: src/main/xmli18n-tmp.h:978 +#: src/main/xmli18n-tmp.h:1030 msgid "Canon SELPHY-CP-510" msgstr "" -#: src/main/xmli18n-tmp.h:979 +#: src/main/xmli18n-tmp.h:1031 msgid "Canon SELPHY-CP-600" msgstr "" -#: src/main/xmli18n-tmp.h:980 +#: src/main/xmli18n-tmp.h:1032 msgid "Canon SELPHY-CP-710" msgstr "" -#: src/main/xmli18n-tmp.h:981 +#: src/main/xmli18n-tmp.h:1033 msgid "Canon SELPHY-CP-720" msgstr "" -#: src/main/xmli18n-tmp.h:982 -#, fuzzy +#: src/main/xmli18n-tmp.h:1034 msgid "Canon SELPHY-CP-730" -msgstr "Stylus C50" +msgstr "" -#: src/main/xmli18n-tmp.h:983 +#: src/main/xmli18n-tmp.h:1035 msgid "Canon SELPHY-CP-740" msgstr "" -#: src/main/xmli18n-tmp.h:984 -#, fuzzy +#: src/main/xmli18n-tmp.h:1036 msgid "Canon SELPHY-CP-750" -msgstr "Stylus C50" +msgstr "" -#: src/main/xmli18n-tmp.h:985 +#: src/main/xmli18n-tmp.h:1037 msgid "Canon SELPHY ES1" msgstr "" -#: src/main/xmli18n-tmp.h:986 +#: src/main/xmli18n-tmp.h:1038 msgid "Canon SELPHY ES2" msgstr "" -#: src/main/xmli18n-tmp.h:987 +#: src/main/xmli18n-tmp.h:1039 msgid "Canon SELPHY ES20" msgstr "" -#: src/main/xmli18n-tmp.h:988 +#: src/main/xmli18n-tmp.h:1040 msgid "Sony DPP-EX5" msgstr "" -#: src/main/xmli18n-tmp.h:989 +#: src/main/xmli18n-tmp.h:1041 msgid "Sony DPP-EX7" msgstr "" -#: src/main/xmli18n-tmp.h:990 +#: src/main/xmli18n-tmp.h:1042 msgid "Sony UP-DP10" msgstr "" -#: src/main/xmli18n-tmp.h:991 +#: src/main/xmli18n-tmp.h:1043 msgid "Sony UP-DR100" msgstr "" -#: src/main/xmli18n-tmp.h:992 +#: src/main/xmli18n-tmp.h:1044 msgid "Sony UP-DR150" msgstr "" -#: src/main/xmli18n-tmp.h:993 +#: src/main/xmli18n-tmp.h:1045 msgid "Fujifilm Printpix-CX-400" msgstr "" -#: src/main/xmli18n-tmp.h:994 +#: src/main/xmli18n-tmp.h:1046 msgid "Fujifilm Printpix-CX-550" msgstr "" -#: src/main/xmli18n-tmp.h:995 +#: src/main/xmli18n-tmp.h:1047 msgid "Fujifilm FinePix-NX-500" msgstr "" -#: src/main/xmli18n-tmp.h:996 +#: src/main/xmli18n-tmp.h:1048 msgid "Kodak Easyshare-Printer-Dock" msgstr "" -#: src/main/xmli18n-tmp.h:997 +#: src/main/xmli18n-tmp.h:1049 msgid "Shinko CHC-S9045" msgstr "" -#: src/main/xmli18n-tmp.h:998 +#: src/main/xmli18n-tmp.h:1050 msgid "RAW DATA 16 bit" msgstr "" -#: src/main/xmli18n-tmp.h:999 +#: src/main/xmli18n-tmp.h:1051 msgid "RAW DATA 8 bit" msgstr "" -#: src/gutenprintui/panel.c:274 src/gutenprintui2/panel.c:274 +#: src/gutenprintui2/curve.c:130 +#, fuzzy +msgid "Curve type" +msgstr "ÄŒerná" + +#: src/gutenprintui2/curve.c:131 +msgid "Is this curve linear, spline interpolated, or free-form" +msgstr "" + +#: src/gutenprintui2/curve.c:139 +msgid "Minimum X" +msgstr "" + +#: src/gutenprintui2/curve.c:140 +msgid "Minimum possible value for X" +msgstr "" + +#: src/gutenprintui2/curve.c:149 +msgid "Maximum X" +msgstr "" + +#: src/gutenprintui2/curve.c:150 +msgid "Maximum possible X value" +msgstr "" + +#: src/gutenprintui2/curve.c:159 +msgid "Minimum Y" +msgstr "" + +#: src/gutenprintui2/curve.c:160 +msgid "Minimum possible value for Y" +msgstr "" + +#: src/gutenprintui2/curve.c:169 +msgid "Maximum Y" +msgstr "" + +#: src/gutenprintui2/curve.c:170 +msgid "Maximum possible value for Y" +msgstr "" + +#: src/gutenprintui2/gammacurve.c:418 +msgid "_Gamma value" +msgstr "" + +#: src/gutenprintui2/panel.c:275 msgid "Inch" msgstr "Palec" -#: src/gutenprintui/panel.c:274 src/gutenprintui2/panel.c:274 +#: src/gutenprintui2/panel.c:275 msgid "Set the base unit of measurement to inches" msgstr "Nastavit základní jednotku měření na palce" -#: src/gutenprintui/panel.c:276 src/gutenprintui2/panel.c:276 +#: src/gutenprintui2/panel.c:277 msgid "cm" msgstr "cm" -#: src/gutenprintui/panel.c:276 src/gutenprintui2/panel.c:276 +#: src/gutenprintui2/panel.c:277 msgid "Set the base unit of measurement to centimetres" msgstr "Nastavit základní jednotku měření na centimetry" -#: src/gutenprintui/panel.c:278 src/gutenprintui2/panel.c:278 +#: src/gutenprintui2/panel.c:279 #, fuzzy msgid "Points" msgstr "Vytisknout" -#: src/gutenprintui/panel.c:278 src/gutenprintui2/panel.c:278 +#: src/gutenprintui2/panel.c:279 #, fuzzy msgid "Set the base unit of measurement to points (1/72\")" msgstr "Nastavit základní jednotku měření na palce" -#: src/gutenprintui/panel.c:280 src/gutenprintui2/panel.c:280 +#: src/gutenprintui2/panel.c:281 msgid "mm" msgstr "" -#: src/gutenprintui/panel.c:280 src/gutenprintui2/panel.c:280 +#: src/gutenprintui2/panel.c:281 #, fuzzy msgid "Set the base unit of measurement to millimetres" msgstr "Nastavit základní jednotku měření na centimetry" -#: src/gutenprintui/panel.c:282 src/gutenprintui2/panel.c:282 +#: src/gutenprintui2/panel.c:283 msgid "Pica" msgstr "" -#: src/gutenprintui/panel.c:282 src/gutenprintui2/panel.c:282 +#: src/gutenprintui2/panel.c:283 #, fuzzy msgid "Set the base unit of measurement to picas (1/12\")" msgstr "Nastavit základní jednotku měření na palce" -#: src/gutenprintui/panel.c:289 src/gutenprintui2/panel.c:289 +#: src/gutenprintui2/panel.c:290 msgid "Color output" msgstr "Barevný výstup" -#: src/gutenprintui/panel.c:291 src/gutenprintui2/panel.c:291 +#: src/gutenprintui2/panel.c:292 msgid "Print in shades of gray using black ink" msgstr "Tisknout v odstínech Å¡edi pomocí Äerného inkoustu" -#: src/gutenprintui/panel.c:303 src/gutenprintui2/panel.c:303 +#: src/gutenprintui2/panel.c:304 #, fuzzy msgid "Standard Command" msgstr "Standardní" -#: src/gutenprintui/panel.c:303 src/gutenprintui2/panel.c:303 +#: src/gutenprintui2/panel.c:304 msgid "Use standard print command" msgstr "" -#: src/gutenprintui/panel.c:304 src/gutenprintui2/panel.c:304 +#: src/gutenprintui2/panel.c:305 #, fuzzy msgid "Custom Command" msgstr "Příkaz:" -#: src/gutenprintui/panel.c:304 src/gutenprintui2/panel.c:304 +#: src/gutenprintui2/panel.c:305 msgid "Use custom print command" msgstr "" -#: src/gutenprintui/panel.c:305 src/gutenprintui/plist.c:704 -#: src/gutenprintui/plist.c:787 src/gutenprintui2/panel.c:305 -#: src/gutenprintui2/plist.c:707 src/gutenprintui2/plist.c:790 +#: src/gutenprintui2/panel.c:306 src/gutenprintui2/plist.c:710 +#: src/gutenprintui2/plist.c:793 msgid "File" msgstr "Soubor" -#: src/gutenprintui/panel.c:305 src/gutenprintui2/panel.c:305 +#: src/gutenprintui2/panel.c:306 #, fuzzy msgid "Print to a file" msgstr "Tisknout do souboru?" -#: src/gutenprintui/panel.c:521 src/gutenprintui2/panel.c:521 +#: src/gutenprintui2/panel.c:522 msgid "Edit Curve..." msgstr "" -#: src/gutenprintui/panel.c:532 src/gutenprintui2/panel.c:532 +#: src/gutenprintui2/panel.c:533 #, fuzzy msgid "Set Default" msgstr "Nastavit implicitní" -#: src/gutenprintui/panel.c:534 src/gutenprintui2/panel.c:534 +#: src/gutenprintui2/panel.c:535 msgid "Restore Previous" msgstr "" -#: src/gutenprintui/panel.c:536 src/gutenprintui/panel.c:1532 -#: src/gutenprintui/panel.c:1787 src/gutenprintui/panel.c:1819 -#: src/gutenprintui2/panel.c:536 src/gutenprintui2/panel.c:1533 -#: src/gutenprintui2/panel.c:1787 src/gutenprintui2/panel.c:1819 +#: src/gutenprintui2/panel.c:537 src/gutenprintui2/panel.c:1708 +#: src/gutenprintui2/panel.c:1962 src/gutenprintui2/panel.c:1994 msgid "OK" msgstr "Budiž" -#: src/gutenprintui/panel.c:538 src/gutenprintui/panel.c:1197 -#: src/gutenprintui/panel.c:1534 src/gutenprintui/panel.c:1789 -#: src/gutenprintui2/panel.c:538 src/gutenprintui2/panel.c:1198 -#: src/gutenprintui2/panel.c:1535 src/gutenprintui2/panel.c:1789 +#: src/gutenprintui2/panel.c:539 src/gutenprintui2/panel.c:1373 +#: src/gutenprintui2/panel.c:1710 src/gutenprintui2/panel.c:1964 msgid "Cancel" msgstr "ZruÅ¡it" -#: src/gutenprintui/panel.c:1180 src/gutenprintui2/panel.c:1181 +#: src/gutenprintui2/panel.c:641 +#, fuzzy +msgid "Select File..." +msgstr "Nastavit tiskárnu..." + +#: src/gutenprintui2/panel.c:1018 +msgid "Reset" +msgstr "" + +#: src/gutenprintui2/panel.c:1356 #, c-format msgid "%s -- Print v%s" msgstr "%s -- Tisk v%s" -#: src/gutenprintui/panel.c:1189 src/gutenprintui2/panel.c:1190 +#: src/gutenprintui2/panel.c:1365 msgid "About" msgstr "O programu" -#: src/gutenprintui/panel.c:1191 src/gutenprintui2/panel.c:1192 +#: src/gutenprintui2/panel.c:1367 msgid "" "Print and\n" "Save Settings" @@ -6663,7 +7090,7 @@ msgstr "" "Vytisknout a\n" "uložit nastavení" -#: src/gutenprintui/panel.c:1193 src/gutenprintui2/panel.c:1194 +#: src/gutenprintui2/panel.c:1369 msgid "" "Save\n" "Settings" @@ -6671,15 +7098,15 @@ msgstr "" "Uložit\n" "nastavení" -#: src/gutenprintui/panel.c:1195 src/gutenprintui2/panel.c:1196 +#: src/gutenprintui2/panel.c:1371 msgid "Print" msgstr "Vytisknout" -#: src/gutenprintui/panel.c:1247 src/gutenprintui2/panel.c:1248 +#: src/gutenprintui2/panel.c:1423 msgid "Preview" msgstr "Náhled" -#: src/gutenprintui/panel.c:1272 src/gutenprintui2/panel.c:1273 +#: src/gutenprintui2/panel.c:1448 msgid "" "Position the image on the page.\n" "Click and drag with the primary button to position the image.\n" @@ -6703,74 +7130,72 @@ msgstr "" "Pokud pÅ™i tažení myší kliknÄ›te jiným tlaÄítkem, obrázek se vrátí na svou " "původní pozici." -#: src/gutenprintui/panel.c:1319 src/gutenprintui2/panel.c:1320 +#: src/gutenprintui2/panel.c:1495 msgid "Paper Size" msgstr "" -#: src/gutenprintui/panel.c:1342 src/gutenprintui2/panel.c:1343 +#: src/gutenprintui2/panel.c:1518 msgid "Show All Paper Sizes" msgstr "" -#: src/gutenprintui/panel.c:1358 src/gutenprintui2/panel.c:1359 +#: src/gutenprintui2/panel.c:1534 msgid "Dimensions:" msgstr "RozmÄ›ry:" -#: src/gutenprintui/panel.c:1363 src/gutenprintui/panel.c:2063 -#: src/gutenprintui2/panel.c:1364 src/gutenprintui2/panel.c:2063 +#: src/gutenprintui2/panel.c:1539 src/gutenprintui2/panel.c:2238 msgid "Width:" msgstr "Šířka:" -#: src/gutenprintui/panel.c:1364 src/gutenprintui2/panel.c:1365 +#: src/gutenprintui2/panel.c:1540 msgid "Width of the paper that you wish to print to" msgstr "Šířka papíru, na který chcete tisknout" -#: src/gutenprintui/panel.c:1368 src/gutenprintui/panel.c:2065 -#: src/gutenprintui2/panel.c:1369 src/gutenprintui2/panel.c:2065 +#: src/gutenprintui2/panel.c:1544 src/gutenprintui2/panel.c:2240 msgid "Height:" msgstr "Výška:" -#: src/gutenprintui/panel.c:1369 src/gutenprintui2/panel.c:1370 +#: src/gutenprintui2/panel.c:1545 msgid "Height of the paper that you wish to print to" msgstr "Výška papíru, na který chcete tisknout" -#: src/gutenprintui/panel.c:1374 src/gutenprintui2/panel.c:1375 +#: src/gutenprintui2/panel.c:1550 msgid "Automatic Paper Size" msgstr "" -#: src/gutenprintui/panel.c:1391 src/gutenprintui2/panel.c:1392 +#: src/gutenprintui2/panel.c:1567 msgid "Number of Copies" msgstr "" -#: src/gutenprintui/panel.c:1403 src/gutenprintui2/panel.c:1404 +#: src/gutenprintui2/panel.c:1579 msgid "Select the number of copies to print; a value between 1 and 100" msgstr "" -#: src/gutenprintui/panel.c:1435 src/gutenprintui2/panel.c:1436 +#: src/gutenprintui2/panel.c:1611 #, fuzzy msgid "Image Position" msgstr "Pozice" -#: src/gutenprintui/panel.c:1452 src/gutenprintui2/panel.c:1453 +#: src/gutenprintui2/panel.c:1628 msgid "Auto" msgstr "Automaticky" -#: src/gutenprintui/panel.c:1454 src/gutenprintui2/panel.c:1455 +#: src/gutenprintui2/panel.c:1630 msgid "Portrait" msgstr "Na výšku" -#: src/gutenprintui/panel.c:1456 src/gutenprintui2/panel.c:1457 +#: src/gutenprintui2/panel.c:1632 msgid "Landscape" msgstr "Na šířku" -#: src/gutenprintui/panel.c:1458 src/gutenprintui2/panel.c:1459 +#: src/gutenprintui2/panel.c:1634 msgid "Upside down" msgstr "Vzhůru nohama" -#: src/gutenprintui/panel.c:1460 src/gutenprintui2/panel.c:1461 +#: src/gutenprintui2/panel.c:1636 msgid "Seascape" msgstr "Na stranu" -#: src/gutenprintui/panel.c:1464 src/gutenprintui2/panel.c:1465 +#: src/gutenprintui2/panel.c:1640 msgid "" "Select the orientation: portrait, landscape, upside down, or seascape " "(upside down landscape)" @@ -6778,125 +7203,121 @@ msgstr "" "Vyberte orientaci: na výšku, na šířku, vzhůru nohama nebo na stranu (na " "šířku vzhůru nohama)" -#: src/gutenprintui/panel.c:1466 src/gutenprintui2/panel.c:1467 +#: src/gutenprintui2/panel.c:1642 msgid "Orientation:" msgstr "Orientace:" -#: src/gutenprintui/panel.c:1477 src/gutenprintui2/panel.c:1478 +#: src/gutenprintui2/panel.c:1653 msgid "Left:" msgstr "Levý:" -#: src/gutenprintui/panel.c:1478 src/gutenprintui2/panel.c:1479 +#: src/gutenprintui2/panel.c:1654 msgid "Distance from the left of the paper to the image" msgstr "Vzdálenost od levého okraje papíru k obrázku" -#: src/gutenprintui/panel.c:1481 src/gutenprintui/panel.c:1485 -#: src/gutenprintui2/panel.c:1482 src/gutenprintui2/panel.c:1486 +#: src/gutenprintui2/panel.c:1657 src/gutenprintui2/panel.c:1661 msgid "Right:" msgstr "Pravý:" -#: src/gutenprintui/panel.c:1482 src/gutenprintui2/panel.c:1483 +#: src/gutenprintui2/panel.c:1658 msgid "Distance from the left of the paper to the right of the image" msgstr "Vzdálenost od levého okraje papíru k pravému okraji obrázku" -#: src/gutenprintui/panel.c:1486 src/gutenprintui2/panel.c:1487 +#: src/gutenprintui2/panel.c:1662 msgid "Distance from the right of the paper to the image" msgstr "Vzdálenost od pravého okraje papíru k obrázku" -#: src/gutenprintui/panel.c:1488 src/gutenprintui2/panel.c:1489 +#: src/gutenprintui2/panel.c:1664 msgid "Top:" msgstr "Horní:" -#: src/gutenprintui/panel.c:1489 src/gutenprintui2/panel.c:1490 +#: src/gutenprintui2/panel.c:1665 msgid "Distance from the top of the paper to the image" msgstr "Vzdálenost od horního okraje papíru k obrázku" -#: src/gutenprintui/panel.c:1492 src/gutenprintui/panel.c:1496 -#: src/gutenprintui2/panel.c:1493 src/gutenprintui2/panel.c:1497 +#: src/gutenprintui2/panel.c:1668 src/gutenprintui2/panel.c:1672 msgid "Bottom:" msgstr "Spodní:" -#: src/gutenprintui/panel.c:1493 src/gutenprintui2/panel.c:1494 +#: src/gutenprintui2/panel.c:1669 #, fuzzy msgid "Distance from the top of the paper to bottom of the image" msgstr "Vzdálenost od horního okraje papíru k spodnímu okraji obrázku" -#: src/gutenprintui/panel.c:1497 src/gutenprintui2/panel.c:1498 +#: src/gutenprintui2/panel.c:1673 msgid "Distance from the bottom of the paper to the image" msgstr "Vzdálenost od spodního okraje papíru k obrázku" -#: src/gutenprintui/panel.c:1507 src/gutenprintui2/panel.c:1508 +#: src/gutenprintui2/panel.c:1683 msgid "Center:" msgstr "Vycentrovat:" -#: src/gutenprintui/panel.c:1510 src/gutenprintui2/panel.c:1511 +#: src/gutenprintui2/panel.c:1686 #, fuzzy msgid "Horizontal" msgstr "HorizontálnÄ›" -#: src/gutenprintui/panel.c:1511 src/gutenprintui2/panel.c:1512 +#: src/gutenprintui2/panel.c:1687 msgid "Center the image horizontally on the paper" msgstr "Vycentrovat obrázek na papíře horizontálnÄ›" -#: src/gutenprintui/panel.c:1513 src/gutenprintui2/panel.c:1514 +#: src/gutenprintui2/panel.c:1689 msgid "Both" msgstr "Obojí" -#: src/gutenprintui/panel.c:1514 src/gutenprintui2/panel.c:1515 +#: src/gutenprintui2/panel.c:1690 msgid "Center the image on the paper" msgstr "Vycentrovat obrázek na papíře" -#: src/gutenprintui/panel.c:1516 src/gutenprintui2/panel.c:1517 +#: src/gutenprintui2/panel.c:1692 #, fuzzy msgid "Vertical" msgstr "VertikálnÄ›" -#: src/gutenprintui/panel.c:1517 src/gutenprintui2/panel.c:1518 +#: src/gutenprintui2/panel.c:1693 msgid "Center the image vertically on the paper" msgstr "Vycentrovat obrázek na papíře vertikálnÄ›" -#: src/gutenprintui/panel.c:1530 src/gutenprintui2/panel.c:1531 +#: src/gutenprintui2/panel.c:1706 msgid "Setup Printer" msgstr "Nastavit tiskárnu" -#: src/gutenprintui/panel.c:1555 src/gutenprintui2/panel.c:1555 +#: src/gutenprintui2/panel.c:1730 #, fuzzy msgid "Printer Make:" msgstr "Název tiskárny:" -#: src/gutenprintui/panel.c:1566 src/gutenprintui2/panel.c:1566 +#: src/gutenprintui2/panel.c:1741 #, fuzzy msgid "Select the make of your printer" msgstr "Vyberte model své tiskárny" -#: src/gutenprintui/panel.c:1584 src/gutenprintui/panel.c:1672 -#: src/gutenprintui/panel.c:1890 src/gutenprintui2/panel.c:1584 -#: src/gutenprintui2/panel.c:1672 src/gutenprintui2/panel.c:1890 +#: src/gutenprintui2/panel.c:1759 src/gutenprintui2/panel.c:1847 +#: src/gutenprintui2/panel.c:2065 msgid "Printer Model:" msgstr "Model tiskárny:" -#: src/gutenprintui/panel.c:1595 src/gutenprintui2/panel.c:1595 +#: src/gutenprintui2/panel.c:1770 msgid "Select your printer model" msgstr "Vyberte model své tiskárny" -#: src/gutenprintui/panel.c:1643 src/gutenprintui2/panel.c:1643 +#: src/gutenprintui2/panel.c:1818 msgid "PPD File:" msgstr "Soubor PPD:" -#: src/gutenprintui/panel.c:1659 src/gutenprintui2/panel.c:1659 +#: src/gutenprintui2/panel.c:1834 msgid "Enter the correct PPD filename for your printer" msgstr "Zadejte správný název souboru PPD pro svou tiskárnu" -#: src/gutenprintui/panel.c:1661 src/gutenprintui/panel.c:1741 -#: src/gutenprintui2/panel.c:1661 src/gutenprintui2/panel.c:1741 +#: src/gutenprintui2/panel.c:1836 src/gutenprintui2/panel.c:1916 msgid "Browse" msgstr "Procházet" -#: src/gutenprintui/panel.c:1668 src/gutenprintui2/panel.c:1668 +#: src/gutenprintui2/panel.c:1843 msgid "Choose the correct PPD filename for your printer" msgstr "Zvolte správný název souboru PPD pro svou tiskárnu" -#: src/gutenprintui/panel.c:1710 src/gutenprintui2/panel.c:1710 +#: src/gutenprintui2/panel.c:1885 #, fuzzy msgid "" "Select the name of the output queue (not the type, or model, of printer) " @@ -6905,58 +7326,57 @@ msgstr "" "Vyberte název tiskárny (ne typ nebo model tiskárny), na kterou chcete " "tisknout" -#: src/gutenprintui/panel.c:1712 src/gutenprintui2/panel.c:1712 +#: src/gutenprintui2/panel.c:1887 #, fuzzy msgid "Printer Queue:" msgstr "Název tiskárny:" -#: src/gutenprintui/panel.c:1728 src/gutenprintui2/panel.c:1728 +#: src/gutenprintui2/panel.c:1903 #, fuzzy msgid "Enter the correct command to print to your printer. " msgstr "Zadejte správný název souboru PPD pro svou tiskárnu" -#: src/gutenprintui/panel.c:1739 src/gutenprintui2/panel.c:1739 +#: src/gutenprintui2/panel.c:1914 msgid "Enter the file to print to. " msgstr "" -#: src/gutenprintui/panel.c:1747 src/gutenprintui2/panel.c:1747 +#: src/gutenprintui2/panel.c:1922 #, fuzzy msgid "File to print to" msgstr "testovací tisk" -#: src/gutenprintui/panel.c:1755 src/gutenprintui2/panel.c:1755 +#: src/gutenprintui2/panel.c:1930 #, fuzzy msgid "Print To File" msgstr "Tisknout do souboru?" -#: src/gutenprintui/panel.c:1785 src/gutenprintui2/panel.c:1785 +#: src/gutenprintui2/panel.c:1960 msgid "Define New Printer" msgstr "Definovat novou tiskárnu" -#: src/gutenprintui/panel.c:1803 src/gutenprintui/panel.c:1887 -#: src/gutenprintui2/panel.c:1803 src/gutenprintui2/panel.c:1887 +#: src/gutenprintui2/panel.c:1978 src/gutenprintui2/panel.c:2062 msgid "Printer Name:" msgstr "Název tiskárny:" -#: src/gutenprintui/panel.c:1807 src/gutenprintui2/panel.c:1807 +#: src/gutenprintui2/panel.c:1982 msgid "Enter the name you wish to give this logical printer" msgstr "Zadejte název, který chcete dát této logické tiskárnÄ›" -#: src/gutenprintui/panel.c:1817 src/gutenprintui2/panel.c:1817 +#: src/gutenprintui2/panel.c:1992 #, fuzzy msgid "About Gutenprint " msgstr "O Gimp-Print " -#: src/gutenprintui/panel.c:1824 src/gutenprintui2/panel.c:1824 +#: src/gutenprintui2/panel.c:1999 #, fuzzy msgid "Gutenprint Version " msgstr "Verze Gimp-Print " -#: src/gutenprintui/panel.c:1872 src/gutenprintui2/panel.c:1872 +#: src/gutenprintui2/panel.c:2047 msgid "Printer Settings" msgstr "Nastavení tiskárny" -#: src/gutenprintui/panel.c:1885 src/gutenprintui2/panel.c:1885 +#: src/gutenprintui2/panel.c:2060 msgid "" "Select the name of the printer (not the type, or model, of printer) that you " "wish to print to" @@ -6964,11 +7384,11 @@ msgstr "" "Vyberte název tiskárny (ne typ nebo model tiskárny), na kterou chcete " "tisknout" -#: src/gutenprintui/panel.c:1902 src/gutenprintui2/panel.c:1902 +#: src/gutenprintui2/panel.c:2077 msgid "Setup Printer..." msgstr "Nastavit tiskárnu..." -#: src/gutenprintui/panel.c:1904 src/gutenprintui2/panel.c:1904 +#: src/gutenprintui2/panel.c:2079 msgid "" "Choose the printer model, PPD file, and command that is used to print to " "this printer" @@ -6976,11 +7396,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:1917 src/gutenprintui2/panel.c:1917 +#: src/gutenprintui2/panel.c:2092 msgid "New Printer..." msgstr "Nová tiskárna..." -#: src/gutenprintui/panel.c:1918 src/gutenprintui2/panel.c:1918 +#: src/gutenprintui2/panel.c:2093 msgid "" "Define a new logical printer. This can be used to name a collection of " "settings that you wish to remember for future use." @@ -6988,33 +7408,33 @@ 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:1948 src/gutenprintui2/panel.c:1948 +#: src/gutenprintui2/panel.c:2123 #, fuzzy msgid "Set Printer Option Defaults" msgstr "Nastavit implicitní" -#: src/gutenprintui/panel.c:1949 src/gutenprintui2/panel.c:1949 +#: src/gutenprintui2/panel.c:2124 msgid "Set all printer options to their defaults" msgstr "" -#: src/gutenprintui/panel.c:1972 src/gutenprintui2/panel.c:1972 +#: src/gutenprintui2/panel.c:2147 #, fuzzy msgid "Image Size" msgstr "Typ obrázku" -#: src/gutenprintui/panel.c:1997 src/gutenprintui2/panel.c:1997 +#: src/gutenprintui2/panel.c:2172 msgid "Scaling:" msgstr "Měřítko:" -#: src/gutenprintui/panel.c:2001 src/gutenprintui2/panel.c:2001 +#: src/gutenprintui2/panel.c:2176 msgid "Set the scale (size) of the image" msgstr "Nastavte měřítko (velikost) obrázku" -#: src/gutenprintui/panel.c:2023 src/gutenprintui2/panel.c:2023 +#: src/gutenprintui2/panel.c:2198 msgid "Scale by:" msgstr "" -#: src/gutenprintui/panel.c:2028 src/gutenprintui2/panel.c:2028 +#: src/gutenprintui2/panel.c:2203 msgid "" "Select whether scaling is measured as percent of available page size or " "number of output dots per inch" @@ -7022,31 +7442,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:2031 src/gutenprintui2/panel.c:2031 +#: src/gutenprintui2/panel.c:2206 msgid "Percent" msgstr "Procenta" -#: src/gutenprintui/panel.c:2036 src/gutenprintui2/panel.c:2036 +#: src/gutenprintui2/panel.c:2211 msgid "Scale the print to the size of the page" msgstr "Upravit tisk na velikost stránky" -#: src/gutenprintui/panel.c:2040 src/gutenprintui2/panel.c:2040 +#: src/gutenprintui2/panel.c:2215 msgid "PPI" msgstr "PPI" -#: src/gutenprintui/panel.c:2045 src/gutenprintui2/panel.c:2045 +#: src/gutenprintui2/panel.c:2220 msgid "Scale the print to the number of dots per inch" msgstr "Upravit tisk na poÄet bodů na palec" -#: src/gutenprintui/panel.c:2063 src/gutenprintui2/panel.c:2063 +#: src/gutenprintui2/panel.c:2238 msgid "Set the width of the print" msgstr "Nastavit šířku tisku" -#: src/gutenprintui/panel.c:2065 src/gutenprintui2/panel.c:2065 +#: src/gutenprintui2/panel.c:2240 msgid "Set the height of the print" msgstr "Nastavit výšku tisku" -#: src/gutenprintui/panel.c:2071 src/gutenprintui2/panel.c:2071 +#: src/gutenprintui2/panel.c:2246 msgid "" "Use Original\n" "Image Size" @@ -7054,153 +7474,107 @@ msgstr "" "Použít původní\n" "velikost obrázku" -#: src/gutenprintui/panel.c:2077 src/gutenprintui2/panel.c:2077 +#: src/gutenprintui2/panel.c:2252 msgid "Set the print size to the size of the image" msgstr "Nastavit velikost tisku na velikost obrázku" -#: src/gutenprintui/panel.c:2100 src/gutenprintui2/panel.c:2101 +#: src/gutenprintui2/panel.c:2276 msgid "Print Color Adjust" msgstr "Úprava barvy tisku" -#: src/gutenprintui/panel.c:2103 src/gutenprintui2/panel.c:2104 +#: src/gutenprintui2/panel.c:2279 msgid "Set Defaults" msgstr "Nastavit implicitní" -#: src/gutenprintui/panel.c:2105 src/gutenprintui2/panel.c:2106 +#: src/gutenprintui2/panel.c:2281 msgid "Close" msgstr "Zavřít" -#: src/gutenprintui/panel.c:2134 src/gutenprintui2/panel.c:2135 +#: src/gutenprintui2/panel.c:2310 msgid "Image preview" msgstr "Náhled obrázku" -#: src/gutenprintui/panel.c:2148 src/gutenprintui2/panel.c:2149 +#: src/gutenprintui2/panel.c:2324 msgid "View Output Channels:" msgstr "" -#: src/gutenprintui/panel.c:2234 src/gutenprintui2/panel.c:2240 +#: src/gutenprintui2/panel.c:2415 #, fuzzy msgid "Output" msgstr "Typ výstupu:" -#: src/gutenprintui/panel.c:2262 src/gutenprintui2/panel.c:2268 +#: src/gutenprintui2/panel.c:2443 msgid "Output Type:" msgstr "Typ výstupu:" -#: src/gutenprintui/panel.c:2266 src/gutenprintui2/panel.c:2272 +#: src/gutenprintui2/panel.c:2447 msgid "Select the desired output type" msgstr "Zvolte požadovaný typ výstupu" -#: src/gutenprintui/panel.c:2287 src/gutenprintui2/panel.c:2293 +#: src/gutenprintui2/panel.c:2468 msgid "Adjust Output..." msgstr "Upravit výstup..." -#: src/gutenprintui/panel.c:2296 src/gutenprintui2/panel.c:2302 +#: src/gutenprintui2/panel.c:2477 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:2314 src/gutenprintui2/panel.c:2321 +#: src/gutenprintui2/panel.c:2496 #, fuzzy msgid "Size Units:" msgstr "Jednotky:" -#: src/gutenprintui/panel.c:2317 src/gutenprintui2/panel.c:2324 +#: src/gutenprintui2/panel.c:2499 #, fuzzy msgid " " msgstr "> " -#: src/gutenprintui/panel.c:2341 src/gutenprintui2/panel.c:2348 +#: src/gutenprintui2/panel.c:2523 msgid "Units:" msgstr "Jednotky:" -#: src/gutenprintui/panel.c:2346 src/gutenprintui2/panel.c:2353 +#: src/gutenprintui2/panel.c:2528 msgid "Select the base unit of measurement for printing" msgstr "Vyberte základní jednotku měření pro tisk" -#: src/gutenprintui/plist.c:90 src/gutenprintui/plist.c:99 -#: src/gutenprintui2/plist.c:89 src/gutenprintui2/plist.c:98 +#: src/gutenprintui2/plist.c:92 src/gutenprintui2/plist.c:101 msgid "System V lp" msgstr "" -#: src/gutenprintui/plist.c:96 src/gutenprintui2/plist.c:95 +#: src/gutenprintui2/plist.c:98 msgid "CUPS" msgstr "" -#: src/gutenprintui/plist.c:102 src/gutenprintui2/plist.c:101 +#: src/gutenprintui2/plist.c:104 msgid "Berkeley lpd (/etc/lpc)" msgstr "" -#: src/gutenprintui/plist.c:105 src/gutenprintui2/plist.c:104 -msgid "Berkeley lpd (/usr/bsd/lpc)" -msgstr "" - -#: src/gutenprintui/plist.c:108 src/gutenprintui2/plist.c:107 -msgid "Berkeley lpd (/usr/etc/lpc" -msgstr "" - -#: src/gutenprintui/plist.c:111 src/gutenprintui2/plist.c:110 -msgid "Berkeley lpd (/usr/libexec/lpc)" -msgstr "" - -#: src/gutenprintui/plist.c:114 src/gutenprintui2/plist.c:113 -msgid "Berkeley lpd (/usr/sbin/lpc)" -msgstr "" - -#: src/gutenprintui/plist.c:1043 src/gutenprintui2/plist.c:1057 -#, fuzzy -msgid "Printer" -msgstr "Vytisknout" - -#: src/gutenprintui/plist.c:1230 src/gutenprintui2/plist.c:1250 -#, fuzzy -msgid "(Default Printer)" -msgstr "Nastavit tiskárnu" - -#: src/gutenprintui2/curve.c:130 -#, fuzzy -msgid "Curve type" -msgstr "ÄŒerná" - -#: src/gutenprintui2/curve.c:131 -msgid "Is this curve linear, spline interpolated, or free-form" -msgstr "" - -#: src/gutenprintui2/curve.c:139 -msgid "Minimum X" -msgstr "" - -#: src/gutenprintui2/curve.c:140 -msgid "Minimum possible value for X" -msgstr "" - -#: src/gutenprintui2/curve.c:149 -msgid "Maximum X" -msgstr "" - -#: src/gutenprintui2/curve.c:150 -msgid "Maximum possible X value" -msgstr "" - -#: src/gutenprintui2/curve.c:159 -msgid "Minimum Y" +#: src/gutenprintui2/plist.c:107 +msgid "Berkeley lpd (/usr/bsd/lpc)" msgstr "" -#: src/gutenprintui2/curve.c:160 -msgid "Minimum possible value for Y" +#: src/gutenprintui2/plist.c:110 +msgid "Berkeley lpd (/usr/etc/lpc" msgstr "" -#: src/gutenprintui2/curve.c:169 -msgid "Maximum Y" +#: src/gutenprintui2/plist.c:113 +msgid "Berkeley lpd (/usr/libexec/lpc)" msgstr "" -#: src/gutenprintui2/curve.c:170 -msgid "Maximum possible value for Y" +#: src/gutenprintui2/plist.c:116 +msgid "Berkeley lpd (/usr/sbin/lpc)" msgstr "" -#: src/gutenprintui2/gammacurve.c:418 -msgid "_Gamma value" -msgstr "" +#: src/gutenprintui2/plist.c:1060 +#, fuzzy +msgid "Printer" +msgstr "Vytisknout" + +#: src/gutenprintui2/plist.c:1253 +#, fuzzy +msgid "(Default Printer)" +msgstr "Nastavit tiskárnu" #: src/cups/genppd.c:145 #, fuzzy @@ -7243,48 +7617,48 @@ msgstr "" #. 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:1058 +#: src/cups/genppd.c:1064 msgid "English" msgstr "Czech" #. TRANSLATORS: Specify PPD translation encoding e.g. ISOLatin1 -#: src/cups/genppd.c:1060 +#: src/cups/genppd.c:1066 msgid "ISOLatin1" msgstr "UTF-8" -#: src/cups/genppd.c:1641 +#: src/cups/genppd.c:1647 msgid "2-Sided Printing" msgstr "" -#: src/cups/genppd.c:1665 +#: src/cups/genppd.c:1671 msgid "Shrink Page If Necessary to Fit Borders" msgstr "" -#: src/cups/genppd.c:1669 +#: src/cups/genppd.c:1675 msgid "Shrink (print the whole page)" msgstr "" -#: src/cups/genppd.c:1670 +#: src/cups/genppd.c:1676 msgid "Crop (preserve dimensions)" msgstr "" -#: src/cups/genppd.c:1671 +#: src/cups/genppd.c:1677 msgid "Expand (use maximum page area)" msgstr "" -#: src/cups/genppd.c:1756 +#: src/cups/genppd.c:1762 msgid "No" msgstr "" -#: src/cups/genppd.c:1758 +#: src/cups/genppd.c:1764 msgid "Yes" msgstr "" -#: src/cups/genppd.c:1795 src/cups/genppd.c:1857 +#: src/cups/genppd.c:1801 src/cups/genppd.c:1863 msgid "Value" msgstr "" -#: src/cups/genppd.c:1800 +#: src/cups/genppd.c:1806 msgid "Fine Adjustment" msgstr "" @@ -8155,228 +8529,90 @@ msgstr "" msgid "Error in input\n" msgstr "Chyba ve vstupu\n" -#: src/gimp/print-image-gimp.c:225 src/gimp2/print-image-gimp.c:225 +#: src/gimp2/print-image-gimp.c:225 msgid "Printing..." msgstr "Tisknu..." -#: src/gimp/print.c:133 -msgid "/File/Print..." -msgstr "/Soubor/Tisk..." - -#: src/ghost/ijsgutenprint.c:98 -#, c-format -msgid "" -"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" -msgstr "" - -#: 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:199 -#, fuzzy, c-format -msgid "ERROR: ijsgutenprint: No row buffer\n" -msgstr "Žádná vyrovnávací paměť řádků\n" - -#: 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: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: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:656 -#, c-format -msgid "ijsgutenprint: unknown DeviceModel %s\n" -msgstr "" - -#: 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: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: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: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: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: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:830 -#, fuzzy, c-format -msgid "ERROR: ijsgutenprint: cannot parse %s boolean %s\n" -msgstr "Nemohu tisknout na tiskárnu %s pomocí %s\n" +#, fuzzy +#~ 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:841 -#, fuzzy, c-format -msgid "ERROR: ijsgutenprint: Bad parameter %s %d\n" -msgstr "Neznámá tiskárna %s\n" +#, fuzzy +#~ msgid "ERROR: ijsgutenprint: No row buffer\n" +#~ msgstr "Žádná vyrovnávací paměť řádků\n" -#: 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" +#, fuzzy +#~ 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:1308 -#, fuzzy, c-format -msgid "ERROR: ijsgutenprint: image_init failed %d\n" -msgstr "image_init selhalo %d\n" +#, fuzzy +#~ 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:1319 -#, fuzzy, c-format -msgid "ERROR: ijsgutenprint: Unable to open file descriptor: %s\n" -msgstr "Nemohu otevřít deskriptor souboru: %s\n" +#, fuzzy +#~ msgid "ERROR: ijsgutenprint: Printer %s is not a known model\n" +#~ msgstr "Tiskárna %s není známý model\n" -#: src/ghost/ijsgutenprint.c:1331 -#, fuzzy, c-format -msgid "ERROR: ijsgutenprint: Unable to open %s: %s\n" -msgstr "Nemohu otevřít %s: %s\n" +#, fuzzy +#~ msgid "ERROR: ijsgutenprint: cannot parse TopLeft %s\n" +#~ msgstr "Nemohu tisknout na tiskárnu %s pomocí %s\n" -#: src/ghost/ijsgutenprint.c:1344 -#, fuzzy, c-format -msgid "ERROR: ijsgutenprint: Unknown printer %s\n" -msgstr "Neznámá tiskárna %s\n" +#, fuzzy +#~ msgid "ERROR: ijsgutenprint: cannot parse PaperSize %s\n" +#~ msgstr "Nemohu tisknout na tiskárnu %s pomocí %s\n" -#: src/ghost/ijsgutenprint.c:1516 -#, fuzzy, c-format -msgid "ERROR: ijsgutenprint: Bad parameters; cannot continue!\n" -msgstr "Å patné parametry; nemohu pokraÄovat!\n" +#, fuzzy +#~ msgid "ERROR: ijsgutenprint: cannot parse curve %s\n" +#~ msgstr "Nemohu tisknout na tiskárnu %s pomocí %s\n" -#: 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 "ERROR: ijsgutenprint: cannot parse %s float %s\n" +#~ msgstr "Nemohu tisknout na tiskárnu %s pomocí %s\n" #, fuzzy -#~ msgid "Model Name" -#~ msgstr "ZruÅ¡it" +#~ msgid "ERROR: ijsgutenprint: cannot parse %s int %s\n" +#~ msgstr "Nemohu tisknout na tiskárnu %s pomocí %s\n" #, fuzzy -#~ msgid "Cassette" -#~ msgstr "Matný papír" +#~ msgid "ERROR: ijsgutenprint: cannot parse %s dimension %s\n" +#~ msgstr "Nemohu tisknout na tiskárnu %s pomocí %s\n" #, fuzzy -#~ msgid " Gamma" -#~ msgstr "Gama:" +#~ msgid "ERROR: ijsgutenprint: cannot parse %s boolean %s\n" +#~ msgstr "Nemohu tisknout na tiskárnu %s pomocí %s\n" #, fuzzy -#~ msgid " Curve" -#~ msgstr "ÄŒerná" +#~ msgid "ERROR: ijsgutenprint: Bad parameter %s %d\n" +#~ msgstr "Neznámá tiskárna %s\n" #, fuzzy -#~ msgid "1440 x 1440" -#~ msgstr "1440 x 1440 DPI" +#~ msgid "ERROR: ijsgutenprint: bad key code %d\n" +#~ msgstr "Získání dalšího řádku selhalo na %.0f\n" #, fuzzy -#~ msgid "1440 x 1440 DPI High Quality" -#~ msgstr "1200 DPI nejvyšší kvalita" +#~ msgid "ERROR: ijsgutenprint: image_init failed %d\n" +#~ msgstr "image_init selhalo %d\n" #, fuzzy -#~ msgid "1440 x 1440 DPI Highest Quality" -#~ msgstr "1200 DPI nejvyšší kvalita" +#~ msgid "ERROR: ijsgutenprint: Unable to open file descriptor: %s\n" +#~ msgstr "Nemohu otevřít deskriptor souboru: %s\n" #, fuzzy -#~ msgid "2880 x 1440 DPI High Quality" -#~ msgstr "1200 DPI nejvyšší kvalita" +#~ msgid "ERROR: ijsgutenprint: Unable to open %s: %s\n" +#~ msgstr "Nemohu otevřít %s: %s\n" #, fuzzy -#~ msgid "2880 x 1440 DPI Highest Quality" -#~ msgstr "1200 DPI nejvyšší kvalita" +#~ msgid "ERROR: ijsgutenprint: Unknown printer %s\n" +#~ msgstr "Neznámá tiskárna %s\n" #, fuzzy -#~ msgid "" -#~ "\n" -#~ "\n" -#~ "Copyright (C) 1997-2003 Michael Sweet, Robert Krawitz,\n" -#~ "and the rest of the Gutenprint Development Team.\n" -#~ "\n" -#~ "Please visit our web site at http://gimp-print.sourceforge.net.\n" -#~ "\n" -#~ "This program is free software; you can redistribute it and/or modify\n" -#~ "it under the terms of the GNU General Public License as published by\n" -#~ "the Free Software Foundation; either version 2 of the License, or\n" -#~ "(at your option) any later version.\n" -#~ "\n" -#~ "This program is distributed in the hope that it will be useful,\n" -#~ "but WITHOUT ANY WARRANTY; without even the implied warranty of\n" -#~ "MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the\n" -#~ "GNU General Public License for more details.\n" -#~ "\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" -#~ msgstr "" -#~ "\n" -#~ "\n" -#~ "Copyright (C) 1997-2001 Michael Sweet, Robert Krawitz\n" -#~ "a zbytek vývojového týmu Gimp-Print.\n" -#~ "\n" -#~ "NavÅ¡tivte prosím naÅ¡i WWW stránku na http://gimp-print.sourceforge.net.\n" -#~ "\n" -#~ "Tento program je free software; můžete jej dále šířit a/nebo modifikovat\n" -#~ "za podmínek GNU General Public License publikované Free Software\n" -#~ "Foundation; a to buÄ verze 2 licence, nebo (podle vaÅ¡eho uvážení)\n" -#~ "libovolné pozdÄ›jší verze.\n" -#~ "\n" -#~ "Tento program je rozÅ¡iÅ™ován v nadÄ›ji, že bude, užiteÄný, ale BEZ " -#~ "JAKÉKOLI\n" -#~ "ZÃRUKY; ani bez pÅ™edpokládané záruky PRODEJNOSTI nebo VHODNOSTI PRO " -#~ "NÄšJAKÃ\n" -#~ "KONKRÉTNà ÚČEL. Pro další podrobnosti si pÅ™eÄtÄ›te GNU General Public\n" -#~ "License.\n" -#~ "\n" -#~ "Kopii GNU General Public License jste mÄ›li dostat s tímto programem;\n" -#~ "pokud se tak nestalo, napiÅ¡te Free Software Foundation, Inc., 59 Temple\n" -#~ "Place - Suite 330, Boston, MA 02111-1307, USA.\n" +#~ msgid "ERROR: ijsgutenprint: Bad parameters; cannot continue!\n" +#~ msgstr "Å patné parametry; nemohu pokraÄovat!\n" #, 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-2001 Robert Krawitz\n" -#~ "Escputil je dodáván ABSOLUTNÄš BEZ ZÃRUKY; pro detaily napiÅ¡te 'escputil -" -#~ "l'\n" -#~ "Toto je svobodný software, a můžete jej dále šířit za urÄitých podmínek;\n" -#~ "pro detaily napiÅ¡te 'escputil -l'.\n" +#~ msgid "ERROR: ijsgutenprint: Get next row failed at %.0f\n" +#~ msgstr "Získání dalšího řádku selhalo na %.0f\n" #, fuzzy #~ msgid "90x90 DPI" @@ -8410,10 +8646,6 @@ msgstr "Získání dalšího řádku selhalo na %.0f\n" #~ msgid "720x360 DPI DMT" #~ msgstr "720 x 360 DPI MW2" -#, fuzzy -#~ msgid "720x720 DPI" -#~ msgstr "2880 x 720 DPI" - #, fuzzy #~ msgid "720x720 DPI DMT" #~ msgstr "2880 x 720 DPI" @@ -8478,10 +8710,6 @@ msgstr "Získání dalšího řádku selhalo na %.0f\n" #~ msgid "2400x2400 DPI DMT" #~ msgstr "2400×600 DPI" -#, fuzzy -#~ msgid "Plain Paper PIXMA" -#~ msgstr "Normální papír" - #~ msgid "Fabric Sheets" #~ msgstr "Listy tkaniny" @@ -8506,29 +8734,29 @@ msgstr "Získání dalšího řádku selhalo na %.0f\n" #~ msgid "Photo Paper Pro" #~ msgstr "Profesionální fotopapír" -#~ msgid "Photo CcMmYK Color" -#~ msgstr "Fotografické barvy CcMmYK" - -#~ msgid "Photo CcMmY Color" -#~ msgstr "Fotografické barvy CcMmY" +#~ msgid "CMY Color" +#~ msgstr "Barvy CMY" #~ msgid "CMYK Color" #~ msgstr "Barvy CMYK" -#~ msgid "CMY Color" -#~ msgstr "Barvy CMY" +#~ msgid "Photo CcMmY Color" +#~ msgstr "Fotografické barvy CcMmY" + +#~ msgid "Photo CcMmYK Color" +#~ msgstr "Fotografické barvy CcMmYK" #, fuzzy -#~ msgid "Gutenprint" -#~ msgstr "testovací tisk" +#~ msgid " Gamma" +#~ msgstr "Gama:" #, fuzzy -#~ msgid "ERROR: ijsgutenprint: ijs_server_get_page_header failed %d\n" -#~ msgstr "ijs_server_get_page_header selhalo %d\n" +#~ msgid " Curve" +#~ msgstr "ÄŒerná" #, fuzzy -#~ msgid "EPSON Stylus C50" -#~ msgstr "Stylus C50" +#~ msgid "Red Balance" +#~ msgstr "Žlutá" #, fuzzy #~ msgid "EPSON Stylus C60" @@ -8538,18 +8766,6 @@ msgstr "Získání dalšího řádku selhalo na %.0f\n" #~ msgid "EPSON Stylus C61" #~ msgstr "Stylus C61" -#, fuzzy -#~ msgid "EPSON Stylus C62" -#~ msgstr "Stylus C62" - -#, fuzzy -#~ msgid "EPSON Stylus C70" -#~ msgstr "Stylus C70" - -#, fuzzy -#~ msgid "EPSON Stylus C80" -#~ msgstr "Stylus C80" - #, fuzzy #~ msgid "EPSON Stylus C82" #~ msgstr "Stylus C82" @@ -8782,10 +8998,6 @@ msgstr "Získání dalšího řádku selhalo na %.0f\n" #~ msgid "EPSON Stylus Pro 5500" #~ msgstr "Stylus Pro 5500" -#, fuzzy -#~ msgid "EPSON Stylus Pro 7000" -#~ msgstr "Stylus Pro 7000" - #, fuzzy #~ msgid "EPSON Stylus Pro 7500" #~ msgstr "Stylus Pro 7500" @@ -8819,20 +9031,84 @@ msgstr "Získání dalšího řádku selhalo na %.0f\n" #~ msgstr "Stylus Scan 2500" #, fuzzy -#~ msgid "EPSON E-100" -#~ msgstr "Stylus C50" +#~ msgid "" +#~ "\n" +#~ "\n" +#~ "Copyright (C) 1997-2003 Michael Sweet, Robert Krawitz,\n" +#~ "and the rest of the Gutenprint Development Team.\n" +#~ "\n" +#~ "Please visit our web site at http://gimp-print.sourceforge.net.\n" +#~ "\n" +#~ "This program is free software; you can redistribute it and/or modify\n" +#~ "it under the terms of the GNU General Public License as published by\n" +#~ "the Free Software Foundation; either version 2 of the License, or\n" +#~ "(at your option) any later version.\n" +#~ "\n" +#~ "This program is distributed in the hope that it will be useful,\n" +#~ "but WITHOUT ANY WARRANTY; without even the implied warranty of\n" +#~ "MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the\n" +#~ "GNU General Public License for more details.\n" +#~ "\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" +#~ msgstr "" +#~ "\n" +#~ "\n" +#~ "Copyright (C) 1997-2001 Michael Sweet, Robert Krawitz\n" +#~ "a zbytek vývojového týmu Gimp-Print.\n" +#~ "\n" +#~ "NavÅ¡tivte prosím naÅ¡i WWW stránku na http://gimp-print.sourceforge.net.\n" +#~ "\n" +#~ "Tento program je free software; můžete jej dále šířit a/nebo modifikovat\n" +#~ "za podmínek GNU General Public License publikované Free Software\n" +#~ "Foundation; a to buÄ verze 2 licence, nebo (podle vaÅ¡eho uvážení)\n" +#~ "libovolné pozdÄ›jší verze.\n" +#~ "\n" +#~ "Tento program je rozÅ¡iÅ™ován v nadÄ›ji, že bude, užiteÄný, ale BEZ " +#~ "JAKÉKOLI\n" +#~ "ZÃRUKY; ani bez pÅ™edpokládané záruky PRODEJNOSTI nebo VHODNOSTI PRO " +#~ "NÄšJAKÃ\n" +#~ "KONKRÉTNà ÚČEL. Pro další podrobnosti si pÅ™eÄtÄ›te GNU General Public\n" +#~ "License.\n" +#~ "\n" +#~ "Kopii GNU General Public License jste mÄ›li dostat s tímto programem;\n" +#~ "pokud se tak nestalo, napiÅ¡te Free Software Foundation, Inc., 59 Temple\n" +#~ "Place - Suite 330, Boston, MA 02111-1307, USA.\n" + +#, fuzzy +#~ msgid "Gutenprint" +#~ msgstr "testovací tisk" #, fuzzy -#~ msgid "Printer does not support listing ink types!\n" -#~ msgstr "Tiskárna nepodporuje barevný výstup\n" +#~ msgid "" +#~ ", Copyright (C) 2000-2003 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-2001 Robert Krawitz\n" +#~ "Escputil je dodáván ABSOLUTNÄš BEZ ZÃRUKY; pro detaily napiÅ¡te 'escputil -" +#~ "l'\n" +#~ "Toto je svobodný software, a můžete jej dále šířit za urÄitých podmínek;\n" +#~ "pro detaily napiÅ¡te 'escputil -l'.\n" #, fuzzy #~ msgid "Cannot identify printer!\n" #~ msgstr "Nemohu zpracovat výstup z tiskárny\n" #, fuzzy -#~ msgid "Red Balance" -#~ msgstr "Žlutá" +#~ msgid "Printer does not support listing ink types!\n" +#~ msgstr "Tiskárna nepodporuje barevný výstup\n" + +#~ msgid "/File/Print..." +#~ msgstr "/Soubor/Tisk..." + +#, fuzzy +#~ msgid "ERROR: ijsgutenprint: ijs_server_get_page_header failed %d\n" +#~ msgstr "ijs_server_get_page_header selhalo %d\n" #, fuzzy #~ msgid "Gloss Balance" @@ -8945,27 +9221,15 @@ msgstr "Získání dalšího řádku selhalo na %.0f\n" #~ msgid "Solid Colors" #~ msgstr "Jednolité barvy" -#~ msgid "Stylus C20sx" -#~ msgstr "Stylus C20sx" - #~ 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" diff --git a/po/da.gmo b/po/da.gmo index e132524..ce983be 100644 Binary files a/po/da.gmo and b/po/da.gmo differ diff --git a/po/da.po b/po/da.po index 27cf1e5..0486b51 100644 --- a/po/da.po +++ b/po/da.po @@ -1,28 +1,29 @@ -# Danish translation of gutenprint-5.0.0.po -# Copyright (C) 2001, 2006 Free Software Foundation, Inc. +# Danish translation of gutenprint-5.2 +# Copyright (C) 2001, 2006, 2007, 2008 Free Software Foundation, Inc. +# This file is distributed under the same license as the gutenprint package. # # Keld Simonsen , 2001. # Kjartan Maraas , 2001. -# Mogens Jaeger , 2006. +# Mogens Jæger , 2006, 2007, 2008. msgid "" msgstr "" -"Project-Id-Version: gutenprint 5.0.0\n" +"Project-Id-Version: gutenprint 5.1.98.1\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2008-01-01 20:47-0500\n" -"PO-Revision-Date: 2006-07-20 12:56+0200\n" -"Last-Translator: Mogens Jaeger \n" +"POT-Creation-Date: 2008-04-25 21:19-0400\n" +"PO-Revision-Date: 2008-04-24 16:20+0200\n" +"Last-Translator: Mogens Jæger \n" "Language-Team: Danish \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.11.2\n" +"X-Generator: KBabel 1.11.4\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:1752 +#: src/main/print-escp2.c:2116 msgid "Default" msgstr "Standard" @@ -62,41 +63,53 @@ msgid "Ordered" msgstr "Ordnet" #: src/main/dither-main.c:65 +msgid "Ordered New" +msgstr "Ordnet ny" + +#: src/main/dither-main.c:66 msgid "Fast" msgstr "Hurtig" -#: src/main/dither-main.c:66 +#: src/main/dither-main.c:67 msgid "Very Fast" msgstr "Meget Hurtig" -#: src/main/dither-main.c:67 +#: src/main/dither-main.c:68 msgid "Hybrid Floyd-Steinberg" msgstr "Blandet Floyd-Steinberg" -#: src/main/dither-main.c:68 +#: src/main/dither-main.c:69 msgid "Predithered Input" msgstr "Forud dithered inddata" -#: src/main/dither-main.c:88 src/main/print-color.c:56 +#: src/main/dither-main.c:70 +msgid "Drop Size Segmented" +msgstr "DrÃ¥bestørrelse segmenteret" + +#: src/main/dither-main.c:71 +msgid "Drop Size Segmented New" +msgstr "DrÃ¥bestørrelse segmenteret ny" + +#: src/main/dither-main.c:91 src/main/print-color.c:56 msgid "Density" msgstr "Tæthed" -#: src/main/dither-main.c:88 src/main/print-canon.c:295 +#: src/main/dither-main.c:91 src/main/print-canon.c:295 #: src/main/print-canon.c:303 src/main/print-canon.c:311 -#: src/main/print-canon.c:319 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-escp2.c:471 -#: src/main/print-escp2.c:479 src/main/print-escp2.c:487 +#: src/main/print-canon.c:319 src/main/print-escp2.c:446 +#: src/main/print-escp2.c:454 src/main/print-escp2.c:462 +#: src/main/print-escp2.c:470 src/main/print-escp2.c:478 +#: src/main/print-escp2.c:486 src/main/print-escp2.c:494 #: 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:1764 src/main/print-olympus.c:1772 -#: src/main/print-olympus.c:1780 src/main/print-olympus.c:1788 -#: src/main/print-pcl.c:1261 src/main/print-pcl.c:1269 -#: src/main/print-pcl.c:1277 src/main/print-pcl.c:1285 +#: src/main/print-olympus.c:1762 src/main/print-olympus.c:1770 +#: src/main/print-olympus.c:1778 src/main/print-olympus.c:1786 +#: src/main/print-pcl.c:1329 src/main/print-pcl.c:1337 +#: src/main/print-pcl.c:1345 src/main/print-pcl.c:1353 msgid "Output Level Adjustment" msgstr "Udskrifts niveaujustering" -#: src/main/dither-main.c:89 +#: src/main/dither-main.c:92 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 " @@ -106,15 +119,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:97 +#: src/main/dither-main.c:100 msgid "Dither Algorithm" msgstr "Dither-algoritme" -#: src/main/dither-main.c:97 +#: src/main/dither-main.c:100 msgid "Screening Adjustment" msgstr "Visningsjustering" -#: src/main/dither-main.c:98 +#: src/main/dither-main.c:101 msgid "" "Choose the dither algorithm to be used.\n" "Adaptive Hybrid usually produces the best all-around quality.\n" @@ -150,9 +163,9 @@ msgstr "Farveomsætningsmodul" msgid "Dither algorithm" msgstr "Dither-algoritme" -#: src/main/print-canon.c:200 src/main/print-escp2.c:180 -#: src/main/print-lexmark.c:266 src/main/print-olympus.c:1699 -#: src/main/print-pcl.c:1196 src/main/print-ps.c:67 +#: src/main/print-canon.c:200 src/main/print-escp2.c:182 +#: src/main/print-lexmark.c:266 src/main/print-olympus.c:1697 +#: src/main/print-pcl.c:1264 msgid "Page Size" msgstr "Papirstørrelse" @@ -160,236 +173,243 @@ msgstr "Papirstørrelse" #: src/main/print-canon.c:212 src/main/print-canon.c:218 #: src/main/print-canon.c:224 src/main/print-canon.c:230 #: src/main/print-canon.c:248 src/main/print-canon.c:272 -#: src/main/print-escp2.c:180 src/main/print-escp2.c:186 -#: src/main/print-escp2.c:192 src/main/print-escp2.c:198 -#: src/main/print-escp2.c:204 src/main/print-escp2.c:210 -#: src/main/print-escp2.c:228 src/main/print-escp2.c:245 -#: src/main/print-escp2.c:251 src/main/print-escp2.c:263 -#: src/main/print-escp2.c:281 src/main/print-lexmark.c:266 +#: src/main/print-escp2.c:182 src/main/print-escp2.c:188 +#: src/main/print-escp2.c:194 src/main/print-escp2.c:200 +#: src/main/print-escp2.c:206 src/main/print-escp2.c:212 +#: src/main/print-escp2.c:230 src/main/print-escp2.c:247 +#: src/main/print-escp2.c:253 src/main/print-escp2.c:265 +#: src/main/print-escp2.c:283 src/main/print-lexmark.c:266 #: src/main/print-lexmark.c:272 src/main/print-lexmark.c:278 -#: src/main/print-lexmark.c:284 src/main/print-olympus.c:1699 -#: src/main/print-olympus.c:1705 src/main/print-olympus.c:1711 -#: src/main/print-olympus.c:1717 src/main/print-pcl.c:1196 -#: src/main/print-pcl.c:1202 src/main/print-pcl.c:1208 -#: src/main/print-pcl.c:1214 src/main/print-pcl.c:1238 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 +#: src/main/print-lexmark.c:284 src/main/print-olympus.c:1697 +#: src/main/print-olympus.c:1703 src/main/print-olympus.c:1709 +#: src/main/print-olympus.c:1715 src/main/print-pcl.c:1264 +#: src/main/print-pcl.c:1270 src/main/print-pcl.c:1276 +#: src/main/print-pcl.c:1282 src/main/print-pcl.c:1306 src/main/print-ps.c:68 +#: src/main/print-ps.c:74 msgid "Basic Printer Setup" msgstr "Basis printerindstillinger" -#: src/main/print-canon.c:201 src/main/print-escp2.c:181 -#: src/main/print-lexmark.c:267 src/main/print-olympus.c:1700 -#: src/main/print-pcl.c:1197 src/main/print-ps.c:68 +#: src/main/print-canon.c:201 src/main/print-escp2.c:183 +#: src/main/print-lexmark.c:267 src/main/print-olympus.c:1698 +#: src/main/print-pcl.c:1265 msgid "Size of the paper being printed to" msgstr "Størrelse pÃ¥ det papir der skal udskrives pÃ¥" -#: src/main/print-canon.c:206 src/main/print-escp2.c:186 -#: src/main/print-lexmark.c:272 src/main/print-olympus.c:1705 -#: src/main/print-pcl.c:1202 src/main/print-ps.c:73 src/cups/genppd.c:1417 +#: src/main/print-canon.c:206 src/main/print-escp2.c:188 +#: src/main/print-lexmark.c:272 src/main/print-olympus.c:1703 +#: src/main/print-pcl.c:1270 src/cups/genppd.c:1422 msgid "Media Type" msgstr "Medietype" -#: src/main/print-canon.c:207 src/main/print-escp2.c:187 -#: src/main/print-lexmark.c:273 src/main/print-olympus.c:1706 -#: src/main/print-pcl.c:1203 src/main/print-ps.c:74 +#: src/main/print-canon.c:207 src/main/print-escp2.c:189 +#: src/main/print-lexmark.c:273 src/main/print-olympus.c:1704 +#: src/main/print-pcl.c:1271 msgid "Type of media (plain paper, photo paper, etc.)" msgstr "Medietype (almindeligt papir, fotopapir, o.s.v.)" -#: src/main/print-canon.c:212 src/main/print-escp2.c:192 -#: src/main/print-lexmark.c:278 src/main/print-olympus.c:1711 -#: src/main/print-pcl.c:1208 src/main/print-ps.c:79 src/cups/genppd.c:1445 +#: src/main/print-canon.c:212 src/main/print-escp2.c:194 +#: src/main/print-lexmark.c:278 src/main/print-olympus.c:1709 +#: src/main/print-pcl.c:1276 src/cups/genppd.c:1450 msgid "Media Source" msgstr "Mediekilde" -#: src/main/print-canon.c:213 src/main/print-escp2.c:193 -#: src/main/print-lexmark.c:279 src/main/print-olympus.c:1712 -#: src/main/print-pcl.c:1209 src/main/print-ps.c:80 +#: src/main/print-canon.c:213 src/main/print-escp2.c:195 +#: src/main/print-lexmark.c:279 src/main/print-olympus.c:1710 +#: src/main/print-pcl.c:1277 msgid "Source (input slot) of the media" msgstr "I hvilken bakke er mediet" -#: src/main/print-canon.c:218 src/main/print-escp2.c:198 +#: src/main/print-canon.c:218 src/main/print-escp2.c:200 msgid "CD Hub Size" msgstr "Cd center størrelse" -#: src/main/print-canon.c:219 src/main/print-escp2.c:199 +#: src/main/print-canon.c:219 src/main/print-escp2.c:201 msgid "Print only outside of the hub of the CD, or all the way to the hole" msgstr "Print kun udenfor centeret af Cd-en, eller helt ind til hullet" -#: src/main/print-canon.c:224 src/main/print-escp2.c:204 +#: src/main/print-canon.c:224 src/main/print-escp2.c:206 msgid "CD Size (Custom)" -msgstr "" +msgstr "Cd størrelse (egendefineret)" -#: src/main/print-canon.c:225 src/main/print-escp2.c:205 +#: src/main/print-canon.c:225 src/main/print-escp2.c:207 msgid "Variable adjustment for the outer diameter of CD" -msgstr "" +msgstr "Variabel justering af udvendig diameter pÃ¥ cd" -#: src/main/print-canon.c:230 src/main/print-escp2.c:210 -#, fuzzy +#: src/main/print-canon.c:230 src/main/print-escp2.c:212 msgid "CD Hub Size (Custom)" -msgstr "Cd center størrelse" +msgstr "Cd center størrelse (egendefineret)" -#: src/main/print-canon.c:231 src/main/print-escp2.c:211 -#, fuzzy +#: src/main/print-canon.c:231 src/main/print-escp2.c:213 msgid "Variable adjustment to the inner hub of the CD" -msgstr "Skalér udskriften til arkstørrelsen" +msgstr "Variabel justering af centeret pÃ¥ cd'en" -#: src/main/print-canon.c:236 src/main/print-escp2.c:216 +#: src/main/print-canon.c:236 src/main/print-escp2.c:218 msgid "CD Horizontal Fine Adjustment" msgstr "Cd vandret finjustering" #: src/main/print-canon.c:236 src/main/print-canon.c:242 -#: src/main/print-canon.c:254 src/main/print-escp2.c:216 -#: src/main/print-escp2.c:222 src/main/print-escp2.c:239 -#: src/main/print-escp2.c:275 src/main/print-lexmark.c:290 -#: src/main/print-olympus.c:1723 src/main/print-olympus.c:1729 -#: src/main/print-olympus.c:1735 src/main/print-pcl.c:1220 -#: src/main/print-ps.c:91 src/main/print-raw.c:80 +#: src/main/print-canon.c:254 src/main/print-escp2.c:218 +#: src/main/print-escp2.c:224 src/main/print-escp2.c:241 +#: src/main/print-escp2.c:277 src/main/print-lexmark.c:290 +#: src/main/print-olympus.c:1721 src/main/print-olympus.c:1727 +#: src/main/print-olympus.c:1733 src/main/print-pcl.c:1288 +#: src/main/print-raw.c:80 msgid "Advanced Printer Setup" msgstr "Avanceret printeropsætning" #: src/main/print-canon.c:237 src/main/print-canon.c:243 -#: src/main/print-escp2.c:217 src/main/print-escp2.c:223 +#: src/main/print-escp2.c:219 src/main/print-escp2.c:225 msgid "Fine adjustment to horizontal position for CD printing" msgstr "Finjustering i vandret plan til printning pÃ¥ Cd" -#: src/main/print-canon.c:242 src/main/print-escp2.c:222 +#: src/main/print-canon.c:242 src/main/print-escp2.c:224 msgid "CD Vertical Fine Adjustment" msgstr "Cd lodret finjustering" -#: src/main/print-canon.c:248 src/main/print-escp2.c:228 -#: src/main/print-lexmark.c:284 src/main/print-olympus.c:1717 -#: src/main/print-pcl.c:1214 src/main/print-ps.c:85 src/cups/genppd.c:1518 +#: src/main/print-canon.c:248 src/main/print-escp2.c:230 +#: src/main/print-lexmark.c:284 src/main/print-olympus.c:1715 +#: src/main/print-pcl.c:1282 src/cups/genppd.c:1523 msgid "Resolution" msgstr "Opløsning" #: src/main/print-canon.c:249 src/main/print-lexmark.c:285 -#: src/main/print-olympus.c:1718 src/main/print-pcl.c:1215 -#: src/main/print-ps.c:86 +#: src/main/print-olympus.c:1716 src/main/print-pcl.c:1283 msgid "Resolution and quality of the print" msgstr "Opløsning og kvalitet af udskriften" -#: src/main/print-canon.c:254 src/main/print-escp2.c:239 -#: src/main/print-lexmark.c:290 src/main/print-olympus.c:1723 -#: src/main/print-pcl.c:1220 src/main/print-ps.c:91 src/main/print-raw.c:80 +#: src/main/print-canon.c:254 src/main/print-escp2.c:241 +#: src/main/print-lexmark.c:290 src/main/print-olympus.c:1721 +#: src/main/print-pcl.c:1288 src/main/print-raw.c:80 msgid "Ink Type" msgstr "Blæktype" -#: src/main/print-canon.c:255 src/main/print-escp2.c:240 -#: src/main/print-escp2.c:252 src/main/print-lexmark.c:291 -#: src/main/print-olympus.c:1724 src/main/print-pcl.c:1221 -#: src/main/print-ps.c:92 src/main/print-raw.c:81 +#: src/main/print-canon.c:255 src/main/print-escp2.c:242 +#: src/main/print-escp2.c:254 src/main/print-lexmark.c:291 +#: src/main/print-olympus.c:1722 src/main/print-pcl.c:1289 +#: src/main/print-raw.c:81 msgid "Type of ink in the printer" msgstr "Blæktype i printeren" #: src/main/print-canon.c:260 src/main/print-canon.c:261 -#: src/main/print-escp2.c:329 src/main/print-escp2.c:330 +#: src/main/print-escp2.c:331 src/main/print-escp2.c:332 #: src/main/print-lexmark.c:296 src/main/print-lexmark.c:297 -#: src/main/print-pcl.c:1226 src/main/print-pcl.c:1227 +#: src/main/print-pcl.c:1294 src/main/print-pcl.c:1295 msgid "Ink Channels" msgstr "Blækkanaler" -#: src/main/print-canon.c:260 src/main/print-escp2.c:130 -#: src/main/print-escp2.c:137 src/main/print-escp2.c:144 -#: src/main/print-escp2.c:287 src/main/print-escp2.c:293 -#: src/main/print-escp2.c:299 src/main/print-escp2.c:305 -#: src/main/print-escp2.c:311 src/main/print-escp2.c:317 -#: src/main/print-escp2.c:323 src/main/print-escp2.c:329 -#: src/main/print-escp2.c:335 src/main/print-lexmark.c:296 -#: src/main/print-pcl.c:1226 +#: src/main/print-canon.c:260 src/main/print-escp2.c:132 +#: src/main/print-escp2.c:139 src/main/print-escp2.c:146 +#: src/main/print-escp2.c:289 src/main/print-escp2.c:295 +#: src/main/print-escp2.c:301 src/main/print-escp2.c:307 +#: src/main/print-escp2.c:313 src/main/print-escp2.c:319 +#: src/main/print-escp2.c:325 src/main/print-escp2.c:331 +#: src/main/print-escp2.c:337 src/main/print-lexmark.c:296 +#: src/main/print-pcl.c:1294 msgid "Advanced Printer Functionality" msgstr "Avanceret printerfunktionalitet" -#: src/main/print-canon.c:266 src/main/print-escp2.c:341 -#: src/main/print-lexmark.c:302 src/main/print-olympus.c:1741 -#: src/main/print-pcl.c:1232 src/main/print-ps.c:103 src/main/print-raw.c:86 +#: src/main/print-canon.c:266 src/main/print-escp2.c:343 +#: src/main/print-lexmark.c:302 src/main/print-olympus.c:1739 +#: src/main/print-pcl.c:1300 src/main/print-ps.c:80 src/main/print-raw.c:86 msgid "Printing Mode" msgstr "Printningstilstand" #: src/main/print-canon.c:266 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:341 -#: src/main/print-escp2.c:347 src/main/print-lexmark.c:302 -#: src/main/print-olympus.c:1741 src/main/print-pcl.c:1232 -#: src/main/print-ps.c:103 src/main/print-raw.c:86 +#: src/main/print-color.c:208 src/main/print-escp2.c:343 +#: src/main/print-escp2.c:349 src/main/print-lexmark.c:302 +#: src/main/print-olympus.c:1739 src/main/print-pcl.c:1300 +#: src/main/print-ps.c:80 src/main/print-raw.c:86 msgid "Core Parameter" msgstr "Kerneparameter" -#: src/main/print-canon.c:267 src/main/print-escp2.c:342 -#: src/main/print-lexmark.c:303 src/main/print-olympus.c:1742 -#: src/main/print-pcl.c:1233 src/main/print-ps.c:104 src/main/print-raw.c:87 +#: src/main/print-canon.c:267 src/main/print-escp2.c:344 +#: src/main/print-lexmark.c:303 src/main/print-olympus.c:1740 +#: src/main/print-pcl.c:1301 src/main/print-ps.c:81 src/main/print-raw.c:87 msgid "Printing Output Mode" msgstr "Printnings udskriftstilstand" -#: src/main/print-canon.c:272 src/main/print-pcl.c:1238 +#: src/main/print-canon.c:272 src/main/print-pcl.c:1306 msgid "Double-Sided Printing" msgstr "Tosidet printning" -#: src/main/print-canon.c:273 src/main/print-pcl.c:1239 +#: src/main/print-canon.c:273 src/main/print-pcl.c:1307 msgid "Duplex/Tumble Setting" msgstr "Duplex/Tumble indstilling" -#: src/main/print-canon.c:295 src/main/print-escp2.c:439 -#: src/main/print-lexmark.c:325 src/main/print-pcl.c:1261 +#: src/main/print-canon.c:295 src/main/print-escp2.c:446 +#: src/main/print-lexmark.c:325 src/main/print-pcl.c:1329 msgid "Cyan Density" msgstr "Tæthed for cyan" -#: src/main/print-canon.c:296 src/main/print-escp2.c:440 -#: src/main/print-lexmark.c:326 src/main/print-pcl.c:1262 +#: src/main/print-canon.c:296 src/main/print-escp2.c:447 +#: src/main/print-lexmark.c:326 src/main/print-pcl.c:1330 msgid "Adjust the cyan density" msgstr "Justér tæthed for cyan" -#: src/main/print-canon.c:303 src/main/print-escp2.c:447 -#: src/main/print-lexmark.c:333 src/main/print-pcl.c:1269 +#: src/main/print-canon.c:303 src/main/print-escp2.c:454 +#: src/main/print-lexmark.c:333 src/main/print-pcl.c:1337 msgid "Magenta Density" msgstr "Tæthed for magenta" -#: src/main/print-canon.c:304 src/main/print-escp2.c:448 -#: src/main/print-lexmark.c:334 src/main/print-pcl.c:1270 +#: src/main/print-canon.c:304 src/main/print-escp2.c:455 +#: src/main/print-lexmark.c:334 src/main/print-pcl.c:1338 msgid "Adjust the magenta density" msgstr "Justér tæthed for magenta" -#: src/main/print-canon.c:311 src/main/print-escp2.c:455 -#: src/main/print-lexmark.c:341 src/main/print-pcl.c:1277 +#: src/main/print-canon.c:311 src/main/print-escp2.c:462 +#: src/main/print-lexmark.c:341 src/main/print-pcl.c:1345 msgid "Yellow Density" msgstr "Tæthed for gul" -#: src/main/print-canon.c:312 src/main/print-escp2.c:456 -#: src/main/print-lexmark.c:342 src/main/print-pcl.c:1278 +#: src/main/print-canon.c:312 src/main/print-escp2.c:463 +#: src/main/print-lexmark.c:342 src/main/print-pcl.c:1346 msgid "Adjust the yellow density" msgstr "Justér tæthed for gul" -#: src/main/print-canon.c:319 src/main/print-escp2.c:463 -#: src/main/print-lexmark.c:349 src/main/print-pcl.c:1285 +#: src/main/print-canon.c:319 src/main/print-escp2.c:470 +#: src/main/print-lexmark.c:349 src/main/print-pcl.c:1353 msgid "Black Density" msgstr "Tæthed for sort" -#: src/main/print-canon.c:320 src/main/print-escp2.c:464 -#: src/main/print-lexmark.c:350 src/main/print-pcl.c:1286 +#: src/main/print-canon.c:320 src/main/print-escp2.c:471 +#: src/main/print-lexmark.c:350 src/main/print-pcl.c:1354 msgid "Adjust the black density" msgstr "Justér tæthed for sort" #: src/main/print-canon.c:327 src/main/print-canon.c:328 -#: src/main/print-escp2.c:495 src/main/print-escp2.c:496 +#: src/main/print-escp2.c:534 src/main/print-escp2.c:535 #: src/main/print-lexmark.c:357 src/main/print-lexmark.c:358 -#: src/main/print-pcl.c:1293 src/main/print-pcl.c:1294 +#: src/main/print-pcl.c:1361 src/main/print-pcl.c:1362 msgid "Light Cyan Transition" msgstr "Lys cyan overgang" #: src/main/print-canon.c:327 src/main/print-canon.c:335 -#: src/main/print-canon.c:343 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-escp2.c:543 -#: src/main/print-escp2.c:551 src/main/print-escp2.c:559 -#: src/main/print-lexmark.c:357 src/main/print-lexmark.c:365 -#: src/main/print-pcl.c:1293 src/main/print-pcl.c:1301 +#: src/main/print-canon.c:343 src/main/print-escp2.c:502 +#: src/main/print-escp2.c:510 src/main/print-escp2.c:518 +#: src/main/print-escp2.c:526 src/main/print-escp2.c:534 +#: src/main/print-escp2.c:542 src/main/print-escp2.c:550 +#: src/main/print-escp2.c:558 src/main/print-escp2.c:566 +#: src/main/print-escp2.c:574 src/main/print-escp2.c:582 +#: src/main/print-escp2.c:590 src/main/print-escp2.c:598 +#: src/main/print-escp2.c:606 src/main/print-escp2.c:614 +#: src/main/print-escp2.c:622 src/main/print-escp2.c:630 +#: src/main/print-escp2.c:638 src/main/print-escp2.c:646 +#: src/main/print-escp2.c:654 src/main/print-escp2.c:662 +#: src/main/print-escp2.c:670 src/main/print-escp2.c:678 +#: src/main/print-escp2.c:686 src/main/print-escp2.c:694 +#: src/main/print-escp2.c:702 src/main/print-escp2.c:710 +#: src/main/print-escp2.c:718 src/main/print-escp2.c:726 +#: src/main/print-escp2.c:734 src/main/print-lexmark.c:357 +#: src/main/print-lexmark.c:365 src/main/print-pcl.c:1361 +#: src/main/print-pcl.c:1369 msgid "Advanced Ink Adjustment" msgstr "Avanceret blækjustering" #: src/main/print-canon.c:335 src/main/print-canon.c:336 -#: src/main/print-escp2.c:503 src/main/print-escp2.c:504 +#: src/main/print-escp2.c:566 src/main/print-escp2.c:567 #: src/main/print-lexmark.c:365 src/main/print-lexmark.c:366 -#: src/main/print-pcl.c:1301 src/main/print-pcl.c:1302 +#: src/main/print-pcl.c:1369 src/main/print-pcl.c:1370 msgid "Light Magenta Transition" msgstr "Lys cyan overgang" @@ -397,54 +417,53 @@ msgstr "Lys cyan overgang" msgid "Light Yellow Transition" msgstr "Lys gul overgang" -#: src/main/print-canon.c:363 src/main/print-pcl.c:1482 +#: src/main/print-canon.c:363 src/main/print-pcl.c:1550 #: src/main/escp2-resolutions.c:557 src/main/escp2-resolutions.c:565 #: src/main/escp2-resolutions.c:576 src/main/escp2-resolutions.c:588 msgid "Off" msgstr "Afbrudt" -#: src/main/print-canon.c:364 src/main/print-pcl.c:1483 +#: src/main/print-canon.c:364 src/main/print-pcl.c:1551 msgid "Long Edge (Standard)" msgstr "Lang kant (standard)" -#: src/main/print-canon.c:365 src/main/print-pcl.c:1484 +#: src/main/print-canon.c:365 src/main/print-pcl.c:1552 msgid "Short Edge (Flip)" msgstr "Kort kant (vend)" -#: src/main/print-canon.c:629 src/main/print-escp2.c:1648 +#: src/main/print-canon.c:629 src/main/print-escp2.c:2012 #: src/main/xmli18n-tmp.h:6 msgid "CD - 5 inch" msgstr "Cd - 12 cm" -#: src/main/print-canon.c:631 src/main/print-escp2.c:1650 +#: src/main/print-canon.c:631 src/main/print-escp2.c:2014 #: src/main/xmli18n-tmp.h:7 msgid "CD - 3 inch" msgstr "Cd - 8 cm" -#: src/main/print-canon.c:633 src/main/print-escp2.c:1652 +#: src/main/print-canon.c:633 src/main/print-escp2.c:2016 #: src/main/xmli18n-tmp.h:8 -#, fuzzy msgid "CD - Custom" -msgstr "Egendefineret" +msgstr "Cd - egendefineret" -#: src/main/print-canon.c:656 src/main/print-escp2.c:1677 +#: src/main/print-canon.c:656 src/main/print-escp2.c:2041 msgid "Normal" msgstr "Normal" -#: src/main/print-canon.c:658 src/main/print-escp2.c:1679 +#: src/main/print-canon.c:658 src/main/print-escp2.c:2043 msgid "Print To Hub" msgstr "Print til center" -#: src/main/print-canon.c:773 src/main/print-escp2.c:2011 -#: src/main/print-lexmark.c:1279 src/main/print-olympus.c:1996 -#: src/main/print-pcl.c:1776 src/main/print-ps.c:170 src/main/print-raw.c:135 -#: src/gutenprintui/panel.c:289 src/gutenprintui2/panel.c:289 +#: src/main/print-canon.c:773 src/main/print-escp2.c:2450 +#: src/main/print-lexmark.c:1279 src/main/print-olympus.c:1994 +#: src/main/print-pcl.c:1844 src/main/print-ps.c:310 src/main/print-raw.c:135 +#: src/gutenprintui2/panel.c:290 msgid "Color" msgstr "Farver" -#: src/main/print-canon.c:775 src/main/print-escp2.c:2013 -#: src/main/print-lexmark.c:1281 src/main/print-pcl.c:1778 -#: src/main/print-ps.c:172 src/main/print-raw.c:137 +#: src/main/print-canon.c:775 src/main/print-escp2.c:2452 +#: src/main/print-lexmark.c:1281 src/main/print-pcl.c:1846 +#: src/main/print-ps.c:312 src/main/print-raw.c:137 msgid "Black and White" msgstr "Sort og hvid" @@ -482,7 +501,7 @@ msgstr "Forud dithered" #: src/main/print-color.c:121 src/main/escp2-channels.c:916 #: src/main/escp2-channels.c:929 src/main/escp2-channels.c:943 -#: src/gutenprintui/panel.c:290 src/gutenprintui2/panel.c:290 +#: src/gutenprintui2/panel.c:291 msgid "Grayscale" msgstr "GrÃ¥tone" @@ -506,7 +525,7 @@ msgstr "CMYK" msgid "KCMY" msgstr "KCMY" -#: src/main/print-color.c:165 src/main/print-color.c:446 +#: src/main/print-color.c:165 src/main/print-color.c:454 msgid "Channel " msgstr "Kanal " @@ -562,7 +581,7 @@ msgid "Output image type" msgstr "Udskrifts billedtype" #: src/main/print-color.c:208 src/main/print-color.c:209 -#: src/main/print-escp2.c:347 +#: src/main/print-escp2.c:349 msgid "Raw Channels" msgstr "Ufiltrerede kanaler" @@ -622,14 +641,14 @@ msgstr "Program gamma" msgid "Gamma value assumed by application" msgstr "Gammaværdi som formodet af program" -#: src/main/print-color.c:266 src/main/escp2-channels.c:3048 -#: src/main/escp2-channels.c:3060 src/main/escp2-channels.c:3068 -#: src/main/escp2-channels.c:3078 src/main/escp2-channels.c:3089 -#: src/main/escp2-channels.c:3101 src/main/escp2-channels.c:3117 -#: src/main/escp2-channels.c:3125 src/main/escp2-channels.c:3138 -#: src/main/escp2-channels.c:3151 src/main/escp2-channels.c:3165 -#: src/main/escp2-channels.c:3179 src/main/escp2-channels.c:3194 -#: src/gutenprintui/panel.c:2152 src/gutenprintui2/panel.c:2153 +#: src/main/print-color.c:266 src/main/escp2-channels.c:3087 +#: src/main/escp2-channels.c:3099 src/main/escp2-channels.c:3107 +#: src/main/escp2-channels.c:3117 src/main/escp2-channels.c:3128 +#: src/main/escp2-channels.c:3140 src/main/escp2-channels.c:3156 +#: src/main/escp2-channels.c:3164 src/main/escp2-channels.c:3177 +#: src/main/escp2-channels.c:3190 src/main/escp2-channels.c:3204 +#: src/main/escp2-channels.c:3218 src/main/escp2-channels.c:3230 +#: src/main/escp2-channels.c:3243 src/gutenprintui2/panel.c:2328 #: src/escputil/escputil.c:978 src/escputil/escputil.c:997 #: src/escputil/escputil.c:1201 msgid "Cyan" @@ -639,14 +658,14 @@ msgstr "Cyan" msgid "Adjust the cyan gamma" msgstr "Justér gamma for cyan" -#: src/main/print-color.c:274 src/main/escp2-channels.c:3049 -#: src/main/escp2-channels.c:3059 src/main/escp2-channels.c:3070 -#: src/main/escp2-channels.c:3079 src/main/escp2-channels.c:3090 -#: src/main/escp2-channels.c:3103 src/main/escp2-channels.c:3116 -#: src/main/escp2-channels.c:3126 src/main/escp2-channels.c:3139 -#: src/main/escp2-channels.c:3152 src/main/escp2-channels.c:3164 -#: src/main/escp2-channels.c:3178 src/main/escp2-channels.c:3195 -#: src/gutenprintui/panel.c:2159 src/gutenprintui2/panel.c:2160 +#: src/main/print-color.c:274 src/main/escp2-channels.c:3088 +#: src/main/escp2-channels.c:3098 src/main/escp2-channels.c:3109 +#: src/main/escp2-channels.c:3118 src/main/escp2-channels.c:3129 +#: src/main/escp2-channels.c:3142 src/main/escp2-channels.c:3155 +#: src/main/escp2-channels.c:3165 src/main/escp2-channels.c:3178 +#: src/main/escp2-channels.c:3191 src/main/escp2-channels.c:3203 +#: src/main/escp2-channels.c:3217 src/main/escp2-channels.c:3229 +#: src/main/escp2-channels.c:3244 src/gutenprintui2/panel.c:2335 #: src/escputil/escputil.c:979 src/escputil/escputil.c:998 #: src/escputil/escputil.c:1202 msgid "Magenta" @@ -656,14 +675,14 @@ msgstr "Magenta" msgid "Adjust the magenta gamma" msgstr "Justér gamma for magenta" -#: src/main/print-color.c:282 src/main/escp2-channels.c:3050 -#: src/main/escp2-channels.c:3061 src/main/escp2-channels.c:3069 -#: src/main/escp2-channels.c:3080 src/main/escp2-channels.c:3091 -#: src/main/escp2-channels.c:3105 src/main/escp2-channels.c:3112 -#: src/main/escp2-channels.c:3127 src/main/escp2-channels.c:3140 -#: src/main/escp2-channels.c:3153 src/main/escp2-channels.c:3163 -#: src/main/escp2-channels.c:3177 src/main/escp2-channels.c:3196 -#: src/gutenprintui/panel.c:2166 src/gutenprintui2/panel.c:2167 +#: src/main/print-color.c:282 src/main/escp2-channels.c:3089 +#: src/main/escp2-channels.c:3100 src/main/escp2-channels.c:3108 +#: src/main/escp2-channels.c:3119 src/main/escp2-channels.c:3130 +#: src/main/escp2-channels.c:3144 src/main/escp2-channels.c:3151 +#: src/main/escp2-channels.c:3166 src/main/escp2-channels.c:3179 +#: src/main/escp2-channels.c:3192 src/main/escp2-channels.c:3202 +#: src/main/escp2-channels.c:3216 src/main/escp2-channels.c:3228 +#: src/main/escp2-channels.c:3245 src/gutenprintui2/panel.c:2342 #: src/escputil/escputil.c:980 src/escputil/escputil.c:999 #: src/escputil/escputil.c:1203 msgid "Yellow" @@ -673,10 +692,9 @@ msgstr "Gul" msgid "Adjust the yellow gamma" msgstr "Justér gamma for gul" -#: src/main/print-color.c:290 src/main/escp2-channels.c:3168 -#: src/main/escp2-channels.c:3181 src/gutenprintui/panel.c:2180 -#: src/gutenprintui2/panel.c:2181 src/escputil/escputil.c:987 -#: src/escputil/escputil.c:1005 +#: src/main/print-color.c:290 src/main/escp2-channels.c:3207 +#: src/main/escp2-channels.c:3220 src/gutenprintui2/panel.c:2356 +#: src/escputil/escputil.c:987 src/escputil/escputil.c:1005 msgid "Red" msgstr "Rød" @@ -684,8 +702,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:2187 -#: src/gutenprintui2/panel.c:2188 +#: src/main/print-color.c:298 src/gutenprintui2/panel.c:2363 msgid "Green" msgstr "Grøn" @@ -693,10 +710,9 @@ msgstr "Grøn" msgid "Adjust the green gamma" msgstr "Justér gamma for grøn" -#: src/main/print-color.c:306 src/main/escp2-channels.c:3169 -#: src/main/escp2-channels.c:3182 src/gutenprintui/panel.c:2194 -#: src/gutenprintui2/panel.c:2195 src/escputil/escputil.c:988 -#: src/escputil/escputil.c:1006 +#: src/main/print-color.c:306 src/main/escp2-channels.c:3208 +#: src/main/escp2-channels.c:3221 src/gutenprintui2/panel.c:2370 +#: src/escputil/escputil.c:988 src/escputil/escputil.c:1006 msgid "Blue" msgstr "BlÃ¥" @@ -705,14 +721,14 @@ msgid "Adjust the blue gamma" msgstr "Justér gamma for blÃ¥" #: src/main/print-color.c:314 src/main/print-lexmark.c:613 -#: src/main/escp2-channels.c:3047 src/main/escp2-channels.c:3057 -#: src/main/escp2-channels.c:3058 src/main/escp2-channels.c:3071 -#: src/main/escp2-channels.c:3081 src/main/escp2-channels.c:3088 -#: src/main/escp2-channels.c:3100 src/main/escp2-channels.c:3113 -#: src/main/escp2-channels.c:3124 src/main/escp2-channels.c:3137 -#: src/main/escp2-channels.c:3150 src/main/escp2-channels.c:3156 -#: src/main/escp2-channels.c:3180 src/main/escp2-channels.c:3193 -#: src/gutenprintui/panel.c:2173 src/gutenprintui2/panel.c:2174 +#: src/main/escp2-channels.c:3086 src/main/escp2-channels.c:3096 +#: src/main/escp2-channels.c:3097 src/main/escp2-channels.c:3110 +#: src/main/escp2-channels.c:3120 src/main/escp2-channels.c:3127 +#: src/main/escp2-channels.c:3139 src/main/escp2-channels.c:3152 +#: src/main/escp2-channels.c:3163 src/main/escp2-channels.c:3176 +#: src/main/escp2-channels.c:3189 src/main/escp2-channels.c:3195 +#: src/main/escp2-channels.c:3219 src/main/escp2-channels.c:3231 +#: src/main/escp2-channels.c:3242 src/gutenprintui2/panel.c:2349 #: src/escputil/escputil.c:975 src/escputil/escputil.c:996 #: src/escputil/escputil.c:1200 msgid "Black" @@ -722,7 +738,7 @@ msgstr "Sort" msgid "Adjust the black gamma" msgstr "Justér sort gamma" -#: src/main/print-color.c:322 src/main/print-olympus.c:1764 +#: src/main/print-color.c:322 src/main/print-olympus.c:1762 msgid "Cyan Balance" msgstr "Cyan balance" @@ -735,7 +751,7 @@ msgstr "GrÃ¥ balance" msgid "Adjust the cyan gray balance" msgstr "Justér cyans grÃ¥balance" -#: src/main/print-color.c:330 src/main/print-olympus.c:1772 +#: src/main/print-color.c:330 src/main/print-olympus.c:1770 msgid "Magenta Balance" msgstr "Magenta balance" @@ -743,7 +759,7 @@ msgstr "Magenta balance" msgid "Adjust the magenta gray balance" msgstr "Justér magentas grÃ¥balance" -#: src/main/print-color.c:338 src/main/print-olympus.c:1780 +#: src/main/print-color.c:338 src/main/print-olympus.c:1778 msgid "Yellow Balance" msgstr "Gul balance" @@ -769,9 +785,11 @@ msgstr "Begræns blækmængde" #: 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:353 -#: src/main/print-escp2.c:359 src/main/print-escp2.c:365 -#: src/main/print-escp2.c:371 src/main/print-escp2.c:377 +#: src/main/print-color.c:421 src/main/print-color.c:553 +#: src/main/print-escp2.c:355 src/main/print-escp2.c:361 +#: src/main/print-escp2.c:367 src/main/print-escp2.c:373 +#: src/main/print-escp2.c:379 src/main/print-escp2.c:742 +#: src/main/print-escp2.c:750 src/main/print-escp2.c:758 msgid "Advanced Output Control" msgstr "Avanceret udskriftskontrol" @@ -779,218 +797,226 @@ msgstr "Avanceret udskriftskontrol" msgid "Limit the total ink printed to the page" msgstr "Begræns den samlede mængde blæk der printes pÃ¥ siden" -#: src/main/print-color.c:365 +#: src/main/print-color.c:365 src/main/print-escp2.c:742 msgid "GCR Transition" msgstr "GCR overgang" -#: src/main/print-color.c:366 +#: src/main/print-color.c:366 src/main/print-escp2.c:743 msgid "Adjust the gray component transition rate" msgstr "Justér den grÃ¥ bestanddels overgangsniveau" -#: src/main/print-color.c:373 +#: src/main/print-color.c:373 src/main/print-escp2.c:750 msgid "GCR Lower Bound" msgstr "GCR nedre grænse" -#: src/main/print-color.c:374 +#: src/main/print-color.c:374 src/main/print-escp2.c:751 msgid "Lower bound of gray component reduction" msgstr "Nedre grænse for reduktion af grÃ¥ bestanddel" -#: src/main/print-color.c:381 +#: src/main/print-color.c:381 src/main/print-escp2.c:758 msgid "GCR Upper Bound" msgstr "GCR overgrænse" -#: src/main/print-color.c:382 +#: src/main/print-color.c:382 src/main/print-escp2.c:759 msgid "Upper bound of gray component reduction" msgstr "Overgrænse for reduktion af grÃ¥ bestanddel" -#: src/main/print-color.c:447 src/main/print-color.c:457 -#: src/main/print-color.c:465 src/main/print-color.c:473 -#: src/main/print-color.c:481 src/main/print-color.c:489 -#: src/main/print-color.c:497 src/main/print-color.c:505 -#: src/main/print-color.c:513 +#: src/main/print-color.c:421 +msgid "LUT dump file" +msgstr "LookUp Table overførselsfil" + +#: src/main/print-color.c:422 +msgid "Dump file for LUT for external color adjustment" +msgstr "Overførselsfil for LookUp Table til ekstern farvejustering" + +#: src/main/print-color.c:455 src/main/print-color.c:465 +#: src/main/print-color.c:473 src/main/print-color.c:481 +#: src/main/print-color.c:489 src/main/print-color.c:497 +#: src/main/print-color.c:505 src/main/print-color.c:513 +#: src/main/print-color.c:521 msgid "Output Curves" msgstr "Uddata kurver" -#: src/main/print-color.c:447 +#: src/main/print-color.c:455 msgid "Curve for raw channel " msgstr "Kurve for ufiltreret kanal " -#: src/main/print-color.c:457 +#: src/main/print-color.c:465 msgid "Cyan Curve" msgstr "Cyan kurve" -#: src/main/print-color.c:458 +#: src/main/print-color.c:466 msgid "Cyan curve" msgstr "Cyan kurve" -#: src/main/print-color.c:465 +#: src/main/print-color.c:473 msgid "Magenta Curve" msgstr "Magenta kurve" -#: src/main/print-color.c:466 +#: src/main/print-color.c:474 msgid "Magenta curve" msgstr "Magenta kurve" -#: src/main/print-color.c:473 +#: src/main/print-color.c:481 msgid "Yellow Curve" msgstr "Gul kurve" -#: src/main/print-color.c:474 +#: src/main/print-color.c:482 msgid "Yellow curve" msgstr "Gul kurve" -#: src/main/print-color.c:481 +#: src/main/print-color.c:489 msgid "Black Curve" msgstr "Sort kurve" -#: src/main/print-color.c:482 +#: src/main/print-color.c:490 msgid "Black curve" msgstr "Sort kurve" -#: src/main/print-color.c:489 +#: src/main/print-color.c:497 msgid "Red Curve" msgstr "Rød kurve" -#: src/main/print-color.c:490 +#: src/main/print-color.c:498 msgid "Red curve" msgstr "Rød kurve" -#: src/main/print-color.c:497 +#: src/main/print-color.c:505 msgid "Green Curve" msgstr "Grøn kurve" -#: src/main/print-color.c:498 +#: src/main/print-color.c:506 msgid "Green curve" msgstr "Grøn kurve" -#: src/main/print-color.c:505 +#: src/main/print-color.c:513 msgid "Blue Curve" msgstr "BlÃ¥ kurve" -#: src/main/print-color.c:506 +#: src/main/print-color.c:514 msgid "Blue curve" msgstr "BlÃ¥ kurve" -#: src/main/print-color.c:513 +#: src/main/print-color.c:521 msgid "White Curve" msgstr "Gul kurve" -#: src/main/print-color.c:514 +#: src/main/print-color.c:522 msgid "White curve" msgstr "Hvid kurve" -#: src/main/print-color.c:521 +#: src/main/print-color.c:529 msgid "Hue Map" msgstr "Farvetonediagram" -#: src/main/print-color.c:521 src/main/print-color.c:529 -#: src/main/print-color.c:537 +#: src/main/print-color.c:529 src/main/print-color.c:537 +#: src/main/print-color.c:545 msgid "Advanced HSL Curves" msgstr "Avancerede HSL kurver" -#: src/main/print-color.c:522 +#: src/main/print-color.c:530 msgid "Hue adjustment curve" msgstr "Farvetone justeringskurve" -#: src/main/print-color.c:529 +#: src/main/print-color.c:537 msgid "Saturation Map" msgstr "Mætningsdiagram" -#: src/main/print-color.c:530 +#: src/main/print-color.c:538 msgid "Saturation adjustment curve" msgstr "Mætnings justeringskurve" -#: src/main/print-color.c:537 +#: src/main/print-color.c:545 msgid "Luminosity Map" msgstr "Lysintensitetsdiagram" -#: src/main/print-color.c:538 +#: src/main/print-color.c:546 msgid "Luminosity adjustment curve" msgstr "Lysintensitets justeringskurve" -#: src/main/print-color.c:545 +#: src/main/print-color.c:553 msgid "Gray Component Reduction" msgstr "GrÃ¥ bestanddels reduktion" -#: src/main/print-color.c:546 +#: src/main/print-color.c:554 msgid "Gray component reduction curve" msgstr "GrÃ¥ bestanddels reduktionskurve" -#: src/main/print-color.c:1670 +#: src/main/print-color.c:1743 msgid "Traditional Gutenprint color conversion" msgstr "Traditionel Gutenprint farveomsætning" -#: src/main/printers.c:517 +#: src/main/printers.c:514 #, c-format msgid "Value must be set for %s\n" msgstr "Værdi skal angives for %s\n" -#: src/main/printers.c:530 src/main/printers.c:535 +#: src/main/printers.c:527 src/main/printers.c:532 #, c-format msgid "`%s' is not a valid %s\n" msgstr "`%s' er ikke en gyldig %s\n" -#: src/main/printers.c:554 +#: src/main/printers.c:551 #, c-format msgid "%s must be between %f and %f (is %f)\n" msgstr "%s skal være mellem %f og %f (er %f)\n" -#: src/main/printers.c:576 src/main/printers.c:600 +#: src/main/printers.c:573 src/main/printers.c:597 #, c-format msgid "%s must be between %d and %d (is %d)\n" msgstr "%s skal være mellem %d og %d (er %d)\n" -#: src/main/printers.c:631 +#: src/main/printers.c:628 #, c-format msgid "%s bounds must be between %f and %f\n" msgstr "%s grænser skal være mellem %f og %f\n" -#: src/main/printers.c:639 +#: src/main/printers.c:636 #, c-format msgid "%s wrap mode must be %s\n" msgstr "%s nulstilling tilstand skal være %s\n" -#: src/main/printers.c:643 +#: src/main/printers.c:640 msgid "no wrap" msgstr "ingen nulstilling af tæller" -#: src/main/printers.c:643 +#: src/main/printers.c:640 msgid "wrap around" msgstr "nulstil tæller" -#: src/main/printers.c:687 +#: src/main/printers.c:684 #, c-format msgid "Unknown type parameter %s (%d)\n" msgstr "Ukendt parametertype %s (%d)\n" -#: src/main/printers.c:700 src/main/printers.c:711 +#: src/main/printers.c:697 src/main/printers.c:708 #, c-format msgid "%s out of range (value %d, min %d, max %d)\n" msgstr "%s uden for omrÃ¥de (værdi %d, min %d, max %d)\n" -#: src/main/printers.c:772 +#: src/main/printers.c:768 msgid "Page size is not valid\n" msgstr "Arkstørrelse er ikke gyldig\n" -#: src/main/printers.c:793 +#: src/main/printers.c:789 #, c-format msgid "Top margin must not be less than %d\n" msgstr "Top margin mÃ¥ ikke være mindre end %d\n" -#: src/main/printers.c:799 +#: src/main/printers.c:795 #, c-format msgid "Left margin must not be less than %d\n" msgstr "Venstre margin mÃ¥ ikke være mindre end %d\n" -#: src/main/printers.c:805 +#: src/main/printers.c:801 msgid "Height must be greater than zero\n" msgstr "Højde skal være større end nul\n" -#: src/main/printers.c:811 +#: src/main/printers.c:807 msgid "Width must be greater than zero\n" msgstr "Bredde skal være større end nul\n" -#: src/main/printers.c:817 +#: src/main/printers.c:813 #, c-format msgid "" "Image is too wide for the page: left margin is %d, width %d, right edge is %" @@ -999,7 +1025,7 @@ msgstr "" "Billedet er for bredt til siden: venstre margin er %d, bredde %d, højre kant " "er %d\n" -#: src/main/printers.c:824 +#: src/main/printers.c:820 #, c-format msgid "" "Image is too long for the page: top margin is %d, height %d, bottom edge is %" @@ -1008,278 +1034,370 @@ msgstr "" "Billedet er for langt til siden: top margin er %d, højde %d, bund kant er %" "d\n" -#: src/main/print-escp2.c:162 +#: src/main/print-escp2.c:164 msgid "Automatic Printing Mode" msgstr "Automatisk printningstilstand" -#: src/main/print-escp2.c:162 src/main/print-escp2.c:174 +#: src/main/print-escp2.c:164 src/main/print-escp2.c:176 #: src/main/generic-options.c:62 msgid "Basic Output Adjustment" msgstr "Basis udskriftsjustering" -#: src/main/print-escp2.c:163 +#: src/main/print-escp2.c:165 msgid "Automatic printing mode" msgstr "Automatisk printningstilstand" -#: src/main/print-escp2.c:174 src/main/print-escp2.c:175 +#: src/main/print-escp2.c:176 src/main/print-escp2.c:177 #: src/main/generic-options.c:62 src/main/generic-options.c:63 msgid "Print Quality" msgstr "Udskriftskvalitet" -#: src/main/print-escp2.c:229 +#: src/main/print-escp2.c:231 msgid "Resolution of the print" msgstr "Udskriftens opløsning" -#: src/main/print-escp2.c:245 +#: src/main/print-escp2.c:247 msgid "Enhanced Gloss" msgstr "Forbedret glans" -#: src/main/print-escp2.c:246 +#: src/main/print-escp2.c:248 msgid "Add gloss enhancement" msgstr "Tilføj glansforbedring" -#: src/main/print-escp2.c:251 +#: src/main/print-escp2.c:253 msgid "Ink Set" msgstr "Blæk sæt" -#: src/main/print-escp2.c:257 +#: src/main/print-escp2.c:259 msgid "Printing Direction" msgstr "Printretning" -#: src/main/print-escp2.c:257 src/main/print-escp2.c:269 +#: src/main/print-escp2.c:259 src/main/print-escp2.c:271 msgid "Advanced Output Adjustment" msgstr "Avanceret udskriftsjustering" -#: src/main/print-escp2.c:258 +#: src/main/print-escp2.c:260 msgid "Printing direction (unidirectional is higher quality, but slower)" msgstr "Printretning (envejs giver højere kvalitet, men er langsommere)" -#: src/main/print-escp2.c:263 src/main/print-olympus.c:1735 +#: src/main/print-escp2.c:265 src/main/print-olympus.c:1733 msgid "Borderless" msgstr "Med/uden margin" -#: src/main/print-escp2.c:264 src/main/print-olympus.c:1736 +#: src/main/print-escp2.c:266 src/main/print-olympus.c:1734 msgid "Print without borders" msgstr "Print uden margin" -#: src/main/print-escp2.c:269 +#: src/main/print-escp2.c:271 msgid "Interleave Method" msgstr "Udjævningsmetode" -#: src/main/print-escp2.c:270 +#: src/main/print-escp2.c:272 msgid "Interleave pattern to use" msgstr "Udjævningsmønster der skal bruges" -#: src/main/print-escp2.c:275 +#: src/main/print-escp2.c:277 msgid "Adjust dot size as necessary" msgstr "Justér punktstørrelse som nødvendigt" -#: src/main/print-escp2.c:276 +#: src/main/print-escp2.c:278 msgid "Adjust dot size as necessary to achieve desired density" msgstr "Justér punktstørrelse som nødvendigt, for at opnÃ¥ ønsket tæthed" -#: src/main/print-escp2.c:281 src/main/print-escp2.c:282 +#: src/main/print-escp2.c:283 src/main/print-escp2.c:284 msgid "Output Order" msgstr "Udskriftsrækkefølge" -#: src/main/print-escp2.c:287 src/main/print-escp2.c:288 +#: src/main/print-escp2.c:289 src/main/print-escp2.c:290 msgid "Alignment Passes" msgstr "Retten-ind gennemløb" -#: src/main/print-escp2.c:293 src/main/print-escp2.c:294 +#: src/main/print-escp2.c:295 src/main/print-escp2.c:296 msgid "Alignment Choices" msgstr "Retten-ind valg" -#: src/main/print-escp2.c:299 src/main/print-escp2.c:300 +#: src/main/print-escp2.c:301 src/main/print-escp2.c:302 msgid "Ink change command" msgstr "Kommando til udskiftning af blækpatron" -#: src/main/print-escp2.c:305 src/main/print-escp2.c:306 +#: src/main/print-escp2.c:307 src/main/print-escp2.c:308 msgid "Alternate Alignment Passes" msgstr "Skiftende retten-ind gennemløb" -#: src/main/print-escp2.c:311 src/main/print-escp2.c:312 +#: src/main/print-escp2.c:313 src/main/print-escp2.c:314 msgid "Alternate Alignment Choices" msgstr "Skiftende retten-ind valg" -#: src/main/print-escp2.c:317 +#: src/main/print-escp2.c:319 msgid "Supports Packet Mode" msgstr "Understøtter netværkstilstand" -#: src/main/print-escp2.c:318 -#, fuzzy +#: src/main/print-escp2.c:320 msgid "Supports D4 Packet Mode" -msgstr "Understøtter netværkstilstand" +msgstr "Understøtter D4 netværkstilstand" -#: src/main/print-escp2.c:323 +#: src/main/print-escp2.c:325 msgid "Has Interchangeable Ink Cartridges" -msgstr "" +msgstr "Har udskiftelige blækpatroner" -#: src/main/print-escp2.c:324 +#: src/main/print-escp2.c:326 msgid "Has multiple choices of ink cartridges" -msgstr "" +msgstr "Har flere valgmuligheder af blækpatroner" -#: src/main/print-escp2.c:335 src/main/print-escp2.c:336 +#: src/main/print-escp2.c:337 src/main/print-escp2.c:338 msgid "Channel Names" msgstr "Kanalnavne" -#: src/main/print-escp2.c:348 +#: src/main/print-escp2.c:350 msgid "Raw Channel Count" msgstr "Ufiltreret kanal tælling" -#: src/main/print-escp2.c:353 +#: src/main/print-escp2.c:355 msgid "Cyan Map" msgstr "Diagram for cyan" -#: src/main/print-escp2.c:354 +#: src/main/print-escp2.c:356 msgid "Adjust the cyan map" msgstr "Justér diagram for cyan" -#: src/main/print-escp2.c:359 +#: src/main/print-escp2.c:361 msgid "Magenta Map" msgstr "Diagram for magenta" -#: src/main/print-escp2.c:360 +#: src/main/print-escp2.c:362 msgid "Adjust the magenta map" msgstr "Justér diagram for magenta" -#: src/main/print-escp2.c:365 +#: src/main/print-escp2.c:367 msgid "Yellow Map" msgstr "Diagram for gul" -#: src/main/print-escp2.c:366 +#: src/main/print-escp2.c:368 msgid "Adjust the yellow map" msgstr "Justér diagram for gul" -#: src/main/print-escp2.c:371 +#: src/main/print-escp2.c:373 msgid "Blue Map" msgstr "Diagram for blÃ¥" -#: src/main/print-escp2.c:372 +#: src/main/print-escp2.c:374 msgid "Adjust the blue map" msgstr "Justér diagram for blÃ¥" -#: src/main/print-escp2.c:377 +#: src/main/print-escp2.c:379 msgid "Red Map" msgstr "Diagram for rød" -#: src/main/print-escp2.c:378 +#: src/main/print-escp2.c:380 msgid "Adjust the red map" msgstr "Justér diagram for rød" -#: src/main/print-escp2.c:471 +#: src/main/print-escp2.c:478 msgid "Red Density" msgstr "Tæthed for rød" -#: src/main/print-escp2.c:472 +#: src/main/print-escp2.c:479 msgid "Adjust the red density" msgstr "Justér tæthed for rød" -#: src/main/print-escp2.c:479 +#: src/main/print-escp2.c:486 msgid "Blue Density" msgstr "Tæthed for blÃ¥" -#: src/main/print-escp2.c:480 +#: src/main/print-escp2.c:487 msgid "Adjust the blue density" msgstr "Justér tæthed for blÃ¥" -#: src/main/print-escp2.c:487 +#: src/main/print-escp2.c:494 msgid "Gloss Level" msgstr "Glansniveau" -#: src/main/print-escp2.c:488 +#: src/main/print-escp2.c:495 msgid "Adjust the gloss level" msgstr "Justér glansniveau" -#: src/main/print-escp2.c:511 src/main/print-escp2.c:512 +#: src/main/print-escp2.c:502 +msgid "Drop Size Small" +msgstr "Lille drÃ¥bestørrelse" + +#: src/main/print-escp2.c:503 +msgid "Drop Size 1 (small)" +msgstr "DrÃ¥bestørrelse 1 (lille)" + +#: src/main/print-escp2.c:510 +msgid "Drop Size Medium" +msgstr "Mellem drÃ¥bestørrelse" + +#: src/main/print-escp2.c:511 +msgid "Drop Size 2 (medium)" +msgstr "DrÃ¥bestørrelse 2 (mellem)" + +#: src/main/print-escp2.c:518 +msgid "Drop Size Large" +msgstr "Stor drÃ¥bestørrelse" + +#: src/main/print-escp2.c:519 +msgid "Drop Size 3 (large)" +msgstr "DrÃ¥bestørrelse 3 (stor)" + +#: src/main/print-escp2.c:526 src/main/print-escp2.c:527 +msgid "Light Cyan Value" +msgstr "Lys cyan værdi" + +#: src/main/print-escp2.c:542 src/main/print-escp2.c:543 +msgid "Light Cyan Density Scale" +msgstr "Tæthedsskala for lys cyan" + +#: src/main/print-escp2.c:550 src/main/print-escp2.c:551 +msgid "Light Magenta Value" +msgstr "Lys magenta værdi" + +#: src/main/print-escp2.c:558 src/main/print-escp2.c:559 +msgid "Light Magenta Density Scale" +msgstr "Tæthedsskala for lys magenta" + +#: src/main/print-escp2.c:574 src/main/print-escp2.c:575 +msgid "Dark Yellow Value" +msgstr "Mørkegul værdi" + +#: src/main/print-escp2.c:582 src/main/print-escp2.c:583 msgid "Dark Yellow Transition" msgstr "Mørkgul overgang" -#: src/main/print-escp2.c:519 src/main/print-escp2.c:520 -#: src/main/print-escp2.c:527 src/main/print-escp2.c:528 +#: src/main/print-escp2.c:590 src/main/print-escp2.c:591 +msgid "Dark Yellow Density Scale" +msgstr "Tæthedsskala for mørkegul" + +#: src/main/print-escp2.c:598 src/main/print-escp2.c:599 +#: src/main/print-escp2.c:622 src/main/print-escp2.c:623 +msgid "Gray Value" +msgstr "GrÃ¥tone værdi" + +#: src/main/print-escp2.c:606 src/main/print-escp2.c:607 +#: src/main/print-escp2.c:630 src/main/print-escp2.c:631 msgid "Gray Transition" msgstr "GrÃ¥ overgang" -#: src/main/print-escp2.c:535 src/main/print-escp2.c:536 -#: src/main/print-escp2.c:559 src/main/print-escp2.c:560 +#: src/main/print-escp2.c:614 src/main/print-escp2.c:615 +#: src/main/print-escp2.c:638 src/main/print-escp2.c:639 +msgid "Gray Density Scale" +msgstr "Tæthedsskala for grÃ¥tone" + +#: src/main/print-escp2.c:646 src/main/print-escp2.c:647 +#: src/main/print-escp2.c:718 src/main/print-escp2.c:719 +msgid "Light Gray Value" +msgstr "LysegrÃ¥ værdi" + +#: src/main/print-escp2.c:654 src/main/print-escp2.c:655 +#: src/main/print-escp2.c:726 src/main/print-escp2.c:727 msgid "Light Gray Transition" msgstr "LysgrÃ¥ overgang" -#: src/main/print-escp2.c:543 src/main/print-escp2.c:544 +#: src/main/print-escp2.c:662 src/main/print-escp2.c:663 +#: src/main/print-escp2.c:734 src/main/print-escp2.c:735 +msgid "Light Gray Density Scale" +msgstr "Tæthedsskala for lysegrÃ¥" + +#: src/main/print-escp2.c:670 src/main/print-escp2.c:671 +msgid "Dark Gray Value" +msgstr "MørkegrÃ¥ værdi" + +#: src/main/print-escp2.c:678 src/main/print-escp2.c:679 msgid "Dark Gray Transition" msgstr "MørkgrÃ¥ overgang" -#: src/main/print-escp2.c:551 +#: src/main/print-escp2.c:686 src/main/print-escp2.c:687 +msgid "Dark Gray Density Scale" +msgstr "Tæthedsskala for mørkegrÃ¥" + +#: src/main/print-escp2.c:694 +msgid "Mid Gray Value" +msgstr "MidtgrÃ¥ værdi" + +#: src/main/print-escp2.c:695 +msgid "Medium Gray Value" +msgstr "MellemgrÃ¥ værdi" + +#: src/main/print-escp2.c:702 msgid "Mid Gray Transition" msgstr "MellemgrÃ¥ overgang" -#: src/main/print-escp2.c:552 +#: src/main/print-escp2.c:703 msgid "Medium Gray Transition" msgstr "MiddelgrÃ¥ overgang" -#: src/main/print-escp2.c:1635 +#: src/main/print-escp2.c:710 +msgid "Mid Gray Density Scale" +msgstr "Tæthedsskala for midtgrÃ¥" + +#: src/main/print-escp2.c:711 +msgid "Medium Gray Density Scale" +msgstr "Tæthedsskala for mellemgrÃ¥" + +#: src/main/print-escp2.c:1999 msgid "Full Manual Control" msgstr "Fuld manuel kontrol" -#: src/main/print-escp2.c:1637 +#: src/main/print-escp2.c:2001 msgid "Automatic Setting Control" msgstr "Automatisk indstillingskontrol" -#: src/main/print-escp2.c:1732 src/main/generic-options.c:213 +#: src/main/print-escp2.c:2096 src/main/generic-options.c:213 #: src/main/generic-options.c:230 msgid "Manual Control" msgstr "Manuel kontrol" -#: src/main/print-escp2.c:1771 src/main/print-escp2.c:1863 -#: src/main/print-escp2.c:1875 src/main/print-pcl.c:230 -#: src/main/escp2-channels.c:2805 src/main/escp2-papers.c:1707 -#: src/main/escp2-papers.c:1731 src/main/escp2-papers.c:1764 -#: src/main/escp2-papers.c:1815 src/main/escp2-papers.c:1857 -#: src/main/escp2-papers.c:1899 src/main/escp2-papers.c:1992 -#: src/main/escp2-resolutions.c:640 src/main/escp2-resolutions.c:655 -#: src/main/escp2-resolutions.c:668 src/main/generic-options.c:36 -#: src/gutenprintui/panel.c:2613 src/gutenprintui2/panel.c:2639 +#: src/main/print-escp2.c:2139 src/main/print-escp2.c:2231 +#: src/main/print-escp2.c:2243 src/main/print-pcl.c:237 +#: src/main/escp2-channels.c:2827 src/main/escp2-channels.c:2836 +#: src/main/escp2-papers.c:1718 src/main/escp2-papers.c:1742 +#: src/main/escp2-papers.c:1775 src/main/escp2-papers.c:1826 +#: src/main/escp2-papers.c:1868 src/main/escp2-papers.c:1910 +#: src/main/escp2-papers.c:2003 src/main/escp2-resolutions.c:640 +#: src/main/escp2-resolutions.c:655 src/main/escp2-resolutions.c:670 +#: src/main/escp2-resolutions.c:683 src/main/generic-options.c:36 +#: src/gutenprintui2/panel.c:2814 msgid "Standard" msgstr "Standard" -#: src/main/print-escp2.c:1842 +#: src/main/print-escp2.c:2210 msgid "Automatic" msgstr "Automatisk" -#: src/main/print-escp2.c:1844 +#: src/main/print-escp2.c:2212 msgid "Bidirectional" msgstr "Tovejs" -#: src/main/print-escp2.c:1846 +#: src/main/print-escp2.c:2214 msgid "Unidirectional" msgstr "Envejs" -#: src/main/print-escp2.c:1877 +#: src/main/print-escp2.c:2245 msgid "Alternate Fill" msgstr "Alternativ udfyldning" -#: src/main/print-escp2.c:1879 +#: src/main/print-escp2.c:2247 msgid "Ascending Fill" msgstr "Stigende udfyldning" -#: src/main/print-escp2.c:1881 +#: src/main/print-escp2.c:2249 msgid "Descending Fill" msgstr "Aftagende udfyldning" -#: src/main/print-escp2.c:1883 +#: src/main/print-escp2.c:2251 msgid "Ascending Double" msgstr "Stigende dobbelt" -#: src/main/print-escp2.c:1885 +#: src/main/print-escp2.c:2253 msgid "Nearest Neighbor Avoidance" msgstr "Vige udenom nærmeste nabo" -#: src/main/print-escp2.c:2328 +#: src/main/print-escp2.c:2771 #, 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:3436 src/main/print-olympus.c:2451 +#: src/main/print-escp2.c:3934 src/main/print-olympus.c:2449 #: src/main/print-raw.c:217 msgid "Print options not verified; cannot print.\n" msgstr "Print indstillinger ikke kontrolleret, kan ikke printe.\n" @@ -1353,109 +1471,109 @@ msgid "Three Color Composite" msgstr "Tre farver sammensat" #: src/main/print-lexmark.c:607 src/main/print-lexmark.c:677 -#: src/main/escp2-channels.c:1540 src/main/escp2-channels.c:1554 -#: src/main/escp2-channels.c:1568 src/main/escp2-channels.c:1582 -#: src/main/escp2-channels.c:1808 src/main/escp2-channels.c:1823 -#: src/main/escp2-channels.c:1838 src/main/escp2-channels.c:1855 +#: src/main/escp2-channels.c:1554 src/main/escp2-channels.c:1568 +#: src/main/escp2-channels.c:1582 src/main/escp2-channels.c:1596 +#: src/main/escp2-channels.c:1822 src/main/escp2-channels.c:1837 +#: src/main/escp2-channels.c:1852 src/main/escp2-channels.c:1869 msgid "Six Color Photo" msgstr "Seks farver foto" #: src/main/print-lexmark.c:610 src/main/print-lexmark.c:680 -#: src/main/escp2-channels.c:1475 src/main/escp2-channels.c:1489 -#: src/main/escp2-channels.c:1503 src/main/escp2-channels.c:1517 -#: src/main/escp2-channels.c:1752 src/main/escp2-channels.c:1767 -#: src/main/escp2-channels.c:1784 +#: src/main/escp2-channels.c:1489 src/main/escp2-channels.c:1503 +#: src/main/escp2-channels.c:1517 src/main/escp2-channels.c:1531 +#: src/main/escp2-channels.c:1766 src/main/escp2-channels.c:1781 +#: src/main/escp2-channels.c:1798 msgid "Five Color Photo Composite" msgstr "Fem farver foto sammensat" -#: src/main/print-lexmark.c:856 src/main/escp2-papers.c:1341 -#: src/main/escp2-papers.c:1385 src/main/escp2-papers.c:1429 -#: src/main/escp2-papers.c:1477 src/main/escp2-papers.c:1525 -#: src/main/escp2-papers.c:1569 +#: src/main/print-lexmark.c:856 src/main/escp2-papers.c:1351 +#: src/main/escp2-papers.c:1395 src/main/escp2-papers.c:1439 +#: src/main/escp2-papers.c:1487 src/main/escp2-papers.c:1535 +#: src/main/escp2-papers.c:1579 msgid "Plain Paper" msgstr "Almindeligt papir" -#: src/main/print-lexmark.c:860 src/main/escp2-papers.c:1347 -#: src/main/escp2-papers.c:1391 src/main/escp2-papers.c:1435 -#: src/main/escp2-papers.c:1483 src/main/escp2-papers.c:1531 -#: src/main/escp2-papers.c:1575 +#: src/main/print-lexmark.c:860 src/main/escp2-papers.c:1357 +#: src/main/escp2-papers.c:1401 src/main/escp2-papers.c:1445 +#: src/main/escp2-papers.c:1493 src/main/escp2-papers.c:1541 +#: src/main/escp2-papers.c:1585 msgid "Glossy Film" msgstr "Blanke film" -#: src/main/print-lexmark.c:864 src/main/escp2-papers.c:1349 -#: src/main/escp2-papers.c:1393 src/main/escp2-papers.c:1437 -#: src/main/escp2-papers.c:1485 src/main/escp2-papers.c:1533 -#: src/main/escp2-papers.c:1577 +#: src/main/print-lexmark.c:864 src/main/escp2-papers.c:1359 +#: src/main/escp2-papers.c:1403 src/main/escp2-papers.c:1447 +#: src/main/escp2-papers.c:1495 src/main/escp2-papers.c:1543 +#: src/main/escp2-papers.c:1587 msgid "Transparencies" msgstr "Transparenter" -#: src/main/print-lexmark.c:868 src/main/escp2-papers.c:1351 -#: src/main/escp2-papers.c:1395 src/main/escp2-papers.c:1439 -#: src/main/escp2-papers.c:1487 src/main/escp2-papers.c:1535 -#: src/main/escp2-papers.c:1579 +#: src/main/print-lexmark.c:868 src/main/escp2-papers.c:1361 +#: src/main/escp2-papers.c:1405 src/main/escp2-papers.c:1449 +#: src/main/escp2-papers.c:1497 src/main/escp2-papers.c:1545 +#: src/main/escp2-papers.c:1589 msgid "Envelopes" msgstr "Kuverter" -#: src/main/print-lexmark.c:872 src/main/escp2-papers.c:1355 -#: src/main/escp2-papers.c:1399 src/main/escp2-papers.c:1443 -#: src/main/escp2-papers.c:1491 src/main/escp2-papers.c:1539 -#: src/main/escp2-papers.c:1583 +#: src/main/print-lexmark.c:872 src/main/escp2-papers.c:1365 +#: src/main/escp2-papers.c:1409 src/main/escp2-papers.c:1453 +#: src/main/escp2-papers.c:1501 src/main/escp2-papers.c:1549 +#: src/main/escp2-papers.c:1593 msgid "Matte Paper" msgstr "Mat papir" -#: src/main/print-lexmark.c:876 src/main/escp2-papers.c:1359 -#: src/main/escp2-papers.c:1403 src/main/escp2-papers.c:1447 -#: src/main/escp2-papers.c:1495 src/main/escp2-papers.c:1543 -#: src/main/escp2-papers.c:1587 +#: src/main/print-lexmark.c:876 src/main/escp2-papers.c:1369 +#: src/main/escp2-papers.c:1413 src/main/escp2-papers.c:1457 +#: src/main/escp2-papers.c:1505 src/main/escp2-papers.c:1553 +#: src/main/escp2-papers.c:1597 msgid "Inkjet Paper" msgstr "Inkjetpapir" -#: src/main/print-lexmark.c:880 src/main/escp2-papers.c:1361 -#: src/main/escp2-papers.c:1405 src/main/escp2-papers.c:1449 -#: src/main/escp2-papers.c:1497 src/main/escp2-papers.c:1545 -#: src/main/escp2-papers.c:1589 +#: src/main/print-lexmark.c:880 src/main/escp2-papers.c:1371 +#: src/main/escp2-papers.c:1415 src/main/escp2-papers.c:1459 +#: src/main/escp2-papers.c:1507 src/main/escp2-papers.c:1555 +#: src/main/escp2-papers.c:1599 msgid "Photo Quality Inkjet Paper" msgstr "Fotokvalitets inkjetpapir" -#: src/main/print-lexmark.c:884 src/main/escp2-papers.c:1363 -#: src/main/escp2-papers.c:1407 src/main/escp2-papers.c:1451 -#: src/main/escp2-papers.c:1499 src/main/escp2-papers.c:1547 -#: src/main/escp2-papers.c:1591 +#: src/main/print-lexmark.c:884 src/main/escp2-papers.c:1373 +#: src/main/escp2-papers.c:1417 src/main/escp2-papers.c:1461 +#: src/main/escp2-papers.c:1509 src/main/escp2-papers.c:1557 +#: src/main/escp2-papers.c:1601 msgid "Photo Paper" msgstr "Fotopapir" -#: src/main/print-lexmark.c:888 src/main/escp2-papers.c:1365 -#: src/main/escp2-papers.c:1409 src/main/escp2-papers.c:1453 -#: src/main/escp2-papers.c:1501 src/main/escp2-papers.c:1549 -#: src/main/escp2-papers.c:1593 src/main/escp2-papers.c:1617 +#: src/main/print-lexmark.c:888 src/main/escp2-papers.c:1375 +#: src/main/escp2-papers.c:1419 src/main/escp2-papers.c:1463 +#: src/main/escp2-papers.c:1511 src/main/escp2-papers.c:1559 +#: src/main/escp2-papers.c:1603 src/main/escp2-papers.c:1627 msgid "Premium Glossy Photo Paper" msgstr "Førsteklasses blankt fotopapir" -#: src/main/print-lexmark.c:892 src/main/escp2-papers.c:1369 -#: src/main/escp2-papers.c:1413 src/main/escp2-papers.c:1457 -#: src/main/escp2-papers.c:1505 src/main/escp2-papers.c:1553 -#: src/main/escp2-papers.c:1597 +#: src/main/print-lexmark.c:892 src/main/escp2-papers.c:1379 +#: src/main/escp2-papers.c:1423 src/main/escp2-papers.c:1467 +#: src/main/escp2-papers.c:1515 src/main/escp2-papers.c:1563 +#: src/main/escp2-papers.c:1607 msgid "Premium Luster Photo Paper" msgstr "Førsteklasses glittet fotopapir" -#: src/main/print-lexmark.c:896 src/main/escp2-papers.c:1371 -#: src/main/escp2-papers.c:1415 src/main/escp2-papers.c:1463 -#: src/main/escp2-papers.c:1511 src/main/escp2-papers.c:1555 -#: src/main/escp2-papers.c:1603 +#: src/main/print-lexmark.c:896 src/main/escp2-papers.c:1381 +#: src/main/escp2-papers.c:1425 src/main/escp2-papers.c:1473 +#: src/main/escp2-papers.c:1521 src/main/escp2-papers.c:1565 +#: src/main/escp2-papers.c:1613 msgid "Photo Quality Glossy Paper" msgstr "Fotokvalitets blankt papir" -#: src/main/print-lexmark.c:900 src/main/escp2-papers.c:1373 -#: src/main/escp2-papers.c:1417 src/main/escp2-papers.c:1465 -#: src/main/escp2-papers.c:1513 src/main/escp2-papers.c:1557 -#: src/main/escp2-papers.c:1605 +#: src/main/print-lexmark.c:900 src/main/escp2-papers.c:1383 +#: src/main/escp2-papers.c:1427 src/main/escp2-papers.c:1475 +#: src/main/escp2-papers.c:1523 src/main/escp2-papers.c:1567 +#: src/main/escp2-papers.c:1615 msgid "Ilford Heavy Paper" msgstr "Ilford Heavy Papir" -#: src/main/print-lexmark.c:904 src/main/escp2-papers.c:1377 -#: src/main/escp2-papers.c:1421 src/main/escp2-papers.c:1469 -#: src/main/escp2-papers.c:1517 src/main/escp2-papers.c:1561 -#: src/main/escp2-papers.c:1609 src/main/escp2-papers.c:1619 +#: src/main/print-lexmark.c:904 src/main/escp2-papers.c:1387 +#: src/main/escp2-papers.c:1431 src/main/escp2-papers.c:1479 +#: src/main/escp2-papers.c:1527 src/main/escp2-papers.c:1571 +#: src/main/escp2-papers.c:1619 src/main/escp2-papers.c:1629 msgid "Other" msgstr "Andet" @@ -1471,50 +1589,50 @@ msgstr "Manuel fødning med pause" msgid "Manual without Pause" msgstr "Manuel fødning uden pause" -#: src/main/print-olympus.c:277 +#: src/main/print-olympus.c:275 msgid "Coated" msgstr "Coated" -#: src/main/print-olympus.c:278 src/cups/genppd.c:1726 src/cups/genppd.c:1753 -#: src/cups/genppd.c:1834 +#: src/main/print-olympus.c:276 src/cups/genppd.c:1732 src/cups/genppd.c:1759 +#: src/cups/genppd.c:1840 msgid "None" msgstr "Ingen" -#: src/main/print-olympus.c:963 src/main/print-olympus.c:1023 -#: src/main/print-olympus.c:1127 +#: src/main/print-olympus.c:961 src/main/print-olympus.c:1021 +#: src/main/print-olympus.c:1125 msgid "Glossy" msgstr "Blankt" -#: src/main/print-olympus.c:964 src/main/print-olympus.c:1024 -#: src/main/print-olympus.c:1128 +#: src/main/print-olympus.c:962 src/main/print-olympus.c:1022 +#: src/main/print-olympus.c:1126 msgid "Texture" msgstr "Tekstur" -#: src/main/print-olympus.c:1025 src/main/print-olympus.c:1129 +#: src/main/print-olympus.c:1023 src/main/print-olympus.c:1127 msgid "Matte" msgstr "Mat" -#: src/main/print-olympus.c:1729 src/main/print-olympus.c:1730 +#: src/main/print-olympus.c:1727 src/main/print-olympus.c:1728 msgid "Laminate Pattern" msgstr "Lamineret mønster" -#: src/main/print-olympus.c:1765 +#: src/main/print-olympus.c:1763 msgid "Adjust the cyan balance" msgstr "Justér cyanbalance" -#: src/main/print-olympus.c:1773 +#: src/main/print-olympus.c:1771 msgid "Adjust the magenta balance" msgstr "Justér magentabalance" -#: src/main/print-olympus.c:1781 +#: src/main/print-olympus.c:1779 msgid "Adjust the yellow balance" msgstr "Justér gulbalance" -#: src/main/print-olympus.c:1788 +#: src/main/print-olympus.c:1786 msgid "Black Balance" msgstr "Sort balance" -#: src/main/print-olympus.c:1789 +#: src/main/print-olympus.c:1787 msgid "Adjust the black balance" msgstr "Justér sortbalance" @@ -1546,91 +1664,114 @@ msgstr "Hurtigttørrende foto" msgid "Quick-dry Transparency" msgstr "Hurtigttørrende klar film" -#: src/main/print-pcl.c:231 src/main/xmli18n-tmp.h:16 +#: src/main/print-pcl.c:238 src/main/xmli18n-tmp.h:17 msgid "Manual" msgstr "Manuelt" -#: src/main/print-pcl.c:233 +#: src/main/print-pcl.c:240 +msgid "Tray 1 - Movable Guides" +msgstr "Bakke 1 - med indstillelig papirføring" + +#: src/main/print-pcl.c:241 msgid "Tray 1" msgstr "Bakke 1" -#: src/main/print-pcl.c:234 src/main/print-pcl.c:240 +#: src/main/print-pcl.c:242 +msgid "Tray 2 - Movable Guides" +msgstr "Bakke 2 - med indstillelig papirføring" + +#: src/main/print-pcl.c:243 src/main/print-pcl.c:251 msgid "Tray 2" msgstr "Bakke 2" -#: src/main/print-pcl.c:235 +#: src/main/print-pcl.c:244 +msgid "Tray 3 - Movable Guides" +msgstr "Bakke 3 - med indstillelig papirføring" + +#: src/main/print-pcl.c:245 msgid "Tray 3" msgstr "Bakke 3" -#: src/main/print-pcl.c:236 +#: src/main/print-pcl.c:246 +msgid "Tray 4 - Movable Guides" +msgstr "Bakke 4 - med indstillelig papirføring" + +#: src/main/print-pcl.c:247 msgid "Tray 4" msgstr "Bakke 4" -#: src/main/print-pcl.c:237 +#: src/main/print-pcl.c:248 msgid "Portable Sheet Feeder" msgstr "Alternativ arkføder" -#: src/main/print-pcl.c:238 +#: src/main/print-pcl.c:249 msgid "Desktop Sheet Feeder" msgstr "Intern arkføder" -#: src/main/print-pcl.c:239 +#: src/main/print-pcl.c:250 msgid "Tray" msgstr "Bakke" -#: src/main/print-pcl.c:241 +#: src/main/print-pcl.c:252 msgid "Optional Source" msgstr "Valgfri kilde" -#: src/main/print-pcl.c:242 +#: src/main/print-pcl.c:253 msgid "Autoselect" msgstr "Autoudvælg" -#: src/main/print-pcl.c:256 +#: src/main/print-pcl.c:267 msgid "150x150 DPI" msgstr "150x150 DPI" -#: src/main/print-pcl.c:257 +#: src/main/print-pcl.c:268 msgid "300x300 DPI" msgstr "300x300 DPI" -#: src/main/print-pcl.c:258 +#: src/main/print-pcl.c:269 msgid "600x300 DPI" msgstr "600x300 DPI" -#: src/main/print-pcl.c:259 +#: src/main/print-pcl.c:270 msgid "600x600 DPI monochrome" msgstr "600x600 DPI monokrom" -#: src/main/print-pcl.c:260 +#: src/main/print-pcl.c:271 msgid "600x600 DPI" msgstr "600x600 DPI" -#: src/main/print-pcl.c:261 +#: src/main/print-pcl.c:272 msgid "1200x600 DPI" msgstr "1200x600 DPI" -#: src/main/print-pcl.c:262 +#: src/main/print-pcl.c:273 msgid "2400x600 DPI" msgstr "2400x600 DPI" -#: src/main/print-pcl.c:1470 +#: src/main/print-pcl.c:1538 msgid "Color + Black Cartridges" msgstr "Farve + sort patroner" -#: src/main/print-pcl.c:1471 +#: src/main/print-pcl.c:1539 msgid "Color + Photo Cartridges" msgstr "Farve + foto patroner" -#: src/main/print-ps.c:97 +#: src/main/print-ps.c:68 msgid "PPDFile" msgstr "PPDfil" -#: src/main/print-ps.c:98 src/gutenprintui/panel.c:1768 -#: src/gutenprintui2/panel.c:1768 +#: src/main/print-ps.c:69 src/gutenprintui2/panel.c:1943 msgid "PPD File" msgstr "PPD fil" +#: src/main/print-ps.c:74 +msgid "Model Name" +msgstr "Modelnavn" + +#: src/main/print-ps.c:75 +msgid "PPD File Model Name" +msgstr "PPD fil modelnavn" + #: src/main/print-raw.c:223 msgid "Image dimensions must match paper dimensions" msgstr "Billedets størrelse skal passe til papirets størrelse" @@ -1646,259 +1787,264 @@ msgstr "Tre-niveau grÃ¥skala" #: src/main/escp2-channels.c:1035 src/main/escp2-channels.c:1048 #: src/main/escp2-channels.c:1061 src/main/escp2-channels.c:1074 #: src/main/escp2-channels.c:1087 src/main/escp2-channels.c:1100 -#: src/main/escp2-channels.c:2505 src/main/escp2-channels.c:2528 -#: src/main/escp2-channels.c:2548 src/main/escp2-channels.c:2568 -#: src/main/escp2-channels.c:2588 src/main/escp2-channels.c:2608 +#: src/main/escp2-channels.c:2525 src/main/escp2-channels.c:2548 +#: src/main/escp2-channels.c:2568 src/main/escp2-channels.c:2588 +#: src/main/escp2-channels.c:2608 src/main/escp2-channels.c:2628 msgid "Quadtone" msgstr "FireTone grÃ¥" -#: src/main/escp2-channels.c:1604 src/main/escp2-channels.c:1618 +#: src/main/escp2-channels.c:1466 +msgid "Four Color Photo" +msgstr "Fire farver foto" + +#: src/main/escp2-channels.c:1618 src/main/escp2-channels.c:1632 msgid "Six Color Enhanced Composite" msgstr "Seks farver forbedret sammensat" -#: src/main/escp2-channels.c:1641 src/main/escp2-channels.c:1655 -#: src/main/escp2-channels.c:1669 src/main/escp2-channels.c:1705 +#: src/main/escp2-channels.c:1655 src/main/escp2-channels.c:1669 +#: src/main/escp2-channels.c:1683 src/main/escp2-channels.c:1719 msgid "Seven Color Photo" msgstr "Syv farver foto" -#: src/main/escp2-channels.c:1691 +#: src/main/escp2-channels.c:1705 msgid "Seven Color Enhanced" msgstr "Syv farver forbedret" -#: src/main/escp2-channels.c:1728 +#: src/main/escp2-channels.c:1742 msgid "Eight Color Photo" msgstr "Otte farver foto" -#: src/main/escp2-channels.c:1876 src/main/escp2-channels.c:1888 -#: src/main/escp2-channels.c:1894 +#: src/main/escp2-channels.c:1890 src/main/escp2-channels.c:1902 +#: src/main/escp2-channels.c:1908 msgid "One Color Raw" msgstr "En farve ufiltreret" -#: src/main/escp2-channels.c:1900 +#: src/main/escp2-channels.c:1914 msgid "One Color Raw Enhanced Gloss" msgstr "En farve ufiltreret forbedret glans" -#: src/main/escp2-channels.c:1913 src/main/escp2-channels.c:1925 +#: src/main/escp2-channels.c:1927 src/main/escp2-channels.c:1939 msgid "Two Color Raw" msgstr "To farver ufiltreret" -#: src/main/escp2-channels.c:1939 src/main/escp2-channels.c:1953 -#: src/main/escp2-channels.c:1980 src/main/escp2-channels.c:1993 -#: src/main/escp2-channels.c:2006 src/main/escp2-channels.c:2019 -#: src/main/escp2-channels.c:2033 src/main/escp2-channels.c:2047 -#: src/main/escp2-channels.c:2060 +#: src/main/escp2-channels.c:1953 src/main/escp2-channels.c:1967 +#: src/main/escp2-channels.c:1994 src/main/escp2-channels.c:2007 +#: src/main/escp2-channels.c:2020 src/main/escp2-channels.c:2033 +#: src/main/escp2-channels.c:2047 src/main/escp2-channels.c:2061 +#: src/main/escp2-channels.c:2074 msgid "Three Color Raw" msgstr "Tre farver ufiltreret" -#: src/main/escp2-channels.c:1967 +#: src/main/escp2-channels.c:1981 msgid "Three Color Raw Gloss" msgstr "Fire farver ufiltreret, glans " -#: src/main/escp2-channels.c:2067 src/main/escp2-channels.c:2073 -#: src/main/escp2-channels.c:2079 src/main/escp2-channels.c:2085 -#: src/main/escp2-channels.c:2091 src/main/escp2-channels.c:2097 -#: src/main/escp2-channels.c:2103 src/main/escp2-channels.c:2109 -#: src/main/escp2-channels.c:2115 src/main/escp2-channels.c:2121 +#: src/main/escp2-channels.c:2081 src/main/escp2-channels.c:2087 +#: src/main/escp2-channels.c:2093 src/main/escp2-channels.c:2099 +#: src/main/escp2-channels.c:2105 src/main/escp2-channels.c:2111 +#: src/main/escp2-channels.c:2117 src/main/escp2-channels.c:2123 +#: src/main/escp2-channels.c:2129 src/main/escp2-channels.c:2135 +#: src/main/escp2-channels.c:2141 msgid "Four Color Raw" msgstr "Fire farver ufiltreret" -#: src/main/escp2-channels.c:2127 +#: src/main/escp2-channels.c:2147 msgid "Four Color Raw Gloss" msgstr "Fire farver ufiltreret, glans" -#: src/main/escp2-channels.c:2142 src/main/escp2-channels.c:2156 +#: src/main/escp2-channels.c:2162 src/main/escp2-channels.c:2176 msgid "Five Color Raw" msgstr "Fem farver ufiltreret" -#: src/main/escp2-channels.c:2170 src/main/escp2-channels.c:2186 -#: src/main/escp2-channels.c:2192 src/main/escp2-channels.c:2198 -#: src/main/escp2-channels.c:2213 src/main/escp2-channels.c:2234 +#: src/main/escp2-channels.c:2190 src/main/escp2-channels.c:2206 +#: src/main/escp2-channels.c:2212 src/main/escp2-channels.c:2218 +#: src/main/escp2-channels.c:2233 src/main/escp2-channels.c:2254 msgid "Six Color Raw" msgstr "Seks farver ufiltreret" -#: src/main/escp2-channels.c:2219 +#: src/main/escp2-channels.c:2239 msgid "Six Color Enhanced Gloss Raw" msgstr "Seks farver forbedret glans ufiltreret" -#: src/main/escp2-channels.c:2250 src/main/escp2-channels.c:2265 -#: src/main/escp2-channels.c:2280 +#: src/main/escp2-channels.c:2270 src/main/escp2-channels.c:2285 +#: src/main/escp2-channels.c:2300 msgid "Seven Color Raw" msgstr "Syv farver ufiltreret" -#: src/main/escp2-channels.c:2297 +#: src/main/escp2-channels.c:2317 msgid "Seven Color Enhanced Gloss Raw" msgstr "Syv farver forbedret glans ufiltreret" -#: src/main/escp2-channels.c:2315 +#: src/main/escp2-channels.c:2335 msgid "Eight Color Raw" msgstr "Otte farver ufiltreret" -#: src/main/escp2-channels.c:2482 src/main/escp2-channels.c:2495 -#: src/main/escp2-channels.c:2497 src/main/escp2-channels.c:2517 -#: src/main/escp2-channels.c:2520 src/main/escp2-channels.c:2540 -#: src/main/escp2-channels.c:2560 src/main/escp2-channels.c:2580 -#: src/main/escp2-channels.c:2600 src/main/escp2-channels.c:2620 -#: src/main/escp2-channels.c:2636 src/main/escp2-channels.c:2638 -#: src/main/escp2-channels.c:2640 src/main/escp2-channels.c:2642 -#: src/main/escp2-channels.c:2658 src/main/escp2-channels.c:2674 -#: src/main/escp2-channels.c:2694 +#: src/main/escp2-channels.c:2502 src/main/escp2-channels.c:2515 +#: src/main/escp2-channels.c:2517 src/main/escp2-channels.c:2537 +#: src/main/escp2-channels.c:2540 src/main/escp2-channels.c:2560 +#: src/main/escp2-channels.c:2580 src/main/escp2-channels.c:2600 +#: src/main/escp2-channels.c:2620 src/main/escp2-channels.c:2640 +#: src/main/escp2-channels.c:2656 src/main/escp2-channels.c:2658 +#: src/main/escp2-channels.c:2660 src/main/escp2-channels.c:2662 +#: src/main/escp2-channels.c:2678 src/main/escp2-channels.c:2694 +#: src/main/escp2-channels.c:2714 msgid "EPSON Standard Inks" msgstr "Epson standard blæk" -#: src/main/escp2-channels.c:2714 src/main/escp2-channels.c:2739 +#: src/main/escp2-channels.c:2734 src/main/escp2-channels.c:2759 msgid "UltraChrome Photo Black" msgstr "UltraChrome foto sort" -#: src/main/escp2-channels.c:2718 src/main/escp2-channels.c:2743 +#: src/main/escp2-channels.c:2738 src/main/escp2-channels.c:2763 msgid "UltraChrome Matte Black" msgstr "UltraChrome mat sort" -#: src/main/escp2-channels.c:2758 src/main/escp2-channels.c:2796 -#: src/main/escp2-channels.c:3167 src/escputil/escputil.c:976 +#: src/main/escp2-channels.c:2778 src/main/escp2-channels.c:2816 +#: src/main/escp2-channels.c:3206 src/escputil/escputil.c:976 msgid "Photo Black" msgstr "Foto sort" -#: src/main/escp2-channels.c:2762 src/main/escp2-channels.c:2778 -#: src/main/escp2-channels.c:3166 src/escputil/escputil.c:986 +#: src/main/escp2-channels.c:2782 src/main/escp2-channels.c:2798 +#: src/main/escp2-channels.c:3205 src/escputil/escputil.c:986 msgid "Matte Black" msgstr "Mat sort" -#: src/main/escp2-channels.c:3092 src/main/escp2-channels.c:3102 -#: src/main/escp2-channels.c:3114 src/main/escp2-channels.c:3128 -#: src/main/escp2-channels.c:3141 src/main/escp2-channels.c:3154 -#: src/main/escp2-channels.c:3191 src/escputil/escputil.c:981 +#: src/main/escp2-channels.c:3131 src/main/escp2-channels.c:3141 +#: src/main/escp2-channels.c:3153 src/main/escp2-channels.c:3167 +#: src/main/escp2-channels.c:3180 src/main/escp2-channels.c:3193 +#: src/main/escp2-channels.c:3240 src/escputil/escputil.c:981 #: src/escputil/escputil.c:1204 msgid "Light Cyan" msgstr "Lys cyan" -#: src/main/escp2-channels.c:3093 src/main/escp2-channels.c:3104 -#: src/main/escp2-channels.c:3115 src/main/escp2-channels.c:3129 -#: src/main/escp2-channels.c:3142 src/main/escp2-channels.c:3155 -#: src/main/escp2-channels.c:3190 src/escputil/escputil.c:982 +#: src/main/escp2-channels.c:3132 src/main/escp2-channels.c:3143 +#: src/main/escp2-channels.c:3154 src/main/escp2-channels.c:3168 +#: src/main/escp2-channels.c:3181 src/main/escp2-channels.c:3194 +#: src/main/escp2-channels.c:3239 src/escputil/escputil.c:982 #: src/escputil/escputil.c:1205 msgid "Light Magenta" msgstr "Lys magenta" -#: src/main/escp2-channels.c:3130 src/main/escp2-channels.c:3192 +#: src/main/escp2-channels.c:3169 src/main/escp2-channels.c:3241 #: src/escputil/escputil.c:985 msgid "Light Black" msgstr "Lys sort" -#: src/main/escp2-channels.c:3143 +#: src/main/escp2-channels.c:3182 msgid "Dark Yellow" msgstr "Mørk gul" -#: src/main/escp2-channels.c:3170 src/escputil/escputil.c:989 +#: src/main/escp2-channels.c:3209 src/escputil/escputil.c:989 msgid "Gloss Optimizer" msgstr "Glans forbedrer" -#: src/main/escp2-channels.c:3189 src/escputil/escputil.c:990 +#: src/main/escp2-channels.c:3238 src/escputil/escputil.c:990 msgid "Light Light Black" msgstr "Lys lys-sort" -#: src/main/escp2-papers.c:1343 src/main/escp2-papers.c:1387 -#: src/main/escp2-papers.c:1431 src/main/escp2-papers.c:1479 -#: src/main/escp2-papers.c:1527 src/main/escp2-papers.c:1571 +#: src/main/escp2-papers.c:1353 src/main/escp2-papers.c:1397 +#: src/main/escp2-papers.c:1441 src/main/escp2-papers.c:1489 +#: src/main/escp2-papers.c:1537 src/main/escp2-papers.c:1581 msgid "Plain Paper Fast Load" msgstr "Almindeligt papir hurtigindføring" -#: src/main/escp2-papers.c:1345 src/main/escp2-papers.c:1389 -#: src/main/escp2-papers.c:1433 src/main/escp2-papers.c:1481 -#: src/main/escp2-papers.c:1529 src/main/escp2-papers.c:1573 +#: src/main/escp2-papers.c:1355 src/main/escp2-papers.c:1399 +#: src/main/escp2-papers.c:1443 src/main/escp2-papers.c:1491 +#: src/main/escp2-papers.c:1539 src/main/escp2-papers.c:1583 #: src/main/xmli18n-tmp.h:5 msgid "Postcard" msgstr "Postkort" -#: src/main/escp2-papers.c:1353 src/main/escp2-papers.c:1397 -#: src/main/escp2-papers.c:1441 src/main/escp2-papers.c:1489 -#: src/main/escp2-papers.c:1537 src/main/escp2-papers.c:1581 +#: src/main/escp2-papers.c:1363 src/main/escp2-papers.c:1407 +#: src/main/escp2-papers.c:1451 src/main/escp2-papers.c:1499 +#: src/main/escp2-papers.c:1547 src/main/escp2-papers.c:1591 msgid "Back Light Film" msgstr "Baglys film" -#: src/main/escp2-papers.c:1357 src/main/escp2-papers.c:1401 -#: src/main/escp2-papers.c:1445 src/main/escp2-papers.c:1493 -#: src/main/escp2-papers.c:1541 src/main/escp2-papers.c:1585 -msgid "Matte Paper Heavyweight" -msgstr "Heavyweight mat papir" - #: src/main/escp2-papers.c:1367 src/main/escp2-papers.c:1411 #: src/main/escp2-papers.c:1455 src/main/escp2-papers.c:1503 #: src/main/escp2-papers.c:1551 src/main/escp2-papers.c:1595 +msgid "Matte Paper Heavyweight" +msgstr "Heavyweight mat papir" + +#: src/main/escp2-papers.c:1377 src/main/escp2-papers.c:1421 +#: src/main/escp2-papers.c:1465 src/main/escp2-papers.c:1513 +#: src/main/escp2-papers.c:1561 src/main/escp2-papers.c:1605 msgid "Premium Semigloss Photo Paper" msgstr "Premium silkemat fotopapir" -#: src/main/escp2-papers.c:1375 src/main/escp2-papers.c:1419 -#: src/main/escp2-papers.c:1467 src/main/escp2-papers.c:1515 -#: src/main/escp2-papers.c:1559 src/main/escp2-papers.c:1607 +#: src/main/escp2-papers.c:1385 src/main/escp2-papers.c:1429 +#: src/main/escp2-papers.c:1477 src/main/escp2-papers.c:1525 +#: src/main/escp2-papers.c:1569 src/main/escp2-papers.c:1617 msgid "ColorLife Paper" msgstr "ColorLife papir" -#: src/main/escp2-papers.c:1459 src/main/escp2-papers.c:1507 -#: src/main/escp2-papers.c:1599 +#: src/main/escp2-papers.c:1469 src/main/escp2-papers.c:1517 +#: src/main/escp2-papers.c:1609 msgid "Archival Matte Paper" msgstr "Arkivfast mat papir" -#: src/main/escp2-papers.c:1461 src/main/escp2-papers.c:1509 -#: src/main/escp2-papers.c:1601 +#: src/main/escp2-papers.c:1471 src/main/escp2-papers.c:1519 +#: src/main/escp2-papers.c:1611 msgid "Watercolor Paper - Radiant White" msgstr "Vandfarvepapir - strÃ¥lende hvidt" -#: src/main/escp2-papers.c:1716 src/main/escp2-papers.c:1842 -#: src/main/escp2-papers.c:1884 src/main/escp2-papers.c:1926 -#: src/main/escp2-papers.c:2001 +#: src/main/escp2-papers.c:1727 src/main/escp2-papers.c:1853 +#: src/main/escp2-papers.c:1895 src/main/escp2-papers.c:1937 +#: src/main/escp2-papers.c:2012 msgid "Roll Feed" msgstr "Rulle fødning" -#: src/main/escp2-papers.c:1740 src/main/escp2-papers.c:1791 +#: src/main/escp2-papers.c:1751 src/main/escp2-papers.c:1802 msgid "Roll Feed (cut each page)" msgstr "Rulle fødning (skær efter hver side)" -#: src/main/escp2-papers.c:1749 src/main/escp2-papers.c:1800 +#: src/main/escp2-papers.c:1760 src/main/escp2-papers.c:1811 msgid "Roll Feed (do not cut)" msgstr "Rulle fødning (ingen afskæring)" -#: src/main/escp2-papers.c:1773 src/main/escp2-papers.c:1824 +#: src/main/escp2-papers.c:1784 src/main/escp2-papers.c:1835 msgid "Manual Feed" msgstr "Manuel fødning" -#: src/main/escp2-papers.c:1782 src/main/escp2-papers.c:1833 -#: src/main/escp2-papers.c:1935 src/main/escp2-papers.c:1968 +#: src/main/escp2-papers.c:1793 src/main/escp2-papers.c:1844 +#: src/main/escp2-papers.c:1946 src/main/escp2-papers.c:1979 msgid "Print to CD" msgstr "Udskriv pÃ¥ Cd" -#: src/main/escp2-papers.c:1866 src/main/escp2-papers.c:1908 +#: src/main/escp2-papers.c:1877 src/main/escp2-papers.c:1919 msgid "Manual Sheet Guide" msgstr "Manuel ark guide" -#: src/main/escp2-papers.c:1875 src/main/escp2-papers.c:1917 +#: src/main/escp2-papers.c:1886 src/main/escp2-papers.c:1928 msgid "Manual Feed (Front)" msgstr "Manuel fødning (front)" -#: src/main/escp2-papers.c:1950 +#: src/main/escp2-papers.c:1961 msgid "Rear Tray" msgstr "Bagerste bakke" -#: src/main/escp2-papers.c:1959 +#: src/main/escp2-papers.c:1970 msgid "Front Tray" msgstr "Front bakke" -#: src/main/escp2-papers.c:1977 +#: src/main/escp2-papers.c:1988 msgid "Photo Board" msgstr "Foto plade" -#: src/main/escp2-papers.c:2016 +#: src/main/escp2-papers.c:2027 msgid "Cut Sheet Bin 1" msgstr "TilskÃ¥rne ark, bakke 1" -#: src/main/escp2-papers.c:2025 +#: src/main/escp2-papers.c:2036 msgid "Cut Sheet Bin 2" msgstr "TilskÃ¥rne ark, bakke 2" -#: src/main/escp2-papers.c:2034 +#: src/main/escp2-papers.c:2045 msgid "Cut Sheet Autoselect" msgstr "Automatisk valg af bakke" -#: src/main/escp2-papers.c:2043 +#: src/main/escp2-papers.c:2054 msgid "Manual Selection" msgstr "Manuel udvælgelse" @@ -1936,9 +2082,8 @@ msgid "720 x 360 DPI" msgstr "720 x 360 DPI" #: src/main/escp2-resolutions.c:87 -#, fuzzy msgid "720 x 360 DPI Enhanced" -msgstr "720 x 360 DPI" +msgstr "720 x 360 DPI forbedret" #: src/main/escp2-resolutions.c:91 src/main/escp2-resolutions.c:94 msgid "720 DPI" @@ -2036,42 +2181,48 @@ msgid "Eight Pass" msgstr "Otte gennemløb" #: src/main/escp2-resolutions.c:637 src/main/escp2-resolutions.c:652 -#: src/main/generic-options.c:33 +#: src/main/escp2-resolutions.c:667 src/main/generic-options.c:33 msgid "Fast Economy" msgstr "Hurtig økonomisk" #: src/main/escp2-resolutions.c:638 src/main/escp2-resolutions.c:653 -#: src/main/generic-options.c:34 +#: src/main/escp2-resolutions.c:668 src/main/generic-options.c:34 msgid "Economy" msgstr "Økonomisk" #: src/main/escp2-resolutions.c:639 src/main/escp2-resolutions.c:654 -#: src/main/escp2-resolutions.c:667 src/main/generic-options.c:35 +#: src/main/escp2-resolutions.c:669 src/main/escp2-resolutions.c:682 +#: src/main/generic-options.c:35 msgid "Draft" msgstr "Kladde" #: src/main/escp2-resolutions.c:641 src/main/escp2-resolutions.c:656 -#: src/main/escp2-resolutions.c:670 src/main/generic-options.c:37 +#: src/main/escp2-resolutions.c:671 src/main/escp2-resolutions.c:685 +#: src/main/generic-options.c:37 msgid "High" msgstr "Høj" #: src/main/escp2-resolutions.c:642 src/main/escp2-resolutions.c:657 -#: src/main/escp2-resolutions.c:669 src/main/generic-options.c:38 +#: src/main/escp2-resolutions.c:672 src/main/escp2-resolutions.c:684 +#: src/main/generic-options.c:38 msgid "Photo" msgstr "Foto" #: src/main/escp2-resolutions.c:643 src/main/escp2-resolutions.c:658 -#: src/main/escp2-resolutions.c:671 src/main/generic-options.c:39 +#: src/main/escp2-resolutions.c:673 src/main/escp2-resolutions.c:686 +#: src/main/generic-options.c:39 msgid "Super Photo" msgstr "Super foto" #: src/main/escp2-resolutions.c:644 src/main/escp2-resolutions.c:659 -#: src/main/escp2-resolutions.c:672 src/main/generic-options.c:40 +#: src/main/escp2-resolutions.c:674 src/main/escp2-resolutions.c:687 +#: src/main/generic-options.c:40 msgid "Ultra Photo" msgstr "Ultra foto" #: src/main/escp2-resolutions.c:645 src/main/escp2-resolutions.c:660 -#: src/main/escp2-resolutions.c:673 src/main/generic-options.c:41 +#: src/main/escp2-resolutions.c:675 src/main/escp2-resolutions.c:688 +#: src/main/generic-options.c:41 msgid "Best" msgstr "Bedst" @@ -2148,4174 +2299,4331 @@ msgid "3x5" msgstr "3x5" #: src/main/xmli18n-tmp.h:10 +msgid "3 1/2 x5" +msgstr "3 1/2 x5" + +#: src/main/xmli18n-tmp.h:11 msgid "4x6" msgstr "4x6" -#: src/main/xmli18n-tmp.h:11 +#: src/main/xmli18n-tmp.h:12 msgid "Epson 4x6 Photo Paper (tear-off borders)" msgstr "Epson 4x6 fotopapir (riv-af kanter)" -#: src/main/xmli18n-tmp.h:12 +#: src/main/xmli18n-tmp.h:13 msgid "5x7" msgstr "5x7" -#: src/main/xmli18n-tmp.h:13 +#: src/main/xmli18n-tmp.h:14 msgid "5x8" msgstr "5x8" -#: src/main/xmli18n-tmp.h:14 +#: src/main/xmli18n-tmp.h:15 msgid "6x8" msgstr "6x8" -#: src/main/xmli18n-tmp.h:15 +#: src/main/xmli18n-tmp.h:16 msgid "8x10" msgstr "8x10" -#: src/main/xmli18n-tmp.h:17 +#: src/main/xmli18n-tmp.h:18 msgid "12x18" msgstr "12x18" -#: src/main/xmli18n-tmp.h:18 +#: src/main/xmli18n-tmp.h:19 msgid "Super B 13x19" msgstr "Super B 13x19" -#: src/main/xmli18n-tmp.h:19 +#: src/main/xmli18n-tmp.h:20 msgid "Engineering C 17x22" msgstr "Engineering C 17x22" -#: src/main/xmli18n-tmp.h:20 +#: src/main/xmli18n-tmp.h:21 msgid "8x12" msgstr "8x12" -#: src/main/xmli18n-tmp.h:21 +#: src/main/xmli18n-tmp.h:22 msgid "11x14" msgstr "11x14" -#: src/main/xmli18n-tmp.h:22 +#: src/main/xmli18n-tmp.h:23 msgid "16x20" msgstr "16x20" -#: src/main/xmli18n-tmp.h:23 +#: src/main/xmli18n-tmp.h:24 msgid "16x24" msgstr "16x24" -#: src/main/xmli18n-tmp.h:24 +#: src/main/xmli18n-tmp.h:25 msgid "20x24" msgstr "20x24" -#: src/main/xmli18n-tmp.h:25 +#: src/main/xmli18n-tmp.h:26 msgid "20x30" msgstr "20x30" -#: src/main/xmli18n-tmp.h:26 +#: src/main/xmli18n-tmp.h:27 msgid "22x30" msgstr "22x30" -#: src/main/xmli18n-tmp.h:27 +#: src/main/xmli18n-tmp.h:28 msgid "24x30" msgstr "24x30" -#: src/main/xmli18n-tmp.h:28 +#: src/main/xmli18n-tmp.h:29 msgid "Super A1 24x36" msgstr "Super A1 24x36" -#: src/main/xmli18n-tmp.h:29 +#: src/main/xmli18n-tmp.h:30 msgid "30x40" msgstr "30x40" -#: src/main/xmli18n-tmp.h:30 +#: src/main/xmli18n-tmp.h:31 msgid "4A" msgstr "4A" -#: src/main/xmli18n-tmp.h:31 +#: src/main/xmli18n-tmp.h:32 msgid "2A" msgstr "2A" -#: src/main/xmli18n-tmp.h:32 +#: src/main/xmli18n-tmp.h:33 msgid "Super A0" msgstr "Super A0" -#: src/main/xmli18n-tmp.h:33 +#: src/main/xmli18n-tmp.h:34 msgid "A0" msgstr "A0" -#: src/main/xmli18n-tmp.h:34 +#: src/main/xmli18n-tmp.h:35 msgid "A1" msgstr "A1" -#: src/main/xmli18n-tmp.h:35 +#: src/main/xmli18n-tmp.h:36 msgid "A2" msgstr "A2" -#: src/main/xmli18n-tmp.h:36 +#: src/main/xmli18n-tmp.h:37 msgid "A3" msgstr "A3" -#: src/main/xmli18n-tmp.h:37 +#: src/main/xmli18n-tmp.h:38 msgid "A4" msgstr "A4" -#: src/main/xmli18n-tmp.h:38 +#: src/main/xmli18n-tmp.h:39 msgid "A5" msgstr "A5" -#: src/main/xmli18n-tmp.h:39 +#: src/main/xmli18n-tmp.h:40 msgid "A6" msgstr "A6" -#: src/main/xmli18n-tmp.h:40 +#: src/main/xmli18n-tmp.h:41 msgid "A7" msgstr "A7" -#: src/main/xmli18n-tmp.h:41 +#: src/main/xmli18n-tmp.h:42 msgid "A8" msgstr "A8" -#: src/main/xmli18n-tmp.h:42 +#: src/main/xmli18n-tmp.h:43 msgid "A9" msgstr "A9" -#: src/main/xmli18n-tmp.h:43 +#: src/main/xmli18n-tmp.h:44 msgid "A10" msgstr "A10" -#: src/main/xmli18n-tmp.h:44 +#: src/main/xmli18n-tmp.h:45 msgid "RA0" msgstr "RA0" -#: src/main/xmli18n-tmp.h:45 +#: src/main/xmli18n-tmp.h:46 msgid "RA1" msgstr "RA1" -#: src/main/xmli18n-tmp.h:46 +#: src/main/xmli18n-tmp.h:47 msgid "RA2" msgstr "RA2" -#: src/main/xmli18n-tmp.h:47 +#: src/main/xmli18n-tmp.h:48 msgid "RA3" msgstr "RA3" -#: src/main/xmli18n-tmp.h:48 +#: src/main/xmli18n-tmp.h:49 msgid "RA4" msgstr "RA4" -#: src/main/xmli18n-tmp.h:49 +#: src/main/xmli18n-tmp.h:50 msgid "SRA0" msgstr "SRA0" -#: src/main/xmli18n-tmp.h:50 +#: src/main/xmli18n-tmp.h:51 msgid "SRA1" msgstr "SRA1" -#: src/main/xmli18n-tmp.h:51 +#: src/main/xmli18n-tmp.h:52 msgid "SRA2" msgstr "SRA2" -#: src/main/xmli18n-tmp.h:52 +#: src/main/xmli18n-tmp.h:53 msgid "SRA3" msgstr "SRA3" -#: src/main/xmli18n-tmp.h:53 +#: src/main/xmli18n-tmp.h:54 msgid "SRA4" msgstr "SRA4" -#: src/main/xmli18n-tmp.h:54 +#: src/main/xmli18n-tmp.h:55 msgid "4B ISO" msgstr "4B ISO" -#: src/main/xmli18n-tmp.h:55 +#: src/main/xmli18n-tmp.h:56 msgid "2B ISO" msgstr "2B ISO" -#: src/main/xmli18n-tmp.h:56 +#: src/main/xmli18n-tmp.h:57 msgid "B0 ISO" msgstr "B0 ISO" -#: src/main/xmli18n-tmp.h:57 +#: src/main/xmli18n-tmp.h:58 msgid "B1 ISO" msgstr "B1 ISO" -#: src/main/xmli18n-tmp.h:58 +#: src/main/xmli18n-tmp.h:59 msgid "B2 ISO" msgstr "B2 ISO" -#: src/main/xmli18n-tmp.h:59 +#: src/main/xmli18n-tmp.h:60 msgid "B3 ISO" msgstr "B3 ISO" -#: src/main/xmli18n-tmp.h:60 +#: src/main/xmli18n-tmp.h:61 msgid "B4 ISO" msgstr "B4 ISO" -#: src/main/xmli18n-tmp.h:61 +#: src/main/xmli18n-tmp.h:62 msgid "B5 ISO" msgstr "B5 ISO" -#: src/main/xmli18n-tmp.h:62 +#: src/main/xmli18n-tmp.h:63 msgid "B6 ISO" msgstr "B6 ISO" -#: src/main/xmli18n-tmp.h:63 +#: src/main/xmli18n-tmp.h:64 msgid "B7 ISO" msgstr "B7 ISO" -#: src/main/xmli18n-tmp.h:64 +#: src/main/xmli18n-tmp.h:65 msgid "B8 ISO" msgstr "B8 ISO" -#: src/main/xmli18n-tmp.h:65 +#: src/main/xmli18n-tmp.h:66 msgid "B9 ISO" msgstr "B9 ISO" -#: src/main/xmli18n-tmp.h:66 +#: src/main/xmli18n-tmp.h:67 msgid "B10 ISO" msgstr "B10 ISO" -#: src/main/xmli18n-tmp.h:67 +#: src/main/xmli18n-tmp.h:68 msgid "Super B0 JIS" msgstr "Super B0 JIS" -#: src/main/xmli18n-tmp.h:68 +#: src/main/xmli18n-tmp.h:69 msgid "B0 JIS" msgstr "B0 JIS" -#: src/main/xmli18n-tmp.h:69 +#: src/main/xmli18n-tmp.h:70 msgid "B1 JIS" msgstr "B1 JIS" -#: src/main/xmli18n-tmp.h:70 +#: src/main/xmli18n-tmp.h:71 msgid "B2 JIS" msgstr "B2 JIS" -#: src/main/xmli18n-tmp.h:71 +#: src/main/xmli18n-tmp.h:72 msgid "B3 JIS" msgstr "B3 JIS" -#: src/main/xmli18n-tmp.h:72 +#: src/main/xmli18n-tmp.h:73 msgid "B4 JIS" msgstr "B4 JIS" -#: src/main/xmli18n-tmp.h:73 +#: src/main/xmli18n-tmp.h:74 msgid "B5 JIS" msgstr "B5 JIS" -#: src/main/xmli18n-tmp.h:74 +#: src/main/xmli18n-tmp.h:75 msgid "B6 JIS" msgstr "B6 JIS" -#: src/main/xmli18n-tmp.h:75 +#: src/main/xmli18n-tmp.h:76 msgid "B7 JIS" msgstr "B7 JIS" -#: src/main/xmli18n-tmp.h:76 +#: src/main/xmli18n-tmp.h:77 msgid "B8 JIS" msgstr "B8 JIS" -#: src/main/xmli18n-tmp.h:77 +#: src/main/xmli18n-tmp.h:78 msgid "B9 JIS" msgstr "B9 JIS" -#: src/main/xmli18n-tmp.h:78 +#: src/main/xmli18n-tmp.h:79 msgid "B10 JIS" msgstr "B10 JIS" -#: src/main/xmli18n-tmp.h:79 +#: src/main/xmli18n-tmp.h:80 msgid "C0" msgstr "C0" -#: src/main/xmli18n-tmp.h:80 +#: src/main/xmli18n-tmp.h:81 +msgid "C0 landscape" +msgstr "C0 tværformat" + +#: src/main/xmli18n-tmp.h:82 msgid "C1" msgstr "C1" -#: src/main/xmli18n-tmp.h:81 +#: src/main/xmli18n-tmp.h:83 +msgid "C1 landscape" +msgstr "C1 tværformat" + +#: src/main/xmli18n-tmp.h:84 msgid "C2" msgstr "C2" -#: src/main/xmli18n-tmp.h:82 +#: src/main/xmli18n-tmp.h:85 +msgid "C2 landscape" +msgstr "C2 tværformat" + +#: src/main/xmli18n-tmp.h:86 msgid "C3" msgstr "C3" -#: src/main/xmli18n-tmp.h:83 +#: src/main/xmli18n-tmp.h:87 +msgid "C3 landscape" +msgstr "C3 tværformat" + +#: src/main/xmli18n-tmp.h:88 msgid "C4" msgstr "C4" -#: src/main/xmli18n-tmp.h:84 +#: src/main/xmli18n-tmp.h:89 +msgid "C4 landscape" +msgstr "C4 tværformat" + +#: src/main/xmli18n-tmp.h:90 msgid "C5" msgstr "C5" -#: src/main/xmli18n-tmp.h:85 +#: src/main/xmli18n-tmp.h:91 +msgid "C5 landscape" +msgstr "C5 tværformat" + +#: src/main/xmli18n-tmp.h:92 msgid "B6-C4" msgstr "B6-C4" -#: src/main/xmli18n-tmp.h:86 +#: src/main/xmli18n-tmp.h:93 +msgid "B6-C4 landscape" +msgstr "B6-C4 tværformat" + +#: src/main/xmli18n-tmp.h:94 msgid "C6" msgstr "C6" -#: src/main/xmli18n-tmp.h:87 +#: src/main/xmli18n-tmp.h:95 +msgid "C6 landscape" +msgstr "C6 tværformat" + +#: src/main/xmli18n-tmp.h:96 msgid "DL" msgstr "DL" -#: src/main/xmli18n-tmp.h:88 +#: src/main/xmli18n-tmp.h:97 +msgid "DL landscape" +msgstr "DL tværformat" + +#: src/main/xmli18n-tmp.h:98 msgid "C7-6" msgstr "C7-6" -#: src/main/xmli18n-tmp.h:89 +#: src/main/xmli18n-tmp.h:99 +msgid "C7-6 landscape" +msgstr "C7-6 tværformat" + +#: src/main/xmli18n-tmp.h:100 msgid "C7" msgstr "C7" -#: src/main/xmli18n-tmp.h:90 +#: src/main/xmli18n-tmp.h:101 +msgid "C7 landscape" +msgstr "C7 tværformat" + +#: src/main/xmli18n-tmp.h:102 msgid "C8" msgstr "C8" -#: src/main/xmli18n-tmp.h:91 +#: src/main/xmli18n-tmp.h:103 +msgid "C8 landscape" +msgstr "C8 tværformat" + +#: src/main/xmli18n-tmp.h:104 msgid "C9" msgstr "C9" -#: src/main/xmli18n-tmp.h:92 +#: src/main/xmli18n-tmp.h:105 +msgid "C9 landscape" +msgstr "C9 tværformat" + +#: src/main/xmli18n-tmp.h:106 msgid "C10" msgstr "C10" -#: src/main/xmli18n-tmp.h:93 +#: src/main/xmli18n-tmp.h:107 +msgid "C10 landscape" +msgstr "C10 tværformat" + +#: src/main/xmli18n-tmp.h:108 msgid "ArchA" msgstr "ArchA" -#: src/main/xmli18n-tmp.h:94 +#: src/main/xmli18n-tmp.h:109 msgid "ArchA transposed" msgstr "ArchA vendt" -#: src/main/xmli18n-tmp.h:95 +#: src/main/xmli18n-tmp.h:110 msgid "ArchB" msgstr "ArchB" -#: src/main/xmli18n-tmp.h:96 +#: src/main/xmli18n-tmp.h:111 msgid "ArchB transposed" msgstr "ArchB vendt" -#: src/main/xmli18n-tmp.h:97 +#: src/main/xmli18n-tmp.h:112 msgid "ArchC" msgstr "ArchC" -#: src/main/xmli18n-tmp.h:98 +#: src/main/xmli18n-tmp.h:113 msgid "ArchC transposed" msgstr "ArchC vendt" -#: src/main/xmli18n-tmp.h:99 +#: src/main/xmli18n-tmp.h:114 msgid "ArchD" msgstr "ArchD" -#: src/main/xmli18n-tmp.h:100 +#: src/main/xmli18n-tmp.h:115 msgid "ArchD transposed" msgstr "ArchD vendt" -#: src/main/xmli18n-tmp.h:101 +#: src/main/xmli18n-tmp.h:116 msgid "ArchE" msgstr "ArchE" -#: src/main/xmli18n-tmp.h:102 +#: src/main/xmli18n-tmp.h:117 msgid "ArchE transposed" msgstr "ArchE vendt" -#: src/main/xmli18n-tmp.h:103 +#: src/main/xmli18n-tmp.h:118 msgid "American foolscap" msgstr "American foolscap" -#: src/main/xmli18n-tmp.h:104 +#: src/main/xmli18n-tmp.h:119 msgid "European foolscap" msgstr "European foolscap" -#: src/main/xmli18n-tmp.h:105 +#: src/main/xmli18n-tmp.h:120 msgid "Crown Quarto" msgstr "Crown Quarto" -#: src/main/xmli18n-tmp.h:106 +#: src/main/xmli18n-tmp.h:121 msgid "Large Crown Quarto" msgstr "Large Crown Quarto" -#: src/main/xmli18n-tmp.h:107 +#: src/main/xmli18n-tmp.h:122 msgid "Demy Quarto" msgstr "Demy Quarto" -#: src/main/xmli18n-tmp.h:108 +#: src/main/xmli18n-tmp.h:123 msgid "Royal Quarto" msgstr "Royal Quarto" -#: src/main/xmli18n-tmp.h:109 +#: src/main/xmli18n-tmp.h:124 msgid "ISO A4" msgstr "ISO A4" -#: src/main/xmli18n-tmp.h:110 +#: src/main/xmli18n-tmp.h:125 msgid "Crown Octavo" msgstr "Crown Octavo" -#: src/main/xmli18n-tmp.h:111 +#: src/main/xmli18n-tmp.h:126 msgid "Large Crown Octavo" msgstr "Large Crown Octavo" -#: src/main/xmli18n-tmp.h:112 +#: src/main/xmli18n-tmp.h:127 msgid "Demy Octavo" msgstr "Demy Octavo" -#: src/main/xmli18n-tmp.h:113 +#: src/main/xmli18n-tmp.h:128 msgid "Royal Octavo" msgstr "Royal Octavo" -#: src/main/xmli18n-tmp.h:114 +#: src/main/xmli18n-tmp.h:129 msgid "ISO A5" msgstr "ISO A5" -#: src/main/xmli18n-tmp.h:115 +#: src/main/xmli18n-tmp.h:130 msgid "Small paperback" msgstr "Small paperback" -#: src/main/xmli18n-tmp.h:116 +#: src/main/xmli18n-tmp.h:131 msgid "Penguin small paperback" msgstr "Penguin small paperback" -#: src/main/xmli18n-tmp.h:117 +#: src/main/xmli18n-tmp.h:132 msgid "Penguin large paperback" msgstr "Penguin large paperback" -#: src/main/xmli18n-tmp.h:118 +#: src/main/xmli18n-tmp.h:133 msgid "10cm x 15cm" msgstr "10cm x 15cm" -#: src/main/xmli18n-tmp.h:119 +#: src/main/xmli18n-tmp.h:134 msgid "Hagaki Card" msgstr "Hagaki Card" -#: src/main/xmli18n-tmp.h:120 +#: src/main/xmli18n-tmp.h:135 msgid "Oufuku Card" msgstr "Oufuku Card" -#: src/main/xmli18n-tmp.h:121 +#: src/main/xmli18n-tmp.h:136 msgid "Japanese long envelope #3" msgstr "Japanese lang kuvert #3" -#: src/main/xmli18n-tmp.h:122 +#: src/main/xmli18n-tmp.h:137 +msgid "Japanese long envelope #3 landscape" +msgstr "Japanese lang kuvert #3 tværformat" + +#: src/main/xmli18n-tmp.h:138 msgid "Japanese long envelope #4" msgstr "Japanese lang kuvert #4" -#: src/main/xmli18n-tmp.h:123 +#: src/main/xmli18n-tmp.h:139 +msgid "Japanese long envelope #4 landscape" +msgstr "Japanese lang kuvert #4 tværformat" + +#: src/main/xmli18n-tmp.h:140 msgid "Japanese Kaku envelope #4" msgstr "Japanese Kaku kuvert #4" -#: src/main/xmli18n-tmp.h:124 +#: src/main/xmli18n-tmp.h:141 +msgid "Japanese Kaku envelope #4 landscape" +msgstr "Japanese Kaku kuvert #4 tværformat" + +#: src/main/xmli18n-tmp.h:142 msgid "Commercial 10" msgstr "Commercial 10" -#: src/main/xmli18n-tmp.h:125 +#: src/main/xmli18n-tmp.h:143 +msgid "Commercial 10 landscape" +msgstr "Commercial 10 tværformat" + +#: src/main/xmli18n-tmp.h:144 msgid "A2 Invitation" msgstr "A2 Invitation" -#: src/main/xmli18n-tmp.h:126 +#: src/main/xmli18n-tmp.h:145 msgid "Monarch Envelope" msgstr "Monarch kuvert" -#: src/main/xmli18n-tmp.h:127 +#: src/main/xmli18n-tmp.h:146 +msgid "Monarch Envelope landscape" +msgstr "Monarch kuvert tværformat" + +#: src/main/xmli18n-tmp.h:147 msgid "4x5 3/8" msgstr "4x5 3/8" -#: src/main/xmli18n-tmp.h:128 +#: src/main/xmli18n-tmp.h:148 msgid "4x7" msgstr "4x7" -#: src/main/xmli18n-tmp.h:129 +#: src/main/xmli18n-tmp.h:149 msgid "CP_L" msgstr "CP_L" -#: src/main/xmli18n-tmp.h:130 +#: src/main/xmli18n-tmp.h:150 msgid "Card" msgstr "Card" -#: src/main/xmli18n-tmp.h:131 +#: src/main/xmli18n-tmp.h:151 msgid "Wide Postcard" msgstr "Wide Postcard" -#: src/main/xmli18n-tmp.h:132 +#: src/main/xmli18n-tmp.h:152 msgid "Chilean Office" msgstr "Chilean Office" -#: src/main/xmli18n-tmp.h:133 +#: src/main/xmli18n-tmp.h:153 msgid "Chilean Double Letter" msgstr "Chilean Double Letter" -#: src/main/xmli18n-tmp.h:134 +#: src/main/xmli18n-tmp.h:154 msgid "Chilean Double Office" msgstr "Chilean Double Office" -#: src/main/xmli18n-tmp.h:135 +#: src/main/xmli18n-tmp.h:155 msgid "Custom" msgstr "Egendefineret" -#: src/main/xmli18n-tmp.h:136 +#: src/main/xmli18n-tmp.h:156 msgid "89 mm Roll Paper" msgstr "89 mm rulle papir" -#: src/main/xmli18n-tmp.h:137 +#: src/main/xmli18n-tmp.h:157 msgid "4 Inch Roll Paper" msgstr "4 tommer rulle papir" -#: src/main/xmli18n-tmp.h:138 +#: src/main/xmli18n-tmp.h:158 msgid "5 Inch Roll Paper" msgstr "5 tommer rulle papir" -#: src/main/xmli18n-tmp.h:139 +#: src/main/xmli18n-tmp.h:159 msgid "210 mm Roll Paper" msgstr "210mm rulle papir" -#: src/main/xmli18n-tmp.h:140 +#: src/main/xmli18n-tmp.h:160 msgid "13 Inch Roll Paper" msgstr "13 tommer rulle papir" -#: src/main/xmli18n-tmp.h:141 +#: src/main/xmli18n-tmp.h:161 msgid "22 Inch Roll Paper" msgstr "22 tommer rulle papir" -#: src/main/xmli18n-tmp.h:142 +#: src/main/xmli18n-tmp.h:162 msgid "24 Inch Roll Paper" msgstr "24 tommer rulle papir" -#: src/main/xmli18n-tmp.h:143 +#: src/main/xmli18n-tmp.h:163 msgid "36 Inch Roll Paper" msgstr "36 tommer rulle papir" -#: src/main/xmli18n-tmp.h:144 +#: src/main/xmli18n-tmp.h:164 msgid "44 Inch Roll Paper" msgstr "44 tommer rulle papir" -#: src/main/xmli18n-tmp.h:145 +#: src/main/xmli18n-tmp.h:165 msgid "PostScript Level 1" msgstr "Postscript Level 1" -#: src/main/xmli18n-tmp.h:146 +#: src/main/xmli18n-tmp.h:166 msgid "PostScript Level 2" msgstr "Postscript Level 2" -#: src/main/xmli18n-tmp.h:147 +#: src/main/xmli18n-tmp.h:167 msgid "Canon BJ-30" msgstr "Canon BJ-30" -#: src/main/xmli18n-tmp.h:148 +#: src/main/xmli18n-tmp.h:168 msgid "Canon BJC-50" msgstr "Canon BJC-50" -#: src/main/xmli18n-tmp.h:149 +#: src/main/xmli18n-tmp.h:169 msgid "Canon BJC-55" msgstr "Canon BJC-55" -#: src/main/xmli18n-tmp.h:150 +#: src/main/xmli18n-tmp.h:170 msgid "Canon BJC-80" msgstr "Canon BJC-80" -#: src/main/xmli18n-tmp.h:151 +#: src/main/xmli18n-tmp.h:171 msgid "Canon BJC-85" msgstr "Canon BJC-85" -#: src/main/xmli18n-tmp.h:152 +#: src/main/xmli18n-tmp.h:172 msgid "Canon BJC-210" msgstr "Canon BJC-210" -#: src/main/xmli18n-tmp.h:153 +#: src/main/xmli18n-tmp.h:173 msgid "Canon BJC-240" msgstr "Canon BJC-240" -#: src/main/xmli18n-tmp.h:154 +#: src/main/xmli18n-tmp.h:174 msgid "Canon BJC-250" msgstr "Canon BJC-250" -#: src/main/xmli18n-tmp.h:155 +#: src/main/xmli18n-tmp.h:175 msgid "Canon BJC-1000" msgstr "Canon BJC-1000" -#: src/main/xmli18n-tmp.h:156 +#: src/main/xmli18n-tmp.h:176 msgid "Canon BJC-2000" msgstr "Canon BJC-2000" -#: src/main/xmli18n-tmp.h:157 +#: src/main/xmli18n-tmp.h:177 msgid "Canon BJC-2010" msgstr "Canon BJC-2010" -#: src/main/xmli18n-tmp.h:158 +#: src/main/xmli18n-tmp.h:178 msgid "Canon BJC-2100" msgstr "Canon BJC-2100" -#: src/main/xmli18n-tmp.h:159 +#: src/main/xmli18n-tmp.h:179 msgid "Canon BJC-2110" msgstr "Canon BJC-2110" -#: src/main/xmli18n-tmp.h:160 +#: src/main/xmli18n-tmp.h:180 msgid "Canon BJC-3000" msgstr "Canon BJC-3000" -#: src/main/xmli18n-tmp.h:161 +#: src/main/xmli18n-tmp.h:181 msgid "Canon BJC-4000" msgstr "Canon BJC-4000" -#: src/main/xmli18n-tmp.h:162 +#: src/main/xmli18n-tmp.h:182 msgid "Canon BJC-4300" msgstr "Canon BJC-4300" -#: src/main/xmli18n-tmp.h:163 +#: src/main/xmli18n-tmp.h:183 msgid "Canon BJC-4400" msgstr "Canon BJC-4400" -#: src/main/xmli18n-tmp.h:164 -#, fuzzy +#: src/main/xmli18n-tmp.h:184 msgid "Canon BJC-5100" -msgstr "Canon BJC-1000" +msgstr "Canon BJC-5100" -#: src/main/xmli18n-tmp.h:165 -#, fuzzy +#: src/main/xmli18n-tmp.h:185 msgid "Canon BJC-5500" -msgstr "Canon BJC-6500" +msgstr "Canon BJC-5500" -#: src/main/xmli18n-tmp.h:166 +#: src/main/xmli18n-tmp.h:186 msgid "Canon BJC-6000" msgstr "Canon BJC-6000" -#: src/main/xmli18n-tmp.h:167 +#: src/main/xmli18n-tmp.h:187 msgid "Canon BJC-6100" msgstr "Canon BJC-6100" -#: src/main/xmli18n-tmp.h:168 +#: src/main/xmli18n-tmp.h:188 msgid "Canon BJC-6200" msgstr "Canon BJC-6200" -#: src/main/xmli18n-tmp.h:169 +#: src/main/xmli18n-tmp.h:189 msgid "Canon BJC-6500" msgstr "Canon BJC-6500" -#: src/main/xmli18n-tmp.h:170 +#: src/main/xmli18n-tmp.h:190 msgid "Canon BJC-7000" msgstr "Canon BJC-7000" -#: src/main/xmli18n-tmp.h:171 +#: src/main/xmli18n-tmp.h:191 msgid "Canon BJC-7100" msgstr "Canon BJC-7100" -#: src/main/xmli18n-tmp.h:172 +#: src/main/xmli18n-tmp.h:192 msgid "Canon BJC-8200" msgstr "Canon BJC-8200" -#: src/main/xmli18n-tmp.h:173 -#, fuzzy +#: src/main/xmli18n-tmp.h:193 msgid "Canon BJC-8500" -msgstr "Canon BJC-6500" +msgstr "Canon BJC-8500" -#: src/main/xmli18n-tmp.h:174 +#: src/main/xmli18n-tmp.h:194 msgid "Canon S100" msgstr "Canon S100" -#: src/main/xmli18n-tmp.h:175 +#: src/main/xmli18n-tmp.h:195 msgid "Canon S200" msgstr "Canon S200" -#: src/main/xmli18n-tmp.h:176 +#: src/main/xmli18n-tmp.h:196 msgid "Canon S300" msgstr "Canon S300" -#: src/main/xmli18n-tmp.h:177 +#: src/main/xmli18n-tmp.h:197 msgid "Canon S400" msgstr "Canon S400" -#: src/main/xmli18n-tmp.h:178 +#: src/main/xmli18n-tmp.h:198 msgid "Canon S450" msgstr "Canon S450" -#: src/main/xmli18n-tmp.h:179 +#: src/main/xmli18n-tmp.h:199 msgid "Canon S500" msgstr "Canon S500" -#: src/main/xmli18n-tmp.h:180 +#: src/main/xmli18n-tmp.h:200 msgid "Canon S600" msgstr "Canon S600" -#: src/main/xmli18n-tmp.h:181 +#: src/main/xmli18n-tmp.h:201 msgid "Canon S630" msgstr "Canon S630" -#: src/main/xmli18n-tmp.h:182 +#: src/main/xmli18n-tmp.h:202 msgid "Canon S800" msgstr "Canon S800" -#: src/main/xmli18n-tmp.h:183 +#: src/main/xmli18n-tmp.h:203 msgid "Canon S4500" msgstr "Canon S4500" -#: src/main/xmli18n-tmp.h:184 -#, fuzzy +#: src/main/xmli18n-tmp.h:204 msgid "Canon PIXMA iP2000" -msgstr "Canon iP4000" +msgstr "Canon PIXMA iP2000" -#: src/main/xmli18n-tmp.h:185 -#, fuzzy +#: src/main/xmli18n-tmp.h:205 msgid "Canon PIXMA iP3000" -msgstr "Canon iP4000" +msgstr "Canon PIXMA iP3000" -#: src/main/xmli18n-tmp.h:186 -#, fuzzy +#: src/main/xmli18n-tmp.h:206 msgid "Canon PIXMA iP3100" -msgstr "Canon CP-300" +msgstr "Canon PIXMA iP3100" -#: src/main/xmli18n-tmp.h:187 -#, fuzzy +#: src/main/xmli18n-tmp.h:207 msgid "Canon PIXMA iP4000" -msgstr "Canon iP4000" +msgstr "Canon PIXMA iP4000" -#: src/main/xmli18n-tmp.h:188 -#, fuzzy +#: src/main/xmli18n-tmp.h:208 msgid "Canon PIXMA iP4100" -msgstr "Canon iP4000" +msgstr "Canon PIXMA iP4100" -#: src/main/xmli18n-tmp.h:189 -#, fuzzy +#: src/main/xmli18n-tmp.h:209 msgid "Canon PIXMA iP4200" -msgstr "Canon iP4000" +msgstr "Canon PIXMA iP4200" -#: src/main/xmli18n-tmp.h:190 -#, fuzzy +#: src/main/xmli18n-tmp.h:210 msgid "Canon PIXMA iP4300" -msgstr "Canon iP4000" +msgstr "Canon PIXMA iP4300" -#: src/main/xmli18n-tmp.h:191 -#, fuzzy +#: src/main/xmli18n-tmp.h:211 msgid "Canon PIXMA iP4500" -msgstr "Canon iP4000" +msgstr "Canon PIXMA iP4500" -#: src/main/xmli18n-tmp.h:192 -#, fuzzy +#: src/main/xmli18n-tmp.h:212 msgid "Canon PIXMA iP5000" -msgstr "Canon iP4000" +msgstr "Canon PIXMA iP5000" -#: src/main/xmli18n-tmp.h:193 -#, fuzzy +#: src/main/xmli18n-tmp.h:213 msgid "Canon PIXMA iP5200" -msgstr "Canon CP-200" +msgstr "Canon PIXMA iP5200" -#: src/main/xmli18n-tmp.h:194 -#, fuzzy +#: src/main/xmli18n-tmp.h:214 msgid "Canon PIXMA iP5300" -msgstr "Canon iP4000" +msgstr "Canon PIXMA iP5300" -#: src/main/xmli18n-tmp.h:195 -#, fuzzy +#: src/main/xmli18n-tmp.h:215 +msgid "Canon PIXMA iP6000D" +msgstr "Canon PIXMA iP6000D" + +#: src/main/xmli18n-tmp.h:216 msgid "Canon PIXMA iP6700" -msgstr "Canon iP4000" +msgstr "Canon PIXMA iP6700" -#: src/main/xmli18n-tmp.h:196 -#, fuzzy +#: src/main/xmli18n-tmp.h:217 msgid "Canon PIXMA iP8500" -msgstr "Canon iP4000" +msgstr "Canon PIXMA iP8500" -#: src/main/xmli18n-tmp.h:197 -#, fuzzy +#: src/main/xmli18n-tmp.h:218 msgid "Canon PIXMA iX5000" -msgstr "Canon iP4000" +msgstr "Canon PIXMA iX5000" -#: src/main/xmli18n-tmp.h:198 -#, fuzzy +#: src/main/xmli18n-tmp.h:219 msgid "Canon PIXMA Pro9500" -msgstr "Canon iP4000" +msgstr "Canon PIXMA Pro9500" -#: src/main/xmli18n-tmp.h:199 -#, fuzzy +#: src/main/xmli18n-tmp.h:220 msgid "Canon PIXMA MP150" -msgstr "Canon CP-300" +msgstr "Canon PIXMA MP150" -#: src/main/xmli18n-tmp.h:200 -#, fuzzy +#: src/main/xmli18n-tmp.h:221 msgid "Canon PIXMA MP170" -msgstr "Canon CP-300" +msgstr "Canon PIXMA MP170" -#: src/main/xmli18n-tmp.h:201 -#, fuzzy +#: src/main/xmli18n-tmp.h:222 msgid "Canon PIXMA MP180" -msgstr "Canon CP-300" +msgstr "Canon PIXMA MP180" -#: src/main/xmli18n-tmp.h:202 -#, fuzzy +#: src/main/xmli18n-tmp.h:223 msgid "Canon PIXMA MP500" -msgstr "Canon iP4000" +msgstr "Canon PIXMA MP500" -#: src/main/xmli18n-tmp.h:203 -#, fuzzy +#: src/main/xmli18n-tmp.h:224 +msgid "Canon PIXMA MP520" +msgstr "Canon PIXMA MP520" + +#: src/main/xmli18n-tmp.h:225 msgid "Canon PIXMA MP610" -msgstr "Canon CP-300" +msgstr "Canon PIXMA MP610" -#: src/main/xmli18n-tmp.h:204 -#, fuzzy +#: src/main/xmli18n-tmp.h:226 msgid "Canon PIXMA MP700" -msgstr "Canon iP4000" +msgstr "Canon PIXMA MP700" -#: src/main/xmli18n-tmp.h:205 -#, fuzzy +#: src/main/xmli18n-tmp.h:227 msgid "Canon PIXMA MP710" -msgstr "Canon CP-300" +msgstr "Canon PIXMA MP710" -#: src/main/xmli18n-tmp.h:206 -#, fuzzy +#: src/main/xmli18n-tmp.h:228 msgid "Canon PIXMA MP730" -msgstr "Canon iP4000" +msgstr "Canon PIXMA MP730" -#: src/main/xmli18n-tmp.h:207 -#, fuzzy +#: src/main/xmli18n-tmp.h:229 msgid "Canon PIXMA MP740" -msgstr "Canon iP4000" +msgstr "Canon PIXMA MP740" -#: src/main/xmli18n-tmp.h:208 -#, fuzzy +#: src/main/xmli18n-tmp.h:230 msgid "Canon PIXMA MP750" -msgstr "Canon iP4000" +msgstr "Canon PIXMA MP750" -#: src/main/xmli18n-tmp.h:209 -#, fuzzy +#: src/main/xmli18n-tmp.h:231 msgid "Canon PIXMA MP760" -msgstr "Canon iP4000" +msgstr "Canon PIXMA MP760" -#: src/main/xmli18n-tmp.h:210 -#, fuzzy +#: src/main/xmli18n-tmp.h:232 msgid "Canon PIXMA MP770" -msgstr "Canon iP4000" +msgstr "Canon PIXMA MP770" -#: src/main/xmli18n-tmp.h:211 -#, fuzzy +#: src/main/xmli18n-tmp.h:233 msgid "Canon PIXMA MP780" -msgstr "Canon iP4000" +msgstr "Canon PIXMA MP780" -#: src/main/xmli18n-tmp.h:212 -#, fuzzy +#: src/main/xmli18n-tmp.h:234 msgid "Canon PIXMA MP790" -msgstr "Canon iP4000" +msgstr "Canon PIXMA MP790" -#: src/main/xmli18n-tmp.h:213 -#, fuzzy +#: src/main/xmli18n-tmp.h:235 msgid "Canon PIXMA MP830" -msgstr "Canon iP4000" +msgstr "Canon PIXMA MP830" -#: src/main/xmli18n-tmp.h:214 -#, fuzzy +#: src/main/xmli18n-tmp.h:236 msgid "Canon PIXUS iP3100" -msgstr "Canon S100" +msgstr "Canon PIXUS iP3100" -#: src/main/xmli18n-tmp.h:215 -#, fuzzy +#: src/main/xmli18n-tmp.h:237 msgid "Canon PIXUS iP4100" -msgstr "Canon iP4000" +msgstr "Canon PIXUS iP4100" -#: src/main/xmli18n-tmp.h:216 -#, fuzzy +#: src/main/xmli18n-tmp.h:238 msgid "Canon i80" -msgstr "Canon S450" +msgstr "Canon i80" -#: src/main/xmli18n-tmp.h:217 -#, fuzzy +#: src/main/xmli18n-tmp.h:239 msgid "Canon i560" -msgstr "Canon S450" +msgstr "Canon i560" -#: src/main/xmli18n-tmp.h:218 -#, fuzzy +#: src/main/xmli18n-tmp.h:240 msgid "Canon i850" -msgstr "Canon S450" +msgstr "Canon i850" -#: src/main/xmli18n-tmp.h:219 -#, fuzzy +#: src/main/xmli18n-tmp.h:241 msgid "Canon i860" -msgstr "Canon S600" +msgstr "Canon i860" -#: src/main/xmli18n-tmp.h:220 -#, fuzzy +#: src/main/xmli18n-tmp.h:242 msgid "Canon i865" -msgstr "Canon BJC-85" +msgstr "Canon i865" -#: src/main/xmli18n-tmp.h:221 +#: src/main/xmli18n-tmp.h:243 msgid "Epson Stylus C20" msgstr "Epson Stylus C20" -#: src/main/xmli18n-tmp.h:222 +#: src/main/xmli18n-tmp.h:244 msgid "Epson Stylus C20SX" msgstr "Epson Stylus C20SX" -#: src/main/xmli18n-tmp.h:223 +#: src/main/xmli18n-tmp.h:245 msgid "Epson Stylus C20UX" msgstr "Epson Stylus C20UX" -#: src/main/xmli18n-tmp.h:224 +#: src/main/xmli18n-tmp.h:246 msgid "Epson Stylus C40" msgstr "Epson Stylus C40" -#: src/main/xmli18n-tmp.h:225 +#: src/main/xmli18n-tmp.h:247 msgid "Epson Stylus C40SX" msgstr "Epson Stylus C40SX" -#: src/main/xmli18n-tmp.h:226 +#: src/main/xmli18n-tmp.h:248 msgid "Epson Stylus C40UX" msgstr "Epson Stylus C40UX" -#: src/main/xmli18n-tmp.h:227 +#: src/main/xmli18n-tmp.h:249 msgid "Epson Stylus C41" msgstr "Epson Stylus C41" -#: src/main/xmli18n-tmp.h:228 +#: src/main/xmli18n-tmp.h:250 msgid "Epson Stylus C41SX" msgstr "Epson Stylus C41SX" -#: src/main/xmli18n-tmp.h:229 +#: src/main/xmli18n-tmp.h:251 msgid "Epson Stylus C41UX" msgstr "Epson Stylus C41UX" -#: src/main/xmli18n-tmp.h:230 +#: src/main/xmli18n-tmp.h:252 msgid "Epson Stylus C42" msgstr "Epson Stylus C42" -#: src/main/xmli18n-tmp.h:231 +#: src/main/xmli18n-tmp.h:253 msgid "Epson Stylus C42SX" msgstr "Epson Stylus C42SX" -#: src/main/xmli18n-tmp.h:232 +#: src/main/xmli18n-tmp.h:254 msgid "Epson Stylus C42UX" msgstr "Epson Stylus C42UX" -#: src/main/xmli18n-tmp.h:233 +#: src/main/xmli18n-tmp.h:255 msgid "Epson Stylus C43" msgstr "Epson Stylus C43" -#: src/main/xmli18n-tmp.h:234 +#: src/main/xmli18n-tmp.h:256 msgid "Epson Stylus C43SX" msgstr "Epson Stylus C43SX" -#: src/main/xmli18n-tmp.h:235 +#: src/main/xmli18n-tmp.h:257 msgid "Epson Stylus C43UX" msgstr "Epson Stylus C43UX" -#: src/main/xmli18n-tmp.h:236 +#: src/main/xmli18n-tmp.h:258 msgid "Epson Stylus C44" msgstr "Epson Stylus C44" -#: src/main/xmli18n-tmp.h:237 +#: src/main/xmli18n-tmp.h:259 msgid "Epson Stylus C44SX" msgstr "Epson Stylus C44SX" -#: src/main/xmli18n-tmp.h:238 +#: src/main/xmli18n-tmp.h:260 msgid "Epson Stylus C44UX" msgstr "Epson Stylus C44UX" -#: src/main/xmli18n-tmp.h:239 +#: src/main/xmli18n-tmp.h:261 msgid "Epson Stylus C45" msgstr "Epson Stylus C45" -#: src/main/xmli18n-tmp.h:240 +#: src/main/xmli18n-tmp.h:262 msgid "Epson Stylus C46" msgstr "Epson Stylus C46" -#: src/main/xmli18n-tmp.h:241 +#: src/main/xmli18n-tmp.h:263 msgid "Epson Stylus C48" msgstr "Epson Stylus C48" -#: src/main/xmli18n-tmp.h:242 +#: src/main/xmli18n-tmp.h:264 msgid "Epson Stylus C50" msgstr "Epson Stylus C50" -#: src/main/xmli18n-tmp.h:243 +#: src/main/xmli18n-tmp.h:265 msgid "Epson Stylus C60" msgstr "Epson Stylus C60" -#: src/main/xmli18n-tmp.h:244 +#: src/main/xmli18n-tmp.h:266 msgid "Epson Stylus C61" msgstr "Epson Stylus C61" -#: src/main/xmli18n-tmp.h:245 +#: src/main/xmli18n-tmp.h:267 msgid "Epson Stylus C62" msgstr "Epson Stylus C62" -#: src/main/xmli18n-tmp.h:246 +#: src/main/xmli18n-tmp.h:268 msgid "Epson Stylus C63" msgstr "Epson Stylus C63" -#: src/main/xmli18n-tmp.h:247 +#: src/main/xmli18n-tmp.h:269 msgid "Epson Stylus C64" msgstr "Epson Stylus C64" -#: src/main/xmli18n-tmp.h:248 +#: src/main/xmli18n-tmp.h:270 msgid "Epson Stylus C65" msgstr "Epson Stylus C65" -#: src/main/xmli18n-tmp.h:249 +#: src/main/xmli18n-tmp.h:271 msgid "Epson Stylus C66" msgstr "Epson Stylus C66" -#: src/main/xmli18n-tmp.h:250 +#: src/main/xmli18n-tmp.h:272 msgid "Epson Stylus C68" msgstr "Epson Stylus C68" -#: src/main/xmli18n-tmp.h:251 +#: src/main/xmli18n-tmp.h:273 msgid "Epson Stylus C70" msgstr "Epson Stylus C70" -#: src/main/xmli18n-tmp.h:252 -#, fuzzy +#: src/main/xmli18n-tmp.h:274 msgid "Epson Stylus C79" -msgstr "Epson Stylus C70" +msgstr "Epson Stylus C79" -#: src/main/xmli18n-tmp.h:253 +#: src/main/xmli18n-tmp.h:275 msgid "Epson Stylus C80" msgstr "Epson Stylus C80" -#: src/main/xmli18n-tmp.h:254 +#: src/main/xmli18n-tmp.h:276 msgid "Epson Stylus C82" msgstr "Epson Stylus C82" -#: src/main/xmli18n-tmp.h:255 +#: src/main/xmli18n-tmp.h:277 msgid "Epson Stylus C83" msgstr "Epson Stylus C83" -#: src/main/xmli18n-tmp.h:256 +#: src/main/xmli18n-tmp.h:278 msgid "Epson Stylus C84" msgstr "Epson Stylus C84" -#: src/main/xmli18n-tmp.h:257 +#: src/main/xmli18n-tmp.h:279 msgid "Epson Stylus C85" msgstr "Epson Stylus C85" -#: src/main/xmli18n-tmp.h:258 +#: src/main/xmli18n-tmp.h:280 msgid "Epson Stylus C86" msgstr "Epson Stylus C86" -#: src/main/xmli18n-tmp.h:259 -#, fuzzy +#: src/main/xmli18n-tmp.h:281 msgid "Epson Stylus C87" -msgstr "Epson Stylus C48" +msgstr "Epson Stylus C87" -#: src/main/xmli18n-tmp.h:260 +#: src/main/xmli18n-tmp.h:282 msgid "Epson Stylus C88" msgstr "Epson Stylus C88" -#: src/main/xmli18n-tmp.h:261 -#, fuzzy +#: src/main/xmli18n-tmp.h:283 msgid "Epson Stylus C110" -msgstr "Epson Stylus C20" +msgstr "Epson Stylus C110" -#: src/main/xmli18n-tmp.h:262 -#, fuzzy +#: src/main/xmli18n-tmp.h:284 msgid "Epson Stylus C120" -msgstr "Epson Stylus C20" +msgstr "Epson Stylus C120" -#: src/main/xmli18n-tmp.h:263 +#: src/main/xmli18n-tmp.h:285 msgid "Epson Stylus Color" msgstr "Epson Stylus Color" -#: src/main/xmli18n-tmp.h:264 +#: src/main/xmli18n-tmp.h:286 msgid "Epson Stylus Color I" msgstr "Epson Stylus Color I" -#: src/main/xmli18n-tmp.h:265 +#: src/main/xmli18n-tmp.h:287 msgid "Epson Stylus Color II" msgstr "Epson Stylus Color II" -#: src/main/xmli18n-tmp.h:266 +#: src/main/xmli18n-tmp.h:288 msgid "Epson Stylus Color IIs" msgstr "Epson Stylus Color IIs" -#: src/main/xmli18n-tmp.h:267 +#: src/main/xmli18n-tmp.h:289 msgid "Epson Stylus Color PRO" msgstr "Epson Stylus Color PRO" -#: src/main/xmli18n-tmp.h:268 +#: src/main/xmli18n-tmp.h:290 msgid "Epson Stylus Pro XL" msgstr "Epson Stylus Pro XL" -#: src/main/xmli18n-tmp.h:269 +#: src/main/xmli18n-tmp.h:291 msgid "Epson Stylus Color 400" msgstr "Epson Stylus Color 400" -#: src/main/xmli18n-tmp.h:270 +#: src/main/xmli18n-tmp.h:292 msgid "Epson Stylus Color 440" msgstr "Epson Stylus Color 440" -#: src/main/xmli18n-tmp.h:271 +#: src/main/xmli18n-tmp.h:293 msgid "Epson Stylus Color 460" msgstr "Epson Stylus Color 460" -#: src/main/xmli18n-tmp.h:272 +#: src/main/xmli18n-tmp.h:294 msgid "Epson Stylus Color 480" msgstr "Epson Stylus Color 480" -#: src/main/xmli18n-tmp.h:273 +#: src/main/xmli18n-tmp.h:295 msgid "Epson Stylus Color 500" msgstr "Epson Stylus Color 500" -#: src/main/xmli18n-tmp.h:274 +#: src/main/xmli18n-tmp.h:296 msgid "Epson Stylus Color 580" msgstr "Epson Stylus Color 580" -#: src/main/xmli18n-tmp.h:275 +#: src/main/xmli18n-tmp.h:297 msgid "Epson Stylus Color 600" msgstr "Epson Stylus Color 600" -#: src/main/xmli18n-tmp.h:276 +#: src/main/xmli18n-tmp.h:298 msgid "Epson Stylus Color 640" msgstr "Epson Stylus Color 640" -#: src/main/xmli18n-tmp.h:277 +#: src/main/xmli18n-tmp.h:299 msgid "Epson Stylus Color 660" msgstr "Epson Stylus Color 660" -#: src/main/xmli18n-tmp.h:278 +#: src/main/xmli18n-tmp.h:300 msgid "Epson Stylus Color 670" msgstr "Epson Stylus Color 670" -#: src/main/xmli18n-tmp.h:279 +#: src/main/xmli18n-tmp.h:301 msgid "Epson Stylus Color 680" msgstr "Epson Stylus Color 680" -#: src/main/xmli18n-tmp.h:280 +#: src/main/xmli18n-tmp.h:302 msgid "Epson Stylus Color 740" msgstr "Epson Stylus Color 740" -#: src/main/xmli18n-tmp.h:281 +#: src/main/xmli18n-tmp.h:303 msgid "Epson Stylus Color 760" msgstr "Epson Stylus Color 760" -#: src/main/xmli18n-tmp.h:282 +#: src/main/xmli18n-tmp.h:304 msgid "Epson Stylus Color 777" msgstr "Epson Stylus Color 777" -#: src/main/xmli18n-tmp.h:283 +#: src/main/xmli18n-tmp.h:305 msgid "Epson Stylus Color 800" msgstr "Epson Stylus Color 800" -#: src/main/xmli18n-tmp.h:284 +#: src/main/xmli18n-tmp.h:306 msgid "Epson Stylus Color 850" msgstr "Epson Stylus Color 850" -#: src/main/xmli18n-tmp.h:285 +#: src/main/xmli18n-tmp.h:307 msgid "Epson Stylus Color 860" msgstr "Epson Stylus Color 860" -#: src/main/xmli18n-tmp.h:286 +#: src/main/xmli18n-tmp.h:308 msgid "Epson Stylus Color 880" msgstr "Epson Stylus Color 880" -#: src/main/xmli18n-tmp.h:287 +#: src/main/xmli18n-tmp.h:309 msgid "Epson Stylus Color 8 3" msgstr "Epson Stylus Color 8 3" -#: src/main/xmli18n-tmp.h:288 +#: src/main/xmli18n-tmp.h:310 msgid "Epson Stylus Color 900" msgstr "Epson Stylus Color 900" -#: src/main/xmli18n-tmp.h:289 +#: src/main/xmli18n-tmp.h:311 msgid "Epson Stylus Color 980" msgstr "Epson Stylus Color 980" -#: src/main/xmli18n-tmp.h:290 +#: src/main/xmli18n-tmp.h:312 msgid "Epson Stylus Color 1160" msgstr "Epson Stylus Color 1160" -#: src/main/xmli18n-tmp.h:291 +#: src/main/xmli18n-tmp.h:313 msgid "Epson Stylus Color 1500" msgstr "Epson Stylus Color 1500" -#: src/main/xmli18n-tmp.h:292 +#: src/main/xmli18n-tmp.h:314 msgid "Epson Stylus Color 1520" msgstr "Epson Stylus Color 1520" -#: src/main/xmli18n-tmp.h:293 +#: src/main/xmli18n-tmp.h:315 msgid "Epson Stylus Color 3000" msgstr "Epson Stylus Color 3000" -#: src/main/xmli18n-tmp.h:294 +#: src/main/xmli18n-tmp.h:316 msgid "Epson Stylus Photo" msgstr "Epson Stylus Photo" -#: src/main/xmli18n-tmp.h:295 +#: src/main/xmli18n-tmp.h:317 msgid "Epson Stylus Photo 700" msgstr "Epson Stylus Photo 700" -#: src/main/xmli18n-tmp.h:296 +#: src/main/xmli18n-tmp.h:318 msgid "Epson Stylus Photo EX" msgstr "Epson Stylus Photo EX" -#: src/main/xmli18n-tmp.h:297 +#: src/main/xmli18n-tmp.h:319 msgid "Epson Stylus Photo EX3" msgstr "Epson Stylus Photo EX3" -#: src/main/xmli18n-tmp.h:298 +#: src/main/xmli18n-tmp.h:320 msgid "Epson Stylus Photo 720" msgstr "Epson Stylus Photo 720" -#: src/main/xmli18n-tmp.h:299 +#: src/main/xmli18n-tmp.h:321 msgid "Epson Stylus Photo 750" msgstr "Epson Stylus Photo 750" -#: src/main/xmli18n-tmp.h:300 +#: src/main/xmli18n-tmp.h:322 msgid "Epson Stylus Photo 780" msgstr "Epson Stylus Photo 780" -#: src/main/xmli18n-tmp.h:301 +#: src/main/xmli18n-tmp.h:323 msgid "Epson Stylus Photo 785" msgstr "Epson Stylus Photo 785" -#: src/main/xmli18n-tmp.h:302 +#: src/main/xmli18n-tmp.h:324 msgid "Epson Stylus Photo 790" msgstr "Epson Stylus Photo 790" -#: src/main/xmli18n-tmp.h:303 +#: src/main/xmli18n-tmp.h:325 msgid "Epson Stylus Photo 810" msgstr "Epson Stylus Photo 810" -#: src/main/xmli18n-tmp.h:304 +#: src/main/xmli18n-tmp.h:326 msgid "Epson Stylus Photo 820" msgstr "Epson Stylus Photo 820" -#: src/main/xmli18n-tmp.h:305 +#: src/main/xmli18n-tmp.h:327 msgid "Epson Stylus Photo 825" msgstr "Epson Stylus Photo 825" -#: src/main/xmli18n-tmp.h:306 +#: src/main/xmli18n-tmp.h:328 msgid "Epson Stylus Photo 830" msgstr "Epson Stylus Photo 830" -#: src/main/xmli18n-tmp.h:307 +#: src/main/xmli18n-tmp.h:329 msgid "Epson Stylus Photo 830U" msgstr "Epson Stylus Photo 830U" -#: src/main/xmli18n-tmp.h:308 +#: src/main/xmli18n-tmp.h:330 msgid "Epson Stylus Photo 870" msgstr "Epson Stylus Photo 870" -#: src/main/xmli18n-tmp.h:309 +#: src/main/xmli18n-tmp.h:331 msgid "Epson Stylus Photo 875" msgstr "Epson Stylus Photo 875" -#: src/main/xmli18n-tmp.h:310 +#: src/main/xmli18n-tmp.h:332 msgid "Epson Stylus Photo 890" msgstr "Epson Stylus Photo 890" -#: src/main/xmli18n-tmp.h:311 +#: src/main/xmli18n-tmp.h:333 msgid "Epson Stylus Photo 895" msgstr "Epson Stylus Photo 895" -#: src/main/xmli18n-tmp.h:312 +#: src/main/xmli18n-tmp.h:334 msgid "Epson Stylus Photo 900" msgstr "Epson Stylus Photo 900" -#: src/main/xmli18n-tmp.h:313 +#: src/main/xmli18n-tmp.h:335 msgid "Epson Stylus Photo 915" msgstr "Epson Stylus Photo 915" -#: src/main/xmli18n-tmp.h:314 +#: src/main/xmli18n-tmp.h:336 msgid "Epson Stylus Photo 925" msgstr "Epson Stylus Photo 925" -#: src/main/xmli18n-tmp.h:315 +#: src/main/xmli18n-tmp.h:337 msgid "Epson Stylus Photo 935" msgstr "Epson Stylus Photo 935" -#: src/main/xmli18n-tmp.h:316 +#: src/main/xmli18n-tmp.h:338 msgid "Epson Stylus Photo 950" msgstr "Epson Stylus Photo 950" -#: src/main/xmli18n-tmp.h:317 +#: src/main/xmli18n-tmp.h:339 msgid "Epson Stylus Photo 960" msgstr "Epson Stylus Photo 960" -#: src/main/xmli18n-tmp.h:318 +#: src/main/xmli18n-tmp.h:340 msgid "Epson Stylus Photo 1200" msgstr "Epson Stylus Photo 1200" -#: src/main/xmli18n-tmp.h:319 +#: src/main/xmli18n-tmp.h:341 msgid "Epson Stylus Photo 1270" msgstr "Epson Stylus Photo 1270" -#: src/main/xmli18n-tmp.h:320 +#: src/main/xmli18n-tmp.h:342 msgid "Epson Stylus Photo 1280" msgstr "Epson Stylus Photo 1280" -#: src/main/xmli18n-tmp.h:321 +#: src/main/xmli18n-tmp.h:343 msgid "Epson Stylus Photo 1290" msgstr "Epson Stylus Photo 1290" -#: src/main/xmli18n-tmp.h:322 -#, fuzzy +#: src/main/xmli18n-tmp.h:344 msgid "Epson Stylus Photo 1400" -msgstr "Epson Stylus Photo 1200" +msgstr "Epson Stylus Photo 1400" -#: src/main/xmli18n-tmp.h:323 -#, fuzzy +#: src/main/xmli18n-tmp.h:345 msgid "Epson Stylus Photo 1410" -msgstr "Epson Stylus Photo 810" +msgstr "Epson Stylus Photo 1410" -#: src/main/xmli18n-tmp.h:324 +#: src/main/xmli18n-tmp.h:346 msgid "Epson Stylus Photo 2000P" msgstr "Epson Stylus Photo 2000P" -#: src/main/xmli18n-tmp.h:325 +#: src/main/xmli18n-tmp.h:347 msgid "Epson Stylus Photo 2100" msgstr "Epson Stylus Photo 2100" -#: src/main/xmli18n-tmp.h:326 +#: src/main/xmli18n-tmp.h:348 msgid "Epson Stylus Photo 2200" msgstr "Epson Stylus Photo 2200" -#: src/main/xmli18n-tmp.h:327 +#: src/main/xmli18n-tmp.h:349 msgid "Epson Stylus Photo R200" msgstr "Epson Stylus Photo R200" -#: src/main/xmli18n-tmp.h:328 +#: src/main/xmli18n-tmp.h:350 msgid "Epson Stylus Photo R210" msgstr "Epson Stylus Photo R210" -#: src/main/xmli18n-tmp.h:329 +#: src/main/xmli18n-tmp.h:351 msgid "Epson Stylus Photo R220" msgstr "Epson Stylus Photo R220" -#: src/main/xmli18n-tmp.h:330 -#, fuzzy +#: src/main/xmli18n-tmp.h:352 msgid "Epson Stylus Photo R230" -msgstr "Epson Stylus Photo R200" +msgstr "Epson Stylus Photo R230" -#: src/main/xmli18n-tmp.h:331 -#, fuzzy +#: src/main/xmli18n-tmp.h:353 msgid "Epson Stylus Photo R240" -msgstr "Epson Stylus Photo R2400" +msgstr "Epson Stylus Photo R240" -#: src/main/xmli18n-tmp.h:332 -#, fuzzy +#: src/main/xmli18n-tmp.h:354 msgid "Epson Stylus Photo R245" -msgstr "Epson Stylus Photo RX425" +msgstr "Epson Stylus Photo R245" -#: src/main/xmli18n-tmp.h:333 -#, fuzzy +#: src/main/xmli18n-tmp.h:355 msgid "Epson Stylus Photo R260" -msgstr "Epson Stylus Photo R200" +msgstr "Epson Stylus Photo R260" -#: src/main/xmli18n-tmp.h:334 -#, fuzzy +#: src/main/xmli18n-tmp.h:356 msgid "Epson Stylus Photo R265" -msgstr "Epson Stylus Photo RX425" +msgstr "Epson Stylus Photo R265" -#: src/main/xmli18n-tmp.h:335 -#, fuzzy +#: src/main/xmli18n-tmp.h:357 msgid "Epson Stylus Photo R270" -msgstr "Epson Stylus Photo 1270" +msgstr "Epson Stylus Photo R270" -#: src/main/xmli18n-tmp.h:336 +#: src/main/xmli18n-tmp.h:358 +msgid "Epson Stylus Photo R280" +msgstr "Epson Stylus Photo R280" + +#: src/main/xmli18n-tmp.h:359 +msgid "Epson Stylus Photo R285" +msgstr "Epson Stylus Photo R285" + +#: src/main/xmli18n-tmp.h:360 msgid "Epson Stylus Photo R300" msgstr "Epson Stylus Photo R300" -#: src/main/xmli18n-tmp.h:337 +#: src/main/xmli18n-tmp.h:361 msgid "Epson Stylus Photo R310" msgstr "Epson Stylus Photo R310" -#: src/main/xmli18n-tmp.h:338 +#: src/main/xmli18n-tmp.h:362 msgid "Epson Stylus Photo R320" msgstr "Epson Stylus Photo R320" -#: src/main/xmli18n-tmp.h:339 +#: src/main/xmli18n-tmp.h:363 msgid "Epson Stylus Photo R340" msgstr "Epson Stylus Photo R340" -#: src/main/xmli18n-tmp.h:340 -#, fuzzy +#: src/main/xmli18n-tmp.h:364 msgid "Epson Stylus Photo R350" -msgstr "Epson Stylus Photo R300" +msgstr "Epson Stylus Photo R350" -#: src/main/xmli18n-tmp.h:341 -#, fuzzy +#: src/main/xmli18n-tmp.h:365 msgid "Epson Stylus Photo R360" -msgstr "Epson Stylus Photo R300" +msgstr "Epson Stylus Photo R360" -#: src/main/xmli18n-tmp.h:342 -#, fuzzy +#: src/main/xmli18n-tmp.h:366 msgid "Epson Stylus Photo R380" -msgstr "Epson Stylus Photo R300" +msgstr "Epson Stylus Photo R380" -#: src/main/xmli18n-tmp.h:343 -#, fuzzy +#: src/main/xmli18n-tmp.h:367 msgid "Epson Stylus Photo R390" -msgstr "Epson Stylus Photo R300" +msgstr "Epson Stylus Photo R390" -#: src/main/xmli18n-tmp.h:344 +#: src/main/xmli18n-tmp.h:368 msgid "Epson Stylus Photo RX400" msgstr "Epson Stylus Photo RX400" -#: src/main/xmli18n-tmp.h:345 +#: src/main/xmli18n-tmp.h:369 msgid "Epson Stylus Photo RX420" msgstr "Epson Stylus Photo RX420" -#: src/main/xmli18n-tmp.h:346 +#: src/main/xmli18n-tmp.h:370 msgid "Epson Stylus Photo RX425" msgstr "Epson Stylus Photo RX425" -#: src/main/xmli18n-tmp.h:347 +#: src/main/xmli18n-tmp.h:371 msgid "Epson Stylus Photo RX430" msgstr "Epson Stylus Photo RX430" -#: src/main/xmli18n-tmp.h:348 +#: src/main/xmli18n-tmp.h:372 msgid "Epson Stylus Photo RX500" msgstr "Epson Stylus Photo RX500" -#: src/main/xmli18n-tmp.h:349 +#: src/main/xmli18n-tmp.h:373 msgid "Epson Stylus Photo RX510" msgstr "Epson Stylus Photo RX510" -#: src/main/xmli18n-tmp.h:350 -#, fuzzy +#: src/main/xmli18n-tmp.h:374 msgid "Epson Stylus Photo RX560" -msgstr "Epson Stylus Photo RX500" +msgstr "Epson Stylus Photo RX560" -#: src/main/xmli18n-tmp.h:351 -#, fuzzy +#: src/main/xmli18n-tmp.h:375 msgid "Epson Stylus Photo RX580" -msgstr "Epson Stylus Photo RX500" +msgstr "Epson Stylus Photo RX580" -#: src/main/xmli18n-tmp.h:352 -#, fuzzy +#: src/main/xmli18n-tmp.h:376 +msgid "Epson Stylus Photo RX585" +msgstr "Epson Stylus Photo RX585" + +#: src/main/xmli18n-tmp.h:377 msgid "Epson Stylus Photo RX590" -msgstr "Epson Stylus Photo RX500" +msgstr "Epson Stylus Photo RX590" -#: src/main/xmli18n-tmp.h:353 -#, fuzzy +#: src/main/xmli18n-tmp.h:378 msgid "Epson Stylus Photo RX595" -msgstr "Epson Stylus Photo RX500" +msgstr "Epson Stylus Photo RX595" -#: src/main/xmli18n-tmp.h:354 +#: src/main/xmli18n-tmp.h:379 msgid "Epson Stylus Photo RX600" msgstr "Epson Stylus Photo RX600" -#: src/main/xmli18n-tmp.h:355 +#: src/main/xmli18n-tmp.h:380 msgid "Epson Stylus Photo RX620" msgstr "Epson Stylus Photo RX620" -#: src/main/xmli18n-tmp.h:356 +#: src/main/xmli18n-tmp.h:381 msgid "Epson Stylus Photo RX630" msgstr "Epson Stylus Photo RX630" -#: src/main/xmli18n-tmp.h:357 -#, fuzzy +#: src/main/xmli18n-tmp.h:382 msgid "Epson Stylus Photo RX640" -msgstr "Epson Stylus Photo RX400" +msgstr "Epson Stylus Photo RX640" -#: src/main/xmli18n-tmp.h:358 +#: src/main/xmli18n-tmp.h:383 +msgid "Epson Stylus Photo RX680" +msgstr "Epson Stylus Photo RX680" + +#: src/main/xmli18n-tmp.h:384 +msgid "Epson Stylus Photo RX685" +msgstr "Epson Stylus Photo RX685" + +#: src/main/xmli18n-tmp.h:385 msgid "Epson Stylus Photo RX700" msgstr "Epson Stylus Photo RX700" -#: src/main/xmli18n-tmp.h:359 +#: src/main/xmli18n-tmp.h:386 msgid "Epson Stylus Photo R800" msgstr "Epson Stylus Photo R800" -#: src/main/xmli18n-tmp.h:360 +#: src/main/xmli18n-tmp.h:387 msgid "Epson Stylus Photo R1800" msgstr "Epson Stylus Photo R1800" -#: src/main/xmli18n-tmp.h:361 +#: src/main/xmli18n-tmp.h:388 msgid "Epson Stylus Photo R2400" msgstr "Epson Stylus Photo R2400" -#: src/main/xmli18n-tmp.h:362 +#: src/main/xmli18n-tmp.h:389 msgid "Epson Stylus Pro 5000" msgstr "Epson Stylus Pro 5000" -#: src/main/xmli18n-tmp.h:363 +#: src/main/xmli18n-tmp.h:390 msgid "Epson Stylus Pro 5500" msgstr "Epson Stylus Pro 5500" -#: src/main/xmli18n-tmp.h:364 +#: src/main/xmli18n-tmp.h:391 msgid "Epson Stylus Pro 7000" msgstr "Epson Stylus Pro 7000" -#: src/main/xmli18n-tmp.h:365 +#: src/main/xmli18n-tmp.h:392 msgid "Epson Stylus Pro 7500" msgstr "Epson Stylus Pro 7500" -#: src/main/xmli18n-tmp.h:366 +#: src/main/xmli18n-tmp.h:393 msgid "Epson Stylus Pro 7600" msgstr "Epson Stylus Pro 7600" -#: src/main/xmli18n-tmp.h:367 +#: src/main/xmli18n-tmp.h:394 msgid "Epson Stylus Pro 9000" msgstr "Epson Stylus Pro 9000" -#: src/main/xmli18n-tmp.h:368 +#: src/main/xmli18n-tmp.h:395 msgid "Epson Stylus Pro 9500" msgstr "Epson Stylus Pro 9500" -#: src/main/xmli18n-tmp.h:369 +#: src/main/xmli18n-tmp.h:396 msgid "Epson Stylus Pro 9600" msgstr "Epson Stylus Pro 9600" -#: src/main/xmli18n-tmp.h:370 +#: src/main/xmli18n-tmp.h:397 msgid "Epson Stylus Pro 10000" msgstr "Epson Stylus Pro 10000" -#: src/main/xmli18n-tmp.h:371 +#: src/main/xmli18n-tmp.h:398 msgid "Epson Stylus Scan 2000" msgstr "Epson Stylus Scan 2000" -#: src/main/xmli18n-tmp.h:372 +#: src/main/xmli18n-tmp.h:399 msgid "Epson Stylus Scan 2500" msgstr "Epson Stylus Scan 2500" -#: src/main/xmli18n-tmp.h:373 +#: src/main/xmli18n-tmp.h:400 msgid "Epson Stylus CX1500" msgstr "Epson Stylus CX1500" -#: src/main/xmli18n-tmp.h:374 +#: src/main/xmli18n-tmp.h:401 msgid "Epson Stylus CX3100" msgstr "Epson Stylus CX3100" -#: src/main/xmli18n-tmp.h:375 +#: src/main/xmli18n-tmp.h:402 msgid "Epson Stylus CX3200" msgstr "Epson Stylus CX3200" -#: src/main/xmli18n-tmp.h:376 +#: src/main/xmli18n-tmp.h:403 msgid "Epson Stylus CX3500" msgstr "Epson Stylus CX3500" -#: src/main/xmli18n-tmp.h:377 +#: src/main/xmli18n-tmp.h:404 msgid "Epson Stylus CX3600" msgstr "Epson Stylus CX3600" -#: src/main/xmli18n-tmp.h:378 +#: src/main/xmli18n-tmp.h:405 msgid "Epson Stylus CX3650" msgstr "Epson Stylus CX3650" -#: src/main/xmli18n-tmp.h:379 +#: src/main/xmli18n-tmp.h:406 msgid "Epson Stylus CX3700" msgstr "Epson Stylus CX3700" -#: src/main/xmli18n-tmp.h:380 +#: src/main/xmli18n-tmp.h:407 msgid "Epson Stylus CX3800" msgstr "Epson Stylus CX3800" -#: src/main/xmli18n-tmp.h:381 +#: src/main/xmli18n-tmp.h:408 msgid "Epson Stylus CX3805" msgstr "Epson Stylus CX3805" -#: src/main/xmli18n-tmp.h:382 +#: src/main/xmli18n-tmp.h:409 msgid "Epson Stylus CX3810" msgstr "Epson Stylus CX3810" -#: src/main/xmli18n-tmp.h:383 +#: src/main/xmli18n-tmp.h:410 msgid "Epson Stylus CX4100" msgstr "Epson Stylus CX4100" -#: src/main/xmli18n-tmp.h:384 +#: src/main/xmli18n-tmp.h:411 msgid "Epson Stylus CX4200" msgstr "Epson Stylus CX4200" -#: src/main/xmli18n-tmp.h:385 -#, fuzzy +#: src/main/xmli18n-tmp.h:412 msgid "Epson Stylus CX4400" -msgstr "Epson Stylus CX4100" +msgstr "Epson Stylus CX4400" -#: src/main/xmli18n-tmp.h:386 +#: src/main/xmli18n-tmp.h:413 msgid "Epson Stylus CX4500" msgstr "Epson Stylus CX4500" -#: src/main/xmli18n-tmp.h:387 +#: src/main/xmli18n-tmp.h:414 msgid "Epson Stylus CX4600" msgstr "Epson Stylus CX4600" -#: src/main/xmli18n-tmp.h:388 +#: src/main/xmli18n-tmp.h:415 msgid "Epson Stylus CX4700" msgstr "Epson Stylus CX4700" -#: src/main/xmli18n-tmp.h:389 +#: src/main/xmli18n-tmp.h:416 msgid "Epson Stylus CX4800" msgstr "Epson Stylus CX4800" -#: src/main/xmli18n-tmp.h:390 -#, fuzzy +#: src/main/xmli18n-tmp.h:417 msgid "Epson Stylus CX4900" -msgstr "Epson Stylus CX4100" +msgstr "Epson Stylus CX4900" -#: src/main/xmli18n-tmp.h:391 -#, fuzzy +#: src/main/xmli18n-tmp.h:418 msgid "Epson Stylus CX5000" -msgstr "Epson Stylus CX1500" +msgstr "Epson Stylus CX5000" -#: src/main/xmli18n-tmp.h:392 -#, fuzzy +#: src/main/xmli18n-tmp.h:419 msgid "Epson Stylus CX5000F" -msgstr "Epson Stylus CX1500" +msgstr "Epson Stylus CX5000F" -#: src/main/xmli18n-tmp.h:393 +#: src/main/xmli18n-tmp.h:420 msgid "Epson Stylus CX5100" msgstr "Epson Stylus CX5100" -#: src/main/xmli18n-tmp.h:394 +#: src/main/xmli18n-tmp.h:421 msgid "Epson Stylus CX5200" msgstr "Epson Stylus CX5200" -#: src/main/xmli18n-tmp.h:395 +#: src/main/xmli18n-tmp.h:422 msgid "Epson Stylus CX5300" msgstr "Epson Stylus CX5300" -#: src/main/xmli18n-tmp.h:396 +#: src/main/xmli18n-tmp.h:423 msgid "Epson Stylus CX5400" msgstr "Epson Stylus CX5400" -#: src/main/xmli18n-tmp.h:397 -#, fuzzy +#: src/main/xmli18n-tmp.h:424 msgid "Epson Stylus CX5600" -msgstr "Epson Stylus CX1500" +msgstr "Epson Stylus CX5600" -#: src/main/xmli18n-tmp.h:398 +#: src/main/xmli18n-tmp.h:425 msgid "Epson Stylus CX5700" msgstr "Epson Stylus CX5700" -#: src/main/xmli18n-tmp.h:399 +#: src/main/xmli18n-tmp.h:426 msgid "Epson Stylus CX5800" msgstr "Epson Stylus CX5800" -#: src/main/xmli18n-tmp.h:400 -#, fuzzy +#: src/main/xmli18n-tmp.h:427 msgid "Epson Stylus CX6000" -msgstr "Epson Stylus CX3600" +msgstr "Epson Stylus CX6000" -#: src/main/xmli18n-tmp.h:401 +#: src/main/xmli18n-tmp.h:428 msgid "Epson Stylus CX6300" msgstr "Epson Stylus CX6300" -#: src/main/xmli18n-tmp.h:402 +#: src/main/xmli18n-tmp.h:429 msgid "Epson Stylus CX6400" msgstr "Epson Stylus CX6400" -#: src/main/xmli18n-tmp.h:403 +#: src/main/xmli18n-tmp.h:430 msgid "Epson Stylus CX6500" msgstr "Epson Stylus CX6500" -#: src/main/xmli18n-tmp.h:404 +#: src/main/xmli18n-tmp.h:431 msgid "Epson Stylus CX6600" msgstr "Epson Stylus CX6600" -#: src/main/xmli18n-tmp.h:405 -#, fuzzy +#: src/main/xmli18n-tmp.h:432 msgid "Epson Stylus CX7000F" -msgstr "Epson Stylus CX3700" +msgstr "Epson Stylus CX7000F" -#: src/main/xmli18n-tmp.h:406 -#, fuzzy +#: src/main/xmli18n-tmp.h:433 msgid "Epson Stylus CX7400" -msgstr "Epson Stylus CX3700" +msgstr "Epson Stylus CX7400" -#: src/main/xmli18n-tmp.h:407 +#: src/main/xmli18n-tmp.h:434 msgid "Epson Stylus CX7700" msgstr "Epson Stylus CX7700" -#: src/main/xmli18n-tmp.h:408 +#: src/main/xmli18n-tmp.h:435 msgid "Epson Stylus CX7800" msgstr "Epson Stylus CX7800" -#: src/main/xmli18n-tmp.h:409 +#: src/main/xmli18n-tmp.h:436 msgid "Epson Stylus CX8300" msgstr "Epson Stylus CX8300" -#: src/main/xmli18n-tmp.h:410 +#: src/main/xmli18n-tmp.h:437 msgid "Epson Stylus CX8400" msgstr "Epson Stylus CX8400" -#: src/main/xmli18n-tmp.h:411 -#, fuzzy +#: src/main/xmli18n-tmp.h:438 msgid "Epson Stylus CX9400" -msgstr "Epson Stylus CX4100" +msgstr "Epson Stylus CX9400" -#: src/main/xmli18n-tmp.h:412 +#: src/main/xmli18n-tmp.h:439 msgid "Epson Stylus D68" msgstr "Epson Stylus D68" -#: src/main/xmli18n-tmp.h:413 +#: src/main/xmli18n-tmp.h:440 msgid "Epson Stylus D88" msgstr "Epson Stylus D88" -#: src/main/xmli18n-tmp.h:414 -#, fuzzy +#: src/main/xmli18n-tmp.h:441 +msgid "Epson Stylus D92" +msgstr "Epson Stylus D92" + +#: src/main/xmli18n-tmp.h:442 msgid "Epson Stylus D120" -msgstr "Epson Stylus C20" +msgstr "Epson Stylus D120" -#: src/main/xmli18n-tmp.h:415 +#: src/main/xmli18n-tmp.h:443 msgid "Epson Stylus DX3800" msgstr "Epson Stylus DX3800" -#: src/main/xmli18n-tmp.h:416 +#: src/main/xmli18n-tmp.h:444 msgid "Epson Stylus DX3850" msgstr "Epson Stylus DX3850" -#: src/main/xmli18n-tmp.h:417 -#, fuzzy +#: src/main/xmli18n-tmp.h:445 msgid "Epson Stylus DX4050" -msgstr "Epson Stylus DX4200" +msgstr "Epson Stylus DX4050" -#: src/main/xmli18n-tmp.h:418 +#: src/main/xmli18n-tmp.h:446 msgid "Epson Stylus DX4200" msgstr "Epson Stylus DX4200" -#: src/main/xmli18n-tmp.h:419 +#: src/main/xmli18n-tmp.h:447 msgid "Epson Stylus DX4250" msgstr "Epson Stylus DX4250" -#: src/main/xmli18n-tmp.h:420 +#: src/main/xmli18n-tmp.h:448 +msgid "Epson Stylus DX4400" +msgstr "Epson Stylus DX4400" + +#: src/main/xmli18n-tmp.h:449 +msgid "Epson Stylus DX4450" +msgstr "Epson Stylus DX4450" + +#: src/main/xmli18n-tmp.h:450 msgid "Epson Stylus DX4800" msgstr "Epson Stylus DX4800" -#: src/main/xmli18n-tmp.h:421 +#: src/main/xmli18n-tmp.h:451 +msgid "Epson Stylus DX7000F" +msgstr "Epson Stylus DX7000F" + +#: src/main/xmli18n-tmp.h:452 +msgid "Epson Stylus DX7400" +msgstr "Epson Stylus DX7400" + +#: src/main/xmli18n-tmp.h:453 +msgid "Epson Stylus DX7450" +msgstr "Epson Stylus DX7450" + +#: src/main/xmli18n-tmp.h:454 +msgid "Epson Stylus DX8400" +msgstr "Epson Stylus DX8400" + +#: src/main/xmli18n-tmp.h:455 +msgid "Epson Stylus DX8450" +msgstr "Epson Stylus DX8450" + +#: src/main/xmli18n-tmp.h:456 msgid "Epson PictureMate" msgstr "Epson PictureMate" -#: src/main/xmli18n-tmp.h:422 +#: src/main/xmli18n-tmp.h:457 +msgid "Epson PictureMate Dash" +msgstr "Epson PictureMate Dash" + +#: src/main/xmli18n-tmp.h:458 msgid "Epson PictureMate Deluxe" msgstr "Epson PictureMate Deluxe" -#: src/main/xmli18n-tmp.h:423 -#, fuzzy +#: src/main/xmli18n-tmp.h:459 msgid "Epson PictureMate Flash" -msgstr "Epson PictureMate" +msgstr "Epson PictureMate Flash" -#: src/main/xmli18n-tmp.h:424 -#, fuzzy +#: src/main/xmli18n-tmp.h:460 msgid "Epson PictureMate Pal" -msgstr "Epson PictureMate" +msgstr "Epson PictureMate Pal" -#: src/main/xmli18n-tmp.h:425 -#, fuzzy +#: src/main/xmli18n-tmp.h:461 msgid "Epson PictureMate Snap" -msgstr "Epson PictureMate" +msgstr "Epson PictureMate Snap" -#: src/main/xmli18n-tmp.h:426 -#, fuzzy +#: src/main/xmli18n-tmp.h:462 +msgid "Epson PictureMate 100" +msgstr "Epson PictureMate 100" + +#: src/main/xmli18n-tmp.h:463 msgid "Epson PictureMate 200" -msgstr "Epson PictureMate" +msgstr "Epson PictureMate 200" -#: src/main/xmli18n-tmp.h:427 -#, fuzzy +#: src/main/xmli18n-tmp.h:464 msgid "Epson PictureMate 210" -msgstr "Epson PictureMate" +msgstr "Epson PictureMate 210" -#: src/main/xmli18n-tmp.h:428 -#, fuzzy +#: src/main/xmli18n-tmp.h:465 msgid "Epson PictureMate 240" -msgstr "Epson PictureMate" +msgstr "Epson PictureMate 240" -#: src/main/xmli18n-tmp.h:429 -#, fuzzy +#: src/main/xmli18n-tmp.h:466 msgid "Epson PictureMate 250" -msgstr "Epson PictureMate" +msgstr "Epson PictureMate 250" -#: src/main/xmli18n-tmp.h:430 -#, fuzzy +#: src/main/xmli18n-tmp.h:467 +msgid "Epson PictureMate 260" +msgstr "Epson PictureMate 260" + +#: src/main/xmli18n-tmp.h:468 +msgid "Epson PictureMate 270" +msgstr "Epson PictureMate 270" + +#: src/main/xmli18n-tmp.h:469 msgid "Epson PictureMate 280" -msgstr "Epson PictureMate" +msgstr "Epson PictureMate 280" -#: src/main/xmli18n-tmp.h:431 +#: src/main/xmli18n-tmp.h:470 +msgid "Epson PictureMate 290" +msgstr "Epson PictureMate 290" + +#: src/main/xmli18n-tmp.h:471 +msgid "Epson PictureMate 500" +msgstr "Epson PictureMate 500" + +#: src/main/xmli18n-tmp.h:472 +msgid "Epson PictureMate 2005" +msgstr "Epson PictureMate 2005" + +#: src/main/xmli18n-tmp.h:473 msgid "Epson CL 700" msgstr "Epson CL 700" -#: src/main/xmli18n-tmp.h:432 +#: src/main/xmli18n-tmp.h:474 msgid "Epson CL 750" msgstr "Epson CL 750" -#: src/main/xmli18n-tmp.h:433 +#: src/main/xmli18n-tmp.h:475 msgid "Epson CL 760" msgstr "Epson CL 760" -#: src/main/xmli18n-tmp.h:434 +#: src/main/xmli18n-tmp.h:476 msgid "Epson E 100" msgstr "Epson E 100" -#: src/main/xmli18n-tmp.h:435 +#: src/main/xmli18n-tmp.h:477 msgid "Epson E 150" msgstr "Epson E 150" -#: src/main/xmli18n-tmp.h:436 +#: src/main/xmli18n-tmp.h:478 msgid "Epson E 200" msgstr "Epson E 200" -#: src/main/xmli18n-tmp.h:437 +#: src/main/xmli18n-tmp.h:479 +msgid "Epson E 300" +msgstr "Epson E 300" + +#: src/main/xmli18n-tmp.h:480 +msgid "Epson E 500" +msgstr "Epson E 500" + +#: src/main/xmli18n-tmp.h:481 +msgid "Epson E 520" +msgstr "Epson E 520" + +#: src/main/xmli18n-tmp.h:482 +msgid "Epson E 700" +msgstr "Epson E 700" + +#: src/main/xmli18n-tmp.h:483 +msgid "Epson E 720" +msgstr "Epson E 720" + +#: src/main/xmli18n-tmp.h:484 msgid "Epson EM 900C" msgstr "Epson EM 900C" -#: src/main/xmli18n-tmp.h:438 +#: src/main/xmli18n-tmp.h:485 msgid "Epson EM 930C" msgstr "Epson EM 930C" -#: src/main/xmli18n-tmp.h:439 +#: src/main/xmli18n-tmp.h:486 msgid "Epson MC 2000" msgstr "Epson MC 2000" -#: src/main/xmli18n-tmp.h:440 +#: src/main/xmli18n-tmp.h:487 msgid "Epson MC 5000" msgstr "Epson MC 5000" -#: src/main/xmli18n-tmp.h:441 +#: src/main/xmli18n-tmp.h:488 msgid "Epson MC 7000" msgstr "Epson MC 7000" -#: src/main/xmli18n-tmp.h:442 +#: src/main/xmli18n-tmp.h:489 msgid "Epson MC 9000" msgstr "Epson MC 9000" -#: src/main/xmli18n-tmp.h:443 +#: src/main/xmli18n-tmp.h:490 msgid "Epson MC 10000" msgstr "Epson MC 10000" -#: src/main/xmli18n-tmp.h:444 +#: src/main/xmli18n-tmp.h:491 msgid "Epson MJ 930C" msgstr "Epson MJ 930C" -#: src/main/xmli18n-tmp.h:445 +#: src/main/xmli18n-tmp.h:492 msgid "Epson MJ 5100C" msgstr "Epson MJ 5100C" -#: src/main/xmli18n-tmp.h:446 +#: src/main/xmli18n-tmp.h:493 msgid "Epson MJ 6000C" msgstr "Epson MJ 6000C" -#: src/main/xmli18n-tmp.h:447 +#: src/main/xmli18n-tmp.h:494 msgid "Epson MJ 8000C" msgstr "Epson MJ 8000C" -#: src/main/xmli18n-tmp.h:448 -#, fuzzy +#: src/main/xmli18n-tmp.h:495 msgid "Epson PM 670C" -msgstr "Epson PM 700C" +msgstr "Epson PM 670C" -#: src/main/xmli18n-tmp.h:449 +#: src/main/xmli18n-tmp.h:496 msgid "Epson PM 700C" msgstr "Epson PM 700C" -#: src/main/xmli18n-tmp.h:450 +#: src/main/xmli18n-tmp.h:497 msgid "Epson PM 730C" msgstr "Epson PM 730C" -#: src/main/xmli18n-tmp.h:451 +#: src/main/xmli18n-tmp.h:498 msgid "Epson PM 740C" msgstr "Epson PM 740C" -#: src/main/xmli18n-tmp.h:452 +#: src/main/xmli18n-tmp.h:499 msgid "Epson PM 750C" msgstr "Epson PM 750C" -#: src/main/xmli18n-tmp.h:453 +#: src/main/xmli18n-tmp.h:500 msgid "Epson PM 760C" msgstr "Epson PM 760C" -#: src/main/xmli18n-tmp.h:454 +#: src/main/xmli18n-tmp.h:501 msgid "Epson PM 770C" msgstr "Epson PM 770C" -#: src/main/xmli18n-tmp.h:455 +#: src/main/xmli18n-tmp.h:502 msgid "Epson PM 780C" msgstr "Epson PM 780C" -#: src/main/xmli18n-tmp.h:456 +#: src/main/xmli18n-tmp.h:503 msgid "Epson PM 790PT" msgstr "Epson PM 790PT" -#: src/main/xmli18n-tmp.h:457 +#: src/main/xmli18n-tmp.h:504 msgid "Epson PM 800C" msgstr "Epson PM 800C" -#: src/main/xmli18n-tmp.h:458 +#: src/main/xmli18n-tmp.h:505 msgid "Epson PM 850PT" msgstr "Epson PM 850PT" -#: src/main/xmli18n-tmp.h:459 +#: src/main/xmli18n-tmp.h:506 msgid "Epson PM 870C" msgstr "Epson PM 870C" -#: src/main/xmli18n-tmp.h:460 +#: src/main/xmli18n-tmp.h:507 msgid "Epson PM 880C" msgstr "Epson PM 880C" -#: src/main/xmli18n-tmp.h:461 +#: src/main/xmli18n-tmp.h:508 msgid "Epson PM 930C" msgstr "Epson PM 930C" -#: src/main/xmli18n-tmp.h:462 +#: src/main/xmli18n-tmp.h:509 msgid "Epson PM 940C" msgstr "Epson PM 940C" -#: src/main/xmli18n-tmp.h:463 +#: src/main/xmli18n-tmp.h:510 msgid "Epson PM 950C" msgstr "Epson PM 950C" -#: src/main/xmli18n-tmp.h:464 +#: src/main/xmli18n-tmp.h:511 msgid "Epson PM 970C" msgstr "Epson PM 970C" -#: src/main/xmli18n-tmp.h:465 +#: src/main/xmli18n-tmp.h:512 msgid "Epson PM 980C" msgstr "Epson PM 980C" -#: src/main/xmli18n-tmp.h:466 +#: src/main/xmli18n-tmp.h:513 msgid "Epson PM 2000C" msgstr "Epson PM 2000C" -#: src/main/xmli18n-tmp.h:467 +#: src/main/xmli18n-tmp.h:514 msgid "Epson PM 2200C" msgstr "Epson PM 2200C" -#: src/main/xmli18n-tmp.h:468 +#: src/main/xmli18n-tmp.h:515 msgid "Epson PM 3000C" msgstr "Epson PM 3000C" -#: src/main/xmli18n-tmp.h:469 +#: src/main/xmli18n-tmp.h:516 msgid "Epson PM 3300C" msgstr "Epson PM 3300C" -#: src/main/xmli18n-tmp.h:470 +#: src/main/xmli18n-tmp.h:517 msgid "Epson PM 3500C" msgstr "Epson PM 3500C" -#: src/main/xmli18n-tmp.h:471 +#: src/main/xmli18n-tmp.h:518 msgid "Epson PM 3700C" msgstr "Epson PM 3700C" -#: src/main/xmli18n-tmp.h:472 +#: src/main/xmli18n-tmp.h:519 msgid "Epson PM 4000PX" msgstr "Epson PM 4000PX" -#: src/main/xmli18n-tmp.h:473 +#: src/main/xmli18n-tmp.h:520 msgid "Epson PM 5000C" msgstr "Epson PM 5000C" -#: src/main/xmli18n-tmp.h:474 +#: src/main/xmli18n-tmp.h:521 msgid "Epson PM 7000C" msgstr "Epson PM 7000C" -#: src/main/xmli18n-tmp.h:475 +#: src/main/xmli18n-tmp.h:522 msgid "Epson PM 9000C" msgstr "Epson PM 9000C" -#: src/main/xmli18n-tmp.h:476 +#: src/main/xmli18n-tmp.h:523 msgid "Epson PM 10000" msgstr "Epson PM 10000" -#: src/main/xmli18n-tmp.h:477 +#: src/main/xmli18n-tmp.h:524 msgid "Epson PM A650" msgstr "Epson PM A650" -#: src/main/xmli18n-tmp.h:478 +#: src/main/xmli18n-tmp.h:525 msgid "Epson PM A750" msgstr "Epson PM A750" -#: src/main/xmli18n-tmp.h:479 -#, fuzzy +#: src/main/xmli18n-tmp.h:526 msgid "Epson PM A820" -msgstr "Epson PM A890" +msgstr "Epson PM A820" -#: src/main/xmli18n-tmp.h:480 +#: src/main/xmli18n-tmp.h:527 msgid "Epson PM A890" msgstr "Epson PM A890" -#: src/main/xmli18n-tmp.h:481 +#: src/main/xmli18n-tmp.h:528 msgid "Epson PM A900" msgstr "Epson PM A900" -#: src/main/xmli18n-tmp.h:482 +#: src/main/xmli18n-tmp.h:529 msgid "Epson PM A950" msgstr "Epson PM A950" -#: src/main/xmli18n-tmp.h:483 +#: src/main/xmli18n-tmp.h:530 msgid "Epson PM D600" msgstr "Epson PM D600" -#: src/main/xmli18n-tmp.h:484 +#: src/main/xmli18n-tmp.h:531 msgid "Epson PM D750" msgstr "Epson PM D750" -#: src/main/xmli18n-tmp.h:485 +#: src/main/xmli18n-tmp.h:532 msgid "Epson PM D770" msgstr "Epson PM D770" -#: src/main/xmli18n-tmp.h:486 +#: src/main/xmli18n-tmp.h:533 msgid "Epson PM D800" msgstr "Epson PM D800" -#: src/main/xmli18n-tmp.h:487 -#, fuzzy +#: src/main/xmli18n-tmp.h:534 msgid "Epson PM D870" -msgstr "Epson PM 870C" +msgstr "Epson PM D870" -#: src/main/xmli18n-tmp.h:488 +#: src/main/xmli18n-tmp.h:535 msgid "Epson PM D1000" msgstr "Epson PM D1000" -#: src/main/xmli18n-tmp.h:489 +#: src/main/xmli18n-tmp.h:536 msgid "Epson PM G700" msgstr "Epson PM G700" -#: src/main/xmli18n-tmp.h:490 +#: src/main/xmli18n-tmp.h:537 msgid "Epson PM G720" msgstr "Epson PM G720" -#: src/main/xmli18n-tmp.h:491 +#: src/main/xmli18n-tmp.h:538 msgid "Epson PM G730" msgstr "Epson PM G730" -#: src/main/xmli18n-tmp.h:492 +#: src/main/xmli18n-tmp.h:539 msgid "Epson PM G800" msgstr "Epson PM G800" -#: src/main/xmli18n-tmp.h:493 +#: src/main/xmli18n-tmp.h:540 msgid "Epson PM G820" msgstr "Epson PM G820" -#: src/main/xmli18n-tmp.h:494 -#, fuzzy +#: src/main/xmli18n-tmp.h:541 msgid "Epson PM G850" -msgstr "Epson PM G800" +msgstr "Epson PM G850" -#: src/main/xmli18n-tmp.h:495 -#, fuzzy +#: src/main/xmli18n-tmp.h:542 msgid "Epson PM G4500" -msgstr "Epson PM G700" +msgstr "Epson PM G4500" -#: src/main/xmli18n-tmp.h:496 +#: src/main/xmli18n-tmp.h:543 msgid "Epson PX A650" msgstr "Epson PX A650" -#: src/main/xmli18n-tmp.h:497 +#: src/main/xmli18n-tmp.h:544 msgid "Epson PX G900" msgstr "Epson PX G900" -#: src/main/xmli18n-tmp.h:498 +#: src/main/xmli18n-tmp.h:545 msgid "Epson PX G920" msgstr "Epson PX G920" -#: src/main/xmli18n-tmp.h:499 +#: src/main/xmli18n-tmp.h:546 msgid "Epson PX G5000" msgstr "Epson PX G5000" -#: src/main/xmli18n-tmp.h:500 +#: src/main/xmli18n-tmp.h:547 msgid "Epson PX V500" msgstr "Epson PX V500" -#: src/main/xmli18n-tmp.h:501 +#: src/main/xmli18n-tmp.h:548 msgid "Epson PX V600" msgstr "Epson PX V600" -#: src/main/xmli18n-tmp.h:502 +#: src/main/xmli18n-tmp.h:549 msgid "Epson PX V630" msgstr "Epson PX V630" -#: src/main/xmli18n-tmp.h:503 -#, fuzzy +#: src/main/xmli18n-tmp.h:550 msgid "Epson PX V780" -msgstr "Epson PM 780C" +msgstr "Epson PX V780" -#: src/main/xmli18n-tmp.h:504 +#: src/main/xmli18n-tmp.h:551 msgid "Epson PX 5500" msgstr "Epson PX 5500" -#: src/main/xmli18n-tmp.h:505 +#: src/main/xmli18n-tmp.h:552 msgid "Epson PX 7000" msgstr "Epson PX 7000" -#: src/main/xmli18n-tmp.h:506 +#: src/main/xmli18n-tmp.h:553 msgid "Epson PX 9000" msgstr "Epson PX 9000" -#: src/main/xmli18n-tmp.h:507 +#: src/main/xmli18n-tmp.h:554 msgid "Apollo P-2100" msgstr "Apollo P-2100" -#: src/main/xmli18n-tmp.h:508 +#: src/main/xmli18n-tmp.h:555 msgid "Apollo P-2150" msgstr "Apollo P-2150" -#: src/main/xmli18n-tmp.h:509 +#: src/main/xmli18n-tmp.h:556 msgid "Apollo P-2200" msgstr "Apollo P-2200" -#: src/main/xmli18n-tmp.h:510 +#: src/main/xmli18n-tmp.h:557 msgid "Apollo P-2250" msgstr "Apollo P-2250" -#: src/main/xmli18n-tmp.h:511 +#: src/main/xmli18n-tmp.h:558 msgid "Apollo P-2500" msgstr "Apollo P-2500" -#: src/main/xmli18n-tmp.h:512 +#: src/main/xmli18n-tmp.h:559 msgid "Apollo P-2550" msgstr "Apollo P-2550" -#: src/main/xmli18n-tmp.h:513 +#: src/main/xmli18n-tmp.h:560 msgid "Apollo P-2600" msgstr "Apollo P-2600" -#: src/main/xmli18n-tmp.h:514 +#: src/main/xmli18n-tmp.h:561 msgid "Apollo P-2650" msgstr "Apollo P-2650" -#: src/main/xmli18n-tmp.h:515 +#: src/main/xmli18n-tmp.h:562 msgid "Apple Color StyleWriter 4100" msgstr "Apple Color StyleWriter 4100" -#: src/main/xmli18n-tmp.h:516 +#: src/main/xmli18n-tmp.h:563 msgid "Apple Color StyleWriter 4500" msgstr "Apple Color StyleWriter 4500" -#: src/main/xmli18n-tmp.h:517 +#: src/main/xmli18n-tmp.h:564 msgid "Apple Color StyleWriter 6500" msgstr "Apple Color StyleWriter 6500" -#: src/main/xmli18n-tmp.h:518 +#: src/main/xmli18n-tmp.h:565 msgid "Apple LaserWriter Select 360" msgstr "Apple LaserWriter Select 360" -#: src/main/xmli18n-tmp.h:519 +#: src/main/xmli18n-tmp.h:566 msgid "Brother DCP-1200" msgstr "Brother DCP-1200" -#: src/main/xmli18n-tmp.h:520 +#: src/main/xmli18n-tmp.h:567 msgid "Brother HL-4Ve" msgstr "Brother HL-4Ve" -#: src/main/xmli18n-tmp.h:521 +#: src/main/xmli18n-tmp.h:568 msgid "Brother HL-10V" msgstr "Brother HL-10V" -#: src/main/xmli18n-tmp.h:522 +#: src/main/xmli18n-tmp.h:569 msgid "Brother HL-10h" msgstr "Brother HL-10h" -#: src/main/xmli18n-tmp.h:523 +#: src/main/xmli18n-tmp.h:570 msgid "Brother HL-630" msgstr "Brother HL-630" -#: src/main/xmli18n-tmp.h:524 +#: src/main/xmli18n-tmp.h:571 msgid "Brother HL-660" msgstr "Brother HL-660" -#: src/main/xmli18n-tmp.h:525 +#: src/main/xmli18n-tmp.h:572 msgid "Brother HL-760" msgstr "Brother HL-760" -#: src/main/xmli18n-tmp.h:526 +#: src/main/xmli18n-tmp.h:573 msgid "Brother HL-960" msgstr "Brother HL-960" -#: src/main/xmli18n-tmp.h:527 +#: src/main/xmli18n-tmp.h:574 msgid "Brother HL-1040" msgstr "Brother HL-1040" -#: src/main/xmli18n-tmp.h:528 +#: src/main/xmli18n-tmp.h:575 msgid "Brother HL-1050" msgstr "Brother HL-1050" -#: src/main/xmli18n-tmp.h:529 +#: src/main/xmli18n-tmp.h:576 msgid "Brother HL-1060" msgstr "Brother HL-1060" -#: src/main/xmli18n-tmp.h:530 +#: src/main/xmli18n-tmp.h:577 msgid "Brother HL-1070" msgstr "Brother HL-1070" -#: src/main/xmli18n-tmp.h:531 +#: src/main/xmli18n-tmp.h:578 msgid "Brother HL-1240" msgstr "Brother HL-1240" -#: src/main/xmli18n-tmp.h:532 +#: src/main/xmli18n-tmp.h:579 msgid "Brother HL-1250" msgstr "Brother HL-1250" -#: src/main/xmli18n-tmp.h:533 +#: src/main/xmli18n-tmp.h:580 msgid "Brother HL-1260" msgstr "Brother HL-1260" -#: src/main/xmli18n-tmp.h:534 +#: src/main/xmli18n-tmp.h:581 msgid "Brother HL-1270N" msgstr "Brother HL-1270N" -#: src/main/xmli18n-tmp.h:535 +#: src/main/xmli18n-tmp.h:582 msgid "Brother HL-1440" msgstr "Brother HL-1440" -#: src/main/xmli18n-tmp.h:536 +#: src/main/xmli18n-tmp.h:583 msgid "Brother HL-1660e" msgstr "Brother HL-1660e" -#: src/main/xmli18n-tmp.h:537 +#: src/main/xmli18n-tmp.h:584 msgid "Brother HL-2060" msgstr "Brother HL-2060" -#: src/main/xmli18n-tmp.h:538 +#: src/main/xmli18n-tmp.h:585 msgid "Brother MFC-6550MC" msgstr "Brother MFC-6550MC" -#: src/main/xmli18n-tmp.h:539 +#: src/main/xmli18n-tmp.h:586 msgid "Brother MFC-8300" msgstr "Brother MFC-8300" -#: src/main/xmli18n-tmp.h:540 +#: src/main/xmli18n-tmp.h:587 msgid "Brother MFC-9500" msgstr "Brother MFC-9500" -#: src/main/xmli18n-tmp.h:541 +#: src/main/xmli18n-tmp.h:588 msgid "Brother MFC-9600" msgstr "Brother MFC-9600" -#: src/main/xmli18n-tmp.h:542 +#: src/main/xmli18n-tmp.h:589 msgid "Canon GP 335" msgstr "Canon GP 335" -#: src/main/xmli18n-tmp.h:543 +#: src/main/xmli18n-tmp.h:590 msgid "Canon LBP-4sx" msgstr "Canon LBP-4sx" -#: src/main/xmli18n-tmp.h:544 +#: src/main/xmli18n-tmp.h:591 msgid "Canon LBP-430" msgstr "Canon LBP-430" -#: src/main/xmli18n-tmp.h:545 +#: src/main/xmli18n-tmp.h:592 msgid "Canon LBP-1000" msgstr "Canon LBP-1000" -#: src/main/xmli18n-tmp.h:546 +#: src/main/xmli18n-tmp.h:593 msgid "Canon LBP-1260" msgstr "Canon LBP-1260" -#: src/main/xmli18n-tmp.h:547 +#: src/main/xmli18n-tmp.h:594 msgid "Canon LBP-1760" msgstr "Canon LBP-1760" -#: src/main/xmli18n-tmp.h:548 +#: src/main/xmli18n-tmp.h:595 msgid "Canon imageRunner 330s" msgstr "Canon imageRunner 330s" -#: src/main/xmli18n-tmp.h:549 +#: src/main/xmli18n-tmp.h:596 msgid "Citizen ProJet II" msgstr "Citizen ProJet II" -#: src/main/xmli18n-tmp.h:550 +#: src/main/xmli18n-tmp.h:597 msgid "DEC 1800" msgstr "DEC 1800" -#: src/main/xmli18n-tmp.h:551 +#: src/main/xmli18n-tmp.h:598 msgid "DEC LN17" msgstr "DEC LN17" -#: src/main/xmli18n-tmp.h:552 +#: src/main/xmli18n-tmp.h:599 msgid "Epson ActionLaser 1100" msgstr "Epson ActionLaser 1100" -#: src/main/xmli18n-tmp.h:553 +#: src/main/xmli18n-tmp.h:600 msgid "Epson ActionLaser II" msgstr "Epson ActionLaser II" -#: src/main/xmli18n-tmp.h:554 +#: src/main/xmli18n-tmp.h:601 msgid "Epson AcuLaser C2000" msgstr "Epson AcuLaser C2000" -#: src/main/xmli18n-tmp.h:555 +#: src/main/xmli18n-tmp.h:602 msgid "Epson AcuLaser C2000PS" msgstr "Epson AcuLaser C2000PS" -#: src/main/xmli18n-tmp.h:556 +#: src/main/xmli18n-tmp.h:603 msgid "Epson AcuLaser C8500" msgstr "Epson AcuLaser C8500" -#: src/main/xmli18n-tmp.h:557 +#: src/main/xmli18n-tmp.h:604 msgid "Epson AcuLaser C8500PS" msgstr "Epson AcuLaser C8500PS" -#: src/main/xmli18n-tmp.h:558 +#: src/main/xmli18n-tmp.h:605 msgid "Epson AcuLaser C8600" msgstr "Epson AcuLaser C8600" -#: src/main/xmli18n-tmp.h:559 +#: src/main/xmli18n-tmp.h:606 msgid "Epson AcuLaser C8600PS" msgstr "Epson AcuLaser C8600PS" -#: src/main/xmli18n-tmp.h:560 +#: src/main/xmli18n-tmp.h:607 msgid "Epson EPL-5200" msgstr "Epson EPL-5200" -#: src/main/xmli18n-tmp.h:561 +#: src/main/xmli18n-tmp.h:608 msgid "Epson EPL-5200+" msgstr "Epson EPL-5200+" -#: src/main/xmli18n-tmp.h:562 +#: src/main/xmli18n-tmp.h:609 msgid "Epson EPL-5700" msgstr "Epson EPL-5700" -#: src/main/xmli18n-tmp.h:563 +#: src/main/xmli18n-tmp.h:610 msgid "Epson EPL-5700PS" msgstr "Epson EPL-5700PS" -#: src/main/xmli18n-tmp.h:564 +#: src/main/xmli18n-tmp.h:611 msgid "Epson EPL-5800" msgstr "Epson EPL-5800" -#: src/main/xmli18n-tmp.h:565 +#: src/main/xmli18n-tmp.h:612 msgid "Epson EPL-5800PS" msgstr "Epson EPL-5800PS" -#: src/main/xmli18n-tmp.h:566 +#: src/main/xmli18n-tmp.h:613 msgid "Epson EPL-5900" msgstr "Epson EPL-5900" -#: src/main/xmli18n-tmp.h:567 +#: src/main/xmli18n-tmp.h:614 msgid "Epson EPL-5900PS" msgstr "Epson EPL-5900PS" -#: src/main/xmli18n-tmp.h:568 +#: src/main/xmli18n-tmp.h:615 msgid "Epson EPL-6100" msgstr "Epson EPL-6100" -#: src/main/xmli18n-tmp.h:569 +#: src/main/xmli18n-tmp.h:616 msgid "Epson EPL-6100PS" msgstr "Epson EPL-6100PS" -#: src/main/xmli18n-tmp.h:570 +#: src/main/xmli18n-tmp.h:617 msgid "Epson EPL-7100" msgstr "Epson EPL-7100" -#: src/main/xmli18n-tmp.h:571 +#: src/main/xmli18n-tmp.h:618 msgid "Fujitsu PrintPartner 10V" msgstr "Fujitsu PrintPartner 10V" -#: src/main/xmli18n-tmp.h:572 +#: src/main/xmli18n-tmp.h:619 msgid "Fujitsu PrintPartner 16DV" msgstr "Fujitsu PrintPartner 16DV" -#: src/main/xmli18n-tmp.h:573 +#: src/main/xmli18n-tmp.h:620 msgid "Fujitsu PrintPartner 20W" msgstr "Fujitsu PrintPartner 20W" -#: src/main/xmli18n-tmp.h:574 +#: src/main/xmli18n-tmp.h:621 msgid "Fujitsu PrintPartner 8000" msgstr "Fujitsu PrintPartner 8000" -#: src/main/xmli18n-tmp.h:575 +#: src/main/xmli18n-tmp.h:622 msgid "Generic PCL 4 Printer" msgstr "Generic PCL 4 Printer" -#: src/main/xmli18n-tmp.h:576 +#: src/main/xmli18n-tmp.h:623 +#, fuzzy +msgid "Generic PCL 4 LF Printer" +msgstr "Generic PCL 4 Printer" + +#: src/main/xmli18n-tmp.h:624 msgid "Generic PCL 5 Printer" msgstr "Generic PCL 5 Printer" -#: src/main/xmli18n-tmp.h:577 +#: src/main/xmli18n-tmp.h:625 +#, fuzzy +msgid "Generic PCL 5 LF Printer" +msgstr "Generic PCL 5 Printer" + +#: src/main/xmli18n-tmp.h:626 msgid "Generic PCL 5c Printer" msgstr "Generic PCL 5c Printer" -#: src/main/xmli18n-tmp.h:578 +#: src/main/xmli18n-tmp.h:627 +#, fuzzy +msgid "Generic PCL 5c LF Printer" +msgstr "Generic PCL 5c Printer" + +#: src/main/xmli18n-tmp.h:628 msgid "Generic PCL 5e Printer" msgstr "Generic PCL 5e Printer" -#: src/main/xmli18n-tmp.h:579 +#: src/main/xmli18n-tmp.h:629 +#, fuzzy +msgid "Generic PCL 5e LF Printer" +msgstr "Generic PCL 5e Printer" + +#: src/main/xmli18n-tmp.h:630 msgid "Generic PCL 6/PCL XL Printer" msgstr "Generic PCL 6/PCL XL Printer" -#: src/main/xmli18n-tmp.h:580 +#: src/main/xmli18n-tmp.h:631 +#, fuzzy +msgid "Generic PCL 6/PCL XL LF Printer" +msgstr "Generic PCL 6/PCL XL Printer" + +#: src/main/xmli18n-tmp.h:632 msgid "HP Business Inkjet 2200" msgstr "HP Business Inkjet 2200" -#: src/main/xmli18n-tmp.h:581 +#: src/main/xmli18n-tmp.h:633 msgid "HP Business Inkjet 2230" msgstr "HP Business Inkjet 2230" -#: src/main/xmli18n-tmp.h:582 +#: src/main/xmli18n-tmp.h:634 msgid "HP Business Inkjet 2250" msgstr "HP Business Inkjet 2250" -#: src/main/xmli18n-tmp.h:583 +#: src/main/xmli18n-tmp.h:635 msgid "HP Business Inkjet 2250TN" msgstr "HP Business Inkjet 2250TN" -#: src/main/xmli18n-tmp.h:584 +#: src/main/xmli18n-tmp.h:636 msgid "HP Business Inkjet 2280" msgstr "HP Business Inkjet 2280" -#: src/main/xmli18n-tmp.h:585 +#: src/main/xmli18n-tmp.h:637 msgid "HP Color Inkjet Printer CP1160" msgstr "HP Color Inkjet Printer CP1160" -#: src/main/xmli18n-tmp.h:586 +#: src/main/xmli18n-tmp.h:638 msgid "HP Color Inkjet Printer CP1700" msgstr "HP Color Inkjet Printer CP1700" -#: src/main/xmli18n-tmp.h:587 +#: src/main/xmli18n-tmp.h:639 msgid "HP Color LaserJet 2500" msgstr "HP Color LaserJet 2500" -#: src/main/xmli18n-tmp.h:588 +#: src/main/xmli18n-tmp.h:640 msgid "HP Color LaserJet 4500" msgstr "HP Color LaserJet 4500" -#: src/main/xmli18n-tmp.h:589 +#: src/main/xmli18n-tmp.h:641 msgid "HP Color LaserJet 4550" msgstr "HP Color LaserJet 4550" -#: src/main/xmli18n-tmp.h:590 +#: src/main/xmli18n-tmp.h:642 msgid "HP Color LaserJet 4600" msgstr "HP Color LaserJet 4600" -#: src/main/xmli18n-tmp.h:591 +#: src/main/xmli18n-tmp.h:643 msgid "HP Color LaserJet 5" msgstr "HP Color LaserJet 5" -#: src/main/xmli18n-tmp.h:592 +#: src/main/xmli18n-tmp.h:644 msgid "HP Color LaserJet 5000" msgstr "HP Color LaserJet 5000" -#: src/main/xmli18n-tmp.h:593 +#: src/main/xmli18n-tmp.h:645 msgid "HP Color LaserJet 5500" msgstr "HP Color LaserJet 5500" -#: src/main/xmli18n-tmp.h:594 +#: src/main/xmli18n-tmp.h:646 msgid "HP Color LaserJet 8550GN" msgstr "HP Color LaserJet 8550GN" -#: src/main/xmli18n-tmp.h:595 +#: src/main/xmli18n-tmp.h:647 msgid "HP DesignJet 230" msgstr "HP DesignJet 230" -#: src/main/xmli18n-tmp.h:596 +#: src/main/xmli18n-tmp.h:648 msgid "HP DesignJet 250C" msgstr "HP DesignJet 250C" -#: src/main/xmli18n-tmp.h:597 +#: src/main/xmli18n-tmp.h:649 msgid "HP DesignJet 430" msgstr "HP DesignJet 430" -#: src/main/xmli18n-tmp.h:598 +#: src/main/xmli18n-tmp.h:650 msgid "HP DesignJet 450C" msgstr "HP DesignJet 450C" -#: src/main/xmli18n-tmp.h:599 +#: src/main/xmli18n-tmp.h:651 msgid "HP DesignJet 455CA" msgstr "HP DesignJet 455CA" -#: src/main/xmli18n-tmp.h:600 +#: src/main/xmli18n-tmp.h:652 msgid "HP DesignJet 488CA" msgstr "HP DesignJet 488CA" -#: src/main/xmli18n-tmp.h:601 +#: src/main/xmli18n-tmp.h:653 msgid "HP DesignJet 700" msgstr "HP DesignJet 700" -#: src/main/xmli18n-tmp.h:602 +#: src/main/xmli18n-tmp.h:654 msgid "HP DesignJet 750C Plus" msgstr "HP DesignJet 750C Plus" -#: src/main/xmli18n-tmp.h:603 +#: src/main/xmli18n-tmp.h:655 msgid "HP DesignJet 750C" msgstr "HP DesignJet 750C" -#: src/main/xmli18n-tmp.h:604 +#: src/main/xmli18n-tmp.h:656 msgid "HP DesignJet 2500CP" msgstr "HP DesignJet 2500CP" -#: src/main/xmli18n-tmp.h:605 +#: src/main/xmli18n-tmp.h:657 msgid "HP DesignJet 3500CP" msgstr "HP DesignJet 3500CP" -#: src/main/xmli18n-tmp.h:606 +#: src/main/xmli18n-tmp.h:658 msgid "HP DesignJet ColorPro CAD" msgstr "HP DesignJet ColorPro CAD" -#: src/main/xmli18n-tmp.h:607 +#: src/main/xmli18n-tmp.h:659 msgid "HP DeskJet 400" msgstr "HP DeskJet 400" -#: src/main/xmli18n-tmp.h:608 +#: src/main/xmli18n-tmp.h:660 msgid "HP DeskJet 420C" msgstr "HP DeskJet 420C" -#: src/main/xmli18n-tmp.h:609 +#: src/main/xmli18n-tmp.h:661 msgid "HP DeskJet 450" msgstr "HP DeskJet 450" -#: src/main/xmli18n-tmp.h:610 +#: src/main/xmli18n-tmp.h:662 msgid "HP DeskJet 500" msgstr "HP DeskJet 500" -#: src/main/xmli18n-tmp.h:611 +#: src/main/xmli18n-tmp.h:663 msgid "HP DeskJet 500C" msgstr "HP DeskJet 500C" -#: src/main/xmli18n-tmp.h:612 +#: src/main/xmli18n-tmp.h:664 msgid "HP DeskJet 505J Plus" msgstr "HP DeskJet 505J Plus" -#: src/main/xmli18n-tmp.h:613 +#: src/main/xmli18n-tmp.h:665 msgid "HP DeskJet 510" msgstr "HP DeskJet 510" -#: src/main/xmli18n-tmp.h:614 +#: src/main/xmli18n-tmp.h:666 msgid "HP DeskJet 520" msgstr "HP DeskJet 520" -#: src/main/xmli18n-tmp.h:615 +#: src/main/xmli18n-tmp.h:667 msgid "HP DeskJet 540C" msgstr "HP DeskJet 540C" -#: src/main/xmli18n-tmp.h:616 +#: src/main/xmli18n-tmp.h:668 msgid "HP DeskJet 550C" msgstr "HP DeskJet 550C" -#: src/main/xmli18n-tmp.h:617 +#: src/main/xmli18n-tmp.h:669 msgid "HP DeskJet 5550" msgstr "HP DeskJet 5550" -#: src/main/xmli18n-tmp.h:618 +#: src/main/xmli18n-tmp.h:670 msgid "HP DeskJet 5551" msgstr "HP DeskJet 5551" -#: src/main/xmli18n-tmp.h:619 +#: src/main/xmli18n-tmp.h:671 msgid "HP DeskJet 560C" msgstr "HP DeskJet 560C" -#: src/main/xmli18n-tmp.h:620 +#: src/main/xmli18n-tmp.h:672 msgid "HP DeskJet 600" msgstr "HP DeskJet 600" -#: src/main/xmli18n-tmp.h:621 +#: src/main/xmli18n-tmp.h:673 msgid "HP DeskJet 600C" msgstr "HP DeskJet 600C" -#: src/main/xmli18n-tmp.h:622 +#: src/main/xmli18n-tmp.h:674 msgid "HP DeskJet 610C" msgstr "HP DeskJet 610C" -#: src/main/xmli18n-tmp.h:623 +#: src/main/xmli18n-tmp.h:675 msgid "HP DeskJet 610CL" msgstr "HP DeskJet 610CL" -#: src/main/xmli18n-tmp.h:624 +#: src/main/xmli18n-tmp.h:676 msgid "HP DeskJet 6122" msgstr "HP DeskJet 6122" -#: src/main/xmli18n-tmp.h:625 +#: src/main/xmli18n-tmp.h:677 msgid "HP DeskJet 6127" msgstr "HP DeskJet 6127" -#: src/main/xmli18n-tmp.h:626 +#: src/main/xmli18n-tmp.h:678 msgid "HP DeskJet 612C" msgstr "HP DeskJet 612C" -#: src/main/xmli18n-tmp.h:627 +#: src/main/xmli18n-tmp.h:679 msgid "HP DeskJet 640C" msgstr "HP DeskJet 640C" -#: src/main/xmli18n-tmp.h:628 +#: src/main/xmli18n-tmp.h:680 msgid "HP DeskJet 648C" msgstr "HP DeskJet 648C" -#: src/main/xmli18n-tmp.h:629 +#: src/main/xmli18n-tmp.h:681 msgid "HP DeskJet 660C" msgstr "HP DeskJet 660C" -#: src/main/xmli18n-tmp.h:630 +#: src/main/xmli18n-tmp.h:682 msgid "HP DeskJet 670C" msgstr "HP DeskJet 670C" -#: src/main/xmli18n-tmp.h:631 +#: src/main/xmli18n-tmp.h:683 msgid "HP DeskJet 670TV" msgstr "HP DeskJet 670TV" -#: src/main/xmli18n-tmp.h:632 +#: src/main/xmli18n-tmp.h:684 msgid "HP DeskJet 672C" msgstr "HP DeskJet 672C" -#: src/main/xmli18n-tmp.h:633 +#: src/main/xmli18n-tmp.h:685 msgid "HP DeskJet 680C" msgstr "HP DeskJet 680C" -#: src/main/xmli18n-tmp.h:634 +#: src/main/xmli18n-tmp.h:686 msgid "HP DeskJet 682C" msgstr "HP DeskJet 682C" -#: src/main/xmli18n-tmp.h:635 +#: src/main/xmli18n-tmp.h:687 msgid "HP DeskJet 690C" msgstr "HP DeskJet 690C" -#: src/main/xmli18n-tmp.h:636 +#: src/main/xmli18n-tmp.h:688 msgid "HP DeskJet 692C" msgstr "HP DeskJet 692C" -#: src/main/xmli18n-tmp.h:637 +#: src/main/xmli18n-tmp.h:689 msgid "HP DeskJet 693C" msgstr "HP DeskJet 693C" -#: src/main/xmli18n-tmp.h:638 +#: src/main/xmli18n-tmp.h:690 msgid "HP DeskJet 694C" msgstr "HP DeskJet 694C" -#: src/main/xmli18n-tmp.h:639 +#: src/main/xmli18n-tmp.h:691 msgid "HP DeskJet 695C" msgstr "HP DeskJet 695C" -#: src/main/xmli18n-tmp.h:640 +#: src/main/xmli18n-tmp.h:692 msgid "HP DeskJet 697C" msgstr "HP DeskJet 697C" -#: src/main/xmli18n-tmp.h:641 +#: src/main/xmli18n-tmp.h:693 msgid "HP DeskJet 810C" msgstr "HP DeskJet 810C" -#: src/main/xmli18n-tmp.h:642 +#: src/main/xmli18n-tmp.h:694 msgid "HP DeskJet 812C" msgstr "HP DeskJet 812C" -#: src/main/xmli18n-tmp.h:643 +#: src/main/xmli18n-tmp.h:695 msgid "HP DeskJet 815C" msgstr "HP DeskJet 815C" -#: src/main/xmli18n-tmp.h:644 +#: src/main/xmli18n-tmp.h:696 msgid "HP DeskJet 816C" msgstr "HP DeskJet 816C" -#: src/main/xmli18n-tmp.h:645 +#: src/main/xmli18n-tmp.h:697 msgid "HP DeskJet 825C" msgstr "HP DeskJet 825C" -#: src/main/xmli18n-tmp.h:646 +#: src/main/xmli18n-tmp.h:698 msgid "HP DeskJet 830C" msgstr "HP DeskJet 830C" -#: src/main/xmli18n-tmp.h:647 +#: src/main/xmli18n-tmp.h:699 msgid "HP DeskJet 832C" msgstr "HP DeskJet 832C" -#: src/main/xmli18n-tmp.h:648 +#: src/main/xmli18n-tmp.h:700 msgid "HP DeskJet 840C" msgstr "HP DeskJet 840C" -#: src/main/xmli18n-tmp.h:649 +#: src/main/xmli18n-tmp.h:701 msgid "HP DeskJet 841C" msgstr "HP DeskJet 841C" -#: src/main/xmli18n-tmp.h:650 +#: src/main/xmli18n-tmp.h:702 msgid "HP DeskJet 842C" msgstr "HP DeskJet 842C" -#: src/main/xmli18n-tmp.h:651 +#: src/main/xmli18n-tmp.h:703 msgid "HP DeskJet 843C" msgstr "HP DeskJet 843C" -#: src/main/xmli18n-tmp.h:652 +#: src/main/xmli18n-tmp.h:704 msgid "HP DeskJet 845C" msgstr "HP DeskJet 845C" -#: src/main/xmli18n-tmp.h:653 +#: src/main/xmli18n-tmp.h:705 msgid "HP DeskJet 850C" msgstr "HP DeskJet 850C" -#: src/main/xmli18n-tmp.h:654 +#: src/main/xmli18n-tmp.h:706 msgid "HP DeskJet 855C" msgstr "HP DeskJet 855C" -#: src/main/xmli18n-tmp.h:655 +#: src/main/xmli18n-tmp.h:707 msgid "HP DeskJet 870C" msgstr "HP DeskJet 870C" -#: src/main/xmli18n-tmp.h:656 +#: src/main/xmli18n-tmp.h:708 msgid "HP DeskJet 880C" msgstr "HP DeskJet 880C" -#: src/main/xmli18n-tmp.h:657 +#: src/main/xmli18n-tmp.h:709 msgid "HP DeskJet 882C" msgstr "HP DeskJet 882C" -#: src/main/xmli18n-tmp.h:658 +#: src/main/xmli18n-tmp.h:710 msgid "HP DeskJet 890C" msgstr "HP DeskJet 890C" -#: src/main/xmli18n-tmp.h:659 +#: src/main/xmli18n-tmp.h:711 msgid "HP DeskJet 895C" msgstr "HP DeskJet 895C" -#: src/main/xmli18n-tmp.h:660 +#: src/main/xmli18n-tmp.h:712 msgid "HP DeskJet 916C" msgstr "HP DeskJet 916C" -#: src/main/xmli18n-tmp.h:661 +#: src/main/xmli18n-tmp.h:713 msgid "HP DeskJet 920C" msgstr "HP DeskJet 920C" -#: src/main/xmli18n-tmp.h:662 +#: src/main/xmli18n-tmp.h:714 msgid "HP DeskJet 9300" msgstr "HP DeskJet 9300" -#: src/main/xmli18n-tmp.h:663 +#: src/main/xmli18n-tmp.h:715 msgid "HP DeskJet 930C" msgstr "HP DeskJet 930C" -#: src/main/xmli18n-tmp.h:664 +#: src/main/xmli18n-tmp.h:716 msgid "HP DeskJet 932C" msgstr "HP DeskJet 932C" -#: src/main/xmli18n-tmp.h:665 +#: src/main/xmli18n-tmp.h:717 msgid "HP DeskJet 933C" msgstr "HP DeskJet 933C" -#: src/main/xmli18n-tmp.h:666 +#: src/main/xmli18n-tmp.h:718 msgid "HP DeskJet 934C" msgstr "HP DeskJet 934C" -#: src/main/xmli18n-tmp.h:667 +#: src/main/xmli18n-tmp.h:719 msgid "HP DeskJet 935C" msgstr "HP DeskJet 935C" -#: src/main/xmli18n-tmp.h:668 +#: src/main/xmli18n-tmp.h:720 msgid "HP DeskJet 940C" msgstr "HP DeskJet 940C" -#: src/main/xmli18n-tmp.h:669 +#: src/main/xmli18n-tmp.h:721 msgid "HP DeskJet 948C" msgstr "HP DeskJet 948C" -#: src/main/xmli18n-tmp.h:670 +#: src/main/xmli18n-tmp.h:722 msgid "HP DeskJet 950C" msgstr "HP DeskJet 950C" -#: src/main/xmli18n-tmp.h:671 +#: src/main/xmli18n-tmp.h:723 msgid "HP DeskJet 952C" msgstr "HP DeskJet 952C" -#: src/main/xmli18n-tmp.h:672 +#: src/main/xmli18n-tmp.h:724 msgid "HP DeskJet 955C" msgstr "HP DeskJet 955C" -#: src/main/xmli18n-tmp.h:673 +#: src/main/xmli18n-tmp.h:725 msgid "HP DeskJet 957C" msgstr "HP DeskJet 957C" -#: src/main/xmli18n-tmp.h:674 +#: src/main/xmli18n-tmp.h:726 msgid "HP DeskJet 959C" msgstr "HP DeskJet 959C" -#: src/main/xmli18n-tmp.h:675 +#: src/main/xmli18n-tmp.h:727 msgid "HP DeskJet 960C" msgstr "HP DeskJet 960C" -#: src/main/xmli18n-tmp.h:676 +#: src/main/xmli18n-tmp.h:728 msgid "HP DeskJet 970C" msgstr "HP DeskJet 970C" -#: src/main/xmli18n-tmp.h:677 +#: src/main/xmli18n-tmp.h:729 msgid "HP DeskJet 975C" msgstr "HP DeskJet 975C" -#: src/main/xmli18n-tmp.h:678 +#: src/main/xmli18n-tmp.h:730 msgid "HP DeskJet 980C" msgstr "HP DeskJet 980C" -#: src/main/xmli18n-tmp.h:679 +#: src/main/xmli18n-tmp.h:731 msgid "HP DeskJet 990C" msgstr "HP DeskJet 990C" -#: src/main/xmli18n-tmp.h:680 +#: src/main/xmli18n-tmp.h:732 msgid "HP DeskJet 995C" msgstr "HP DeskJet 995C" -#: src/main/xmli18n-tmp.h:681 +#: src/main/xmli18n-tmp.h:733 msgid "HP DeskJet 1100C" msgstr "HP DeskJet 1100C" -#: src/main/xmli18n-tmp.h:682 +#: src/main/xmli18n-tmp.h:734 msgid "HP DeskJet 1120C" msgstr "HP DeskJet 1120C" -#: src/main/xmli18n-tmp.h:683 +#: src/main/xmli18n-tmp.h:735 msgid "HP DeskJet 1125C" msgstr "HP DeskJet 1125C" -#: src/main/xmli18n-tmp.h:684 +#: src/main/xmli18n-tmp.h:736 msgid "HP DeskJet 1200C" msgstr "HP DeskJet 1200C" -#: src/main/xmli18n-tmp.h:685 +#: src/main/xmli18n-tmp.h:737 msgid "HP DeskJet 1220C" msgstr "HP DeskJet 1220C" -#: src/main/xmli18n-tmp.h:686 +#: src/main/xmli18n-tmp.h:738 msgid "HP DeskJet 1600C" msgstr "HP DeskJet 1600C" -#: src/main/xmli18n-tmp.h:687 +#: src/main/xmli18n-tmp.h:739 msgid "HP DeskJet 1600CM" msgstr "HP DeskJet 1600CM" -#: src/main/xmli18n-tmp.h:688 +#: src/main/xmli18n-tmp.h:740 msgid "HP DeskJet 2000" msgstr "HP DeskJet 2000" -#: src/main/xmli18n-tmp.h:689 +#: src/main/xmli18n-tmp.h:741 msgid "HP DeskJet 2500" msgstr "HP DeskJet 2500" -#: src/main/xmli18n-tmp.h:690 +#: src/main/xmli18n-tmp.h:742 msgid "HP DeskJet 2500CM" msgstr "HP DeskJet 2500CM" -#: src/main/xmli18n-tmp.h:691 +#: src/main/xmli18n-tmp.h:743 msgid "HP DeskJet 340C" msgstr "HP DeskJet 340C" -#: src/main/xmli18n-tmp.h:692 +#: src/main/xmli18n-tmp.h:744 msgid "HP DeskJet 3810" msgstr "HP DeskJet 3810" -#: src/main/xmli18n-tmp.h:693 +#: src/main/xmli18n-tmp.h:745 msgid "HP DeskJet 3816" msgstr "HP DeskJet 3816" -#: src/main/xmli18n-tmp.h:694 +#: src/main/xmli18n-tmp.h:746 msgid "HP DeskJet 3820" msgstr "HP DeskJet 3820" -#: src/main/xmli18n-tmp.h:695 +#: src/main/xmli18n-tmp.h:747 msgid "HP DeskJet 3822" msgstr "HP DeskJet 3822" -#: src/main/xmli18n-tmp.h:696 +#: src/main/xmli18n-tmp.h:748 msgid "HP LaserJet 2" msgstr "HP LaserJet 2" -#: src/main/xmli18n-tmp.h:697 +#: src/main/xmli18n-tmp.h:749 msgid "HP LaserJet 2D" msgstr "HP LaserJet 2D" -#: src/main/xmli18n-tmp.h:698 +#: src/main/xmli18n-tmp.h:750 msgid "HP LaserJet 2P Plus" msgstr "HP LaserJet 2P Plus" -#: src/main/xmli18n-tmp.h:699 +#: src/main/xmli18n-tmp.h:751 msgid "HP LaserJet 2P" msgstr "HP LaserJet 2P" -#: src/main/xmli18n-tmp.h:700 +#: src/main/xmli18n-tmp.h:752 msgid "HP LaserJet 3" msgstr "HP LaserJet 3" -#: src/main/xmli18n-tmp.h:701 +#: src/main/xmli18n-tmp.h:753 msgid "HP LaserJet 3D" msgstr "HP LaserJet 3D" -#: src/main/xmli18n-tmp.h:702 +#: src/main/xmli18n-tmp.h:754 msgid "HP LaserJet 3P w/ PCL5" msgstr "HP LaserJet 3P w/ PCL5" -#: src/main/xmli18n-tmp.h:703 +#: src/main/xmli18n-tmp.h:755 msgid "HP LaserJet 3P w/PS" msgstr "HP LaserJet 3P w/PS" -#: src/main/xmli18n-tmp.h:704 +#: src/main/xmli18n-tmp.h:756 msgid "HP LaserJet 4 Plus" msgstr "HP LaserJet 4 Plus" -#: src/main/xmli18n-tmp.h:705 +#: src/main/xmli18n-tmp.h:757 msgid "HP LaserJet 4" msgstr "HP LaserJet 4" -#: src/main/xmli18n-tmp.h:706 +#: src/main/xmli18n-tmp.h:758 msgid "HP LaserJet 4L" msgstr "HP LaserJet 4L" -#: src/main/xmli18n-tmp.h:707 +#: src/main/xmli18n-tmp.h:759 msgid "HP LaserJet 4M" msgstr "HP LaserJet 4M" -#: src/main/xmli18n-tmp.h:708 +#: src/main/xmli18n-tmp.h:760 msgid "HP LaserJet 4ML" msgstr "HP LaserJet 4ML" -#: src/main/xmli18n-tmp.h:709 +#: src/main/xmli18n-tmp.h:761 msgid "HP LaserJet 4P" msgstr "HP LaserJet 4P" -#: src/main/xmli18n-tmp.h:710 +#: src/main/xmli18n-tmp.h:762 msgid "HP LaserJet 4Si" msgstr "HP LaserJet 4Si" -#: src/main/xmli18n-tmp.h:711 +#: src/main/xmli18n-tmp.h:763 msgid "HP LaserJet 4V" msgstr "HP LaserJet 4V" -#: src/main/xmli18n-tmp.h:712 +#: src/main/xmli18n-tmp.h:764 msgid "HP LaserJet 5" msgstr "HP LaserJet 5" -#: src/main/xmli18n-tmp.h:713 +#: src/main/xmli18n-tmp.h:765 msgid "HP LaserJet 5L" msgstr "HP LaserJet 5L" -#: src/main/xmli18n-tmp.h:714 +#: src/main/xmli18n-tmp.h:766 msgid "HP LaserJet 5M" msgstr "HP LaserJet 5M" -#: src/main/xmli18n-tmp.h:715 +#: src/main/xmli18n-tmp.h:767 msgid "HP LaserJet 5MP" msgstr "HP LaserJet 5MP" -#: src/main/xmli18n-tmp.h:716 +#: src/main/xmli18n-tmp.h:768 msgid "HP LaserJet 5P" msgstr "HP LaserJet 5P" -#: src/main/xmli18n-tmp.h:717 +#: src/main/xmli18n-tmp.h:769 msgid "HP LaserJet 5Si" msgstr "HP LaserJet 5Si" -#: src/main/xmli18n-tmp.h:718 +#: src/main/xmli18n-tmp.h:770 msgid "HP LaserJet 6" msgstr "HP LaserJet 6" -#: src/main/xmli18n-tmp.h:719 +#: src/main/xmli18n-tmp.h:771 msgid "HP LaserJet 6L" msgstr "HP LaserJet 6L" -#: src/main/xmli18n-tmp.h:720 +#: src/main/xmli18n-tmp.h:772 msgid "HP LaserJet 6MP" msgstr "HP LaserJet 6MP" -#: src/main/xmli18n-tmp.h:721 +#: src/main/xmli18n-tmp.h:773 msgid "HP LaserJet 6P" msgstr "HP LaserJet 6P" -#: src/main/xmli18n-tmp.h:722 +#: src/main/xmli18n-tmp.h:774 msgid "HP LaserJet 1010" msgstr "HP LaserJet 1010" -#: src/main/xmli18n-tmp.h:723 +#: src/main/xmli18n-tmp.h:775 msgid "HP LaserJet 1012" msgstr "HP LaserJet 1012" -#: src/main/xmli18n-tmp.h:724 +#: src/main/xmli18n-tmp.h:776 msgid "HP LaserJet 1015" msgstr "HP LaserJet 1015" -#: src/main/xmli18n-tmp.h:725 -#, fuzzy +#: src/main/xmli18n-tmp.h:777 msgid "HP LaserJet 1022" -msgstr "HP LaserJet 1012" +msgstr "HP LaserJet 1022" -#: src/main/xmli18n-tmp.h:726 +#: src/main/xmli18n-tmp.h:778 msgid "HP LaserJet 1100" msgstr "HP LaserJet 1100" -#: src/main/xmli18n-tmp.h:727 +#: src/main/xmli18n-tmp.h:779 msgid "HP LaserJet 1100A" msgstr "HP LaserJet 1100A" -#: src/main/xmli18n-tmp.h:728 +#: src/main/xmli18n-tmp.h:780 msgid "HP LaserJet 1150" msgstr "HP LaserJet 1150" -#: src/main/xmli18n-tmp.h:729 +#: src/main/xmli18n-tmp.h:781 msgid "HP LaserJet 1200" msgstr "HP LaserJet 1200" -#: src/main/xmli18n-tmp.h:730 +#: src/main/xmli18n-tmp.h:782 msgid "HP LaserJet 1220" msgstr "HP LaserJet 1220" -#: src/main/xmli18n-tmp.h:731 +#: src/main/xmli18n-tmp.h:783 msgid "HP LaserJet 1300" msgstr "HP LaserJet 1300" -#: src/main/xmli18n-tmp.h:732 +#: src/main/xmli18n-tmp.h:784 msgid "HP LaserJet 2100" msgstr "HP LaserJet 2100" -#: src/main/xmli18n-tmp.h:733 +#: src/main/xmli18n-tmp.h:785 msgid "HP LaserJet 2100M" msgstr "HP LaserJet 2100M" -#: src/main/xmli18n-tmp.h:734 +#: src/main/xmli18n-tmp.h:786 msgid "HP LaserJet 2200" msgstr "HP LaserJet 2200" -#: src/main/xmli18n-tmp.h:735 +#: src/main/xmli18n-tmp.h:787 msgid "HP LaserJet 2300" msgstr "HP LaserJet 2300" -#: src/main/xmli18n-tmp.h:736 +#: src/main/xmli18n-tmp.h:788 msgid "HP LaserJet 3200" msgstr "HP LaserJet 3200" -#: src/main/xmli18n-tmp.h:737 +#: src/main/xmli18n-tmp.h:789 msgid "HP LaserJet 3200m" msgstr "HP LaserJet 3200m" -#: src/main/xmli18n-tmp.h:738 +#: src/main/xmli18n-tmp.h:790 msgid "HP LaserJet 3200se" msgstr "HP LaserJet 3200se" -#: src/main/xmli18n-tmp.h:739 +#: src/main/xmli18n-tmp.h:791 msgid "HP LaserJet 3300 MFP" msgstr "HP LaserJet 3300 MFP" -#: src/main/xmli18n-tmp.h:740 +#: src/main/xmli18n-tmp.h:792 msgid "HP LaserJet 3310 MFP" msgstr "HP LaserJet 3310 MFP" -#: src/main/xmli18n-tmp.h:741 +#: src/main/xmli18n-tmp.h:793 msgid "HP LaserJet 3320 MFP" msgstr "HP LaserJet 3320 MFP" -#: src/main/xmli18n-tmp.h:742 +#: src/main/xmli18n-tmp.h:794 msgid "HP LaserJet 3320N MFP" msgstr "HP LaserJet 3320N MFP" -#: src/main/xmli18n-tmp.h:743 +#: src/main/xmli18n-tmp.h:795 msgid "HP LaserJet 3330 MFP" msgstr "HP LaserJet 3330 MFP" -#: src/main/xmli18n-tmp.h:744 +#: src/main/xmli18n-tmp.h:796 msgid "HP LaserJet 4000" msgstr "HP LaserJet 4000" -#: src/main/xmli18n-tmp.h:745 +#: src/main/xmli18n-tmp.h:797 msgid "HP LaserJet 4050" msgstr "HP LaserJet 4050" -#: src/main/xmli18n-tmp.h:746 +#: src/main/xmli18n-tmp.h:798 msgid "HP LaserJet 4100" msgstr "HP LaserJet 4100" -#: src/main/xmli18n-tmp.h:747 +#: src/main/xmli18n-tmp.h:799 msgid "HP LaserJet 4200" msgstr "HP LaserJet 4200" -#: src/main/xmli18n-tmp.h:748 +#: src/main/xmli18n-tmp.h:800 msgid "HP LaserJet 4300" msgstr "HP LaserJet 4300" -#: src/main/xmli18n-tmp.h:749 +#: src/main/xmli18n-tmp.h:801 msgid "HP LaserJet 5000" msgstr "HP LaserJet 5000" -#: src/main/xmli18n-tmp.h:750 +#: src/main/xmli18n-tmp.h:802 msgid "HP LaserJet 5100" msgstr "HP LaserJet 5100" -#: src/main/xmli18n-tmp.h:751 +#: src/main/xmli18n-tmp.h:803 msgid "HP LaserJet 8000" msgstr "HP LaserJet 8000" -#: src/main/xmli18n-tmp.h:752 +#: src/main/xmli18n-tmp.h:804 msgid "HP LaserJet 8100" msgstr "HP LaserJet 8100" -#: src/main/xmli18n-tmp.h:753 +#: src/main/xmli18n-tmp.h:805 msgid "HP LaserJet 8150" msgstr "HP LaserJet 8150" -#: src/main/xmli18n-tmp.h:754 +#: src/main/xmli18n-tmp.h:806 msgid "HP LaserJet 9000" msgstr "HP LaserJet 9000" -#: src/main/xmli18n-tmp.h:755 +#: src/main/xmli18n-tmp.h:807 msgid "HP Mopier 240" msgstr "HP Mopier 240" -#: src/main/xmli18n-tmp.h:756 +#: src/main/xmli18n-tmp.h:808 msgid "HP Mopier 320" msgstr "HP Mopier 320" -#: src/main/xmli18n-tmp.h:757 +#: src/main/xmli18n-tmp.h:809 msgid "HP OfficeJet 300" msgstr "HP OfficeJet 300" -#: src/main/xmli18n-tmp.h:758 +#: src/main/xmli18n-tmp.h:810 msgid "HP OfficeJet 330" msgstr "HP OfficeJet 330" -#: src/main/xmli18n-tmp.h:759 +#: src/main/xmli18n-tmp.h:811 msgid "HP OfficeJet 350" msgstr "HP OfficeJet 350" -#: src/main/xmli18n-tmp.h:760 +#: src/main/xmli18n-tmp.h:812 msgid "HP OfficeJet 500" msgstr "HP OfficeJet 500" -#: src/main/xmli18n-tmp.h:761 +#: src/main/xmli18n-tmp.h:813 msgid "HP OfficeJet 520" msgstr "HP OfficeJet 520" -#: src/main/xmli18n-tmp.h:762 +#: src/main/xmli18n-tmp.h:814 msgid "HP OfficeJet 570" msgstr "HP OfficeJet 570" -#: src/main/xmli18n-tmp.h:763 +#: src/main/xmli18n-tmp.h:815 msgid "HP OfficeJet 580" msgstr "HP OfficeJet 580" -#: src/main/xmli18n-tmp.h:764 +#: src/main/xmli18n-tmp.h:816 msgid "HP OfficeJet 590" msgstr "HP OfficeJet 590" -#: src/main/xmli18n-tmp.h:765 +#: src/main/xmli18n-tmp.h:817 msgid "HP OfficeJet 600" msgstr "HP OfficeJet 600" -#: src/main/xmli18n-tmp.h:766 +#: src/main/xmli18n-tmp.h:818 msgid "HP OfficeJet 610" msgstr "HP OfficeJet 610" -#: src/main/xmli18n-tmp.h:767 +#: src/main/xmli18n-tmp.h:819 msgid "HP OfficeJet 625" msgstr "HP OfficeJet 625" -#: src/main/xmli18n-tmp.h:768 +#: src/main/xmli18n-tmp.h:820 msgid "HP OfficeJet 630" msgstr "HP OfficeJet 630" -#: src/main/xmli18n-tmp.h:769 +#: src/main/xmli18n-tmp.h:821 msgid "HP OfficeJet 635" msgstr "HP OfficeJet 635" -#: src/main/xmli18n-tmp.h:770 +#: src/main/xmli18n-tmp.h:822 msgid "HP OfficeJet 700" msgstr "HP OfficeJet 700" -#: src/main/xmli18n-tmp.h:771 +#: src/main/xmli18n-tmp.h:823 msgid "HP OfficeJet 710" msgstr "HP OfficeJet 710" -#: src/main/xmli18n-tmp.h:772 +#: src/main/xmli18n-tmp.h:824 msgid "HP OfficeJet 720" msgstr "HP OfficeJet 720" -#: src/main/xmli18n-tmp.h:773 +#: src/main/xmli18n-tmp.h:825 msgid "HP OfficeJet 725" msgstr "HP OfficeJet 725" -#: src/main/xmli18n-tmp.h:774 +#: src/main/xmli18n-tmp.h:826 msgid "HP OfficeJet 5105" msgstr "HP OfficeJet 5105" -#: src/main/xmli18n-tmp.h:775 +#: src/main/xmli18n-tmp.h:827 msgid "HP OfficeJet 5110" msgstr "HP OfficeJet 5110" -#: src/main/xmli18n-tmp.h:776 +#: src/main/xmli18n-tmp.h:828 msgid "HP OfficeJet 5110xi" msgstr "HP OfficeJet 5110xi" -#: src/main/xmli18n-tmp.h:777 +#: src/main/xmli18n-tmp.h:829 msgid "HP OfficeJet 6105" msgstr "HP OfficeJet 6105" -#: src/main/xmli18n-tmp.h:778 +#: src/main/xmli18n-tmp.h:830 msgid "HP OfficeJet 6110" msgstr "HP OfficeJet 6110" -#: src/main/xmli18n-tmp.h:779 +#: src/main/xmli18n-tmp.h:831 msgid "HP OfficeJet 7110" msgstr "HP OfficeJet 7110" -#: src/main/xmli18n-tmp.h:780 +#: src/main/xmli18n-tmp.h:832 msgid "HP OfficeJet 7130" msgstr "HP OfficeJet 7130" -#: src/main/xmli18n-tmp.h:781 +#: src/main/xmli18n-tmp.h:833 msgid "HP OfficeJet 7140" msgstr "HP OfficeJet 7140" -#: src/main/xmli18n-tmp.h:782 +#: src/main/xmli18n-tmp.h:834 msgid "HP OfficeJet D125" msgstr "HP OfficeJet D125" -#: src/main/xmli18n-tmp.h:783 +#: src/main/xmli18n-tmp.h:835 msgid "HP OfficeJet D135" msgstr "HP OfficeJet D135" -#: src/main/xmli18n-tmp.h:784 +#: src/main/xmli18n-tmp.h:836 msgid "HP OfficeJet D145" msgstr "HP OfficeJet D145" -#: src/main/xmli18n-tmp.h:785 +#: src/main/xmli18n-tmp.h:837 msgid "HP OfficeJet D155" msgstr "HP OfficeJet D155" -#: src/main/xmli18n-tmp.h:786 +#: src/main/xmli18n-tmp.h:838 msgid "HP OfficeJet G55" msgstr "HP OfficeJet G55" -#: src/main/xmli18n-tmp.h:787 +#: src/main/xmli18n-tmp.h:839 msgid "HP OfficeJet G85" msgstr "HP OfficeJet G85" -#: src/main/xmli18n-tmp.h:788 +#: src/main/xmli18n-tmp.h:840 msgid "HP OfficeJet G95" msgstr "HP OfficeJet G95" -#: src/main/xmli18n-tmp.h:789 +#: src/main/xmli18n-tmp.h:841 msgid "HP OfficeJet K60" msgstr "HP OfficeJet K60" -#: src/main/xmli18n-tmp.h:790 +#: src/main/xmli18n-tmp.h:842 msgid "HP OfficeJet K60xi" msgstr "HP OfficeJet K60xi" -#: src/main/xmli18n-tmp.h:791 +#: src/main/xmli18n-tmp.h:843 msgid "HP OfficeJet K80" msgstr "HP OfficeJet K80" -#: src/main/xmli18n-tmp.h:792 +#: src/main/xmli18n-tmp.h:844 msgid "HP OfficeJet K80xi" msgstr "HP OfficeJet K80xi" -#: src/main/xmli18n-tmp.h:793 +#: src/main/xmli18n-tmp.h:845 msgid "HP OfficeJet LX" msgstr "HP OfficeJet LX" -#: src/main/xmli18n-tmp.h:794 +#: src/main/xmli18n-tmp.h:846 msgid "HP OfficeJet Pro 1150C" msgstr "HP OfficeJet Pro 1150C" -#: src/main/xmli18n-tmp.h:795 +#: src/main/xmli18n-tmp.h:847 msgid "HP OfficeJet Pro 1170C" msgstr "HP OfficeJet Pro 1170C" -#: src/main/xmli18n-tmp.h:796 +#: src/main/xmli18n-tmp.h:848 msgid "HP OfficeJet Pro 1175C" msgstr "HP OfficeJet Pro 1175C" -#: src/main/xmli18n-tmp.h:797 +#: src/main/xmli18n-tmp.h:849 msgid "HP OfficeJet R40" msgstr "HP OfficeJet R40" -#: src/main/xmli18n-tmp.h:798 +#: src/main/xmli18n-tmp.h:850 msgid "HP OfficeJet R45" msgstr "HP OfficeJet R45" -#: src/main/xmli18n-tmp.h:799 +#: src/main/xmli18n-tmp.h:851 msgid "HP OfficeJet R60" msgstr "HP OfficeJet R60" -#: src/main/xmli18n-tmp.h:800 +#: src/main/xmli18n-tmp.h:852 msgid "HP OfficeJet R65" msgstr "HP OfficeJet R65" -#: src/main/xmli18n-tmp.h:801 +#: src/main/xmli18n-tmp.h:853 msgid "HP OfficeJet R80" msgstr "HP OfficeJet R80" -#: src/main/xmli18n-tmp.h:802 +#: src/main/xmli18n-tmp.h:854 msgid "HP OfficeJet T45" msgstr "HP OfficeJet T45" -#: src/main/xmli18n-tmp.h:803 +#: src/main/xmli18n-tmp.h:855 msgid "HP OfficeJet T65" msgstr "HP OfficeJet T65" -#: src/main/xmli18n-tmp.h:804 +#: src/main/xmli18n-tmp.h:856 msgid "HP OfficeJet V40" msgstr "HP OfficeJet V40" -#: src/main/xmli18n-tmp.h:805 +#: src/main/xmli18n-tmp.h:857 msgid "HP OfficeJet V40xi" msgstr "HP OfficeJet V40xi" -#: src/main/xmli18n-tmp.h:806 +#: src/main/xmli18n-tmp.h:858 msgid "HP OfficeJet" msgstr "HP OfficeJet" -#: src/main/xmli18n-tmp.h:807 +#: src/main/xmli18n-tmp.h:859 msgid "HP PSC 370" msgstr "HP PSC 370" -#: src/main/xmli18n-tmp.h:808 +#: src/main/xmli18n-tmp.h:860 msgid "HP PSC 380" msgstr "HP PSC 380" -#: src/main/xmli18n-tmp.h:809 +#: src/main/xmli18n-tmp.h:861 msgid "HP PSC 500" msgstr "HP PSC 500" -#: src/main/xmli18n-tmp.h:810 +#: src/main/xmli18n-tmp.h:862 msgid "HP PSC 750" msgstr "HP PSC 750" -#: src/main/xmli18n-tmp.h:811 +#: src/main/xmli18n-tmp.h:863 msgid "HP PSC 950" msgstr "HP PSC 950" -#: src/main/xmli18n-tmp.h:812 +#: src/main/xmli18n-tmp.h:864 msgid "HP PSC 950xi" msgstr "HP PSC 950xi" -#: src/main/xmli18n-tmp.h:813 +#: src/main/xmli18n-tmp.h:865 msgid "HP PSC 2110" msgstr "HP PSC 2110" -#: src/main/xmli18n-tmp.h:814 +#: src/main/xmli18n-tmp.h:866 msgid "HP PSC 2150" msgstr "HP PSC 2150" -#: src/main/xmli18n-tmp.h:815 +#: src/main/xmli18n-tmp.h:867 msgid "HP PSC 2210" msgstr "HP PSC 2210" -#: src/main/xmli18n-tmp.h:816 +#: src/main/xmli18n-tmp.h:868 msgid "HP PhotoSmart 7150" msgstr "HP PhotoSmart 7150" -#: src/main/xmli18n-tmp.h:817 +#: src/main/xmli18n-tmp.h:869 msgid "HP PhotoSmart 7345" msgstr "HP PhotoSmart 7345" -#: src/main/xmli18n-tmp.h:818 +#: src/main/xmli18n-tmp.h:870 msgid "HP PhotoSmart 7350" msgstr "HP PhotoSmart 7350" -#: src/main/xmli18n-tmp.h:819 +#: src/main/xmli18n-tmp.h:871 msgid "HP PhotoSmart 7550" msgstr "HP PhotoSmart 7550" -#: src/main/xmli18n-tmp.h:820 +#: src/main/xmli18n-tmp.h:872 msgid "HP PhotoSmart P100" msgstr "HP PhotoSmart P100" -#: src/main/xmli18n-tmp.h:821 +#: src/main/xmli18n-tmp.h:873 msgid "HP PhotoSmart P130" msgstr "HP PhotoSmart P130" -#: src/main/xmli18n-tmp.h:822 +#: src/main/xmli18n-tmp.h:874 msgid "HP PhotoSmart P230" msgstr "HP PhotoSmart P230" -#: src/main/xmli18n-tmp.h:823 +#: src/main/xmli18n-tmp.h:875 msgid "HP PhotoSmart P1000" msgstr "HP PhotoSmart P1000" -#: src/main/xmli18n-tmp.h:824 +#: src/main/xmli18n-tmp.h:876 msgid "HP PhotoSmart P1100" msgstr "HP PhotoSmart P1100" -#: src/main/xmli18n-tmp.h:825 +#: src/main/xmli18n-tmp.h:877 msgid "HP PhotoSmart P1115" msgstr "HP PhotoSmart P1115" -#: src/main/xmli18n-tmp.h:826 +#: src/main/xmli18n-tmp.h:878 msgid "HP PhotoSmart P1215" msgstr "HP PhotoSmart P1215" -#: src/main/xmli18n-tmp.h:827 +#: src/main/xmli18n-tmp.h:879 msgid "HP PhotoSmart P1218" msgstr "HP PhotoSmart P1218" -#: src/main/xmli18n-tmp.h:828 +#: src/main/xmli18n-tmp.h:880 msgid "HP PhotoSmart P1315" msgstr "HP PhotoSmart P1315" -#: src/main/xmli18n-tmp.h:829 +#: src/main/xmli18n-tmp.h:881 msgid "HP e-printer e20" msgstr "HP e-printer e20" -#: src/main/xmli18n-tmp.h:830 +#: src/main/xmli18n-tmp.h:882 msgid "IBM 4019" msgstr "IBM 4019" -#: src/main/xmli18n-tmp.h:831 +#: src/main/xmli18n-tmp.h:883 msgid "IBM 4029 030 LaserPrinter 10" msgstr "IBM 4029 030 LaserPrinter 10" -#: src/main/xmli18n-tmp.h:832 +#: src/main/xmli18n-tmp.h:884 msgid "IBM 4312" msgstr "IBM 4312" -#: src/main/xmli18n-tmp.h:833 +#: src/main/xmli18n-tmp.h:885 msgid "IBM Infoprint 12" msgstr "IBM Infoprint 12" -#: src/main/xmli18n-tmp.h:834 +#: src/main/xmli18n-tmp.h:886 msgid "IBM Page Printer 3112" msgstr "IBM Page Printer 3112" -#: src/main/xmli18n-tmp.h:835 +#: src/main/xmli18n-tmp.h:887 msgid "Infotec 4651 MF" msgstr "Infotec 4651 MF" -#: src/main/xmli18n-tmp.h:836 +#: src/main/xmli18n-tmp.h:888 msgid "Kyocera F-1010" msgstr "Kyocera F-1010" -#: src/main/xmli18n-tmp.h:837 +#: src/main/xmli18n-tmp.h:889 msgid "Kyocera FS-600 - KPDL-2" msgstr "Kyocera FS-600 - KPDL-2" -#: src/main/xmli18n-tmp.h:838 +#: src/main/xmli18n-tmp.h:890 msgid "Kyocera FS-600" msgstr "Kyocera FS-600" -#: src/main/xmli18n-tmp.h:839 +#: src/main/xmli18n-tmp.h:891 msgid "Kyocera FS-680" msgstr "Kyocera FS-680" -#: src/main/xmli18n-tmp.h:840 +#: src/main/xmli18n-tmp.h:892 msgid "Kyocera FS-800" msgstr "Kyocera FS-800" -#: src/main/xmli18n-tmp.h:841 +#: src/main/xmli18n-tmp.h:893 msgid "Kyocera FS-1000" msgstr "Kyocera FS-1000" -#: src/main/xmli18n-tmp.h:842 +#: src/main/xmli18n-tmp.h:894 msgid "Kyocera FS-1000+" msgstr "Kyocera FS-1000+" -#: src/main/xmli18n-tmp.h:843 +#: src/main/xmli18n-tmp.h:895 msgid "Kyocera FS-1010" msgstr "Kyocera FS-1010" -#: src/main/xmli18n-tmp.h:844 +#: src/main/xmli18n-tmp.h:896 msgid "Kyocera FS-1050" msgstr "Kyocera FS-1050" -#: src/main/xmli18n-tmp.h:845 +#: src/main/xmli18n-tmp.h:897 msgid "Kyocera FS-1200" msgstr "Kyocera FS-1200" -#: src/main/xmli18n-tmp.h:846 +#: src/main/xmli18n-tmp.h:898 msgid "Kyocera FS-1600" msgstr "Kyocera FS-1600" -#: src/main/xmli18n-tmp.h:847 +#: src/main/xmli18n-tmp.h:899 msgid "Kyocera FS-1600+" msgstr "Kyocera FS-1600+" -#: src/main/xmli18n-tmp.h:848 +#: src/main/xmli18n-tmp.h:900 msgid "Kyocera FS-1700" msgstr "Kyocera FS-1700" -#: src/main/xmli18n-tmp.h:849 +#: src/main/xmli18n-tmp.h:901 msgid "Kyocera FS-1700+" msgstr "Kyocera FS-1700+" -#: src/main/xmli18n-tmp.h:850 +#: src/main/xmli18n-tmp.h:902 msgid "Kyocera FS-1750" msgstr "Kyocera FS-1750" -#: src/main/xmli18n-tmp.h:851 +#: src/main/xmli18n-tmp.h:903 msgid "Kyocera FS-1800" msgstr "Kyocera FS-1800" -#: src/main/xmli18n-tmp.h:852 +#: src/main/xmli18n-tmp.h:904 msgid "Kyocera FS-1800+" msgstr "Kyocera FS-1800+" -#: src/main/xmli18n-tmp.h:853 +#: src/main/xmli18n-tmp.h:905 msgid "Kyocera FS-1900" msgstr "Kyocera FS-1900" -#: src/main/xmli18n-tmp.h:854 +#: src/main/xmli18n-tmp.h:906 msgid "Kyocera FS-3500" msgstr "Kyocera FS-3500" -#: src/main/xmli18n-tmp.h:855 +#: src/main/xmli18n-tmp.h:907 msgid "Kyocera FS-3600" msgstr "Kyocera FS-3600" -#: src/main/xmli18n-tmp.h:856 +#: src/main/xmli18n-tmp.h:908 msgid "Kyocera FS-3600+" msgstr "Kyocera FS-3600+" -#: src/main/xmli18n-tmp.h:857 +#: src/main/xmli18n-tmp.h:909 msgid "Kyocera FS-3700" msgstr "Kyocera FS-3700" -#: src/main/xmli18n-tmp.h:858 +#: src/main/xmli18n-tmp.h:910 msgid "Kyocera FS-3700+" msgstr "Kyocera FS-3700+" -#: src/main/xmli18n-tmp.h:859 +#: src/main/xmli18n-tmp.h:911 msgid "Kyocera FS-3750" msgstr "Kyocera FS-3750" -#: src/main/xmli18n-tmp.h:860 +#: src/main/xmli18n-tmp.h:912 msgid "Kyocera FS-3800" msgstr "Kyocera FS-3800" -#: src/main/xmli18n-tmp.h:861 +#: src/main/xmli18n-tmp.h:913 msgid "Kyocera FS-5800C" msgstr "Kyocera FS-5800C" -#: src/main/xmli18n-tmp.h:862 +#: src/main/xmli18n-tmp.h:914 msgid "Kyocera FS-5900C" msgstr "Kyocera FS-5900C" -#: src/main/xmli18n-tmp.h:863 +#: src/main/xmli18n-tmp.h:915 msgid "Kyocera FS-6500" msgstr "Kyocera FS-6500" -#: src/main/xmli18n-tmp.h:864 +#: src/main/xmli18n-tmp.h:916 msgid "Kyocera FS-6500+" msgstr "Kyocera FS-6500+" -#: src/main/xmli18n-tmp.h:865 +#: src/main/xmli18n-tmp.h:917 msgid "Kyocera FS-6700" msgstr "Kyocera FS-6700" -#: src/main/xmli18n-tmp.h:866 +#: src/main/xmli18n-tmp.h:918 msgid "Kyocera FS-7000" msgstr "Kyocera FS-7000" -#: src/main/xmli18n-tmp.h:867 +#: src/main/xmli18n-tmp.h:919 msgid "Kyocera FS-7000+" msgstr "Kyocera FS-7000+" -#: src/main/xmli18n-tmp.h:868 +#: src/main/xmli18n-tmp.h:920 msgid "Kyocera FS-8000C" msgstr "Kyocera FS-8000C" -#: src/main/xmli18n-tmp.h:869 +#: src/main/xmli18n-tmp.h:921 msgid "Kyocera FS-9000" msgstr "Kyocera FS-9000" -#: src/main/xmli18n-tmp.h:870 +#: src/main/xmli18n-tmp.h:922 msgid "Kyocera FS-9100DN" msgstr "Kyocera FS-9100DN" -#: src/main/xmli18n-tmp.h:871 +#: src/main/xmli18n-tmp.h:923 msgid "Kyocera FS-9500DN" msgstr "Kyocera FS-9500DN" -#: src/main/xmli18n-tmp.h:872 +#: src/main/xmli18n-tmp.h:924 msgid "Kyocera KM-1530" msgstr "Kyocera KM-1530" -#: src/main/xmli18n-tmp.h:873 +#: src/main/xmli18n-tmp.h:925 msgid "Kyocera KM-1810" msgstr "Kyocera KM-1810" -#: src/main/xmli18n-tmp.h:874 +#: src/main/xmli18n-tmp.h:926 msgid "Kyocera KM-2030" msgstr "Kyocera KM-2030" -#: src/main/xmli18n-tmp.h:875 +#: src/main/xmli18n-tmp.h:927 msgid "Kyocera KM-2530" msgstr "Kyocera KM-2530" -#: src/main/xmli18n-tmp.h:876 +#: src/main/xmli18n-tmp.h:928 msgid "Kyocera KM-3530" msgstr "Kyocera KM-3530" -#: src/main/xmli18n-tmp.h:877 +#: src/main/xmli18n-tmp.h:929 msgid "Kyocera KM-4230" msgstr "Kyocera KM-4230" -#: src/main/xmli18n-tmp.h:878 +#: src/main/xmli18n-tmp.h:930 msgid "Kyocera KM-4530" msgstr "Kyocera KM-4530" -#: src/main/xmli18n-tmp.h:879 +#: src/main/xmli18n-tmp.h:931 msgid "Kyocera KM-5230" msgstr "Kyocera KM-5230" -#: src/main/xmli18n-tmp.h:880 +#: src/main/xmli18n-tmp.h:932 msgid "Kyocera KM-5530" msgstr "Kyocera KM-5530" -#: src/main/xmli18n-tmp.h:881 +#: src/main/xmli18n-tmp.h:933 msgid "Kyocera KM-6230" msgstr "Kyocera KM-6230" -#: src/main/xmli18n-tmp.h:882 +#: src/main/xmli18n-tmp.h:934 msgid "Lexmark 4076" msgstr "Lexmark 4076" -#: src/main/xmli18n-tmp.h:883 +#: src/main/xmli18n-tmp.h:935 msgid "Lexmark Optra E" msgstr "Lexmark Optra E" -#: src/main/xmli18n-tmp.h:884 +#: src/main/xmli18n-tmp.h:936 msgid "Lexmark Optra E+" msgstr "Lexmark Optra E+" -#: src/main/xmli18n-tmp.h:885 -#, fuzzy +#: src/main/xmli18n-tmp.h:937 msgid "Lexmark Optra E220" -msgstr "Lexmark Optra E" +msgstr "Lexmark Optra E220" -#: src/main/xmli18n-tmp.h:886 +#: src/main/xmli18n-tmp.h:938 msgid "Lexmark Valuewriter 300" msgstr "Lexmark Valuewriter 300" -#: src/main/xmli18n-tmp.h:887 +#: src/main/xmli18n-tmp.h:939 msgid "Minolta PagePro 6" msgstr "Minolta PagePro 6" -#: src/main/xmli18n-tmp.h:888 +#: src/main/xmli18n-tmp.h:940 msgid "Minolta PagePro 6e" msgstr "Minolta PagePro 6e" -#: src/main/xmli18n-tmp.h:889 +#: src/main/xmli18n-tmp.h:941 msgid "Minolta PagePro 6ex" msgstr "Minolta PagePro 6ex" -#: src/main/xmli18n-tmp.h:890 +#: src/main/xmli18n-tmp.h:942 msgid "Minolta PagePro 8" msgstr "Minolta PagePro 8" -#: src/main/xmli18n-tmp.h:891 +#: src/main/xmli18n-tmp.h:943 msgid "Minolta PagePro 8L" msgstr "Minolta PagePro 8L" -#: src/main/xmli18n-tmp.h:892 +#: src/main/xmli18n-tmp.h:944 msgid "Minolta PagePro 1100" msgstr "Minolta PagePro 1100" -#: src/main/xmli18n-tmp.h:893 +#: src/main/xmli18n-tmp.h:945 msgid "NEC SuperScript 660i" msgstr "NEC SuperScript 660i" -#: src/main/xmli18n-tmp.h:894 +#: src/main/xmli18n-tmp.h:946 msgid "NEC SuperScript 860" msgstr "NEC SuperScript 860" -#: src/main/xmli18n-tmp.h:895 +#: src/main/xmli18n-tmp.h:947 msgid "NEC SuperScript 870" msgstr "NEC SuperScript 870" -#: src/main/xmli18n-tmp.h:896 +#: src/main/xmli18n-tmp.h:948 msgid "NEC SuperScript 1260" msgstr "NEC SuperScript 1260" -#: src/main/xmli18n-tmp.h:897 +#: src/main/xmli18n-tmp.h:949 msgid "NEC SuperScript 1400" msgstr "NEC SuperScript 1400" -#: src/main/xmli18n-tmp.h:898 +#: src/main/xmli18n-tmp.h:950 msgid "NEC SuperScript 1800" msgstr "NEC SuperScript 1800" -#: src/main/xmli18n-tmp.h:899 +#: src/main/xmli18n-tmp.h:951 msgid "Okidata OL400" msgstr "Okidata OL400" -#: src/main/xmli18n-tmp.h:900 +#: src/main/xmli18n-tmp.h:952 msgid "Okidata OL400e" msgstr "Okidata OL400e" -#: src/main/xmli18n-tmp.h:901 +#: src/main/xmli18n-tmp.h:953 msgid "Okidata OL400ex" msgstr "Okidata OL400ex" -#: src/main/xmli18n-tmp.h:902 +#: src/main/xmli18n-tmp.h:954 msgid "Okidata OL410e" msgstr "Okidata OL410e" -#: src/main/xmli18n-tmp.h:903 +#: src/main/xmli18n-tmp.h:955 msgid "Okidata OL600e" msgstr "Okidata OL600e" -#: src/main/xmli18n-tmp.h:904 +#: src/main/xmli18n-tmp.h:956 msgid "Okidata OL610e/S" msgstr "Okidata OL610e/S" -#: src/main/xmli18n-tmp.h:905 +#: src/main/xmli18n-tmp.h:957 msgid "Okidata OL800" msgstr "Okidata OL800" -#: src/main/xmli18n-tmp.h:906 +#: src/main/xmli18n-tmp.h:958 msgid "Okidata OL810ex" msgstr "Okidata OL810ex" -#: src/main/xmli18n-tmp.h:907 +#: src/main/xmli18n-tmp.h:959 msgid "Okidata Okipage 6e" msgstr "Okidata Okipage 6e" -#: src/main/xmli18n-tmp.h:908 +#: src/main/xmli18n-tmp.h:960 msgid "Okidata Okipage 6ex" msgstr "Okidata Okipage 6ex" -#: src/main/xmli18n-tmp.h:909 +#: src/main/xmli18n-tmp.h:961 msgid "Okidata Okipage 8p" msgstr "Okidata Okipage 8p" -#: src/main/xmli18n-tmp.h:910 +#: src/main/xmli18n-tmp.h:962 msgid "Okidata Okipage 10e" msgstr "Okidata Okipage 10e" -#: src/main/xmli18n-tmp.h:911 +#: src/main/xmli18n-tmp.h:963 msgid "Okidata Okipage 10ex" msgstr "Okidata Okipage 10ex" -#: src/main/xmli18n-tmp.h:912 +#: src/main/xmli18n-tmp.h:964 msgid "Okidata Okipage 14ex" msgstr "Okidata Okipage 14ex" -#: src/main/xmli18n-tmp.h:913 +#: src/main/xmli18n-tmp.h:965 msgid "Okidata Super 6e" msgstr "Okidata Super 6e" -#: src/main/xmli18n-tmp.h:914 +#: src/main/xmli18n-tmp.h:966 msgid "Olivetti JP350S" msgstr "Olivetti JP350S" -#: src/main/xmli18n-tmp.h:915 +#: src/main/xmli18n-tmp.h:967 msgid "Olivetti PG 306" msgstr "Olivetti PG 306" -#: src/main/xmli18n-tmp.h:916 +#: src/main/xmli18n-tmp.h:968 msgid "PCPI 1030" msgstr "PCPI 1030" -#: src/main/xmli18n-tmp.h:917 +#: src/main/xmli18n-tmp.h:969 msgid "Panasonic KX-P4410" msgstr "Panasonic KX-P4410" -#: src/main/xmli18n-tmp.h:918 +#: src/main/xmli18n-tmp.h:970 msgid "Panasonic KX-P4450" msgstr "Panasonic KX-P4450" -#: src/main/xmli18n-tmp.h:919 +#: src/main/xmli18n-tmp.h:971 msgid "Panasonic KX-P6150" msgstr "Panasonic KX-P6150" -#: src/main/xmli18n-tmp.h:920 +#: src/main/xmli18n-tmp.h:972 msgid "Panasonic KX-P6500" msgstr "Panasonic KX-P6500" -#: src/main/xmli18n-tmp.h:921 +#: src/main/xmli18n-tmp.h:973 msgid "Raven LP-410" msgstr "Raven LP-410" -#: src/main/xmli18n-tmp.h:922 +#: src/main/xmli18n-tmp.h:974 msgid "Ricoh Aficio 220" msgstr "Ricoh Aficio 220" -#: src/main/xmli18n-tmp.h:923 +#: src/main/xmli18n-tmp.h:975 msgid "Ricoh Aficio 401" msgstr "Ricoh Aficio 401" -#: src/main/xmli18n-tmp.h:924 +#: src/main/xmli18n-tmp.h:976 msgid "Ricoh Aficio 700" msgstr "Ricoh Aficio 700" -#: src/main/xmli18n-tmp.h:925 +#: src/main/xmli18n-tmp.h:977 msgid "Samsung ML-85" msgstr "Samsung ML-85" -#: src/main/xmli18n-tmp.h:926 +#: src/main/xmli18n-tmp.h:978 msgid "Samsung ML-4600" msgstr "Samsung ML-4600" -#: src/main/xmli18n-tmp.h:927 +#: src/main/xmli18n-tmp.h:979 msgid "Samsung ML-5000a" msgstr "Samsung ML-5000a" -#: src/main/xmli18n-tmp.h:928 +#: src/main/xmli18n-tmp.h:980 msgid "Samsung ML-6000" msgstr "Samsung ML-6000" -#: src/main/xmli18n-tmp.h:929 +#: src/main/xmli18n-tmp.h:981 msgid "Samsung ML-6100" msgstr "Samsung ML-6100" -#: src/main/xmli18n-tmp.h:930 +#: src/main/xmli18n-tmp.h:982 msgid "Samsung ML-7000" msgstr "Samsung ML-7000" -#: src/main/xmli18n-tmp.h:931 +#: src/main/xmli18n-tmp.h:983 msgid "Samsung ML-7000N" msgstr "Samsung ML-7000N" -#: src/main/xmli18n-tmp.h:932 +#: src/main/xmli18n-tmp.h:984 msgid "Samsung ML-7000P" msgstr "Samsung ML-7000P" -#: src/main/xmli18n-tmp.h:933 +#: src/main/xmli18n-tmp.h:985 msgid "Samsung ML-7050" msgstr "Samsung ML-7050" -#: src/main/xmli18n-tmp.h:934 +#: src/main/xmli18n-tmp.h:986 msgid "Samsung QL-5100A" msgstr "Samsung QL-5100A" -#: src/main/xmli18n-tmp.h:935 +#: src/main/xmli18n-tmp.h:987 msgid "Samsung QL-6050" msgstr "Samsung QL-6050" -#: src/main/xmli18n-tmp.h:936 +#: src/main/xmli18n-tmp.h:988 msgid "Seiko SpeedJET 200" msgstr "Seiko SpeedJET 200" -#: src/main/xmli18n-tmp.h:937 +#: src/main/xmli18n-tmp.h:989 msgid "Sharp AR-161" msgstr "Sharp AR-161" -#: src/main/xmli18n-tmp.h:938 -#, fuzzy +#: src/main/xmli18n-tmp.h:990 msgid "Sharp AR-M257" -msgstr "Sharp AR-161" +msgstr "Sharp AR-M257" -#: src/main/xmli18n-tmp.h:939 +#: src/main/xmli18n-tmp.h:991 msgid "Sony IJP-V100" msgstr "Sony IJP-V100" -#: src/main/xmli18n-tmp.h:940 +#: src/main/xmli18n-tmp.h:992 msgid "Star LS-04" msgstr "Star LS-04" -#: src/main/xmli18n-tmp.h:941 +#: src/main/xmli18n-tmp.h:993 msgid "Star LaserPrinter 8" msgstr "Star LaserPrinter 8" -#: src/main/xmli18n-tmp.h:942 +#: src/main/xmli18n-tmp.h:994 msgid "Tally MT908" msgstr "Tally MT908" -#: src/main/xmli18n-tmp.h:943 +#: src/main/xmli18n-tmp.h:995 msgid "Xerox Able 1406" msgstr "Xerox Able 1406" -#: src/main/xmli18n-tmp.h:944 +#: src/main/xmli18n-tmp.h:996 msgid "Xerox DocuPrint 4508" msgstr "Xerox DocuPrint 4508" -#: src/main/xmli18n-tmp.h:945 +#: src/main/xmli18n-tmp.h:997 msgid "Xerox DocuPrint C20" msgstr "Xerox DocuPrint C20" -#: src/main/xmli18n-tmp.h:946 +#: src/main/xmli18n-tmp.h:998 msgid "Xerox DocuPrint N4512" msgstr "Xerox DocuPrint N4512" -#: src/main/xmli18n-tmp.h:947 +#: src/main/xmli18n-tmp.h:999 msgid "Xerox DocuPrint N4512PS" msgstr "Xerox DocuPrint N4512PS" -#: src/main/xmli18n-tmp.h:948 +#: src/main/xmli18n-tmp.h:1000 msgid "Xerox DocuPrint P12" msgstr "Xerox DocuPrint P12" -#: src/main/xmli18n-tmp.h:949 +#: src/main/xmli18n-tmp.h:1001 msgid "Xerox DocuPrint P1202" msgstr "Xerox DocuPrint P1202" -#: src/main/xmli18n-tmp.h:950 +#: src/main/xmli18n-tmp.h:1002 msgid "Xerox DocuPrint P8e" msgstr "Xerox DocuPrint P8e" -#: src/main/xmli18n-tmp.h:951 +#: src/main/xmli18n-tmp.h:1003 msgid "Xerox Document Centre 400" msgstr "Xerox Document Centre 400" -#: src/main/xmli18n-tmp.h:952 -#, fuzzy +#: src/main/xmli18n-tmp.h:1004 msgid "Xerox WorkCentre M118" -msgstr "Xerox Document Centre 400" +msgstr "Xerox WorkCentre M118" -#: src/main/xmli18n-tmp.h:953 +#: src/main/xmli18n-tmp.h:1005 msgid "Compaq IJ1200" -msgstr "" +msgstr "Compaq IJ1200" -#: src/main/xmli18n-tmp.h:954 -#, fuzzy +#: src/main/xmli18n-tmp.h:1006 msgid "Lexmark X73" -msgstr "Lexmark Z43" +msgstr "Lexmark X73" -#: src/main/xmli18n-tmp.h:955 +#: src/main/xmli18n-tmp.h:1007 msgid "Lexmark Z42" msgstr "Lexmark Z42" -#: src/main/xmli18n-tmp.h:956 +#: src/main/xmli18n-tmp.h:1008 msgid "Lexmark Z43" msgstr "Lexmark Z43" -#: src/main/xmli18n-tmp.h:957 +#: src/main/xmli18n-tmp.h:1009 msgid "Lexmark Z52" msgstr "Lexmark Z52" -#: src/main/xmli18n-tmp.h:958 +#: src/main/xmli18n-tmp.h:1010 msgid "Lexmark Z53" msgstr "Lexmark Z53" -#: src/main/xmli18n-tmp.h:959 +#: src/main/xmli18n-tmp.h:1011 msgid "Olympus P-10" msgstr "Olympus P-10" -#: src/main/xmli18n-tmp.h:960 +#: src/main/xmli18n-tmp.h:1012 msgid "Olympus P-11" msgstr "Olympus P-11" -#: src/main/xmli18n-tmp.h:961 +#: src/main/xmli18n-tmp.h:1013 msgid "Olympus P-200" msgstr "Olympus P-200" -#: src/main/xmli18n-tmp.h:962 +#: src/main/xmli18n-tmp.h:1014 msgid "Olympus P-300" msgstr "Olympus P-300" -#: src/main/xmli18n-tmp.h:963 +#: src/main/xmli18n-tmp.h:1015 msgid "Olympus P-300E" msgstr "Olympus P-300E" -#: src/main/xmli18n-tmp.h:964 +#: src/main/xmli18n-tmp.h:1016 msgid "Olympus P-300U" msgstr "Olympus P-300U" -#: src/main/xmli18n-tmp.h:965 +#: src/main/xmli18n-tmp.h:1017 msgid "Olympus P-330E" msgstr "Olympus P-330E" -#: src/main/xmli18n-tmp.h:966 +#: src/main/xmli18n-tmp.h:1018 msgid "Olympus P-330NE" msgstr "Olympus P-330NE" -#: src/main/xmli18n-tmp.h:967 +#: src/main/xmli18n-tmp.h:1019 msgid "Olympus P-400" msgstr "Olympus P-400" -#: src/main/xmli18n-tmp.h:968 +#: src/main/xmli18n-tmp.h:1020 msgid "Olympus P-440" msgstr "Olympus P-440" -#: src/main/xmli18n-tmp.h:969 -#, fuzzy +#: src/main/xmli18n-tmp.h:1021 msgid "Olympus P-S100" -msgstr "Olympus P-10" +msgstr "Olympus P-S100" -#: src/main/xmli18n-tmp.h:970 -#, fuzzy +#: src/main/xmli18n-tmp.h:1022 msgid "Canon CP-10" -msgstr "Canon CP-100" +msgstr "Canon CP-10" -#: src/main/xmli18n-tmp.h:971 +#: src/main/xmli18n-tmp.h:1023 msgid "Canon CP-100" msgstr "Canon CP-100" -#: src/main/xmli18n-tmp.h:972 +#: src/main/xmli18n-tmp.h:1024 msgid "Canon CP-200" msgstr "Canon CP-200" -#: src/main/xmli18n-tmp.h:973 +#: src/main/xmli18n-tmp.h:1025 msgid "Canon CP-220" msgstr "Canon CP-220" -#: src/main/xmli18n-tmp.h:974 +#: src/main/xmli18n-tmp.h:1026 msgid "Canon CP-300" msgstr "Canon CP-300" -#: src/main/xmli18n-tmp.h:975 +#: src/main/xmli18n-tmp.h:1027 msgid "Canon CP-330" msgstr "Canon CP-330" -#: src/main/xmli18n-tmp.h:976 +#: src/main/xmli18n-tmp.h:1028 msgid "Canon SELPHY-CP-400" msgstr "Canon SELPHY-CP-400" -#: src/main/xmli18n-tmp.h:977 +#: src/main/xmli18n-tmp.h:1029 msgid "Canon SELPHY-CP-500" msgstr "Canon SELPHY-CP-500" -#: src/main/xmli18n-tmp.h:978 +#: src/main/xmli18n-tmp.h:1030 msgid "Canon SELPHY-CP-510" msgstr "Canon SELPHY-CP-510" -#: src/main/xmli18n-tmp.h:979 +#: src/main/xmli18n-tmp.h:1031 msgid "Canon SELPHY-CP-600" msgstr "Canon SELPHY-CP-600" -#: src/main/xmli18n-tmp.h:980 +#: src/main/xmli18n-tmp.h:1032 msgid "Canon SELPHY-CP-710" msgstr "Canon SELPHY-CP-710" -#: src/main/xmli18n-tmp.h:981 -#, fuzzy +#: src/main/xmli18n-tmp.h:1033 msgid "Canon SELPHY-CP-720" -msgstr "Canon SELPHY-CP-710" +msgstr "Canon SELPHY-CP-720" -#: src/main/xmli18n-tmp.h:982 -#, fuzzy +#: src/main/xmli18n-tmp.h:1034 msgid "Canon SELPHY-CP-730" -msgstr "Canon SELPHY-CP-710" +msgstr "Canon SELPHY-CP-730" -#: src/main/xmli18n-tmp.h:983 -#, fuzzy +#: src/main/xmli18n-tmp.h:1035 msgid "Canon SELPHY-CP-740" -msgstr "Canon SELPHY-CP-400" +msgstr "Canon SELPHY-CP-740" -#: src/main/xmli18n-tmp.h:984 -#, fuzzy +#: src/main/xmli18n-tmp.h:1036 msgid "Canon SELPHY-CP-750" -msgstr "Canon SELPHY-CP-500" +msgstr "Canon SELPHY-CP-750" -#: src/main/xmli18n-tmp.h:985 -#, fuzzy +#: src/main/xmli18n-tmp.h:1037 msgid "Canon SELPHY ES1" -msgstr "Canon SELPHY-CP-510" +msgstr "Canon SELPHY ES1" -#: src/main/xmli18n-tmp.h:986 -#, fuzzy +#: src/main/xmli18n-tmp.h:1038 msgid "Canon SELPHY ES2" -msgstr "Canon SELPHY-CP-400" +msgstr "Canon SELPHY ES2" -#: src/main/xmli18n-tmp.h:987 -#, fuzzy +#: src/main/xmli18n-tmp.h:1039 msgid "Canon SELPHY ES20" -msgstr "Canon SELPHY-CP-400" +msgstr "Canon SELPHY ES20" -#: src/main/xmli18n-tmp.h:988 -#, fuzzy +#: src/main/xmli18n-tmp.h:1040 msgid "Sony DPP-EX5" -msgstr "Sony UP-DR150" +msgstr "Sony DPP-EX5" -#: src/main/xmli18n-tmp.h:989 +#: src/main/xmli18n-tmp.h:1041 msgid "Sony DPP-EX7" -msgstr "" +msgstr "Sony DPP-EX7" -#: src/main/xmli18n-tmp.h:990 +#: src/main/xmli18n-tmp.h:1042 msgid "Sony UP-DP10" msgstr "Sony UP-DP10" -#: src/main/xmli18n-tmp.h:991 -#, fuzzy +#: src/main/xmli18n-tmp.h:1043 msgid "Sony UP-DR100" -msgstr "Sony UP-DR150" +msgstr "Sony UP-DR100" -#: src/main/xmli18n-tmp.h:992 +#: src/main/xmli18n-tmp.h:1044 msgid "Sony UP-DR150" msgstr "Sony UP-DR150" -#: src/main/xmli18n-tmp.h:993 +#: src/main/xmli18n-tmp.h:1045 msgid "Fujifilm Printpix-CX-400" msgstr "Fujifilm Printpix-CX-400" -#: src/main/xmli18n-tmp.h:994 +#: src/main/xmli18n-tmp.h:1046 msgid "Fujifilm Printpix-CX-550" msgstr "Fujifilm Printpix-CX-550" -#: src/main/xmli18n-tmp.h:995 -#, fuzzy +#: src/main/xmli18n-tmp.h:1047 msgid "Fujifilm FinePix-NX-500" -msgstr "Fujifilm Printpix-CX-400" +msgstr "Fujifilm FinePix-NX-500" -#: src/main/xmli18n-tmp.h:996 +#: src/main/xmli18n-tmp.h:1048 msgid "Kodak Easyshare-Printer-Dock" -msgstr "" +msgstr "Kodak Easyshare-Printer-Dock" -#: src/main/xmli18n-tmp.h:997 +#: src/main/xmli18n-tmp.h:1049 msgid "Shinko CHC-S9045" -msgstr "" +msgstr "Shinko CHC-S9045" -#: src/main/xmli18n-tmp.h:998 +#: src/main/xmli18n-tmp.h:1050 msgid "RAW DATA 16 bit" msgstr "RAW DATA 16 bit" -#: src/main/xmli18n-tmp.h:999 +#: src/main/xmli18n-tmp.h:1051 msgid "RAW DATA 8 bit" msgstr "RAW DATA 8 bit" -#: src/gutenprintui/panel.c:274 src/gutenprintui2/panel.c:274 +#: src/gutenprintui2/curve.c:130 +msgid "Curve type" +msgstr "Kurvetype" + +#: src/gutenprintui2/curve.c:131 +msgid "Is this curve linear, spline interpolated, or free-form" +msgstr "Er denne kurve lineær, tilpasset med interpolation eller fri-form" + +#: src/gutenprintui2/curve.c:139 +msgid "Minimum X" +msgstr "Minimum X" + +#: src/gutenprintui2/curve.c:140 +msgid "Minimum possible value for X" +msgstr "Mindst mulige værdi for X" + +#: src/gutenprintui2/curve.c:149 +msgid "Maximum X" +msgstr "Maksimum X" + +#: src/gutenprintui2/curve.c:150 +msgid "Maximum possible X value" +msgstr "Størst mulige værdi for X" + +#: src/gutenprintui2/curve.c:159 +msgid "Minimum Y" +msgstr "Minimum Y" + +#: src/gutenprintui2/curve.c:160 +msgid "Minimum possible value for Y" +msgstr "Mindst mulige værdi for Y" + +#: src/gutenprintui2/curve.c:169 +msgid "Maximum Y" +msgstr "Maksimum Y" + +#: src/gutenprintui2/curve.c:170 +msgid "Maximum possible value for Y" +msgstr "Størst mulige værdi for Y" + +#: src/gutenprintui2/gammacurve.c:418 +msgid "_Gamma value" +msgstr "_Gamma værdi" + +#: src/gutenprintui2/panel.c:275 msgid "Inch" msgstr "Tommer" -#: src/gutenprintui/panel.c:274 src/gutenprintui2/panel.c:274 +#: src/gutenprintui2/panel.c:275 msgid "Set the base unit of measurement to inches" msgstr "Brug tommer som basisenhed ved mÃ¥langivelse" -#: src/gutenprintui/panel.c:276 src/gutenprintui2/panel.c:276 +#: src/gutenprintui2/panel.c:277 msgid "cm" msgstr "cm" -#: src/gutenprintui/panel.c:276 src/gutenprintui2/panel.c:276 +#: src/gutenprintui2/panel.c:277 msgid "Set the base unit of measurement to centimetres" msgstr "Brug centimeter som basisenhed ved mÃ¥langivelse" -#: src/gutenprintui/panel.c:278 src/gutenprintui2/panel.c:278 +#: src/gutenprintui2/panel.c:279 msgid "Points" msgstr "Punkter" -#: src/gutenprintui/panel.c:278 src/gutenprintui2/panel.c:278 +#: src/gutenprintui2/panel.c:279 msgid "Set the base unit of measurement to points (1/72\")" msgstr "Brug punkter (1/72\") som basisenhed ved mÃ¥langivelse" -#: src/gutenprintui/panel.c:280 src/gutenprintui2/panel.c:280 +#: src/gutenprintui2/panel.c:281 msgid "mm" msgstr "mm" -#: src/gutenprintui/panel.c:280 src/gutenprintui2/panel.c:280 +#: src/gutenprintui2/panel.c:281 msgid "Set the base unit of measurement to millimetres" msgstr "Brug millimeter som basisenhed ved mÃ¥langivelse" -#: src/gutenprintui/panel.c:282 src/gutenprintui2/panel.c:282 +#: src/gutenprintui2/panel.c:283 msgid "Pica" msgstr "Pica" -#: src/gutenprintui/panel.c:282 src/gutenprintui2/panel.c:282 +#: src/gutenprintui2/panel.c:283 msgid "Set the base unit of measurement to picas (1/12\")" msgstr "Brug picas (1/12\") som basisenhed ved mÃ¥langivelse" -#: src/gutenprintui/panel.c:289 src/gutenprintui2/panel.c:289 +#: src/gutenprintui2/panel.c:290 msgid "Color output" msgstr "Farveudskrift" -#: src/gutenprintui/panel.c:291 src/gutenprintui2/panel.c:291 +#: src/gutenprintui2/panel.c:292 msgid "Print in shades of gray using black ink" msgstr "Print grÃ¥toner med sort blæk" -#: src/gutenprintui/panel.c:303 src/gutenprintui2/panel.c:303 +#: src/gutenprintui2/panel.c:304 msgid "Standard Command" msgstr "Standard kommando" -#: src/gutenprintui/panel.c:303 src/gutenprintui2/panel.c:303 +#: src/gutenprintui2/panel.c:304 msgid "Use standard print command" msgstr "Brug standarddefineret printerkommando" -#: src/gutenprintui/panel.c:304 src/gutenprintui2/panel.c:304 +#: src/gutenprintui2/panel.c:305 msgid "Custom Command" -msgstr "Bruger kommando" +msgstr "Egendefineret kommando" -#: src/gutenprintui/panel.c:304 src/gutenprintui2/panel.c:304 +#: src/gutenprintui2/panel.c:305 msgid "Use custom print command" msgstr "Anvend egendefineret printerkommando" -#: src/gutenprintui/panel.c:305 src/gutenprintui/plist.c:704 -#: src/gutenprintui/plist.c:787 src/gutenprintui2/panel.c:305 -#: src/gutenprintui2/plist.c:707 src/gutenprintui2/plist.c:790 +#: src/gutenprintui2/panel.c:306 src/gutenprintui2/plist.c:710 +#: src/gutenprintui2/plist.c:793 msgid "File" msgstr "Fil" -#: src/gutenprintui/panel.c:305 src/gutenprintui2/panel.c:305 +#: src/gutenprintui2/panel.c:306 msgid "Print to a file" msgstr "Udskriv til fil" -#: src/gutenprintui/panel.c:521 src/gutenprintui2/panel.c:521 +#: src/gutenprintui2/panel.c:522 msgid "Edit Curve..." msgstr "Ret kurve..." -#: src/gutenprintui/panel.c:532 src/gutenprintui2/panel.c:532 +#: src/gutenprintui2/panel.c:533 msgid "Set Default" msgstr "Sæt som standard" -#: src/gutenprintui/panel.c:534 src/gutenprintui2/panel.c:534 +#: src/gutenprintui2/panel.c:535 msgid "Restore Previous" msgstr "Genskab forrige" -#: src/gutenprintui/panel.c:536 src/gutenprintui/panel.c:1532 -#: src/gutenprintui/panel.c:1787 src/gutenprintui/panel.c:1819 -#: src/gutenprintui2/panel.c:536 src/gutenprintui2/panel.c:1533 -#: src/gutenprintui2/panel.c:1787 src/gutenprintui2/panel.c:1819 +#: src/gutenprintui2/panel.c:537 src/gutenprintui2/panel.c:1708 +#: src/gutenprintui2/panel.c:1962 src/gutenprintui2/panel.c:1994 msgid "OK" msgstr "O.k" -#: src/gutenprintui/panel.c:538 src/gutenprintui/panel.c:1197 -#: src/gutenprintui/panel.c:1534 src/gutenprintui/panel.c:1789 -#: src/gutenprintui2/panel.c:538 src/gutenprintui2/panel.c:1198 -#: src/gutenprintui2/panel.c:1535 src/gutenprintui2/panel.c:1789 +#: src/gutenprintui2/panel.c:539 src/gutenprintui2/panel.c:1373 +#: src/gutenprintui2/panel.c:1710 src/gutenprintui2/panel.c:1964 msgid "Cancel" msgstr "Annullér" -#: src/gutenprintui/panel.c:1180 src/gutenprintui2/panel.c:1181 +#: src/gutenprintui2/panel.c:641 +msgid "Select File..." +msgstr "Vælg fil..." + +#: src/gutenprintui2/panel.c:1018 +msgid "Reset" +msgstr "Nulstil" + +#: src/gutenprintui2/panel.c:1356 #, c-format msgid "%s -- Print v%s" msgstr "%s -- Udskriv v%s" -#: src/gutenprintui/panel.c:1189 src/gutenprintui2/panel.c:1190 +#: src/gutenprintui2/panel.c:1365 msgid "About" msgstr "Om" -#: src/gutenprintui/panel.c:1191 src/gutenprintui2/panel.c:1192 +#: src/gutenprintui2/panel.c:1367 msgid "" "Print and\n" "Save Settings" @@ -6323,7 +6631,7 @@ msgstr "" " Print og\n" "gem opsætning" -#: src/gutenprintui/panel.c:1193 src/gutenprintui2/panel.c:1194 +#: src/gutenprintui2/panel.c:1369 msgid "" "Save\n" "Settings" @@ -6331,15 +6639,15 @@ msgstr "" " Gem\n" "opsætning" -#: src/gutenprintui/panel.c:1195 src/gutenprintui2/panel.c:1196 +#: src/gutenprintui2/panel.c:1371 msgid "Print" msgstr "Udskriv" -#: src/gutenprintui/panel.c:1247 src/gutenprintui2/panel.c:1248 +#: src/gutenprintui2/panel.c:1423 msgid "Preview" msgstr "Smugkig" -#: src/gutenprintui/panel.c:1272 src/gutenprintui2/panel.c:1273 +#: src/gutenprintui2/panel.c:1448 msgid "" "Position the image on the page.\n" "Click and drag with the primary button to position the image.\n" @@ -6363,73 +6671,71 @@ msgstr "" "Hvis du trykker pÃ¥ en anden musetaste mens du trækker med musen, vil " "billedet returnere til dets oprindelig position." -#: src/gutenprintui/panel.c:1319 src/gutenprintui2/panel.c:1320 +#: src/gutenprintui2/panel.c:1495 msgid "Paper Size" msgstr "Papirstørrelse" -#: src/gutenprintui/panel.c:1342 src/gutenprintui2/panel.c:1343 +#: src/gutenprintui2/panel.c:1518 msgid "Show All Paper Sizes" msgstr "Vis alle papirstørrelser" -#: src/gutenprintui/panel.c:1358 src/gutenprintui2/panel.c:1359 +#: src/gutenprintui2/panel.c:1534 msgid "Dimensions:" msgstr "Størrelser:" -#: src/gutenprintui/panel.c:1363 src/gutenprintui/panel.c:2063 -#: src/gutenprintui2/panel.c:1364 src/gutenprintui2/panel.c:2063 +#: src/gutenprintui2/panel.c:1539 src/gutenprintui2/panel.c:2238 msgid "Width:" msgstr "Bredde:" -#: src/gutenprintui/panel.c:1364 src/gutenprintui2/panel.c:1365 +#: src/gutenprintui2/panel.c:1540 msgid "Width of the paper that you wish to print to" msgstr "Bredden af det papir der skal udskrives pÃ¥" -#: src/gutenprintui/panel.c:1368 src/gutenprintui/panel.c:2065 -#: src/gutenprintui2/panel.c:1369 src/gutenprintui2/panel.c:2065 +#: src/gutenprintui2/panel.c:1544 src/gutenprintui2/panel.c:2240 msgid "Height:" msgstr "Højde:" -#: src/gutenprintui/panel.c:1369 src/gutenprintui2/panel.c:1370 +#: src/gutenprintui2/panel.c:1545 msgid "Height of the paper that you wish to print to" msgstr "Højden af det papir der skal udskrives pÃ¥" -#: src/gutenprintui/panel.c:1374 src/gutenprintui2/panel.c:1375 +#: src/gutenprintui2/panel.c:1550 msgid "Automatic Paper Size" msgstr "Automatisk papirstørrelse" -#: src/gutenprintui/panel.c:1391 src/gutenprintui2/panel.c:1392 +#: src/gutenprintui2/panel.c:1567 msgid "Number of Copies" msgstr "Antal kopier" -#: src/gutenprintui/panel.c:1403 src/gutenprintui2/panel.c:1404 +#: src/gutenprintui2/panel.c:1579 msgid "Select the number of copies to print; a value between 1 and 100" msgstr "Vælg antal kopier; skal være mellem 1 og 100" -#: src/gutenprintui/panel.c:1435 src/gutenprintui2/panel.c:1436 +#: src/gutenprintui2/panel.c:1611 msgid "Image Position" msgstr "Billedposition" -#: src/gutenprintui/panel.c:1452 src/gutenprintui2/panel.c:1453 +#: src/gutenprintui2/panel.c:1628 msgid "Auto" msgstr "Auto" -#: src/gutenprintui/panel.c:1454 src/gutenprintui2/panel.c:1455 +#: src/gutenprintui2/panel.c:1630 msgid "Portrait" msgstr "Portræt" -#: src/gutenprintui/panel.c:1456 src/gutenprintui2/panel.c:1457 +#: src/gutenprintui2/panel.c:1632 msgid "Landscape" msgstr "Tværformat" -#: src/gutenprintui/panel.c:1458 src/gutenprintui2/panel.c:1459 +#: src/gutenprintui2/panel.c:1634 msgid "Upside down" msgstr "Vendt op/ned" -#: src/gutenprintui/panel.c:1460 src/gutenprintui2/panel.c:1461 +#: src/gutenprintui2/panel.c:1636 msgid "Seascape" msgstr "Tværformat vendt op/ned" -#: src/gutenprintui/panel.c:1464 src/gutenprintui2/panel.c:1465 +#: src/gutenprintui2/panel.c:1640 msgid "" "Select the orientation: portrait, landscape, upside down, or seascape " "(upside down landscape)" @@ -6437,120 +6743,116 @@ msgstr "" "Vælg papirretning: portræt, tværformat eller portræt og tværformat vendt op/" "ned" -#: src/gutenprintui/panel.c:1466 src/gutenprintui2/panel.c:1467 +#: src/gutenprintui2/panel.c:1642 msgid "Orientation:" msgstr "Orientering:" -#: src/gutenprintui/panel.c:1477 src/gutenprintui2/panel.c:1478 +#: src/gutenprintui2/panel.c:1653 msgid "Left:" msgstr "Venstre:" -#: src/gutenprintui/panel.c:1478 src/gutenprintui2/panel.c:1479 +#: src/gutenprintui2/panel.c:1654 msgid "Distance from the left of the paper to the image" msgstr "Afstand fra venstre side af arket til billedet" -#: src/gutenprintui/panel.c:1481 src/gutenprintui/panel.c:1485 -#: src/gutenprintui2/panel.c:1482 src/gutenprintui2/panel.c:1486 +#: src/gutenprintui2/panel.c:1657 src/gutenprintui2/panel.c:1661 msgid "Right:" msgstr "Højre:" -#: src/gutenprintui/panel.c:1482 src/gutenprintui2/panel.c:1483 +#: src/gutenprintui2/panel.c:1658 msgid "Distance from the left of the paper to the right of the image" msgstr "Afstand fra venstre papiretkant til højre side af billedet" -#: src/gutenprintui/panel.c:1486 src/gutenprintui2/panel.c:1487 +#: src/gutenprintui2/panel.c:1662 msgid "Distance from the right of the paper to the image" msgstr "Afstand fra højre papirkant til billedet" -#: src/gutenprintui/panel.c:1488 src/gutenprintui2/panel.c:1489 +#: src/gutenprintui2/panel.c:1664 msgid "Top:" msgstr "Øverst:" -#: src/gutenprintui/panel.c:1489 src/gutenprintui2/panel.c:1490 +#: src/gutenprintui2/panel.c:1665 msgid "Distance from the top of the paper to the image" msgstr "Afstand fra toppen af arket til billedet" -#: src/gutenprintui/panel.c:1492 src/gutenprintui/panel.c:1496 -#: src/gutenprintui2/panel.c:1493 src/gutenprintui2/panel.c:1497 +#: src/gutenprintui2/panel.c:1668 src/gutenprintui2/panel.c:1672 msgid "Bottom:" msgstr "Nederst:" -#: src/gutenprintui/panel.c:1493 src/gutenprintui2/panel.c:1494 +#: src/gutenprintui2/panel.c:1669 msgid "Distance from the top of the paper to bottom of the image" msgstr "Afstand fra toppen af arket til bunden af billedet" -#: src/gutenprintui/panel.c:1497 src/gutenprintui2/panel.c:1498 +#: src/gutenprintui2/panel.c:1673 msgid "Distance from the bottom of the paper to the image" msgstr "Afstand fra den nederste kant af arket til billedet" -#: src/gutenprintui/panel.c:1507 src/gutenprintui2/panel.c:1508 +#: src/gutenprintui2/panel.c:1683 msgid "Center:" msgstr "Centrér:" -#: src/gutenprintui/panel.c:1510 src/gutenprintui2/panel.c:1511 +#: src/gutenprintui2/panel.c:1686 msgid "Horizontal" msgstr "Vandret" -#: src/gutenprintui/panel.c:1511 src/gutenprintui2/panel.c:1512 +#: src/gutenprintui2/panel.c:1687 msgid "Center the image horizontally on the paper" msgstr "Centrér billedet i vandret pÃ¥ papiret" -#: src/gutenprintui/panel.c:1513 src/gutenprintui2/panel.c:1514 +#: src/gutenprintui2/panel.c:1689 msgid "Both" msgstr "Begge" -#: src/gutenprintui/panel.c:1514 src/gutenprintui2/panel.c:1515 +#: src/gutenprintui2/panel.c:1690 msgid "Center the image on the paper" msgstr "Centrér billedet pÃ¥ papiret" -#: src/gutenprintui/panel.c:1516 src/gutenprintui2/panel.c:1517 +#: src/gutenprintui2/panel.c:1692 msgid "Vertical" msgstr "Lodret" -#: src/gutenprintui/panel.c:1517 src/gutenprintui2/panel.c:1518 +#: src/gutenprintui2/panel.c:1693 msgid "Center the image vertically on the paper" msgstr "Centrér billedet i lodret pÃ¥ papiret" -#: src/gutenprintui/panel.c:1530 src/gutenprintui2/panel.c:1531 +#: src/gutenprintui2/panel.c:1706 msgid "Setup Printer" msgstr "Indstil printer" -#: src/gutenprintui/panel.c:1555 src/gutenprintui2/panel.c:1555 +#: src/gutenprintui2/panel.c:1730 msgid "Printer Make:" msgstr "Printer mærke:" -#: src/gutenprintui/panel.c:1566 src/gutenprintui2/panel.c:1566 +#: src/gutenprintui2/panel.c:1741 msgid "Select the make of your printer" msgstr "Vælg dit printermærke" -#: src/gutenprintui/panel.c:1584 src/gutenprintui/panel.c:1672 -#: src/gutenprintui/panel.c:1890 src/gutenprintui2/panel.c:1584 -#: src/gutenprintui2/panel.c:1672 src/gutenprintui2/panel.c:1890 +#: src/gutenprintui2/panel.c:1759 src/gutenprintui2/panel.c:1847 +#: src/gutenprintui2/panel.c:2065 msgid "Printer Model:" msgstr "Printermodel:" -#: src/gutenprintui/panel.c:1595 src/gutenprintui2/panel.c:1595 +#: src/gutenprintui2/panel.c:1770 msgid "Select your printer model" msgstr "Vælg din printermodel" -#: src/gutenprintui/panel.c:1643 src/gutenprintui2/panel.c:1643 +#: src/gutenprintui2/panel.c:1818 msgid "PPD File:" msgstr "PPD-fil:" -#: src/gutenprintui/panel.c:1659 src/gutenprintui2/panel.c:1659 +#: src/gutenprintui2/panel.c:1834 msgid "Enter the correct PPD filename for your printer" msgstr "Angiv korrekt PPD filnavn for printeren" -#: src/gutenprintui/panel.c:1661 src/gutenprintui/panel.c:1741 -#: src/gutenprintui2/panel.c:1661 src/gutenprintui2/panel.c:1741 +#: src/gutenprintui2/panel.c:1836 src/gutenprintui2/panel.c:1916 msgid "Browse" msgstr "Bladr igennem" -#: src/gutenprintui/panel.c:1668 src/gutenprintui2/panel.c:1668 +#: src/gutenprintui2/panel.c:1843 msgid "Choose the correct PPD filename for your printer" msgstr "Vælg korrekt PPD filnavn for printeren" -#: src/gutenprintui/panel.c:1710 src/gutenprintui2/panel.c:1710 +#: src/gutenprintui2/panel.c:1885 msgid "" "Select the name of the output queue (not the type, or model, of printer) " "that you wish to print to" @@ -6558,52 +6860,51 @@ msgstr "" "Vælg navnet pÃ¥ uddatakøen (hverken type eller model af printer) som du " "ønsker at printe til" -#: src/gutenprintui/panel.c:1712 src/gutenprintui2/panel.c:1712 +#: src/gutenprintui2/panel.c:1887 msgid "Printer Queue:" msgstr "Printerkø:" -#: src/gutenprintui/panel.c:1728 src/gutenprintui2/panel.c:1728 +#: src/gutenprintui2/panel.c:1903 msgid "Enter the correct command to print to your printer. " msgstr "Angiv den korrekte kommando til printning pÃ¥ din printer. " -#: src/gutenprintui/panel.c:1739 src/gutenprintui2/panel.c:1739 +#: src/gutenprintui2/panel.c:1914 msgid "Enter the file to print to. " msgstr "Angiv hvilken fil du vil skrive til. " -#: src/gutenprintui/panel.c:1747 src/gutenprintui2/panel.c:1747 +#: src/gutenprintui2/panel.c:1922 msgid "File to print to" msgstr "Fil der skal skrives til" -#: src/gutenprintui/panel.c:1755 src/gutenprintui2/panel.c:1755 +#: src/gutenprintui2/panel.c:1930 msgid "Print To File" msgstr "Udskriv til fil" -#: src/gutenprintui/panel.c:1785 src/gutenprintui2/panel.c:1785 +#: src/gutenprintui2/panel.c:1960 msgid "Define New Printer" msgstr "Definér ny printer" -#: src/gutenprintui/panel.c:1803 src/gutenprintui/panel.c:1887 -#: src/gutenprintui2/panel.c:1803 src/gutenprintui2/panel.c:1887 +#: src/gutenprintui2/panel.c:1978 src/gutenprintui2/panel.c:2062 msgid "Printer Name:" msgstr "Printernavn:" -#: src/gutenprintui/panel.c:1807 src/gutenprintui2/panel.c:1807 +#: src/gutenprintui2/panel.c:1982 msgid "Enter the name you wish to give this logical printer" msgstr "Angiv et navn til denne logiske printer" -#: src/gutenprintui/panel.c:1817 src/gutenprintui2/panel.c:1817 +#: src/gutenprintui2/panel.c:1992 msgid "About Gutenprint " msgstr "Om Gutenprint" -#: src/gutenprintui/panel.c:1824 src/gutenprintui2/panel.c:1824 +#: src/gutenprintui2/panel.c:1999 msgid "Gutenprint Version " msgstr "Gutenprint version" -#: src/gutenprintui/panel.c:1872 src/gutenprintui2/panel.c:1872 +#: src/gutenprintui2/panel.c:2047 msgid "Printer Settings" msgstr "Printer indstillinger" -#: src/gutenprintui/panel.c:1885 src/gutenprintui2/panel.c:1885 +#: src/gutenprintui2/panel.c:2060 msgid "" "Select the name of the printer (not the type, or model, of printer) that you " "wish to print to" @@ -6611,11 +6912,11 @@ msgstr "" "Vælg navnet pÃ¥ printeren (hverken type eller model af printer) som du ønsker " "at udskrive til" -#: src/gutenprintui/panel.c:1902 src/gutenprintui2/panel.c:1902 +#: src/gutenprintui2/panel.c:2077 msgid "Setup Printer..." msgstr "Opsætning printer..." -#: src/gutenprintui/panel.c:1904 src/gutenprintui2/panel.c:1904 +#: src/gutenprintui2/panel.c:2079 msgid "" "Choose the printer model, PPD file, and command that is used to print to " "this printer" @@ -6623,11 +6924,11 @@ msgstr "" "Vælg printermodel, PPD fil og kommando, der skal bruges for at printe til " "denne printer" -#: src/gutenprintui/panel.c:1917 src/gutenprintui2/panel.c:1917 +#: src/gutenprintui2/panel.c:2092 msgid "New Printer..." msgstr "Ny printer..." -#: src/gutenprintui/panel.c:1918 src/gutenprintui2/panel.c:1918 +#: src/gutenprintui2/panel.c:2093 msgid "" "Define a new logical printer. This can be used to name a collection of " "settings that you wish to remember for future use." @@ -6635,64 +6936,63 @@ 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:1948 src/gutenprintui2/panel.c:1948 -#, fuzzy +#: src/gutenprintui2/panel.c:2123 msgid "Set Printer Option Defaults" -msgstr "Sæt til standardværdier" +msgstr "Sæt printerindstilling til standardværdier" -#: src/gutenprintui/panel.c:1949 src/gutenprintui2/panel.c:1949 +#: src/gutenprintui2/panel.c:2124 msgid "Set all printer options to their defaults" -msgstr "" +msgstr "Sæt alle printerindstillinger til standardværdier" -#: src/gutenprintui/panel.c:1972 src/gutenprintui2/panel.c:1972 +#: src/gutenprintui2/panel.c:2147 msgid "Image Size" msgstr "Billedstørrelse" -#: src/gutenprintui/panel.c:1997 src/gutenprintui2/panel.c:1997 +#: src/gutenprintui2/panel.c:2172 msgid "Scaling:" msgstr "Skalering:" -#: src/gutenprintui/panel.c:2001 src/gutenprintui2/panel.c:2001 +#: src/gutenprintui2/panel.c:2176 msgid "Set the scale (size) of the image" msgstr "Angiv skalering (størrelse) af billedet" -#: src/gutenprintui/panel.c:2023 src/gutenprintui2/panel.c:2023 +#: src/gutenprintui2/panel.c:2198 msgid "Scale by:" msgstr "Skalér med:" -#: src/gutenprintui/panel.c:2028 src/gutenprintui2/panel.c:2028 +#: src/gutenprintui2/panel.c:2203 msgid "" "Select whether scaling is measured as percent of available page size or " "number of output dots per inch" msgstr "" -"Vælg om skalering mÃ¥les i procent af valgt sidestørrelse, eller antal af " +"Vælg om skalering mÃ¥les i procent af valgt arkstørrelse, eller antal af " "udskriftspunkter pr. tomme" -#: src/gutenprintui/panel.c:2031 src/gutenprintui2/panel.c:2031 +#: src/gutenprintui2/panel.c:2206 msgid "Percent" msgstr "Procent" -#: src/gutenprintui/panel.c:2036 src/gutenprintui2/panel.c:2036 +#: src/gutenprintui2/panel.c:2211 msgid "Scale the print to the size of the page" msgstr "Skalér udskriften til arkstørrelsen" -#: src/gutenprintui/panel.c:2040 src/gutenprintui2/panel.c:2040 +#: src/gutenprintui2/panel.c:2215 msgid "PPI" msgstr "PPI" -#: src/gutenprintui/panel.c:2045 src/gutenprintui2/panel.c:2045 +#: src/gutenprintui2/panel.c:2220 msgid "Scale the print to the number of dots per inch" msgstr "Skalér udskriften til antal punkter pr. tomme" -#: src/gutenprintui/panel.c:2063 src/gutenprintui2/panel.c:2063 +#: src/gutenprintui2/panel.c:2238 msgid "Set the width of the print" msgstr "Angiv bredden af udskriften" -#: src/gutenprintui/panel.c:2065 src/gutenprintui2/panel.c:2065 +#: src/gutenprintui2/panel.c:2240 msgid "Set the height of the print" msgstr "Angiv højden pÃ¥ udskriften" -#: src/gutenprintui/panel.c:2071 src/gutenprintui2/panel.c:2071 +#: src/gutenprintui2/panel.c:2246 msgid "" "Use Original\n" "Image Size" @@ -6700,148 +7000,103 @@ msgstr "" "Brug original\n" "billedstørrelse" -#: src/gutenprintui/panel.c:2077 src/gutenprintui2/panel.c:2077 +#: src/gutenprintui2/panel.c:2252 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:2100 src/gutenprintui2/panel.c:2101 +#: src/gutenprintui2/panel.c:2276 msgid "Print Color Adjust" msgstr "Udskrifts-farvejustering" -#: src/gutenprintui/panel.c:2103 src/gutenprintui2/panel.c:2104 +#: src/gutenprintui2/panel.c:2279 msgid "Set Defaults" msgstr "Sæt til standardværdier" -#: src/gutenprintui/panel.c:2105 src/gutenprintui2/panel.c:2106 +#: src/gutenprintui2/panel.c:2281 msgid "Close" msgstr "Luk" -#: src/gutenprintui/panel.c:2134 src/gutenprintui2/panel.c:2135 +#: src/gutenprintui2/panel.c:2310 msgid "Image preview" msgstr "Smugkig af billede" -#: src/gutenprintui/panel.c:2148 src/gutenprintui2/panel.c:2149 +#: src/gutenprintui2/panel.c:2324 msgid "View Output Channels:" msgstr "Vis udskriftskanaler:" -#: src/gutenprintui/panel.c:2234 src/gutenprintui2/panel.c:2240 +#: src/gutenprintui2/panel.c:2415 msgid "Output" msgstr "Udskrift" -#: src/gutenprintui/panel.c:2262 src/gutenprintui2/panel.c:2268 +#: src/gutenprintui2/panel.c:2443 msgid "Output Type:" msgstr "Udskriftstype:" -#: src/gutenprintui/panel.c:2266 src/gutenprintui2/panel.c:2272 +#: src/gutenprintui2/panel.c:2447 msgid "Select the desired output type" msgstr "Vælg den ønskede udskriftstype" -#: src/gutenprintui/panel.c:2287 src/gutenprintui2/panel.c:2293 +#: src/gutenprintui2/panel.c:2468 msgid "Adjust Output..." msgstr "Justér udskrift..." -#: src/gutenprintui/panel.c:2296 src/gutenprintui2/panel.c:2302 +#: src/gutenprintui2/panel.c:2477 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:2314 src/gutenprintui2/panel.c:2321 +#: src/gutenprintui2/panel.c:2496 msgid "Size Units:" msgstr "MÃ¥l-enhed:" -#: src/gutenprintui/panel.c:2317 src/gutenprintui2/panel.c:2324 +#: src/gutenprintui2/panel.c:2499 msgid " " msgstr " " -#: src/gutenprintui/panel.c:2341 src/gutenprintui2/panel.c:2348 +#: src/gutenprintui2/panel.c:2523 msgid "Units:" msgstr "Enheder:" -#: src/gutenprintui/panel.c:2346 src/gutenprintui2/panel.c:2353 +#: src/gutenprintui2/panel.c:2528 msgid "Select the base unit of measurement for printing" msgstr "Vælg basisenhed for mÃ¥langivelse ved printning" -#: src/gutenprintui/plist.c:90 src/gutenprintui/plist.c:99 -#: src/gutenprintui2/plist.c:89 src/gutenprintui2/plist.c:98 +#: src/gutenprintui2/plist.c:92 src/gutenprintui2/plist.c:101 msgid "System V lp" msgstr "System V lp" -#: src/gutenprintui/plist.c:96 src/gutenprintui2/plist.c:95 +#: src/gutenprintui2/plist.c:98 msgid "CUPS" msgstr "CUPS" -#: src/gutenprintui/plist.c:102 src/gutenprintui2/plist.c:101 +#: src/gutenprintui2/plist.c:104 msgid "Berkeley lpd (/etc/lpc)" msgstr "Berkeley lpd (/etc/lpc)" -#: src/gutenprintui/plist.c:105 src/gutenprintui2/plist.c:104 +#: src/gutenprintui2/plist.c:107 msgid "Berkeley lpd (/usr/bsd/lpc)" msgstr "Berkeley lpd (/usr/bsd/lpc)" -#: src/gutenprintui/plist.c:108 src/gutenprintui2/plist.c:107 +#: src/gutenprintui2/plist.c:110 msgid "Berkeley lpd (/usr/etc/lpc" msgstr "Berkeley lpd (/usr/etc/lpc" -#: src/gutenprintui/plist.c:111 src/gutenprintui2/plist.c:110 +#: src/gutenprintui2/plist.c:113 msgid "Berkeley lpd (/usr/libexec/lpc)" msgstr "Berkeley lpd (/usr/libexec/lpc)" -#: src/gutenprintui/plist.c:114 src/gutenprintui2/plist.c:113 +#: src/gutenprintui2/plist.c:116 msgid "Berkeley lpd (/usr/sbin/lpc)" msgstr "Berkeley lpd (/usr/sbin/lpc)" -#: src/gutenprintui/plist.c:1043 src/gutenprintui2/plist.c:1057 +#: src/gutenprintui2/plist.c:1060 msgid "Printer" msgstr "Printer" -#: src/gutenprintui/plist.c:1230 src/gutenprintui2/plist.c:1250 +#: src/gutenprintui2/plist.c:1253 msgid "(Default Printer)" msgstr "(Standard printer)" -#: src/gutenprintui2/curve.c:130 -msgid "Curve type" -msgstr "Kurvetype" - -#: src/gutenprintui2/curve.c:131 -msgid "Is this curve linear, spline interpolated, or free-form" -msgstr "Er denne kurve lineær, tilpasset med interpolation eller fri-form" - -#: src/gutenprintui2/curve.c:139 -msgid "Minimum X" -msgstr "Minimum X" - -#: src/gutenprintui2/curve.c:140 -msgid "Minimum possible value for X" -msgstr "Mindst mulige værdi for X" - -#: src/gutenprintui2/curve.c:149 -msgid "Maximum X" -msgstr "Maksimum X" - -#: src/gutenprintui2/curve.c:150 -msgid "Maximum possible X value" -msgstr "Størst mulige værdi for X" - -#: src/gutenprintui2/curve.c:159 -msgid "Minimum Y" -msgstr "Minimum Y" - -#: src/gutenprintui2/curve.c:160 -msgid "Minimum possible value for Y" -msgstr "Mindst mulige værdi for Y" - -#: src/gutenprintui2/curve.c:169 -msgid "Maximum Y" -msgstr "Maksimum Y" - -#: src/gutenprintui2/curve.c:170 -msgid "Maximum possible value for Y" -msgstr "Størst mulige værdi for Y" - -#: src/gutenprintui2/gammacurve.c:418 -msgid "_Gamma value" -msgstr "_Gamma værdi" - #: src/cups/genppd.c:145 msgid "Printer Features" msgstr "Printer egenskaber" @@ -6877,50 +7132,48 @@ msgstr "Ekstra 5" #. 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:1058 +#: src/cups/genppd.c:1064 msgid "English" msgstr "Danish" #. TRANSLATORS: Specify PPD translation encoding e.g. ISOLatin1 -#: src/cups/genppd.c:1060 +#: src/cups/genppd.c:1066 msgid "ISOLatin1" msgstr "ISOLatin1" -#: src/cups/genppd.c:1641 -#, fuzzy +#: src/cups/genppd.c:1647 msgid "2-Sided Printing" -msgstr "Tosidet printning" +msgstr "2-sidet udskrivning" -#: src/cups/genppd.c:1665 +#: src/cups/genppd.c:1671 msgid "Shrink Page If Necessary to Fit Borders" -msgstr "" +msgstr "Formindsk side sÃ¥ den passer til kanter" -#: src/cups/genppd.c:1669 +#: src/cups/genppd.c:1675 msgid "Shrink (print the whole page)" -msgstr "" +msgstr "Formindsk (udskriv hele siden)" -#: src/cups/genppd.c:1670 +#: src/cups/genppd.c:1676 msgid "Crop (preserve dimensions)" -msgstr "" +msgstr "Beskær (bevar format)" -#: src/cups/genppd.c:1671 +#: src/cups/genppd.c:1677 msgid "Expand (use maximum page area)" -msgstr "" +msgstr "Udvid (brug hele arket)" -#: src/cups/genppd.c:1756 +#: src/cups/genppd.c:1762 msgid "No" msgstr "Nej" -#: src/cups/genppd.c:1758 +#: src/cups/genppd.c:1764 msgid "Yes" msgstr "Ja" -#: src/cups/genppd.c:1795 src/cups/genppd.c:1857 -#, fuzzy +#: src/cups/genppd.c:1801 src/cups/genppd.c:1863 msgid "Value" -msgstr "BlÃ¥" +msgstr "Værdi" -#: src/cups/genppd.c:1800 +#: src/cups/genppd.c:1806 msgid "Fine Adjustment" msgstr "Finjustering" @@ -6965,7 +7218,6 @@ msgstr "" "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" @@ -7014,8 +7266,8 @@ msgstr "" " [-P printer | -r enhed] [-u] [-q] [-m model] [ -S ]\n" " [-C valg] [-p mønstre]\n" "Udfører vedligeholdelse pÃ¥ EPSON Stylus (R) printere.\n" -"Eksempler: escputil --clean-head --new --printer-navn pÃ¥ min-kø\n" -" escputil --ink-level --raw-device /dev/usb/lp0\n" +"Eksempler: escputil --ink-level --raw-device /dev/usb/lp0\n" +" escputil --clean-head --new --printer-name pÃ¥ min-kø\n" "\n" " Kommandoer:\n" " -c|--clean-head Renser print hoved.\n" @@ -7046,12 +7298,11 @@ msgstr "" " -r|--raw-device Specificer navnet pÃ¥ den enhed der skrives til " "direkte\n" " i stedet for at gÃ¥ gennem en printerkø.\n" +" -m|--model Specificer den præcise printermodel.\n" " -u|--new Printeren er ny (Stylus Color 740 eller nyere).\n" " Bruges kun nÃ¥r der ikke anvendes direkte adgang.\n" " -q|--quiet Undertrykker banneret.\n" " -S|--short-name Printer kort-navn for printer med --identify.\n" -" -m|--model Specificer den præcise printermodel til brug for\n" -" indretning af printhoved (alignment).\n" " -C|--choices Angiv antallet af mønstre, ved printerhoved retten " "ind.\n" " -p|--patterns Angiv antallet af sæt af mønstre, ved printerhoved " @@ -7211,7 +7462,7 @@ msgstr "Kan ikke læse fra %s: %s\n" #: src/escputil/escputil.c:729 #, c-format msgid "Please specify a raw device\n" -msgstr "" +msgstr "Angiv en ufiltreret enhed\n" #: src/escputil/escputil.c:736 #, c-format @@ -7219,9 +7470,9 @@ msgid "Cannot open %s read/write: %s\n" msgstr "Kan ikke Ã¥bne %s læse/skrive: %s\n" #: src/escputil/escputil.c:783 -#, fuzzy, c-format +#, c-format msgid "Unknown printer %s!\n" -msgstr "Ukendt indstilling %c\n" +msgstr "Ukendt printer %s!\n" #: src/escputil/escputil.c:819 src/escputil/escputil.c:1414 #, c-format @@ -7433,7 +7684,7 @@ msgstr "" #: src/escputil/escputil.c:1598 src/escputil/escputil.c:1622 #: src/escputil/escputil.c:1642 msgid "Ink cartridge" -msgstr "" +msgstr "Blækpatron" #: src/escputil/escputil.c:1598 src/escputil/escputil.c:1622 #: src/escputil/escputil.c:1642 @@ -7733,7 +7984,7 @@ msgid "Final command was not confirmed.\n" msgstr "Afsluttende kommando blev ikke bekræftet.\n" #: src/escputil/escputil.c:1908 -#, fuzzy, c-format +#, c-format msgid "" "This procedure assumes that your printer is an %s.\n" "If this is not your printer model, please type control-C now and\n" @@ -7742,7 +7993,7 @@ msgid "" "Please place a sheet of paper in your printer to begin the head\n" "alignment procedure.\n" msgstr "" -"Denne procedure gÃ¥r ud fra, at din printer er en Epson %s.\n" +"Denne procedure gÃ¥r ud fra, at din printer er en %s.\n" "Hvis dette ikke er din printermodel, tast ctrl-C nu, og vælg\n" "din aktuelle printermodel.\n" "\n" @@ -7818,355 +8069,93 @@ msgstr "" msgid "Error in input\n" msgstr "Fejl i inddata\n" -#: src/gimp/print-image-gimp.c:225 src/gimp2/print-image-gimp.c:225 +#: src/gimp2/print-image-gimp.c:225 msgid "Printing..." msgstr "Udskriver..." -#: src/gimp/print.c:133 -msgid "/File/Print..." -msgstr "/Fil/Udskriv..." - -#: src/ghost/ijsgutenprint.c:98 -#, c-format -msgid "" -"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" -msgstr "" -"ijsgutenprint: den installerede version af Gutenprint softwaren (%s)\n" -" matcher ikke PPD filen (%s). Hvis du har opgraderet din version af\n" -" Gutenprint for nyligt, skal du geninstallere alle printerkøer.\n" -" Se i distributionsvejledningen eller brug ``foomatic-ppdfile''\n" -" kommandoen for anvisninger.\n" -"ERROR: ijsgutenprint: den installerede version af Gutenprint softwaren (%s)\n" -" matcher ikke PPD filen (%s).\n" - -#: 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:199 -#, c-format -msgid "ERROR: ijsgutenprint: No row buffer\n" -msgstr "ERROR: ijsgutenprint: Ingen række buffer\n" - -#: 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 "" -"ERROR: ijsgutenprint: Kan ikke fortolke parameter %s=%s (forventer et " -"nummer)\n" - -#: 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: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:656 -#, c-format -msgid "ijsgutenprint: unknown DeviceModel %s\n" -msgstr "ijsgutenprint: ukendt DeviceModel %s\n" - -#: 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:723 -#, c-format -msgid "ERROR: ijsgutenprint: cannot parse PaperSize %s\n" -msgstr "ERROR: ijsgutenprint: Kan ikke fortolke PaperSize %s\n" - -#: 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: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: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: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: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:841 -#, c-format -msgid "ERROR: ijsgutenprint: Bad parameter %s %d\n" -msgstr "ERROR: ijsgutenprint: Forkert parameter %s %d\n" - -#: src/ghost/ijsgutenprint.c:867 -#, c-format -msgid "ERROR: ijsgutenprint: bad key code %d\n" -msgstr "ERROR: ijsgutenprint: forkert nøglekode %d\n" - -#: src/ghost/ijsgutenprint.c:1308 -#, c-format -msgid "ERROR: ijsgutenprint: image_init failed %d\n" -msgstr "ERROR: ijsgutenprint: image_init fejlede %d\n" - -#: src/ghost/ijsgutenprint.c:1319 -#, c-format -msgid "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:1331 -#, c-format -msgid "ERROR: ijsgutenprint: Unable to open %s: %s\n" -msgstr "ERROR: ijsgutenprint: Ikke i stand til at Ã¥bne %s: %s\n" - -#: src/ghost/ijsgutenprint.c:1344 -#, c-format -msgid "ERROR: ijsgutenprint: Unknown printer %s\n" -msgstr "ERROR: ijsgutenprint: Ukendt printer %s\n" - -#: src/ghost/ijsgutenprint.c:1516 -#, c-format -msgid "ERROR: ijsgutenprint: Bad parameters; cannot continue!\n" -msgstr "ERROR: ijsgutenprint: Forkerte parametre; kan ikke fortsætte!\n" - -#: src/ghost/ijsgutenprint.c:1534 -#, c-format -msgid "ERROR: ijsgutenprint: Get next row failed at %.0f\n" -msgstr "ERROR: ijsgutenprint: Hentning af næste række fejlede ved %.0f\n" - -#, fuzzy -#~ msgid "Model Name" -#~ msgstr "Kanalnavne" - -#, fuzzy -#~ msgid "Canon MULTIPASS MP500" -#~ msgstr "Canon S500" - -#, fuzzy -#~ msgid "Canon MULTIPASS MP760" -#~ msgstr "Canon LBP-1760" - -#~ msgid "Cassette" -#~ msgstr "Kassette" - -#~ msgid "CD tray" -#~ msgstr "CD skuffe" - -#~ msgid " Gamma" -#~ msgstr "Gamma" - -#~ msgid " Curve" -#~ msgstr "Kurve" - -#~ msgid "1440 x 1440" -#~ msgstr "1440 x 1440" - -#~ msgid "1440 x 1440 DPI High Quality" -#~ msgstr "1440 x 1440 DPI høj kvalitet" - -#~ msgid "1440 x 1440 DPI Highest Quality" -#~ msgstr "1440 x 1440 DPI højeste kvalitet" - -#~ msgid "2880 x 1440 DPI High Quality" -#~ msgstr "2880 x 1440 DPI høj kvalitet" - -#~ msgid "2880 x 1440 DPI Highest Quality" -#~ msgstr "2880 x 1440 DPI højeste kvalitet" - #~ msgid "" -#~ "\n" -#~ "\n" -#~ "Copyright (C) 1997-2003 Michael Sweet, Robert Krawitz,\n" -#~ "and the rest of the Gutenprint Development Team.\n" -#~ "\n" -#~ "Please visit our web site at http://gimp-print.sourceforge.net.\n" -#~ "\n" -#~ "This program is free software; you can redistribute it and/or modify\n" -#~ "it under the terms of the GNU General Public License as published by\n" -#~ "the Free Software Foundation; either version 2 of the License, or\n" -#~ "(at your option) any later version.\n" -#~ "\n" -#~ "This program is distributed in the hope that it will be useful,\n" -#~ "but WITHOUT ANY WARRANTY; without even the implied warranty of\n" -#~ "MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the\n" -#~ "GNU General Public License for more details.\n" -#~ "\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" +#~ "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" #~ msgstr "" -#~ "\n" -#~ "\n" -#~ "Copyright (C) 1997-2003 Michael Sweet, Robert Krawitz,\n" -#~ "og resten af Gutenprint udviklings teamet.\n" -#~ "\n" -#~ "Besøg vores web site pÃ¥: http://gimp-print.sourceforge.net.\n" -#~ "\n" -#~ "Dette program er fri software, du mÃ¥ redistribuere det og/eller ændre\n" -#~ "det, under betingelserne i GNU General Public License som publiceret af\n" -#~ "the Free Software Foundation; enten version 2 af licensen, eller\n" -#~ "(efter eget ønske) enhver senere version.\n" -#~ "\n" -#~ "Dette program er distribueret i det hÃ¥b at det kan være nyttigt, men\n" -#~ "UDEN ENHVER FORM FOR GARANTI, endda uden den underforstÃ¥ede\n" -#~ "garanti for SALGBARHED, eller EGNETHED FOR ET BESTEMT FORMÃ…L\n" -#~ "Se GNU General Public License for yderligere detaljer.\n" -#~ "\n" -#~ "Du skulle have modtaget en kopi af GNU General Public License sammen\n" -#~ "med dette program. Hvis ikke, skriv da til Free Software Foundation, " -#~ "Inc .,\n" -#~ "59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.\n" - -#~ 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" +#~ "ijsgutenprint: den installerede version af Gutenprint softwaren (%s)\n" +#~ " matcher ikke PPD filen (%s). Hvis du har opgraderet din version af\n" +#~ " Gutenprint for nyligt, skal du geninstallere alle printerkøer.\n" +#~ " Se i distributionsvejledningen eller brug ``foomatic-ppdfile''\n" +#~ " kommandoen for anvisninger.\n" +#~ "ERROR: ijsgutenprint: den installerede version af Gutenprint softwaren (%" +#~ "s)\n" +#~ " matcher ikke PPD filen (%s).\n" + +#~ msgid "ERROR: ijsgutenprint: Bad color space: bps %d channels %d space %s\n" #~ msgstr "" -#~ ", Copyright (C) 2000-2006 Robert Krawitz\n" -#~ "Escputil kommer UDEN NOGEN FORM FOR GARANTI; for detaljer skriv 'escputil " -#~ "-l'\n" -#~ "Dette er fri software, og du er velkommen til at redistribuere det\n" -#~ "under bestemte forudsætninger; skriv 'escputil -l' for detaljer.\n" - -#~ msgid "90x90 DPI" -#~ msgstr "90x90 DPI" - -#~ msgid "90x90 DPI DMT" -#~ msgstr "90x90 DPI DMT" - -#~ msgid "180x180 DPI" -#~ msgstr "180x180 DPI" - -#~ msgid "180x180 DPI DMT" -#~ msgstr "180x180 DPI DMT" - -#~ msgid "360x360 DPI" -#~ msgstr "360x360 DPI" - -#~ msgid "360x360 DPI DMT" -#~ msgstr "360x360 DPI DMT" +#~ "ERROR: ijsgutenprint: Fejlagtigt farveomrÃ¥de: bps %d kanaler %d omrÃ¥de %" +#~ "s\n" -#~ msgid "720x360 DPI" -#~ msgstr "720x360 DPI" +#~ msgid "ERROR: ijsgutenprint: No row buffer\n" +#~ msgstr "ERROR: ijsgutenprint: Ingen række buffer\n" -#~ msgid "720x360 DPI DMT" -#~ msgstr "720x360 DPI DMT" - -#~ msgid "720x720 DPI" -#~ msgstr "720x720 DPI" - -#~ msgid "720x720 DPI DMT" -#~ msgstr "720x720 DPI DMT" - -#~ msgid "1440x720 DPI" -#~ msgstr "1440x720 DPI" - -#~ msgid "1440x720 DPI DMT" -#~ msgstr "1440x720 DPI DMT" - -#~ msgid "1440x1440 DPI" -#~ msgstr "1440x1440 DPI" - -#~ msgid "1440x1440 DPI DMT" -#~ msgstr "1440x1440 DPI DMT" - -#~ msgid "2880x2880 DPI" -#~ msgstr "2880x2880 DPI" - -#~ msgid "2880x2880 DPI DMT" -#~ msgstr "2880x2880 DPI DMT" - -#~ msgid "150x150 DPI DMT" -#~ msgstr "150x150 DPI DMT" - -#~ msgid "300x300 DPI DMT" -#~ msgstr "300x300 DPI DMT" - -#~ msgid "600x300 DPI DMT" -#~ msgstr "600x300 DPI DMT" - -#~ msgid "600x600 DPI DMT" -#~ msgstr "600x600 DPI DMT" - -#~ msgid "1200x600 DPI DMT" -#~ msgstr "1200x600 DPI DMT" - -#~ msgid "1200x1200 DPI" -#~ msgstr "1200x1200 DPI" +#~ msgid "" +#~ "ERROR: ijsgutenprint: Unable to parse parameter %s=%s (expect a number)\n" +#~ msgstr "" +#~ "ERROR: ijsgutenprint: Kan ikke fortolke parameter %s=%s (forventer et " +#~ "nummer)\n" -#~ msgid "1200x1200 DPI DMT" -#~ msgstr "1200x1200 DPI DMT" +#~ msgid "ERROR: ijsgutenprint: Printer must be specified with -sDeviceModel\n" +#~ msgstr "ERROR: ijsgutenprint: Printer skal specificeres med -sDeviceModel\n" -#~ msgid "2400x2400 DPI" -#~ msgstr "2400x2400 DPI" +#~ msgid "ERROR: ijsgutenprint: Printer %s is not a known model\n" +#~ msgstr "ERROR: ijsgutenprint: Printer %s er ikke en kendt model\n" -#~ msgid "2400x2400 DPI DMT" -#~ msgstr "2400x2400 DPI DMT" +#~ msgid "ijsgutenprint: unknown DeviceModel %s\n" +#~ msgstr "ijsgutenprint: ukendt DeviceModel %s\n" -#~ msgid "Plain Paper PIXMA" -#~ msgstr "Almindeligt papir PIXMA" +#~ msgid "ERROR: ijsgutenprint: cannot parse TopLeft %s\n" +#~ msgstr "ERROR: ijsgutenprint: kan ikke fortolke TopLeft %s\n" -#~ msgid "Back Print Film" -#~ msgstr "Bagside-printfilm" +#~ msgid "ERROR: ijsgutenprint: cannot parse PaperSize %s\n" +#~ msgstr "ERROR: ijsgutenprint: Kan ikke fortolke PaperSize %s\n" -#~ msgid "Fabric Sheets" -#~ msgstr "Stofark" +#~ msgid "ERROR: ijsgutenprint: cannot parse curve %s\n" +#~ msgstr "ERROR: ijsgutenprint: Kan ikke fortolke kurve %s\n" -#~ msgid "Envelope" -#~ msgstr "Kuvert" +#~ msgid "ERROR: ijsgutenprint: cannot parse %s float %s\n" +#~ msgstr "ERROR: ijsgutenprint: Kan ikke fortolke %s flyde %s\n" -#~ msgid "High Resolution Paper" -#~ msgstr "Højopløsningspapir" +#~ msgid "ERROR: ijsgutenprint: cannot parse %s int %s\n" +#~ msgstr "ERROR: ijsgutenprint: Kan ikke fortolke %s int %s\n" -#~ msgid "T-Shirt Transfers" -#~ msgstr "T-shirt overføring" +#~ msgid "ERROR: ijsgutenprint: cannot parse %s dimension %s\n" +#~ msgstr "ERROR: ijsgutenprint: Kan ikke fortolke %s dimension %s\n" -#~ msgid "High Gloss Film" -#~ msgstr "Højglansfilm" +#~ msgid "ERROR: ijsgutenprint: cannot parse %s boolean %s\n" +#~ msgstr "ERROR: ijsgutenprint: Kan ikke fortolke %s boolean %s\n" -#~ msgid "Glossy Photo Paper" -#~ msgstr "Blankt fotopapir" +#~ msgid "ERROR: ijsgutenprint: Bad parameter %s %d\n" +#~ msgstr "ERROR: ijsgutenprint: Forkert parameter %s %d\n" -#~ msgid "Glossy Photo Cards" -#~ msgstr "Blanke fotokort" +#~ msgid "ERROR: ijsgutenprint: bad key code %d\n" +#~ msgstr "ERROR: ijsgutenprint: forkert nøglekode %d\n" -#~ msgid "Photo Paper Pro" -#~ msgstr "Prof. fotopapir" +#~ msgid "ERROR: ijsgutenprint: image_init failed %d\n" +#~ msgstr "ERROR: ijsgutenprint: image_init fejlede %d\n" -#~ msgid "Photo CcMmYK Color" -#~ msgstr "Foto CcMmYK farver" +#~ msgid "ERROR: ijsgutenprint: Unable to open file descriptor: %s\n" +#~ msgstr "ERROR: ijsgutenprint: Ikke i stand til at Ã¥bne filbeskriver: %s\n" -#~ msgid "Photo CcMmY Color" -#~ msgstr "Foto CcMmY farver" +#~ msgid "ERROR: ijsgutenprint: Unable to open %s: %s\n" +#~ msgstr "ERROR: ijsgutenprint: Ikke i stand til at Ã¥bne %s: %s\n" -#~ msgid "CMYK Color" -#~ msgstr "CMYK farver" +#~ msgid "ERROR: ijsgutenprint: Unknown printer %s\n" +#~ msgstr "ERROR: ijsgutenprint: Ukendt printer %s\n" -#~ msgid "CMY Color" -#~ msgstr "CMY farver" +#~ msgid "ERROR: ijsgutenprint: Bad parameters; cannot continue!\n" +#~ msgstr "ERROR: ijsgutenprint: Forkerte parametre; kan ikke fortsætte!\n" -#~ msgid "Gutenprint" -#~ msgstr "Gutenprint" +#~ msgid "ERROR: ijsgutenprint: Get next row failed at %.0f\n" +#~ msgstr "ERROR: ijsgutenprint: Hentning af næste række fejlede ved %.0f\n" diff --git a/po/de.gmo b/po/de.gmo index 29f5e76..bf6298d 100644 Binary files a/po/de.gmo and b/po/de.gmo differ diff --git a/po/de.po b/po/de.po index cb62cce..9c3cc73 100644 --- a/po/de.po +++ b/po/de.po @@ -6,22 +6,22 @@ msgid "" msgstr "" "Project-Id-Version: gimpprint 4.3.4\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2008-01-01 20:47-0500\n" +"POT-Creation-Date: 2008-04-25 21:19-0400\n" "PO-Revision-Date: 2002-09-05 21:20MET\n" "Last-Translator: Olaf Klemke \n" "Language-Team: deutsch \n" "MIME-Version: 1.0\n" -"Content-Type: text/plain; charset=utf-8\n" +"Content-Type: text/plain; charset=ISO-8859-15\n" "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:1752 +#: src/main/print-escp2.c:2116 #, fuzzy msgid "Default" -msgstr "Zurücksetzen" +msgstr "Zurücksetzen" #: src/main/dither-main.c:47 msgid "EvenTone" @@ -63,60 +63,73 @@ msgid "Ordered" msgstr "Abgestuft" #: src/main/dither-main.c:65 +#, fuzzy +msgid "Ordered New" +msgstr "Abgestuft" + +#: src/main/dither-main.c:66 msgid "Fast" msgstr "Schnell" -#: src/main/dither-main.c:66 +#: src/main/dither-main.c:67 msgid "Very Fast" msgstr "Sehr schnell" -#: src/main/dither-main.c:67 +#: src/main/dither-main.c:68 msgid "Hybrid Floyd-Steinberg" msgstr "Hybrid Floyd-Steinberg" -#: src/main/dither-main.c:68 +#: src/main/dither-main.c:69 msgid "Predithered Input" msgstr "" -#: src/main/dither-main.c:88 src/main/print-color.c:56 +#: src/main/dither-main.c:70 +msgid "Drop Size Segmented" +msgstr "" + +#: src/main/dither-main.c:71 +msgid "Drop Size Segmented New" +msgstr "" + +#: src/main/dither-main.c:91 src/main/print-color.c:56 #, fuzzy msgid "Density" msgstr "Empfindlichkeit:" -#: src/main/dither-main.c:88 src/main/print-canon.c:295 +#: src/main/dither-main.c:91 src/main/print-canon.c:295 #: src/main/print-canon.c:303 src/main/print-canon.c:311 -#: src/main/print-canon.c:319 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-escp2.c:471 -#: src/main/print-escp2.c:479 src/main/print-escp2.c:487 +#: src/main/print-canon.c:319 src/main/print-escp2.c:446 +#: src/main/print-escp2.c:454 src/main/print-escp2.c:462 +#: src/main/print-escp2.c:470 src/main/print-escp2.c:478 +#: src/main/print-escp2.c:486 src/main/print-escp2.c:494 #: 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:1764 src/main/print-olympus.c:1772 -#: src/main/print-olympus.c:1780 src/main/print-olympus.c:1788 -#: src/main/print-pcl.c:1261 src/main/print-pcl.c:1269 -#: src/main/print-pcl.c:1277 src/main/print-pcl.c:1285 +#: src/main/print-olympus.c:1762 src/main/print-olympus.c:1770 +#: src/main/print-olympus.c:1778 src/main/print-olympus.c:1786 +#: src/main/print-pcl.c:1329 src/main/print-pcl.c:1337 +#: src/main/print-pcl.c:1345 src/main/print-pcl.c:1353 msgid "Output Level Adjustment" msgstr "" -#: src/main/dither-main.c:89 +#: src/main/dither-main.c:92 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 "" "Stellen sie die Empfindlichkeit (Tintenmenge) des Druckes ein. Eine " -"Verringerung läßt die Tinte durch das Papierdringen oder verschmieren, eine " -"Erhöhung kann zu schlecht gedeckten Bereichen führen." +"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:97 +#: src/main/dither-main.c:100 msgid "Dither Algorithm" msgstr "Raster Algorythmus" -#: src/main/dither-main.c:97 +#: src/main/dither-main.c:100 msgid "Screening Adjustment" msgstr "" -#: src/main/dither-main.c:98 +#: src/main/dither-main.c:101 #, fuzzy msgid "" "Choose the dither algorithm to be used.\n" @@ -128,10 +141,10 @@ msgid "" "art.\n" "Hybrid Floyd-Steinberg generally produces inferior output." msgstr "" -"Wählen sie den Raster-Algorythmus aus\n" -"Adaptive Hybrid ist gut für alles.\n" -"Abgestuft ist schnell und für Fotos geeignet.\n" -"Schnell und Sehr Schnell sind am schnellsten und gut für Zeichnungen und " +"Wählen sie den Raster-Algorythmus aus\n" +"Adaptive Hybrid ist gut für alles.\n" +"Abgestuft ist schnell und für Fotos geeignet.\n" +"Schnell und Sehr Schnell sind am schnellsten und gut für Zeichnungen und " "Texte.\n" "Hybrid Floyd-Steinberg bringt im allgemeinen weniger gute Resultate." @@ -152,260 +165,269 @@ msgstr "" msgid "Dither algorithm" msgstr "Raster Algorythmus" -#: src/main/print-canon.c:200 src/main/print-escp2.c:180 -#: src/main/print-lexmark.c:266 src/main/print-olympus.c:1699 -#: src/main/print-pcl.c:1196 src/main/print-ps.c:67 +#: src/main/print-canon.c:200 src/main/print-escp2.c:182 +#: src/main/print-lexmark.c:266 src/main/print-olympus.c:1697 +#: src/main/print-pcl.c:1264 #, fuzzy msgid "Page Size" -msgstr "Größe" +msgstr "Größe" #: src/main/print-canon.c:200 src/main/print-canon.c:206 #: src/main/print-canon.c:212 src/main/print-canon.c:218 #: src/main/print-canon.c:224 src/main/print-canon.c:230 #: src/main/print-canon.c:248 src/main/print-canon.c:272 -#: src/main/print-escp2.c:180 src/main/print-escp2.c:186 -#: src/main/print-escp2.c:192 src/main/print-escp2.c:198 -#: src/main/print-escp2.c:204 src/main/print-escp2.c:210 -#: src/main/print-escp2.c:228 src/main/print-escp2.c:245 -#: src/main/print-escp2.c:251 src/main/print-escp2.c:263 -#: src/main/print-escp2.c:281 src/main/print-lexmark.c:266 +#: src/main/print-escp2.c:182 src/main/print-escp2.c:188 +#: src/main/print-escp2.c:194 src/main/print-escp2.c:200 +#: src/main/print-escp2.c:206 src/main/print-escp2.c:212 +#: src/main/print-escp2.c:230 src/main/print-escp2.c:247 +#: src/main/print-escp2.c:253 src/main/print-escp2.c:265 +#: src/main/print-escp2.c:283 src/main/print-lexmark.c:266 #: src/main/print-lexmark.c:272 src/main/print-lexmark.c:278 -#: src/main/print-lexmark.c:284 src/main/print-olympus.c:1699 -#: src/main/print-olympus.c:1705 src/main/print-olympus.c:1711 -#: src/main/print-olympus.c:1717 src/main/print-pcl.c:1196 -#: src/main/print-pcl.c:1202 src/main/print-pcl.c:1208 -#: src/main/print-pcl.c:1214 src/main/print-pcl.c:1238 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 +#: src/main/print-lexmark.c:284 src/main/print-olympus.c:1697 +#: src/main/print-olympus.c:1703 src/main/print-olympus.c:1709 +#: src/main/print-olympus.c:1715 src/main/print-pcl.c:1264 +#: src/main/print-pcl.c:1270 src/main/print-pcl.c:1276 +#: src/main/print-pcl.c:1282 src/main/print-pcl.c:1306 src/main/print-ps.c:68 +#: src/main/print-ps.c:74 #, fuzzy msgid "Basic Printer Setup" msgstr "Drucker Einstellungen" -#: src/main/print-canon.c:201 src/main/print-escp2.c:181 -#: src/main/print-lexmark.c:267 src/main/print-olympus.c:1700 -#: src/main/print-pcl.c:1197 src/main/print-ps.c:68 +#: src/main/print-canon.c:201 src/main/print-escp2.c:183 +#: src/main/print-lexmark.c:267 src/main/print-olympus.c:1698 +#: src/main/print-pcl.c:1265 #, fuzzy msgid "Size of the paper being printed to" -msgstr "Größe des Papiers " +msgstr "Größe des Papiers " -#: src/main/print-canon.c:206 src/main/print-escp2.c:186 -#: src/main/print-lexmark.c:272 src/main/print-olympus.c:1705 -#: src/main/print-pcl.c:1202 src/main/print-ps.c:73 src/cups/genppd.c:1417 +#: src/main/print-canon.c:206 src/main/print-escp2.c:188 +#: src/main/print-lexmark.c:272 src/main/print-olympus.c:1703 +#: src/main/print-pcl.c:1270 src/cups/genppd.c:1422 msgid "Media Type" msgstr "Medium Type" -#: src/main/print-canon.c:207 src/main/print-escp2.c:187 -#: src/main/print-lexmark.c:273 src/main/print-olympus.c:1706 -#: src/main/print-pcl.c:1203 src/main/print-ps.c:74 +#: src/main/print-canon.c:207 src/main/print-escp2.c:189 +#: src/main/print-lexmark.c:273 src/main/print-olympus.c:1704 +#: src/main/print-pcl.c:1271 msgid "Type of media (plain paper, photo paper, etc.)" msgstr "" -#: src/main/print-canon.c:212 src/main/print-escp2.c:192 -#: src/main/print-lexmark.c:278 src/main/print-olympus.c:1711 -#: src/main/print-pcl.c:1208 src/main/print-ps.c:79 src/cups/genppd.c:1445 +#: src/main/print-canon.c:212 src/main/print-escp2.c:194 +#: src/main/print-lexmark.c:278 src/main/print-olympus.c:1709 +#: src/main/print-pcl.c:1276 src/cups/genppd.c:1450 msgid "Media Source" msgstr "Medium Quelle" -#: src/main/print-canon.c:213 src/main/print-escp2.c:193 -#: src/main/print-lexmark.c:279 src/main/print-olympus.c:1712 -#: src/main/print-pcl.c:1209 src/main/print-ps.c:80 +#: src/main/print-canon.c:213 src/main/print-escp2.c:195 +#: src/main/print-lexmark.c:279 src/main/print-olympus.c:1710 +#: src/main/print-pcl.c:1277 #, fuzzy msgid "Source (input slot) of the media" msgstr "in welchem Schacht ist das Druckmedium" -#: src/main/print-canon.c:218 src/main/print-escp2.c:198 +#: src/main/print-canon.c:218 src/main/print-escp2.c:200 msgid "CD Hub Size" msgstr "" -#: src/main/print-canon.c:219 src/main/print-escp2.c:199 +#: src/main/print-canon.c:219 src/main/print-escp2.c:201 msgid "Print only outside of the hub of the CD, or all the way to the hole" msgstr "" -#: src/main/print-canon.c:224 src/main/print-escp2.c:204 +#: src/main/print-canon.c:224 src/main/print-escp2.c:206 msgid "CD Size (Custom)" msgstr "" -#: src/main/print-canon.c:225 src/main/print-escp2.c:205 +#: src/main/print-canon.c:225 src/main/print-escp2.c:207 msgid "Variable adjustment for the outer diameter of CD" msgstr "" -#: src/main/print-canon.c:230 src/main/print-escp2.c:210 +#: src/main/print-canon.c:230 src/main/print-escp2.c:212 msgid "CD Hub Size (Custom)" msgstr "" -#: src/main/print-canon.c:231 src/main/print-escp2.c:211 +#: src/main/print-canon.c:231 src/main/print-escp2.c:213 #, fuzzy msgid "Variable adjustment to the inner hub of the CD" -msgstr "Bildgröße an Seitengröße anpassen" +msgstr "Bildgröße an Seitengröße anpassen" -#: src/main/print-canon.c:236 src/main/print-escp2.c:216 +#: src/main/print-canon.c:236 src/main/print-escp2.c:218 msgid "CD Horizontal Fine Adjustment" msgstr "" #: src/main/print-canon.c:236 src/main/print-canon.c:242 -#: src/main/print-canon.c:254 src/main/print-escp2.c:216 -#: src/main/print-escp2.c:222 src/main/print-escp2.c:239 -#: src/main/print-escp2.c:275 src/main/print-lexmark.c:290 -#: src/main/print-olympus.c:1723 src/main/print-olympus.c:1729 -#: src/main/print-olympus.c:1735 src/main/print-pcl.c:1220 -#: src/main/print-ps.c:91 src/main/print-raw.c:80 +#: src/main/print-canon.c:254 src/main/print-escp2.c:218 +#: src/main/print-escp2.c:224 src/main/print-escp2.c:241 +#: src/main/print-escp2.c:277 src/main/print-lexmark.c:290 +#: src/main/print-olympus.c:1721 src/main/print-olympus.c:1727 +#: src/main/print-olympus.c:1733 src/main/print-pcl.c:1288 +#: src/main/print-raw.c:80 msgid "Advanced Printer Setup" msgstr "" #: src/main/print-canon.c:237 src/main/print-canon.c:243 -#: src/main/print-escp2.c:217 src/main/print-escp2.c:223 +#: src/main/print-escp2.c:219 src/main/print-escp2.c:225 msgid "Fine adjustment to horizontal position for CD printing" msgstr "" -#: src/main/print-canon.c:242 src/main/print-escp2.c:222 +#: src/main/print-canon.c:242 src/main/print-escp2.c:224 msgid "CD Vertical Fine Adjustment" msgstr "" -#: src/main/print-canon.c:248 src/main/print-escp2.c:228 -#: src/main/print-lexmark.c:284 src/main/print-olympus.c:1717 -#: src/main/print-pcl.c:1214 src/main/print-ps.c:85 src/cups/genppd.c:1518 +#: src/main/print-canon.c:248 src/main/print-escp2.c:230 +#: src/main/print-lexmark.c:284 src/main/print-olympus.c:1715 +#: src/main/print-pcl.c:1282 src/cups/genppd.c:1523 msgid "Resolution" -msgstr "Auflösung" +msgstr "Auflösung" #: src/main/print-canon.c:249 src/main/print-lexmark.c:285 -#: src/main/print-olympus.c:1718 src/main/print-pcl.c:1215 -#: src/main/print-ps.c:86 +#: src/main/print-olympus.c:1716 src/main/print-pcl.c:1283 msgid "Resolution and quality of the print" -msgstr "Auflösung und Druckqualität" +msgstr "Auflösung und Druckqualität" -#: src/main/print-canon.c:254 src/main/print-escp2.c:239 -#: src/main/print-lexmark.c:290 src/main/print-olympus.c:1723 -#: src/main/print-pcl.c:1220 src/main/print-ps.c:91 src/main/print-raw.c:80 +#: src/main/print-canon.c:254 src/main/print-escp2.c:241 +#: src/main/print-lexmark.c:290 src/main/print-olympus.c:1721 +#: src/main/print-pcl.c:1288 src/main/print-raw.c:80 msgid "Ink Type" msgstr "Tintentype" -#: src/main/print-canon.c:255 src/main/print-escp2.c:240 -#: src/main/print-escp2.c:252 src/main/print-lexmark.c:291 -#: src/main/print-olympus.c:1724 src/main/print-pcl.c:1221 -#: src/main/print-ps.c:92 src/main/print-raw.c:81 +#: src/main/print-canon.c:255 src/main/print-escp2.c:242 +#: src/main/print-escp2.c:254 src/main/print-lexmark.c:291 +#: src/main/print-olympus.c:1722 src/main/print-pcl.c:1289 +#: src/main/print-raw.c:81 msgid "Type of ink in the printer" msgstr "Tintenart im Drucker" #: src/main/print-canon.c:260 src/main/print-canon.c:261 -#: src/main/print-escp2.c:329 src/main/print-escp2.c:330 +#: src/main/print-escp2.c:331 src/main/print-escp2.c:332 #: src/main/print-lexmark.c:296 src/main/print-lexmark.c:297 -#: src/main/print-pcl.c:1226 src/main/print-pcl.c:1227 +#: src/main/print-pcl.c:1294 src/main/print-pcl.c:1295 msgid "Ink Channels" msgstr "" -#: src/main/print-canon.c:260 src/main/print-escp2.c:130 -#: src/main/print-escp2.c:137 src/main/print-escp2.c:144 -#: src/main/print-escp2.c:287 src/main/print-escp2.c:293 -#: src/main/print-escp2.c:299 src/main/print-escp2.c:305 -#: src/main/print-escp2.c:311 src/main/print-escp2.c:317 -#: src/main/print-escp2.c:323 src/main/print-escp2.c:329 -#: src/main/print-escp2.c:335 src/main/print-lexmark.c:296 -#: src/main/print-pcl.c:1226 +#: src/main/print-canon.c:260 src/main/print-escp2.c:132 +#: src/main/print-escp2.c:139 src/main/print-escp2.c:146 +#: src/main/print-escp2.c:289 src/main/print-escp2.c:295 +#: src/main/print-escp2.c:301 src/main/print-escp2.c:307 +#: src/main/print-escp2.c:313 src/main/print-escp2.c:319 +#: src/main/print-escp2.c:325 src/main/print-escp2.c:331 +#: src/main/print-escp2.c:337 src/main/print-lexmark.c:296 +#: src/main/print-pcl.c:1294 msgid "Advanced Printer Functionality" msgstr "" -#: src/main/print-canon.c:266 src/main/print-escp2.c:341 -#: src/main/print-lexmark.c:302 src/main/print-olympus.c:1741 -#: src/main/print-pcl.c:1232 src/main/print-ps.c:103 src/main/print-raw.c:86 +#: src/main/print-canon.c:266 src/main/print-escp2.c:343 +#: src/main/print-lexmark.c:302 src/main/print-olympus.c:1739 +#: src/main/print-pcl.c:1300 src/main/print-ps.c:80 src/main/print-raw.c:86 #, fuzzy msgid "Printing Mode" msgstr "Druckermodel:" #: src/main/print-canon.c:266 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:341 -#: src/main/print-escp2.c:347 src/main/print-lexmark.c:302 -#: src/main/print-olympus.c:1741 src/main/print-pcl.c:1232 -#: src/main/print-ps.c:103 src/main/print-raw.c:86 +#: src/main/print-color.c:208 src/main/print-escp2.c:343 +#: src/main/print-escp2.c:349 src/main/print-lexmark.c:302 +#: src/main/print-olympus.c:1739 src/main/print-pcl.c:1300 +#: src/main/print-ps.c:80 src/main/print-raw.c:86 #, fuzzy msgid "Core Parameter" msgstr "Normalpapier" -#: src/main/print-canon.c:267 src/main/print-escp2.c:342 -#: src/main/print-lexmark.c:303 src/main/print-olympus.c:1742 -#: src/main/print-pcl.c:1233 src/main/print-ps.c:104 src/main/print-raw.c:87 +#: src/main/print-canon.c:267 src/main/print-escp2.c:344 +#: src/main/print-lexmark.c:303 src/main/print-olympus.c:1740 +#: src/main/print-pcl.c:1301 src/main/print-ps.c:81 src/main/print-raw.c:87 msgid "Printing Output Mode" msgstr "" -#: src/main/print-canon.c:272 src/main/print-pcl.c:1238 +#: src/main/print-canon.c:272 src/main/print-pcl.c:1306 msgid "Double-Sided Printing" msgstr "" -#: src/main/print-canon.c:273 src/main/print-pcl.c:1239 +#: src/main/print-canon.c:273 src/main/print-pcl.c:1307 msgid "Duplex/Tumble Setting" msgstr "" -#: src/main/print-canon.c:295 src/main/print-escp2.c:439 -#: src/main/print-lexmark.c:325 src/main/print-pcl.c:1261 +#: src/main/print-canon.c:295 src/main/print-escp2.c:446 +#: src/main/print-lexmark.c:325 src/main/print-pcl.c:1329 #, fuzzy msgid "Cyan Density" msgstr "Empfindlichkeit:" -#: src/main/print-canon.c:296 src/main/print-escp2.c:440 -#: src/main/print-lexmark.c:326 src/main/print-pcl.c:1262 +#: src/main/print-canon.c:296 src/main/print-escp2.c:447 +#: src/main/print-lexmark.c:326 src/main/print-pcl.c:1330 #, fuzzy msgid "Adjust the cyan density" msgstr "Stellen sie die Cyan-Balance ein" -#: src/main/print-canon.c:303 src/main/print-escp2.c:447 -#: src/main/print-lexmark.c:333 src/main/print-pcl.c:1269 +#: src/main/print-canon.c:303 src/main/print-escp2.c:454 +#: src/main/print-lexmark.c:333 src/main/print-pcl.c:1337 #, fuzzy msgid "Magenta Density" msgstr "Magenta" -#: src/main/print-canon.c:304 src/main/print-escp2.c:448 -#: src/main/print-lexmark.c:334 src/main/print-pcl.c:1270 +#: src/main/print-canon.c:304 src/main/print-escp2.c:455 +#: src/main/print-lexmark.c:334 src/main/print-pcl.c:1338 #, fuzzy msgid "Adjust the magenta density" msgstr "Stellen sie die Magenta-Balance ein" -#: src/main/print-canon.c:311 src/main/print-escp2.c:455 -#: src/main/print-lexmark.c:341 src/main/print-pcl.c:1277 +#: src/main/print-canon.c:311 src/main/print-escp2.c:462 +#: src/main/print-lexmark.c:341 src/main/print-pcl.c:1345 #, fuzzy msgid "Yellow Density" msgstr "Empfindlichkeit:" -#: src/main/print-canon.c:312 src/main/print-escp2.c:456 -#: src/main/print-lexmark.c:342 src/main/print-pcl.c:1278 +#: src/main/print-canon.c:312 src/main/print-escp2.c:463 +#: src/main/print-lexmark.c:342 src/main/print-pcl.c:1346 #, fuzzy msgid "Adjust the yellow density" msgstr "Stellen sie die Gelb-Balance ein" -#: src/main/print-canon.c:319 src/main/print-escp2.c:463 -#: src/main/print-lexmark.c:349 src/main/print-pcl.c:1285 +#: src/main/print-canon.c:319 src/main/print-escp2.c:470 +#: src/main/print-lexmark.c:349 src/main/print-pcl.c:1353 #, fuzzy msgid "Black Density" msgstr "Empfindlichkeit:" -#: src/main/print-canon.c:320 src/main/print-escp2.c:464 -#: src/main/print-lexmark.c:350 src/main/print-pcl.c:1286 +#: src/main/print-canon.c:320 src/main/print-escp2.c:471 +#: src/main/print-lexmark.c:350 src/main/print-pcl.c:1354 #, fuzzy msgid "Adjust the black density" msgstr "Stellen sie die Cyan-Balance ein" #: src/main/print-canon.c:327 src/main/print-canon.c:328 -#: src/main/print-escp2.c:495 src/main/print-escp2.c:496 +#: src/main/print-escp2.c:534 src/main/print-escp2.c:535 #: src/main/print-lexmark.c:357 src/main/print-lexmark.c:358 -#: src/main/print-pcl.c:1293 src/main/print-pcl.c:1294 +#: src/main/print-pcl.c:1361 src/main/print-pcl.c:1362 #, fuzzy msgid "Light Cyan Transition" msgstr "helles Cyan" #: src/main/print-canon.c:327 src/main/print-canon.c:335 -#: src/main/print-canon.c:343 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-escp2.c:543 -#: src/main/print-escp2.c:551 src/main/print-escp2.c:559 -#: src/main/print-lexmark.c:357 src/main/print-lexmark.c:365 -#: src/main/print-pcl.c:1293 src/main/print-pcl.c:1301 +#: src/main/print-canon.c:343 src/main/print-escp2.c:502 +#: src/main/print-escp2.c:510 src/main/print-escp2.c:518 +#: src/main/print-escp2.c:526 src/main/print-escp2.c:534 +#: src/main/print-escp2.c:542 src/main/print-escp2.c:550 +#: src/main/print-escp2.c:558 src/main/print-escp2.c:566 +#: src/main/print-escp2.c:574 src/main/print-escp2.c:582 +#: src/main/print-escp2.c:590 src/main/print-escp2.c:598 +#: src/main/print-escp2.c:606 src/main/print-escp2.c:614 +#: src/main/print-escp2.c:622 src/main/print-escp2.c:630 +#: src/main/print-escp2.c:638 src/main/print-escp2.c:646 +#: src/main/print-escp2.c:654 src/main/print-escp2.c:662 +#: src/main/print-escp2.c:670 src/main/print-escp2.c:678 +#: src/main/print-escp2.c:686 src/main/print-escp2.c:694 +#: src/main/print-escp2.c:702 src/main/print-escp2.c:710 +#: src/main/print-escp2.c:718 src/main/print-escp2.c:726 +#: src/main/print-escp2.c:734 src/main/print-lexmark.c:357 +#: src/main/print-lexmark.c:365 src/main/print-pcl.c:1361 +#: src/main/print-pcl.c:1369 msgid "Advanced Ink Adjustment" msgstr "" #: src/main/print-canon.c:335 src/main/print-canon.c:336 -#: src/main/print-escp2.c:503 src/main/print-escp2.c:504 +#: src/main/print-escp2.c:566 src/main/print-escp2.c:567 #: src/main/print-lexmark.c:365 src/main/print-lexmark.c:366 -#: src/main/print-pcl.c:1301 src/main/print-pcl.c:1302 +#: src/main/print-pcl.c:1369 src/main/print-pcl.c:1370 #, fuzzy msgid "Light Magenta Transition" msgstr "helles Magenta" @@ -415,58 +437,58 @@ msgstr "helles Magenta" msgid "Light Yellow Transition" msgstr "helles Cyan" -#: src/main/print-canon.c:363 src/main/print-pcl.c:1482 +#: src/main/print-canon.c:363 src/main/print-pcl.c:1550 #: src/main/escp2-resolutions.c:557 src/main/escp2-resolutions.c:565 #: src/main/escp2-resolutions.c:576 src/main/escp2-resolutions.c:588 msgid "Off" msgstr "" -#: src/main/print-canon.c:364 src/main/print-pcl.c:1483 +#: src/main/print-canon.c:364 src/main/print-pcl.c:1551 msgid "Long Edge (Standard)" msgstr "" -#: src/main/print-canon.c:365 src/main/print-pcl.c:1484 +#: src/main/print-canon.c:365 src/main/print-pcl.c:1552 msgid "Short Edge (Flip)" msgstr "" -#: src/main/print-canon.c:629 src/main/print-escp2.c:1648 +#: src/main/print-canon.c:629 src/main/print-escp2.c:2012 #: src/main/xmli18n-tmp.h:6 msgid "CD - 5 inch" msgstr "" -#: src/main/print-canon.c:631 src/main/print-escp2.c:1650 +#: src/main/print-canon.c:631 src/main/print-escp2.c:2014 #: src/main/xmli18n-tmp.h:7 msgid "CD - 3 inch" msgstr "" -#: src/main/print-canon.c:633 src/main/print-escp2.c:1652 +#: src/main/print-canon.c:633 src/main/print-escp2.c:2016 #: src/main/xmli18n-tmp.h:8 #, fuzzy msgid "CD - Custom" msgstr "Auto" -#: src/main/print-canon.c:656 src/main/print-escp2.c:1677 +#: src/main/print-canon.c:656 src/main/print-escp2.c:2041 msgid "Normal" msgstr "" -#: src/main/print-canon.c:658 src/main/print-escp2.c:1679 +#: src/main/print-canon.c:658 src/main/print-escp2.c:2043 #, fuzzy msgid "Print To Hub" msgstr "Drucke in Datei?" -#: src/main/print-canon.c:773 src/main/print-escp2.c:2011 -#: src/main/print-lexmark.c:1279 src/main/print-olympus.c:1996 -#: src/main/print-pcl.c:1776 src/main/print-ps.c:170 src/main/print-raw.c:135 -#: src/gutenprintui/panel.c:289 src/gutenprintui2/panel.c:289 +#: src/main/print-canon.c:773 src/main/print-escp2.c:2450 +#: src/main/print-lexmark.c:1279 src/main/print-olympus.c:1994 +#: src/main/print-pcl.c:1844 src/main/print-ps.c:310 src/main/print-raw.c:135 +#: src/gutenprintui2/panel.c:290 msgid "Color" msgstr "Farbe" -#: src/main/print-canon.c:775 src/main/print-escp2.c:2013 -#: src/main/print-lexmark.c:1281 src/main/print-pcl.c:1778 -#: src/main/print-ps.c:172 src/main/print-raw.c:137 +#: src/main/print-canon.c:775 src/main/print-escp2.c:2452 +#: src/main/print-lexmark.c:1281 src/main/print-pcl.c:1846 +#: src/main/print-ps.c:312 src/main/print-raw.c:137 #, fuzzy msgid "Black and White" -msgstr "Schwarz-Weiß" +msgstr "Schwarz-Weiß" #: src/main/print-color.c:50 msgid "High Accuracy" @@ -504,7 +526,7 @@ msgstr "Drucken" #: src/main/print-color.c:121 src/main/escp2-channels.c:916 #: src/main/escp2-channels.c:929 src/main/escp2-channels.c:943 -#: src/gutenprintui/panel.c:290 src/gutenprintui2/panel.c:290 +#: src/gutenprintui2/panel.c:291 msgid "Grayscale" msgstr "Graustufen" @@ -529,7 +551,7 @@ msgstr "" msgid "KCMY" msgstr "" -#: src/main/print-color.c:165 src/main/print-color.c:446 +#: src/main/print-color.c:165 src/main/print-color.c:454 #, fuzzy msgid "Channel " msgstr "Abbruch" @@ -591,7 +613,7 @@ msgid "Output image type" msgstr "Ausgabeart:" #: src/main/print-color.c:208 src/main/print-color.c:209 -#: src/main/print-escp2.c:347 +#: src/main/print-escp2.c:349 msgid "Raw Channels" msgstr "" @@ -612,7 +634,7 @@ msgstr "Helligkeit:" #: src/main/print-color.c:225 #, fuzzy msgid "Brightness of the print" -msgstr "Einstellen der Höhe des Ausdrucks" +msgstr "Einstellen der Höhe des Ausdrucks" #: src/main/print-color.c:232 #, fuzzy @@ -646,8 +668,8 @@ 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 "" -"Stellen sie den Gamma-Parameter des Bildes ein. Größere Werte ergeben " -"hellere Ausdrucke, kleinere dunkelere. Schwarz-Weiß bleibt gleich, nicht wie " +"Stellen sie den Gamma-Parameter des Bildes ein. Größere Werte ergeben " +"hellere Ausdrucke, kleinere dunkelere. Schwarz-Weiß bleibt gleich, nicht wie " "bei der Helligkeitseinstellung." #: src/main/print-color.c:258 @@ -659,14 +681,14 @@ msgstr "Gamma:" msgid "Gamma value assumed by application" msgstr "" -#: src/main/print-color.c:266 src/main/escp2-channels.c:3048 -#: src/main/escp2-channels.c:3060 src/main/escp2-channels.c:3068 -#: src/main/escp2-channels.c:3078 src/main/escp2-channels.c:3089 -#: src/main/escp2-channels.c:3101 src/main/escp2-channels.c:3117 -#: src/main/escp2-channels.c:3125 src/main/escp2-channels.c:3138 -#: src/main/escp2-channels.c:3151 src/main/escp2-channels.c:3165 -#: src/main/escp2-channels.c:3179 src/main/escp2-channels.c:3194 -#: src/gutenprintui/panel.c:2152 src/gutenprintui2/panel.c:2153 +#: src/main/print-color.c:266 src/main/escp2-channels.c:3087 +#: src/main/escp2-channels.c:3099 src/main/escp2-channels.c:3107 +#: src/main/escp2-channels.c:3117 src/main/escp2-channels.c:3128 +#: src/main/escp2-channels.c:3140 src/main/escp2-channels.c:3156 +#: src/main/escp2-channels.c:3164 src/main/escp2-channels.c:3177 +#: src/main/escp2-channels.c:3190 src/main/escp2-channels.c:3204 +#: src/main/escp2-channels.c:3218 src/main/escp2-channels.c:3230 +#: src/main/escp2-channels.c:3243 src/gutenprintui2/panel.c:2328 #: src/escputil/escputil.c:978 src/escputil/escputil.c:997 #: src/escputil/escputil.c:1201 msgid "Cyan" @@ -677,14 +699,14 @@ msgstr "Cyan" msgid "Adjust the cyan gamma" msgstr "Stellen sie die Cyan-Balance ein" -#: src/main/print-color.c:274 src/main/escp2-channels.c:3049 -#: src/main/escp2-channels.c:3059 src/main/escp2-channels.c:3070 -#: src/main/escp2-channels.c:3079 src/main/escp2-channels.c:3090 -#: src/main/escp2-channels.c:3103 src/main/escp2-channels.c:3116 -#: src/main/escp2-channels.c:3126 src/main/escp2-channels.c:3139 -#: src/main/escp2-channels.c:3152 src/main/escp2-channels.c:3164 -#: src/main/escp2-channels.c:3178 src/main/escp2-channels.c:3195 -#: src/gutenprintui/panel.c:2159 src/gutenprintui2/panel.c:2160 +#: src/main/print-color.c:274 src/main/escp2-channels.c:3088 +#: src/main/escp2-channels.c:3098 src/main/escp2-channels.c:3109 +#: src/main/escp2-channels.c:3118 src/main/escp2-channels.c:3129 +#: src/main/escp2-channels.c:3142 src/main/escp2-channels.c:3155 +#: src/main/escp2-channels.c:3165 src/main/escp2-channels.c:3178 +#: src/main/escp2-channels.c:3191 src/main/escp2-channels.c:3203 +#: src/main/escp2-channels.c:3217 src/main/escp2-channels.c:3229 +#: src/main/escp2-channels.c:3244 src/gutenprintui2/panel.c:2335 #: src/escputil/escputil.c:979 src/escputil/escputil.c:998 #: src/escputil/escputil.c:1202 msgid "Magenta" @@ -695,14 +717,14 @@ msgstr "Magenta" msgid "Adjust the magenta gamma" msgstr "Stellen sie die Magenta-Balance ein" -#: src/main/print-color.c:282 src/main/escp2-channels.c:3050 -#: src/main/escp2-channels.c:3061 src/main/escp2-channels.c:3069 -#: src/main/escp2-channels.c:3080 src/main/escp2-channels.c:3091 -#: src/main/escp2-channels.c:3105 src/main/escp2-channels.c:3112 -#: src/main/escp2-channels.c:3127 src/main/escp2-channels.c:3140 -#: src/main/escp2-channels.c:3153 src/main/escp2-channels.c:3163 -#: src/main/escp2-channels.c:3177 src/main/escp2-channels.c:3196 -#: src/gutenprintui/panel.c:2166 src/gutenprintui2/panel.c:2167 +#: src/main/print-color.c:282 src/main/escp2-channels.c:3089 +#: src/main/escp2-channels.c:3100 src/main/escp2-channels.c:3108 +#: src/main/escp2-channels.c:3119 src/main/escp2-channels.c:3130 +#: src/main/escp2-channels.c:3144 src/main/escp2-channels.c:3151 +#: src/main/escp2-channels.c:3166 src/main/escp2-channels.c:3179 +#: src/main/escp2-channels.c:3192 src/main/escp2-channels.c:3202 +#: src/main/escp2-channels.c:3216 src/main/escp2-channels.c:3228 +#: src/main/escp2-channels.c:3245 src/gutenprintui2/panel.c:2342 #: src/escputil/escputil.c:980 src/escputil/escputil.c:999 #: src/escputil/escputil.c:1203 msgid "Yellow" @@ -713,10 +735,9 @@ msgstr "Gelb" msgid "Adjust the yellow gamma" msgstr "Stellen sie die Gelb-Balance ein" -#: src/main/print-color.c:290 src/main/escp2-channels.c:3168 -#: src/main/escp2-channels.c:3181 src/gutenprintui/panel.c:2180 -#: src/gutenprintui2/panel.c:2181 src/escputil/escputil.c:987 -#: src/escputil/escputil.c:1005 +#: src/main/print-color.c:290 src/main/escp2-channels.c:3207 +#: src/main/escp2-channels.c:3220 src/gutenprintui2/panel.c:2356 +#: src/escputil/escputil.c:987 src/escputil/escputil.c:1005 msgid "Red" msgstr "" @@ -725,8 +746,7 @@ msgstr "" msgid "Adjust the red gamma" msgstr "Stellen sie die Gelb-Balance ein" -#: src/main/print-color.c:298 src/gutenprintui/panel.c:2187 -#: src/gutenprintui2/panel.c:2188 +#: src/main/print-color.c:298 src/gutenprintui2/panel.c:2363 msgid "Green" msgstr "" @@ -735,10 +755,9 @@ msgstr "" msgid "Adjust the green gamma" msgstr "Stellen sie die Magenta-Balance ein" -#: src/main/print-color.c:306 src/main/escp2-channels.c:3169 -#: src/main/escp2-channels.c:3182 src/gutenprintui/panel.c:2194 -#: src/gutenprintui2/panel.c:2195 src/escputil/escputil.c:988 -#: src/escputil/escputil.c:1006 +#: src/main/print-color.c:306 src/main/escp2-channels.c:3208 +#: src/main/escp2-channels.c:3221 src/gutenprintui2/panel.c:2370 +#: src/escputil/escputil.c:988 src/escputil/escputil.c:1006 msgid "Blue" msgstr "" @@ -748,14 +767,14 @@ msgid "Adjust the blue gamma" msgstr "Stellen sie die Cyan-Balance ein" #: src/main/print-color.c:314 src/main/print-lexmark.c:613 -#: src/main/escp2-channels.c:3047 src/main/escp2-channels.c:3057 -#: src/main/escp2-channels.c:3058 src/main/escp2-channels.c:3071 -#: src/main/escp2-channels.c:3081 src/main/escp2-channels.c:3088 -#: src/main/escp2-channels.c:3100 src/main/escp2-channels.c:3113 -#: src/main/escp2-channels.c:3124 src/main/escp2-channels.c:3137 -#: src/main/escp2-channels.c:3150 src/main/escp2-channels.c:3156 -#: src/main/escp2-channels.c:3180 src/main/escp2-channels.c:3193 -#: src/gutenprintui/panel.c:2173 src/gutenprintui2/panel.c:2174 +#: src/main/escp2-channels.c:3086 src/main/escp2-channels.c:3096 +#: src/main/escp2-channels.c:3097 src/main/escp2-channels.c:3110 +#: src/main/escp2-channels.c:3120 src/main/escp2-channels.c:3127 +#: src/main/escp2-channels.c:3139 src/main/escp2-channels.c:3152 +#: src/main/escp2-channels.c:3163 src/main/escp2-channels.c:3176 +#: src/main/escp2-channels.c:3189 src/main/escp2-channels.c:3195 +#: src/main/escp2-channels.c:3219 src/main/escp2-channels.c:3231 +#: src/main/escp2-channels.c:3242 src/gutenprintui2/panel.c:2349 #: src/escputil/escputil.c:975 src/escputil/escputil.c:996 #: src/escputil/escputil.c:1200 msgid "Black" @@ -766,7 +785,7 @@ msgstr "Schwarz" msgid "Adjust the black gamma" msgstr "Stellen sie die Cyan-Balance ein" -#: src/main/print-color.c:322 src/main/print-olympus.c:1764 +#: src/main/print-color.c:322 src/main/print-olympus.c:1762 msgid "Cyan Balance" msgstr "" @@ -781,7 +800,7 @@ msgstr "Graustufen" msgid "Adjust the cyan gray balance" msgstr "Stellen sie die Cyan-Balance ein" -#: src/main/print-color.c:330 src/main/print-olympus.c:1772 +#: src/main/print-color.c:330 src/main/print-olympus.c:1770 #, fuzzy msgid "Magenta Balance" msgstr "Magenta" @@ -791,7 +810,7 @@ msgstr "Magenta" msgid "Adjust the magenta gray balance" msgstr "Stellen sie die Magenta-Balance ein" -#: src/main/print-color.c:338 src/main/print-olympus.c:1780 +#: src/main/print-color.c:338 src/main/print-olympus.c:1778 #, fuzzy msgid "Yellow Balance" msgstr "Stellen sie die Gelb-Balance ein" @@ -822,9 +841,11 @@ msgstr "Tintentype" #: 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:353 -#: src/main/print-escp2.c:359 src/main/print-escp2.c:365 -#: src/main/print-escp2.c:371 src/main/print-escp2.c:377 +#: src/main/print-color.c:421 src/main/print-color.c:553 +#: src/main/print-escp2.c:355 src/main/print-escp2.c:361 +#: src/main/print-escp2.c:367 src/main/print-escp2.c:373 +#: src/main/print-escp2.c:379 src/main/print-escp2.c:742 +#: src/main/print-escp2.c:750 src/main/print-escp2.c:758 #, fuzzy msgid "Advanced Output Control" msgstr "Ausgabeart:" @@ -833,560 +854,677 @@ msgstr "Ausgabeart:" msgid "Limit the total ink printed to the page" msgstr "" -#: src/main/print-color.c:365 +#: src/main/print-color.c:365 src/main/print-escp2.c:742 msgid "GCR Transition" msgstr "" -#: src/main/print-color.c:366 +#: src/main/print-color.c:366 src/main/print-escp2.c:743 msgid "Adjust the gray component transition rate" msgstr "" -#: src/main/print-color.c:373 +#: src/main/print-color.c:373 src/main/print-escp2.c:750 msgid "GCR Lower Bound" msgstr "" -#: src/main/print-color.c:374 +#: src/main/print-color.c:374 src/main/print-escp2.c:751 msgid "Lower bound of gray component reduction" msgstr "" -#: src/main/print-color.c:381 +#: src/main/print-color.c:381 src/main/print-escp2.c:758 msgid "GCR Upper Bound" msgstr "" -#: src/main/print-color.c:382 +#: src/main/print-color.c:382 src/main/print-escp2.c:759 msgid "Upper bound of gray component reduction" msgstr "" -#: src/main/print-color.c:447 src/main/print-color.c:457 -#: src/main/print-color.c:465 src/main/print-color.c:473 -#: src/main/print-color.c:481 src/main/print-color.c:489 -#: src/main/print-color.c:497 src/main/print-color.c:505 -#: src/main/print-color.c:513 +#: src/main/print-color.c:421 +msgid "LUT dump file" +msgstr "" + +#: src/main/print-color.c:422 +msgid "Dump file for LUT for external color adjustment" +msgstr "" + +#: src/main/print-color.c:455 src/main/print-color.c:465 +#: src/main/print-color.c:473 src/main/print-color.c:481 +#: src/main/print-color.c:489 src/main/print-color.c:497 +#: src/main/print-color.c:505 src/main/print-color.c:513 +#: src/main/print-color.c:521 #, fuzzy msgid "Output Curves" msgstr "Ausgabeart:" -#: src/main/print-color.c:447 +#: src/main/print-color.c:455 msgid "Curve for raw channel " msgstr "" -#: src/main/print-color.c:457 +#: src/main/print-color.c:465 msgid "Cyan Curve" msgstr "" -#: src/main/print-color.c:458 +#: src/main/print-color.c:466 #, fuzzy msgid "Cyan curve" msgstr "Abbruch" -#: src/main/print-color.c:465 +#: src/main/print-color.c:473 #, fuzzy msgid "Magenta Curve" msgstr "Magenta" -#: src/main/print-color.c:466 +#: src/main/print-color.c:474 #, fuzzy msgid "Magenta curve" msgstr "Magenta" -#: src/main/print-color.c:473 +#: src/main/print-color.c:481 #, fuzzy msgid "Yellow Curve" msgstr "Gelb" -#: src/main/print-color.c:474 +#: src/main/print-color.c:482 #, fuzzy msgid "Yellow curve" msgstr "Gelb" -#: src/main/print-color.c:481 +#: src/main/print-color.c:489 #, fuzzy msgid "Black Curve" msgstr "Schwarz" -#: src/main/print-color.c:482 +#: src/main/print-color.c:490 #, fuzzy msgid "Black curve" msgstr "Schwarz" -#: src/main/print-color.c:489 +#: src/main/print-color.c:497 #, fuzzy msgid "Red Curve" msgstr "Gelb" -#: src/main/print-color.c:490 +#: src/main/print-color.c:498 #, fuzzy msgid "Red curve" msgstr "Gelb" -#: src/main/print-color.c:497 +#: src/main/print-color.c:505 #, fuzzy msgid "Green Curve" msgstr "Magenta" -#: src/main/print-color.c:498 +#: src/main/print-color.c:506 #, fuzzy msgid "Green curve" msgstr "Magenta" -#: src/main/print-color.c:505 +#: src/main/print-color.c:513 #, fuzzy msgid "Blue Curve" msgstr "Schwarz" -#: src/main/print-color.c:506 +#: src/main/print-color.c:514 #, fuzzy msgid "Blue curve" msgstr "Schwarz" -#: src/main/print-color.c:513 +#: src/main/print-color.c:521 #, fuzzy msgid "White Curve" msgstr "Gelb" -#: src/main/print-color.c:514 +#: src/main/print-color.c:522 #, fuzzy msgid "White curve" msgstr "Gelb" -#: src/main/print-color.c:521 +#: src/main/print-color.c:529 msgid "Hue Map" msgstr "" -#: src/main/print-color.c:521 src/main/print-color.c:529 -#: src/main/print-color.c:537 +#: src/main/print-color.c:529 src/main/print-color.c:537 +#: src/main/print-color.c:545 msgid "Advanced HSL Curves" msgstr "" -#: src/main/print-color.c:522 +#: src/main/print-color.c:530 msgid "Hue adjustment curve" msgstr "" -#: src/main/print-color.c:529 +#: src/main/print-color.c:537 #, fuzzy msgid "Saturation Map" msgstr "Farbbalance:" -#: src/main/print-color.c:530 +#: src/main/print-color.c:538 msgid "Saturation adjustment curve" msgstr "" -#: src/main/print-color.c:537 +#: src/main/print-color.c:545 msgid "Luminosity Map" msgstr "" -#: src/main/print-color.c:538 +#: src/main/print-color.c:546 msgid "Luminosity adjustment curve" msgstr "" -#: src/main/print-color.c:545 +#: src/main/print-color.c:553 msgid "Gray Component Reduction" msgstr "" -#: src/main/print-color.c:546 +#: src/main/print-color.c:554 msgid "Gray component reduction curve" msgstr "" -#: src/main/print-color.c:1670 +#: src/main/print-color.c:1743 msgid "Traditional Gutenprint color conversion" msgstr "" -#: src/main/printers.c:517 +#: src/main/printers.c:514 #, c-format msgid "Value must be set for %s\n" msgstr "" -#: src/main/printers.c:530 src/main/printers.c:535 +#: src/main/printers.c:527 src/main/printers.c:532 #, fuzzy, c-format msgid "`%s' is not a valid %s\n" msgstr "%s ist kein erlaubter Parameter von %s\n" -#: src/main/printers.c:554 +#: src/main/printers.c:551 #, c-format msgid "%s must be between %f and %f (is %f)\n" msgstr "" -#: src/main/printers.c:576 src/main/printers.c:600 +#: src/main/printers.c:573 src/main/printers.c:597 #, c-format msgid "%s must be between %d and %d (is %d)\n" msgstr "" -#: src/main/printers.c:631 +#: src/main/printers.c:628 #, c-format msgid "%s bounds must be between %f and %f\n" msgstr "" -#: src/main/printers.c:639 +#: src/main/printers.c:636 #, c-format msgid "%s wrap mode must be %s\n" msgstr "" -#: src/main/printers.c:643 +#: src/main/printers.c:640 msgid "no wrap" msgstr "" -#: src/main/printers.c:643 +#: src/main/printers.c:640 msgid "wrap around" msgstr "" -#: src/main/printers.c:687 +#: src/main/printers.c:684 #, fuzzy, c-format msgid "Unknown type parameter %s (%d)\n" msgstr "Unbekannter Drucker %s\n" -#: src/main/printers.c:700 src/main/printers.c:711 +#: src/main/printers.c:697 src/main/printers.c:708 #, c-format msgid "%s out of range (value %d, min %d, max %d)\n" -msgstr "%s Bereichsüberschreitung (Wert %d, min %d, max %d)\n" +msgstr "%s Bereichsüberschreitung (Wert %d, min %d, max %d)\n" -#: src/main/printers.c:772 +#: src/main/printers.c:768 #, fuzzy msgid "Page size is not valid\n" -msgstr "Die Bildgröße stimmt nicht\n" +msgstr "Die Bildgröße stimmt nicht\n" -#: src/main/printers.c:793 +#: src/main/printers.c:789 #, fuzzy, c-format msgid "Top margin must not be less than %d\n" msgstr "Der obere Rand darf nicht kleiner Null sein\n" -#: src/main/printers.c:799 +#: src/main/printers.c:795 #, fuzzy, c-format msgid "Left margin must not be less than %d\n" msgstr "Der linke Rand darf nicht kleiner Null sein\n" -#: src/main/printers.c:805 +#: src/main/printers.c:801 #, fuzzy msgid "Height must be greater than zero\n" msgstr "Der linke Rand darf nicht kleiner Null sein\n" -#: src/main/printers.c:811 +#: src/main/printers.c:807 #, fuzzy msgid "Width must be greater than zero\n" msgstr "Der obere Rand darf nicht kleiner Null sein\n" -#: src/main/printers.c:817 +#: src/main/printers.c:813 #, c-format msgid "" "Image is too wide for the page: left margin is %d, width %d, right edge is %" "d\n" msgstr "" -#: src/main/printers.c:824 +#: src/main/printers.c:820 #, c-format msgid "" "Image is too long for the page: top margin is %d, height %d, bottom edge is %" "d\n" msgstr "" -#: src/main/print-escp2.c:162 +#: src/main/print-escp2.c:164 msgid "Automatic Printing Mode" msgstr "" -#: src/main/print-escp2.c:162 src/main/print-escp2.c:174 +#: src/main/print-escp2.c:164 src/main/print-escp2.c:176 #: src/main/generic-options.c:62 msgid "Basic Output Adjustment" msgstr "" -#: src/main/print-escp2.c:163 +#: src/main/print-escp2.c:165 msgid "Automatic printing mode" msgstr "" -#: src/main/print-escp2.c:174 src/main/print-escp2.c:175 +#: src/main/print-escp2.c:176 src/main/print-escp2.c:177 #: src/main/generic-options.c:62 src/main/generic-options.c:63 #, fuzzy msgid "Print Quality" -msgstr "720 DPI höchste Qualität" +msgstr "720 DPI höchste Qualität" -#: src/main/print-escp2.c:229 +#: src/main/print-escp2.c:231 #, fuzzy msgid "Resolution of the print" -msgstr "Auflösung und Druckqualität" +msgstr "Auflösung und Druckqualität" -#: src/main/print-escp2.c:245 +#: src/main/print-escp2.c:247 msgid "Enhanced Gloss" msgstr "" -#: src/main/print-escp2.c:246 +#: src/main/print-escp2.c:248 msgid "Add gloss enhancement" msgstr "" -#: src/main/print-escp2.c:251 +#: src/main/print-escp2.c:253 #, fuzzy msgid "Ink Set" msgstr "Tintentype" -#: src/main/print-escp2.c:257 +#: src/main/print-escp2.c:259 msgid "Printing Direction" msgstr "" -#: src/main/print-escp2.c:257 src/main/print-escp2.c:269 +#: src/main/print-escp2.c:259 src/main/print-escp2.c:271 msgid "Advanced Output Adjustment" msgstr "" -#: src/main/print-escp2.c:258 +#: src/main/print-escp2.c:260 msgid "Printing direction (unidirectional is higher quality, but slower)" msgstr "" -#: src/main/print-escp2.c:263 src/main/print-olympus.c:1735 +#: src/main/print-escp2.c:265 src/main/print-olympus.c:1733 msgid "Borderless" msgstr "" -#: src/main/print-escp2.c:264 src/main/print-olympus.c:1736 +#: src/main/print-escp2.c:266 src/main/print-olympus.c:1734 msgid "Print without borders" msgstr "" -#: src/main/print-escp2.c:269 +#: src/main/print-escp2.c:271 msgid "Interleave Method" msgstr "" -#: src/main/print-escp2.c:270 +#: src/main/print-escp2.c:272 msgid "Interleave pattern to use" msgstr "" -#: src/main/print-escp2.c:275 +#: src/main/print-escp2.c:277 msgid "Adjust dot size as necessary" msgstr "" -#: src/main/print-escp2.c:276 +#: src/main/print-escp2.c:278 msgid "Adjust dot size as necessary to achieve desired density" msgstr "" -#: src/main/print-escp2.c:281 src/main/print-escp2.c:282 +#: src/main/print-escp2.c:283 src/main/print-escp2.c:284 #, fuzzy msgid "Output Order" msgstr "Ausgabeart:" -#: src/main/print-escp2.c:287 src/main/print-escp2.c:288 +#: src/main/print-escp2.c:289 src/main/print-escp2.c:290 msgid "Alignment Passes" msgstr "" -#: src/main/print-escp2.c:293 src/main/print-escp2.c:294 +#: src/main/print-escp2.c:295 src/main/print-escp2.c:296 msgid "Alignment Choices" msgstr "" -#: src/main/print-escp2.c:299 src/main/print-escp2.c:300 +#: src/main/print-escp2.c:301 src/main/print-escp2.c:302 #, fuzzy msgid "Ink change command" msgstr "Unbekannter Befehl.\n" -#: src/main/print-escp2.c:305 src/main/print-escp2.c:306 +#: src/main/print-escp2.c:307 src/main/print-escp2.c:308 msgid "Alternate Alignment Passes" msgstr "" -#: src/main/print-escp2.c:311 src/main/print-escp2.c:312 +#: src/main/print-escp2.c:313 src/main/print-escp2.c:314 #, fuzzy msgid "Alternate Alignment Choices" msgstr "Wiederhole die Kopf-Ausrichtung.\n" -#: src/main/print-escp2.c:317 +#: src/main/print-escp2.c:319 msgid "Supports Packet Mode" msgstr "" -#: src/main/print-escp2.c:318 +#: src/main/print-escp2.c:320 msgid "Supports D4 Packet Mode" msgstr "" -#: src/main/print-escp2.c:323 +#: src/main/print-escp2.c:325 msgid "Has Interchangeable Ink Cartridges" msgstr "" -#: src/main/print-escp2.c:324 +#: src/main/print-escp2.c:326 msgid "Has multiple choices of ink cartridges" msgstr "" -#: src/main/print-escp2.c:335 src/main/print-escp2.c:336 +#: src/main/print-escp2.c:337 src/main/print-escp2.c:338 #, fuzzy msgid "Channel Names" msgstr "Abbruch" -#: src/main/print-escp2.c:348 +#: src/main/print-escp2.c:350 msgid "Raw Channel Count" msgstr "" -#: src/main/print-escp2.c:353 +#: src/main/print-escp2.c:355 #, fuzzy msgid "Cyan Map" msgstr "Cyan" -#: src/main/print-escp2.c:354 +#: src/main/print-escp2.c:356 #, fuzzy msgid "Adjust the cyan map" msgstr "Stellen sie die Cyan-Balance ein" -#: src/main/print-escp2.c:359 +#: src/main/print-escp2.c:361 #, fuzzy msgid "Magenta Map" msgstr "Magenta" -#: src/main/print-escp2.c:360 +#: src/main/print-escp2.c:362 #, fuzzy msgid "Adjust the magenta map" msgstr "Stellen sie die Magenta-Balance ein" -#: src/main/print-escp2.c:365 +#: src/main/print-escp2.c:367 #, fuzzy msgid "Yellow Map" msgstr "Gelb" -#: src/main/print-escp2.c:366 +#: src/main/print-escp2.c:368 #, fuzzy msgid "Adjust the yellow map" msgstr "Stellen sie die Gelb-Balance ein" -#: src/main/print-escp2.c:371 +#: src/main/print-escp2.c:373 #, fuzzy msgid "Blue Map" -msgstr "Schwarz-Weiß" +msgstr "Schwarz-Weiß" -#: src/main/print-escp2.c:372 +#: src/main/print-escp2.c:374 #, fuzzy msgid "Adjust the blue map" msgstr "Stellen sie die Cyan-Balance ein" -#: src/main/print-escp2.c:377 +#: src/main/print-escp2.c:379 msgid "Red Map" msgstr "" -#: src/main/print-escp2.c:378 +#: src/main/print-escp2.c:380 #, fuzzy msgid "Adjust the red map" msgstr "Stellen sie die Gelb-Balance ein" -#: src/main/print-escp2.c:471 +#: src/main/print-escp2.c:478 #, fuzzy msgid "Red Density" msgstr "Empfindlichkeit:" -#: src/main/print-escp2.c:472 +#: src/main/print-escp2.c:479 #, fuzzy msgid "Adjust the red density" msgstr "Stellen sie die Gelb-Balance ein" -#: src/main/print-escp2.c:479 +#: src/main/print-escp2.c:486 #, fuzzy msgid "Blue Density" msgstr "Empfindlichkeit:" -#: src/main/print-escp2.c:480 +#: src/main/print-escp2.c:487 #, fuzzy msgid "Adjust the blue density" msgstr "Stellen sie die Cyan-Balance ein" -#: src/main/print-escp2.c:487 +#: src/main/print-escp2.c:494 #, fuzzy msgid "Gloss Level" msgstr "Glossy Film" -#: src/main/print-escp2.c:488 +#: src/main/print-escp2.c:495 #, fuzzy msgid "Adjust the gloss level" msgstr "Stellen sie die Gelb-Balance ein" -#: src/main/print-escp2.c:511 src/main/print-escp2.c:512 +#: src/main/print-escp2.c:502 +msgid "Drop Size Small" +msgstr "" + +#: src/main/print-escp2.c:503 +msgid "Drop Size 1 (small)" +msgstr "" + +#: src/main/print-escp2.c:510 +msgid "Drop Size Medium" +msgstr "" + +#: src/main/print-escp2.c:511 +msgid "Drop Size 2 (medium)" +msgstr "" + +#: src/main/print-escp2.c:518 +msgid "Drop Size Large" +msgstr "" + +#: src/main/print-escp2.c:519 +msgid "Drop Size 3 (large)" +msgstr "" + +#: src/main/print-escp2.c:526 src/main/print-escp2.c:527 +#, fuzzy +msgid "Light Cyan Value" +msgstr "helles Cyan" + +#: src/main/print-escp2.c:542 src/main/print-escp2.c:543 +#, fuzzy +msgid "Light Cyan Density Scale" +msgstr "helles Cyan" + +#: src/main/print-escp2.c:550 src/main/print-escp2.c:551 +#, fuzzy +msgid "Light Magenta Value" +msgstr "helles Magenta" + +#: src/main/print-escp2.c:558 src/main/print-escp2.c:559 +#, fuzzy +msgid "Light Magenta Density Scale" +msgstr "helles Magenta" + +#: src/main/print-escp2.c:574 src/main/print-escp2.c:575 +#, fuzzy +msgid "Dark Yellow Value" +msgstr "Gelb" + +#: src/main/print-escp2.c:582 src/main/print-escp2.c:583 msgid "Dark Yellow Transition" msgstr "" -#: src/main/print-escp2.c:519 src/main/print-escp2.c:520 -#: src/main/print-escp2.c:527 src/main/print-escp2.c:528 +#: src/main/print-escp2.c:590 src/main/print-escp2.c:591 +#, fuzzy +msgid "Dark Yellow Density Scale" +msgstr "Gelb" + +#: src/main/print-escp2.c:598 src/main/print-escp2.c:599 +#: src/main/print-escp2.c:622 src/main/print-escp2.c:623 +#, fuzzy +msgid "Gray Value" +msgstr "Graustufen" + +#: src/main/print-escp2.c:606 src/main/print-escp2.c:607 +#: src/main/print-escp2.c:630 src/main/print-escp2.c:631 msgid "Gray Transition" msgstr "" -#: src/main/print-escp2.c:535 src/main/print-escp2.c:536 -#: src/main/print-escp2.c:559 src/main/print-escp2.c:560 +#: src/main/print-escp2.c:614 src/main/print-escp2.c:615 +#: src/main/print-escp2.c:638 src/main/print-escp2.c:639 +#, fuzzy +msgid "Gray Density Scale" +msgstr "Graustufen" + +#: src/main/print-escp2.c:646 src/main/print-escp2.c:647 +#: src/main/print-escp2.c:718 src/main/print-escp2.c:719 +#, fuzzy +msgid "Light Gray Value" +msgstr "helles Cyan" + +#: src/main/print-escp2.c:654 src/main/print-escp2.c:655 +#: src/main/print-escp2.c:726 src/main/print-escp2.c:727 #, fuzzy msgid "Light Gray Transition" msgstr "helles Cyan" -#: src/main/print-escp2.c:543 src/main/print-escp2.c:544 +#: src/main/print-escp2.c:662 src/main/print-escp2.c:663 +#: src/main/print-escp2.c:734 src/main/print-escp2.c:735 +#, fuzzy +msgid "Light Gray Density Scale" +msgstr "helles Cyan" + +#: src/main/print-escp2.c:670 src/main/print-escp2.c:671 +#, fuzzy +msgid "Dark Gray Value" +msgstr "helles Cyan" + +#: src/main/print-escp2.c:678 src/main/print-escp2.c:679 #, fuzzy msgid "Dark Gray Transition" msgstr "helles Cyan" -#: src/main/print-escp2.c:551 +#: src/main/print-escp2.c:686 src/main/print-escp2.c:687 +#, fuzzy +msgid "Dark Gray Density Scale" +msgstr "helles Cyan" + +#: src/main/print-escp2.c:694 +#, fuzzy +msgid "Mid Gray Value" +msgstr "Graustufen" + +#: src/main/print-escp2.c:695 +#, fuzzy +msgid "Medium Gray Value" +msgstr "helles Cyan" + +#: src/main/print-escp2.c:702 #, fuzzy msgid "Mid Gray Transition" msgstr "helles Cyan" -#: src/main/print-escp2.c:552 +#: src/main/print-escp2.c:703 #, fuzzy msgid "Medium Gray Transition" msgstr "helles Cyan" -#: src/main/print-escp2.c:1635 +#: src/main/print-escp2.c:710 +#, fuzzy +msgid "Mid Gray Density Scale" +msgstr "helles Cyan" + +#: src/main/print-escp2.c:711 +#, fuzzy +msgid "Medium Gray Density Scale" +msgstr "helles Cyan" + +#: src/main/print-escp2.c:1999 #, fuzzy msgid "Full Manual Control" msgstr "Ausgabeart:" -#: src/main/print-escp2.c:1637 +#: src/main/print-escp2.c:2001 msgid "Automatic Setting Control" msgstr "" -#: src/main/print-escp2.c:1732 src/main/generic-options.c:213 +#: src/main/print-escp2.c:2096 src/main/generic-options.c:213 #: src/main/generic-options.c:230 #, fuzzy msgid "Manual Control" msgstr "Ausgabeart:" -#: src/main/print-escp2.c:1771 src/main/print-escp2.c:1863 -#: src/main/print-escp2.c:1875 src/main/print-pcl.c:230 -#: src/main/escp2-channels.c:2805 src/main/escp2-papers.c:1707 -#: src/main/escp2-papers.c:1731 src/main/escp2-papers.c:1764 -#: src/main/escp2-papers.c:1815 src/main/escp2-papers.c:1857 -#: src/main/escp2-papers.c:1899 src/main/escp2-papers.c:1992 -#: src/main/escp2-resolutions.c:640 src/main/escp2-resolutions.c:655 -#: src/main/escp2-resolutions.c:668 src/main/generic-options.c:36 -#: src/gutenprintui/panel.c:2613 src/gutenprintui2/panel.c:2639 +#: src/main/print-escp2.c:2139 src/main/print-escp2.c:2231 +#: src/main/print-escp2.c:2243 src/main/print-pcl.c:237 +#: src/main/escp2-channels.c:2827 src/main/escp2-channels.c:2836 +#: src/main/escp2-papers.c:1718 src/main/escp2-papers.c:1742 +#: src/main/escp2-papers.c:1775 src/main/escp2-papers.c:1826 +#: src/main/escp2-papers.c:1868 src/main/escp2-papers.c:1910 +#: src/main/escp2-papers.c:2003 src/main/escp2-resolutions.c:640 +#: src/main/escp2-resolutions.c:655 src/main/escp2-resolutions.c:670 +#: src/main/escp2-resolutions.c:683 src/main/generic-options.c:36 +#: src/gutenprintui2/panel.c:2814 msgid "Standard" msgstr "Standard" -#: src/main/print-escp2.c:1842 +#: src/main/print-escp2.c:2210 #, fuzzy msgid "Automatic" -msgstr "Größe" +msgstr "Größe" -#: src/main/print-escp2.c:1844 +#: src/main/print-escp2.c:2212 #, fuzzy msgid "Bidirectional" msgstr "600 DPI Unidirectional" -#: src/main/print-escp2.c:1846 +#: src/main/print-escp2.c:2214 #, fuzzy msgid "Unidirectional" msgstr "600 DPI Unidirectional" -#: src/main/print-escp2.c:1877 +#: src/main/print-escp2.c:2245 msgid "Alternate Fill" msgstr "" -#: src/main/print-escp2.c:1879 +#: src/main/print-escp2.c:2247 msgid "Ascending Fill" msgstr "" -#: src/main/print-escp2.c:1881 +#: src/main/print-escp2.c:2249 msgid "Descending Fill" msgstr "" -#: src/main/print-escp2.c:1883 +#: src/main/print-escp2.c:2251 msgid "Ascending Double" msgstr "" -#: src/main/print-escp2.c:1885 +#: src/main/print-escp2.c:2253 msgid "Nearest Neighbor Avoidance" msgstr "" -#: src/main/print-escp2.c:2328 +#: src/main/print-escp2.c:2771 #, fuzzy, c-format msgid "This printer does not support raw printer output at depth %d\n" -msgstr "Drucker unterstützt keine Rohdatenausgabe\n" +msgstr "Drucker unterstützt keine Rohdatenausgabe\n" -#: src/main/print-escp2.c:3436 src/main/print-olympus.c:2451 +#: src/main/print-escp2.c:3934 src/main/print-olympus.c:2449 #: src/main/print-raw.c:217 msgid "Print options not verified; cannot print.\n" -msgstr "Ungeprüfte Druckoptionen; drucken nicht möglich.\n" +msgstr "Ungeprüfte Druckoptionen; drucken nicht möglich.\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" @@ -1394,7 +1532,7 @@ msgstr "600 DPI" #: src/main/print-lexmark.c:579 src/main/print-lexmark.c:655 msgid "600 DPI high quality" -msgstr "600 DPI hohe Qualität" +msgstr "600 DPI hohe Qualität" #: src/main/print-lexmark.c:580 src/main/print-lexmark.c:656 msgid "600 DPI Unidirectional" @@ -1406,11 +1544,11 @@ msgstr "1200 DPI" #: src/main/print-lexmark.c:582 src/main/print-lexmark.c:658 msgid "1200 DPI high quality" -msgstr "1200 DPI hohe Qualität" +msgstr "1200 DPI hohe Qualität" #: src/main/print-lexmark.c:583 src/main/print-lexmark.c:659 msgid "1200 DPI highest quality" -msgstr "1200 DPI höchste Qualität" +msgstr "1200 DPI höchste Qualität" #: src/main/print-lexmark.c:584 src/main/print-lexmark.c:660 msgid "1200 DPI Unidirectional" @@ -1418,15 +1556,15 @@ msgstr "1200 DPI Unidirectional" #: 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 hohe Qualität" +msgstr "2400 DPI × 1200 DPI hohe Qualität" #: src/main/print-lexmark.c:587 msgid "2400 DPI x 1200 DPI highest quality" -msgstr "2400 DPI × 1200 DPI höchste Qualität" +msgstr "2400 DPI × 1200 DPI höchste Qualität" #: src/main/print-lexmark.c:589 msgid "test print" @@ -1453,109 +1591,109 @@ msgid "Three Color Composite" msgstr "Aus drei Farben gemischt" #: src/main/print-lexmark.c:607 src/main/print-lexmark.c:677 -#: src/main/escp2-channels.c:1540 src/main/escp2-channels.c:1554 -#: src/main/escp2-channels.c:1568 src/main/escp2-channels.c:1582 -#: src/main/escp2-channels.c:1808 src/main/escp2-channels.c:1823 -#: src/main/escp2-channels.c:1838 src/main/escp2-channels.c:1855 +#: src/main/escp2-channels.c:1554 src/main/escp2-channels.c:1568 +#: src/main/escp2-channels.c:1582 src/main/escp2-channels.c:1596 +#: src/main/escp2-channels.c:1822 src/main/escp2-channels.c:1837 +#: src/main/escp2-channels.c:1852 src/main/escp2-channels.c:1869 msgid "Six Color Photo" msgstr "Sechs Farben Foto" #: src/main/print-lexmark.c:610 src/main/print-lexmark.c:680 -#: src/main/escp2-channels.c:1475 src/main/escp2-channels.c:1489 -#: src/main/escp2-channels.c:1503 src/main/escp2-channels.c:1517 -#: src/main/escp2-channels.c:1752 src/main/escp2-channels.c:1767 -#: src/main/escp2-channels.c:1784 +#: src/main/escp2-channels.c:1489 src/main/escp2-channels.c:1503 +#: src/main/escp2-channels.c:1517 src/main/escp2-channels.c:1531 +#: src/main/escp2-channels.c:1766 src/main/escp2-channels.c:1781 +#: src/main/escp2-channels.c:1798 msgid "Five Color Photo Composite" -msgstr "Foto aus fünf Farben gemischt " +msgstr "Foto aus fünf Farben gemischt " -#: src/main/print-lexmark.c:856 src/main/escp2-papers.c:1341 -#: src/main/escp2-papers.c:1385 src/main/escp2-papers.c:1429 -#: src/main/escp2-papers.c:1477 src/main/escp2-papers.c:1525 -#: src/main/escp2-papers.c:1569 +#: src/main/print-lexmark.c:856 src/main/escp2-papers.c:1351 +#: src/main/escp2-papers.c:1395 src/main/escp2-papers.c:1439 +#: src/main/escp2-papers.c:1487 src/main/escp2-papers.c:1535 +#: src/main/escp2-papers.c:1579 msgid "Plain Paper" msgstr "Normalpapier" -#: src/main/print-lexmark.c:860 src/main/escp2-papers.c:1347 -#: src/main/escp2-papers.c:1391 src/main/escp2-papers.c:1435 -#: src/main/escp2-papers.c:1483 src/main/escp2-papers.c:1531 -#: src/main/escp2-papers.c:1575 +#: src/main/print-lexmark.c:860 src/main/escp2-papers.c:1357 +#: src/main/escp2-papers.c:1401 src/main/escp2-papers.c:1445 +#: src/main/escp2-papers.c:1493 src/main/escp2-papers.c:1541 +#: src/main/escp2-papers.c:1585 msgid "Glossy Film" msgstr "Glossy Film" -#: src/main/print-lexmark.c:864 src/main/escp2-papers.c:1349 -#: src/main/escp2-papers.c:1393 src/main/escp2-papers.c:1437 -#: src/main/escp2-papers.c:1485 src/main/escp2-papers.c:1533 -#: src/main/escp2-papers.c:1577 +#: src/main/print-lexmark.c:864 src/main/escp2-papers.c:1359 +#: src/main/escp2-papers.c:1403 src/main/escp2-papers.c:1447 +#: src/main/escp2-papers.c:1495 src/main/escp2-papers.c:1543 +#: src/main/escp2-papers.c:1587 msgid "Transparencies" msgstr "Folie" -#: src/main/print-lexmark.c:868 src/main/escp2-papers.c:1351 -#: src/main/escp2-papers.c:1395 src/main/escp2-papers.c:1439 -#: src/main/escp2-papers.c:1487 src/main/escp2-papers.c:1535 -#: src/main/escp2-papers.c:1579 +#: src/main/print-lexmark.c:868 src/main/escp2-papers.c:1361 +#: src/main/escp2-papers.c:1405 src/main/escp2-papers.c:1449 +#: src/main/escp2-papers.c:1497 src/main/escp2-papers.c:1545 +#: src/main/escp2-papers.c:1589 msgid "Envelopes" msgstr "Umschlag" -#: src/main/print-lexmark.c:872 src/main/escp2-papers.c:1355 -#: src/main/escp2-papers.c:1399 src/main/escp2-papers.c:1443 -#: src/main/escp2-papers.c:1491 src/main/escp2-papers.c:1539 -#: src/main/escp2-papers.c:1583 +#: src/main/print-lexmark.c:872 src/main/escp2-papers.c:1365 +#: src/main/escp2-papers.c:1409 src/main/escp2-papers.c:1453 +#: src/main/escp2-papers.c:1501 src/main/escp2-papers.c:1549 +#: src/main/escp2-papers.c:1593 msgid "Matte Paper" msgstr "Mattes Papier" -#: src/main/print-lexmark.c:876 src/main/escp2-papers.c:1359 -#: src/main/escp2-papers.c:1403 src/main/escp2-papers.c:1447 -#: src/main/escp2-papers.c:1495 src/main/escp2-papers.c:1543 -#: src/main/escp2-papers.c:1587 +#: src/main/print-lexmark.c:876 src/main/escp2-papers.c:1369 +#: src/main/escp2-papers.c:1413 src/main/escp2-papers.c:1457 +#: src/main/escp2-papers.c:1505 src/main/escp2-papers.c:1553 +#: src/main/escp2-papers.c:1597 msgid "Inkjet Paper" msgstr "Inkjet Papier" -#: src/main/print-lexmark.c:880 src/main/escp2-papers.c:1361 -#: src/main/escp2-papers.c:1405 src/main/escp2-papers.c:1449 -#: src/main/escp2-papers.c:1497 src/main/escp2-papers.c:1545 -#: src/main/escp2-papers.c:1589 +#: src/main/print-lexmark.c:880 src/main/escp2-papers.c:1371 +#: src/main/escp2-papers.c:1415 src/main/escp2-papers.c:1459 +#: src/main/escp2-papers.c:1507 src/main/escp2-papers.c:1555 +#: src/main/escp2-papers.c:1599 msgid "Photo Quality Inkjet Paper" msgstr "Photo Quality Inkjet Papier" -#: src/main/print-lexmark.c:884 src/main/escp2-papers.c:1363 -#: src/main/escp2-papers.c:1407 src/main/escp2-papers.c:1451 -#: src/main/escp2-papers.c:1499 src/main/escp2-papers.c:1547 -#: src/main/escp2-papers.c:1591 +#: src/main/print-lexmark.c:884 src/main/escp2-papers.c:1373 +#: src/main/escp2-papers.c:1417 src/main/escp2-papers.c:1461 +#: src/main/escp2-papers.c:1509 src/main/escp2-papers.c:1557 +#: src/main/escp2-papers.c:1601 msgid "Photo Paper" msgstr "Foto Papier" -#: src/main/print-lexmark.c:888 src/main/escp2-papers.c:1365 -#: src/main/escp2-papers.c:1409 src/main/escp2-papers.c:1453 -#: src/main/escp2-papers.c:1501 src/main/escp2-papers.c:1549 -#: src/main/escp2-papers.c:1593 src/main/escp2-papers.c:1617 +#: src/main/print-lexmark.c:888 src/main/escp2-papers.c:1375 +#: src/main/escp2-papers.c:1419 src/main/escp2-papers.c:1463 +#: src/main/escp2-papers.c:1511 src/main/escp2-papers.c:1559 +#: src/main/escp2-papers.c:1603 src/main/escp2-papers.c:1627 msgid "Premium Glossy Photo Paper" msgstr "Premium Glossy Foto Papier" -#: src/main/print-lexmark.c:892 src/main/escp2-papers.c:1369 -#: src/main/escp2-papers.c:1413 src/main/escp2-papers.c:1457 -#: src/main/escp2-papers.c:1505 src/main/escp2-papers.c:1553 -#: src/main/escp2-papers.c:1597 +#: src/main/print-lexmark.c:892 src/main/escp2-papers.c:1379 +#: src/main/escp2-papers.c:1423 src/main/escp2-papers.c:1467 +#: src/main/escp2-papers.c:1515 src/main/escp2-papers.c:1563 +#: src/main/escp2-papers.c:1607 msgid "Premium Luster Photo Paper" msgstr "Premium Glanz Foto Papier" -#: src/main/print-lexmark.c:896 src/main/escp2-papers.c:1371 -#: src/main/escp2-papers.c:1415 src/main/escp2-papers.c:1463 -#: src/main/escp2-papers.c:1511 src/main/escp2-papers.c:1555 -#: src/main/escp2-papers.c:1603 +#: src/main/print-lexmark.c:896 src/main/escp2-papers.c:1381 +#: src/main/escp2-papers.c:1425 src/main/escp2-papers.c:1473 +#: src/main/escp2-papers.c:1521 src/main/escp2-papers.c:1565 +#: src/main/escp2-papers.c:1613 msgid "Photo Quality Glossy Paper" msgstr "Photo Quality Glossy Papier" -#: src/main/print-lexmark.c:900 src/main/escp2-papers.c:1373 -#: src/main/escp2-papers.c:1417 src/main/escp2-papers.c:1465 -#: src/main/escp2-papers.c:1513 src/main/escp2-papers.c:1557 -#: src/main/escp2-papers.c:1605 +#: src/main/print-lexmark.c:900 src/main/escp2-papers.c:1383 +#: src/main/escp2-papers.c:1427 src/main/escp2-papers.c:1475 +#: src/main/escp2-papers.c:1523 src/main/escp2-papers.c:1567 +#: src/main/escp2-papers.c:1615 msgid "Ilford Heavy Paper" msgstr "Ilford schweres Papier" -#: src/main/print-lexmark.c:904 src/main/escp2-papers.c:1377 -#: src/main/escp2-papers.c:1421 src/main/escp2-papers.c:1469 -#: src/main/escp2-papers.c:1517 src/main/escp2-papers.c:1561 -#: src/main/escp2-papers.c:1609 src/main/escp2-papers.c:1619 +#: src/main/print-lexmark.c:904 src/main/escp2-papers.c:1387 +#: src/main/escp2-papers.c:1431 src/main/escp2-papers.c:1479 +#: src/main/escp2-papers.c:1527 src/main/escp2-papers.c:1571 +#: src/main/escp2-papers.c:1619 src/main/escp2-papers.c:1629 msgid "Other" msgstr "Anderes" @@ -1571,56 +1709,56 @@ msgstr "Handeinzug mit Pause" msgid "Manual without Pause" msgstr "Handeinzug ohne Pause" -#: src/main/print-olympus.c:277 +#: src/main/print-olympus.c:275 msgid "Coated" msgstr "" -#: src/main/print-olympus.c:278 src/cups/genppd.c:1726 src/cups/genppd.c:1753 -#: src/cups/genppd.c:1834 +#: src/main/print-olympus.c:276 src/cups/genppd.c:1732 src/cups/genppd.c:1759 +#: src/cups/genppd.c:1840 msgid "None" msgstr "" -#: src/main/print-olympus.c:963 src/main/print-olympus.c:1023 -#: src/main/print-olympus.c:1127 +#: src/main/print-olympus.c:961 src/main/print-olympus.c:1021 +#: src/main/print-olympus.c:1125 #, fuzzy msgid "Glossy" msgstr "Glossy Film" -#: src/main/print-olympus.c:964 src/main/print-olympus.c:1024 -#: src/main/print-olympus.c:1128 +#: src/main/print-olympus.c:962 src/main/print-olympus.c:1022 +#: src/main/print-olympus.c:1126 msgid "Texture" msgstr "" -#: src/main/print-olympus.c:1025 src/main/print-olympus.c:1129 +#: src/main/print-olympus.c:1023 src/main/print-olympus.c:1127 #, fuzzy msgid "Matte" msgstr "Mattes Papier" -#: src/main/print-olympus.c:1729 src/main/print-olympus.c:1730 +#: src/main/print-olympus.c:1727 src/main/print-olympus.c:1728 msgid "Laminate Pattern" msgstr "" -#: src/main/print-olympus.c:1765 +#: src/main/print-olympus.c:1763 #, fuzzy msgid "Adjust the cyan balance" msgstr "Stellen sie die Cyan-Balance ein" -#: src/main/print-olympus.c:1773 +#: src/main/print-olympus.c:1771 #, fuzzy msgid "Adjust the magenta balance" msgstr "Stellen sie die Magenta-Balance ein" -#: src/main/print-olympus.c:1781 +#: src/main/print-olympus.c:1779 #, fuzzy msgid "Adjust the yellow balance" msgstr "Stellen sie die Gelb-Balance ein" -#: src/main/print-olympus.c:1788 +#: src/main/print-olympus.c:1786 #, fuzzy msgid "Black Balance" -msgstr "Schwarz-Weiß" +msgstr "Schwarz-Weiß" -#: src/main/print-olympus.c:1789 +#: src/main/print-olympus.c:1787 #, fuzzy msgid "Adjust the black balance" msgstr "Stellen sie die Cyan-Balance ein" @@ -1653,93 +1791,117 @@ msgstr "Schnelltrocknendes Glossy" msgid "Quick-dry Transparency" msgstr "Schnelltrocknende Folie" -#: src/main/print-pcl.c:231 src/main/xmli18n-tmp.h:16 +#: src/main/print-pcl.c:238 src/main/xmli18n-tmp.h:17 msgid "Manual" msgstr "Manuell" -#: src/main/print-pcl.c:233 +#: src/main/print-pcl.c:240 +msgid "Tray 1 - Movable Guides" +msgstr "" + +#: src/main/print-pcl.c:241 msgid "Tray 1" msgstr "Schacht 1" -#: src/main/print-pcl.c:234 src/main/print-pcl.c:240 +#: src/main/print-pcl.c:242 +msgid "Tray 2 - Movable Guides" +msgstr "" + +#: src/main/print-pcl.c:243 src/main/print-pcl.c:251 msgid "Tray 2" msgstr "Schacht 2" -#: src/main/print-pcl.c:235 +#: src/main/print-pcl.c:244 +msgid "Tray 3 - Movable Guides" +msgstr "" + +#: src/main/print-pcl.c:245 msgid "Tray 3" msgstr "Schacht 3" -#: src/main/print-pcl.c:236 +#: src/main/print-pcl.c:246 +msgid "Tray 4 - Movable Guides" +msgstr "" + +#: src/main/print-pcl.c:247 msgid "Tray 4" msgstr "Schacht 4" -#: src/main/print-pcl.c:237 +#: src/main/print-pcl.c:248 msgid "Portable Sheet Feeder" -msgstr "optionale Papierzuführung" +msgstr "optionale Papierzuführung" -#: src/main/print-pcl.c:238 +#: src/main/print-pcl.c:249 msgid "Desktop Sheet Feeder" -msgstr "eingebaute Papierzuführung" +msgstr "eingebaute Papierzuführung" -#: src/main/print-pcl.c:239 +#: src/main/print-pcl.c:250 msgid "Tray" msgstr "Schacht" -#: src/main/print-pcl.c:241 +#: src/main/print-pcl.c:252 msgid "Optional Source" -msgstr "sonstige Zuführung" +msgstr "sonstige Zuführung" -#: src/main/print-pcl.c:242 +#: src/main/print-pcl.c:253 msgid "Autoselect" msgstr "autom. Auswahl" -#: src/main/print-pcl.c:256 +#: src/main/print-pcl.c:267 msgid "150x150 DPI" -msgstr "150×150 DPI" +msgstr "150×150 DPI" -#: src/main/print-pcl.c:257 +#: src/main/print-pcl.c:268 msgid "300x300 DPI" -msgstr "300×300 DPI" +msgstr "300×300 DPI" -#: src/main/print-pcl.c:258 +#: src/main/print-pcl.c:269 msgid "600x300 DPI" -msgstr "600×300 DPI" +msgstr "600×300 DPI" -#: src/main/print-pcl.c:259 +#: src/main/print-pcl.c:270 msgid "600x600 DPI monochrome" -msgstr "600×600 DPI monochrome" +msgstr "600×600 DPI monochrome" -#: src/main/print-pcl.c:260 +#: src/main/print-pcl.c:271 msgid "600x600 DPI" -msgstr "600×600 DPI" +msgstr "600×600 DPI" -#: src/main/print-pcl.c:261 +#: src/main/print-pcl.c:272 msgid "1200x600 DPI" -msgstr "1200×600 DPI" +msgstr "1200×600 DPI" -#: src/main/print-pcl.c:262 +#: src/main/print-pcl.c:273 msgid "2400x600 DPI" -msgstr "2400×600 DPI" +msgstr "2400×600 DPI" -#: src/main/print-pcl.c:1470 +#: src/main/print-pcl.c:1538 msgid "Color + Black Cartridges" msgstr "Farbe+Schwarz Patrone" -#: src/main/print-pcl.c:1471 +#: src/main/print-pcl.c:1539 msgid "Color + Photo Cartridges" msgstr "Farb + Foto Patronen" -#: src/main/print-ps.c:97 +#: src/main/print-ps.c:68 #, fuzzy msgid "PPDFile" msgstr "PPD Datei:" -#: src/main/print-ps.c:98 src/gutenprintui/panel.c:1768 -#: src/gutenprintui2/panel.c:1768 +#: src/main/print-ps.c:69 src/gutenprintui2/panel.c:1943 #, fuzzy msgid "PPD File" msgstr "PPD Datei?" +#: src/main/print-ps.c:74 +#, fuzzy +msgid "Model Name" +msgstr "Abbruch" + +#: src/main/print-ps.c:75 +msgid "PPD File Model Name" +msgstr "" + #: src/main/print-raw.c:223 msgid "Image dimensions must match paper dimensions" msgstr "" @@ -1756,289 +1918,295 @@ msgstr "zweistufig Grau" #: src/main/escp2-channels.c:1035 src/main/escp2-channels.c:1048 #: src/main/escp2-channels.c:1061 src/main/escp2-channels.c:1074 #: src/main/escp2-channels.c:1087 src/main/escp2-channels.c:1100 -#: src/main/escp2-channels.c:2505 src/main/escp2-channels.c:2528 -#: src/main/escp2-channels.c:2548 src/main/escp2-channels.c:2568 -#: src/main/escp2-channels.c:2588 src/main/escp2-channels.c:2608 +#: src/main/escp2-channels.c:2525 src/main/escp2-channels.c:2548 +#: src/main/escp2-channels.c:2568 src/main/escp2-channels.c:2588 +#: src/main/escp2-channels.c:2608 src/main/escp2-channels.c:2628 msgid "Quadtone" msgstr "Quadtone" -#: src/main/escp2-channels.c:1604 src/main/escp2-channels.c:1618 +#: src/main/escp2-channels.c:1466 +#, fuzzy +msgid "Four Color Photo" +msgstr "Sechs Farben Foto" + +#: src/main/escp2-channels.c:1618 src/main/escp2-channels.c:1632 msgid "Six Color Enhanced Composite" msgstr "Aus sechs Farben gemischt " -#: src/main/escp2-channels.c:1641 src/main/escp2-channels.c:1655 -#: src/main/escp2-channels.c:1669 src/main/escp2-channels.c:1705 +#: src/main/escp2-channels.c:1655 src/main/escp2-channels.c:1669 +#: src/main/escp2-channels.c:1683 src/main/escp2-channels.c:1719 #, fuzzy msgid "Seven Color Photo" msgstr "Sechs Farben Foto" -#: src/main/escp2-channels.c:1691 +#: src/main/escp2-channels.c:1705 msgid "Seven Color Enhanced" msgstr "Aus sieben Farben gemischt" -#: src/main/escp2-channels.c:1728 +#: src/main/escp2-channels.c:1742 #, fuzzy msgid "Eight Color Photo" msgstr "Sechs Farben Foto" -#: src/main/escp2-channels.c:1876 src/main/escp2-channels.c:1888 -#: src/main/escp2-channels.c:1894 +#: src/main/escp2-channels.c:1890 src/main/escp2-channels.c:1902 +#: src/main/escp2-channels.c:1908 msgid "One Color Raw" msgstr "einfarbige Rohausgabe" -#: src/main/escp2-channels.c:1900 +#: src/main/escp2-channels.c:1914 #, fuzzy msgid "One Color Raw Enhanced Gloss" msgstr "Aus sieben Farben gemischt" -#: src/main/escp2-channels.c:1913 src/main/escp2-channels.c:1925 +#: src/main/escp2-channels.c:1927 src/main/escp2-channels.c:1939 msgid "Two Color Raw" msgstr "zweifarbige Rohausgabe" -#: src/main/escp2-channels.c:1939 src/main/escp2-channels.c:1953 -#: src/main/escp2-channels.c:1980 src/main/escp2-channels.c:1993 -#: src/main/escp2-channels.c:2006 src/main/escp2-channels.c:2019 -#: src/main/escp2-channels.c:2033 src/main/escp2-channels.c:2047 -#: src/main/escp2-channels.c:2060 +#: src/main/escp2-channels.c:1953 src/main/escp2-channels.c:1967 +#: src/main/escp2-channels.c:1994 src/main/escp2-channels.c:2007 +#: src/main/escp2-channels.c:2020 src/main/escp2-channels.c:2033 +#: src/main/escp2-channels.c:2047 src/main/escp2-channels.c:2061 +#: src/main/escp2-channels.c:2074 #, fuzzy msgid "Three Color Raw" msgstr "Siebenfarbige Rohausgabe" -#: src/main/escp2-channels.c:1967 +#: src/main/escp2-channels.c:1981 #, fuzzy msgid "Three Color Raw Gloss" msgstr "Siebenfarbige Rohausgabe" -#: src/main/escp2-channels.c:2067 src/main/escp2-channels.c:2073 -#: src/main/escp2-channels.c:2079 src/main/escp2-channels.c:2085 -#: src/main/escp2-channels.c:2091 src/main/escp2-channels.c:2097 -#: src/main/escp2-channels.c:2103 src/main/escp2-channels.c:2109 -#: src/main/escp2-channels.c:2115 src/main/escp2-channels.c:2121 +#: src/main/escp2-channels.c:2081 src/main/escp2-channels.c:2087 +#: src/main/escp2-channels.c:2093 src/main/escp2-channels.c:2099 +#: src/main/escp2-channels.c:2105 src/main/escp2-channels.c:2111 +#: src/main/escp2-channels.c:2117 src/main/escp2-channels.c:2123 +#: src/main/escp2-channels.c:2129 src/main/escp2-channels.c:2135 +#: src/main/escp2-channels.c:2141 msgid "Four Color Raw" msgstr "vierfarbige Rohausgabe" -#: src/main/escp2-channels.c:2127 +#: src/main/escp2-channels.c:2147 #, fuzzy msgid "Four Color Raw Gloss" msgstr "vierfarbige Rohausgabe" -#: src/main/escp2-channels.c:2142 src/main/escp2-channels.c:2156 +#: src/main/escp2-channels.c:2162 src/main/escp2-channels.c:2176 #, fuzzy msgid "Five Color Raw" msgstr "Siebenfarbige Rohausgabe" -#: src/main/escp2-channels.c:2170 src/main/escp2-channels.c:2186 -#: src/main/escp2-channels.c:2192 src/main/escp2-channels.c:2198 -#: src/main/escp2-channels.c:2213 src/main/escp2-channels.c:2234 +#: src/main/escp2-channels.c:2190 src/main/escp2-channels.c:2206 +#: src/main/escp2-channels.c:2212 src/main/escp2-channels.c:2218 +#: src/main/escp2-channels.c:2233 src/main/escp2-channels.c:2254 msgid "Six Color Raw" msgstr "Sechsfarbige Rohausgabe" -#: src/main/escp2-channels.c:2219 +#: src/main/escp2-channels.c:2239 #, fuzzy msgid "Six Color Enhanced Gloss Raw" msgstr "Aus sechs Farben gemischt " -#: src/main/escp2-channels.c:2250 src/main/escp2-channels.c:2265 -#: src/main/escp2-channels.c:2280 +#: src/main/escp2-channels.c:2270 src/main/escp2-channels.c:2285 +#: src/main/escp2-channels.c:2300 msgid "Seven Color Raw" msgstr "Siebenfarbige Rohausgabe" -#: src/main/escp2-channels.c:2297 +#: src/main/escp2-channels.c:2317 #, fuzzy msgid "Seven Color Enhanced Gloss Raw" msgstr "Aus sieben Farben gemischt" -#: src/main/escp2-channels.c:2315 +#: src/main/escp2-channels.c:2335 #, fuzzy msgid "Eight Color Raw" msgstr "Sechsfarbige Rohausgabe" -#: src/main/escp2-channels.c:2482 src/main/escp2-channels.c:2495 -#: src/main/escp2-channels.c:2497 src/main/escp2-channels.c:2517 -#: src/main/escp2-channels.c:2520 src/main/escp2-channels.c:2540 -#: src/main/escp2-channels.c:2560 src/main/escp2-channels.c:2580 -#: src/main/escp2-channels.c:2600 src/main/escp2-channels.c:2620 -#: src/main/escp2-channels.c:2636 src/main/escp2-channels.c:2638 -#: src/main/escp2-channels.c:2640 src/main/escp2-channels.c:2642 -#: src/main/escp2-channels.c:2658 src/main/escp2-channels.c:2674 -#: src/main/escp2-channels.c:2694 +#: src/main/escp2-channels.c:2502 src/main/escp2-channels.c:2515 +#: src/main/escp2-channels.c:2517 src/main/escp2-channels.c:2537 +#: src/main/escp2-channels.c:2540 src/main/escp2-channels.c:2560 +#: src/main/escp2-channels.c:2580 src/main/escp2-channels.c:2600 +#: src/main/escp2-channels.c:2620 src/main/escp2-channels.c:2640 +#: src/main/escp2-channels.c:2656 src/main/escp2-channels.c:2658 +#: src/main/escp2-channels.c:2660 src/main/escp2-channels.c:2662 +#: src/main/escp2-channels.c:2678 src/main/escp2-channels.c:2694 +#: src/main/escp2-channels.c:2714 msgid "EPSON Standard Inks" msgstr "" -#: src/main/escp2-channels.c:2714 src/main/escp2-channels.c:2739 +#: src/main/escp2-channels.c:2734 src/main/escp2-channels.c:2759 #, fuzzy msgid "UltraChrome Photo Black" msgstr "Sechs Farben Foto" -#: src/main/escp2-channels.c:2718 src/main/escp2-channels.c:2743 +#: src/main/escp2-channels.c:2738 src/main/escp2-channels.c:2763 msgid "UltraChrome Matte Black" msgstr "" -#: src/main/escp2-channels.c:2758 src/main/escp2-channels.c:2796 -#: src/main/escp2-channels.c:3167 src/escputil/escputil.c:976 +#: src/main/escp2-channels.c:2778 src/main/escp2-channels.c:2816 +#: src/main/escp2-channels.c:3206 src/escputil/escputil.c:976 #, fuzzy msgid "Photo Black" msgstr "Foto Papier" -#: src/main/escp2-channels.c:2762 src/main/escp2-channels.c:2778 -#: src/main/escp2-channels.c:3166 src/escputil/escputil.c:986 +#: src/main/escp2-channels.c:2782 src/main/escp2-channels.c:2798 +#: src/main/escp2-channels.c:3205 src/escputil/escputil.c:986 #, fuzzy msgid "Matte Black" msgstr "Mattes Papier" -#: src/main/escp2-channels.c:3092 src/main/escp2-channels.c:3102 -#: src/main/escp2-channels.c:3114 src/main/escp2-channels.c:3128 -#: src/main/escp2-channels.c:3141 src/main/escp2-channels.c:3154 -#: src/main/escp2-channels.c:3191 src/escputil/escputil.c:981 +#: src/main/escp2-channels.c:3131 src/main/escp2-channels.c:3141 +#: src/main/escp2-channels.c:3153 src/main/escp2-channels.c:3167 +#: src/main/escp2-channels.c:3180 src/main/escp2-channels.c:3193 +#: src/main/escp2-channels.c:3240 src/escputil/escputil.c:981 #: src/escputil/escputil.c:1204 #, fuzzy msgid "Light Cyan" msgstr "helles Cyan" -#: src/main/escp2-channels.c:3093 src/main/escp2-channels.c:3104 -#: src/main/escp2-channels.c:3115 src/main/escp2-channels.c:3129 -#: src/main/escp2-channels.c:3142 src/main/escp2-channels.c:3155 -#: src/main/escp2-channels.c:3190 src/escputil/escputil.c:982 +#: src/main/escp2-channels.c:3132 src/main/escp2-channels.c:3143 +#: src/main/escp2-channels.c:3154 src/main/escp2-channels.c:3168 +#: src/main/escp2-channels.c:3181 src/main/escp2-channels.c:3194 +#: src/main/escp2-channels.c:3239 src/escputil/escputil.c:982 #: src/escputil/escputil.c:1205 #, fuzzy msgid "Light Magenta" msgstr "helles Magenta" -#: src/main/escp2-channels.c:3130 src/main/escp2-channels.c:3192 +#: src/main/escp2-channels.c:3169 src/main/escp2-channels.c:3241 #: src/escputil/escputil.c:985 #, fuzzy msgid "Light Black" msgstr "Schwarz" -#: src/main/escp2-channels.c:3143 +#: src/main/escp2-channels.c:3182 #, fuzzy msgid "Dark Yellow" msgstr "Gelb" -#: src/main/escp2-channels.c:3170 src/escputil/escputil.c:989 +#: src/main/escp2-channels.c:3209 src/escputil/escputil.c:989 #, fuzzy msgid "Gloss Optimizer" msgstr "Glossy Film" -#: src/main/escp2-channels.c:3189 src/escputil/escputil.c:990 +#: src/main/escp2-channels.c:3238 src/escputil/escputil.c:990 #, fuzzy msgid "Light Light Black" msgstr "Schwarz" -#: src/main/escp2-papers.c:1343 src/main/escp2-papers.c:1387 -#: src/main/escp2-papers.c:1431 src/main/escp2-papers.c:1479 -#: src/main/escp2-papers.c:1527 src/main/escp2-papers.c:1571 +#: src/main/escp2-papers.c:1353 src/main/escp2-papers.c:1397 +#: src/main/escp2-papers.c:1441 src/main/escp2-papers.c:1489 +#: src/main/escp2-papers.c:1537 src/main/escp2-papers.c:1581 msgid "Plain Paper Fast Load" msgstr "Normalpapier Schnelleinzug" -#: src/main/escp2-papers.c:1345 src/main/escp2-papers.c:1389 -#: src/main/escp2-papers.c:1433 src/main/escp2-papers.c:1481 -#: src/main/escp2-papers.c:1529 src/main/escp2-papers.c:1573 +#: src/main/escp2-papers.c:1355 src/main/escp2-papers.c:1399 +#: src/main/escp2-papers.c:1443 src/main/escp2-papers.c:1491 +#: src/main/escp2-papers.c:1539 src/main/escp2-papers.c:1583 #: src/main/xmli18n-tmp.h:5 msgid "Postcard" msgstr "Postkarte" -#: src/main/escp2-papers.c:1353 src/main/escp2-papers.c:1397 -#: src/main/escp2-papers.c:1441 src/main/escp2-papers.c:1489 -#: src/main/escp2-papers.c:1537 src/main/escp2-papers.c:1581 +#: src/main/escp2-papers.c:1363 src/main/escp2-papers.c:1407 +#: src/main/escp2-papers.c:1451 src/main/escp2-papers.c:1499 +#: src/main/escp2-papers.c:1547 src/main/escp2-papers.c:1591 msgid "Back Light Film" msgstr "Durchlichtfolie" -#: src/main/escp2-papers.c:1357 src/main/escp2-papers.c:1401 -#: src/main/escp2-papers.c:1445 src/main/escp2-papers.c:1493 -#: src/main/escp2-papers.c:1541 src/main/escp2-papers.c:1585 +#: src/main/escp2-papers.c:1367 src/main/escp2-papers.c:1411 +#: src/main/escp2-papers.c:1455 src/main/escp2-papers.c:1503 +#: src/main/escp2-papers.c:1551 src/main/escp2-papers.c:1595 #, fuzzy msgid "Matte Paper Heavyweight" msgstr "Mattes Papier" -#: src/main/escp2-papers.c:1367 src/main/escp2-papers.c:1411 -#: src/main/escp2-papers.c:1455 src/main/escp2-papers.c:1503 -#: src/main/escp2-papers.c:1551 src/main/escp2-papers.c:1595 +#: src/main/escp2-papers.c:1377 src/main/escp2-papers.c:1421 +#: src/main/escp2-papers.c:1465 src/main/escp2-papers.c:1513 +#: src/main/escp2-papers.c:1561 src/main/escp2-papers.c:1605 #, fuzzy msgid "Premium Semigloss Photo Paper" msgstr "Premium Glossy Foto Papier" -#: src/main/escp2-papers.c:1375 src/main/escp2-papers.c:1419 -#: src/main/escp2-papers.c:1467 src/main/escp2-papers.c:1515 -#: src/main/escp2-papers.c:1559 src/main/escp2-papers.c:1607 +#: src/main/escp2-papers.c:1385 src/main/escp2-papers.c:1429 +#: src/main/escp2-papers.c:1477 src/main/escp2-papers.c:1525 +#: src/main/escp2-papers.c:1569 src/main/escp2-papers.c:1617 #, fuzzy msgid "ColorLife Paper" msgstr "Normalpapier" -#: src/main/escp2-papers.c:1459 src/main/escp2-papers.c:1507 -#: src/main/escp2-papers.c:1599 +#: src/main/escp2-papers.c:1469 src/main/escp2-papers.c:1517 +#: src/main/escp2-papers.c:1609 #, fuzzy msgid "Archival Matte Paper" msgstr "Mattes Papier" -#: src/main/escp2-papers.c:1461 src/main/escp2-papers.c:1509 -#: src/main/escp2-papers.c:1601 +#: src/main/escp2-papers.c:1471 src/main/escp2-papers.c:1519 +#: src/main/escp2-papers.c:1611 msgid "Watercolor Paper - Radiant White" msgstr "" -#: src/main/escp2-papers.c:1716 src/main/escp2-papers.c:1842 -#: src/main/escp2-papers.c:1884 src/main/escp2-papers.c:1926 -#: src/main/escp2-papers.c:2001 +#: src/main/escp2-papers.c:1727 src/main/escp2-papers.c:1853 +#: src/main/escp2-papers.c:1895 src/main/escp2-papers.c:1937 +#: src/main/escp2-papers.c:2012 msgid "Roll Feed" msgstr "Vorschub" -#: src/main/escp2-papers.c:1740 src/main/escp2-papers.c:1791 +#: src/main/escp2-papers.c:1751 src/main/escp2-papers.c:1802 msgid "Roll Feed (cut each page)" msgstr "" -#: src/main/escp2-papers.c:1749 src/main/escp2-papers.c:1800 +#: src/main/escp2-papers.c:1760 src/main/escp2-papers.c:1811 msgid "Roll Feed (do not cut)" msgstr "" -#: src/main/escp2-papers.c:1773 src/main/escp2-papers.c:1824 +#: src/main/escp2-papers.c:1784 src/main/escp2-papers.c:1835 #, fuzzy msgid "Manual Feed" msgstr "Manuell" -#: src/main/escp2-papers.c:1782 src/main/escp2-papers.c:1833 -#: src/main/escp2-papers.c:1935 src/main/escp2-papers.c:1968 +#: src/main/escp2-papers.c:1793 src/main/escp2-papers.c:1844 +#: src/main/escp2-papers.c:1946 src/main/escp2-papers.c:1979 #, fuzzy msgid "Print to CD" msgstr "Drucke in Datei?" -#: src/main/escp2-papers.c:1866 src/main/escp2-papers.c:1908 +#: src/main/escp2-papers.c:1877 src/main/escp2-papers.c:1919 #, fuzzy msgid "Manual Sheet Guide" msgstr "Manuell" -#: src/main/escp2-papers.c:1875 src/main/escp2-papers.c:1917 +#: src/main/escp2-papers.c:1886 src/main/escp2-papers.c:1928 #, fuzzy msgid "Manual Feed (Front)" msgstr "Manuell" -#: src/main/escp2-papers.c:1950 +#: src/main/escp2-papers.c:1961 #, fuzzy msgid "Rear Tray" msgstr "Schacht" -#: src/main/escp2-papers.c:1959 +#: src/main/escp2-papers.c:1970 msgid "Front Tray" msgstr "" -#: src/main/escp2-papers.c:1977 +#: src/main/escp2-papers.c:1988 #, fuzzy msgid "Photo Board" msgstr "Foto Papier" -#: src/main/escp2-papers.c:2016 +#: src/main/escp2-papers.c:2027 msgid "Cut Sheet Bin 1" msgstr "" -#: src/main/escp2-papers.c:2025 +#: src/main/escp2-papers.c:2036 msgid "Cut Sheet Bin 2" msgstr "" -#: src/main/escp2-papers.c:2034 +#: src/main/escp2-papers.c:2045 #, fuzzy msgid "Cut Sheet Autoselect" msgstr "autom. Auswahl" -#: src/main/escp2-papers.c:2043 +#: src/main/escp2-papers.c:2054 msgid "Manual Selection" msgstr "" @@ -2049,7 +2217,7 @@ msgstr "" #: 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 "600×600 DPI monochrome" #: src/main/escp2-resolutions.c:47 src/main/escp2-resolutions.c:50 msgid "180 DPI Economy" @@ -2058,17 +2226,17 @@ msgstr "" #: src/main/escp2-resolutions.c:54 src/main/escp2-resolutions.c:57 #, fuzzy msgid "360 x 180 DPI Draft" -msgstr "150×150 DPI" +msgstr "150×150 DPI" #: src/main/escp2-resolutions.c:61 src/main/escp2-resolutions.c:64 #, fuzzy msgid "360 x 240 DPI Draft" -msgstr "600×600 DPI" +msgstr "600×600 DPI" #: src/main/escp2-resolutions.c:68 #, fuzzy msgid "360 DPI High Quality" -msgstr "600 DPI hohe Qualität" +msgstr "600 DPI hohe Qualität" #: src/main/escp2-resolutions.c:71 src/main/escp2-resolutions.c:74 #: src/main/escp2-resolutions.c:77 @@ -2094,12 +2262,12 @@ msgstr "1200 DPI" #: src/main/escp2-resolutions.c:97 src/main/escp2-resolutions.c:100 #, fuzzy msgid "720 DPI High Quality" -msgstr "1200 DPI hohe Qualität" +msgstr "1200 DPI hohe Qualität" #: src/main/escp2-resolutions.c:103 #, fuzzy msgid "720 DPI Highest Quality" -msgstr "1200 DPI höchste Qualität" +msgstr "1200 DPI höchste Qualität" #: src/main/escp2-resolutions.c:106 #, fuzzy @@ -2115,7 +2283,7 @@ msgstr "1440 x 720 DPI" #: src/main/escp2-resolutions.c:116 #, fuzzy msgid "1440 x 720 DPI Highest Quality" -msgstr "1200 DPI höchste Qualität" +msgstr "1200 DPI höchste Qualität" #: src/main/escp2-resolutions.c:119 src/main/escp2-resolutions.c:122 #, fuzzy @@ -2130,7 +2298,7 @@ msgstr "2880 x 720 DPI" #: src/main/escp2-resolutions.c:135 #, fuzzy msgid "2880 x 720 DPI Highest Quality" -msgstr "1200 DPI höchste Qualität" +msgstr "1200 DPI höchste Qualität" #: src/main/escp2-resolutions.c:139 src/main/escp2-resolutions.c:142 #: src/main/escp2-resolutions.c:145 @@ -2200,46 +2368,52 @@ msgid "Eight Pass" msgstr "Helligkeit:" #: src/main/escp2-resolutions.c:637 src/main/escp2-resolutions.c:652 -#: src/main/generic-options.c:33 +#: src/main/escp2-resolutions.c:667 src/main/generic-options.c:33 msgid "Fast Economy" msgstr "" #: src/main/escp2-resolutions.c:638 src/main/escp2-resolutions.c:653 -#: src/main/generic-options.c:34 +#: src/main/escp2-resolutions.c:668 src/main/generic-options.c:34 msgid "Economy" msgstr "" #: src/main/escp2-resolutions.c:639 src/main/escp2-resolutions.c:654 -#: src/main/escp2-resolutions.c:667 src/main/generic-options.c:35 +#: src/main/escp2-resolutions.c:669 src/main/escp2-resolutions.c:682 +#: src/main/generic-options.c:35 msgid "Draft" msgstr "" #: src/main/escp2-resolutions.c:641 src/main/escp2-resolutions.c:656 -#: src/main/escp2-resolutions.c:670 src/main/generic-options.c:37 +#: src/main/escp2-resolutions.c:671 src/main/escp2-resolutions.c:685 +#: src/main/generic-options.c:37 #, fuzzy msgid "High" -msgstr "Höhe:" +msgstr "Höhe:" #: src/main/escp2-resolutions.c:642 src/main/escp2-resolutions.c:657 -#: src/main/escp2-resolutions.c:669 src/main/generic-options.c:38 +#: src/main/escp2-resolutions.c:672 src/main/escp2-resolutions.c:684 +#: src/main/generic-options.c:38 #, fuzzy msgid "Photo" msgstr "Foto" #: src/main/escp2-resolutions.c:643 src/main/escp2-resolutions.c:658 -#: src/main/escp2-resolutions.c:671 src/main/generic-options.c:39 +#: src/main/escp2-resolutions.c:673 src/main/escp2-resolutions.c:686 +#: src/main/generic-options.c:39 #, fuzzy msgid "Super Photo" msgstr "Sieben Farb Foto" #: src/main/escp2-resolutions.c:644 src/main/escp2-resolutions.c:659 -#: src/main/escp2-resolutions.c:672 src/main/generic-options.c:40 +#: src/main/escp2-resolutions.c:674 src/main/escp2-resolutions.c:687 +#: src/main/generic-options.c:40 #, fuzzy msgid "Ultra Photo" msgstr "Sechs Farben Foto" #: src/main/escp2-resolutions.c:645 src/main/escp2-resolutions.c:660 -#: src/main/escp2-resolutions.c:673 src/main/generic-options.c:41 +#: src/main/escp2-resolutions.c:675 src/main/escp2-resolutions.c:688 +#: src/main/generic-options.c:41 msgid "Best" msgstr "" @@ -2267,7 +2441,7 @@ msgstr "Strichzeichnung" #: src/main/generic-options.c:55 #, fuzzy msgid "Page" -msgstr "Größe" +msgstr "Größe" #: src/main/generic-options.c:56 msgid "Job" @@ -2294,12 +2468,12 @@ msgstr "" #: src/main/generic-options.c:80 #, fuzzy msgid "Page Number" -msgstr "Größe" +msgstr "Größe" #: src/main/generic-options.c:81 #, fuzzy msgid "Page number" -msgstr "Größe" +msgstr "Größe" #: src/main/xmli18n-tmp.h:1 msgid "Letter" @@ -2319,4162 +2493,4402 @@ msgstr "Executive" #: src/main/xmli18n-tmp.h:9 msgid "3x5" -msgstr "3×5" +msgstr "3×5" #: src/main/xmli18n-tmp.h:10 -msgid "4x6" -msgstr "4×6" +msgid "3 1/2 x5" +msgstr "" #: src/main/xmli18n-tmp.h:11 +msgid "4x6" +msgstr "4×6" + +#: src/main/xmli18n-tmp.h:12 #, fuzzy msgid "Epson 4x6 Photo Paper (tear-off borders)" -msgstr "Epson 4×6 Photo Paper" +msgstr "Epson 4×6 Photo Paper" -#: src/main/xmli18n-tmp.h:12 +#: src/main/xmli18n-tmp.h:13 msgid "5x7" -msgstr "5×7" +msgstr "5×7" -#: src/main/xmli18n-tmp.h:13 +#: src/main/xmli18n-tmp.h:14 msgid "5x8" -msgstr "5×8" +msgstr "5×8" -#: src/main/xmli18n-tmp.h:14 +#: src/main/xmli18n-tmp.h:15 msgid "6x8" -msgstr "6×8" +msgstr "6×8" -#: src/main/xmli18n-tmp.h:15 +#: src/main/xmli18n-tmp.h:16 msgid "8x10" -msgstr "8×10" +msgstr "8×10" -#: src/main/xmli18n-tmp.h:17 +#: src/main/xmli18n-tmp.h:18 msgid "12x18" -msgstr "12×18" +msgstr "12×18" -#: src/main/xmli18n-tmp.h:18 +#: src/main/xmli18n-tmp.h:19 msgid "Super B 13x19" -msgstr "Super B 13×19" +msgstr "Super B 13×19" -#: src/main/xmli18n-tmp.h:19 +#: src/main/xmli18n-tmp.h:20 msgid "Engineering C 17x22" msgstr "" -#: src/main/xmli18n-tmp.h:20 +#: src/main/xmli18n-tmp.h:21 msgid "8x12" -msgstr "8×12" +msgstr "8×12" -#: src/main/xmli18n-tmp.h:21 +#: src/main/xmli18n-tmp.h:22 msgid "11x14" -msgstr "11×14" +msgstr "11×14" -#: src/main/xmli18n-tmp.h:22 +#: src/main/xmli18n-tmp.h:23 msgid "16x20" -msgstr "16×20" +msgstr "16×20" -#: src/main/xmli18n-tmp.h:23 +#: src/main/xmli18n-tmp.h:24 msgid "16x24" -msgstr "16×24" +msgstr "16×24" -#: src/main/xmli18n-tmp.h:24 +#: src/main/xmli18n-tmp.h:25 msgid "20x24" -msgstr "20×24" +msgstr "20×24" -#: src/main/xmli18n-tmp.h:25 +#: src/main/xmli18n-tmp.h:26 msgid "20x30" -msgstr "20×30" +msgstr "20×30" -#: src/main/xmli18n-tmp.h:26 +#: src/main/xmli18n-tmp.h:27 #, fuzzy msgid "22x30" -msgstr "20×30" +msgstr "20×30" -#: src/main/xmli18n-tmp.h:27 +#: src/main/xmli18n-tmp.h:28 msgid "24x30" -msgstr "24×30" +msgstr "24×30" -#: src/main/xmli18n-tmp.h:28 +#: src/main/xmli18n-tmp.h:29 msgid "Super A1 24x36" msgstr "" -#: src/main/xmli18n-tmp.h:29 +#: src/main/xmli18n-tmp.h:30 msgid "30x40" -msgstr "30×40" +msgstr "30×40" -#: src/main/xmli18n-tmp.h:30 +#: src/main/xmli18n-tmp.h:31 msgid "4A" msgstr "4A" -#: src/main/xmli18n-tmp.h:31 +#: src/main/xmli18n-tmp.h:32 msgid "2A" msgstr "2A" -#: src/main/xmli18n-tmp.h:32 +#: src/main/xmli18n-tmp.h:33 #, fuzzy msgid "Super A0" msgstr "Sieben Farb Foto" -#: src/main/xmli18n-tmp.h:33 +#: src/main/xmli18n-tmp.h:34 msgid "A0" msgstr "A0" -#: src/main/xmli18n-tmp.h:34 +#: src/main/xmli18n-tmp.h:35 msgid "A1" msgstr "A1" -#: src/main/xmli18n-tmp.h:35 +#: src/main/xmli18n-tmp.h:36 msgid "A2" msgstr "A2" -#: src/main/xmli18n-tmp.h:36 +#: src/main/xmli18n-tmp.h:37 msgid "A3" msgstr "A3" -#: src/main/xmli18n-tmp.h:37 +#: src/main/xmli18n-tmp.h:38 msgid "A4" msgstr "A4" -#: src/main/xmli18n-tmp.h:38 +#: src/main/xmli18n-tmp.h:39 msgid "A5" msgstr "A5" -#: src/main/xmli18n-tmp.h:39 +#: src/main/xmli18n-tmp.h:40 msgid "A6" msgstr "A6" -#: src/main/xmli18n-tmp.h:40 +#: src/main/xmli18n-tmp.h:41 msgid "A7" msgstr "A7" -#: src/main/xmli18n-tmp.h:41 +#: src/main/xmli18n-tmp.h:42 msgid "A8" msgstr "A8" -#: src/main/xmli18n-tmp.h:42 +#: src/main/xmli18n-tmp.h:43 msgid "A9" msgstr "A9" -#: src/main/xmli18n-tmp.h:43 +#: src/main/xmli18n-tmp.h:44 msgid "A10" msgstr "A10" -#: src/main/xmli18n-tmp.h:44 +#: src/main/xmli18n-tmp.h:45 msgid "RA0" msgstr "RA0" -#: src/main/xmli18n-tmp.h:45 +#: src/main/xmli18n-tmp.h:46 msgid "RA1" msgstr "RA1" -#: src/main/xmli18n-tmp.h:46 +#: src/main/xmli18n-tmp.h:47 msgid "RA2" msgstr "RA2" -#: src/main/xmli18n-tmp.h:47 +#: src/main/xmli18n-tmp.h:48 msgid "RA3" msgstr "RA3" -#: src/main/xmli18n-tmp.h:48 +#: src/main/xmli18n-tmp.h:49 msgid "RA4" msgstr "RA4" -#: src/main/xmli18n-tmp.h:49 +#: src/main/xmli18n-tmp.h:50 msgid "SRA0" msgstr "SRA0" -#: src/main/xmli18n-tmp.h:50 +#: src/main/xmli18n-tmp.h:51 msgid "SRA1" msgstr "SRA1" -#: src/main/xmli18n-tmp.h:51 +#: src/main/xmli18n-tmp.h:52 msgid "SRA2" msgstr "SRA2" -#: src/main/xmli18n-tmp.h:52 +#: src/main/xmli18n-tmp.h:53 msgid "SRA3" msgstr "SRA3" -#: src/main/xmli18n-tmp.h:53 +#: src/main/xmli18n-tmp.h:54 msgid "SRA4" msgstr "SRA4" -#: src/main/xmli18n-tmp.h:54 +#: src/main/xmli18n-tmp.h:55 msgid "4B ISO" msgstr "4B ISO" -#: src/main/xmli18n-tmp.h:55 +#: src/main/xmli18n-tmp.h:56 msgid "2B ISO" msgstr "2B ISO" -#: src/main/xmli18n-tmp.h:56 +#: src/main/xmli18n-tmp.h:57 msgid "B0 ISO" msgstr "B0 ISO" -#: src/main/xmli18n-tmp.h:57 +#: src/main/xmli18n-tmp.h:58 msgid "B1 ISO" msgstr "B1 ISO" -#: src/main/xmli18n-tmp.h:58 +#: src/main/xmli18n-tmp.h:59 msgid "B2 ISO" msgstr "B2 ISO" -#: src/main/xmli18n-tmp.h:59 +#: src/main/xmli18n-tmp.h:60 msgid "B3 ISO" msgstr "B3 ISO" -#: src/main/xmli18n-tmp.h:60 +#: src/main/xmli18n-tmp.h:61 msgid "B4 ISO" msgstr "B4 ISO" -#: src/main/xmli18n-tmp.h:61 +#: src/main/xmli18n-tmp.h:62 msgid "B5 ISO" msgstr "B5 ISO" -#: src/main/xmli18n-tmp.h:62 +#: src/main/xmli18n-tmp.h:63 msgid "B6 ISO" msgstr "B6 ISO" -#: src/main/xmli18n-tmp.h:63 +#: src/main/xmli18n-tmp.h:64 msgid "B7 ISO" msgstr "B7 ISO" -#: src/main/xmli18n-tmp.h:64 +#: src/main/xmli18n-tmp.h:65 msgid "B8 ISO" msgstr "B8 ISO" -#: src/main/xmli18n-tmp.h:65 +#: src/main/xmli18n-tmp.h:66 msgid "B9 ISO" msgstr "B9 ISO" -#: src/main/xmli18n-tmp.h:66 +#: src/main/xmli18n-tmp.h:67 msgid "B10 ISO" msgstr "B10 ISO" -#: src/main/xmli18n-tmp.h:67 +#: src/main/xmli18n-tmp.h:68 #, fuzzy msgid "Super B0 JIS" msgstr "B0 JIS" -#: src/main/xmli18n-tmp.h:68 +#: src/main/xmli18n-tmp.h:69 msgid "B0 JIS" msgstr "B0 JIS" -#: src/main/xmli18n-tmp.h:69 +#: src/main/xmli18n-tmp.h:70 msgid "B1 JIS" msgstr "B1 JIS" -#: src/main/xmli18n-tmp.h:70 +#: src/main/xmli18n-tmp.h:71 msgid "B2 JIS" msgstr "B2 JIS" -#: src/main/xmli18n-tmp.h:71 +#: src/main/xmli18n-tmp.h:72 msgid "B3 JIS" msgstr "B3 JIS" -#: src/main/xmli18n-tmp.h:72 +#: src/main/xmli18n-tmp.h:73 msgid "B4 JIS" msgstr "B4 JIS" -#: src/main/xmli18n-tmp.h:73 +#: src/main/xmli18n-tmp.h:74 msgid "B5 JIS" msgstr "B5 JIS" -#: src/main/xmli18n-tmp.h:74 +#: src/main/xmli18n-tmp.h:75 msgid "B6 JIS" msgstr "B6 JIS" -#: src/main/xmli18n-tmp.h:75 +#: src/main/xmli18n-tmp.h:76 msgid "B7 JIS" msgstr "B7 JIS" -#: src/main/xmli18n-tmp.h:76 +#: src/main/xmli18n-tmp.h:77 msgid "B8 JIS" msgstr "B8 JIS" -#: src/main/xmli18n-tmp.h:77 +#: src/main/xmli18n-tmp.h:78 msgid "B9 JIS" msgstr "B9 JIS" -#: src/main/xmli18n-tmp.h:78 +#: src/main/xmli18n-tmp.h:79 msgid "B10 JIS" msgstr "B10 JIS" -#: src/main/xmli18n-tmp.h:79 +#: src/main/xmli18n-tmp.h:80 msgid "C0" msgstr "C0" -#: src/main/xmli18n-tmp.h:80 +#: src/main/xmli18n-tmp.h:81 +#, fuzzy +msgid "C0 landscape" +msgstr "Querformat" + +#: src/main/xmli18n-tmp.h:82 msgid "C1" msgstr "C1" -#: src/main/xmli18n-tmp.h:81 +#: src/main/xmli18n-tmp.h:83 +#, fuzzy +msgid "C1 landscape" +msgstr "Querformat" + +#: src/main/xmli18n-tmp.h:84 msgid "C2" msgstr "C2" -#: src/main/xmli18n-tmp.h:82 +#: src/main/xmli18n-tmp.h:85 +#, fuzzy +msgid "C2 landscape" +msgstr "Querformat" + +#: src/main/xmli18n-tmp.h:86 msgid "C3" msgstr "C3" -#: src/main/xmli18n-tmp.h:83 +#: src/main/xmli18n-tmp.h:87 +#, fuzzy +msgid "C3 landscape" +msgstr "Querformat" + +#: src/main/xmli18n-tmp.h:88 msgid "C4" msgstr "C4" -#: src/main/xmli18n-tmp.h:84 +#: src/main/xmli18n-tmp.h:89 +#, fuzzy +msgid "C4 landscape" +msgstr "Querformat" + +#: src/main/xmli18n-tmp.h:90 msgid "C5" msgstr "C5" -#: src/main/xmli18n-tmp.h:85 +#: src/main/xmli18n-tmp.h:91 +#, fuzzy +msgid "C5 landscape" +msgstr "Querformat" + +#: src/main/xmli18n-tmp.h:92 msgid "B6-C4" msgstr "B6-C4" -#: src/main/xmli18n-tmp.h:86 +#: src/main/xmli18n-tmp.h:93 +#, fuzzy +msgid "B6-C4 landscape" +msgstr "Querformat" + +#: src/main/xmli18n-tmp.h:94 msgid "C6" msgstr "C6" -#: src/main/xmli18n-tmp.h:87 +#: src/main/xmli18n-tmp.h:95 +#, fuzzy +msgid "C6 landscape" +msgstr "Querformat" + +#: src/main/xmli18n-tmp.h:96 msgid "DL" msgstr "DL" -#: src/main/xmli18n-tmp.h:88 +#: src/main/xmli18n-tmp.h:97 +#, fuzzy +msgid "DL landscape" +msgstr "Querformat" + +#: src/main/xmli18n-tmp.h:98 msgid "C7-6" msgstr "C7-6" -#: src/main/xmli18n-tmp.h:89 +#: src/main/xmli18n-tmp.h:99 +#, fuzzy +msgid "C7-6 landscape" +msgstr "Querformat" + +#: src/main/xmli18n-tmp.h:100 msgid "C7" msgstr "C7" -#: src/main/xmli18n-tmp.h:90 +#: src/main/xmli18n-tmp.h:101 +#, fuzzy +msgid "C7 landscape" +msgstr "Querformat" + +#: src/main/xmli18n-tmp.h:102 msgid "C8" msgstr "C8" -#: src/main/xmli18n-tmp.h:91 +#: src/main/xmli18n-tmp.h:103 +#, fuzzy +msgid "C8 landscape" +msgstr "Querformat" + +#: src/main/xmli18n-tmp.h:104 msgid "C9" msgstr "C9" -#: src/main/xmli18n-tmp.h:92 +#: src/main/xmli18n-tmp.h:105 +#, fuzzy +msgid "C9 landscape" +msgstr "Querformat" + +#: src/main/xmli18n-tmp.h:106 msgid "C10" msgstr "C10" -#: src/main/xmli18n-tmp.h:93 +#: src/main/xmli18n-tmp.h:107 +#, fuzzy +msgid "C10 landscape" +msgstr "Querformat" + +#: src/main/xmli18n-tmp.h:108 msgid "ArchA" msgstr "ArchA" -#: src/main/xmli18n-tmp.h:94 +#: src/main/xmli18n-tmp.h:109 msgid "ArchA transposed" msgstr "" -#: src/main/xmli18n-tmp.h:95 +#: src/main/xmli18n-tmp.h:110 msgid "ArchB" msgstr "ArchB" -#: src/main/xmli18n-tmp.h:96 +#: src/main/xmli18n-tmp.h:111 msgid "ArchB transposed" msgstr "" -#: src/main/xmli18n-tmp.h:97 +#: src/main/xmli18n-tmp.h:112 msgid "ArchC" msgstr "ArchC" -#: src/main/xmli18n-tmp.h:98 +#: src/main/xmli18n-tmp.h:113 msgid "ArchC transposed" msgstr "" -#: src/main/xmli18n-tmp.h:99 +#: src/main/xmli18n-tmp.h:114 msgid "ArchD" msgstr "ArchD" -#: src/main/xmli18n-tmp.h:100 +#: src/main/xmli18n-tmp.h:115 msgid "ArchD transposed" msgstr "" -#: src/main/xmli18n-tmp.h:101 +#: src/main/xmli18n-tmp.h:116 msgid "ArchE" msgstr "ArchE" -#: src/main/xmli18n-tmp.h:102 +#: src/main/xmli18n-tmp.h:117 msgid "ArchE transposed" msgstr "" -#: src/main/xmli18n-tmp.h:103 +#: src/main/xmli18n-tmp.h:118 msgid "American foolscap" -msgstr "Amerikan. Narrenmütze" +msgstr "Amerikan. Narrenmütze" -#: src/main/xmli18n-tmp.h:104 +#: src/main/xmli18n-tmp.h:119 msgid "European foolscap" -msgstr "Europäische Narrenmütze" +msgstr "Europäische Narrenmütze" -#: src/main/xmli18n-tmp.h:105 +#: src/main/xmli18n-tmp.h:120 msgid "Crown Quarto" msgstr "" -#: src/main/xmli18n-tmp.h:106 +#: src/main/xmli18n-tmp.h:121 msgid "Large Crown Quarto" msgstr "" -#: src/main/xmli18n-tmp.h:107 +#: src/main/xmli18n-tmp.h:122 msgid "Demy Quarto" msgstr "" -#: src/main/xmli18n-tmp.h:108 +#: src/main/xmli18n-tmp.h:123 msgid "Royal Quarto" msgstr "" -#: src/main/xmli18n-tmp.h:109 +#: src/main/xmli18n-tmp.h:124 #, fuzzy msgid "ISO A4" msgstr "SRA4" -#: src/main/xmli18n-tmp.h:110 +#: src/main/xmli18n-tmp.h:125 msgid "Crown Octavo" msgstr "" -#: src/main/xmli18n-tmp.h:111 +#: src/main/xmli18n-tmp.h:126 msgid "Large Crown Octavo" msgstr "" -#: src/main/xmli18n-tmp.h:112 +#: src/main/xmli18n-tmp.h:127 msgid "Demy Octavo" msgstr "" -#: src/main/xmli18n-tmp.h:113 +#: src/main/xmli18n-tmp.h:128 msgid "Royal Octavo" msgstr "" -#: src/main/xmli18n-tmp.h:114 +#: src/main/xmli18n-tmp.h:129 msgid "ISO A5" msgstr "" -#: src/main/xmli18n-tmp.h:115 +#: src/main/xmli18n-tmp.h:130 msgid "Small paperback" msgstr "" -#: src/main/xmli18n-tmp.h:116 +#: src/main/xmli18n-tmp.h:131 msgid "Penguin small paperback" msgstr "" -#: src/main/xmli18n-tmp.h:117 +#: src/main/xmli18n-tmp.h:132 msgid "Penguin large paperback" msgstr "" -#: src/main/xmli18n-tmp.h:118 +#: src/main/xmli18n-tmp.h:133 msgid "10cm x 15cm" msgstr "" -#: src/main/xmli18n-tmp.h:119 +#: src/main/xmli18n-tmp.h:134 msgid "Hagaki Card" msgstr "Hagaki Card" -#: src/main/xmli18n-tmp.h:120 +#: src/main/xmli18n-tmp.h:135 msgid "Oufuku Card" msgstr "Oufuku Card" -#: src/main/xmli18n-tmp.h:121 +#: src/main/xmli18n-tmp.h:136 msgid "Japanese long envelope #3" msgstr "Japanese langer Umschlag #3" -#: src/main/xmli18n-tmp.h:122 +#: src/main/xmli18n-tmp.h:137 +#, fuzzy +msgid "Japanese long envelope #3 landscape" +msgstr "Japanese langer Umschlag #3" + +#: src/main/xmli18n-tmp.h:138 msgid "Japanese long envelope #4" msgstr "Japanese langer Umschlag #4" -#: src/main/xmli18n-tmp.h:123 +#: src/main/xmli18n-tmp.h:139 +#, fuzzy +msgid "Japanese long envelope #4 landscape" +msgstr "Japanese langer Umschlag #4" + +#: src/main/xmli18n-tmp.h:140 #, fuzzy msgid "Japanese Kaku envelope #4" msgstr "Japanese langer Umschlag #4" -#: src/main/xmli18n-tmp.h:124 +#: src/main/xmli18n-tmp.h:141 +#, fuzzy +msgid "Japanese Kaku envelope #4 landscape" +msgstr "Japanese langer Umschlag #4" + +#: src/main/xmli18n-tmp.h:142 msgid "Commercial 10" msgstr "Commercial 10" -#: src/main/xmli18n-tmp.h:125 +#: src/main/xmli18n-tmp.h:143 +#, fuzzy +msgid "Commercial 10 landscape" +msgstr "Commercial 10" + +#: src/main/xmli18n-tmp.h:144 msgid "A2 Invitation" msgstr "A2 Invitation" -#: src/main/xmli18n-tmp.h:126 +#: src/main/xmli18n-tmp.h:145 msgid "Monarch Envelope" msgstr "Briefumschlag (Monarch)" -#: src/main/xmli18n-tmp.h:127 -msgid "4x5 3/8" -msgstr "" - -#: src/main/xmli18n-tmp.h:128 +#: src/main/xmli18n-tmp.h:146 +#, fuzzy +msgid "Monarch Envelope landscape" +msgstr "Briefumschlag (Monarch)" + +#: src/main/xmli18n-tmp.h:147 +msgid "4x5 3/8" +msgstr "" + +#: src/main/xmli18n-tmp.h:148 #, fuzzy msgid "4x7" -msgstr "5×7" +msgstr "5×7" -#: src/main/xmli18n-tmp.h:129 +#: src/main/xmli18n-tmp.h:149 msgid "CP_L" msgstr "" -#: src/main/xmli18n-tmp.h:130 +#: src/main/xmli18n-tmp.h:150 msgid "Card" msgstr "" -#: src/main/xmli18n-tmp.h:131 +#: src/main/xmli18n-tmp.h:151 #, fuzzy msgid "Wide Postcard" msgstr "Postkarte" -#: src/main/xmli18n-tmp.h:132 +#: src/main/xmli18n-tmp.h:152 msgid "Chilean Office" msgstr "" -#: src/main/xmli18n-tmp.h:133 +#: src/main/xmli18n-tmp.h:153 msgid "Chilean Double Letter" msgstr "" -#: src/main/xmli18n-tmp.h:134 +#: src/main/xmli18n-tmp.h:154 msgid "Chilean Double Office" msgstr "" -#: src/main/xmli18n-tmp.h:135 +#: src/main/xmli18n-tmp.h:155 #, fuzzy msgid "Custom" msgstr "Auto" -#: src/main/xmli18n-tmp.h:136 +#: src/main/xmli18n-tmp.h:156 msgid "89 mm Roll Paper" msgstr "89 mm Endlospapier" -#: src/main/xmli18n-tmp.h:137 +#: src/main/xmli18n-tmp.h:157 msgid "4 Inch Roll Paper" msgstr "4 Inch Endlospapier" -#: src/main/xmli18n-tmp.h:138 +#: src/main/xmli18n-tmp.h:158 msgid "5 Inch Roll Paper" msgstr "5 Inch Endlospapier" -#: src/main/xmli18n-tmp.h:139 +#: src/main/xmli18n-tmp.h:159 msgid "210 mm Roll Paper" msgstr "210 mm Endlospapier" -#: src/main/xmli18n-tmp.h:140 +#: src/main/xmli18n-tmp.h:160 msgid "13 Inch Roll Paper" msgstr "13 Zoll Endlospapier" -#: src/main/xmli18n-tmp.h:141 +#: src/main/xmli18n-tmp.h:161 msgid "22 Inch Roll Paper" msgstr "22 Zoll Endlospapier" -#: src/main/xmli18n-tmp.h:142 +#: src/main/xmli18n-tmp.h:162 msgid "24 Inch Roll Paper" msgstr "24 Zoll Endlospapier" -#: src/main/xmli18n-tmp.h:143 +#: src/main/xmli18n-tmp.h:163 msgid "36 Inch Roll Paper" msgstr "36 Zoll Endlospapier" -#: src/main/xmli18n-tmp.h:144 +#: src/main/xmli18n-tmp.h:164 msgid "44 Inch Roll Paper" msgstr "44 Zoll Endlospapier" -#: src/main/xmli18n-tmp.h:145 +#: src/main/xmli18n-tmp.h:165 msgid "PostScript Level 1" msgstr "" -#: src/main/xmli18n-tmp.h:146 +#: src/main/xmli18n-tmp.h:166 msgid "PostScript Level 2" msgstr "" -#: src/main/xmli18n-tmp.h:147 +#: src/main/xmli18n-tmp.h:167 msgid "Canon BJ-30" msgstr "" -#: src/main/xmli18n-tmp.h:148 +#: src/main/xmli18n-tmp.h:168 msgid "Canon BJC-50" msgstr "" -#: src/main/xmli18n-tmp.h:149 +#: src/main/xmli18n-tmp.h:169 msgid "Canon BJC-55" msgstr "" -#: src/main/xmli18n-tmp.h:150 +#: src/main/xmli18n-tmp.h:170 msgid "Canon BJC-80" msgstr "" -#: src/main/xmli18n-tmp.h:151 +#: src/main/xmli18n-tmp.h:171 msgid "Canon BJC-85" msgstr "" -#: src/main/xmli18n-tmp.h:152 +#: src/main/xmli18n-tmp.h:172 msgid "Canon BJC-210" msgstr "" -#: src/main/xmli18n-tmp.h:153 +#: src/main/xmli18n-tmp.h:173 msgid "Canon BJC-240" msgstr "" -#: src/main/xmli18n-tmp.h:154 +#: src/main/xmli18n-tmp.h:174 msgid "Canon BJC-250" msgstr "" -#: src/main/xmli18n-tmp.h:155 +#: src/main/xmli18n-tmp.h:175 msgid "Canon BJC-1000" msgstr "" -#: src/main/xmli18n-tmp.h:156 +#: src/main/xmli18n-tmp.h:176 msgid "Canon BJC-2000" msgstr "" -#: src/main/xmli18n-tmp.h:157 +#: src/main/xmli18n-tmp.h:177 msgid "Canon BJC-2010" msgstr "" -#: src/main/xmli18n-tmp.h:158 +#: src/main/xmli18n-tmp.h:178 msgid "Canon BJC-2100" msgstr "" -#: src/main/xmli18n-tmp.h:159 +#: src/main/xmli18n-tmp.h:179 msgid "Canon BJC-2110" msgstr "" -#: src/main/xmli18n-tmp.h:160 +#: src/main/xmli18n-tmp.h:180 msgid "Canon BJC-3000" msgstr "" -#: src/main/xmli18n-tmp.h:161 +#: src/main/xmli18n-tmp.h:181 msgid "Canon BJC-4000" msgstr "" -#: src/main/xmli18n-tmp.h:162 +#: src/main/xmli18n-tmp.h:182 msgid "Canon BJC-4300" msgstr "" -#: src/main/xmli18n-tmp.h:163 +#: src/main/xmli18n-tmp.h:183 msgid "Canon BJC-4400" msgstr "" -#: src/main/xmli18n-tmp.h:164 +#: src/main/xmli18n-tmp.h:184 msgid "Canon BJC-5100" msgstr "" -#: src/main/xmli18n-tmp.h:165 +#: src/main/xmli18n-tmp.h:185 msgid "Canon BJC-5500" msgstr "" -#: src/main/xmli18n-tmp.h:166 +#: src/main/xmli18n-tmp.h:186 msgid "Canon BJC-6000" msgstr "" -#: src/main/xmli18n-tmp.h:167 +#: src/main/xmli18n-tmp.h:187 msgid "Canon BJC-6100" msgstr "" -#: src/main/xmli18n-tmp.h:168 +#: src/main/xmli18n-tmp.h:188 msgid "Canon BJC-6200" msgstr "" -#: src/main/xmli18n-tmp.h:169 +#: src/main/xmli18n-tmp.h:189 msgid "Canon BJC-6500" msgstr "" -#: src/main/xmli18n-tmp.h:170 +#: src/main/xmli18n-tmp.h:190 msgid "Canon BJC-7000" msgstr "" -#: src/main/xmli18n-tmp.h:171 +#: src/main/xmli18n-tmp.h:191 msgid "Canon BJC-7100" msgstr "" -#: src/main/xmli18n-tmp.h:172 +#: src/main/xmli18n-tmp.h:192 msgid "Canon BJC-8200" msgstr "" -#: src/main/xmli18n-tmp.h:173 +#: src/main/xmli18n-tmp.h:193 msgid "Canon BJC-8500" msgstr "" -#: src/main/xmli18n-tmp.h:174 +#: src/main/xmli18n-tmp.h:194 msgid "Canon S100" msgstr "" -#: src/main/xmli18n-tmp.h:175 +#: src/main/xmli18n-tmp.h:195 msgid "Canon S200" msgstr "" -#: src/main/xmli18n-tmp.h:176 +#: src/main/xmli18n-tmp.h:196 msgid "Canon S300" msgstr "" -#: src/main/xmli18n-tmp.h:177 +#: src/main/xmli18n-tmp.h:197 msgid "Canon S400" msgstr "" -#: src/main/xmli18n-tmp.h:178 +#: src/main/xmli18n-tmp.h:198 msgid "Canon S450" msgstr "" -#: src/main/xmli18n-tmp.h:179 +#: src/main/xmli18n-tmp.h:199 msgid "Canon S500" msgstr "" -#: src/main/xmli18n-tmp.h:180 +#: src/main/xmli18n-tmp.h:200 msgid "Canon S600" msgstr "" -#: src/main/xmli18n-tmp.h:181 +#: src/main/xmli18n-tmp.h:201 msgid "Canon S630" msgstr "" -#: src/main/xmli18n-tmp.h:182 +#: src/main/xmli18n-tmp.h:202 msgid "Canon S800" msgstr "" -#: src/main/xmli18n-tmp.h:183 +#: src/main/xmli18n-tmp.h:203 msgid "Canon S4500" msgstr "" -#: src/main/xmli18n-tmp.h:184 +#: src/main/xmli18n-tmp.h:204 msgid "Canon PIXMA iP2000" msgstr "" -#: src/main/xmli18n-tmp.h:185 +#: src/main/xmli18n-tmp.h:205 msgid "Canon PIXMA iP3000" msgstr "" -#: src/main/xmli18n-tmp.h:186 +#: src/main/xmli18n-tmp.h:206 msgid "Canon PIXMA iP3100" msgstr "" -#: src/main/xmli18n-tmp.h:187 +#: src/main/xmli18n-tmp.h:207 msgid "Canon PIXMA iP4000" msgstr "" -#: src/main/xmli18n-tmp.h:188 +#: src/main/xmli18n-tmp.h:208 msgid "Canon PIXMA iP4100" msgstr "" -#: src/main/xmli18n-tmp.h:189 +#: src/main/xmli18n-tmp.h:209 msgid "Canon PIXMA iP4200" msgstr "" -#: src/main/xmli18n-tmp.h:190 +#: src/main/xmli18n-tmp.h:210 msgid "Canon PIXMA iP4300" msgstr "" -#: src/main/xmli18n-tmp.h:191 -#, fuzzy +#: src/main/xmli18n-tmp.h:211 msgid "Canon PIXMA iP4500" -msgstr "Epson 4×6 Photo Paper" +msgstr "" -#: src/main/xmli18n-tmp.h:192 +#: src/main/xmli18n-tmp.h:212 msgid "Canon PIXMA iP5000" msgstr "" -#: src/main/xmli18n-tmp.h:193 +#: src/main/xmli18n-tmp.h:213 msgid "Canon PIXMA iP5200" msgstr "" -#: src/main/xmli18n-tmp.h:194 +#: src/main/xmli18n-tmp.h:214 msgid "Canon PIXMA iP5300" msgstr "" -#: src/main/xmli18n-tmp.h:195 +#: src/main/xmli18n-tmp.h:215 +msgid "Canon PIXMA iP6000D" +msgstr "" + +#: src/main/xmli18n-tmp.h:216 msgid "Canon PIXMA iP6700" msgstr "" -#: src/main/xmli18n-tmp.h:196 -#, fuzzy +#: src/main/xmli18n-tmp.h:217 msgid "Canon PIXMA iP8500" -msgstr "Epson 4×6 Photo Paper" +msgstr "" -#: src/main/xmli18n-tmp.h:197 +#: src/main/xmli18n-tmp.h:218 msgid "Canon PIXMA iX5000" msgstr "" -#: src/main/xmli18n-tmp.h:198 -#, fuzzy +#: src/main/xmli18n-tmp.h:219 msgid "Canon PIXMA Pro9500" -msgstr "Epson 4×6 Photo Paper" +msgstr "" -#: src/main/xmli18n-tmp.h:199 +#: src/main/xmli18n-tmp.h:220 msgid "Canon PIXMA MP150" msgstr "" -#: src/main/xmli18n-tmp.h:200 +#: src/main/xmli18n-tmp.h:221 msgid "Canon PIXMA MP170" msgstr "" -#: src/main/xmli18n-tmp.h:201 +#: src/main/xmli18n-tmp.h:222 msgid "Canon PIXMA MP180" msgstr "" -#: src/main/xmli18n-tmp.h:202 +#: src/main/xmli18n-tmp.h:223 msgid "Canon PIXMA MP500" msgstr "" -#: src/main/xmli18n-tmp.h:203 -#, fuzzy +#: src/main/xmli18n-tmp.h:224 +msgid "Canon PIXMA MP520" +msgstr "" + +#: src/main/xmli18n-tmp.h:225 msgid "Canon PIXMA MP610" -msgstr "Epson 4×6 Photo Paper" +msgstr "" -#: src/main/xmli18n-tmp.h:204 +#: src/main/xmli18n-tmp.h:226 msgid "Canon PIXMA MP700" msgstr "" -#: src/main/xmli18n-tmp.h:205 +#: src/main/xmli18n-tmp.h:227 msgid "Canon PIXMA MP710" msgstr "" -#: src/main/xmli18n-tmp.h:206 +#: src/main/xmli18n-tmp.h:228 msgid "Canon PIXMA MP730" msgstr "" -#: src/main/xmli18n-tmp.h:207 +#: src/main/xmli18n-tmp.h:229 msgid "Canon PIXMA MP740" msgstr "" -#: src/main/xmli18n-tmp.h:208 +#: src/main/xmli18n-tmp.h:230 msgid "Canon PIXMA MP750" msgstr "" -#: src/main/xmli18n-tmp.h:209 +#: src/main/xmli18n-tmp.h:231 msgid "Canon PIXMA MP760" msgstr "" -#: src/main/xmli18n-tmp.h:210 +#: src/main/xmli18n-tmp.h:232 msgid "Canon PIXMA MP770" msgstr "" -#: src/main/xmli18n-tmp.h:211 +#: src/main/xmli18n-tmp.h:233 msgid "Canon PIXMA MP780" msgstr "" -#: src/main/xmli18n-tmp.h:212 +#: src/main/xmli18n-tmp.h:234 msgid "Canon PIXMA MP790" msgstr "" -#: src/main/xmli18n-tmp.h:213 +#: src/main/xmli18n-tmp.h:235 msgid "Canon PIXMA MP830" msgstr "" -#: src/main/xmli18n-tmp.h:214 +#: src/main/xmli18n-tmp.h:236 msgid "Canon PIXUS iP3100" msgstr "" -#: src/main/xmli18n-tmp.h:215 +#: src/main/xmli18n-tmp.h:237 msgid "Canon PIXUS iP4100" msgstr "" -#: src/main/xmli18n-tmp.h:216 +#: src/main/xmli18n-tmp.h:238 msgid "Canon i80" msgstr "" -#: src/main/xmli18n-tmp.h:217 +#: src/main/xmli18n-tmp.h:239 msgid "Canon i560" msgstr "" -#: src/main/xmli18n-tmp.h:218 +#: src/main/xmli18n-tmp.h:240 msgid "Canon i850" msgstr "" -#: src/main/xmli18n-tmp.h:219 +#: src/main/xmli18n-tmp.h:241 msgid "Canon i860" msgstr "" -#: src/main/xmli18n-tmp.h:220 +#: src/main/xmli18n-tmp.h:242 msgid "Canon i865" msgstr "" -#: src/main/xmli18n-tmp.h:221 +#: src/main/xmli18n-tmp.h:243 msgid "Epson Stylus C20" msgstr "" -#: src/main/xmli18n-tmp.h:222 +#: src/main/xmli18n-tmp.h:244 msgid "Epson Stylus C20SX" msgstr "" -#: src/main/xmli18n-tmp.h:223 +#: src/main/xmli18n-tmp.h:245 msgid "Epson Stylus C20UX" msgstr "" -#: src/main/xmli18n-tmp.h:224 +#: src/main/xmli18n-tmp.h:246 msgid "Epson Stylus C40" msgstr "" -#: src/main/xmli18n-tmp.h:225 +#: src/main/xmli18n-tmp.h:247 msgid "Epson Stylus C40SX" msgstr "" -#: src/main/xmli18n-tmp.h:226 +#: src/main/xmli18n-tmp.h:248 msgid "Epson Stylus C40UX" msgstr "" -#: src/main/xmli18n-tmp.h:227 +#: src/main/xmli18n-tmp.h:249 msgid "Epson Stylus C41" msgstr "" -#: src/main/xmli18n-tmp.h:228 +#: src/main/xmli18n-tmp.h:250 msgid "Epson Stylus C41SX" msgstr "" -#: src/main/xmli18n-tmp.h:229 +#: src/main/xmli18n-tmp.h:251 msgid "Epson Stylus C41UX" msgstr "" -#: src/main/xmli18n-tmp.h:230 +#: src/main/xmli18n-tmp.h:252 msgid "Epson Stylus C42" msgstr "" -#: src/main/xmli18n-tmp.h:231 +#: src/main/xmli18n-tmp.h:253 msgid "Epson Stylus C42SX" msgstr "" -#: src/main/xmli18n-tmp.h:232 +#: src/main/xmli18n-tmp.h:254 msgid "Epson Stylus C42UX" msgstr "" -#: src/main/xmli18n-tmp.h:233 +#: src/main/xmli18n-tmp.h:255 msgid "Epson Stylus C43" msgstr "" -#: src/main/xmli18n-tmp.h:234 +#: src/main/xmli18n-tmp.h:256 msgid "Epson Stylus C43SX" msgstr "" -#: src/main/xmli18n-tmp.h:235 +#: src/main/xmli18n-tmp.h:257 msgid "Epson Stylus C43UX" msgstr "" -#: src/main/xmli18n-tmp.h:236 +#: src/main/xmli18n-tmp.h:258 msgid "Epson Stylus C44" msgstr "" -#: src/main/xmli18n-tmp.h:237 +#: src/main/xmli18n-tmp.h:259 msgid "Epson Stylus C44SX" msgstr "" -#: src/main/xmli18n-tmp.h:238 +#: src/main/xmli18n-tmp.h:260 msgid "Epson Stylus C44UX" msgstr "" -#: src/main/xmli18n-tmp.h:239 +#: src/main/xmli18n-tmp.h:261 msgid "Epson Stylus C45" msgstr "" -#: src/main/xmli18n-tmp.h:240 +#: src/main/xmli18n-tmp.h:262 msgid "Epson Stylus C46" msgstr "" -#: src/main/xmli18n-tmp.h:241 +#: src/main/xmli18n-tmp.h:263 msgid "Epson Stylus C48" msgstr "" -#: src/main/xmli18n-tmp.h:242 +#: src/main/xmli18n-tmp.h:264 msgid "Epson Stylus C50" msgstr "" -#: src/main/xmli18n-tmp.h:243 +#: src/main/xmli18n-tmp.h:265 msgid "Epson Stylus C60" msgstr "" -#: src/main/xmli18n-tmp.h:244 +#: src/main/xmli18n-tmp.h:266 msgid "Epson Stylus C61" msgstr "" -#: src/main/xmli18n-tmp.h:245 +#: src/main/xmli18n-tmp.h:267 msgid "Epson Stylus C62" msgstr "" -#: src/main/xmli18n-tmp.h:246 +#: src/main/xmli18n-tmp.h:268 msgid "Epson Stylus C63" msgstr "" -#: src/main/xmli18n-tmp.h:247 +#: src/main/xmli18n-tmp.h:269 msgid "Epson Stylus C64" msgstr "" -#: src/main/xmli18n-tmp.h:248 +#: src/main/xmli18n-tmp.h:270 msgid "Epson Stylus C65" msgstr "" -#: src/main/xmli18n-tmp.h:249 +#: src/main/xmli18n-tmp.h:271 msgid "Epson Stylus C66" msgstr "" -#: src/main/xmli18n-tmp.h:250 +#: src/main/xmli18n-tmp.h:272 msgid "Epson Stylus C68" msgstr "" -#: src/main/xmli18n-tmp.h:251 +#: src/main/xmli18n-tmp.h:273 msgid "Epson Stylus C70" msgstr "" -#: src/main/xmli18n-tmp.h:252 -#, fuzzy +#: src/main/xmli18n-tmp.h:274 msgid "Epson Stylus C79" -msgstr "Epson 4×6 Photo Paper" +msgstr "" -#: src/main/xmli18n-tmp.h:253 +#: src/main/xmli18n-tmp.h:275 msgid "Epson Stylus C80" msgstr "" -#: src/main/xmli18n-tmp.h:254 +#: src/main/xmli18n-tmp.h:276 msgid "Epson Stylus C82" msgstr "" -#: src/main/xmli18n-tmp.h:255 +#: src/main/xmli18n-tmp.h:277 msgid "Epson Stylus C83" msgstr "" -#: src/main/xmli18n-tmp.h:256 +#: src/main/xmli18n-tmp.h:278 msgid "Epson Stylus C84" msgstr "" -#: src/main/xmli18n-tmp.h:257 +#: src/main/xmli18n-tmp.h:279 msgid "Epson Stylus C85" msgstr "" -#: src/main/xmli18n-tmp.h:258 +#: src/main/xmli18n-tmp.h:280 msgid "Epson Stylus C86" msgstr "" -#: src/main/xmli18n-tmp.h:259 -#, fuzzy +#: src/main/xmli18n-tmp.h:281 msgid "Epson Stylus C87" -msgstr "Epson 4×6 Photo Paper" +msgstr "" -#: src/main/xmli18n-tmp.h:260 +#: src/main/xmli18n-tmp.h:282 msgid "Epson Stylus C88" msgstr "" -#: src/main/xmli18n-tmp.h:261 -#, fuzzy +#: src/main/xmli18n-tmp.h:283 msgid "Epson Stylus C110" -msgstr "Epson 4×6 Photo Paper" +msgstr "" -#: src/main/xmli18n-tmp.h:262 -#, fuzzy +#: src/main/xmli18n-tmp.h:284 msgid "Epson Stylus C120" -msgstr "Epson 4×6 Photo Paper" +msgstr "" -#: src/main/xmli18n-tmp.h:263 +#: src/main/xmli18n-tmp.h:285 msgid "Epson Stylus Color" msgstr "" -#: src/main/xmli18n-tmp.h:264 +#: src/main/xmli18n-tmp.h:286 msgid "Epson Stylus Color I" msgstr "" -#: src/main/xmli18n-tmp.h:265 +#: src/main/xmli18n-tmp.h:287 msgid "Epson Stylus Color II" msgstr "" -#: src/main/xmli18n-tmp.h:266 +#: src/main/xmli18n-tmp.h:288 msgid "Epson Stylus Color IIs" msgstr "" -#: src/main/xmli18n-tmp.h:267 +#: src/main/xmli18n-tmp.h:289 msgid "Epson Stylus Color PRO" msgstr "" -#: src/main/xmli18n-tmp.h:268 +#: src/main/xmli18n-tmp.h:290 msgid "Epson Stylus Pro XL" msgstr "" -#: src/main/xmli18n-tmp.h:269 +#: src/main/xmli18n-tmp.h:291 msgid "Epson Stylus Color 400" msgstr "" -#: src/main/xmli18n-tmp.h:270 +#: src/main/xmli18n-tmp.h:292 msgid "Epson Stylus Color 440" msgstr "" -#: src/main/xmli18n-tmp.h:271 +#: src/main/xmli18n-tmp.h:293 msgid "Epson Stylus Color 460" msgstr "" -#: src/main/xmli18n-tmp.h:272 +#: src/main/xmli18n-tmp.h:294 msgid "Epson Stylus Color 480" msgstr "" -#: src/main/xmli18n-tmp.h:273 +#: src/main/xmli18n-tmp.h:295 msgid "Epson Stylus Color 500" msgstr "" -#: src/main/xmli18n-tmp.h:274 +#: src/main/xmli18n-tmp.h:296 msgid "Epson Stylus Color 580" msgstr "" -#: src/main/xmli18n-tmp.h:275 +#: src/main/xmli18n-tmp.h:297 msgid "Epson Stylus Color 600" msgstr "" -#: src/main/xmli18n-tmp.h:276 +#: src/main/xmli18n-tmp.h:298 msgid "Epson Stylus Color 640" msgstr "" -#: src/main/xmli18n-tmp.h:277 +#: src/main/xmli18n-tmp.h:299 msgid "Epson Stylus Color 660" msgstr "" -#: src/main/xmli18n-tmp.h:278 +#: src/main/xmli18n-tmp.h:300 msgid "Epson Stylus Color 670" msgstr "" -#: src/main/xmli18n-tmp.h:279 +#: src/main/xmli18n-tmp.h:301 msgid "Epson Stylus Color 680" msgstr "" -#: src/main/xmli18n-tmp.h:280 +#: src/main/xmli18n-tmp.h:302 msgid "Epson Stylus Color 740" msgstr "" -#: src/main/xmli18n-tmp.h:281 +#: src/main/xmli18n-tmp.h:303 msgid "Epson Stylus Color 760" msgstr "" -#: src/main/xmli18n-tmp.h:282 +#: src/main/xmli18n-tmp.h:304 msgid "Epson Stylus Color 777" msgstr "" -#: src/main/xmli18n-tmp.h:283 +#: src/main/xmli18n-tmp.h:305 msgid "Epson Stylus Color 800" msgstr "" -#: src/main/xmli18n-tmp.h:284 +#: src/main/xmli18n-tmp.h:306 msgid "Epson Stylus Color 850" msgstr "" -#: src/main/xmli18n-tmp.h:285 +#: src/main/xmli18n-tmp.h:307 msgid "Epson Stylus Color 860" msgstr "" -#: src/main/xmli18n-tmp.h:286 +#: src/main/xmli18n-tmp.h:308 msgid "Epson Stylus Color 880" msgstr "" -#: src/main/xmli18n-tmp.h:287 +#: src/main/xmli18n-tmp.h:309 msgid "Epson Stylus Color 8 3" msgstr "" -#: src/main/xmli18n-tmp.h:288 +#: src/main/xmli18n-tmp.h:310 msgid "Epson Stylus Color 900" msgstr "" -#: src/main/xmli18n-tmp.h:289 +#: src/main/xmli18n-tmp.h:311 msgid "Epson Stylus Color 980" msgstr "" -#: src/main/xmli18n-tmp.h:290 +#: src/main/xmli18n-tmp.h:312 msgid "Epson Stylus Color 1160" msgstr "" -#: src/main/xmli18n-tmp.h:291 +#: src/main/xmli18n-tmp.h:313 msgid "Epson Stylus Color 1500" msgstr "" -#: src/main/xmli18n-tmp.h:292 +#: src/main/xmli18n-tmp.h:314 msgid "Epson Stylus Color 1520" msgstr "" -#: src/main/xmli18n-tmp.h:293 +#: src/main/xmli18n-tmp.h:315 msgid "Epson Stylus Color 3000" msgstr "" -#: src/main/xmli18n-tmp.h:294 +#: src/main/xmli18n-tmp.h:316 #, fuzzy msgid "Epson Stylus Photo" -msgstr "Epson 4×6 Photo Paper" +msgstr "Epson 4×6 Photo Paper" -#: src/main/xmli18n-tmp.h:295 +#: src/main/xmli18n-tmp.h:317 #, fuzzy msgid "Epson Stylus Photo 700" -msgstr "Epson 4×6 Photo Paper" +msgstr "Epson 4×6 Photo Paper" -#: src/main/xmli18n-tmp.h:296 +#: src/main/xmli18n-tmp.h:318 #, fuzzy msgid "Epson Stylus Photo EX" -msgstr "Epson 4×6 Photo Paper" +msgstr "Epson 4×6 Photo Paper" -#: src/main/xmli18n-tmp.h:297 +#: src/main/xmli18n-tmp.h:319 #, fuzzy msgid "Epson Stylus Photo EX3" -msgstr "Epson 4×6 Photo Paper" +msgstr "Epson 4×6 Photo Paper" -#: src/main/xmli18n-tmp.h:298 +#: src/main/xmli18n-tmp.h:320 #, fuzzy msgid "Epson Stylus Photo 720" -msgstr "Epson 4×6 Photo Paper" +msgstr "Epson 4×6 Photo Paper" -#: src/main/xmli18n-tmp.h:299 +#: src/main/xmli18n-tmp.h:321 #, fuzzy msgid "Epson Stylus Photo 750" -msgstr "Epson 4×6 Photo Paper" +msgstr "Epson 4×6 Photo Paper" -#: src/main/xmli18n-tmp.h:300 +#: src/main/xmli18n-tmp.h:322 #, fuzzy msgid "Epson Stylus Photo 780" -msgstr "Epson 4×6 Photo Paper" +msgstr "Epson 4×6 Photo Paper" -#: src/main/xmli18n-tmp.h:301 +#: src/main/xmli18n-tmp.h:323 #, fuzzy msgid "Epson Stylus Photo 785" -msgstr "Epson 4×6 Photo Paper" +msgstr "Epson 4×6 Photo Paper" -#: src/main/xmli18n-tmp.h:302 +#: src/main/xmli18n-tmp.h:324 #, fuzzy msgid "Epson Stylus Photo 790" -msgstr "Epson 4×6 Photo Paper" +msgstr "Epson 4×6 Photo Paper" -#: src/main/xmli18n-tmp.h:303 +#: src/main/xmli18n-tmp.h:325 #, fuzzy msgid "Epson Stylus Photo 810" -msgstr "Epson 4×6 Photo Paper" +msgstr "Epson 4×6 Photo Paper" -#: src/main/xmli18n-tmp.h:304 +#: src/main/xmli18n-tmp.h:326 #, fuzzy msgid "Epson Stylus Photo 820" -msgstr "Epson 4×6 Photo Paper" +msgstr "Epson 4×6 Photo Paper" -#: src/main/xmli18n-tmp.h:305 +#: src/main/xmli18n-tmp.h:327 #, fuzzy msgid "Epson Stylus Photo 825" -msgstr "Epson 4×6 Photo Paper" +msgstr "Epson 4×6 Photo Paper" -#: src/main/xmli18n-tmp.h:306 +#: src/main/xmli18n-tmp.h:328 #, fuzzy msgid "Epson Stylus Photo 830" -msgstr "Epson 4×6 Photo Paper" +msgstr "Epson 4×6 Photo Paper" -#: src/main/xmli18n-tmp.h:307 +#: src/main/xmli18n-tmp.h:329 msgid "Epson Stylus Photo 830U" msgstr "" -#: src/main/xmli18n-tmp.h:308 +#: src/main/xmli18n-tmp.h:330 #, fuzzy msgid "Epson Stylus Photo 870" -msgstr "Epson 4×6 Photo Paper" +msgstr "Epson 4×6 Photo Paper" -#: src/main/xmli18n-tmp.h:309 +#: src/main/xmli18n-tmp.h:331 #, fuzzy msgid "Epson Stylus Photo 875" -msgstr "Epson 4×6 Photo Paper" +msgstr "Epson 4×6 Photo Paper" -#: src/main/xmli18n-tmp.h:310 +#: src/main/xmli18n-tmp.h:332 #, fuzzy msgid "Epson Stylus Photo 890" -msgstr "Epson 4×6 Photo Paper" +msgstr "Epson 4×6 Photo Paper" -#: src/main/xmli18n-tmp.h:311 +#: src/main/xmli18n-tmp.h:333 #, fuzzy msgid "Epson Stylus Photo 895" -msgstr "Epson 4×6 Photo Paper" +msgstr "Epson 4×6 Photo Paper" -#: src/main/xmli18n-tmp.h:312 +#: src/main/xmli18n-tmp.h:334 #, fuzzy msgid "Epson Stylus Photo 900" -msgstr "Epson 4×6 Photo Paper" +msgstr "Epson 4×6 Photo Paper" -#: src/main/xmli18n-tmp.h:313 +#: src/main/xmli18n-tmp.h:335 #, fuzzy msgid "Epson Stylus Photo 915" -msgstr "Epson 4×6 Photo Paper" +msgstr "Epson 4×6 Photo Paper" -#: src/main/xmli18n-tmp.h:314 +#: src/main/xmli18n-tmp.h:336 #, fuzzy msgid "Epson Stylus Photo 925" -msgstr "Epson 4×6 Photo Paper" +msgstr "Epson 4×6 Photo Paper" -#: src/main/xmli18n-tmp.h:315 +#: src/main/xmli18n-tmp.h:337 #, fuzzy msgid "Epson Stylus Photo 935" -msgstr "Epson 4×6 Photo Paper" +msgstr "Epson 4×6 Photo Paper" -#: src/main/xmli18n-tmp.h:316 +#: src/main/xmli18n-tmp.h:338 #, fuzzy msgid "Epson Stylus Photo 950" -msgstr "Epson 4×6 Photo Paper" +msgstr "Epson 4×6 Photo Paper" -#: src/main/xmli18n-tmp.h:317 +#: src/main/xmli18n-tmp.h:339 #, fuzzy msgid "Epson Stylus Photo 960" -msgstr "Epson 4×6 Photo Paper" +msgstr "Epson 4×6 Photo Paper" -#: src/main/xmli18n-tmp.h:318 +#: src/main/xmli18n-tmp.h:340 msgid "Epson Stylus Photo 1200" msgstr "" -#: src/main/xmli18n-tmp.h:319 +#: src/main/xmli18n-tmp.h:341 msgid "Epson Stylus Photo 1270" msgstr "" -#: src/main/xmli18n-tmp.h:320 +#: src/main/xmli18n-tmp.h:342 msgid "Epson Stylus Photo 1280" msgstr "" -#: src/main/xmli18n-tmp.h:321 +#: src/main/xmli18n-tmp.h:343 msgid "Epson Stylus Photo 1290" msgstr "" -#: src/main/xmli18n-tmp.h:322 -#, fuzzy +#: src/main/xmli18n-tmp.h:344 msgid "Epson Stylus Photo 1400" -msgstr "Epson 4×6 Photo Paper" +msgstr "" -#: src/main/xmli18n-tmp.h:323 -#, fuzzy +#: src/main/xmli18n-tmp.h:345 msgid "Epson Stylus Photo 1410" -msgstr "Epson 4×6 Photo Paper" +msgstr "" -#: src/main/xmli18n-tmp.h:324 +#: src/main/xmli18n-tmp.h:346 #, fuzzy msgid "Epson Stylus Photo 2000P" -msgstr "Epson 4×6 Photo Paper" +msgstr "Epson 4×6 Photo Paper" -#: src/main/xmli18n-tmp.h:325 +#: src/main/xmli18n-tmp.h:347 msgid "Epson Stylus Photo 2100" msgstr "" -#: src/main/xmli18n-tmp.h:326 +#: src/main/xmli18n-tmp.h:348 msgid "Epson Stylus Photo 2200" msgstr "" -#: src/main/xmli18n-tmp.h:327 +#: src/main/xmli18n-tmp.h:349 msgid "Epson Stylus Photo R200" msgstr "" -#: src/main/xmli18n-tmp.h:328 +#: src/main/xmli18n-tmp.h:350 msgid "Epson Stylus Photo R210" msgstr "" -#: src/main/xmli18n-tmp.h:329 +#: src/main/xmli18n-tmp.h:351 msgid "Epson Stylus Photo R220" msgstr "" -#: src/main/xmli18n-tmp.h:330 -#, fuzzy +#: src/main/xmli18n-tmp.h:352 msgid "Epson Stylus Photo R230" -msgstr "Epson 4×6 Photo Paper" +msgstr "" -#: src/main/xmli18n-tmp.h:331 -#, fuzzy +#: src/main/xmli18n-tmp.h:353 msgid "Epson Stylus Photo R240" -msgstr "Epson 4×6 Photo Paper" +msgstr "" -#: src/main/xmli18n-tmp.h:332 -#, fuzzy +#: src/main/xmli18n-tmp.h:354 msgid "Epson Stylus Photo R245" -msgstr "Epson 4×6 Photo Paper" +msgstr "" -#: src/main/xmli18n-tmp.h:333 -#, fuzzy +#: src/main/xmli18n-tmp.h:355 msgid "Epson Stylus Photo R260" -msgstr "Epson 4×6 Photo Paper" +msgstr "" -#: src/main/xmli18n-tmp.h:334 -#, fuzzy +#: src/main/xmli18n-tmp.h:356 msgid "Epson Stylus Photo R265" -msgstr "Epson 4×6 Photo Paper" +msgstr "" -#: src/main/xmli18n-tmp.h:335 -#, fuzzy +#: src/main/xmli18n-tmp.h:357 msgid "Epson Stylus Photo R270" -msgstr "Epson 4×6 Photo Paper" +msgstr "" -#: src/main/xmli18n-tmp.h:336 +#: src/main/xmli18n-tmp.h:358 +msgid "Epson Stylus Photo R280" +msgstr "" + +#: src/main/xmli18n-tmp.h:359 +msgid "Epson Stylus Photo R285" +msgstr "" + +#: src/main/xmli18n-tmp.h:360 msgid "Epson Stylus Photo R300" msgstr "" -#: src/main/xmli18n-tmp.h:337 +#: src/main/xmli18n-tmp.h:361 msgid "Epson Stylus Photo R310" msgstr "" -#: src/main/xmli18n-tmp.h:338 +#: src/main/xmli18n-tmp.h:362 msgid "Epson Stylus Photo R320" msgstr "" -#: src/main/xmli18n-tmp.h:339 +#: src/main/xmli18n-tmp.h:363 msgid "Epson Stylus Photo R340" msgstr "" -#: src/main/xmli18n-tmp.h:340 -#, fuzzy +#: src/main/xmli18n-tmp.h:364 msgid "Epson Stylus Photo R350" -msgstr "Epson 4×6 Photo Paper" +msgstr "" -#: src/main/xmli18n-tmp.h:341 -#, fuzzy +#: src/main/xmli18n-tmp.h:365 msgid "Epson Stylus Photo R360" -msgstr "Epson 4×6 Photo Paper" +msgstr "" -#: src/main/xmli18n-tmp.h:342 -#, fuzzy +#: src/main/xmli18n-tmp.h:366 msgid "Epson Stylus Photo R380" -msgstr "Epson 4×6 Photo Paper" +msgstr "" -#: src/main/xmli18n-tmp.h:343 -#, fuzzy +#: src/main/xmli18n-tmp.h:367 msgid "Epson Stylus Photo R390" -msgstr "Epson 4×6 Photo Paper" +msgstr "" -#: src/main/xmli18n-tmp.h:344 +#: src/main/xmli18n-tmp.h:368 msgid "Epson Stylus Photo RX400" msgstr "" -#: src/main/xmli18n-tmp.h:345 +#: src/main/xmli18n-tmp.h:369 msgid "Epson Stylus Photo RX420" msgstr "" -#: src/main/xmli18n-tmp.h:346 +#: src/main/xmli18n-tmp.h:370 msgid "Epson Stylus Photo RX425" msgstr "" -#: src/main/xmli18n-tmp.h:347 +#: src/main/xmli18n-tmp.h:371 msgid "Epson Stylus Photo RX430" msgstr "" -#: src/main/xmli18n-tmp.h:348 +#: src/main/xmli18n-tmp.h:372 msgid "Epson Stylus Photo RX500" msgstr "" -#: src/main/xmli18n-tmp.h:349 +#: src/main/xmli18n-tmp.h:373 msgid "Epson Stylus Photo RX510" msgstr "" -#: src/main/xmli18n-tmp.h:350 -#, fuzzy +#: src/main/xmli18n-tmp.h:374 msgid "Epson Stylus Photo RX560" -msgstr "Epson 4×6 Photo Paper" +msgstr "" -#: src/main/xmli18n-tmp.h:351 -#, fuzzy +#: src/main/xmli18n-tmp.h:375 msgid "Epson Stylus Photo RX580" -msgstr "Epson 4×6 Photo Paper" +msgstr "" -#: src/main/xmli18n-tmp.h:352 -#, fuzzy +#: src/main/xmli18n-tmp.h:376 +msgid "Epson Stylus Photo RX585" +msgstr "" + +#: src/main/xmli18n-tmp.h:377 msgid "Epson Stylus Photo RX590" -msgstr "Epson 4×6 Photo Paper" +msgstr "" -#: src/main/xmli18n-tmp.h:353 -#, fuzzy +#: src/main/xmli18n-tmp.h:378 msgid "Epson Stylus Photo RX595" -msgstr "Epson 4×6 Photo Paper" +msgstr "" -#: src/main/xmli18n-tmp.h:354 +#: src/main/xmli18n-tmp.h:379 msgid "Epson Stylus Photo RX600" msgstr "" -#: src/main/xmli18n-tmp.h:355 +#: src/main/xmli18n-tmp.h:380 msgid "Epson Stylus Photo RX620" msgstr "" -#: src/main/xmli18n-tmp.h:356 +#: src/main/xmli18n-tmp.h:381 msgid "Epson Stylus Photo RX630" msgstr "" -#: src/main/xmli18n-tmp.h:357 -#, fuzzy +#: src/main/xmli18n-tmp.h:382 msgid "Epson Stylus Photo RX640" -msgstr "Epson 4×6 Photo Paper" +msgstr "" -#: src/main/xmli18n-tmp.h:358 +#: src/main/xmli18n-tmp.h:383 +msgid "Epson Stylus Photo RX680" +msgstr "" + +#: src/main/xmli18n-tmp.h:384 +msgid "Epson Stylus Photo RX685" +msgstr "" + +#: src/main/xmli18n-tmp.h:385 msgid "Epson Stylus Photo RX700" msgstr "" -#: src/main/xmli18n-tmp.h:359 +#: src/main/xmli18n-tmp.h:386 msgid "Epson Stylus Photo R800" msgstr "" -#: src/main/xmli18n-tmp.h:360 +#: src/main/xmli18n-tmp.h:387 msgid "Epson Stylus Photo R1800" msgstr "" -#: src/main/xmli18n-tmp.h:361 +#: src/main/xmli18n-tmp.h:388 msgid "Epson Stylus Photo R2400" msgstr "" -#: src/main/xmli18n-tmp.h:362 +#: src/main/xmli18n-tmp.h:389 msgid "Epson Stylus Pro 5000" msgstr "" -#: src/main/xmli18n-tmp.h:363 +#: src/main/xmli18n-tmp.h:390 msgid "Epson Stylus Pro 5500" msgstr "" -#: src/main/xmli18n-tmp.h:364 +#: src/main/xmli18n-tmp.h:391 msgid "Epson Stylus Pro 7000" msgstr "" -#: src/main/xmli18n-tmp.h:365 +#: src/main/xmli18n-tmp.h:392 msgid "Epson Stylus Pro 7500" msgstr "" -#: src/main/xmli18n-tmp.h:366 +#: src/main/xmli18n-tmp.h:393 msgid "Epson Stylus Pro 7600" msgstr "" -#: src/main/xmli18n-tmp.h:367 +#: src/main/xmli18n-tmp.h:394 msgid "Epson Stylus Pro 9000" msgstr "" -#: src/main/xmli18n-tmp.h:368 +#: src/main/xmli18n-tmp.h:395 msgid "Epson Stylus Pro 9500" msgstr "" -#: src/main/xmli18n-tmp.h:369 +#: src/main/xmli18n-tmp.h:396 msgid "Epson Stylus Pro 9600" msgstr "" -#: src/main/xmli18n-tmp.h:370 +#: src/main/xmli18n-tmp.h:397 msgid "Epson Stylus Pro 10000" msgstr "" -#: src/main/xmli18n-tmp.h:371 +#: src/main/xmli18n-tmp.h:398 msgid "Epson Stylus Scan 2000" msgstr "" -#: src/main/xmli18n-tmp.h:372 +#: src/main/xmli18n-tmp.h:399 msgid "Epson Stylus Scan 2500" msgstr "" -#: src/main/xmli18n-tmp.h:373 +#: src/main/xmli18n-tmp.h:400 msgid "Epson Stylus CX1500" msgstr "" -#: src/main/xmli18n-tmp.h:374 +#: src/main/xmli18n-tmp.h:401 msgid "Epson Stylus CX3100" msgstr "" -#: src/main/xmli18n-tmp.h:375 +#: src/main/xmli18n-tmp.h:402 msgid "Epson Stylus CX3200" msgstr "" -#: src/main/xmli18n-tmp.h:376 +#: src/main/xmli18n-tmp.h:403 msgid "Epson Stylus CX3500" msgstr "" -#: src/main/xmli18n-tmp.h:377 +#: src/main/xmli18n-tmp.h:404 msgid "Epson Stylus CX3600" msgstr "" -#: src/main/xmli18n-tmp.h:378 +#: src/main/xmli18n-tmp.h:405 msgid "Epson Stylus CX3650" msgstr "" -#: src/main/xmli18n-tmp.h:379 +#: src/main/xmli18n-tmp.h:406 msgid "Epson Stylus CX3700" msgstr "" -#: src/main/xmli18n-tmp.h:380 +#: src/main/xmli18n-tmp.h:407 msgid "Epson Stylus CX3800" msgstr "" -#: src/main/xmli18n-tmp.h:381 +#: src/main/xmli18n-tmp.h:408 msgid "Epson Stylus CX3805" msgstr "" -#: src/main/xmli18n-tmp.h:382 +#: src/main/xmli18n-tmp.h:409 msgid "Epson Stylus CX3810" msgstr "" -#: src/main/xmli18n-tmp.h:383 +#: src/main/xmli18n-tmp.h:410 msgid "Epson Stylus CX4100" msgstr "" -#: src/main/xmli18n-tmp.h:384 +#: src/main/xmli18n-tmp.h:411 msgid "Epson Stylus CX4200" msgstr "" -#: src/main/xmli18n-tmp.h:385 -#, fuzzy +#: src/main/xmli18n-tmp.h:412 msgid "Epson Stylus CX4400" -msgstr "Epson 4×6 Photo Paper" +msgstr "" -#: src/main/xmli18n-tmp.h:386 +#: src/main/xmli18n-tmp.h:413 msgid "Epson Stylus CX4500" msgstr "" -#: src/main/xmli18n-tmp.h:387 +#: src/main/xmli18n-tmp.h:414 msgid "Epson Stylus CX4600" msgstr "" -#: src/main/xmli18n-tmp.h:388 +#: src/main/xmli18n-tmp.h:415 msgid "Epson Stylus CX4700" msgstr "" -#: src/main/xmli18n-tmp.h:389 +#: src/main/xmli18n-tmp.h:416 msgid "Epson Stylus CX4800" msgstr "" -#: src/main/xmli18n-tmp.h:390 -#, fuzzy +#: src/main/xmli18n-tmp.h:417 msgid "Epson Stylus CX4900" -msgstr "Epson 4×6 Photo Paper" +msgstr "" -#: src/main/xmli18n-tmp.h:391 -#, fuzzy +#: src/main/xmli18n-tmp.h:418 msgid "Epson Stylus CX5000" -msgstr "Epson 4×6 Photo Paper" +msgstr "" -#: src/main/xmli18n-tmp.h:392 -#, fuzzy +#: src/main/xmli18n-tmp.h:419 msgid "Epson Stylus CX5000F" -msgstr "Epson 4×6 Photo Paper" +msgstr "" -#: src/main/xmli18n-tmp.h:393 +#: src/main/xmli18n-tmp.h:420 msgid "Epson Stylus CX5100" msgstr "" -#: src/main/xmli18n-tmp.h:394 +#: src/main/xmli18n-tmp.h:421 msgid "Epson Stylus CX5200" msgstr "" -#: src/main/xmli18n-tmp.h:395 +#: src/main/xmli18n-tmp.h:422 msgid "Epson Stylus CX5300" msgstr "" -#: src/main/xmli18n-tmp.h:396 +#: src/main/xmli18n-tmp.h:423 msgid "Epson Stylus CX5400" msgstr "" -#: src/main/xmli18n-tmp.h:397 -#, fuzzy +#: src/main/xmli18n-tmp.h:424 msgid "Epson Stylus CX5600" -msgstr "Epson 4×6 Photo Paper" +msgstr "" -#: src/main/xmli18n-tmp.h:398 +#: src/main/xmli18n-tmp.h:425 msgid "Epson Stylus CX5700" msgstr "" -#: src/main/xmli18n-tmp.h:399 +#: src/main/xmli18n-tmp.h:426 msgid "Epson Stylus CX5800" msgstr "" -#: src/main/xmli18n-tmp.h:400 -#, fuzzy +#: src/main/xmli18n-tmp.h:427 msgid "Epson Stylus CX6000" -msgstr "Epson 4×6 Photo Paper" +msgstr "" -#: src/main/xmli18n-tmp.h:401 +#: src/main/xmli18n-tmp.h:428 msgid "Epson Stylus CX6300" msgstr "" -#: src/main/xmli18n-tmp.h:402 +#: src/main/xmli18n-tmp.h:429 msgid "Epson Stylus CX6400" msgstr "" -#: src/main/xmli18n-tmp.h:403 +#: src/main/xmli18n-tmp.h:430 msgid "Epson Stylus CX6500" msgstr "" -#: src/main/xmli18n-tmp.h:404 +#: src/main/xmli18n-tmp.h:431 msgid "Epson Stylus CX6600" msgstr "" -#: src/main/xmli18n-tmp.h:405 -#, fuzzy +#: src/main/xmli18n-tmp.h:432 msgid "Epson Stylus CX7000F" -msgstr "Epson 4×6 Photo Paper" +msgstr "" -#: src/main/xmli18n-tmp.h:406 -#, fuzzy +#: src/main/xmli18n-tmp.h:433 msgid "Epson Stylus CX7400" -msgstr "Epson 4×6 Photo Paper" +msgstr "" -#: src/main/xmli18n-tmp.h:407 +#: src/main/xmli18n-tmp.h:434 msgid "Epson Stylus CX7700" msgstr "" -#: src/main/xmli18n-tmp.h:408 +#: src/main/xmli18n-tmp.h:435 msgid "Epson Stylus CX7800" msgstr "" -#: src/main/xmli18n-tmp.h:409 +#: src/main/xmli18n-tmp.h:436 msgid "Epson Stylus CX8300" msgstr "" -#: src/main/xmli18n-tmp.h:410 +#: src/main/xmli18n-tmp.h:437 msgid "Epson Stylus CX8400" msgstr "" -#: src/main/xmli18n-tmp.h:411 -#, fuzzy +#: src/main/xmli18n-tmp.h:438 msgid "Epson Stylus CX9400" -msgstr "Epson 4×6 Photo Paper" +msgstr "" -#: src/main/xmli18n-tmp.h:412 +#: src/main/xmli18n-tmp.h:439 msgid "Epson Stylus D68" msgstr "" -#: src/main/xmli18n-tmp.h:413 +#: src/main/xmli18n-tmp.h:440 msgid "Epson Stylus D88" msgstr "" -#: src/main/xmli18n-tmp.h:414 -#, fuzzy +#: src/main/xmli18n-tmp.h:441 +msgid "Epson Stylus D92" +msgstr "" + +#: src/main/xmli18n-tmp.h:442 msgid "Epson Stylus D120" -msgstr "Epson 4×6 Photo Paper" +msgstr "" -#: src/main/xmli18n-tmp.h:415 +#: src/main/xmli18n-tmp.h:443 msgid "Epson Stylus DX3800" msgstr "" -#: src/main/xmli18n-tmp.h:416 +#: src/main/xmli18n-tmp.h:444 msgid "Epson Stylus DX3850" msgstr "" -#: src/main/xmli18n-tmp.h:417 -#, fuzzy +#: src/main/xmli18n-tmp.h:445 msgid "Epson Stylus DX4050" -msgstr "Epson 4×6 Photo Paper" +msgstr "" -#: src/main/xmli18n-tmp.h:418 +#: src/main/xmli18n-tmp.h:446 msgid "Epson Stylus DX4200" msgstr "" -#: src/main/xmli18n-tmp.h:419 +#: src/main/xmli18n-tmp.h:447 msgid "Epson Stylus DX4250" msgstr "" -#: src/main/xmli18n-tmp.h:420 +#: src/main/xmli18n-tmp.h:448 +msgid "Epson Stylus DX4400" +msgstr "" + +#: src/main/xmli18n-tmp.h:449 +msgid "Epson Stylus DX4450" +msgstr "" + +#: src/main/xmli18n-tmp.h:450 msgid "Epson Stylus DX4800" msgstr "" -#: src/main/xmli18n-tmp.h:421 +#: src/main/xmli18n-tmp.h:451 +msgid "Epson Stylus DX7000F" +msgstr "" + +#: src/main/xmli18n-tmp.h:452 +msgid "Epson Stylus DX7400" +msgstr "" + +#: src/main/xmli18n-tmp.h:453 +msgid "Epson Stylus DX7450" +msgstr "" + +#: src/main/xmli18n-tmp.h:454 +msgid "Epson Stylus DX8400" +msgstr "" + +#: src/main/xmli18n-tmp.h:455 +msgid "Epson Stylus DX8450" +msgstr "" + +#: src/main/xmli18n-tmp.h:456 msgid "Epson PictureMate" msgstr "" -#: src/main/xmli18n-tmp.h:422 +#: src/main/xmli18n-tmp.h:457 +msgid "Epson PictureMate Dash" +msgstr "" + +#: src/main/xmli18n-tmp.h:458 msgid "Epson PictureMate Deluxe" msgstr "" -#: src/main/xmli18n-tmp.h:423 +#: src/main/xmli18n-tmp.h:459 msgid "Epson PictureMate Flash" msgstr "" -#: src/main/xmli18n-tmp.h:424 +#: src/main/xmli18n-tmp.h:460 msgid "Epson PictureMate Pal" msgstr "" -#: src/main/xmli18n-tmp.h:425 +#: src/main/xmli18n-tmp.h:461 msgid "Epson PictureMate Snap" msgstr "" -#: src/main/xmli18n-tmp.h:426 +#: src/main/xmli18n-tmp.h:462 +msgid "Epson PictureMate 100" +msgstr "" + +#: src/main/xmli18n-tmp.h:463 msgid "Epson PictureMate 200" msgstr "" -#: src/main/xmli18n-tmp.h:427 +#: src/main/xmli18n-tmp.h:464 msgid "Epson PictureMate 210" msgstr "" -#: src/main/xmli18n-tmp.h:428 +#: src/main/xmli18n-tmp.h:465 msgid "Epson PictureMate 240" msgstr "" -#: src/main/xmli18n-tmp.h:429 +#: src/main/xmli18n-tmp.h:466 msgid "Epson PictureMate 250" msgstr "" -#: src/main/xmli18n-tmp.h:430 +#: src/main/xmli18n-tmp.h:467 +msgid "Epson PictureMate 260" +msgstr "" + +#: src/main/xmli18n-tmp.h:468 +msgid "Epson PictureMate 270" +msgstr "" + +#: src/main/xmli18n-tmp.h:469 msgid "Epson PictureMate 280" msgstr "" -#: src/main/xmli18n-tmp.h:431 +#: src/main/xmli18n-tmp.h:470 +msgid "Epson PictureMate 290" +msgstr "" + +#: src/main/xmli18n-tmp.h:471 +msgid "Epson PictureMate 500" +msgstr "" + +#: src/main/xmli18n-tmp.h:472 +msgid "Epson PictureMate 2005" +msgstr "" + +#: src/main/xmli18n-tmp.h:473 msgid "Epson CL 700" msgstr "" -#: src/main/xmli18n-tmp.h:432 +#: src/main/xmli18n-tmp.h:474 msgid "Epson CL 750" msgstr "" -#: src/main/xmli18n-tmp.h:433 +#: src/main/xmli18n-tmp.h:475 msgid "Epson CL 760" msgstr "" -#: src/main/xmli18n-tmp.h:434 +#: src/main/xmli18n-tmp.h:476 msgid "Epson E 100" msgstr "" -#: src/main/xmli18n-tmp.h:435 +#: src/main/xmli18n-tmp.h:477 msgid "Epson E 150" msgstr "" -#: src/main/xmli18n-tmp.h:436 +#: src/main/xmli18n-tmp.h:478 msgid "Epson E 200" msgstr "" -#: src/main/xmli18n-tmp.h:437 +#: src/main/xmli18n-tmp.h:479 +msgid "Epson E 300" +msgstr "" + +#: src/main/xmli18n-tmp.h:480 +msgid "Epson E 500" +msgstr "" + +#: src/main/xmli18n-tmp.h:481 +msgid "Epson E 520" +msgstr "" + +#: src/main/xmli18n-tmp.h:482 +msgid "Epson E 700" +msgstr "" + +#: src/main/xmli18n-tmp.h:483 +msgid "Epson E 720" +msgstr "" + +#: src/main/xmli18n-tmp.h:484 msgid "Epson EM 900C" msgstr "" -#: src/main/xmli18n-tmp.h:438 +#: src/main/xmli18n-tmp.h:485 msgid "Epson EM 930C" msgstr "" -#: src/main/xmli18n-tmp.h:439 +#: src/main/xmli18n-tmp.h:486 msgid "Epson MC 2000" msgstr "" -#: src/main/xmli18n-tmp.h:440 +#: src/main/xmli18n-tmp.h:487 msgid "Epson MC 5000" msgstr "" -#: src/main/xmli18n-tmp.h:441 +#: src/main/xmli18n-tmp.h:488 msgid "Epson MC 7000" msgstr "" -#: src/main/xmli18n-tmp.h:442 +#: src/main/xmli18n-tmp.h:489 msgid "Epson MC 9000" msgstr "" -#: src/main/xmli18n-tmp.h:443 +#: src/main/xmli18n-tmp.h:490 msgid "Epson MC 10000" msgstr "" -#: src/main/xmli18n-tmp.h:444 +#: src/main/xmli18n-tmp.h:491 msgid "Epson MJ 930C" msgstr "" -#: src/main/xmli18n-tmp.h:445 +#: src/main/xmli18n-tmp.h:492 msgid "Epson MJ 5100C" msgstr "" -#: src/main/xmli18n-tmp.h:446 +#: src/main/xmli18n-tmp.h:493 msgid "Epson MJ 6000C" msgstr "" -#: src/main/xmli18n-tmp.h:447 +#: src/main/xmli18n-tmp.h:494 msgid "Epson MJ 8000C" msgstr "" -#: src/main/xmli18n-tmp.h:448 -#, fuzzy +#: src/main/xmli18n-tmp.h:495 msgid "Epson PM 670C" -msgstr "Epson 4×6 Photo Paper" +msgstr "" -#: src/main/xmli18n-tmp.h:449 +#: src/main/xmli18n-tmp.h:496 msgid "Epson PM 700C" msgstr "" -#: src/main/xmli18n-tmp.h:450 +#: src/main/xmli18n-tmp.h:497 msgid "Epson PM 730C" msgstr "" -#: src/main/xmli18n-tmp.h:451 +#: src/main/xmli18n-tmp.h:498 msgid "Epson PM 740C" msgstr "" -#: src/main/xmli18n-tmp.h:452 +#: src/main/xmli18n-tmp.h:499 msgid "Epson PM 750C" msgstr "" -#: src/main/xmli18n-tmp.h:453 +#: src/main/xmli18n-tmp.h:500 msgid "Epson PM 760C" msgstr "" -#: src/main/xmli18n-tmp.h:454 +#: src/main/xmli18n-tmp.h:501 msgid "Epson PM 770C" msgstr "" -#: src/main/xmli18n-tmp.h:455 +#: src/main/xmli18n-tmp.h:502 msgid "Epson PM 780C" msgstr "" -#: src/main/xmli18n-tmp.h:456 +#: src/main/xmli18n-tmp.h:503 msgid "Epson PM 790PT" msgstr "" -#: src/main/xmli18n-tmp.h:457 +#: src/main/xmli18n-tmp.h:504 msgid "Epson PM 800C" msgstr "" -#: src/main/xmli18n-tmp.h:458 +#: src/main/xmli18n-tmp.h:505 msgid "Epson PM 850PT" msgstr "" -#: src/main/xmli18n-tmp.h:459 +#: src/main/xmli18n-tmp.h:506 msgid "Epson PM 870C" msgstr "" -#: src/main/xmli18n-tmp.h:460 +#: src/main/xmli18n-tmp.h:507 msgid "Epson PM 880C" msgstr "" -#: src/main/xmli18n-tmp.h:461 +#: src/main/xmli18n-tmp.h:508 msgid "Epson PM 930C" msgstr "" -#: src/main/xmli18n-tmp.h:462 +#: src/main/xmli18n-tmp.h:509 msgid "Epson PM 940C" msgstr "" -#: src/main/xmli18n-tmp.h:463 +#: src/main/xmli18n-tmp.h:510 msgid "Epson PM 950C" msgstr "" -#: src/main/xmli18n-tmp.h:464 +#: src/main/xmli18n-tmp.h:511 msgid "Epson PM 970C" msgstr "" -#: src/main/xmli18n-tmp.h:465 +#: src/main/xmli18n-tmp.h:512 msgid "Epson PM 980C" msgstr "" -#: src/main/xmli18n-tmp.h:466 +#: src/main/xmli18n-tmp.h:513 msgid "Epson PM 2000C" msgstr "" -#: src/main/xmli18n-tmp.h:467 +#: src/main/xmli18n-tmp.h:514 msgid "Epson PM 2200C" msgstr "" -#: src/main/xmli18n-tmp.h:468 +#: src/main/xmli18n-tmp.h:515 msgid "Epson PM 3000C" msgstr "" -#: src/main/xmli18n-tmp.h:469 +#: src/main/xmli18n-tmp.h:516 msgid "Epson PM 3300C" msgstr "" -#: src/main/xmli18n-tmp.h:470 +#: src/main/xmli18n-tmp.h:517 msgid "Epson PM 3500C" msgstr "" -#: src/main/xmli18n-tmp.h:471 +#: src/main/xmli18n-tmp.h:518 msgid "Epson PM 3700C" msgstr "" -#: src/main/xmli18n-tmp.h:472 +#: src/main/xmli18n-tmp.h:519 msgid "Epson PM 4000PX" msgstr "" -#: src/main/xmli18n-tmp.h:473 +#: src/main/xmli18n-tmp.h:520 msgid "Epson PM 5000C" msgstr "" -#: src/main/xmli18n-tmp.h:474 +#: src/main/xmli18n-tmp.h:521 msgid "Epson PM 7000C" msgstr "" -#: src/main/xmli18n-tmp.h:475 +#: src/main/xmli18n-tmp.h:522 msgid "Epson PM 9000C" msgstr "" -#: src/main/xmli18n-tmp.h:476 +#: src/main/xmli18n-tmp.h:523 msgid "Epson PM 10000" msgstr "" -#: src/main/xmli18n-tmp.h:477 +#: src/main/xmli18n-tmp.h:524 msgid "Epson PM A650" msgstr "" -#: src/main/xmli18n-tmp.h:478 +#: src/main/xmli18n-tmp.h:525 msgid "Epson PM A750" msgstr "" -#: src/main/xmli18n-tmp.h:479 -#, fuzzy +#: src/main/xmli18n-tmp.h:526 msgid "Epson PM A820" -msgstr "Epson 4×6 Photo Paper" +msgstr "" -#: src/main/xmli18n-tmp.h:480 +#: src/main/xmli18n-tmp.h:527 msgid "Epson PM A890" msgstr "" -#: src/main/xmli18n-tmp.h:481 +#: src/main/xmli18n-tmp.h:528 msgid "Epson PM A900" msgstr "" -#: src/main/xmli18n-tmp.h:482 +#: src/main/xmli18n-tmp.h:529 msgid "Epson PM A950" msgstr "" -#: src/main/xmli18n-tmp.h:483 +#: src/main/xmli18n-tmp.h:530 msgid "Epson PM D600" msgstr "" -#: src/main/xmli18n-tmp.h:484 +#: src/main/xmli18n-tmp.h:531 msgid "Epson PM D750" msgstr "" -#: src/main/xmli18n-tmp.h:485 +#: src/main/xmli18n-tmp.h:532 msgid "Epson PM D770" msgstr "" -#: src/main/xmli18n-tmp.h:486 +#: src/main/xmli18n-tmp.h:533 msgid "Epson PM D800" msgstr "" -#: src/main/xmli18n-tmp.h:487 -#, fuzzy +#: src/main/xmli18n-tmp.h:534 msgid "Epson PM D870" -msgstr "Epson 4×6 Photo Paper" +msgstr "" -#: src/main/xmli18n-tmp.h:488 +#: src/main/xmli18n-tmp.h:535 msgid "Epson PM D1000" msgstr "" -#: src/main/xmli18n-tmp.h:489 +#: src/main/xmli18n-tmp.h:536 msgid "Epson PM G700" msgstr "" -#: src/main/xmli18n-tmp.h:490 +#: src/main/xmli18n-tmp.h:537 msgid "Epson PM G720" msgstr "" -#: src/main/xmli18n-tmp.h:491 +#: src/main/xmli18n-tmp.h:538 msgid "Epson PM G730" msgstr "" -#: src/main/xmli18n-tmp.h:492 +#: src/main/xmli18n-tmp.h:539 msgid "Epson PM G800" msgstr "" -#: src/main/xmli18n-tmp.h:493 +#: src/main/xmli18n-tmp.h:540 msgid "Epson PM G820" msgstr "" -#: src/main/xmli18n-tmp.h:494 +#: src/main/xmli18n-tmp.h:541 msgid "Epson PM G850" msgstr "" -#: src/main/xmli18n-tmp.h:495 -#, fuzzy +#: src/main/xmli18n-tmp.h:542 msgid "Epson PM G4500" -msgstr "Epson 4×6 Photo Paper" +msgstr "" -#: src/main/xmli18n-tmp.h:496 +#: src/main/xmli18n-tmp.h:543 msgid "Epson PX A650" msgstr "" -#: src/main/xmli18n-tmp.h:497 +#: src/main/xmli18n-tmp.h:544 msgid "Epson PX G900" msgstr "" -#: src/main/xmli18n-tmp.h:498 +#: src/main/xmli18n-tmp.h:545 msgid "Epson PX G920" msgstr "" -#: src/main/xmli18n-tmp.h:499 +#: src/main/xmli18n-tmp.h:546 msgid "Epson PX G5000" msgstr "" -#: src/main/xmli18n-tmp.h:500 +#: src/main/xmli18n-tmp.h:547 msgid "Epson PX V500" msgstr "" -#: src/main/xmli18n-tmp.h:501 +#: src/main/xmli18n-tmp.h:548 msgid "Epson PX V600" msgstr "" -#: src/main/xmli18n-tmp.h:502 +#: src/main/xmli18n-tmp.h:549 msgid "Epson PX V630" msgstr "" -#: src/main/xmli18n-tmp.h:503 -#, fuzzy +#: src/main/xmli18n-tmp.h:550 msgid "Epson PX V780" -msgstr "Epson 4×6 Photo Paper" +msgstr "" -#: src/main/xmli18n-tmp.h:504 +#: src/main/xmli18n-tmp.h:551 msgid "Epson PX 5500" msgstr "" -#: src/main/xmli18n-tmp.h:505 +#: src/main/xmli18n-tmp.h:552 msgid "Epson PX 7000" msgstr "" -#: src/main/xmli18n-tmp.h:506 +#: src/main/xmli18n-tmp.h:553 msgid "Epson PX 9000" msgstr "" -#: src/main/xmli18n-tmp.h:507 +#: src/main/xmli18n-tmp.h:554 msgid "Apollo P-2100" msgstr "" -#: src/main/xmli18n-tmp.h:508 +#: src/main/xmli18n-tmp.h:555 msgid "Apollo P-2150" msgstr "" -#: src/main/xmli18n-tmp.h:509 +#: src/main/xmli18n-tmp.h:556 msgid "Apollo P-2200" msgstr "" -#: src/main/xmli18n-tmp.h:510 +#: src/main/xmli18n-tmp.h:557 msgid "Apollo P-2250" msgstr "" -#: src/main/xmli18n-tmp.h:511 +#: src/main/xmli18n-tmp.h:558 msgid "Apollo P-2500" msgstr "" -#: src/main/xmli18n-tmp.h:512 +#: src/main/xmli18n-tmp.h:559 msgid "Apollo P-2550" msgstr "" -#: src/main/xmli18n-tmp.h:513 +#: src/main/xmli18n-tmp.h:560 msgid "Apollo P-2600" msgstr "" -#: src/main/xmli18n-tmp.h:514 +#: src/main/xmli18n-tmp.h:561 msgid "Apollo P-2650" msgstr "" -#: src/main/xmli18n-tmp.h:515 +#: src/main/xmli18n-tmp.h:562 msgid "Apple Color StyleWriter 4100" msgstr "" -#: src/main/xmli18n-tmp.h:516 +#: src/main/xmli18n-tmp.h:563 msgid "Apple Color StyleWriter 4500" msgstr "" -#: src/main/xmli18n-tmp.h:517 +#: src/main/xmli18n-tmp.h:564 msgid "Apple Color StyleWriter 6500" msgstr "" -#: src/main/xmli18n-tmp.h:518 +#: src/main/xmli18n-tmp.h:565 msgid "Apple LaserWriter Select 360" msgstr "" -#: src/main/xmli18n-tmp.h:519 +#: src/main/xmli18n-tmp.h:566 msgid "Brother DCP-1200" msgstr "" -#: src/main/xmli18n-tmp.h:520 +#: src/main/xmli18n-tmp.h:567 msgid "Brother HL-4Ve" msgstr "" -#: src/main/xmli18n-tmp.h:521 +#: src/main/xmli18n-tmp.h:568 msgid "Brother HL-10V" msgstr "" -#: src/main/xmli18n-tmp.h:522 +#: src/main/xmli18n-tmp.h:569 msgid "Brother HL-10h" msgstr "" -#: src/main/xmli18n-tmp.h:523 +#: src/main/xmli18n-tmp.h:570 msgid "Brother HL-630" msgstr "" -#: src/main/xmli18n-tmp.h:524 +#: src/main/xmli18n-tmp.h:571 msgid "Brother HL-660" msgstr "" -#: src/main/xmli18n-tmp.h:525 +#: src/main/xmli18n-tmp.h:572 msgid "Brother HL-760" msgstr "" -#: src/main/xmli18n-tmp.h:526 +#: src/main/xmli18n-tmp.h:573 msgid "Brother HL-960" msgstr "" -#: src/main/xmli18n-tmp.h:527 +#: src/main/xmli18n-tmp.h:574 msgid "Brother HL-1040" msgstr "" -#: src/main/xmli18n-tmp.h:528 +#: src/main/xmli18n-tmp.h:575 msgid "Brother HL-1050" msgstr "" -#: src/main/xmli18n-tmp.h:529 +#: src/main/xmli18n-tmp.h:576 msgid "Brother HL-1060" msgstr "" -#: src/main/xmli18n-tmp.h:530 +#: src/main/xmli18n-tmp.h:577 msgid "Brother HL-1070" msgstr "" -#: src/main/xmli18n-tmp.h:531 +#: src/main/xmli18n-tmp.h:578 msgid "Brother HL-1240" msgstr "" -#: src/main/xmli18n-tmp.h:532 +#: src/main/xmli18n-tmp.h:579 msgid "Brother HL-1250" msgstr "" -#: src/main/xmli18n-tmp.h:533 +#: src/main/xmli18n-tmp.h:580 msgid "Brother HL-1260" msgstr "" -#: src/main/xmli18n-tmp.h:534 +#: src/main/xmli18n-tmp.h:581 msgid "Brother HL-1270N" msgstr "" -#: src/main/xmli18n-tmp.h:535 +#: src/main/xmli18n-tmp.h:582 msgid "Brother HL-1440" msgstr "" -#: src/main/xmli18n-tmp.h:536 +#: src/main/xmli18n-tmp.h:583 msgid "Brother HL-1660e" msgstr "" -#: src/main/xmli18n-tmp.h:537 +#: src/main/xmli18n-tmp.h:584 msgid "Brother HL-2060" msgstr "" -#: src/main/xmli18n-tmp.h:538 +#: src/main/xmli18n-tmp.h:585 msgid "Brother MFC-6550MC" msgstr "" -#: src/main/xmli18n-tmp.h:539 +#: src/main/xmli18n-tmp.h:586 msgid "Brother MFC-8300" msgstr "" -#: src/main/xmli18n-tmp.h:540 +#: src/main/xmli18n-tmp.h:587 msgid "Brother MFC-9500" msgstr "" -#: src/main/xmli18n-tmp.h:541 +#: src/main/xmli18n-tmp.h:588 msgid "Brother MFC-9600" msgstr "" -#: src/main/xmli18n-tmp.h:542 +#: src/main/xmli18n-tmp.h:589 msgid "Canon GP 335" msgstr "" -#: src/main/xmli18n-tmp.h:543 +#: src/main/xmli18n-tmp.h:590 msgid "Canon LBP-4sx" msgstr "" -#: src/main/xmli18n-tmp.h:544 +#: src/main/xmli18n-tmp.h:591 msgid "Canon LBP-430" msgstr "" -#: src/main/xmli18n-tmp.h:545 +#: src/main/xmli18n-tmp.h:592 msgid "Canon LBP-1000" msgstr "" -#: src/main/xmli18n-tmp.h:546 +#: src/main/xmli18n-tmp.h:593 msgid "Canon LBP-1260" msgstr "" -#: src/main/xmli18n-tmp.h:547 +#: src/main/xmli18n-tmp.h:594 msgid "Canon LBP-1760" msgstr "" -#: src/main/xmli18n-tmp.h:548 +#: src/main/xmli18n-tmp.h:595 msgid "Canon imageRunner 330s" msgstr "" -#: src/main/xmli18n-tmp.h:549 +#: src/main/xmli18n-tmp.h:596 msgid "Citizen ProJet II" msgstr "" -#: src/main/xmli18n-tmp.h:550 +#: src/main/xmli18n-tmp.h:597 msgid "DEC 1800" msgstr "" -#: src/main/xmli18n-tmp.h:551 +#: src/main/xmli18n-tmp.h:598 msgid "DEC LN17" msgstr "" -#: src/main/xmli18n-tmp.h:552 +#: src/main/xmli18n-tmp.h:599 msgid "Epson ActionLaser 1100" msgstr "" -#: src/main/xmli18n-tmp.h:553 +#: src/main/xmli18n-tmp.h:600 msgid "Epson ActionLaser II" msgstr "" -#: src/main/xmli18n-tmp.h:554 +#: src/main/xmli18n-tmp.h:601 msgid "Epson AcuLaser C2000" msgstr "" -#: src/main/xmli18n-tmp.h:555 +#: src/main/xmli18n-tmp.h:602 msgid "Epson AcuLaser C2000PS" msgstr "" -#: src/main/xmli18n-tmp.h:556 +#: src/main/xmli18n-tmp.h:603 msgid "Epson AcuLaser C8500" msgstr "" -#: src/main/xmli18n-tmp.h:557 +#: src/main/xmli18n-tmp.h:604 msgid "Epson AcuLaser C8500PS" msgstr "" -#: src/main/xmli18n-tmp.h:558 +#: src/main/xmli18n-tmp.h:605 msgid "Epson AcuLaser C8600" msgstr "" -#: src/main/xmli18n-tmp.h:559 +#: src/main/xmli18n-tmp.h:606 msgid "Epson AcuLaser C8600PS" msgstr "" -#: src/main/xmli18n-tmp.h:560 +#: src/main/xmli18n-tmp.h:607 msgid "Epson EPL-5200" msgstr "" -#: src/main/xmli18n-tmp.h:561 +#: src/main/xmli18n-tmp.h:608 msgid "Epson EPL-5200+" msgstr "" -#: src/main/xmli18n-tmp.h:562 +#: src/main/xmli18n-tmp.h:609 msgid "Epson EPL-5700" msgstr "" -#: src/main/xmli18n-tmp.h:563 +#: src/main/xmli18n-tmp.h:610 msgid "Epson EPL-5700PS" msgstr "" -#: src/main/xmli18n-tmp.h:564 +#: src/main/xmli18n-tmp.h:611 msgid "Epson EPL-5800" msgstr "" -#: src/main/xmli18n-tmp.h:565 +#: src/main/xmli18n-tmp.h:612 msgid "Epson EPL-5800PS" msgstr "" -#: src/main/xmli18n-tmp.h:566 +#: src/main/xmli18n-tmp.h:613 msgid "Epson EPL-5900" msgstr "" -#: src/main/xmli18n-tmp.h:567 +#: src/main/xmli18n-tmp.h:614 msgid "Epson EPL-5900PS" msgstr "" -#: src/main/xmli18n-tmp.h:568 +#: src/main/xmli18n-tmp.h:615 msgid "Epson EPL-6100" msgstr "" -#: src/main/xmli18n-tmp.h:569 +#: src/main/xmli18n-tmp.h:616 msgid "Epson EPL-6100PS" msgstr "" -#: src/main/xmli18n-tmp.h:570 +#: src/main/xmli18n-tmp.h:617 msgid "Epson EPL-7100" msgstr "" -#: src/main/xmli18n-tmp.h:571 +#: src/main/xmli18n-tmp.h:618 msgid "Fujitsu PrintPartner 10V" msgstr "" -#: src/main/xmli18n-tmp.h:572 +#: src/main/xmli18n-tmp.h:619 msgid "Fujitsu PrintPartner 16DV" msgstr "" -#: src/main/xmli18n-tmp.h:573 +#: src/main/xmli18n-tmp.h:620 msgid "Fujitsu PrintPartner 20W" msgstr "" -#: src/main/xmli18n-tmp.h:574 +#: src/main/xmli18n-tmp.h:621 msgid "Fujitsu PrintPartner 8000" msgstr "" -#: src/main/xmli18n-tmp.h:575 +#: src/main/xmli18n-tmp.h:622 #, fuzzy msgid "Generic PCL 4 Printer" msgstr "Neuen Printer einrichten" -#: src/main/xmli18n-tmp.h:576 +#: src/main/xmli18n-tmp.h:623 +#, fuzzy +msgid "Generic PCL 4 LF Printer" +msgstr "Neuen Printer einrichten" + +#: src/main/xmli18n-tmp.h:624 #, fuzzy msgid "Generic PCL 5 Printer" msgstr "Neuen Printer einrichten" -#: src/main/xmli18n-tmp.h:577 +#: src/main/xmli18n-tmp.h:625 +#, fuzzy +msgid "Generic PCL 5 LF Printer" +msgstr "Neuen Printer einrichten" + +#: src/main/xmli18n-tmp.h:626 #, fuzzy msgid "Generic PCL 5c Printer" msgstr "Neuen Printer einrichten" -#: src/main/xmli18n-tmp.h:578 +#: src/main/xmli18n-tmp.h:627 +#, fuzzy +msgid "Generic PCL 5c LF Printer" +msgstr "Neuen Printer einrichten" + +#: src/main/xmli18n-tmp.h:628 #, fuzzy msgid "Generic PCL 5e Printer" msgstr "Neuen Printer einrichten" -#: src/main/xmli18n-tmp.h:579 +#: src/main/xmli18n-tmp.h:629 +#, fuzzy +msgid "Generic PCL 5e LF Printer" +msgstr "Neuen Printer einrichten" + +#: src/main/xmli18n-tmp.h:630 msgid "Generic PCL 6/PCL XL Printer" msgstr "" -#: src/main/xmli18n-tmp.h:580 +#: src/main/xmli18n-tmp.h:631 +#, fuzzy +msgid "Generic PCL 6/PCL XL LF Printer" +msgstr "Neuen Printer einrichten" + +#: src/main/xmli18n-tmp.h:632 msgid "HP Business Inkjet 2200" msgstr "" -#: src/main/xmli18n-tmp.h:581 +#: src/main/xmli18n-tmp.h:633 msgid "HP Business Inkjet 2230" msgstr "" -#: src/main/xmli18n-tmp.h:582 +#: src/main/xmli18n-tmp.h:634 msgid "HP Business Inkjet 2250" msgstr "" -#: src/main/xmli18n-tmp.h:583 +#: src/main/xmli18n-tmp.h:635 msgid "HP Business Inkjet 2250TN" msgstr "" -#: src/main/xmli18n-tmp.h:584 +#: src/main/xmli18n-tmp.h:636 msgid "HP Business Inkjet 2280" msgstr "" -#: src/main/xmli18n-tmp.h:585 +#: src/main/xmli18n-tmp.h:637 msgid "HP Color Inkjet Printer CP1160" msgstr "" -#: src/main/xmli18n-tmp.h:586 +#: src/main/xmli18n-tmp.h:638 msgid "HP Color Inkjet Printer CP1700" msgstr "" -#: src/main/xmli18n-tmp.h:587 +#: src/main/xmli18n-tmp.h:639 msgid "HP Color LaserJet 2500" msgstr "" -#: src/main/xmli18n-tmp.h:588 +#: src/main/xmli18n-tmp.h:640 msgid "HP Color LaserJet 4500" msgstr "" -#: src/main/xmli18n-tmp.h:589 +#: src/main/xmli18n-tmp.h:641 msgid "HP Color LaserJet 4550" msgstr "" -#: src/main/xmli18n-tmp.h:590 +#: src/main/xmli18n-tmp.h:642 msgid "HP Color LaserJet 4600" msgstr "" -#: src/main/xmli18n-tmp.h:591 +#: src/main/xmli18n-tmp.h:643 msgid "HP Color LaserJet 5" msgstr "" -#: src/main/xmli18n-tmp.h:592 +#: src/main/xmli18n-tmp.h:644 msgid "HP Color LaserJet 5000" msgstr "" -#: src/main/xmli18n-tmp.h:593 +#: src/main/xmli18n-tmp.h:645 msgid "HP Color LaserJet 5500" msgstr "" -#: src/main/xmli18n-tmp.h:594 +#: src/main/xmli18n-tmp.h:646 msgid "HP Color LaserJet 8550GN" msgstr "" -#: src/main/xmli18n-tmp.h:595 +#: src/main/xmli18n-tmp.h:647 msgid "HP DesignJet 230" msgstr "" -#: src/main/xmli18n-tmp.h:596 +#: src/main/xmli18n-tmp.h:648 msgid "HP DesignJet 250C" msgstr "" -#: src/main/xmli18n-tmp.h:597 +#: src/main/xmli18n-tmp.h:649 msgid "HP DesignJet 430" msgstr "" -#: src/main/xmli18n-tmp.h:598 +#: src/main/xmli18n-tmp.h:650 msgid "HP DesignJet 450C" msgstr "" -#: src/main/xmli18n-tmp.h:599 +#: src/main/xmli18n-tmp.h:651 msgid "HP DesignJet 455CA" msgstr "" -#: src/main/xmli18n-tmp.h:600 +#: src/main/xmli18n-tmp.h:652 msgid "HP DesignJet 488CA" msgstr "" -#: src/main/xmli18n-tmp.h:601 +#: src/main/xmli18n-tmp.h:653 msgid "HP DesignJet 700" msgstr "" -#: src/main/xmli18n-tmp.h:602 +#: src/main/xmli18n-tmp.h:654 msgid "HP DesignJet 750C Plus" msgstr "" -#: src/main/xmli18n-tmp.h:603 +#: src/main/xmli18n-tmp.h:655 msgid "HP DesignJet 750C" msgstr "" -#: src/main/xmli18n-tmp.h:604 +#: src/main/xmli18n-tmp.h:656 msgid "HP DesignJet 2500CP" msgstr "" -#: src/main/xmli18n-tmp.h:605 +#: src/main/xmli18n-tmp.h:657 msgid "HP DesignJet 3500CP" msgstr "" -#: src/main/xmli18n-tmp.h:606 +#: src/main/xmli18n-tmp.h:658 msgid "HP DesignJet ColorPro CAD" msgstr "" -#: src/main/xmli18n-tmp.h:607 +#: src/main/xmli18n-tmp.h:659 msgid "HP DeskJet 400" msgstr "" -#: src/main/xmli18n-tmp.h:608 +#: src/main/xmli18n-tmp.h:660 msgid "HP DeskJet 420C" msgstr "" -#: src/main/xmli18n-tmp.h:609 +#: src/main/xmli18n-tmp.h:661 msgid "HP DeskJet 450" msgstr "" -#: src/main/xmli18n-tmp.h:610 +#: src/main/xmli18n-tmp.h:662 msgid "HP DeskJet 500" msgstr "" -#: src/main/xmli18n-tmp.h:611 +#: src/main/xmli18n-tmp.h:663 msgid "HP DeskJet 500C" msgstr "" -#: src/main/xmli18n-tmp.h:612 +#: src/main/xmli18n-tmp.h:664 msgid "HP DeskJet 505J Plus" msgstr "" -#: src/main/xmli18n-tmp.h:613 +#: src/main/xmli18n-tmp.h:665 msgid "HP DeskJet 510" msgstr "" -#: src/main/xmli18n-tmp.h:614 +#: src/main/xmli18n-tmp.h:666 msgid "HP DeskJet 520" msgstr "" -#: src/main/xmli18n-tmp.h:615 +#: src/main/xmli18n-tmp.h:667 msgid "HP DeskJet 540C" msgstr "" -#: src/main/xmli18n-tmp.h:616 +#: src/main/xmli18n-tmp.h:668 msgid "HP DeskJet 550C" msgstr "" -#: src/main/xmli18n-tmp.h:617 +#: src/main/xmli18n-tmp.h:669 msgid "HP DeskJet 5550" msgstr "" -#: src/main/xmli18n-tmp.h:618 +#: src/main/xmli18n-tmp.h:670 msgid "HP DeskJet 5551" msgstr "" -#: src/main/xmli18n-tmp.h:619 +#: src/main/xmli18n-tmp.h:671 msgid "HP DeskJet 560C" msgstr "" -#: src/main/xmli18n-tmp.h:620 +#: src/main/xmli18n-tmp.h:672 msgid "HP DeskJet 600" msgstr "" -#: src/main/xmli18n-tmp.h:621 +#: src/main/xmli18n-tmp.h:673 msgid "HP DeskJet 600C" msgstr "" -#: src/main/xmli18n-tmp.h:622 +#: src/main/xmli18n-tmp.h:674 msgid "HP DeskJet 610C" msgstr "" -#: src/main/xmli18n-tmp.h:623 +#: src/main/xmli18n-tmp.h:675 msgid "HP DeskJet 610CL" msgstr "" -#: src/main/xmli18n-tmp.h:624 +#: src/main/xmli18n-tmp.h:676 msgid "HP DeskJet 6122" msgstr "" -#: src/main/xmli18n-tmp.h:625 +#: src/main/xmli18n-tmp.h:677 msgid "HP DeskJet 6127" msgstr "" -#: src/main/xmli18n-tmp.h:626 +#: src/main/xmli18n-tmp.h:678 msgid "HP DeskJet 612C" msgstr "" -#: src/main/xmli18n-tmp.h:627 +#: src/main/xmli18n-tmp.h:679 msgid "HP DeskJet 640C" msgstr "" -#: src/main/xmli18n-tmp.h:628 +#: src/main/xmli18n-tmp.h:680 msgid "HP DeskJet 648C" msgstr "" -#: src/main/xmli18n-tmp.h:629 +#: src/main/xmli18n-tmp.h:681 msgid "HP DeskJet 660C" msgstr "" -#: src/main/xmli18n-tmp.h:630 +#: src/main/xmli18n-tmp.h:682 msgid "HP DeskJet 670C" msgstr "" -#: src/main/xmli18n-tmp.h:631 +#: src/main/xmli18n-tmp.h:683 msgid "HP DeskJet 670TV" msgstr "" -#: src/main/xmli18n-tmp.h:632 +#: src/main/xmli18n-tmp.h:684 msgid "HP DeskJet 672C" msgstr "" -#: src/main/xmli18n-tmp.h:633 +#: src/main/xmli18n-tmp.h:685 msgid "HP DeskJet 680C" msgstr "" -#: src/main/xmli18n-tmp.h:634 +#: src/main/xmli18n-tmp.h:686 msgid "HP DeskJet 682C" msgstr "" -#: src/main/xmli18n-tmp.h:635 +#: src/main/xmli18n-tmp.h:687 msgid "HP DeskJet 690C" msgstr "" -#: src/main/xmli18n-tmp.h:636 +#: src/main/xmli18n-tmp.h:688 msgid "HP DeskJet 692C" msgstr "" -#: src/main/xmli18n-tmp.h:637 +#: src/main/xmli18n-tmp.h:689 msgid "HP DeskJet 693C" msgstr "" -#: src/main/xmli18n-tmp.h:638 +#: src/main/xmli18n-tmp.h:690 msgid "HP DeskJet 694C" msgstr "" -#: src/main/xmli18n-tmp.h:639 +#: src/main/xmli18n-tmp.h:691 msgid "HP DeskJet 695C" msgstr "" -#: src/main/xmli18n-tmp.h:640 +#: src/main/xmli18n-tmp.h:692 msgid "HP DeskJet 697C" msgstr "" -#: src/main/xmli18n-tmp.h:641 +#: src/main/xmli18n-tmp.h:693 msgid "HP DeskJet 810C" msgstr "" -#: src/main/xmli18n-tmp.h:642 +#: src/main/xmli18n-tmp.h:694 msgid "HP DeskJet 812C" msgstr "" -#: src/main/xmli18n-tmp.h:643 +#: src/main/xmli18n-tmp.h:695 msgid "HP DeskJet 815C" msgstr "" -#: src/main/xmli18n-tmp.h:644 +#: src/main/xmli18n-tmp.h:696 msgid "HP DeskJet 816C" msgstr "" -#: src/main/xmli18n-tmp.h:645 +#: src/main/xmli18n-tmp.h:697 msgid "HP DeskJet 825C" msgstr "" -#: src/main/xmli18n-tmp.h:646 +#: src/main/xmli18n-tmp.h:698 msgid "HP DeskJet 830C" msgstr "" -#: src/main/xmli18n-tmp.h:647 +#: src/main/xmli18n-tmp.h:699 msgid "HP DeskJet 832C" msgstr "" -#: src/main/xmli18n-tmp.h:648 +#: src/main/xmli18n-tmp.h:700 msgid "HP DeskJet 840C" msgstr "" -#: src/main/xmli18n-tmp.h:649 +#: src/main/xmli18n-tmp.h:701 msgid "HP DeskJet 841C" msgstr "" -#: src/main/xmli18n-tmp.h:650 +#: src/main/xmli18n-tmp.h:702 msgid "HP DeskJet 842C" msgstr "" -#: src/main/xmli18n-tmp.h:651 +#: src/main/xmli18n-tmp.h:703 msgid "HP DeskJet 843C" msgstr "" -#: src/main/xmli18n-tmp.h:652 +#: src/main/xmli18n-tmp.h:704 msgid "HP DeskJet 845C" msgstr "" -#: src/main/xmli18n-tmp.h:653 +#: src/main/xmli18n-tmp.h:705 msgid "HP DeskJet 850C" msgstr "" -#: src/main/xmli18n-tmp.h:654 +#: src/main/xmli18n-tmp.h:706 msgid "HP DeskJet 855C" msgstr "" -#: src/main/xmli18n-tmp.h:655 +#: src/main/xmli18n-tmp.h:707 msgid "HP DeskJet 870C" msgstr "" -#: src/main/xmli18n-tmp.h:656 +#: src/main/xmli18n-tmp.h:708 msgid "HP DeskJet 880C" msgstr "" -#: src/main/xmli18n-tmp.h:657 +#: src/main/xmli18n-tmp.h:709 msgid "HP DeskJet 882C" msgstr "" -#: src/main/xmli18n-tmp.h:658 +#: src/main/xmli18n-tmp.h:710 msgid "HP DeskJet 890C" msgstr "" -#: src/main/xmli18n-tmp.h:659 +#: src/main/xmli18n-tmp.h:711 msgid "HP DeskJet 895C" msgstr "" -#: src/main/xmli18n-tmp.h:660 +#: src/main/xmli18n-tmp.h:712 msgid "HP DeskJet 916C" msgstr "" -#: src/main/xmli18n-tmp.h:661 +#: src/main/xmli18n-tmp.h:713 msgid "HP DeskJet 920C" msgstr "" -#: src/main/xmli18n-tmp.h:662 +#: src/main/xmli18n-tmp.h:714 msgid "HP DeskJet 9300" msgstr "" -#: src/main/xmli18n-tmp.h:663 +#: src/main/xmli18n-tmp.h:715 msgid "HP DeskJet 930C" msgstr "" -#: src/main/xmli18n-tmp.h:664 +#: src/main/xmli18n-tmp.h:716 msgid "HP DeskJet 932C" msgstr "" -#: src/main/xmli18n-tmp.h:665 +#: src/main/xmli18n-tmp.h:717 msgid "HP DeskJet 933C" msgstr "" -#: src/main/xmli18n-tmp.h:666 +#: src/main/xmli18n-tmp.h:718 msgid "HP DeskJet 934C" msgstr "" -#: src/main/xmli18n-tmp.h:667 +#: src/main/xmli18n-tmp.h:719 msgid "HP DeskJet 935C" msgstr "" -#: src/main/xmli18n-tmp.h:668 +#: src/main/xmli18n-tmp.h:720 msgid "HP DeskJet 940C" msgstr "" -#: src/main/xmli18n-tmp.h:669 +#: src/main/xmli18n-tmp.h:721 msgid "HP DeskJet 948C" msgstr "" -#: src/main/xmli18n-tmp.h:670 +#: src/main/xmli18n-tmp.h:722 msgid "HP DeskJet 950C" msgstr "" -#: src/main/xmli18n-tmp.h:671 +#: src/main/xmli18n-tmp.h:723 msgid "HP DeskJet 952C" msgstr "" -#: src/main/xmli18n-tmp.h:672 +#: src/main/xmli18n-tmp.h:724 msgid "HP DeskJet 955C" msgstr "" -#: src/main/xmli18n-tmp.h:673 +#: src/main/xmli18n-tmp.h:725 msgid "HP DeskJet 957C" msgstr "" -#: src/main/xmli18n-tmp.h:674 +#: src/main/xmli18n-tmp.h:726 msgid "HP DeskJet 959C" msgstr "" -#: src/main/xmli18n-tmp.h:675 +#: src/main/xmli18n-tmp.h:727 msgid "HP DeskJet 960C" msgstr "" -#: src/main/xmli18n-tmp.h:676 +#: src/main/xmli18n-tmp.h:728 msgid "HP DeskJet 970C" msgstr "" -#: src/main/xmli18n-tmp.h:677 +#: src/main/xmli18n-tmp.h:729 msgid "HP DeskJet 975C" msgstr "" -#: src/main/xmli18n-tmp.h:678 +#: src/main/xmli18n-tmp.h:730 msgid "HP DeskJet 980C" msgstr "" -#: src/main/xmli18n-tmp.h:679 +#: src/main/xmli18n-tmp.h:731 msgid "HP DeskJet 990C" msgstr "" -#: src/main/xmli18n-tmp.h:680 +#: src/main/xmli18n-tmp.h:732 msgid "HP DeskJet 995C" msgstr "" -#: src/main/xmli18n-tmp.h:681 +#: src/main/xmli18n-tmp.h:733 msgid "HP DeskJet 1100C" msgstr "" -#: src/main/xmli18n-tmp.h:682 +#: src/main/xmli18n-tmp.h:734 msgid "HP DeskJet 1120C" msgstr "" -#: src/main/xmli18n-tmp.h:683 +#: src/main/xmli18n-tmp.h:735 msgid "HP DeskJet 1125C" msgstr "" -#: src/main/xmli18n-tmp.h:684 +#: src/main/xmli18n-tmp.h:736 msgid "HP DeskJet 1200C" msgstr "" -#: src/main/xmli18n-tmp.h:685 +#: src/main/xmli18n-tmp.h:737 msgid "HP DeskJet 1220C" msgstr "" -#: src/main/xmli18n-tmp.h:686 +#: src/main/xmli18n-tmp.h:738 msgid "HP DeskJet 1600C" msgstr "" -#: src/main/xmli18n-tmp.h:687 +#: src/main/xmli18n-tmp.h:739 msgid "HP DeskJet 1600CM" msgstr "" -#: src/main/xmli18n-tmp.h:688 +#: src/main/xmli18n-tmp.h:740 msgid "HP DeskJet 2000" msgstr "" -#: src/main/xmli18n-tmp.h:689 +#: src/main/xmli18n-tmp.h:741 msgid "HP DeskJet 2500" msgstr "" -#: src/main/xmli18n-tmp.h:690 +#: src/main/xmli18n-tmp.h:742 msgid "HP DeskJet 2500CM" msgstr "" -#: src/main/xmli18n-tmp.h:691 +#: src/main/xmli18n-tmp.h:743 msgid "HP DeskJet 340C" msgstr "" -#: src/main/xmli18n-tmp.h:692 +#: src/main/xmli18n-tmp.h:744 msgid "HP DeskJet 3810" msgstr "" -#: src/main/xmli18n-tmp.h:693 +#: src/main/xmli18n-tmp.h:745 msgid "HP DeskJet 3816" msgstr "" -#: src/main/xmli18n-tmp.h:694 +#: src/main/xmli18n-tmp.h:746 msgid "HP DeskJet 3820" msgstr "" -#: src/main/xmli18n-tmp.h:695 +#: src/main/xmli18n-tmp.h:747 msgid "HP DeskJet 3822" msgstr "" -#: src/main/xmli18n-tmp.h:696 +#: src/main/xmli18n-tmp.h:748 msgid "HP LaserJet 2" msgstr "" -#: src/main/xmli18n-tmp.h:697 +#: src/main/xmli18n-tmp.h:749 msgid "HP LaserJet 2D" msgstr "" -#: src/main/xmli18n-tmp.h:698 +#: src/main/xmli18n-tmp.h:750 msgid "HP LaserJet 2P Plus" msgstr "" -#: src/main/xmli18n-tmp.h:699 +#: src/main/xmli18n-tmp.h:751 msgid "HP LaserJet 2P" msgstr "" -#: src/main/xmli18n-tmp.h:700 +#: src/main/xmli18n-tmp.h:752 msgid "HP LaserJet 3" msgstr "" -#: src/main/xmli18n-tmp.h:701 +#: src/main/xmli18n-tmp.h:753 msgid "HP LaserJet 3D" msgstr "" -#: src/main/xmli18n-tmp.h:702 +#: src/main/xmli18n-tmp.h:754 msgid "HP LaserJet 3P w/ PCL5" msgstr "" -#: src/main/xmli18n-tmp.h:703 +#: src/main/xmli18n-tmp.h:755 msgid "HP LaserJet 3P w/PS" msgstr "" -#: src/main/xmli18n-tmp.h:704 +#: src/main/xmli18n-tmp.h:756 msgid "HP LaserJet 4 Plus" msgstr "" -#: src/main/xmli18n-tmp.h:705 +#: src/main/xmli18n-tmp.h:757 msgid "HP LaserJet 4" msgstr "" -#: src/main/xmli18n-tmp.h:706 +#: src/main/xmli18n-tmp.h:758 msgid "HP LaserJet 4L" msgstr "" -#: src/main/xmli18n-tmp.h:707 +#: src/main/xmli18n-tmp.h:759 msgid "HP LaserJet 4M" msgstr "" -#: src/main/xmli18n-tmp.h:708 +#: src/main/xmli18n-tmp.h:760 msgid "HP LaserJet 4ML" msgstr "" -#: src/main/xmli18n-tmp.h:709 +#: src/main/xmli18n-tmp.h:761 msgid "HP LaserJet 4P" msgstr "" -#: src/main/xmli18n-tmp.h:710 +#: src/main/xmli18n-tmp.h:762 msgid "HP LaserJet 4Si" msgstr "" -#: src/main/xmli18n-tmp.h:711 +#: src/main/xmli18n-tmp.h:763 msgid "HP LaserJet 4V" msgstr "" -#: src/main/xmli18n-tmp.h:712 +#: src/main/xmli18n-tmp.h:764 msgid "HP LaserJet 5" msgstr "" -#: src/main/xmli18n-tmp.h:713 +#: src/main/xmli18n-tmp.h:765 msgid "HP LaserJet 5L" msgstr "" -#: src/main/xmli18n-tmp.h:714 +#: src/main/xmli18n-tmp.h:766 msgid "HP LaserJet 5M" msgstr "" -#: src/main/xmli18n-tmp.h:715 +#: src/main/xmli18n-tmp.h:767 msgid "HP LaserJet 5MP" msgstr "" -#: src/main/xmli18n-tmp.h:716 +#: src/main/xmli18n-tmp.h:768 msgid "HP LaserJet 5P" msgstr "" -#: src/main/xmli18n-tmp.h:717 +#: src/main/xmli18n-tmp.h:769 msgid "HP LaserJet 5Si" msgstr "" -#: src/main/xmli18n-tmp.h:718 +#: src/main/xmli18n-tmp.h:770 msgid "HP LaserJet 6" msgstr "" -#: src/main/xmli18n-tmp.h:719 +#: src/main/xmli18n-tmp.h:771 msgid "HP LaserJet 6L" msgstr "" -#: src/main/xmli18n-tmp.h:720 +#: src/main/xmli18n-tmp.h:772 msgid "HP LaserJet 6MP" msgstr "" -#: src/main/xmli18n-tmp.h:721 +#: src/main/xmli18n-tmp.h:773 msgid "HP LaserJet 6P" msgstr "" -#: src/main/xmli18n-tmp.h:722 +#: src/main/xmli18n-tmp.h:774 msgid "HP LaserJet 1010" msgstr "" -#: src/main/xmli18n-tmp.h:723 +#: src/main/xmli18n-tmp.h:775 msgid "HP LaserJet 1012" msgstr "" -#: src/main/xmli18n-tmp.h:724 +#: src/main/xmli18n-tmp.h:776 msgid "HP LaserJet 1015" msgstr "" -#: src/main/xmli18n-tmp.h:725 +#: src/main/xmli18n-tmp.h:777 msgid "HP LaserJet 1022" msgstr "" -#: src/main/xmli18n-tmp.h:726 +#: src/main/xmli18n-tmp.h:778 msgid "HP LaserJet 1100" msgstr "" -#: src/main/xmli18n-tmp.h:727 +#: src/main/xmli18n-tmp.h:779 msgid "HP LaserJet 1100A" msgstr "" -#: src/main/xmli18n-tmp.h:728 +#: src/main/xmli18n-tmp.h:780 msgid "HP LaserJet 1150" msgstr "" -#: src/main/xmli18n-tmp.h:729 +#: src/main/xmli18n-tmp.h:781 msgid "HP LaserJet 1200" msgstr "" -#: src/main/xmli18n-tmp.h:730 +#: src/main/xmli18n-tmp.h:782 msgid "HP LaserJet 1220" msgstr "" -#: src/main/xmli18n-tmp.h:731 +#: src/main/xmli18n-tmp.h:783 msgid "HP LaserJet 1300" msgstr "" -#: src/main/xmli18n-tmp.h:732 +#: src/main/xmli18n-tmp.h:784 msgid "HP LaserJet 2100" msgstr "" -#: src/main/xmli18n-tmp.h:733 +#: src/main/xmli18n-tmp.h:785 msgid "HP LaserJet 2100M" msgstr "" -#: src/main/xmli18n-tmp.h:734 +#: src/main/xmli18n-tmp.h:786 msgid "HP LaserJet 2200" msgstr "" -#: src/main/xmli18n-tmp.h:735 +#: src/main/xmli18n-tmp.h:787 msgid "HP LaserJet 2300" msgstr "" -#: src/main/xmli18n-tmp.h:736 +#: src/main/xmli18n-tmp.h:788 msgid "HP LaserJet 3200" msgstr "" -#: src/main/xmli18n-tmp.h:737 +#: src/main/xmli18n-tmp.h:789 msgid "HP LaserJet 3200m" msgstr "" -#: src/main/xmli18n-tmp.h:738 +#: src/main/xmli18n-tmp.h:790 msgid "HP LaserJet 3200se" msgstr "" -#: src/main/xmli18n-tmp.h:739 +#: src/main/xmli18n-tmp.h:791 msgid "HP LaserJet 3300 MFP" msgstr "" -#: src/main/xmli18n-tmp.h:740 +#: src/main/xmli18n-tmp.h:792 msgid "HP LaserJet 3310 MFP" msgstr "" -#: src/main/xmli18n-tmp.h:741 +#: src/main/xmli18n-tmp.h:793 msgid "HP LaserJet 3320 MFP" msgstr "" -#: src/main/xmli18n-tmp.h:742 +#: src/main/xmli18n-tmp.h:794 msgid "HP LaserJet 3320N MFP" msgstr "" -#: src/main/xmli18n-tmp.h:743 +#: src/main/xmli18n-tmp.h:795 msgid "HP LaserJet 3330 MFP" msgstr "" -#: src/main/xmli18n-tmp.h:744 +#: src/main/xmli18n-tmp.h:796 msgid "HP LaserJet 4000" msgstr "" -#: src/main/xmli18n-tmp.h:745 +#: src/main/xmli18n-tmp.h:797 msgid "HP LaserJet 4050" msgstr "" -#: src/main/xmli18n-tmp.h:746 +#: src/main/xmli18n-tmp.h:798 msgid "HP LaserJet 4100" msgstr "" -#: src/main/xmli18n-tmp.h:747 +#: src/main/xmli18n-tmp.h:799 msgid "HP LaserJet 4200" msgstr "" -#: src/main/xmli18n-tmp.h:748 +#: src/main/xmli18n-tmp.h:800 msgid "HP LaserJet 4300" msgstr "" -#: src/main/xmli18n-tmp.h:749 +#: src/main/xmli18n-tmp.h:801 msgid "HP LaserJet 5000" msgstr "" -#: src/main/xmli18n-tmp.h:750 +#: src/main/xmli18n-tmp.h:802 msgid "HP LaserJet 5100" msgstr "" -#: src/main/xmli18n-tmp.h:751 +#: src/main/xmli18n-tmp.h:803 msgid "HP LaserJet 8000" msgstr "" -#: src/main/xmli18n-tmp.h:752 +#: src/main/xmli18n-tmp.h:804 msgid "HP LaserJet 8100" msgstr "" -#: src/main/xmli18n-tmp.h:753 +#: src/main/xmli18n-tmp.h:805 msgid "HP LaserJet 8150" msgstr "" -#: src/main/xmli18n-tmp.h:754 +#: src/main/xmli18n-tmp.h:806 msgid "HP LaserJet 9000" msgstr "" -#: src/main/xmli18n-tmp.h:755 +#: src/main/xmli18n-tmp.h:807 msgid "HP Mopier 240" msgstr "" -#: src/main/xmli18n-tmp.h:756 +#: src/main/xmli18n-tmp.h:808 msgid "HP Mopier 320" msgstr "" -#: src/main/xmli18n-tmp.h:757 +#: src/main/xmli18n-tmp.h:809 msgid "HP OfficeJet 300" msgstr "" -#: src/main/xmli18n-tmp.h:758 +#: src/main/xmli18n-tmp.h:810 msgid "HP OfficeJet 330" msgstr "" -#: src/main/xmli18n-tmp.h:759 +#: src/main/xmli18n-tmp.h:811 msgid "HP OfficeJet 350" msgstr "" -#: src/main/xmli18n-tmp.h:760 +#: src/main/xmli18n-tmp.h:812 msgid "HP OfficeJet 500" msgstr "" -#: src/main/xmli18n-tmp.h:761 +#: src/main/xmli18n-tmp.h:813 msgid "HP OfficeJet 520" msgstr "" -#: src/main/xmli18n-tmp.h:762 +#: src/main/xmli18n-tmp.h:814 msgid "HP OfficeJet 570" msgstr "" -#: src/main/xmli18n-tmp.h:763 +#: src/main/xmli18n-tmp.h:815 msgid "HP OfficeJet 580" msgstr "" -#: src/main/xmli18n-tmp.h:764 +#: src/main/xmli18n-tmp.h:816 msgid "HP OfficeJet 590" msgstr "" -#: src/main/xmli18n-tmp.h:765 +#: src/main/xmli18n-tmp.h:817 msgid "HP OfficeJet 600" msgstr "" -#: src/main/xmli18n-tmp.h:766 +#: src/main/xmli18n-tmp.h:818 msgid "HP OfficeJet 610" msgstr "" -#: src/main/xmli18n-tmp.h:767 +#: src/main/xmli18n-tmp.h:819 msgid "HP OfficeJet 625" msgstr "" -#: src/main/xmli18n-tmp.h:768 +#: src/main/xmli18n-tmp.h:820 msgid "HP OfficeJet 630" msgstr "" -#: src/main/xmli18n-tmp.h:769 +#: src/main/xmli18n-tmp.h:821 msgid "HP OfficeJet 635" msgstr "" -#: src/main/xmli18n-tmp.h:770 +#: src/main/xmli18n-tmp.h:822 msgid "HP OfficeJet 700" msgstr "" -#: src/main/xmli18n-tmp.h:771 +#: src/main/xmli18n-tmp.h:823 msgid "HP OfficeJet 710" msgstr "" -#: src/main/xmli18n-tmp.h:772 +#: src/main/xmli18n-tmp.h:824 msgid "HP OfficeJet 720" msgstr "" -#: src/main/xmli18n-tmp.h:773 +#: src/main/xmli18n-tmp.h:825 msgid "HP OfficeJet 725" msgstr "" -#: src/main/xmli18n-tmp.h:774 +#: src/main/xmli18n-tmp.h:826 msgid "HP OfficeJet 5105" msgstr "" -#: src/main/xmli18n-tmp.h:775 +#: src/main/xmli18n-tmp.h:827 msgid "HP OfficeJet 5110" msgstr "" -#: src/main/xmli18n-tmp.h:776 +#: src/main/xmli18n-tmp.h:828 msgid "HP OfficeJet 5110xi" msgstr "" -#: src/main/xmli18n-tmp.h:777 +#: src/main/xmli18n-tmp.h:829 msgid "HP OfficeJet 6105" msgstr "" -#: src/main/xmli18n-tmp.h:778 +#: src/main/xmli18n-tmp.h:830 msgid "HP OfficeJet 6110" msgstr "" -#: src/main/xmli18n-tmp.h:779 +#: src/main/xmli18n-tmp.h:831 msgid "HP OfficeJet 7110" msgstr "" -#: src/main/xmli18n-tmp.h:780 +#: src/main/xmli18n-tmp.h:832 msgid "HP OfficeJet 7130" msgstr "" -#: src/main/xmli18n-tmp.h:781 +#: src/main/xmli18n-tmp.h:833 msgid "HP OfficeJet 7140" msgstr "" -#: src/main/xmli18n-tmp.h:782 +#: src/main/xmli18n-tmp.h:834 msgid "HP OfficeJet D125" msgstr "" -#: src/main/xmli18n-tmp.h:783 +#: src/main/xmli18n-tmp.h:835 msgid "HP OfficeJet D135" msgstr "" -#: src/main/xmli18n-tmp.h:784 +#: src/main/xmli18n-tmp.h:836 msgid "HP OfficeJet D145" msgstr "" -#: src/main/xmli18n-tmp.h:785 +#: src/main/xmli18n-tmp.h:837 msgid "HP OfficeJet D155" msgstr "" -#: src/main/xmli18n-tmp.h:786 +#: src/main/xmli18n-tmp.h:838 msgid "HP OfficeJet G55" msgstr "" -#: src/main/xmli18n-tmp.h:787 +#: src/main/xmli18n-tmp.h:839 msgid "HP OfficeJet G85" msgstr "" -#: src/main/xmli18n-tmp.h:788 +#: src/main/xmli18n-tmp.h:840 msgid "HP OfficeJet G95" msgstr "" -#: src/main/xmli18n-tmp.h:789 +#: src/main/xmli18n-tmp.h:841 msgid "HP OfficeJet K60" msgstr "" -#: src/main/xmli18n-tmp.h:790 +#: src/main/xmli18n-tmp.h:842 msgid "HP OfficeJet K60xi" msgstr "" -#: src/main/xmli18n-tmp.h:791 +#: src/main/xmli18n-tmp.h:843 msgid "HP OfficeJet K80" msgstr "" -#: src/main/xmli18n-tmp.h:792 +#: src/main/xmli18n-tmp.h:844 msgid "HP OfficeJet K80xi" msgstr "" -#: src/main/xmli18n-tmp.h:793 +#: src/main/xmli18n-tmp.h:845 msgid "HP OfficeJet LX" msgstr "" -#: src/main/xmli18n-tmp.h:794 +#: src/main/xmli18n-tmp.h:846 msgid "HP OfficeJet Pro 1150C" msgstr "" -#: src/main/xmli18n-tmp.h:795 +#: src/main/xmli18n-tmp.h:847 msgid "HP OfficeJet Pro 1170C" msgstr "" -#: src/main/xmli18n-tmp.h:796 +#: src/main/xmli18n-tmp.h:848 msgid "HP OfficeJet Pro 1175C" msgstr "" -#: src/main/xmli18n-tmp.h:797 +#: src/main/xmli18n-tmp.h:849 msgid "HP OfficeJet R40" msgstr "" -#: src/main/xmli18n-tmp.h:798 +#: src/main/xmli18n-tmp.h:850 msgid "HP OfficeJet R45" msgstr "" -#: src/main/xmli18n-tmp.h:799 +#: src/main/xmli18n-tmp.h:851 msgid "HP OfficeJet R60" msgstr "" -#: src/main/xmli18n-tmp.h:800 +#: src/main/xmli18n-tmp.h:852 msgid "HP OfficeJet R65" msgstr "" -#: src/main/xmli18n-tmp.h:801 +#: src/main/xmli18n-tmp.h:853 msgid "HP OfficeJet R80" msgstr "" -#: src/main/xmli18n-tmp.h:802 +#: src/main/xmli18n-tmp.h:854 msgid "HP OfficeJet T45" msgstr "" -#: src/main/xmli18n-tmp.h:803 +#: src/main/xmli18n-tmp.h:855 msgid "HP OfficeJet T65" msgstr "" -#: src/main/xmli18n-tmp.h:804 +#: src/main/xmli18n-tmp.h:856 msgid "HP OfficeJet V40" msgstr "" -#: src/main/xmli18n-tmp.h:805 +#: src/main/xmli18n-tmp.h:857 msgid "HP OfficeJet V40xi" msgstr "" -#: src/main/xmli18n-tmp.h:806 +#: src/main/xmli18n-tmp.h:858 msgid "HP OfficeJet" msgstr "" -#: src/main/xmli18n-tmp.h:807 +#: src/main/xmli18n-tmp.h:859 msgid "HP PSC 370" msgstr "" -#: src/main/xmli18n-tmp.h:808 +#: src/main/xmli18n-tmp.h:860 msgid "HP PSC 380" msgstr "" -#: src/main/xmli18n-tmp.h:809 +#: src/main/xmli18n-tmp.h:861 msgid "HP PSC 500" msgstr "" -#: src/main/xmli18n-tmp.h:810 +#: src/main/xmli18n-tmp.h:862 msgid "HP PSC 750" msgstr "" -#: src/main/xmli18n-tmp.h:811 +#: src/main/xmli18n-tmp.h:863 msgid "HP PSC 950" msgstr "" -#: src/main/xmli18n-tmp.h:812 +#: src/main/xmli18n-tmp.h:864 msgid "HP PSC 950xi" msgstr "" -#: src/main/xmli18n-tmp.h:813 +#: src/main/xmli18n-tmp.h:865 msgid "HP PSC 2110" msgstr "" -#: src/main/xmli18n-tmp.h:814 +#: src/main/xmli18n-tmp.h:866 msgid "HP PSC 2150" msgstr "" -#: src/main/xmli18n-tmp.h:815 +#: src/main/xmli18n-tmp.h:867 msgid "HP PSC 2210" msgstr "" -#: src/main/xmli18n-tmp.h:816 +#: src/main/xmli18n-tmp.h:868 msgid "HP PhotoSmart 7150" msgstr "" -#: src/main/xmli18n-tmp.h:817 +#: src/main/xmli18n-tmp.h:869 msgid "HP PhotoSmart 7345" msgstr "" -#: src/main/xmli18n-tmp.h:818 +#: src/main/xmli18n-tmp.h:870 msgid "HP PhotoSmart 7350" msgstr "" -#: src/main/xmli18n-tmp.h:819 +#: src/main/xmli18n-tmp.h:871 msgid "HP PhotoSmart 7550" msgstr "" -#: src/main/xmli18n-tmp.h:820 +#: src/main/xmli18n-tmp.h:872 msgid "HP PhotoSmart P100" msgstr "" -#: src/main/xmli18n-tmp.h:821 +#: src/main/xmli18n-tmp.h:873 msgid "HP PhotoSmart P130" msgstr "" -#: src/main/xmli18n-tmp.h:822 +#: src/main/xmli18n-tmp.h:874 msgid "HP PhotoSmart P230" msgstr "" -#: src/main/xmli18n-tmp.h:823 +#: src/main/xmli18n-tmp.h:875 msgid "HP PhotoSmart P1000" msgstr "" -#: src/main/xmli18n-tmp.h:824 +#: src/main/xmli18n-tmp.h:876 msgid "HP PhotoSmart P1100" msgstr "" -#: src/main/xmli18n-tmp.h:825 +#: src/main/xmli18n-tmp.h:877 msgid "HP PhotoSmart P1115" msgstr "" -#: src/main/xmli18n-tmp.h:826 +#: src/main/xmli18n-tmp.h:878 msgid "HP PhotoSmart P1215" msgstr "" -#: src/main/xmli18n-tmp.h:827 +#: src/main/xmli18n-tmp.h:879 msgid "HP PhotoSmart P1218" msgstr "" -#: src/main/xmli18n-tmp.h:828 +#: src/main/xmli18n-tmp.h:880 msgid "HP PhotoSmart P1315" msgstr "" -#: src/main/xmli18n-tmp.h:829 +#: src/main/xmli18n-tmp.h:881 #, fuzzy msgid "HP e-printer e20" msgstr "Drucker Name:" -#: src/main/xmli18n-tmp.h:830 +#: src/main/xmli18n-tmp.h:882 msgid "IBM 4019" msgstr "" -#: src/main/xmli18n-tmp.h:831 +#: src/main/xmli18n-tmp.h:883 msgid "IBM 4029 030 LaserPrinter 10" msgstr "" -#: src/main/xmli18n-tmp.h:832 +#: src/main/xmli18n-tmp.h:884 msgid "IBM 4312" msgstr "" -#: src/main/xmli18n-tmp.h:833 +#: src/main/xmli18n-tmp.h:885 msgid "IBM Infoprint 12" msgstr "" -#: src/main/xmli18n-tmp.h:834 +#: src/main/xmli18n-tmp.h:886 msgid "IBM Page Printer 3112" msgstr "" -#: src/main/xmli18n-tmp.h:835 +#: src/main/xmli18n-tmp.h:887 msgid "Infotec 4651 MF" msgstr "" -#: src/main/xmli18n-tmp.h:836 +#: src/main/xmli18n-tmp.h:888 msgid "Kyocera F-1010" msgstr "" -#: src/main/xmli18n-tmp.h:837 +#: src/main/xmli18n-tmp.h:889 msgid "Kyocera FS-600 - KPDL-2" msgstr "" -#: src/main/xmli18n-tmp.h:838 +#: src/main/xmli18n-tmp.h:890 msgid "Kyocera FS-600" msgstr "" -#: src/main/xmli18n-tmp.h:839 +#: src/main/xmli18n-tmp.h:891 msgid "Kyocera FS-680" msgstr "" -#: src/main/xmli18n-tmp.h:840 +#: src/main/xmli18n-tmp.h:892 msgid "Kyocera FS-800" msgstr "" -#: src/main/xmli18n-tmp.h:841 +#: src/main/xmli18n-tmp.h:893 msgid "Kyocera FS-1000" msgstr "" -#: src/main/xmli18n-tmp.h:842 +#: src/main/xmli18n-tmp.h:894 msgid "Kyocera FS-1000+" msgstr "" -#: src/main/xmli18n-tmp.h:843 +#: src/main/xmli18n-tmp.h:895 msgid "Kyocera FS-1010" msgstr "" -#: src/main/xmli18n-tmp.h:844 +#: src/main/xmli18n-tmp.h:896 msgid "Kyocera FS-1050" msgstr "" -#: src/main/xmli18n-tmp.h:845 +#: src/main/xmli18n-tmp.h:897 msgid "Kyocera FS-1200" msgstr "" -#: src/main/xmli18n-tmp.h:846 +#: src/main/xmli18n-tmp.h:898 msgid "Kyocera FS-1600" msgstr "" -#: src/main/xmli18n-tmp.h:847 +#: src/main/xmli18n-tmp.h:899 msgid "Kyocera FS-1600+" msgstr "" -#: src/main/xmli18n-tmp.h:848 +#: src/main/xmli18n-tmp.h:900 msgid "Kyocera FS-1700" msgstr "" -#: src/main/xmli18n-tmp.h:849 +#: src/main/xmli18n-tmp.h:901 msgid "Kyocera FS-1700+" msgstr "" -#: src/main/xmli18n-tmp.h:850 +#: src/main/xmli18n-tmp.h:902 msgid "Kyocera FS-1750" msgstr "" -#: src/main/xmli18n-tmp.h:851 +#: src/main/xmli18n-tmp.h:903 msgid "Kyocera FS-1800" msgstr "" -#: src/main/xmli18n-tmp.h:852 +#: src/main/xmli18n-tmp.h:904 msgid "Kyocera FS-1800+" msgstr "" -#: src/main/xmli18n-tmp.h:853 +#: src/main/xmli18n-tmp.h:905 msgid "Kyocera FS-1900" msgstr "" -#: src/main/xmli18n-tmp.h:854 +#: src/main/xmli18n-tmp.h:906 msgid "Kyocera FS-3500" msgstr "" -#: src/main/xmli18n-tmp.h:855 +#: src/main/xmli18n-tmp.h:907 msgid "Kyocera FS-3600" msgstr "" -#: src/main/xmli18n-tmp.h:856 +#: src/main/xmli18n-tmp.h:908 msgid "Kyocera FS-3600+" msgstr "" -#: src/main/xmli18n-tmp.h:857 +#: src/main/xmli18n-tmp.h:909 msgid "Kyocera FS-3700" msgstr "" -#: src/main/xmli18n-tmp.h:858 +#: src/main/xmli18n-tmp.h:910 msgid "Kyocera FS-3700+" msgstr "" -#: src/main/xmli18n-tmp.h:859 +#: src/main/xmli18n-tmp.h:911 msgid "Kyocera FS-3750" msgstr "" -#: src/main/xmli18n-tmp.h:860 +#: src/main/xmli18n-tmp.h:912 msgid "Kyocera FS-3800" msgstr "" -#: src/main/xmli18n-tmp.h:861 +#: src/main/xmli18n-tmp.h:913 msgid "Kyocera FS-5800C" msgstr "" -#: src/main/xmli18n-tmp.h:862 +#: src/main/xmli18n-tmp.h:914 msgid "Kyocera FS-5900C" msgstr "" -#: src/main/xmli18n-tmp.h:863 +#: src/main/xmli18n-tmp.h:915 msgid "Kyocera FS-6500" msgstr "" -#: src/main/xmli18n-tmp.h:864 +#: src/main/xmli18n-tmp.h:916 msgid "Kyocera FS-6500+" msgstr "" -#: src/main/xmli18n-tmp.h:865 +#: src/main/xmli18n-tmp.h:917 msgid "Kyocera FS-6700" msgstr "" -#: src/main/xmli18n-tmp.h:866 +#: src/main/xmli18n-tmp.h:918 msgid "Kyocera FS-7000" msgstr "" -#: src/main/xmli18n-tmp.h:867 +#: src/main/xmli18n-tmp.h:919 msgid "Kyocera FS-7000+" msgstr "" -#: src/main/xmli18n-tmp.h:868 +#: src/main/xmli18n-tmp.h:920 msgid "Kyocera FS-8000C" msgstr "" -#: src/main/xmli18n-tmp.h:869 +#: src/main/xmli18n-tmp.h:921 msgid "Kyocera FS-9000" msgstr "" -#: src/main/xmli18n-tmp.h:870 +#: src/main/xmli18n-tmp.h:922 msgid "Kyocera FS-9100DN" msgstr "" -#: src/main/xmli18n-tmp.h:871 +#: src/main/xmli18n-tmp.h:923 msgid "Kyocera FS-9500DN" msgstr "" -#: src/main/xmli18n-tmp.h:872 +#: src/main/xmli18n-tmp.h:924 msgid "Kyocera KM-1530" msgstr "" -#: src/main/xmli18n-tmp.h:873 +#: src/main/xmli18n-tmp.h:925 msgid "Kyocera KM-1810" msgstr "" -#: src/main/xmli18n-tmp.h:874 +#: src/main/xmli18n-tmp.h:926 msgid "Kyocera KM-2030" msgstr "" -#: src/main/xmli18n-tmp.h:875 +#: src/main/xmli18n-tmp.h:927 msgid "Kyocera KM-2530" msgstr "" -#: src/main/xmli18n-tmp.h:876 +#: src/main/xmli18n-tmp.h:928 msgid "Kyocera KM-3530" msgstr "" -#: src/main/xmli18n-tmp.h:877 +#: src/main/xmli18n-tmp.h:929 msgid "Kyocera KM-4230" msgstr "" -#: src/main/xmli18n-tmp.h:878 +#: src/main/xmli18n-tmp.h:930 msgid "Kyocera KM-4530" msgstr "" -#: src/main/xmli18n-tmp.h:879 +#: src/main/xmli18n-tmp.h:931 msgid "Kyocera KM-5230" msgstr "" -#: src/main/xmli18n-tmp.h:880 +#: src/main/xmli18n-tmp.h:932 msgid "Kyocera KM-5530" msgstr "" -#: src/main/xmli18n-tmp.h:881 +#: src/main/xmli18n-tmp.h:933 msgid "Kyocera KM-6230" msgstr "" -#: src/main/xmli18n-tmp.h:882 +#: src/main/xmli18n-tmp.h:934 msgid "Lexmark 4076" msgstr "" -#: src/main/xmli18n-tmp.h:883 +#: src/main/xmli18n-tmp.h:935 msgid "Lexmark Optra E" msgstr "" -#: src/main/xmli18n-tmp.h:884 +#: src/main/xmli18n-tmp.h:936 msgid "Lexmark Optra E+" msgstr "" -#: src/main/xmli18n-tmp.h:885 +#: src/main/xmli18n-tmp.h:937 msgid "Lexmark Optra E220" msgstr "" -#: src/main/xmli18n-tmp.h:886 +#: src/main/xmli18n-tmp.h:938 msgid "Lexmark Valuewriter 300" msgstr "" -#: src/main/xmli18n-tmp.h:887 +#: src/main/xmli18n-tmp.h:939 msgid "Minolta PagePro 6" msgstr "" -#: src/main/xmli18n-tmp.h:888 +#: src/main/xmli18n-tmp.h:940 msgid "Minolta PagePro 6e" msgstr "" -#: src/main/xmli18n-tmp.h:889 +#: src/main/xmli18n-tmp.h:941 msgid "Minolta PagePro 6ex" msgstr "" -#: src/main/xmli18n-tmp.h:890 +#: src/main/xmli18n-tmp.h:942 msgid "Minolta PagePro 8" msgstr "" -#: src/main/xmli18n-tmp.h:891 +#: src/main/xmli18n-tmp.h:943 msgid "Minolta PagePro 8L" msgstr "" -#: src/main/xmli18n-tmp.h:892 +#: src/main/xmli18n-tmp.h:944 msgid "Minolta PagePro 1100" msgstr "" -#: src/main/xmli18n-tmp.h:893 +#: src/main/xmli18n-tmp.h:945 msgid "NEC SuperScript 660i" msgstr "" -#: src/main/xmli18n-tmp.h:894 +#: src/main/xmli18n-tmp.h:946 msgid "NEC SuperScript 860" msgstr "" -#: src/main/xmli18n-tmp.h:895 +#: src/main/xmli18n-tmp.h:947 msgid "NEC SuperScript 870" msgstr "" -#: src/main/xmli18n-tmp.h:896 +#: src/main/xmli18n-tmp.h:948 msgid "NEC SuperScript 1260" msgstr "" -#: src/main/xmli18n-tmp.h:897 +#: src/main/xmli18n-tmp.h:949 msgid "NEC SuperScript 1400" msgstr "" -#: src/main/xmli18n-tmp.h:898 +#: src/main/xmli18n-tmp.h:950 msgid "NEC SuperScript 1800" msgstr "" -#: src/main/xmli18n-tmp.h:899 +#: src/main/xmli18n-tmp.h:951 msgid "Okidata OL400" msgstr "" -#: src/main/xmli18n-tmp.h:900 +#: src/main/xmli18n-tmp.h:952 msgid "Okidata OL400e" msgstr "" -#: src/main/xmli18n-tmp.h:901 +#: src/main/xmli18n-tmp.h:953 msgid "Okidata OL400ex" msgstr "" -#: src/main/xmli18n-tmp.h:902 +#: src/main/xmli18n-tmp.h:954 msgid "Okidata OL410e" msgstr "" -#: src/main/xmli18n-tmp.h:903 +#: src/main/xmli18n-tmp.h:955 msgid "Okidata OL600e" msgstr "" -#: src/main/xmli18n-tmp.h:904 +#: src/main/xmli18n-tmp.h:956 msgid "Okidata OL610e/S" msgstr "" -#: src/main/xmli18n-tmp.h:905 +#: src/main/xmli18n-tmp.h:957 msgid "Okidata OL800" msgstr "" -#: src/main/xmli18n-tmp.h:906 +#: src/main/xmli18n-tmp.h:958 msgid "Okidata OL810ex" msgstr "" -#: src/main/xmli18n-tmp.h:907 +#: src/main/xmli18n-tmp.h:959 msgid "Okidata Okipage 6e" msgstr "" -#: src/main/xmli18n-tmp.h:908 +#: src/main/xmli18n-tmp.h:960 msgid "Okidata Okipage 6ex" msgstr "" -#: src/main/xmli18n-tmp.h:909 +#: src/main/xmli18n-tmp.h:961 msgid "Okidata Okipage 8p" msgstr "" -#: src/main/xmli18n-tmp.h:910 +#: src/main/xmli18n-tmp.h:962 msgid "Okidata Okipage 10e" msgstr "" -#: src/main/xmli18n-tmp.h:911 +#: src/main/xmli18n-tmp.h:963 msgid "Okidata Okipage 10ex" msgstr "" -#: src/main/xmli18n-tmp.h:912 +#: src/main/xmli18n-tmp.h:964 msgid "Okidata Okipage 14ex" msgstr "" -#: src/main/xmli18n-tmp.h:913 +#: src/main/xmli18n-tmp.h:965 msgid "Okidata Super 6e" msgstr "" -#: src/main/xmli18n-tmp.h:914 +#: src/main/xmli18n-tmp.h:966 msgid "Olivetti JP350S" msgstr "" -#: src/main/xmli18n-tmp.h:915 +#: src/main/xmli18n-tmp.h:967 msgid "Olivetti PG 306" msgstr "" -#: src/main/xmli18n-tmp.h:916 +#: src/main/xmli18n-tmp.h:968 msgid "PCPI 1030" msgstr "" -#: src/main/xmli18n-tmp.h:917 +#: src/main/xmli18n-tmp.h:969 msgid "Panasonic KX-P4410" msgstr "" -#: src/main/xmli18n-tmp.h:918 +#: src/main/xmli18n-tmp.h:970 msgid "Panasonic KX-P4450" msgstr "" -#: src/main/xmli18n-tmp.h:919 +#: src/main/xmli18n-tmp.h:971 msgid "Panasonic KX-P6150" msgstr "" -#: src/main/xmli18n-tmp.h:920 +#: src/main/xmli18n-tmp.h:972 msgid "Panasonic KX-P6500" msgstr "" -#: src/main/xmli18n-tmp.h:921 +#: src/main/xmli18n-tmp.h:973 msgid "Raven LP-410" msgstr "" -#: src/main/xmli18n-tmp.h:922 +#: src/main/xmli18n-tmp.h:974 msgid "Ricoh Aficio 220" msgstr "" -#: src/main/xmli18n-tmp.h:923 +#: src/main/xmli18n-tmp.h:975 msgid "Ricoh Aficio 401" msgstr "" -#: src/main/xmli18n-tmp.h:924 +#: src/main/xmli18n-tmp.h:976 msgid "Ricoh Aficio 700" msgstr "" -#: src/main/xmli18n-tmp.h:925 +#: src/main/xmli18n-tmp.h:977 msgid "Samsung ML-85" msgstr "" -#: src/main/xmli18n-tmp.h:926 +#: src/main/xmli18n-tmp.h:978 msgid "Samsung ML-4600" msgstr "" -#: src/main/xmli18n-tmp.h:927 +#: src/main/xmli18n-tmp.h:979 msgid "Samsung ML-5000a" msgstr "" -#: src/main/xmli18n-tmp.h:928 +#: src/main/xmli18n-tmp.h:980 msgid "Samsung ML-6000" msgstr "" -#: src/main/xmli18n-tmp.h:929 +#: src/main/xmli18n-tmp.h:981 msgid "Samsung ML-6100" msgstr "" -#: src/main/xmli18n-tmp.h:930 +#: src/main/xmli18n-tmp.h:982 msgid "Samsung ML-7000" msgstr "" -#: src/main/xmli18n-tmp.h:931 +#: src/main/xmli18n-tmp.h:983 msgid "Samsung ML-7000N" msgstr "" -#: src/main/xmli18n-tmp.h:932 +#: src/main/xmli18n-tmp.h:984 msgid "Samsung ML-7000P" msgstr "" -#: src/main/xmli18n-tmp.h:933 +#: src/main/xmli18n-tmp.h:985 msgid "Samsung ML-7050" msgstr "" -#: src/main/xmli18n-tmp.h:934 +#: src/main/xmli18n-tmp.h:986 msgid "Samsung QL-5100A" msgstr "" -#: src/main/xmli18n-tmp.h:935 +#: src/main/xmli18n-tmp.h:987 msgid "Samsung QL-6050" msgstr "" -#: src/main/xmli18n-tmp.h:936 +#: src/main/xmli18n-tmp.h:988 msgid "Seiko SpeedJET 200" msgstr "" -#: src/main/xmli18n-tmp.h:937 +#: src/main/xmli18n-tmp.h:989 msgid "Sharp AR-161" msgstr "" -#: src/main/xmli18n-tmp.h:938 +#: src/main/xmli18n-tmp.h:990 msgid "Sharp AR-M257" msgstr "" -#: src/main/xmli18n-tmp.h:939 +#: src/main/xmli18n-tmp.h:991 msgid "Sony IJP-V100" msgstr "" -#: src/main/xmli18n-tmp.h:940 +#: src/main/xmli18n-tmp.h:992 msgid "Star LS-04" msgstr "" -#: src/main/xmli18n-tmp.h:941 +#: src/main/xmli18n-tmp.h:993 #, fuzzy msgid "Star LaserPrinter 8" msgstr "Drucker einrichten" -#: src/main/xmli18n-tmp.h:942 +#: src/main/xmli18n-tmp.h:994 msgid "Tally MT908" msgstr "" -#: src/main/xmli18n-tmp.h:943 +#: src/main/xmli18n-tmp.h:995 msgid "Xerox Able 1406" msgstr "" -#: src/main/xmli18n-tmp.h:944 +#: src/main/xmli18n-tmp.h:996 msgid "Xerox DocuPrint 4508" msgstr "" -#: src/main/xmli18n-tmp.h:945 +#: src/main/xmli18n-tmp.h:997 msgid "Xerox DocuPrint C20" msgstr "" -#: src/main/xmli18n-tmp.h:946 +#: src/main/xmli18n-tmp.h:998 msgid "Xerox DocuPrint N4512" msgstr "" -#: src/main/xmli18n-tmp.h:947 +#: src/main/xmli18n-tmp.h:999 msgid "Xerox DocuPrint N4512PS" msgstr "" -#: src/main/xmli18n-tmp.h:948 +#: src/main/xmli18n-tmp.h:1000 msgid "Xerox DocuPrint P12" msgstr "" -#: src/main/xmli18n-tmp.h:949 +#: src/main/xmli18n-tmp.h:1001 msgid "Xerox DocuPrint P1202" msgstr "" -#: src/main/xmli18n-tmp.h:950 +#: src/main/xmli18n-tmp.h:1002 msgid "Xerox DocuPrint P8e" msgstr "" -#: src/main/xmli18n-tmp.h:951 +#: src/main/xmli18n-tmp.h:1003 msgid "Xerox Document Centre 400" msgstr "" -#: src/main/xmli18n-tmp.h:952 +#: src/main/xmli18n-tmp.h:1004 msgid "Xerox WorkCentre M118" msgstr "" -#: src/main/xmli18n-tmp.h:953 +#: src/main/xmli18n-tmp.h:1005 msgid "Compaq IJ1200" msgstr "" -#: src/main/xmli18n-tmp.h:954 +#: src/main/xmli18n-tmp.h:1006 msgid "Lexmark X73" msgstr "" -#: src/main/xmli18n-tmp.h:955 +#: src/main/xmli18n-tmp.h:1007 msgid "Lexmark Z42" msgstr "" -#: src/main/xmli18n-tmp.h:956 +#: src/main/xmli18n-tmp.h:1008 msgid "Lexmark Z43" msgstr "" -#: src/main/xmli18n-tmp.h:957 +#: src/main/xmli18n-tmp.h:1009 msgid "Lexmark Z52" msgstr "" -#: src/main/xmli18n-tmp.h:958 +#: src/main/xmli18n-tmp.h:1010 msgid "Lexmark Z53" msgstr "" -#: src/main/xmli18n-tmp.h:959 +#: src/main/xmli18n-tmp.h:1011 msgid "Olympus P-10" msgstr "" -#: src/main/xmli18n-tmp.h:960 +#: src/main/xmli18n-tmp.h:1012 msgid "Olympus P-11" msgstr "" -#: src/main/xmli18n-tmp.h:961 +#: src/main/xmli18n-tmp.h:1013 msgid "Olympus P-200" msgstr "" -#: src/main/xmli18n-tmp.h:962 +#: src/main/xmli18n-tmp.h:1014 msgid "Olympus P-300" msgstr "" -#: src/main/xmli18n-tmp.h:963 +#: src/main/xmli18n-tmp.h:1015 msgid "Olympus P-300E" msgstr "" -#: src/main/xmli18n-tmp.h:964 +#: src/main/xmli18n-tmp.h:1016 msgid "Olympus P-300U" msgstr "" -#: src/main/xmli18n-tmp.h:965 +#: src/main/xmli18n-tmp.h:1017 msgid "Olympus P-330E" msgstr "" -#: src/main/xmli18n-tmp.h:966 +#: src/main/xmli18n-tmp.h:1018 msgid "Olympus P-330NE" msgstr "" -#: src/main/xmli18n-tmp.h:967 +#: src/main/xmli18n-tmp.h:1019 msgid "Olympus P-400" msgstr "" -#: src/main/xmli18n-tmp.h:968 +#: src/main/xmli18n-tmp.h:1020 msgid "Olympus P-440" msgstr "" -#: src/main/xmli18n-tmp.h:969 +#: src/main/xmli18n-tmp.h:1021 msgid "Olympus P-S100" msgstr "" -#: src/main/xmli18n-tmp.h:970 +#: src/main/xmli18n-tmp.h:1022 msgid "Canon CP-10" msgstr "" -#: src/main/xmli18n-tmp.h:971 +#: src/main/xmli18n-tmp.h:1023 msgid "Canon CP-100" msgstr "" -#: src/main/xmli18n-tmp.h:972 +#: src/main/xmli18n-tmp.h:1024 msgid "Canon CP-200" msgstr "" -#: src/main/xmli18n-tmp.h:973 +#: src/main/xmli18n-tmp.h:1025 msgid "Canon CP-220" msgstr "" -#: src/main/xmli18n-tmp.h:974 +#: src/main/xmli18n-tmp.h:1026 msgid "Canon CP-300" msgstr "" -#: src/main/xmli18n-tmp.h:975 +#: src/main/xmli18n-tmp.h:1027 msgid "Canon CP-330" msgstr "" -#: src/main/xmli18n-tmp.h:976 +#: src/main/xmli18n-tmp.h:1028 msgid "Canon SELPHY-CP-400" msgstr "" -#: src/main/xmli18n-tmp.h:977 +#: src/main/xmli18n-tmp.h:1029 msgid "Canon SELPHY-CP-500" msgstr "" -#: src/main/xmli18n-tmp.h:978 +#: src/main/xmli18n-tmp.h:1030 msgid "Canon SELPHY-CP-510" msgstr "" -#: src/main/xmli18n-tmp.h:979 +#: src/main/xmli18n-tmp.h:1031 msgid "Canon SELPHY-CP-600" msgstr "" -#: src/main/xmli18n-tmp.h:980 +#: src/main/xmli18n-tmp.h:1032 msgid "Canon SELPHY-CP-710" msgstr "" -#: src/main/xmli18n-tmp.h:981 +#: src/main/xmli18n-tmp.h:1033 msgid "Canon SELPHY-CP-720" msgstr "" -#: src/main/xmli18n-tmp.h:982 +#: src/main/xmli18n-tmp.h:1034 msgid "Canon SELPHY-CP-730" msgstr "" -#: src/main/xmli18n-tmp.h:983 +#: src/main/xmli18n-tmp.h:1035 msgid "Canon SELPHY-CP-740" msgstr "" -#: src/main/xmli18n-tmp.h:984 +#: src/main/xmli18n-tmp.h:1036 msgid "Canon SELPHY-CP-750" msgstr "" -#: src/main/xmli18n-tmp.h:985 +#: src/main/xmli18n-tmp.h:1037 msgid "Canon SELPHY ES1" msgstr "" -#: src/main/xmli18n-tmp.h:986 +#: src/main/xmli18n-tmp.h:1038 msgid "Canon SELPHY ES2" msgstr "" -#: src/main/xmli18n-tmp.h:987 +#: src/main/xmli18n-tmp.h:1039 msgid "Canon SELPHY ES20" msgstr "" -#: src/main/xmli18n-tmp.h:988 +#: src/main/xmli18n-tmp.h:1040 msgid "Sony DPP-EX5" msgstr "" -#: src/main/xmli18n-tmp.h:989 +#: src/main/xmli18n-tmp.h:1041 msgid "Sony DPP-EX7" msgstr "" -#: src/main/xmli18n-tmp.h:990 +#: src/main/xmli18n-tmp.h:1042 msgid "Sony UP-DP10" msgstr "" -#: src/main/xmli18n-tmp.h:991 +#: src/main/xmli18n-tmp.h:1043 msgid "Sony UP-DR100" msgstr "" -#: src/main/xmli18n-tmp.h:992 +#: src/main/xmli18n-tmp.h:1044 msgid "Sony UP-DR150" msgstr "" -#: src/main/xmli18n-tmp.h:993 +#: src/main/xmli18n-tmp.h:1045 msgid "Fujifilm Printpix-CX-400" msgstr "" -#: src/main/xmli18n-tmp.h:994 +#: src/main/xmli18n-tmp.h:1046 msgid "Fujifilm Printpix-CX-550" msgstr "" -#: src/main/xmli18n-tmp.h:995 +#: src/main/xmli18n-tmp.h:1047 msgid "Fujifilm FinePix-NX-500" msgstr "" -#: src/main/xmli18n-tmp.h:996 +#: src/main/xmli18n-tmp.h:1048 msgid "Kodak Easyshare-Printer-Dock" msgstr "" -#: src/main/xmli18n-tmp.h:997 +#: src/main/xmli18n-tmp.h:1049 msgid "Shinko CHC-S9045" msgstr "" -#: src/main/xmli18n-tmp.h:998 +#: src/main/xmli18n-tmp.h:1050 msgid "RAW DATA 16 bit" msgstr "" -#: src/main/xmli18n-tmp.h:999 +#: src/main/xmli18n-tmp.h:1051 msgid "RAW DATA 8 bit" msgstr "" -#: src/gutenprintui/panel.c:274 src/gutenprintui2/panel.c:274 +#: src/gutenprintui2/curve.c:130 +#, fuzzy +msgid "Curve type" +msgstr "Schwarz" + +#: src/gutenprintui2/curve.c:131 +msgid "Is this curve linear, spline interpolated, or free-form" +msgstr "" + +#: src/gutenprintui2/curve.c:139 +msgid "Minimum X" +msgstr "" + +#: src/gutenprintui2/curve.c:140 +msgid "Minimum possible value for X" +msgstr "" + +#: src/gutenprintui2/curve.c:149 +msgid "Maximum X" +msgstr "" + +#: src/gutenprintui2/curve.c:150 +msgid "Maximum possible X value" +msgstr "" + +#: src/gutenprintui2/curve.c:159 +msgid "Minimum Y" +msgstr "" + +#: src/gutenprintui2/curve.c:160 +msgid "Minimum possible value for Y" +msgstr "" + +#: src/gutenprintui2/curve.c:169 +msgid "Maximum Y" +msgstr "" + +#: src/gutenprintui2/curve.c:170 +msgid "Maximum possible value for Y" +msgstr "" + +#: src/gutenprintui2/gammacurve.c:418 +msgid "_Gamma value" +msgstr "" + +#: src/gutenprintui2/panel.c:275 msgid "Inch" msgstr "Zoll" -#: src/gutenprintui/panel.c:274 src/gutenprintui2/panel.c:274 +#: src/gutenprintui2/panel.c:275 msgid "Set the base unit of measurement to inches" -msgstr "Stelle die Basismaßeinheit auf Zoll" +msgstr "Stelle die Basismaßeinheit auf Zoll" -#: src/gutenprintui/panel.c:276 src/gutenprintui2/panel.c:276 +#: src/gutenprintui2/panel.c:277 msgid "cm" msgstr "cm" -#: src/gutenprintui/panel.c:276 src/gutenprintui2/panel.c:276 +#: src/gutenprintui2/panel.c:277 msgid "Set the base unit of measurement to centimetres" msgstr "Die Basiseinheit auf Zentimeter einstellen" -#: src/gutenprintui/panel.c:278 src/gutenprintui2/panel.c:278 +#: src/gutenprintui2/panel.c:279 #, fuzzy msgid "Points" msgstr "Drucken" -#: src/gutenprintui/panel.c:278 src/gutenprintui2/panel.c:278 +#: src/gutenprintui2/panel.c:279 #, fuzzy msgid "Set the base unit of measurement to points (1/72\")" -msgstr "Stelle die Basismaßeinheit auf Zoll" +msgstr "Stelle die Basismaßeinheit auf Zoll" -#: src/gutenprintui/panel.c:280 src/gutenprintui2/panel.c:280 +#: src/gutenprintui2/panel.c:281 msgid "mm" msgstr "" -#: src/gutenprintui/panel.c:280 src/gutenprintui2/panel.c:280 +#: src/gutenprintui2/panel.c:281 #, fuzzy msgid "Set the base unit of measurement to millimetres" msgstr "Die Basiseinheit auf Zentimeter einstellen" -#: src/gutenprintui/panel.c:282 src/gutenprintui2/panel.c:282 +#: src/gutenprintui2/panel.c:283 msgid "Pica" msgstr "" -#: src/gutenprintui/panel.c:282 src/gutenprintui2/panel.c:282 +#: src/gutenprintui2/panel.c:283 #, fuzzy msgid "Set the base unit of measurement to picas (1/12\")" -msgstr "Stelle die Basismaßeinheit auf Zoll" +msgstr "Stelle die Basismaßeinheit auf Zoll" -#: src/gutenprintui/panel.c:289 src/gutenprintui2/panel.c:289 +#: src/gutenprintui2/panel.c:290 msgid "Color output" msgstr "Farbausgabe" -#: src/gutenprintui/panel.c:291 src/gutenprintui2/panel.c:291 +#: src/gutenprintui2/panel.c:292 msgid "Print in shades of gray using black ink" msgstr "Drucke Graustufen nur mit schwarzer Tinte" -#: src/gutenprintui/panel.c:303 src/gutenprintui2/panel.c:303 +#: src/gutenprintui2/panel.c:304 #, fuzzy msgid "Standard Command" msgstr "Standard" -#: src/gutenprintui/panel.c:303 src/gutenprintui2/panel.c:303 +#: src/gutenprintui2/panel.c:304 msgid "Use standard print command" msgstr "" -#: src/gutenprintui/panel.c:304 src/gutenprintui2/panel.c:304 +#: src/gutenprintui2/panel.c:305 #, fuzzy msgid "Custom Command" msgstr "Befehl:" -#: src/gutenprintui/panel.c:304 src/gutenprintui2/panel.c:304 +#: src/gutenprintui2/panel.c:305 msgid "Use custom print command" msgstr "" -#: src/gutenprintui/panel.c:305 src/gutenprintui/plist.c:704 -#: src/gutenprintui/plist.c:787 src/gutenprintui2/panel.c:305 -#: src/gutenprintui2/plist.c:707 src/gutenprintui2/plist.c:790 +#: src/gutenprintui2/panel.c:306 src/gutenprintui2/plist.c:710 +#: src/gutenprintui2/plist.c:793 msgid "File" msgstr "Datei" -#: src/gutenprintui/panel.c:305 src/gutenprintui2/panel.c:305 +#: src/gutenprintui2/panel.c:306 #, fuzzy msgid "Print to a file" msgstr "Drucke in Datei?" -#: src/gutenprintui/panel.c:521 src/gutenprintui2/panel.c:521 +#: src/gutenprintui2/panel.c:522 msgid "Edit Curve..." msgstr "" -#: src/gutenprintui/panel.c:532 src/gutenprintui2/panel.c:532 +#: src/gutenprintui2/panel.c:533 #, fuzzy msgid "Set Default" -msgstr "Zurücksetzen" +msgstr "Zurücksetzen" -#: src/gutenprintui/panel.c:534 src/gutenprintui2/panel.c:534 +#: src/gutenprintui2/panel.c:535 msgid "Restore Previous" msgstr "" -#: src/gutenprintui/panel.c:536 src/gutenprintui/panel.c:1532 -#: src/gutenprintui/panel.c:1787 src/gutenprintui/panel.c:1819 -#: src/gutenprintui2/panel.c:536 src/gutenprintui2/panel.c:1533 -#: src/gutenprintui2/panel.c:1787 src/gutenprintui2/panel.c:1819 +#: src/gutenprintui2/panel.c:537 src/gutenprintui2/panel.c:1708 +#: src/gutenprintui2/panel.c:1962 src/gutenprintui2/panel.c:1994 msgid "OK" msgstr "OK" -#: src/gutenprintui/panel.c:538 src/gutenprintui/panel.c:1197 -#: src/gutenprintui/panel.c:1534 src/gutenprintui/panel.c:1789 -#: src/gutenprintui2/panel.c:538 src/gutenprintui2/panel.c:1198 -#: src/gutenprintui2/panel.c:1535 src/gutenprintui2/panel.c:1789 -msgid "Cancel" -msgstr "Abbruch" +#: src/gutenprintui2/panel.c:539 src/gutenprintui2/panel.c:1373 +#: src/gutenprintui2/panel.c:1710 src/gutenprintui2/panel.c:1964 +msgid "Cancel" +msgstr "Abbruch" + +#: src/gutenprintui2/panel.c:641 +#, fuzzy +msgid "Select File..." +msgstr "Drucker einrichten..." + +#: src/gutenprintui2/panel.c:1018 +msgid "Reset" +msgstr "" -#: src/gutenprintui/panel.c:1180 src/gutenprintui2/panel.c:1181 +#: src/gutenprintui2/panel.c:1356 #, c-format msgid "%s -- Print v%s" msgstr "%s -- Drucke v%s" -#: src/gutenprintui/panel.c:1189 src/gutenprintui2/panel.c:1190 +#: src/gutenprintui2/panel.c:1365 msgid "About" -msgstr "Ãœber" +msgstr "Über" -#: src/gutenprintui/panel.c:1191 src/gutenprintui2/panel.c:1192 +#: src/gutenprintui2/panel.c:1367 msgid "" "Print and\n" "Save Settings" @@ -6482,7 +6896,7 @@ msgstr "" "Drucke und\n" "Sichere die Einstellungen" -#: src/gutenprintui/panel.c:1193 src/gutenprintui2/panel.c:1194 +#: src/gutenprintui2/panel.c:1369 msgid "" "Save\n" "Settings" @@ -6490,15 +6904,15 @@ msgstr "" "Sichere\n" "die Einstellungen" -#: src/gutenprintui/panel.c:1195 src/gutenprintui2/panel.c:1196 +#: src/gutenprintui2/panel.c:1371 msgid "Print" msgstr "Drucken" -#: src/gutenprintui/panel.c:1247 src/gutenprintui2/panel.c:1248 +#: src/gutenprintui2/panel.c:1423 msgid "Preview" msgstr "Vorschau" -#: src/gutenprintui/panel.c:1272 src/gutenprintui2/panel.c:1273 +#: src/gutenprintui2/panel.c:1448 msgid "" "Position the image on the page.\n" "Click and drag with the primary button to position the image.\n" @@ -6515,208 +6929,202 @@ msgstr "" "Mit der linken Maustaste verschieben sie das Bild.\n" "Mit der rechten geht es feiner; jede Bewegung verschiebt das Bild um einen " "Punkt (1/72\")\n" -"Die mittlere verschiebt das Bild in Relation zur seiner Größe\n" -"Wenn sie dabei die Umschalttaste (Shift) gedrückt halten, verschieben sie " +"Die mittlere verschiebt das Bild in Relation zur seiner Größe\n" +"Wenn sie dabei die Umschalttaste (Shift) gedrückt halten, verschieben sie " "entweder nur waagerecht oder nur senkrecht\n" -"Das Drücken einer anderen Taste, während des Verschiebens, bringt das Bild " -"in seine Ausgangsposition zurück." +"Das Drücken einer anderen Taste, während des Verschiebens, bringt das Bild " +"in seine Ausgangsposition zurück." -#: src/gutenprintui/panel.c:1319 src/gutenprintui2/panel.c:1320 +#: src/gutenprintui2/panel.c:1495 #, fuzzy msgid "Paper Size" -msgstr "Größe" +msgstr "Größe" -#: src/gutenprintui/panel.c:1342 src/gutenprintui2/panel.c:1343 +#: src/gutenprintui2/panel.c:1518 msgid "Show All Paper Sizes" msgstr "" -#: src/gutenprintui/panel.c:1358 src/gutenprintui2/panel.c:1359 +#: src/gutenprintui2/panel.c:1534 msgid "Dimensions:" -msgstr "Maße:" +msgstr "Maße:" -#: src/gutenprintui/panel.c:1363 src/gutenprintui/panel.c:2063 -#: src/gutenprintui2/panel.c:1364 src/gutenprintui2/panel.c:2063 +#: src/gutenprintui2/panel.c:1539 src/gutenprintui2/panel.c:2238 msgid "Width:" msgstr "Breite:" -#: src/gutenprintui/panel.c:1364 src/gutenprintui2/panel.c:1365 +#: src/gutenprintui2/panel.c:1540 msgid "Width of the paper that you wish to print to" msgstr "Breite des Papiers" -#: src/gutenprintui/panel.c:1368 src/gutenprintui/panel.c:2065 -#: src/gutenprintui2/panel.c:1369 src/gutenprintui2/panel.c:2065 +#: src/gutenprintui2/panel.c:1544 src/gutenprintui2/panel.c:2240 msgid "Height:" -msgstr "Höhe:" +msgstr "Höhe:" -#: src/gutenprintui/panel.c:1369 src/gutenprintui2/panel.c:1370 +#: src/gutenprintui2/panel.c:1545 msgid "Height of the paper that you wish to print to" -msgstr "Höhe des Papiers" +msgstr "Höhe des Papiers" -#: src/gutenprintui/panel.c:1374 src/gutenprintui2/panel.c:1375 +#: src/gutenprintui2/panel.c:1550 #, fuzzy msgid "Automatic Paper Size" -msgstr "Größe" +msgstr "Größe" -#: src/gutenprintui/panel.c:1391 src/gutenprintui2/panel.c:1392 +#: src/gutenprintui2/panel.c:1567 msgid "Number of Copies" msgstr "" -#: src/gutenprintui/panel.c:1403 src/gutenprintui2/panel.c:1404 +#: src/gutenprintui2/panel.c:1579 msgid "Select the number of copies to print; a value between 1 and 100" msgstr "" -#: src/gutenprintui/panel.c:1435 src/gutenprintui2/panel.c:1436 +#: src/gutenprintui2/panel.c:1611 #, fuzzy msgid "Image Position" msgstr "Position" -#: src/gutenprintui/panel.c:1452 src/gutenprintui2/panel.c:1453 +#: src/gutenprintui2/panel.c:1628 msgid "Auto" msgstr "Auto" -#: src/gutenprintui/panel.c:1454 src/gutenprintui2/panel.c:1455 +#: src/gutenprintui2/panel.c:1630 msgid "Portrait" msgstr "Aufrecht" -#: src/gutenprintui/panel.c:1456 src/gutenprintui2/panel.c:1457 +#: src/gutenprintui2/panel.c:1632 msgid "Landscape" msgstr "Querformat" -#: src/gutenprintui/panel.c:1458 src/gutenprintui2/panel.c:1459 +#: src/gutenprintui2/panel.c:1634 msgid "Upside down" msgstr "umgekehrt Aufrecht" -#: src/gutenprintui/panel.c:1460 src/gutenprintui2/panel.c:1461 +#: src/gutenprintui2/panel.c:1636 msgid "Seascape" msgstr "umgekehrt Querformat" -#: src/gutenprintui/panel.c:1464 src/gutenprintui2/panel.c:1465 +#: src/gutenprintui2/panel.c:1640 msgid "" "Select the orientation: portrait, landscape, upside down, or seascape " "(upside down landscape)" msgstr "" -"wählen sie die Ausrichtung: Aufrecht, Querformat, umgekehrt Aufrecht, " +"wählen sie die Ausrichtung: Aufrecht, Querformat, umgekehrt Aufrecht, " "umgekehrt Querformat" -#: src/gutenprintui/panel.c:1466 src/gutenprintui2/panel.c:1467 +#: src/gutenprintui2/panel.c:1642 msgid "Orientation:" msgstr "Ausrichtung:" -#: src/gutenprintui/panel.c:1477 src/gutenprintui2/panel.c:1478 +#: src/gutenprintui2/panel.c:1653 msgid "Left:" msgstr "links:" -#: src/gutenprintui/panel.c:1478 src/gutenprintui2/panel.c:1479 +#: src/gutenprintui2/panel.c:1654 msgid "Distance from the left of the paper to the image" msgstr "Entfernung vom linken Blattrand Bildrand" -#: src/gutenprintui/panel.c:1481 src/gutenprintui/panel.c:1485 -#: src/gutenprintui2/panel.c:1482 src/gutenprintui2/panel.c:1486 +#: src/gutenprintui2/panel.c:1657 src/gutenprintui2/panel.c:1661 msgid "Right:" msgstr "rechts:" -#: src/gutenprintui/panel.c:1482 src/gutenprintui2/panel.c:1483 +#: src/gutenprintui2/panel.c:1658 msgid "Distance from the left of the paper to the right of the image" msgstr "Entfernung vom linken Blattrand zum rechten Bildrand" -#: src/gutenprintui/panel.c:1486 src/gutenprintui2/panel.c:1487 +#: src/gutenprintui2/panel.c:1662 msgid "Distance from the right of the paper to the image" msgstr "Entfernung vom rechten Blattrand zum Bildrand" -#: src/gutenprintui/panel.c:1488 src/gutenprintui2/panel.c:1489 +#: src/gutenprintui2/panel.c:1664 msgid "Top:" msgstr "Oben:" -#: src/gutenprintui/panel.c:1489 src/gutenprintui2/panel.c:1490 +#: src/gutenprintui2/panel.c:1665 msgid "Distance from the top of the paper to the image" msgstr "Entfernung vom oberen Blattrand zum Bildrand" -#: src/gutenprintui/panel.c:1492 src/gutenprintui/panel.c:1496 -#: src/gutenprintui2/panel.c:1493 src/gutenprintui2/panel.c:1497 +#: src/gutenprintui2/panel.c:1668 src/gutenprintui2/panel.c:1672 msgid "Bottom:" msgstr "unten:" -#: src/gutenprintui/panel.c:1493 src/gutenprintui2/panel.c:1494 +#: src/gutenprintui2/panel.c:1669 #, fuzzy msgid "Distance from the top of the paper to bottom of the image" msgstr "Entfernung vom oberen Blattrand zum unteren Bildrand" -#: src/gutenprintui/panel.c:1497 src/gutenprintui2/panel.c:1498 +#: src/gutenprintui2/panel.c:1673 msgid "Distance from the bottom of the paper to the image" msgstr "Entfernung vom unteren Blattrand zum Bild" -#: src/gutenprintui/panel.c:1507 src/gutenprintui2/panel.c:1508 +#: src/gutenprintui2/panel.c:1683 msgid "Center:" msgstr "Zentrieren:" -#: src/gutenprintui/panel.c:1510 src/gutenprintui2/panel.c:1511 +#: src/gutenprintui2/panel.c:1686 #, fuzzy msgid "Horizontal" msgstr "Waagerecht" -#: src/gutenprintui/panel.c:1511 src/gutenprintui2/panel.c:1512 +#: src/gutenprintui2/panel.c:1687 msgid "Center the image horizontally on the paper" msgstr "Bild waagerecht auf dem Blatt zentrieren" -#: src/gutenprintui/panel.c:1513 src/gutenprintui2/panel.c:1514 +#: src/gutenprintui2/panel.c:1689 msgid "Both" msgstr "Beides" -#: src/gutenprintui/panel.c:1514 src/gutenprintui2/panel.c:1515 +#: src/gutenprintui2/panel.c:1690 msgid "Center the image on the paper" msgstr "Bild auf dem Blatt zentrieren" -#: src/gutenprintui/panel.c:1516 src/gutenprintui2/panel.c:1517 +#: src/gutenprintui2/panel.c:1692 #, fuzzy msgid "Vertical" msgstr "senkrecht" -#: src/gutenprintui/panel.c:1517 src/gutenprintui2/panel.c:1518 +#: src/gutenprintui2/panel.c:1693 msgid "Center the image vertically on the paper" msgstr "Bild senkrecht auf dem Blatt zentrieren" -#: src/gutenprintui/panel.c:1530 src/gutenprintui2/panel.c:1531 +#: src/gutenprintui2/panel.c:1706 msgid "Setup Printer" msgstr "Drucker einrichten" -#: src/gutenprintui/panel.c:1555 src/gutenprintui2/panel.c:1555 +#: src/gutenprintui2/panel.c:1730 #, fuzzy msgid "Printer Make:" msgstr "Drucker Name:" -#: src/gutenprintui/panel.c:1566 src/gutenprintui2/panel.c:1566 +#: src/gutenprintui2/panel.c:1741 #, fuzzy msgid "Select the make of your printer" -msgstr "Wählen sie ihr Druckermodel" +msgstr "Wählen sie ihr Druckermodel" -#: src/gutenprintui/panel.c:1584 src/gutenprintui/panel.c:1672 -#: src/gutenprintui/panel.c:1890 src/gutenprintui2/panel.c:1584 -#: src/gutenprintui2/panel.c:1672 src/gutenprintui2/panel.c:1890 +#: src/gutenprintui2/panel.c:1759 src/gutenprintui2/panel.c:1847 +#: src/gutenprintui2/panel.c:2065 msgid "Printer Model:" msgstr "Druckermodel:" -#: src/gutenprintui/panel.c:1595 src/gutenprintui2/panel.c:1595 +#: src/gutenprintui2/panel.c:1770 msgid "Select your printer model" -msgstr "Wählen sie ihr Druckermodel" +msgstr "Wählen sie ihr Druckermodel" -#: src/gutenprintui/panel.c:1643 src/gutenprintui2/panel.c:1643 +#: src/gutenprintui2/panel.c:1818 msgid "PPD File:" msgstr "PPD Datei:" -#: src/gutenprintui/panel.c:1659 src/gutenprintui2/panel.c:1659 +#: src/gutenprintui2/panel.c:1834 msgid "Enter the correct PPD filename for your printer" -msgstr "Wählen sie die, für ihren Drucker, richtige PPD-Datei." +msgstr "Wählen sie die, für ihren Drucker, richtige PPD-Datei." -#: src/gutenprintui/panel.c:1661 src/gutenprintui/panel.c:1741 -#: src/gutenprintui2/panel.c:1661 src/gutenprintui2/panel.c:1741 +#: src/gutenprintui2/panel.c:1836 src/gutenprintui2/panel.c:1916 msgid "Browse" msgstr "Suchen" -#: src/gutenprintui/panel.c:1668 src/gutenprintui2/panel.c:1668 +#: src/gutenprintui2/panel.c:1843 msgid "Choose the correct PPD filename for your printer" -msgstr "Wählen sie die, für ihren Drucker, richtige PPD-Datei." +msgstr "Wählen sie die, für ihren Drucker, richtige PPD-Datei." -#: src/gutenprintui/panel.c:1710 src/gutenprintui2/panel.c:1710 +#: src/gutenprintui2/panel.c:1885 #, fuzzy msgid "" "Select the name of the output queue (not the type, or model, of printer) " @@ -6725,58 +7133,57 @@ msgstr "" "Bitte geben sie das Pseudonym des Druckers ihrer Wahl an. (kein Type, " "Modell...)" -#: src/gutenprintui/panel.c:1712 src/gutenprintui2/panel.c:1712 +#: src/gutenprintui2/panel.c:1887 #, fuzzy msgid "Printer Queue:" msgstr "Drucker Name:" -#: src/gutenprintui/panel.c:1728 src/gutenprintui2/panel.c:1728 +#: src/gutenprintui2/panel.c:1903 #, fuzzy msgid "Enter the correct command to print to your printer. " -msgstr "Wählen sie die, für ihren Drucker, richtige PPD-Datei." +msgstr "Wählen sie die, für ihren Drucker, richtige PPD-Datei." -#: src/gutenprintui/panel.c:1739 src/gutenprintui2/panel.c:1739 +#: src/gutenprintui2/panel.c:1914 msgid "Enter the file to print to. " msgstr "" -#: src/gutenprintui/panel.c:1747 src/gutenprintui2/panel.c:1747 +#: src/gutenprintui2/panel.c:1922 #, fuzzy msgid "File to print to" msgstr "Probeausdruck" -#: src/gutenprintui/panel.c:1755 src/gutenprintui2/panel.c:1755 +#: src/gutenprintui2/panel.c:1930 #, fuzzy msgid "Print To File" msgstr "Drucke in Datei?" -#: src/gutenprintui/panel.c:1785 src/gutenprintui2/panel.c:1785 +#: src/gutenprintui2/panel.c:1960 msgid "Define New Printer" msgstr "Neuen Printer einrichten" -#: src/gutenprintui/panel.c:1803 src/gutenprintui/panel.c:1887 -#: src/gutenprintui2/panel.c:1803 src/gutenprintui2/panel.c:1887 +#: src/gutenprintui2/panel.c:1978 src/gutenprintui2/panel.c:2062 msgid "Printer Name:" msgstr "Drucker Name:" -#: src/gutenprintui/panel.c:1807 src/gutenprintui2/panel.c:1807 +#: src/gutenprintui2/panel.c:1982 msgid "Enter the name you wish to give this logical printer" -msgstr "Bitte geben sie einen Pseudonym für diesen Drucker an." +msgstr "Bitte geben sie einen Pseudonym für diesen Drucker an." -#: src/gutenprintui/panel.c:1817 src/gutenprintui2/panel.c:1817 +#: src/gutenprintui2/panel.c:1992 #, fuzzy msgid "About Gutenprint " -msgstr "Ãœber Gimp-Print " +msgstr "Über Gimp-Print " -#: src/gutenprintui/panel.c:1824 src/gutenprintui2/panel.c:1824 +#: src/gutenprintui2/panel.c:1999 #, fuzzy msgid "Gutenprint Version " msgstr "Gimp-Print Version " -#: src/gutenprintui/panel.c:1872 src/gutenprintui2/panel.c:1872 +#: src/gutenprintui2/panel.c:2047 msgid "Printer Settings" msgstr "Drucker Einstellungen" -#: src/gutenprintui/panel.c:1885 src/gutenprintui2/panel.c:1885 +#: src/gutenprintui2/panel.c:2060 msgid "" "Select the name of the printer (not the type, or model, of printer) that you " "wish to print to" @@ -6784,245 +7191,199 @@ msgstr "" "Bitte geben sie das Pseudonym des Druckers ihrer Wahl an. (kein Type, " "Modell...)" -#: src/gutenprintui/panel.c:1902 src/gutenprintui2/panel.c:1902 +#: src/gutenprintui2/panel.c:2077 msgid "Setup Printer..." msgstr "Drucker einrichten..." -#: src/gutenprintui/panel.c:1904 src/gutenprintui2/panel.c:1904 +#: src/gutenprintui2/panel.c:2079 msgid "" "Choose the printer model, PPD file, and command that is used to print to " "this printer" msgstr "" -"Wählen sie ein Druckermodel, eine PPD-Datei und einen Befehl zum Drucken auf " +"Wählen sie ein Druckermodel, eine PPD-Datei und einen Befehl zum Drucken auf " "diesem Drucker" -#: src/gutenprintui/panel.c:1917 src/gutenprintui2/panel.c:1917 +#: src/gutenprintui2/panel.c:2092 msgid "New Printer..." msgstr "neuer Drucker..." -#: src/gutenprintui/panel.c:1918 src/gutenprintui2/panel.c:1918 +#: src/gutenprintui2/panel.c:2093 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 "" -"neuer logischer Drucker. Hier können sie einer besonderen Druckereinstellung " -"einen Namen geben und später unter diesem einfach aufrufen." +"neuer logischer Drucker. Hier können sie einer besonderen Druckereinstellung " +"einen Namen geben und später unter diesem einfach aufrufen." -#: src/gutenprintui/panel.c:1948 src/gutenprintui2/panel.c:1948 +#: src/gutenprintui2/panel.c:2123 #, fuzzy msgid "Set Printer Option Defaults" -msgstr "Zurücksetzen" +msgstr "Zurücksetzen" -#: src/gutenprintui/panel.c:1949 src/gutenprintui2/panel.c:1949 +#: src/gutenprintui2/panel.c:2124 msgid "Set all printer options to their defaults" msgstr "" -#: src/gutenprintui/panel.c:1972 src/gutenprintui2/panel.c:1972 +#: src/gutenprintui2/panel.c:2147 #, fuzzy msgid "Image Size" -msgstr "Größe" +msgstr "Größe" -#: src/gutenprintui/panel.c:1997 src/gutenprintui2/panel.c:1997 +#: src/gutenprintui2/panel.c:2172 msgid "Scaling:" msgstr "Zoom:" -#: src/gutenprintui/panel.c:2001 src/gutenprintui2/panel.c:2001 +#: src/gutenprintui2/panel.c:2176 msgid "Set the scale (size) of the image" -msgstr "Einstellung der Bildgröße" +msgstr "Einstellung der Bildgröße" -#: src/gutenprintui/panel.c:2023 src/gutenprintui2/panel.c:2023 +#: src/gutenprintui2/panel.c:2198 msgid "Scale by:" msgstr "" -#: src/gutenprintui/panel.c:2028 src/gutenprintui2/panel.c:2028 +#: src/gutenprintui2/panel.c:2203 msgid "" "Select whether scaling is measured as percent of available page size or " "number of output dots per inch" msgstr "" -"Wählen sie ob die Einstellungen in Prozent oder in Punkte per Zoll erfolgen " +"Wählen sie ob die Einstellungen in Prozent oder in Punkte per Zoll erfolgen " "sollen" -#: src/gutenprintui/panel.c:2031 src/gutenprintui2/panel.c:2031 +#: src/gutenprintui2/panel.c:2206 msgid "Percent" msgstr "Prozent" -#: src/gutenprintui/panel.c:2036 src/gutenprintui2/panel.c:2036 +#: src/gutenprintui2/panel.c:2211 msgid "Scale the print to the size of the page" -msgstr "Bildgröße an Seitengröße anpassen" +msgstr "Bildgröße an Seitengröße anpassen" -#: src/gutenprintui/panel.c:2040 src/gutenprintui2/panel.c:2040 +#: src/gutenprintui2/panel.c:2215 msgid "PPI" msgstr "PPI" -#: src/gutenprintui/panel.c:2045 src/gutenprintui2/panel.c:2045 +#: src/gutenprintui2/panel.c:2220 msgid "Scale the print to the number of dots per inch" -msgstr "Wählen sie die Druckauflösung (Punkte per Zoll)" +msgstr "Wählen sie die Druckauflösung (Punkte per Zoll)" -#: src/gutenprintui/panel.c:2063 src/gutenprintui2/panel.c:2063 +#: src/gutenprintui2/panel.c:2238 msgid "Set the width of the print" msgstr "Einstellen der Breite des Ausdrucks" -#: src/gutenprintui/panel.c:2065 src/gutenprintui2/panel.c:2065 +#: src/gutenprintui2/panel.c:2240 msgid "Set the height of the print" -msgstr "Einstellen der Höhe des Ausdrucks" +msgstr "Einstellen der Höhe des Ausdrucks" -#: src/gutenprintui/panel.c:2071 src/gutenprintui2/panel.c:2071 +#: src/gutenprintui2/panel.c:2246 msgid "" "Use Original\n" "Image Size" msgstr "" "Benutze originale\n" -"Bildgröße" +"Bildgröße" -#: src/gutenprintui/panel.c:2077 src/gutenprintui2/panel.c:2077 +#: src/gutenprintui2/panel.c:2252 msgid "Set the print size to the size of the image" -msgstr "Ausdruckgröße gleich Bildgröße" +msgstr "Ausdruckgröße gleich Bildgröße" -#: src/gutenprintui/panel.c:2100 src/gutenprintui2/panel.c:2101 +#: src/gutenprintui2/panel.c:2276 msgid "Print Color Adjust" msgstr "Farbabstimmung" -#: src/gutenprintui/panel.c:2103 src/gutenprintui2/panel.c:2104 +#: src/gutenprintui2/panel.c:2279 msgid "Set Defaults" -msgstr "Zurücksetzen" +msgstr "Zurücksetzen" -#: src/gutenprintui/panel.c:2105 src/gutenprintui2/panel.c:2106 +#: src/gutenprintui2/panel.c:2281 msgid "Close" -msgstr "Schließen" +msgstr "Schließen" -#: src/gutenprintui/panel.c:2134 src/gutenprintui2/panel.c:2135 +#: src/gutenprintui2/panel.c:2310 msgid "Image preview" msgstr "Vorschau" -#: src/gutenprintui/panel.c:2148 src/gutenprintui2/panel.c:2149 +#: src/gutenprintui2/panel.c:2324 msgid "View Output Channels:" msgstr "" -#: src/gutenprintui/panel.c:2234 src/gutenprintui2/panel.c:2240 +#: src/gutenprintui2/panel.c:2415 #, fuzzy msgid "Output" msgstr "Ausgabeart:" -#: src/gutenprintui/panel.c:2262 src/gutenprintui2/panel.c:2268 +#: src/gutenprintui2/panel.c:2443 msgid "Output Type:" msgstr "Ausgabeart:" -#: src/gutenprintui/panel.c:2266 src/gutenprintui2/panel.c:2272 +#: src/gutenprintui2/panel.c:2447 msgid "Select the desired output type" -msgstr "Wählen sie die gewüschte Ausgabeart:" +msgstr "Wählen sie die gewüschte Ausgabeart:" -#: src/gutenprintui/panel.c:2287 src/gutenprintui2/panel.c:2293 +#: src/gutenprintui2/panel.c:2468 msgid "Adjust Output..." msgstr "Ausgabeeinstellungen.." -#: src/gutenprintui/panel.c:2296 src/gutenprintui2/panel.c:2302 +#: src/gutenprintui2/panel.c:2477 msgid "" "Adjust color balance, brightness, contrast, saturation, and dither algorithm" msgstr "" -"Einstellungen für Farbalance, Helligkeit, Kontrast, Sättigung und Rasterung" +"Einstellungen für Farbalance, Helligkeit, Kontrast, Sättigung und Rasterung" -#: src/gutenprintui/panel.c:2314 src/gutenprintui2/panel.c:2321 +#: src/gutenprintui2/panel.c:2496 #, fuzzy msgid "Size Units:" msgstr "Einheiten:" -#: src/gutenprintui/panel.c:2317 src/gutenprintui2/panel.c:2324 +#: src/gutenprintui2/panel.c:2499 #, fuzzy msgid " " msgstr "> " -#: src/gutenprintui/panel.c:2341 src/gutenprintui2/panel.c:2348 +#: src/gutenprintui2/panel.c:2523 msgid "Units:" msgstr "Einheiten:" -#: src/gutenprintui/panel.c:2346 src/gutenprintui2/panel.c:2353 +#: src/gutenprintui2/panel.c:2528 msgid "Select the base unit of measurement for printing" -msgstr "Wählen sie die Basismaßeinheit für das Drucken" +msgstr "Wählen sie die Basismaßeinheit für das Drucken" -#: src/gutenprintui/plist.c:90 src/gutenprintui/plist.c:99 -#: src/gutenprintui2/plist.c:89 src/gutenprintui2/plist.c:98 +#: src/gutenprintui2/plist.c:92 src/gutenprintui2/plist.c:101 msgid "System V lp" msgstr "" -#: src/gutenprintui/plist.c:96 src/gutenprintui2/plist.c:95 +#: src/gutenprintui2/plist.c:98 msgid "CUPS" msgstr "" -#: src/gutenprintui/plist.c:102 src/gutenprintui2/plist.c:101 +#: src/gutenprintui2/plist.c:104 msgid "Berkeley lpd (/etc/lpc)" msgstr "" -#: src/gutenprintui/plist.c:105 src/gutenprintui2/plist.c:104 +#: src/gutenprintui2/plist.c:107 msgid "Berkeley lpd (/usr/bsd/lpc)" msgstr "" -#: src/gutenprintui/plist.c:108 src/gutenprintui2/plist.c:107 +#: src/gutenprintui2/plist.c:110 msgid "Berkeley lpd (/usr/etc/lpc" msgstr "" -#: src/gutenprintui/plist.c:111 src/gutenprintui2/plist.c:110 +#: src/gutenprintui2/plist.c:113 msgid "Berkeley lpd (/usr/libexec/lpc)" msgstr "" -#: src/gutenprintui/plist.c:114 src/gutenprintui2/plist.c:113 +#: src/gutenprintui2/plist.c:116 msgid "Berkeley lpd (/usr/sbin/lpc)" msgstr "" -#: src/gutenprintui/plist.c:1043 src/gutenprintui2/plist.c:1057 +#: src/gutenprintui2/plist.c:1060 #, fuzzy msgid "Printer" msgstr "Drucken" -#: src/gutenprintui/plist.c:1230 src/gutenprintui2/plist.c:1250 +#: src/gutenprintui2/plist.c:1253 #, fuzzy msgid "(Default Printer)" msgstr "Drucker einrichten" -#: src/gutenprintui2/curve.c:130 -#, fuzzy -msgid "Curve type" -msgstr "Schwarz" - -#: src/gutenprintui2/curve.c:131 -msgid "Is this curve linear, spline interpolated, or free-form" -msgstr "" - -#: src/gutenprintui2/curve.c:139 -msgid "Minimum X" -msgstr "" - -#: src/gutenprintui2/curve.c:140 -msgid "Minimum possible value for X" -msgstr "" - -#: src/gutenprintui2/curve.c:149 -msgid "Maximum X" -msgstr "" - -#: src/gutenprintui2/curve.c:150 -msgid "Maximum possible X value" -msgstr "" - -#: src/gutenprintui2/curve.c:159 -msgid "Minimum Y" -msgstr "" - -#: src/gutenprintui2/curve.c:160 -msgid "Minimum possible value for Y" -msgstr "" - -#: src/gutenprintui2/curve.c:169 -msgid "Maximum Y" -msgstr "" - -#: src/gutenprintui2/curve.c:170 -msgid "Maximum possible value for Y" -msgstr "" - -#: src/gutenprintui2/gammacurve.c:418 -msgid "_Gamma value" -msgstr "" - #: src/cups/genppd.c:145 #, fuzzy msgid "Printer Features" @@ -7065,48 +7426,48 @@ msgstr "" #. 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:1058 +#: src/cups/genppd.c:1064 msgid "English" msgstr "German" #. TRANSLATORS: Specify PPD translation encoding e.g. ISOLatin1 -#: src/cups/genppd.c:1060 +#: src/cups/genppd.c:1066 msgid "ISOLatin1" msgstr "ISOLatin1" -#: src/cups/genppd.c:1641 +#: src/cups/genppd.c:1647 msgid "2-Sided Printing" msgstr "" -#: src/cups/genppd.c:1665 +#: src/cups/genppd.c:1671 msgid "Shrink Page If Necessary to Fit Borders" msgstr "" -#: src/cups/genppd.c:1669 +#: src/cups/genppd.c:1675 msgid "Shrink (print the whole page)" msgstr "" -#: src/cups/genppd.c:1670 +#: src/cups/genppd.c:1676 msgid "Crop (preserve dimensions)" msgstr "" -#: src/cups/genppd.c:1671 +#: src/cups/genppd.c:1677 msgid "Expand (use maximum page area)" msgstr "" -#: src/cups/genppd.c:1756 +#: src/cups/genppd.c:1762 msgid "No" msgstr "" -#: src/cups/genppd.c:1758 +#: src/cups/genppd.c:1764 msgid "Yes" msgstr "" -#: src/cups/genppd.c:1795 src/cups/genppd.c:1857 +#: src/cups/genppd.c:1801 src/cups/genppd.c:1863 msgid "Value" msgstr "" -#: src/cups/genppd.c:1800 +#: src/cups/genppd.c:1806 msgid "Fine Adjustment" msgstr "" @@ -7135,15 +7496,15 @@ msgid "" msgstr "" "Copyright 2000 Robert Krawitz (rlk@alum.mit.edu)\n" "\n" -"Dieses Programm ist freie Software. Sie können es unter\n" +"Dieses Programm ist freie Software. Sie können es unter\n" " den Bedingungen der GNU General Public License, wie von der\n" " Free Software Foundation herausgegeben, weitergeben und/oder\n" " modifizieren, entweder unter Version 2 der Lizenz oder (wenn\n" -" Sie es wünschen) jeder späteren Version.\n" -" Die Veröffentlichung dieses Programms erfolgt in der\n" -" Hoffnung, daß es Ihnen von Nutzen sein wird, aber OHNE JEDE\n" -" GEWÄHRLEISTUNG - sogar ohne die implizite Gewährleistung\n" -" der MARKTREIFE oder der EIGNUNG FÃœR EINEN BESTIMMTEN ZWECK\n" +" Sie es wünschen) jeder späteren Version.\n" +" Die Veröffentlichung dieses Programms erfolgt in der\n" +" Hoffnung, daß es Ihnen von Nutzen sein wird, aber OHNE JEDE\n" +" GEWÄHRLEISTUNG - sogar ohne die implizite Gewährleistung\n" +" der MARKTREIFE oder der EIGNUNG FÜR EINEN BESTIMMTEN ZWECK\n" ". Details finden Sie in der GNU General Public License.\n" " Sie sollten eine Kopie der GNU General Public License zusammen\n" " mit diesem Programm erhalten haben. Falls nicht, schreiben Sie\n" @@ -7198,44 +7559,44 @@ msgid "" msgstr "" "Benutzung: escputil [-c | -n | -a | -i | -o | -s | -d | -l | -M]\n" " [-P Drucker| -r device] [-u] [-q] [-m model]\n" -"Perform maintenance on EPSON Stylus ® printers \n" +"Perform maintenance on EPSON Stylus ® printers \n" " Beispiel: escputil --clean-head --printer stpex-on-third-floor\n" " escputil --ink-level --new --raw-device /dev/lp0\n" "\n" " Kommandos:\n" -" -c|--clean-head Druckköpfe reinigen.\n" +" -c|--clean-head Druckköpfe reinigen.\n" " -n|--nozzle-check Testausdruck.\n" -" Schmutzige oder verklebte Düsen sind\n" +" Schmutzige oder verklebte Düsen sind\n" " als Aussetzer erkennbar. Wenn diese auftreten, \n" -" sollten sie die Köpfe reinigen\n" -" -a|--align-head Richtet die Köpfe aus. VORSICHT: Die unnötige\n" +" sollten sie die Köpfe reinigen\n" +" -a|--align-head Richtet die Köpfe aus. VORSICHT: Die unnötige\n" " Benutzung dieser Option kann eine schlechte " -"Druckqualität\n" -" oder Druckerschäden verursachen.\n" +"Druckqualität\n" +" oder Druckerschäden verursachen.\n" " -o|--align-color Richtet den Farb-Kopf aus.(nur Stylus Color 480 \n" -" 580 ). VORSICHT: Die unnötige Benutzung dieser \n" -" Option kann eine schlechte Druckqualität oder\n" -" Druckerschäden verursachen.\n" +" 580 ). VORSICHT: Die unnötige Benutzung dieser \n" +" Option kann eine schlechte Druckqualität oder\n" +" Druckerschäden verursachen.\n" " -s|--status Zeigt den Drucker Status.\n" -" -i|--ink-level Fragt den Tintenstand ab. Benötigt Schreib- und\n" +" -i|--ink-level Fragt den Tintenstand ab. Benötigt Schreib- und\n" " Leserechte auf die Drucker-Schnittstelle. \n" " -d|--identify Fragt die Modelinformationen ab.\n" -" Benötigt Schreib- und Leserechte auf die Drucker-" +" Benötigt Schreib- und Leserechte auf die Drucker-" "Schnittstelle \n" " Drucker-Schnittstelle.\n" " -l|--license Zeigt die Lizenz- und Garantiebedingungen dieses " "Programmes\n" -" -M|--list-models Zeigt die unterstützen Drucker an..\n" +" -M|--list-models Zeigt die unterstützen Drucker an..\n" " -h|--help Zeigt diese Informationen an.\n" " Optionen:\n" -" -P|--printer-name Gibt die ausgewählte Drucker-Schleife an.\n" +" -P|--printer-name Gibt die ausgewählte Drucker-Schleife an.\n" " ohne Angabe = Systemdrucker lp\n" " -r|--raw-device Gibt die Druckerschnittstelle an.\n" " Vorsicht-geht nicht durch die Schleife\n" " -u|--new Der Drucker ist neu (Stylus Colour 740 or\n" " neuer).\n" -" -q|--quiet Unterdrücke die Programmausgaben.\n" -" -m|--model Gibt den präzisen Druckertyp zur Kopfausrichtung an.\n" +" -q|--quiet Unterdrücke die Programmausgaben.\n" +" -m|--model Gibt den präzisen Druckertyp zur Kopfausrichtung an.\n" #: src/escputil/escputil.c:162 #, fuzzy @@ -7283,44 +7644,44 @@ msgid "" msgstr "" "Benutzung: escputil [-c | -n | -a | -i | -o | -s | -d | -l | -M]\n" " [-P Drucker| -r device] [-u] [-q] [-m model]\n" -"Perform maintenance on EPSON Stylus ® printers \n" +"Perform maintenance on EPSON Stylus ® printers \n" " Beispiel: escputil --clean-head --printer stpex-on-third-floor\n" " escputil --ink-level --new --raw-device /dev/lp0\n" "\n" " Kommandos:\n" -" -c|--clean-head Druckköpfe reinigen.\n" +" -c|--clean-head Druckköpfe reinigen.\n" " -n|--nozzle-check Testausdruck.\n" -" Schmutzige oder verklebte Düsen sind\n" +" Schmutzige oder verklebte Düsen sind\n" " als Aussetzer erkennbar. Wenn diese auftreten, \n" -" sollten sie die Köpfe reinigen\n" -" -a|--align-head Richtet die Köpfe aus. VORSICHT: Die unnötige\n" +" sollten sie die Köpfe reinigen\n" +" -a|--align-head Richtet die Köpfe aus. VORSICHT: Die unnötige\n" " Benutzung dieser Option kann eine schlechte " -"Druckqualität\n" -" oder Druckerschäden verursachen.\n" +"Druckqualität\n" +" oder Druckerschäden verursachen.\n" " -o|--align-color Richtet den Farb-Kopf aus.(nur Stylus Color 480 \n" -" 580 ). VORSICHT: Die unnötige Benutzung dieser \n" -" Option kann eine schlechte Druckqualität oder\n" -" Druckerschäden verursachen.\n" +" 580 ). VORSICHT: Die unnötige Benutzung dieser \n" +" Option kann eine schlechte Druckqualität oder\n" +" Druckerschäden verursachen.\n" " -s|--status Zeigt den Drucker Status.\n" -" -i|--ink-level Fragt den Tintenstand ab. Benötigt Schreib- und\n" +" -i|--ink-level Fragt den Tintenstand ab. Benötigt Schreib- und\n" " Leserechte auf die Drucker-Schnittstelle. \n" " -d|--identify Fragt die Modelinformationen ab.\n" -" Benötigt Schreib- und Leserechte auf die Drucker-" +" Benötigt Schreib- und Leserechte auf die Drucker-" "Schnittstelle \n" " Drucker-Schnittstelle.\n" " -l|--license Zeigt die Lizenz- und Garantiebedingungen dieses " "Programmes\n" -" -M|--list-models Zeigt die unterstützen Drucker an..\n" +" -M|--list-models Zeigt die unterstützen Drucker an..\n" " -h|--help Zeigt diese Informationen an.\n" " Optionen:\n" -" -P|--printer-name Gibt die ausgewählte Drucker-Schleife an.\n" +" -P|--printer-name Gibt die ausgewählte Drucker-Schleife an.\n" " ohne Angabe = Systemdrucker lp\n" " -r|--raw-device Gibt die Druckerschnittstelle an.\n" " Vorsicht-geht nicht durch die Schleife\n" " -u|--new Der Drucker ist neu (Stylus Colour 740 or\n" " neuer).\n" -" -q|--quiet Unterdrücke die Programmausgaben.\n" -" -m|--model Gibt den präzisen Druckertyp zur Kopfausrichtung an.\n" +" -q|--quiet Unterdrücke die Programmausgaben.\n" +" -m|--model Gibt den präzisen Druckertyp zur Kopfausrichtung an.\n" #: src/escputil/escputil.c:333 src/escputil/escputil.c:341 #, c-format @@ -7365,7 +7726,7 @@ msgstr "" #: src/escputil/escputil.c:463 #, c-format msgid "Cannot open device %s: %s\n" -msgstr "Kann die Schnittstelle nicht öffnen %s: %s\n" +msgstr "Kann die Schnittstelle nicht öffnen %s: %s\n" #: src/escputil/escputil.c:486 #, c-format @@ -7638,12 +7999,12 @@ msgstr "Sie sollten nur ein Druckermodell angeben." #: src/escputil/escputil.c:1711 #, c-format msgid "Cleaning heads...\n" -msgstr "Reinige die Köpfe...\n" +msgstr "Reinige die Köpfe...\n" #: 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" +msgstr "Teste die Köpfe. Ist Papier im Drucker?\n" #: src/escputil/escputil.c:1732 #, c-format @@ -7683,42 +8044,42 @@ msgid "" "It is essential that you not turn your printer off during this procedure.\n" "\n" msgstr "" -"Bitte lesen sie diese Anweisungen sorgfältig bevor sie fortfahren.\n" +"Bitte lesen sie diese Anweisungen sorgfältig bevor sie fortfahren.\n" "\n" -"Mit diesem Programm können sie die Druckköpfe ihres Epson-Stylus\n" +"Mit diesem Programm können sie die Druckköpfe ihres Epson-Stylus\n" "Druckers ausrichten. Der falsche Gebrauch dieses Programmes kann \n" -"die Druckqualtät beeinträchtigen und möglicherweise den Drucker \n" -"beschädigen. Dieses Programm wurde von Seiko Epson nicht getestet\n" +"die Druckqualtät beeinträchtigen und möglicherweise den Drucker \n" +"beschädigen. Dieses Programm wurde von Seiko Epson nicht getestet\n" "oder zugelassen, es besteht keine Garantie, das es funktioniert. Das volle\n" "Risiko seines Einsatzes liegt bei Ihnen.\n" " \n" -"Es werden %d Testmuster gedruckt. Alle Muster ähneln sich.\n" -"Sie bestehen aus Paaren von senkrechten Linien, welche sich überlappen.\n" +"Es werden %d Testmuster gedruckt. Alle Muster ähneln sich.\n" +"Sie bestehen aus Paaren von senkrechten Linien, welche sich überlappen.\n" "Zwischen jedem Linienpaar steht eine Zahl von %d bis %d.\n" "\n" "Wenn sie die Linienpaare untersuchen, sollten sie eines finden, welches am\n" -"beßsten zusammen paßt, optimal ist eine durchgehende Linie. Benutzen sie \n" +"beßsten zusammen paßt, optimal ist eine durchgehende Linie. Benutzen sie \n" "ruhig hochwertiges Papier und eine Lupe um ganz sicher zu gehen, das " -"pefekteste Paar zu erkennen. Nachdem sie nun das schönste Paar ausgewählt \n" +"pefekteste Paar zu erkennen. Nachdem sie nun das schönste Paar ausgewählt \n" "und sich die Zahl gemerkt haben; legen sie das Blatt wieder in den Drucker " "ein\n" "bevor sie die Zahl eingeben.\n" "\n" -"Jedes Muster ist gleich, aber die späteren werden feiner gedruckt um die " +"Jedes Muster ist gleich, aber die späteren werden feiner gedruckt um die " "Unterschiede\n" -"noch mehr hervorzuheben. Sie müssen zur richtigen Ausrichtung der Druckköpfe " +"noch mehr hervorzuheben. Sie müssen zur richtigen Ausrichtung der Druckköpfe " "alle\n" -"Durchgänge ausführen. Nach erfolgreicher Ausrichtung wird noch ein " +"Durchgänge ausführen. Nach erfolgreicher Ausrichtung wird noch ein " "Musterausdruck\n" -"erzeugt. Sie werden erkennen, daß das beßste Paar (#%d von %d) ist.\n" +"erzeugt. Sie werden erkennen, daß das beßste Paar (#%d von %d) ist.\n" "\n" "Nach der letzten Ausgabe werden sie gefragt ob sie die Ausrichtung im " "Drucker sichern (s),\n" -"den Vorgang wiederholen(r) oder ohne Sicherung abbrechen möchten. Beim " +"den Vorgang wiederholen(r) oder ohne Sicherung abbrechen möchten. Beim " "Abbruch \n" "bleiben die Einstellungen bis zum Ausschalten des Druckers erhalten, aber " -"nicht länger.\n" -"Es ist wichtigt, den Drucker während der Ausrichtung nicht Auszuschalten.\n" +"nicht länger.\n" +"Es ist wichtigt, den Drucker während der Ausrichtung nicht Auszuschalten.\n" "\n" #: src/escputil/escputil.c:1767 @@ -7756,42 +8117,42 @@ msgid "" "this procedure.\n" "\n" msgstr "" -"Bitte lesen sie diese Anweisungen sorgfältig bevor sie fortfahren.\n" +"Bitte lesen sie diese Anweisungen sorgfältig bevor sie fortfahren.\n" "\n" -"Mit diesem Programm können sie die Druckköpfe ihres Epson-Stylus\n" +"Mit diesem Programm können sie die Druckköpfe ihres Epson-Stylus\n" "Druckers ausrichten. Der falsche Gebrauch dieses Programmes kann \n" -"die Druckqualtät beeinträchtigen und möglicherweise den Drucker \n" -"beschädigen. Dieses Programm wurde von Seiko Epson nicht getestet\n" +"die Druckqualtät beeinträchtigen und möglicherweise den Drucker \n" +"beschädigen. Dieses Programm wurde von Seiko Epson nicht getestet\n" "oder zugelassen, es besteht keine Garantie, das es funktioniert. Das volle\n" "Risiko seines Einsatzes liegt bei Ihnen.\n" " \n" "Dieses Programm druckt Testmuster.\n" -"Sie bestehen aus Paaren von senkrechten Linien, welche sich überlappen.\n" +"Sie bestehen aus Paaren von senkrechten Linien, welche sich überlappen.\n" "Zwischen jedem Linienpaar steht eine Zahl von %d bis %d.\n" "\n" "Wenn sie die Linienpaare untersuchen, sollten sie eines finden, welches am\n" -"beßsten zusammen paßt, optimal ist eine durchgehende Linie. Benutzen sie \n" +"beßsten zusammen paßt, optimal ist eine durchgehende Linie. Benutzen sie \n" "ruhig hochwertiges Papier und eine Lupe um ganz sicher zu gehen, das " -"pefekteste Paar zu erkennen. Nachdem sie nun das schönste Paar ausgewählt \n" +"pefekteste Paar zu erkennen. Nachdem sie nun das schönste Paar ausgewählt \n" "und sich die Zahl gemerkt haben; legen sie das Blatt wieder in den Drucker " "ein\n" "bevor sie die Zahl eingeben.\n" "\n" -"Jedes Muster ist gleich, aber die späteren werden feiner gedruckt um die " +"Jedes Muster ist gleich, aber die späteren werden feiner gedruckt um die " "Unterschiede\n" -"noch mehr hervorzuheben. Sie müssen zur richtigen Ausrichtung der Druckköpfe " +"noch mehr hervorzuheben. Sie müssen zur richtigen Ausrichtung der Druckköpfe " "alle\n" -"Durchgänge ausführen. Nach erfolgreicher Ausrichtung wird noch ein " +"Durchgänge ausführen. Nach erfolgreicher Ausrichtung wird noch ein " "Musterausdruck\n" -"erzeugt. Sie werden erkennen, daß das beßste Paar (#%d von %d) ist.\n" +"erzeugt. Sie werden erkennen, daß das beßste Paar (#%d von %d) ist.\n" "\n" "Nach der letzten Ausgabe werden sie gefragt ob sie die Ausrichtung im " "Drucker sichern (s),\n" -"den Vorgang wiederholen(r) oder ohne Sicherung abbrechen möchten. Beim " +"den Vorgang wiederholen(r) oder ohne Sicherung abbrechen möchten. Beim " "Abbruch \n" "bleiben die Einstellungen bis zum Ausschalten des Druckers erhalten, aber " -"nicht länger.\n" -"Es ist wichtigt, den Drucker während der Ausrichtung nicht Auszuschalten.\n" +"nicht länger.\n" +"Es ist wichtigt, den Drucker während der Ausrichtung nicht Auszuschalten.\n" "\n" #: src/escputil/escputil.c:1811 @@ -7816,12 +8177,12 @@ msgid "" "What do you want to do (s, q, r)?\n" msgstr "" "Bitte kontrollieren sie den letzten Ausdruck sehr genau, ob ihr\n" -"Drucker pefekt ausgerichtet ist. Sie können nun:\n" +"Drucker pefekt ausgerichtet ist. Sie können nun:\n" " (s) die Einstellungen im Drucker sichern ,\n" " (q) das Programm ohne Sicherung verlassen, oder\n" " (r) Den Vorgang von Anfang an wiederholen.\n" -"Sie werden um eine Bestätigung gebeten.\n" -"Was möchten sie tun (s, q, r)?\n" +"Sie werden um eine Bestätigung gebeten.\n" +"Was möchten sie tun (s, q, r)?\n" #: src/escputil/escputil.c:1836 src/escputil/escputil.c:1845 #: src/escputil/escputil.c:1860 src/escputil/escputil.c:1878 @@ -7834,8 +8195,8 @@ msgstr "> " msgid "" "Please confirm by typing 'q' again that you wish to quit without saving:\n" msgstr "" -"Bitte bestätigen sie mit der Taste 'q' das sie die Einstellungen nicht " -"sichern möchten\n" +"Bitte bestätigen sie mit der Taste 'q' das sie die Einstellungen nicht " +"sichern möchten\n" #: src/escputil/escputil.c:1850 #, c-format @@ -7843,8 +8204,8 @@ 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 "" -"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" +"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:1857 #, c-format @@ -7852,8 +8213,8 @@ msgid "" "Please confirm by typing 'r' again that you wish to repeat the\n" "alignment process:\n" msgstr "" -"Bitte bestätigen sie mit der Taste 'r', daß sie die Kopf-Ausrichtung\n" -"wiederholen möchten:\n" +"Bitte bestätigen sie mit der Taste 'r', daß sie die Kopf-Ausrichtung\n" +"wiederholen möchten:\n" #: src/escputil/escputil.c:1865 #, c-format @@ -7869,11 +8230,11 @@ msgid "" "Please confirm by typing 's' again that you wish to save the settings\n" "to your printer:\n" msgstr "" -"Dies wird die Einstellungen ihres Druckers dauerhaft verändern.\n" -"WARNUNG:diser Vorgang wurde von Seiko Epson nicht geprüft\n" -"und könnte den Drucker beschädigen. Weiter?\n" -"Bitte bestätigen sie mit der Taste 's' , wenn sie die Einstellungen im\n" -"Drucker sichern möchten.\n" +"Dies wird die Einstellungen ihres Druckers dauerhaft verändern.\n" +"WARNUNG:diser Vorgang wurde von Seiko Epson nicht geprüft\n" +"und könnte den Drucker beschädigen. Weiter?\n" +"Bitte bestätigen sie mit der Taste 's' , wenn sie die Einstellungen im\n" +"Drucker sichern möchten.\n" #: src/escputil/escputil.c:1883 #, c-format @@ -7912,7 +8273,7 @@ msgstr "Unbekannter Befehl.\n" #: src/escputil/escputil.c:1903 #, c-format msgid "Final command was not confirmed.\n" -msgstr "Der letzte Befehl wurde nicht bestätigt.\n" +msgstr "Der letzte Befehl wurde nicht bestätigt.\n" #: src/escputil/escputil.c:1908 #, fuzzy, c-format @@ -7924,16 +8285,16 @@ msgid "" "Please place a sheet of paper in your printer to begin the head\n" "alignment procedure.\n" msgstr "" -"Diese Routine geht davon aus, daß ihr Drucker ein Epson %s ist.\n" -"Wenn nicht drücken sie bitte jetzt control-C und \n" -"wählen ihr Modell.\n" +"Diese Routine geht davon aus, daß ihr Drucker ein Epson %s ist.\n" +"Wenn nicht drücken sie bitte jetzt control-C und \n" +"wählen ihr Modell.\n" "\n" "Bitte legen sie ein Blatt Papier ein, um die Kopf-Ausrichtung zu beginnen.\n" #: src/escputil/escputil.c:1977 src/escputil/escputil.c:2008 #: src/escputil/escputil.c:2051 msgid "Press enter to continue > " -msgstr "Drücken sie Eingabe um fortzufahren > " +msgstr "Drücken sie Eingabe um fortzufahren > " #: src/escputil/escputil.c:1984 #, c-format @@ -7942,9 +8303,9 @@ msgid "" "pattern.\n" "Type a pair number, '?' for help, or 'r' to repeat the procedure.\n" msgstr "" -"Bitte betrachten sie den Ausdruck und entscheiden sie sich für \n" -"die beßsten Ãœbereinstimmungen der Muster-Paare .\n" -"Geben sie die Nummer ein, '?' für Hilfe, oder 'r' um den Druck zu " +"Bitte betrachten sie den Ausdruck und entscheiden sie sich für \n" +"die beßsten Übereinstimmungen der Muster-Paare .\n" +"Geben sie die Nummer ein, '?' für Hilfe, oder 'r' um den Druck zu " "wiederholen\n" #: src/escputil/escputil.c:1997 @@ -7960,7 +8321,7 @@ msgstr "Bitte legen sie ein neues Blatt ein.\n" #: src/escputil/escputil.c:2024 #, c-format msgid "Number out of range!\n" -msgstr "Die Zahl ist ungültig!\n" +msgstr "Die Zahl ist ungültig!\n" #: src/escputil/escputil.c:2029 #, c-format @@ -7970,12 +8331,12 @@ msgstr "Wie bitte ?????\n" #: src/escputil/escputil.c:2035 #, 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" +msgstr "Die Nummer des beßten Paares sollte zwischen 1 und %d liegen.\n" #: src/escputil/escputil.c:2042 #, c-format msgid "Attempting to set alignment..." -msgstr "Beginne die Köpfe einzurichten..." +msgstr "Beginne die Köpfe einzurichten..." #: src/escputil/escputil.c:2045 #, c-format @@ -7991,7 +8352,7 @@ msgid "" "quality printing.\n" msgstr "" "Bitte kontrollieren sie die Ausrichtung. Nachdem die Ausrichtungs-\n" -"muster nochmal gedruckt wurden, sollten die beßsten Ãœbereinstim-\n" +"muster nochmal gedruckt wurden, sollten die beßsten Übereinstim-\n" "mungen jeder Zeile im Muster %d sein. Wenn nicht, sollten sie diesen\n" "Vorgang wiederholen.\n" @@ -8000,231 +8361,90 @@ msgstr "" msgid "Error in input\n" msgstr "Eingabefehler\n" -#: src/gimp/print-image-gimp.c:225 src/gimp2/print-image-gimp.c:225 +#: src/gimp2/print-image-gimp.c:225 msgid "Printing..." msgstr "Drucken..." -#: src/gimp/print.c:133 -msgid "/File/Print..." -msgstr "/Datei/Drucken..." - -#: src/ghost/ijsgutenprint.c:98 -#, c-format -msgid "" -"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" -msgstr "" - -#: 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:199 -#, fuzzy, c-format -msgid "ERROR: ijsgutenprint: No row buffer\n" -msgstr "Kein Zeilen-Speicher\n" - -#: 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: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: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:656 -#, c-format -msgid "ijsgutenprint: unknown DeviceModel %s\n" -msgstr "" - -#: 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: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: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: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: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: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:830 -#, fuzzy, c-format -msgid "ERROR: ijsgutenprint: cannot parse %s boolean %s\n" -msgstr "Kann auf den Drucker nicht drucken. %s with %s\n" +#, fuzzy +#~ 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:841 -#, fuzzy, c-format -msgid "ERROR: ijsgutenprint: Bad parameter %s %d\n" -msgstr "Unbekannter Drucker %s\n" +#, fuzzy +#~ msgid "ERROR: ijsgutenprint: No row buffer\n" +#~ msgstr "Kein Zeilen-Speicher\n" -#: src/ghost/ijsgutenprint.c:867 -#, fuzzy, c-format -msgid "ERROR: ijsgutenprint: bad key code %d\n" -msgstr "Zeilensprung gescheitert bei % 0f \n" +#, fuzzy +#~ 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:1308 -#, fuzzy, c-format -msgid "ERROR: ijsgutenprint: image_init failed %d\n" -msgstr "image_init gescheitert %d\n" +#, fuzzy +#~ msgid "ERROR: ijsgutenprint: Printer must be specified with -sDeviceModel\n" +#~ msgstr "Der Drucker muß mit -sMODEL angegeben werden\n" -#: 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" +#, fuzzy +#~ msgid "ERROR: ijsgutenprint: Printer %s is not a known model\n" +#~ msgstr "Druckermodel %s ist unbekannt.\n" -#: src/ghost/ijsgutenprint.c:1331 -#, fuzzy, c-format -msgid "ERROR: ijsgutenprint: Unable to open %s: %s\n" -msgstr "Kann %s: %s nicht öffnen\n" +#, fuzzy +#~ msgid "ERROR: ijsgutenprint: cannot parse TopLeft %s\n" +#~ msgstr "Kann auf den Drucker nicht drucken. %s with %s\n" -#: src/ghost/ijsgutenprint.c:1344 -#, fuzzy, c-format -msgid "ERROR: ijsgutenprint: Unknown printer %s\n" -msgstr "Unbekannter Drucker %s\n" +#, fuzzy +#~ msgid "ERROR: ijsgutenprint: cannot parse PaperSize %s\n" +#~ msgstr "Kann auf den Drucker nicht drucken. %s with %s\n" -#: src/ghost/ijsgutenprint.c:1516 -#, fuzzy, c-format -msgid "ERROR: ijsgutenprint: Bad parameters; cannot continue!\n" -msgstr "Unzulässige Parameter, breche ab!\n" +#, fuzzy +#~ msgid "ERROR: ijsgutenprint: cannot parse curve %s\n" +#~ msgstr "Kann auf den Drucker nicht drucken. %s with %s\n" -#: 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 "ERROR: ijsgutenprint: cannot parse %s float %s\n" +#~ msgstr "Kann auf den Drucker nicht drucken. %s with %s\n" #, fuzzy -#~ msgid "Model Name" -#~ msgstr "Abbruch" +#~ msgid "ERROR: ijsgutenprint: cannot parse %s int %s\n" +#~ msgstr "Kann auf den Drucker nicht drucken. %s with %s\n" #, fuzzy -#~ msgid "Cassette" -#~ msgstr "Mattes Papier" +#~ msgid "ERROR: ijsgutenprint: cannot parse %s dimension %s\n" +#~ msgstr "Kann auf den Drucker nicht drucken. %s with %s\n" #, fuzzy -#~ msgid " Gamma" -#~ msgstr "Gamma:" +#~ msgid "ERROR: ijsgutenprint: cannot parse %s boolean %s\n" +#~ msgstr "Kann auf den Drucker nicht drucken. %s with %s\n" #, fuzzy -#~ msgid " Curve" -#~ msgstr "Schwarz" +#~ msgid "ERROR: ijsgutenprint: Bad parameter %s %d\n" +#~ msgstr "Unbekannter Drucker %s\n" #, fuzzy -#~ msgid "1440 x 1440" -#~ msgstr "1440 x 1440 DPI" +#~ msgid "ERROR: ijsgutenprint: bad key code %d\n" +#~ msgstr "Zeilensprung gescheitert bei % 0f \n" #, fuzzy -#~ msgid "1440 x 1440 DPI High Quality" -#~ msgstr "1200 DPI höchste Qualität" +#~ msgid "ERROR: ijsgutenprint: image_init failed %d\n" +#~ msgstr "image_init gescheitert %d\n" #, fuzzy -#~ msgid "1440 x 1440 DPI Highest Quality" -#~ msgstr "1200 DPI höchste Qualität" +#~ msgid "ERROR: ijsgutenprint: Unable to open file descriptor: %s\n" +#~ msgstr "Kann file descriptor : %s nicht öffnen\n" #, fuzzy -#~ msgid "2880 x 1440 DPI High Quality" -#~ msgstr "1200 DPI höchste Qualität" +#~ msgid "ERROR: ijsgutenprint: Unable to open %s: %s\n" +#~ msgstr "Kann %s: %s nicht öffnen\n" #, fuzzy -#~ msgid "2880 x 1440 DPI Highest Quality" -#~ msgstr "1200 DPI höchste Qualität" +#~ msgid "ERROR: ijsgutenprint: Unknown printer %s\n" +#~ msgstr "Unbekannter Drucker %s\n" #, fuzzy -#~ msgid "" -#~ "\n" -#~ "\n" -#~ "Copyright (C) 1997-2003 Michael Sweet, Robert Krawitz,\n" -#~ "and the rest of the Gutenprint Development Team.\n" -#~ "\n" -#~ "Please visit our web site at http://gimp-print.sourceforge.net.\n" -#~ "\n" -#~ "This program is free software; you can redistribute it and/or modify\n" -#~ "it under the terms of the GNU General Public License as published by\n" -#~ "the Free Software Foundation; either version 2 of the License, or\n" -#~ "(at your option) any later version.\n" -#~ "\n" -#~ "This program is distributed in the hope that it will be useful,\n" -#~ "but WITHOUT ANY WARRANTY; without even the implied warranty of\n" -#~ "MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the\n" -#~ "GNU General Public License for more details.\n" -#~ "\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" -#~ msgstr "" -#~ "\n" -#~ "\n" -#~ "Copyright © 1997-2001 Michael Sweet, Robert Krawitz,\n" -#~ "und dem Rest der Gimp-Print Entwicklergruppe.\n" -#~ "\n" -#~ "Bitte besuchen sie unsere Internetseite: http://gimp-print.sourceforge." -#~ "net.\n" -#~ "\n" -#~ "Dieses Programm ist freie Software. Sie können es unter\n" -#~ "den Bedingungen der GNU General Public License, wie von der\n" -#~ "Free Software Foundation herausgegeben, weitergeben und/oder\n" -#~ "modifizieren, entweder unter Version 2 der Lizenz oder (wenn\n" -#~ "Sie es wünschen) jeder späteren Version.\n" -#~ "\n" -#~ "Die Veröffentlichung dieses Programms erfolgt in der\n" -#~ "Hoffnung, daß es Ihnen von Nutzen sein wird, aber OHNE JEDE\n" -#~ "GEWÄHRLEISTUNG - sogar ohne die implizite Gewährleistung\n" -#~ "der MARKTREIFE oder der EIGNUNG FÃœR EINEN BESTIMMTEN ZWECK.\n" -#~ "Details finden Sie in der GNU General Public License.\n" -#~ "\n" -#~ "Sie sollten eine Kopie der GNU General Public License zusammen\n" -#~ "mit diesem Programm erhalten haben. Falls nicht, schreiben Sie\n" -#~ "an die Free Software Foundation, Inc., 675 Mass Ave, Cambridge,\n" -#~ "MA 02139, USA.\n" +#~ msgid "ERROR: ijsgutenprint: Bad parameters; cannot continue!\n" +#~ msgstr "Unzulässige Parameter, breche ab!\n" #, 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 erhalten sie OHNE JEGLICHE GARANTIE; für Einzelheiten geben sie " -#~ "'escputil -l' ein\n" -#~ "Dies ist freie Software und sie dürfen sie gern, unter den genannten " -#~ "Bedingungen, \n" -#~ "weitergeben; für Einzelheiten geben sie 'escputil -l' ein.\n" +#~ msgid "ERROR: ijsgutenprint: Get next row failed at %.0f\n" +#~ msgstr "Zeilensprung gescheitert bei % 0f \n" #, fuzzy #~ msgid "90x90 DPI" @@ -8236,19 +8456,19 @@ msgstr "Zeilensprung gescheitert bei % 0f \n" #, fuzzy #~ msgid "180x180 DPI" -#~ msgstr "150×150 DPI" +#~ msgstr "150×150 DPI" #, fuzzy #~ msgid "180x180 DPI DMT" -#~ msgstr "150×150 DPI" +#~ msgstr "150×150 DPI" #, fuzzy #~ msgid "360x360 DPI" -#~ msgstr "300×300 DPI" +#~ msgstr "300×300 DPI" #, fuzzy #~ msgid "360x360 DPI DMT" -#~ msgstr "600×600 DPI" +#~ msgstr "600×600 DPI" #, fuzzy #~ msgid "720x360 DPI" @@ -8258,10 +8478,6 @@ msgstr "Zeilensprung gescheitert bei % 0f \n" #~ msgid "720x360 DPI DMT" #~ msgstr "720 x 360 DPI MW2" -#, fuzzy -#~ msgid "720x720 DPI" -#~ msgstr "2880 x 720 DPI" - #, fuzzy #~ msgid "720x720 DPI DMT" #~ msgstr "2880 x 720 DPI" @@ -8292,43 +8508,39 @@ msgstr "Zeilensprung gescheitert bei % 0f \n" #, fuzzy #~ msgid "150x150 DPI DMT" -#~ msgstr "150×150 DPI" +#~ msgstr "150×150 DPI" #, fuzzy #~ msgid "300x300 DPI DMT" -#~ msgstr "300×300 DPI" +#~ msgstr "300×300 DPI" #, fuzzy #~ msgid "600x300 DPI DMT" -#~ msgstr "600×300 DPI" +#~ msgstr "600×300 DPI" #, fuzzy #~ msgid "600x600 DPI DMT" -#~ msgstr "600×600 DPI" +#~ msgstr "600×600 DPI" #, fuzzy #~ msgid "1200x600 DPI DMT" -#~ msgstr "1200×600 DPI" +#~ msgstr "1200×600 DPI" #, fuzzy #~ msgid "1200x1200 DPI" -#~ msgstr "1200×600 DPI" +#~ msgstr "1200×600 DPI" #, fuzzy #~ msgid "1200x1200 DPI DMT" -#~ msgstr "1200×600 DPI" +#~ msgstr "1200×600 DPI" #, fuzzy #~ msgid "2400x2400 DPI" -#~ msgstr "2400×600 DPI" +#~ msgstr "2400×600 DPI" #, fuzzy #~ msgid "2400x2400 DPI DMT" -#~ msgstr "2400×600 DPI" - -#, fuzzy -#~ msgid "Plain Paper PIXMA" -#~ msgstr "Normalpapier" +#~ msgstr "2400×600 DPI" #~ msgid "Back Print Film" #~ msgstr "Transferfolie" @@ -8357,37 +8569,112 @@ msgstr "Zeilensprung gescheitert bei % 0f \n" #~ msgid "Photo Paper Pro" #~ msgstr "Foto Papier Pro" -#~ msgid "Photo CcMmYK Color" -#~ msgstr "Foto CcMmYK Farbe" +#~ msgid "CMY Color" +#~ msgstr "CMY Farbe" + +#~ msgid "CMYK Color" +#~ msgstr "CMYK Farbe" #~ msgid "Photo CcMmY Color" #~ msgstr "Foto CcMmY Farbe" -#~ msgid "CMYK Color" -#~ msgstr "CMYK Farbe" +#~ msgid "Photo CcMmYK Color" +#~ msgstr "Foto CcMmYK Farbe" -#~ msgid "CMY Color" -#~ msgstr "CMY Farbe" +#, fuzzy +#~ msgid " Gamma" +#~ msgstr "Gamma:" #, fuzzy -#~ msgid "Gutenprint" -#~ msgstr "Probeausdruck" +#~ msgid " Curve" +#~ msgstr "Schwarz" #, fuzzy -#~ msgid "ERROR: ijsgutenprint: ijs_server_get_page_header failed %d\n" -#~ msgstr "Zeilensprung gescheitert bei % 0f \n" +#~ msgid "Red Balance" +#~ msgstr "Stellen sie die Gelb-Balance ein" #, fuzzy -#~ msgid "Printer does not support listing ink types!\n" -#~ msgstr "Drucker unterstützt keine Farbausgabe\n" +#~ msgid "" +#~ "\n" +#~ "\n" +#~ "Copyright (C) 1997-2003 Michael Sweet, Robert Krawitz,\n" +#~ "and the rest of the Gutenprint Development Team.\n" +#~ "\n" +#~ "Please visit our web site at http://gimp-print.sourceforge.net.\n" +#~ "\n" +#~ "This program is free software; you can redistribute it and/or modify\n" +#~ "it under the terms of the GNU General Public License as published by\n" +#~ "the Free Software Foundation; either version 2 of the License, or\n" +#~ "(at your option) any later version.\n" +#~ "\n" +#~ "This program is distributed in the hope that it will be useful,\n" +#~ "but WITHOUT ANY WARRANTY; without even the implied warranty of\n" +#~ "MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the\n" +#~ "GNU General Public License for more details.\n" +#~ "\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" +#~ msgstr "" +#~ "\n" +#~ "\n" +#~ "Copyright © 1997-2001 Michael Sweet, Robert Krawitz,\n" +#~ "und dem Rest der Gimp-Print Entwicklergruppe.\n" +#~ "\n" +#~ "Bitte besuchen sie unsere Internetseite: http://gimp-print.sourceforge." +#~ "net.\n" +#~ "\n" +#~ "Dieses Programm ist freie Software. Sie können es unter\n" +#~ "den Bedingungen der GNU General Public License, wie von der\n" +#~ "Free Software Foundation herausgegeben, weitergeben und/oder\n" +#~ "modifizieren, entweder unter Version 2 der Lizenz oder (wenn\n" +#~ "Sie es wünschen) jeder späteren Version.\n" +#~ "\n" +#~ "Die Veröffentlichung dieses Programms erfolgt in der\n" +#~ "Hoffnung, daß es Ihnen von Nutzen sein wird, aber OHNE JEDE\n" +#~ "GEWÄHRLEISTUNG - sogar ohne die implizite Gewährleistung\n" +#~ "der MARKTREIFE oder der EIGNUNG FÜR EINEN BESTIMMTEN ZWECK.\n" +#~ "Details finden Sie in der GNU General Public License.\n" +#~ "\n" +#~ "Sie sollten eine Kopie der GNU General Public License zusammen\n" +#~ "mit diesem Programm erhalten haben. Falls nicht, schreiben Sie\n" +#~ "an die Free Software Foundation, Inc., 675 Mass Ave, Cambridge,\n" +#~ "MA 02139, USA.\n" + +#, fuzzy +#~ msgid "Gutenprint" +#~ msgstr "Probeausdruck" + +#, fuzzy +#~ msgid "" +#~ ", Copyright (C) 2000-2003 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 erhalten sie OHNE JEGLICHE GARANTIE; für Einzelheiten geben sie " +#~ "'escputil -l' ein\n" +#~ "Dies ist freie Software und sie dürfen sie gern, unter den genannten " +#~ "Bedingungen, \n" +#~ "weitergeben; für Einzelheiten geben sie 'escputil -l' ein.\n" #, fuzzy #~ msgid "Cannot identify printer!\n" #~ msgstr "Kann die Meldungen vom Drucker nicht deuten.\n" #, fuzzy -#~ msgid "Red Balance" -#~ msgstr "Stellen sie die Gelb-Balance ein" +#~ msgid "Printer does not support listing ink types!\n" +#~ msgstr "Drucker unterstützt keine Farbausgabe\n" + +#~ msgid "/File/Print..." +#~ msgstr "/Datei/Drucken..." + +#, fuzzy +#~ msgid "ERROR: ijsgutenprint: ijs_server_get_page_header failed %d\n" +#~ msgstr "Zeilensprung gescheitert bei % 0f \n" #, fuzzy #~ msgid "Gloss Balance" @@ -8397,7 +8684,7 @@ msgstr "Zeilensprung gescheitert bei % 0f \n" #~ "Printer alignment must be done with a raw device or else\n" #~ "the -m option must be used to specify a printer.\n" #~ msgstr "" -#~ "Zur Druckerausrichtung muß die Schnittstelle bzw.\n" +#~ "Zur Druckerausrichtung muß die Schnittstelle bzw.\n" #~ "mit der \"-m\"- Option das Druckermodel angegeben werden.\n" #~ msgid "Attempting to detect printer model..." @@ -8415,21 +8702,21 @@ msgstr "Zeilensprung gescheitert bei % 0f \n" #, fuzzy #~ msgid "Gimp-Print" -#~ msgstr "Ãœber Gimp-Print " +#~ msgstr "Über Gimp-Print " #, fuzzy #~ msgid "Brightness of the print (0 is solid black, 2 is solid white)" #~ msgstr "" #~ "Stellen sie die Helligkeit ein.\n" -#~ "0 ist völlig Schwarz, 2 ist völlige Weiß" +#~ "0 ist völlig Schwarz, 2 ist völlige Weiß" #~ 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 "" -#~ "Geben sie den richtigen Druckbefehl für ihren Drucker ein. ( Bitte " -#~ "löschen sie nicht die -l bzw. -oraw Option von der Befehlszeile, sonst " +#~ "Geben sie den richtigen Druckbefehl für ihren Drucker ein. ( Bitte " +#~ "löschen sie nicht die -l bzw. -oraw Option von der Befehlszeile, sonst " #~ "kann der Duck scheitern!)" #~ msgid "PPD File?" @@ -8445,7 +8732,7 @@ msgstr "Zeilensprung gescheitert bei % 0f \n" #~ msgstr "%s: Option `%c%s'erlaubt keine Argumente\n" #~ msgid "%s: option `%s' requires an argument\n" -#~ msgstr "%s: Option `%s' benötigt ein Argument\n" +#~ msgstr "%s: Option `%s' benötigt ein Argument\n" #~ msgid "%s: unrecognized option `--%s'\n" #~ msgstr "%s: unbekannte Option `--%s'\n" @@ -8457,10 +8744,10 @@ msgstr "Zeilensprung gescheitert bei % 0f \n" #~ msgstr "%s: nicht erlaubte Option -- %c\n" #~ msgid "%s: invalid option -- %c\n" -#~ msgstr "%s: unvollständige Option -- %c\n" +#~ msgstr "%s: unvollständige Option -- %c\n" #~ msgid "%s: option requires an argument -- %c\n" -#~ msgstr "%s: Option benötigt ein Argument -- %c\n" +#~ msgstr "%s: Option benötigt ein Argument -- %c\n" #~ msgid "%s: option `-W %s' is ambiguous\n" #~ msgstr "%s: Option `-W %s' ist nicht definiert\n" @@ -8474,7 +8761,7 @@ msgstr "Zeilensprung gescheitert bei % 0f \n" #, fuzzy #~ msgid "Image is too wide for the page\n" -#~ msgstr "Bildgröße an Seitengröße anpassen" +#~ msgstr "Bildgröße an Seitengröße anpassen" #, fuzzy #~ msgid "Full Bleed" @@ -8485,7 +8772,7 @@ msgstr "Zeilensprung gescheitert bei % 0f \n" #~ msgstr "600 DPI Unidirectional" #~ msgid "24x36" -#~ msgstr "24×36" +#~ msgstr "24×36" #~ msgid "%.0f of %.0f\n" #~ msgstr "%.0f von %.0f\n" @@ -8538,26 +8825,26 @@ msgstr "Zeilensprung gescheitert bei % 0f \n" #~ "WARNING: THIS FUNCTION IS NOT YET TESTED! It may not work, and it may\n" #~ "damage your printer!\n" #~ msgstr "" -#~ "Bitte lesen sie diese Anweisungen sorgfältig bevor sie fortfahren.\n" +#~ "Bitte lesen sie diese Anweisungen sorgfältig bevor sie fortfahren.\n" #~ "\n" -#~ "Mit diesem Programm können sie die Druckköpfe ihres Epson-Stylus\n" +#~ "Mit diesem Programm können sie die Druckköpfe ihres Epson-Stylus\n" #~ "Druckers ausrichten. Der falsche Gebrauch dieses Programmes kann \n" -#~ "die Druckqualtät beeinträchtigen und möglicherweise den Drucker \n" -#~ "beschädigen. Dieses Programm wurde von Seiko Epson nicht getestet\n" +#~ "die Druckqualtät beeinträchtigen und möglicherweise den Drucker \n" +#~ "beschädigen. Dieses Programm wurde von Seiko Epson nicht getestet\n" #~ "oder zugelassen, es besteht keine Garantie, das es funktioniert. Das " #~ "volle\n" #~ "Risiko seines Einsatzes liegt bei Ihnen.\n" #~ " \n" #~ "Es werden %d Testmuster auf einem Blastt Papier gedruckt.\n" -#~ "Das Blatt muß vor jedem Durchgang wieder eingelegt werden.\n" +#~ "Das Blatt muß vor jedem Durchgang wieder eingelegt werden.\n" #~ "Bei jedem Muster steht eine Zahl von %d bis %d.\n" #~ "\n" #~ "Wenn sie die Muster untersuchen, sollten sie eines finden, welches am\n" -#~ "beßsten zusammen paßt, optimal ist eine durchgehende Linie. Benutzen " +#~ "beßsten zusammen paßt, optimal ist eine durchgehende Linie. Benutzen " #~ "sie \n" #~ "ruhig hochwertiges Papier und eine Lupe um ganz sicher zu gehen, das " -#~ "pefekteste Paar zu erkennen. Nachdem sie nun das schönste Paar " -#~ "ausgewählt \n" +#~ "pefekteste Paar zu erkennen. Nachdem sie nun das schönste Paar " +#~ "ausgewählt \n" #~ "und sich die Zahl gemerkt haben; legen sie das Blatt wieder in den " #~ "Drucker ein\n" #~ "bevor sie die Zahl eingeben.\n" @@ -8565,31 +8852,31 @@ msgstr "Zeilensprung gescheitert bei % 0f \n" #~ "\n" #~ "Nach der letzten Ausgabe werden sie gefragt ob sie die Ausrichtung im " #~ "Drucker sichern (s),\n" -#~ "den Vorgang wiederholen(r) oder ohne Sicherung abbrechen möchten. Beim " +#~ "den Vorgang wiederholen(r) oder ohne Sicherung abbrechen möchten. Beim " #~ "Abbruch \n" #~ "bleiben die Einstellungen bis zum Ausschalten des Druckers erhalten, aber " -#~ "nicht länger.\n" -#~ "Es ist wichtigt, den Drucker während der Ausrichtung nicht " +#~ "nicht länger.\n" +#~ "Es ist wichtigt, den Drucker während der Ausrichtung nicht " #~ "Auszuschalten.\n" #~ "\n" #~ "WARNUNG: DIESE FUNKTION WURDE NOCH NICHT GETEST !! \n" -#~ " es könnte nicht funktioniert oder ihren Drucker schädigen.\n" +#~ " es könnte nicht funktioniert oder ihren Drucker schädigen.\n" #~ msgid "Printer %s does not require color head alignment.\n" -#~ msgstr "Drucker %s benötigt keine Kopfausrichtung.\n" +#~ msgstr "Drucker %s benötigt keine Kopfausrichtung.\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 "" -#~ "Bitte betrachten sie den Ausdruck und entscheiden sie sich für \n" -#~ "die beßsten Ãœbereinstimmungen der Muster-Paare .\n" -#~ "Geben sie die Muster-Nummer ein, '?' für Hilfe, oder 'r' um den Druck zu " +#~ "Bitte betrachten sie den Ausdruck und entscheiden sie sich für \n" +#~ "die beßsten Übereinstimmungen der Muster-Paare .\n" +#~ "Geben sie die Muster-Nummer ein, '?' für Hilfe, oder 'r' um den Druck zu " #~ "wiederholen\n" #, fuzzy #~ msgid "Model %d out of range.\n" -#~ msgstr "Die Zahl ist ungültig!\n" +#~ msgstr "Die Zahl ist ungültig!\n" #~ msgid "Right Border:" #~ msgstr "rechter Rand:" @@ -8598,7 +8885,7 @@ msgstr "Zeilensprung gescheitert bei % 0f \n" #~ msgstr "unterer Rand:" #~ msgid "Size" -#~ msgstr "Größe" +#~ msgstr "Größe" #~ msgid "Image / Output Settings" #~ msgstr "Bild-/ Ausgabeeinstellungen" @@ -8609,7 +8896,7 @@ msgstr "Zeilensprung gescheitert bei % 0f \n" #, fuzzy #~ msgid "Resolutions" -#~ msgstr "Auflösung" +#~ msgstr "Auflösung" #~ msgid "Media Type:" #~ msgstr "Druckmedium: " @@ -8618,10 +8905,10 @@ msgstr "Zeilensprung gescheitert bei % 0f \n" #~ msgstr "Art des Druckmediums" #~ msgid "Media Size:" -#~ msgstr "Papier Größe:" +#~ msgstr "Papier Größe:" #~ msgid "Size of paper that you wish to print to" -#~ msgstr "Größe des Papiers " +#~ msgstr "Größe des Papiers " #~ msgid "Media Source:" #~ msgstr "Schacht/Quelle:" @@ -8633,21 +8920,21 @@ msgstr "Zeilensprung gescheitert bei % 0f \n" #~ msgstr "Tintenart:" #~ msgid "Resolution:" -#~ msgstr "Auflösung:" +#~ msgstr "Auflösung:" #~ msgid "Print in black and white (no color, and no shades of gray)" -#~ msgstr "Drucke in Schwarz-Weiß (keine Farbe oder Graustufen)" +#~ msgstr "Drucke in Schwarz-Weiß (keine Farbe oder Graustufen)" #~ msgid "Fastest and brightest color for text and line art" -#~ msgstr "Schnellste und hellste Farbe für Text und Strichzeichnung." +#~ msgstr "Schnellste und hellste Farbe für Text und Strichzeichnung." #~ msgid "Best for images dominated by regions of solid color" -#~ msgstr "Beste Qualität für Bilder mit einfarbigen Flächen." +#~ msgstr "Beste Qualität für Bilder mit einfarbigen Flächen." #~ msgid "" #~ "Slowest, but most accurate and smoothest color for continuous tone images " #~ "and photographs" -#~ msgstr "Langsamste aber beste Qualität für Farbverläufe und Fotografien." +#~ msgstr "Langsamste aber beste Qualität für Farbverläufe und Fotografien." #~ msgid "Dither Algorithm:" #~ msgstr "Raster-Algorythmus:" @@ -8660,7 +8947,7 @@ msgstr "Zeilensprung gescheitert bei % 0f \n" #~ "Kann von %s: %s nicht lesen.\n" #~ msgid "%s out of range (value %f, min %f, max %f)\n" -#~ msgstr "%s Bereichsüberschreitung (Wert %f, min %f, max %f)\n" +#~ msgstr "%s Bereichsüberschreitung (Wert %f, min %f, max %f)\n" #~ msgid "%s is not a valid dither algorithm\n" #~ msgstr "%s ist kein Rasteralgorythmus\n" @@ -8681,13 +8968,13 @@ msgstr "Zeilensprung gescheitert bei % 0f \n" #~ msgstr "" #~ "Betrachten sie den Musterausdruck und finden sie herraus, welches " #~ "Muster \n" -#~ "am beßsten zusammen paßt, optimal ist eine durchgehende Linie.\n" -#~ "Wenn sie keine gute Ãœbereinstimmung finden, wählen sie die annehm-\n" +#~ "am beßsten zusammen paßt, optimal ist eine durchgehende Linie.\n" +#~ "Wenn sie keine gute Übereinstimmung finden, wählen sie die annehm-\n" #~ "barste und wiederholen den Vorgang.\n" -#~ "Geben sie die Musternummer ein oder \"?\" für Hilfe.\n" +#~ "Geben sie die Musternummer ein oder \"?\" für Hilfe.\n" #~ msgid "The best pattern should be numbered between 1 and %d.\n" -#~ msgstr "Die Nummer des beßsten Musters sollte zwischen 1 und %d liegen.\n" +#~ msgstr "Die Nummer des beßsten Musters sollte zwischen 1 und %d liegen.\n" #~ msgid "Set the contrast of the print" #~ msgstr "Stellen sie den Kontrast ein" @@ -8702,13 +8989,13 @@ msgstr "Zeilensprung gescheitert bei % 0f \n" #~ msgstr "Gelb:" #~ msgid "Parameter %s out of range (value %f, min %f, max %f)\n" -#~ msgstr "Parameter %s ist nicht zulässig (wert %f, min %f, max %f)\n" +#~ msgstr "Parameter %s ist nicht zulässig (wert %f, min %f, max %f)\n" #~ msgid "Parameter %s out of range (value %d, min %d, max %d)\n" -#~ msgstr "Parameter %s ist nicht zulässig (wert %d, min %d, max %d)\n" +#~ msgstr "Parameter %s ist nicht zulässig (wert %d, min %d, max %d)\n" #~ msgid "13x19" -#~ msgstr "13×19" +#~ msgstr "13×19" #~ msgid "Monarch" #~ msgstr "Monarch" diff --git a/po/el.gmo b/po/el.gmo index 6e908b6..fe74123 100644 Binary files a/po/el.gmo and b/po/el.gmo differ diff --git a/po/el.po b/po/el.po index bc9a2d1..42d7433 100644 --- a/po/el.po +++ b/po/el.po @@ -6,31 +6,31 @@ msgid "" msgstr "" "Project-Id-Version: gimp-print 1.0\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2008-01-01 20:47-0500\n" +"POT-Creation-Date: 2008-04-25 21:19-0400\n" "PO-Revision-Date: 2001-12-29 20:10+0000\n" "Last-Translator: Simos Xenitellis \n" "Language-Team: Greek \n" "MIME-Version: 1.0\n" -"Content-Type: text/plain; charset=utf-8\n" +"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:1752 +#: src/main/print-escp2.c:2116 #, fuzzy msgid "Default" -msgstr "ΟÏισμός ΠÏοκαθοÏισμένων Τιμών" +msgstr "Ïñéóìüò ÐñïêáèïñéóìÝíùí Ôéìþí" #: src/main/dither-main.c:47 #, fuzzy msgid "EvenTone" -msgstr "ΕκτÏπωση Φακέλου" +msgstr "Åêôýðùóç ÖáêÝëïõ" #: src/main/dither-main.c:48 #, fuzzy msgid "Hybrid EvenTone" -msgstr "ΕκτÏπωση Φακέλου" +msgstr "Åêôýðùóç ÖáêÝëïõ" # #. TRANSLATORS: EvenTone, EvenBetter, and UniTone are proper @@ -39,17 +39,17 @@ msgstr "ΕκτÏπωση Φακέλου" #: src/main/dither-main.c:53 #, fuzzy msgid "EvenBetter" -msgstr "Διαστάσεις Letter" +msgstr "ÄéáóôÜóåéò Letter" #: src/main/dither-main.c:54 #, fuzzy msgid "Hybrid EvenBetter" -msgstr "ΕκτÏπωση Φακέλου" +msgstr "Åêôýðùóç ÖáêÝëïõ" #: src/main/dither-main.c:60 #, fuzzy msgid "UniTone" -msgstr "ΕκτÏπωση Φακέλου" +msgstr "Åêôýðùóç ÖáêÝëïõ" #: src/main/dither-main.c:61 msgid "Hybrid UniTone" @@ -62,61 +62,74 @@ msgstr "" #: src/main/dither-main.c:64 #, fuzzy msgid "Ordered" -msgstr "Διάταξη" +msgstr "ÄéÜôáîç" #: src/main/dither-main.c:65 -msgid "Fast" -msgstr "Ταχεία" +#, fuzzy +msgid "Ordered New" +msgstr "ÄéÜôáîç" #: src/main/dither-main.c:66 +msgid "Fast" +msgstr "Ôá÷åßá" + +#: src/main/dither-main.c:67 #, fuzzy msgid "Very Fast" -msgstr "Ταχεία" +msgstr "Ôá÷åßá" -#: src/main/dither-main.c:67 +#: src/main/dither-main.c:68 msgid "Hybrid Floyd-Steinberg" msgstr "" -#: src/main/dither-main.c:68 +#: src/main/dither-main.c:69 msgid "Predithered Input" msgstr "" -#: src/main/dither-main.c:88 src/main/print-color.c:56 +#: src/main/dither-main.c:70 +msgid "Drop Size Segmented" +msgstr "" + +#: src/main/dither-main.c:71 +msgid "Drop Size Segmented New" +msgstr "" + +#: src/main/dither-main.c:91 src/main/print-color.c:56 #, fuzzy msgid "Density" -msgstr "Πυκνότητα" +msgstr "Ðõêíüôçôá" -#: src/main/dither-main.c:88 src/main/print-canon.c:295 +#: src/main/dither-main.c:91 src/main/print-canon.c:295 #: src/main/print-canon.c:303 src/main/print-canon.c:311 -#: src/main/print-canon.c:319 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-escp2.c:471 -#: src/main/print-escp2.c:479 src/main/print-escp2.c:487 +#: src/main/print-canon.c:319 src/main/print-escp2.c:446 +#: src/main/print-escp2.c:454 src/main/print-escp2.c:462 +#: src/main/print-escp2.c:470 src/main/print-escp2.c:478 +#: src/main/print-escp2.c:486 src/main/print-escp2.c:494 #: 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:1764 src/main/print-olympus.c:1772 -#: src/main/print-olympus.c:1780 src/main/print-olympus.c:1788 -#: src/main/print-pcl.c:1261 src/main/print-pcl.c:1269 -#: src/main/print-pcl.c:1277 src/main/print-pcl.c:1285 +#: src/main/print-olympus.c:1762 src/main/print-olympus.c:1770 +#: src/main/print-olympus.c:1778 src/main/print-olympus.c:1786 +#: src/main/print-pcl.c:1329 src/main/print-pcl.c:1337 +#: src/main/print-pcl.c:1345 src/main/print-pcl.c:1353 msgid "Output Level Adjustment" msgstr "" -#: src/main/dither-main.c:89 +#: src/main/dither-main.c:92 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:97 +#: src/main/dither-main.c:100 msgid "Dither Algorithm" msgstr "" -#: src/main/dither-main.c:97 +#: src/main/dither-main.c:100 msgid "Screening Adjustment" msgstr "" -#: src/main/dither-main.c:98 +#: src/main/dither-main.c:101 msgid "" "Choose the dither algorithm to be used.\n" "Adaptive Hybrid usually produces the best all-around quality.\n" @@ -145,326 +158,335 @@ msgid "Dither algorithm" msgstr "" # -#: src/main/print-canon.c:200 src/main/print-escp2.c:180 -#: src/main/print-lexmark.c:266 src/main/print-olympus.c:1699 -#: src/main/print-pcl.c:1196 src/main/print-ps.c:67 +#: src/main/print-canon.c:200 src/main/print-escp2.c:182 +#: src/main/print-lexmark.c:266 src/main/print-olympus.c:1697 +#: src/main/print-pcl.c:1264 #, fuzzy msgid "Page Size" -msgstr "Μέγεθος" +msgstr "ÌÝãåèïò" #: src/main/print-canon.c:200 src/main/print-canon.c:206 #: src/main/print-canon.c:212 src/main/print-canon.c:218 #: src/main/print-canon.c:224 src/main/print-canon.c:230 #: src/main/print-canon.c:248 src/main/print-canon.c:272 -#: src/main/print-escp2.c:180 src/main/print-escp2.c:186 -#: src/main/print-escp2.c:192 src/main/print-escp2.c:198 -#: src/main/print-escp2.c:204 src/main/print-escp2.c:210 -#: src/main/print-escp2.c:228 src/main/print-escp2.c:245 -#: src/main/print-escp2.c:251 src/main/print-escp2.c:263 -#: src/main/print-escp2.c:281 src/main/print-lexmark.c:266 +#: src/main/print-escp2.c:182 src/main/print-escp2.c:188 +#: src/main/print-escp2.c:194 src/main/print-escp2.c:200 +#: src/main/print-escp2.c:206 src/main/print-escp2.c:212 +#: src/main/print-escp2.c:230 src/main/print-escp2.c:247 +#: src/main/print-escp2.c:253 src/main/print-escp2.c:265 +#: src/main/print-escp2.c:283 src/main/print-lexmark.c:266 #: src/main/print-lexmark.c:272 src/main/print-lexmark.c:278 -#: src/main/print-lexmark.c:284 src/main/print-olympus.c:1699 -#: src/main/print-olympus.c:1705 src/main/print-olympus.c:1711 -#: src/main/print-olympus.c:1717 src/main/print-pcl.c:1196 -#: src/main/print-pcl.c:1202 src/main/print-pcl.c:1208 -#: src/main/print-pcl.c:1214 src/main/print-pcl.c:1238 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 +#: src/main/print-lexmark.c:284 src/main/print-olympus.c:1697 +#: src/main/print-olympus.c:1703 src/main/print-olympus.c:1709 +#: src/main/print-olympus.c:1715 src/main/print-pcl.c:1264 +#: src/main/print-pcl.c:1270 src/main/print-pcl.c:1276 +#: src/main/print-pcl.c:1282 src/main/print-pcl.c:1306 src/main/print-ps.c:68 +#: src/main/print-ps.c:74 #, fuzzy msgid "Basic Printer Setup" -msgstr "Ρυθμίσεις Επιλογέα" +msgstr "Ñõèìßóåéò ÅðéëïãÝá" -#: src/main/print-canon.c:201 src/main/print-escp2.c:181 -#: src/main/print-lexmark.c:267 src/main/print-olympus.c:1700 -#: src/main/print-pcl.c:1197 src/main/print-ps.c:68 +#: src/main/print-canon.c:201 src/main/print-escp2.c:183 +#: src/main/print-lexmark.c:267 src/main/print-olympus.c:1698 +#: src/main/print-pcl.c:1265 #, fuzzy msgid "Size of the paper being printed to" -msgstr "Επιλέξτε τον φάκελο που θέλετε να ανοίξετε" +msgstr "ÅðéëÝîôå ôïí öÜêåëï ðïõ èÝëåôå íá áíïßîåôå" -#: src/main/print-canon.c:206 src/main/print-escp2.c:186 -#: src/main/print-lexmark.c:272 src/main/print-olympus.c:1705 -#: src/main/print-pcl.c:1202 src/main/print-ps.c:73 src/cups/genppd.c:1417 +#: src/main/print-canon.c:206 src/main/print-escp2.c:188 +#: src/main/print-lexmark.c:272 src/main/print-olympus.c:1703 +#: src/main/print-pcl.c:1270 src/cups/genppd.c:1422 #, fuzzy msgid "Media Type" -msgstr "Είδος MIME" +msgstr "Åßäïò MIME" -#: src/main/print-canon.c:207 src/main/print-escp2.c:187 -#: src/main/print-lexmark.c:273 src/main/print-olympus.c:1706 -#: src/main/print-pcl.c:1203 src/main/print-ps.c:74 +#: src/main/print-canon.c:207 src/main/print-escp2.c:189 +#: src/main/print-lexmark.c:273 src/main/print-olympus.c:1704 +#: src/main/print-pcl.c:1271 msgid "Type of media (plain paper, photo paper, etc.)" msgstr "" -#: src/main/print-canon.c:212 src/main/print-escp2.c:192 -#: src/main/print-lexmark.c:278 src/main/print-olympus.c:1711 -#: src/main/print-pcl.c:1208 src/main/print-ps.c:79 src/cups/genppd.c:1445 +#: src/main/print-canon.c:212 src/main/print-escp2.c:194 +#: src/main/print-lexmark.c:278 src/main/print-olympus.c:1709 +#: src/main/print-pcl.c:1276 src/cups/genppd.c:1450 #, fuzzy msgid "Media Source" -msgstr "Ανοικτό Λογισμικό" +msgstr "Áíïéêôü Ëïãéóìéêü" -#: src/main/print-canon.c:213 src/main/print-escp2.c:193 -#: src/main/print-lexmark.c:279 src/main/print-olympus.c:1712 -#: src/main/print-pcl.c:1209 src/main/print-ps.c:80 +#: src/main/print-canon.c:213 src/main/print-escp2.c:195 +#: src/main/print-lexmark.c:279 src/main/print-olympus.c:1710 +#: src/main/print-pcl.c:1277 msgid "Source (input slot) of the media" msgstr "" -#: src/main/print-canon.c:218 src/main/print-escp2.c:198 +#: src/main/print-canon.c:218 src/main/print-escp2.c:200 msgid "CD Hub Size" msgstr "" -#: src/main/print-canon.c:219 src/main/print-escp2.c:199 +#: src/main/print-canon.c:219 src/main/print-escp2.c:201 msgid "Print only outside of the hub of the CD, or all the way to the hole" msgstr "" -#: src/main/print-canon.c:224 src/main/print-escp2.c:204 +#: src/main/print-canon.c:224 src/main/print-escp2.c:206 msgid "CD Size (Custom)" msgstr "" -#: src/main/print-canon.c:225 src/main/print-escp2.c:205 +#: src/main/print-canon.c:225 src/main/print-escp2.c:207 msgid "Variable adjustment for the outer diameter of CD" msgstr "" -#: src/main/print-canon.c:230 src/main/print-escp2.c:210 +#: src/main/print-canon.c:230 src/main/print-escp2.c:212 msgid "CD Hub Size (Custom)" msgstr "" -#: src/main/print-canon.c:231 src/main/print-escp2.c:211 +#: src/main/print-canon.c:231 src/main/print-escp2.c:213 #, fuzzy msgid "Variable adjustment to the inner hub of the CD" -msgstr "Ελάττωση του μεγέθους της εικόνας στο μισό" +msgstr "ÅëÜôôùóç ôïõ ìåãÝèïõò ôçò åéêüíáò óôï ìéóü" -#: src/main/print-canon.c:236 src/main/print-escp2.c:216 +#: src/main/print-canon.c:236 src/main/print-escp2.c:218 msgid "CD Horizontal Fine Adjustment" msgstr "" #: src/main/print-canon.c:236 src/main/print-canon.c:242 -#: src/main/print-canon.c:254 src/main/print-escp2.c:216 -#: src/main/print-escp2.c:222 src/main/print-escp2.c:239 -#: src/main/print-escp2.c:275 src/main/print-lexmark.c:290 -#: src/main/print-olympus.c:1723 src/main/print-olympus.c:1729 -#: src/main/print-olympus.c:1735 src/main/print-pcl.c:1220 -#: src/main/print-ps.c:91 src/main/print-raw.c:80 +#: src/main/print-canon.c:254 src/main/print-escp2.c:218 +#: src/main/print-escp2.c:224 src/main/print-escp2.c:241 +#: src/main/print-escp2.c:277 src/main/print-lexmark.c:290 +#: src/main/print-olympus.c:1721 src/main/print-olympus.c:1727 +#: src/main/print-olympus.c:1733 src/main/print-pcl.c:1288 +#: src/main/print-raw.c:80 msgid "Advanced Printer Setup" msgstr "" #: src/main/print-canon.c:237 src/main/print-canon.c:243 -#: src/main/print-escp2.c:217 src/main/print-escp2.c:223 +#: src/main/print-escp2.c:219 src/main/print-escp2.c:225 msgid "Fine adjustment to horizontal position for CD printing" msgstr "" -#: src/main/print-canon.c:242 src/main/print-escp2.c:222 +#: src/main/print-canon.c:242 src/main/print-escp2.c:224 msgid "CD Vertical Fine Adjustment" msgstr "" -#: src/main/print-canon.c:248 src/main/print-escp2.c:228 -#: src/main/print-lexmark.c:284 src/main/print-olympus.c:1717 -#: src/main/print-pcl.c:1214 src/main/print-ps.c:85 src/cups/genppd.c:1518 +#: src/main/print-canon.c:248 src/main/print-escp2.c:230 +#: src/main/print-lexmark.c:284 src/main/print-olympus.c:1715 +#: src/main/print-pcl.c:1282 src/cups/genppd.c:1523 msgid "Resolution" -msgstr "Ανάλυση" +msgstr "ÁíÜëõóç" #: src/main/print-canon.c:249 src/main/print-lexmark.c:285 -#: src/main/print-olympus.c:1718 src/main/print-pcl.c:1215 -#: src/main/print-ps.c:86 +#: src/main/print-olympus.c:1716 src/main/print-pcl.c:1283 msgid "Resolution and quality of the print" msgstr "" -#: src/main/print-canon.c:254 src/main/print-escp2.c:239 -#: src/main/print-lexmark.c:290 src/main/print-olympus.c:1723 -#: src/main/print-pcl.c:1220 src/main/print-ps.c:91 src/main/print-raw.c:80 +#: src/main/print-canon.c:254 src/main/print-escp2.c:241 +#: src/main/print-lexmark.c:290 src/main/print-olympus.c:1721 +#: src/main/print-pcl.c:1288 src/main/print-raw.c:80 #, fuzzy msgid "Ink Type" -msgstr "ΤÏπος MIME" +msgstr "Ôýðïò MIME" -#: src/main/print-canon.c:255 src/main/print-escp2.c:240 -#: src/main/print-escp2.c:252 src/main/print-lexmark.c:291 -#: src/main/print-olympus.c:1724 src/main/print-pcl.c:1221 -#: src/main/print-ps.c:92 src/main/print-raw.c:81 +#: src/main/print-canon.c:255 src/main/print-escp2.c:242 +#: src/main/print-escp2.c:254 src/main/print-lexmark.c:291 +#: src/main/print-olympus.c:1722 src/main/print-pcl.c:1289 +#: src/main/print-raw.c:81 #, fuzzy msgid "Type of ink in the printer" -msgstr "ΑÏχείο κειμένου Ï€Ïος συμπεÏίληψη στην αναφοÏά" +msgstr "Áñ÷åßï êåéìÝíïõ ðñïò óõìðåñßëçøç óôçí áíáöïñÜ" #: src/main/print-canon.c:260 src/main/print-canon.c:261 -#: src/main/print-escp2.c:329 src/main/print-escp2.c:330 +#: src/main/print-escp2.c:331 src/main/print-escp2.c:332 #: src/main/print-lexmark.c:296 src/main/print-lexmark.c:297 -#: src/main/print-pcl.c:1226 src/main/print-pcl.c:1227 +#: src/main/print-pcl.c:1294 src/main/print-pcl.c:1295 msgid "Ink Channels" msgstr "" -#: src/main/print-canon.c:260 src/main/print-escp2.c:130 -#: src/main/print-escp2.c:137 src/main/print-escp2.c:144 -#: src/main/print-escp2.c:287 src/main/print-escp2.c:293 -#: src/main/print-escp2.c:299 src/main/print-escp2.c:305 -#: src/main/print-escp2.c:311 src/main/print-escp2.c:317 -#: src/main/print-escp2.c:323 src/main/print-escp2.c:329 -#: src/main/print-escp2.c:335 src/main/print-lexmark.c:296 -#: src/main/print-pcl.c:1226 +#: src/main/print-canon.c:260 src/main/print-escp2.c:132 +#: src/main/print-escp2.c:139 src/main/print-escp2.c:146 +#: src/main/print-escp2.c:289 src/main/print-escp2.c:295 +#: src/main/print-escp2.c:301 src/main/print-escp2.c:307 +#: src/main/print-escp2.c:313 src/main/print-escp2.c:319 +#: src/main/print-escp2.c:325 src/main/print-escp2.c:331 +#: src/main/print-escp2.c:337 src/main/print-lexmark.c:296 +#: src/main/print-pcl.c:1294 msgid "Advanced Printer Functionality" msgstr "" -#: src/main/print-canon.c:266 src/main/print-escp2.c:341 -#: src/main/print-lexmark.c:302 src/main/print-olympus.c:1741 -#: src/main/print-pcl.c:1232 src/main/print-ps.c:103 src/main/print-raw.c:86 +#: src/main/print-canon.c:266 src/main/print-escp2.c:343 +#: src/main/print-lexmark.c:302 src/main/print-olympus.c:1739 +#: src/main/print-pcl.c:1300 src/main/print-ps.c:80 src/main/print-raw.c:86 #, fuzzy msgid "Printing Mode" -msgstr "Όνομα εκτυπωτή:" +msgstr "¼íïìá åêôõðùôÞ:" #: src/main/print-canon.c:266 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:341 -#: src/main/print-escp2.c:347 src/main/print-lexmark.c:302 -#: src/main/print-olympus.c:1741 src/main/print-pcl.c:1232 -#: src/main/print-ps.c:103 src/main/print-raw.c:86 +#: src/main/print-color.c:208 src/main/print-escp2.c:343 +#: src/main/print-escp2.c:349 src/main/print-lexmark.c:302 +#: src/main/print-olympus.c:1739 src/main/print-pcl.c:1300 +#: src/main/print-ps.c:80 src/main/print-raw.c:86 #, fuzzy msgid "Core Parameter" -msgstr "ΚÏÏια Σελίδα" +msgstr "Êýñéá Óåëßäá" -#: src/main/print-canon.c:267 src/main/print-escp2.c:342 -#: src/main/print-lexmark.c:303 src/main/print-olympus.c:1742 -#: src/main/print-pcl.c:1233 src/main/print-ps.c:104 src/main/print-raw.c:87 +#: src/main/print-canon.c:267 src/main/print-escp2.c:344 +#: src/main/print-lexmark.c:303 src/main/print-olympus.c:1740 +#: src/main/print-pcl.c:1301 src/main/print-ps.c:81 src/main/print-raw.c:87 msgid "Printing Output Mode" msgstr "" -#: src/main/print-canon.c:272 src/main/print-pcl.c:1238 +#: src/main/print-canon.c:272 src/main/print-pcl.c:1306 msgid "Double-Sided Printing" msgstr "" -#: src/main/print-canon.c:273 src/main/print-pcl.c:1239 +#: src/main/print-canon.c:273 src/main/print-pcl.c:1307 msgid "Duplex/Tumble Setting" msgstr "" -#: src/main/print-canon.c:295 src/main/print-escp2.c:439 -#: src/main/print-lexmark.c:325 src/main/print-pcl.c:1261 +#: src/main/print-canon.c:295 src/main/print-escp2.c:446 +#: src/main/print-lexmark.c:325 src/main/print-pcl.c:1329 #, fuzzy msgid "Cyan Density" -msgstr "Πυκνότητα" +msgstr "Ðõêíüôçôá" -#: src/main/print-canon.c:296 src/main/print-escp2.c:440 -#: src/main/print-lexmark.c:326 src/main/print-pcl.c:1262 +#: src/main/print-canon.c:296 src/main/print-escp2.c:447 +#: src/main/print-lexmark.c:326 src/main/print-pcl.c:1330 #, fuzzy msgid "Adjust the cyan density" -msgstr "Στο κέντÏο της οθόνης" +msgstr "Óôï êÝíôñï ôçò ïèüíçò" -#: src/main/print-canon.c:303 src/main/print-escp2.c:447 -#: src/main/print-lexmark.c:333 src/main/print-pcl.c:1269 +#: src/main/print-canon.c:303 src/main/print-escp2.c:454 +#: src/main/print-lexmark.c:333 src/main/print-pcl.c:1337 #, fuzzy msgid "Magenta Density" -msgstr "μώβ" +msgstr "ìþâ" -#: src/main/print-canon.c:304 src/main/print-escp2.c:448 -#: src/main/print-lexmark.c:334 src/main/print-pcl.c:1270 +#: src/main/print-canon.c:304 src/main/print-escp2.c:455 +#: src/main/print-lexmark.c:334 src/main/print-pcl.c:1338 #, fuzzy msgid "Adjust the magenta density" -msgstr "Στο κέντÏο της οθόνης" +msgstr "Óôï êÝíôñï ôçò ïèüíçò" -#: src/main/print-canon.c:311 src/main/print-escp2.c:455 -#: src/main/print-lexmark.c:341 src/main/print-pcl.c:1277 +#: src/main/print-canon.c:311 src/main/print-escp2.c:462 +#: src/main/print-lexmark.c:341 src/main/print-pcl.c:1345 #, fuzzy msgid "Yellow Density" -msgstr "Πυκνότητα" +msgstr "Ðõêíüôçôá" -#: src/main/print-canon.c:312 src/main/print-escp2.c:456 -#: src/main/print-lexmark.c:342 src/main/print-pcl.c:1278 +#: src/main/print-canon.c:312 src/main/print-escp2.c:463 +#: src/main/print-lexmark.c:342 src/main/print-pcl.c:1346 #, fuzzy msgid "Adjust the yellow density" -msgstr "Στο κέντÏο της οθόνης" +msgstr "Óôï êÝíôñï ôçò ïèüíçò" -#: src/main/print-canon.c:319 src/main/print-escp2.c:463 -#: src/main/print-lexmark.c:349 src/main/print-pcl.c:1285 +#: src/main/print-canon.c:319 src/main/print-escp2.c:470 +#: src/main/print-lexmark.c:349 src/main/print-pcl.c:1353 #, fuzzy msgid "Black Density" -msgstr "Πυκνότητα" +msgstr "Ðõêíüôçôá" -#: src/main/print-canon.c:320 src/main/print-escp2.c:464 -#: src/main/print-lexmark.c:350 src/main/print-pcl.c:1286 +#: src/main/print-canon.c:320 src/main/print-escp2.c:471 +#: src/main/print-lexmark.c:350 src/main/print-pcl.c:1354 #, fuzzy msgid "Adjust the black density" -msgstr "Στο κέντÏο της οθόνης" +msgstr "Óôï êÝíôñï ôçò ïèüíçò" #: src/main/print-canon.c:327 src/main/print-canon.c:328 -#: src/main/print-escp2.c:495 src/main/print-escp2.c:496 +#: src/main/print-escp2.c:534 src/main/print-escp2.c:535 #: src/main/print-lexmark.c:357 src/main/print-lexmark.c:358 -#: src/main/print-pcl.c:1293 src/main/print-pcl.c:1294 +#: src/main/print-pcl.c:1361 src/main/print-pcl.c:1362 #, fuzzy msgid "Light Cyan Transition" -msgstr "Ψιλή Î’Ïοχή" +msgstr "ØéëÞ Âñï÷Þ" #: src/main/print-canon.c:327 src/main/print-canon.c:335 -#: src/main/print-canon.c:343 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-escp2.c:543 -#: src/main/print-escp2.c:551 src/main/print-escp2.c:559 -#: src/main/print-lexmark.c:357 src/main/print-lexmark.c:365 -#: src/main/print-pcl.c:1293 src/main/print-pcl.c:1301 +#: src/main/print-canon.c:343 src/main/print-escp2.c:502 +#: src/main/print-escp2.c:510 src/main/print-escp2.c:518 +#: src/main/print-escp2.c:526 src/main/print-escp2.c:534 +#: src/main/print-escp2.c:542 src/main/print-escp2.c:550 +#: src/main/print-escp2.c:558 src/main/print-escp2.c:566 +#: src/main/print-escp2.c:574 src/main/print-escp2.c:582 +#: src/main/print-escp2.c:590 src/main/print-escp2.c:598 +#: src/main/print-escp2.c:606 src/main/print-escp2.c:614 +#: src/main/print-escp2.c:622 src/main/print-escp2.c:630 +#: src/main/print-escp2.c:638 src/main/print-escp2.c:646 +#: src/main/print-escp2.c:654 src/main/print-escp2.c:662 +#: src/main/print-escp2.c:670 src/main/print-escp2.c:678 +#: src/main/print-escp2.c:686 src/main/print-escp2.c:694 +#: src/main/print-escp2.c:702 src/main/print-escp2.c:710 +#: src/main/print-escp2.c:718 src/main/print-escp2.c:726 +#: src/main/print-escp2.c:734 src/main/print-lexmark.c:357 +#: src/main/print-lexmark.c:365 src/main/print-pcl.c:1361 +#: src/main/print-pcl.c:1369 msgid "Advanced Ink Adjustment" msgstr "" #: src/main/print-canon.c:335 src/main/print-canon.c:336 -#: src/main/print-escp2.c:503 src/main/print-escp2.c:504 +#: src/main/print-escp2.c:566 src/main/print-escp2.c:567 #: src/main/print-lexmark.c:365 src/main/print-lexmark.c:366 -#: src/main/print-pcl.c:1301 src/main/print-pcl.c:1302 +#: src/main/print-pcl.c:1369 src/main/print-pcl.c:1370 #, fuzzy msgid "Light Magenta Transition" -msgstr "Ψιλή Î’Ïοχή" +msgstr "ØéëÞ Âñï÷Þ" #: src/main/print-canon.c:343 src/main/print-canon.c:344 #, fuzzy msgid "Light Yellow Transition" -msgstr "Ψιλή Î’Ïοχή" +msgstr "ØéëÞ Âñï÷Þ" -#: src/main/print-canon.c:363 src/main/print-pcl.c:1482 +#: src/main/print-canon.c:363 src/main/print-pcl.c:1550 #: src/main/escp2-resolutions.c:557 src/main/escp2-resolutions.c:565 #: src/main/escp2-resolutions.c:576 src/main/escp2-resolutions.c:588 msgid "Off" msgstr "" -#: src/main/print-canon.c:364 src/main/print-pcl.c:1483 +#: src/main/print-canon.c:364 src/main/print-pcl.c:1551 msgid "Long Edge (Standard)" msgstr "" -#: src/main/print-canon.c:365 src/main/print-pcl.c:1484 +#: src/main/print-canon.c:365 src/main/print-pcl.c:1552 msgid "Short Edge (Flip)" msgstr "" -#: src/main/print-canon.c:629 src/main/print-escp2.c:1648 +#: src/main/print-canon.c:629 src/main/print-escp2.c:2012 #: src/main/xmli18n-tmp.h:6 msgid "CD - 5 inch" msgstr "" -#: src/main/print-canon.c:631 src/main/print-escp2.c:1650 +#: src/main/print-canon.c:631 src/main/print-escp2.c:2014 #: src/main/xmli18n-tmp.h:7 msgid "CD - 3 inch" msgstr "" # Translation of "custom" sucks! ("kata paraggelia"??? nah!) -#: src/main/print-canon.c:633 src/main/print-escp2.c:1652 +#: src/main/print-canon.c:633 src/main/print-escp2.c:2016 #: src/main/xmli18n-tmp.h:8 #, fuzzy msgid "CD - Custom" -msgstr "ΟÏισμένο από το χÏήστη" +msgstr "ÏñéóìÝíï áðü ôï ÷ñÞóôç" -#: src/main/print-canon.c:656 src/main/print-escp2.c:1677 +#: src/main/print-canon.c:656 src/main/print-escp2.c:2041 msgid "Normal" msgstr "" -#: src/main/print-canon.c:658 src/main/print-escp2.c:1679 +#: src/main/print-canon.c:658 src/main/print-escp2.c:2043 #, fuzzy msgid "Print To Hub" -msgstr "ΕκτÏπωση σε ΑÏχείο" +msgstr "Åêôýðùóç óå Áñ÷åßï" # -#: src/main/print-canon.c:773 src/main/print-escp2.c:2011 -#: src/main/print-lexmark.c:1279 src/main/print-olympus.c:1996 -#: src/main/print-pcl.c:1776 src/main/print-ps.c:170 src/main/print-raw.c:135 -#: src/gutenprintui/panel.c:289 src/gutenprintui2/panel.c:289 +#: src/main/print-canon.c:773 src/main/print-escp2.c:2450 +#: src/main/print-lexmark.c:1279 src/main/print-olympus.c:1994 +#: src/main/print-pcl.c:1844 src/main/print-ps.c:310 src/main/print-raw.c:135 +#: src/gutenprintui2/panel.c:290 msgid "Color" -msgstr "ΧÏώμα" +msgstr "×ñþìá" -#: src/main/print-canon.c:775 src/main/print-escp2.c:2013 -#: src/main/print-lexmark.c:1281 src/main/print-pcl.c:1778 -#: src/main/print-ps.c:172 src/main/print-raw.c:137 +#: src/main/print-canon.c:775 src/main/print-escp2.c:2452 +#: src/main/print-lexmark.c:1281 src/main/print-pcl.c:1846 +#: src/main/print-ps.c:312 src/main/print-raw.c:137 #, fuzzy msgid "Black and White" -msgstr "Μαυ_ÏόασπÏο" +msgstr "Ìáõ_ñüáóðñï" #: src/main/print-color.c:50 msgid "High Accuracy" @@ -473,7 +495,7 @@ msgstr "" #: src/main/print-color.c:51 #, fuzzy msgid "Bright Colors" -msgstr "ΠÏωτεÏωντα ΧÏώματα" +msgstr "Ðñùôåýùíôá ×ñþìáôá" #: src/main/print-color.c:52 msgid "Correct Hue Only" @@ -499,18 +521,18 @@ msgstr "" #: src/main/print-color.c:58 #, fuzzy msgid "Pre-Dithered" -msgstr "ΕκτÏπωση" +msgstr "Åêôýðùóç" #: src/main/print-color.c:121 src/main/escp2-channels.c:916 #: src/main/escp2-channels.c:929 src/main/escp2-channels.c:943 -#: src/gutenprintui/panel.c:290 src/gutenprintui2/panel.c:290 +#: src/gutenprintui2/panel.c:291 msgid "Grayscale" -msgstr "Κλίμακα του γκÏι" +msgstr "Êëßìáêá ôïõ ãêñé" #: src/main/print-color.c:123 #, fuzzy msgid "Whitescale" -msgstr "ΚίτÏινο" +msgstr "Êßôñéíï" #: src/main/print-color.c:125 msgid "RGB" @@ -529,10 +551,10 @@ msgid "KCMY" msgstr "" # -#: src/main/print-color.c:165 src/main/print-color.c:446 +#: src/main/print-color.c:165 src/main/print-color.c:454 #, fuzzy msgid "Channel " -msgstr "ΑκÏÏωση" +msgstr "Áêýñùóç" # #: src/main/print-color.c:165 src/main/print-color.c:216 @@ -543,7 +565,7 @@ msgstr "ΑκÏÏωση" #: src/main/print-color.c:314 src/gutenprintui2/gammacurve.c:408 #, fuzzy msgid "Gamma" -msgstr "Γάμμα" +msgstr "ÃÜììá" #: src/main/print-color.c:166 msgid "Gamma for raw channel " @@ -574,25 +596,25 @@ msgstr "" #: src/main/print-color.c:192 #, fuzzy msgid "Input Image Type" -msgstr "Είδος MIME" +msgstr "Åßäïò MIME" #: src/main/print-color.c:193 #, fuzzy msgid "Input image type" -msgstr "Είδος MIME" +msgstr "Åßäïò MIME" #: src/main/print-color.c:200 #, fuzzy msgid "Output Image Type" -msgstr "Byte Εξόδου" +msgstr "Byte Åîüäïõ" #: src/main/print-color.c:201 #, fuzzy msgid "Output image type" -msgstr "Byte Εξόδου" +msgstr "Byte Åîüäïõ" #: src/main/print-color.c:208 src/main/print-color.c:209 -#: src/main/print-escp2.c:347 +#: src/main/print-escp2.c:349 msgid "Raw Channels" msgstr "" @@ -600,7 +622,7 @@ msgstr "" #: src/main/print-color.c:216 #, fuzzy msgid "SimpleGamma" -msgstr "Γάμμα" +msgstr "ÃÜììá" #: src/main/print-color.c:217 msgid "Do not correct for screen gamma" @@ -609,17 +631,17 @@ msgstr "" #: src/main/print-color.c:224 #, fuzzy msgid "Brightness" -msgstr "ΕÏγασία" +msgstr "Åñãáóßá" #: src/main/print-color.c:225 #, fuzzy msgid "Brightness of the print" -msgstr "Εστίαση για Ï€ÏοσαÏμογή του Ïψους της σελίδας" +msgstr "Åóôßáóç ãéá ðñïóáñìïãÞ ôïõ ýøïõò ôçò óåëßäáò" #: src/main/print-color.c:232 #, fuzzy msgid "Contrast" -msgstr "Αντίθεση" +msgstr "Áíôßèåóç" #: src/main/print-color.c:233 msgid "Contrast of the print (0 is solid gray)" @@ -632,7 +654,7 @@ msgstr "" #: src/main/print-color.c:240 #, fuzzy msgid "Advanced Image Control" -msgstr "Byte Εξόδου" +msgstr "Byte Åîüäïõ" #: src/main/print-color.c:241 msgid "Use linear vs. fixed end point contrast adjustment" @@ -652,121 +674,118 @@ msgstr "" #: src/main/print-color.c:258 #, fuzzy msgid "AppGamma" -msgstr "Γάμμα" +msgstr "ÃÜììá" #: src/main/print-color.c:259 msgid "Gamma value assumed by application" msgstr "" -#: src/main/print-color.c:266 src/main/escp2-channels.c:3048 -#: src/main/escp2-channels.c:3060 src/main/escp2-channels.c:3068 -#: src/main/escp2-channels.c:3078 src/main/escp2-channels.c:3089 -#: src/main/escp2-channels.c:3101 src/main/escp2-channels.c:3117 -#: src/main/escp2-channels.c:3125 src/main/escp2-channels.c:3138 -#: src/main/escp2-channels.c:3151 src/main/escp2-channels.c:3165 -#: src/main/escp2-channels.c:3179 src/main/escp2-channels.c:3194 -#: src/gutenprintui/panel.c:2152 src/gutenprintui2/panel.c:2153 +#: src/main/print-color.c:266 src/main/escp2-channels.c:3087 +#: src/main/escp2-channels.c:3099 src/main/escp2-channels.c:3107 +#: src/main/escp2-channels.c:3117 src/main/escp2-channels.c:3128 +#: src/main/escp2-channels.c:3140 src/main/escp2-channels.c:3156 +#: src/main/escp2-channels.c:3164 src/main/escp2-channels.c:3177 +#: src/main/escp2-channels.c:3190 src/main/escp2-channels.c:3204 +#: src/main/escp2-channels.c:3218 src/main/escp2-channels.c:3230 +#: src/main/escp2-channels.c:3243 src/gutenprintui2/panel.c:2328 #: src/escputil/escputil.c:978 src/escputil/escputil.c:997 #: src/escputil/escputil.c:1201 msgid "Cyan" -msgstr "Κυανό" +msgstr "Êõáíü" #: src/main/print-color.c:267 #, fuzzy msgid "Adjust the cyan gamma" -msgstr "Στο κέντÏο της οθόνης" - -#: src/main/print-color.c:274 src/main/escp2-channels.c:3049 -#: src/main/escp2-channels.c:3059 src/main/escp2-channels.c:3070 -#: src/main/escp2-channels.c:3079 src/main/escp2-channels.c:3090 -#: src/main/escp2-channels.c:3103 src/main/escp2-channels.c:3116 -#: src/main/escp2-channels.c:3126 src/main/escp2-channels.c:3139 -#: src/main/escp2-channels.c:3152 src/main/escp2-channels.c:3164 -#: src/main/escp2-channels.c:3178 src/main/escp2-channels.c:3195 -#: src/gutenprintui/panel.c:2159 src/gutenprintui2/panel.c:2160 +msgstr "Óôï êÝíôñï ôçò ïèüíçò" + +#: src/main/print-color.c:274 src/main/escp2-channels.c:3088 +#: src/main/escp2-channels.c:3098 src/main/escp2-channels.c:3109 +#: src/main/escp2-channels.c:3118 src/main/escp2-channels.c:3129 +#: src/main/escp2-channels.c:3142 src/main/escp2-channels.c:3155 +#: src/main/escp2-channels.c:3165 src/main/escp2-channels.c:3178 +#: src/main/escp2-channels.c:3191 src/main/escp2-channels.c:3203 +#: src/main/escp2-channels.c:3217 src/main/escp2-channels.c:3229 +#: src/main/escp2-channels.c:3244 src/gutenprintui2/panel.c:2335 #: src/escputil/escputil.c:979 src/escputil/escputil.c:998 #: src/escputil/escputil.c:1202 #, fuzzy msgid "Magenta" -msgstr "μώβ" +msgstr "ìþâ" #: src/main/print-color.c:275 #, fuzzy msgid "Adjust the magenta gamma" -msgstr "Στο κέντÏο της οθόνης" - -#: src/main/print-color.c:282 src/main/escp2-channels.c:3050 -#: src/main/escp2-channels.c:3061 src/main/escp2-channels.c:3069 -#: src/main/escp2-channels.c:3080 src/main/escp2-channels.c:3091 -#: src/main/escp2-channels.c:3105 src/main/escp2-channels.c:3112 -#: src/main/escp2-channels.c:3127 src/main/escp2-channels.c:3140 -#: src/main/escp2-channels.c:3153 src/main/escp2-channels.c:3163 -#: src/main/escp2-channels.c:3177 src/main/escp2-channels.c:3196 -#: src/gutenprintui/panel.c:2166 src/gutenprintui2/panel.c:2167 +msgstr "Óôï êÝíôñï ôçò ïèüíçò" + +#: src/main/print-color.c:282 src/main/escp2-channels.c:3089 +#: src/main/escp2-channels.c:3100 src/main/escp2-channels.c:3108 +#: src/main/escp2-channels.c:3119 src/main/escp2-channels.c:3130 +#: src/main/escp2-channels.c:3144 src/main/escp2-channels.c:3151 +#: src/main/escp2-channels.c:3166 src/main/escp2-channels.c:3179 +#: src/main/escp2-channels.c:3192 src/main/escp2-channels.c:3202 +#: src/main/escp2-channels.c:3216 src/main/escp2-channels.c:3228 +#: src/main/escp2-channels.c:3245 src/gutenprintui2/panel.c:2342 #: src/escputil/escputil.c:980 src/escputil/escputil.c:999 #: src/escputil/escputil.c:1203 msgid "Yellow" -msgstr "ΚίτÏινο" +msgstr "Êßôñéíï" #: src/main/print-color.c:283 #, fuzzy msgid "Adjust the yellow gamma" -msgstr "Στο κέντÏο της οθόνης" +msgstr "Óôï êÝíôñï ôçò ïèüíçò" -#: src/main/print-color.c:290 src/main/escp2-channels.c:3168 -#: src/main/escp2-channels.c:3181 src/gutenprintui/panel.c:2180 -#: src/gutenprintui2/panel.c:2181 src/escputil/escputil.c:987 -#: src/escputil/escputil.c:1005 +#: src/main/print-color.c:290 src/main/escp2-channels.c:3207 +#: src/main/escp2-channels.c:3220 src/gutenprintui2/panel.c:2356 +#: src/escputil/escputil.c:987 src/escputil/escputil.c:1005 msgid "Red" msgstr "" #: src/main/print-color.c:291 #, fuzzy msgid "Adjust the red gamma" -msgstr "Στο κέντÏο της οθόνης" +msgstr "Óôï êÝíôñï ôçò ïèüíçò" -#: src/main/print-color.c:298 src/gutenprintui/panel.c:2187 -#: src/gutenprintui2/panel.c:2188 +#: src/main/print-color.c:298 src/gutenprintui2/panel.c:2363 msgid "Green" msgstr "" #: src/main/print-color.c:299 #, fuzzy msgid "Adjust the green gamma" -msgstr "Στο κέντÏο της οθόνης" +msgstr "Óôï êÝíôñï ôçò ïèüíçò" -#: src/main/print-color.c:306 src/main/escp2-channels.c:3169 -#: src/main/escp2-channels.c:3182 src/gutenprintui/panel.c:2194 -#: src/gutenprintui2/panel.c:2195 src/escputil/escputil.c:988 -#: src/escputil/escputil.c:1006 +#: src/main/print-color.c:306 src/main/escp2-channels.c:3208 +#: src/main/escp2-channels.c:3221 src/gutenprintui2/panel.c:2370 +#: src/escputil/escputil.c:988 src/escputil/escputil.c:1006 msgid "Blue" msgstr "" #: src/main/print-color.c:307 #, fuzzy msgid "Adjust the blue gamma" -msgstr "Στο κέντÏο της οθόνης" +msgstr "Óôï êÝíôñï ôçò ïèüíçò" #: src/main/print-color.c:314 src/main/print-lexmark.c:613 -#: src/main/escp2-channels.c:3047 src/main/escp2-channels.c:3057 -#: src/main/escp2-channels.c:3058 src/main/escp2-channels.c:3071 -#: src/main/escp2-channels.c:3081 src/main/escp2-channels.c:3088 -#: src/main/escp2-channels.c:3100 src/main/escp2-channels.c:3113 -#: src/main/escp2-channels.c:3124 src/main/escp2-channels.c:3137 -#: src/main/escp2-channels.c:3150 src/main/escp2-channels.c:3156 -#: src/main/escp2-channels.c:3180 src/main/escp2-channels.c:3193 -#: src/gutenprintui/panel.c:2173 src/gutenprintui2/panel.c:2174 +#: src/main/escp2-channels.c:3086 src/main/escp2-channels.c:3096 +#: src/main/escp2-channels.c:3097 src/main/escp2-channels.c:3110 +#: src/main/escp2-channels.c:3120 src/main/escp2-channels.c:3127 +#: src/main/escp2-channels.c:3139 src/main/escp2-channels.c:3152 +#: src/main/escp2-channels.c:3163 src/main/escp2-channels.c:3176 +#: src/main/escp2-channels.c:3189 src/main/escp2-channels.c:3195 +#: src/main/escp2-channels.c:3219 src/main/escp2-channels.c:3231 +#: src/main/escp2-channels.c:3242 src/gutenprintui2/panel.c:2349 #: src/escputil/escputil.c:975 src/escputil/escputil.c:996 #: src/escputil/escputil.c:1200 msgid "Black" -msgstr "ΜαÏÏο" +msgstr "Ìáýñï" #: src/main/print-color.c:315 #, fuzzy msgid "Adjust the black gamma" -msgstr "Στο κέντÏο της οθόνης" +msgstr "Óôï êÝíôñï ôçò ïèüíçò" -#: src/main/print-color.c:322 src/main/print-olympus.c:1764 +#: src/main/print-color.c:322 src/main/print-olympus.c:1762 msgid "Cyan Balance" msgstr "" @@ -774,38 +793,38 @@ msgstr "" #: src/main/print-color.c:338 #, fuzzy msgid "GrayBalance" -msgstr "Κλίμακα του γκÏι" +msgstr "Êëßìáêá ôïõ ãêñé" #: src/main/print-color.c:323 #, fuzzy msgid "Adjust the cyan gray balance" -msgstr "Στο κέντÏο της οθόνης" +msgstr "Óôï êÝíôñï ôçò ïèüíçò" -#: src/main/print-color.c:330 src/main/print-olympus.c:1772 +#: src/main/print-color.c:330 src/main/print-olympus.c:1770 #, fuzzy msgid "Magenta Balance" -msgstr "μώβ" +msgstr "ìþâ" #: src/main/print-color.c:331 #, fuzzy msgid "Adjust the magenta gray balance" -msgstr "Στο κέντÏο της οθόνης" +msgstr "Óôï êÝíôñï ôçò ïèüíçò" -#: src/main/print-color.c:338 src/main/print-olympus.c:1780 +#: src/main/print-color.c:338 src/main/print-olympus.c:1778 #, fuzzy msgid "Yellow Balance" -msgstr "Στο κέντÏο της οθόνης" +msgstr "Óôï êÝíôñï ôçò ïèüíçò" #: src/main/print-color.c:339 #, fuzzy msgid "Adjust the yellow gray balance" -msgstr "Στο κέντÏο της οθόνης" +msgstr "Óôï êÝíôñï ôçò ïèüíçò" # #: src/main/print-color.c:346 #, fuzzy msgid "Saturation" -msgstr "ΚοÏεσμός:" +msgstr "Êïñåóìüò:" #: src/main/print-color.c:347 msgid "" @@ -816,567 +835,686 @@ msgstr "" #: src/main/print-color.c:357 #, fuzzy msgid "Ink Limit" -msgstr "ΤÏπος MIME" +msgstr "Ôýðïò MIME" #: 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:353 -#: src/main/print-escp2.c:359 src/main/print-escp2.c:365 -#: src/main/print-escp2.c:371 src/main/print-escp2.c:377 +#: src/main/print-color.c:421 src/main/print-color.c:553 +#: src/main/print-escp2.c:355 src/main/print-escp2.c:361 +#: src/main/print-escp2.c:367 src/main/print-escp2.c:373 +#: src/main/print-escp2.c:379 src/main/print-escp2.c:742 +#: src/main/print-escp2.c:750 src/main/print-escp2.c:758 #, fuzzy msgid "Advanced Output Control" -msgstr "Byte Εξόδου" +msgstr "Byte Åîüäïõ" #: src/main/print-color.c:358 msgid "Limit the total ink printed to the page" msgstr "" -#: src/main/print-color.c:365 +#: src/main/print-color.c:365 src/main/print-escp2.c:742 msgid "GCR Transition" msgstr "" -#: src/main/print-color.c:366 +#: src/main/print-color.c:366 src/main/print-escp2.c:743 msgid "Adjust the gray component transition rate" msgstr "" -#: src/main/print-color.c:373 +#: src/main/print-color.c:373 src/main/print-escp2.c:750 msgid "GCR Lower Bound" msgstr "" -#: src/main/print-color.c:374 +#: src/main/print-color.c:374 src/main/print-escp2.c:751 msgid "Lower bound of gray component reduction" msgstr "" -#: src/main/print-color.c:381 +#: src/main/print-color.c:381 src/main/print-escp2.c:758 msgid "GCR Upper Bound" msgstr "" -#: src/main/print-color.c:382 +#: src/main/print-color.c:382 src/main/print-escp2.c:759 msgid "Upper bound of gray component reduction" msgstr "" -#: src/main/print-color.c:447 src/main/print-color.c:457 -#: src/main/print-color.c:465 src/main/print-color.c:473 -#: src/main/print-color.c:481 src/main/print-color.c:489 -#: src/main/print-color.c:497 src/main/print-color.c:505 -#: src/main/print-color.c:513 +#: src/main/print-color.c:421 +msgid "LUT dump file" +msgstr "" + +#: src/main/print-color.c:422 +msgid "Dump file for LUT for external color adjustment" +msgstr "" + +#: src/main/print-color.c:455 src/main/print-color.c:465 +#: src/main/print-color.c:473 src/main/print-color.c:481 +#: src/main/print-color.c:489 src/main/print-color.c:497 +#: src/main/print-color.c:505 src/main/print-color.c:513 +#: src/main/print-color.c:521 #, fuzzy msgid "Output Curves" -msgstr "Byte Εξόδου" +msgstr "Byte Åîüäïõ" -#: src/main/print-color.c:447 +#: src/main/print-color.c:455 msgid "Curve for raw channel " msgstr "" -#: src/main/print-color.c:457 +#: src/main/print-color.c:465 msgid "Cyan Curve" msgstr "" # -#: src/main/print-color.c:458 +#: src/main/print-color.c:466 #, fuzzy msgid "Cyan curve" -msgstr "ΑκÏÏωση" +msgstr "Áêýñùóç" -#: src/main/print-color.c:465 +#: src/main/print-color.c:473 #, fuzzy msgid "Magenta Curve" -msgstr "μώβ" +msgstr "ìþâ" -#: src/main/print-color.c:466 +#: src/main/print-color.c:474 #, fuzzy msgid "Magenta curve" -msgstr "μώβ" +msgstr "ìþâ" -#: src/main/print-color.c:473 +#: src/main/print-color.c:481 #, fuzzy msgid "Yellow Curve" -msgstr "ΚίτÏινο" +msgstr "Êßôñéíï" -#: src/main/print-color.c:474 +#: src/main/print-color.c:482 #, fuzzy msgid "Yellow curve" -msgstr "ΚίτÏινο" +msgstr "Êßôñéíï" -#: src/main/print-color.c:481 +#: src/main/print-color.c:489 #, fuzzy msgid "Black Curve" -msgstr "ΜαÏÏο" +msgstr "Ìáýñï" -#: src/main/print-color.c:482 +#: src/main/print-color.c:490 #, fuzzy msgid "Black curve" -msgstr "ΜαÏÏο" +msgstr "Ìáýñï" -#: src/main/print-color.c:489 +#: src/main/print-color.c:497 #, fuzzy msgid "Red Curve" -msgstr "ΚίτÏινο" +msgstr "Êßôñéíï" -#: src/main/print-color.c:490 +#: src/main/print-color.c:498 #, fuzzy msgid "Red curve" -msgstr "ΚίτÏινο" +msgstr "Êßôñéíï" -#: src/main/print-color.c:497 +#: src/main/print-color.c:505 #, fuzzy msgid "Green Curve" -msgstr "μώβ" +msgstr "ìþâ" -#: src/main/print-color.c:498 +#: src/main/print-color.c:506 #, fuzzy msgid "Green curve" -msgstr "μώβ" +msgstr "ìþâ" -#: src/main/print-color.c:505 +#: src/main/print-color.c:513 #, fuzzy msgid "Blue Curve" -msgstr "ΜαÏÏο" +msgstr "Ìáýñï" -#: src/main/print-color.c:506 +#: src/main/print-color.c:514 #, fuzzy msgid "Blue curve" -msgstr "ΜαÏÏο" +msgstr "Ìáýñï" -#: src/main/print-color.c:513 +#: src/main/print-color.c:521 #, fuzzy msgid "White Curve" -msgstr "ΚίτÏινο" +msgstr "Êßôñéíï" -#: src/main/print-color.c:514 +#: src/main/print-color.c:522 #, fuzzy msgid "White curve" -msgstr "ΚίτÏινο" +msgstr "Êßôñéíï" -#: src/main/print-color.c:521 +#: src/main/print-color.c:529 msgid "Hue Map" msgstr "" -#: src/main/print-color.c:521 src/main/print-color.c:529 -#: src/main/print-color.c:537 +#: src/main/print-color.c:529 src/main/print-color.c:537 +#: src/main/print-color.c:545 msgid "Advanced HSL Curves" msgstr "" -#: src/main/print-color.c:522 +#: src/main/print-color.c:530 msgid "Hue adjustment curve" msgstr "" # -#: src/main/print-color.c:529 +#: src/main/print-color.c:537 #, fuzzy msgid "Saturation Map" -msgstr "ΚοÏεσμός:" +msgstr "Êïñåóìüò:" -#: src/main/print-color.c:530 +#: src/main/print-color.c:538 msgid "Saturation adjustment curve" msgstr "" -#: src/main/print-color.c:537 +#: src/main/print-color.c:545 msgid "Luminosity Map" msgstr "" -#: src/main/print-color.c:538 +#: src/main/print-color.c:546 msgid "Luminosity adjustment curve" msgstr "" -#: src/main/print-color.c:545 +#: src/main/print-color.c:553 msgid "Gray Component Reduction" msgstr "" -#: src/main/print-color.c:546 +#: src/main/print-color.c:554 msgid "Gray component reduction curve" msgstr "" -#: src/main/print-color.c:1670 +#: src/main/print-color.c:1743 msgid "Traditional Gutenprint color conversion" msgstr "" -#: src/main/printers.c:517 +#: src/main/printers.c:514 #, c-format msgid "Value must be set for %s\n" msgstr "" -#: src/main/printers.c:530 src/main/printers.c:535 +#: src/main/printers.c:527 src/main/printers.c:532 #, c-format msgid "`%s' is not a valid %s\n" msgstr "" -#: src/main/printers.c:554 +#: src/main/printers.c:551 #, c-format msgid "%s must be between %f and %f (is %f)\n" msgstr "" -#: src/main/printers.c:576 src/main/printers.c:600 +#: src/main/printers.c:573 src/main/printers.c:597 #, c-format msgid "%s must be between %d and %d (is %d)\n" msgstr "" -#: src/main/printers.c:631 +#: src/main/printers.c:628 #, c-format msgid "%s bounds must be between %f and %f\n" msgstr "" -#: src/main/printers.c:639 +#: src/main/printers.c:636 #, c-format msgid "%s wrap mode must be %s\n" msgstr "" -#: src/main/printers.c:643 +#: src/main/printers.c:640 msgid "no wrap" msgstr "" -#: src/main/printers.c:643 +#: src/main/printers.c:640 msgid "wrap around" msgstr "" -#: src/main/printers.c:687 +#: src/main/printers.c:684 #, fuzzy, c-format msgid "Unknown type parameter %s (%d)\n" -msgstr "Άγνωστος κωδικός op %u" +msgstr "¶ãíùóôïò êùäéêüò op %u" -#: src/main/printers.c:700 src/main/printers.c:711 +#: src/main/printers.c:697 src/main/printers.c:708 #, c-format msgid "%s out of range (value %d, min %d, max %d)\n" msgstr "" -#: src/main/printers.c:772 +#: src/main/printers.c:768 msgid "Page size is not valid\n" msgstr "" -#: src/main/printers.c:793 +#: src/main/printers.c:789 #, c-format msgid "Top margin must not be less than %d\n" msgstr "" -#: src/main/printers.c:799 +#: src/main/printers.c:795 #, c-format msgid "Left margin must not be less than %d\n" msgstr "" -#: src/main/printers.c:805 +#: src/main/printers.c:801 msgid "Height must be greater than zero\n" msgstr "" -#: src/main/printers.c:811 +#: src/main/printers.c:807 msgid "Width must be greater than zero\n" msgstr "" -#: src/main/printers.c:817 +#: src/main/printers.c:813 #, c-format msgid "" "Image is too wide for the page: left margin is %d, width %d, right edge is %" "d\n" msgstr "" -#: src/main/printers.c:824 +#: src/main/printers.c:820 #, c-format msgid "" "Image is too long for the page: top margin is %d, height %d, bottom edge is %" "d\n" msgstr "" -#: src/main/print-escp2.c:162 +#: src/main/print-escp2.c:164 msgid "Automatic Printing Mode" msgstr "" -#: src/main/print-escp2.c:162 src/main/print-escp2.c:174 +#: src/main/print-escp2.c:164 src/main/print-escp2.c:176 #: src/main/generic-options.c:62 msgid "Basic Output Adjustment" msgstr "" -#: src/main/print-escp2.c:163 +#: src/main/print-escp2.c:165 msgid "Automatic printing mode" msgstr "" -#: src/main/print-escp2.c:174 src/main/print-escp2.c:175 +#: src/main/print-escp2.c:176 src/main/print-escp2.c:177 #: src/main/generic-options.c:62 src/main/generic-options.c:63 msgid "Print Quality" msgstr "" -#: src/main/print-escp2.c:229 +#: src/main/print-escp2.c:231 #, fuzzy msgid "Resolution of the print" -msgstr "Στο κέντÏο της οθόνης" +msgstr "Óôï êÝíôñï ôçò ïèüíçò" -#: src/main/print-escp2.c:245 +#: src/main/print-escp2.c:247 msgid "Enhanced Gloss" msgstr "" -#: src/main/print-escp2.c:246 +#: src/main/print-escp2.c:248 msgid "Add gloss enhancement" msgstr "" -#: src/main/print-escp2.c:251 +#: src/main/print-escp2.c:253 #, fuzzy msgid "Ink Set" -msgstr "ΤÏπος MIME" +msgstr "Ôýðïò MIME" -#: src/main/print-escp2.c:257 +#: src/main/print-escp2.c:259 msgid "Printing Direction" msgstr "" -#: src/main/print-escp2.c:257 src/main/print-escp2.c:269 +#: src/main/print-escp2.c:259 src/main/print-escp2.c:271 msgid "Advanced Output Adjustment" msgstr "" -#: src/main/print-escp2.c:258 +#: src/main/print-escp2.c:260 msgid "Printing direction (unidirectional is higher quality, but slower)" msgstr "" -#: src/main/print-escp2.c:263 src/main/print-olympus.c:1735 +#: src/main/print-escp2.c:265 src/main/print-olympus.c:1733 msgid "Borderless" msgstr "" -#: src/main/print-escp2.c:264 src/main/print-olympus.c:1736 +#: src/main/print-escp2.c:266 src/main/print-olympus.c:1734 msgid "Print without borders" msgstr "" -#: src/main/print-escp2.c:269 +#: src/main/print-escp2.c:271 msgid "Interleave Method" msgstr "" -#: src/main/print-escp2.c:270 +#: src/main/print-escp2.c:272 msgid "Interleave pattern to use" msgstr "" -#: src/main/print-escp2.c:275 +#: src/main/print-escp2.c:277 msgid "Adjust dot size as necessary" msgstr "" -#: src/main/print-escp2.c:276 +#: src/main/print-escp2.c:278 msgid "Adjust dot size as necessary to achieve desired density" msgstr "" -#: src/main/print-escp2.c:281 src/main/print-escp2.c:282 +#: src/main/print-escp2.c:283 src/main/print-escp2.c:284 #, fuzzy msgid "Output Order" -msgstr "Byte Εξόδου" +msgstr "Byte Åîüäïõ" -#: src/main/print-escp2.c:287 src/main/print-escp2.c:288 +#: src/main/print-escp2.c:289 src/main/print-escp2.c:290 msgid "Alignment Passes" msgstr "" -#: src/main/print-escp2.c:293 src/main/print-escp2.c:294 +#: src/main/print-escp2.c:295 src/main/print-escp2.c:296 msgid "Alignment Choices" msgstr "" -#: src/main/print-escp2.c:299 src/main/print-escp2.c:300 +#: src/main/print-escp2.c:301 src/main/print-escp2.c:302 #, fuzzy msgid "Ink change command" -msgstr "άγνωστο χÏώμα: %s" +msgstr "Üãíùóôï ÷ñþìá: %s" -#: src/main/print-escp2.c:305 src/main/print-escp2.c:306 +#: src/main/print-escp2.c:307 src/main/print-escp2.c:308 msgid "Alternate Alignment Passes" msgstr "" -#: src/main/print-escp2.c:311 src/main/print-escp2.c:312 +#: src/main/print-escp2.c:313 src/main/print-escp2.c:314 #, fuzzy msgid "Alternate Alignment Choices" -msgstr "Εκκίνηση των Έξυπνων Εισαγωγέων" +msgstr "Åêêßíçóç ôùí ¸îõðíùí ÅéóáãùãÝùí" -#: src/main/print-escp2.c:317 +#: src/main/print-escp2.c:319 msgid "Supports Packet Mode" msgstr "" -#: src/main/print-escp2.c:318 +#: src/main/print-escp2.c:320 msgid "Supports D4 Packet Mode" msgstr "" -#: src/main/print-escp2.c:323 +#: src/main/print-escp2.c:325 msgid "Has Interchangeable Ink Cartridges" msgstr "" -#: src/main/print-escp2.c:324 +#: src/main/print-escp2.c:326 msgid "Has multiple choices of ink cartridges" msgstr "" # -#: src/main/print-escp2.c:335 src/main/print-escp2.c:336 +#: src/main/print-escp2.c:337 src/main/print-escp2.c:338 #, fuzzy msgid "Channel Names" -msgstr "ΑκÏÏωση" +msgstr "Áêýñùóç" -#: src/main/print-escp2.c:348 +#: src/main/print-escp2.c:350 msgid "Raw Channel Count" msgstr "" -#: src/main/print-escp2.c:353 +#: src/main/print-escp2.c:355 #, fuzzy msgid "Cyan Map" -msgstr "Κυανό" +msgstr "Êõáíü" -#: src/main/print-escp2.c:354 +#: src/main/print-escp2.c:356 #, fuzzy msgid "Adjust the cyan map" -msgstr "Στο κέντÏο της οθόνης" +msgstr "Óôï êÝíôñï ôçò ïèüíçò" -#: src/main/print-escp2.c:359 +#: src/main/print-escp2.c:361 #, fuzzy msgid "Magenta Map" -msgstr "μώβ" +msgstr "ìþâ" -#: src/main/print-escp2.c:360 +#: src/main/print-escp2.c:362 #, fuzzy msgid "Adjust the magenta map" -msgstr "Στο κέντÏο της οθόνης" +msgstr "Óôï êÝíôñï ôçò ïèüíçò" -#: src/main/print-escp2.c:365 +#: src/main/print-escp2.c:367 #, fuzzy msgid "Yellow Map" -msgstr "ΚίτÏινο" +msgstr "Êßôñéíï" -#: src/main/print-escp2.c:366 +#: src/main/print-escp2.c:368 #, fuzzy msgid "Adjust the yellow map" -msgstr "Στο κέντÏο της οθόνης" +msgstr "Óôï êÝíôñï ôçò ïèüíçò" -#: src/main/print-escp2.c:371 +#: src/main/print-escp2.c:373 #, fuzzy msgid "Blue Map" -msgstr "Μαυ_ÏόασπÏο" +msgstr "Ìáõ_ñüáóðñï" -#: src/main/print-escp2.c:372 +#: src/main/print-escp2.c:374 #, fuzzy msgid "Adjust the blue map" -msgstr "Στο κέντÏο της οθόνης" +msgstr "Óôï êÝíôñï ôçò ïèüíçò" -#: src/main/print-escp2.c:377 +#: src/main/print-escp2.c:379 msgid "Red Map" msgstr "" -#: src/main/print-escp2.c:378 +#: src/main/print-escp2.c:380 #, fuzzy msgid "Adjust the red map" -msgstr "Στο κέντÏο της οθόνης" +msgstr "Óôï êÝíôñï ôçò ïèüíçò" -#: src/main/print-escp2.c:471 +#: src/main/print-escp2.c:478 #, fuzzy msgid "Red Density" -msgstr "Πυκνότητα" +msgstr "Ðõêíüôçôá" -#: src/main/print-escp2.c:472 +#: src/main/print-escp2.c:479 #, fuzzy msgid "Adjust the red density" -msgstr "Στο κέντÏο της οθόνης" +msgstr "Óôï êÝíôñï ôçò ïèüíçò" -#: src/main/print-escp2.c:479 +#: src/main/print-escp2.c:486 #, fuzzy msgid "Blue Density" -msgstr "Πυκνότητα" +msgstr "Ðõêíüôçôá" -#: src/main/print-escp2.c:480 +#: src/main/print-escp2.c:487 #, fuzzy msgid "Adjust the blue density" -msgstr "Στο κέντÏο της οθόνης" +msgstr "Óôï êÝíôñï ôçò ïèüíçò" -#: src/main/print-escp2.c:487 +#: src/main/print-escp2.c:494 msgid "Gloss Level" msgstr "" -#: src/main/print-escp2.c:488 +#: src/main/print-escp2.c:495 #, fuzzy msgid "Adjust the gloss level" -msgstr "Στο κέντÏο της οθόνης" +msgstr "Óôï êÝíôñï ôçò ïèüíçò" + +#: src/main/print-escp2.c:502 +msgid "Drop Size Small" +msgstr "" + +#: src/main/print-escp2.c:503 +msgid "Drop Size 1 (small)" +msgstr "" + +#: src/main/print-escp2.c:510 +msgid "Drop Size Medium" +msgstr "" + +#: src/main/print-escp2.c:511 +msgid "Drop Size 2 (medium)" +msgstr "" + +#: src/main/print-escp2.c:518 +msgid "Drop Size Large" +msgstr "" + +#: src/main/print-escp2.c:519 +msgid "Drop Size 3 (large)" +msgstr "" + +#: src/main/print-escp2.c:526 src/main/print-escp2.c:527 +#, fuzzy +msgid "Light Cyan Value" +msgstr "ØéëÞ Âñï÷Þ" + +#: src/main/print-escp2.c:542 src/main/print-escp2.c:543 +#, fuzzy +msgid "Light Cyan Density Scale" +msgstr "ØéëÞ Âñï÷Þ" + +#: src/main/print-escp2.c:550 src/main/print-escp2.c:551 +#, fuzzy +msgid "Light Magenta Value" +msgstr "ØéëÞ Âñï÷Þ" + +#: src/main/print-escp2.c:558 src/main/print-escp2.c:559 +#, fuzzy +msgid "Light Magenta Density Scale" +msgstr "ØéëÞ Âñï÷Þ" + +#: src/main/print-escp2.c:574 src/main/print-escp2.c:575 +#, fuzzy +msgid "Dark Yellow Value" +msgstr "Êßôñéíï" -#: src/main/print-escp2.c:511 src/main/print-escp2.c:512 +#: src/main/print-escp2.c:582 src/main/print-escp2.c:583 msgid "Dark Yellow Transition" msgstr "" -#: src/main/print-escp2.c:519 src/main/print-escp2.c:520 -#: src/main/print-escp2.c:527 src/main/print-escp2.c:528 +#: src/main/print-escp2.c:590 src/main/print-escp2.c:591 +#, fuzzy +msgid "Dark Yellow Density Scale" +msgstr "Êßôñéíï" + +#: src/main/print-escp2.c:598 src/main/print-escp2.c:599 +#: src/main/print-escp2.c:622 src/main/print-escp2.c:623 +#, fuzzy +msgid "Gray Value" +msgstr "Êëßìáêá ôïõ ãêñé" + +#: src/main/print-escp2.c:606 src/main/print-escp2.c:607 +#: src/main/print-escp2.c:630 src/main/print-escp2.c:631 msgid "Gray Transition" msgstr "" -#: src/main/print-escp2.c:535 src/main/print-escp2.c:536 -#: src/main/print-escp2.c:559 src/main/print-escp2.c:560 +#: src/main/print-escp2.c:614 src/main/print-escp2.c:615 +#: src/main/print-escp2.c:638 src/main/print-escp2.c:639 +#, fuzzy +msgid "Gray Density Scale" +msgstr "Êëßìáêá ôïõ ãêñé" + +#: src/main/print-escp2.c:646 src/main/print-escp2.c:647 +#: src/main/print-escp2.c:718 src/main/print-escp2.c:719 +#, fuzzy +msgid "Light Gray Value" +msgstr "ØéëÞ Âñï÷Þ" + +#: src/main/print-escp2.c:654 src/main/print-escp2.c:655 +#: src/main/print-escp2.c:726 src/main/print-escp2.c:727 #, fuzzy msgid "Light Gray Transition" -msgstr "Ψιλή Î’Ïοχή" +msgstr "ØéëÞ Âñï÷Þ" + +#: src/main/print-escp2.c:662 src/main/print-escp2.c:663 +#: src/main/print-escp2.c:734 src/main/print-escp2.c:735 +#, fuzzy +msgid "Light Gray Density Scale" +msgstr "ØéëÞ Âñï÷Þ" + +#: src/main/print-escp2.c:670 src/main/print-escp2.c:671 +#, fuzzy +msgid "Dark Gray Value" +msgstr "ØéëÞ Âñï÷Þ" -#: src/main/print-escp2.c:543 src/main/print-escp2.c:544 +#: src/main/print-escp2.c:678 src/main/print-escp2.c:679 #, fuzzy msgid "Dark Gray Transition" -msgstr "Ψιλή Î’Ïοχή" +msgstr "ØéëÞ Âñï÷Þ" + +#: src/main/print-escp2.c:686 src/main/print-escp2.c:687 +#, fuzzy +msgid "Dark Gray Density Scale" +msgstr "ØéëÞ Âñï÷Þ" + +#: src/main/print-escp2.c:694 +#, fuzzy +msgid "Mid Gray Value" +msgstr "Êëßìáêá ôïõ ãêñé" + +#: src/main/print-escp2.c:695 +#, fuzzy +msgid "Medium Gray Value" +msgstr "ØéëÞ Âñï÷Þ" -#: src/main/print-escp2.c:551 +#: src/main/print-escp2.c:702 #, fuzzy msgid "Mid Gray Transition" -msgstr "Ψιλή Î’Ïοχή" +msgstr "ØéëÞ Âñï÷Þ" -#: src/main/print-escp2.c:552 +#: src/main/print-escp2.c:703 #, fuzzy msgid "Medium Gray Transition" -msgstr "Ψιλή Î’Ïοχή" +msgstr "ØéëÞ Âñï÷Þ" + +#: src/main/print-escp2.c:710 +#, fuzzy +msgid "Mid Gray Density Scale" +msgstr "ØéëÞ Âñï÷Þ" + +#: src/main/print-escp2.c:711 +#, fuzzy +msgid "Medium Gray Density Scale" +msgstr "ØéëÞ Âñï÷Þ" -#: src/main/print-escp2.c:1635 +#: src/main/print-escp2.c:1999 #, fuzzy msgid "Full Manual Control" -msgstr "Byte Εξόδου" +msgstr "Byte Åîüäïõ" -#: src/main/print-escp2.c:1637 +#: src/main/print-escp2.c:2001 msgid "Automatic Setting Control" msgstr "" -#: src/main/print-escp2.c:1732 src/main/generic-options.c:213 +#: src/main/print-escp2.c:2096 src/main/generic-options.c:213 #: src/main/generic-options.c:230 #, fuzzy msgid "Manual Control" -msgstr "Byte Εξόδου" - -#: src/main/print-escp2.c:1771 src/main/print-escp2.c:1863 -#: src/main/print-escp2.c:1875 src/main/print-pcl.c:230 -#: src/main/escp2-channels.c:2805 src/main/escp2-papers.c:1707 -#: src/main/escp2-papers.c:1731 src/main/escp2-papers.c:1764 -#: src/main/escp2-papers.c:1815 src/main/escp2-papers.c:1857 -#: src/main/escp2-papers.c:1899 src/main/escp2-papers.c:1992 -#: src/main/escp2-resolutions.c:640 src/main/escp2-resolutions.c:655 -#: src/main/escp2-resolutions.c:668 src/main/generic-options.c:36 -#: src/gutenprintui/panel.c:2613 src/gutenprintui2/panel.c:2639 +msgstr "Byte Åîüäïõ" + +#: src/main/print-escp2.c:2139 src/main/print-escp2.c:2231 +#: src/main/print-escp2.c:2243 src/main/print-pcl.c:237 +#: src/main/escp2-channels.c:2827 src/main/escp2-channels.c:2836 +#: src/main/escp2-papers.c:1718 src/main/escp2-papers.c:1742 +#: src/main/escp2-papers.c:1775 src/main/escp2-papers.c:1826 +#: src/main/escp2-papers.c:1868 src/main/escp2-papers.c:1910 +#: src/main/escp2-papers.c:2003 src/main/escp2-resolutions.c:640 +#: src/main/escp2-resolutions.c:655 src/main/escp2-resolutions.c:670 +#: src/main/escp2-resolutions.c:683 src/main/generic-options.c:36 +#: src/gutenprintui2/panel.c:2814 msgid "Standard" -msgstr "Κανονικό" +msgstr "Êáíïíéêü" # -#: src/main/print-escp2.c:1842 +#: src/main/print-escp2.c:2210 #, fuzzy msgid "Automatic" -msgstr "Μέγεθος" +msgstr "ÌÝãåèïò" -#: src/main/print-escp2.c:1844 +#: src/main/print-escp2.c:2212 #, fuzzy msgid "Bidirectional" msgstr "360 DPI FOL2" -#: src/main/print-escp2.c:1846 +#: src/main/print-escp2.c:2214 #, fuzzy msgid "Unidirectional" msgstr "360 DPI FOL2" -#: src/main/print-escp2.c:1877 +#: src/main/print-escp2.c:2245 msgid "Alternate Fill" msgstr "" -#: src/main/print-escp2.c:1879 +#: src/main/print-escp2.c:2247 msgid "Ascending Fill" msgstr "" -#: src/main/print-escp2.c:1881 +#: src/main/print-escp2.c:2249 msgid "Descending Fill" msgstr "" -#: src/main/print-escp2.c:1883 +#: src/main/print-escp2.c:2251 msgid "Ascending Double" msgstr "" -#: src/main/print-escp2.c:1885 +#: src/main/print-escp2.c:2253 msgid "Nearest Neighbor Avoidance" msgstr "" -#: src/main/print-escp2.c:2328 +#: src/main/print-escp2.c:2771 #, c-format msgid "This printer does not support raw printer output at depth %d\n" msgstr "" -#: src/main/print-escp2.c:3436 src/main/print-olympus.c:2451 +#: src/main/print-escp2.c:3934 src/main/print-olympus.c:2449 #: src/main/print-raw.c:217 msgid "Print options not verified; cannot print.\n" msgstr "" @@ -1428,7 +1566,7 @@ msgstr "" #: src/main/print-lexmark.c:589 #, fuzzy msgid "test print" -msgstr "Τίτλοι Ï€Ïος εκτÏπωση" +msgstr "Ôßôëïé ðñïò åêôýðùóç" #: src/main/print-lexmark.c:601 src/main/print-lexmark.c:671 #: src/main/escp2-channels.c:1288 src/main/escp2-channels.c:1302 @@ -1451,200 +1589,200 @@ msgid "Three Color Composite" msgstr "" #: src/main/print-lexmark.c:607 src/main/print-lexmark.c:677 -#: src/main/escp2-channels.c:1540 src/main/escp2-channels.c:1554 -#: src/main/escp2-channels.c:1568 src/main/escp2-channels.c:1582 -#: src/main/escp2-channels.c:1808 src/main/escp2-channels.c:1823 -#: src/main/escp2-channels.c:1838 src/main/escp2-channels.c:1855 +#: src/main/escp2-channels.c:1554 src/main/escp2-channels.c:1568 +#: src/main/escp2-channels.c:1582 src/main/escp2-channels.c:1596 +#: src/main/escp2-channels.c:1822 src/main/escp2-channels.c:1837 +#: src/main/escp2-channels.c:1852 src/main/escp2-channels.c:1869 msgid "Six Color Photo" msgstr "" #: src/main/print-lexmark.c:610 src/main/print-lexmark.c:680 -#: src/main/escp2-channels.c:1475 src/main/escp2-channels.c:1489 -#: src/main/escp2-channels.c:1503 src/main/escp2-channels.c:1517 -#: src/main/escp2-channels.c:1752 src/main/escp2-channels.c:1767 -#: src/main/escp2-channels.c:1784 +#: src/main/escp2-channels.c:1489 src/main/escp2-channels.c:1503 +#: src/main/escp2-channels.c:1517 src/main/escp2-channels.c:1531 +#: src/main/escp2-channels.c:1766 src/main/escp2-channels.c:1781 +#: src/main/escp2-channels.c:1798 msgid "Five Color Photo Composite" msgstr "" -#: src/main/print-lexmark.c:856 src/main/escp2-papers.c:1341 -#: src/main/escp2-papers.c:1385 src/main/escp2-papers.c:1429 -#: src/main/escp2-papers.c:1477 src/main/escp2-papers.c:1525 -#: src/main/escp2-papers.c:1569 +#: src/main/print-lexmark.c:856 src/main/escp2-papers.c:1351 +#: src/main/escp2-papers.c:1395 src/main/escp2-papers.c:1439 +#: src/main/escp2-papers.c:1487 src/main/escp2-papers.c:1535 +#: src/main/escp2-papers.c:1579 #, fuzzy msgid "Plain Paper" -msgstr "ΚÏÏια Σελίδα" +msgstr "Êýñéá Óåëßäá" -#: src/main/print-lexmark.c:860 src/main/escp2-papers.c:1347 -#: src/main/escp2-papers.c:1391 src/main/escp2-papers.c:1435 -#: src/main/escp2-papers.c:1483 src/main/escp2-papers.c:1531 -#: src/main/escp2-papers.c:1575 +#: src/main/print-lexmark.c:860 src/main/escp2-papers.c:1357 +#: src/main/escp2-papers.c:1401 src/main/escp2-papers.c:1445 +#: src/main/escp2-papers.c:1493 src/main/escp2-papers.c:1541 +#: src/main/escp2-papers.c:1585 msgid "Glossy Film" msgstr "" -#: src/main/print-lexmark.c:864 src/main/escp2-papers.c:1349 -#: src/main/escp2-papers.c:1393 src/main/escp2-papers.c:1437 -#: src/main/escp2-papers.c:1485 src/main/escp2-papers.c:1533 -#: src/main/escp2-papers.c:1577 +#: src/main/print-lexmark.c:864 src/main/escp2-papers.c:1359 +#: src/main/escp2-papers.c:1403 src/main/escp2-papers.c:1447 +#: src/main/escp2-papers.c:1495 src/main/escp2-papers.c:1543 +#: src/main/escp2-papers.c:1587 #, fuzzy msgid "Transparencies" -msgstr "Διαφανές" +msgstr "ÄéáöáíÝò" -#: src/main/print-lexmark.c:868 src/main/escp2-papers.c:1351 -#: src/main/escp2-papers.c:1395 src/main/escp2-papers.c:1439 -#: src/main/escp2-papers.c:1487 src/main/escp2-papers.c:1535 -#: src/main/escp2-papers.c:1579 +#: src/main/print-lexmark.c:868 src/main/escp2-papers.c:1361 +#: src/main/escp2-papers.c:1405 src/main/escp2-papers.c:1449 +#: src/main/escp2-papers.c:1497 src/main/escp2-papers.c:1545 +#: src/main/escp2-papers.c:1589 #, fuzzy msgid "Envelopes" -msgstr "ΠÏογÏαμματιστές" +msgstr "ÐñïãñáììáôéóôÝò" -#: src/main/print-lexmark.c:872 src/main/escp2-papers.c:1355 -#: src/main/escp2-papers.c:1399 src/main/escp2-papers.c:1443 -#: src/main/escp2-papers.c:1491 src/main/escp2-papers.c:1539 -#: src/main/escp2-papers.c:1583 +#: src/main/print-lexmark.c:872 src/main/escp2-papers.c:1365 +#: src/main/escp2-papers.c:1409 src/main/escp2-papers.c:1453 +#: src/main/escp2-papers.c:1501 src/main/escp2-papers.c:1549 +#: src/main/escp2-papers.c:1593 #, fuzzy msgid "Matte Paper" -msgstr "ΧαÏτί Μανίλα" +msgstr "×áñôß Ìáíßëá" -#: src/main/print-lexmark.c:876 src/main/escp2-papers.c:1359 -#: src/main/escp2-papers.c:1403 src/main/escp2-papers.c:1447 -#: src/main/escp2-papers.c:1495 src/main/escp2-papers.c:1543 -#: src/main/escp2-papers.c:1587 +#: src/main/print-lexmark.c:876 src/main/escp2-papers.c:1369 +#: src/main/escp2-papers.c:1413 src/main/escp2-papers.c:1457 +#: src/main/escp2-papers.c:1505 src/main/escp2-papers.c:1553 +#: src/main/escp2-papers.c:1597 msgid "Inkjet Paper" msgstr "" -#: src/main/print-lexmark.c:880 src/main/escp2-papers.c:1361 -#: src/main/escp2-papers.c:1405 src/main/escp2-papers.c:1449 -#: src/main/escp2-papers.c:1497 src/main/escp2-papers.c:1545 -#: src/main/escp2-papers.c:1589 +#: src/main/print-lexmark.c:880 src/main/escp2-papers.c:1371 +#: src/main/escp2-papers.c:1415 src/main/escp2-papers.c:1459 +#: src/main/escp2-papers.c:1507 src/main/escp2-papers.c:1555 +#: src/main/escp2-papers.c:1599 msgid "Photo Quality Inkjet Paper" msgstr "" -#: src/main/print-lexmark.c:884 src/main/escp2-papers.c:1363 -#: src/main/escp2-papers.c:1407 src/main/escp2-papers.c:1451 -#: src/main/escp2-papers.c:1499 src/main/escp2-papers.c:1547 -#: src/main/escp2-papers.c:1591 +#: src/main/print-lexmark.c:884 src/main/escp2-papers.c:1373 +#: src/main/escp2-papers.c:1417 src/main/escp2-papers.c:1461 +#: src/main/escp2-papers.c:1509 src/main/escp2-papers.c:1557 +#: src/main/escp2-papers.c:1601 #, fuzzy msgid "Photo Paper" -msgstr "Κείμενα" +msgstr "Êåßìåíá" -#: src/main/print-lexmark.c:888 src/main/escp2-papers.c:1365 -#: src/main/escp2-papers.c:1409 src/main/escp2-papers.c:1453 -#: src/main/escp2-papers.c:1501 src/main/escp2-papers.c:1549 -#: src/main/escp2-papers.c:1593 src/main/escp2-papers.c:1617 +#: src/main/print-lexmark.c:888 src/main/escp2-papers.c:1375 +#: src/main/escp2-papers.c:1419 src/main/escp2-papers.c:1463 +#: src/main/escp2-papers.c:1511 src/main/escp2-papers.c:1559 +#: src/main/escp2-papers.c:1603 src/main/escp2-papers.c:1627 msgid "Premium Glossy Photo Paper" msgstr "" -#: src/main/print-lexmark.c:892 src/main/escp2-papers.c:1369 -#: src/main/escp2-papers.c:1413 src/main/escp2-papers.c:1457 -#: src/main/escp2-papers.c:1505 src/main/escp2-papers.c:1553 -#: src/main/escp2-papers.c:1597 +#: src/main/print-lexmark.c:892 src/main/escp2-papers.c:1379 +#: src/main/escp2-papers.c:1423 src/main/escp2-papers.c:1467 +#: src/main/escp2-papers.c:1515 src/main/escp2-papers.c:1563 +#: src/main/escp2-papers.c:1607 msgid "Premium Luster Photo Paper" msgstr "" -#: src/main/print-lexmark.c:896 src/main/escp2-papers.c:1371 -#: src/main/escp2-papers.c:1415 src/main/escp2-papers.c:1463 -#: src/main/escp2-papers.c:1511 src/main/escp2-papers.c:1555 -#: src/main/escp2-papers.c:1603 +#: src/main/print-lexmark.c:896 src/main/escp2-papers.c:1381 +#: src/main/escp2-papers.c:1425 src/main/escp2-papers.c:1473 +#: src/main/escp2-papers.c:1521 src/main/escp2-papers.c:1565 +#: src/main/escp2-papers.c:1613 msgid "Photo Quality Glossy Paper" msgstr "" -#: src/main/print-lexmark.c:900 src/main/escp2-papers.c:1373 -#: src/main/escp2-papers.c:1417 src/main/escp2-papers.c:1465 -#: src/main/escp2-papers.c:1513 src/main/escp2-papers.c:1557 -#: src/main/escp2-papers.c:1605 +#: src/main/print-lexmark.c:900 src/main/escp2-papers.c:1383 +#: src/main/escp2-papers.c:1427 src/main/escp2-papers.c:1475 +#: src/main/escp2-papers.c:1523 src/main/escp2-papers.c:1567 +#: src/main/escp2-papers.c:1615 msgid "Ilford Heavy Paper" msgstr "" # -#: src/main/print-lexmark.c:904 src/main/escp2-papers.c:1377 -#: src/main/escp2-papers.c:1421 src/main/escp2-papers.c:1469 -#: src/main/escp2-papers.c:1517 src/main/escp2-papers.c:1561 -#: src/main/escp2-papers.c:1609 src/main/escp2-papers.c:1619 +#: src/main/print-lexmark.c:904 src/main/escp2-papers.c:1387 +#: src/main/escp2-papers.c:1431 src/main/escp2-papers.c:1479 +#: src/main/escp2-papers.c:1527 src/main/escp2-papers.c:1571 +#: src/main/escp2-papers.c:1619 src/main/escp2-papers.c:1629 msgid "Other" -msgstr "Άλλα" +msgstr "¶ëëá" #: src/main/print-lexmark.c:1113 #, fuzzy msgid "Auto Sheet Feeder" -msgstr "Αυτόματη απόκÏυψη" +msgstr "Áõôüìáôç áðüêñõøç" #: src/main/print-lexmark.c:1114 #, fuzzy msgid "Manual with Pause" -msgstr "Σελίδα εγχειÏιδίου" +msgstr "Óåëßäá åã÷åéñéäßïõ" #: src/main/print-lexmark.c:1115 msgid "Manual without Pause" msgstr "" -#: src/main/print-olympus.c:277 +#: src/main/print-olympus.c:275 msgid "Coated" msgstr "" -#: src/main/print-olympus.c:278 src/cups/genppd.c:1726 src/cups/genppd.c:1753 -#: src/cups/genppd.c:1834 +#: src/main/print-olympus.c:276 src/cups/genppd.c:1732 src/cups/genppd.c:1759 +#: src/cups/genppd.c:1840 msgid "None" msgstr "" -#: src/main/print-olympus.c:963 src/main/print-olympus.c:1023 -#: src/main/print-olympus.c:1127 +#: src/main/print-olympus.c:961 src/main/print-olympus.c:1021 +#: src/main/print-olympus.c:1125 msgid "Glossy" msgstr "" -#: src/main/print-olympus.c:964 src/main/print-olympus.c:1024 -#: src/main/print-olympus.c:1128 +#: src/main/print-olympus.c:962 src/main/print-olympus.c:1022 +#: src/main/print-olympus.c:1126 msgid "Texture" msgstr "" -#: src/main/print-olympus.c:1025 src/main/print-olympus.c:1129 +#: src/main/print-olympus.c:1023 src/main/print-olympus.c:1127 #, fuzzy msgid "Matte" -msgstr "ΧαÏτί Μανίλα" +msgstr "×áñôß Ìáíßëá" -#: src/main/print-olympus.c:1729 src/main/print-olympus.c:1730 +#: src/main/print-olympus.c:1727 src/main/print-olympus.c:1728 msgid "Laminate Pattern" msgstr "" -#: src/main/print-olympus.c:1765 +#: src/main/print-olympus.c:1763 #, fuzzy msgid "Adjust the cyan balance" -msgstr "Στο κέντÏο της οθόνης" +msgstr "Óôï êÝíôñï ôçò ïèüíçò" -#: src/main/print-olympus.c:1773 +#: src/main/print-olympus.c:1771 #, fuzzy msgid "Adjust the magenta balance" -msgstr "Στο κέντÏο της οθόνης" +msgstr "Óôï êÝíôñï ôçò ïèüíçò" -#: src/main/print-olympus.c:1781 +#: src/main/print-olympus.c:1779 #, fuzzy msgid "Adjust the yellow balance" -msgstr "Στο κέντÏο της οθόνης" +msgstr "Óôï êÝíôñï ôçò ïèüíçò" -#: src/main/print-olympus.c:1788 +#: src/main/print-olympus.c:1786 #, fuzzy msgid "Black Balance" -msgstr "Μαυ_ÏόασπÏο" +msgstr "Ìáõ_ñüáóðñï" -#: src/main/print-olympus.c:1789 +#: src/main/print-olympus.c:1787 #, fuzzy msgid "Adjust the black balance" -msgstr "Στο κέντÏο της οθόνης" +msgstr "Óôï êÝíôñï ôçò ïèüíçò" #: src/main/print-pcl.c:185 #, fuzzy msgid "Plain" -msgstr "Σε αναπαÏαγωγή" +msgstr "Óå áíáðáñáãùãÞ" # #: src/main/print-pcl.c:186 #, fuzzy msgid "Bond" -msgstr "Έντονη ΓÏαφή" +msgstr "¸íôïíç ÃñáöÞ" #: src/main/print-pcl.c:187 #, fuzzy msgid "Premium" -msgstr "ΠÏωτ" +msgstr "Ðñùô" #: src/main/print-pcl.c:188 msgid "Glossy Photo" @@ -1653,7 +1791,7 @@ msgstr "" #: src/main/print-pcl.c:189 #, fuzzy msgid "Transparency" -msgstr "Διαφανές" +msgstr "ÄéáöáíÝò" #: src/main/print-pcl.c:190 msgid "Quick-dry Photo" @@ -1662,104 +1800,129 @@ msgstr "" #: src/main/print-pcl.c:191 #, fuzzy msgid "Quick-dry Transparency" -msgstr "Διαφάνεια ΧÏοιάς" +msgstr "ÄéáöÜíåéá ×ñïéÜò" # Revise translation of "manual" (as in opposite of "automatic", not synonym of "documentation") -#: src/main/print-pcl.c:231 src/main/xmli18n-tmp.h:16 +#: src/main/print-pcl.c:238 src/main/xmli18n-tmp.h:17 msgid "Manual" -msgstr "ΕγχειÏίδιο" +msgstr "Åã÷åéñßäéï" + +#: src/main/print-pcl.c:240 +msgid "Tray 1 - Movable Guides" +msgstr "" -#: src/main/print-pcl.c:233 +#: src/main/print-pcl.c:241 #, fuzzy msgid "Tray 1" -msgstr "Δοκιμή" +msgstr "ÄïêéìÞ" -#: src/main/print-pcl.c:234 src/main/print-pcl.c:240 +#: src/main/print-pcl.c:242 +msgid "Tray 2 - Movable Guides" +msgstr "" + +#: src/main/print-pcl.c:243 src/main/print-pcl.c:251 #, fuzzy msgid "Tray 2" -msgstr "Δοκιμή" +msgstr "ÄïêéìÞ" + +#: src/main/print-pcl.c:244 +msgid "Tray 3 - Movable Guides" +msgstr "" -#: src/main/print-pcl.c:235 +#: src/main/print-pcl.c:245 #, fuzzy msgid "Tray 3" -msgstr "Δοκιμή" +msgstr "ÄïêéìÞ" + +#: src/main/print-pcl.c:246 +msgid "Tray 4 - Movable Guides" +msgstr "" -#: src/main/print-pcl.c:236 +#: src/main/print-pcl.c:247 #, fuzzy msgid "Tray 4" -msgstr "Δοκιμή" +msgstr "ÄïêéìÞ" -#: src/main/print-pcl.c:237 +#: src/main/print-pcl.c:248 msgid "Portable Sheet Feeder" msgstr "" -#: src/main/print-pcl.c:238 +#: src/main/print-pcl.c:249 #, fuzzy msgid "Desktop Sheet Feeder" -msgstr "Ρυθμίσεις επιφάνειας εÏγασίας" +msgstr "Ñõèìßóåéò åðéöÜíåéáò åñãáóßáò" -#: src/main/print-pcl.c:239 +#: src/main/print-pcl.c:250 #, fuzzy msgid "Tray" -msgstr "Δοκιμή" +msgstr "ÄïêéìÞ" -#: src/main/print-pcl.c:241 +#: src/main/print-pcl.c:252 #, fuzzy msgid "Optional Source" -msgstr "Ανοικτό Λογισμικό" +msgstr "Áíïéêôü Ëïãéóìéêü" -#: src/main/print-pcl.c:242 +#: src/main/print-pcl.c:253 #, fuzzy msgid "Autoselect" -msgstr "Απεπιλογή" +msgstr "ÁðåðéëïãÞ" -#: src/main/print-pcl.c:256 +#: src/main/print-pcl.c:267 msgid "150x150 DPI" msgstr "150x150 DPI" -#: src/main/print-pcl.c:257 +#: src/main/print-pcl.c:268 msgid "300x300 DPI" msgstr "" -#: src/main/print-pcl.c:258 +#: src/main/print-pcl.c:269 msgid "600x300 DPI" msgstr "600x300 DPI" -#: src/main/print-pcl.c:259 +#: src/main/print-pcl.c:270 #, fuzzy msgid "600x600 DPI monochrome" -msgstr "μονόχÏωμο" +msgstr "ìïíü÷ñùìï" -#: src/main/print-pcl.c:260 +#: src/main/print-pcl.c:271 msgid "600x600 DPI" msgstr "600x600 DPI" -#: src/main/print-pcl.c:261 +#: src/main/print-pcl.c:272 msgid "1200x600 DPI" msgstr "1200x600 DPI" -#: src/main/print-pcl.c:262 +#: src/main/print-pcl.c:273 msgid "2400x600 DPI" msgstr "2400x600 DPI" -#: src/main/print-pcl.c:1470 +#: src/main/print-pcl.c:1538 msgid "Color + Black Cartridges" msgstr "" -#: src/main/print-pcl.c:1471 +#: src/main/print-pcl.c:1539 msgid "Color + Photo Cartridges" msgstr "" -#: src/main/print-ps.c:97 +#: src/main/print-ps.c:68 #, fuzzy msgid "PPDFile" -msgstr "ΑÏχείο Ταυτότητας ΔιεÏγασίας: " +msgstr "Áñ÷åßï Ôáõôüôçôáò Äéåñãáóßáò: " -#: src/main/print-ps.c:98 src/gutenprintui/panel.c:1768 -#: src/gutenprintui2/panel.c:1768 +#: src/main/print-ps.c:69 src/gutenprintui2/panel.c:1943 #, fuzzy msgid "PPD File" -msgstr " ΑÏχείο " +msgstr " Áñ÷åßï " + +# +#: src/main/print-ps.c:74 +#, fuzzy +msgid "Model Name" +msgstr "Áêýñùóç" + +#: src/main/print-ps.c:75 +msgid "PPD File Model Name" +msgstr "" #: src/main/print-raw.c:223 msgid "Image dimensions must match paper dimensions" @@ -1768,307 +1931,313 @@ msgstr "" #: src/main/escp2-channels.c:965 src/main/escp2-channels.c:978 #, fuzzy msgid "Two Level Grayscale" -msgstr "Κλίμακα του γκÏι" +msgstr "Êëßìáêá ôïõ ãêñé" #: src/main/escp2-channels.c:1000 src/main/escp2-channels.c:1013 #, fuzzy msgid "Three Level Grayscale" -msgstr "Κλίμακα του γκÏι" +msgstr "Êëßìáêá ôïõ ãêñé" #: src/main/escp2-channels.c:1035 src/main/escp2-channels.c:1048 #: src/main/escp2-channels.c:1061 src/main/escp2-channels.c:1074 #: src/main/escp2-channels.c:1087 src/main/escp2-channels.c:1100 -#: src/main/escp2-channels.c:2505 src/main/escp2-channels.c:2528 -#: src/main/escp2-channels.c:2548 src/main/escp2-channels.c:2568 -#: src/main/escp2-channels.c:2588 src/main/escp2-channels.c:2608 +#: src/main/escp2-channels.c:2525 src/main/escp2-channels.c:2548 +#: src/main/escp2-channels.c:2568 src/main/escp2-channels.c:2588 +#: src/main/escp2-channels.c:2608 src/main/escp2-channels.c:2628 msgid "Quadtone" msgstr "" -#: src/main/escp2-channels.c:1604 src/main/escp2-channels.c:1618 +#: src/main/escp2-channels.c:1466 +#, fuzzy +msgid "Four Color Photo" +msgstr "Stylus Color Pro" + +#: src/main/escp2-channels.c:1618 src/main/escp2-channels.c:1632 msgid "Six Color Enhanced Composite" msgstr "" -#: src/main/escp2-channels.c:1641 src/main/escp2-channels.c:1655 -#: src/main/escp2-channels.c:1669 src/main/escp2-channels.c:1705 +#: src/main/escp2-channels.c:1655 src/main/escp2-channels.c:1669 +#: src/main/escp2-channels.c:1683 src/main/escp2-channels.c:1719 #, fuzzy msgid "Seven Color Photo" msgstr "Stylus Color Pro" -#: src/main/escp2-channels.c:1691 +#: src/main/escp2-channels.c:1705 #, fuzzy msgid "Seven Color Enhanced" msgstr "Stylus Color Pro" -#: src/main/escp2-channels.c:1728 +#: src/main/escp2-channels.c:1742 #, fuzzy msgid "Eight Color Photo" msgstr "Stylus Color Pro" -#: src/main/escp2-channels.c:1876 src/main/escp2-channels.c:1888 -#: src/main/escp2-channels.c:1894 +#: src/main/escp2-channels.c:1890 src/main/escp2-channels.c:1902 +#: src/main/escp2-channels.c:1908 #, fuzzy msgid "One Color Raw" msgstr "Stylus Color Pro" -#: src/main/escp2-channels.c:1900 +#: src/main/escp2-channels.c:1914 msgid "One Color Raw Enhanced Gloss" msgstr "" -#: src/main/escp2-channels.c:1913 src/main/escp2-channels.c:1925 +#: src/main/escp2-channels.c:1927 src/main/escp2-channels.c:1939 #, fuzzy msgid "Two Color Raw" msgstr "Stylus Color Pro" -#: src/main/escp2-channels.c:1939 src/main/escp2-channels.c:1953 -#: src/main/escp2-channels.c:1980 src/main/escp2-channels.c:1993 -#: src/main/escp2-channels.c:2006 src/main/escp2-channels.c:2019 -#: src/main/escp2-channels.c:2033 src/main/escp2-channels.c:2047 -#: src/main/escp2-channels.c:2060 +#: src/main/escp2-channels.c:1953 src/main/escp2-channels.c:1967 +#: src/main/escp2-channels.c:1994 src/main/escp2-channels.c:2007 +#: src/main/escp2-channels.c:2020 src/main/escp2-channels.c:2033 +#: src/main/escp2-channels.c:2047 src/main/escp2-channels.c:2061 +#: src/main/escp2-channels.c:2074 #, fuzzy msgid "Three Color Raw" msgstr "Stylus Color Pro" -#: src/main/escp2-channels.c:1967 +#: src/main/escp2-channels.c:1981 #, fuzzy msgid "Three Color Raw Gloss" msgstr "Stylus Color Pro" -#: src/main/escp2-channels.c:2067 src/main/escp2-channels.c:2073 -#: src/main/escp2-channels.c:2079 src/main/escp2-channels.c:2085 -#: src/main/escp2-channels.c:2091 src/main/escp2-channels.c:2097 -#: src/main/escp2-channels.c:2103 src/main/escp2-channels.c:2109 -#: src/main/escp2-channels.c:2115 src/main/escp2-channels.c:2121 +#: src/main/escp2-channels.c:2081 src/main/escp2-channels.c:2087 +#: src/main/escp2-channels.c:2093 src/main/escp2-channels.c:2099 +#: src/main/escp2-channels.c:2105 src/main/escp2-channels.c:2111 +#: src/main/escp2-channels.c:2117 src/main/escp2-channels.c:2123 +#: src/main/escp2-channels.c:2129 src/main/escp2-channels.c:2135 +#: src/main/escp2-channels.c:2141 #, fuzzy msgid "Four Color Raw" msgstr "Stylus Color Pro" -#: src/main/escp2-channels.c:2127 +#: src/main/escp2-channels.c:2147 msgid "Four Color Raw Gloss" msgstr "" -#: src/main/escp2-channels.c:2142 src/main/escp2-channels.c:2156 +#: src/main/escp2-channels.c:2162 src/main/escp2-channels.c:2176 #, fuzzy msgid "Five Color Raw" msgstr "Stylus Color Pro" -#: src/main/escp2-channels.c:2170 src/main/escp2-channels.c:2186 -#: src/main/escp2-channels.c:2192 src/main/escp2-channels.c:2198 -#: src/main/escp2-channels.c:2213 src/main/escp2-channels.c:2234 +#: src/main/escp2-channels.c:2190 src/main/escp2-channels.c:2206 +#: src/main/escp2-channels.c:2212 src/main/escp2-channels.c:2218 +#: src/main/escp2-channels.c:2233 src/main/escp2-channels.c:2254 #, fuzzy msgid "Six Color Raw" msgstr "Stylus Color Pro" -#: src/main/escp2-channels.c:2219 +#: src/main/escp2-channels.c:2239 msgid "Six Color Enhanced Gloss Raw" msgstr "" -#: src/main/escp2-channels.c:2250 src/main/escp2-channels.c:2265 -#: src/main/escp2-channels.c:2280 +#: src/main/escp2-channels.c:2270 src/main/escp2-channels.c:2285 +#: src/main/escp2-channels.c:2300 #, fuzzy msgid "Seven Color Raw" msgstr "Stylus Color Pro" -#: src/main/escp2-channels.c:2297 +#: src/main/escp2-channels.c:2317 #, fuzzy msgid "Seven Color Enhanced Gloss Raw" msgstr "Stylus Color Pro" -#: src/main/escp2-channels.c:2315 +#: src/main/escp2-channels.c:2335 #, fuzzy msgid "Eight Color Raw" msgstr "Stylus Color Pro" -#: src/main/escp2-channels.c:2482 src/main/escp2-channels.c:2495 -#: src/main/escp2-channels.c:2497 src/main/escp2-channels.c:2517 -#: src/main/escp2-channels.c:2520 src/main/escp2-channels.c:2540 -#: src/main/escp2-channels.c:2560 src/main/escp2-channels.c:2580 -#: src/main/escp2-channels.c:2600 src/main/escp2-channels.c:2620 -#: src/main/escp2-channels.c:2636 src/main/escp2-channels.c:2638 -#: src/main/escp2-channels.c:2640 src/main/escp2-channels.c:2642 -#: src/main/escp2-channels.c:2658 src/main/escp2-channels.c:2674 -#: src/main/escp2-channels.c:2694 +#: src/main/escp2-channels.c:2502 src/main/escp2-channels.c:2515 +#: src/main/escp2-channels.c:2517 src/main/escp2-channels.c:2537 +#: src/main/escp2-channels.c:2540 src/main/escp2-channels.c:2560 +#: src/main/escp2-channels.c:2580 src/main/escp2-channels.c:2600 +#: src/main/escp2-channels.c:2620 src/main/escp2-channels.c:2640 +#: src/main/escp2-channels.c:2656 src/main/escp2-channels.c:2658 +#: src/main/escp2-channels.c:2660 src/main/escp2-channels.c:2662 +#: src/main/escp2-channels.c:2678 src/main/escp2-channels.c:2694 +#: src/main/escp2-channels.c:2714 msgid "EPSON Standard Inks" msgstr "" -#: src/main/escp2-channels.c:2714 src/main/escp2-channels.c:2739 +#: src/main/escp2-channels.c:2734 src/main/escp2-channels.c:2759 #, fuzzy msgid "UltraChrome Photo Black" msgstr "Slashdot" -#: src/main/escp2-channels.c:2718 src/main/escp2-channels.c:2743 +#: src/main/escp2-channels.c:2738 src/main/escp2-channels.c:2763 msgid "UltraChrome Matte Black" msgstr "" -#: src/main/escp2-channels.c:2758 src/main/escp2-channels.c:2796 -#: src/main/escp2-channels.c:3167 src/escputil/escputil.c:976 +#: src/main/escp2-channels.c:2778 src/main/escp2-channels.c:2816 +#: src/main/escp2-channels.c:3206 src/escputil/escputil.c:976 #, fuzzy msgid "Photo Black" -msgstr "Κείμενα" +msgstr "Êåßìåíá" -#: src/main/escp2-channels.c:2762 src/main/escp2-channels.c:2778 -#: src/main/escp2-channels.c:3166 src/escputil/escputil.c:986 +#: src/main/escp2-channels.c:2782 src/main/escp2-channels.c:2798 +#: src/main/escp2-channels.c:3205 src/escputil/escputil.c:986 #, fuzzy msgid "Matte Black" -msgstr "ΧαÏτί Μανίλα" +msgstr "×áñôß Ìáíßëá" -#: src/main/escp2-channels.c:3092 src/main/escp2-channels.c:3102 -#: src/main/escp2-channels.c:3114 src/main/escp2-channels.c:3128 -#: src/main/escp2-channels.c:3141 src/main/escp2-channels.c:3154 -#: src/main/escp2-channels.c:3191 src/escputil/escputil.c:981 +#: src/main/escp2-channels.c:3131 src/main/escp2-channels.c:3141 +#: src/main/escp2-channels.c:3153 src/main/escp2-channels.c:3167 +#: src/main/escp2-channels.c:3180 src/main/escp2-channels.c:3193 +#: src/main/escp2-channels.c:3240 src/escputil/escputil.c:981 #: src/escputil/escputil.c:1204 #, fuzzy msgid "Light Cyan" -msgstr "Ψιλή Î’Ïοχή" +msgstr "ØéëÞ Âñï÷Þ" -#: src/main/escp2-channels.c:3093 src/main/escp2-channels.c:3104 -#: src/main/escp2-channels.c:3115 src/main/escp2-channels.c:3129 -#: src/main/escp2-channels.c:3142 src/main/escp2-channels.c:3155 -#: src/main/escp2-channels.c:3190 src/escputil/escputil.c:982 +#: src/main/escp2-channels.c:3132 src/main/escp2-channels.c:3143 +#: src/main/escp2-channels.c:3154 src/main/escp2-channels.c:3168 +#: src/main/escp2-channels.c:3181 src/main/escp2-channels.c:3194 +#: src/main/escp2-channels.c:3239 src/escputil/escputil.c:982 #: src/escputil/escputil.c:1205 #, fuzzy msgid "Light Magenta" -msgstr "Ψιλή Î’Ïοχή" +msgstr "ØéëÞ Âñï÷Þ" -#: src/main/escp2-channels.c:3130 src/main/escp2-channels.c:3192 +#: src/main/escp2-channels.c:3169 src/main/escp2-channels.c:3241 #: src/escputil/escputil.c:985 #, fuzzy msgid "Light Black" -msgstr "ΜαÏÏο" +msgstr "Ìáýñï" -#: src/main/escp2-channels.c:3143 +#: src/main/escp2-channels.c:3182 #, fuzzy msgid "Dark Yellow" -msgstr "ΚίτÏινο" +msgstr "Êßôñéíï" -#: src/main/escp2-channels.c:3170 src/escputil/escputil.c:989 +#: src/main/escp2-channels.c:3209 src/escputil/escputil.c:989 msgid "Gloss Optimizer" msgstr "" -#: src/main/escp2-channels.c:3189 src/escputil/escputil.c:990 +#: src/main/escp2-channels.c:3238 src/escputil/escputil.c:990 #, fuzzy msgid "Light Light Black" -msgstr "ΜαÏÏο" +msgstr "Ìáýñï" -#: src/main/escp2-papers.c:1343 src/main/escp2-papers.c:1387 -#: src/main/escp2-papers.c:1431 src/main/escp2-papers.c:1479 -#: src/main/escp2-papers.c:1527 src/main/escp2-papers.c:1571 +#: src/main/escp2-papers.c:1353 src/main/escp2-papers.c:1397 +#: src/main/escp2-papers.c:1441 src/main/escp2-papers.c:1489 +#: src/main/escp2-papers.c:1537 src/main/escp2-papers.c:1581 #, fuzzy msgid "Plain Paper Fast Load" -msgstr "ΚÏÏια Σελίδα" +msgstr "Êýñéá Óåëßäá" -#: src/main/escp2-papers.c:1345 src/main/escp2-papers.c:1389 -#: src/main/escp2-papers.c:1433 src/main/escp2-papers.c:1481 -#: src/main/escp2-papers.c:1529 src/main/escp2-papers.c:1573 +#: src/main/escp2-papers.c:1355 src/main/escp2-papers.c:1399 +#: src/main/escp2-papers.c:1443 src/main/escp2-papers.c:1491 +#: src/main/escp2-papers.c:1539 src/main/escp2-papers.c:1583 #: src/main/xmli18n-tmp.h:5 #, fuzzy msgid "Postcard" -msgstr "Τελευταία καÏτέλα" +msgstr "Ôåëåõôáßá êáñôÝëá" -#: src/main/escp2-papers.c:1353 src/main/escp2-papers.c:1397 -#: src/main/escp2-papers.c:1441 src/main/escp2-papers.c:1489 -#: src/main/escp2-papers.c:1537 src/main/escp2-papers.c:1581 +#: src/main/escp2-papers.c:1363 src/main/escp2-papers.c:1407 +#: src/main/escp2-papers.c:1451 src/main/escp2-papers.c:1499 +#: src/main/escp2-papers.c:1547 src/main/escp2-papers.c:1591 #, fuzzy msgid "Back Light Film" -msgstr "ΕλαφÏÏ Ï‡Î±Î»Î¬Î¶Î¹" - -#: src/main/escp2-papers.c:1357 src/main/escp2-papers.c:1401 -#: src/main/escp2-papers.c:1445 src/main/escp2-papers.c:1493 -#: src/main/escp2-papers.c:1541 src/main/escp2-papers.c:1585 -#, fuzzy -msgid "Matte Paper Heavyweight" -msgstr "ΧαÏτί Μανίλα" +msgstr "Åëáöñý ÷áëÜæé" #: src/main/escp2-papers.c:1367 src/main/escp2-papers.c:1411 #: src/main/escp2-papers.c:1455 src/main/escp2-papers.c:1503 #: src/main/escp2-papers.c:1551 src/main/escp2-papers.c:1595 +#, fuzzy +msgid "Matte Paper Heavyweight" +msgstr "×áñôß Ìáíßëá" + +#: src/main/escp2-papers.c:1377 src/main/escp2-papers.c:1421 +#: src/main/escp2-papers.c:1465 src/main/escp2-papers.c:1513 +#: src/main/escp2-papers.c:1561 src/main/escp2-papers.c:1605 msgid "Premium Semigloss Photo Paper" msgstr "" -#: src/main/escp2-papers.c:1375 src/main/escp2-papers.c:1419 -#: src/main/escp2-papers.c:1467 src/main/escp2-papers.c:1515 -#: src/main/escp2-papers.c:1559 src/main/escp2-papers.c:1607 +#: src/main/escp2-papers.c:1385 src/main/escp2-papers.c:1429 +#: src/main/escp2-papers.c:1477 src/main/escp2-papers.c:1525 +#: src/main/escp2-papers.c:1569 src/main/escp2-papers.c:1617 #, fuzzy msgid "ColorLife Paper" -msgstr "ΚÏÏια Σελίδα" +msgstr "Êýñéá Óåëßäá" -#: src/main/escp2-papers.c:1459 src/main/escp2-papers.c:1507 -#: src/main/escp2-papers.c:1599 +#: src/main/escp2-papers.c:1469 src/main/escp2-papers.c:1517 +#: src/main/escp2-papers.c:1609 #, fuzzy msgid "Archival Matte Paper" -msgstr "ΧαÏτί Μανίλα" +msgstr "×áñôß Ìáíßëá" -#: src/main/escp2-papers.c:1461 src/main/escp2-papers.c:1509 -#: src/main/escp2-papers.c:1601 +#: src/main/escp2-papers.c:1471 src/main/escp2-papers.c:1519 +#: src/main/escp2-papers.c:1611 msgid "Watercolor Paper - Radiant White" msgstr "" -#: src/main/escp2-papers.c:1716 src/main/escp2-papers.c:1842 -#: src/main/escp2-papers.c:1884 src/main/escp2-papers.c:1926 -#: src/main/escp2-papers.c:2001 +#: src/main/escp2-papers.c:1727 src/main/escp2-papers.c:1853 +#: src/main/escp2-papers.c:1895 src/main/escp2-papers.c:1937 +#: src/main/escp2-papers.c:2012 #, fuzzy msgid "Roll Feed" -msgstr "Ρόλος" +msgstr "Ñüëïò" -#: src/main/escp2-papers.c:1740 src/main/escp2-papers.c:1791 +#: src/main/escp2-papers.c:1751 src/main/escp2-papers.c:1802 msgid "Roll Feed (cut each page)" msgstr "" -#: src/main/escp2-papers.c:1749 src/main/escp2-papers.c:1800 +#: src/main/escp2-papers.c:1760 src/main/escp2-papers.c:1811 msgid "Roll Feed (do not cut)" msgstr "" # Revise translation of "manual" (as in opposite of "automatic", not synonym of "documentation") -#: src/main/escp2-papers.c:1773 src/main/escp2-papers.c:1824 +#: src/main/escp2-papers.c:1784 src/main/escp2-papers.c:1835 #, fuzzy msgid "Manual Feed" -msgstr "ΕγχειÏίδιο" +msgstr "Åã÷åéñßäéï" -#: src/main/escp2-papers.c:1782 src/main/escp2-papers.c:1833 -#: src/main/escp2-papers.c:1935 src/main/escp2-papers.c:1968 +#: src/main/escp2-papers.c:1793 src/main/escp2-papers.c:1844 +#: src/main/escp2-papers.c:1946 src/main/escp2-papers.c:1979 #, fuzzy msgid "Print to CD" -msgstr "ΕκτÏπωση σε ΑÏχείο" +msgstr "Åêôýðùóç óå Áñ÷åßï" # Revise translation of "manual" (as in opposite of "automatic", not synonym of "documentation") -#: src/main/escp2-papers.c:1866 src/main/escp2-papers.c:1908 +#: src/main/escp2-papers.c:1877 src/main/escp2-papers.c:1919 #, fuzzy msgid "Manual Sheet Guide" -msgstr "ΕγχειÏίδιο" +msgstr "Åã÷åéñßäéï" # Revise translation of "manual" (as in opposite of "automatic", not synonym of "documentation") -#: src/main/escp2-papers.c:1875 src/main/escp2-papers.c:1917 +#: src/main/escp2-papers.c:1886 src/main/escp2-papers.c:1928 #, fuzzy msgid "Manual Feed (Front)" -msgstr "ΕγχειÏίδιο" +msgstr "Åã÷åéñßäéï" -#: src/main/escp2-papers.c:1950 +#: src/main/escp2-papers.c:1961 #, fuzzy msgid "Rear Tray" -msgstr "Δοκιμή" +msgstr "ÄïêéìÞ" -#: src/main/escp2-papers.c:1959 +#: src/main/escp2-papers.c:1970 msgid "Front Tray" msgstr "" -#: src/main/escp2-papers.c:1977 +#: src/main/escp2-papers.c:1988 #, fuzzy msgid "Photo Board" -msgstr "Κείμενα" +msgstr "Êåßìåíá" -#: src/main/escp2-papers.c:2016 +#: src/main/escp2-papers.c:2027 msgid "Cut Sheet Bin 1" msgstr "" -#: src/main/escp2-papers.c:2025 +#: src/main/escp2-papers.c:2036 msgid "Cut Sheet Bin 2" msgstr "" -#: src/main/escp2-papers.c:2034 +#: src/main/escp2-papers.c:2045 #, fuzzy msgid "Cut Sheet Autoselect" -msgstr "Απεπιλογή" +msgstr "ÁðåðéëïãÞ" -#: src/main/escp2-papers.c:2043 +#: src/main/escp2-papers.c:2054 msgid "Manual Selection" msgstr "" @@ -2079,7 +2248,7 @@ msgstr "" #: src/main/escp2-resolutions.c:40 src/main/escp2-resolutions.c:43 #, fuzzy msgid "360 x 120 DPI Economy" -msgstr "μονόχÏωμο" +msgstr "ìïíü÷ñùìï" #: src/main/escp2-resolutions.c:47 src/main/escp2-resolutions.c:50 msgid "180 DPI Economy" @@ -2197,7 +2366,7 @@ msgstr "" #: src/main/escp2-resolutions.c:589 #, fuzzy msgid "Interleave" -msgstr "Όνομα εκτυπωτή:" +msgstr "¼íïìá åêôõðùôÞ:" #: src/main/escp2-resolutions.c:567 src/main/escp2-resolutions.c:578 #: src/main/escp2-resolutions.c:590 @@ -2217,54 +2386,60 @@ msgstr "" #: src/main/escp2-resolutions.c:581 src/main/escp2-resolutions.c:593 #, fuzzy msgid "Interleave 2" -msgstr "Όνομα εκτυπωτή:" +msgstr "¼íïìá åêôõðùôÞ:" #: src/main/escp2-resolutions.c:594 #, fuzzy msgid "Eight Pass" -msgstr "ΕÏγασία" +msgstr "Åñãáóßá" #: src/main/escp2-resolutions.c:637 src/main/escp2-resolutions.c:652 -#: src/main/generic-options.c:33 +#: src/main/escp2-resolutions.c:667 src/main/generic-options.c:33 msgid "Fast Economy" msgstr "" #: src/main/escp2-resolutions.c:638 src/main/escp2-resolutions.c:653 -#: src/main/generic-options.c:34 +#: src/main/escp2-resolutions.c:668 src/main/generic-options.c:34 msgid "Economy" msgstr "" #: src/main/escp2-resolutions.c:639 src/main/escp2-resolutions.c:654 -#: src/main/escp2-resolutions.c:667 src/main/generic-options.c:35 +#: src/main/escp2-resolutions.c:669 src/main/escp2-resolutions.c:682 +#: src/main/generic-options.c:35 msgid "Draft" msgstr "" #: src/main/escp2-resolutions.c:641 src/main/escp2-resolutions.c:656 -#: src/main/escp2-resolutions.c:670 src/main/generic-options.c:37 +#: src/main/escp2-resolutions.c:671 src/main/escp2-resolutions.c:685 +#: src/main/generic-options.c:37 #, fuzzy msgid "High" -msgstr "Ύψος:" +msgstr "¾øïò:" #: src/main/escp2-resolutions.c:642 src/main/escp2-resolutions.c:657 -#: src/main/escp2-resolutions.c:669 src/main/generic-options.c:38 +#: src/main/escp2-resolutions.c:672 src/main/escp2-resolutions.c:684 +#: src/main/generic-options.c:38 #, fuzzy msgid "Photo" -msgstr "ΚÏυπτογÏαφία" +msgstr "Êñõðôïãñáößá" #: src/main/escp2-resolutions.c:643 src/main/escp2-resolutions.c:658 -#: src/main/escp2-resolutions.c:671 src/main/generic-options.c:39 +#: src/main/escp2-resolutions.c:673 src/main/escp2-resolutions.c:686 +#: src/main/generic-options.c:39 #, fuzzy msgid "Super Photo" msgstr "Slashdot" #: src/main/escp2-resolutions.c:644 src/main/escp2-resolutions.c:659 -#: src/main/escp2-resolutions.c:672 src/main/generic-options.c:40 +#: src/main/escp2-resolutions.c:674 src/main/escp2-resolutions.c:687 +#: src/main/generic-options.c:40 #, fuzzy msgid "Ultra Photo" msgstr "Slashdot" #: src/main/escp2-resolutions.c:645 src/main/escp2-resolutions.c:660 -#: src/main/escp2-resolutions.c:673 src/main/generic-options.c:41 +#: src/main/escp2-resolutions.c:675 src/main/escp2-resolutions.c:688 +#: src/main/generic-options.c:41 msgid "Best" msgstr "" @@ -2283,18 +2458,18 @@ msgstr "" #: src/main/generic-options.c:49 #, fuzzy msgid "Photograph" -msgstr "ΚÏυπτογÏαφία" +msgstr "Êñõðôïãñáößá" #: src/main/generic-options.c:50 #, fuzzy msgid "Line Art" -msgstr "ΓÏαμμή" +msgstr "ÃñáììÞ" # #: src/main/generic-options.c:55 #, fuzzy msgid "Page" -msgstr "Μέγεθος" +msgstr "ÌÝãåèïò" #: src/main/generic-options.c:56 msgid "Job" @@ -2303,12 +2478,12 @@ msgstr "" #: src/main/generic-options.c:68 #, fuzzy msgid "Image Type" -msgstr "ΤÏπος Στοιχείου:" +msgstr "Ôýðïò Óôïé÷åßïõ:" #: src/main/generic-options.c:69 #, fuzzy msgid "Type of image being printed" -msgstr "ΑÏχείο κειμένου Ï€Ïος συμπεÏίληψη στην αναφοÏά" +msgstr "Áñ÷åßï êåéìÝíïõ ðñïò óõìðåñßëçøç óôçí áíáöïñÜ" #: src/main/generic-options.c:74 src/main/generic-options.c:80 msgid "Job Mode" @@ -2322,4446 +2497,4701 @@ msgstr "" #: src/main/generic-options.c:80 #, fuzzy msgid "Page Number" -msgstr "Μέγεθος" +msgstr "ÌÝãåèïò" # #: src/main/generic-options.c:81 #, fuzzy msgid "Page number" -msgstr "Μέγεθος" +msgstr "ÌÝãåèïò" # #: src/main/xmli18n-tmp.h:1 msgid "Letter" -msgstr "Διαστάσεις Letter" +msgstr "ÄéáóôÜóåéò Letter" # #: src/main/xmli18n-tmp.h:2 msgid "Legal" -msgstr "Διαστάσεις Legal" +msgstr "ÄéáóôÜóåéò Legal" #: src/main/xmli18n-tmp.h:3 #, fuzzy msgid "Tabloid" -msgstr "Πίνακας" +msgstr "Ðßíáêáò" #: src/main/xmli18n-tmp.h:4 #, fuzzy msgid "Executive" -msgstr "Εκτέλεση" +msgstr "ÅêôÝëåóç" #: src/main/xmli18n-tmp.h:9 msgid "3x5" msgstr "3x5" #: src/main/xmli18n-tmp.h:10 +msgid "3 1/2 x5" +msgstr "" + +#: src/main/xmli18n-tmp.h:11 msgid "4x6" msgstr "4x6" -#: src/main/xmli18n-tmp.h:11 +#: src/main/xmli18n-tmp.h:12 #, fuzzy msgid "Epson 4x6 Photo Paper (tear-off borders)" -msgstr "Κείμενα" +msgstr "Êåßìåíá" -#: src/main/xmli18n-tmp.h:12 +#: src/main/xmli18n-tmp.h:13 msgid "5x7" msgstr "5x7" -#: src/main/xmli18n-tmp.h:13 +#: src/main/xmli18n-tmp.h:14 msgid "5x8" msgstr "5x8" -#: src/main/xmli18n-tmp.h:14 +#: src/main/xmli18n-tmp.h:15 msgid "6x8" msgstr "6x8" -#: src/main/xmli18n-tmp.h:15 +#: src/main/xmli18n-tmp.h:16 msgid "8x10" msgstr "8x10" -#: src/main/xmli18n-tmp.h:17 +#: src/main/xmli18n-tmp.h:18 msgid "12x18" msgstr "12x18" -#: src/main/xmli18n-tmp.h:18 +#: src/main/xmli18n-tmp.h:19 msgid "Super B 13x19" msgstr "Super B 13x19" -#: src/main/xmli18n-tmp.h:19 +#: src/main/xmli18n-tmp.h:20 msgid "Engineering C 17x22" msgstr "" -#: src/main/xmli18n-tmp.h:20 +#: src/main/xmli18n-tmp.h:21 msgid "8x12" msgstr "8x12" -#: src/main/xmli18n-tmp.h:21 +#: src/main/xmli18n-tmp.h:22 msgid "11x14" msgstr "11x14" -#: src/main/xmli18n-tmp.h:22 +#: src/main/xmli18n-tmp.h:23 msgid "16x20" msgstr "16x20" -#: src/main/xmli18n-tmp.h:23 +#: src/main/xmli18n-tmp.h:24 msgid "16x24" msgstr "16x24" -#: src/main/xmli18n-tmp.h:24 +#: src/main/xmli18n-tmp.h:25 msgid "20x24" msgstr "20x24" -#: src/main/xmli18n-tmp.h:25 +#: src/main/xmli18n-tmp.h:26 msgid "20x30" msgstr "20x30" -#: src/main/xmli18n-tmp.h:26 +#: src/main/xmli18n-tmp.h:27 #, fuzzy msgid "22x30" msgstr "20x30" -#: src/main/xmli18n-tmp.h:27 +#: src/main/xmli18n-tmp.h:28 msgid "24x30" msgstr "24x30" -#: src/main/xmli18n-tmp.h:28 +#: src/main/xmli18n-tmp.h:29 msgid "Super A1 24x36" msgstr "" -#: src/main/xmli18n-tmp.h:29 +#: src/main/xmli18n-tmp.h:30 msgid "30x40" msgstr "30x40" -#: src/main/xmli18n-tmp.h:30 +#: src/main/xmli18n-tmp.h:31 msgid "4A" msgstr "4A" -#: src/main/xmli18n-tmp.h:31 +#: src/main/xmli18n-tmp.h:32 msgid "2A" msgstr "2A" -#: src/main/xmli18n-tmp.h:32 +#: src/main/xmli18n-tmp.h:33 #, fuzzy msgid "Super A0" msgstr "Slashdot" -#: src/main/xmli18n-tmp.h:33 +#: src/main/xmli18n-tmp.h:34 msgid "A0" msgstr "A0" -#: src/main/xmli18n-tmp.h:34 +#: src/main/xmli18n-tmp.h:35 msgid "A1" msgstr "A1" -#: src/main/xmli18n-tmp.h:35 +#: src/main/xmli18n-tmp.h:36 msgid "A2" msgstr "A2" -#: src/main/xmli18n-tmp.h:36 +#: src/main/xmli18n-tmp.h:37 msgid "A3" msgstr "A3" # -#: src/main/xmli18n-tmp.h:37 +#: src/main/xmli18n-tmp.h:38 msgid "A4" -msgstr "Διαστάσεις Α4" +msgstr "ÄéáóôÜóåéò Á4" -#: src/main/xmli18n-tmp.h:38 +#: src/main/xmli18n-tmp.h:39 msgid "A5" msgstr "A5" -#: src/main/xmli18n-tmp.h:39 +#: src/main/xmli18n-tmp.h:40 msgid "A6" msgstr "A6" -#: src/main/xmli18n-tmp.h:40 +#: src/main/xmli18n-tmp.h:41 msgid "A7" msgstr "A7" -#: src/main/xmli18n-tmp.h:41 +#: src/main/xmli18n-tmp.h:42 msgid "A8" msgstr "A8" -#: src/main/xmli18n-tmp.h:42 +#: src/main/xmli18n-tmp.h:43 msgid "A9" msgstr "A9" -#: src/main/xmli18n-tmp.h:43 +#: src/main/xmli18n-tmp.h:44 msgid "A10" msgstr "A10" # -#: src/main/xmli18n-tmp.h:44 +#: src/main/xmli18n-tmp.h:45 #, fuzzy msgid "RA0" msgstr "RAD" # -#: src/main/xmli18n-tmp.h:45 +#: src/main/xmli18n-tmp.h:46 #, fuzzy msgid "RA1" msgstr "RAD" # -#: src/main/xmli18n-tmp.h:46 +#: src/main/xmli18n-tmp.h:47 #, fuzzy msgid "RA2" msgstr "RAD" # -#: src/main/xmli18n-tmp.h:47 +#: src/main/xmli18n-tmp.h:48 #, fuzzy msgid "RA3" msgstr "RAD" # -#: src/main/xmli18n-tmp.h:48 +#: src/main/xmli18n-tmp.h:49 #, fuzzy msgid "RA4" -msgstr "Διαστάσεις Α4" +msgstr "ÄéáóôÜóåéò Á4" -#: src/main/xmli18n-tmp.h:49 +#: src/main/xmli18n-tmp.h:50 msgid "SRA0" msgstr "SRA0" -#: src/main/xmli18n-tmp.h:50 +#: src/main/xmli18n-tmp.h:51 msgid "SRA1" msgstr "SRA1" -#: src/main/xmli18n-tmp.h:51 +#: src/main/xmli18n-tmp.h:52 msgid "SRA2" msgstr "SRA2" -#: src/main/xmli18n-tmp.h:52 +#: src/main/xmli18n-tmp.h:53 msgid "SRA3" msgstr "SRA3" # -#: src/main/xmli18n-tmp.h:53 +#: src/main/xmli18n-tmp.h:54 #, fuzzy msgid "SRA4" -msgstr "Διαστάσεις Α4" +msgstr "ÄéáóôÜóåéò Á4" -#: src/main/xmli18n-tmp.h:54 +#: src/main/xmli18n-tmp.h:55 msgid "4B ISO" msgstr "4B ISO" -#: src/main/xmli18n-tmp.h:55 +#: src/main/xmli18n-tmp.h:56 msgid "2B ISO" msgstr "2B ISO" -#: src/main/xmli18n-tmp.h:56 +#: src/main/xmli18n-tmp.h:57 msgid "B0 ISO" msgstr "B0 ISO" -#: src/main/xmli18n-tmp.h:57 +#: src/main/xmli18n-tmp.h:58 msgid "B1 ISO" msgstr "B1 ISO" -#: src/main/xmli18n-tmp.h:58 +#: src/main/xmli18n-tmp.h:59 msgid "B2 ISO" msgstr "B2 ISO" -#: src/main/xmli18n-tmp.h:59 +#: src/main/xmli18n-tmp.h:60 msgid "B3 ISO" msgstr "B3 ISO" -#: src/main/xmli18n-tmp.h:60 +#: src/main/xmli18n-tmp.h:61 msgid "B4 ISO" msgstr "B4 ISO" -#: src/main/xmli18n-tmp.h:61 +#: src/main/xmli18n-tmp.h:62 msgid "B5 ISO" msgstr "B5 ISO" -#: src/main/xmli18n-tmp.h:62 +#: src/main/xmli18n-tmp.h:63 msgid "B6 ISO" msgstr "B6 ISO" -#: src/main/xmli18n-tmp.h:63 +#: src/main/xmli18n-tmp.h:64 msgid "B7 ISO" msgstr "B7 ISO" -#: src/main/xmli18n-tmp.h:64 +#: src/main/xmli18n-tmp.h:65 msgid "B8 ISO" msgstr "B8 ISO" -#: src/main/xmli18n-tmp.h:65 +#: src/main/xmli18n-tmp.h:66 msgid "B9 ISO" msgstr "B9 ISO" -#: src/main/xmli18n-tmp.h:66 +#: src/main/xmli18n-tmp.h:67 msgid "B10 ISO" msgstr "B10 ISO" -#: src/main/xmli18n-tmp.h:67 +#: src/main/xmli18n-tmp.h:68 #, fuzzy msgid "Super B0 JIS" msgstr "B0 JIS" -#: src/main/xmli18n-tmp.h:68 +#: src/main/xmli18n-tmp.h:69 msgid "B0 JIS" msgstr "B0 JIS" -#: src/main/xmli18n-tmp.h:69 +#: src/main/xmli18n-tmp.h:70 msgid "B1 JIS" msgstr "B1 JIS" -#: src/main/xmli18n-tmp.h:70 +#: src/main/xmli18n-tmp.h:71 msgid "B2 JIS" msgstr "B2 JIS" -#: src/main/xmli18n-tmp.h:71 +#: src/main/xmli18n-tmp.h:72 msgid "B3 JIS" msgstr "B3 JIS" -#: src/main/xmli18n-tmp.h:72 +#: src/main/xmli18n-tmp.h:73 msgid "B4 JIS" msgstr "B4 JIS" -#: src/main/xmli18n-tmp.h:73 +#: src/main/xmli18n-tmp.h:74 msgid "B5 JIS" msgstr "B5 JIS" -#: src/main/xmli18n-tmp.h:74 +#: src/main/xmli18n-tmp.h:75 msgid "B6 JIS" msgstr "B6 JIS" -#: src/main/xmli18n-tmp.h:75 +#: src/main/xmli18n-tmp.h:76 msgid "B7 JIS" msgstr "B7 JIS" -#: src/main/xmli18n-tmp.h:76 +#: src/main/xmli18n-tmp.h:77 msgid "B8 JIS" msgstr "B8 JIS" -#: src/main/xmli18n-tmp.h:77 +#: src/main/xmli18n-tmp.h:78 msgid "B9 JIS" msgstr "B9 JIS" -#: src/main/xmli18n-tmp.h:78 +#: src/main/xmli18n-tmp.h:79 msgid "B10 JIS" msgstr "B10 JIS" -#: src/main/xmli18n-tmp.h:79 +#: src/main/xmli18n-tmp.h:80 msgid "C0" msgstr "C0" -#: src/main/xmli18n-tmp.h:80 +#: src/main/xmli18n-tmp.h:81 +#, fuzzy +msgid "C0 landscape" +msgstr "Ïñéæüíôéïò" + +#: src/main/xmli18n-tmp.h:82 msgid "C1" msgstr "C1" -#: src/main/xmli18n-tmp.h:81 +#: src/main/xmli18n-tmp.h:83 +#, fuzzy +msgid "C1 landscape" +msgstr "Ïñéæüíôéïò" + +#: src/main/xmli18n-tmp.h:84 msgid "C2" msgstr "C2" -#: src/main/xmli18n-tmp.h:82 +#: src/main/xmli18n-tmp.h:85 +#, fuzzy +msgid "C2 landscape" +msgstr "Ïñéæüíôéïò" + +#: src/main/xmli18n-tmp.h:86 msgid "C3" msgstr "C3" -#: src/main/xmli18n-tmp.h:83 +#: src/main/xmli18n-tmp.h:87 +#, fuzzy +msgid "C3 landscape" +msgstr "Ïñéæüíôéïò" + +#: src/main/xmli18n-tmp.h:88 msgid "C4" msgstr "C4" -#: src/main/xmli18n-tmp.h:84 +#: src/main/xmli18n-tmp.h:89 +#, fuzzy +msgid "C4 landscape" +msgstr "Ïñéæüíôéïò" + +#: src/main/xmli18n-tmp.h:90 msgid "C5" msgstr "C5" -#: src/main/xmli18n-tmp.h:85 +#: src/main/xmli18n-tmp.h:91 +#, fuzzy +msgid "C5 landscape" +msgstr "Ïñéæüíôéïò" + +#: src/main/xmli18n-tmp.h:92 msgid "B6-C4" msgstr "B6-C4" -#: src/main/xmli18n-tmp.h:86 +#: src/main/xmli18n-tmp.h:93 +#, fuzzy +msgid "B6-C4 landscape" +msgstr "Ïñéæüíôéïò" + +#: src/main/xmli18n-tmp.h:94 msgid "C6" msgstr "C6" -#: src/main/xmli18n-tmp.h:87 +#: src/main/xmli18n-tmp.h:95 +#, fuzzy +msgid "C6 landscape" +msgstr "Ïñéæüíôéïò" + +#: src/main/xmli18n-tmp.h:96 #, fuzzy msgid "DL" -msgstr "ΤεκμηÏίωση" +msgstr "Ôåêìçñßùóç" -#: src/main/xmli18n-tmp.h:88 +#: src/main/xmli18n-tmp.h:97 +#, fuzzy +msgid "DL landscape" +msgstr "Ïñéæüíôéïò" + +#: src/main/xmli18n-tmp.h:98 msgid "C7-6" msgstr "C7-6" -#: src/main/xmli18n-tmp.h:89 +#: src/main/xmli18n-tmp.h:99 +#, fuzzy +msgid "C7-6 landscape" +msgstr "Ïñéæüíôéïò" + +#: src/main/xmli18n-tmp.h:100 msgid "C7" msgstr "C7" -#: src/main/xmli18n-tmp.h:90 +#: src/main/xmli18n-tmp.h:101 +#, fuzzy +msgid "C7 landscape" +msgstr "Ïñéæüíôéïò" + +#: src/main/xmli18n-tmp.h:102 msgid "C8" msgstr "C8" -#: src/main/xmli18n-tmp.h:91 +#: src/main/xmli18n-tmp.h:103 +#, fuzzy +msgid "C8 landscape" +msgstr "Ïñéæüíôéïò" + +#: src/main/xmli18n-tmp.h:104 msgid "C9" msgstr "C9" -#: src/main/xmli18n-tmp.h:92 +#: src/main/xmli18n-tmp.h:105 +#, fuzzy +msgid "C9 landscape" +msgstr "Ïñéæüíôéïò" + +#: src/main/xmli18n-tmp.h:106 msgid "C10" msgstr "C10" -#: src/main/xmli18n-tmp.h:93 +#: src/main/xmli18n-tmp.h:107 +#, fuzzy +msgid "C10 landscape" +msgstr "Ïñéæüíôéïò" + +#: src/main/xmli18n-tmp.h:108 #, fuzzy msgid "ArchA" -msgstr "Τόξο" +msgstr "Ôüîï" -#: src/main/xmli18n-tmp.h:94 +#: src/main/xmli18n-tmp.h:109 msgid "ArchA transposed" msgstr "" -#: src/main/xmli18n-tmp.h:95 +#: src/main/xmli18n-tmp.h:110 #, fuzzy msgid "ArchB" -msgstr "Τόξο" +msgstr "Ôüîï" -#: src/main/xmli18n-tmp.h:96 +#: src/main/xmli18n-tmp.h:111 msgid "ArchB transposed" msgstr "" -#: src/main/xmli18n-tmp.h:97 +#: src/main/xmli18n-tmp.h:112 #, fuzzy msgid "ArchC" -msgstr "Τόξο" +msgstr "Ôüîï" -#: src/main/xmli18n-tmp.h:98 +#: src/main/xmli18n-tmp.h:113 msgid "ArchC transposed" msgstr "" -#: src/main/xmli18n-tmp.h:99 +#: src/main/xmli18n-tmp.h:114 #, fuzzy msgid "ArchD" -msgstr "Τόξο" +msgstr "Ôüîï" -#: src/main/xmli18n-tmp.h:100 +#: src/main/xmli18n-tmp.h:115 msgid "ArchD transposed" msgstr "" -#: src/main/xmli18n-tmp.h:101 +#: src/main/xmli18n-tmp.h:116 #, fuzzy msgid "ArchE" -msgstr "Τόξο" +msgstr "Ôüîï" -#: src/main/xmli18n-tmp.h:102 +#: src/main/xmli18n-tmp.h:117 msgid "ArchE transposed" msgstr "" -#: src/main/xmli18n-tmp.h:103 +#: src/main/xmli18n-tmp.h:118 #, fuzzy msgid "American foolscap" -msgstr "ΑμεÏικανική Σαμόα" +msgstr "ÁìåñéêáíéêÞ Óáìüá" -#: src/main/xmli18n-tmp.h:104 +#: src/main/xmli18n-tmp.h:119 #, fuzzy msgid "European foolscap" -msgstr "ΑμεÏικανική Σαμόα" +msgstr "ÁìåñéêáíéêÞ Óáìüá" -#: src/main/xmli18n-tmp.h:105 +#: src/main/xmli18n-tmp.h:120 #, fuzzy msgid "Crown Quarto" -msgstr "Ï€Ïοσομοίωση" +msgstr "ðñïóïìïßùóç" -#: src/main/xmli18n-tmp.h:106 +#: src/main/xmli18n-tmp.h:121 msgid "Large Crown Quarto" msgstr "" -#: src/main/xmli18n-tmp.h:107 +#: src/main/xmli18n-tmp.h:122 #, fuzzy msgid "Demy Quarto" -msgstr "Ï€Ïοσομοίωση" +msgstr "ðñïóïìïßùóç" -#: src/main/xmli18n-tmp.h:108 +#: src/main/xmli18n-tmp.h:123 #, fuzzy msgid "Royal Quarto" -msgstr "Ï€Ïοσομοίωση" +msgstr "ðñïóïìïßùóç" # -#: src/main/xmli18n-tmp.h:109 +#: src/main/xmli18n-tmp.h:124 #, fuzzy msgid "ISO A4" -msgstr "Διαστάσεις Α4" +msgstr "ÄéáóôÜóåéò Á4" -#: src/main/xmli18n-tmp.h:110 +#: src/main/xmli18n-tmp.h:125 msgid "Crown Octavo" msgstr "" -#: src/main/xmli18n-tmp.h:111 +#: src/main/xmli18n-tmp.h:126 msgid "Large Crown Octavo" msgstr "" -#: src/main/xmli18n-tmp.h:112 +#: src/main/xmli18n-tmp.h:127 #, fuzzy msgid "Demy Octavo" -msgstr "Ï€Ïοσομοίωση" +msgstr "ðñïóïìïßùóç" -#: src/main/xmli18n-tmp.h:113 +#: src/main/xmli18n-tmp.h:128 msgid "Royal Octavo" msgstr "" -#: src/main/xmli18n-tmp.h:114 +#: src/main/xmli18n-tmp.h:129 msgid "ISO A5" msgstr "" -#: src/main/xmli18n-tmp.h:115 +#: src/main/xmli18n-tmp.h:130 #, fuzzy msgid "Small paperback" -msgstr "Επένδυση" +msgstr "ÅðÝíäõóç" -#: src/main/xmli18n-tmp.h:116 +#: src/main/xmli18n-tmp.h:131 #, fuzzy msgid "Penguin small paperback" -msgstr "Επένδυση" +msgstr "ÅðÝíäõóç" -#: src/main/xmli18n-tmp.h:117 +#: src/main/xmli18n-tmp.h:132 msgid "Penguin large paperback" msgstr "" -#: src/main/xmli18n-tmp.h:118 +#: src/main/xmli18n-tmp.h:133 msgid "10cm x 15cm" msgstr "" -#: src/main/xmli18n-tmp.h:119 +#: src/main/xmli18n-tmp.h:134 #, fuzzy msgid "Hagaki Card" -msgstr "Αναζήτηση καÏτέλας" +msgstr "ÁíáæÞôçóç êáñôÝëáò" -#: src/main/xmli18n-tmp.h:120 +#: src/main/xmli18n-tmp.h:135 msgid "Oufuku Card" msgstr "" -#: src/main/xmli18n-tmp.h:121 +#: src/main/xmli18n-tmp.h:136 msgid "Japanese long envelope #3" msgstr "" -#: src/main/xmli18n-tmp.h:122 +#: src/main/xmli18n-tmp.h:137 +msgid "Japanese long envelope #3 landscape" +msgstr "" + +#: src/main/xmli18n-tmp.h:138 msgid "Japanese long envelope #4" msgstr "" -#: src/main/xmli18n-tmp.h:123 +#: src/main/xmli18n-tmp.h:139 +msgid "Japanese long envelope #4 landscape" +msgstr "" + +#: src/main/xmli18n-tmp.h:140 msgid "Japanese Kaku envelope #4" msgstr "" -#: src/main/xmli18n-tmp.h:124 +#: src/main/xmli18n-tmp.h:141 +msgid "Japanese Kaku envelope #4 landscape" +msgstr "" + +#: src/main/xmli18n-tmp.h:142 msgid "Commercial 10" msgstr "" -#: src/main/xmli18n-tmp.h:125 +#: src/main/xmli18n-tmp.h:143 +msgid "Commercial 10 landscape" +msgstr "" + +#: src/main/xmli18n-tmp.h:144 #, fuzzy msgid "A2 Invitation" -msgstr "ΚινοÏμενα σχέδια" +msgstr "Êéíïýìåíá ó÷Ýäéá" -#: src/main/xmli18n-tmp.h:126 +#: src/main/xmli18n-tmp.h:145 #, fuzzy msgid "Monarch Envelope" -msgstr "ΕκτÏπωση Φακέλου" +msgstr "Åêôýðùóç ÖáêÝëïõ" -#: src/main/xmli18n-tmp.h:127 +#: src/main/xmli18n-tmp.h:146 +#, fuzzy +msgid "Monarch Envelope landscape" +msgstr "Åêôýðùóç ÖáêÝëïõ" + +#: src/main/xmli18n-tmp.h:147 msgid "4x5 3/8" msgstr "" -#: src/main/xmli18n-tmp.h:128 +#: src/main/xmli18n-tmp.h:148 #, fuzzy msgid "4x7" msgstr "5x7" -#: src/main/xmli18n-tmp.h:129 +#: src/main/xmli18n-tmp.h:149 msgid "CP_L" msgstr "" -#: src/main/xmli18n-tmp.h:130 +#: src/main/xmli18n-tmp.h:150 msgid "Card" msgstr "" -#: src/main/xmli18n-tmp.h:131 +#: src/main/xmli18n-tmp.h:151 #, fuzzy msgid "Wide Postcard" -msgstr "Τελευταία καÏτέλα" +msgstr "Ôåëåõôáßá êáñôÝëá" -#: src/main/xmli18n-tmp.h:132 +#: src/main/xmli18n-tmp.h:152 msgid "Chilean Office" msgstr "" -#: src/main/xmli18n-tmp.h:133 +#: src/main/xmli18n-tmp.h:153 msgid "Chilean Double Letter" msgstr "" -#: src/main/xmli18n-tmp.h:134 +#: src/main/xmli18n-tmp.h:154 msgid "Chilean Double Office" msgstr "" # Translation of "custom" sucks! ("kata paraggelia"??? nah!) -#: src/main/xmli18n-tmp.h:135 +#: src/main/xmli18n-tmp.h:155 msgid "Custom" -msgstr "ΟÏισμένο από το χÏήστη" +msgstr "ÏñéóìÝíï áðü ôï ÷ñÞóôç" -#: src/main/xmli18n-tmp.h:136 +#: src/main/xmli18n-tmp.h:156 msgid "89 mm Roll Paper" msgstr "" -#: src/main/xmli18n-tmp.h:137 +#: src/main/xmli18n-tmp.h:157 msgid "4 Inch Roll Paper" msgstr "" -#: src/main/xmli18n-tmp.h:138 +#: src/main/xmli18n-tmp.h:158 msgid "5 Inch Roll Paper" msgstr "" -#: src/main/xmli18n-tmp.h:139 +#: src/main/xmli18n-tmp.h:159 msgid "210 mm Roll Paper" msgstr "" -#: src/main/xmli18n-tmp.h:140 +#: src/main/xmli18n-tmp.h:160 msgid "13 Inch Roll Paper" msgstr "" -#: src/main/xmli18n-tmp.h:141 +#: src/main/xmli18n-tmp.h:161 msgid "22 Inch Roll Paper" msgstr "" -#: src/main/xmli18n-tmp.h:142 +#: src/main/xmli18n-tmp.h:162 msgid "24 Inch Roll Paper" msgstr "" -#: src/main/xmli18n-tmp.h:143 +#: src/main/xmli18n-tmp.h:163 msgid "36 Inch Roll Paper" msgstr "" -#: src/main/xmli18n-tmp.h:144 +#: src/main/xmli18n-tmp.h:164 msgid "44 Inch Roll Paper" msgstr "" -#: src/main/xmli18n-tmp.h:145 +#: src/main/xmli18n-tmp.h:165 msgid "PostScript Level 1" msgstr "" -#: src/main/xmli18n-tmp.h:146 +#: src/main/xmli18n-tmp.h:166 msgid "PostScript Level 2" msgstr "" -#: src/main/xmli18n-tmp.h:147 +#: src/main/xmli18n-tmp.h:167 msgid "Canon BJ-30" msgstr "" -#: src/main/xmli18n-tmp.h:148 +#: src/main/xmli18n-tmp.h:168 msgid "Canon BJC-50" msgstr "" -#: src/main/xmli18n-tmp.h:149 +#: src/main/xmli18n-tmp.h:169 msgid "Canon BJC-55" msgstr "" -#: src/main/xmli18n-tmp.h:150 +#: src/main/xmli18n-tmp.h:170 msgid "Canon BJC-80" msgstr "" -#: src/main/xmli18n-tmp.h:151 +#: src/main/xmli18n-tmp.h:171 msgid "Canon BJC-85" msgstr "" -#: src/main/xmli18n-tmp.h:152 +#: src/main/xmli18n-tmp.h:172 msgid "Canon BJC-210" msgstr "" -#: src/main/xmli18n-tmp.h:153 +#: src/main/xmli18n-tmp.h:173 msgid "Canon BJC-240" msgstr "" -#: src/main/xmli18n-tmp.h:154 +#: src/main/xmli18n-tmp.h:174 msgid "Canon BJC-250" msgstr "" -#: src/main/xmli18n-tmp.h:155 +#: src/main/xmli18n-tmp.h:175 msgid "Canon BJC-1000" msgstr "" -#: src/main/xmli18n-tmp.h:156 +#: src/main/xmli18n-tmp.h:176 msgid "Canon BJC-2000" msgstr "" -#: src/main/xmli18n-tmp.h:157 +#: src/main/xmli18n-tmp.h:177 msgid "Canon BJC-2010" msgstr "" -#: src/main/xmli18n-tmp.h:158 +#: src/main/xmli18n-tmp.h:178 msgid "Canon BJC-2100" msgstr "" -#: src/main/xmli18n-tmp.h:159 +#: src/main/xmli18n-tmp.h:179 msgid "Canon BJC-2110" msgstr "" -#: src/main/xmli18n-tmp.h:160 +#: src/main/xmli18n-tmp.h:180 msgid "Canon BJC-3000" msgstr "" -#: src/main/xmli18n-tmp.h:161 +#: src/main/xmli18n-tmp.h:181 msgid "Canon BJC-4000" msgstr "" -#: src/main/xmli18n-tmp.h:162 +#: src/main/xmli18n-tmp.h:182 msgid "Canon BJC-4300" msgstr "" -#: src/main/xmli18n-tmp.h:163 +#: src/main/xmli18n-tmp.h:183 msgid "Canon BJC-4400" msgstr "" -#: src/main/xmli18n-tmp.h:164 +#: src/main/xmli18n-tmp.h:184 msgid "Canon BJC-5100" msgstr "" -#: src/main/xmli18n-tmp.h:165 +#: src/main/xmli18n-tmp.h:185 msgid "Canon BJC-5500" msgstr "" -#: src/main/xmli18n-tmp.h:166 +#: src/main/xmli18n-tmp.h:186 msgid "Canon BJC-6000" msgstr "" -#: src/main/xmli18n-tmp.h:167 +#: src/main/xmli18n-tmp.h:187 msgid "Canon BJC-6100" msgstr "" -#: src/main/xmli18n-tmp.h:168 +#: src/main/xmli18n-tmp.h:188 msgid "Canon BJC-6200" msgstr "" -#: src/main/xmli18n-tmp.h:169 +#: src/main/xmli18n-tmp.h:189 msgid "Canon BJC-6500" msgstr "" -#: src/main/xmli18n-tmp.h:170 +#: src/main/xmli18n-tmp.h:190 msgid "Canon BJC-7000" msgstr "" -#: src/main/xmli18n-tmp.h:171 +#: src/main/xmli18n-tmp.h:191 msgid "Canon BJC-7100" msgstr "" -#: src/main/xmli18n-tmp.h:172 +#: src/main/xmli18n-tmp.h:192 msgid "Canon BJC-8200" msgstr "" -#: src/main/xmli18n-tmp.h:173 +#: src/main/xmli18n-tmp.h:193 msgid "Canon BJC-8500" msgstr "" -#: src/main/xmli18n-tmp.h:174 +#: src/main/xmli18n-tmp.h:194 msgid "Canon S100" msgstr "" -#: src/main/xmli18n-tmp.h:175 +#: src/main/xmli18n-tmp.h:195 msgid "Canon S200" msgstr "" -#: src/main/xmli18n-tmp.h:176 +#: src/main/xmli18n-tmp.h:196 msgid "Canon S300" msgstr "" -#: src/main/xmli18n-tmp.h:177 +#: src/main/xmli18n-tmp.h:197 msgid "Canon S400" msgstr "" -#: src/main/xmli18n-tmp.h:178 +#: src/main/xmli18n-tmp.h:198 msgid "Canon S450" msgstr "" -#: src/main/xmli18n-tmp.h:179 +#: src/main/xmli18n-tmp.h:199 msgid "Canon S500" msgstr "" -#: src/main/xmli18n-tmp.h:180 +#: src/main/xmli18n-tmp.h:200 msgid "Canon S600" msgstr "" -#: src/main/xmli18n-tmp.h:181 +#: src/main/xmli18n-tmp.h:201 msgid "Canon S630" msgstr "" -#: src/main/xmli18n-tmp.h:182 +#: src/main/xmli18n-tmp.h:202 msgid "Canon S800" msgstr "" -#: src/main/xmli18n-tmp.h:183 +#: src/main/xmli18n-tmp.h:203 msgid "Canon S4500" msgstr "" -#: src/main/xmli18n-tmp.h:184 +#: src/main/xmli18n-tmp.h:204 msgid "Canon PIXMA iP2000" msgstr "" -#: src/main/xmli18n-tmp.h:185 +#: src/main/xmli18n-tmp.h:205 msgid "Canon PIXMA iP3000" msgstr "" -#: src/main/xmli18n-tmp.h:186 +#: src/main/xmli18n-tmp.h:206 msgid "Canon PIXMA iP3100" msgstr "" -#: src/main/xmli18n-tmp.h:187 +#: src/main/xmli18n-tmp.h:207 msgid "Canon PIXMA iP4000" msgstr "" -#: src/main/xmli18n-tmp.h:188 +#: src/main/xmli18n-tmp.h:208 msgid "Canon PIXMA iP4100" msgstr "" -#: src/main/xmli18n-tmp.h:189 +#: src/main/xmli18n-tmp.h:209 msgid "Canon PIXMA iP4200" msgstr "" -#: src/main/xmli18n-tmp.h:190 -#, fuzzy +#: src/main/xmli18n-tmp.h:210 msgid "Canon PIXMA iP4300" -msgstr "Stylus C60" +msgstr "" -#: src/main/xmli18n-tmp.h:191 -#, fuzzy +#: src/main/xmli18n-tmp.h:211 msgid "Canon PIXMA iP4500" -msgstr "Stylus C60" +msgstr "" -#: src/main/xmli18n-tmp.h:192 -#, fuzzy +#: src/main/xmli18n-tmp.h:212 msgid "Canon PIXMA iP5000" -msgstr "Stylus C60" +msgstr "" -#: src/main/xmli18n-tmp.h:193 +#: src/main/xmli18n-tmp.h:213 msgid "Canon PIXMA iP5200" msgstr "" -#: src/main/xmli18n-tmp.h:194 -#, fuzzy +#: src/main/xmli18n-tmp.h:214 msgid "Canon PIXMA iP5300" -msgstr "Stylus C60" +msgstr "" -#: src/main/xmli18n-tmp.h:195 -#, fuzzy +#: src/main/xmli18n-tmp.h:215 +msgid "Canon PIXMA iP6000D" +msgstr "" + +#: src/main/xmli18n-tmp.h:216 msgid "Canon PIXMA iP6700" -msgstr "Stylus C60" +msgstr "" -#: src/main/xmli18n-tmp.h:196 -#, fuzzy +#: src/main/xmli18n-tmp.h:217 msgid "Canon PIXMA iP8500" -msgstr "Stylus C60" +msgstr "" -#: src/main/xmli18n-tmp.h:197 -#, fuzzy +#: src/main/xmli18n-tmp.h:218 msgid "Canon PIXMA iX5000" -msgstr "Stylus C60" +msgstr "" -#: src/main/xmli18n-tmp.h:198 -#, fuzzy +#: src/main/xmli18n-tmp.h:219 msgid "Canon PIXMA Pro9500" -msgstr "Stylus C60" +msgstr "" -#: src/main/xmli18n-tmp.h:199 -#, fuzzy +#: src/main/xmli18n-tmp.h:220 msgid "Canon PIXMA MP150" -msgstr "Stylus C60" +msgstr "" -#: src/main/xmli18n-tmp.h:200 -#, fuzzy +#: src/main/xmli18n-tmp.h:221 msgid "Canon PIXMA MP170" -msgstr "Stylus C60" +msgstr "" -#: src/main/xmli18n-tmp.h:201 -#, fuzzy +#: src/main/xmli18n-tmp.h:222 msgid "Canon PIXMA MP180" -msgstr "Stylus C60" +msgstr "" -#: src/main/xmli18n-tmp.h:202 -#, fuzzy +#: src/main/xmli18n-tmp.h:223 msgid "Canon PIXMA MP500" -msgstr "Stylus C60" +msgstr "" -#: src/main/xmli18n-tmp.h:203 -#, fuzzy +#: src/main/xmli18n-tmp.h:224 +msgid "Canon PIXMA MP520" +msgstr "" + +#: src/main/xmli18n-tmp.h:225 msgid "Canon PIXMA MP610" -msgstr "Stylus C60" +msgstr "" -#: src/main/xmli18n-tmp.h:204 -#, fuzzy +#: src/main/xmli18n-tmp.h:226 msgid "Canon PIXMA MP700" -msgstr "Stylus C60" +msgstr "" -#: src/main/xmli18n-tmp.h:205 -#, fuzzy +#: src/main/xmli18n-tmp.h:227 msgid "Canon PIXMA MP710" -msgstr "Stylus C60" +msgstr "" -#: src/main/xmli18n-tmp.h:206 -#, fuzzy +#: src/main/xmli18n-tmp.h:228 msgid "Canon PIXMA MP730" -msgstr "Stylus C60" +msgstr "" -#: src/main/xmli18n-tmp.h:207 -#, fuzzy +#: src/main/xmli18n-tmp.h:229 msgid "Canon PIXMA MP740" -msgstr "Stylus C60" +msgstr "" -#: src/main/xmli18n-tmp.h:208 -#, fuzzy +#: src/main/xmli18n-tmp.h:230 msgid "Canon PIXMA MP750" -msgstr "Stylus C60" +msgstr "" -#: src/main/xmli18n-tmp.h:209 -#, fuzzy +#: src/main/xmli18n-tmp.h:231 msgid "Canon PIXMA MP760" -msgstr "Stylus C60" +msgstr "" -#: src/main/xmli18n-tmp.h:210 -#, fuzzy +#: src/main/xmli18n-tmp.h:232 msgid "Canon PIXMA MP770" -msgstr "Stylus C60" +msgstr "" -#: src/main/xmli18n-tmp.h:211 -#, fuzzy +#: src/main/xmli18n-tmp.h:233 msgid "Canon PIXMA MP780" -msgstr "Stylus C60" +msgstr "" -#: src/main/xmli18n-tmp.h:212 -#, fuzzy +#: src/main/xmli18n-tmp.h:234 msgid "Canon PIXMA MP790" -msgstr "Stylus C60" +msgstr "" -#: src/main/xmli18n-tmp.h:213 -#, fuzzy +#: src/main/xmli18n-tmp.h:235 msgid "Canon PIXMA MP830" -msgstr "Stylus C60" +msgstr "" -#: src/main/xmli18n-tmp.h:214 +#: src/main/xmli18n-tmp.h:236 msgid "Canon PIXUS iP3100" msgstr "" -#: src/main/xmli18n-tmp.h:215 +#: src/main/xmli18n-tmp.h:237 msgid "Canon PIXUS iP4100" msgstr "" -#: src/main/xmli18n-tmp.h:216 -#, fuzzy +#: src/main/xmli18n-tmp.h:238 msgid "Canon i80" -msgstr "Stylus C60" +msgstr "" -#: src/main/xmli18n-tmp.h:217 +#: src/main/xmli18n-tmp.h:239 msgid "Canon i560" msgstr "" -#: src/main/xmli18n-tmp.h:218 +#: src/main/xmli18n-tmp.h:240 msgid "Canon i850" msgstr "" -#: src/main/xmli18n-tmp.h:219 +#: src/main/xmli18n-tmp.h:241 msgid "Canon i860" msgstr "" -#: src/main/xmli18n-tmp.h:220 +#: src/main/xmli18n-tmp.h:242 msgid "Canon i865" msgstr "" -#: src/main/xmli18n-tmp.h:221 +#: src/main/xmli18n-tmp.h:243 #, fuzzy msgid "Epson Stylus C20" -msgstr "Stylus C20ux" +msgstr "Stylus C20sx" -#: src/main/xmli18n-tmp.h:222 +#: src/main/xmli18n-tmp.h:244 #, fuzzy msgid "Epson Stylus C20SX" msgstr "Stylus C20ux" -#: src/main/xmli18n-tmp.h:223 +#: src/main/xmli18n-tmp.h:245 #, fuzzy msgid "Epson Stylus C20UX" msgstr "Stylus C20ux" -#: src/main/xmli18n-tmp.h:224 +#: src/main/xmli18n-tmp.h:246 #, fuzzy msgid "Epson Stylus C40" -msgstr "Stylus C40ux" +msgstr "Stylus C40sx" -#: src/main/xmli18n-tmp.h:225 +#: src/main/xmli18n-tmp.h:247 #, fuzzy msgid "Epson Stylus C40SX" msgstr "Stylus C40ux" -#: src/main/xmli18n-tmp.h:226 +#: src/main/xmli18n-tmp.h:248 #, fuzzy msgid "Epson Stylus C40UX" msgstr "Stylus C40ux" -#: src/main/xmli18n-tmp.h:227 +#: src/main/xmli18n-tmp.h:249 #, fuzzy msgid "Epson Stylus C41" -msgstr "Stylus C40ux" +msgstr "Stylus C40sx" -#: src/main/xmli18n-tmp.h:228 +#: src/main/xmli18n-tmp.h:250 #, fuzzy msgid "Epson Stylus C41SX" msgstr "Stylus C40ux" -#: src/main/xmli18n-tmp.h:229 +#: src/main/xmli18n-tmp.h:251 #, fuzzy msgid "Epson Stylus C41UX" msgstr "Stylus C40ux" -#: src/main/xmli18n-tmp.h:230 +#: src/main/xmli18n-tmp.h:252 #, fuzzy msgid "Epson Stylus C42" -msgstr "Stylus C40ux" +msgstr "Stylus C40sx" -#: src/main/xmli18n-tmp.h:231 +#: src/main/xmli18n-tmp.h:253 #, fuzzy msgid "Epson Stylus C42SX" msgstr "Stylus C40ux" -#: src/main/xmli18n-tmp.h:232 +#: src/main/xmli18n-tmp.h:254 #, fuzzy msgid "Epson Stylus C42UX" msgstr "Stylus C40ux" -#: src/main/xmli18n-tmp.h:233 +#: src/main/xmli18n-tmp.h:255 #, fuzzy msgid "Epson Stylus C43" msgstr "Stylus C40ux" -#: src/main/xmli18n-tmp.h:234 +#: src/main/xmli18n-tmp.h:256 #, fuzzy msgid "Epson Stylus C43SX" msgstr "Stylus C40ux" -#: src/main/xmli18n-tmp.h:235 +#: src/main/xmli18n-tmp.h:257 #, fuzzy msgid "Epson Stylus C43UX" msgstr "Stylus C40ux" -#: src/main/xmli18n-tmp.h:236 +#: src/main/xmli18n-tmp.h:258 #, fuzzy msgid "Epson Stylus C44" msgstr "Stylus C40ux" -#: src/main/xmli18n-tmp.h:237 +#: src/main/xmli18n-tmp.h:259 #, fuzzy msgid "Epson Stylus C44SX" msgstr "Stylus C40ux" -#: src/main/xmli18n-tmp.h:238 +#: src/main/xmli18n-tmp.h:260 #, fuzzy msgid "Epson Stylus C44UX" msgstr "Stylus C40ux" -#: src/main/xmli18n-tmp.h:239 +#: src/main/xmli18n-tmp.h:261 #, fuzzy msgid "Epson Stylus C45" msgstr "Stylus C60" -#: src/main/xmli18n-tmp.h:240 +#: src/main/xmli18n-tmp.h:262 #, fuzzy msgid "Epson Stylus C46" msgstr "Stylus C60" -#: src/main/xmli18n-tmp.h:241 +#: src/main/xmli18n-tmp.h:263 #, fuzzy msgid "Epson Stylus C48" -msgstr "Stylus C60" +msgstr "Stylus C80" -#: src/main/xmli18n-tmp.h:242 +#: src/main/xmli18n-tmp.h:264 #, fuzzy msgid "Epson Stylus C50" msgstr "Stylus C60" -#: src/main/xmli18n-tmp.h:243 +#: src/main/xmli18n-tmp.h:265 #, fuzzy msgid "Epson Stylus C60" msgstr "Stylus C60" -#: src/main/xmli18n-tmp.h:244 +#: src/main/xmli18n-tmp.h:266 #, fuzzy msgid "Epson Stylus C61" msgstr "Stylus C60" -#: src/main/xmli18n-tmp.h:245 +#: src/main/xmli18n-tmp.h:267 #, fuzzy msgid "Epson Stylus C62" msgstr "Stylus C60" -#: src/main/xmli18n-tmp.h:246 +#: src/main/xmli18n-tmp.h:268 #, fuzzy msgid "Epson Stylus C63" msgstr "Stylus C60" -#: src/main/xmli18n-tmp.h:247 +#: src/main/xmli18n-tmp.h:269 #, fuzzy msgid "Epson Stylus C64" msgstr "Stylus C60" -#: src/main/xmli18n-tmp.h:248 +#: src/main/xmli18n-tmp.h:270 #, fuzzy msgid "Epson Stylus C65" msgstr "Stylus C60" -#: src/main/xmli18n-tmp.h:249 +#: src/main/xmli18n-tmp.h:271 #, fuzzy msgid "Epson Stylus C66" msgstr "Stylus C60" -#: src/main/xmli18n-tmp.h:250 +#: src/main/xmli18n-tmp.h:272 #, fuzzy msgid "Epson Stylus C68" msgstr "Stylus C60" -#: src/main/xmli18n-tmp.h:251 +#: src/main/xmli18n-tmp.h:273 #, fuzzy msgid "Epson Stylus C70" msgstr "Stylus C70" -#: src/main/xmli18n-tmp.h:252 +#: src/main/xmli18n-tmp.h:274 #, fuzzy msgid "Epson Stylus C79" msgstr "Stylus C70" -#: src/main/xmli18n-tmp.h:253 +#: src/main/xmli18n-tmp.h:275 #, fuzzy msgid "Epson Stylus C80" msgstr "Stylus C80" -#: src/main/xmli18n-tmp.h:254 +#: src/main/xmli18n-tmp.h:276 #, fuzzy msgid "Epson Stylus C82" msgstr "Stylus C80" -#: src/main/xmli18n-tmp.h:255 +#: src/main/xmli18n-tmp.h:277 #, fuzzy msgid "Epson Stylus C83" msgstr "Stylus C80" -#: src/main/xmli18n-tmp.h:256 +#: src/main/xmli18n-tmp.h:278 #, fuzzy msgid "Epson Stylus C84" msgstr "Stylus C80" -#: src/main/xmli18n-tmp.h:257 +#: src/main/xmli18n-tmp.h:279 #, fuzzy msgid "Epson Stylus C85" msgstr "Stylus C60" -#: src/main/xmli18n-tmp.h:258 +#: src/main/xmli18n-tmp.h:280 #, fuzzy msgid "Epson Stylus C86" msgstr "Stylus C60" -#: src/main/xmli18n-tmp.h:259 +#: src/main/xmli18n-tmp.h:281 #, fuzzy msgid "Epson Stylus C87" -msgstr "Stylus C60" +msgstr "Stylus C70" -#: src/main/xmli18n-tmp.h:260 +#: src/main/xmli18n-tmp.h:282 #, fuzzy msgid "Epson Stylus C88" msgstr "Stylus C80" -#: src/main/xmli18n-tmp.h:261 +#: src/main/xmli18n-tmp.h:283 #, fuzzy msgid "Epson Stylus C110" -msgstr "Stylus C20ux" +msgstr "Stylus C60" -#: src/main/xmli18n-tmp.h:262 +#: src/main/xmli18n-tmp.h:284 #, fuzzy msgid "Epson Stylus C120" -msgstr "Stylus C20ux" +msgstr "Stylus C20sx" -#: src/main/xmli18n-tmp.h:263 +#: src/main/xmli18n-tmp.h:285 #, fuzzy msgid "Epson Stylus Color" msgstr "Stylus Color" -#: src/main/xmli18n-tmp.h:264 +#: src/main/xmli18n-tmp.h:286 #, fuzzy msgid "Epson Stylus Color I" msgstr "Stylus Color" -#: src/main/xmli18n-tmp.h:265 +#: src/main/xmli18n-tmp.h:287 #, fuzzy msgid "Epson Stylus Color II" msgstr "Stylus Color" -#: src/main/xmli18n-tmp.h:266 +#: src/main/xmli18n-tmp.h:288 #, fuzzy msgid "Epson Stylus Color IIs" msgstr "Stylus Color" -#: src/main/xmli18n-tmp.h:267 +#: src/main/xmli18n-tmp.h:289 #, fuzzy msgid "Epson Stylus Color PRO" msgstr "Stylus Color Pro" -#: src/main/xmli18n-tmp.h:268 +#: src/main/xmli18n-tmp.h:290 #, fuzzy msgid "Epson Stylus Pro XL" msgstr "Stylus Color Pro XL" -#: src/main/xmli18n-tmp.h:269 +#: src/main/xmli18n-tmp.h:291 #, fuzzy msgid "Epson Stylus Color 400" msgstr "Stylus Color 400" -#: src/main/xmli18n-tmp.h:270 +#: src/main/xmli18n-tmp.h:292 #, fuzzy msgid "Epson Stylus Color 440" msgstr "Stylus Color 440" -#: src/main/xmli18n-tmp.h:271 +#: src/main/xmli18n-tmp.h:293 #, fuzzy msgid "Epson Stylus Color 460" msgstr "Stylus Color 460" -#: src/main/xmli18n-tmp.h:272 +#: src/main/xmli18n-tmp.h:294 #, fuzzy msgid "Epson Stylus Color 480" msgstr "Stylus Color 480" -#: src/main/xmli18n-tmp.h:273 +#: src/main/xmli18n-tmp.h:295 #, fuzzy msgid "Epson Stylus Color 500" msgstr "Stylus Color 500" -#: src/main/xmli18n-tmp.h:274 +#: src/main/xmli18n-tmp.h:296 #, fuzzy msgid "Epson Stylus Color 580" msgstr "Stylus Color 580" -#: src/main/xmli18n-tmp.h:275 +#: src/main/xmli18n-tmp.h:297 #, fuzzy msgid "Epson Stylus Color 600" msgstr "Stylus Color 600" -#: src/main/xmli18n-tmp.h:276 +#: src/main/xmli18n-tmp.h:298 #, fuzzy msgid "Epson Stylus Color 640" msgstr "Stylus Color 640" -#: src/main/xmli18n-tmp.h:277 +#: src/main/xmli18n-tmp.h:299 #, fuzzy msgid "Epson Stylus Color 660" msgstr "Stylus Color 660" -#: src/main/xmli18n-tmp.h:278 +#: src/main/xmli18n-tmp.h:300 #, fuzzy msgid "Epson Stylus Color 670" msgstr "Stylus Color 670" -#: src/main/xmli18n-tmp.h:279 +#: src/main/xmli18n-tmp.h:301 #, fuzzy msgid "Epson Stylus Color 680" msgstr "Stylus Color 680" -#: src/main/xmli18n-tmp.h:280 +#: src/main/xmli18n-tmp.h:302 #, fuzzy msgid "Epson Stylus Color 740" msgstr "Stylus Color 740" -#: src/main/xmli18n-tmp.h:281 +#: src/main/xmli18n-tmp.h:303 #, fuzzy msgid "Epson Stylus Color 760" msgstr "Stylus Color 760" -#: src/main/xmli18n-tmp.h:282 +#: src/main/xmli18n-tmp.h:304 #, fuzzy msgid "Epson Stylus Color 777" msgstr "Stylus Color 777" -#: src/main/xmli18n-tmp.h:283 +#: src/main/xmli18n-tmp.h:305 #, fuzzy msgid "Epson Stylus Color 800" msgstr "Stylus Color 800" -#: src/main/xmli18n-tmp.h:284 +#: src/main/xmli18n-tmp.h:306 #, fuzzy msgid "Epson Stylus Color 850" msgstr "Stylus Color 850" -#: src/main/xmli18n-tmp.h:285 +#: src/main/xmli18n-tmp.h:307 #, fuzzy msgid "Epson Stylus Color 860" msgstr "Stylus Color 860" -#: src/main/xmli18n-tmp.h:286 +#: src/main/xmli18n-tmp.h:308 #, fuzzy msgid "Epson Stylus Color 880" msgstr "Stylus Color 880" -#: src/main/xmli18n-tmp.h:287 +#: src/main/xmli18n-tmp.h:309 #, fuzzy msgid "Epson Stylus Color 8 3" msgstr "Stylus Color 83" -#: src/main/xmli18n-tmp.h:288 +#: src/main/xmli18n-tmp.h:310 #, fuzzy msgid "Epson Stylus Color 900" msgstr "Stylus Color 900" -#: src/main/xmli18n-tmp.h:289 +#: src/main/xmli18n-tmp.h:311 #, fuzzy msgid "Epson Stylus Color 980" msgstr "Stylus Color 980" -#: src/main/xmli18n-tmp.h:290 +#: src/main/xmli18n-tmp.h:312 #, fuzzy msgid "Epson Stylus Color 1160" msgstr "Stylus Color 1160" -#: src/main/xmli18n-tmp.h:291 +#: src/main/xmli18n-tmp.h:313 #, fuzzy msgid "Epson Stylus Color 1500" msgstr "Stylus Color 1500" -#: src/main/xmli18n-tmp.h:292 +#: src/main/xmli18n-tmp.h:314 #, fuzzy msgid "Epson Stylus Color 1520" msgstr "Stylus Color 1520" -#: src/main/xmli18n-tmp.h:293 +#: src/main/xmli18n-tmp.h:315 #, fuzzy msgid "Epson Stylus Color 3000" msgstr "Stylus Color 3000" -#: src/main/xmli18n-tmp.h:294 +#: src/main/xmli18n-tmp.h:316 #, fuzzy msgid "Epson Stylus Photo" msgstr "Slashdot" -#: src/main/xmli18n-tmp.h:295 +#: src/main/xmli18n-tmp.h:317 #, fuzzy msgid "Epson Stylus Photo 700" msgstr "Stylus Photo 700" -#: src/main/xmli18n-tmp.h:296 +#: src/main/xmli18n-tmp.h:318 #, fuzzy msgid "Epson Stylus Photo EX" msgstr "Stylus Photo EX" -#: src/main/xmli18n-tmp.h:297 +#: src/main/xmli18n-tmp.h:319 #, fuzzy msgid "Epson Stylus Photo EX3" msgstr "Stylus Photo EX" -#: src/main/xmli18n-tmp.h:298 +#: src/main/xmli18n-tmp.h:320 #, fuzzy msgid "Epson Stylus Photo 720" msgstr "Stylus Photo 720" -#: src/main/xmli18n-tmp.h:299 +#: src/main/xmli18n-tmp.h:321 #, fuzzy msgid "Epson Stylus Photo 750" msgstr "Stylus Photo 750" -#: src/main/xmli18n-tmp.h:300 +#: src/main/xmli18n-tmp.h:322 #, fuzzy msgid "Epson Stylus Photo 780" msgstr "Stylus Photo 780" -#: src/main/xmli18n-tmp.h:301 +#: src/main/xmli18n-tmp.h:323 #, fuzzy msgid "Epson Stylus Photo 785" msgstr "Stylus Photo 785" -#: src/main/xmli18n-tmp.h:302 +#: src/main/xmli18n-tmp.h:324 #, fuzzy msgid "Epson Stylus Photo 790" msgstr "Stylus Photo 790" -#: src/main/xmli18n-tmp.h:303 +#: src/main/xmli18n-tmp.h:325 #, fuzzy msgid "Epson Stylus Photo 810" msgstr "Stylus Photo 810" -#: src/main/xmli18n-tmp.h:304 +#: src/main/xmli18n-tmp.h:326 #, fuzzy msgid "Epson Stylus Photo 820" msgstr "Stylus Photo 820" -#: src/main/xmli18n-tmp.h:305 +#: src/main/xmli18n-tmp.h:327 #, fuzzy msgid "Epson Stylus Photo 825" msgstr "Stylus Photo 785" -#: src/main/xmli18n-tmp.h:306 +#: src/main/xmli18n-tmp.h:328 #, fuzzy msgid "Epson Stylus Photo 830" msgstr "Stylus Photo 780" -#: src/main/xmli18n-tmp.h:307 +#: src/main/xmli18n-tmp.h:329 #, fuzzy msgid "Epson Stylus Photo 830U" msgstr "Stylus Photo 780" -#: src/main/xmli18n-tmp.h:308 +#: src/main/xmli18n-tmp.h:330 #, fuzzy msgid "Epson Stylus Photo 870" msgstr "Stylus Photo 870" -#: src/main/xmli18n-tmp.h:309 +#: src/main/xmli18n-tmp.h:331 #, fuzzy msgid "Epson Stylus Photo 875" msgstr "Stylus Photo 875" -#: src/main/xmli18n-tmp.h:310 +#: src/main/xmli18n-tmp.h:332 #, fuzzy msgid "Epson Stylus Photo 890" msgstr "Stylus Photo 890" -#: src/main/xmli18n-tmp.h:311 +#: src/main/xmli18n-tmp.h:333 #, fuzzy msgid "Epson Stylus Photo 895" msgstr "Stylus Photo 895" -#: src/main/xmli18n-tmp.h:312 +#: src/main/xmli18n-tmp.h:334 #, fuzzy msgid "Epson Stylus Photo 900" msgstr "Stylus Photo 700" -#: src/main/xmli18n-tmp.h:313 +#: src/main/xmli18n-tmp.h:335 #, fuzzy msgid "Epson Stylus Photo 915" msgstr "Stylus Photo 895" -#: src/main/xmli18n-tmp.h:314 +#: src/main/xmli18n-tmp.h:336 #, fuzzy msgid "Epson Stylus Photo 925" msgstr "Stylus Photo 895" -#: src/main/xmli18n-tmp.h:315 +#: src/main/xmli18n-tmp.h:337 #, fuzzy msgid "Epson Stylus Photo 935" msgstr "Stylus Photo 895" -#: src/main/xmli18n-tmp.h:316 +#: src/main/xmli18n-tmp.h:338 #, fuzzy msgid "Epson Stylus Photo 950" msgstr "Stylus Photo 750" -#: src/main/xmli18n-tmp.h:317 +#: src/main/xmli18n-tmp.h:339 #, fuzzy msgid "Epson Stylus Photo 960" msgstr "Stylus Photo 790" -#: src/main/xmli18n-tmp.h:318 +#: src/main/xmli18n-tmp.h:340 #, fuzzy msgid "Epson Stylus Photo 1200" msgstr "Stylus Photo 1200" -#: src/main/xmli18n-tmp.h:319 +#: src/main/xmli18n-tmp.h:341 #, fuzzy msgid "Epson Stylus Photo 1270" msgstr "Stylus Photo 1270" -#: src/main/xmli18n-tmp.h:320 +#: src/main/xmli18n-tmp.h:342 #, fuzzy msgid "Epson Stylus Photo 1280" msgstr "Stylus Photo 1280" -#: src/main/xmli18n-tmp.h:321 +#: src/main/xmli18n-tmp.h:343 #, fuzzy msgid "Epson Stylus Photo 1290" msgstr "Stylus Photo 1290" -#: src/main/xmli18n-tmp.h:322 +#: src/main/xmli18n-tmp.h:344 #, fuzzy msgid "Epson Stylus Photo 1400" msgstr "Stylus Photo 1200" -#: src/main/xmli18n-tmp.h:323 +#: src/main/xmli18n-tmp.h:345 #, fuzzy msgid "Epson Stylus Photo 1410" msgstr "Stylus Photo 810" -#: src/main/xmli18n-tmp.h:324 +#: src/main/xmli18n-tmp.h:346 #, fuzzy msgid "Epson Stylus Photo 2000P" msgstr "Stylus Photo 2000P" -#: src/main/xmli18n-tmp.h:325 +#: src/main/xmli18n-tmp.h:347 #, fuzzy msgid "Epson Stylus Photo 2100" msgstr "Stylus Photo 1200" -#: src/main/xmli18n-tmp.h:326 +#: src/main/xmli18n-tmp.h:348 #, fuzzy msgid "Epson Stylus Photo 2200" msgstr "Stylus Photo 1200" -#: src/main/xmli18n-tmp.h:327 +#: src/main/xmli18n-tmp.h:349 #, fuzzy msgid "Epson Stylus Photo R200" msgstr "Stylus Photo 1200" -#: src/main/xmli18n-tmp.h:328 +#: src/main/xmli18n-tmp.h:350 #, fuzzy msgid "Epson Stylus Photo R210" msgstr "Stylus Photo 1200" -#: src/main/xmli18n-tmp.h:329 +#: src/main/xmli18n-tmp.h:351 #, fuzzy msgid "Epson Stylus Photo R220" msgstr "Stylus Photo 1200" -#: src/main/xmli18n-tmp.h:330 +#: src/main/xmli18n-tmp.h:352 #, fuzzy msgid "Epson Stylus Photo R230" msgstr "Stylus Photo 1200" -#: src/main/xmli18n-tmp.h:331 +#: src/main/xmli18n-tmp.h:353 #, fuzzy msgid "Epson Stylus Photo R240" msgstr "Stylus Photo 1200" -#: src/main/xmli18n-tmp.h:332 +#: src/main/xmli18n-tmp.h:354 #, fuzzy msgid "Epson Stylus Photo R245" -msgstr "Stylus Photo 1200" +msgstr "Stylus Photo 895" -#: src/main/xmli18n-tmp.h:333 +#: src/main/xmli18n-tmp.h:355 #, fuzzy msgid "Epson Stylus Photo R260" msgstr "Stylus Photo 1200" -#: src/main/xmli18n-tmp.h:334 +#: src/main/xmli18n-tmp.h:356 #, fuzzy msgid "Epson Stylus Photo R265" -msgstr "Stylus Photo 1200" +msgstr "Stylus Photo 895" -#: src/main/xmli18n-tmp.h:335 +#: src/main/xmli18n-tmp.h:357 #, fuzzy msgid "Epson Stylus Photo R270" msgstr "Stylus Photo 1270" -#: src/main/xmli18n-tmp.h:336 +#: src/main/xmli18n-tmp.h:358 +#, fuzzy +msgid "Epson Stylus Photo R280" +msgstr "Stylus Photo 1280" + +#: src/main/xmli18n-tmp.h:359 +#, fuzzy +msgid "Epson Stylus Photo R285" +msgstr "Stylus Photo 785" + +#: src/main/xmli18n-tmp.h:360 #, fuzzy msgid "Epson Stylus Photo R300" msgstr "Stylus Photo 700" -#: src/main/xmli18n-tmp.h:337 +#: src/main/xmli18n-tmp.h:361 #, fuzzy msgid "Epson Stylus Photo R310" msgstr "Stylus Photo 700" -#: src/main/xmli18n-tmp.h:338 +#: src/main/xmli18n-tmp.h:362 #, fuzzy msgid "Epson Stylus Photo R320" msgstr "Stylus Photo 1200" -#: src/main/xmli18n-tmp.h:339 +#: src/main/xmli18n-tmp.h:363 #, fuzzy msgid "Epson Stylus Photo R340" msgstr "Stylus Photo 700" -#: src/main/xmli18n-tmp.h:340 +#: src/main/xmli18n-tmp.h:364 #, fuzzy msgid "Epson Stylus Photo R350" msgstr "Stylus Photo 700" -#: src/main/xmli18n-tmp.h:341 +#: src/main/xmli18n-tmp.h:365 #, fuzzy msgid "Epson Stylus Photo R360" msgstr "Stylus Photo 700" -#: src/main/xmli18n-tmp.h:342 +#: src/main/xmli18n-tmp.h:366 #, fuzzy msgid "Epson Stylus Photo R380" msgstr "Stylus Photo 700" -#: src/main/xmli18n-tmp.h:343 +#: src/main/xmli18n-tmp.h:367 #, fuzzy msgid "Epson Stylus Photo R390" msgstr "Stylus Photo 700" -#: src/main/xmli18n-tmp.h:344 +#: src/main/xmli18n-tmp.h:368 #, fuzzy msgid "Epson Stylus Photo RX400" msgstr "Stylus Photo 700" -#: src/main/xmli18n-tmp.h:345 +#: src/main/xmli18n-tmp.h:369 #, fuzzy msgid "Epson Stylus Photo RX420" msgstr "Stylus Photo 1200" -#: src/main/xmli18n-tmp.h:346 +#: src/main/xmli18n-tmp.h:370 #, fuzzy msgid "Epson Stylus Photo RX425" msgstr "Stylus Photo 1200" -#: src/main/xmli18n-tmp.h:347 +#: src/main/xmli18n-tmp.h:371 #, fuzzy msgid "Epson Stylus Photo RX430" msgstr "Stylus Photo 700" -#: src/main/xmli18n-tmp.h:348 +#: src/main/xmli18n-tmp.h:372 #, fuzzy msgid "Epson Stylus Photo RX500" msgstr "Stylus Photo 700" -#: src/main/xmli18n-tmp.h:349 +#: src/main/xmli18n-tmp.h:373 #, fuzzy msgid "Epson Stylus Photo RX510" msgstr "Stylus Photo 700" -#: src/main/xmli18n-tmp.h:350 +#: src/main/xmli18n-tmp.h:374 #, fuzzy msgid "Epson Stylus Photo RX560" msgstr "Stylus Photo 700" -#: src/main/xmli18n-tmp.h:351 +#: src/main/xmli18n-tmp.h:375 #, fuzzy msgid "Epson Stylus Photo RX580" msgstr "Stylus Photo 700" -#: src/main/xmli18n-tmp.h:352 +#: src/main/xmli18n-tmp.h:376 +#, fuzzy +msgid "Epson Stylus Photo RX585" +msgstr "Stylus Photo 700" + +#: src/main/xmli18n-tmp.h:377 #, fuzzy msgid "Epson Stylus Photo RX590" msgstr "Stylus Photo 700" -#: src/main/xmli18n-tmp.h:353 +#: src/main/xmli18n-tmp.h:378 #, fuzzy msgid "Epson Stylus Photo RX595" msgstr "Stylus Photo 700" -#: src/main/xmli18n-tmp.h:354 +#: src/main/xmli18n-tmp.h:379 #, fuzzy msgid "Epson Stylus Photo RX600" msgstr "Stylus Photo 700" -#: src/main/xmli18n-tmp.h:355 +#: src/main/xmli18n-tmp.h:380 #, fuzzy msgid "Epson Stylus Photo RX620" msgstr "Stylus Photo 700" -#: src/main/xmli18n-tmp.h:356 +#: src/main/xmli18n-tmp.h:381 #, fuzzy msgid "Epson Stylus Photo RX630" msgstr "Stylus Photo 700" -#: src/main/xmli18n-tmp.h:357 +#: src/main/xmli18n-tmp.h:382 #, fuzzy msgid "Epson Stylus Photo RX640" msgstr "Stylus Photo 700" -#: src/main/xmli18n-tmp.h:358 +#: src/main/xmli18n-tmp.h:383 +#, fuzzy +msgid "Epson Stylus Photo RX680" +msgstr "Stylus Photo 700" + +#: src/main/xmli18n-tmp.h:384 +#, fuzzy +msgid "Epson Stylus Photo RX685" +msgstr "Stylus Photo 700" + +#: src/main/xmli18n-tmp.h:385 #, fuzzy msgid "Epson Stylus Photo RX700" msgstr "Stylus Photo 700" -#: src/main/xmli18n-tmp.h:359 +#: src/main/xmli18n-tmp.h:386 #, fuzzy msgid "Epson Stylus Photo R800" msgstr "Stylus Photo 700" -#: src/main/xmli18n-tmp.h:360 +#: src/main/xmli18n-tmp.h:387 #, fuzzy msgid "Epson Stylus Photo R1800" msgstr "Stylus Photo 700" -#: src/main/xmli18n-tmp.h:361 +#: src/main/xmli18n-tmp.h:388 #, fuzzy msgid "Epson Stylus Photo R2400" msgstr "Stylus Photo 1200" -#: src/main/xmli18n-tmp.h:362 +#: src/main/xmli18n-tmp.h:389 #, fuzzy msgid "Epson Stylus Pro 5000" msgstr "Stylus Pro 5000" -#: src/main/xmli18n-tmp.h:363 +#: src/main/xmli18n-tmp.h:390 #, fuzzy msgid "Epson Stylus Pro 5500" msgstr "Stylus Pro 5500" -#: src/main/xmli18n-tmp.h:364 +#: src/main/xmli18n-tmp.h:391 #, fuzzy msgid "Epson Stylus Pro 7000" msgstr "Stylus Pro 7000" -#: src/main/xmli18n-tmp.h:365 +#: src/main/xmli18n-tmp.h:392 #, fuzzy msgid "Epson Stylus Pro 7500" msgstr "Stylus Pro 7500" -#: src/main/xmli18n-tmp.h:366 +#: src/main/xmli18n-tmp.h:393 #, fuzzy msgid "Epson Stylus Pro 7600" msgstr "Stylus Pro 7000" -#: src/main/xmli18n-tmp.h:367 +#: src/main/xmli18n-tmp.h:394 #, fuzzy msgid "Epson Stylus Pro 9000" msgstr "Stylus Pro 9000" -#: src/main/xmli18n-tmp.h:368 +#: src/main/xmli18n-tmp.h:395 #, fuzzy msgid "Epson Stylus Pro 9500" msgstr "Stylus Pro 9500" -#: src/main/xmli18n-tmp.h:369 +#: src/main/xmli18n-tmp.h:396 #, fuzzy msgid "Epson Stylus Pro 9600" msgstr "Stylus Pro 9000" -#: src/main/xmli18n-tmp.h:370 +#: src/main/xmli18n-tmp.h:397 #, fuzzy msgid "Epson Stylus Pro 10000" msgstr "Stylus Pro 10000" -#: src/main/xmli18n-tmp.h:371 +#: src/main/xmli18n-tmp.h:398 #, fuzzy msgid "Epson Stylus Scan 2000" msgstr "Stylus Scan 2000" -#: src/main/xmli18n-tmp.h:372 +#: src/main/xmli18n-tmp.h:399 #, fuzzy msgid "Epson Stylus Scan 2500" msgstr "Stylus Scan 2500" -#: src/main/xmli18n-tmp.h:373 +#: src/main/xmli18n-tmp.h:400 #, fuzzy msgid "Epson Stylus CX1500" msgstr "Stylus C20sx" -#: src/main/xmli18n-tmp.h:374 +#: src/main/xmli18n-tmp.h:401 #, fuzzy msgid "Epson Stylus CX3100" msgstr "Stylus C20sx" -#: src/main/xmli18n-tmp.h:375 +#: src/main/xmli18n-tmp.h:402 #, fuzzy msgid "Epson Stylus CX3200" msgstr "Stylus C20sx" -#: src/main/xmli18n-tmp.h:376 +#: src/main/xmli18n-tmp.h:403 #, fuzzy msgid "Epson Stylus CX3500" msgstr "Stylus C20sx" -#: src/main/xmli18n-tmp.h:377 +#: src/main/xmli18n-tmp.h:404 #, fuzzy msgid "Epson Stylus CX3600" msgstr "Stylus C20sx" -#: src/main/xmli18n-tmp.h:378 +#: src/main/xmli18n-tmp.h:405 #, fuzzy msgid "Epson Stylus CX3650" msgstr "Stylus C20sx" -#: src/main/xmli18n-tmp.h:379 +#: src/main/xmli18n-tmp.h:406 #, fuzzy msgid "Epson Stylus CX3700" msgstr "Stylus C20sx" -#: src/main/xmli18n-tmp.h:380 +#: src/main/xmli18n-tmp.h:407 #, fuzzy msgid "Epson Stylus CX3800" msgstr "Stylus C20sx" -#: src/main/xmli18n-tmp.h:381 +#: src/main/xmli18n-tmp.h:408 #, fuzzy msgid "Epson Stylus CX3805" -msgstr "Stylus C60" +msgstr "Stylus C80" -#: src/main/xmli18n-tmp.h:382 +#: src/main/xmli18n-tmp.h:409 #, fuzzy msgid "Epson Stylus CX3810" msgstr "Stylus C20sx" -#: src/main/xmli18n-tmp.h:383 +#: src/main/xmli18n-tmp.h:410 #, fuzzy msgid "Epson Stylus CX4100" msgstr "Stylus C20sx" -#: src/main/xmli18n-tmp.h:384 +#: src/main/xmli18n-tmp.h:411 #, fuzzy msgid "Epson Stylus CX4200" msgstr "Stylus C20sx" -#: src/main/xmli18n-tmp.h:385 +#: src/main/xmli18n-tmp.h:412 #, fuzzy msgid "Epson Stylus CX4400" msgstr "Stylus C20sx" -#: src/main/xmli18n-tmp.h:386 +#: src/main/xmli18n-tmp.h:413 #, fuzzy msgid "Epson Stylus CX4500" msgstr "Stylus C20sx" -#: src/main/xmli18n-tmp.h:387 +#: src/main/xmli18n-tmp.h:414 #, fuzzy msgid "Epson Stylus CX4600" msgstr "Stylus C20sx" -#: src/main/xmli18n-tmp.h:388 +#: src/main/xmli18n-tmp.h:415 #, fuzzy msgid "Epson Stylus CX4700" msgstr "Stylus C20sx" -#: src/main/xmli18n-tmp.h:389 +#: src/main/xmli18n-tmp.h:416 #, fuzzy msgid "Epson Stylus CX4800" msgstr "Stylus C20sx" -#: src/main/xmli18n-tmp.h:390 +#: src/main/xmli18n-tmp.h:417 #, fuzzy msgid "Epson Stylus CX4900" msgstr "Stylus C20sx" -#: src/main/xmli18n-tmp.h:391 +#: src/main/xmli18n-tmp.h:418 #, fuzzy msgid "Epson Stylus CX5000" msgstr "Stylus C20sx" -#: src/main/xmli18n-tmp.h:392 +#: src/main/xmli18n-tmp.h:419 #, fuzzy msgid "Epson Stylus CX5000F" msgstr "Stylus C20sx" -#: src/main/xmli18n-tmp.h:393 +#: src/main/xmli18n-tmp.h:420 #, fuzzy msgid "Epson Stylus CX5100" msgstr "Stylus C60" -#: src/main/xmli18n-tmp.h:394 +#: src/main/xmli18n-tmp.h:421 #, fuzzy msgid "Epson Stylus CX5200" msgstr "Stylus C60" -#: src/main/xmli18n-tmp.h:395 +#: src/main/xmli18n-tmp.h:422 #, fuzzy msgid "Epson Stylus CX5300" msgstr "Stylus C20sx" -#: src/main/xmli18n-tmp.h:396 +#: src/main/xmli18n-tmp.h:423 #, fuzzy msgid "Epson Stylus CX5400" msgstr "Stylus C20sx" -#: src/main/xmli18n-tmp.h:397 +#: src/main/xmli18n-tmp.h:424 #, fuzzy msgid "Epson Stylus CX5600" msgstr "Stylus C20sx" -#: src/main/xmli18n-tmp.h:398 +#: src/main/xmli18n-tmp.h:425 #, fuzzy msgid "Epson Stylus CX5700" msgstr "Stylus C20sx" -#: src/main/xmli18n-tmp.h:399 +#: src/main/xmli18n-tmp.h:426 #, fuzzy msgid "Epson Stylus CX5800" msgstr "Stylus C20sx" -#: src/main/xmli18n-tmp.h:400 +#: src/main/xmli18n-tmp.h:427 #, fuzzy msgid "Epson Stylus CX6000" msgstr "Stylus C20sx" -#: src/main/xmli18n-tmp.h:401 +#: src/main/xmli18n-tmp.h:428 #, fuzzy msgid "Epson Stylus CX6300" msgstr "Stylus C20sx" -#: src/main/xmli18n-tmp.h:402 +#: src/main/xmli18n-tmp.h:429 #, fuzzy msgid "Epson Stylus CX6400" msgstr "Stylus C20sx" -#: src/main/xmli18n-tmp.h:403 +#: src/main/xmli18n-tmp.h:430 #, fuzzy msgid "Epson Stylus CX6500" msgstr "Stylus C20sx" -#: src/main/xmli18n-tmp.h:404 +#: src/main/xmli18n-tmp.h:431 #, fuzzy msgid "Epson Stylus CX6600" msgstr "Stylus C20sx" -#: src/main/xmli18n-tmp.h:405 +#: src/main/xmli18n-tmp.h:432 #, fuzzy msgid "Epson Stylus CX7000F" -msgstr "Stylus C20sx" +msgstr "Stylus C70" -#: src/main/xmli18n-tmp.h:406 +#: src/main/xmli18n-tmp.h:433 #, fuzzy msgid "Epson Stylus CX7400" msgstr "Stylus C20sx" -#: src/main/xmli18n-tmp.h:407 +#: src/main/xmli18n-tmp.h:434 #, fuzzy msgid "Epson Stylus CX7700" msgstr "Stylus C70" -#: src/main/xmli18n-tmp.h:408 +#: src/main/xmli18n-tmp.h:435 #, fuzzy msgid "Epson Stylus CX7800" msgstr "Stylus C20sx" -#: src/main/xmli18n-tmp.h:409 +#: src/main/xmli18n-tmp.h:436 #, fuzzy msgid "Epson Stylus CX8300" msgstr "Stylus C20sx" -#: src/main/xmli18n-tmp.h:410 +#: src/main/xmli18n-tmp.h:437 #, fuzzy msgid "Epson Stylus CX8400" msgstr "Stylus C20sx" -#: src/main/xmli18n-tmp.h:411 +#: src/main/xmli18n-tmp.h:438 #, fuzzy msgid "Epson Stylus CX9400" msgstr "Stylus C20sx" -#: src/main/xmli18n-tmp.h:412 +#: src/main/xmli18n-tmp.h:439 #, fuzzy msgid "Epson Stylus D68" msgstr "Stylus C60" -#: src/main/xmli18n-tmp.h:413 +#: src/main/xmli18n-tmp.h:440 #, fuzzy msgid "Epson Stylus D88" msgstr "Stylus C80" -#: src/main/xmli18n-tmp.h:414 +#: src/main/xmli18n-tmp.h:441 +#, fuzzy +msgid "Epson Stylus D92" +msgstr "Stylus C60" + +#: src/main/xmli18n-tmp.h:442 #, fuzzy msgid "Epson Stylus D120" msgstr "Stylus C20ux" -#: src/main/xmli18n-tmp.h:415 +#: src/main/xmli18n-tmp.h:443 #, fuzzy msgid "Epson Stylus DX3800" msgstr "Stylus C20sx" -#: src/main/xmli18n-tmp.h:416 +#: src/main/xmli18n-tmp.h:444 #, fuzzy msgid "Epson Stylus DX3850" msgstr "Stylus C20sx" -#: src/main/xmli18n-tmp.h:417 +#: src/main/xmli18n-tmp.h:445 #, fuzzy msgid "Epson Stylus DX4050" msgstr "Stylus C20sx" -#: src/main/xmli18n-tmp.h:418 +#: src/main/xmli18n-tmp.h:446 #, fuzzy msgid "Epson Stylus DX4200" msgstr "Stylus C20sx" -#: src/main/xmli18n-tmp.h:419 +#: src/main/xmli18n-tmp.h:447 #, fuzzy msgid "Epson Stylus DX4250" -msgstr "Stylus C60" +msgstr "Stylus C20sx" -#: src/main/xmli18n-tmp.h:420 +#: src/main/xmli18n-tmp.h:448 +#, fuzzy +msgid "Epson Stylus DX4400" +msgstr "Stylus C20sx" + +#: src/main/xmli18n-tmp.h:449 +#, fuzzy +msgid "Epson Stylus DX4450" +msgstr "Stylus C20sx" + +#: src/main/xmli18n-tmp.h:450 #, fuzzy msgid "Epson Stylus DX4800" msgstr "Stylus C20sx" -#: src/main/xmli18n-tmp.h:421 +#: src/main/xmli18n-tmp.h:451 +#, fuzzy +msgid "Epson Stylus DX7000F" +msgstr "Stylus Pro 7000" + +#: src/main/xmli18n-tmp.h:452 +#, fuzzy +msgid "Epson Stylus DX7400" +msgstr "Stylus C20sx" + +#: src/main/xmli18n-tmp.h:453 +#, fuzzy +msgid "Epson Stylus DX7450" +msgstr "Stylus C20sx" + +#: src/main/xmli18n-tmp.h:454 +#, fuzzy +msgid "Epson Stylus DX8400" +msgstr "Stylus C20sx" + +#: src/main/xmli18n-tmp.h:455 +#, fuzzy +msgid "Epson Stylus DX8450" +msgstr "Stylus C20sx" + +#: src/main/xmli18n-tmp.h:456 msgid "Epson PictureMate" msgstr "" -#: src/main/xmli18n-tmp.h:422 +#: src/main/xmli18n-tmp.h:457 +msgid "Epson PictureMate Dash" +msgstr "" + +#: src/main/xmli18n-tmp.h:458 msgid "Epson PictureMate Deluxe" msgstr "" -#: src/main/xmli18n-tmp.h:423 +#: src/main/xmli18n-tmp.h:459 msgid "Epson PictureMate Flash" msgstr "" -#: src/main/xmli18n-tmp.h:424 +#: src/main/xmli18n-tmp.h:460 msgid "Epson PictureMate Pal" msgstr "" -#: src/main/xmli18n-tmp.h:425 +#: src/main/xmli18n-tmp.h:461 msgid "Epson PictureMate Snap" msgstr "" -#: src/main/xmli18n-tmp.h:426 -#, fuzzy +#: src/main/xmli18n-tmp.h:462 +msgid "Epson PictureMate 100" +msgstr "" + +#: src/main/xmli18n-tmp.h:463 msgid "Epson PictureMate 200" -msgstr "Stylus C60" +msgstr "" -#: src/main/xmli18n-tmp.h:427 -#, fuzzy +#: src/main/xmli18n-tmp.h:464 msgid "Epson PictureMate 210" -msgstr "Stylus C60" +msgstr "" -#: src/main/xmli18n-tmp.h:428 -#, fuzzy +#: src/main/xmli18n-tmp.h:465 msgid "Epson PictureMate 240" -msgstr "Stylus C60" +msgstr "" -#: src/main/xmli18n-tmp.h:429 -#, fuzzy +#: src/main/xmli18n-tmp.h:466 msgid "Epson PictureMate 250" -msgstr "Stylus C60" +msgstr "" -#: src/main/xmli18n-tmp.h:430 -#, fuzzy +#: src/main/xmli18n-tmp.h:467 +msgid "Epson PictureMate 260" +msgstr "" + +#: src/main/xmli18n-tmp.h:468 +msgid "Epson PictureMate 270" +msgstr "" + +#: src/main/xmli18n-tmp.h:469 msgid "Epson PictureMate 280" -msgstr "Stylus C60" +msgstr "" -#: src/main/xmli18n-tmp.h:431 +#: src/main/xmli18n-tmp.h:470 +msgid "Epson PictureMate 290" +msgstr "" + +#: src/main/xmli18n-tmp.h:471 +msgid "Epson PictureMate 500" +msgstr "" + +#: src/main/xmli18n-tmp.h:472 +msgid "Epson PictureMate 2005" +msgstr "" + +#: src/main/xmli18n-tmp.h:473 msgid "Epson CL 700" msgstr "" -#: src/main/xmli18n-tmp.h:432 +#: src/main/xmli18n-tmp.h:474 msgid "Epson CL 750" msgstr "" -#: src/main/xmli18n-tmp.h:433 +#: src/main/xmli18n-tmp.h:475 msgid "Epson CL 760" msgstr "" -#: src/main/xmli18n-tmp.h:434 +#: src/main/xmli18n-tmp.h:476 msgid "Epson E 100" msgstr "" -#: src/main/xmli18n-tmp.h:435 +#: src/main/xmli18n-tmp.h:477 msgid "Epson E 150" msgstr "" -#: src/main/xmli18n-tmp.h:436 +#: src/main/xmli18n-tmp.h:478 msgid "Epson E 200" msgstr "" -#: src/main/xmli18n-tmp.h:437 +#: src/main/xmli18n-tmp.h:479 +msgid "Epson E 300" +msgstr "" + +#: src/main/xmli18n-tmp.h:480 +msgid "Epson E 500" +msgstr "" + +#: src/main/xmli18n-tmp.h:481 +msgid "Epson E 520" +msgstr "" + +#: src/main/xmli18n-tmp.h:482 +msgid "Epson E 700" +msgstr "" + +#: src/main/xmli18n-tmp.h:483 +msgid "Epson E 720" +msgstr "" + +#: src/main/xmli18n-tmp.h:484 msgid "Epson EM 900C" msgstr "" -#: src/main/xmli18n-tmp.h:438 +#: src/main/xmli18n-tmp.h:485 msgid "Epson EM 930C" msgstr "" -#: src/main/xmli18n-tmp.h:439 +#: src/main/xmli18n-tmp.h:486 msgid "Epson MC 2000" msgstr "" -#: src/main/xmli18n-tmp.h:440 +#: src/main/xmli18n-tmp.h:487 msgid "Epson MC 5000" msgstr "" -#: src/main/xmli18n-tmp.h:441 +#: src/main/xmli18n-tmp.h:488 msgid "Epson MC 7000" msgstr "" -#: src/main/xmli18n-tmp.h:442 +#: src/main/xmli18n-tmp.h:489 msgid "Epson MC 9000" msgstr "" -#: src/main/xmli18n-tmp.h:443 +#: src/main/xmli18n-tmp.h:490 msgid "Epson MC 10000" msgstr "" -#: src/main/xmli18n-tmp.h:444 +#: src/main/xmli18n-tmp.h:491 msgid "Epson MJ 930C" msgstr "" -#: src/main/xmli18n-tmp.h:445 +#: src/main/xmli18n-tmp.h:492 msgid "Epson MJ 5100C" msgstr "" -#: src/main/xmli18n-tmp.h:446 +#: src/main/xmli18n-tmp.h:493 msgid "Epson MJ 6000C" msgstr "" -#: src/main/xmli18n-tmp.h:447 +#: src/main/xmli18n-tmp.h:494 msgid "Epson MJ 8000C" msgstr "" -#: src/main/xmli18n-tmp.h:448 -#, fuzzy +#: src/main/xmli18n-tmp.h:495 msgid "Epson PM 670C" -msgstr "Stylus C60" +msgstr "" -#: src/main/xmli18n-tmp.h:449 +#: src/main/xmli18n-tmp.h:496 msgid "Epson PM 700C" msgstr "" -#: src/main/xmli18n-tmp.h:450 +#: src/main/xmli18n-tmp.h:497 msgid "Epson PM 730C" msgstr "" -#: src/main/xmli18n-tmp.h:451 +#: src/main/xmli18n-tmp.h:498 msgid "Epson PM 740C" msgstr "" -#: src/main/xmli18n-tmp.h:452 +#: src/main/xmli18n-tmp.h:499 msgid "Epson PM 750C" msgstr "" -#: src/main/xmli18n-tmp.h:453 +#: src/main/xmli18n-tmp.h:500 msgid "Epson PM 760C" msgstr "" -#: src/main/xmli18n-tmp.h:454 +#: src/main/xmli18n-tmp.h:501 msgid "Epson PM 770C" msgstr "" -#: src/main/xmli18n-tmp.h:455 +#: src/main/xmli18n-tmp.h:502 msgid "Epson PM 780C" msgstr "" -#: src/main/xmli18n-tmp.h:456 +#: src/main/xmli18n-tmp.h:503 msgid "Epson PM 790PT" msgstr "" -#: src/main/xmli18n-tmp.h:457 +#: src/main/xmli18n-tmp.h:504 msgid "Epson PM 800C" msgstr "" -#: src/main/xmli18n-tmp.h:458 +#: src/main/xmli18n-tmp.h:505 msgid "Epson PM 850PT" msgstr "" -#: src/main/xmli18n-tmp.h:459 +#: src/main/xmli18n-tmp.h:506 msgid "Epson PM 870C" msgstr "" -#: src/main/xmli18n-tmp.h:460 +#: src/main/xmli18n-tmp.h:507 msgid "Epson PM 880C" msgstr "" -#: src/main/xmli18n-tmp.h:461 +#: src/main/xmli18n-tmp.h:508 msgid "Epson PM 930C" msgstr "" -#: src/main/xmli18n-tmp.h:462 +#: src/main/xmli18n-tmp.h:509 msgid "Epson PM 940C" msgstr "" -#: src/main/xmli18n-tmp.h:463 +#: src/main/xmli18n-tmp.h:510 msgid "Epson PM 950C" msgstr "" -#: src/main/xmli18n-tmp.h:464 +#: src/main/xmli18n-tmp.h:511 msgid "Epson PM 970C" msgstr "" -#: src/main/xmli18n-tmp.h:465 +#: src/main/xmli18n-tmp.h:512 msgid "Epson PM 980C" msgstr "" -#: src/main/xmli18n-tmp.h:466 +#: src/main/xmli18n-tmp.h:513 msgid "Epson PM 2000C" msgstr "" -#: src/main/xmli18n-tmp.h:467 +#: src/main/xmli18n-tmp.h:514 msgid "Epson PM 2200C" msgstr "" -#: src/main/xmli18n-tmp.h:468 +#: src/main/xmli18n-tmp.h:515 msgid "Epson PM 3000C" msgstr "" -#: src/main/xmli18n-tmp.h:469 +#: src/main/xmli18n-tmp.h:516 msgid "Epson PM 3300C" msgstr "" -#: src/main/xmli18n-tmp.h:470 +#: src/main/xmli18n-tmp.h:517 msgid "Epson PM 3500C" msgstr "" -#: src/main/xmli18n-tmp.h:471 +#: src/main/xmli18n-tmp.h:518 msgid "Epson PM 3700C" msgstr "" -#: src/main/xmli18n-tmp.h:472 +#: src/main/xmli18n-tmp.h:519 msgid "Epson PM 4000PX" msgstr "" -#: src/main/xmli18n-tmp.h:473 +#: src/main/xmli18n-tmp.h:520 msgid "Epson PM 5000C" msgstr "" -#: src/main/xmli18n-tmp.h:474 +#: src/main/xmli18n-tmp.h:521 msgid "Epson PM 7000C" msgstr "" -#: src/main/xmli18n-tmp.h:475 +#: src/main/xmli18n-tmp.h:522 msgid "Epson PM 9000C" msgstr "" -#: src/main/xmli18n-tmp.h:476 +#: src/main/xmli18n-tmp.h:523 #, fuzzy msgid "Epson PM 10000" msgstr "Stylus Pro 10000" -#: src/main/xmli18n-tmp.h:477 +#: src/main/xmli18n-tmp.h:524 msgid "Epson PM A650" msgstr "" -#: src/main/xmli18n-tmp.h:478 +#: src/main/xmli18n-tmp.h:525 msgid "Epson PM A750" msgstr "" -#: src/main/xmli18n-tmp.h:479 -#, fuzzy +#: src/main/xmli18n-tmp.h:526 msgid "Epson PM A820" -msgstr "Stylus C60" +msgstr "" -#: src/main/xmli18n-tmp.h:480 +#: src/main/xmli18n-tmp.h:527 msgid "Epson PM A890" msgstr "" -#: src/main/xmli18n-tmp.h:481 -#, fuzzy +#: src/main/xmli18n-tmp.h:528 msgid "Epson PM A900" -msgstr "Stylus C60" +msgstr "" -#: src/main/xmli18n-tmp.h:482 +#: src/main/xmli18n-tmp.h:529 msgid "Epson PM A950" msgstr "" -#: src/main/xmli18n-tmp.h:483 +#: src/main/xmli18n-tmp.h:530 msgid "Epson PM D600" msgstr "" -#: src/main/xmli18n-tmp.h:484 +#: src/main/xmli18n-tmp.h:531 #, fuzzy msgid "Epson PM D750" msgstr "Stylus C60" -#: src/main/xmli18n-tmp.h:485 +#: src/main/xmli18n-tmp.h:532 #, fuzzy msgid "Epson PM D770" msgstr "Stylus C60" -#: src/main/xmli18n-tmp.h:486 +#: src/main/xmli18n-tmp.h:533 msgid "Epson PM D800" msgstr "" -#: src/main/xmli18n-tmp.h:487 -#, fuzzy +#: src/main/xmli18n-tmp.h:534 msgid "Epson PM D870" -msgstr "Stylus C60" +msgstr "" -#: src/main/xmli18n-tmp.h:488 +#: src/main/xmli18n-tmp.h:535 #, fuzzy msgid "Epson PM D1000" msgstr "Stylus C60" -#: src/main/xmli18n-tmp.h:489 +#: src/main/xmli18n-tmp.h:536 #, fuzzy msgid "Epson PM G700" msgstr "Stylus C60" -#: src/main/xmli18n-tmp.h:490 +#: src/main/xmli18n-tmp.h:537 #, fuzzy msgid "Epson PM G720" msgstr "Stylus C60" -#: src/main/xmli18n-tmp.h:491 +#: src/main/xmli18n-tmp.h:538 msgid "Epson PM G730" msgstr "" -#: src/main/xmli18n-tmp.h:492 +#: src/main/xmli18n-tmp.h:539 #, fuzzy msgid "Epson PM G800" msgstr "Stylus C60" -#: src/main/xmli18n-tmp.h:493 +#: src/main/xmli18n-tmp.h:540 #, fuzzy msgid "Epson PM G820" msgstr "Stylus C60" -#: src/main/xmli18n-tmp.h:494 -#, fuzzy +#: src/main/xmli18n-tmp.h:541 msgid "Epson PM G850" -msgstr "Stylus C60" +msgstr "" -#: src/main/xmli18n-tmp.h:495 -#, fuzzy +#: src/main/xmli18n-tmp.h:542 msgid "Epson PM G4500" -msgstr "Stylus C60" +msgstr "" -#: src/main/xmli18n-tmp.h:496 -#, fuzzy +#: src/main/xmli18n-tmp.h:543 msgid "Epson PX A650" -msgstr "Stylus C60" +msgstr "" -#: src/main/xmli18n-tmp.h:497 +#: src/main/xmli18n-tmp.h:544 #, fuzzy msgid "Epson PX G900" msgstr "Stylus C60" -#: src/main/xmli18n-tmp.h:498 +#: src/main/xmli18n-tmp.h:545 #, fuzzy msgid "Epson PX G920" msgstr "Stylus C60" -#: src/main/xmli18n-tmp.h:499 +#: src/main/xmli18n-tmp.h:546 #, fuzzy msgid "Epson PX G5000" msgstr "Stylus C60" -#: src/main/xmli18n-tmp.h:500 +#: src/main/xmli18n-tmp.h:547 #, fuzzy msgid "Epson PX V500" msgstr "Stylus C60" -#: src/main/xmli18n-tmp.h:501 +#: src/main/xmli18n-tmp.h:548 #, fuzzy msgid "Epson PX V600" msgstr "Stylus C60" -#: src/main/xmli18n-tmp.h:502 +#: src/main/xmli18n-tmp.h:549 msgid "Epson PX V630" msgstr "" -#: src/main/xmli18n-tmp.h:503 -#, fuzzy +#: src/main/xmli18n-tmp.h:550 msgid "Epson PX V780" -msgstr "Stylus C60" +msgstr "" -#: src/main/xmli18n-tmp.h:504 -#, fuzzy +#: src/main/xmli18n-tmp.h:551 msgid "Epson PX 5500" -msgstr "Stylus C60" +msgstr "" -#: src/main/xmli18n-tmp.h:505 +#: src/main/xmli18n-tmp.h:552 msgid "Epson PX 7000" msgstr "" -#: src/main/xmli18n-tmp.h:506 +#: src/main/xmli18n-tmp.h:553 msgid "Epson PX 9000" msgstr "" -#: src/main/xmli18n-tmp.h:507 +#: src/main/xmli18n-tmp.h:554 msgid "Apollo P-2100" msgstr "" -#: src/main/xmli18n-tmp.h:508 +#: src/main/xmli18n-tmp.h:555 msgid "Apollo P-2150" msgstr "" -#: src/main/xmli18n-tmp.h:509 +#: src/main/xmli18n-tmp.h:556 msgid "Apollo P-2200" msgstr "" -#: src/main/xmli18n-tmp.h:510 +#: src/main/xmli18n-tmp.h:557 msgid "Apollo P-2250" msgstr "" -#: src/main/xmli18n-tmp.h:511 +#: src/main/xmli18n-tmp.h:558 msgid "Apollo P-2500" msgstr "" -#: src/main/xmli18n-tmp.h:512 +#: src/main/xmli18n-tmp.h:559 msgid "Apollo P-2550" msgstr "" -#: src/main/xmli18n-tmp.h:513 +#: src/main/xmli18n-tmp.h:560 msgid "Apollo P-2600" msgstr "" -#: src/main/xmli18n-tmp.h:514 +#: src/main/xmli18n-tmp.h:561 msgid "Apollo P-2650" msgstr "" -#: src/main/xmli18n-tmp.h:515 +#: src/main/xmli18n-tmp.h:562 msgid "Apple Color StyleWriter 4100" msgstr "" -#: src/main/xmli18n-tmp.h:516 +#: src/main/xmli18n-tmp.h:563 msgid "Apple Color StyleWriter 4500" msgstr "" -#: src/main/xmli18n-tmp.h:517 +#: src/main/xmli18n-tmp.h:564 msgid "Apple Color StyleWriter 6500" msgstr "" -#: src/main/xmli18n-tmp.h:518 +#: src/main/xmli18n-tmp.h:565 msgid "Apple LaserWriter Select 360" msgstr "" -#: src/main/xmli18n-tmp.h:519 +#: src/main/xmli18n-tmp.h:566 msgid "Brother DCP-1200" msgstr "" -#: src/main/xmli18n-tmp.h:520 +#: src/main/xmli18n-tmp.h:567 msgid "Brother HL-4Ve" msgstr "" -#: src/main/xmli18n-tmp.h:521 +#: src/main/xmli18n-tmp.h:568 msgid "Brother HL-10V" msgstr "" -#: src/main/xmli18n-tmp.h:522 +#: src/main/xmli18n-tmp.h:569 msgid "Brother HL-10h" msgstr "" -#: src/main/xmli18n-tmp.h:523 +#: src/main/xmli18n-tmp.h:570 msgid "Brother HL-630" msgstr "" -#: src/main/xmli18n-tmp.h:524 +#: src/main/xmli18n-tmp.h:571 msgid "Brother HL-660" msgstr "" -#: src/main/xmli18n-tmp.h:525 +#: src/main/xmli18n-tmp.h:572 msgid "Brother HL-760" msgstr "" -#: src/main/xmli18n-tmp.h:526 +#: src/main/xmli18n-tmp.h:573 msgid "Brother HL-960" msgstr "" -#: src/main/xmli18n-tmp.h:527 +#: src/main/xmli18n-tmp.h:574 msgid "Brother HL-1040" msgstr "" -#: src/main/xmli18n-tmp.h:528 +#: src/main/xmli18n-tmp.h:575 msgid "Brother HL-1050" msgstr "" -#: src/main/xmli18n-tmp.h:529 +#: src/main/xmli18n-tmp.h:576 msgid "Brother HL-1060" msgstr "" -#: src/main/xmli18n-tmp.h:530 +#: src/main/xmli18n-tmp.h:577 msgid "Brother HL-1070" msgstr "" -#: src/main/xmli18n-tmp.h:531 +#: src/main/xmli18n-tmp.h:578 msgid "Brother HL-1240" msgstr "" -#: src/main/xmli18n-tmp.h:532 +#: src/main/xmli18n-tmp.h:579 msgid "Brother HL-1250" msgstr "" -#: src/main/xmli18n-tmp.h:533 +#: src/main/xmli18n-tmp.h:580 msgid "Brother HL-1260" msgstr "" -#: src/main/xmli18n-tmp.h:534 +#: src/main/xmli18n-tmp.h:581 msgid "Brother HL-1270N" msgstr "" -#: src/main/xmli18n-tmp.h:535 +#: src/main/xmli18n-tmp.h:582 msgid "Brother HL-1440" msgstr "" -#: src/main/xmli18n-tmp.h:536 +#: src/main/xmli18n-tmp.h:583 msgid "Brother HL-1660e" msgstr "" -#: src/main/xmli18n-tmp.h:537 +#: src/main/xmli18n-tmp.h:584 msgid "Brother HL-2060" msgstr "" -#: src/main/xmli18n-tmp.h:538 +#: src/main/xmli18n-tmp.h:585 msgid "Brother MFC-6550MC" msgstr "" -#: src/main/xmli18n-tmp.h:539 +#: src/main/xmli18n-tmp.h:586 msgid "Brother MFC-8300" msgstr "" -#: src/main/xmli18n-tmp.h:540 +#: src/main/xmli18n-tmp.h:587 msgid "Brother MFC-9500" msgstr "" -#: src/main/xmli18n-tmp.h:541 +#: src/main/xmli18n-tmp.h:588 msgid "Brother MFC-9600" msgstr "" -#: src/main/xmli18n-tmp.h:542 +#: src/main/xmli18n-tmp.h:589 msgid "Canon GP 335" msgstr "" -#: src/main/xmli18n-tmp.h:543 +#: src/main/xmli18n-tmp.h:590 msgid "Canon LBP-4sx" msgstr "" -#: src/main/xmli18n-tmp.h:544 +#: src/main/xmli18n-tmp.h:591 msgid "Canon LBP-430" msgstr "" -#: src/main/xmli18n-tmp.h:545 +#: src/main/xmli18n-tmp.h:592 msgid "Canon LBP-1000" msgstr "" -#: src/main/xmli18n-tmp.h:546 +#: src/main/xmli18n-tmp.h:593 msgid "Canon LBP-1260" msgstr "" -#: src/main/xmli18n-tmp.h:547 +#: src/main/xmli18n-tmp.h:594 msgid "Canon LBP-1760" msgstr "" -#: src/main/xmli18n-tmp.h:548 +#: src/main/xmli18n-tmp.h:595 msgid "Canon imageRunner 330s" msgstr "" -#: src/main/xmli18n-tmp.h:549 +#: src/main/xmli18n-tmp.h:596 msgid "Citizen ProJet II" msgstr "" -#: src/main/xmli18n-tmp.h:550 +#: src/main/xmli18n-tmp.h:597 msgid "DEC 1800" msgstr "" -#: src/main/xmli18n-tmp.h:551 +#: src/main/xmli18n-tmp.h:598 msgid "DEC LN17" msgstr "" -#: src/main/xmli18n-tmp.h:552 +#: src/main/xmli18n-tmp.h:599 msgid "Epson ActionLaser 1100" msgstr "" -#: src/main/xmli18n-tmp.h:553 +#: src/main/xmli18n-tmp.h:600 msgid "Epson ActionLaser II" msgstr "" -#: src/main/xmli18n-tmp.h:554 +#: src/main/xmli18n-tmp.h:601 msgid "Epson AcuLaser C2000" msgstr "" -#: src/main/xmli18n-tmp.h:555 +#: src/main/xmli18n-tmp.h:602 msgid "Epson AcuLaser C2000PS" msgstr "" -#: src/main/xmli18n-tmp.h:556 +#: src/main/xmli18n-tmp.h:603 msgid "Epson AcuLaser C8500" msgstr "" -#: src/main/xmli18n-tmp.h:557 +#: src/main/xmli18n-tmp.h:604 msgid "Epson AcuLaser C8500PS" msgstr "" -#: src/main/xmli18n-tmp.h:558 +#: src/main/xmli18n-tmp.h:605 msgid "Epson AcuLaser C8600" msgstr "" -#: src/main/xmli18n-tmp.h:559 +#: src/main/xmli18n-tmp.h:606 msgid "Epson AcuLaser C8600PS" msgstr "" -#: src/main/xmli18n-tmp.h:560 +#: src/main/xmli18n-tmp.h:607 msgid "Epson EPL-5200" msgstr "" -#: src/main/xmli18n-tmp.h:561 +#: src/main/xmli18n-tmp.h:608 msgid "Epson EPL-5200+" msgstr "" -#: src/main/xmli18n-tmp.h:562 +#: src/main/xmli18n-tmp.h:609 msgid "Epson EPL-5700" msgstr "" -#: src/main/xmli18n-tmp.h:563 +#: src/main/xmli18n-tmp.h:610 msgid "Epson EPL-5700PS" msgstr "" -#: src/main/xmli18n-tmp.h:564 +#: src/main/xmli18n-tmp.h:611 msgid "Epson EPL-5800" msgstr "" -#: src/main/xmli18n-tmp.h:565 +#: src/main/xmli18n-tmp.h:612 msgid "Epson EPL-5800PS" msgstr "" -#: src/main/xmli18n-tmp.h:566 +#: src/main/xmli18n-tmp.h:613 msgid "Epson EPL-5900" msgstr "" -#: src/main/xmli18n-tmp.h:567 +#: src/main/xmli18n-tmp.h:614 msgid "Epson EPL-5900PS" msgstr "" -#: src/main/xmli18n-tmp.h:568 +#: src/main/xmli18n-tmp.h:615 msgid "Epson EPL-6100" msgstr "" -#: src/main/xmli18n-tmp.h:569 +#: src/main/xmli18n-tmp.h:616 msgid "Epson EPL-6100PS" msgstr "" -#: src/main/xmli18n-tmp.h:570 +#: src/main/xmli18n-tmp.h:617 msgid "Epson EPL-7100" msgstr "" -#: src/main/xmli18n-tmp.h:571 +#: src/main/xmli18n-tmp.h:618 msgid "Fujitsu PrintPartner 10V" msgstr "" -#: src/main/xmli18n-tmp.h:572 +#: src/main/xmli18n-tmp.h:619 msgid "Fujitsu PrintPartner 16DV" msgstr "" -#: src/main/xmli18n-tmp.h:573 +#: src/main/xmli18n-tmp.h:620 msgid "Fujitsu PrintPartner 20W" msgstr "" -#: src/main/xmli18n-tmp.h:574 +#: src/main/xmli18n-tmp.h:621 msgid "Fujitsu PrintPartner 8000" msgstr "" # -#: src/main/xmli18n-tmp.h:575 +#: src/main/xmli18n-tmp.h:622 #, fuzzy msgid "Generic PCL 4 Printer" -msgstr "Επιλογή εκτυπωτή" +msgstr "ÅðéëïãÞ åêôõðùôÞ" + +# +#: src/main/xmli18n-tmp.h:623 +#, fuzzy +msgid "Generic PCL 4 LF Printer" +msgstr "ÅðéëïãÞ åêôõðùôÞ" + +# +#: src/main/xmli18n-tmp.h:624 +#, fuzzy +msgid "Generic PCL 5 Printer" +msgstr "ÅðéëïãÞ åêôõðùôÞ" + +# +#: src/main/xmli18n-tmp.h:625 +#, fuzzy +msgid "Generic PCL 5 LF Printer" +msgstr "ÅðéëïãÞ åêôõðùôÞ" # -#: src/main/xmli18n-tmp.h:576 +#: src/main/xmli18n-tmp.h:626 #, fuzzy -msgid "Generic PCL 5 Printer" -msgstr "Επιλογή εκτυπωτή" +msgid "Generic PCL 5c Printer" +msgstr "ÅðéëïãÞ åêôõðùôÞ" # -#: src/main/xmli18n-tmp.h:577 +#: src/main/xmli18n-tmp.h:627 #, fuzzy -msgid "Generic PCL 5c Printer" -msgstr "Επιλογή εκτυπωτή" +msgid "Generic PCL 5c LF Printer" +msgstr "ÅðéëïãÞ åêôõðùôÞ" # -#: src/main/xmli18n-tmp.h:578 +#: src/main/xmli18n-tmp.h:628 #, fuzzy msgid "Generic PCL 5e Printer" -msgstr "Επιλογή εκτυπωτή" +msgstr "ÅðéëïãÞ åêôõðùôÞ" -#: src/main/xmli18n-tmp.h:579 +# +#: src/main/xmli18n-tmp.h:629 +#, fuzzy +msgid "Generic PCL 5e LF Printer" +msgstr "ÅðéëïãÞ åêôõðùôÞ" + +#: src/main/xmli18n-tmp.h:630 msgid "Generic PCL 6/PCL XL Printer" msgstr "" -#: src/main/xmli18n-tmp.h:580 +# +#: src/main/xmli18n-tmp.h:631 +#, fuzzy +msgid "Generic PCL 6/PCL XL LF Printer" +msgstr "ÅðéëïãÞ åêôõðùôÞ" + +#: src/main/xmli18n-tmp.h:632 msgid "HP Business Inkjet 2200" msgstr "" -#: src/main/xmli18n-tmp.h:581 +#: src/main/xmli18n-tmp.h:633 msgid "HP Business Inkjet 2230" msgstr "" -#: src/main/xmli18n-tmp.h:582 +#: src/main/xmli18n-tmp.h:634 msgid "HP Business Inkjet 2250" msgstr "" -#: src/main/xmli18n-tmp.h:583 +#: src/main/xmli18n-tmp.h:635 msgid "HP Business Inkjet 2250TN" msgstr "" -#: src/main/xmli18n-tmp.h:584 +#: src/main/xmli18n-tmp.h:636 msgid "HP Business Inkjet 2280" msgstr "" -#: src/main/xmli18n-tmp.h:585 +#: src/main/xmli18n-tmp.h:637 msgid "HP Color Inkjet Printer CP1160" msgstr "" -#: src/main/xmli18n-tmp.h:586 +#: src/main/xmli18n-tmp.h:638 msgid "HP Color Inkjet Printer CP1700" msgstr "" -#: src/main/xmli18n-tmp.h:587 +#: src/main/xmli18n-tmp.h:639 msgid "HP Color LaserJet 2500" msgstr "" -#: src/main/xmli18n-tmp.h:588 +#: src/main/xmli18n-tmp.h:640 msgid "HP Color LaserJet 4500" msgstr "" -#: src/main/xmli18n-tmp.h:589 +#: src/main/xmli18n-tmp.h:641 msgid "HP Color LaserJet 4550" msgstr "" -#: src/main/xmli18n-tmp.h:590 +#: src/main/xmli18n-tmp.h:642 msgid "HP Color LaserJet 4600" msgstr "" -#: src/main/xmli18n-tmp.h:591 +#: src/main/xmli18n-tmp.h:643 msgid "HP Color LaserJet 5" msgstr "" -#: src/main/xmli18n-tmp.h:592 +#: src/main/xmli18n-tmp.h:644 msgid "HP Color LaserJet 5000" msgstr "" -#: src/main/xmli18n-tmp.h:593 +#: src/main/xmli18n-tmp.h:645 msgid "HP Color LaserJet 5500" msgstr "" -#: src/main/xmli18n-tmp.h:594 +#: src/main/xmli18n-tmp.h:646 msgid "HP Color LaserJet 8550GN" msgstr "" -#: src/main/xmli18n-tmp.h:595 +#: src/main/xmli18n-tmp.h:647 msgid "HP DesignJet 230" msgstr "" -#: src/main/xmli18n-tmp.h:596 +#: src/main/xmli18n-tmp.h:648 msgid "HP DesignJet 250C" msgstr "" -#: src/main/xmli18n-tmp.h:597 +#: src/main/xmli18n-tmp.h:649 msgid "HP DesignJet 430" msgstr "" -#: src/main/xmli18n-tmp.h:598 +#: src/main/xmli18n-tmp.h:650 msgid "HP DesignJet 450C" msgstr "" -#: src/main/xmli18n-tmp.h:599 +#: src/main/xmli18n-tmp.h:651 msgid "HP DesignJet 455CA" msgstr "" -#: src/main/xmli18n-tmp.h:600 +#: src/main/xmli18n-tmp.h:652 msgid "HP DesignJet 488CA" msgstr "" -#: src/main/xmli18n-tmp.h:601 +#: src/main/xmli18n-tmp.h:653 msgid "HP DesignJet 700" msgstr "" -#: src/main/xmli18n-tmp.h:602 +#: src/main/xmli18n-tmp.h:654 msgid "HP DesignJet 750C Plus" msgstr "" -#: src/main/xmli18n-tmp.h:603 +#: src/main/xmli18n-tmp.h:655 msgid "HP DesignJet 750C" msgstr "" -#: src/main/xmli18n-tmp.h:604 +#: src/main/xmli18n-tmp.h:656 msgid "HP DesignJet 2500CP" msgstr "" -#: src/main/xmli18n-tmp.h:605 +#: src/main/xmli18n-tmp.h:657 msgid "HP DesignJet 3500CP" msgstr "" -#: src/main/xmli18n-tmp.h:606 +#: src/main/xmli18n-tmp.h:658 msgid "HP DesignJet ColorPro CAD" msgstr "" -#: src/main/xmli18n-tmp.h:607 +#: src/main/xmli18n-tmp.h:659 msgid "HP DeskJet 400" msgstr "" -#: src/main/xmli18n-tmp.h:608 +#: src/main/xmli18n-tmp.h:660 msgid "HP DeskJet 420C" msgstr "" -#: src/main/xmli18n-tmp.h:609 +#: src/main/xmli18n-tmp.h:661 msgid "HP DeskJet 450" msgstr "" -#: src/main/xmli18n-tmp.h:610 +#: src/main/xmli18n-tmp.h:662 msgid "HP DeskJet 500" msgstr "" -#: src/main/xmli18n-tmp.h:611 +#: src/main/xmli18n-tmp.h:663 msgid "HP DeskJet 500C" msgstr "" -#: src/main/xmli18n-tmp.h:612 +#: src/main/xmli18n-tmp.h:664 msgid "HP DeskJet 505J Plus" msgstr "" -#: src/main/xmli18n-tmp.h:613 +#: src/main/xmli18n-tmp.h:665 msgid "HP DeskJet 510" msgstr "" -#: src/main/xmli18n-tmp.h:614 +#: src/main/xmli18n-tmp.h:666 msgid "HP DeskJet 520" msgstr "" -#: src/main/xmli18n-tmp.h:615 +#: src/main/xmli18n-tmp.h:667 msgid "HP DeskJet 540C" msgstr "" -#: src/main/xmli18n-tmp.h:616 +#: src/main/xmli18n-tmp.h:668 msgid "HP DeskJet 550C" msgstr "" -#: src/main/xmli18n-tmp.h:617 +#: src/main/xmli18n-tmp.h:669 msgid "HP DeskJet 5550" msgstr "" -#: src/main/xmli18n-tmp.h:618 +#: src/main/xmli18n-tmp.h:670 msgid "HP DeskJet 5551" msgstr "" -#: src/main/xmli18n-tmp.h:619 +#: src/main/xmli18n-tmp.h:671 msgid "HP DeskJet 560C" msgstr "" -#: src/main/xmli18n-tmp.h:620 +#: src/main/xmli18n-tmp.h:672 msgid "HP DeskJet 600" msgstr "" -#: src/main/xmli18n-tmp.h:621 +#: src/main/xmli18n-tmp.h:673 msgid "HP DeskJet 600C" msgstr "" -#: src/main/xmli18n-tmp.h:622 +#: src/main/xmli18n-tmp.h:674 msgid "HP DeskJet 610C" msgstr "" -#: src/main/xmli18n-tmp.h:623 +#: src/main/xmli18n-tmp.h:675 msgid "HP DeskJet 610CL" msgstr "" -#: src/main/xmli18n-tmp.h:624 +#: src/main/xmli18n-tmp.h:676 msgid "HP DeskJet 6122" msgstr "" -#: src/main/xmli18n-tmp.h:625 +#: src/main/xmli18n-tmp.h:677 msgid "HP DeskJet 6127" msgstr "" -#: src/main/xmli18n-tmp.h:626 +#: src/main/xmli18n-tmp.h:678 msgid "HP DeskJet 612C" msgstr "" -#: src/main/xmli18n-tmp.h:627 +#: src/main/xmli18n-tmp.h:679 msgid "HP DeskJet 640C" msgstr "" -#: src/main/xmli18n-tmp.h:628 +#: src/main/xmli18n-tmp.h:680 msgid "HP DeskJet 648C" msgstr "" -#: src/main/xmli18n-tmp.h:629 +#: src/main/xmli18n-tmp.h:681 msgid "HP DeskJet 660C" msgstr "" -#: src/main/xmli18n-tmp.h:630 +#: src/main/xmli18n-tmp.h:682 msgid "HP DeskJet 670C" msgstr "" -#: src/main/xmli18n-tmp.h:631 +#: src/main/xmli18n-tmp.h:683 msgid "HP DeskJet 670TV" msgstr "" -#: src/main/xmli18n-tmp.h:632 +#: src/main/xmli18n-tmp.h:684 msgid "HP DeskJet 672C" msgstr "" -#: src/main/xmli18n-tmp.h:633 +#: src/main/xmli18n-tmp.h:685 msgid "HP DeskJet 680C" msgstr "" -#: src/main/xmli18n-tmp.h:634 +#: src/main/xmli18n-tmp.h:686 msgid "HP DeskJet 682C" msgstr "" -#: src/main/xmli18n-tmp.h:635 +#: src/main/xmli18n-tmp.h:687 msgid "HP DeskJet 690C" msgstr "" -#: src/main/xmli18n-tmp.h:636 +#: src/main/xmli18n-tmp.h:688 msgid "HP DeskJet 692C" msgstr "" -#: src/main/xmli18n-tmp.h:637 +#: src/main/xmli18n-tmp.h:689 msgid "HP DeskJet 693C" msgstr "" -#: src/main/xmli18n-tmp.h:638 +#: src/main/xmli18n-tmp.h:690 msgid "HP DeskJet 694C" msgstr "" -#: src/main/xmli18n-tmp.h:639 +#: src/main/xmli18n-tmp.h:691 msgid "HP DeskJet 695C" msgstr "" -#: src/main/xmli18n-tmp.h:640 +#: src/main/xmli18n-tmp.h:692 msgid "HP DeskJet 697C" msgstr "" -#: src/main/xmli18n-tmp.h:641 +#: src/main/xmli18n-tmp.h:693 msgid "HP DeskJet 810C" msgstr "" -#: src/main/xmli18n-tmp.h:642 +#: src/main/xmli18n-tmp.h:694 msgid "HP DeskJet 812C" msgstr "" -#: src/main/xmli18n-tmp.h:643 +#: src/main/xmli18n-tmp.h:695 msgid "HP DeskJet 815C" msgstr "" -#: src/main/xmli18n-tmp.h:644 +#: src/main/xmli18n-tmp.h:696 msgid "HP DeskJet 816C" msgstr "" -#: src/main/xmli18n-tmp.h:645 +#: src/main/xmli18n-tmp.h:697 msgid "HP DeskJet 825C" msgstr "" -#: src/main/xmli18n-tmp.h:646 +#: src/main/xmli18n-tmp.h:698 msgid "HP DeskJet 830C" msgstr "" -#: src/main/xmli18n-tmp.h:647 +#: src/main/xmli18n-tmp.h:699 msgid "HP DeskJet 832C" msgstr "" -#: src/main/xmli18n-tmp.h:648 +#: src/main/xmli18n-tmp.h:700 msgid "HP DeskJet 840C" msgstr "" -#: src/main/xmli18n-tmp.h:649 +#: src/main/xmli18n-tmp.h:701 msgid "HP DeskJet 841C" msgstr "" -#: src/main/xmli18n-tmp.h:650 +#: src/main/xmli18n-tmp.h:702 msgid "HP DeskJet 842C" msgstr "" -#: src/main/xmli18n-tmp.h:651 +#: src/main/xmli18n-tmp.h:703 msgid "HP DeskJet 843C" msgstr "" -#: src/main/xmli18n-tmp.h:652 +#: src/main/xmli18n-tmp.h:704 msgid "HP DeskJet 845C" msgstr "" -#: src/main/xmli18n-tmp.h:653 +#: src/main/xmli18n-tmp.h:705 msgid "HP DeskJet 850C" msgstr "" -#: src/main/xmli18n-tmp.h:654 +#: src/main/xmli18n-tmp.h:706 msgid "HP DeskJet 855C" msgstr "" -#: src/main/xmli18n-tmp.h:655 +#: src/main/xmli18n-tmp.h:707 msgid "HP DeskJet 870C" msgstr "" -#: src/main/xmli18n-tmp.h:656 +#: src/main/xmli18n-tmp.h:708 msgid "HP DeskJet 880C" msgstr "" -#: src/main/xmli18n-tmp.h:657 +#: src/main/xmli18n-tmp.h:709 msgid "HP DeskJet 882C" msgstr "" -#: src/main/xmli18n-tmp.h:658 +#: src/main/xmli18n-tmp.h:710 msgid "HP DeskJet 890C" msgstr "" -#: src/main/xmli18n-tmp.h:659 +#: src/main/xmli18n-tmp.h:711 msgid "HP DeskJet 895C" msgstr "" -#: src/main/xmli18n-tmp.h:660 +#: src/main/xmli18n-tmp.h:712 msgid "HP DeskJet 916C" msgstr "" -#: src/main/xmli18n-tmp.h:661 +#: src/main/xmli18n-tmp.h:713 msgid "HP DeskJet 920C" msgstr "" -#: src/main/xmli18n-tmp.h:662 +#: src/main/xmli18n-tmp.h:714 msgid "HP DeskJet 9300" msgstr "" -#: src/main/xmli18n-tmp.h:663 +#: src/main/xmli18n-tmp.h:715 msgid "HP DeskJet 930C" msgstr "" -#: src/main/xmli18n-tmp.h:664 +#: src/main/xmli18n-tmp.h:716 msgid "HP DeskJet 932C" msgstr "" -#: src/main/xmli18n-tmp.h:665 +#: src/main/xmli18n-tmp.h:717 msgid "HP DeskJet 933C" msgstr "" -#: src/main/xmli18n-tmp.h:666 +#: src/main/xmli18n-tmp.h:718 msgid "HP DeskJet 934C" msgstr "" -#: src/main/xmli18n-tmp.h:667 +#: src/main/xmli18n-tmp.h:719 msgid "HP DeskJet 935C" msgstr "" -#: src/main/xmli18n-tmp.h:668 +#: src/main/xmli18n-tmp.h:720 msgid "HP DeskJet 940C" msgstr "" -#: src/main/xmli18n-tmp.h:669 +#: src/main/xmli18n-tmp.h:721 msgid "HP DeskJet 948C" msgstr "" -#: src/main/xmli18n-tmp.h:670 +#: src/main/xmli18n-tmp.h:722 msgid "HP DeskJet 950C" msgstr "" -#: src/main/xmli18n-tmp.h:671 +#: src/main/xmli18n-tmp.h:723 msgid "HP DeskJet 952C" msgstr "" -#: src/main/xmli18n-tmp.h:672 +#: src/main/xmli18n-tmp.h:724 msgid "HP DeskJet 955C" msgstr "" -#: src/main/xmli18n-tmp.h:673 +#: src/main/xmli18n-tmp.h:725 msgid "HP DeskJet 957C" msgstr "" -#: src/main/xmli18n-tmp.h:674 +#: src/main/xmli18n-tmp.h:726 msgid "HP DeskJet 959C" msgstr "" -#: src/main/xmli18n-tmp.h:675 +#: src/main/xmli18n-tmp.h:727 msgid "HP DeskJet 960C" msgstr "" -#: src/main/xmli18n-tmp.h:676 +#: src/main/xmli18n-tmp.h:728 msgid "HP DeskJet 970C" msgstr "" -#: src/main/xmli18n-tmp.h:677 +#: src/main/xmli18n-tmp.h:729 msgid "HP DeskJet 975C" msgstr "" -#: src/main/xmli18n-tmp.h:678 +#: src/main/xmli18n-tmp.h:730 msgid "HP DeskJet 980C" msgstr "" -#: src/main/xmli18n-tmp.h:679 +#: src/main/xmli18n-tmp.h:731 msgid "HP DeskJet 990C" msgstr "" -#: src/main/xmli18n-tmp.h:680 +#: src/main/xmli18n-tmp.h:732 msgid "HP DeskJet 995C" msgstr "" -#: src/main/xmli18n-tmp.h:681 +#: src/main/xmli18n-tmp.h:733 msgid "HP DeskJet 1100C" msgstr "" -#: src/main/xmli18n-tmp.h:682 +#: src/main/xmli18n-tmp.h:734 msgid "HP DeskJet 1120C" msgstr "" -#: src/main/xmli18n-tmp.h:683 +#: src/main/xmli18n-tmp.h:735 msgid "HP DeskJet 1125C" msgstr "" -#: src/main/xmli18n-tmp.h:684 +#: src/main/xmli18n-tmp.h:736 msgid "HP DeskJet 1200C" msgstr "" -#: src/main/xmli18n-tmp.h:685 +#: src/main/xmli18n-tmp.h:737 msgid "HP DeskJet 1220C" msgstr "" -#: src/main/xmli18n-tmp.h:686 +#: src/main/xmli18n-tmp.h:738 msgid "HP DeskJet 1600C" msgstr "" -#: src/main/xmli18n-tmp.h:687 +#: src/main/xmli18n-tmp.h:739 msgid "HP DeskJet 1600CM" msgstr "" -#: src/main/xmli18n-tmp.h:688 +#: src/main/xmli18n-tmp.h:740 msgid "HP DeskJet 2000" msgstr "" -#: src/main/xmli18n-tmp.h:689 +#: src/main/xmli18n-tmp.h:741 msgid "HP DeskJet 2500" msgstr "" -#: src/main/xmli18n-tmp.h:690 +#: src/main/xmli18n-tmp.h:742 msgid "HP DeskJet 2500CM" msgstr "" -#: src/main/xmli18n-tmp.h:691 +#: src/main/xmli18n-tmp.h:743 msgid "HP DeskJet 340C" msgstr "" -#: src/main/xmli18n-tmp.h:692 +#: src/main/xmli18n-tmp.h:744 msgid "HP DeskJet 3810" msgstr "" -#: src/main/xmli18n-tmp.h:693 +#: src/main/xmli18n-tmp.h:745 msgid "HP DeskJet 3816" msgstr "" -#: src/main/xmli18n-tmp.h:694 +#: src/main/xmli18n-tmp.h:746 msgid "HP DeskJet 3820" msgstr "" -#: src/main/xmli18n-tmp.h:695 +#: src/main/xmli18n-tmp.h:747 msgid "HP DeskJet 3822" msgstr "" -#: src/main/xmli18n-tmp.h:696 +#: src/main/xmli18n-tmp.h:748 msgid "HP LaserJet 2" msgstr "" -#: src/main/xmli18n-tmp.h:697 +#: src/main/xmli18n-tmp.h:749 msgid "HP LaserJet 2D" msgstr "" -#: src/main/xmli18n-tmp.h:698 +#: src/main/xmli18n-tmp.h:750 msgid "HP LaserJet 2P Plus" msgstr "" -#: src/main/xmli18n-tmp.h:699 +#: src/main/xmli18n-tmp.h:751 msgid "HP LaserJet 2P" msgstr "" -#: src/main/xmli18n-tmp.h:700 +#: src/main/xmli18n-tmp.h:752 msgid "HP LaserJet 3" msgstr "" -#: src/main/xmli18n-tmp.h:701 +#: src/main/xmli18n-tmp.h:753 msgid "HP LaserJet 3D" msgstr "" -#: src/main/xmli18n-tmp.h:702 +#: src/main/xmli18n-tmp.h:754 msgid "HP LaserJet 3P w/ PCL5" msgstr "" -#: src/main/xmli18n-tmp.h:703 +#: src/main/xmli18n-tmp.h:755 msgid "HP LaserJet 3P w/PS" msgstr "" -#: src/main/xmli18n-tmp.h:704 +#: src/main/xmli18n-tmp.h:756 msgid "HP LaserJet 4 Plus" msgstr "" -#: src/main/xmli18n-tmp.h:705 +#: src/main/xmli18n-tmp.h:757 msgid "HP LaserJet 4" msgstr "" -#: src/main/xmli18n-tmp.h:706 +#: src/main/xmli18n-tmp.h:758 msgid "HP LaserJet 4L" msgstr "" -#: src/main/xmli18n-tmp.h:707 +#: src/main/xmli18n-tmp.h:759 msgid "HP LaserJet 4M" msgstr "" -#: src/main/xmli18n-tmp.h:708 +#: src/main/xmli18n-tmp.h:760 msgid "HP LaserJet 4ML" msgstr "" -#: src/main/xmli18n-tmp.h:709 +#: src/main/xmli18n-tmp.h:761 msgid "HP LaserJet 4P" msgstr "" -#: src/main/xmli18n-tmp.h:710 +#: src/main/xmli18n-tmp.h:762 msgid "HP LaserJet 4Si" msgstr "" -#: src/main/xmli18n-tmp.h:711 +#: src/main/xmli18n-tmp.h:763 msgid "HP LaserJet 4V" msgstr "" -#: src/main/xmli18n-tmp.h:712 +#: src/main/xmli18n-tmp.h:764 msgid "HP LaserJet 5" msgstr "" -#: src/main/xmli18n-tmp.h:713 +#: src/main/xmli18n-tmp.h:765 msgid "HP LaserJet 5L" msgstr "" -#: src/main/xmli18n-tmp.h:714 +#: src/main/xmli18n-tmp.h:766 msgid "HP LaserJet 5M" msgstr "" -#: src/main/xmli18n-tmp.h:715 +#: src/main/xmli18n-tmp.h:767 msgid "HP LaserJet 5MP" msgstr "" -#: src/main/xmli18n-tmp.h:716 +#: src/main/xmli18n-tmp.h:768 msgid "HP LaserJet 5P" msgstr "" -#: src/main/xmli18n-tmp.h:717 +#: src/main/xmli18n-tmp.h:769 msgid "HP LaserJet 5Si" msgstr "" -#: src/main/xmli18n-tmp.h:718 +#: src/main/xmli18n-tmp.h:770 msgid "HP LaserJet 6" msgstr "" -#: src/main/xmli18n-tmp.h:719 +#: src/main/xmli18n-tmp.h:771 msgid "HP LaserJet 6L" msgstr "" -#: src/main/xmli18n-tmp.h:720 +#: src/main/xmli18n-tmp.h:772 msgid "HP LaserJet 6MP" msgstr "" -#: src/main/xmli18n-tmp.h:721 +#: src/main/xmli18n-tmp.h:773 msgid "HP LaserJet 6P" msgstr "" -#: src/main/xmli18n-tmp.h:722 +#: src/main/xmli18n-tmp.h:774 msgid "HP LaserJet 1010" msgstr "" -#: src/main/xmli18n-tmp.h:723 +#: src/main/xmli18n-tmp.h:775 msgid "HP LaserJet 1012" msgstr "" -#: src/main/xmli18n-tmp.h:724 +#: src/main/xmli18n-tmp.h:776 msgid "HP LaserJet 1015" msgstr "" -#: src/main/xmli18n-tmp.h:725 +#: src/main/xmli18n-tmp.h:777 msgid "HP LaserJet 1022" msgstr "" -#: src/main/xmli18n-tmp.h:726 +#: src/main/xmli18n-tmp.h:778 msgid "HP LaserJet 1100" msgstr "" -#: src/main/xmli18n-tmp.h:727 +#: src/main/xmli18n-tmp.h:779 msgid "HP LaserJet 1100A" msgstr "" -#: src/main/xmli18n-tmp.h:728 +#: src/main/xmli18n-tmp.h:780 msgid "HP LaserJet 1150" msgstr "" -#: src/main/xmli18n-tmp.h:729 +#: src/main/xmli18n-tmp.h:781 msgid "HP LaserJet 1200" msgstr "" -#: src/main/xmli18n-tmp.h:730 +#: src/main/xmli18n-tmp.h:782 msgid "HP LaserJet 1220" msgstr "" -#: src/main/xmli18n-tmp.h:731 +#: src/main/xmli18n-tmp.h:783 msgid "HP LaserJet 1300" msgstr "" -#: src/main/xmli18n-tmp.h:732 +#: src/main/xmli18n-tmp.h:784 msgid "HP LaserJet 2100" msgstr "" -#: src/main/xmli18n-tmp.h:733 +#: src/main/xmli18n-tmp.h:785 msgid "HP LaserJet 2100M" msgstr "" -#: src/main/xmli18n-tmp.h:734 +#: src/main/xmli18n-tmp.h:786 msgid "HP LaserJet 2200" msgstr "" -#: src/main/xmli18n-tmp.h:735 +#: src/main/xmli18n-tmp.h:787 msgid "HP LaserJet 2300" msgstr "" -#: src/main/xmli18n-tmp.h:736 +#: src/main/xmli18n-tmp.h:788 msgid "HP LaserJet 3200" msgstr "" -#: src/main/xmli18n-tmp.h:737 +#: src/main/xmli18n-tmp.h:789 msgid "HP LaserJet 3200m" msgstr "" -#: src/main/xmli18n-tmp.h:738 +#: src/main/xmli18n-tmp.h:790 msgid "HP LaserJet 3200se" msgstr "" -#: src/main/xmli18n-tmp.h:739 +#: src/main/xmli18n-tmp.h:791 msgid "HP LaserJet 3300 MFP" msgstr "" -#: src/main/xmli18n-tmp.h:740 +#: src/main/xmli18n-tmp.h:792 msgid "HP LaserJet 3310 MFP" msgstr "" -#: src/main/xmli18n-tmp.h:741 +#: src/main/xmli18n-tmp.h:793 msgid "HP LaserJet 3320 MFP" msgstr "" -#: src/main/xmli18n-tmp.h:742 +#: src/main/xmli18n-tmp.h:794 msgid "HP LaserJet 3320N MFP" msgstr "" -#: src/main/xmli18n-tmp.h:743 +#: src/main/xmli18n-tmp.h:795 msgid "HP LaserJet 3330 MFP" msgstr "" -#: src/main/xmli18n-tmp.h:744 +#: src/main/xmli18n-tmp.h:796 msgid "HP LaserJet 4000" msgstr "" -#: src/main/xmli18n-tmp.h:745 +#: src/main/xmli18n-tmp.h:797 msgid "HP LaserJet 4050" msgstr "" -#: src/main/xmli18n-tmp.h:746 +#: src/main/xmli18n-tmp.h:798 msgid "HP LaserJet 4100" msgstr "" -#: src/main/xmli18n-tmp.h:747 +#: src/main/xmli18n-tmp.h:799 msgid "HP LaserJet 4200" msgstr "" -#: src/main/xmli18n-tmp.h:748 +#: src/main/xmli18n-tmp.h:800 msgid "HP LaserJet 4300" msgstr "" -#: src/main/xmli18n-tmp.h:749 +#: src/main/xmli18n-tmp.h:801 msgid "HP LaserJet 5000" msgstr "" -#: src/main/xmli18n-tmp.h:750 +#: src/main/xmli18n-tmp.h:802 msgid "HP LaserJet 5100" msgstr "" -#: src/main/xmli18n-tmp.h:751 +#: src/main/xmli18n-tmp.h:803 msgid "HP LaserJet 8000" msgstr "" -#: src/main/xmli18n-tmp.h:752 +#: src/main/xmli18n-tmp.h:804 msgid "HP LaserJet 8100" msgstr "" -#: src/main/xmli18n-tmp.h:753 +#: src/main/xmli18n-tmp.h:805 msgid "HP LaserJet 8150" msgstr "" -#: src/main/xmli18n-tmp.h:754 +#: src/main/xmli18n-tmp.h:806 msgid "HP LaserJet 9000" msgstr "" -#: src/main/xmli18n-tmp.h:755 +#: src/main/xmli18n-tmp.h:807 msgid "HP Mopier 240" msgstr "" -#: src/main/xmli18n-tmp.h:756 +#: src/main/xmli18n-tmp.h:808 msgid "HP Mopier 320" msgstr "" -#: src/main/xmli18n-tmp.h:757 +#: src/main/xmli18n-tmp.h:809 msgid "HP OfficeJet 300" msgstr "" -#: src/main/xmli18n-tmp.h:758 +#: src/main/xmli18n-tmp.h:810 msgid "HP OfficeJet 330" msgstr "" -#: src/main/xmli18n-tmp.h:759 +#: src/main/xmli18n-tmp.h:811 msgid "HP OfficeJet 350" msgstr "" -#: src/main/xmli18n-tmp.h:760 +#: src/main/xmli18n-tmp.h:812 msgid "HP OfficeJet 500" msgstr "" -#: src/main/xmli18n-tmp.h:761 +#: src/main/xmli18n-tmp.h:813 msgid "HP OfficeJet 520" msgstr "" -#: src/main/xmli18n-tmp.h:762 +#: src/main/xmli18n-tmp.h:814 msgid "HP OfficeJet 570" msgstr "" -#: src/main/xmli18n-tmp.h:763 +#: src/main/xmli18n-tmp.h:815 msgid "HP OfficeJet 580" msgstr "" -#: src/main/xmli18n-tmp.h:764 +#: src/main/xmli18n-tmp.h:816 msgid "HP OfficeJet 590" msgstr "" -#: src/main/xmli18n-tmp.h:765 +#: src/main/xmli18n-tmp.h:817 msgid "HP OfficeJet 600" msgstr "" -#: src/main/xmli18n-tmp.h:766 +#: src/main/xmli18n-tmp.h:818 msgid "HP OfficeJet 610" msgstr "" -#: src/main/xmli18n-tmp.h:767 +#: src/main/xmli18n-tmp.h:819 msgid "HP OfficeJet 625" msgstr "" -#: src/main/xmli18n-tmp.h:768 +#: src/main/xmli18n-tmp.h:820 msgid "HP OfficeJet 630" msgstr "" -#: src/main/xmli18n-tmp.h:769 +#: src/main/xmli18n-tmp.h:821 msgid "HP OfficeJet 635" msgstr "" -#: src/main/xmli18n-tmp.h:770 +#: src/main/xmli18n-tmp.h:822 msgid "HP OfficeJet 700" msgstr "" -#: src/main/xmli18n-tmp.h:771 +#: src/main/xmli18n-tmp.h:823 msgid "HP OfficeJet 710" msgstr "" -#: src/main/xmli18n-tmp.h:772 +#: src/main/xmli18n-tmp.h:824 msgid "HP OfficeJet 720" msgstr "" -#: src/main/xmli18n-tmp.h:773 +#: src/main/xmli18n-tmp.h:825 msgid "HP OfficeJet 725" msgstr "" -#: src/main/xmli18n-tmp.h:774 +#: src/main/xmli18n-tmp.h:826 msgid "HP OfficeJet 5105" msgstr "" -#: src/main/xmli18n-tmp.h:775 +#: src/main/xmli18n-tmp.h:827 msgid "HP OfficeJet 5110" msgstr "" -#: src/main/xmli18n-tmp.h:776 +#: src/main/xmli18n-tmp.h:828 msgid "HP OfficeJet 5110xi" msgstr "" -#: src/main/xmli18n-tmp.h:777 +#: src/main/xmli18n-tmp.h:829 msgid "HP OfficeJet 6105" msgstr "" -#: src/main/xmli18n-tmp.h:778 +#: src/main/xmli18n-tmp.h:830 msgid "HP OfficeJet 6110" msgstr "" -#: src/main/xmli18n-tmp.h:779 +#: src/main/xmli18n-tmp.h:831 msgid "HP OfficeJet 7110" msgstr "" -#: src/main/xmli18n-tmp.h:780 +#: src/main/xmli18n-tmp.h:832 msgid "HP OfficeJet 7130" msgstr "" -#: src/main/xmli18n-tmp.h:781 +#: src/main/xmli18n-tmp.h:833 msgid "HP OfficeJet 7140" msgstr "" -#: src/main/xmli18n-tmp.h:782 +#: src/main/xmli18n-tmp.h:834 msgid "HP OfficeJet D125" msgstr "" -#: src/main/xmli18n-tmp.h:783 +#: src/main/xmli18n-tmp.h:835 msgid "HP OfficeJet D135" msgstr "" -#: src/main/xmli18n-tmp.h:784 +#: src/main/xmli18n-tmp.h:836 msgid "HP OfficeJet D145" msgstr "" -#: src/main/xmli18n-tmp.h:785 +#: src/main/xmli18n-tmp.h:837 msgid "HP OfficeJet D155" msgstr "" -#: src/main/xmli18n-tmp.h:786 +#: src/main/xmli18n-tmp.h:838 msgid "HP OfficeJet G55" msgstr "" -#: src/main/xmli18n-tmp.h:787 +#: src/main/xmli18n-tmp.h:839 msgid "HP OfficeJet G85" msgstr "" -#: src/main/xmli18n-tmp.h:788 +#: src/main/xmli18n-tmp.h:840 msgid "HP OfficeJet G95" msgstr "" -#: src/main/xmli18n-tmp.h:789 +#: src/main/xmli18n-tmp.h:841 msgid "HP OfficeJet K60" msgstr "" -#: src/main/xmli18n-tmp.h:790 +#: src/main/xmli18n-tmp.h:842 msgid "HP OfficeJet K60xi" msgstr "" -#: src/main/xmli18n-tmp.h:791 +#: src/main/xmli18n-tmp.h:843 msgid "HP OfficeJet K80" msgstr "" -#: src/main/xmli18n-tmp.h:792 +#: src/main/xmli18n-tmp.h:844 msgid "HP OfficeJet K80xi" msgstr "" -#: src/main/xmli18n-tmp.h:793 +#: src/main/xmli18n-tmp.h:845 msgid "HP OfficeJet LX" msgstr "" -#: src/main/xmli18n-tmp.h:794 +#: src/main/xmli18n-tmp.h:846 msgid "HP OfficeJet Pro 1150C" msgstr "" -#: src/main/xmli18n-tmp.h:795 +#: src/main/xmli18n-tmp.h:847 msgid "HP OfficeJet Pro 1170C" msgstr "" -#: src/main/xmli18n-tmp.h:796 +#: src/main/xmli18n-tmp.h:848 msgid "HP OfficeJet Pro 1175C" msgstr "" -#: src/main/xmli18n-tmp.h:797 +#: src/main/xmli18n-tmp.h:849 msgid "HP OfficeJet R40" msgstr "" -#: src/main/xmli18n-tmp.h:798 +#: src/main/xmli18n-tmp.h:850 msgid "HP OfficeJet R45" msgstr "" -#: src/main/xmli18n-tmp.h:799 +#: src/main/xmli18n-tmp.h:851 msgid "HP OfficeJet R60" msgstr "" -#: src/main/xmli18n-tmp.h:800 +#: src/main/xmli18n-tmp.h:852 msgid "HP OfficeJet R65" msgstr "" -#: src/main/xmli18n-tmp.h:801 +#: src/main/xmli18n-tmp.h:853 msgid "HP OfficeJet R80" msgstr "" -#: src/main/xmli18n-tmp.h:802 +#: src/main/xmli18n-tmp.h:854 msgid "HP OfficeJet T45" msgstr "" -#: src/main/xmli18n-tmp.h:803 +#: src/main/xmli18n-tmp.h:855 msgid "HP OfficeJet T65" msgstr "" -#: src/main/xmli18n-tmp.h:804 +#: src/main/xmli18n-tmp.h:856 msgid "HP OfficeJet V40" msgstr "" -#: src/main/xmli18n-tmp.h:805 +#: src/main/xmli18n-tmp.h:857 msgid "HP OfficeJet V40xi" msgstr "" -#: src/main/xmli18n-tmp.h:806 +#: src/main/xmli18n-tmp.h:858 msgid "HP OfficeJet" msgstr "" -#: src/main/xmli18n-tmp.h:807 +#: src/main/xmli18n-tmp.h:859 msgid "HP PSC 370" msgstr "" -#: src/main/xmli18n-tmp.h:808 +#: src/main/xmli18n-tmp.h:860 msgid "HP PSC 380" msgstr "" -#: src/main/xmli18n-tmp.h:809 +#: src/main/xmli18n-tmp.h:861 msgid "HP PSC 500" msgstr "" -#: src/main/xmli18n-tmp.h:810 +#: src/main/xmli18n-tmp.h:862 msgid "HP PSC 750" msgstr "" -#: src/main/xmli18n-tmp.h:811 +#: src/main/xmli18n-tmp.h:863 msgid "HP PSC 950" msgstr "" -#: src/main/xmli18n-tmp.h:812 +#: src/main/xmli18n-tmp.h:864 msgid "HP PSC 950xi" msgstr "" -#: src/main/xmli18n-tmp.h:813 +#: src/main/xmli18n-tmp.h:865 msgid "HP PSC 2110" msgstr "" -#: src/main/xmli18n-tmp.h:814 +#: src/main/xmli18n-tmp.h:866 msgid "HP PSC 2150" msgstr "" -#: src/main/xmli18n-tmp.h:815 +#: src/main/xmli18n-tmp.h:867 msgid "HP PSC 2210" msgstr "" -#: src/main/xmli18n-tmp.h:816 +#: src/main/xmli18n-tmp.h:868 msgid "HP PhotoSmart 7150" msgstr "" -#: src/main/xmli18n-tmp.h:817 +#: src/main/xmli18n-tmp.h:869 msgid "HP PhotoSmart 7345" msgstr "" -#: src/main/xmli18n-tmp.h:818 +#: src/main/xmli18n-tmp.h:870 msgid "HP PhotoSmart 7350" msgstr "" -#: src/main/xmli18n-tmp.h:819 +#: src/main/xmli18n-tmp.h:871 msgid "HP PhotoSmart 7550" msgstr "" -#: src/main/xmli18n-tmp.h:820 +#: src/main/xmli18n-tmp.h:872 msgid "HP PhotoSmart P100" msgstr "" -#: src/main/xmli18n-tmp.h:821 +#: src/main/xmli18n-tmp.h:873 msgid "HP PhotoSmart P130" msgstr "" -#: src/main/xmli18n-tmp.h:822 +#: src/main/xmli18n-tmp.h:874 msgid "HP PhotoSmart P230" msgstr "" -#: src/main/xmli18n-tmp.h:823 +#: src/main/xmli18n-tmp.h:875 msgid "HP PhotoSmart P1000" msgstr "" -#: src/main/xmli18n-tmp.h:824 +#: src/main/xmli18n-tmp.h:876 msgid "HP PhotoSmart P1100" msgstr "" -#: src/main/xmli18n-tmp.h:825 +#: src/main/xmli18n-tmp.h:877 msgid "HP PhotoSmart P1115" msgstr "" -#: src/main/xmli18n-tmp.h:826 +#: src/main/xmli18n-tmp.h:878 msgid "HP PhotoSmart P1215" msgstr "" -#: src/main/xmli18n-tmp.h:827 +#: src/main/xmli18n-tmp.h:879 msgid "HP PhotoSmart P1218" msgstr "" -#: src/main/xmli18n-tmp.h:828 +#: src/main/xmli18n-tmp.h:880 msgid "HP PhotoSmart P1315" msgstr "" -#: src/main/xmli18n-tmp.h:829 +#: src/main/xmli18n-tmp.h:881 #, fuzzy msgid "HP e-printer e20" -msgstr "Όνομα εκτυπωτή:" +msgstr "¼íïìá åêôõðùôÞ:" -#: src/main/xmli18n-tmp.h:830 +#: src/main/xmli18n-tmp.h:882 msgid "IBM 4019" msgstr "" -#: src/main/xmli18n-tmp.h:831 +#: src/main/xmli18n-tmp.h:883 msgid "IBM 4029 030 LaserPrinter 10" msgstr "" -#: src/main/xmli18n-tmp.h:832 +#: src/main/xmli18n-tmp.h:884 msgid "IBM 4312" msgstr "" -#: src/main/xmli18n-tmp.h:833 +#: src/main/xmli18n-tmp.h:885 msgid "IBM Infoprint 12" msgstr "" -#: src/main/xmli18n-tmp.h:834 +#: src/main/xmli18n-tmp.h:886 msgid "IBM Page Printer 3112" msgstr "" -#: src/main/xmli18n-tmp.h:835 +#: src/main/xmli18n-tmp.h:887 msgid "Infotec 4651 MF" msgstr "" -#: src/main/xmli18n-tmp.h:836 +#: src/main/xmli18n-tmp.h:888 msgid "Kyocera F-1010" msgstr "" -#: src/main/xmli18n-tmp.h:837 +#: src/main/xmli18n-tmp.h:889 msgid "Kyocera FS-600 - KPDL-2" msgstr "" -#: src/main/xmli18n-tmp.h:838 +#: src/main/xmli18n-tmp.h:890 msgid "Kyocera FS-600" msgstr "" -#: src/main/xmli18n-tmp.h:839 +#: src/main/xmli18n-tmp.h:891 msgid "Kyocera FS-680" msgstr "" -#: src/main/xmli18n-tmp.h:840 +#: src/main/xmli18n-tmp.h:892 msgid "Kyocera FS-800" msgstr "" -#: src/main/xmli18n-tmp.h:841 +#: src/main/xmli18n-tmp.h:893 msgid "Kyocera FS-1000" msgstr "" -#: src/main/xmli18n-tmp.h:842 +#: src/main/xmli18n-tmp.h:894 msgid "Kyocera FS-1000+" msgstr "" -#: src/main/xmli18n-tmp.h:843 +#: src/main/xmli18n-tmp.h:895 msgid "Kyocera FS-1010" msgstr "" -#: src/main/xmli18n-tmp.h:844 +#: src/main/xmli18n-tmp.h:896 msgid "Kyocera FS-1050" msgstr "" -#: src/main/xmli18n-tmp.h:845 +#: src/main/xmli18n-tmp.h:897 msgid "Kyocera FS-1200" msgstr "" -#: src/main/xmli18n-tmp.h:846 +#: src/main/xmli18n-tmp.h:898 msgid "Kyocera FS-1600" msgstr "" -#: src/main/xmli18n-tmp.h:847 +#: src/main/xmli18n-tmp.h:899 msgid "Kyocera FS-1600+" msgstr "" -#: src/main/xmli18n-tmp.h:848 +#: src/main/xmli18n-tmp.h:900 msgid "Kyocera FS-1700" msgstr "" -#: src/main/xmli18n-tmp.h:849 +#: src/main/xmli18n-tmp.h:901 msgid "Kyocera FS-1700+" msgstr "" -#: src/main/xmli18n-tmp.h:850 +#: src/main/xmli18n-tmp.h:902 msgid "Kyocera FS-1750" msgstr "" -#: src/main/xmli18n-tmp.h:851 +#: src/main/xmli18n-tmp.h:903 msgid "Kyocera FS-1800" msgstr "" -#: src/main/xmli18n-tmp.h:852 +#: src/main/xmli18n-tmp.h:904 msgid "Kyocera FS-1800+" msgstr "" -#: src/main/xmli18n-tmp.h:853 +#: src/main/xmli18n-tmp.h:905 msgid "Kyocera FS-1900" msgstr "" -#: src/main/xmli18n-tmp.h:854 +#: src/main/xmli18n-tmp.h:906 msgid "Kyocera FS-3500" msgstr "" -#: src/main/xmli18n-tmp.h:855 +#: src/main/xmli18n-tmp.h:907 msgid "Kyocera FS-3600" msgstr "" -#: src/main/xmli18n-tmp.h:856 +#: src/main/xmli18n-tmp.h:908 msgid "Kyocera FS-3600+" msgstr "" -#: src/main/xmli18n-tmp.h:857 +#: src/main/xmli18n-tmp.h:909 msgid "Kyocera FS-3700" msgstr "" -#: src/main/xmli18n-tmp.h:858 +#: src/main/xmli18n-tmp.h:910 msgid "Kyocera FS-3700+" msgstr "" -#: src/main/xmli18n-tmp.h:859 +#: src/main/xmli18n-tmp.h:911 msgid "Kyocera FS-3750" msgstr "" -#: src/main/xmli18n-tmp.h:860 +#: src/main/xmli18n-tmp.h:912 msgid "Kyocera FS-3800" msgstr "" -#: src/main/xmli18n-tmp.h:861 +#: src/main/xmli18n-tmp.h:913 msgid "Kyocera FS-5800C" msgstr "" -#: src/main/xmli18n-tmp.h:862 +#: src/main/xmli18n-tmp.h:914 msgid "Kyocera FS-5900C" msgstr "" -#: src/main/xmli18n-tmp.h:863 +#: src/main/xmli18n-tmp.h:915 msgid "Kyocera FS-6500" msgstr "" -#: src/main/xmli18n-tmp.h:864 +#: src/main/xmli18n-tmp.h:916 msgid "Kyocera FS-6500+" msgstr "" -#: src/main/xmli18n-tmp.h:865 +#: src/main/xmli18n-tmp.h:917 msgid "Kyocera FS-6700" msgstr "" -#: src/main/xmli18n-tmp.h:866 +#: src/main/xmli18n-tmp.h:918 msgid "Kyocera FS-7000" msgstr "" -#: src/main/xmli18n-tmp.h:867 +#: src/main/xmli18n-tmp.h:919 msgid "Kyocera FS-7000+" msgstr "" -#: src/main/xmli18n-tmp.h:868 +#: src/main/xmli18n-tmp.h:920 msgid "Kyocera FS-8000C" msgstr "" -#: src/main/xmli18n-tmp.h:869 +#: src/main/xmli18n-tmp.h:921 msgid "Kyocera FS-9000" msgstr "" -#: src/main/xmli18n-tmp.h:870 +#: src/main/xmli18n-tmp.h:922 msgid "Kyocera FS-9100DN" msgstr "" -#: src/main/xmli18n-tmp.h:871 +#: src/main/xmli18n-tmp.h:923 msgid "Kyocera FS-9500DN" msgstr "" -#: src/main/xmli18n-tmp.h:872 +#: src/main/xmli18n-tmp.h:924 msgid "Kyocera KM-1530" msgstr "" -#: src/main/xmli18n-tmp.h:873 +#: src/main/xmli18n-tmp.h:925 msgid "Kyocera KM-1810" msgstr "" -#: src/main/xmli18n-tmp.h:874 +#: src/main/xmli18n-tmp.h:926 msgid "Kyocera KM-2030" msgstr "" -#: src/main/xmli18n-tmp.h:875 +#: src/main/xmli18n-tmp.h:927 msgid "Kyocera KM-2530" msgstr "" -#: src/main/xmli18n-tmp.h:876 +#: src/main/xmli18n-tmp.h:928 msgid "Kyocera KM-3530" msgstr "" -#: src/main/xmli18n-tmp.h:877 +#: src/main/xmli18n-tmp.h:929 msgid "Kyocera KM-4230" msgstr "" -#: src/main/xmli18n-tmp.h:878 +#: src/main/xmli18n-tmp.h:930 msgid "Kyocera KM-4530" msgstr "" -#: src/main/xmli18n-tmp.h:879 +#: src/main/xmli18n-tmp.h:931 msgid "Kyocera KM-5230" msgstr "" -#: src/main/xmli18n-tmp.h:880 +#: src/main/xmli18n-tmp.h:932 msgid "Kyocera KM-5530" msgstr "" -#: src/main/xmli18n-tmp.h:881 +#: src/main/xmli18n-tmp.h:933 msgid "Kyocera KM-6230" msgstr "" -#: src/main/xmli18n-tmp.h:882 +#: src/main/xmli18n-tmp.h:934 msgid "Lexmark 4076" msgstr "" -#: src/main/xmli18n-tmp.h:883 +#: src/main/xmli18n-tmp.h:935 msgid "Lexmark Optra E" msgstr "" -#: src/main/xmli18n-tmp.h:884 +#: src/main/xmli18n-tmp.h:936 msgid "Lexmark Optra E+" msgstr "" -#: src/main/xmli18n-tmp.h:885 +#: src/main/xmli18n-tmp.h:937 msgid "Lexmark Optra E220" msgstr "" -#: src/main/xmli18n-tmp.h:886 +#: src/main/xmli18n-tmp.h:938 msgid "Lexmark Valuewriter 300" msgstr "" -#: src/main/xmli18n-tmp.h:887 +#: src/main/xmli18n-tmp.h:939 msgid "Minolta PagePro 6" msgstr "" -#: src/main/xmli18n-tmp.h:888 +#: src/main/xmli18n-tmp.h:940 msgid "Minolta PagePro 6e" msgstr "" -#: src/main/xmli18n-tmp.h:889 +#: src/main/xmli18n-tmp.h:941 msgid "Minolta PagePro 6ex" msgstr "" -#: src/main/xmli18n-tmp.h:890 +#: src/main/xmli18n-tmp.h:942 msgid "Minolta PagePro 8" msgstr "" -#: src/main/xmli18n-tmp.h:891 +#: src/main/xmli18n-tmp.h:943 msgid "Minolta PagePro 8L" msgstr "" -#: src/main/xmli18n-tmp.h:892 +#: src/main/xmli18n-tmp.h:944 msgid "Minolta PagePro 1100" msgstr "" -#: src/main/xmli18n-tmp.h:893 +#: src/main/xmli18n-tmp.h:945 msgid "NEC SuperScript 660i" msgstr "" -#: src/main/xmli18n-tmp.h:894 +#: src/main/xmli18n-tmp.h:946 msgid "NEC SuperScript 860" msgstr "" -#: src/main/xmli18n-tmp.h:895 +#: src/main/xmli18n-tmp.h:947 msgid "NEC SuperScript 870" msgstr "" -#: src/main/xmli18n-tmp.h:896 +#: src/main/xmli18n-tmp.h:948 msgid "NEC SuperScript 1260" msgstr "" -#: src/main/xmli18n-tmp.h:897 +#: src/main/xmli18n-tmp.h:949 msgid "NEC SuperScript 1400" msgstr "" -#: src/main/xmli18n-tmp.h:898 +#: src/main/xmli18n-tmp.h:950 msgid "NEC SuperScript 1800" msgstr "" -#: src/main/xmli18n-tmp.h:899 +#: src/main/xmli18n-tmp.h:951 msgid "Okidata OL400" msgstr "" -#: src/main/xmli18n-tmp.h:900 +#: src/main/xmli18n-tmp.h:952 msgid "Okidata OL400e" msgstr "" -#: src/main/xmli18n-tmp.h:901 +#: src/main/xmli18n-tmp.h:953 msgid "Okidata OL400ex" msgstr "" -#: src/main/xmli18n-tmp.h:902 +#: src/main/xmli18n-tmp.h:954 msgid "Okidata OL410e" msgstr "" -#: src/main/xmli18n-tmp.h:903 +#: src/main/xmli18n-tmp.h:955 msgid "Okidata OL600e" msgstr "" -#: src/main/xmli18n-tmp.h:904 +#: src/main/xmli18n-tmp.h:956 msgid "Okidata OL610e/S" msgstr "" -#: src/main/xmli18n-tmp.h:905 +#: src/main/xmli18n-tmp.h:957 msgid "Okidata OL800" msgstr "" -#: src/main/xmli18n-tmp.h:906 +#: src/main/xmli18n-tmp.h:958 msgid "Okidata OL810ex" msgstr "" -#: src/main/xmli18n-tmp.h:907 +#: src/main/xmli18n-tmp.h:959 msgid "Okidata Okipage 6e" msgstr "" -#: src/main/xmli18n-tmp.h:908 +#: src/main/xmli18n-tmp.h:960 msgid "Okidata Okipage 6ex" msgstr "" -#: src/main/xmli18n-tmp.h:909 +#: src/main/xmli18n-tmp.h:961 msgid "Okidata Okipage 8p" msgstr "" -#: src/main/xmli18n-tmp.h:910 +#: src/main/xmli18n-tmp.h:962 msgid "Okidata Okipage 10e" msgstr "" -#: src/main/xmli18n-tmp.h:911 +#: src/main/xmli18n-tmp.h:963 msgid "Okidata Okipage 10ex" msgstr "" -#: src/main/xmli18n-tmp.h:912 +#: src/main/xmli18n-tmp.h:964 msgid "Okidata Okipage 14ex" msgstr "" -#: src/main/xmli18n-tmp.h:913 +#: src/main/xmli18n-tmp.h:965 msgid "Okidata Super 6e" msgstr "" -#: src/main/xmli18n-tmp.h:914 +#: src/main/xmli18n-tmp.h:966 msgid "Olivetti JP350S" msgstr "" -#: src/main/xmli18n-tmp.h:915 +#: src/main/xmli18n-tmp.h:967 msgid "Olivetti PG 306" msgstr "" -#: src/main/xmli18n-tmp.h:916 +#: src/main/xmli18n-tmp.h:968 msgid "PCPI 1030" msgstr "" -#: src/main/xmli18n-tmp.h:917 +#: src/main/xmli18n-tmp.h:969 msgid "Panasonic KX-P4410" msgstr "" -#: src/main/xmli18n-tmp.h:918 +#: src/main/xmli18n-tmp.h:970 msgid "Panasonic KX-P4450" msgstr "" -#: src/main/xmli18n-tmp.h:919 +#: src/main/xmli18n-tmp.h:971 msgid "Panasonic KX-P6150" msgstr "" -#: src/main/xmli18n-tmp.h:920 +#: src/main/xmli18n-tmp.h:972 msgid "Panasonic KX-P6500" msgstr "" -#: src/main/xmli18n-tmp.h:921 +#: src/main/xmli18n-tmp.h:973 msgid "Raven LP-410" msgstr "" -#: src/main/xmli18n-tmp.h:922 +#: src/main/xmli18n-tmp.h:974 msgid "Ricoh Aficio 220" msgstr "" -#: src/main/xmli18n-tmp.h:923 +#: src/main/xmli18n-tmp.h:975 msgid "Ricoh Aficio 401" msgstr "" -#: src/main/xmli18n-tmp.h:924 +#: src/main/xmli18n-tmp.h:976 msgid "Ricoh Aficio 700" msgstr "" -#: src/main/xmli18n-tmp.h:925 +#: src/main/xmli18n-tmp.h:977 msgid "Samsung ML-85" msgstr "" -#: src/main/xmli18n-tmp.h:926 +#: src/main/xmli18n-tmp.h:978 msgid "Samsung ML-4600" msgstr "" -#: src/main/xmli18n-tmp.h:927 +#: src/main/xmli18n-tmp.h:979 msgid "Samsung ML-5000a" msgstr "" -#: src/main/xmli18n-tmp.h:928 +#: src/main/xmli18n-tmp.h:980 msgid "Samsung ML-6000" msgstr "" -#: src/main/xmli18n-tmp.h:929 +#: src/main/xmli18n-tmp.h:981 msgid "Samsung ML-6100" msgstr "" -#: src/main/xmli18n-tmp.h:930 +#: src/main/xmli18n-tmp.h:982 msgid "Samsung ML-7000" msgstr "" -#: src/main/xmli18n-tmp.h:931 +#: src/main/xmli18n-tmp.h:983 msgid "Samsung ML-7000N" msgstr "" -#: src/main/xmli18n-tmp.h:932 +#: src/main/xmli18n-tmp.h:984 msgid "Samsung ML-7000P" msgstr "" -#: src/main/xmli18n-tmp.h:933 +#: src/main/xmli18n-tmp.h:985 msgid "Samsung ML-7050" msgstr "" -#: src/main/xmli18n-tmp.h:934 +#: src/main/xmli18n-tmp.h:986 msgid "Samsung QL-5100A" msgstr "" -#: src/main/xmli18n-tmp.h:935 +#: src/main/xmli18n-tmp.h:987 msgid "Samsung QL-6050" msgstr "" -#: src/main/xmli18n-tmp.h:936 +#: src/main/xmli18n-tmp.h:988 msgid "Seiko SpeedJET 200" msgstr "" -#: src/main/xmli18n-tmp.h:937 +#: src/main/xmli18n-tmp.h:989 msgid "Sharp AR-161" msgstr "" -#: src/main/xmli18n-tmp.h:938 +#: src/main/xmli18n-tmp.h:990 msgid "Sharp AR-M257" msgstr "" -#: src/main/xmli18n-tmp.h:939 +#: src/main/xmli18n-tmp.h:991 msgid "Sony IJP-V100" msgstr "" -#: src/main/xmli18n-tmp.h:940 +#: src/main/xmli18n-tmp.h:992 msgid "Star LS-04" msgstr "" -#: src/main/xmli18n-tmp.h:941 +#: src/main/xmli18n-tmp.h:993 #, fuzzy msgid "Star LaserPrinter 8" -msgstr "ΡÏθμιση Εκτυπωτή" +msgstr "Ñýèìéóç ÅêôõðùôÞ" -#: src/main/xmli18n-tmp.h:942 +#: src/main/xmli18n-tmp.h:994 msgid "Tally MT908" msgstr "" -#: src/main/xmli18n-tmp.h:943 +#: src/main/xmli18n-tmp.h:995 msgid "Xerox Able 1406" msgstr "" -#: src/main/xmli18n-tmp.h:944 +#: src/main/xmli18n-tmp.h:996 msgid "Xerox DocuPrint 4508" msgstr "" -#: src/main/xmli18n-tmp.h:945 +#: src/main/xmli18n-tmp.h:997 msgid "Xerox DocuPrint C20" msgstr "" -#: src/main/xmli18n-tmp.h:946 +#: src/main/xmli18n-tmp.h:998 msgid "Xerox DocuPrint N4512" msgstr "" -#: src/main/xmli18n-tmp.h:947 +#: src/main/xmli18n-tmp.h:999 msgid "Xerox DocuPrint N4512PS" msgstr "" -#: src/main/xmli18n-tmp.h:948 +#: src/main/xmli18n-tmp.h:1000 msgid "Xerox DocuPrint P12" msgstr "" -#: src/main/xmli18n-tmp.h:949 +#: src/main/xmli18n-tmp.h:1001 msgid "Xerox DocuPrint P1202" msgstr "" -#: src/main/xmli18n-tmp.h:950 +#: src/main/xmli18n-tmp.h:1002 msgid "Xerox DocuPrint P8e" msgstr "" -#: src/main/xmli18n-tmp.h:951 +#: src/main/xmli18n-tmp.h:1003 msgid "Xerox Document Centre 400" msgstr "" -#: src/main/xmli18n-tmp.h:952 +#: src/main/xmli18n-tmp.h:1004 msgid "Xerox WorkCentre M118" msgstr "" -#: src/main/xmli18n-tmp.h:953 +#: src/main/xmli18n-tmp.h:1005 msgid "Compaq IJ1200" msgstr "" -#: src/main/xmli18n-tmp.h:954 +#: src/main/xmli18n-tmp.h:1006 msgid "Lexmark X73" msgstr "" -#: src/main/xmli18n-tmp.h:955 +#: src/main/xmli18n-tmp.h:1007 msgid "Lexmark Z42" msgstr "" -#: src/main/xmli18n-tmp.h:956 +#: src/main/xmli18n-tmp.h:1008 msgid "Lexmark Z43" msgstr "" -#: src/main/xmli18n-tmp.h:957 +#: src/main/xmli18n-tmp.h:1009 msgid "Lexmark Z52" msgstr "" -#: src/main/xmli18n-tmp.h:958 +#: src/main/xmli18n-tmp.h:1010 msgid "Lexmark Z53" msgstr "" -#: src/main/xmli18n-tmp.h:959 +#: src/main/xmli18n-tmp.h:1011 msgid "Olympus P-10" msgstr "" -#: src/main/xmli18n-tmp.h:960 +#: src/main/xmli18n-tmp.h:1012 msgid "Olympus P-11" msgstr "" -#: src/main/xmli18n-tmp.h:961 +#: src/main/xmli18n-tmp.h:1013 msgid "Olympus P-200" msgstr "" -#: src/main/xmli18n-tmp.h:962 +#: src/main/xmli18n-tmp.h:1014 msgid "Olympus P-300" msgstr "" -#: src/main/xmli18n-tmp.h:963 +#: src/main/xmli18n-tmp.h:1015 msgid "Olympus P-300E" msgstr "" -#: src/main/xmli18n-tmp.h:964 +#: src/main/xmli18n-tmp.h:1016 msgid "Olympus P-300U" msgstr "" -#: src/main/xmli18n-tmp.h:965 +#: src/main/xmli18n-tmp.h:1017 msgid "Olympus P-330E" msgstr "" -#: src/main/xmli18n-tmp.h:966 +#: src/main/xmli18n-tmp.h:1018 msgid "Olympus P-330NE" msgstr "" -#: src/main/xmli18n-tmp.h:967 +#: src/main/xmli18n-tmp.h:1019 msgid "Olympus P-400" msgstr "" -#: src/main/xmli18n-tmp.h:968 +#: src/main/xmli18n-tmp.h:1020 msgid "Olympus P-440" msgstr "" -#: src/main/xmli18n-tmp.h:969 +#: src/main/xmli18n-tmp.h:1021 msgid "Olympus P-S100" msgstr "" -#: src/main/xmli18n-tmp.h:970 +#: src/main/xmli18n-tmp.h:1022 msgid "Canon CP-10" msgstr "" -#: src/main/xmli18n-tmp.h:971 +#: src/main/xmli18n-tmp.h:1023 msgid "Canon CP-100" msgstr "" -#: src/main/xmli18n-tmp.h:972 +#: src/main/xmli18n-tmp.h:1024 msgid "Canon CP-200" msgstr "" -#: src/main/xmli18n-tmp.h:973 +#: src/main/xmli18n-tmp.h:1025 msgid "Canon CP-220" msgstr "" -#: src/main/xmli18n-tmp.h:974 +#: src/main/xmli18n-tmp.h:1026 msgid "Canon CP-300" msgstr "" -#: src/main/xmli18n-tmp.h:975 +#: src/main/xmli18n-tmp.h:1027 msgid "Canon CP-330" msgstr "" -#: src/main/xmli18n-tmp.h:976 +#: src/main/xmli18n-tmp.h:1028 msgid "Canon SELPHY-CP-400" msgstr "" -#: src/main/xmli18n-tmp.h:977 +#: src/main/xmli18n-tmp.h:1029 msgid "Canon SELPHY-CP-500" msgstr "" -#: src/main/xmli18n-tmp.h:978 +#: src/main/xmli18n-tmp.h:1030 msgid "Canon SELPHY-CP-510" msgstr "" -#: src/main/xmli18n-tmp.h:979 +#: src/main/xmli18n-tmp.h:1031 msgid "Canon SELPHY-CP-600" msgstr "" -#: src/main/xmli18n-tmp.h:980 +#: src/main/xmli18n-tmp.h:1032 msgid "Canon SELPHY-CP-710" msgstr "" -#: src/main/xmli18n-tmp.h:981 +#: src/main/xmli18n-tmp.h:1033 msgid "Canon SELPHY-CP-720" msgstr "" -#: src/main/xmli18n-tmp.h:982 -#, fuzzy +#: src/main/xmli18n-tmp.h:1034 msgid "Canon SELPHY-CP-730" -msgstr "Stylus C60" +msgstr "" -#: src/main/xmli18n-tmp.h:983 +#: src/main/xmli18n-tmp.h:1035 msgid "Canon SELPHY-CP-740" msgstr "" -#: src/main/xmli18n-tmp.h:984 -#, fuzzy +#: src/main/xmli18n-tmp.h:1036 msgid "Canon SELPHY-CP-750" -msgstr "Stylus C60" +msgstr "" -#: src/main/xmli18n-tmp.h:985 +#: src/main/xmli18n-tmp.h:1037 msgid "Canon SELPHY ES1" msgstr "" -#: src/main/xmli18n-tmp.h:986 +#: src/main/xmli18n-tmp.h:1038 msgid "Canon SELPHY ES2" msgstr "" -#: src/main/xmli18n-tmp.h:987 +#: src/main/xmli18n-tmp.h:1039 msgid "Canon SELPHY ES20" msgstr "" -#: src/main/xmli18n-tmp.h:988 +#: src/main/xmli18n-tmp.h:1040 msgid "Sony DPP-EX5" msgstr "" -#: src/main/xmli18n-tmp.h:989 +#: src/main/xmli18n-tmp.h:1041 msgid "Sony DPP-EX7" msgstr "" -#: src/main/xmli18n-tmp.h:990 +#: src/main/xmli18n-tmp.h:1042 msgid "Sony UP-DP10" msgstr "" -#: src/main/xmli18n-tmp.h:991 +#: src/main/xmli18n-tmp.h:1043 msgid "Sony UP-DR100" msgstr "" -#: src/main/xmli18n-tmp.h:992 +#: src/main/xmli18n-tmp.h:1044 msgid "Sony UP-DR150" msgstr "" -#: src/main/xmli18n-tmp.h:993 +#: src/main/xmli18n-tmp.h:1045 msgid "Fujifilm Printpix-CX-400" msgstr "" -#: src/main/xmli18n-tmp.h:994 +#: src/main/xmli18n-tmp.h:1046 msgid "Fujifilm Printpix-CX-550" msgstr "" -#: src/main/xmli18n-tmp.h:995 +#: src/main/xmli18n-tmp.h:1047 msgid "Fujifilm FinePix-NX-500" msgstr "" -#: src/main/xmli18n-tmp.h:996 +#: src/main/xmli18n-tmp.h:1048 msgid "Kodak Easyshare-Printer-Dock" msgstr "" -#: src/main/xmli18n-tmp.h:997 +#: src/main/xmli18n-tmp.h:1049 msgid "Shinko CHC-S9045" msgstr "" -#: src/main/xmli18n-tmp.h:998 +#: src/main/xmli18n-tmp.h:1050 msgid "RAW DATA 16 bit" msgstr "" -#: src/main/xmli18n-tmp.h:999 +#: src/main/xmli18n-tmp.h:1051 msgid "RAW DATA 8 bit" msgstr "" -#: src/gutenprintui/panel.c:274 src/gutenprintui2/panel.c:274 +#: src/gutenprintui2/curve.c:130 +#, fuzzy +msgid "Curve type" +msgstr "Ìáýñï" + +#: src/gutenprintui2/curve.c:131 +msgid "Is this curve linear, spline interpolated, or free-form" +msgstr "" + +#: src/gutenprintui2/curve.c:139 +msgid "Minimum X" +msgstr "" + +#: src/gutenprintui2/curve.c:140 +msgid "Minimum possible value for X" +msgstr "" + +#: src/gutenprintui2/curve.c:149 +msgid "Maximum X" +msgstr "" + +#: src/gutenprintui2/curve.c:150 +msgid "Maximum possible X value" +msgstr "" + +#: src/gutenprintui2/curve.c:159 +msgid "Minimum Y" +msgstr "" + +#: src/gutenprintui2/curve.c:160 +msgid "Minimum possible value for Y" +msgstr "" + +#: src/gutenprintui2/curve.c:169 +msgid "Maximum Y" +msgstr "" + +#: src/gutenprintui2/curve.c:170 +msgid "Maximum possible value for Y" +msgstr "" + +#: src/gutenprintui2/gammacurve.c:418 +msgid "_Gamma value" +msgstr "" + +#: src/gutenprintui2/panel.c:275 #, fuzzy msgid "Inch" -msgstr "ίντσα" +msgstr "ßíôóá" -#: src/gutenprintui/panel.c:274 src/gutenprintui2/panel.c:274 +#: src/gutenprintui2/panel.c:275 msgid "Set the base unit of measurement to inches" msgstr "" -#: src/gutenprintui/panel.c:276 src/gutenprintui2/panel.c:276 +#: src/gutenprintui2/panel.c:277 msgid "cm" msgstr "cm" -#: src/gutenprintui/panel.c:276 src/gutenprintui2/panel.c:276 +#: src/gutenprintui2/panel.c:277 msgid "Set the base unit of measurement to centimetres" msgstr "" # -#: src/gutenprintui/panel.c:278 src/gutenprintui2/panel.c:278 +#: src/gutenprintui2/panel.c:279 #, fuzzy msgid "Points" -msgstr "ΕκτÏπωση" +msgstr "Åêôýðùóç" -#: src/gutenprintui/panel.c:278 src/gutenprintui2/panel.c:278 +#: src/gutenprintui2/panel.c:279 #, fuzzy msgid "Set the base unit of measurement to points (1/72\")" -msgstr "Επιλέγει γÏαμματοσειÏές για επικόλληση" +msgstr "ÅðéëÝãåé ãñáììáôïóåéñÝò ãéá åðéêüëëçóç" -#: src/gutenprintui/panel.c:280 src/gutenprintui2/panel.c:280 +#: src/gutenprintui2/panel.c:281 msgid "mm" msgstr "" -#: src/gutenprintui/panel.c:280 src/gutenprintui2/panel.c:280 +#: src/gutenprintui2/panel.c:281 #, fuzzy msgid "Set the base unit of measurement to millimetres" -msgstr "Επιλέγει γÏαμματοσειÏές για επικόλληση" +msgstr "ÅðéëÝãåé ãñáììáôïóåéñÝò ãéá åðéêüëëçóç" -#: src/gutenprintui/panel.c:282 src/gutenprintui2/panel.c:282 +#: src/gutenprintui2/panel.c:283 msgid "Pica" msgstr "" -#: src/gutenprintui/panel.c:282 src/gutenprintui2/panel.c:282 +#: src/gutenprintui2/panel.c:283 #, fuzzy msgid "Set the base unit of measurement to picas (1/12\")" -msgstr "Επιλέγει γÏαμματοσειÏές για επικόλληση" +msgstr "ÅðéëÝãåé ãñáììáôïóåéñÝò ãéá åðéêüëëçóç" -#: src/gutenprintui/panel.c:289 src/gutenprintui2/panel.c:289 +#: src/gutenprintui2/panel.c:290 #, fuzzy msgid "Color output" -msgstr "ΚÏλιση όταν υπάÏχει νέα έξοδος" +msgstr "Êýëéóç üôáí õðÜñ÷åé íÝá Ýîïäïò" -#: src/gutenprintui/panel.c:291 src/gutenprintui2/panel.c:291 +#: src/gutenprintui2/panel.c:292 msgid "Print in shades of gray using black ink" msgstr "" -#: src/gutenprintui/panel.c:303 src/gutenprintui2/panel.c:303 +#: src/gutenprintui2/panel.c:304 #, fuzzy msgid "Standard Command" -msgstr "Κανονικό" +msgstr "Êáíïíéêü" -#: src/gutenprintui/panel.c:303 src/gutenprintui2/panel.c:303 +#: src/gutenprintui2/panel.c:304 msgid "Use standard print command" msgstr "" # -#: src/gutenprintui/panel.c:304 src/gutenprintui2/panel.c:304 +#: src/gutenprintui2/panel.c:305 #, fuzzy msgid "Custom Command" -msgstr "Εντολή:" +msgstr "ÅíôïëÞ:" -#: src/gutenprintui/panel.c:304 src/gutenprintui2/panel.c:304 +#: src/gutenprintui2/panel.c:305 msgid "Use custom print command" msgstr "" # -#: src/gutenprintui/panel.c:305 src/gutenprintui/plist.c:704 -#: src/gutenprintui/plist.c:787 src/gutenprintui2/panel.c:305 -#: src/gutenprintui2/plist.c:707 src/gutenprintui2/plist.c:790 +#: src/gutenprintui2/panel.c:306 src/gutenprintui2/plist.c:710 +#: src/gutenprintui2/plist.c:793 msgid "File" -msgstr "ΑÏχείο" +msgstr "Áñ÷åßï" -#: src/gutenprintui/panel.c:305 src/gutenprintui2/panel.c:305 +#: src/gutenprintui2/panel.c:306 #, fuzzy msgid "Print to a file" -msgstr "ΕκτÏπωση σε ΑÏχείο" +msgstr "Åêôýðùóç óå Áñ÷åßï" -#: src/gutenprintui/panel.c:521 src/gutenprintui2/panel.c:521 +#: src/gutenprintui2/panel.c:522 msgid "Edit Curve..." msgstr "" -#: src/gutenprintui/panel.c:532 src/gutenprintui2/panel.c:532 +#: src/gutenprintui2/panel.c:533 #, fuzzy msgid "Set Default" -msgstr "ΟÏισμός ΠÏοκαθοÏισμένων Τιμών" +msgstr "Ïñéóìüò ÐñïêáèïñéóìÝíùí Ôéìþí" -#: src/gutenprintui/panel.c:534 src/gutenprintui2/panel.c:534 +#: src/gutenprintui2/panel.c:535 msgid "Restore Previous" msgstr "" # -#: src/gutenprintui/panel.c:536 src/gutenprintui/panel.c:1532 -#: src/gutenprintui/panel.c:1787 src/gutenprintui/panel.c:1819 -#: src/gutenprintui2/panel.c:536 src/gutenprintui2/panel.c:1533 -#: src/gutenprintui2/panel.c:1787 src/gutenprintui2/panel.c:1819 +#: src/gutenprintui2/panel.c:537 src/gutenprintui2/panel.c:1708 +#: src/gutenprintui2/panel.c:1962 src/gutenprintui2/panel.c:1994 msgid "OK" -msgstr "Εντάξει" +msgstr "ÅíôÜîåé" # -#: src/gutenprintui/panel.c:538 src/gutenprintui/panel.c:1197 -#: src/gutenprintui/panel.c:1534 src/gutenprintui/panel.c:1789 -#: src/gutenprintui2/panel.c:538 src/gutenprintui2/panel.c:1198 -#: src/gutenprintui2/panel.c:1535 src/gutenprintui2/panel.c:1789 +#: src/gutenprintui2/panel.c:539 src/gutenprintui2/panel.c:1373 +#: src/gutenprintui2/panel.c:1710 src/gutenprintui2/panel.c:1964 msgid "Cancel" -msgstr "ΑκÏÏωση" +msgstr "Áêýñùóç" + +#: src/gutenprintui2/panel.c:641 +#, fuzzy +msgid "Select File..." +msgstr "Ñýèìéóç ÅêôõðùôÞ" + +#: src/gutenprintui2/panel.c:1018 +msgid "Reset" +msgstr "" -#: src/gutenprintui/panel.c:1180 src/gutenprintui2/panel.c:1181 +#: src/gutenprintui2/panel.c:1356 #, fuzzy, c-format msgid "%s -- Print v%s" -msgstr "%s έκδοση %s" +msgstr "%s Ýêäïóç %s" # -#: src/gutenprintui/panel.c:1189 src/gutenprintui2/panel.c:1190 +#: src/gutenprintui2/panel.c:1365 msgid "About" -msgstr "ΠεÏί" +msgstr "Ðåñß" -#: src/gutenprintui/panel.c:1191 src/gutenprintui2/panel.c:1192 +#: src/gutenprintui2/panel.c:1367 #, fuzzy msgid "" "Print and\n" "Save Settings" -msgstr "Αποθήκευση Ρυθμίσεων" +msgstr "ÁðïèÞêåõóç Ñõèìßóåùí" -#: src/gutenprintui/panel.c:1193 src/gutenprintui2/panel.c:1194 +#: src/gutenprintui2/panel.c:1369 #, fuzzy msgid "" "Save\n" "Settings" -msgstr "Αποθήκευση Ρυθμίσεων" +msgstr "ÁðïèÞêåõóç Ñõèìßóåùí" # -#: src/gutenprintui/panel.c:1195 src/gutenprintui2/panel.c:1196 +#: src/gutenprintui2/panel.c:1371 msgid "Print" -msgstr "ΕκτÏπωση" +msgstr "Åêôýðùóç" # -#: src/gutenprintui/panel.c:1247 src/gutenprintui2/panel.c:1248 +#: src/gutenprintui2/panel.c:1423 msgid "Preview" -msgstr "ΠÏοεπισκόπηση" +msgstr "Ðñïåðéóêüðçóç" -#: src/gutenprintui/panel.c:1272 src/gutenprintui2/panel.c:1273 +#: src/gutenprintui2/panel.c:1448 msgid "" "Position the image on the page.\n" "Click and drag with the primary button to position the image.\n" @@ -6776,573 +7206,520 @@ msgid "" msgstr "" # -#: src/gutenprintui/panel.c:1319 src/gutenprintui2/panel.c:1320 +#: src/gutenprintui2/panel.c:1495 #, fuzzy msgid "Paper Size" -msgstr "Μέγεθος" +msgstr "ÌÝãåèïò" -#: src/gutenprintui/panel.c:1342 src/gutenprintui2/panel.c:1343 +#: src/gutenprintui2/panel.c:1518 msgid "Show All Paper Sizes" msgstr "" -#: src/gutenprintui/panel.c:1358 src/gutenprintui2/panel.c:1359 +#: src/gutenprintui2/panel.c:1534 msgid "Dimensions:" -msgstr "Διαστάσεις:" +msgstr "ÄéáóôÜóåéò:" -#: src/gutenprintui/panel.c:1363 src/gutenprintui/panel.c:2063 -#: src/gutenprintui2/panel.c:1364 src/gutenprintui2/panel.c:2063 +#: src/gutenprintui2/panel.c:1539 src/gutenprintui2/panel.c:2238 msgid "Width:" -msgstr "Πλάτος:" +msgstr "ÐëÜôïò:" -#: src/gutenprintui/panel.c:1364 src/gutenprintui2/panel.c:1365 +#: src/gutenprintui2/panel.c:1540 #, fuzzy msgid "Width of the paper that you wish to print to" -msgstr "Επιλέξτε τον φάκελο που θέλετε να ανοίξετε" +msgstr "ÅðéëÝîôå ôïí öÜêåëï ðïõ èÝëåôå íá áíïßîåôå" -#: src/gutenprintui/panel.c:1368 src/gutenprintui/panel.c:2065 -#: src/gutenprintui2/panel.c:1369 src/gutenprintui2/panel.c:2065 +#: src/gutenprintui2/panel.c:1544 src/gutenprintui2/panel.c:2240 msgid "Height:" -msgstr "Ύψος:" +msgstr "¾øïò:" -#: src/gutenprintui/panel.c:1369 src/gutenprintui2/panel.c:1370 +#: src/gutenprintui2/panel.c:1545 #, fuzzy msgid "Height of the paper that you wish to print to" -msgstr "Επιλέξτε τον φάκελο που θέλετε να ανοίξετε" +msgstr "ÅðéëÝîôå ôïí öÜêåëï ðïõ èÝëåôå íá áíïßîåôå" # -#: src/gutenprintui/panel.c:1374 src/gutenprintui2/panel.c:1375 +#: src/gutenprintui2/panel.c:1550 #, fuzzy msgid "Automatic Paper Size" -msgstr "Μέγεθος" +msgstr "ÌÝãåèïò" -#: src/gutenprintui/panel.c:1391 src/gutenprintui2/panel.c:1392 +#: src/gutenprintui2/panel.c:1567 msgid "Number of Copies" msgstr "" -#: src/gutenprintui/panel.c:1403 src/gutenprintui2/panel.c:1404 +#: src/gutenprintui2/panel.c:1579 msgid "Select the number of copies to print; a value between 1 and 100" msgstr "" -#: src/gutenprintui/panel.c:1435 src/gutenprintui2/panel.c:1436 +#: src/gutenprintui2/panel.c:1611 #, fuzzy msgid "Image Position" -msgstr "Θέση" +msgstr "ÈÝóç" -#: src/gutenprintui/panel.c:1452 src/gutenprintui2/panel.c:1453 +#: src/gutenprintui2/panel.c:1628 msgid "Auto" -msgstr "Αυτόματο" +msgstr "Áõôüìáôï" # Not sure how the terms "portrait" and "landscape" are usually # translated; if anyone knows what the term in the Greek version # of MSWindoze is and if it is better (or equally good), maybe we # would want to use that for consistency and for the sake of newbies? -#: src/gutenprintui/panel.c:1454 src/gutenprintui2/panel.c:1455 +#: src/gutenprintui2/panel.c:1630 msgid "Portrait" -msgstr "ΠοÏÏ„Ïαίτο" +msgstr "Ðïñôñáßôï" -#: src/gutenprintui/panel.c:1456 src/gutenprintui2/panel.c:1457 +#: src/gutenprintui2/panel.c:1632 msgid "Landscape" -msgstr "ΟÏιζόντιος" +msgstr "Ïñéæüíôéïò" -#: src/gutenprintui/panel.c:1458 src/gutenprintui2/panel.c:1459 +#: src/gutenprintui2/panel.c:1634 #, fuzzy msgid "Upside down" -msgstr "Ανάποδα" +msgstr "ÁíÜðïäá" -#: src/gutenprintui/panel.c:1460 src/gutenprintui2/panel.c:1461 +#: src/gutenprintui2/panel.c:1636 msgid "Seascape" -msgstr "Tοπίο" +msgstr "Tïðßï" -#: src/gutenprintui/panel.c:1464 src/gutenprintui2/panel.c:1465 +#: src/gutenprintui2/panel.c:1640 msgid "" "Select the orientation: portrait, landscape, upside down, or seascape " "(upside down landscape)" msgstr "" -#: src/gutenprintui/panel.c:1466 src/gutenprintui2/panel.c:1467 +#: src/gutenprintui2/panel.c:1642 #, fuzzy msgid "Orientation:" -msgstr "ΠÏοσανατολισμός" +msgstr "Ðñïóáíáôïëéóìüò" -#: src/gutenprintui/panel.c:1477 src/gutenprintui2/panel.c:1478 +#: src/gutenprintui2/panel.c:1653 msgid "Left:" -msgstr "ΑÏιστεÏά:" +msgstr "ÁñéóôåñÜ:" -#: src/gutenprintui/panel.c:1478 src/gutenprintui2/panel.c:1479 +#: src/gutenprintui2/panel.c:1654 msgid "Distance from the left of the paper to the image" msgstr "" -#: src/gutenprintui/panel.c:1481 src/gutenprintui/panel.c:1485 -#: src/gutenprintui2/panel.c:1482 src/gutenprintui2/panel.c:1486 +#: src/gutenprintui2/panel.c:1657 src/gutenprintui2/panel.c:1661 msgid "Right:" -msgstr "Δεξιά:" +msgstr "ÄåîéÜ:" -#: src/gutenprintui/panel.c:1482 src/gutenprintui2/panel.c:1483 +#: src/gutenprintui2/panel.c:1658 #, fuzzy msgid "Distance from the left of the paper to the right of the image" -msgstr "Εστίαση για Ï€ÏοσαÏμογή του Ïψους της σελίδας" +msgstr "Åóôßáóç ãéá ðñïóáñìïãÞ ôïõ ýøïõò ôçò óåëßäáò" -#: src/gutenprintui/panel.c:1486 src/gutenprintui2/panel.c:1487 +#: src/gutenprintui2/panel.c:1662 msgid "Distance from the right of the paper to the image" msgstr "" -#: src/gutenprintui/panel.c:1488 src/gutenprintui2/panel.c:1489 +#: src/gutenprintui2/panel.c:1664 msgid "Top:" -msgstr "Πάνω:" +msgstr "ÐÜíù:" -#: src/gutenprintui/panel.c:1489 src/gutenprintui2/panel.c:1490 +#: src/gutenprintui2/panel.c:1665 msgid "Distance from the top of the paper to the image" msgstr "" -#: src/gutenprintui/panel.c:1492 src/gutenprintui/panel.c:1496 -#: src/gutenprintui2/panel.c:1493 src/gutenprintui2/panel.c:1497 +#: src/gutenprintui2/panel.c:1668 src/gutenprintui2/panel.c:1672 msgid "Bottom:" -msgstr "Κάτω:" +msgstr "ÊÜôù:" -#: src/gutenprintui/panel.c:1493 src/gutenprintui2/panel.c:1494 +#: src/gutenprintui2/panel.c:1669 #, fuzzy msgid "Distance from the top of the paper to bottom of the image" -msgstr "Εστίαση για Ï€ÏοσαÏμογή του Ïψους της σελίδας" +msgstr "Åóôßáóç ãéá ðñïóáñìïãÞ ôïõ ýøïõò ôçò óåëßäáò" -#: src/gutenprintui/panel.c:1497 src/gutenprintui2/panel.c:1498 +#: src/gutenprintui2/panel.c:1673 msgid "Distance from the bottom of the paper to the image" msgstr "" -#: src/gutenprintui/panel.c:1507 src/gutenprintui2/panel.c:1508 +#: src/gutenprintui2/panel.c:1683 #, fuzzy msgid "Center:" -msgstr "ΚέντÏο" +msgstr "ÊÝíôñï" -#: src/gutenprintui/panel.c:1510 src/gutenprintui2/panel.c:1511 +#: src/gutenprintui2/panel.c:1686 #, fuzzy msgid "Horizontal" -msgstr "_ΟÏιζόντια" +msgstr "_Ïñéæüíôéá" -#: src/gutenprintui/panel.c:1511 src/gutenprintui2/panel.c:1512 +#: src/gutenprintui2/panel.c:1687 msgid "Center the image horizontally on the paper" msgstr "" # -#: src/gutenprintui/panel.c:1513 src/gutenprintui2/panel.c:1514 +#: src/gutenprintui2/panel.c:1689 msgid "Both" -msgstr "Και τα δÏο" +msgstr "Êáé ôá äýï" -#: src/gutenprintui/panel.c:1514 src/gutenprintui2/panel.c:1515 +#: src/gutenprintui2/panel.c:1690 #, fuzzy msgid "Center the image on the paper" -msgstr "Αλλαγή του μεγέθους σελίδας" +msgstr "ÁëëáãÞ ôïõ ìåãÝèïõò óåëßäáò" -#: src/gutenprintui/panel.c:1516 src/gutenprintui2/panel.c:1517 +#: src/gutenprintui2/panel.c:1692 #, fuzzy msgid "Vertical" -msgstr "ΚατακόÏÏ…_φα" +msgstr "Êáôáêüñõ_öá" -#: src/gutenprintui/panel.c:1517 src/gutenprintui2/panel.c:1518 +#: src/gutenprintui2/panel.c:1693 #, fuzzy msgid "Center the image vertically on the paper" -msgstr "ΠεÏιστÏοφή εικόνας για κάθετα ταμπλώ" +msgstr "ÐåñéóôñïöÞ åéêüíáò ãéá êÜèåôá ôáìðëþ" -#: src/gutenprintui/panel.c:1530 src/gutenprintui2/panel.c:1531 +#: src/gutenprintui2/panel.c:1706 msgid "Setup Printer" -msgstr "ΡÏθμιση Εκτυπωτή" +msgstr "Ñýèìéóç ÅêôõðùôÞ" -#: src/gutenprintui/panel.c:1555 src/gutenprintui2/panel.c:1555 +#: src/gutenprintui2/panel.c:1730 #, fuzzy msgid "Printer Make:" -msgstr "Όνομα εκτυπωτή:" +msgstr "¼íïìá åêôõðùôÞ:" # -#: src/gutenprintui/panel.c:1566 src/gutenprintui2/panel.c:1566 +#: src/gutenprintui2/panel.c:1741 #, fuzzy msgid "Select the make of your printer" -msgstr "Επιλογή εκτυπωτή" +msgstr "ÅðéëïãÞ åêôõðùôÞ" -#: src/gutenprintui/panel.c:1584 src/gutenprintui/panel.c:1672 -#: src/gutenprintui/panel.c:1890 src/gutenprintui2/panel.c:1584 -#: src/gutenprintui2/panel.c:1672 src/gutenprintui2/panel.c:1890 +#: src/gutenprintui2/panel.c:1759 src/gutenprintui2/panel.c:1847 +#: src/gutenprintui2/panel.c:2065 #, fuzzy msgid "Printer Model:" -msgstr "Όνομα εκτυπωτή:" +msgstr "¼íïìá åêôõðùôÞ:" # -#: src/gutenprintui/panel.c:1595 src/gutenprintui2/panel.c:1595 +#: src/gutenprintui2/panel.c:1770 #, fuzzy msgid "Select your printer model" -msgstr "Επιλογή εκτυπωτή" +msgstr "ÅðéëïãÞ åêôõðùôÞ" -#: src/gutenprintui/panel.c:1643 src/gutenprintui2/panel.c:1643 +#: src/gutenprintui2/panel.c:1818 #, fuzzy msgid "PPD File:" -msgstr "ΑÏχείο Ταυτότητας ΔιεÏγασίας: " +msgstr "Áñ÷åßï Ôáõôüôçôáò Äéåñãáóßáò: " -#: src/gutenprintui/panel.c:1659 src/gutenprintui2/panel.c:1659 +#: src/gutenprintui2/panel.c:1834 msgid "Enter the correct PPD filename for your printer" msgstr "" # -#: src/gutenprintui/panel.c:1661 src/gutenprintui/panel.c:1741 -#: src/gutenprintui2/panel.c:1661 src/gutenprintui2/panel.c:1741 +#: src/gutenprintui2/panel.c:1836 src/gutenprintui2/panel.c:1916 msgid "Browse" -msgstr "ΕξεÏεÏνηση" +msgstr "Åîåñåýíçóç" -#: src/gutenprintui/panel.c:1668 src/gutenprintui2/panel.c:1668 +#: src/gutenprintui2/panel.c:1843 msgid "Choose the correct PPD filename for your printer" msgstr "" -#: src/gutenprintui/panel.c:1710 src/gutenprintui2/panel.c:1710 +#: src/gutenprintui2/panel.c:1885 msgid "" "Select the name of the output queue (not the type, or model, of printer) " "that you wish to print to" msgstr "" -#: src/gutenprintui/panel.c:1712 src/gutenprintui2/panel.c:1712 +#: src/gutenprintui2/panel.c:1887 #, fuzzy msgid "Printer Queue:" -msgstr "Όνομα εκτυπωτή:" +msgstr "¼íïìá åêôõðùôÞ:" -#: src/gutenprintui/panel.c:1728 src/gutenprintui2/panel.c:1728 +#: src/gutenprintui2/panel.c:1903 msgid "Enter the correct command to print to your printer. " msgstr "" -#: src/gutenprintui/panel.c:1739 src/gutenprintui2/panel.c:1739 +#: src/gutenprintui2/panel.c:1914 msgid "Enter the file to print to. " msgstr "" -#: src/gutenprintui/panel.c:1747 src/gutenprintui2/panel.c:1747 +#: src/gutenprintui2/panel.c:1922 #, fuzzy msgid "File to print to" -msgstr "Τίτλοι Ï€Ïος εκτÏπωση" +msgstr "Ôßôëïé ðñïò åêôýðùóç" -#: src/gutenprintui/panel.c:1755 src/gutenprintui2/panel.c:1755 +#: src/gutenprintui2/panel.c:1930 #, fuzzy msgid "Print To File" -msgstr "ΕκτÏπωση σε ΑÏχείο" +msgstr "Åêôýðùóç óå Áñ÷åßï" # -#: src/gutenprintui/panel.c:1785 src/gutenprintui2/panel.c:1785 +#: src/gutenprintui2/panel.c:1960 #, fuzzy msgid "Define New Printer" -msgstr "Επιλογή εκτυπωτή" +msgstr "ÅðéëïãÞ åêôõðùôÞ" -#: src/gutenprintui/panel.c:1803 src/gutenprintui/panel.c:1887 -#: src/gutenprintui2/panel.c:1803 src/gutenprintui2/panel.c:1887 +#: src/gutenprintui2/panel.c:1978 src/gutenprintui2/panel.c:2062 #, fuzzy msgid "Printer Name:" -msgstr "Όνομα εκτυπωτή:" +msgstr "¼íïìá åêôõðùôÞ:" -#: src/gutenprintui/panel.c:1807 src/gutenprintui2/panel.c:1807 +#: src/gutenprintui2/panel.c:1982 #, fuzzy msgid "Enter the name you wish to give this logical printer" -msgstr "Εισάγετε τον αÏιθμό γÏαμμής στον οποίο θέλετε να πάτε." +msgstr "ÅéóÜãåôå ôïí áñéèìü ãñáììÞò óôïí ïðïßï èÝëåôå íá ðÜôå." -#: src/gutenprintui/panel.c:1817 src/gutenprintui2/panel.c:1817 +#: src/gutenprintui2/panel.c:1992 #, fuzzy msgid "About Gutenprint " -msgstr "Σημείο ΠÏοσάÏτησης: " +msgstr "Óçìåßï ÐñïóÜñôçóçò: " -#: src/gutenprintui/panel.c:1824 src/gutenprintui2/panel.c:1824 +#: src/gutenprintui2/panel.c:1999 #, fuzzy msgid "Gutenprint Version " -msgstr "ΕκτÏπωση σε: " +msgstr "Åêôýðùóç óå: " -#: src/gutenprintui/panel.c:1872 src/gutenprintui2/panel.c:1872 +#: src/gutenprintui2/panel.c:2047 #, fuzzy msgid "Printer Settings" -msgstr "Ρυθμίσεις Επιλογέα" +msgstr "Ñõèìßóåéò ÅðéëïãÝá" -#: src/gutenprintui/panel.c:1885 src/gutenprintui2/panel.c:1885 +#: src/gutenprintui2/panel.c:2060 msgid "" "Select the name of the printer (not the type, or model, of printer) that you " "wish to print to" msgstr "" -#: src/gutenprintui/panel.c:1902 src/gutenprintui2/panel.c:1902 +#: src/gutenprintui2/panel.c:2077 #, fuzzy msgid "Setup Printer..." -msgstr "ΡÏθμιση Εκτυπωτή" +msgstr "Ñýèìéóç ÅêôõðùôÞ" -#: src/gutenprintui/panel.c:1904 src/gutenprintui2/panel.c:1904 +#: src/gutenprintui2/panel.c:2079 msgid "" "Choose the printer model, PPD file, and command that is used to print to " "this printer" msgstr "" # -#: src/gutenprintui/panel.c:1917 src/gutenprintui2/panel.c:1917 +#: src/gutenprintui2/panel.c:2092 #, fuzzy msgid "New Printer..." -msgstr "ΕκτÏπωση..." +msgstr "Åêôýðùóç..." -#: src/gutenprintui/panel.c:1918 src/gutenprintui2/panel.c:1918 +#: src/gutenprintui2/panel.c:2093 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:1948 src/gutenprintui2/panel.c:1948 +#: src/gutenprintui2/panel.c:2123 #, fuzzy msgid "Set Printer Option Defaults" -msgstr "ΟÏισμός ΠÏοκαθοÏισμένων Τιμών" +msgstr "Ïñéóìüò ÐñïêáèïñéóìÝíùí Ôéìþí" -#: src/gutenprintui/panel.c:1949 src/gutenprintui2/panel.c:1949 +#: src/gutenprintui2/panel.c:2124 msgid "Set all printer options to their defaults" msgstr "" # -#: src/gutenprintui/panel.c:1972 src/gutenprintui2/panel.c:1972 +#: src/gutenprintui2/panel.c:2147 #, fuzzy msgid "Image Size" -msgstr "Μέγεθος" +msgstr "ÌÝãåèïò" -#: src/gutenprintui/panel.c:1997 src/gutenprintui2/panel.c:1997 +#: src/gutenprintui2/panel.c:2172 #, fuzzy msgid "Scaling:" -msgstr "Αποθήκευση:" +msgstr "ÁðïèÞêåõóç:" -#: src/gutenprintui/panel.c:2001 src/gutenprintui2/panel.c:2001 +#: src/gutenprintui2/panel.c:2176 #, fuzzy msgid "Set the scale (size) of the image" -msgstr "Ελάττωση του μεγέθους της εικόνας στο μισό" +msgstr "ÅëÜôôùóç ôïõ ìåãÝèïõò ôçò åéêüíáò óôï ìéóü" -#: src/gutenprintui/panel.c:2023 src/gutenprintui2/panel.c:2023 +#: src/gutenprintui2/panel.c:2198 msgid "Scale by:" msgstr "" -#: src/gutenprintui/panel.c:2028 src/gutenprintui2/panel.c:2028 +#: src/gutenprintui2/panel.c:2203 msgid "" "Select whether scaling is measured as percent of available page size or " "number of output dots per inch" msgstr "" -#: src/gutenprintui/panel.c:2031 src/gutenprintui2/panel.c:2031 +#: src/gutenprintui2/panel.c:2206 msgid "Percent" -msgstr "Ποσοστό" +msgstr "Ðïóïóôü" -#: src/gutenprintui/panel.c:2036 src/gutenprintui2/panel.c:2036 +#: src/gutenprintui2/panel.c:2211 #, fuzzy msgid "Scale the print to the size of the page" -msgstr "Ελάττωση του μεγέθους της εικόνας στο μισό" +msgstr "ÅëÜôôùóç ôïõ ìåãÝèïõò ôçò åéêüíáò óôï ìéóü" # -#: src/gutenprintui/panel.c:2040 src/gutenprintui2/panel.c:2040 +#: src/gutenprintui2/panel.c:2215 #, fuzzy msgid "PPI" -msgstr "ΑΡΙΘΜ.ΔΙΕΡΓΑΣΙΑΣ" +msgstr "ÁÑÉÈÌ.ÄÉÅÑÃÁÓÉÁÓ" -#: src/gutenprintui/panel.c:2045 src/gutenprintui2/panel.c:2045 +#: src/gutenprintui2/panel.c:2220 msgid "Scale the print to the number of dots per inch" msgstr "" -#: src/gutenprintui/panel.c:2063 src/gutenprintui2/panel.c:2063 +#: src/gutenprintui2/panel.c:2238 #, fuzzy msgid "Set the width of the print" -msgstr "Το πλάτος του μαÏαφετιοÏ" +msgstr "Ôï ðëÜôïò ôïõ ìáñáöåôéïý" -#: src/gutenprintui/panel.c:2065 src/gutenprintui2/panel.c:2065 +#: src/gutenprintui2/panel.c:2240 #, fuzzy msgid "Set the height of the print" -msgstr "Εστίαση για Ï€ÏοσαÏμογή του Ïψους της σελίδας" +msgstr "Åóôßáóç ãéá ðñïóáñìïãÞ ôïõ ýøïõò ôçò óåëßäáò" -#: src/gutenprintui/panel.c:2071 src/gutenprintui2/panel.c:2071 +#: src/gutenprintui2/panel.c:2246 #, fuzzy msgid "" "Use Original\n" "Image Size" -msgstr "ΑÏχικό _Μέγεθος" +msgstr "Áñ÷éêü _ÌÝãåèïò" -#: src/gutenprintui/panel.c:2077 src/gutenprintui2/panel.c:2077 +#: src/gutenprintui2/panel.c:2252 #, fuzzy msgid "Set the print size to the size of the image" -msgstr "ΟÏισμός παÏαμετÏοποιημένου μεγέθους για την εικόνα" +msgstr "Ïñéóìüò ðáñáìåôñïðïéçìÝíïõ ìåãÝèïõò ãéá ôçí åéêüíá" -#: src/gutenprintui/panel.c:2100 src/gutenprintui2/panel.c:2101 +#: src/gutenprintui2/panel.c:2276 #, fuzzy msgid "Print Color Adjust" -msgstr "ΠÏωτεÏωντα ΧÏώματα" +msgstr "Ðñùôåýùíôá ×ñþìáôá" -#: src/gutenprintui/panel.c:2103 src/gutenprintui2/panel.c:2104 +#: src/gutenprintui2/panel.c:2279 #, fuzzy msgid "Set Defaults" -msgstr "ΟÏισμός ΠÏοκαθοÏισμένων Τιμών" +msgstr "Ïñéóìüò ÐñïêáèïñéóìÝíùí Ôéìþí" # -#: src/gutenprintui/panel.c:2105 src/gutenprintui2/panel.c:2106 +#: src/gutenprintui2/panel.c:2281 msgid "Close" -msgstr "Κλείσιμο" +msgstr "Êëåßóéìï" -#: src/gutenprintui/panel.c:2134 src/gutenprintui2/panel.c:2135 +#: src/gutenprintui2/panel.c:2310 #, fuzzy msgid "Image preview" -msgstr "ΠαÏατηÏητής Εικόνων" +msgstr "ÐáñáôçñçôÞò Åéêüíùí" -#: src/gutenprintui/panel.c:2148 src/gutenprintui2/panel.c:2149 +#: src/gutenprintui2/panel.c:2324 msgid "View Output Channels:" msgstr "" -#: src/gutenprintui/panel.c:2234 src/gutenprintui2/panel.c:2240 +#: src/gutenprintui2/panel.c:2415 #, fuzzy msgid "Output" -msgstr "Byte Εξόδου" +msgstr "Byte Åîüäïõ" -#: src/gutenprintui/panel.c:2262 src/gutenprintui2/panel.c:2268 +#: src/gutenprintui2/panel.c:2443 #, fuzzy msgid "Output Type:" -msgstr "Byte Εξόδου" +msgstr "Byte Åîüäïõ" -#: src/gutenprintui/panel.c:2266 src/gutenprintui2/panel.c:2272 +#: src/gutenprintui2/panel.c:2447 #, fuzzy msgid "Select the desired output type" -msgstr "Επιλογή αÏχείου Ï€Ïος αποθήκευση" +msgstr "ÅðéëïãÞ áñ÷åßïõ ðñïò áðïèÞêåõóç" -#: src/gutenprintui/panel.c:2287 src/gutenprintui2/panel.c:2293 +#: src/gutenprintui2/panel.c:2468 msgid "Adjust Output..." msgstr "" -#: src/gutenprintui/panel.c:2296 src/gutenprintui2/panel.c:2302 +#: src/gutenprintui2/panel.c:2477 msgid "" "Adjust color balance, brightness, contrast, saturation, and dither algorithm" msgstr "" -#: src/gutenprintui/panel.c:2314 src/gutenprintui2/panel.c:2321 +#: src/gutenprintui2/panel.c:2496 #, fuzzy msgid "Size Units:" -msgstr "&Μονάδες:" +msgstr "&ÌïíÜäåò:" -#: src/gutenprintui/panel.c:2317 src/gutenprintui2/panel.c:2324 +#: src/gutenprintui2/panel.c:2499 #, fuzzy msgid " " msgstr "> " -#: src/gutenprintui/panel.c:2341 src/gutenprintui2/panel.c:2348 +#: src/gutenprintui2/panel.c:2523 #, fuzzy msgid "Units:" -msgstr "&Μονάδες:" +msgstr "&ÌïíÜäåò:" -#: src/gutenprintui/panel.c:2346 src/gutenprintui2/panel.c:2353 +#: src/gutenprintui2/panel.c:2528 #, fuzzy msgid "Select the base unit of measurement for printing" -msgstr "Επιλέγει γÏαμματοσειÏές για επικόλληση" +msgstr "ÅðéëÝãåé ãñáììáôïóåéñÝò ãéá åðéêüëëçóç" -#: src/gutenprintui/plist.c:90 src/gutenprintui/plist.c:99 -#: src/gutenprintui2/plist.c:89 src/gutenprintui2/plist.c:98 +#: src/gutenprintui2/plist.c:92 src/gutenprintui2/plist.c:101 msgid "System V lp" msgstr "" -#: src/gutenprintui/plist.c:96 src/gutenprintui2/plist.c:95 +#: src/gutenprintui2/plist.c:98 msgid "CUPS" msgstr "" -#: src/gutenprintui/plist.c:102 src/gutenprintui2/plist.c:101 +#: src/gutenprintui2/plist.c:104 msgid "Berkeley lpd (/etc/lpc)" msgstr "" -#: src/gutenprintui/plist.c:105 src/gutenprintui2/plist.c:104 +#: src/gutenprintui2/plist.c:107 msgid "Berkeley lpd (/usr/bsd/lpc)" msgstr "" -#: src/gutenprintui/plist.c:108 src/gutenprintui2/plist.c:107 +#: src/gutenprintui2/plist.c:110 msgid "Berkeley lpd (/usr/etc/lpc" msgstr "" -#: src/gutenprintui/plist.c:111 src/gutenprintui2/plist.c:110 +#: src/gutenprintui2/plist.c:113 msgid "Berkeley lpd (/usr/libexec/lpc)" msgstr "" -#: src/gutenprintui/plist.c:114 src/gutenprintui2/plist.c:113 +#: src/gutenprintui2/plist.c:116 msgid "Berkeley lpd (/usr/sbin/lpc)" msgstr "" # -#: src/gutenprintui/plist.c:1043 src/gutenprintui2/plist.c:1057 +#: src/gutenprintui2/plist.c:1060 #, fuzzy msgid "Printer" -msgstr "ΕκτÏπωση" +msgstr "Åêôýðùóç" -#: src/gutenprintui/plist.c:1230 src/gutenprintui2/plist.c:1250 +#: src/gutenprintui2/plist.c:1253 #, fuzzy msgid "(Default Printer)" -msgstr "ΡÏθμιση Εκτυπωτή" - -#: src/gutenprintui2/curve.c:130 -#, fuzzy -msgid "Curve type" -msgstr "ΜαÏÏο" - -#: src/gutenprintui2/curve.c:131 -msgid "Is this curve linear, spline interpolated, or free-form" -msgstr "" - -#: src/gutenprintui2/curve.c:139 -msgid "Minimum X" -msgstr "" - -#: src/gutenprintui2/curve.c:140 -msgid "Minimum possible value for X" -msgstr "" - -#: src/gutenprintui2/curve.c:149 -msgid "Maximum X" -msgstr "" - -#: src/gutenprintui2/curve.c:150 -msgid "Maximum possible X value" -msgstr "" - -#: src/gutenprintui2/curve.c:159 -msgid "Minimum Y" -msgstr "" - -#: src/gutenprintui2/curve.c:160 -msgid "Minimum possible value for Y" -msgstr "" - -#: src/gutenprintui2/curve.c:169 -msgid "Maximum Y" -msgstr "" - -#: src/gutenprintui2/curve.c:170 -msgid "Maximum possible value for Y" -msgstr "" - -#: src/gutenprintui2/gammacurve.c:418 -msgid "_Gamma value" -msgstr "" +msgstr "Ñýèìéóç ÅêôõðùôÞ" #: src/cups/genppd.c:145 #, fuzzy msgid "Printer Features" -msgstr "Ρυθμίσεις Επιλογέα" +msgstr "Ñõèìßóåéò ÅðéëïãÝá" #: src/cups/genppd.c:146 #, fuzzy msgid "Output Control" -msgstr "Byte Εξόδου" +msgstr "Byte Åîüäïõ" # #: src/cups/genppd.c:151 #, fuzzy msgid "Common" -msgstr "Εντολή:" +msgstr "ÅíôïëÞ:" #: src/cups/genppd.c:152 #, fuzzy msgid "Extra 1" -msgstr "Δοκιμή" +msgstr "ÄïêéìÞ" #: src/cups/genppd.c:153 #, fuzzy msgid "Extra 2" -msgstr "Δοκιμή" +msgstr "ÄïêéìÞ" #: src/cups/genppd.c:154 #, fuzzy msgid "Extra 3" -msgstr "Δοκιμή" +msgstr "ÄïêéìÞ" #: src/cups/genppd.c:155 #, fuzzy msgid "Extra 4" -msgstr "Δοκιμή" +msgstr "ÄïêéìÞ" #: src/cups/genppd.c:156 msgid "Extra 5" @@ -7351,56 +7728,56 @@ msgstr "" #. 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:1058 +#: src/cups/genppd.c:1064 msgid "English" msgstr "Greek" #. TRANSLATORS: Specify PPD translation encoding e.g. ISOLatin1 -#: src/cups/genppd.c:1060 +#: src/cups/genppd.c:1066 #, fuzzy msgid "ISOLatin1" -msgstr "Λάτιν" +msgstr "ËÜôéí" -#: src/cups/genppd.c:1641 +#: src/cups/genppd.c:1647 msgid "2-Sided Printing" msgstr "" -#: src/cups/genppd.c:1665 +#: src/cups/genppd.c:1671 msgid "Shrink Page If Necessary to Fit Borders" msgstr "" -#: src/cups/genppd.c:1669 +#: src/cups/genppd.c:1675 msgid "Shrink (print the whole page)" msgstr "" -#: src/cups/genppd.c:1670 +#: src/cups/genppd.c:1676 msgid "Crop (preserve dimensions)" msgstr "" -#: src/cups/genppd.c:1671 +#: src/cups/genppd.c:1677 msgid "Expand (use maximum page area)" msgstr "" -#: src/cups/genppd.c:1756 +#: src/cups/genppd.c:1762 msgid "No" msgstr "" -#: src/cups/genppd.c:1758 +#: src/cups/genppd.c:1764 msgid "Yes" msgstr "" -#: src/cups/genppd.c:1795 src/cups/genppd.c:1857 +#: src/cups/genppd.c:1801 src/cups/genppd.c:1863 msgid "Value" msgstr "" -#: src/cups/genppd.c:1800 +#: src/cups/genppd.c:1806 msgid "Fine Adjustment" msgstr "" #: src/escputil/escputil.c:70 #, fuzzy msgid "Escputil version " -msgstr "%s έκδοση %s" +msgstr "%s Ýêäïóç %s" #: src/escputil/escputil.c:76 msgid "" @@ -7514,12 +7891,12 @@ msgstr "" #: src/escputil/escputil.c:333 src/escputil/escputil.c:341 #, fuzzy, c-format msgid "You may only specify one printer or raw device." -msgstr "ΜποÏείτε να αποθηκεÏσετε μια μόνο διεÏθυνση τη φοÏά.\n" +msgstr "Ìðïñåßôå íá áðïèçêåýóåôå ìéá ìüíï äéåýèõíóç ôç öïñÜ.\n" #: src/escputil/escputil.c:349 #, fuzzy, c-format msgid "You may only specify one printer model." -msgstr "ΜποÏείτε να αποθηκεÏσετε μια μόνο διεÏθυνση τη φοÏά.\n" +msgstr "Ìðïñåßôå íá áðïèçêåýóåôå ìéá ìüíï äéåýèõíóç ôç öïñÜ.\n" #: src/escputil/escputil.c:373 #, c-format @@ -7534,7 +7911,7 @@ msgstr "" #: src/escputil/escputil.c:385 #, fuzzy, c-format msgid "Unknown option %c\n" -msgstr "Άγνωστος κωδικός op %u" +msgstr "¶ãíùóôïò êùäéêüò op %u" #: src/escputil/escputil.c:393 #, c-format @@ -7554,17 +7931,17 @@ msgstr "" #: src/escputil/escputil.c:463 #, fuzzy, c-format msgid "Cannot open device %s: %s\n" -msgstr "Άνοιγμα αÏχείου %s αδÏνατον\n" +msgstr "¶íïéãìá áñ÷åßïõ %s áäýíáôïí\n" #: src/escputil/escputil.c:486 #, fuzzy, c-format msgid "Cannot print to printer %s with %s\n" -msgstr "Δεν είναι δυνατό να γίνει καταχώÏηση αποθήκευσης με κέλυφος" +msgstr "Äåí åßíáé äõíáôü íá ãßíåé êáôá÷þñçóç áðïèÞêåõóçò ìå êÝëõöïò" #: src/escputil/escputil.c:502 src/escputil/escputil.c:512 #, fuzzy, c-format msgid "Unable to send command to printer\n" -msgstr "Ανεπιτυχής σÏνδεση στο πιλότο" +msgstr "Áíåðéôõ÷Þò óýíäåóç óôï ðéëüôï" #: src/escputil/escputil.c:572 #, c-format @@ -7574,7 +7951,7 @@ msgstr "" #: src/escputil/escputil.c:577 #, fuzzy, c-format msgid "Cannot read from %s: %s\n" -msgstr "Δεν είναι δυνατό να ελεγχθεί ο φάκελος: %s: %s" +msgstr "Äåí åßíáé äõíáôü íá åëåã÷èåß ï öÜêåëïò: %s: %s" #: src/escputil/escputil.c:729 #, c-format @@ -7584,17 +7961,17 @@ msgstr "" #: src/escputil/escputil.c:736 #, fuzzy, c-format msgid "Cannot open %s read/write: %s\n" -msgstr "Άνοιγμα αÏχείου %s αδÏνατον\n" +msgstr "¶íïéãìá áñ÷åßïõ %s áäýíáôïí\n" #: src/escputil/escputil.c:783 #, fuzzy, c-format msgid "Unknown printer %s!\n" -msgstr "Άγνωστος κωδικός op %u" +msgstr "¶ãíùóôïò êùäéêüò op %u" #: src/escputil/escputil.c:819 src/escputil/escputil.c:1414 #, fuzzy, c-format msgid "Cannot write to %s: %s\n" -msgstr "ΕγγÏαφή αδÏνατη: %s" +msgstr "ÅããñáöÞ áäýíáôç: %s" #: src/escputil/escputil.c:865 src/escputil/escputil.c:1379 #: src/escputil/escputil.c:1507 @@ -7602,7 +7979,7 @@ msgstr "ΕγγÏαφή αδÏνατη: %s" msgid "" "\n" "Cannot write to %s: %s\n" -msgstr "ΕγγÏαφή αδÏνατη: %s" +msgstr "ÅããñáöÞ áäýíáôç: %s" #: src/escputil/escputil.c:908 #, c-format @@ -7636,7 +8013,7 @@ msgstr "" #: src/escputil/escputil.c:1030 #, fuzzy, c-format msgid "Status: Waiting\n" -msgstr "ΚοÏεσμός:" +msgstr "Êïñåóìüò:" #: src/escputil/escputil.c:1033 #, c-format @@ -7691,12 +8068,12 @@ msgstr "" #: src/escputil/escputil.c:1071 #, fuzzy, c-format msgid "Error: Ink out\n" -msgstr "Σφάλμα Ï€Ïοσθήκης λίστας" +msgstr "ÓöÜëìá ðñïóèÞêçò ëßóôáò" #: src/escputil/escputil.c:1074 #, fuzzy, c-format msgid "Error: Paper out\n" -msgstr "Σφάλμα Ï€Ïοσθήκης λίστας" +msgstr "ÓöÜëìá ðñïóèÞêçò ëßóôáò" #: src/escputil/escputil.c:1077 #, c-format @@ -7751,14 +8128,14 @@ msgstr "" #: src/escputil/escputil.c:1210 src/escputil/escputil.c:1240 #, fuzzy msgid "Ink color" -msgstr " χÏώμα" +msgstr " ÷ñþìá" #: src/escputil/escputil.c:1210 src/escputil/escputil.c:1240 #: src/escputil/escputil.c:1598 src/escputil/escputil.c:1622 #: src/escputil/escputil.c:1642 #, fuzzy msgid "Percent remaining" -msgstr "Επί τοις εκατό ελεÏθεÏο" +msgstr "Åðß ôïéò åêáôü åëåýèåñï" #: src/escputil/escputil.c:1287 src/escputil/escputil.c:1290 #: src/escputil/escputil.c:1293 src/escputil/escputil.c:1296 @@ -7818,12 +8195,12 @@ msgstr "" #: src/escputil/escputil.c:1689 #, fuzzy, c-format msgid "Cannot identify printer model.\n" -msgstr "ΜποÏείτε να αποθηκεÏσετε μια μόνο διεÏθυνση τη φοÏά.\n" +msgstr "Ìðïñåßôå íá áðïèçêåýóåôå ìéá ìüíï äéåýèõíóç ôç öïñÜ.\n" #: src/escputil/escputil.c:1711 #, fuzzy, c-format msgid "Cleaning heads...\n" -msgstr "Ανάγνωση επικεφαλίδων..." +msgstr "ÁíÜãíùóç åðéêåöáëßäùí..." #: src/escputil/escputil.c:1728 #, c-format @@ -7956,7 +8333,7 @@ msgstr "" #: src/escputil/escputil.c:1865 #, fuzzy, c-format msgid "Repeating the alignment process.\n" -msgstr "Εκκίνηση των Έξυπνων Εισαγωγέων" +msgstr "Åêêßíçóç ôùí ¸îõðíùí ÅéóáãùãÝùí" #: src/escputil/escputil.c:1871 #, c-format @@ -7998,7 +8375,7 @@ msgstr "" #: src/escputil/escputil.c:1900 #, fuzzy, c-format msgid "Unrecognized command.\n" -msgstr "άγνωστο χÏώμα: %s" +msgstr "Üãíùóôï ÷ñþìá: %s" #: src/escputil/escputil.c:1903 #, c-format @@ -8020,7 +8397,7 @@ msgstr "" #: src/escputil/escputil.c:2051 #, fuzzy msgid "Press enter to continue > " -msgstr "ΠαÏακαλώ εισαγάγετε μια γÏαμμή εντολών παÏακάτω." +msgstr "Ðáñáêáëþ åéóáãÜãåôå ìéá ãñáììÞ åíôïëþí ðáñáêÜôù." #: src/escputil/escputil.c:1984 #, c-format @@ -8039,17 +8416,17 @@ msgstr "" #: src/escputil/escputil.c:2005 src/escputil/escputil.c:2050 #, fuzzy, c-format msgid "Please insert a fresh sheet of paper.\n" -msgstr "ΠαÏακαλώ εισάγετε 200 δÏαχμές για να συνεχίσετε." +msgstr "Ðáñáêáëþ åéóÜãåôå 200 äñá÷ìÝò ãéá íá óõíå÷ßóåôå." #: src/escputil/escputil.c:2024 #, fuzzy, c-format msgid "Number out of range!\n" -msgstr "ΑÏιθμός Σελίδων" +msgstr "Áñéèìüò Óåëßäùí" #: src/escputil/escputil.c:2029 #, fuzzy, c-format msgid "I cannot understand what you typed!\n" -msgstr "Δεν καταλαβαίνω την εντολή σου. " +msgstr "Äåí êáôáëáâáßíù ôçí åíôïëÞ óïõ. " #: src/escputil/escputil.c:2035 #, c-format @@ -8059,7 +8436,7 @@ msgstr "" #: src/escputil/escputil.c:2042 #, fuzzy, c-format msgid "Attempting to set alignment..." -msgstr "Εκκίνηση των Έξυπνων Εισαγωγέων" +msgstr "Åêêßíçóç ôùí ¸îõðíùí ÅéóáãùãÝùí" #: src/escputil/escputil.c:2045 #, c-format @@ -8078,186 +8455,69 @@ msgstr "" #: src/escputil/escputil.c:2092 #, fuzzy, c-format msgid "Error in input\n" -msgstr "Σφάλμα Ï€Ïοσθήκης λίστας" +msgstr "ÓöÜëìá ðñïóèÞêçò ëßóôáò" -#: src/gimp/print-image-gimp.c:225 src/gimp2/print-image-gimp.c:225 +#: src/gimp2/print-image-gimp.c:225 #, fuzzy msgid "Printing..." -msgstr "Εκτυπώνεται .." +msgstr "Åêôõðþíåôáé .." -#: src/gimp/print.c:133 #, fuzzy -msgid "/File/Print..." -msgstr "/ΦίλτÏα/Κείμενο/FreeType..." - -#: src/ghost/ijsgutenprint.c:98 -#, c-format -msgid "" -"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" -msgstr "" - -#: 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:199 -#, fuzzy, c-format -msgid "ERROR: ijsgutenprint: No row buffer\n" -msgstr "Άγνωστος κωδικός op %u" - -#: 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:498 -#, c-format -msgid "ERROR: ijsgutenprint: Printer must be specified with -sDeviceModel\n" -msgstr "" - -#: src/ghost/ijsgutenprint.c:500 -#, c-format -msgid "ERROR: ijsgutenprint: Printer %s is not a known model\n" -msgstr "" - -#: src/ghost/ijsgutenprint.c:656 -#, c-format -msgid "ijsgutenprint: unknown DeviceModel %s\n" -msgstr "" +#~ msgid "ERROR: ijsgutenprint: No row buffer\n" +#~ msgstr "¶ãíùóôïò êùäéêüò op %u" -#: src/ghost/ijsgutenprint.c:700 -#, fuzzy, c-format -msgid "ERROR: ijsgutenprint: cannot parse TopLeft %s\n" -msgstr "Δεν είναι δυνατό να γίνει καταχώÏηση αποθήκευσης με κέλυφος" - -#: src/ghost/ijsgutenprint.c:723 -#, fuzzy, c-format -msgid "ERROR: ijsgutenprint: cannot parse PaperSize %s\n" -msgstr "Δεν είναι δυνατό να γίνει καταχώÏηση αποθήκευσης με κέλυφος" - -#: src/ghost/ijsgutenprint.c:795 -#, fuzzy, c-format -msgid "ERROR: ijsgutenprint: cannot parse curve %s\n" -msgstr "Δεν είναι δυνατό να γίνει καταχώÏηση αποθήκευσης με κέλυφος" - -#: src/ghost/ijsgutenprint.c:802 -#, fuzzy, c-format -msgid "ERROR: ijsgutenprint: cannot parse %s float %s\n" -msgstr "Δεν είναι δυνατό να γίνει καταχώÏηση αποθήκευσης με κέλυφος" - -#: src/ghost/ijsgutenprint.c:809 -#, fuzzy, c-format -msgid "ERROR: ijsgutenprint: cannot parse %s int %s\n" -msgstr "Δεν είναι δυνατό να γίνει καταχώÏηση αποθήκευσης με κέλυφος" - -#: src/ghost/ijsgutenprint.c:816 -#, fuzzy, c-format -msgid "ERROR: ijsgutenprint: cannot parse %s dimension %s\n" -msgstr "Δεν είναι δυνατό να γίνει καταχώÏηση αποθήκευσης με κέλυφος" - -#: src/ghost/ijsgutenprint.c:830 -#, fuzzy, c-format -msgid "ERROR: ijsgutenprint: cannot parse %s boolean %s\n" -msgstr "Δεν είναι δυνατό να γίνει καταχώÏηση αποθήκευσης με κέλυφος" - -#: src/ghost/ijsgutenprint.c:841 -#, fuzzy, c-format -msgid "ERROR: ijsgutenprint: Bad parameter %s %d\n" -msgstr "Άγνωστος κωδικός op %u" - -#: src/ghost/ijsgutenprint.c:867 -#, fuzzy, c-format -msgid "ERROR: ijsgutenprint: bad key code %d\n" -msgstr "Άγνωστος κωδικός op %u" - -#: src/ghost/ijsgutenprint.c:1308 -#, c-format -msgid "ERROR: ijsgutenprint: image_init failed %d\n" -msgstr "" - -#: 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:1331 -#, fuzzy, c-format -msgid "ERROR: ijsgutenprint: Unable to open %s: %s\n" -msgstr "Άνοιγμα αÏχείου %s αδÏνατον\n" - -#: src/ghost/ijsgutenprint.c:1344 -#, fuzzy, c-format -msgid "ERROR: ijsgutenprint: Unknown printer %s\n" -msgstr "Άγνωστος κωδικός op %u" +#, fuzzy +#~ msgid "" +#~ "ERROR: ijsgutenprint: Unable to parse parameter %s=%s (expect a number)\n" +#~ msgstr "¶íïéãìá áñ÷åßïõ %s áäýíáôïí\n" -#: src/ghost/ijsgutenprint.c:1516 -#, c-format -msgid "ERROR: ijsgutenprint: Bad parameters; cannot continue!\n" -msgstr "" +#, fuzzy +#~ msgid "ERROR: ijsgutenprint: cannot parse TopLeft %s\n" +#~ msgstr "Äåí åßíáé äõíáôü íá ãßíåé êáôá÷þñçóç áðïèÞêåõóçò ìå êÝëõöïò" -#: src/ghost/ijsgutenprint.c:1534 -#, c-format -msgid "ERROR: ijsgutenprint: Get next row failed at %.0f\n" -msgstr "" +#, fuzzy +#~ msgid "ERROR: ijsgutenprint: cannot parse PaperSize %s\n" +#~ msgstr "Äåí åßíáé äõíáôü íá ãßíåé êáôá÷þñçóç áðïèÞêåõóçò ìå êÝëõöïò" -# #, fuzzy -#~ msgid "Model Name" -#~ msgstr "ΑκÏÏωση" +#~ msgid "ERROR: ijsgutenprint: cannot parse curve %s\n" +#~ msgstr "Äåí åßíáé äõíáôü íá ãßíåé êáôá÷þñçóç áðïèÞêåõóçò ìå êÝëõöïò" #, fuzzy -#~ msgid "Cassette" -#~ msgstr "ΧαÏτί Μανίλα" +#~ msgid "ERROR: ijsgutenprint: cannot parse %s float %s\n" +#~ msgstr "Äåí åßíáé äõíáôü íá ãßíåé êáôá÷þñçóç áðïèÞêåõóçò ìå êÝëõöïò" -# #, fuzzy -#~ msgid " Gamma" -#~ msgstr "Γάμμα" +#~ msgid "ERROR: ijsgutenprint: cannot parse %s int %s\n" +#~ msgstr "Äåí åßíáé äõíáôü íá ãßíåé êáôá÷þñçóç áðïèÞêåõóçò ìå êÝëõöïò" #, fuzzy -#~ msgid " Curve" -#~ msgstr "ΜαÏÏο" +#~ msgid "ERROR: ijsgutenprint: cannot parse %s dimension %s\n" +#~ msgstr "Äåí åßíáé äõíáôü íá ãßíåé êáôá÷þñçóç áðïèÞêåõóçò ìå êÝëõöïò" #, fuzzy -#~ msgid "1440 x 1440" -#~ msgstr "1440 x 1440 DPI" +#~ msgid "ERROR: ijsgutenprint: cannot parse %s boolean %s\n" +#~ msgstr "Äåí åßíáé äõíáôü íá ãßíåé êáôá÷þñçóç áðïèÞêåõóçò ìå êÝëõöïò" #, fuzzy -#~ msgid "1440 x 1440 DPI High Quality" -#~ msgstr "1440 x 1440 DPI" +#~ msgid "ERROR: ijsgutenprint: Bad parameter %s %d\n" +#~ msgstr "¶ãíùóôïò êùäéêüò op %u" #, fuzzy -#~ msgid "1440 x 1440 DPI Highest Quality" -#~ msgstr "1440 x 1440 DPI" +#~ msgid "ERROR: ijsgutenprint: bad key code %d\n" +#~ msgstr "¶ãíùóôïò êùäéêüò op %u" #, fuzzy -#~ msgid "2880 x 1440 DPI High Quality" -#~ msgstr "1440 x 1440 DPI" +#~ msgid "ERROR: ijsgutenprint: Unable to open file descriptor: %s\n" +#~ msgstr "¶íïéãìá áñ÷åßïõ %s áäýíáôïí\n" #, fuzzy -#~ msgid "2880 x 1440 DPI Highest Quality" -#~ msgstr "1440 x 1440 DPI" +#~ msgid "ERROR: ijsgutenprint: Unable to open %s: %s\n" +#~ msgstr "¶íïéãìá áñ÷åßïõ %s áäýíáôïí\n" #, 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 "" -#~ "Αυτό το Ï€ÏόγÏαμμα είναι μέÏος του GNOME.\n" -#~ "Το Gnome-Chess δεν παÏέχει ΑΠΟΛΥΤΩΣ ΚΑΜΙΑ ΕΓΓΥΗΣΗ. ΠÏόκειται για " -#~ "ελεÏθεÏο λογισμικο, και μποÏείτε να το αναδιανείμετε βάσει των συνθηκών " -#~ "της Γενικής Δημόσιας Άδειας GNU (GNU General Public Licence)." +#~ msgid "ERROR: ijsgutenprint: Unknown printer %s\n" +#~ msgstr "¶ãíùóôïò êùäéêüò op %u" #, fuzzy #~ msgid "90x90 DPI" @@ -8291,10 +8551,6 @@ msgstr "" #~ msgid "720x360 DPI DMT" #~ msgstr "720 x 360 DPI" -#, fuzzy -#~ msgid "720x720 DPI" -#~ msgstr "2880 x 720 DPI" - #, fuzzy #~ msgid "720x720 DPI DMT" #~ msgstr "2880 x 720 DPI" @@ -8359,54 +8615,55 @@ msgstr "" #~ msgid "2400x2400 DPI DMT" #~ msgstr "2400x600 DPI" -#, fuzzy -#~ msgid "Plain Paper PIXMA" -#~ msgstr "ΚÏÏια Σελίδα" - #, fuzzy #~ msgid "Back Print Film" -#~ msgstr "ΕκτÏπωση σε ΑÏχείο" +#~ msgstr "Åêôýðùóç óå Áñ÷åßï" #, fuzzy #~ msgid "Fabric Sheets" -#~ msgstr "ΕκτÏπωση ΦÏλλων" +#~ msgstr "Åêôýðùóç Öýëëùí" #, fuzzy #~ msgid "Envelope" -#~ msgstr "ΕκτÏπωση Φακέλου" +#~ msgstr "Åêôýðùóç ÖáêÝëïõ" # #, fuzzy #~ msgid "High Resolution Paper" -#~ msgstr "Aνάλυση Χ:" +#~ msgstr "AíÜëõóç ×:" #, fuzzy #~ msgid "T-Shirt Transfers" -#~ msgstr "ΜεταφοÏά ΑÏχείων" +#~ msgstr "ÌåôáöïñÜ Áñ÷åßùí" #, fuzzy -#~ msgid "Photo CcMmYK Color" -#~ msgstr "Επιλογή Î•Î¹Î´Î¹ÎºÎ¿Ï Î§Ïώματος" +#~ msgid "CMY Color" +#~ msgstr "+ ×ñþìá" + +#, fuzzy +#~ msgid "CMYK Color" +#~ msgstr "+ ×ñþìá" #, fuzzy #~ msgid "Photo CcMmY Color" -#~ msgstr "Επιλογή Î•Î¹Î´Î¹ÎºÎ¿Ï Î§Ïώματος" +#~ msgstr "ÅðéëïãÞ Åéäéêïý ×ñþìáôïò" #, fuzzy -#~ msgid "CMYK Color" -#~ msgstr "+ ΧÏώμα" +#~ msgid "Photo CcMmYK Color" +#~ msgstr "ÅðéëïãÞ Åéäéêïý ×ñþìáôïò" +# #, fuzzy -#~ msgid "CMY Color" -#~ msgstr "+ ΧÏώμα" +#~ msgid " Gamma" +#~ msgstr "ÃÜììá" #, fuzzy -#~ msgid "Gutenprint" -#~ msgstr "Τίτλοι Ï€Ïος εκτÏπωση" +#~ msgid " Curve" +#~ msgstr "Ìáýñï" #, fuzzy -#~ msgid "EPSON Stylus C50" -#~ msgstr "Stylus C60" +#~ msgid "Red Balance" +#~ msgstr "Óôï êÝíôñï ôçò ïèüíçò" #, fuzzy #~ msgid "EPSON Stylus C60" @@ -8416,18 +8673,6 @@ msgstr "" #~ msgid "EPSON Stylus C61" #~ msgstr "Stylus C60" -#, fuzzy -#~ msgid "EPSON Stylus C62" -#~ msgstr "Stylus C60" - -#, fuzzy -#~ msgid "EPSON Stylus C70" -#~ msgstr "Stylus C70" - -#, fuzzy -#~ msgid "EPSON Stylus C80" -#~ msgstr "Stylus C80" - #, fuzzy #~ msgid "EPSON Stylus C82" #~ msgstr "Stylus C80" @@ -8660,10 +8905,6 @@ msgstr "" #~ msgid "EPSON Stylus Pro 5500" #~ msgstr "Stylus Pro 5500" -#, fuzzy -#~ msgid "EPSON Stylus Pro 7000" -#~ msgstr "Stylus Pro 7000" - #, fuzzy #~ msgid "EPSON Stylus Pro 7500" #~ msgstr "Stylus Pro 7500" @@ -8697,90 +8938,103 @@ msgstr "" #~ msgstr "Stylus Scan 2500" #, fuzzy -#~ msgid "EPSON E-100" -#~ msgstr "Stylus C60" +#~ msgid "Gutenprint" +#~ msgstr "Ôßôëïé ðñïò åêôýðùóç" + +#, fuzzy +#~ msgid "" +#~ ", Copyright (C) 2000-2003 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 "" +#~ "Áõôü ôï ðñüãñáììá åßíáé ìÝñïò ôïõ GNOME.\n" +#~ "Ôï Gnome-Chess äåí ðáñÝ÷åé ÁÐÏËÕÔÙÓ ÊÁÌÉÁ ÅÃÃÕÇÓÇ. Ðñüêåéôáé ãéá " +#~ "åëåýèåñï ëïãéóìéêï, êáé ìðïñåßôå íá ôï áíáäéáíåßìåôå âÜóåé ôùí óõíèçêþí " +#~ "ôçò ÃåíéêÞò Äçìüóéáò ¶äåéáò GNU (GNU General Public Licence)." #, fuzzy #~ msgid "Cannot identify printer!\n" -#~ msgstr "Αδυναμία ανοίγματος αÏχείου εξόδου: %s\n" +#~ msgstr "Áäõíáìßá áíïßãìáôïò áñ÷åßïõ åîüäïõ: %s\n" #, fuzzy -#~ msgid "Red Balance" -#~ msgstr "Στο κέντÏο της οθόνης" +#~ msgid "/File/Print..." +#~ msgstr "/Ößëôñá/Êåßìåíï/FreeType..." #, fuzzy #~ msgid "Gloss Balance" -#~ msgstr "Στο κέντÏο της οθόνης" +#~ msgstr "Óôï êÝíôñï ôçò ïèüíçò" #, fuzzy #~ msgid "" #~ "\n" #~ "Cannot open %s read/write: %s\n" -#~ msgstr "Άνοιγμα αÏχείου %s αδÏνατον\n" +#~ msgstr "¶íïéãìá áñ÷åßïõ %s áäýíáôïí\n" #, fuzzy #~ msgid "Gimp-Print" -#~ msgstr "Σημείο ΠÏοσάÏτησης: " +#~ msgstr "Óçìåßï ÐñïóÜñôçóçò: " #, fuzzy #~ msgid "PPD File?" -#~ msgstr " ΑÏχείο " +#~ msgstr " Áñ÷åßï " # #~ msgid "%s: option `%s' is ambiguous\n" -#~ msgstr "%s: η επιλογή `%s' είναι ασαφής\n" +#~ msgstr "%s: ç åðéëïãÞ `%s' åßíáé áóáöÞò\n" # #~ msgid "%s: option `--%s' doesn't allow an argument\n" -#~ msgstr "%s: η επιλογή `--%s' δε δέχεται ÏŒÏισμα\n" +#~ msgstr "%s: ç åðéëïãÞ `--%s' äå äÝ÷åôáé üñéóìá\n" # #~ msgid "%s: option `%c%s' doesn't allow an argument\n" -#~ msgstr "%s: η επιλογή `%c%s' δε δέχεται ÏŒÏισμα\n" +#~ msgstr "%s: ç åðéëïãÞ `%c%s' äå äÝ÷åôáé üñéóìá\n" # #~ msgid "%s: option `%s' requires an argument\n" -#~ msgstr "%s: η επιλογή `%s' απαιτεί ÏŒÏισμα\n" +#~ msgstr "%s: ç åðéëïãÞ `%s' áðáéôåß üñéóìá\n" # #~ msgid "%s: unrecognized option `--%s'\n" -#~ msgstr "%s: άγνωστη επιλογή `--%s'\n" +#~ msgstr "%s: Üãíùóôç åðéëïãÞ `--%s'\n" # #~ msgid "%s: unrecognized option `%c%s'\n" -#~ msgstr "%s: άγνωστη επιλογή `%c%s'\n" +#~ msgstr "%s: Üãíùóôç åðéëïãÞ `%c%s'\n" # #~ msgid "%s: illegal option -- %c\n" -#~ msgstr "%s: μη επιτÏεπόμενη επιλογή -- %c\n" +#~ msgstr "%s: ìç åðéôñåðüìåíç åðéëïãÞ -- %c\n" # #~ msgid "%s: invalid option -- %c\n" -#~ msgstr "%s: άκυÏη επιλογή -- %c'\n" +#~ msgstr "%s: Üêõñç åðéëïãÞ -- %c'\n" # #~ msgid "%s: option requires an argument -- %c\n" -#~ msgstr "%s: η επιλογή απαιτεί ÏŒÏισμα -- %c\n" +#~ msgstr "%s: ç åðéëïãÞ áðáéôåß üñéóìá -- %c\n" # #~ msgid "%s: option `-W %s' is ambiguous\n" -#~ msgstr "%s: η επιλογή `-W %s' είναι ασαφής\n" +#~ msgstr "%s: ç åðéëïãÞ `-W %s' åßíáé áóáöÞò\n" # #~ msgid "%s: option `-W %s' doesn't allow an argument\n" -#~ msgstr "%s: η επιλογή `-W %s' δεν επιτÏέπει ÏŒÏισμα\n" +#~ msgstr "%s: ç åðéëïãÞ `-W %s' äåí åðéôñÝðåé üñéóìá\n" #, fuzzy #~ msgid "Bright" -#~ msgstr "ΕÏγασία" +#~ msgstr "Åñãáóßá" #, fuzzy #~ msgid "Image is too wide for the page\n" -#~ msgstr "Ελάττωση του μεγέθους της εικόνας στο μισό" +#~ msgstr "ÅëÜôôùóç ôïõ ìåãÝèïõò ôçò åéêüíáò óôï ìéóü" #, fuzzy #~ msgid "Full Bleed" -#~ msgstr "Ρόλος" +#~ msgstr "Ñüëïò" #, fuzzy #~ msgid "traditional" @@ -8791,102 +9045,88 @@ msgstr "" #, fuzzy #~ msgid "ps2" -#~ msgstr "στιγ." - -#~ msgid "Stylus C20sx" -#~ msgstr "Stylus C20sx" +#~ msgstr "óôéã." #~ 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" #, fuzzy #~ msgid "Model %d out of range.\n" -#~ msgstr "ΑÏιθμός Σελίδων" +#~ msgstr "Áñéèìüò Óåëßäùí" #, fuzzy #~ msgid "Right Border:" -#~ msgstr "ΔεξιόχειÏας" +#~ msgstr "Äåîéü÷åéñáò" #, fuzzy #~ msgid "Bottom Border:" -#~ msgstr "Πλαίσιο Εικονιδίου:" +#~ msgstr "Ðëáßóéï Åéêïíéäßïõ:" # #~ msgid "Size" -#~ msgstr "Μέγεθος" +#~ msgstr "ÌÝãåèïò" #, fuzzy #~ msgid "Image / Output Settings" -#~ msgstr "Ρυθμίσεις Εισόδου/Εξόδου IRC" +#~ msgstr "Ñõèìßóåéò Åéóüäïõ/Åîüäïõ IRC" # #, fuzzy #~ msgid "GIMP-print" -#~ msgstr "ΕκτÏπωση" +#~ msgstr "Åêôýðùóç" #, fuzzy #~ msgid "Resolutions" -#~ msgstr "Ανάλυση" +#~ msgstr "ÁíÜëõóç" #, fuzzy #~ msgid "Media Type:" -#~ msgstr "ΤÏπος MIME:" +#~ msgstr "Ôýðïò MIME:" #, fuzzy #~ msgid "Media Size:" -#~ msgstr "Μέγεθος Χ:" +#~ msgstr "ÌÝãåèïò ×:" #, fuzzy #~ msgid "Media Source:" -#~ msgstr "Ανοικτό Λογισμικό" +#~ msgstr "Áíïéêôü Ëïãéóìéêü" #, fuzzy #~ msgid "Ink Type:" -#~ msgstr "ΤÏπος Στοιχείου:" +#~ msgstr "Ôýðïò Óôïé÷åßïõ:" #, fuzzy #~ msgid "Resolution:" -#~ msgstr "Ανάλυση" +#~ msgstr "ÁíÜëõóç" #, fuzzy #~ msgid "" #~ "\n" #~ "Cannot read from %s: %s\n" -#~ msgstr "Δεν είναι δυνατό να ελεγχθεί ο φάκελος: %s: %s" +#~ msgstr "Äåí åßíáé äõíáôü íá åëåã÷èåß ï öÜêåëïò: %s: %s" #, fuzzy #~ msgid "Cyan:" -#~ msgstr "Κυανό" +#~ msgstr "Êõáíü" #, fuzzy #~ msgid "Magenta:" -#~ msgstr "μώβ" +#~ msgstr "ìþâ" #, fuzzy #~ msgid "Yellow:" -#~ msgstr "ΚίτÏινο" +#~ msgstr "Êßôñéíï" #~ msgid "1440 x 360 DPI" #~ msgstr "1440 x 360 DPI" @@ -8896,20 +9136,20 @@ msgstr "" #, fuzzy #~ msgid "Monarch" -#~ msgstr "ΜάÏτιος" +#~ msgstr "ÌÜñôéïò" #, fuzzy #~ msgid "Long 3" -#~ msgstr "Μεγάλη" +#~ msgstr "ÌåãÜëç" #, fuzzy #~ msgid "Long 4" -#~ msgstr "Μεγάλη" +#~ msgstr "ÌåãÜëç" #, fuzzy #~ msgid "Kaku" -#~ msgstr "ΑντίγÏαφο ασφαλείας" +#~ msgstr "Áíôßãñáöï áóöáëåßáò" #, fuzzy #~ msgid "HP Greeting Card" -#~ msgstr "ΧαιÏετισμός SMTP" +#~ msgstr "×áéñåôéóìüò SMTP" diff --git a/po/en_GB.gmo b/po/en_GB.gmo index db6c647..b2f8d63 100644 Binary files a/po/en_GB.gmo and b/po/en_GB.gmo differ diff --git a/po/en_GB.po b/po/en_GB.po index 3a10c3e..7c5ea2d 100644 --- a/po/en_GB.po +++ b/po/en_GB.po @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: gimp-print\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2008-01-01 20:47-0500\n" +"POT-Creation-Date: 2008-04-25 21:19-0400\n" "PO-Revision-Date: 2006-05-29 12:39+0100\n" "Last-Translator: Roger Leigh \n" "Language-Team: British English\n" @@ -17,7 +17,7 @@ msgstr "" #. 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:1752 +#: src/main/print-escp2.c:2116 msgid "Default" msgstr "Default" @@ -57,41 +57,54 @@ msgid "Ordered" msgstr "Ordered" #: src/main/dither-main.c:65 +#, fuzzy +msgid "Ordered New" +msgstr "Ordered" + +#: src/main/dither-main.c:66 msgid "Fast" msgstr "Fast" -#: src/main/dither-main.c:66 +#: src/main/dither-main.c:67 msgid "Very Fast" msgstr "Very Fast" -#: src/main/dither-main.c:67 +#: src/main/dither-main.c:68 msgid "Hybrid Floyd-Steinberg" msgstr "Hybrid Floyd-Steinberg" -#: src/main/dither-main.c:68 +#: src/main/dither-main.c:69 msgid "Predithered Input" msgstr "Predithered Input" -#: src/main/dither-main.c:88 src/main/print-color.c:56 +#: src/main/dither-main.c:70 +msgid "Drop Size Segmented" +msgstr "" + +#: src/main/dither-main.c:71 +msgid "Drop Size Segmented New" +msgstr "" + +#: src/main/dither-main.c:91 src/main/print-color.c:56 msgid "Density" msgstr "Density" -#: src/main/dither-main.c:88 src/main/print-canon.c:295 +#: src/main/dither-main.c:91 src/main/print-canon.c:295 #: src/main/print-canon.c:303 src/main/print-canon.c:311 -#: src/main/print-canon.c:319 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-escp2.c:471 -#: src/main/print-escp2.c:479 src/main/print-escp2.c:487 +#: src/main/print-canon.c:319 src/main/print-escp2.c:446 +#: src/main/print-escp2.c:454 src/main/print-escp2.c:462 +#: src/main/print-escp2.c:470 src/main/print-escp2.c:478 +#: src/main/print-escp2.c:486 src/main/print-escp2.c:494 #: 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:1764 src/main/print-olympus.c:1772 -#: src/main/print-olympus.c:1780 src/main/print-olympus.c:1788 -#: src/main/print-pcl.c:1261 src/main/print-pcl.c:1269 -#: src/main/print-pcl.c:1277 src/main/print-pcl.c:1285 +#: src/main/print-olympus.c:1762 src/main/print-olympus.c:1770 +#: src/main/print-olympus.c:1778 src/main/print-olympus.c:1786 +#: src/main/print-pcl.c:1329 src/main/print-pcl.c:1337 +#: src/main/print-pcl.c:1345 src/main/print-pcl.c:1353 msgid "Output Level Adjustment" msgstr "Output Level Adjustment" -#: src/main/dither-main.c:89 +#: src/main/dither-main.c:92 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 " @@ -101,15 +114,15 @@ msgstr "" "ink bleeds through the paper or smears; increase the density if black " "regions are not solid." -#: src/main/dither-main.c:97 +#: src/main/dither-main.c:100 msgid "Dither Algorithm" msgstr "Dither Algorithm" -#: src/main/dither-main.c:97 +#: src/main/dither-main.c:100 msgid "Screening Adjustment" msgstr "Screening Adjustment" -#: src/main/dither-main.c:98 +#: src/main/dither-main.c:101 msgid "" "Choose the dither algorithm to be used.\n" "Adaptive Hybrid usually produces the best all-around quality.\n" @@ -145,9 +158,9 @@ msgstr "Colour conversion module" msgid "Dither algorithm" msgstr "Dither algorithm" -#: src/main/print-canon.c:200 src/main/print-escp2.c:180 -#: src/main/print-lexmark.c:266 src/main/print-olympus.c:1699 -#: src/main/print-pcl.c:1196 src/main/print-ps.c:67 +#: src/main/print-canon.c:200 src/main/print-escp2.c:182 +#: src/main/print-lexmark.c:266 src/main/print-olympus.c:1697 +#: src/main/print-pcl.c:1264 msgid "Page Size" msgstr "Page Size" @@ -155,236 +168,245 @@ msgstr "Page Size" #: src/main/print-canon.c:212 src/main/print-canon.c:218 #: src/main/print-canon.c:224 src/main/print-canon.c:230 #: src/main/print-canon.c:248 src/main/print-canon.c:272 -#: src/main/print-escp2.c:180 src/main/print-escp2.c:186 -#: src/main/print-escp2.c:192 src/main/print-escp2.c:198 -#: src/main/print-escp2.c:204 src/main/print-escp2.c:210 -#: src/main/print-escp2.c:228 src/main/print-escp2.c:245 -#: src/main/print-escp2.c:251 src/main/print-escp2.c:263 -#: src/main/print-escp2.c:281 src/main/print-lexmark.c:266 +#: src/main/print-escp2.c:182 src/main/print-escp2.c:188 +#: src/main/print-escp2.c:194 src/main/print-escp2.c:200 +#: src/main/print-escp2.c:206 src/main/print-escp2.c:212 +#: src/main/print-escp2.c:230 src/main/print-escp2.c:247 +#: src/main/print-escp2.c:253 src/main/print-escp2.c:265 +#: src/main/print-escp2.c:283 src/main/print-lexmark.c:266 #: src/main/print-lexmark.c:272 src/main/print-lexmark.c:278 -#: src/main/print-lexmark.c:284 src/main/print-olympus.c:1699 -#: src/main/print-olympus.c:1705 src/main/print-olympus.c:1711 -#: src/main/print-olympus.c:1717 src/main/print-pcl.c:1196 -#: src/main/print-pcl.c:1202 src/main/print-pcl.c:1208 -#: src/main/print-pcl.c:1214 src/main/print-pcl.c:1238 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 +#: src/main/print-lexmark.c:284 src/main/print-olympus.c:1697 +#: src/main/print-olympus.c:1703 src/main/print-olympus.c:1709 +#: src/main/print-olympus.c:1715 src/main/print-pcl.c:1264 +#: src/main/print-pcl.c:1270 src/main/print-pcl.c:1276 +#: src/main/print-pcl.c:1282 src/main/print-pcl.c:1306 src/main/print-ps.c:68 +#: src/main/print-ps.c:74 msgid "Basic Printer Setup" msgstr "Basic Printer Setup" -#: src/main/print-canon.c:201 src/main/print-escp2.c:181 -#: src/main/print-lexmark.c:267 src/main/print-olympus.c:1700 -#: src/main/print-pcl.c:1197 src/main/print-ps.c:68 +#: src/main/print-canon.c:201 src/main/print-escp2.c:183 +#: src/main/print-lexmark.c:267 src/main/print-olympus.c:1698 +#: src/main/print-pcl.c:1265 msgid "Size of the paper being printed to" msgstr "Size of the paper being printed to" -#: src/main/print-canon.c:206 src/main/print-escp2.c:186 -#: src/main/print-lexmark.c:272 src/main/print-olympus.c:1705 -#: src/main/print-pcl.c:1202 src/main/print-ps.c:73 src/cups/genppd.c:1417 +#: src/main/print-canon.c:206 src/main/print-escp2.c:188 +#: src/main/print-lexmark.c:272 src/main/print-olympus.c:1703 +#: src/main/print-pcl.c:1270 src/cups/genppd.c:1422 msgid "Media Type" msgstr "Media Type" -#: src/main/print-canon.c:207 src/main/print-escp2.c:187 -#: src/main/print-lexmark.c:273 src/main/print-olympus.c:1706 -#: src/main/print-pcl.c:1203 src/main/print-ps.c:74 +#: src/main/print-canon.c:207 src/main/print-escp2.c:189 +#: src/main/print-lexmark.c:273 src/main/print-olympus.c:1704 +#: src/main/print-pcl.c:1271 msgid "Type of media (plain paper, photo paper, etc.)" msgstr "Type of media (plain paper, photo paper, etc.)" -#: src/main/print-canon.c:212 src/main/print-escp2.c:192 -#: src/main/print-lexmark.c:278 src/main/print-olympus.c:1711 -#: src/main/print-pcl.c:1208 src/main/print-ps.c:79 src/cups/genppd.c:1445 +#: src/main/print-canon.c:212 src/main/print-escp2.c:194 +#: src/main/print-lexmark.c:278 src/main/print-olympus.c:1709 +#: src/main/print-pcl.c:1276 src/cups/genppd.c:1450 msgid "Media Source" msgstr "Media Source" -#: src/main/print-canon.c:213 src/main/print-escp2.c:193 -#: src/main/print-lexmark.c:279 src/main/print-olympus.c:1712 -#: src/main/print-pcl.c:1209 src/main/print-ps.c:80 +#: src/main/print-canon.c:213 src/main/print-escp2.c:195 +#: src/main/print-lexmark.c:279 src/main/print-olympus.c:1710 +#: src/main/print-pcl.c:1277 msgid "Source (input slot) of the media" msgstr "Source (input slot) of the media" -#: src/main/print-canon.c:218 src/main/print-escp2.c:198 +#: src/main/print-canon.c:218 src/main/print-escp2.c:200 msgid "CD Hub Size" msgstr "CD Hub Size" -#: src/main/print-canon.c:219 src/main/print-escp2.c:199 +#: src/main/print-canon.c:219 src/main/print-escp2.c:201 msgid "Print only outside of the hub of the CD, or all the way to the hole" msgstr "Print only outside of the hub of the CD, or all the way to the hole" -#: src/main/print-canon.c:224 src/main/print-escp2.c:204 +#: src/main/print-canon.c:224 src/main/print-escp2.c:206 msgid "CD Size (Custom)" msgstr "" -#: src/main/print-canon.c:225 src/main/print-escp2.c:205 +#: src/main/print-canon.c:225 src/main/print-escp2.c:207 msgid "Variable adjustment for the outer diameter of CD" msgstr "" -#: src/main/print-canon.c:230 src/main/print-escp2.c:210 +#: src/main/print-canon.c:230 src/main/print-escp2.c:212 #, fuzzy msgid "CD Hub Size (Custom)" msgstr "CD Hub Size" -#: src/main/print-canon.c:231 src/main/print-escp2.c:211 +#: src/main/print-canon.c:231 src/main/print-escp2.c:213 #, fuzzy msgid "Variable adjustment to the inner hub of the CD" msgstr "Scale the print to the size of the page" -#: src/main/print-canon.c:236 src/main/print-escp2.c:216 +#: src/main/print-canon.c:236 src/main/print-escp2.c:218 msgid "CD Horizontal Fine Adjustment" msgstr "CD Horizontal Fine Adjustment" #: src/main/print-canon.c:236 src/main/print-canon.c:242 -#: src/main/print-canon.c:254 src/main/print-escp2.c:216 -#: src/main/print-escp2.c:222 src/main/print-escp2.c:239 -#: src/main/print-escp2.c:275 src/main/print-lexmark.c:290 -#: src/main/print-olympus.c:1723 src/main/print-olympus.c:1729 -#: src/main/print-olympus.c:1735 src/main/print-pcl.c:1220 -#: src/main/print-ps.c:91 src/main/print-raw.c:80 +#: src/main/print-canon.c:254 src/main/print-escp2.c:218 +#: src/main/print-escp2.c:224 src/main/print-escp2.c:241 +#: src/main/print-escp2.c:277 src/main/print-lexmark.c:290 +#: src/main/print-olympus.c:1721 src/main/print-olympus.c:1727 +#: src/main/print-olympus.c:1733 src/main/print-pcl.c:1288 +#: src/main/print-raw.c:80 msgid "Advanced Printer Setup" msgstr "Advanced Printer Setup" #: src/main/print-canon.c:237 src/main/print-canon.c:243 -#: src/main/print-escp2.c:217 src/main/print-escp2.c:223 +#: src/main/print-escp2.c:219 src/main/print-escp2.c:225 msgid "Fine adjustment to horizontal position for CD printing" msgstr "Fine adjustment to horizontal position for CD printing" -#: src/main/print-canon.c:242 src/main/print-escp2.c:222 +#: src/main/print-canon.c:242 src/main/print-escp2.c:224 msgid "CD Vertical Fine Adjustment" msgstr "CD Vertical Fine Adjustment" -#: src/main/print-canon.c:248 src/main/print-escp2.c:228 -#: src/main/print-lexmark.c:284 src/main/print-olympus.c:1717 -#: src/main/print-pcl.c:1214 src/main/print-ps.c:85 src/cups/genppd.c:1518 +#: src/main/print-canon.c:248 src/main/print-escp2.c:230 +#: src/main/print-lexmark.c:284 src/main/print-olympus.c:1715 +#: src/main/print-pcl.c:1282 src/cups/genppd.c:1523 msgid "Resolution" msgstr "Resolution" #: src/main/print-canon.c:249 src/main/print-lexmark.c:285 -#: src/main/print-olympus.c:1718 src/main/print-pcl.c:1215 -#: src/main/print-ps.c:86 +#: src/main/print-olympus.c:1716 src/main/print-pcl.c:1283 msgid "Resolution and quality of the print" msgstr "Resolution and quality of the print" -#: src/main/print-canon.c:254 src/main/print-escp2.c:239 -#: src/main/print-lexmark.c:290 src/main/print-olympus.c:1723 -#: src/main/print-pcl.c:1220 src/main/print-ps.c:91 src/main/print-raw.c:80 +#: src/main/print-canon.c:254 src/main/print-escp2.c:241 +#: src/main/print-lexmark.c:290 src/main/print-olympus.c:1721 +#: src/main/print-pcl.c:1288 src/main/print-raw.c:80 msgid "Ink Type" msgstr "Ink Type" -#: src/main/print-canon.c:255 src/main/print-escp2.c:240 -#: src/main/print-escp2.c:252 src/main/print-lexmark.c:291 -#: src/main/print-olympus.c:1724 src/main/print-pcl.c:1221 -#: src/main/print-ps.c:92 src/main/print-raw.c:81 +#: src/main/print-canon.c:255 src/main/print-escp2.c:242 +#: src/main/print-escp2.c:254 src/main/print-lexmark.c:291 +#: src/main/print-olympus.c:1722 src/main/print-pcl.c:1289 +#: 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:260 src/main/print-canon.c:261 -#: src/main/print-escp2.c:329 src/main/print-escp2.c:330 +#: src/main/print-escp2.c:331 src/main/print-escp2.c:332 #: src/main/print-lexmark.c:296 src/main/print-lexmark.c:297 -#: src/main/print-pcl.c:1226 src/main/print-pcl.c:1227 +#: src/main/print-pcl.c:1294 src/main/print-pcl.c:1295 msgid "Ink Channels" msgstr "Ink Channels" -#: src/main/print-canon.c:260 src/main/print-escp2.c:130 -#: src/main/print-escp2.c:137 src/main/print-escp2.c:144 -#: src/main/print-escp2.c:287 src/main/print-escp2.c:293 -#: src/main/print-escp2.c:299 src/main/print-escp2.c:305 -#: src/main/print-escp2.c:311 src/main/print-escp2.c:317 -#: src/main/print-escp2.c:323 src/main/print-escp2.c:329 -#: src/main/print-escp2.c:335 src/main/print-lexmark.c:296 -#: src/main/print-pcl.c:1226 +#: src/main/print-canon.c:260 src/main/print-escp2.c:132 +#: src/main/print-escp2.c:139 src/main/print-escp2.c:146 +#: src/main/print-escp2.c:289 src/main/print-escp2.c:295 +#: src/main/print-escp2.c:301 src/main/print-escp2.c:307 +#: src/main/print-escp2.c:313 src/main/print-escp2.c:319 +#: src/main/print-escp2.c:325 src/main/print-escp2.c:331 +#: src/main/print-escp2.c:337 src/main/print-lexmark.c:296 +#: src/main/print-pcl.c:1294 msgid "Advanced Printer Functionality" msgstr "Advanced Printer Functionality" -#: src/main/print-canon.c:266 src/main/print-escp2.c:341 -#: src/main/print-lexmark.c:302 src/main/print-olympus.c:1741 -#: src/main/print-pcl.c:1232 src/main/print-ps.c:103 src/main/print-raw.c:86 +#: src/main/print-canon.c:266 src/main/print-escp2.c:343 +#: src/main/print-lexmark.c:302 src/main/print-olympus.c:1739 +#: src/main/print-pcl.c:1300 src/main/print-ps.c:80 src/main/print-raw.c:86 msgid "Printing Mode" msgstr "Printing Mode" #: src/main/print-canon.c:266 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:341 -#: src/main/print-escp2.c:347 src/main/print-lexmark.c:302 -#: src/main/print-olympus.c:1741 src/main/print-pcl.c:1232 -#: src/main/print-ps.c:103 src/main/print-raw.c:86 +#: src/main/print-color.c:208 src/main/print-escp2.c:343 +#: src/main/print-escp2.c:349 src/main/print-lexmark.c:302 +#: src/main/print-olympus.c:1739 src/main/print-pcl.c:1300 +#: src/main/print-ps.c:80 src/main/print-raw.c:86 msgid "Core Parameter" msgstr "Core Parameter" -#: src/main/print-canon.c:267 src/main/print-escp2.c:342 -#: src/main/print-lexmark.c:303 src/main/print-olympus.c:1742 -#: src/main/print-pcl.c:1233 src/main/print-ps.c:104 src/main/print-raw.c:87 +#: src/main/print-canon.c:267 src/main/print-escp2.c:344 +#: src/main/print-lexmark.c:303 src/main/print-olympus.c:1740 +#: src/main/print-pcl.c:1301 src/main/print-ps.c:81 src/main/print-raw.c:87 msgid "Printing Output Mode" msgstr "Printing Output Mode" -#: src/main/print-canon.c:272 src/main/print-pcl.c:1238 +#: src/main/print-canon.c:272 src/main/print-pcl.c:1306 msgid "Double-Sided Printing" msgstr "Double-Sided Printing" -#: src/main/print-canon.c:273 src/main/print-pcl.c:1239 +#: src/main/print-canon.c:273 src/main/print-pcl.c:1307 msgid "Duplex/Tumble Setting" msgstr "Duplex/Tumble Setting" -#: src/main/print-canon.c:295 src/main/print-escp2.c:439 -#: src/main/print-lexmark.c:325 src/main/print-pcl.c:1261 +#: src/main/print-canon.c:295 src/main/print-escp2.c:446 +#: src/main/print-lexmark.c:325 src/main/print-pcl.c:1329 msgid "Cyan Density" msgstr "Cyan Density" -#: src/main/print-canon.c:296 src/main/print-escp2.c:440 -#: src/main/print-lexmark.c:326 src/main/print-pcl.c:1262 +#: src/main/print-canon.c:296 src/main/print-escp2.c:447 +#: src/main/print-lexmark.c:326 src/main/print-pcl.c:1330 msgid "Adjust the cyan density" msgstr "Adjust the cyan density" -#: src/main/print-canon.c:303 src/main/print-escp2.c:447 -#: src/main/print-lexmark.c:333 src/main/print-pcl.c:1269 +#: src/main/print-canon.c:303 src/main/print-escp2.c:454 +#: src/main/print-lexmark.c:333 src/main/print-pcl.c:1337 msgid "Magenta Density" msgstr "Magenta Density" -#: src/main/print-canon.c:304 src/main/print-escp2.c:448 -#: src/main/print-lexmark.c:334 src/main/print-pcl.c:1270 +#: src/main/print-canon.c:304 src/main/print-escp2.c:455 +#: src/main/print-lexmark.c:334 src/main/print-pcl.c:1338 msgid "Adjust the magenta density" msgstr "Adjust the magenta density" -#: src/main/print-canon.c:311 src/main/print-escp2.c:455 -#: src/main/print-lexmark.c:341 src/main/print-pcl.c:1277 +#: src/main/print-canon.c:311 src/main/print-escp2.c:462 +#: src/main/print-lexmark.c:341 src/main/print-pcl.c:1345 msgid "Yellow Density" msgstr "Yellow Density" -#: src/main/print-canon.c:312 src/main/print-escp2.c:456 -#: src/main/print-lexmark.c:342 src/main/print-pcl.c:1278 +#: src/main/print-canon.c:312 src/main/print-escp2.c:463 +#: src/main/print-lexmark.c:342 src/main/print-pcl.c:1346 msgid "Adjust the yellow density" msgstr "Adjust the yellow density" -#: src/main/print-canon.c:319 src/main/print-escp2.c:463 -#: src/main/print-lexmark.c:349 src/main/print-pcl.c:1285 +#: src/main/print-canon.c:319 src/main/print-escp2.c:470 +#: src/main/print-lexmark.c:349 src/main/print-pcl.c:1353 msgid "Black Density" msgstr "Black Density" -#: src/main/print-canon.c:320 src/main/print-escp2.c:464 -#: src/main/print-lexmark.c:350 src/main/print-pcl.c:1286 +#: src/main/print-canon.c:320 src/main/print-escp2.c:471 +#: src/main/print-lexmark.c:350 src/main/print-pcl.c:1354 msgid "Adjust the black density" msgstr "Adjust the black density" #: src/main/print-canon.c:327 src/main/print-canon.c:328 -#: src/main/print-escp2.c:495 src/main/print-escp2.c:496 +#: src/main/print-escp2.c:534 src/main/print-escp2.c:535 #: src/main/print-lexmark.c:357 src/main/print-lexmark.c:358 -#: src/main/print-pcl.c:1293 src/main/print-pcl.c:1294 +#: src/main/print-pcl.c:1361 src/main/print-pcl.c:1362 msgid "Light Cyan Transition" msgstr "Light Cyan Transition" #: src/main/print-canon.c:327 src/main/print-canon.c:335 -#: src/main/print-canon.c:343 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-escp2.c:543 -#: src/main/print-escp2.c:551 src/main/print-escp2.c:559 -#: src/main/print-lexmark.c:357 src/main/print-lexmark.c:365 -#: src/main/print-pcl.c:1293 src/main/print-pcl.c:1301 +#: src/main/print-canon.c:343 src/main/print-escp2.c:502 +#: src/main/print-escp2.c:510 src/main/print-escp2.c:518 +#: src/main/print-escp2.c:526 src/main/print-escp2.c:534 +#: src/main/print-escp2.c:542 src/main/print-escp2.c:550 +#: src/main/print-escp2.c:558 src/main/print-escp2.c:566 +#: src/main/print-escp2.c:574 src/main/print-escp2.c:582 +#: src/main/print-escp2.c:590 src/main/print-escp2.c:598 +#: src/main/print-escp2.c:606 src/main/print-escp2.c:614 +#: src/main/print-escp2.c:622 src/main/print-escp2.c:630 +#: src/main/print-escp2.c:638 src/main/print-escp2.c:646 +#: src/main/print-escp2.c:654 src/main/print-escp2.c:662 +#: src/main/print-escp2.c:670 src/main/print-escp2.c:678 +#: src/main/print-escp2.c:686 src/main/print-escp2.c:694 +#: src/main/print-escp2.c:702 src/main/print-escp2.c:710 +#: src/main/print-escp2.c:718 src/main/print-escp2.c:726 +#: src/main/print-escp2.c:734 src/main/print-lexmark.c:357 +#: src/main/print-lexmark.c:365 src/main/print-pcl.c:1361 +#: src/main/print-pcl.c:1369 msgid "Advanced Ink Adjustment" msgstr "Advanced Ink Adjustment" #: src/main/print-canon.c:335 src/main/print-canon.c:336 -#: src/main/print-escp2.c:503 src/main/print-escp2.c:504 +#: src/main/print-escp2.c:566 src/main/print-escp2.c:567 #: src/main/print-lexmark.c:365 src/main/print-lexmark.c:366 -#: src/main/print-pcl.c:1301 src/main/print-pcl.c:1302 +#: src/main/print-pcl.c:1369 src/main/print-pcl.c:1370 msgid "Light Magenta Transition" msgstr "Light Magenta Transition" @@ -392,54 +414,54 @@ msgstr "Light Magenta Transition" msgid "Light Yellow Transition" msgstr "Light Yellow Transition" -#: src/main/print-canon.c:363 src/main/print-pcl.c:1482 +#: src/main/print-canon.c:363 src/main/print-pcl.c:1550 #: src/main/escp2-resolutions.c:557 src/main/escp2-resolutions.c:565 #: src/main/escp2-resolutions.c:576 src/main/escp2-resolutions.c:588 msgid "Off" msgstr "Off" -#: src/main/print-canon.c:364 src/main/print-pcl.c:1483 +#: src/main/print-canon.c:364 src/main/print-pcl.c:1551 msgid "Long Edge (Standard)" msgstr "Long Edge (Standard)" -#: src/main/print-canon.c:365 src/main/print-pcl.c:1484 +#: src/main/print-canon.c:365 src/main/print-pcl.c:1552 msgid "Short Edge (Flip)" msgstr "Short Edge (Flip)" -#: src/main/print-canon.c:629 src/main/print-escp2.c:1648 +#: src/main/print-canon.c:629 src/main/print-escp2.c:2012 #: src/main/xmli18n-tmp.h:6 msgid "CD - 5 inch" msgstr "CD - 5 inch" -#: src/main/print-canon.c:631 src/main/print-escp2.c:1650 +#: src/main/print-canon.c:631 src/main/print-escp2.c:2014 #: src/main/xmli18n-tmp.h:7 msgid "CD - 3 inch" msgstr "CD - 3 inch" -#: src/main/print-canon.c:633 src/main/print-escp2.c:1652 +#: src/main/print-canon.c:633 src/main/print-escp2.c:2016 #: src/main/xmli18n-tmp.h:8 #, fuzzy msgid "CD - Custom" msgstr "Custom" -#: src/main/print-canon.c:656 src/main/print-escp2.c:1677 +#: src/main/print-canon.c:656 src/main/print-escp2.c:2041 msgid "Normal" msgstr "Normal" -#: src/main/print-canon.c:658 src/main/print-escp2.c:1679 +#: src/main/print-canon.c:658 src/main/print-escp2.c:2043 msgid "Print To Hub" msgstr "Print To Hub" -#: src/main/print-canon.c:773 src/main/print-escp2.c:2011 -#: src/main/print-lexmark.c:1279 src/main/print-olympus.c:1996 -#: src/main/print-pcl.c:1776 src/main/print-ps.c:170 src/main/print-raw.c:135 -#: src/gutenprintui/panel.c:289 src/gutenprintui2/panel.c:289 +#: src/main/print-canon.c:773 src/main/print-escp2.c:2450 +#: src/main/print-lexmark.c:1279 src/main/print-olympus.c:1994 +#: src/main/print-pcl.c:1844 src/main/print-ps.c:310 src/main/print-raw.c:135 +#: src/gutenprintui2/panel.c:290 msgid "Color" msgstr "Colour" -#: src/main/print-canon.c:775 src/main/print-escp2.c:2013 -#: src/main/print-lexmark.c:1281 src/main/print-pcl.c:1778 -#: src/main/print-ps.c:172 src/main/print-raw.c:137 +#: src/main/print-canon.c:775 src/main/print-escp2.c:2452 +#: src/main/print-lexmark.c:1281 src/main/print-pcl.c:1846 +#: src/main/print-ps.c:312 src/main/print-raw.c:137 msgid "Black and White" msgstr "Black and White" @@ -477,7 +499,7 @@ msgstr "Pre-Dithered" #: src/main/print-color.c:121 src/main/escp2-channels.c:916 #: src/main/escp2-channels.c:929 src/main/escp2-channels.c:943 -#: src/gutenprintui/panel.c:290 src/gutenprintui2/panel.c:290 +#: src/gutenprintui2/panel.c:291 msgid "Grayscale" msgstr "Grayscale" @@ -501,7 +523,7 @@ msgstr "CMYK" msgid "KCMY" msgstr "KCMY" -#: src/main/print-color.c:165 src/main/print-color.c:446 +#: src/main/print-color.c:165 src/main/print-color.c:454 msgid "Channel " msgstr "Channel " @@ -557,7 +579,7 @@ msgid "Output image type" msgstr "Output image type" #: src/main/print-color.c:208 src/main/print-color.c:209 -#: src/main/print-escp2.c:347 +#: src/main/print-escp2.c:349 msgid "Raw Channels" msgstr "Raw Channels" @@ -617,14 +639,14 @@ msgstr "AppGamma" msgid "Gamma value assumed by application" msgstr "Gamma value assumed by application" -#: src/main/print-color.c:266 src/main/escp2-channels.c:3048 -#: src/main/escp2-channels.c:3060 src/main/escp2-channels.c:3068 -#: src/main/escp2-channels.c:3078 src/main/escp2-channels.c:3089 -#: src/main/escp2-channels.c:3101 src/main/escp2-channels.c:3117 -#: src/main/escp2-channels.c:3125 src/main/escp2-channels.c:3138 -#: src/main/escp2-channels.c:3151 src/main/escp2-channels.c:3165 -#: src/main/escp2-channels.c:3179 src/main/escp2-channels.c:3194 -#: src/gutenprintui/panel.c:2152 src/gutenprintui2/panel.c:2153 +#: src/main/print-color.c:266 src/main/escp2-channels.c:3087 +#: src/main/escp2-channels.c:3099 src/main/escp2-channels.c:3107 +#: src/main/escp2-channels.c:3117 src/main/escp2-channels.c:3128 +#: src/main/escp2-channels.c:3140 src/main/escp2-channels.c:3156 +#: src/main/escp2-channels.c:3164 src/main/escp2-channels.c:3177 +#: src/main/escp2-channels.c:3190 src/main/escp2-channels.c:3204 +#: src/main/escp2-channels.c:3218 src/main/escp2-channels.c:3230 +#: src/main/escp2-channels.c:3243 src/gutenprintui2/panel.c:2328 #: src/escputil/escputil.c:978 src/escputil/escputil.c:997 #: src/escputil/escputil.c:1201 msgid "Cyan" @@ -634,14 +656,14 @@ msgstr "Cyan" msgid "Adjust the cyan gamma" msgstr "Adjust the cyan gamma" -#: src/main/print-color.c:274 src/main/escp2-channels.c:3049 -#: src/main/escp2-channels.c:3059 src/main/escp2-channels.c:3070 -#: src/main/escp2-channels.c:3079 src/main/escp2-channels.c:3090 -#: src/main/escp2-channels.c:3103 src/main/escp2-channels.c:3116 -#: src/main/escp2-channels.c:3126 src/main/escp2-channels.c:3139 -#: src/main/escp2-channels.c:3152 src/main/escp2-channels.c:3164 -#: src/main/escp2-channels.c:3178 src/main/escp2-channels.c:3195 -#: src/gutenprintui/panel.c:2159 src/gutenprintui2/panel.c:2160 +#: src/main/print-color.c:274 src/main/escp2-channels.c:3088 +#: src/main/escp2-channels.c:3098 src/main/escp2-channels.c:3109 +#: src/main/escp2-channels.c:3118 src/main/escp2-channels.c:3129 +#: src/main/escp2-channels.c:3142 src/main/escp2-channels.c:3155 +#: src/main/escp2-channels.c:3165 src/main/escp2-channels.c:3178 +#: src/main/escp2-channels.c:3191 src/main/escp2-channels.c:3203 +#: src/main/escp2-channels.c:3217 src/main/escp2-channels.c:3229 +#: src/main/escp2-channels.c:3244 src/gutenprintui2/panel.c:2335 #: src/escputil/escputil.c:979 src/escputil/escputil.c:998 #: src/escputil/escputil.c:1202 msgid "Magenta" @@ -651,14 +673,14 @@ msgstr "Magenta" msgid "Adjust the magenta gamma" msgstr "Adjust the magenta gamma" -#: src/main/print-color.c:282 src/main/escp2-channels.c:3050 -#: src/main/escp2-channels.c:3061 src/main/escp2-channels.c:3069 -#: src/main/escp2-channels.c:3080 src/main/escp2-channels.c:3091 -#: src/main/escp2-channels.c:3105 src/main/escp2-channels.c:3112 -#: src/main/escp2-channels.c:3127 src/main/escp2-channels.c:3140 -#: src/main/escp2-channels.c:3153 src/main/escp2-channels.c:3163 -#: src/main/escp2-channels.c:3177 src/main/escp2-channels.c:3196 -#: src/gutenprintui/panel.c:2166 src/gutenprintui2/panel.c:2167 +#: src/main/print-color.c:282 src/main/escp2-channels.c:3089 +#: src/main/escp2-channels.c:3100 src/main/escp2-channels.c:3108 +#: src/main/escp2-channels.c:3119 src/main/escp2-channels.c:3130 +#: src/main/escp2-channels.c:3144 src/main/escp2-channels.c:3151 +#: src/main/escp2-channels.c:3166 src/main/escp2-channels.c:3179 +#: src/main/escp2-channels.c:3192 src/main/escp2-channels.c:3202 +#: src/main/escp2-channels.c:3216 src/main/escp2-channels.c:3228 +#: src/main/escp2-channels.c:3245 src/gutenprintui2/panel.c:2342 #: src/escputil/escputil.c:980 src/escputil/escputil.c:999 #: src/escputil/escputil.c:1203 msgid "Yellow" @@ -668,10 +690,9 @@ msgstr "Yellow" msgid "Adjust the yellow gamma" msgstr "Adjust the yellow gamma" -#: src/main/print-color.c:290 src/main/escp2-channels.c:3168 -#: src/main/escp2-channels.c:3181 src/gutenprintui/panel.c:2180 -#: src/gutenprintui2/panel.c:2181 src/escputil/escputil.c:987 -#: src/escputil/escputil.c:1005 +#: src/main/print-color.c:290 src/main/escp2-channels.c:3207 +#: src/main/escp2-channels.c:3220 src/gutenprintui2/panel.c:2356 +#: src/escputil/escputil.c:987 src/escputil/escputil.c:1005 msgid "Red" msgstr "Red" @@ -679,8 +700,7 @@ msgstr "Red" msgid "Adjust the red gamma" msgstr "Adjust the red gamma" -#: src/main/print-color.c:298 src/gutenprintui/panel.c:2187 -#: src/gutenprintui2/panel.c:2188 +#: src/main/print-color.c:298 src/gutenprintui2/panel.c:2363 msgid "Green" msgstr "Green" @@ -688,10 +708,9 @@ msgstr "Green" msgid "Adjust the green gamma" msgstr "Adjust the green gamma" -#: src/main/print-color.c:306 src/main/escp2-channels.c:3169 -#: src/main/escp2-channels.c:3182 src/gutenprintui/panel.c:2194 -#: src/gutenprintui2/panel.c:2195 src/escputil/escputil.c:988 -#: src/escputil/escputil.c:1006 +#: src/main/print-color.c:306 src/main/escp2-channels.c:3208 +#: src/main/escp2-channels.c:3221 src/gutenprintui2/panel.c:2370 +#: src/escputil/escputil.c:988 src/escputil/escputil.c:1006 msgid "Blue" msgstr "Blue" @@ -700,14 +719,14 @@ msgid "Adjust the blue gamma" msgstr "Adjust the blue gamma" #: src/main/print-color.c:314 src/main/print-lexmark.c:613 -#: src/main/escp2-channels.c:3047 src/main/escp2-channels.c:3057 -#: src/main/escp2-channels.c:3058 src/main/escp2-channels.c:3071 -#: src/main/escp2-channels.c:3081 src/main/escp2-channels.c:3088 -#: src/main/escp2-channels.c:3100 src/main/escp2-channels.c:3113 -#: src/main/escp2-channels.c:3124 src/main/escp2-channels.c:3137 -#: src/main/escp2-channels.c:3150 src/main/escp2-channels.c:3156 -#: src/main/escp2-channels.c:3180 src/main/escp2-channels.c:3193 -#: src/gutenprintui/panel.c:2173 src/gutenprintui2/panel.c:2174 +#: src/main/escp2-channels.c:3086 src/main/escp2-channels.c:3096 +#: src/main/escp2-channels.c:3097 src/main/escp2-channels.c:3110 +#: src/main/escp2-channels.c:3120 src/main/escp2-channels.c:3127 +#: src/main/escp2-channels.c:3139 src/main/escp2-channels.c:3152 +#: src/main/escp2-channels.c:3163 src/main/escp2-channels.c:3176 +#: src/main/escp2-channels.c:3189 src/main/escp2-channels.c:3195 +#: src/main/escp2-channels.c:3219 src/main/escp2-channels.c:3231 +#: src/main/escp2-channels.c:3242 src/gutenprintui2/panel.c:2349 #: src/escputil/escputil.c:975 src/escputil/escputil.c:996 #: src/escputil/escputil.c:1200 msgid "Black" @@ -717,7 +736,7 @@ msgstr "Black" msgid "Adjust the black gamma" msgstr "Adjust the black gamma" -#: src/main/print-color.c:322 src/main/print-olympus.c:1764 +#: src/main/print-color.c:322 src/main/print-olympus.c:1762 msgid "Cyan Balance" msgstr "Cyan Balance" @@ -730,7 +749,7 @@ msgstr "GrayBalance" msgid "Adjust the cyan gray balance" msgstr "Adjust the cyan gray balance" -#: src/main/print-color.c:330 src/main/print-olympus.c:1772 +#: src/main/print-color.c:330 src/main/print-olympus.c:1770 msgid "Magenta Balance" msgstr "Magenta Balance" @@ -738,7 +757,7 @@ msgstr "Magenta Balance" msgid "Adjust the magenta gray balance" msgstr "Adjust the magenta gray balance" -#: src/main/print-color.c:338 src/main/print-olympus.c:1780 +#: src/main/print-color.c:338 src/main/print-olympus.c:1778 msgid "Yellow Balance" msgstr "Yellow Balance" @@ -764,9 +783,11 @@ msgstr "Ink Limit" #: 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:353 -#: src/main/print-escp2.c:359 src/main/print-escp2.c:365 -#: src/main/print-escp2.c:371 src/main/print-escp2.c:377 +#: src/main/print-color.c:421 src/main/print-color.c:553 +#: src/main/print-escp2.c:355 src/main/print-escp2.c:361 +#: src/main/print-escp2.c:367 src/main/print-escp2.c:373 +#: src/main/print-escp2.c:379 src/main/print-escp2.c:742 +#: src/main/print-escp2.c:750 src/main/print-escp2.c:758 msgid "Advanced Output Control" msgstr "Advanced Output Control" @@ -774,218 +795,226 @@ msgstr "Advanced Output Control" msgid "Limit the total ink printed to the page" msgstr "Limit the total ink printed to the page" -#: src/main/print-color.c:365 +#: src/main/print-color.c:365 src/main/print-escp2.c:742 msgid "GCR Transition" msgstr "GCR Transition" -#: src/main/print-color.c:366 +#: src/main/print-color.c:366 src/main/print-escp2.c:743 msgid "Adjust the gray component transition rate" msgstr "Adjust the gray component transition rate" -#: src/main/print-color.c:373 +#: src/main/print-color.c:373 src/main/print-escp2.c:750 msgid "GCR Lower Bound" msgstr "GCR Lower Bound" -#: src/main/print-color.c:374 +#: src/main/print-color.c:374 src/main/print-escp2.c:751 msgid "Lower bound of gray component reduction" msgstr "Lower bound of gray component reduction" -#: src/main/print-color.c:381 +#: src/main/print-color.c:381 src/main/print-escp2.c:758 msgid "GCR Upper Bound" msgstr "GCR Upper Bound" -#: src/main/print-color.c:382 +#: src/main/print-color.c:382 src/main/print-escp2.c:759 msgid "Upper bound of gray component reduction" msgstr "Upper bound of gray component reduction" -#: src/main/print-color.c:447 src/main/print-color.c:457 -#: src/main/print-color.c:465 src/main/print-color.c:473 -#: src/main/print-color.c:481 src/main/print-color.c:489 -#: src/main/print-color.c:497 src/main/print-color.c:505 -#: src/main/print-color.c:513 +#: src/main/print-color.c:421 +msgid "LUT dump file" +msgstr "" + +#: src/main/print-color.c:422 +msgid "Dump file for LUT for external color adjustment" +msgstr "" + +#: src/main/print-color.c:455 src/main/print-color.c:465 +#: src/main/print-color.c:473 src/main/print-color.c:481 +#: src/main/print-color.c:489 src/main/print-color.c:497 +#: src/main/print-color.c:505 src/main/print-color.c:513 +#: src/main/print-color.c:521 msgid "Output Curves" msgstr "Output Curves" -#: src/main/print-color.c:447 +#: src/main/print-color.c:455 msgid "Curve for raw channel " msgstr "Curve for raw channel " -#: src/main/print-color.c:457 +#: src/main/print-color.c:465 msgid "Cyan Curve" msgstr "Cyan Curve" -#: src/main/print-color.c:458 +#: src/main/print-color.c:466 msgid "Cyan curve" msgstr "Cyan curve" -#: src/main/print-color.c:465 +#: src/main/print-color.c:473 msgid "Magenta Curve" msgstr "Magenta Curve" -#: src/main/print-color.c:466 +#: src/main/print-color.c:474 msgid "Magenta curve" msgstr "Magenta curve" -#: src/main/print-color.c:473 +#: src/main/print-color.c:481 msgid "Yellow Curve" msgstr "Yellow Curve" -#: src/main/print-color.c:474 +#: src/main/print-color.c:482 msgid "Yellow curve" msgstr "Yellow curve" -#: src/main/print-color.c:481 +#: src/main/print-color.c:489 msgid "Black Curve" msgstr "Black Curve" -#: src/main/print-color.c:482 +#: src/main/print-color.c:490 msgid "Black curve" msgstr "Black curve" -#: src/main/print-color.c:489 +#: src/main/print-color.c:497 msgid "Red Curve" msgstr "Red Curve" -#: src/main/print-color.c:490 +#: src/main/print-color.c:498 msgid "Red curve" msgstr "Red curve" -#: src/main/print-color.c:497 +#: src/main/print-color.c:505 msgid "Green Curve" msgstr "Green Curve" -#: src/main/print-color.c:498 +#: src/main/print-color.c:506 msgid "Green curve" msgstr "Green curve" -#: src/main/print-color.c:505 +#: src/main/print-color.c:513 msgid "Blue Curve" msgstr "Blue Curve" -#: src/main/print-color.c:506 +#: src/main/print-color.c:514 msgid "Blue curve" msgstr "Blue curve" -#: src/main/print-color.c:513 +#: src/main/print-color.c:521 msgid "White Curve" msgstr "White Curve" -#: src/main/print-color.c:514 +#: src/main/print-color.c:522 msgid "White curve" msgstr "White curve" -#: src/main/print-color.c:521 +#: src/main/print-color.c:529 msgid "Hue Map" msgstr "Hue Map" -#: src/main/print-color.c:521 src/main/print-color.c:529 -#: src/main/print-color.c:537 +#: src/main/print-color.c:529 src/main/print-color.c:537 +#: src/main/print-color.c:545 msgid "Advanced HSL Curves" msgstr "Advanced HSL Curves" -#: src/main/print-color.c:522 +#: src/main/print-color.c:530 msgid "Hue adjustment curve" msgstr "Hue adjustment curve" -#: src/main/print-color.c:529 +#: src/main/print-color.c:537 msgid "Saturation Map" msgstr "Saturation Map" -#: src/main/print-color.c:530 +#: src/main/print-color.c:538 msgid "Saturation adjustment curve" msgstr "Saturation adjustment curve" -#: src/main/print-color.c:537 +#: src/main/print-color.c:545 msgid "Luminosity Map" msgstr "Luminosity Map" -#: src/main/print-color.c:538 +#: src/main/print-color.c:546 msgid "Luminosity adjustment curve" msgstr "Luminosity adjustment curve" -#: src/main/print-color.c:545 +#: src/main/print-color.c:553 msgid "Gray Component Reduction" msgstr "Gray Component Reduction" -#: src/main/print-color.c:546 +#: src/main/print-color.c:554 msgid "Gray component reduction curve" msgstr "Gray component reduction curve" -#: src/main/print-color.c:1670 +#: src/main/print-color.c:1743 msgid "Traditional Gutenprint color conversion" msgstr "Traditional Gutenprint colour conversion" -#: src/main/printers.c:517 +#: src/main/printers.c:514 #, c-format msgid "Value must be set for %s\n" msgstr "Value must be set for %s\n" -#: src/main/printers.c:530 src/main/printers.c:535 +#: src/main/printers.c:527 src/main/printers.c:532 #, c-format msgid "`%s' is not a valid %s\n" msgstr "`%s' is not a valid %s\n" -#: src/main/printers.c:554 +#: src/main/printers.c:551 #, c-format msgid "%s must be between %f and %f (is %f)\n" msgstr "%s must be between %f and %f (is %f)\n" -#: src/main/printers.c:576 src/main/printers.c:600 +#: src/main/printers.c:573 src/main/printers.c:597 #, c-format msgid "%s must be between %d and %d (is %d)\n" msgstr "%s must be between %d and %d (is %d)\n" -#: src/main/printers.c:631 +#: src/main/printers.c:628 #, c-format msgid "%s bounds must be between %f and %f\n" msgstr "%s bounds must be between %f and %f\n" -#: src/main/printers.c:639 +#: src/main/printers.c:636 #, c-format msgid "%s wrap mode must be %s\n" msgstr "%s wrap mode must be %s\n" -#: src/main/printers.c:643 +#: src/main/printers.c:640 msgid "no wrap" msgstr "no wrap" -#: src/main/printers.c:643 +#: src/main/printers.c:640 msgid "wrap around" msgstr "wrap around" -#: src/main/printers.c:687 +#: src/main/printers.c:684 #, c-format msgid "Unknown type parameter %s (%d)\n" msgstr "Unknown type parameter %s (%d)\n" -#: src/main/printers.c:700 src/main/printers.c:711 +#: src/main/printers.c:697 src/main/printers.c:708 #, c-format msgid "%s out of range (value %d, min %d, max %d)\n" msgstr "%s out of range (value %d, min %d, max %d)\n" -#: src/main/printers.c:772 +#: src/main/printers.c:768 msgid "Page size is not valid\n" msgstr "Page size is not valid\n" -#: src/main/printers.c:793 +#: src/main/printers.c:789 #, c-format msgid "Top margin must not be less than %d\n" msgstr "Top margin must not be less than %d\n" -#: src/main/printers.c:799 +#: src/main/printers.c:795 #, c-format msgid "Left margin must not be less than %d\n" msgstr "Left margin must not be less than %d\n" -#: src/main/printers.c:805 +#: src/main/printers.c:801 msgid "Height must be greater than zero\n" msgstr "Height must be greater than zero\n" -#: src/main/printers.c:811 +#: src/main/printers.c:807 msgid "Width must be greater than zero\n" msgstr "Width must be greater than zero\n" -#: src/main/printers.c:817 +#: src/main/printers.c:813 #, c-format msgid "" "Image is too wide for the page: left margin is %d, width %d, right edge is %" @@ -994,7 +1023,7 @@ msgstr "" "Image is too wide for the page: left margin is %d, width %d, right edge is %" "d\n" -#: src/main/printers.c:824 +#: src/main/printers.c:820 #, c-format msgid "" "Image is too long for the page: top margin is %d, height %d, bottom edge is %" @@ -1003,278 +1032,387 @@ msgstr "" "Image is too long for the page: top margin is %d, height %d, bottom edge is %" "d\n" -#: src/main/print-escp2.c:162 +#: src/main/print-escp2.c:164 msgid "Automatic Printing Mode" msgstr "Automatic Printing Mode" -#: src/main/print-escp2.c:162 src/main/print-escp2.c:174 +#: src/main/print-escp2.c:164 src/main/print-escp2.c:176 #: src/main/generic-options.c:62 msgid "Basic Output Adjustment" msgstr "Basic Output Adjustment" -#: src/main/print-escp2.c:163 +#: src/main/print-escp2.c:165 msgid "Automatic printing mode" msgstr "Automatic printing mode" -#: src/main/print-escp2.c:174 src/main/print-escp2.c:175 +#: src/main/print-escp2.c:176 src/main/print-escp2.c:177 #: src/main/generic-options.c:62 src/main/generic-options.c:63 msgid "Print Quality" msgstr "Print Quality" -#: src/main/print-escp2.c:229 +#: src/main/print-escp2.c:231 msgid "Resolution of the print" msgstr "Resolution of the print" -#: src/main/print-escp2.c:245 +#: src/main/print-escp2.c:247 msgid "Enhanced Gloss" msgstr "Enhanced Gloss" -#: src/main/print-escp2.c:246 +#: src/main/print-escp2.c:248 msgid "Add gloss enhancement" msgstr "Add gloss enhancement" -#: src/main/print-escp2.c:251 +#: src/main/print-escp2.c:253 msgid "Ink Set" msgstr "Ink Set" -#: src/main/print-escp2.c:257 +#: src/main/print-escp2.c:259 msgid "Printing Direction" msgstr "Printing Direction" -#: src/main/print-escp2.c:257 src/main/print-escp2.c:269 +#: src/main/print-escp2.c:259 src/main/print-escp2.c:271 msgid "Advanced Output Adjustment" msgstr "Advanced Output Adjustment" -#: src/main/print-escp2.c:258 +#: src/main/print-escp2.c:260 msgid "Printing direction (unidirectional is higher quality, but slower)" msgstr "Printing direction (unidirectional is higher quality, but slower)" -#: src/main/print-escp2.c:263 src/main/print-olympus.c:1735 +#: src/main/print-escp2.c:265 src/main/print-olympus.c:1733 msgid "Borderless" msgstr "Borderless" -#: src/main/print-escp2.c:264 src/main/print-olympus.c:1736 +#: src/main/print-escp2.c:266 src/main/print-olympus.c:1734 msgid "Print without borders" msgstr "Print without borders" -#: src/main/print-escp2.c:269 +#: src/main/print-escp2.c:271 msgid "Interleave Method" msgstr "Interleave Method" -#: src/main/print-escp2.c:270 +#: src/main/print-escp2.c:272 msgid "Interleave pattern to use" msgstr "Interleave pattern to use" -#: src/main/print-escp2.c:275 +#: src/main/print-escp2.c:277 msgid "Adjust dot size as necessary" msgstr "Adjust dot size as necessary" -#: src/main/print-escp2.c:276 +#: src/main/print-escp2.c:278 msgid "Adjust dot size as necessary to achieve desired density" msgstr "Adjust dot size as necessary to achieve desired density" -#: src/main/print-escp2.c:281 src/main/print-escp2.c:282 +#: src/main/print-escp2.c:283 src/main/print-escp2.c:284 msgid "Output Order" msgstr "Output Order" -#: src/main/print-escp2.c:287 src/main/print-escp2.c:288 +#: src/main/print-escp2.c:289 src/main/print-escp2.c:290 msgid "Alignment Passes" msgstr "Alignment Passes" -#: src/main/print-escp2.c:293 src/main/print-escp2.c:294 +#: src/main/print-escp2.c:295 src/main/print-escp2.c:296 msgid "Alignment Choices" msgstr "Alignment Choices" -#: src/main/print-escp2.c:299 src/main/print-escp2.c:300 +#: src/main/print-escp2.c:301 src/main/print-escp2.c:302 msgid "Ink change command" msgstr "Ink change command" -#: src/main/print-escp2.c:305 src/main/print-escp2.c:306 +#: src/main/print-escp2.c:307 src/main/print-escp2.c:308 msgid "Alternate Alignment Passes" msgstr "Alternate Alignment Passes" -#: src/main/print-escp2.c:311 src/main/print-escp2.c:312 +#: src/main/print-escp2.c:313 src/main/print-escp2.c:314 msgid "Alternate Alignment Choices" msgstr "Alternate Alignment Choices" -#: src/main/print-escp2.c:317 +#: src/main/print-escp2.c:319 msgid "Supports Packet Mode" msgstr "Supports Packet Mode" -#: src/main/print-escp2.c:318 +#: src/main/print-escp2.c:320 #, fuzzy msgid "Supports D4 Packet Mode" msgstr "Supports Packet Mode" -#: src/main/print-escp2.c:323 +#: src/main/print-escp2.c:325 msgid "Has Interchangeable Ink Cartridges" msgstr "" -#: src/main/print-escp2.c:324 +#: src/main/print-escp2.c:326 msgid "Has multiple choices of ink cartridges" msgstr "" -#: src/main/print-escp2.c:335 src/main/print-escp2.c:336 +#: src/main/print-escp2.c:337 src/main/print-escp2.c:338 msgid "Channel Names" msgstr "Channel Names" -#: src/main/print-escp2.c:348 +#: src/main/print-escp2.c:350 msgid "Raw Channel Count" msgstr "Raw Channel Count" -#: src/main/print-escp2.c:353 +#: src/main/print-escp2.c:355 msgid "Cyan Map" msgstr "Cyan Map" -#: src/main/print-escp2.c:354 +#: src/main/print-escp2.c:356 msgid "Adjust the cyan map" msgstr "Adjust the cyan map" -#: src/main/print-escp2.c:359 +#: src/main/print-escp2.c:361 msgid "Magenta Map" msgstr "Magenta Map" -#: src/main/print-escp2.c:360 +#: src/main/print-escp2.c:362 msgid "Adjust the magenta map" msgstr "Adjust the magenta map" -#: src/main/print-escp2.c:365 +#: src/main/print-escp2.c:367 msgid "Yellow Map" msgstr "Yellow Map" -#: src/main/print-escp2.c:366 +#: src/main/print-escp2.c:368 msgid "Adjust the yellow map" msgstr "Adjust the yellow map" -#: src/main/print-escp2.c:371 +#: src/main/print-escp2.c:373 msgid "Blue Map" msgstr "Blue Map" -#: src/main/print-escp2.c:372 +#: src/main/print-escp2.c:374 msgid "Adjust the blue map" msgstr "Adjust the blue map" -#: src/main/print-escp2.c:377 +#: src/main/print-escp2.c:379 msgid "Red Map" msgstr "Red Map" -#: src/main/print-escp2.c:378 +#: src/main/print-escp2.c:380 msgid "Adjust the red map" msgstr "Adjust the red map" -#: src/main/print-escp2.c:471 +#: src/main/print-escp2.c:478 msgid "Red Density" msgstr "Red Density" -#: src/main/print-escp2.c:472 +#: src/main/print-escp2.c:479 msgid "Adjust the red density" msgstr "Adjust the red density" -#: src/main/print-escp2.c:479 +#: src/main/print-escp2.c:486 msgid "Blue Density" msgstr "Blue Density" -#: src/main/print-escp2.c:480 +#: src/main/print-escp2.c:487 msgid "Adjust the blue density" msgstr "Adjust the blue density" -#: src/main/print-escp2.c:487 +#: src/main/print-escp2.c:494 msgid "Gloss Level" msgstr "Gloss Level" -#: src/main/print-escp2.c:488 +#: src/main/print-escp2.c:495 msgid "Adjust the gloss level" msgstr "Adjust the gloss level" -#: src/main/print-escp2.c:511 src/main/print-escp2.c:512 +#: src/main/print-escp2.c:502 +msgid "Drop Size Small" +msgstr "" + +#: src/main/print-escp2.c:503 +msgid "Drop Size 1 (small)" +msgstr "" + +#: src/main/print-escp2.c:510 +msgid "Drop Size Medium" +msgstr "" + +#: src/main/print-escp2.c:511 +msgid "Drop Size 2 (medium)" +msgstr "" + +#: src/main/print-escp2.c:518 +msgid "Drop Size Large" +msgstr "" + +#: src/main/print-escp2.c:519 +msgid "Drop Size 3 (large)" +msgstr "" + +#: src/main/print-escp2.c:526 src/main/print-escp2.c:527 +#, fuzzy +msgid "Light Cyan Value" +msgstr "Light Cyan" + +#: src/main/print-escp2.c:542 src/main/print-escp2.c:543 +#, fuzzy +msgid "Light Cyan Density Scale" +msgstr "Cyan Density" + +#: src/main/print-escp2.c:550 src/main/print-escp2.c:551 +#, fuzzy +msgid "Light Magenta Value" +msgstr "Light Magenta" + +#: src/main/print-escp2.c:558 src/main/print-escp2.c:559 +#, fuzzy +msgid "Light Magenta Density Scale" +msgstr "Magenta Density" + +#: src/main/print-escp2.c:574 src/main/print-escp2.c:575 +#, fuzzy +msgid "Dark Yellow Value" +msgstr "Dark Yellow" + +#: src/main/print-escp2.c:582 src/main/print-escp2.c:583 msgid "Dark Yellow Transition" msgstr "Dark Yellow Transition" -#: src/main/print-escp2.c:519 src/main/print-escp2.c:520 -#: src/main/print-escp2.c:527 src/main/print-escp2.c:528 +#: src/main/print-escp2.c:590 src/main/print-escp2.c:591 +#, fuzzy +msgid "Dark Yellow Density Scale" +msgstr "Yellow Density" + +#: src/main/print-escp2.c:598 src/main/print-escp2.c:599 +#: src/main/print-escp2.c:622 src/main/print-escp2.c:623 +#, fuzzy +msgid "Gray Value" +msgstr "Grayscale" + +#: src/main/print-escp2.c:606 src/main/print-escp2.c:607 +#: src/main/print-escp2.c:630 src/main/print-escp2.c:631 msgid "Gray Transition" msgstr "Gray Transition" -#: src/main/print-escp2.c:535 src/main/print-escp2.c:536 -#: src/main/print-escp2.c:559 src/main/print-escp2.c:560 +#: src/main/print-escp2.c:614 src/main/print-escp2.c:615 +#: src/main/print-escp2.c:638 src/main/print-escp2.c:639 +#, fuzzy +msgid "Gray Density Scale" +msgstr "Grayscale" + +#: src/main/print-escp2.c:646 src/main/print-escp2.c:647 +#: src/main/print-escp2.c:718 src/main/print-escp2.c:719 +#, fuzzy +msgid "Light Gray Value" +msgstr "Light Gray Transition" + +#: src/main/print-escp2.c:654 src/main/print-escp2.c:655 +#: src/main/print-escp2.c:726 src/main/print-escp2.c:727 msgid "Light Gray Transition" msgstr "Light Gray Transition" -#: src/main/print-escp2.c:543 src/main/print-escp2.c:544 +#: src/main/print-escp2.c:662 src/main/print-escp2.c:663 +#: src/main/print-escp2.c:734 src/main/print-escp2.c:735 +#, fuzzy +msgid "Light Gray Density Scale" +msgstr "Light Gray Transition" + +#: src/main/print-escp2.c:670 src/main/print-escp2.c:671 +#, fuzzy +msgid "Dark Gray Value" +msgstr "Dark Gray Transition" + +#: src/main/print-escp2.c:678 src/main/print-escp2.c:679 msgid "Dark Gray Transition" msgstr "Dark Gray Transition" -#: src/main/print-escp2.c:551 +#: src/main/print-escp2.c:686 src/main/print-escp2.c:687 +#, fuzzy +msgid "Dark Gray Density Scale" +msgstr "Dark Gray Transition" + +#: src/main/print-escp2.c:694 +#, fuzzy +msgid "Mid Gray Value" +msgstr "Grayscale" + +#: src/main/print-escp2.c:695 +#, fuzzy +msgid "Medium Gray Value" +msgstr "Medium Gray Transition" + +#: src/main/print-escp2.c:702 msgid "Mid Gray Transition" msgstr "Mid Gray Transition" -#: src/main/print-escp2.c:552 +#: src/main/print-escp2.c:703 msgid "Medium Gray Transition" msgstr "Medium Gray Transition" -#: src/main/print-escp2.c:1635 +#: src/main/print-escp2.c:710 +#, fuzzy +msgid "Mid Gray Density Scale" +msgstr "Mid Gray Transition" + +#: src/main/print-escp2.c:711 +#, fuzzy +msgid "Medium Gray Density Scale" +msgstr "Medium Gray Transition" + +#: src/main/print-escp2.c:1999 msgid "Full Manual Control" msgstr "Full Manual Control" -#: src/main/print-escp2.c:1637 +#: src/main/print-escp2.c:2001 msgid "Automatic Setting Control" msgstr "Automatic Setting Control" -#: src/main/print-escp2.c:1732 src/main/generic-options.c:213 +#: src/main/print-escp2.c:2096 src/main/generic-options.c:213 #: src/main/generic-options.c:230 msgid "Manual Control" msgstr "Manual Control" -#: src/main/print-escp2.c:1771 src/main/print-escp2.c:1863 -#: src/main/print-escp2.c:1875 src/main/print-pcl.c:230 -#: src/main/escp2-channels.c:2805 src/main/escp2-papers.c:1707 -#: src/main/escp2-papers.c:1731 src/main/escp2-papers.c:1764 -#: src/main/escp2-papers.c:1815 src/main/escp2-papers.c:1857 -#: src/main/escp2-papers.c:1899 src/main/escp2-papers.c:1992 -#: src/main/escp2-resolutions.c:640 src/main/escp2-resolutions.c:655 -#: src/main/escp2-resolutions.c:668 src/main/generic-options.c:36 -#: src/gutenprintui/panel.c:2613 src/gutenprintui2/panel.c:2639 +#: src/main/print-escp2.c:2139 src/main/print-escp2.c:2231 +#: src/main/print-escp2.c:2243 src/main/print-pcl.c:237 +#: src/main/escp2-channels.c:2827 src/main/escp2-channels.c:2836 +#: src/main/escp2-papers.c:1718 src/main/escp2-papers.c:1742 +#: src/main/escp2-papers.c:1775 src/main/escp2-papers.c:1826 +#: src/main/escp2-papers.c:1868 src/main/escp2-papers.c:1910 +#: src/main/escp2-papers.c:2003 src/main/escp2-resolutions.c:640 +#: src/main/escp2-resolutions.c:655 src/main/escp2-resolutions.c:670 +#: src/main/escp2-resolutions.c:683 src/main/generic-options.c:36 +#: src/gutenprintui2/panel.c:2814 msgid "Standard" msgstr "Standard" -#: src/main/print-escp2.c:1842 +#: src/main/print-escp2.c:2210 msgid "Automatic" msgstr "Automatic" -#: src/main/print-escp2.c:1844 +#: src/main/print-escp2.c:2212 msgid "Bidirectional" msgstr "Bidirectional" -#: src/main/print-escp2.c:1846 +#: src/main/print-escp2.c:2214 msgid "Unidirectional" msgstr "Unidirectional" -#: src/main/print-escp2.c:1877 +#: src/main/print-escp2.c:2245 msgid "Alternate Fill" msgstr "Alternate Fill" -#: src/main/print-escp2.c:1879 +#: src/main/print-escp2.c:2247 msgid "Ascending Fill" msgstr "Ascending Fill" -#: src/main/print-escp2.c:1881 +#: src/main/print-escp2.c:2249 msgid "Descending Fill" msgstr "Descending Fill" -#: src/main/print-escp2.c:1883 +#: src/main/print-escp2.c:2251 msgid "Ascending Double" msgstr "Ascending Double" -#: src/main/print-escp2.c:1885 +#: src/main/print-escp2.c:2253 msgid "Nearest Neighbor Avoidance" msgstr "Nearest Neighbour Avoidance" -#: src/main/print-escp2.c:2328 +#: src/main/print-escp2.c:2771 #, 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:3436 src/main/print-olympus.c:2451 +#: src/main/print-escp2.c:3934 src/main/print-olympus.c:2449 #: src/main/print-raw.c:217 msgid "Print options not verified; cannot print.\n" msgstr "Print options not verified; cannot print.\n" @@ -1348,109 +1486,109 @@ msgid "Three Color Composite" msgstr "Three Colour Composite" #: src/main/print-lexmark.c:607 src/main/print-lexmark.c:677 -#: src/main/escp2-channels.c:1540 src/main/escp2-channels.c:1554 -#: src/main/escp2-channels.c:1568 src/main/escp2-channels.c:1582 -#: src/main/escp2-channels.c:1808 src/main/escp2-channels.c:1823 -#: src/main/escp2-channels.c:1838 src/main/escp2-channels.c:1855 +#: src/main/escp2-channels.c:1554 src/main/escp2-channels.c:1568 +#: src/main/escp2-channels.c:1582 src/main/escp2-channels.c:1596 +#: src/main/escp2-channels.c:1822 src/main/escp2-channels.c:1837 +#: src/main/escp2-channels.c:1852 src/main/escp2-channels.c:1869 msgid "Six Color Photo" msgstr "Six Colour Photo" #: src/main/print-lexmark.c:610 src/main/print-lexmark.c:680 -#: src/main/escp2-channels.c:1475 src/main/escp2-channels.c:1489 -#: src/main/escp2-channels.c:1503 src/main/escp2-channels.c:1517 -#: src/main/escp2-channels.c:1752 src/main/escp2-channels.c:1767 -#: src/main/escp2-channels.c:1784 +#: src/main/escp2-channels.c:1489 src/main/escp2-channels.c:1503 +#: src/main/escp2-channels.c:1517 src/main/escp2-channels.c:1531 +#: src/main/escp2-channels.c:1766 src/main/escp2-channels.c:1781 +#: src/main/escp2-channels.c:1798 msgid "Five Color Photo Composite" msgstr "Five Colour Photo Composite" -#: src/main/print-lexmark.c:856 src/main/escp2-papers.c:1341 -#: src/main/escp2-papers.c:1385 src/main/escp2-papers.c:1429 -#: src/main/escp2-papers.c:1477 src/main/escp2-papers.c:1525 -#: src/main/escp2-papers.c:1569 +#: src/main/print-lexmark.c:856 src/main/escp2-papers.c:1351 +#: src/main/escp2-papers.c:1395 src/main/escp2-papers.c:1439 +#: src/main/escp2-papers.c:1487 src/main/escp2-papers.c:1535 +#: src/main/escp2-papers.c:1579 msgid "Plain Paper" msgstr "Plain Paper" -#: src/main/print-lexmark.c:860 src/main/escp2-papers.c:1347 -#: src/main/escp2-papers.c:1391 src/main/escp2-papers.c:1435 -#: src/main/escp2-papers.c:1483 src/main/escp2-papers.c:1531 -#: src/main/escp2-papers.c:1575 +#: src/main/print-lexmark.c:860 src/main/escp2-papers.c:1357 +#: src/main/escp2-papers.c:1401 src/main/escp2-papers.c:1445 +#: src/main/escp2-papers.c:1493 src/main/escp2-papers.c:1541 +#: src/main/escp2-papers.c:1585 msgid "Glossy Film" msgstr "Glossy Film" -#: src/main/print-lexmark.c:864 src/main/escp2-papers.c:1349 -#: src/main/escp2-papers.c:1393 src/main/escp2-papers.c:1437 -#: src/main/escp2-papers.c:1485 src/main/escp2-papers.c:1533 -#: src/main/escp2-papers.c:1577 +#: src/main/print-lexmark.c:864 src/main/escp2-papers.c:1359 +#: src/main/escp2-papers.c:1403 src/main/escp2-papers.c:1447 +#: src/main/escp2-papers.c:1495 src/main/escp2-papers.c:1543 +#: src/main/escp2-papers.c:1587 msgid "Transparencies" msgstr "Transparencies" -#: src/main/print-lexmark.c:868 src/main/escp2-papers.c:1351 -#: src/main/escp2-papers.c:1395 src/main/escp2-papers.c:1439 -#: src/main/escp2-papers.c:1487 src/main/escp2-papers.c:1535 -#: src/main/escp2-papers.c:1579 +#: src/main/print-lexmark.c:868 src/main/escp2-papers.c:1361 +#: src/main/escp2-papers.c:1405 src/main/escp2-papers.c:1449 +#: src/main/escp2-papers.c:1497 src/main/escp2-papers.c:1545 +#: src/main/escp2-papers.c:1589 msgid "Envelopes" msgstr "Envelopes" -#: src/main/print-lexmark.c:872 src/main/escp2-papers.c:1355 -#: src/main/escp2-papers.c:1399 src/main/escp2-papers.c:1443 -#: src/main/escp2-papers.c:1491 src/main/escp2-papers.c:1539 -#: src/main/escp2-papers.c:1583 +#: src/main/print-lexmark.c:872 src/main/escp2-papers.c:1365 +#: src/main/escp2-papers.c:1409 src/main/escp2-papers.c:1453 +#: src/main/escp2-papers.c:1501 src/main/escp2-papers.c:1549 +#: src/main/escp2-papers.c:1593 msgid "Matte Paper" msgstr "Matte Paper" -#: src/main/print-lexmark.c:876 src/main/escp2-papers.c:1359 -#: src/main/escp2-papers.c:1403 src/main/escp2-papers.c:1447 -#: src/main/escp2-papers.c:1495 src/main/escp2-papers.c:1543 -#: src/main/escp2-papers.c:1587 +#: src/main/print-lexmark.c:876 src/main/escp2-papers.c:1369 +#: src/main/escp2-papers.c:1413 src/main/escp2-papers.c:1457 +#: src/main/escp2-papers.c:1505 src/main/escp2-papers.c:1553 +#: src/main/escp2-papers.c:1597 msgid "Inkjet Paper" msgstr "Inkjet Paper" -#: src/main/print-lexmark.c:880 src/main/escp2-papers.c:1361 -#: src/main/escp2-papers.c:1405 src/main/escp2-papers.c:1449 -#: src/main/escp2-papers.c:1497 src/main/escp2-papers.c:1545 -#: src/main/escp2-papers.c:1589 +#: src/main/print-lexmark.c:880 src/main/escp2-papers.c:1371 +#: src/main/escp2-papers.c:1415 src/main/escp2-papers.c:1459 +#: src/main/escp2-papers.c:1507 src/main/escp2-papers.c:1555 +#: src/main/escp2-papers.c:1599 msgid "Photo Quality Inkjet Paper" msgstr "Photo Quality Inkjet Paper" -#: src/main/print-lexmark.c:884 src/main/escp2-papers.c:1363 -#: src/main/escp2-papers.c:1407 src/main/escp2-papers.c:1451 -#: src/main/escp2-papers.c:1499 src/main/escp2-papers.c:1547 -#: src/main/escp2-papers.c:1591 +#: src/main/print-lexmark.c:884 src/main/escp2-papers.c:1373 +#: src/main/escp2-papers.c:1417 src/main/escp2-papers.c:1461 +#: src/main/escp2-papers.c:1509 src/main/escp2-papers.c:1557 +#: src/main/escp2-papers.c:1601 msgid "Photo Paper" msgstr "Photo Paper" -#: src/main/print-lexmark.c:888 src/main/escp2-papers.c:1365 -#: src/main/escp2-papers.c:1409 src/main/escp2-papers.c:1453 -#: src/main/escp2-papers.c:1501 src/main/escp2-papers.c:1549 -#: src/main/escp2-papers.c:1593 src/main/escp2-papers.c:1617 +#: src/main/print-lexmark.c:888 src/main/escp2-papers.c:1375 +#: src/main/escp2-papers.c:1419 src/main/escp2-papers.c:1463 +#: src/main/escp2-papers.c:1511 src/main/escp2-papers.c:1559 +#: src/main/escp2-papers.c:1603 src/main/escp2-papers.c:1627 msgid "Premium Glossy Photo Paper" msgstr "Premium Glossy Photo Paper" -#: src/main/print-lexmark.c:892 src/main/escp2-papers.c:1369 -#: src/main/escp2-papers.c:1413 src/main/escp2-papers.c:1457 -#: src/main/escp2-papers.c:1505 src/main/escp2-papers.c:1553 -#: src/main/escp2-papers.c:1597 +#: src/main/print-lexmark.c:892 src/main/escp2-papers.c:1379 +#: src/main/escp2-papers.c:1423 src/main/escp2-papers.c:1467 +#: src/main/escp2-papers.c:1515 src/main/escp2-papers.c:1563 +#: src/main/escp2-papers.c:1607 msgid "Premium Luster Photo Paper" msgstr "Premium Lustre Photo Paper" -#: src/main/print-lexmark.c:896 src/main/escp2-papers.c:1371 -#: src/main/escp2-papers.c:1415 src/main/escp2-papers.c:1463 -#: src/main/escp2-papers.c:1511 src/main/escp2-papers.c:1555 -#: src/main/escp2-papers.c:1603 +#: src/main/print-lexmark.c:896 src/main/escp2-papers.c:1381 +#: src/main/escp2-papers.c:1425 src/main/escp2-papers.c:1473 +#: src/main/escp2-papers.c:1521 src/main/escp2-papers.c:1565 +#: src/main/escp2-papers.c:1613 msgid "Photo Quality Glossy Paper" msgstr "Photo Quality Glossy Paper" -#: src/main/print-lexmark.c:900 src/main/escp2-papers.c:1373 -#: src/main/escp2-papers.c:1417 src/main/escp2-papers.c:1465 -#: src/main/escp2-papers.c:1513 src/main/escp2-papers.c:1557 -#: src/main/escp2-papers.c:1605 +#: src/main/print-lexmark.c:900 src/main/escp2-papers.c:1383 +#: src/main/escp2-papers.c:1427 src/main/escp2-papers.c:1475 +#: src/main/escp2-papers.c:1523 src/main/escp2-papers.c:1567 +#: src/main/escp2-papers.c:1615 msgid "Ilford Heavy Paper" msgstr "Ilford Heavy Paper" -#: src/main/print-lexmark.c:904 src/main/escp2-papers.c:1377 -#: src/main/escp2-papers.c:1421 src/main/escp2-papers.c:1469 -#: src/main/escp2-papers.c:1517 src/main/escp2-papers.c:1561 -#: src/main/escp2-papers.c:1609 src/main/escp2-papers.c:1619 +#: src/main/print-lexmark.c:904 src/main/escp2-papers.c:1387 +#: src/main/escp2-papers.c:1431 src/main/escp2-papers.c:1479 +#: src/main/escp2-papers.c:1527 src/main/escp2-papers.c:1571 +#: src/main/escp2-papers.c:1619 src/main/escp2-papers.c:1629 msgid "Other" msgstr "Other" @@ -1466,50 +1604,50 @@ msgstr "Manual with Pause" msgid "Manual without Pause" msgstr "Manual without Pause" -#: src/main/print-olympus.c:277 +#: src/main/print-olympus.c:275 msgid "Coated" msgstr "Coated" -#: src/main/print-olympus.c:278 src/cups/genppd.c:1726 src/cups/genppd.c:1753 -#: src/cups/genppd.c:1834 +#: src/main/print-olympus.c:276 src/cups/genppd.c:1732 src/cups/genppd.c:1759 +#: src/cups/genppd.c:1840 msgid "None" msgstr "None" -#: src/main/print-olympus.c:963 src/main/print-olympus.c:1023 -#: src/main/print-olympus.c:1127 +#: src/main/print-olympus.c:961 src/main/print-olympus.c:1021 +#: src/main/print-olympus.c:1125 msgid "Glossy" msgstr "Glossy" -#: src/main/print-olympus.c:964 src/main/print-olympus.c:1024 -#: src/main/print-olympus.c:1128 +#: src/main/print-olympus.c:962 src/main/print-olympus.c:1022 +#: src/main/print-olympus.c:1126 msgid "Texture" msgstr "Texture" -#: src/main/print-olympus.c:1025 src/main/print-olympus.c:1129 +#: src/main/print-olympus.c:1023 src/main/print-olympus.c:1127 msgid "Matte" msgstr "Matte" -#: src/main/print-olympus.c:1729 src/main/print-olympus.c:1730 +#: src/main/print-olympus.c:1727 src/main/print-olympus.c:1728 msgid "Laminate Pattern" msgstr "Laminate Pattern" -#: src/main/print-olympus.c:1765 +#: src/main/print-olympus.c:1763 msgid "Adjust the cyan balance" msgstr "Adjust the cyan balance" -#: src/main/print-olympus.c:1773 +#: src/main/print-olympus.c:1771 msgid "Adjust the magenta balance" msgstr "Adjust the magenta balance" -#: src/main/print-olympus.c:1781 +#: src/main/print-olympus.c:1779 msgid "Adjust the yellow balance" msgstr "Adjust the yellow balance" -#: src/main/print-olympus.c:1788 +#: src/main/print-olympus.c:1786 msgid "Black Balance" msgstr "Black Balance" -#: src/main/print-olympus.c:1789 +#: src/main/print-olympus.c:1787 msgid "Adjust the black balance" msgstr "Adjust the black balance" @@ -1541,91 +1679,115 @@ msgstr "Quick-dry Photo" msgid "Quick-dry Transparency" msgstr "Quick-dry Transparency" -#: src/main/print-pcl.c:231 src/main/xmli18n-tmp.h:16 +#: src/main/print-pcl.c:238 src/main/xmli18n-tmp.h:17 msgid "Manual" msgstr "Manual" -#: src/main/print-pcl.c:233 +#: src/main/print-pcl.c:240 +msgid "Tray 1 - Movable Guides" +msgstr "" + +#: src/main/print-pcl.c:241 msgid "Tray 1" msgstr "Tray 1" -#: src/main/print-pcl.c:234 src/main/print-pcl.c:240 +#: src/main/print-pcl.c:242 +msgid "Tray 2 - Movable Guides" +msgstr "" + +#: src/main/print-pcl.c:243 src/main/print-pcl.c:251 msgid "Tray 2" msgstr "Tray 2" -#: src/main/print-pcl.c:235 +#: src/main/print-pcl.c:244 +msgid "Tray 3 - Movable Guides" +msgstr "" + +#: src/main/print-pcl.c:245 msgid "Tray 3" msgstr "Tray 3" -#: src/main/print-pcl.c:236 +#: src/main/print-pcl.c:246 +msgid "Tray 4 - Movable Guides" +msgstr "" + +#: src/main/print-pcl.c:247 msgid "Tray 4" msgstr "Tray 4" -#: src/main/print-pcl.c:237 +#: src/main/print-pcl.c:248 msgid "Portable Sheet Feeder" msgstr "Portable Sheet Feeder" -#: src/main/print-pcl.c:238 +#: src/main/print-pcl.c:249 msgid "Desktop Sheet Feeder" msgstr "Desktop Sheet Feeder" -#: src/main/print-pcl.c:239 +#: src/main/print-pcl.c:250 msgid "Tray" msgstr "Tray" -#: src/main/print-pcl.c:241 +#: src/main/print-pcl.c:252 msgid "Optional Source" msgstr "Optional Source" -#: src/main/print-pcl.c:242 +#: src/main/print-pcl.c:253 msgid "Autoselect" msgstr "Autoselect" -#: src/main/print-pcl.c:256 +#: src/main/print-pcl.c:267 msgid "150x150 DPI" msgstr "150×150 DPI" -#: src/main/print-pcl.c:257 +#: src/main/print-pcl.c:268 msgid "300x300 DPI" msgstr "300×300 DPI" -#: src/main/print-pcl.c:258 +#: src/main/print-pcl.c:269 msgid "600x300 DPI" msgstr "600×300 DPI" -#: src/main/print-pcl.c:259 +#: src/main/print-pcl.c:270 msgid "600x600 DPI monochrome" msgstr "600×600 DPI monochrome" -#: src/main/print-pcl.c:260 +#: src/main/print-pcl.c:271 msgid "600x600 DPI" msgstr "600×600 DPI" -#: src/main/print-pcl.c:261 +#: src/main/print-pcl.c:272 msgid "1200x600 DPI" msgstr "1200×600 DPI" -#: src/main/print-pcl.c:262 +#: src/main/print-pcl.c:273 msgid "2400x600 DPI" msgstr "2400×600 DPI" -#: src/main/print-pcl.c:1470 +#: src/main/print-pcl.c:1538 msgid "Color + Black Cartridges" msgstr "Colour + Black Cartridges" -#: src/main/print-pcl.c:1471 +#: src/main/print-pcl.c:1539 msgid "Color + Photo Cartridges" msgstr "Colour + Photo Cartridges" -#: src/main/print-ps.c:97 +#: src/main/print-ps.c:68 msgid "PPDFile" msgstr "PPDFile" -#: src/main/print-ps.c:98 src/gutenprintui/panel.c:1768 -#: src/gutenprintui2/panel.c:1768 +#: src/main/print-ps.c:69 src/gutenprintui2/panel.c:1943 msgid "PPD File" msgstr "PPD File" +#: src/main/print-ps.c:74 +#, fuzzy +msgid "Model Name" +msgstr "Channel Names" + +#: src/main/print-ps.c:75 +msgid "PPD File Model Name" +msgstr "" + #: src/main/print-raw.c:223 msgid "Image dimensions must match paper dimensions" msgstr "Image dimensions must match paper dimensions" @@ -1641,259 +1803,265 @@ msgstr "Three Level Grayscale" #: src/main/escp2-channels.c:1035 src/main/escp2-channels.c:1048 #: src/main/escp2-channels.c:1061 src/main/escp2-channels.c:1074 #: src/main/escp2-channels.c:1087 src/main/escp2-channels.c:1100 -#: src/main/escp2-channels.c:2505 src/main/escp2-channels.c:2528 -#: src/main/escp2-channels.c:2548 src/main/escp2-channels.c:2568 -#: src/main/escp2-channels.c:2588 src/main/escp2-channels.c:2608 +#: src/main/escp2-channels.c:2525 src/main/escp2-channels.c:2548 +#: src/main/escp2-channels.c:2568 src/main/escp2-channels.c:2588 +#: src/main/escp2-channels.c:2608 src/main/escp2-channels.c:2628 msgid "Quadtone" msgstr "Quadtone" -#: src/main/escp2-channels.c:1604 src/main/escp2-channels.c:1618 +#: src/main/escp2-channels.c:1466 +#, fuzzy +msgid "Four Color Photo" +msgstr "Six Colour Photo" + +#: src/main/escp2-channels.c:1618 src/main/escp2-channels.c:1632 msgid "Six Color Enhanced Composite" msgstr "Six Colour Enhanced Composite" -#: src/main/escp2-channels.c:1641 src/main/escp2-channels.c:1655 -#: src/main/escp2-channels.c:1669 src/main/escp2-channels.c:1705 +#: src/main/escp2-channels.c:1655 src/main/escp2-channels.c:1669 +#: src/main/escp2-channels.c:1683 src/main/escp2-channels.c:1719 msgid "Seven Color Photo" msgstr "Seven Colour Photo" -#: src/main/escp2-channels.c:1691 +#: src/main/escp2-channels.c:1705 msgid "Seven Color Enhanced" msgstr "Seven Colour Enhanced" -#: src/main/escp2-channels.c:1728 +#: src/main/escp2-channels.c:1742 msgid "Eight Color Photo" msgstr "Eight Colour Photo" -#: src/main/escp2-channels.c:1876 src/main/escp2-channels.c:1888 -#: src/main/escp2-channels.c:1894 +#: src/main/escp2-channels.c:1890 src/main/escp2-channels.c:1902 +#: src/main/escp2-channels.c:1908 msgid "One Color Raw" msgstr "One Colour Raw" -#: src/main/escp2-channels.c:1900 +#: src/main/escp2-channels.c:1914 msgid "One Color Raw Enhanced Gloss" msgstr "One Colour Raw Enhanced Gloss" -#: src/main/escp2-channels.c:1913 src/main/escp2-channels.c:1925 +#: src/main/escp2-channels.c:1927 src/main/escp2-channels.c:1939 msgid "Two Color Raw" msgstr "Two Colour Raw" -#: src/main/escp2-channels.c:1939 src/main/escp2-channels.c:1953 -#: src/main/escp2-channels.c:1980 src/main/escp2-channels.c:1993 -#: src/main/escp2-channels.c:2006 src/main/escp2-channels.c:2019 -#: src/main/escp2-channels.c:2033 src/main/escp2-channels.c:2047 -#: src/main/escp2-channels.c:2060 +#: src/main/escp2-channels.c:1953 src/main/escp2-channels.c:1967 +#: src/main/escp2-channels.c:1994 src/main/escp2-channels.c:2007 +#: src/main/escp2-channels.c:2020 src/main/escp2-channels.c:2033 +#: src/main/escp2-channels.c:2047 src/main/escp2-channels.c:2061 +#: src/main/escp2-channels.c:2074 msgid "Three Color Raw" msgstr "Three Colour Raw" -#: src/main/escp2-channels.c:1967 +#: src/main/escp2-channels.c:1981 msgid "Three Color Raw Gloss" msgstr "Three Colour Raw Gloss" -#: src/main/escp2-channels.c:2067 src/main/escp2-channels.c:2073 -#: src/main/escp2-channels.c:2079 src/main/escp2-channels.c:2085 -#: src/main/escp2-channels.c:2091 src/main/escp2-channels.c:2097 -#: src/main/escp2-channels.c:2103 src/main/escp2-channels.c:2109 -#: src/main/escp2-channels.c:2115 src/main/escp2-channels.c:2121 +#: src/main/escp2-channels.c:2081 src/main/escp2-channels.c:2087 +#: src/main/escp2-channels.c:2093 src/main/escp2-channels.c:2099 +#: src/main/escp2-channels.c:2105 src/main/escp2-channels.c:2111 +#: src/main/escp2-channels.c:2117 src/main/escp2-channels.c:2123 +#: src/main/escp2-channels.c:2129 src/main/escp2-channels.c:2135 +#: src/main/escp2-channels.c:2141 msgid "Four Color Raw" msgstr "Four Colour Raw" -#: src/main/escp2-channels.c:2127 +#: src/main/escp2-channels.c:2147 msgid "Four Color Raw Gloss" msgstr "Four Colour Raw Gloss" -#: src/main/escp2-channels.c:2142 src/main/escp2-channels.c:2156 +#: src/main/escp2-channels.c:2162 src/main/escp2-channels.c:2176 msgid "Five Color Raw" msgstr "Five Colour Raw" -#: src/main/escp2-channels.c:2170 src/main/escp2-channels.c:2186 -#: src/main/escp2-channels.c:2192 src/main/escp2-channels.c:2198 -#: src/main/escp2-channels.c:2213 src/main/escp2-channels.c:2234 +#: src/main/escp2-channels.c:2190 src/main/escp2-channels.c:2206 +#: src/main/escp2-channels.c:2212 src/main/escp2-channels.c:2218 +#: src/main/escp2-channels.c:2233 src/main/escp2-channels.c:2254 msgid "Six Color Raw" msgstr "Six Colour Raw" -#: src/main/escp2-channels.c:2219 +#: src/main/escp2-channels.c:2239 msgid "Six Color Enhanced Gloss Raw" msgstr "Six Colour Enhanced Gloss Raw" -#: src/main/escp2-channels.c:2250 src/main/escp2-channels.c:2265 -#: src/main/escp2-channels.c:2280 +#: src/main/escp2-channels.c:2270 src/main/escp2-channels.c:2285 +#: src/main/escp2-channels.c:2300 msgid "Seven Color Raw" msgstr "Seven Colour Raw" -#: src/main/escp2-channels.c:2297 +#: src/main/escp2-channels.c:2317 msgid "Seven Color Enhanced Gloss Raw" msgstr "Seven Colour Enhanced Gloss Raw" -#: src/main/escp2-channels.c:2315 +#: src/main/escp2-channels.c:2335 msgid "Eight Color Raw" msgstr "Eight Colour Raw" -#: src/main/escp2-channels.c:2482 src/main/escp2-channels.c:2495 -#: src/main/escp2-channels.c:2497 src/main/escp2-channels.c:2517 -#: src/main/escp2-channels.c:2520 src/main/escp2-channels.c:2540 -#: src/main/escp2-channels.c:2560 src/main/escp2-channels.c:2580 -#: src/main/escp2-channels.c:2600 src/main/escp2-channels.c:2620 -#: src/main/escp2-channels.c:2636 src/main/escp2-channels.c:2638 -#: src/main/escp2-channels.c:2640 src/main/escp2-channels.c:2642 -#: src/main/escp2-channels.c:2658 src/main/escp2-channels.c:2674 -#: src/main/escp2-channels.c:2694 +#: src/main/escp2-channels.c:2502 src/main/escp2-channels.c:2515 +#: src/main/escp2-channels.c:2517 src/main/escp2-channels.c:2537 +#: src/main/escp2-channels.c:2540 src/main/escp2-channels.c:2560 +#: src/main/escp2-channels.c:2580 src/main/escp2-channels.c:2600 +#: src/main/escp2-channels.c:2620 src/main/escp2-channels.c:2640 +#: src/main/escp2-channels.c:2656 src/main/escp2-channels.c:2658 +#: src/main/escp2-channels.c:2660 src/main/escp2-channels.c:2662 +#: src/main/escp2-channels.c:2678 src/main/escp2-channels.c:2694 +#: src/main/escp2-channels.c:2714 msgid "EPSON Standard Inks" msgstr "EPSON Standard Inks" -#: src/main/escp2-channels.c:2714 src/main/escp2-channels.c:2739 +#: src/main/escp2-channels.c:2734 src/main/escp2-channels.c:2759 msgid "UltraChrome Photo Black" msgstr "UltraChrome Photo Black" -#: src/main/escp2-channels.c:2718 src/main/escp2-channels.c:2743 +#: src/main/escp2-channels.c:2738 src/main/escp2-channels.c:2763 msgid "UltraChrome Matte Black" msgstr "UltraChrome Matte Black" -#: src/main/escp2-channels.c:2758 src/main/escp2-channels.c:2796 -#: src/main/escp2-channels.c:3167 src/escputil/escputil.c:976 +#: src/main/escp2-channels.c:2778 src/main/escp2-channels.c:2816 +#: src/main/escp2-channels.c:3206 src/escputil/escputil.c:976 msgid "Photo Black" msgstr "Photo Black" -#: src/main/escp2-channels.c:2762 src/main/escp2-channels.c:2778 -#: src/main/escp2-channels.c:3166 src/escputil/escputil.c:986 +#: src/main/escp2-channels.c:2782 src/main/escp2-channels.c:2798 +#: src/main/escp2-channels.c:3205 src/escputil/escputil.c:986 msgid "Matte Black" msgstr "Matte Black" -#: src/main/escp2-channels.c:3092 src/main/escp2-channels.c:3102 -#: src/main/escp2-channels.c:3114 src/main/escp2-channels.c:3128 -#: src/main/escp2-channels.c:3141 src/main/escp2-channels.c:3154 -#: src/main/escp2-channels.c:3191 src/escputil/escputil.c:981 +#: src/main/escp2-channels.c:3131 src/main/escp2-channels.c:3141 +#: src/main/escp2-channels.c:3153 src/main/escp2-channels.c:3167 +#: src/main/escp2-channels.c:3180 src/main/escp2-channels.c:3193 +#: src/main/escp2-channels.c:3240 src/escputil/escputil.c:981 #: src/escputil/escputil.c:1204 msgid "Light Cyan" msgstr "Light Cyan" -#: src/main/escp2-channels.c:3093 src/main/escp2-channels.c:3104 -#: src/main/escp2-channels.c:3115 src/main/escp2-channels.c:3129 -#: src/main/escp2-channels.c:3142 src/main/escp2-channels.c:3155 -#: src/main/escp2-channels.c:3190 src/escputil/escputil.c:982 +#: src/main/escp2-channels.c:3132 src/main/escp2-channels.c:3143 +#: src/main/escp2-channels.c:3154 src/main/escp2-channels.c:3168 +#: src/main/escp2-channels.c:3181 src/main/escp2-channels.c:3194 +#: src/main/escp2-channels.c:3239 src/escputil/escputil.c:982 #: src/escputil/escputil.c:1205 msgid "Light Magenta" msgstr "Light Magenta" -#: src/main/escp2-channels.c:3130 src/main/escp2-channels.c:3192 +#: src/main/escp2-channels.c:3169 src/main/escp2-channels.c:3241 #: src/escputil/escputil.c:985 msgid "Light Black" msgstr "Light Black" -#: src/main/escp2-channels.c:3143 +#: src/main/escp2-channels.c:3182 msgid "Dark Yellow" msgstr "Dark Yellow" -#: src/main/escp2-channels.c:3170 src/escputil/escputil.c:989 +#: src/main/escp2-channels.c:3209 src/escputil/escputil.c:989 msgid "Gloss Optimizer" msgstr "Gloss Optimiser" -#: src/main/escp2-channels.c:3189 src/escputil/escputil.c:990 +#: src/main/escp2-channels.c:3238 src/escputil/escputil.c:990 msgid "Light Light Black" msgstr "Light Light Black" -#: src/main/escp2-papers.c:1343 src/main/escp2-papers.c:1387 -#: src/main/escp2-papers.c:1431 src/main/escp2-papers.c:1479 -#: src/main/escp2-papers.c:1527 src/main/escp2-papers.c:1571 +#: src/main/escp2-papers.c:1353 src/main/escp2-papers.c:1397 +#: src/main/escp2-papers.c:1441 src/main/escp2-papers.c:1489 +#: src/main/escp2-papers.c:1537 src/main/escp2-papers.c:1581 msgid "Plain Paper Fast Load" msgstr "Plain Paper Fast Load" -#: src/main/escp2-papers.c:1345 src/main/escp2-papers.c:1389 -#: src/main/escp2-papers.c:1433 src/main/escp2-papers.c:1481 -#: src/main/escp2-papers.c:1529 src/main/escp2-papers.c:1573 +#: src/main/escp2-papers.c:1355 src/main/escp2-papers.c:1399 +#: src/main/escp2-papers.c:1443 src/main/escp2-papers.c:1491 +#: src/main/escp2-papers.c:1539 src/main/escp2-papers.c:1583 #: src/main/xmli18n-tmp.h:5 msgid "Postcard" msgstr "Postcard" -#: src/main/escp2-papers.c:1353 src/main/escp2-papers.c:1397 -#: src/main/escp2-papers.c:1441 src/main/escp2-papers.c:1489 -#: src/main/escp2-papers.c:1537 src/main/escp2-papers.c:1581 +#: src/main/escp2-papers.c:1363 src/main/escp2-papers.c:1407 +#: src/main/escp2-papers.c:1451 src/main/escp2-papers.c:1499 +#: src/main/escp2-papers.c:1547 src/main/escp2-papers.c:1591 msgid "Back Light Film" msgstr "Back Light Film" -#: src/main/escp2-papers.c:1357 src/main/escp2-papers.c:1401 -#: src/main/escp2-papers.c:1445 src/main/escp2-papers.c:1493 -#: src/main/escp2-papers.c:1541 src/main/escp2-papers.c:1585 -msgid "Matte Paper Heavyweight" -msgstr "Matte Paper Heavyweight" - #: src/main/escp2-papers.c:1367 src/main/escp2-papers.c:1411 #: src/main/escp2-papers.c:1455 src/main/escp2-papers.c:1503 #: src/main/escp2-papers.c:1551 src/main/escp2-papers.c:1595 +msgid "Matte Paper Heavyweight" +msgstr "Matte Paper Heavyweight" + +#: src/main/escp2-papers.c:1377 src/main/escp2-papers.c:1421 +#: src/main/escp2-papers.c:1465 src/main/escp2-papers.c:1513 +#: src/main/escp2-papers.c:1561 src/main/escp2-papers.c:1605 msgid "Premium Semigloss Photo Paper" msgstr "Premium Semigloss Photo Paper" -#: src/main/escp2-papers.c:1375 src/main/escp2-papers.c:1419 -#: src/main/escp2-papers.c:1467 src/main/escp2-papers.c:1515 -#: src/main/escp2-papers.c:1559 src/main/escp2-papers.c:1607 +#: src/main/escp2-papers.c:1385 src/main/escp2-papers.c:1429 +#: src/main/escp2-papers.c:1477 src/main/escp2-papers.c:1525 +#: src/main/escp2-papers.c:1569 src/main/escp2-papers.c:1617 msgid "ColorLife Paper" msgstr "ColorLife Paper" -#: src/main/escp2-papers.c:1459 src/main/escp2-papers.c:1507 -#: src/main/escp2-papers.c:1599 +#: src/main/escp2-papers.c:1469 src/main/escp2-papers.c:1517 +#: src/main/escp2-papers.c:1609 msgid "Archival Matte Paper" msgstr "Archival Matte Paper" -#: src/main/escp2-papers.c:1461 src/main/escp2-papers.c:1509 -#: src/main/escp2-papers.c:1601 +#: src/main/escp2-papers.c:1471 src/main/escp2-papers.c:1519 +#: src/main/escp2-papers.c:1611 msgid "Watercolor Paper - Radiant White" msgstr "Watercolour Paper - Radiant White" -#: src/main/escp2-papers.c:1716 src/main/escp2-papers.c:1842 -#: src/main/escp2-papers.c:1884 src/main/escp2-papers.c:1926 -#: src/main/escp2-papers.c:2001 +#: src/main/escp2-papers.c:1727 src/main/escp2-papers.c:1853 +#: src/main/escp2-papers.c:1895 src/main/escp2-papers.c:1937 +#: src/main/escp2-papers.c:2012 msgid "Roll Feed" msgstr "Roll Feed" -#: src/main/escp2-papers.c:1740 src/main/escp2-papers.c:1791 +#: src/main/escp2-papers.c:1751 src/main/escp2-papers.c:1802 msgid "Roll Feed (cut each page)" msgstr "Roll Feed (cut each page)" -#: src/main/escp2-papers.c:1749 src/main/escp2-papers.c:1800 +#: src/main/escp2-papers.c:1760 src/main/escp2-papers.c:1811 msgid "Roll Feed (do not cut)" msgstr "Roll Feed (do not cut)" -#: src/main/escp2-papers.c:1773 src/main/escp2-papers.c:1824 +#: src/main/escp2-papers.c:1784 src/main/escp2-papers.c:1835 msgid "Manual Feed" msgstr "Manual Feed" -#: src/main/escp2-papers.c:1782 src/main/escp2-papers.c:1833 -#: src/main/escp2-papers.c:1935 src/main/escp2-papers.c:1968 +#: src/main/escp2-papers.c:1793 src/main/escp2-papers.c:1844 +#: src/main/escp2-papers.c:1946 src/main/escp2-papers.c:1979 msgid "Print to CD" msgstr "Print to CD" -#: src/main/escp2-papers.c:1866 src/main/escp2-papers.c:1908 +#: src/main/escp2-papers.c:1877 src/main/escp2-papers.c:1919 msgid "Manual Sheet Guide" msgstr "Manual Sheet Guide" -#: src/main/escp2-papers.c:1875 src/main/escp2-papers.c:1917 +#: src/main/escp2-papers.c:1886 src/main/escp2-papers.c:1928 msgid "Manual Feed (Front)" msgstr "Manual Feed (Front)" -#: src/main/escp2-papers.c:1950 +#: src/main/escp2-papers.c:1961 msgid "Rear Tray" msgstr "Rear Tray" -#: src/main/escp2-papers.c:1959 +#: src/main/escp2-papers.c:1970 msgid "Front Tray" msgstr "Front Tray" -#: src/main/escp2-papers.c:1977 +#: src/main/escp2-papers.c:1988 msgid "Photo Board" msgstr "Photo Board" -#: src/main/escp2-papers.c:2016 +#: src/main/escp2-papers.c:2027 msgid "Cut Sheet Bin 1" msgstr "Cut Sheet Bin 1" -#: src/main/escp2-papers.c:2025 +#: src/main/escp2-papers.c:2036 msgid "Cut Sheet Bin 2" msgstr "Cut Sheet Bin 2" -#: src/main/escp2-papers.c:2034 +#: src/main/escp2-papers.c:2045 msgid "Cut Sheet Autoselect" msgstr "Cut Sheet Autoselect" -#: src/main/escp2-papers.c:2043 +#: src/main/escp2-papers.c:2054 msgid "Manual Selection" msgstr "Manual Selection" @@ -2031,42 +2199,48 @@ msgid "Eight Pass" msgstr "Eight Pass" #: src/main/escp2-resolutions.c:637 src/main/escp2-resolutions.c:652 -#: src/main/generic-options.c:33 +#: src/main/escp2-resolutions.c:667 src/main/generic-options.c:33 msgid "Fast Economy" msgstr "Fast Economy" #: src/main/escp2-resolutions.c:638 src/main/escp2-resolutions.c:653 -#: src/main/generic-options.c:34 +#: src/main/escp2-resolutions.c:668 src/main/generic-options.c:34 msgid "Economy" msgstr "Economy" #: src/main/escp2-resolutions.c:639 src/main/escp2-resolutions.c:654 -#: src/main/escp2-resolutions.c:667 src/main/generic-options.c:35 +#: src/main/escp2-resolutions.c:669 src/main/escp2-resolutions.c:682 +#: src/main/generic-options.c:35 msgid "Draft" msgstr "Draft" #: src/main/escp2-resolutions.c:641 src/main/escp2-resolutions.c:656 -#: src/main/escp2-resolutions.c:670 src/main/generic-options.c:37 +#: src/main/escp2-resolutions.c:671 src/main/escp2-resolutions.c:685 +#: src/main/generic-options.c:37 msgid "High" msgstr "High" #: src/main/escp2-resolutions.c:642 src/main/escp2-resolutions.c:657 -#: src/main/escp2-resolutions.c:669 src/main/generic-options.c:38 +#: src/main/escp2-resolutions.c:672 src/main/escp2-resolutions.c:684 +#: src/main/generic-options.c:38 msgid "Photo" msgstr "Photo" #: src/main/escp2-resolutions.c:643 src/main/escp2-resolutions.c:658 -#: src/main/escp2-resolutions.c:671 src/main/generic-options.c:39 +#: src/main/escp2-resolutions.c:673 src/main/escp2-resolutions.c:686 +#: src/main/generic-options.c:39 msgid "Super Photo" msgstr "Super Photo" #: src/main/escp2-resolutions.c:644 src/main/escp2-resolutions.c:659 -#: src/main/escp2-resolutions.c:672 src/main/generic-options.c:40 +#: src/main/escp2-resolutions.c:674 src/main/escp2-resolutions.c:687 +#: src/main/generic-options.c:40 msgid "Ultra Photo" msgstr "Ultra Photo" #: src/main/escp2-resolutions.c:645 src/main/escp2-resolutions.c:660 -#: src/main/escp2-resolutions.c:673 src/main/generic-options.c:41 +#: src/main/escp2-resolutions.c:675 src/main/escp2-resolutions.c:688 +#: src/main/generic-options.c:41 msgid "Best" msgstr "Best" @@ -2143,4174 +2317,4482 @@ msgid "3x5" msgstr "3×5" #: src/main/xmli18n-tmp.h:10 +msgid "3 1/2 x5" +msgstr "" + +#: src/main/xmli18n-tmp.h:11 msgid "4x6" msgstr "4×6" -#: src/main/xmli18n-tmp.h:11 +#: src/main/xmli18n-tmp.h:12 msgid "Epson 4x6 Photo Paper (tear-off borders)" msgstr "Epson 4×6 Photo Paper (tear-off borders)" -#: src/main/xmli18n-tmp.h:12 +#: src/main/xmli18n-tmp.h:13 msgid "5x7" msgstr "5×7" -#: src/main/xmli18n-tmp.h:13 +#: src/main/xmli18n-tmp.h:14 msgid "5x8" msgstr "5×8" -#: src/main/xmli18n-tmp.h:14 +#: src/main/xmli18n-tmp.h:15 msgid "6x8" msgstr "6×8" -#: src/main/xmli18n-tmp.h:15 +#: src/main/xmli18n-tmp.h:16 msgid "8x10" msgstr "8×10" -#: src/main/xmli18n-tmp.h:17 +#: src/main/xmli18n-tmp.h:18 msgid "12x18" msgstr "12×18" -#: src/main/xmli18n-tmp.h:18 +#: src/main/xmli18n-tmp.h:19 msgid "Super B 13x19" msgstr "Super B 13×19" -#: src/main/xmli18n-tmp.h:19 +#: src/main/xmli18n-tmp.h:20 msgid "Engineering C 17x22" msgstr "Engineering C 17×22" -#: src/main/xmli18n-tmp.h:20 +#: src/main/xmli18n-tmp.h:21 msgid "8x12" msgstr "8×12" -#: src/main/xmli18n-tmp.h:21 +#: src/main/xmli18n-tmp.h:22 msgid "11x14" msgstr "11×14" -#: src/main/xmli18n-tmp.h:22 +#: src/main/xmli18n-tmp.h:23 msgid "16x20" msgstr "16×20" -#: src/main/xmli18n-tmp.h:23 +#: src/main/xmli18n-tmp.h:24 msgid "16x24" msgstr "16×24" -#: src/main/xmli18n-tmp.h:24 +#: src/main/xmli18n-tmp.h:25 msgid "20x24" msgstr "20×24" -#: src/main/xmli18n-tmp.h:25 +#: src/main/xmli18n-tmp.h:26 msgid "20x30" msgstr "20×30" -#: src/main/xmli18n-tmp.h:26 +#: src/main/xmli18n-tmp.h:27 msgid "22x30" msgstr "22×30" -#: src/main/xmli18n-tmp.h:27 +#: src/main/xmli18n-tmp.h:28 msgid "24x30" msgstr "24×30" -#: src/main/xmli18n-tmp.h:28 +#: src/main/xmli18n-tmp.h:29 msgid "Super A1 24x36" msgstr "Super A1 24×36" -#: src/main/xmli18n-tmp.h:29 +#: src/main/xmli18n-tmp.h:30 msgid "30x40" msgstr "30×40" -#: src/main/xmli18n-tmp.h:30 +#: src/main/xmli18n-tmp.h:31 msgid "4A" msgstr "4A" -#: src/main/xmli18n-tmp.h:31 +#: src/main/xmli18n-tmp.h:32 msgid "2A" msgstr "2A" -#: src/main/xmli18n-tmp.h:32 +#: src/main/xmli18n-tmp.h:33 msgid "Super A0" msgstr "Super A0" -#: src/main/xmli18n-tmp.h:33 +#: src/main/xmli18n-tmp.h:34 msgid "A0" msgstr "A0" -#: src/main/xmli18n-tmp.h:34 +#: src/main/xmli18n-tmp.h:35 msgid "A1" msgstr "A1" -#: src/main/xmli18n-tmp.h:35 +#: src/main/xmli18n-tmp.h:36 msgid "A2" msgstr "A2" -#: src/main/xmli18n-tmp.h:36 +#: src/main/xmli18n-tmp.h:37 msgid "A3" msgstr "A3" -#: src/main/xmli18n-tmp.h:37 +#: src/main/xmli18n-tmp.h:38 msgid "A4" msgstr "A4" -#: src/main/xmli18n-tmp.h:38 +#: src/main/xmli18n-tmp.h:39 msgid "A5" msgstr "A5" -#: src/main/xmli18n-tmp.h:39 +#: src/main/xmli18n-tmp.h:40 msgid "A6" msgstr "A6" -#: src/main/xmli18n-tmp.h:40 +#: src/main/xmli18n-tmp.h:41 msgid "A7" msgstr "A7" -#: src/main/xmli18n-tmp.h:41 +#: src/main/xmli18n-tmp.h:42 msgid "A8" msgstr "A8" -#: src/main/xmli18n-tmp.h:42 +#: src/main/xmli18n-tmp.h:43 msgid "A9" msgstr "A9" -#: src/main/xmli18n-tmp.h:43 +#: src/main/xmli18n-tmp.h:44 msgid "A10" msgstr "A10" -#: src/main/xmli18n-tmp.h:44 +#: src/main/xmli18n-tmp.h:45 msgid "RA0" msgstr "RA0" -#: src/main/xmli18n-tmp.h:45 +#: src/main/xmli18n-tmp.h:46 msgid "RA1" msgstr "RA1" -#: src/main/xmli18n-tmp.h:46 +#: src/main/xmli18n-tmp.h:47 msgid "RA2" msgstr "RA2" -#: src/main/xmli18n-tmp.h:47 +#: src/main/xmli18n-tmp.h:48 msgid "RA3" msgstr "RA3" -#: src/main/xmli18n-tmp.h:48 +#: src/main/xmli18n-tmp.h:49 msgid "RA4" msgstr "RA4" -#: src/main/xmli18n-tmp.h:49 +#: src/main/xmli18n-tmp.h:50 msgid "SRA0" msgstr "SRA0" -#: src/main/xmli18n-tmp.h:50 +#: src/main/xmli18n-tmp.h:51 msgid "SRA1" msgstr "SRA1" -#: src/main/xmli18n-tmp.h:51 +#: src/main/xmli18n-tmp.h:52 msgid "SRA2" msgstr "SRA2" -#: src/main/xmli18n-tmp.h:52 +#: src/main/xmli18n-tmp.h:53 msgid "SRA3" msgstr "SRA3" -#: src/main/xmli18n-tmp.h:53 +#: src/main/xmli18n-tmp.h:54 msgid "SRA4" msgstr "SRA4" -#: src/main/xmli18n-tmp.h:54 +#: src/main/xmli18n-tmp.h:55 msgid "4B ISO" msgstr "4B ISO" -#: src/main/xmli18n-tmp.h:55 +#: src/main/xmli18n-tmp.h:56 msgid "2B ISO" msgstr "2B ISO" -#: src/main/xmli18n-tmp.h:56 +#: src/main/xmli18n-tmp.h:57 msgid "B0 ISO" msgstr "B0 ISO" -#: src/main/xmli18n-tmp.h:57 +#: src/main/xmli18n-tmp.h:58 msgid "B1 ISO" msgstr "B1 ISO" -#: src/main/xmli18n-tmp.h:58 +#: src/main/xmli18n-tmp.h:59 msgid "B2 ISO" msgstr "B2 ISO" -#: src/main/xmli18n-tmp.h:59 +#: src/main/xmli18n-tmp.h:60 msgid "B3 ISO" msgstr "B3 ISO" -#: src/main/xmli18n-tmp.h:60 +#: src/main/xmli18n-tmp.h:61 msgid "B4 ISO" msgstr "B4 ISO" -#: src/main/xmli18n-tmp.h:61 +#: src/main/xmli18n-tmp.h:62 msgid "B5 ISO" msgstr "B5 ISO" -#: src/main/xmli18n-tmp.h:62 +#: src/main/xmli18n-tmp.h:63 msgid "B6 ISO" msgstr "B6 ISO" -#: src/main/xmli18n-tmp.h:63 +#: src/main/xmli18n-tmp.h:64 msgid "B7 ISO" msgstr "B7 ISO" -#: src/main/xmli18n-tmp.h:64 +#: src/main/xmli18n-tmp.h:65 msgid "B8 ISO" msgstr "B8 ISO" -#: src/main/xmli18n-tmp.h:65 +#: src/main/xmli18n-tmp.h:66 msgid "B9 ISO" msgstr "B9 ISO" -#: src/main/xmli18n-tmp.h:66 +#: src/main/xmli18n-tmp.h:67 msgid "B10 ISO" msgstr "B10 ISO" -#: src/main/xmli18n-tmp.h:67 +#: src/main/xmli18n-tmp.h:68 msgid "Super B0 JIS" msgstr "Super B0 JIS" -#: src/main/xmli18n-tmp.h:68 +#: src/main/xmli18n-tmp.h:69 msgid "B0 JIS" msgstr "B0 JIS" -#: src/main/xmli18n-tmp.h:69 +#: src/main/xmli18n-tmp.h:70 msgid "B1 JIS" msgstr "B1 JIS" -#: src/main/xmli18n-tmp.h:70 +#: src/main/xmli18n-tmp.h:71 msgid "B2 JIS" msgstr "B2 JIS" -#: src/main/xmli18n-tmp.h:71 +#: src/main/xmli18n-tmp.h:72 msgid "B3 JIS" msgstr "B3 JIS" -#: src/main/xmli18n-tmp.h:72 +#: src/main/xmli18n-tmp.h:73 msgid "B4 JIS" msgstr "B4 JIS" -#: src/main/xmli18n-tmp.h:73 +#: src/main/xmli18n-tmp.h:74 msgid "B5 JIS" msgstr "B5 JIS" -#: src/main/xmli18n-tmp.h:74 +#: src/main/xmli18n-tmp.h:75 msgid "B6 JIS" msgstr "B6 JIS" -#: src/main/xmli18n-tmp.h:75 +#: src/main/xmli18n-tmp.h:76 msgid "B7 JIS" msgstr "B7 JIS" -#: src/main/xmli18n-tmp.h:76 +#: src/main/xmli18n-tmp.h:77 msgid "B8 JIS" msgstr "B8 JIS" -#: src/main/xmli18n-tmp.h:77 +#: src/main/xmli18n-tmp.h:78 msgid "B9 JIS" msgstr "B9 JIS" -#: src/main/xmli18n-tmp.h:78 +#: src/main/xmli18n-tmp.h:79 msgid "B10 JIS" msgstr "B10 JIS" -#: src/main/xmli18n-tmp.h:79 +#: src/main/xmli18n-tmp.h:80 msgid "C0" msgstr "C0" -#: src/main/xmli18n-tmp.h:80 +#: src/main/xmli18n-tmp.h:81 +#, fuzzy +msgid "C0 landscape" +msgstr "Landscape" + +#: src/main/xmli18n-tmp.h:82 msgid "C1" msgstr "C1" -#: src/main/xmli18n-tmp.h:81 +#: src/main/xmli18n-tmp.h:83 +#, fuzzy +msgid "C1 landscape" +msgstr "Landscape" + +#: src/main/xmli18n-tmp.h:84 msgid "C2" msgstr "C2" -#: src/main/xmli18n-tmp.h:82 +#: src/main/xmli18n-tmp.h:85 +#, fuzzy +msgid "C2 landscape" +msgstr "Landscape" + +#: src/main/xmli18n-tmp.h:86 msgid "C3" msgstr "C3" -#: src/main/xmli18n-tmp.h:83 +#: src/main/xmli18n-tmp.h:87 +#, fuzzy +msgid "C3 landscape" +msgstr "Landscape" + +#: src/main/xmli18n-tmp.h:88 msgid "C4" msgstr "C4" -#: src/main/xmli18n-tmp.h:84 +#: src/main/xmli18n-tmp.h:89 +#, fuzzy +msgid "C4 landscape" +msgstr "Landscape" + +#: src/main/xmli18n-tmp.h:90 msgid "C5" msgstr "C5" -#: src/main/xmli18n-tmp.h:85 +#: src/main/xmli18n-tmp.h:91 +#, fuzzy +msgid "C5 landscape" +msgstr "Landscape" + +#: src/main/xmli18n-tmp.h:92 msgid "B6-C4" msgstr "B6-C4" -#: src/main/xmli18n-tmp.h:86 +#: src/main/xmli18n-tmp.h:93 +#, fuzzy +msgid "B6-C4 landscape" +msgstr "Landscape" + +#: src/main/xmli18n-tmp.h:94 msgid "C6" msgstr "C6" -#: src/main/xmli18n-tmp.h:87 +#: src/main/xmli18n-tmp.h:95 +#, fuzzy +msgid "C6 landscape" +msgstr "Landscape" + +#: src/main/xmli18n-tmp.h:96 msgid "DL" msgstr "DL" -#: src/main/xmli18n-tmp.h:88 +#: src/main/xmli18n-tmp.h:97 +#, fuzzy +msgid "DL landscape" +msgstr "Landscape" + +#: src/main/xmli18n-tmp.h:98 msgid "C7-6" msgstr "C7-6" -#: src/main/xmli18n-tmp.h:89 +#: src/main/xmli18n-tmp.h:99 +#, fuzzy +msgid "C7-6 landscape" +msgstr "Landscape" + +#: src/main/xmli18n-tmp.h:100 msgid "C7" msgstr "C7" -#: src/main/xmli18n-tmp.h:90 +#: src/main/xmli18n-tmp.h:101 +#, fuzzy +msgid "C7 landscape" +msgstr "Landscape" + +#: src/main/xmli18n-tmp.h:102 msgid "C8" msgstr "C8" -#: src/main/xmli18n-tmp.h:91 +#: src/main/xmli18n-tmp.h:103 +#, fuzzy +msgid "C8 landscape" +msgstr "Landscape" + +#: src/main/xmli18n-tmp.h:104 msgid "C9" msgstr "C9" -#: src/main/xmli18n-tmp.h:92 +#: src/main/xmli18n-tmp.h:105 +#, fuzzy +msgid "C9 landscape" +msgstr "Landscape" + +#: src/main/xmli18n-tmp.h:106 msgid "C10" msgstr "C10" -#: src/main/xmli18n-tmp.h:93 +#: src/main/xmli18n-tmp.h:107 +#, fuzzy +msgid "C10 landscape" +msgstr "Landscape" + +#: src/main/xmli18n-tmp.h:108 msgid "ArchA" msgstr "ArchA" -#: src/main/xmli18n-tmp.h:94 +#: src/main/xmli18n-tmp.h:109 msgid "ArchA transposed" msgstr "ArchA transposed" -#: src/main/xmli18n-tmp.h:95 +#: src/main/xmli18n-tmp.h:110 msgid "ArchB" msgstr "ArchB" -#: src/main/xmli18n-tmp.h:96 +#: src/main/xmli18n-tmp.h:111 msgid "ArchB transposed" msgstr "ArchB transposed" -#: src/main/xmli18n-tmp.h:97 +#: src/main/xmli18n-tmp.h:112 msgid "ArchC" msgstr "ArchC" -#: src/main/xmli18n-tmp.h:98 +#: src/main/xmli18n-tmp.h:113 msgid "ArchC transposed" msgstr "ArchC transposed" -#: src/main/xmli18n-tmp.h:99 +#: src/main/xmli18n-tmp.h:114 msgid "ArchD" msgstr "ArchD" -#: src/main/xmli18n-tmp.h:100 +#: src/main/xmli18n-tmp.h:115 msgid "ArchD transposed" msgstr "ArchD transposed" -#: src/main/xmli18n-tmp.h:101 +#: src/main/xmli18n-tmp.h:116 msgid "ArchE" msgstr "ArchE" -#: src/main/xmli18n-tmp.h:102 +#: src/main/xmli18n-tmp.h:117 msgid "ArchE transposed" msgstr "ArchE transposed" -#: src/main/xmli18n-tmp.h:103 +#: src/main/xmli18n-tmp.h:118 msgid "American foolscap" msgstr "American foolscap" -#: src/main/xmli18n-tmp.h:104 +#: src/main/xmli18n-tmp.h:119 msgid "European foolscap" msgstr "European foolscap" -#: src/main/xmli18n-tmp.h:105 +#: src/main/xmli18n-tmp.h:120 msgid "Crown Quarto" msgstr "Crown Quarto" -#: src/main/xmli18n-tmp.h:106 +#: src/main/xmli18n-tmp.h:121 msgid "Large Crown Quarto" msgstr "Large Crown Quarto" -#: src/main/xmli18n-tmp.h:107 +#: src/main/xmli18n-tmp.h:122 msgid "Demy Quarto" msgstr "Demy Quarto" -#: src/main/xmli18n-tmp.h:108 +#: src/main/xmli18n-tmp.h:123 msgid "Royal Quarto" msgstr "Royal Quarto" -#: src/main/xmli18n-tmp.h:109 +#: src/main/xmli18n-tmp.h:124 msgid "ISO A4" msgstr "ISO A4" -#: src/main/xmli18n-tmp.h:110 +#: src/main/xmli18n-tmp.h:125 msgid "Crown Octavo" msgstr "Crown Octavo" -#: src/main/xmli18n-tmp.h:111 +#: src/main/xmli18n-tmp.h:126 msgid "Large Crown Octavo" msgstr "Large Crown Octavo" -#: src/main/xmli18n-tmp.h:112 +#: src/main/xmli18n-tmp.h:127 msgid "Demy Octavo" msgstr "Demy Octavo" -#: src/main/xmli18n-tmp.h:113 +#: src/main/xmli18n-tmp.h:128 msgid "Royal Octavo" msgstr "Royal Octavo" -#: src/main/xmli18n-tmp.h:114 +#: src/main/xmli18n-tmp.h:129 msgid "ISO A5" msgstr "ISO A5" -#: src/main/xmli18n-tmp.h:115 +#: src/main/xmli18n-tmp.h:130 msgid "Small paperback" msgstr "Small paperback" -#: src/main/xmli18n-tmp.h:116 +#: src/main/xmli18n-tmp.h:131 msgid "Penguin small paperback" msgstr "Penguin small paperback" -#: src/main/xmli18n-tmp.h:117 +#: src/main/xmli18n-tmp.h:132 msgid "Penguin large paperback" msgstr "Penguin large paperback" -#: src/main/xmli18n-tmp.h:118 +#: src/main/xmli18n-tmp.h:133 msgid "10cm x 15cm" msgstr "10cm x 15cm" -#: src/main/xmli18n-tmp.h:119 +#: src/main/xmli18n-tmp.h:134 msgid "Hagaki Card" msgstr "Hagaki Card" -#: src/main/xmli18n-tmp.h:120 +#: src/main/xmli18n-tmp.h:135 msgid "Oufuku Card" msgstr "Oufuku Card" -#: src/main/xmli18n-tmp.h:121 +#: src/main/xmli18n-tmp.h:136 msgid "Japanese long envelope #3" msgstr "Japanese long envelope #3" -#: src/main/xmli18n-tmp.h:122 +#: src/main/xmli18n-tmp.h:137 +#, fuzzy +msgid "Japanese long envelope #3 landscape" +msgstr "Japanese long envelope #3" + +#: src/main/xmli18n-tmp.h:138 msgid "Japanese long envelope #4" msgstr "Japanese long envelope #4" -#: src/main/xmli18n-tmp.h:123 +#: src/main/xmli18n-tmp.h:139 +#, fuzzy +msgid "Japanese long envelope #4 landscape" +msgstr "Japanese long envelope #4" + +#: src/main/xmli18n-tmp.h:140 msgid "Japanese Kaku envelope #4" msgstr "Japanese Kaku envelope #4" -#: src/main/xmli18n-tmp.h:124 +#: src/main/xmli18n-tmp.h:141 +#, fuzzy +msgid "Japanese Kaku envelope #4 landscape" +msgstr "Japanese Kaku envelope #4" + +#: src/main/xmli18n-tmp.h:142 msgid "Commercial 10" msgstr "Commercial 10" -#: src/main/xmli18n-tmp.h:125 +#: src/main/xmli18n-tmp.h:143 +#, fuzzy +msgid "Commercial 10 landscape" +msgstr "Commercial 10" + +#: src/main/xmli18n-tmp.h:144 msgid "A2 Invitation" msgstr "A2 Invitation" -#: src/main/xmli18n-tmp.h:126 +#: src/main/xmli18n-tmp.h:145 msgid "Monarch Envelope" msgstr "Monarch Envelope" -#: src/main/xmli18n-tmp.h:127 +#: src/main/xmli18n-tmp.h:146 +#, fuzzy +msgid "Monarch Envelope landscape" +msgstr "Monarch Envelope" + +#: src/main/xmli18n-tmp.h:147 msgid "4x5 3/8" msgstr "4×5 3/8" -#: src/main/xmli18n-tmp.h:128 +#: src/main/xmli18n-tmp.h:148 msgid "4x7" msgstr "4×7" -#: src/main/xmli18n-tmp.h:129 +#: src/main/xmli18n-tmp.h:149 msgid "CP_L" msgstr "CP_L" -#: src/main/xmli18n-tmp.h:130 +#: src/main/xmli18n-tmp.h:150 msgid "Card" msgstr "Card" -#: src/main/xmli18n-tmp.h:131 +#: src/main/xmli18n-tmp.h:151 msgid "Wide Postcard" msgstr "Wide Postcard" -#: src/main/xmli18n-tmp.h:132 +#: src/main/xmli18n-tmp.h:152 msgid "Chilean Office" msgstr "Chilean Office" -#: src/main/xmli18n-tmp.h:133 +#: src/main/xmli18n-tmp.h:153 msgid "Chilean Double Letter" msgstr "Chilean Double Letter" -#: src/main/xmli18n-tmp.h:134 +#: src/main/xmli18n-tmp.h:154 msgid "Chilean Double Office" msgstr "Chilean Double Office" -#: src/main/xmli18n-tmp.h:135 +#: src/main/xmli18n-tmp.h:155 msgid "Custom" msgstr "Custom" -#: src/main/xmli18n-tmp.h:136 +#: src/main/xmli18n-tmp.h:156 msgid "89 mm Roll Paper" msgstr "89 mm Roll Paper" -#: src/main/xmli18n-tmp.h:137 +#: src/main/xmli18n-tmp.h:157 msgid "4 Inch Roll Paper" msgstr "4 Inch Roll Paper" -#: src/main/xmli18n-tmp.h:138 +#: src/main/xmli18n-tmp.h:158 msgid "5 Inch Roll Paper" msgstr "5 Inch Roll Paper" -#: src/main/xmli18n-tmp.h:139 +#: src/main/xmli18n-tmp.h:159 msgid "210 mm Roll Paper" msgstr "210 mm Roll Paper" -#: src/main/xmli18n-tmp.h:140 +#: src/main/xmli18n-tmp.h:160 msgid "13 Inch Roll Paper" msgstr "13 Inch Roll Paper" -#: src/main/xmli18n-tmp.h:141 +#: src/main/xmli18n-tmp.h:161 msgid "22 Inch Roll Paper" msgstr "22 Inch Roll Paper" -#: src/main/xmli18n-tmp.h:142 +#: src/main/xmli18n-tmp.h:162 msgid "24 Inch Roll Paper" msgstr "24 Inch Roll Paper" -#: src/main/xmli18n-tmp.h:143 +#: src/main/xmli18n-tmp.h:163 msgid "36 Inch Roll Paper" msgstr "36 Inch Roll Paper" -#: src/main/xmli18n-tmp.h:144 +#: src/main/xmli18n-tmp.h:164 msgid "44 Inch Roll Paper" msgstr "44 Inch Roll Paper" -#: src/main/xmli18n-tmp.h:145 +#: src/main/xmli18n-tmp.h:165 msgid "PostScript Level 1" msgstr "PostScript Level 1" -#: src/main/xmli18n-tmp.h:146 +#: src/main/xmli18n-tmp.h:166 msgid "PostScript Level 2" msgstr "PostScript Level 2" -#: src/main/xmli18n-tmp.h:147 +#: src/main/xmli18n-tmp.h:167 msgid "Canon BJ-30" msgstr "Canon BJ-30" -#: src/main/xmli18n-tmp.h:148 +#: src/main/xmli18n-tmp.h:168 msgid "Canon BJC-50" msgstr "Canon BJC-50" -#: src/main/xmli18n-tmp.h:149 +#: src/main/xmli18n-tmp.h:169 msgid "Canon BJC-55" msgstr "Canon BJC-55" -#: src/main/xmli18n-tmp.h:150 +#: src/main/xmli18n-tmp.h:170 msgid "Canon BJC-80" msgstr "Canon BJC-80" -#: src/main/xmli18n-tmp.h:151 +#: src/main/xmli18n-tmp.h:171 msgid "Canon BJC-85" msgstr "Canon BJC-85" -#: src/main/xmli18n-tmp.h:152 +#: src/main/xmli18n-tmp.h:172 msgid "Canon BJC-210" msgstr "Canon BJC-210" -#: src/main/xmli18n-tmp.h:153 +#: src/main/xmli18n-tmp.h:173 msgid "Canon BJC-240" msgstr "Canon BJC-240" -#: src/main/xmli18n-tmp.h:154 +#: src/main/xmli18n-tmp.h:174 msgid "Canon BJC-250" msgstr "Canon BJC-250" -#: src/main/xmli18n-tmp.h:155 +#: src/main/xmli18n-tmp.h:175 msgid "Canon BJC-1000" msgstr "Canon BJC-1000" -#: src/main/xmli18n-tmp.h:156 +#: src/main/xmli18n-tmp.h:176 msgid "Canon BJC-2000" msgstr "Canon BJC-2000" -#: src/main/xmli18n-tmp.h:157 +#: src/main/xmli18n-tmp.h:177 msgid "Canon BJC-2010" msgstr "Canon BJC-2010" -#: src/main/xmli18n-tmp.h:158 +#: src/main/xmli18n-tmp.h:178 msgid "Canon BJC-2100" msgstr "Canon BJC-2100" -#: src/main/xmli18n-tmp.h:159 +#: src/main/xmli18n-tmp.h:179 msgid "Canon BJC-2110" msgstr "Canon BJC-2110" -#: src/main/xmli18n-tmp.h:160 +#: src/main/xmli18n-tmp.h:180 msgid "Canon BJC-3000" msgstr "Canon BJC-3000" -#: src/main/xmli18n-tmp.h:161 +#: src/main/xmli18n-tmp.h:181 msgid "Canon BJC-4000" msgstr "Canon BJC-4000" -#: src/main/xmli18n-tmp.h:162 +#: src/main/xmli18n-tmp.h:182 msgid "Canon BJC-4300" msgstr "Canon BJC-4300" -#: src/main/xmli18n-tmp.h:163 +#: src/main/xmli18n-tmp.h:183 msgid "Canon BJC-4400" msgstr "Canon BJC-4400" -#: src/main/xmli18n-tmp.h:164 +#: src/main/xmli18n-tmp.h:184 #, fuzzy msgid "Canon BJC-5100" msgstr "Canon BJC-1000" -#: src/main/xmli18n-tmp.h:165 +#: src/main/xmli18n-tmp.h:185 #, fuzzy msgid "Canon BJC-5500" msgstr "Canon BJC-6500" -#: src/main/xmli18n-tmp.h:166 +#: src/main/xmli18n-tmp.h:186 msgid "Canon BJC-6000" msgstr "Canon BJC-6000" -#: src/main/xmli18n-tmp.h:167 +#: src/main/xmli18n-tmp.h:187 msgid "Canon BJC-6100" msgstr "Canon BJC-6100" -#: src/main/xmli18n-tmp.h:168 +#: src/main/xmli18n-tmp.h:188 msgid "Canon BJC-6200" msgstr "Canon BJC-6200" -#: src/main/xmli18n-tmp.h:169 +#: src/main/xmli18n-tmp.h:189 msgid "Canon BJC-6500" msgstr "Canon BJC-6500" -#: src/main/xmli18n-tmp.h:170 +#: src/main/xmli18n-tmp.h:190 msgid "Canon BJC-7000" msgstr "Canon BJC-7000" -#: src/main/xmli18n-tmp.h:171 +#: src/main/xmli18n-tmp.h:191 msgid "Canon BJC-7100" msgstr "Canon BJC-7100" -#: src/main/xmli18n-tmp.h:172 +#: src/main/xmli18n-tmp.h:192 msgid "Canon BJC-8200" msgstr "Canon BJC-8200" -#: src/main/xmli18n-tmp.h:173 +#: src/main/xmli18n-tmp.h:193 #, fuzzy msgid "Canon BJC-8500" msgstr "Canon BJC-6500" -#: src/main/xmli18n-tmp.h:174 +#: src/main/xmli18n-tmp.h:194 msgid "Canon S100" msgstr "Canon S100" -#: src/main/xmli18n-tmp.h:175 +#: src/main/xmli18n-tmp.h:195 msgid "Canon S200" msgstr "Canon S200" -#: src/main/xmli18n-tmp.h:176 +#: src/main/xmli18n-tmp.h:196 msgid "Canon S300" msgstr "Canon S300" -#: src/main/xmli18n-tmp.h:177 +#: src/main/xmli18n-tmp.h:197 msgid "Canon S400" msgstr "Canon S400" -#: src/main/xmli18n-tmp.h:178 +#: src/main/xmli18n-tmp.h:198 msgid "Canon S450" msgstr "Canon S450" -#: src/main/xmli18n-tmp.h:179 +#: src/main/xmli18n-tmp.h:199 msgid "Canon S500" msgstr "Canon S500" -#: src/main/xmli18n-tmp.h:180 +#: src/main/xmli18n-tmp.h:200 msgid "Canon S600" msgstr "Canon S600" -#: src/main/xmli18n-tmp.h:181 +#: src/main/xmli18n-tmp.h:201 msgid "Canon S630" msgstr "Canon S630" -#: src/main/xmli18n-tmp.h:182 +#: src/main/xmli18n-tmp.h:202 msgid "Canon S800" msgstr "Canon S800" -#: src/main/xmli18n-tmp.h:183 +#: src/main/xmli18n-tmp.h:203 msgid "Canon S4500" msgstr "Canon S4500" -#: src/main/xmli18n-tmp.h:184 +#: src/main/xmli18n-tmp.h:204 #, fuzzy msgid "Canon PIXMA iP2000" msgstr "Canon iP4000" -#: src/main/xmli18n-tmp.h:185 +#: src/main/xmli18n-tmp.h:205 #, fuzzy msgid "Canon PIXMA iP3000" msgstr "Canon iP4000" -#: src/main/xmli18n-tmp.h:186 +#: src/main/xmli18n-tmp.h:206 #, fuzzy msgid "Canon PIXMA iP3100" msgstr "Canon CP-300" -#: src/main/xmli18n-tmp.h:187 +#: src/main/xmli18n-tmp.h:207 #, fuzzy msgid "Canon PIXMA iP4000" msgstr "Canon iP4000" -#: src/main/xmli18n-tmp.h:188 +#: src/main/xmli18n-tmp.h:208 #, fuzzy msgid "Canon PIXMA iP4100" msgstr "Canon iP4000" -#: src/main/xmli18n-tmp.h:189 +#: src/main/xmli18n-tmp.h:209 #, fuzzy msgid "Canon PIXMA iP4200" msgstr "Canon iP4000" -#: src/main/xmli18n-tmp.h:190 +#: src/main/xmli18n-tmp.h:210 #, fuzzy msgid "Canon PIXMA iP4300" msgstr "Canon iP4000" -#: src/main/xmli18n-tmp.h:191 +#: src/main/xmli18n-tmp.h:211 #, fuzzy msgid "Canon PIXMA iP4500" msgstr "Canon iP4000" -#: src/main/xmli18n-tmp.h:192 +#: src/main/xmli18n-tmp.h:212 #, fuzzy msgid "Canon PIXMA iP5000" msgstr "Canon iP4000" -#: src/main/xmli18n-tmp.h:193 +#: src/main/xmli18n-tmp.h:213 #, fuzzy msgid "Canon PIXMA iP5200" msgstr "Canon CP-200" -#: src/main/xmli18n-tmp.h:194 +#: src/main/xmli18n-tmp.h:214 #, fuzzy msgid "Canon PIXMA iP5300" msgstr "Canon iP4000" -#: src/main/xmli18n-tmp.h:195 +#: src/main/xmli18n-tmp.h:215 +#, fuzzy +msgid "Canon PIXMA iP6000D" +msgstr "Canon iP4000" + +#: src/main/xmli18n-tmp.h:216 #, fuzzy msgid "Canon PIXMA iP6700" msgstr "Canon iP4000" -#: src/main/xmli18n-tmp.h:196 +#: src/main/xmli18n-tmp.h:217 #, fuzzy msgid "Canon PIXMA iP8500" msgstr "Canon iP4000" -#: src/main/xmli18n-tmp.h:197 +#: src/main/xmli18n-tmp.h:218 #, fuzzy msgid "Canon PIXMA iX5000" msgstr "Canon iP4000" -#: src/main/xmli18n-tmp.h:198 +#: src/main/xmli18n-tmp.h:219 #, fuzzy msgid "Canon PIXMA Pro9500" msgstr "Canon iP4000" -#: src/main/xmli18n-tmp.h:199 +#: src/main/xmli18n-tmp.h:220 #, fuzzy msgid "Canon PIXMA MP150" msgstr "Canon CP-300" -#: src/main/xmli18n-tmp.h:200 +#: src/main/xmli18n-tmp.h:221 #, fuzzy msgid "Canon PIXMA MP170" msgstr "Canon CP-300" -#: src/main/xmli18n-tmp.h:201 +#: src/main/xmli18n-tmp.h:222 #, fuzzy msgid "Canon PIXMA MP180" msgstr "Canon CP-300" -#: src/main/xmli18n-tmp.h:202 +#: src/main/xmli18n-tmp.h:223 #, fuzzy msgid "Canon PIXMA MP500" msgstr "Canon iP4000" -#: src/main/xmli18n-tmp.h:203 +#: src/main/xmli18n-tmp.h:224 +#, fuzzy +msgid "Canon PIXMA MP520" +msgstr "Canon CP-300" + +#: src/main/xmli18n-tmp.h:225 #, fuzzy msgid "Canon PIXMA MP610" msgstr "Canon CP-300" -#: src/main/xmli18n-tmp.h:204 +#: src/main/xmli18n-tmp.h:226 #, fuzzy msgid "Canon PIXMA MP700" msgstr "Canon iP4000" -#: src/main/xmli18n-tmp.h:205 +#: src/main/xmli18n-tmp.h:227 #, fuzzy msgid "Canon PIXMA MP710" msgstr "Canon CP-300" -#: src/main/xmli18n-tmp.h:206 +#: src/main/xmli18n-tmp.h:228 #, fuzzy msgid "Canon PIXMA MP730" msgstr "Canon iP4000" -#: src/main/xmli18n-tmp.h:207 +#: src/main/xmli18n-tmp.h:229 #, fuzzy msgid "Canon PIXMA MP740" msgstr "Canon iP4000" -#: src/main/xmli18n-tmp.h:208 +#: src/main/xmli18n-tmp.h:230 #, fuzzy msgid "Canon PIXMA MP750" msgstr "Canon iP4000" -#: src/main/xmli18n-tmp.h:209 +#: src/main/xmli18n-tmp.h:231 #, fuzzy msgid "Canon PIXMA MP760" msgstr "Canon iP4000" -#: src/main/xmli18n-tmp.h:210 +#: src/main/xmli18n-tmp.h:232 #, fuzzy msgid "Canon PIXMA MP770" msgstr "Canon iP4000" -#: src/main/xmli18n-tmp.h:211 +#: src/main/xmli18n-tmp.h:233 #, fuzzy msgid "Canon PIXMA MP780" msgstr "Canon iP4000" -#: src/main/xmli18n-tmp.h:212 +#: src/main/xmli18n-tmp.h:234 #, fuzzy msgid "Canon PIXMA MP790" msgstr "Canon iP4000" -#: src/main/xmli18n-tmp.h:213 +#: src/main/xmli18n-tmp.h:235 #, fuzzy msgid "Canon PIXMA MP830" msgstr "Canon iP4000" -#: src/main/xmli18n-tmp.h:214 +#: src/main/xmli18n-tmp.h:236 #, fuzzy msgid "Canon PIXUS iP3100" msgstr "Canon S100" -#: src/main/xmli18n-tmp.h:215 +#: src/main/xmli18n-tmp.h:237 #, fuzzy msgid "Canon PIXUS iP4100" msgstr "Canon iP4000" -#: src/main/xmli18n-tmp.h:216 +#: src/main/xmli18n-tmp.h:238 #, fuzzy msgid "Canon i80" msgstr "Canon S450" -#: src/main/xmli18n-tmp.h:217 +#: src/main/xmli18n-tmp.h:239 #, fuzzy msgid "Canon i560" msgstr "Canon S450" -#: src/main/xmli18n-tmp.h:218 +#: src/main/xmli18n-tmp.h:240 #, fuzzy msgid "Canon i850" msgstr "Canon S450" -#: src/main/xmli18n-tmp.h:219 +#: src/main/xmli18n-tmp.h:241 #, fuzzy msgid "Canon i860" msgstr "Canon S600" -#: src/main/xmli18n-tmp.h:220 +#: src/main/xmli18n-tmp.h:242 #, fuzzy msgid "Canon i865" msgstr "Canon BJC-85" -#: src/main/xmli18n-tmp.h:221 +#: src/main/xmli18n-tmp.h:243 msgid "Epson Stylus C20" msgstr "Epson Stylus C20" -#: src/main/xmli18n-tmp.h:222 +#: src/main/xmli18n-tmp.h:244 msgid "Epson Stylus C20SX" msgstr "Epson Stylus C20SX" -#: src/main/xmli18n-tmp.h:223 +#: src/main/xmli18n-tmp.h:245 msgid "Epson Stylus C20UX" msgstr "Epson Stylus C20UX" -#: src/main/xmli18n-tmp.h:224 +#: src/main/xmli18n-tmp.h:246 msgid "Epson Stylus C40" msgstr "Epson Stylus C40" -#: src/main/xmli18n-tmp.h:225 +#: src/main/xmli18n-tmp.h:247 msgid "Epson Stylus C40SX" msgstr "Epson Stylus C40SX" -#: src/main/xmli18n-tmp.h:226 +#: src/main/xmli18n-tmp.h:248 msgid "Epson Stylus C40UX" msgstr "Epson Stylus C40UX" -#: src/main/xmli18n-tmp.h:227 +#: src/main/xmli18n-tmp.h:249 msgid "Epson Stylus C41" msgstr "Epson Stylus C41" -#: src/main/xmli18n-tmp.h:228 +#: src/main/xmli18n-tmp.h:250 msgid "Epson Stylus C41SX" msgstr "Epson Stylus C41SX" -#: src/main/xmli18n-tmp.h:229 +#: src/main/xmli18n-tmp.h:251 msgid "Epson Stylus C41UX" msgstr "Epson Stylus C41UX" -#: src/main/xmli18n-tmp.h:230 +#: src/main/xmli18n-tmp.h:252 msgid "Epson Stylus C42" msgstr "Epson Stylus C42" -#: src/main/xmli18n-tmp.h:231 +#: src/main/xmli18n-tmp.h:253 msgid "Epson Stylus C42SX" msgstr "Epson Stylus C42SX" -#: src/main/xmli18n-tmp.h:232 +#: src/main/xmli18n-tmp.h:254 msgid "Epson Stylus C42UX" msgstr "Epson Stylus C42UX" -#: src/main/xmli18n-tmp.h:233 +#: src/main/xmli18n-tmp.h:255 msgid "Epson Stylus C43" msgstr "Epson Stylus C43" -#: src/main/xmli18n-tmp.h:234 +#: src/main/xmli18n-tmp.h:256 msgid "Epson Stylus C43SX" msgstr "Epson Stylus C43SX" -#: src/main/xmli18n-tmp.h:235 +#: src/main/xmli18n-tmp.h:257 msgid "Epson Stylus C43UX" msgstr "Epson Stylus C43UX" -#: src/main/xmli18n-tmp.h:236 +#: src/main/xmli18n-tmp.h:258 msgid "Epson Stylus C44" msgstr "Epson Stylus C44" -#: src/main/xmli18n-tmp.h:237 +#: src/main/xmli18n-tmp.h:259 msgid "Epson Stylus C44SX" msgstr "Epson Stylus C44SX" -#: src/main/xmli18n-tmp.h:238 +#: src/main/xmli18n-tmp.h:260 msgid "Epson Stylus C44UX" msgstr "Epson Stylus C44UX" -#: src/main/xmli18n-tmp.h:239 +#: src/main/xmli18n-tmp.h:261 msgid "Epson Stylus C45" msgstr "Epson Stylus C45" -#: src/main/xmli18n-tmp.h:240 +#: src/main/xmli18n-tmp.h:262 msgid "Epson Stylus C46" msgstr "Epson Stylus C46" -#: src/main/xmli18n-tmp.h:241 +#: src/main/xmli18n-tmp.h:263 msgid "Epson Stylus C48" msgstr "Epson Stylus C48" -#: src/main/xmli18n-tmp.h:242 +#: src/main/xmli18n-tmp.h:264 msgid "Epson Stylus C50" msgstr "Epson Stylus C50" -#: src/main/xmli18n-tmp.h:243 +#: src/main/xmli18n-tmp.h:265 msgid "Epson Stylus C60" msgstr "Epson Stylus C60" -#: src/main/xmli18n-tmp.h:244 +#: src/main/xmli18n-tmp.h:266 msgid "Epson Stylus C61" msgstr "Epson Stylus C61" -#: src/main/xmli18n-tmp.h:245 +#: src/main/xmli18n-tmp.h:267 msgid "Epson Stylus C62" msgstr "Epson Stylus C62" -#: src/main/xmli18n-tmp.h:246 +#: src/main/xmli18n-tmp.h:268 msgid "Epson Stylus C63" msgstr "Epson Stylus C63" -#: src/main/xmli18n-tmp.h:247 +#: src/main/xmli18n-tmp.h:269 msgid "Epson Stylus C64" msgstr "Epson Stylus C64" -#: src/main/xmli18n-tmp.h:248 +#: src/main/xmli18n-tmp.h:270 msgid "Epson Stylus C65" msgstr "Epson Stylus C65" -#: src/main/xmli18n-tmp.h:249 +#: src/main/xmli18n-tmp.h:271 msgid "Epson Stylus C66" msgstr "Epson Stylus C66" -#: src/main/xmli18n-tmp.h:250 +#: src/main/xmli18n-tmp.h:272 msgid "Epson Stylus C68" msgstr "Epson Stylus C68" -#: src/main/xmli18n-tmp.h:251 +#: src/main/xmli18n-tmp.h:273 msgid "Epson Stylus C70" msgstr "Epson Stylus C70" -#: src/main/xmli18n-tmp.h:252 +#: src/main/xmli18n-tmp.h:274 #, fuzzy msgid "Epson Stylus C79" msgstr "Epson Stylus C70" -#: src/main/xmli18n-tmp.h:253 +#: src/main/xmli18n-tmp.h:275 msgid "Epson Stylus C80" msgstr "Epson Stylus C80" -#: src/main/xmli18n-tmp.h:254 +#: src/main/xmli18n-tmp.h:276 msgid "Epson Stylus C82" msgstr "Epson Stylus C82" -#: src/main/xmli18n-tmp.h:255 +#: src/main/xmli18n-tmp.h:277 msgid "Epson Stylus C83" msgstr "Epson Stylus C83" -#: src/main/xmli18n-tmp.h:256 +#: src/main/xmli18n-tmp.h:278 msgid "Epson Stylus C84" msgstr "Epson Stylus C84" -#: src/main/xmli18n-tmp.h:257 +#: src/main/xmli18n-tmp.h:279 msgid "Epson Stylus C85" msgstr "Epson Stylus C85" -#: src/main/xmli18n-tmp.h:258 +#: src/main/xmli18n-tmp.h:280 msgid "Epson Stylus C86" msgstr "Epson Stylus C86" -#: src/main/xmli18n-tmp.h:259 +#: src/main/xmli18n-tmp.h:281 #, fuzzy msgid "Epson Stylus C87" msgstr "Epson Stylus C48" -#: src/main/xmli18n-tmp.h:260 +#: src/main/xmli18n-tmp.h:282 msgid "Epson Stylus C88" msgstr "Epson Stylus C88" -#: src/main/xmli18n-tmp.h:261 +#: src/main/xmli18n-tmp.h:283 #, fuzzy msgid "Epson Stylus C110" msgstr "Epson Stylus C20" -#: src/main/xmli18n-tmp.h:262 +#: src/main/xmli18n-tmp.h:284 #, fuzzy msgid "Epson Stylus C120" msgstr "Epson Stylus C20" -#: src/main/xmli18n-tmp.h:263 +#: src/main/xmli18n-tmp.h:285 msgid "Epson Stylus Color" msgstr "Epson Stylus Color" -#: src/main/xmli18n-tmp.h:264 +#: src/main/xmli18n-tmp.h:286 msgid "Epson Stylus Color I" msgstr "Epson Stylus Color I" -#: src/main/xmli18n-tmp.h:265 +#: src/main/xmli18n-tmp.h:287 msgid "Epson Stylus Color II" msgstr "Epson Stylus Color II" -#: src/main/xmli18n-tmp.h:266 +#: src/main/xmli18n-tmp.h:288 msgid "Epson Stylus Color IIs" msgstr "Epson Stylus Color IIs" -#: src/main/xmli18n-tmp.h:267 +#: src/main/xmli18n-tmp.h:289 msgid "Epson Stylus Color PRO" msgstr "Epson Stylus Color PRO" -#: src/main/xmli18n-tmp.h:268 +#: src/main/xmli18n-tmp.h:290 msgid "Epson Stylus Pro XL" msgstr "Epson Stylus Pro XL" -#: src/main/xmli18n-tmp.h:269 +#: src/main/xmli18n-tmp.h:291 msgid "Epson Stylus Color 400" msgstr "Epson Stylus Color 400" -#: src/main/xmli18n-tmp.h:270 +#: src/main/xmli18n-tmp.h:292 msgid "Epson Stylus Color 440" msgstr "Epson Stylus Color 440" -#: src/main/xmli18n-tmp.h:271 +#: src/main/xmli18n-tmp.h:293 msgid "Epson Stylus Color 460" msgstr "Epson Stylus Color 460" -#: src/main/xmli18n-tmp.h:272 +#: src/main/xmli18n-tmp.h:294 msgid "Epson Stylus Color 480" msgstr "Epson Stylus Color 480" -#: src/main/xmli18n-tmp.h:273 +#: src/main/xmli18n-tmp.h:295 msgid "Epson Stylus Color 500" msgstr "Epson Stylus Color 500" -#: src/main/xmli18n-tmp.h:274 +#: src/main/xmli18n-tmp.h:296 msgid "Epson Stylus Color 580" msgstr "Epson Stylus Color 580" -#: src/main/xmli18n-tmp.h:275 +#: src/main/xmli18n-tmp.h:297 msgid "Epson Stylus Color 600" msgstr "Epson Stylus Color 600" -#: src/main/xmli18n-tmp.h:276 +#: src/main/xmli18n-tmp.h:298 msgid "Epson Stylus Color 640" msgstr "Epson Stylus Color 640" -#: src/main/xmli18n-tmp.h:277 +#: src/main/xmli18n-tmp.h:299 msgid "Epson Stylus Color 660" msgstr "Epson Stylus Color 660" -#: src/main/xmli18n-tmp.h:278 +#: src/main/xmli18n-tmp.h:300 msgid "Epson Stylus Color 670" msgstr "Epson Stylus Color 670" -#: src/main/xmli18n-tmp.h:279 +#: src/main/xmli18n-tmp.h:301 msgid "Epson Stylus Color 680" msgstr "Epson Stylus Color 680" -#: src/main/xmli18n-tmp.h:280 +#: src/main/xmli18n-tmp.h:302 msgid "Epson Stylus Color 740" msgstr "Epson Stylus Color 740" -#: src/main/xmli18n-tmp.h:281 +#: src/main/xmli18n-tmp.h:303 msgid "Epson Stylus Color 760" msgstr "Epson Stylus Color 760" -#: src/main/xmli18n-tmp.h:282 +#: src/main/xmli18n-tmp.h:304 msgid "Epson Stylus Color 777" msgstr "Epson Stylus Color 777" -#: src/main/xmli18n-tmp.h:283 +#: src/main/xmli18n-tmp.h:305 msgid "Epson Stylus Color 800" msgstr "Epson Stylus Color 800" -#: src/main/xmli18n-tmp.h:284 +#: src/main/xmli18n-tmp.h:306 msgid "Epson Stylus Color 850" msgstr "Epson Stylus Color 850" -#: src/main/xmli18n-tmp.h:285 +#: src/main/xmli18n-tmp.h:307 msgid "Epson Stylus Color 860" msgstr "Epson Stylus Color 860" -#: src/main/xmli18n-tmp.h:286 +#: src/main/xmli18n-tmp.h:308 msgid "Epson Stylus Color 880" msgstr "Epson Stylus Color 880" -#: src/main/xmli18n-tmp.h:287 +#: src/main/xmli18n-tmp.h:309 msgid "Epson Stylus Color 8 3" msgstr "Epson Stylus Color 8 3" -#: src/main/xmli18n-tmp.h:288 +#: src/main/xmli18n-tmp.h:310 msgid "Epson Stylus Color 900" msgstr "Epson Stylus Color 900" -#: src/main/xmli18n-tmp.h:289 +#: src/main/xmli18n-tmp.h:311 msgid "Epson Stylus Color 980" msgstr "Epson Stylus Color 980" -#: src/main/xmli18n-tmp.h:290 +#: src/main/xmli18n-tmp.h:312 msgid "Epson Stylus Color 1160" msgstr "Epson Stylus Color 1160" -#: src/main/xmli18n-tmp.h:291 +#: src/main/xmli18n-tmp.h:313 msgid "Epson Stylus Color 1500" msgstr "Epson Stylus Color 1500" -#: src/main/xmli18n-tmp.h:292 +#: src/main/xmli18n-tmp.h:314 msgid "Epson Stylus Color 1520" msgstr "Epson Stylus Color 1520" -#: src/main/xmli18n-tmp.h:293 +#: src/main/xmli18n-tmp.h:315 msgid "Epson Stylus Color 3000" msgstr "Epson Stylus Color 3000" -#: src/main/xmli18n-tmp.h:294 +#: src/main/xmli18n-tmp.h:316 msgid "Epson Stylus Photo" msgstr "Epson Stylus Photo" -#: src/main/xmli18n-tmp.h:295 +#: src/main/xmli18n-tmp.h:317 msgid "Epson Stylus Photo 700" msgstr "Epson Stylus Photo 700" -#: src/main/xmli18n-tmp.h:296 +#: src/main/xmli18n-tmp.h:318 msgid "Epson Stylus Photo EX" msgstr "Epson Stylus Photo EX" -#: src/main/xmli18n-tmp.h:297 +#: src/main/xmli18n-tmp.h:319 msgid "Epson Stylus Photo EX3" msgstr "Epson Stylus Photo EX3" -#: src/main/xmli18n-tmp.h:298 +#: src/main/xmli18n-tmp.h:320 msgid "Epson Stylus Photo 720" msgstr "Epson Stylus Photo 720" -#: src/main/xmli18n-tmp.h:299 +#: src/main/xmli18n-tmp.h:321 msgid "Epson Stylus Photo 750" msgstr "Epson Stylus Photo 750" -#: src/main/xmli18n-tmp.h:300 +#: src/main/xmli18n-tmp.h:322 msgid "Epson Stylus Photo 780" msgstr "Epson Stylus Photo 780" -#: src/main/xmli18n-tmp.h:301 +#: src/main/xmli18n-tmp.h:323 msgid "Epson Stylus Photo 785" msgstr "Epson Stylus Photo 785" -#: src/main/xmli18n-tmp.h:302 +#: src/main/xmli18n-tmp.h:324 msgid "Epson Stylus Photo 790" msgstr "Epson Stylus Photo 790" -#: src/main/xmli18n-tmp.h:303 +#: src/main/xmli18n-tmp.h:325 msgid "Epson Stylus Photo 810" msgstr "Epson Stylus Photo 810" -#: src/main/xmli18n-tmp.h:304 +#: src/main/xmli18n-tmp.h:326 msgid "Epson Stylus Photo 820" msgstr "Epson Stylus Photo 820" -#: src/main/xmli18n-tmp.h:305 +#: src/main/xmli18n-tmp.h:327 msgid "Epson Stylus Photo 825" msgstr "Epson Stylus Photo 825" -#: src/main/xmli18n-tmp.h:306 +#: src/main/xmli18n-tmp.h:328 msgid "Epson Stylus Photo 830" msgstr "Epson Stylus Photo 830" -#: src/main/xmli18n-tmp.h:307 +#: src/main/xmli18n-tmp.h:329 msgid "Epson Stylus Photo 830U" msgstr "Epson Stylus Photo 830U" -#: src/main/xmli18n-tmp.h:308 +#: src/main/xmli18n-tmp.h:330 msgid "Epson Stylus Photo 870" msgstr "Epson Stylus Photo 870" -#: src/main/xmli18n-tmp.h:309 +#: src/main/xmli18n-tmp.h:331 msgid "Epson Stylus Photo 875" msgstr "Epson Stylus Photo 875" -#: src/main/xmli18n-tmp.h:310 +#: src/main/xmli18n-tmp.h:332 msgid "Epson Stylus Photo 890" msgstr "Epson Stylus Photo 890" -#: src/main/xmli18n-tmp.h:311 +#: src/main/xmli18n-tmp.h:333 msgid "Epson Stylus Photo 895" msgstr "Epson Stylus Photo 895" -#: src/main/xmli18n-tmp.h:312 +#: src/main/xmli18n-tmp.h:334 msgid "Epson Stylus Photo 900" msgstr "Epson Stylus Photo 900" -#: src/main/xmli18n-tmp.h:313 +#: src/main/xmli18n-tmp.h:335 msgid "Epson Stylus Photo 915" msgstr "Epson Stylus Photo 915" -#: src/main/xmli18n-tmp.h:314 +#: src/main/xmli18n-tmp.h:336 msgid "Epson Stylus Photo 925" msgstr "Epson Stylus Photo 925" -#: src/main/xmli18n-tmp.h:315 +#: src/main/xmli18n-tmp.h:337 msgid "Epson Stylus Photo 935" msgstr "Epson Stylus Photo 935" -#: src/main/xmli18n-tmp.h:316 +#: src/main/xmli18n-tmp.h:338 msgid "Epson Stylus Photo 950" msgstr "Epson Stylus Photo 950" -#: src/main/xmli18n-tmp.h:317 +#: src/main/xmli18n-tmp.h:339 msgid "Epson Stylus Photo 960" msgstr "Epson Stylus Photo 960" -#: src/main/xmli18n-tmp.h:318 +#: src/main/xmli18n-tmp.h:340 msgid "Epson Stylus Photo 1200" msgstr "Epson Stylus Photo 1200" -#: src/main/xmli18n-tmp.h:319 +#: src/main/xmli18n-tmp.h:341 msgid "Epson Stylus Photo 1270" msgstr "Epson Stylus Photo 1270" -#: src/main/xmli18n-tmp.h:320 +#: src/main/xmli18n-tmp.h:342 msgid "Epson Stylus Photo 1280" msgstr "Epson Stylus Photo 1280" -#: src/main/xmli18n-tmp.h:321 +#: src/main/xmli18n-tmp.h:343 msgid "Epson Stylus Photo 1290" msgstr "Epson Stylus Photo 1290" -#: src/main/xmli18n-tmp.h:322 +#: src/main/xmli18n-tmp.h:344 #, fuzzy msgid "Epson Stylus Photo 1400" msgstr "Epson Stylus Photo 1200" -#: src/main/xmli18n-tmp.h:323 +#: src/main/xmli18n-tmp.h:345 #, fuzzy msgid "Epson Stylus Photo 1410" msgstr "Epson Stylus Photo 810" -#: src/main/xmli18n-tmp.h:324 +#: src/main/xmli18n-tmp.h:346 msgid "Epson Stylus Photo 2000P" msgstr "Epson Stylus Photo 2000P" -#: src/main/xmli18n-tmp.h:325 +#: src/main/xmli18n-tmp.h:347 msgid "Epson Stylus Photo 2100" msgstr "Epson Stylus Photo 2100" -#: src/main/xmli18n-tmp.h:326 +#: src/main/xmli18n-tmp.h:348 msgid "Epson Stylus Photo 2200" msgstr "Epson Stylus Photo 2200" -#: src/main/xmli18n-tmp.h:327 +#: src/main/xmli18n-tmp.h:349 msgid "Epson Stylus Photo R200" msgstr "Epson Stylus Photo R200" -#: src/main/xmli18n-tmp.h:328 +#: src/main/xmli18n-tmp.h:350 msgid "Epson Stylus Photo R210" msgstr "Epson Stylus Photo R210" -#: src/main/xmli18n-tmp.h:329 +#: src/main/xmli18n-tmp.h:351 msgid "Epson Stylus Photo R220" msgstr "Epson Stylus Photo R220" -#: src/main/xmli18n-tmp.h:330 +#: src/main/xmli18n-tmp.h:352 #, fuzzy msgid "Epson Stylus Photo R230" msgstr "Epson Stylus Photo R200" -#: src/main/xmli18n-tmp.h:331 +#: src/main/xmli18n-tmp.h:353 #, fuzzy msgid "Epson Stylus Photo R240" msgstr "Epson Stylus Photo R2400" -#: src/main/xmli18n-tmp.h:332 +#: src/main/xmli18n-tmp.h:354 #, fuzzy msgid "Epson Stylus Photo R245" msgstr "Epson Stylus Photo RX425" -#: src/main/xmli18n-tmp.h:333 +#: src/main/xmli18n-tmp.h:355 #, fuzzy msgid "Epson Stylus Photo R260" msgstr "Epson Stylus Photo R200" -#: src/main/xmli18n-tmp.h:334 +#: src/main/xmli18n-tmp.h:356 #, fuzzy msgid "Epson Stylus Photo R265" msgstr "Epson Stylus Photo RX425" -#: src/main/xmli18n-tmp.h:335 +#: src/main/xmli18n-tmp.h:357 #, fuzzy msgid "Epson Stylus Photo R270" msgstr "Epson Stylus Photo 1270" -#: src/main/xmli18n-tmp.h:336 +#: src/main/xmli18n-tmp.h:358 +#, fuzzy +msgid "Epson Stylus Photo R280" +msgstr "Epson Stylus Photo 1280" + +#: src/main/xmli18n-tmp.h:359 +#, fuzzy +msgid "Epson Stylus Photo R285" +msgstr "Epson Stylus Photo RX425" + +#: src/main/xmli18n-tmp.h:360 msgid "Epson Stylus Photo R300" msgstr "Epson Stylus Photo R300" -#: src/main/xmli18n-tmp.h:337 +#: src/main/xmli18n-tmp.h:361 msgid "Epson Stylus Photo R310" msgstr "Epson Stylus Photo R310" -#: src/main/xmli18n-tmp.h:338 +#: src/main/xmli18n-tmp.h:362 msgid "Epson Stylus Photo R320" msgstr "Epson Stylus Photo R320" -#: src/main/xmli18n-tmp.h:339 +#: src/main/xmli18n-tmp.h:363 msgid "Epson Stylus Photo R340" msgstr "Epson Stylus Photo R340" -#: src/main/xmli18n-tmp.h:340 +#: src/main/xmli18n-tmp.h:364 #, fuzzy msgid "Epson Stylus Photo R350" msgstr "Epson Stylus Photo R300" -#: src/main/xmli18n-tmp.h:341 +#: src/main/xmli18n-tmp.h:365 #, fuzzy msgid "Epson Stylus Photo R360" msgstr "Epson Stylus Photo R300" -#: src/main/xmli18n-tmp.h:342 +#: src/main/xmli18n-tmp.h:366 #, fuzzy msgid "Epson Stylus Photo R380" msgstr "Epson Stylus Photo R300" -#: src/main/xmli18n-tmp.h:343 +#: src/main/xmli18n-tmp.h:367 #, fuzzy msgid "Epson Stylus Photo R390" msgstr "Epson Stylus Photo R300" -#: src/main/xmli18n-tmp.h:344 +#: src/main/xmli18n-tmp.h:368 msgid "Epson Stylus Photo RX400" msgstr "Epson Stylus Photo RX400" -#: src/main/xmli18n-tmp.h:345 +#: src/main/xmli18n-tmp.h:369 msgid "Epson Stylus Photo RX420" msgstr "Epson Stylus Photo RX420" -#: src/main/xmli18n-tmp.h:346 +#: src/main/xmli18n-tmp.h:370 msgid "Epson Stylus Photo RX425" msgstr "Epson Stylus Photo RX425" -#: src/main/xmli18n-tmp.h:347 +#: src/main/xmli18n-tmp.h:371 msgid "Epson Stylus Photo RX430" msgstr "Epson Stylus Photo RX430" -#: src/main/xmli18n-tmp.h:348 +#: src/main/xmli18n-tmp.h:372 msgid "Epson Stylus Photo RX500" msgstr "Epson Stylus Photo RX500" -#: src/main/xmli18n-tmp.h:349 +#: src/main/xmli18n-tmp.h:373 msgid "Epson Stylus Photo RX510" msgstr "Epson Stylus Photo RX510" -#: src/main/xmli18n-tmp.h:350 +#: src/main/xmli18n-tmp.h:374 #, fuzzy msgid "Epson Stylus Photo RX560" msgstr "Epson Stylus Photo RX500" -#: src/main/xmli18n-tmp.h:351 +#: src/main/xmli18n-tmp.h:375 #, fuzzy msgid "Epson Stylus Photo RX580" msgstr "Epson Stylus Photo RX500" -#: src/main/xmli18n-tmp.h:352 +#: src/main/xmli18n-tmp.h:376 +#, fuzzy +msgid "Epson Stylus Photo RX585" +msgstr "Epson Stylus Photo RX500" + +#: src/main/xmli18n-tmp.h:377 #, fuzzy msgid "Epson Stylus Photo RX590" msgstr "Epson Stylus Photo RX500" -#: src/main/xmli18n-tmp.h:353 +#: src/main/xmli18n-tmp.h:378 #, fuzzy msgid "Epson Stylus Photo RX595" msgstr "Epson Stylus Photo RX500" -#: src/main/xmli18n-tmp.h:354 +#: src/main/xmli18n-tmp.h:379 msgid "Epson Stylus Photo RX600" msgstr "Epson Stylus Photo RX600" -#: src/main/xmli18n-tmp.h:355 +#: src/main/xmli18n-tmp.h:380 msgid "Epson Stylus Photo RX620" msgstr "Epson Stylus Photo RX620" -#: src/main/xmli18n-tmp.h:356 +#: src/main/xmli18n-tmp.h:381 msgid "Epson Stylus Photo RX630" msgstr "Epson Stylus Photo RX630" -#: src/main/xmli18n-tmp.h:357 +#: src/main/xmli18n-tmp.h:382 #, fuzzy msgid "Epson Stylus Photo RX640" msgstr "Epson Stylus Photo RX400" -#: src/main/xmli18n-tmp.h:358 +#: src/main/xmli18n-tmp.h:383 +#, fuzzy +msgid "Epson Stylus Photo RX680" +msgstr "Epson Stylus Photo RX500" + +#: src/main/xmli18n-tmp.h:384 +#, fuzzy +msgid "Epson Stylus Photo RX685" +msgstr "Epson Stylus Photo RX425" + +#: src/main/xmli18n-tmp.h:385 msgid "Epson Stylus Photo RX700" msgstr "Epson Stylus Photo RX700" -#: src/main/xmli18n-tmp.h:359 +#: src/main/xmli18n-tmp.h:386 msgid "Epson Stylus Photo R800" msgstr "Epson Stylus Photo R800" -#: src/main/xmli18n-tmp.h:360 +#: src/main/xmli18n-tmp.h:387 msgid "Epson Stylus Photo R1800" msgstr "Epson Stylus Photo R1800" -#: src/main/xmli18n-tmp.h:361 +#: src/main/xmli18n-tmp.h:388 msgid "Epson Stylus Photo R2400" msgstr "Epson Stylus Photo R2400" -#: src/main/xmli18n-tmp.h:362 +#: src/main/xmli18n-tmp.h:389 msgid "Epson Stylus Pro 5000" msgstr "Epson Stylus Pro 5000" -#: src/main/xmli18n-tmp.h:363 +#: src/main/xmli18n-tmp.h:390 msgid "Epson Stylus Pro 5500" msgstr "Epson Stylus Pro 5500" -#: src/main/xmli18n-tmp.h:364 +#: src/main/xmli18n-tmp.h:391 msgid "Epson Stylus Pro 7000" msgstr "Epson Stylus Pro 7000" -#: src/main/xmli18n-tmp.h:365 +#: src/main/xmli18n-tmp.h:392 msgid "Epson Stylus Pro 7500" msgstr "Epson Stylus Pro 7500" -#: src/main/xmli18n-tmp.h:366 +#: src/main/xmli18n-tmp.h:393 msgid "Epson Stylus Pro 7600" msgstr "Epson Stylus Pro 7600" -#: src/main/xmli18n-tmp.h:367 +#: src/main/xmli18n-tmp.h:394 msgid "Epson Stylus Pro 9000" msgstr "Epson Stylus Pro 9000" -#: src/main/xmli18n-tmp.h:368 +#: src/main/xmli18n-tmp.h:395 msgid "Epson Stylus Pro 9500" msgstr "Epson Stylus Pro 9500" -#: src/main/xmli18n-tmp.h:369 +#: src/main/xmli18n-tmp.h:396 msgid "Epson Stylus Pro 9600" msgstr "Epson Stylus Pro 9600" -#: src/main/xmli18n-tmp.h:370 +#: src/main/xmli18n-tmp.h:397 msgid "Epson Stylus Pro 10000" msgstr "Epson Stylus Pro 10000" -#: src/main/xmli18n-tmp.h:371 +#: src/main/xmli18n-tmp.h:398 msgid "Epson Stylus Scan 2000" msgstr "Epson Stylus Scan 2000" -#: src/main/xmli18n-tmp.h:372 +#: src/main/xmli18n-tmp.h:399 msgid "Epson Stylus Scan 2500" msgstr "Epson Stylus Scan 2500" -#: src/main/xmli18n-tmp.h:373 +#: src/main/xmli18n-tmp.h:400 msgid "Epson Stylus CX1500" msgstr "Epson Stylus CX1500" -#: src/main/xmli18n-tmp.h:374 +#: src/main/xmli18n-tmp.h:401 msgid "Epson Stylus CX3100" msgstr "Epson Stylus CX3100" -#: src/main/xmli18n-tmp.h:375 +#: src/main/xmli18n-tmp.h:402 msgid "Epson Stylus CX3200" msgstr "Epson Stylus CX3200" -#: src/main/xmli18n-tmp.h:376 +#: src/main/xmli18n-tmp.h:403 msgid "Epson Stylus CX3500" msgstr "Epson Stylus CX3500" -#: src/main/xmli18n-tmp.h:377 +#: src/main/xmli18n-tmp.h:404 msgid "Epson Stylus CX3600" msgstr "Epson Stylus CX3600" -#: src/main/xmli18n-tmp.h:378 +#: src/main/xmli18n-tmp.h:405 msgid "Epson Stylus CX3650" msgstr "Epson Stylus CX3650" -#: src/main/xmli18n-tmp.h:379 +#: src/main/xmli18n-tmp.h:406 msgid "Epson Stylus CX3700" msgstr "Epson Stylus CX3700" -#: src/main/xmli18n-tmp.h:380 +#: src/main/xmli18n-tmp.h:407 msgid "Epson Stylus CX3800" msgstr "Epson Stylus CX3800" -#: src/main/xmli18n-tmp.h:381 +#: src/main/xmli18n-tmp.h:408 msgid "Epson Stylus CX3805" msgstr "Epson Stylus CX3805" -#: src/main/xmli18n-tmp.h:382 +#: src/main/xmli18n-tmp.h:409 msgid "Epson Stylus CX3810" msgstr "Epson Stylus CX3810" -#: src/main/xmli18n-tmp.h:383 +#: src/main/xmli18n-tmp.h:410 msgid "Epson Stylus CX4100" msgstr "Epson Stylus CX4100" -#: src/main/xmli18n-tmp.h:384 +#: src/main/xmli18n-tmp.h:411 msgid "Epson Stylus CX4200" msgstr "Epson Stylus CX4200" -#: src/main/xmli18n-tmp.h:385 +#: src/main/xmli18n-tmp.h:412 #, fuzzy msgid "Epson Stylus CX4400" msgstr "Epson Stylus CX4100" -#: src/main/xmli18n-tmp.h:386 +#: src/main/xmli18n-tmp.h:413 msgid "Epson Stylus CX4500" msgstr "Epson Stylus CX4500" -#: src/main/xmli18n-tmp.h:387 +#: src/main/xmli18n-tmp.h:414 msgid "Epson Stylus CX4600" msgstr "Epson Stylus CX4600" -#: src/main/xmli18n-tmp.h:388 +#: src/main/xmli18n-tmp.h:415 msgid "Epson Stylus CX4700" msgstr "Epson Stylus CX4700" -#: src/main/xmli18n-tmp.h:389 +#: src/main/xmli18n-tmp.h:416 msgid "Epson Stylus CX4800" msgstr "Epson Stylus CX4800" -#: src/main/xmli18n-tmp.h:390 +#: src/main/xmli18n-tmp.h:417 #, fuzzy msgid "Epson Stylus CX4900" msgstr "Epson Stylus CX4100" -#: src/main/xmli18n-tmp.h:391 +#: src/main/xmli18n-tmp.h:418 #, fuzzy msgid "Epson Stylus CX5000" msgstr "Epson Stylus CX1500" -#: src/main/xmli18n-tmp.h:392 +#: src/main/xmli18n-tmp.h:419 #, fuzzy msgid "Epson Stylus CX5000F" msgstr "Epson Stylus CX1500" -#: src/main/xmli18n-tmp.h:393 +#: src/main/xmli18n-tmp.h:420 msgid "Epson Stylus CX5100" msgstr "Epson Stylus CX5100" -#: src/main/xmli18n-tmp.h:394 +#: src/main/xmli18n-tmp.h:421 msgid "Epson Stylus CX5200" msgstr "Epson Stylus CX5200" -#: src/main/xmli18n-tmp.h:395 +#: src/main/xmli18n-tmp.h:422 msgid "Epson Stylus CX5300" msgstr "Epson Stylus CX5300" -#: src/main/xmli18n-tmp.h:396 +#: src/main/xmli18n-tmp.h:423 msgid "Epson Stylus CX5400" msgstr "Epson Stylus CX5400" -#: src/main/xmli18n-tmp.h:397 +#: src/main/xmli18n-tmp.h:424 #, fuzzy msgid "Epson Stylus CX5600" msgstr "Epson Stylus CX1500" -#: src/main/xmli18n-tmp.h:398 +#: src/main/xmli18n-tmp.h:425 msgid "Epson Stylus CX5700" msgstr "Epson Stylus CX5700" -#: src/main/xmli18n-tmp.h:399 +#: src/main/xmli18n-tmp.h:426 msgid "Epson Stylus CX5800" msgstr "Epson Stylus CX5800" -#: src/main/xmli18n-tmp.h:400 +#: src/main/xmli18n-tmp.h:427 #, fuzzy msgid "Epson Stylus CX6000" msgstr "Epson Stylus CX3600" -#: src/main/xmli18n-tmp.h:401 +#: src/main/xmli18n-tmp.h:428 msgid "Epson Stylus CX6300" msgstr "Epson Stylus CX6300" -#: src/main/xmli18n-tmp.h:402 +#: src/main/xmli18n-tmp.h:429 msgid "Epson Stylus CX6400" msgstr "Epson Stylus CX6400" -#: src/main/xmli18n-tmp.h:403 +#: src/main/xmli18n-tmp.h:430 msgid "Epson Stylus CX6500" msgstr "Epson Stylus CX6500" -#: src/main/xmli18n-tmp.h:404 +#: src/main/xmli18n-tmp.h:431 msgid "Epson Stylus CX6600" msgstr "Epson Stylus CX6600" -#: src/main/xmli18n-tmp.h:405 +#: src/main/xmli18n-tmp.h:432 #, fuzzy msgid "Epson Stylus CX7000F" msgstr "Epson Stylus CX3700" -#: src/main/xmli18n-tmp.h:406 +#: src/main/xmli18n-tmp.h:433 #, fuzzy msgid "Epson Stylus CX7400" msgstr "Epson Stylus CX3700" -#: src/main/xmli18n-tmp.h:407 +#: src/main/xmli18n-tmp.h:434 msgid "Epson Stylus CX7700" msgstr "Epson Stylus CX7700" -#: src/main/xmli18n-tmp.h:408 +#: src/main/xmli18n-tmp.h:435 msgid "Epson Stylus CX7800" msgstr "Epson Stylus CX7800" -#: src/main/xmli18n-tmp.h:409 +#: src/main/xmli18n-tmp.h:436 msgid "Epson Stylus CX8300" msgstr "Epson Stylus CX8300" -#: src/main/xmli18n-tmp.h:410 +#: src/main/xmli18n-tmp.h:437 msgid "Epson Stylus CX8400" msgstr "Epson Stylus CX8400" -#: src/main/xmli18n-tmp.h:411 +#: src/main/xmli18n-tmp.h:438 #, fuzzy msgid "Epson Stylus CX9400" msgstr "Epson Stylus CX4100" -#: src/main/xmli18n-tmp.h:412 +#: src/main/xmli18n-tmp.h:439 msgid "Epson Stylus D68" msgstr "Epson Stylus D68" -#: src/main/xmli18n-tmp.h:413 +#: src/main/xmli18n-tmp.h:440 msgid "Epson Stylus D88" msgstr "Epson Stylus D88" -#: src/main/xmli18n-tmp.h:414 +#: src/main/xmli18n-tmp.h:441 +#, fuzzy +msgid "Epson Stylus D92" +msgstr "Epson Stylus C20" + +#: src/main/xmli18n-tmp.h:442 #, fuzzy msgid "Epson Stylus D120" msgstr "Epson Stylus C20" -#: src/main/xmli18n-tmp.h:415 +#: src/main/xmli18n-tmp.h:443 msgid "Epson Stylus DX3800" msgstr "Epson Stylus DX3800" -#: src/main/xmli18n-tmp.h:416 +#: src/main/xmli18n-tmp.h:444 msgid "Epson Stylus DX3850" msgstr "Epson Stylus DX3850" -#: src/main/xmli18n-tmp.h:417 +#: src/main/xmli18n-tmp.h:445 #, fuzzy msgid "Epson Stylus DX4050" msgstr "Epson Stylus DX4200" -#: src/main/xmli18n-tmp.h:418 +#: src/main/xmli18n-tmp.h:446 msgid "Epson Stylus DX4200" msgstr "Epson Stylus DX4200" -#: src/main/xmli18n-tmp.h:419 +#: src/main/xmli18n-tmp.h:447 msgid "Epson Stylus DX4250" msgstr "Epson Stylus DX4250" -#: src/main/xmli18n-tmp.h:420 +#: src/main/xmli18n-tmp.h:448 +#, fuzzy +msgid "Epson Stylus DX4400" +msgstr "Epson Stylus CX4100" + +#: src/main/xmli18n-tmp.h:449 +#, fuzzy +msgid "Epson Stylus DX4450" +msgstr "Epson Stylus DX4200" + +#: src/main/xmli18n-tmp.h:450 msgid "Epson Stylus DX4800" msgstr "Epson Stylus DX4800" -#: src/main/xmli18n-tmp.h:421 +#: src/main/xmli18n-tmp.h:451 +#, fuzzy +msgid "Epson Stylus DX7000F" +msgstr "Epson Stylus CX3700" + +#: src/main/xmli18n-tmp.h:452 +#, fuzzy +msgid "Epson Stylus DX7400" +msgstr "Epson Stylus CX3700" + +#: src/main/xmli18n-tmp.h:453 +#, fuzzy +msgid "Epson Stylus DX7450" +msgstr "Epson Stylus DX4200" + +#: src/main/xmli18n-tmp.h:454 +#, fuzzy +msgid "Epson Stylus DX8400" +msgstr "Epson Stylus CX8400" + +#: src/main/xmli18n-tmp.h:455 +#, fuzzy +msgid "Epson Stylus DX8450" +msgstr "Epson Stylus DX3850" + +#: src/main/xmli18n-tmp.h:456 msgid "Epson PictureMate" msgstr "Epson PictureMate" -#: src/main/xmli18n-tmp.h:422 +#: src/main/xmli18n-tmp.h:457 +#, fuzzy +msgid "Epson PictureMate Dash" +msgstr "Epson PictureMate" + +#: src/main/xmli18n-tmp.h:458 msgid "Epson PictureMate Deluxe" msgstr "Epson PictureMate Deluxe" -#: src/main/xmli18n-tmp.h:423 +#: src/main/xmli18n-tmp.h:459 #, fuzzy msgid "Epson PictureMate Flash" msgstr "Epson PictureMate" -#: src/main/xmli18n-tmp.h:424 +#: src/main/xmli18n-tmp.h:460 +#, fuzzy +msgid "Epson PictureMate Pal" +msgstr "Epson PictureMate" + +#: src/main/xmli18n-tmp.h:461 +#, fuzzy +msgid "Epson PictureMate Snap" +msgstr "Epson PictureMate" + +#: src/main/xmli18n-tmp.h:462 +#, fuzzy +msgid "Epson PictureMate 100" +msgstr "Epson PictureMate" + +#: src/main/xmli18n-tmp.h:463 +#, fuzzy +msgid "Epson PictureMate 200" +msgstr "Epson PictureMate" + +#: src/main/xmli18n-tmp.h:464 +#, fuzzy +msgid "Epson PictureMate 210" +msgstr "Epson PictureMate" + +#: src/main/xmli18n-tmp.h:465 +#, fuzzy +msgid "Epson PictureMate 240" +msgstr "Epson PictureMate" + +#: src/main/xmli18n-tmp.h:466 #, fuzzy -msgid "Epson PictureMate Pal" +msgid "Epson PictureMate 250" msgstr "Epson PictureMate" -#: src/main/xmli18n-tmp.h:425 +#: src/main/xmli18n-tmp.h:467 #, fuzzy -msgid "Epson PictureMate Snap" +msgid "Epson PictureMate 260" msgstr "Epson PictureMate" -#: src/main/xmli18n-tmp.h:426 +#: src/main/xmli18n-tmp.h:468 #, fuzzy -msgid "Epson PictureMate 200" +msgid "Epson PictureMate 270" msgstr "Epson PictureMate" -#: src/main/xmli18n-tmp.h:427 +#: src/main/xmli18n-tmp.h:469 #, fuzzy -msgid "Epson PictureMate 210" +msgid "Epson PictureMate 280" msgstr "Epson PictureMate" -#: src/main/xmli18n-tmp.h:428 +#: src/main/xmli18n-tmp.h:470 #, fuzzy -msgid "Epson PictureMate 240" +msgid "Epson PictureMate 290" msgstr "Epson PictureMate" -#: src/main/xmli18n-tmp.h:429 +#: src/main/xmli18n-tmp.h:471 #, fuzzy -msgid "Epson PictureMate 250" +msgid "Epson PictureMate 500" msgstr "Epson PictureMate" -#: src/main/xmli18n-tmp.h:430 +#: src/main/xmli18n-tmp.h:472 #, fuzzy -msgid "Epson PictureMate 280" +msgid "Epson PictureMate 2005" msgstr "Epson PictureMate" -#: src/main/xmli18n-tmp.h:431 +#: src/main/xmli18n-tmp.h:473 msgid "Epson CL 700" msgstr "Epson CL 700" -#: src/main/xmli18n-tmp.h:432 +#: src/main/xmli18n-tmp.h:474 msgid "Epson CL 750" msgstr "Epson CL 750" -#: src/main/xmli18n-tmp.h:433 +#: src/main/xmli18n-tmp.h:475 msgid "Epson CL 760" msgstr "Epson CL 760" -#: src/main/xmli18n-tmp.h:434 +#: src/main/xmli18n-tmp.h:476 msgid "Epson E 100" msgstr "Epson E 100" -#: src/main/xmli18n-tmp.h:435 +#: src/main/xmli18n-tmp.h:477 msgid "Epson E 150" msgstr "Epson E 150" -#: src/main/xmli18n-tmp.h:436 +#: src/main/xmli18n-tmp.h:478 msgid "Epson E 200" msgstr "Epson E 200" -#: src/main/xmli18n-tmp.h:437 +#: src/main/xmli18n-tmp.h:479 +#, fuzzy +msgid "Epson E 300" +msgstr "Epson E 100" + +#: src/main/xmli18n-tmp.h:480 +#, fuzzy +msgid "Epson E 500" +msgstr "Epson E 100" + +#: src/main/xmli18n-tmp.h:481 +#, fuzzy +msgid "Epson E 520" +msgstr "Epson E 150" + +#: src/main/xmli18n-tmp.h:482 +#, fuzzy +msgid "Epson E 700" +msgstr "Epson E 100" + +#: src/main/xmli18n-tmp.h:483 +#, fuzzy +msgid "Epson E 720" +msgstr "Epson E 200" + +#: src/main/xmli18n-tmp.h:484 msgid "Epson EM 900C" msgstr "Epson EM 900C" -#: src/main/xmli18n-tmp.h:438 +#: src/main/xmli18n-tmp.h:485 msgid "Epson EM 930C" msgstr "Epson EM 930C" -#: src/main/xmli18n-tmp.h:439 +#: src/main/xmli18n-tmp.h:486 msgid "Epson MC 2000" msgstr "Epson MC 2000" -#: src/main/xmli18n-tmp.h:440 +#: src/main/xmli18n-tmp.h:487 msgid "Epson MC 5000" msgstr "Epson MC 5000" -#: src/main/xmli18n-tmp.h:441 +#: src/main/xmli18n-tmp.h:488 msgid "Epson MC 7000" msgstr "Epson MC 7000" -#: src/main/xmli18n-tmp.h:442 +#: src/main/xmli18n-tmp.h:489 msgid "Epson MC 9000" msgstr "Epson MC 9000" -#: src/main/xmli18n-tmp.h:443 +#: src/main/xmli18n-tmp.h:490 msgid "Epson MC 10000" msgstr "Epson MC 10000" -#: src/main/xmli18n-tmp.h:444 +#: src/main/xmli18n-tmp.h:491 msgid "Epson MJ 930C" msgstr "Epson MJ 930C" -#: src/main/xmli18n-tmp.h:445 +#: src/main/xmli18n-tmp.h:492 msgid "Epson MJ 5100C" msgstr "Epson MJ 5100C" -#: src/main/xmli18n-tmp.h:446 +#: src/main/xmli18n-tmp.h:493 msgid "Epson MJ 6000C" msgstr "Epson MJ 6000C" -#: src/main/xmli18n-tmp.h:447 +#: src/main/xmli18n-tmp.h:494 msgid "Epson MJ 8000C" msgstr "Epson MJ 8000C" -#: src/main/xmli18n-tmp.h:448 +#: src/main/xmli18n-tmp.h:495 #, fuzzy msgid "Epson PM 670C" msgstr "Epson PM 700C" -#: src/main/xmli18n-tmp.h:449 +#: src/main/xmli18n-tmp.h:496 msgid "Epson PM 700C" msgstr "Epson PM 700C" -#: src/main/xmli18n-tmp.h:450 +#: src/main/xmli18n-tmp.h:497 msgid "Epson PM 730C" msgstr "Epson PM 730C" -#: src/main/xmli18n-tmp.h:451 +#: src/main/xmli18n-tmp.h:498 msgid "Epson PM 740C" msgstr "Epson PM 740C" -#: src/main/xmli18n-tmp.h:452 +#: src/main/xmli18n-tmp.h:499 msgid "Epson PM 750C" msgstr "Epson PM 750C" -#: src/main/xmli18n-tmp.h:453 +#: src/main/xmli18n-tmp.h:500 msgid "Epson PM 760C" msgstr "Epson PM 760C" -#: src/main/xmli18n-tmp.h:454 +#: src/main/xmli18n-tmp.h:501 msgid "Epson PM 770C" msgstr "Epson PM 770C" -#: src/main/xmli18n-tmp.h:455 +#: src/main/xmli18n-tmp.h:502 msgid "Epson PM 780C" msgstr "Epson PM 780C" -#: src/main/xmli18n-tmp.h:456 +#: src/main/xmli18n-tmp.h:503 msgid "Epson PM 790PT" msgstr "Epson PM 790PT" -#: src/main/xmli18n-tmp.h:457 +#: src/main/xmli18n-tmp.h:504 msgid "Epson PM 800C" msgstr "Epson PM 800C" -#: src/main/xmli18n-tmp.h:458 +#: src/main/xmli18n-tmp.h:505 msgid "Epson PM 850PT" msgstr "Epson PM 850PT" -#: src/main/xmli18n-tmp.h:459 +#: src/main/xmli18n-tmp.h:506 msgid "Epson PM 870C" msgstr "Epson PM 870C" -#: src/main/xmli18n-tmp.h:460 +#: src/main/xmli18n-tmp.h:507 msgid "Epson PM 880C" msgstr "Epson PM 880C" -#: src/main/xmli18n-tmp.h:461 +#: src/main/xmli18n-tmp.h:508 msgid "Epson PM 930C" msgstr "Epson PM 930C" -#: src/main/xmli18n-tmp.h:462 +#: src/main/xmli18n-tmp.h:509 msgid "Epson PM 940C" msgstr "Epson PM 940C" -#: src/main/xmli18n-tmp.h:463 +#: src/main/xmli18n-tmp.h:510 msgid "Epson PM 950C" msgstr "Epson PM 950C" -#: src/main/xmli18n-tmp.h:464 +#: src/main/xmli18n-tmp.h:511 msgid "Epson PM 970C" msgstr "Epson PM 970C" -#: src/main/xmli18n-tmp.h:465 +#: src/main/xmli18n-tmp.h:512 msgid "Epson PM 980C" msgstr "Epson PM 980C" -#: src/main/xmli18n-tmp.h:466 +#: src/main/xmli18n-tmp.h:513 msgid "Epson PM 2000C" msgstr "Epson PM 2000C" -#: src/main/xmli18n-tmp.h:467 +#: src/main/xmli18n-tmp.h:514 msgid "Epson PM 2200C" msgstr "Epson PM 2200C" -#: src/main/xmli18n-tmp.h:468 +#: src/main/xmli18n-tmp.h:515 msgid "Epson PM 3000C" msgstr "Epson PM 3000C" -#: src/main/xmli18n-tmp.h:469 +#: src/main/xmli18n-tmp.h:516 msgid "Epson PM 3300C" msgstr "Epson PM 3300C" -#: src/main/xmli18n-tmp.h:470 +#: src/main/xmli18n-tmp.h:517 msgid "Epson PM 3500C" msgstr "Epson PM 3500C" -#: src/main/xmli18n-tmp.h:471 +#: src/main/xmli18n-tmp.h:518 msgid "Epson PM 3700C" msgstr "Epson PM 3700C" -#: src/main/xmli18n-tmp.h:472 +#: src/main/xmli18n-tmp.h:519 msgid "Epson PM 4000PX" msgstr "Epson PM 4000PX" -#: src/main/xmli18n-tmp.h:473 +#: src/main/xmli18n-tmp.h:520 msgid "Epson PM 5000C" msgstr "Epson PM 5000C" -#: src/main/xmli18n-tmp.h:474 +#: src/main/xmli18n-tmp.h:521 msgid "Epson PM 7000C" msgstr "Epson PM 7000C" -#: src/main/xmli18n-tmp.h:475 +#: src/main/xmli18n-tmp.h:522 msgid "Epson PM 9000C" msgstr "Epson PM 9000C" -#: src/main/xmli18n-tmp.h:476 +#: src/main/xmli18n-tmp.h:523 msgid "Epson PM 10000" msgstr "Epson PM 10000" -#: src/main/xmli18n-tmp.h:477 +#: src/main/xmli18n-tmp.h:524 msgid "Epson PM A650" msgstr "Epson PM A650" -#: src/main/xmli18n-tmp.h:478 +#: src/main/xmli18n-tmp.h:525 msgid "Epson PM A750" msgstr "Epson PM A750" -#: src/main/xmli18n-tmp.h:479 +#: src/main/xmli18n-tmp.h:526 #, fuzzy msgid "Epson PM A820" msgstr "Epson PM A890" -#: src/main/xmli18n-tmp.h:480 +#: src/main/xmli18n-tmp.h:527 msgid "Epson PM A890" msgstr "Epson PM A890" -#: src/main/xmli18n-tmp.h:481 +#: src/main/xmli18n-tmp.h:528 msgid "Epson PM A900" msgstr "Epson PM A900" -#: src/main/xmli18n-tmp.h:482 +#: src/main/xmli18n-tmp.h:529 msgid "Epson PM A950" msgstr "Epson PM A950" -#: src/main/xmli18n-tmp.h:483 +#: src/main/xmli18n-tmp.h:530 msgid "Epson PM D600" msgstr "Epson PM D600" -#: src/main/xmli18n-tmp.h:484 +#: src/main/xmli18n-tmp.h:531 msgid "Epson PM D750" msgstr "Epson PM D750" -#: src/main/xmli18n-tmp.h:485 +#: src/main/xmli18n-tmp.h:532 msgid "Epson PM D770" msgstr "Epson PM D770" -#: src/main/xmli18n-tmp.h:486 +#: src/main/xmli18n-tmp.h:533 msgid "Epson PM D800" msgstr "Epson PM D800" -#: src/main/xmli18n-tmp.h:487 +#: src/main/xmli18n-tmp.h:534 #, fuzzy msgid "Epson PM D870" msgstr "Epson PM 870C" -#: src/main/xmli18n-tmp.h:488 +#: src/main/xmli18n-tmp.h:535 msgid "Epson PM D1000" msgstr "Epson PM D1000" -#: src/main/xmli18n-tmp.h:489 +#: src/main/xmli18n-tmp.h:536 msgid "Epson PM G700" msgstr "Epson PM G700" -#: src/main/xmli18n-tmp.h:490 +#: src/main/xmli18n-tmp.h:537 msgid "Epson PM G720" msgstr "Epson PM G720" -#: src/main/xmli18n-tmp.h:491 +#: src/main/xmli18n-tmp.h:538 msgid "Epson PM G730" msgstr "Epson PM G730" -#: src/main/xmli18n-tmp.h:492 +#: src/main/xmli18n-tmp.h:539 msgid "Epson PM G800" msgstr "Epson PM G800" -#: src/main/xmli18n-tmp.h:493 +#: src/main/xmli18n-tmp.h:540 msgid "Epson PM G820" msgstr "Epson PM G820" -#: src/main/xmli18n-tmp.h:494 +#: src/main/xmli18n-tmp.h:541 #, fuzzy msgid "Epson PM G850" msgstr "Epson PM G800" -#: src/main/xmli18n-tmp.h:495 +#: src/main/xmli18n-tmp.h:542 #, fuzzy msgid "Epson PM G4500" msgstr "Epson PM G700" -#: src/main/xmli18n-tmp.h:496 +#: src/main/xmli18n-tmp.h:543 msgid "Epson PX A650" msgstr "Epson PX A650" -#: src/main/xmli18n-tmp.h:497 +#: src/main/xmli18n-tmp.h:544 msgid "Epson PX G900" msgstr "Epson PX G900" -#: src/main/xmli18n-tmp.h:498 +#: src/main/xmli18n-tmp.h:545 msgid "Epson PX G920" msgstr "Epson PX G920" -#: src/main/xmli18n-tmp.h:499 +#: src/main/xmli18n-tmp.h:546 msgid "Epson PX G5000" msgstr "Epson PX G5000" -#: src/main/xmli18n-tmp.h:500 +#: src/main/xmli18n-tmp.h:547 msgid "Epson PX V500" msgstr "Epson PX V500" -#: src/main/xmli18n-tmp.h:501 +#: src/main/xmli18n-tmp.h:548 msgid "Epson PX V600" msgstr "Epson PX V600" -#: src/main/xmli18n-tmp.h:502 +#: src/main/xmli18n-tmp.h:549 msgid "Epson PX V630" msgstr "Epson PX V630" -#: src/main/xmli18n-tmp.h:503 +#: src/main/xmli18n-tmp.h:550 #, fuzzy msgid "Epson PX V780" msgstr "Epson PM 780C" -#: src/main/xmli18n-tmp.h:504 +#: src/main/xmli18n-tmp.h:551 msgid "Epson PX 5500" msgstr "Epson PX 5500" -#: src/main/xmli18n-tmp.h:505 +#: src/main/xmli18n-tmp.h:552 msgid "Epson PX 7000" msgstr "Epson PX 7000" -#: src/main/xmli18n-tmp.h:506 +#: src/main/xmli18n-tmp.h:553 msgid "Epson PX 9000" msgstr "Epson PX 9000" -#: src/main/xmli18n-tmp.h:507 +#: src/main/xmli18n-tmp.h:554 msgid "Apollo P-2100" msgstr "Apollo P-2100" -#: src/main/xmli18n-tmp.h:508 +#: src/main/xmli18n-tmp.h:555 msgid "Apollo P-2150" msgstr "Apollo P-2150" -#: src/main/xmli18n-tmp.h:509 +#: src/main/xmli18n-tmp.h:556 msgid "Apollo P-2200" msgstr "Apollo P-2200" -#: src/main/xmli18n-tmp.h:510 +#: src/main/xmli18n-tmp.h:557 msgid "Apollo P-2250" msgstr "Apollo P-2250" -#: src/main/xmli18n-tmp.h:511 +#: src/main/xmli18n-tmp.h:558 msgid "Apollo P-2500" msgstr "Apollo P-2500" -#: src/main/xmli18n-tmp.h:512 +#: src/main/xmli18n-tmp.h:559 msgid "Apollo P-2550" msgstr "Apollo P-2550" -#: src/main/xmli18n-tmp.h:513 +#: src/main/xmli18n-tmp.h:560 msgid "Apollo P-2600" msgstr "Apollo P-2600" -#: src/main/xmli18n-tmp.h:514 +#: src/main/xmli18n-tmp.h:561 msgid "Apollo P-2650" msgstr "Apollo P-2650" -#: src/main/xmli18n-tmp.h:515 +#: src/main/xmli18n-tmp.h:562 msgid "Apple Color StyleWriter 4100" msgstr "Apple Colour StyleWriter 4100" -#: src/main/xmli18n-tmp.h:516 +#: src/main/xmli18n-tmp.h:563 msgid "Apple Color StyleWriter 4500" msgstr "Apple Colour StyleWriter 4500" -#: src/main/xmli18n-tmp.h:517 +#: src/main/xmli18n-tmp.h:564 msgid "Apple Color StyleWriter 6500" msgstr "Apple Colour StyleWriter 6500" -#: src/main/xmli18n-tmp.h:518 +#: src/main/xmli18n-tmp.h:565 msgid "Apple LaserWriter Select 360" msgstr "Apple LaserWriter Select 360" -#: src/main/xmli18n-tmp.h:519 +#: src/main/xmli18n-tmp.h:566 msgid "Brother DCP-1200" msgstr "Brother DCP-1200" -#: src/main/xmli18n-tmp.h:520 +#: src/main/xmli18n-tmp.h:567 msgid "Brother HL-4Ve" msgstr "Brother HL-4Ve" -#: src/main/xmli18n-tmp.h:521 +#: src/main/xmli18n-tmp.h:568 msgid "Brother HL-10V" msgstr "Brother HL-10V" -#: src/main/xmli18n-tmp.h:522 +#: src/main/xmli18n-tmp.h:569 msgid "Brother HL-10h" msgstr "Brother HL-10h" -#: src/main/xmli18n-tmp.h:523 +#: src/main/xmli18n-tmp.h:570 msgid "Brother HL-630" msgstr "Brother HL-630" -#: src/main/xmli18n-tmp.h:524 +#: src/main/xmli18n-tmp.h:571 msgid "Brother HL-660" msgstr "Brother HL-660" -#: src/main/xmli18n-tmp.h:525 +#: src/main/xmli18n-tmp.h:572 msgid "Brother HL-760" msgstr "Brother HL-760" -#: src/main/xmli18n-tmp.h:526 +#: src/main/xmli18n-tmp.h:573 msgid "Brother HL-960" msgstr "Brother HL-960" -#: src/main/xmli18n-tmp.h:527 +#: src/main/xmli18n-tmp.h:574 msgid "Brother HL-1040" msgstr "Brother HL-1040" -#: src/main/xmli18n-tmp.h:528 +#: src/main/xmli18n-tmp.h:575 msgid "Brother HL-1050" msgstr "Brother HL-1050" -#: src/main/xmli18n-tmp.h:529 +#: src/main/xmli18n-tmp.h:576 msgid "Brother HL-1060" msgstr "Brother HL-1060" -#: src/main/xmli18n-tmp.h:530 +#: src/main/xmli18n-tmp.h:577 msgid "Brother HL-1070" msgstr "Brother HL-1070" -#: src/main/xmli18n-tmp.h:531 +#: src/main/xmli18n-tmp.h:578 msgid "Brother HL-1240" msgstr "Brother HL-1240" -#: src/main/xmli18n-tmp.h:532 +#: src/main/xmli18n-tmp.h:579 msgid "Brother HL-1250" msgstr "Brother HL-1250" -#: src/main/xmli18n-tmp.h:533 +#: src/main/xmli18n-tmp.h:580 msgid "Brother HL-1260" msgstr "Brother HL-1260" -#: src/main/xmli18n-tmp.h:534 +#: src/main/xmli18n-tmp.h:581 msgid "Brother HL-1270N" msgstr "Brother HL-1270N" -#: src/main/xmli18n-tmp.h:535 +#: src/main/xmli18n-tmp.h:582 msgid "Brother HL-1440" msgstr "Brother HL-1440" -#: src/main/xmli18n-tmp.h:536 +#: src/main/xmli18n-tmp.h:583 msgid "Brother HL-1660e" msgstr "Brother HL-1660e" -#: src/main/xmli18n-tmp.h:537 +#: src/main/xmli18n-tmp.h:584 msgid "Brother HL-2060" msgstr "Brother HL-2060" -#: src/main/xmli18n-tmp.h:538 +#: src/main/xmli18n-tmp.h:585 msgid "Brother MFC-6550MC" msgstr "Brother MFC-6550MC" -#: src/main/xmli18n-tmp.h:539 +#: src/main/xmli18n-tmp.h:586 msgid "Brother MFC-8300" msgstr "Brother MFC-8300" -#: src/main/xmli18n-tmp.h:540 +#: src/main/xmli18n-tmp.h:587 msgid "Brother MFC-9500" msgstr "Brother MFC-9500" -#: src/main/xmli18n-tmp.h:541 +#: src/main/xmli18n-tmp.h:588 msgid "Brother MFC-9600" msgstr "Brother MFC-9600" -#: src/main/xmli18n-tmp.h:542 +#: src/main/xmli18n-tmp.h:589 msgid "Canon GP 335" msgstr "Canon GP 335" -#: src/main/xmli18n-tmp.h:543 +#: src/main/xmli18n-tmp.h:590 msgid "Canon LBP-4sx" msgstr "Canon LBP-4sx" -#: src/main/xmli18n-tmp.h:544 +#: src/main/xmli18n-tmp.h:591 msgid "Canon LBP-430" msgstr "Canon LBP-430" -#: src/main/xmli18n-tmp.h:545 +#: src/main/xmli18n-tmp.h:592 msgid "Canon LBP-1000" msgstr "Canon LBP-1000" -#: src/main/xmli18n-tmp.h:546 +#: src/main/xmli18n-tmp.h:593 msgid "Canon LBP-1260" msgstr "Canon LBP-1260" -#: src/main/xmli18n-tmp.h:547 +#: src/main/xmli18n-tmp.h:594 msgid "Canon LBP-1760" msgstr "Canon LBP-1760" -#: src/main/xmli18n-tmp.h:548 +#: src/main/xmli18n-tmp.h:595 msgid "Canon imageRunner 330s" msgstr "Canon imageRunner 330s" -#: src/main/xmli18n-tmp.h:549 +#: src/main/xmli18n-tmp.h:596 msgid "Citizen ProJet II" msgstr "Citizen ProJet II" -#: src/main/xmli18n-tmp.h:550 +#: src/main/xmli18n-tmp.h:597 msgid "DEC 1800" msgstr "DEC 1800" -#: src/main/xmli18n-tmp.h:551 +#: src/main/xmli18n-tmp.h:598 msgid "DEC LN17" msgstr "DEC LN17" -#: src/main/xmli18n-tmp.h:552 +#: src/main/xmli18n-tmp.h:599 msgid "Epson ActionLaser 1100" msgstr "Epson ActionLaser 1100" -#: src/main/xmli18n-tmp.h:553 +#: src/main/xmli18n-tmp.h:600 msgid "Epson ActionLaser II" msgstr "Epson ActionLaser II" -#: src/main/xmli18n-tmp.h:554 +#: src/main/xmli18n-tmp.h:601 msgid "Epson AcuLaser C2000" msgstr "Epson AcuLaser C2000" -#: src/main/xmli18n-tmp.h:555 +#: src/main/xmli18n-tmp.h:602 msgid "Epson AcuLaser C2000PS" msgstr "Epson AcuLaser C2000PS" -#: src/main/xmli18n-tmp.h:556 +#: src/main/xmli18n-tmp.h:603 msgid "Epson AcuLaser C8500" msgstr "Epson AcuLaser C8500" -#: src/main/xmli18n-tmp.h:557 +#: src/main/xmli18n-tmp.h:604 msgid "Epson AcuLaser C8500PS" msgstr "Epson AcuLaser C8500PS" -#: src/main/xmli18n-tmp.h:558 +#: src/main/xmli18n-tmp.h:605 msgid "Epson AcuLaser C8600" msgstr "Epson AcuLaser C8600" -#: src/main/xmli18n-tmp.h:559 +#: src/main/xmli18n-tmp.h:606 msgid "Epson AcuLaser C8600PS" msgstr "Epson AcuLaser C8600PS" -#: src/main/xmli18n-tmp.h:560 +#: src/main/xmli18n-tmp.h:607 msgid "Epson EPL-5200" msgstr "Epson EPL-5200" -#: src/main/xmli18n-tmp.h:561 +#: src/main/xmli18n-tmp.h:608 msgid "Epson EPL-5200+" msgstr "Epson EPL-5200+" -#: src/main/xmli18n-tmp.h:562 +#: src/main/xmli18n-tmp.h:609 msgid "Epson EPL-5700" msgstr "Epson EPL-5700" -#: src/main/xmli18n-tmp.h:563 +#: src/main/xmli18n-tmp.h:610 msgid "Epson EPL-5700PS" msgstr "Epson EPL-5700PS" -#: src/main/xmli18n-tmp.h:564 +#: src/main/xmli18n-tmp.h:611 msgid "Epson EPL-5800" msgstr "Epson EPL-5800" -#: src/main/xmli18n-tmp.h:565 +#: src/main/xmli18n-tmp.h:612 msgid "Epson EPL-5800PS" msgstr "Epson EPL-5800PS" -#: src/main/xmli18n-tmp.h:566 +#: src/main/xmli18n-tmp.h:613 msgid "Epson EPL-5900" msgstr "Epson EPL-5900" -#: src/main/xmli18n-tmp.h:567 +#: src/main/xmli18n-tmp.h:614 msgid "Epson EPL-5900PS" msgstr "Epson EPL-5900PS" -#: src/main/xmli18n-tmp.h:568 +#: src/main/xmli18n-tmp.h:615 msgid "Epson EPL-6100" msgstr "Epson EPL-6100" -#: src/main/xmli18n-tmp.h:569 +#: src/main/xmli18n-tmp.h:616 msgid "Epson EPL-6100PS" msgstr "Epson EPL-6100PS" -#: src/main/xmli18n-tmp.h:570 +#: src/main/xmli18n-tmp.h:617 msgid "Epson EPL-7100" msgstr "Epson EPL-7100" -#: src/main/xmli18n-tmp.h:571 +#: src/main/xmli18n-tmp.h:618 msgid "Fujitsu PrintPartner 10V" msgstr "Fujitsu PrintPartner 10V" -#: src/main/xmli18n-tmp.h:572 +#: src/main/xmli18n-tmp.h:619 msgid "Fujitsu PrintPartner 16DV" msgstr "Fujitsu PrintPartner 16DV" -#: src/main/xmli18n-tmp.h:573 +#: src/main/xmli18n-tmp.h:620 msgid "Fujitsu PrintPartner 20W" msgstr "Fujitsu PrintPartner 20W" -#: src/main/xmli18n-tmp.h:574 +#: src/main/xmli18n-tmp.h:621 msgid "Fujitsu PrintPartner 8000" msgstr "Fujitsu PrintPartner 8000" -#: src/main/xmli18n-tmp.h:575 +#: src/main/xmli18n-tmp.h:622 msgid "Generic PCL 4 Printer" msgstr "Generic PCL 4 Printer" -#: src/main/xmli18n-tmp.h:576 +#: src/main/xmli18n-tmp.h:623 +#, fuzzy +msgid "Generic PCL 4 LF Printer" +msgstr "Generic PCL 4 Printer" + +#: src/main/xmli18n-tmp.h:624 msgid "Generic PCL 5 Printer" msgstr "Generic PCL 5 Printer" -#: src/main/xmli18n-tmp.h:577 +#: src/main/xmli18n-tmp.h:625 +#, fuzzy +msgid "Generic PCL 5 LF Printer" +msgstr "Generic PCL 5 Printer" + +#: src/main/xmli18n-tmp.h:626 msgid "Generic PCL 5c Printer" msgstr "Generic PCL 5c Printer" -#: src/main/xmli18n-tmp.h:578 +#: src/main/xmli18n-tmp.h:627 +#, fuzzy +msgid "Generic PCL 5c LF Printer" +msgstr "Generic PCL 5c Printer" + +#: src/main/xmli18n-tmp.h:628 msgid "Generic PCL 5e Printer" msgstr "Generic PCL 5e Printer" -#: src/main/xmli18n-tmp.h:579 +#: src/main/xmli18n-tmp.h:629 +#, fuzzy +msgid "Generic PCL 5e LF Printer" +msgstr "Generic PCL 5e Printer" + +#: src/main/xmli18n-tmp.h:630 msgid "Generic PCL 6/PCL XL Printer" msgstr "Generic PCL 6/PCL XL Printer" -#: src/main/xmli18n-tmp.h:580 +#: src/main/xmli18n-tmp.h:631 +#, fuzzy +msgid "Generic PCL 6/PCL XL LF Printer" +msgstr "Generic PCL 6/PCL XL Printer" + +#: src/main/xmli18n-tmp.h:632 msgid "HP Business Inkjet 2200" msgstr "HP Business Inkjet 2200" -#: src/main/xmli18n-tmp.h:581 +#: src/main/xmli18n-tmp.h:633 msgid "HP Business Inkjet 2230" msgstr "HP Business Inkjet 2230" -#: src/main/xmli18n-tmp.h:582 +#: src/main/xmli18n-tmp.h:634 msgid "HP Business Inkjet 2250" msgstr "HP Business Inkjet 2250" -#: src/main/xmli18n-tmp.h:583 +#: src/main/xmli18n-tmp.h:635 msgid "HP Business Inkjet 2250TN" msgstr "HP Business Inkjet 2250TN" -#: src/main/xmli18n-tmp.h:584 +#: src/main/xmli18n-tmp.h:636 msgid "HP Business Inkjet 2280" msgstr "HP Business Inkjet 2280" -#: src/main/xmli18n-tmp.h:585 +#: src/main/xmli18n-tmp.h:637 msgid "HP Color Inkjet Printer CP1160" msgstr "HP Color Inkjet Printer CP1160" -#: src/main/xmli18n-tmp.h:586 +#: src/main/xmli18n-tmp.h:638 msgid "HP Color Inkjet Printer CP1700" msgstr "HP Color Inkjet Printer CP1700" -#: src/main/xmli18n-tmp.h:587 +#: src/main/xmli18n-tmp.h:639 msgid "HP Color LaserJet 2500" msgstr "HP Color LaserJet 2500" -#: src/main/xmli18n-tmp.h:588 +#: src/main/xmli18n-tmp.h:640 msgid "HP Color LaserJet 4500" msgstr "HP Color LaserJet 4500" -#: src/main/xmli18n-tmp.h:589 +#: src/main/xmli18n-tmp.h:641 msgid "HP Color LaserJet 4550" msgstr "HP Color LaserJet 4550" -#: src/main/xmli18n-tmp.h:590 +#: src/main/xmli18n-tmp.h:642 msgid "HP Color LaserJet 4600" msgstr "HP Color LaserJet 4600" -#: src/main/xmli18n-tmp.h:591 +#: src/main/xmli18n-tmp.h:643 msgid "HP Color LaserJet 5" msgstr "HP Color LaserJet 5" -#: src/main/xmli18n-tmp.h:592 +#: src/main/xmli18n-tmp.h:644 msgid "HP Color LaserJet 5000" msgstr "HP Color LaserJet 5000" -#: src/main/xmli18n-tmp.h:593 +#: src/main/xmli18n-tmp.h:645 msgid "HP Color LaserJet 5500" msgstr "HP Color LaserJet 5500" -#: src/main/xmli18n-tmp.h:594 +#: src/main/xmli18n-tmp.h:646 msgid "HP Color LaserJet 8550GN" msgstr "HP Color LaserJet 8550GN" -#: src/main/xmli18n-tmp.h:595 +#: src/main/xmli18n-tmp.h:647 msgid "HP DesignJet 230" msgstr "HP DesignJet 230" -#: src/main/xmli18n-tmp.h:596 +#: src/main/xmli18n-tmp.h:648 msgid "HP DesignJet 250C" msgstr "HP DesignJet 250C" -#: src/main/xmli18n-tmp.h:597 +#: src/main/xmli18n-tmp.h:649 msgid "HP DesignJet 430" msgstr "HP DesignJet 430" -#: src/main/xmli18n-tmp.h:598 +#: src/main/xmli18n-tmp.h:650 msgid "HP DesignJet 450C" msgstr "HP DesignJet 450C" -#: src/main/xmli18n-tmp.h:599 +#: src/main/xmli18n-tmp.h:651 msgid "HP DesignJet 455CA" msgstr "HP DesignJet 455CA" -#: src/main/xmli18n-tmp.h:600 +#: src/main/xmli18n-tmp.h:652 msgid "HP DesignJet 488CA" msgstr "HP DesignJet 488CA" -#: src/main/xmli18n-tmp.h:601 +#: src/main/xmli18n-tmp.h:653 msgid "HP DesignJet 700" msgstr "HP DesignJet 700" -#: src/main/xmli18n-tmp.h:602 +#: src/main/xmli18n-tmp.h:654 msgid "HP DesignJet 750C Plus" msgstr "HP DesignJet 750C Plus" -#: src/main/xmli18n-tmp.h:603 +#: src/main/xmli18n-tmp.h:655 msgid "HP DesignJet 750C" msgstr "HP DesignJet 750C" -#: src/main/xmli18n-tmp.h:604 +#: src/main/xmli18n-tmp.h:656 msgid "HP DesignJet 2500CP" msgstr "HP DesignJet 2500CP" -#: src/main/xmli18n-tmp.h:605 +#: src/main/xmli18n-tmp.h:657 msgid "HP DesignJet 3500CP" msgstr "HP DesignJet 3500CP" -#: src/main/xmli18n-tmp.h:606 +#: src/main/xmli18n-tmp.h:658 msgid "HP DesignJet ColorPro CAD" msgstr "HP DesignJet ColorPro CAD" -#: src/main/xmli18n-tmp.h:607 +#: src/main/xmli18n-tmp.h:659 msgid "HP DeskJet 400" msgstr "HP DeskJet 400" -#: src/main/xmli18n-tmp.h:608 +#: src/main/xmli18n-tmp.h:660 msgid "HP DeskJet 420C" msgstr "HP DeskJet 420C" -#: src/main/xmli18n-tmp.h:609 +#: src/main/xmli18n-tmp.h:661 msgid "HP DeskJet 450" msgstr "HP DeskJet 450" -#: src/main/xmli18n-tmp.h:610 +#: src/main/xmli18n-tmp.h:662 msgid "HP DeskJet 500" msgstr "HP DeskJet 500" -#: src/main/xmli18n-tmp.h:611 +#: src/main/xmli18n-tmp.h:663 msgid "HP DeskJet 500C" msgstr "HP DeskJet 500C" -#: src/main/xmli18n-tmp.h:612 +#: src/main/xmli18n-tmp.h:664 msgid "HP DeskJet 505J Plus" msgstr "HP DeskJet 505J Plus" -#: src/main/xmli18n-tmp.h:613 +#: src/main/xmli18n-tmp.h:665 msgid "HP DeskJet 510" msgstr "HP DeskJet 510" -#: src/main/xmli18n-tmp.h:614 +#: src/main/xmli18n-tmp.h:666 msgid "HP DeskJet 520" msgstr "HP DeskJet 520" -#: src/main/xmli18n-tmp.h:615 +#: src/main/xmli18n-tmp.h:667 msgid "HP DeskJet 540C" msgstr "HP DeskJet 540C" -#: src/main/xmli18n-tmp.h:616 +#: src/main/xmli18n-tmp.h:668 msgid "HP DeskJet 550C" msgstr "HP DeskJet 550C" -#: src/main/xmli18n-tmp.h:617 +#: src/main/xmli18n-tmp.h:669 msgid "HP DeskJet 5550" msgstr "HP DeskJet 5550" -#: src/main/xmli18n-tmp.h:618 +#: src/main/xmli18n-tmp.h:670 msgid "HP DeskJet 5551" msgstr "HP DeskJet 5551" -#: src/main/xmli18n-tmp.h:619 +#: src/main/xmli18n-tmp.h:671 msgid "HP DeskJet 560C" msgstr "HP DeskJet 560C" -#: src/main/xmli18n-tmp.h:620 +#: src/main/xmli18n-tmp.h:672 msgid "HP DeskJet 600" msgstr "HP DeskJet 600" -#: src/main/xmli18n-tmp.h:621 +#: src/main/xmli18n-tmp.h:673 msgid "HP DeskJet 600C" msgstr "HP DeskJet 600C" -#: src/main/xmli18n-tmp.h:622 +#: src/main/xmli18n-tmp.h:674 msgid "HP DeskJet 610C" msgstr "HP DeskJet 610C" -#: src/main/xmli18n-tmp.h:623 +#: src/main/xmli18n-tmp.h:675 msgid "HP DeskJet 610CL" msgstr "HP DeskJet 610CL" -#: src/main/xmli18n-tmp.h:624 +#: src/main/xmli18n-tmp.h:676 msgid "HP DeskJet 6122" msgstr "HP DeskJet 6122" -#: src/main/xmli18n-tmp.h:625 +#: src/main/xmli18n-tmp.h:677 msgid "HP DeskJet 6127" msgstr "HP DeskJet 6127" -#: src/main/xmli18n-tmp.h:626 +#: src/main/xmli18n-tmp.h:678 msgid "HP DeskJet 612C" msgstr "HP DeskJet 612C" -#: src/main/xmli18n-tmp.h:627 +#: src/main/xmli18n-tmp.h:679 msgid "HP DeskJet 640C" msgstr "HP DeskJet 640C" -#: src/main/xmli18n-tmp.h:628 +#: src/main/xmli18n-tmp.h:680 msgid "HP DeskJet 648C" msgstr "HP DeskJet 648C" -#: src/main/xmli18n-tmp.h:629 +#: src/main/xmli18n-tmp.h:681 msgid "HP DeskJet 660C" msgstr "HP DeskJet 660C" -#: src/main/xmli18n-tmp.h:630 +#: src/main/xmli18n-tmp.h:682 msgid "HP DeskJet 670C" msgstr "HP DeskJet 670C" -#: src/main/xmli18n-tmp.h:631 +#: src/main/xmli18n-tmp.h:683 msgid "HP DeskJet 670TV" msgstr "HP DeskJet 670TV" -#: src/main/xmli18n-tmp.h:632 +#: src/main/xmli18n-tmp.h:684 msgid "HP DeskJet 672C" msgstr "HP DeskJet 672C" -#: src/main/xmli18n-tmp.h:633 +#: src/main/xmli18n-tmp.h:685 msgid "HP DeskJet 680C" msgstr "HP DeskJet 680C" -#: src/main/xmli18n-tmp.h:634 +#: src/main/xmli18n-tmp.h:686 msgid "HP DeskJet 682C" msgstr "HP DeskJet 682C" -#: src/main/xmli18n-tmp.h:635 +#: src/main/xmli18n-tmp.h:687 msgid "HP DeskJet 690C" msgstr "HP DeskJet 690C" -#: src/main/xmli18n-tmp.h:636 +#: src/main/xmli18n-tmp.h:688 msgid "HP DeskJet 692C" msgstr "HP DeskJet 692C" -#: src/main/xmli18n-tmp.h:637 +#: src/main/xmli18n-tmp.h:689 msgid "HP DeskJet 693C" msgstr "HP DeskJet 693C" -#: src/main/xmli18n-tmp.h:638 +#: src/main/xmli18n-tmp.h:690 msgid "HP DeskJet 694C" msgstr "HP DeskJet 694C" -#: src/main/xmli18n-tmp.h:639 +#: src/main/xmli18n-tmp.h:691 msgid "HP DeskJet 695C" msgstr "HP DeskJet 695C" -#: src/main/xmli18n-tmp.h:640 +#: src/main/xmli18n-tmp.h:692 msgid "HP DeskJet 697C" msgstr "HP DeskJet 697C" -#: src/main/xmli18n-tmp.h:641 +#: src/main/xmli18n-tmp.h:693 msgid "HP DeskJet 810C" msgstr "HP DeskJet 810C" -#: src/main/xmli18n-tmp.h:642 +#: src/main/xmli18n-tmp.h:694 msgid "HP DeskJet 812C" msgstr "HP DeskJet 812C" -#: src/main/xmli18n-tmp.h:643 +#: src/main/xmli18n-tmp.h:695 msgid "HP DeskJet 815C" msgstr "HP DeskJet 815C" -#: src/main/xmli18n-tmp.h:644 +#: src/main/xmli18n-tmp.h:696 msgid "HP DeskJet 816C" msgstr "HP DeskJet 816C" -#: src/main/xmli18n-tmp.h:645 +#: src/main/xmli18n-tmp.h:697 msgid "HP DeskJet 825C" msgstr "HP DeskJet 825C" -#: src/main/xmli18n-tmp.h:646 +#: src/main/xmli18n-tmp.h:698 msgid "HP DeskJet 830C" msgstr "HP DeskJet 830C" -#: src/main/xmli18n-tmp.h:647 +#: src/main/xmli18n-tmp.h:699 msgid "HP DeskJet 832C" msgstr "HP DeskJet 832C" -#: src/main/xmli18n-tmp.h:648 +#: src/main/xmli18n-tmp.h:700 msgid "HP DeskJet 840C" msgstr "HP DeskJet 840C" -#: src/main/xmli18n-tmp.h:649 +#: src/main/xmli18n-tmp.h:701 msgid "HP DeskJet 841C" msgstr "HP DeskJet 841C" -#: src/main/xmli18n-tmp.h:650 +#: src/main/xmli18n-tmp.h:702 msgid "HP DeskJet 842C" msgstr "HP DeskJet 842C" -#: src/main/xmli18n-tmp.h:651 +#: src/main/xmli18n-tmp.h:703 msgid "HP DeskJet 843C" msgstr "HP DeskJet 843C" -#: src/main/xmli18n-tmp.h:652 +#: src/main/xmli18n-tmp.h:704 msgid "HP DeskJet 845C" msgstr "HP DeskJet 845C" -#: src/main/xmli18n-tmp.h:653 +#: src/main/xmli18n-tmp.h:705 msgid "HP DeskJet 850C" msgstr "HP DeskJet 850C" -#: src/main/xmli18n-tmp.h:654 +#: src/main/xmli18n-tmp.h:706 msgid "HP DeskJet 855C" msgstr "HP DeskJet 855C" -#: src/main/xmli18n-tmp.h:655 +#: src/main/xmli18n-tmp.h:707 msgid "HP DeskJet 870C" msgstr "HP DeskJet 870C" -#: src/main/xmli18n-tmp.h:656 +#: src/main/xmli18n-tmp.h:708 msgid "HP DeskJet 880C" msgstr "HP DeskJet 880C" -#: src/main/xmli18n-tmp.h:657 +#: src/main/xmli18n-tmp.h:709 msgid "HP DeskJet 882C" msgstr "HP DeskJet 882C" -#: src/main/xmli18n-tmp.h:658 +#: src/main/xmli18n-tmp.h:710 msgid "HP DeskJet 890C" msgstr "HP DeskJet 890C" -#: src/main/xmli18n-tmp.h:659 +#: src/main/xmli18n-tmp.h:711 msgid "HP DeskJet 895C" msgstr "HP DeskJet 895C" -#: src/main/xmli18n-tmp.h:660 +#: src/main/xmli18n-tmp.h:712 msgid "HP DeskJet 916C" msgstr "HP DeskJet 916C" -#: src/main/xmli18n-tmp.h:661 +#: src/main/xmli18n-tmp.h:713 msgid "HP DeskJet 920C" msgstr "HP DeskJet 920C" -#: src/main/xmli18n-tmp.h:662 +#: src/main/xmli18n-tmp.h:714 msgid "HP DeskJet 9300" msgstr "HP DeskJet 9300" -#: src/main/xmli18n-tmp.h:663 +#: src/main/xmli18n-tmp.h:715 msgid "HP DeskJet 930C" msgstr "HP DeskJet 930C" -#: src/main/xmli18n-tmp.h:664 +#: src/main/xmli18n-tmp.h:716 msgid "HP DeskJet 932C" msgstr "HP DeskJet 932C" -#: src/main/xmli18n-tmp.h:665 +#: src/main/xmli18n-tmp.h:717 msgid "HP DeskJet 933C" msgstr "HP DeskJet 933C" -#: src/main/xmli18n-tmp.h:666 +#: src/main/xmli18n-tmp.h:718 msgid "HP DeskJet 934C" msgstr "HP DeskJet 934C" -#: src/main/xmli18n-tmp.h:667 +#: src/main/xmli18n-tmp.h:719 msgid "HP DeskJet 935C" msgstr "HP DeskJet 935C" -#: src/main/xmli18n-tmp.h:668 +#: src/main/xmli18n-tmp.h:720 msgid "HP DeskJet 940C" msgstr "HP DeskJet 940C" -#: src/main/xmli18n-tmp.h:669 +#: src/main/xmli18n-tmp.h:721 msgid "HP DeskJet 948C" msgstr "HP DeskJet 948C" -#: src/main/xmli18n-tmp.h:670 +#: src/main/xmli18n-tmp.h:722 msgid "HP DeskJet 950C" msgstr "HP DeskJet 950C" -#: src/main/xmli18n-tmp.h:671 +#: src/main/xmli18n-tmp.h:723 msgid "HP DeskJet 952C" msgstr "HP DeskJet 952C" -#: src/main/xmli18n-tmp.h:672 +#: src/main/xmli18n-tmp.h:724 msgid "HP DeskJet 955C" msgstr "HP DeskJet 955C" -#: src/main/xmli18n-tmp.h:673 +#: src/main/xmli18n-tmp.h:725 msgid "HP DeskJet 957C" msgstr "HP DeskJet 957C" -#: src/main/xmli18n-tmp.h:674 +#: src/main/xmli18n-tmp.h:726 msgid "HP DeskJet 959C" msgstr "HP DeskJet 959C" -#: src/main/xmli18n-tmp.h:675 +#: src/main/xmli18n-tmp.h:727 msgid "HP DeskJet 960C" msgstr "HP DeskJet 960C" -#: src/main/xmli18n-tmp.h:676 +#: src/main/xmli18n-tmp.h:728 msgid "HP DeskJet 970C" msgstr "HP DeskJet 970C" -#: src/main/xmli18n-tmp.h:677 +#: src/main/xmli18n-tmp.h:729 msgid "HP DeskJet 975C" msgstr "HP DeskJet 975C" -#: src/main/xmli18n-tmp.h:678 +#: src/main/xmli18n-tmp.h:730 msgid "HP DeskJet 980C" msgstr "HP DeskJet 980C" -#: src/main/xmli18n-tmp.h:679 +#: src/main/xmli18n-tmp.h:731 msgid "HP DeskJet 990C" msgstr "HP DeskJet 990C" -#: src/main/xmli18n-tmp.h:680 +#: src/main/xmli18n-tmp.h:732 msgid "HP DeskJet 995C" msgstr "HP DeskJet 995C" -#: src/main/xmli18n-tmp.h:681 +#: src/main/xmli18n-tmp.h:733 msgid "HP DeskJet 1100C" msgstr "HP DeskJet 1100C" -#: src/main/xmli18n-tmp.h:682 +#: src/main/xmli18n-tmp.h:734 msgid "HP DeskJet 1120C" msgstr "HP DeskJet 1120C" -#: src/main/xmli18n-tmp.h:683 +#: src/main/xmli18n-tmp.h:735 msgid "HP DeskJet 1125C" msgstr "HP DeskJet 1125C" -#: src/main/xmli18n-tmp.h:684 +#: src/main/xmli18n-tmp.h:736 msgid "HP DeskJet 1200C" msgstr "HP DeskJet 1200C" -#: src/main/xmli18n-tmp.h:685 +#: src/main/xmli18n-tmp.h:737 msgid "HP DeskJet 1220C" msgstr "HP DeskJet 1220C" -#: src/main/xmli18n-tmp.h:686 +#: src/main/xmli18n-tmp.h:738 msgid "HP DeskJet 1600C" msgstr "HP DeskJet 1600C" -#: src/main/xmli18n-tmp.h:687 +#: src/main/xmli18n-tmp.h:739 msgid "HP DeskJet 1600CM" msgstr "HP DeskJet 1600CM" -#: src/main/xmli18n-tmp.h:688 +#: src/main/xmli18n-tmp.h:740 msgid "HP DeskJet 2000" msgstr "HP DeskJet 2000" -#: src/main/xmli18n-tmp.h:689 +#: src/main/xmli18n-tmp.h:741 msgid "HP DeskJet 2500" msgstr "HP DeskJet 2500" -#: src/main/xmli18n-tmp.h:690 +#: src/main/xmli18n-tmp.h:742 msgid "HP DeskJet 2500CM" msgstr "HP DeskJet 2500CM" -#: src/main/xmli18n-tmp.h:691 +#: src/main/xmli18n-tmp.h:743 msgid "HP DeskJet 340C" msgstr "HP DeskJet 340C" -#: src/main/xmli18n-tmp.h:692 +#: src/main/xmli18n-tmp.h:744 msgid "HP DeskJet 3810" msgstr "HP DeskJet 3810" -#: src/main/xmli18n-tmp.h:693 +#: src/main/xmli18n-tmp.h:745 msgid "HP DeskJet 3816" msgstr "HP DeskJet 3816" -#: src/main/xmli18n-tmp.h:694 +#: src/main/xmli18n-tmp.h:746 msgid "HP DeskJet 3820" msgstr "HP DeskJet 3820" -#: src/main/xmli18n-tmp.h:695 +#: src/main/xmli18n-tmp.h:747 msgid "HP DeskJet 3822" msgstr "HP DeskJet 3822" -#: src/main/xmli18n-tmp.h:696 +#: src/main/xmli18n-tmp.h:748 msgid "HP LaserJet 2" msgstr "HP LaserJet 2" -#: src/main/xmli18n-tmp.h:697 +#: src/main/xmli18n-tmp.h:749 msgid "HP LaserJet 2D" msgstr "HP LaserJet 2D" -#: src/main/xmli18n-tmp.h:698 +#: src/main/xmli18n-tmp.h:750 msgid "HP LaserJet 2P Plus" msgstr "HP LaserJet 2P Plus" -#: src/main/xmli18n-tmp.h:699 +#: src/main/xmli18n-tmp.h:751 msgid "HP LaserJet 2P" msgstr "HP LaserJet 2P" -#: src/main/xmli18n-tmp.h:700 +#: src/main/xmli18n-tmp.h:752 msgid "HP LaserJet 3" msgstr "HP LaserJet 3" -#: src/main/xmli18n-tmp.h:701 +#: src/main/xmli18n-tmp.h:753 msgid "HP LaserJet 3D" msgstr "HP LaserJet 3D" -#: src/main/xmli18n-tmp.h:702 +#: src/main/xmli18n-tmp.h:754 msgid "HP LaserJet 3P w/ PCL5" msgstr "HP LaserJet 3P w/ PCL5" -#: src/main/xmli18n-tmp.h:703 +#: src/main/xmli18n-tmp.h:755 msgid "HP LaserJet 3P w/PS" msgstr "HP LaserJet 3P w/PS" -#: src/main/xmli18n-tmp.h:704 +#: src/main/xmli18n-tmp.h:756 msgid "HP LaserJet 4 Plus" msgstr "HP LaserJet 4 Plus" -#: src/main/xmli18n-tmp.h:705 +#: src/main/xmli18n-tmp.h:757 msgid "HP LaserJet 4" msgstr "HP LaserJet 4" -#: src/main/xmli18n-tmp.h:706 +#: src/main/xmli18n-tmp.h:758 msgid "HP LaserJet 4L" msgstr "HP LaserJet 4L" -#: src/main/xmli18n-tmp.h:707 +#: src/main/xmli18n-tmp.h:759 msgid "HP LaserJet 4M" msgstr "HP LaserJet 4M" -#: src/main/xmli18n-tmp.h:708 +#: src/main/xmli18n-tmp.h:760 msgid "HP LaserJet 4ML" msgstr "HP LaserJet 4ML" -#: src/main/xmli18n-tmp.h:709 +#: src/main/xmli18n-tmp.h:761 msgid "HP LaserJet 4P" msgstr "HP LaserJet 4P" -#: src/main/xmli18n-tmp.h:710 +#: src/main/xmli18n-tmp.h:762 msgid "HP LaserJet 4Si" msgstr "HP LaserJet 4Si" -#: src/main/xmli18n-tmp.h:711 +#: src/main/xmli18n-tmp.h:763 msgid "HP LaserJet 4V" msgstr "HP LaserJet 4V" -#: src/main/xmli18n-tmp.h:712 +#: src/main/xmli18n-tmp.h:764 msgid "HP LaserJet 5" msgstr "HP LaserJet 5" -#: src/main/xmli18n-tmp.h:713 +#: src/main/xmli18n-tmp.h:765 msgid "HP LaserJet 5L" msgstr "HP LaserJet 5L" -#: src/main/xmli18n-tmp.h:714 +#: src/main/xmli18n-tmp.h:766 msgid "HP LaserJet 5M" msgstr "HP LaserJet 5M" -#: src/main/xmli18n-tmp.h:715 +#: src/main/xmli18n-tmp.h:767 msgid "HP LaserJet 5MP" msgstr "HP LaserJet 5MP" -#: src/main/xmli18n-tmp.h:716 +#: src/main/xmli18n-tmp.h:768 msgid "HP LaserJet 5P" msgstr "HP LaserJet 5P" -#: src/main/xmli18n-tmp.h:717 +#: src/main/xmli18n-tmp.h:769 msgid "HP LaserJet 5Si" msgstr "HP LaserJet 5Si" -#: src/main/xmli18n-tmp.h:718 +#: src/main/xmli18n-tmp.h:770 msgid "HP LaserJet 6" msgstr "HP LaserJet 6" -#: src/main/xmli18n-tmp.h:719 +#: src/main/xmli18n-tmp.h:771 msgid "HP LaserJet 6L" msgstr "HP LaserJet 6L" -#: src/main/xmli18n-tmp.h:720 +#: src/main/xmli18n-tmp.h:772 msgid "HP LaserJet 6MP" msgstr "HP LaserJet 6MP" -#: src/main/xmli18n-tmp.h:721 +#: src/main/xmli18n-tmp.h:773 msgid "HP LaserJet 6P" msgstr "HP LaserJet 6P" -#: src/main/xmli18n-tmp.h:722 +#: src/main/xmli18n-tmp.h:774 msgid "HP LaserJet 1010" msgstr "HP LaserJet 1010" -#: src/main/xmli18n-tmp.h:723 +#: src/main/xmli18n-tmp.h:775 msgid "HP LaserJet 1012" msgstr "HP LaserJet 1012" -#: src/main/xmli18n-tmp.h:724 +#: src/main/xmli18n-tmp.h:776 msgid "HP LaserJet 1015" msgstr "HP LaserJet 1015" -#: src/main/xmli18n-tmp.h:725 +#: src/main/xmli18n-tmp.h:777 #, fuzzy msgid "HP LaserJet 1022" msgstr "HP LaserJet 1012" -#: src/main/xmli18n-tmp.h:726 +#: src/main/xmli18n-tmp.h:778 msgid "HP LaserJet 1100" msgstr "HP LaserJet 1100" -#: src/main/xmli18n-tmp.h:727 +#: src/main/xmli18n-tmp.h:779 msgid "HP LaserJet 1100A" msgstr "HP LaserJet 1100A" -#: src/main/xmli18n-tmp.h:728 +#: src/main/xmli18n-tmp.h:780 msgid "HP LaserJet 1150" msgstr "HP LaserJet 1150" -#: src/main/xmli18n-tmp.h:729 +#: src/main/xmli18n-tmp.h:781 msgid "HP LaserJet 1200" msgstr "HP LaserJet 1200" -#: src/main/xmli18n-tmp.h:730 +#: src/main/xmli18n-tmp.h:782 msgid "HP LaserJet 1220" msgstr "HP LaserJet 1220" -#: src/main/xmli18n-tmp.h:731 +#: src/main/xmli18n-tmp.h:783 msgid "HP LaserJet 1300" msgstr "HP LaserJet 1300" -#: src/main/xmli18n-tmp.h:732 +#: src/main/xmli18n-tmp.h:784 msgid "HP LaserJet 2100" msgstr "HP LaserJet 2100" -#: src/main/xmli18n-tmp.h:733 +#: src/main/xmli18n-tmp.h:785 msgid "HP LaserJet 2100M" msgstr "HP LaserJet 2100M" -#: src/main/xmli18n-tmp.h:734 +#: src/main/xmli18n-tmp.h:786 msgid "HP LaserJet 2200" msgstr "HP LaserJet 2200" -#: src/main/xmli18n-tmp.h:735 +#: src/main/xmli18n-tmp.h:787 msgid "HP LaserJet 2300" msgstr "HP LaserJet 2300" -#: src/main/xmli18n-tmp.h:736 +#: src/main/xmli18n-tmp.h:788 msgid "HP LaserJet 3200" msgstr "HP LaserJet 3200" -#: src/main/xmli18n-tmp.h:737 +#: src/main/xmli18n-tmp.h:789 msgid "HP LaserJet 3200m" msgstr "HP LaserJet 3200m" -#: src/main/xmli18n-tmp.h:738 +#: src/main/xmli18n-tmp.h:790 msgid "HP LaserJet 3200se" msgstr "HP LaserJet 3200se" -#: src/main/xmli18n-tmp.h:739 +#: src/main/xmli18n-tmp.h:791 msgid "HP LaserJet 3300 MFP" msgstr "HP LaserJet 3300 MFP" -#: src/main/xmli18n-tmp.h:740 +#: src/main/xmli18n-tmp.h:792 msgid "HP LaserJet 3310 MFP" msgstr "HP LaserJet 3310 MFP" -#: src/main/xmli18n-tmp.h:741 +#: src/main/xmli18n-tmp.h:793 msgid "HP LaserJet 3320 MFP" msgstr "HP LaserJet 3320 MFP" -#: src/main/xmli18n-tmp.h:742 +#: src/main/xmli18n-tmp.h:794 msgid "HP LaserJet 3320N MFP" msgstr "HP LaserJet 3320N MFP" -#: src/main/xmli18n-tmp.h:743 +#: src/main/xmli18n-tmp.h:795 msgid "HP LaserJet 3330 MFP" msgstr "HP LaserJet 3330 MFP" -#: src/main/xmli18n-tmp.h:744 +#: src/main/xmli18n-tmp.h:796 msgid "HP LaserJet 4000" msgstr "HP LaserJet 4000" -#: src/main/xmli18n-tmp.h:745 +#: src/main/xmli18n-tmp.h:797 msgid "HP LaserJet 4050" msgstr "HP LaserJet 4050" -#: src/main/xmli18n-tmp.h:746 +#: src/main/xmli18n-tmp.h:798 msgid "HP LaserJet 4100" msgstr "HP LaserJet 4100" -#: src/main/xmli18n-tmp.h:747 +#: src/main/xmli18n-tmp.h:799 msgid "HP LaserJet 4200" msgstr "HP LaserJet 4200" -#: src/main/xmli18n-tmp.h:748 +#: src/main/xmli18n-tmp.h:800 msgid "HP LaserJet 4300" msgstr "HP LaserJet 4300" -#: src/main/xmli18n-tmp.h:749 +#: src/main/xmli18n-tmp.h:801 msgid "HP LaserJet 5000" msgstr "HP LaserJet 5000" -#: src/main/xmli18n-tmp.h:750 +#: src/main/xmli18n-tmp.h:802 msgid "HP LaserJet 5100" msgstr "HP LaserJet 5100" -#: src/main/xmli18n-tmp.h:751 +#: src/main/xmli18n-tmp.h:803 msgid "HP LaserJet 8000" msgstr "HP LaserJet 8000" -#: src/main/xmli18n-tmp.h:752 +#: src/main/xmli18n-tmp.h:804 msgid "HP LaserJet 8100" msgstr "HP LaserJet 8100" -#: src/main/xmli18n-tmp.h:753 +#: src/main/xmli18n-tmp.h:805 msgid "HP LaserJet 8150" msgstr "HP LaserJet 8150" -#: src/main/xmli18n-tmp.h:754 +#: src/main/xmli18n-tmp.h:806 msgid "HP LaserJet 9000" msgstr "HP LaserJet 9000" -#: src/main/xmli18n-tmp.h:755 +#: src/main/xmli18n-tmp.h:807 msgid "HP Mopier 240" msgstr "HP Mopier 240" -#: src/main/xmli18n-tmp.h:756 +#: src/main/xmli18n-tmp.h:808 msgid "HP Mopier 320" msgstr "HP Mopier 320" -#: src/main/xmli18n-tmp.h:757 +#: src/main/xmli18n-tmp.h:809 msgid "HP OfficeJet 300" msgstr "HP OfficeJet 300" -#: src/main/xmli18n-tmp.h:758 +#: src/main/xmli18n-tmp.h:810 msgid "HP OfficeJet 330" msgstr "HP OfficeJet 330" -#: src/main/xmli18n-tmp.h:759 +#: src/main/xmli18n-tmp.h:811 msgid "HP OfficeJet 350" msgstr "HP OfficeJet 350" -#: src/main/xmli18n-tmp.h:760 +#: src/main/xmli18n-tmp.h:812 msgid "HP OfficeJet 500" msgstr "HP OfficeJet 500" -#: src/main/xmli18n-tmp.h:761 +#: src/main/xmli18n-tmp.h:813 msgid "HP OfficeJet 520" msgstr "HP OfficeJet 520" -#: src/main/xmli18n-tmp.h:762 +#: src/main/xmli18n-tmp.h:814 msgid "HP OfficeJet 570" msgstr "HP OfficeJet 570" -#: src/main/xmli18n-tmp.h:763 +#: src/main/xmli18n-tmp.h:815 msgid "HP OfficeJet 580" msgstr "HP OfficeJet 580" -#: src/main/xmli18n-tmp.h:764 +#: src/main/xmli18n-tmp.h:816 msgid "HP OfficeJet 590" msgstr "HP OfficeJet 590" -#: src/main/xmli18n-tmp.h:765 +#: src/main/xmli18n-tmp.h:817 msgid "HP OfficeJet 600" msgstr "HP OfficeJet 600" -#: src/main/xmli18n-tmp.h:766 +#: src/main/xmli18n-tmp.h:818 msgid "HP OfficeJet 610" msgstr "HP OfficeJet 610" -#: src/main/xmli18n-tmp.h:767 +#: src/main/xmli18n-tmp.h:819 msgid "HP OfficeJet 625" msgstr "HP OfficeJet 625" -#: src/main/xmli18n-tmp.h:768 +#: src/main/xmli18n-tmp.h:820 msgid "HP OfficeJet 630" msgstr "HP OfficeJet 630" -#: src/main/xmli18n-tmp.h:769 +#: src/main/xmli18n-tmp.h:821 msgid "HP OfficeJet 635" msgstr "HP OfficeJet 635" -#: src/main/xmli18n-tmp.h:770 +#: src/main/xmli18n-tmp.h:822 msgid "HP OfficeJet 700" msgstr "HP OfficeJet 700" -#: src/main/xmli18n-tmp.h:771 +#: src/main/xmli18n-tmp.h:823 msgid "HP OfficeJet 710" msgstr "HP OfficeJet 710" -#: src/main/xmli18n-tmp.h:772 +#: src/main/xmli18n-tmp.h:824 msgid "HP OfficeJet 720" msgstr "HP OfficeJet 720" -#: src/main/xmli18n-tmp.h:773 +#: src/main/xmli18n-tmp.h:825 msgid "HP OfficeJet 725" msgstr "HP OfficeJet 725" -#: src/main/xmli18n-tmp.h:774 +#: src/main/xmli18n-tmp.h:826 msgid "HP OfficeJet 5105" msgstr "HP OfficeJet 5105" -#: src/main/xmli18n-tmp.h:775 +#: src/main/xmli18n-tmp.h:827 msgid "HP OfficeJet 5110" msgstr "HP OfficeJet 5110" -#: src/main/xmli18n-tmp.h:776 +#: src/main/xmli18n-tmp.h:828 msgid "HP OfficeJet 5110xi" msgstr "HP OfficeJet 5110xi" -#: src/main/xmli18n-tmp.h:777 +#: src/main/xmli18n-tmp.h:829 msgid "HP OfficeJet 6105" msgstr "HP OfficeJet 6105" -#: src/main/xmli18n-tmp.h:778 +#: src/main/xmli18n-tmp.h:830 msgid "HP OfficeJet 6110" msgstr "HP OfficeJet 6110" -#: src/main/xmli18n-tmp.h:779 +#: src/main/xmli18n-tmp.h:831 msgid "HP OfficeJet 7110" msgstr "HP OfficeJet 7110" -#: src/main/xmli18n-tmp.h:780 +#: src/main/xmli18n-tmp.h:832 msgid "HP OfficeJet 7130" msgstr "HP OfficeJet 7130" -#: src/main/xmli18n-tmp.h:781 +#: src/main/xmli18n-tmp.h:833 msgid "HP OfficeJet 7140" msgstr "HP OfficeJet 7140" -#: src/main/xmli18n-tmp.h:782 +#: src/main/xmli18n-tmp.h:834 msgid "HP OfficeJet D125" msgstr "HP OfficeJet D125" -#: src/main/xmli18n-tmp.h:783 +#: src/main/xmli18n-tmp.h:835 msgid "HP OfficeJet D135" msgstr "HP OfficeJet D135" -#: src/main/xmli18n-tmp.h:784 +#: src/main/xmli18n-tmp.h:836 msgid "HP OfficeJet D145" msgstr "HP OfficeJet D145" -#: src/main/xmli18n-tmp.h:785 +#: src/main/xmli18n-tmp.h:837 msgid "HP OfficeJet D155" msgstr "HP OfficeJet D155" -#: src/main/xmli18n-tmp.h:786 +#: src/main/xmli18n-tmp.h:838 msgid "HP OfficeJet G55" msgstr "HP OfficeJet G55" -#: src/main/xmli18n-tmp.h:787 +#: src/main/xmli18n-tmp.h:839 msgid "HP OfficeJet G85" msgstr "HP OfficeJet G85" -#: src/main/xmli18n-tmp.h:788 +#: src/main/xmli18n-tmp.h:840 msgid "HP OfficeJet G95" msgstr "HP OfficeJet G95" -#: src/main/xmli18n-tmp.h:789 +#: src/main/xmli18n-tmp.h:841 msgid "HP OfficeJet K60" msgstr "HP OfficeJet K60" -#: src/main/xmli18n-tmp.h:790 +#: src/main/xmli18n-tmp.h:842 msgid "HP OfficeJet K60xi" msgstr "HP OfficeJet K60xi" -#: src/main/xmli18n-tmp.h:791 +#: src/main/xmli18n-tmp.h:843 msgid "HP OfficeJet K80" msgstr "HP OfficeJet K80" -#: src/main/xmli18n-tmp.h:792 +#: src/main/xmli18n-tmp.h:844 msgid "HP OfficeJet K80xi" msgstr "HP OfficeJet K80xi" -#: src/main/xmli18n-tmp.h:793 +#: src/main/xmli18n-tmp.h:845 msgid "HP OfficeJet LX" msgstr "HP OfficeJet LX" -#: src/main/xmli18n-tmp.h:794 +#: src/main/xmli18n-tmp.h:846 msgid "HP OfficeJet Pro 1150C" msgstr "HP OfficeJet Pro 1150C" -#: src/main/xmli18n-tmp.h:795 +#: src/main/xmli18n-tmp.h:847 msgid "HP OfficeJet Pro 1170C" msgstr "HP OfficeJet Pro 1170C" -#: src/main/xmli18n-tmp.h:796 +#: src/main/xmli18n-tmp.h:848 msgid "HP OfficeJet Pro 1175C" msgstr "HP OfficeJet Pro 1175C" -#: src/main/xmli18n-tmp.h:797 +#: src/main/xmli18n-tmp.h:849 msgid "HP OfficeJet R40" msgstr "HP OfficeJet R40" -#: src/main/xmli18n-tmp.h:798 +#: src/main/xmli18n-tmp.h:850 msgid "HP OfficeJet R45" msgstr "HP OfficeJet R45" -#: src/main/xmli18n-tmp.h:799 +#: src/main/xmli18n-tmp.h:851 msgid "HP OfficeJet R60" msgstr "HP OfficeJet R60" -#: src/main/xmli18n-tmp.h:800 +#: src/main/xmli18n-tmp.h:852 msgid "HP OfficeJet R65" msgstr "HP OfficeJet R65" -#: src/main/xmli18n-tmp.h:801 +#: src/main/xmli18n-tmp.h:853 msgid "HP OfficeJet R80" msgstr "HP OfficeJet R80" -#: src/main/xmli18n-tmp.h:802 +#: src/main/xmli18n-tmp.h:854 msgid "HP OfficeJet T45" msgstr "HP OfficeJet T45" -#: src/main/xmli18n-tmp.h:803 +#: src/main/xmli18n-tmp.h:855 msgid "HP OfficeJet T65" msgstr "HP OfficeJet T65" -#: src/main/xmli18n-tmp.h:804 +#: src/main/xmli18n-tmp.h:856 msgid "HP OfficeJet V40" msgstr "HP OfficeJet V40" -#: src/main/xmli18n-tmp.h:805 +#: src/main/xmli18n-tmp.h:857 msgid "HP OfficeJet V40xi" msgstr "HP OfficeJet V40xi" -#: src/main/xmli18n-tmp.h:806 +#: src/main/xmli18n-tmp.h:858 msgid "HP OfficeJet" msgstr "HP OfficeJet" -#: src/main/xmli18n-tmp.h:807 +#: src/main/xmli18n-tmp.h:859 msgid "HP PSC 370" msgstr "HP PSC 370" -#: src/main/xmli18n-tmp.h:808 +#: src/main/xmli18n-tmp.h:860 msgid "HP PSC 380" msgstr "HP PSC 380" -#: src/main/xmli18n-tmp.h:809 +#: src/main/xmli18n-tmp.h:861 msgid "HP PSC 500" msgstr "HP PSC 500" -#: src/main/xmli18n-tmp.h:810 +#: src/main/xmli18n-tmp.h:862 msgid "HP PSC 750" msgstr "HP PSC 750" -#: src/main/xmli18n-tmp.h:811 +#: src/main/xmli18n-tmp.h:863 msgid "HP PSC 950" msgstr "HP PSC 950" -#: src/main/xmli18n-tmp.h:812 +#: src/main/xmli18n-tmp.h:864 msgid "HP PSC 950xi" msgstr "HP PSC 950xi" -#: src/main/xmli18n-tmp.h:813 +#: src/main/xmli18n-tmp.h:865 msgid "HP PSC 2110" msgstr "HP PSC 2110" -#: src/main/xmli18n-tmp.h:814 +#: src/main/xmli18n-tmp.h:866 msgid "HP PSC 2150" msgstr "HP PSC 2150" -#: src/main/xmli18n-tmp.h:815 +#: src/main/xmli18n-tmp.h:867 msgid "HP PSC 2210" msgstr "HP PSC 2210" -#: src/main/xmli18n-tmp.h:816 +#: src/main/xmli18n-tmp.h:868 msgid "HP PhotoSmart 7150" msgstr "HP PhotoSmart 7150" -#: src/main/xmli18n-tmp.h:817 +#: src/main/xmli18n-tmp.h:869 msgid "HP PhotoSmart 7345" msgstr "HP PhotoSmart 7345" -#: src/main/xmli18n-tmp.h:818 +#: src/main/xmli18n-tmp.h:870 msgid "HP PhotoSmart 7350" msgstr "HP PhotoSmart 7350" -#: src/main/xmli18n-tmp.h:819 +#: src/main/xmli18n-tmp.h:871 msgid "HP PhotoSmart 7550" msgstr "HP PhotoSmart 7550" -#: src/main/xmli18n-tmp.h:820 +#: src/main/xmli18n-tmp.h:872 msgid "HP PhotoSmart P100" msgstr "HP PhotoSmart P100" -#: src/main/xmli18n-tmp.h:821 +#: src/main/xmli18n-tmp.h:873 msgid "HP PhotoSmart P130" msgstr "HP PhotoSmart P130" -#: src/main/xmli18n-tmp.h:822 +#: src/main/xmli18n-tmp.h:874 msgid "HP PhotoSmart P230" msgstr "HP PhotoSmart P230" -#: src/main/xmli18n-tmp.h:823 +#: src/main/xmli18n-tmp.h:875 msgid "HP PhotoSmart P1000" msgstr "HP PhotoSmart P1000" -#: src/main/xmli18n-tmp.h:824 +#: src/main/xmli18n-tmp.h:876 msgid "HP PhotoSmart P1100" msgstr "HP PhotoSmart P1100" -#: src/main/xmli18n-tmp.h:825 +#: src/main/xmli18n-tmp.h:877 msgid "HP PhotoSmart P1115" msgstr "HP PhotoSmart P1115" -#: src/main/xmli18n-tmp.h:826 +#: src/main/xmli18n-tmp.h:878 msgid "HP PhotoSmart P1215" msgstr "HP PhotoSmart P1215" -#: src/main/xmli18n-tmp.h:827 +#: src/main/xmli18n-tmp.h:879 msgid "HP PhotoSmart P1218" msgstr "HP PhotoSmart P1218" -#: src/main/xmli18n-tmp.h:828 +#: src/main/xmli18n-tmp.h:880 msgid "HP PhotoSmart P1315" msgstr "HP PhotoSmart P1315" -#: src/main/xmli18n-tmp.h:829 +#: src/main/xmli18n-tmp.h:881 msgid "HP e-printer e20" msgstr "HP e-printer e20" -#: src/main/xmli18n-tmp.h:830 +#: src/main/xmli18n-tmp.h:882 msgid "IBM 4019" msgstr "IBM 4019" -#: src/main/xmli18n-tmp.h:831 +#: src/main/xmli18n-tmp.h:883 msgid "IBM 4029 030 LaserPrinter 10" msgstr "IBM 4029 030 LaserPrinter 10" -#: src/main/xmli18n-tmp.h:832 +#: src/main/xmli18n-tmp.h:884 msgid "IBM 4312" msgstr "IBM 4312" -#: src/main/xmli18n-tmp.h:833 +#: src/main/xmli18n-tmp.h:885 msgid "IBM Infoprint 12" msgstr "IBM Infoprint 12" -#: src/main/xmli18n-tmp.h:834 +#: src/main/xmli18n-tmp.h:886 msgid "IBM Page Printer 3112" msgstr "IBM Page Printer 3112" -#: src/main/xmli18n-tmp.h:835 +#: src/main/xmli18n-tmp.h:887 msgid "Infotec 4651 MF" msgstr "Infotec 4651 MF" -#: src/main/xmli18n-tmp.h:836 +#: src/main/xmli18n-tmp.h:888 msgid "Kyocera F-1010" msgstr "Kyocera F-1010" -#: src/main/xmli18n-tmp.h:837 +#: src/main/xmli18n-tmp.h:889 msgid "Kyocera FS-600 - KPDL-2" msgstr "Kyocera FS-600 - KPDL-2" -#: src/main/xmli18n-tmp.h:838 +#: src/main/xmli18n-tmp.h:890 msgid "Kyocera FS-600" msgstr "Kyocera FS-600" -#: src/main/xmli18n-tmp.h:839 +#: src/main/xmli18n-tmp.h:891 msgid "Kyocera FS-680" msgstr "Kyocera FS-680" -#: src/main/xmli18n-tmp.h:840 +#: src/main/xmli18n-tmp.h:892 msgid "Kyocera FS-800" msgstr "Kyocera FS-800" -#: src/main/xmli18n-tmp.h:841 +#: src/main/xmli18n-tmp.h:893 msgid "Kyocera FS-1000" msgstr "Kyocera FS-1000" -#: src/main/xmli18n-tmp.h:842 +#: src/main/xmli18n-tmp.h:894 msgid "Kyocera FS-1000+" msgstr "Kyocera FS-1000+" -#: src/main/xmli18n-tmp.h:843 +#: src/main/xmli18n-tmp.h:895 msgid "Kyocera FS-1010" msgstr "Kyocera FS-1010" -#: src/main/xmli18n-tmp.h:844 +#: src/main/xmli18n-tmp.h:896 msgid "Kyocera FS-1050" msgstr "Kyocera FS-1050" -#: src/main/xmli18n-tmp.h:845 +#: src/main/xmli18n-tmp.h:897 msgid "Kyocera FS-1200" msgstr "Kyocera FS-1200" -#: src/main/xmli18n-tmp.h:846 +#: src/main/xmli18n-tmp.h:898 msgid "Kyocera FS-1600" msgstr "Kyocera FS-1600" -#: src/main/xmli18n-tmp.h:847 +#: src/main/xmli18n-tmp.h:899 msgid "Kyocera FS-1600+" msgstr "Kyocera FS-1600+" -#: src/main/xmli18n-tmp.h:848 +#: src/main/xmli18n-tmp.h:900 msgid "Kyocera FS-1700" msgstr "Kyocera FS-1700" -#: src/main/xmli18n-tmp.h:849 +#: src/main/xmli18n-tmp.h:901 msgid "Kyocera FS-1700+" msgstr "Kyocera FS-1700+" -#: src/main/xmli18n-tmp.h:850 +#: src/main/xmli18n-tmp.h:902 msgid "Kyocera FS-1750" msgstr "Kyocera FS-1750" -#: src/main/xmli18n-tmp.h:851 +#: src/main/xmli18n-tmp.h:903 msgid "Kyocera FS-1800" msgstr "Kyocera FS-1800" -#: src/main/xmli18n-tmp.h:852 +#: src/main/xmli18n-tmp.h:904 msgid "Kyocera FS-1800+" msgstr "Kyocera FS-1800+" -#: src/main/xmli18n-tmp.h:853 +#: src/main/xmli18n-tmp.h:905 msgid "Kyocera FS-1900" msgstr "Kyocera FS-1900" -#: src/main/xmli18n-tmp.h:854 +#: src/main/xmli18n-tmp.h:906 msgid "Kyocera FS-3500" msgstr "Kyocera FS-3500" -#: src/main/xmli18n-tmp.h:855 +#: src/main/xmli18n-tmp.h:907 msgid "Kyocera FS-3600" msgstr "Kyocera FS-3600" -#: src/main/xmli18n-tmp.h:856 +#: src/main/xmli18n-tmp.h:908 msgid "Kyocera FS-3600+" msgstr "Kyocera FS-3600+" -#: src/main/xmli18n-tmp.h:857 +#: src/main/xmli18n-tmp.h:909 msgid "Kyocera FS-3700" msgstr "Kyocera FS-3700" -#: src/main/xmli18n-tmp.h:858 +#: src/main/xmli18n-tmp.h:910 msgid "Kyocera FS-3700+" msgstr "Kyocera FS-3700+" -#: src/main/xmli18n-tmp.h:859 +#: src/main/xmli18n-tmp.h:911 msgid "Kyocera FS-3750" msgstr "Kyocera FS-3750" -#: src/main/xmli18n-tmp.h:860 +#: src/main/xmli18n-tmp.h:912 msgid "Kyocera FS-3800" msgstr "Kyocera FS-3800" -#: src/main/xmli18n-tmp.h:861 +#: src/main/xmli18n-tmp.h:913 msgid "Kyocera FS-5800C" msgstr "Kyocera FS-5800C" -#: src/main/xmli18n-tmp.h:862 +#: src/main/xmli18n-tmp.h:914 msgid "Kyocera FS-5900C" msgstr "Kyocera FS-5900C" -#: src/main/xmli18n-tmp.h:863 +#: src/main/xmli18n-tmp.h:915 msgid "Kyocera FS-6500" msgstr "Kyocera FS-6500" -#: src/main/xmli18n-tmp.h:864 +#: src/main/xmli18n-tmp.h:916 msgid "Kyocera FS-6500+" msgstr "Kyocera FS-6500+" -#: src/main/xmli18n-tmp.h:865 +#: src/main/xmli18n-tmp.h:917 msgid "Kyocera FS-6700" msgstr "Kyocera FS-6700" -#: src/main/xmli18n-tmp.h:866 +#: src/main/xmli18n-tmp.h:918 msgid "Kyocera FS-7000" msgstr "Kyocera FS-7000" -#: src/main/xmli18n-tmp.h:867 +#: src/main/xmli18n-tmp.h:919 msgid "Kyocera FS-7000+" msgstr "Kyocera FS-7000+" -#: src/main/xmli18n-tmp.h:868 +#: src/main/xmli18n-tmp.h:920 msgid "Kyocera FS-8000C" msgstr "Kyocera FS-8000C" -#: src/main/xmli18n-tmp.h:869 +#: src/main/xmli18n-tmp.h:921 msgid "Kyocera FS-9000" msgstr "Kyocera FS-9000" -#: src/main/xmli18n-tmp.h:870 +#: src/main/xmli18n-tmp.h:922 msgid "Kyocera FS-9100DN" msgstr "Kyocera FS-9100DN" -#: src/main/xmli18n-tmp.h:871 +#: src/main/xmli18n-tmp.h:923 msgid "Kyocera FS-9500DN" msgstr "Kyocera FS-9500DN" -#: src/main/xmli18n-tmp.h:872 +#: src/main/xmli18n-tmp.h:924 msgid "Kyocera KM-1530" msgstr "Kyocera KM-1530" -#: src/main/xmli18n-tmp.h:873 +#: src/main/xmli18n-tmp.h:925 msgid "Kyocera KM-1810" msgstr "Kyocera KM-1810" -#: src/main/xmli18n-tmp.h:874 +#: src/main/xmli18n-tmp.h:926 msgid "Kyocera KM-2030" msgstr "Kyocera KM-2030" -#: src/main/xmli18n-tmp.h:875 +#: src/main/xmli18n-tmp.h:927 msgid "Kyocera KM-2530" msgstr "Kyocera KM-2530" -#: src/main/xmli18n-tmp.h:876 +#: src/main/xmli18n-tmp.h:928 msgid "Kyocera KM-3530" msgstr "Kyocera KM-3530" -#: src/main/xmli18n-tmp.h:877 +#: src/main/xmli18n-tmp.h:929 msgid "Kyocera KM-4230" msgstr "Kyocera KM-4230" -#: src/main/xmli18n-tmp.h:878 +#: src/main/xmli18n-tmp.h:930 msgid "Kyocera KM-4530" msgstr "Kyocera KM-4530" -#: src/main/xmli18n-tmp.h:879 +#: src/main/xmli18n-tmp.h:931 msgid "Kyocera KM-5230" msgstr "Kyocera KM-5230" -#: src/main/xmli18n-tmp.h:880 +#: src/main/xmli18n-tmp.h:932 msgid "Kyocera KM-5530" msgstr "Kyocera KM-5530" -#: src/main/xmli18n-tmp.h:881 +#: src/main/xmli18n-tmp.h:933 msgid "Kyocera KM-6230" msgstr "Kyocera KM-6230" -#: src/main/xmli18n-tmp.h:882 +#: src/main/xmli18n-tmp.h:934 msgid "Lexmark 4076" msgstr "Lexmark 4076" -#: src/main/xmli18n-tmp.h:883 +#: src/main/xmli18n-tmp.h:935 msgid "Lexmark Optra E" msgstr "Lexmark Optra E" -#: src/main/xmli18n-tmp.h:884 +#: src/main/xmli18n-tmp.h:936 msgid "Lexmark Optra E+" msgstr "Lexmark Optra E+" -#: src/main/xmli18n-tmp.h:885 +#: src/main/xmli18n-tmp.h:937 #, fuzzy msgid "Lexmark Optra E220" msgstr "Lexmark Optra E" -#: src/main/xmli18n-tmp.h:886 +#: src/main/xmli18n-tmp.h:938 msgid "Lexmark Valuewriter 300" msgstr "Lexmark Valuewriter 300" -#: src/main/xmli18n-tmp.h:887 +#: src/main/xmli18n-tmp.h:939 msgid "Minolta PagePro 6" msgstr "Minolta PagePro 6" -#: src/main/xmli18n-tmp.h:888 +#: src/main/xmli18n-tmp.h:940 msgid "Minolta PagePro 6e" msgstr "Minolta PagePro 6e" -#: src/main/xmli18n-tmp.h:889 +#: src/main/xmli18n-tmp.h:941 msgid "Minolta PagePro 6ex" msgstr "Minolta PagePro 6ex" -#: src/main/xmli18n-tmp.h:890 +#: src/main/xmli18n-tmp.h:942 msgid "Minolta PagePro 8" msgstr "Minolta PagePro 8" -#: src/main/xmli18n-tmp.h:891 +#: src/main/xmli18n-tmp.h:943 msgid "Minolta PagePro 8L" msgstr "Minolta PagePro 8L" -#: src/main/xmli18n-tmp.h:892 +#: src/main/xmli18n-tmp.h:944 msgid "Minolta PagePro 1100" msgstr "Minolta PagePro 1100" -#: src/main/xmli18n-tmp.h:893 +#: src/main/xmli18n-tmp.h:945 msgid "NEC SuperScript 660i" msgstr "NEC SuperScript 660i" -#: src/main/xmli18n-tmp.h:894 +#: src/main/xmli18n-tmp.h:946 msgid "NEC SuperScript 860" msgstr "NEC SuperScript 860" -#: src/main/xmli18n-tmp.h:895 +#: src/main/xmli18n-tmp.h:947 msgid "NEC SuperScript 870" msgstr "NEC SuperScript 870" -#: src/main/xmli18n-tmp.h:896 +#: src/main/xmli18n-tmp.h:948 msgid "NEC SuperScript 1260" msgstr "NEC SuperScript 1260" -#: src/main/xmli18n-tmp.h:897 +#: src/main/xmli18n-tmp.h:949 msgid "NEC SuperScript 1400" msgstr "NEC SuperScript 1400" -#: src/main/xmli18n-tmp.h:898 +#: src/main/xmli18n-tmp.h:950 msgid "NEC SuperScript 1800" msgstr "NEC SuperScript 1800" -#: src/main/xmli18n-tmp.h:899 +#: src/main/xmli18n-tmp.h:951 msgid "Okidata OL400" msgstr "Okidata OL400" -#: src/main/xmli18n-tmp.h:900 +#: src/main/xmli18n-tmp.h:952 msgid "Okidata OL400e" msgstr "Okidata OL400e" -#: src/main/xmli18n-tmp.h:901 +#: src/main/xmli18n-tmp.h:953 msgid "Okidata OL400ex" msgstr "Okidata OL400ex" -#: src/main/xmli18n-tmp.h:902 +#: src/main/xmli18n-tmp.h:954 msgid "Okidata OL410e" msgstr "Okidata OL410e" -#: src/main/xmli18n-tmp.h:903 +#: src/main/xmli18n-tmp.h:955 msgid "Okidata OL600e" msgstr "Okidata OL600e" -#: src/main/xmli18n-tmp.h:904 +#: src/main/xmli18n-tmp.h:956 msgid "Okidata OL610e/S" msgstr "Okidata OL610e/S" -#: src/main/xmli18n-tmp.h:905 +#: src/main/xmli18n-tmp.h:957 msgid "Okidata OL800" msgstr "Okidata OL800" -#: src/main/xmli18n-tmp.h:906 +#: src/main/xmli18n-tmp.h:958 msgid "Okidata OL810ex" msgstr "Okidata OL810ex" -#: src/main/xmli18n-tmp.h:907 +#: src/main/xmli18n-tmp.h:959 msgid "Okidata Okipage 6e" msgstr "Okidata Okipage 6e" -#: src/main/xmli18n-tmp.h:908 +#: src/main/xmli18n-tmp.h:960 msgid "Okidata Okipage 6ex" msgstr "Okidata Okipage 6ex" -#: src/main/xmli18n-tmp.h:909 +#: src/main/xmli18n-tmp.h:961 msgid "Okidata Okipage 8p" msgstr "Okidata Okipage 8p" -#: src/main/xmli18n-tmp.h:910 +#: src/main/xmli18n-tmp.h:962 msgid "Okidata Okipage 10e" msgstr "Okidata Okipage 10e" -#: src/main/xmli18n-tmp.h:911 +#: src/main/xmli18n-tmp.h:963 msgid "Okidata Okipage 10ex" msgstr "Okidata Okipage 10ex" -#: src/main/xmli18n-tmp.h:912 +#: src/main/xmli18n-tmp.h:964 msgid "Okidata Okipage 14ex" msgstr "Okidata Okipage 14ex" -#: src/main/xmli18n-tmp.h:913 +#: src/main/xmli18n-tmp.h:965 msgid "Okidata Super 6e" msgstr "Okidata Super 6e" -#: src/main/xmli18n-tmp.h:914 +#: src/main/xmli18n-tmp.h:966 msgid "Olivetti JP350S" msgstr "Olivetti JP350S" -#: src/main/xmli18n-tmp.h:915 +#: src/main/xmli18n-tmp.h:967 msgid "Olivetti PG 306" msgstr "Olivetti PG 306" -#: src/main/xmli18n-tmp.h:916 +#: src/main/xmli18n-tmp.h:968 msgid "PCPI 1030" msgstr "PCPI 1030" -#: src/main/xmli18n-tmp.h:917 +#: src/main/xmli18n-tmp.h:969 msgid "Panasonic KX-P4410" msgstr "Panasonic KX-P4410" -#: src/main/xmli18n-tmp.h:918 +#: src/main/xmli18n-tmp.h:970 msgid "Panasonic KX-P4450" msgstr "Panasonic KX-P4450" -#: src/main/xmli18n-tmp.h:919 +#: src/main/xmli18n-tmp.h:971 msgid "Panasonic KX-P6150" msgstr "Panasonic KX-P6150" -#: src/main/xmli18n-tmp.h:920 +#: src/main/xmli18n-tmp.h:972 msgid "Panasonic KX-P6500" msgstr "Panasonic KX-P6500" -#: src/main/xmli18n-tmp.h:921 +#: src/main/xmli18n-tmp.h:973 msgid "Raven LP-410" msgstr "Raven LP-410" -#: src/main/xmli18n-tmp.h:922 +#: src/main/xmli18n-tmp.h:974 msgid "Ricoh Aficio 220" msgstr "Ricoh Aficio 220" -#: src/main/xmli18n-tmp.h:923 +#: src/main/xmli18n-tmp.h:975 msgid "Ricoh Aficio 401" msgstr "Ricoh Aficio 401" -#: src/main/xmli18n-tmp.h:924 +#: src/main/xmli18n-tmp.h:976 msgid "Ricoh Aficio 700" msgstr "Ricoh Aficio 700" -#: src/main/xmli18n-tmp.h:925 +#: src/main/xmli18n-tmp.h:977 msgid "Samsung ML-85" msgstr "Samsung ML-85" -#: src/main/xmli18n-tmp.h:926 +#: src/main/xmli18n-tmp.h:978 msgid "Samsung ML-4600" msgstr "Samsung ML-4600" -#: src/main/xmli18n-tmp.h:927 +#: src/main/xmli18n-tmp.h:979 msgid "Samsung ML-5000a" msgstr "Samsung ML-5000a" -#: src/main/xmli18n-tmp.h:928 +#: src/main/xmli18n-tmp.h:980 msgid "Samsung ML-6000" msgstr "Samsung ML-6000" -#: src/main/xmli18n-tmp.h:929 +#: src/main/xmli18n-tmp.h:981 msgid "Samsung ML-6100" msgstr "Samsung ML-6100" -#: src/main/xmli18n-tmp.h:930 +#: src/main/xmli18n-tmp.h:982 msgid "Samsung ML-7000" msgstr "Samsung ML-7000" -#: src/main/xmli18n-tmp.h:931 +#: src/main/xmli18n-tmp.h:983 msgid "Samsung ML-7000N" msgstr "Samsung ML-7000N" -#: src/main/xmli18n-tmp.h:932 +#: src/main/xmli18n-tmp.h:984 msgid "Samsung ML-7000P" msgstr "Samsung ML-7000P" -#: src/main/xmli18n-tmp.h:933 +#: src/main/xmli18n-tmp.h:985 msgid "Samsung ML-7050" msgstr "Samsung ML-7050" -#: src/main/xmli18n-tmp.h:934 +#: src/main/xmli18n-tmp.h:986 msgid "Samsung QL-5100A" msgstr "Samsung QL-5100A" -#: src/main/xmli18n-tmp.h:935 +#: src/main/xmli18n-tmp.h:987 msgid "Samsung QL-6050" msgstr "Samsung QL-6050" -#: src/main/xmli18n-tmp.h:936 +#: src/main/xmli18n-tmp.h:988 msgid "Seiko SpeedJET 200" msgstr "Seiko SpeedJET 200" -#: src/main/xmli18n-tmp.h:937 +#: src/main/xmli18n-tmp.h:989 msgid "Sharp AR-161" msgstr "Sharp AR-161" -#: src/main/xmli18n-tmp.h:938 +#: src/main/xmli18n-tmp.h:990 #, fuzzy msgid "Sharp AR-M257" msgstr "Sharp AR-161" -#: src/main/xmli18n-tmp.h:939 +#: src/main/xmli18n-tmp.h:991 msgid "Sony IJP-V100" msgstr "Sony IJP-V100" -#: src/main/xmli18n-tmp.h:940 +#: src/main/xmli18n-tmp.h:992 msgid "Star LS-04" msgstr "Star LS-04" -#: src/main/xmli18n-tmp.h:941 +#: src/main/xmli18n-tmp.h:993 msgid "Star LaserPrinter 8" msgstr "Star LaserPrinter 8" -#: src/main/xmli18n-tmp.h:942 +#: src/main/xmli18n-tmp.h:994 msgid "Tally MT908" msgstr "Tally MT908" -#: src/main/xmli18n-tmp.h:943 +#: src/main/xmli18n-tmp.h:995 msgid "Xerox Able 1406" msgstr "Xerox Able 1406" -#: src/main/xmli18n-tmp.h:944 +#: src/main/xmli18n-tmp.h:996 msgid "Xerox DocuPrint 4508" msgstr "Xerox DocuPrint 4508" -#: src/main/xmli18n-tmp.h:945 +#: src/main/xmli18n-tmp.h:997 msgid "Xerox DocuPrint C20" msgstr "Xerox DocuPrint C20" -#: src/main/xmli18n-tmp.h:946 +#: src/main/xmli18n-tmp.h:998 msgid "Xerox DocuPrint N4512" msgstr "Xerox DocuPrint N4512" -#: src/main/xmli18n-tmp.h:947 +#: src/main/xmli18n-tmp.h:999 msgid "Xerox DocuPrint N4512PS" msgstr "Xerox DocuPrint N4512PS" -#: src/main/xmli18n-tmp.h:948 +#: src/main/xmli18n-tmp.h:1000 msgid "Xerox DocuPrint P12" msgstr "Xerox DocuPrint P12" -#: src/main/xmli18n-tmp.h:949 +#: src/main/xmli18n-tmp.h:1001 msgid "Xerox DocuPrint P1202" msgstr "Xerox DocuPrint P1202" -#: src/main/xmli18n-tmp.h:950 +#: src/main/xmli18n-tmp.h:1002 msgid "Xerox DocuPrint P8e" msgstr "Xerox DocuPrint P8e" -#: src/main/xmli18n-tmp.h:951 +#: src/main/xmli18n-tmp.h:1003 msgid "Xerox Document Centre 400" msgstr "Xerox Document Centre 400" -#: src/main/xmli18n-tmp.h:952 +#: src/main/xmli18n-tmp.h:1004 #, fuzzy msgid "Xerox WorkCentre M118" msgstr "Xerox Document Centre 400" -#: src/main/xmli18n-tmp.h:953 +#: src/main/xmli18n-tmp.h:1005 msgid "Compaq IJ1200" msgstr "" -#: src/main/xmli18n-tmp.h:954 +#: src/main/xmli18n-tmp.h:1006 #, fuzzy msgid "Lexmark X73" msgstr "Lexmark Z43" -#: src/main/xmli18n-tmp.h:955 +#: src/main/xmli18n-tmp.h:1007 msgid "Lexmark Z42" msgstr "Lexmark Z42" -#: src/main/xmli18n-tmp.h:956 +#: src/main/xmli18n-tmp.h:1008 msgid "Lexmark Z43" msgstr "Lexmark Z43" -#: src/main/xmli18n-tmp.h:957 +#: src/main/xmli18n-tmp.h:1009 msgid "Lexmark Z52" msgstr "Lexmark Z52" -#: src/main/xmli18n-tmp.h:958 +#: src/main/xmli18n-tmp.h:1010 msgid "Lexmark Z53" msgstr "Lexmark Z53" -#: src/main/xmli18n-tmp.h:959 +#: src/main/xmli18n-tmp.h:1011 msgid "Olympus P-10" msgstr "Olympus P-10" -#: src/main/xmli18n-tmp.h:960 +#: src/main/xmli18n-tmp.h:1012 msgid "Olympus P-11" msgstr "Olympus P-11" -#: src/main/xmli18n-tmp.h:961 +#: src/main/xmli18n-tmp.h:1013 msgid "Olympus P-200" msgstr "Olympus P-200" -#: src/main/xmli18n-tmp.h:962 +#: src/main/xmli18n-tmp.h:1014 msgid "Olympus P-300" msgstr "Olympus P-300" -#: src/main/xmli18n-tmp.h:963 +#: src/main/xmli18n-tmp.h:1015 msgid "Olympus P-300E" msgstr "Olympus P-300E" -#: src/main/xmli18n-tmp.h:964 +#: src/main/xmli18n-tmp.h:1016 msgid "Olympus P-300U" msgstr "Olympus P-300U" -#: src/main/xmli18n-tmp.h:965 +#: src/main/xmli18n-tmp.h:1017 msgid "Olympus P-330E" msgstr "Olympus P-330E" -#: src/main/xmli18n-tmp.h:966 +#: src/main/xmli18n-tmp.h:1018 msgid "Olympus P-330NE" msgstr "Olympus P-330NE" -#: src/main/xmli18n-tmp.h:967 +#: src/main/xmli18n-tmp.h:1019 msgid "Olympus P-400" msgstr "Olympus P-400" -#: src/main/xmli18n-tmp.h:968 +#: src/main/xmli18n-tmp.h:1020 msgid "Olympus P-440" msgstr "Olympus P-440" -#: src/main/xmli18n-tmp.h:969 +#: src/main/xmli18n-tmp.h:1021 #, fuzzy msgid "Olympus P-S100" msgstr "Olympus P-10" -#: src/main/xmli18n-tmp.h:970 +#: src/main/xmli18n-tmp.h:1022 #, fuzzy msgid "Canon CP-10" msgstr "Canon CP-100" -#: src/main/xmli18n-tmp.h:971 +#: src/main/xmli18n-tmp.h:1023 msgid "Canon CP-100" msgstr "Canon CP-100" -#: src/main/xmli18n-tmp.h:972 +#: src/main/xmli18n-tmp.h:1024 msgid "Canon CP-200" msgstr "Canon CP-200" -#: src/main/xmli18n-tmp.h:973 +#: src/main/xmli18n-tmp.h:1025 msgid "Canon CP-220" msgstr "Canon CP-220" -#: src/main/xmli18n-tmp.h:974 +#: src/main/xmli18n-tmp.h:1026 msgid "Canon CP-300" msgstr "Canon CP-300" -#: src/main/xmli18n-tmp.h:975 +#: src/main/xmli18n-tmp.h:1027 msgid "Canon CP-330" msgstr "Canon CP-330" -#: src/main/xmli18n-tmp.h:976 +#: src/main/xmli18n-tmp.h:1028 msgid "Canon SELPHY-CP-400" msgstr "Canon SELPHY-CP-400" -#: src/main/xmli18n-tmp.h:977 +#: src/main/xmli18n-tmp.h:1029 msgid "Canon SELPHY-CP-500" msgstr "Canon SELPHY-CP-500" -#: src/main/xmli18n-tmp.h:978 +#: src/main/xmli18n-tmp.h:1030 msgid "Canon SELPHY-CP-510" msgstr "Canon SELPHY-CP-510" -#: src/main/xmli18n-tmp.h:979 +#: src/main/xmli18n-tmp.h:1031 msgid "Canon SELPHY-CP-600" msgstr "Canon SELPHY-CP-600" -#: src/main/xmli18n-tmp.h:980 +#: src/main/xmli18n-tmp.h:1032 msgid "Canon SELPHY-CP-710" msgstr "Canon SELPHY-CP-710" -#: src/main/xmli18n-tmp.h:981 +#: src/main/xmli18n-tmp.h:1033 #, fuzzy msgid "Canon SELPHY-CP-720" msgstr "Canon SELPHY-CP-710" -#: src/main/xmli18n-tmp.h:982 +#: src/main/xmli18n-tmp.h:1034 #, fuzzy msgid "Canon SELPHY-CP-730" msgstr "Canon SELPHY-CP-710" -#: src/main/xmli18n-tmp.h:983 +#: src/main/xmli18n-tmp.h:1035 #, fuzzy msgid "Canon SELPHY-CP-740" msgstr "Canon SELPHY-CP-400" -#: src/main/xmli18n-tmp.h:984 +#: src/main/xmli18n-tmp.h:1036 #, fuzzy msgid "Canon SELPHY-CP-750" msgstr "Canon SELPHY-CP-500" -#: src/main/xmli18n-tmp.h:985 +#: src/main/xmli18n-tmp.h:1037 #, fuzzy msgid "Canon SELPHY ES1" msgstr "Canon SELPHY-CP-510" -#: src/main/xmli18n-tmp.h:986 +#: src/main/xmli18n-tmp.h:1038 #, fuzzy msgid "Canon SELPHY ES2" msgstr "Canon SELPHY-CP-400" -#: src/main/xmli18n-tmp.h:987 +#: src/main/xmli18n-tmp.h:1039 #, fuzzy msgid "Canon SELPHY ES20" msgstr "Canon SELPHY-CP-400" -#: src/main/xmli18n-tmp.h:988 +#: src/main/xmli18n-tmp.h:1040 #, fuzzy msgid "Sony DPP-EX5" msgstr "Sony UP-DR150" -#: src/main/xmli18n-tmp.h:989 +#: src/main/xmli18n-tmp.h:1041 msgid "Sony DPP-EX7" msgstr "" -#: src/main/xmli18n-tmp.h:990 +#: src/main/xmli18n-tmp.h:1042 msgid "Sony UP-DP10" msgstr "Sony UP-DP10" -#: src/main/xmli18n-tmp.h:991 +#: src/main/xmli18n-tmp.h:1043 #, fuzzy msgid "Sony UP-DR100" msgstr "Sony UP-DR150" -#: src/main/xmli18n-tmp.h:992 +#: src/main/xmli18n-tmp.h:1044 msgid "Sony UP-DR150" msgstr "Sony UP-DR150" -#: src/main/xmli18n-tmp.h:993 +#: src/main/xmli18n-tmp.h:1045 msgid "Fujifilm Printpix-CX-400" msgstr "Fujifilm Printpix-CX-400" -#: src/main/xmli18n-tmp.h:994 +#: src/main/xmli18n-tmp.h:1046 msgid "Fujifilm Printpix-CX-550" msgstr "Fujifilm Printpix-CX-550" -#: src/main/xmli18n-tmp.h:995 +#: src/main/xmli18n-tmp.h:1047 #, fuzzy msgid "Fujifilm FinePix-NX-500" msgstr "Fujifilm Printpix-CX-400" -#: src/main/xmli18n-tmp.h:996 +#: src/main/xmli18n-tmp.h:1048 msgid "Kodak Easyshare-Printer-Dock" msgstr "" -#: src/main/xmli18n-tmp.h:997 +#: src/main/xmli18n-tmp.h:1049 msgid "Shinko CHC-S9045" msgstr "" -#: src/main/xmli18n-tmp.h:998 +#: src/main/xmli18n-tmp.h:1050 msgid "RAW DATA 16 bit" msgstr "RAW DATA 16 bit" -#: src/main/xmli18n-tmp.h:999 +#: src/main/xmli18n-tmp.h:1051 msgid "RAW DATA 8 bit" msgstr "RAW DATA 8 bit" -#: src/gutenprintui/panel.c:274 src/gutenprintui2/panel.c:274 +#: src/gutenprintui2/curve.c:130 +msgid "Curve type" +msgstr "Curve type" + +#: src/gutenprintui2/curve.c:131 +msgid "Is this curve linear, spline interpolated, or free-form" +msgstr "Is this curve linear, spline interpolated, or free-form" + +#: src/gutenprintui2/curve.c:139 +msgid "Minimum X" +msgstr "Minimum X" + +#: src/gutenprintui2/curve.c:140 +msgid "Minimum possible value for X" +msgstr "Minimum possible value for X" + +#: src/gutenprintui2/curve.c:149 +msgid "Maximum X" +msgstr "Maximum X" + +#: src/gutenprintui2/curve.c:150 +msgid "Maximum possible X value" +msgstr "Maximum possible X value" + +#: src/gutenprintui2/curve.c:159 +msgid "Minimum Y" +msgstr "Minimum Y" + +#: src/gutenprintui2/curve.c:160 +msgid "Minimum possible value for Y" +msgstr "Minimum possible value for Y" + +#: src/gutenprintui2/curve.c:169 +msgid "Maximum Y" +msgstr "Maximum Y" + +#: src/gutenprintui2/curve.c:170 +msgid "Maximum possible value for Y" +msgstr "Maximum possible value for Y" + +#: src/gutenprintui2/gammacurve.c:418 +msgid "_Gamma value" +msgstr "_Gamma value" + +#: src/gutenprintui2/panel.c:275 msgid "Inch" msgstr "Inch" -#: src/gutenprintui/panel.c:274 src/gutenprintui2/panel.c:274 +#: src/gutenprintui2/panel.c:275 msgid "Set the base unit of measurement to inches" msgstr "Set the base unit of measurement to inches" -#: src/gutenprintui/panel.c:276 src/gutenprintui2/panel.c:276 +#: src/gutenprintui2/panel.c:277 msgid "cm" msgstr "cm" -#: src/gutenprintui/panel.c:276 src/gutenprintui2/panel.c:276 +#: src/gutenprintui2/panel.c:277 msgid "Set the base unit of measurement to centimetres" msgstr "Set the base unit of measurement to centimetres" -#: src/gutenprintui/panel.c:278 src/gutenprintui2/panel.c:278 +#: src/gutenprintui2/panel.c:279 msgid "Points" msgstr "Points" -#: src/gutenprintui/panel.c:278 src/gutenprintui2/panel.c:278 +#: src/gutenprintui2/panel.c:279 msgid "Set the base unit of measurement to points (1/72\")" msgstr "Set the base unit of measurement to points (1/72\")" -#: src/gutenprintui/panel.c:280 src/gutenprintui2/panel.c:280 +#: src/gutenprintui2/panel.c:281 msgid "mm" msgstr "mm" -#: src/gutenprintui/panel.c:280 src/gutenprintui2/panel.c:280 +#: src/gutenprintui2/panel.c:281 msgid "Set the base unit of measurement to millimetres" msgstr "Set the base unit of measurement to millimetres" -#: src/gutenprintui/panel.c:282 src/gutenprintui2/panel.c:282 +#: src/gutenprintui2/panel.c:283 msgid "Pica" msgstr "Pica" -#: src/gutenprintui/panel.c:282 src/gutenprintui2/panel.c:282 +#: src/gutenprintui2/panel.c:283 msgid "Set the base unit of measurement to picas (1/12\")" msgstr "Set the base unit of measurement to picas (1/12\")" -#: src/gutenprintui/panel.c:289 src/gutenprintui2/panel.c:289 +#: src/gutenprintui2/panel.c:290 msgid "Color output" msgstr "Colour output" -#: src/gutenprintui/panel.c:291 src/gutenprintui2/panel.c:291 +#: src/gutenprintui2/panel.c:292 msgid "Print in shades of gray using black ink" msgstr "Print in shades of gray using black ink" -#: src/gutenprintui/panel.c:303 src/gutenprintui2/panel.c:303 +#: src/gutenprintui2/panel.c:304 msgid "Standard Command" msgstr "Standard Command" -#: src/gutenprintui/panel.c:303 src/gutenprintui2/panel.c:303 +#: src/gutenprintui2/panel.c:304 msgid "Use standard print command" msgstr "Use standard print command" -#: src/gutenprintui/panel.c:304 src/gutenprintui2/panel.c:304 +#: src/gutenprintui2/panel.c:305 msgid "Custom Command" msgstr "Custom Command" -#: src/gutenprintui/panel.c:304 src/gutenprintui2/panel.c:304 +#: src/gutenprintui2/panel.c:305 msgid "Use custom print command" msgstr "Use custom print command" -#: src/gutenprintui/panel.c:305 src/gutenprintui/plist.c:704 -#: src/gutenprintui/plist.c:787 src/gutenprintui2/panel.c:305 -#: src/gutenprintui2/plist.c:707 src/gutenprintui2/plist.c:790 +#: src/gutenprintui2/panel.c:306 src/gutenprintui2/plist.c:710 +#: src/gutenprintui2/plist.c:793 msgid "File" msgstr "File" -#: src/gutenprintui/panel.c:305 src/gutenprintui2/panel.c:305 +#: src/gutenprintui2/panel.c:306 msgid "Print to a file" msgstr "Print to a file" -#: src/gutenprintui/panel.c:521 src/gutenprintui2/panel.c:521 +#: src/gutenprintui2/panel.c:522 msgid "Edit Curve..." msgstr "Edit Curve..." -#: src/gutenprintui/panel.c:532 src/gutenprintui2/panel.c:532 +#: src/gutenprintui2/panel.c:533 msgid "Set Default" msgstr "Set Default" -#: src/gutenprintui/panel.c:534 src/gutenprintui2/panel.c:534 +#: src/gutenprintui2/panel.c:535 msgid "Restore Previous" msgstr "Restore Previous" -#: src/gutenprintui/panel.c:536 src/gutenprintui/panel.c:1532 -#: src/gutenprintui/panel.c:1787 src/gutenprintui/panel.c:1819 -#: src/gutenprintui2/panel.c:536 src/gutenprintui2/panel.c:1533 -#: src/gutenprintui2/panel.c:1787 src/gutenprintui2/panel.c:1819 +#: src/gutenprintui2/panel.c:537 src/gutenprintui2/panel.c:1708 +#: src/gutenprintui2/panel.c:1962 src/gutenprintui2/panel.c:1994 msgid "OK" msgstr "OK" -#: src/gutenprintui/panel.c:538 src/gutenprintui/panel.c:1197 -#: src/gutenprintui/panel.c:1534 src/gutenprintui/panel.c:1789 -#: src/gutenprintui2/panel.c:538 src/gutenprintui2/panel.c:1198 -#: src/gutenprintui2/panel.c:1535 src/gutenprintui2/panel.c:1789 +#: src/gutenprintui2/panel.c:539 src/gutenprintui2/panel.c:1373 +#: src/gutenprintui2/panel.c:1710 src/gutenprintui2/panel.c:1964 msgid "Cancel" msgstr "Cancel" -#: src/gutenprintui/panel.c:1180 src/gutenprintui2/panel.c:1181 +#: src/gutenprintui2/panel.c:641 +#, fuzzy +msgid "Select File..." +msgstr "Setup Printer..." + +#: src/gutenprintui2/panel.c:1018 +#, fuzzy +msgid "Reset" +msgstr "Best" + +#: src/gutenprintui2/panel.c:1356 #, c-format msgid "%s -- Print v%s" msgstr "%s -- Print v%s" -#: src/gutenprintui/panel.c:1189 src/gutenprintui2/panel.c:1190 +#: src/gutenprintui2/panel.c:1365 msgid "About" msgstr "About" -#: src/gutenprintui/panel.c:1191 src/gutenprintui2/panel.c:1192 +#: src/gutenprintui2/panel.c:1367 msgid "" "Print and\n" "Save Settings" @@ -6318,7 +6800,7 @@ msgstr "" "Print and\n" "Save Settings" -#: src/gutenprintui/panel.c:1193 src/gutenprintui2/panel.c:1194 +#: src/gutenprintui2/panel.c:1369 msgid "" "Save\n" "Settings" @@ -6326,15 +6808,15 @@ msgstr "" "Save\n" "Settings" -#: src/gutenprintui/panel.c:1195 src/gutenprintui2/panel.c:1196 +#: src/gutenprintui2/panel.c:1371 msgid "Print" msgstr "Print" -#: src/gutenprintui/panel.c:1247 src/gutenprintui2/panel.c:1248 +#: src/gutenprintui2/panel.c:1423 msgid "Preview" msgstr "Preview" -#: src/gutenprintui/panel.c:1272 src/gutenprintui2/panel.c:1273 +#: src/gutenprintui2/panel.c:1448 msgid "" "Position the image on the page.\n" "Click and drag with the primary button to position the image.\n" @@ -6358,73 +6840,71 @@ msgstr "" "If you click another button while dragging the mouse, the image will return " "to its original position." -#: src/gutenprintui/panel.c:1319 src/gutenprintui2/panel.c:1320 +#: src/gutenprintui2/panel.c:1495 msgid "Paper Size" msgstr "Paper Size" -#: src/gutenprintui/panel.c:1342 src/gutenprintui2/panel.c:1343 +#: src/gutenprintui2/panel.c:1518 msgid "Show All Paper Sizes" msgstr "Show All Paper Sizes" -#: src/gutenprintui/panel.c:1358 src/gutenprintui2/panel.c:1359 +#: src/gutenprintui2/panel.c:1534 msgid "Dimensions:" msgstr "Dimensions:" -#: src/gutenprintui/panel.c:1363 src/gutenprintui/panel.c:2063 -#: src/gutenprintui2/panel.c:1364 src/gutenprintui2/panel.c:2063 +#: src/gutenprintui2/panel.c:1539 src/gutenprintui2/panel.c:2238 msgid "Width:" msgstr "Width:" -#: src/gutenprintui/panel.c:1364 src/gutenprintui2/panel.c:1365 +#: src/gutenprintui2/panel.c:1540 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:1368 src/gutenprintui/panel.c:2065 -#: src/gutenprintui2/panel.c:1369 src/gutenprintui2/panel.c:2065 +#: src/gutenprintui2/panel.c:1544 src/gutenprintui2/panel.c:2240 msgid "Height:" msgstr "Height:" -#: src/gutenprintui/panel.c:1369 src/gutenprintui2/panel.c:1370 +#: src/gutenprintui2/panel.c:1545 msgid "Height of the paper that you wish to print to" msgstr "Height of the paper that you wish to print to" -#: src/gutenprintui/panel.c:1374 src/gutenprintui2/panel.c:1375 +#: src/gutenprintui2/panel.c:1550 msgid "Automatic Paper Size" msgstr "Automatic Paper Size" -#: src/gutenprintui/panel.c:1391 src/gutenprintui2/panel.c:1392 +#: src/gutenprintui2/panel.c:1567 msgid "Number of Copies" msgstr "Number of Copies" -#: src/gutenprintui/panel.c:1403 src/gutenprintui2/panel.c:1404 +#: src/gutenprintui2/panel.c:1579 msgid "Select the number of copies to print; a value between 1 and 100" msgstr "Select the number of copies to print; a value between 1 and 100" -#: src/gutenprintui/panel.c:1435 src/gutenprintui2/panel.c:1436 +#: src/gutenprintui2/panel.c:1611 msgid "Image Position" msgstr "Image Position" -#: src/gutenprintui/panel.c:1452 src/gutenprintui2/panel.c:1453 +#: src/gutenprintui2/panel.c:1628 msgid "Auto" msgstr "Auto" -#: src/gutenprintui/panel.c:1454 src/gutenprintui2/panel.c:1455 +#: src/gutenprintui2/panel.c:1630 msgid "Portrait" msgstr "Portrait" -#: src/gutenprintui/panel.c:1456 src/gutenprintui2/panel.c:1457 +#: src/gutenprintui2/panel.c:1632 msgid "Landscape" msgstr "Landscape" -#: src/gutenprintui/panel.c:1458 src/gutenprintui2/panel.c:1459 +#: src/gutenprintui2/panel.c:1634 msgid "Upside down" msgstr "Upside down" -#: src/gutenprintui/panel.c:1460 src/gutenprintui2/panel.c:1461 +#: src/gutenprintui2/panel.c:1636 msgid "Seascape" msgstr "Seascape" -#: src/gutenprintui/panel.c:1464 src/gutenprintui2/panel.c:1465 +#: src/gutenprintui2/panel.c:1640 msgid "" "Select the orientation: portrait, landscape, upside down, or seascape " "(upside down landscape)" @@ -6432,120 +6912,116 @@ msgstr "" "Select the orientation: portrait, landscape, upside down, or seascape " "(upside down landscape)" -#: src/gutenprintui/panel.c:1466 src/gutenprintui2/panel.c:1467 +#: src/gutenprintui2/panel.c:1642 msgid "Orientation:" msgstr "Orientation:" -#: src/gutenprintui/panel.c:1477 src/gutenprintui2/panel.c:1478 +#: src/gutenprintui2/panel.c:1653 msgid "Left:" msgstr "Left:" -#: src/gutenprintui/panel.c:1478 src/gutenprintui2/panel.c:1479 +#: src/gutenprintui2/panel.c:1654 msgid "Distance from the left of the paper to the image" msgstr "Distance from the left of the paper to the image" -#: src/gutenprintui/panel.c:1481 src/gutenprintui/panel.c:1485 -#: src/gutenprintui2/panel.c:1482 src/gutenprintui2/panel.c:1486 +#: src/gutenprintui2/panel.c:1657 src/gutenprintui2/panel.c:1661 msgid "Right:" msgstr "Right:" -#: src/gutenprintui/panel.c:1482 src/gutenprintui2/panel.c:1483 +#: src/gutenprintui2/panel.c:1658 msgid "Distance from the left of the paper to the right of the image" msgstr "Distance from the left of the paper to the right of the image" -#: src/gutenprintui/panel.c:1486 src/gutenprintui2/panel.c:1487 +#: src/gutenprintui2/panel.c:1662 msgid "Distance from the right of the paper to the image" msgstr "Distance from the right of the paper to the image" -#: src/gutenprintui/panel.c:1488 src/gutenprintui2/panel.c:1489 +#: src/gutenprintui2/panel.c:1664 msgid "Top:" msgstr "Top:" -#: src/gutenprintui/panel.c:1489 src/gutenprintui2/panel.c:1490 +#: src/gutenprintui2/panel.c:1665 msgid "Distance from the top of the paper to the image" msgstr "Distance from the top of the paper to the image" -#: src/gutenprintui/panel.c:1492 src/gutenprintui/panel.c:1496 -#: src/gutenprintui2/panel.c:1493 src/gutenprintui2/panel.c:1497 +#: src/gutenprintui2/panel.c:1668 src/gutenprintui2/panel.c:1672 msgid "Bottom:" msgstr "Bottom:" -#: src/gutenprintui/panel.c:1493 src/gutenprintui2/panel.c:1494 +#: src/gutenprintui2/panel.c:1669 msgid "Distance from the top of the paper to bottom of the image" msgstr "Distance from the top of the paper to bottom of the image" -#: src/gutenprintui/panel.c:1497 src/gutenprintui2/panel.c:1498 +#: src/gutenprintui2/panel.c:1673 msgid "Distance from the bottom of the paper to the image" msgstr "Distance from the bottom of the paper to the image" -#: src/gutenprintui/panel.c:1507 src/gutenprintui2/panel.c:1508 +#: src/gutenprintui2/panel.c:1683 msgid "Center:" msgstr "Centre:" -#: src/gutenprintui/panel.c:1510 src/gutenprintui2/panel.c:1511 +#: src/gutenprintui2/panel.c:1686 msgid "Horizontal" msgstr "Horizontal" -#: src/gutenprintui/panel.c:1511 src/gutenprintui2/panel.c:1512 +#: src/gutenprintui2/panel.c:1687 msgid "Center the image horizontally on the paper" msgstr "Centre the image horizontally on the paper" -#: src/gutenprintui/panel.c:1513 src/gutenprintui2/panel.c:1514 +#: src/gutenprintui2/panel.c:1689 msgid "Both" msgstr "Both" -#: src/gutenprintui/panel.c:1514 src/gutenprintui2/panel.c:1515 +#: src/gutenprintui2/panel.c:1690 msgid "Center the image on the paper" msgstr "Centre the image on the paper" -#: src/gutenprintui/panel.c:1516 src/gutenprintui2/panel.c:1517 +#: src/gutenprintui2/panel.c:1692 msgid "Vertical" msgstr "Vertical" -#: src/gutenprintui/panel.c:1517 src/gutenprintui2/panel.c:1518 +#: src/gutenprintui2/panel.c:1693 msgid "Center the image vertically on the paper" msgstr "Centre the image vertically on the paper" -#: src/gutenprintui/panel.c:1530 src/gutenprintui2/panel.c:1531 +#: src/gutenprintui2/panel.c:1706 msgid "Setup Printer" msgstr "Setup Printer" -#: src/gutenprintui/panel.c:1555 src/gutenprintui2/panel.c:1555 +#: src/gutenprintui2/panel.c:1730 msgid "Printer Make:" msgstr "Printer Make:" -#: src/gutenprintui/panel.c:1566 src/gutenprintui2/panel.c:1566 +#: src/gutenprintui2/panel.c:1741 msgid "Select the make of your printer" msgstr "Select the make of your printer" -#: src/gutenprintui/panel.c:1584 src/gutenprintui/panel.c:1672 -#: src/gutenprintui/panel.c:1890 src/gutenprintui2/panel.c:1584 -#: src/gutenprintui2/panel.c:1672 src/gutenprintui2/panel.c:1890 +#: src/gutenprintui2/panel.c:1759 src/gutenprintui2/panel.c:1847 +#: src/gutenprintui2/panel.c:2065 msgid "Printer Model:" msgstr "Printer Model:" -#: src/gutenprintui/panel.c:1595 src/gutenprintui2/panel.c:1595 +#: src/gutenprintui2/panel.c:1770 msgid "Select your printer model" msgstr "Select your printer model" -#: src/gutenprintui/panel.c:1643 src/gutenprintui2/panel.c:1643 +#: src/gutenprintui2/panel.c:1818 msgid "PPD File:" msgstr "PPD File:" -#: src/gutenprintui/panel.c:1659 src/gutenprintui2/panel.c:1659 +#: src/gutenprintui2/panel.c:1834 msgid "Enter the correct PPD filename for your printer" msgstr "Enter the correct PPD filename for your printer" -#: src/gutenprintui/panel.c:1661 src/gutenprintui/panel.c:1741 -#: src/gutenprintui2/panel.c:1661 src/gutenprintui2/panel.c:1741 +#: src/gutenprintui2/panel.c:1836 src/gutenprintui2/panel.c:1916 msgid "Browse" msgstr "Browse" -#: src/gutenprintui/panel.c:1668 src/gutenprintui2/panel.c:1668 +#: src/gutenprintui2/panel.c:1843 msgid "Choose the correct PPD filename for your printer" msgstr "Choose the correct PPD filename for your printer" -#: src/gutenprintui/panel.c:1710 src/gutenprintui2/panel.c:1710 +#: src/gutenprintui2/panel.c:1885 msgid "" "Select the name of the output queue (not the type, or model, of printer) " "that you wish to print to" @@ -6553,52 +7029,51 @@ msgstr "" "Select the name of the output queue (not the type, or model, of printer) " "that you wish to print to" -#: src/gutenprintui/panel.c:1712 src/gutenprintui2/panel.c:1712 +#: src/gutenprintui2/panel.c:1887 msgid "Printer Queue:" msgstr "Printer Queue:" -#: src/gutenprintui/panel.c:1728 src/gutenprintui2/panel.c:1728 +#: src/gutenprintui2/panel.c:1903 msgid "Enter the correct command to print to your printer. " msgstr "Enter the correct command to print to your printer. " -#: src/gutenprintui/panel.c:1739 src/gutenprintui2/panel.c:1739 +#: src/gutenprintui2/panel.c:1914 msgid "Enter the file to print to. " msgstr "Enter the file to print to. " -#: src/gutenprintui/panel.c:1747 src/gutenprintui2/panel.c:1747 +#: src/gutenprintui2/panel.c:1922 msgid "File to print to" msgstr "File to print to" -#: src/gutenprintui/panel.c:1755 src/gutenprintui2/panel.c:1755 +#: src/gutenprintui2/panel.c:1930 msgid "Print To File" msgstr "Print To File" -#: src/gutenprintui/panel.c:1785 src/gutenprintui2/panel.c:1785 +#: src/gutenprintui2/panel.c:1960 msgid "Define New Printer" msgstr "Define New Printer" -#: src/gutenprintui/panel.c:1803 src/gutenprintui/panel.c:1887 -#: src/gutenprintui2/panel.c:1803 src/gutenprintui2/panel.c:1887 +#: src/gutenprintui2/panel.c:1978 src/gutenprintui2/panel.c:2062 msgid "Printer Name:" msgstr "Printer Name:" -#: src/gutenprintui/panel.c:1807 src/gutenprintui2/panel.c:1807 +#: src/gutenprintui2/panel.c:1982 msgid "Enter the name you wish to give this logical printer" msgstr "Enter the name you wish to give this logical printer" -#: src/gutenprintui/panel.c:1817 src/gutenprintui2/panel.c:1817 +#: src/gutenprintui2/panel.c:1992 msgid "About Gutenprint " msgstr "About Gutenprint " -#: src/gutenprintui/panel.c:1824 src/gutenprintui2/panel.c:1824 +#: src/gutenprintui2/panel.c:1999 msgid "Gutenprint Version " msgstr "Gutenprint Version " -#: src/gutenprintui/panel.c:1872 src/gutenprintui2/panel.c:1872 +#: src/gutenprintui2/panel.c:2047 msgid "Printer Settings" msgstr "Printer Settings" -#: src/gutenprintui/panel.c:1885 src/gutenprintui2/panel.c:1885 +#: src/gutenprintui2/panel.c:2060 msgid "" "Select the name of the printer (not the type, or model, of printer) that you " "wish to print to" @@ -6606,11 +7081,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:1902 src/gutenprintui2/panel.c:1902 +#: src/gutenprintui2/panel.c:2077 msgid "Setup Printer..." msgstr "Setup Printer..." -#: src/gutenprintui/panel.c:1904 src/gutenprintui2/panel.c:1904 +#: src/gutenprintui2/panel.c:2079 msgid "" "Choose the printer model, PPD file, and command that is used to print to " "this printer" @@ -6618,11 +7093,11 @@ msgstr "" "Choose the printer model, PPD file, and command that is used to print to " "this printer" -#: src/gutenprintui/panel.c:1917 src/gutenprintui2/panel.c:1917 +#: src/gutenprintui2/panel.c:2092 msgid "New Printer..." msgstr "New Printer..." -#: src/gutenprintui/panel.c:1918 src/gutenprintui2/panel.c:1918 +#: src/gutenprintui2/panel.c:2093 msgid "" "Define a new logical printer. This can be used to name a collection of " "settings that you wish to remember for future use." @@ -6630,32 +7105,32 @@ 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:1948 src/gutenprintui2/panel.c:1948 +#: src/gutenprintui2/panel.c:2123 #, fuzzy msgid "Set Printer Option Defaults" msgstr "Set Defaults" -#: src/gutenprintui/panel.c:1949 src/gutenprintui2/panel.c:1949 +#: src/gutenprintui2/panel.c:2124 msgid "Set all printer options to their defaults" msgstr "" -#: src/gutenprintui/panel.c:1972 src/gutenprintui2/panel.c:1972 +#: src/gutenprintui2/panel.c:2147 msgid "Image Size" msgstr "Image Size" -#: src/gutenprintui/panel.c:1997 src/gutenprintui2/panel.c:1997 +#: src/gutenprintui2/panel.c:2172 msgid "Scaling:" msgstr "Scaling:" -#: src/gutenprintui/panel.c:2001 src/gutenprintui2/panel.c:2001 +#: src/gutenprintui2/panel.c:2176 msgid "Set the scale (size) of the image" msgstr "Set the scale (size) of the image" -#: src/gutenprintui/panel.c:2023 src/gutenprintui2/panel.c:2023 +#: src/gutenprintui2/panel.c:2198 msgid "Scale by:" msgstr "Scale by:" -#: src/gutenprintui/panel.c:2028 src/gutenprintui2/panel.c:2028 +#: src/gutenprintui2/panel.c:2203 msgid "" "Select whether scaling is measured as percent of available page size or " "number of output dots per inch" @@ -6663,31 +7138,31 @@ msgstr "" "Select whether scaling is measured as percent of available page size or " "number of output dots per inch" -#: src/gutenprintui/panel.c:2031 src/gutenprintui2/panel.c:2031 +#: src/gutenprintui2/panel.c:2206 msgid "Percent" msgstr "Percent" -#: src/gutenprintui/panel.c:2036 src/gutenprintui2/panel.c:2036 +#: src/gutenprintui2/panel.c:2211 msgid "Scale the print to the size of the page" msgstr "Scale the print to the size of the page" -#: src/gutenprintui/panel.c:2040 src/gutenprintui2/panel.c:2040 +#: src/gutenprintui2/panel.c:2215 msgid "PPI" msgstr "PPI" -#: src/gutenprintui/panel.c:2045 src/gutenprintui2/panel.c:2045 +#: src/gutenprintui2/panel.c:2220 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:2063 src/gutenprintui2/panel.c:2063 +#: src/gutenprintui2/panel.c:2238 msgid "Set the width of the print" msgstr "Set the width of the print" -#: src/gutenprintui/panel.c:2065 src/gutenprintui2/panel.c:2065 +#: src/gutenprintui2/panel.c:2240 msgid "Set the height of the print" msgstr "Set the height of the print" -#: src/gutenprintui/panel.c:2071 src/gutenprintui2/panel.c:2071 +#: src/gutenprintui2/panel.c:2246 msgid "" "Use Original\n" "Image Size" @@ -6695,149 +7170,104 @@ msgstr "" "Use Original\n" "Image Size" -#: src/gutenprintui/panel.c:2077 src/gutenprintui2/panel.c:2077 +#: src/gutenprintui2/panel.c:2252 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:2100 src/gutenprintui2/panel.c:2101 +#: src/gutenprintui2/panel.c:2276 msgid "Print Color Adjust" msgstr "Print Colour Adjust" -#: src/gutenprintui/panel.c:2103 src/gutenprintui2/panel.c:2104 +#: src/gutenprintui2/panel.c:2279 msgid "Set Defaults" msgstr "Set Defaults" -#: src/gutenprintui/panel.c:2105 src/gutenprintui2/panel.c:2106 +#: src/gutenprintui2/panel.c:2281 msgid "Close" msgstr "Close" -#: src/gutenprintui/panel.c:2134 src/gutenprintui2/panel.c:2135 +#: src/gutenprintui2/panel.c:2310 msgid "Image preview" msgstr "Image preview" -#: src/gutenprintui/panel.c:2148 src/gutenprintui2/panel.c:2149 +#: src/gutenprintui2/panel.c:2324 msgid "View Output Channels:" msgstr "View Output Channels:" -#: src/gutenprintui/panel.c:2234 src/gutenprintui2/panel.c:2240 +#: src/gutenprintui2/panel.c:2415 msgid "Output" msgstr "Output" -#: src/gutenprintui/panel.c:2262 src/gutenprintui2/panel.c:2268 +#: src/gutenprintui2/panel.c:2443 msgid "Output Type:" msgstr "Output Type:" -#: src/gutenprintui/panel.c:2266 src/gutenprintui2/panel.c:2272 +#: src/gutenprintui2/panel.c:2447 msgid "Select the desired output type" msgstr "Select the desired output type" -#: src/gutenprintui/panel.c:2287 src/gutenprintui2/panel.c:2293 +#: src/gutenprintui2/panel.c:2468 msgid "Adjust Output..." msgstr "Adjust Output..." -#: src/gutenprintui/panel.c:2296 src/gutenprintui2/panel.c:2302 +#: src/gutenprintui2/panel.c:2477 msgid "" "Adjust color balance, brightness, contrast, saturation, and dither algorithm" msgstr "" "Adjust colour balance, brightness, contrast, saturation, and dither algorithm" -#: src/gutenprintui/panel.c:2314 src/gutenprintui2/panel.c:2321 +#: src/gutenprintui2/panel.c:2496 msgid "Size Units:" msgstr "Size Units:" -#: src/gutenprintui/panel.c:2317 src/gutenprintui2/panel.c:2324 +#: src/gutenprintui2/panel.c:2499 msgid " " msgstr " " -#: src/gutenprintui/panel.c:2341 src/gutenprintui2/panel.c:2348 +#: src/gutenprintui2/panel.c:2523 msgid "Units:" msgstr "Units:" -#: src/gutenprintui/panel.c:2346 src/gutenprintui2/panel.c:2353 +#: src/gutenprintui2/panel.c:2528 msgid "Select the base unit of measurement for printing" msgstr "Select the base unit of measurement for printing" -#: src/gutenprintui/plist.c:90 src/gutenprintui/plist.c:99 -#: src/gutenprintui2/plist.c:89 src/gutenprintui2/plist.c:98 +#: src/gutenprintui2/plist.c:92 src/gutenprintui2/plist.c:101 msgid "System V lp" msgstr "System V lp" -#: src/gutenprintui/plist.c:96 src/gutenprintui2/plist.c:95 +#: src/gutenprintui2/plist.c:98 msgid "CUPS" msgstr "CUPS" -#: src/gutenprintui/plist.c:102 src/gutenprintui2/plist.c:101 +#: src/gutenprintui2/plist.c:104 msgid "Berkeley lpd (/etc/lpc)" msgstr "Berkeley lpd (/etc/lpc)" -#: src/gutenprintui/plist.c:105 src/gutenprintui2/plist.c:104 +#: src/gutenprintui2/plist.c:107 msgid "Berkeley lpd (/usr/bsd/lpc)" msgstr "Berkeley lpd (/usr/bsd/lpc)" -#: src/gutenprintui/plist.c:108 src/gutenprintui2/plist.c:107 +#: src/gutenprintui2/plist.c:110 msgid "Berkeley lpd (/usr/etc/lpc" msgstr "Berkeley lpd (/usr/etc/lpc" -#: src/gutenprintui/plist.c:111 src/gutenprintui2/plist.c:110 +#: src/gutenprintui2/plist.c:113 msgid "Berkeley lpd (/usr/libexec/lpc)" msgstr "Berkeley lpd (/usr/libexec/lpc)" -#: src/gutenprintui/plist.c:114 src/gutenprintui2/plist.c:113 +#: src/gutenprintui2/plist.c:116 msgid "Berkeley lpd (/usr/sbin/lpc)" msgstr "Berkeley lpd (/usr/sbin/lpc)" -#: src/gutenprintui/plist.c:1043 src/gutenprintui2/plist.c:1057 +#: src/gutenprintui2/plist.c:1060 msgid "Printer" msgstr "Printer" -#: src/gutenprintui/plist.c:1230 src/gutenprintui2/plist.c:1250 +#: src/gutenprintui2/plist.c:1253 msgid "(Default Printer)" msgstr "(Default Printer)" -#: src/gutenprintui2/curve.c:130 -msgid "Curve type" -msgstr "Curve type" - -#: src/gutenprintui2/curve.c:131 -msgid "Is this curve linear, spline interpolated, or free-form" -msgstr "Is this curve linear, spline interpolated, or free-form" - -#: src/gutenprintui2/curve.c:139 -msgid "Minimum X" -msgstr "Minimum X" - -#: src/gutenprintui2/curve.c:140 -msgid "Minimum possible value for X" -msgstr "Minimum possible value for X" - -#: src/gutenprintui2/curve.c:149 -msgid "Maximum X" -msgstr "Maximum X" - -#: src/gutenprintui2/curve.c:150 -msgid "Maximum possible X value" -msgstr "Maximum possible X value" - -#: src/gutenprintui2/curve.c:159 -msgid "Minimum Y" -msgstr "Minimum Y" - -#: src/gutenprintui2/curve.c:160 -msgid "Minimum possible value for Y" -msgstr "Minimum possible value for Y" - -#: src/gutenprintui2/curve.c:169 -msgid "Maximum Y" -msgstr "Maximum Y" - -#: src/gutenprintui2/curve.c:170 -msgid "Maximum possible value for Y" -msgstr "Maximum possible value for Y" - -#: src/gutenprintui2/gammacurve.c:418 -msgid "_Gamma value" -msgstr "_Gamma value" - #: src/cups/genppd.c:145 msgid "Printer Features" msgstr "Printer Features" @@ -6873,50 +7303,50 @@ msgstr "Extra 5" #. 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:1058 +#: src/cups/genppd.c:1064 msgid "English" msgstr "English-GB" #. TRANSLATORS: Specify PPD translation encoding e.g. ISOLatin1 -#: src/cups/genppd.c:1060 +#: src/cups/genppd.c:1066 msgid "ISOLatin1" msgstr "UTF-8" -#: src/cups/genppd.c:1641 +#: src/cups/genppd.c:1647 #, fuzzy msgid "2-Sided Printing" msgstr "Double-Sided Printing" -#: src/cups/genppd.c:1665 +#: src/cups/genppd.c:1671 msgid "Shrink Page If Necessary to Fit Borders" msgstr "" -#: src/cups/genppd.c:1669 +#: src/cups/genppd.c:1675 msgid "Shrink (print the whole page)" msgstr "" -#: src/cups/genppd.c:1670 +#: src/cups/genppd.c:1676 msgid "Crop (preserve dimensions)" msgstr "" -#: src/cups/genppd.c:1671 +#: src/cups/genppd.c:1677 msgid "Expand (use maximum page area)" msgstr "" -#: src/cups/genppd.c:1756 +#: src/cups/genppd.c:1762 msgid "No" msgstr "No" -#: src/cups/genppd.c:1758 +#: src/cups/genppd.c:1764 msgid "Yes" msgstr "Yes" -#: src/cups/genppd.c:1795 src/cups/genppd.c:1857 +#: src/cups/genppd.c:1801 src/cups/genppd.c:1863 #, fuzzy msgid "Value" msgstr "Blue" -#: src/cups/genppd.c:1800 +#: src/cups/genppd.c:1806 msgid "Fine Adjustment" msgstr "Fine Adjustment" @@ -7797,143 +8227,95 @@ msgstr "" msgid "Error in input\n" msgstr "Error in input\n" -#: src/gimp/print-image-gimp.c:225 src/gimp2/print-image-gimp.c:225 +#: src/gimp2/print-image-gimp.c:225 msgid "Printing..." msgstr "Printing..." -#: src/gimp/print.c:133 -msgid "/File/Print..." -msgstr "/File/Print..." - -#: src/ghost/ijsgutenprint.c:98 -#, c-format -msgid "" -"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" -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:191 -#, c-format -msgid "ERROR: ijsgutenprint: Bad color 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:199 -#, c-format -msgid "ERROR: ijsgutenprint: No row buffer\n" -msgstr "ERROR: ijsgutenprint: No row buffer\n" +#~ msgid "" +#~ "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" +#~ 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" + +#~ msgid "ERROR: ijsgutenprint: Bad color 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:226 src/ghost/ijsgutenprint.c:246 -#, c-format -msgid "" -"ERROR: ijsgutenprint: Unable to parse parameter %s=%s (expect a number)\n" -msgstr "" -"ERROR: ijsgutenprint: Unable to parse parameter %s=%s (expect a number)\n" +#~ msgid "ERROR: ijsgutenprint: No row buffer\n" +#~ msgstr "ERROR: ijsgutenprint: No row buffer\n" -#: src/ghost/ijsgutenprint.c:498 -#, c-format -msgid "ERROR: ijsgutenprint: Printer must be specified with -sDeviceModel\n" -msgstr "ERROR: ijsgutenprint: Printer must be specified with -sDeviceModel\n" +#~ msgid "" +#~ "ERROR: ijsgutenprint: 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:500 -#, c-format -msgid "ERROR: ijsgutenprint: Printer %s is not a known model\n" -msgstr "ERROR: ijsgutenprint: Printer %s is not a known model\n" +#~ msgid "ERROR: ijsgutenprint: Printer must be specified with -sDeviceModel\n" +#~ msgstr "" +#~ "ERROR: ijsgutenprint: Printer must be specified with -sDeviceModel\n" -#: src/ghost/ijsgutenprint.c:656 -#, c-format -msgid "ijsgutenprint: unknown DeviceModel %s\n" -msgstr "ijsgutenprint: unknown DeviceModel %s\n" +#~ msgid "ERROR: ijsgutenprint: Printer %s is not a known model\n" +#~ msgstr "ERROR: ijsgutenprint: Printer %s is not a known model\n" -#: src/ghost/ijsgutenprint.c:700 -#, c-format -msgid "ERROR: ijsgutenprint: cannot parse TopLeft %s\n" -msgstr "ERROR: ijsgutenprint: cannot parse TopLeft %s\n" +#~ msgid "ijsgutenprint: unknown DeviceModel %s\n" +#~ msgstr "ijsgutenprint: unknown DeviceModel %s\n" -#: src/ghost/ijsgutenprint.c:723 -#, c-format -msgid "ERROR: ijsgutenprint: cannot parse PaperSize %s\n" -msgstr "ERROR: ijsgutenprint: cannot parse PaperSize %s\n" +#~ msgid "ERROR: ijsgutenprint: cannot parse TopLeft %s\n" +#~ msgstr "ERROR: ijsgutenprint: cannot parse TopLeft %s\n" -#: src/ghost/ijsgutenprint.c:795 -#, c-format -msgid "ERROR: ijsgutenprint: cannot parse curve %s\n" -msgstr "ERROR: ijsgutenprint: cannot parse curve %s\n" +#~ msgid "ERROR: ijsgutenprint: cannot parse PaperSize %s\n" +#~ msgstr "ERROR: ijsgutenprint: cannot parse PaperSize %s\n" -#: src/ghost/ijsgutenprint.c:802 -#, c-format -msgid "ERROR: ijsgutenprint: cannot parse %s float %s\n" -msgstr "ERROR: ijsgutenprint: cannot parse %s float %s\n" +#~ msgid "ERROR: ijsgutenprint: cannot parse curve %s\n" +#~ msgstr "ERROR: ijsgutenprint: cannot parse curve %s\n" -#: src/ghost/ijsgutenprint.c:809 -#, c-format -msgid "ERROR: ijsgutenprint: cannot parse %s int %s\n" -msgstr "ERROR: ijsgutenprint: cannot parse %s int %s\n" +#~ msgid "ERROR: ijsgutenprint: cannot parse %s float %s\n" +#~ msgstr "ERROR: ijsgutenprint: cannot parse %s float %s\n" -#: src/ghost/ijsgutenprint.c:816 -#, c-format -msgid "ERROR: ijsgutenprint: cannot parse %s dimension %s\n" -msgstr "ERROR: ijsgutenprint: cannot parse %s dimension %s\n" +#~ msgid "ERROR: ijsgutenprint: cannot parse %s int %s\n" +#~ msgstr "ERROR: ijsgutenprint: cannot parse %s int %s\n" -#: src/ghost/ijsgutenprint.c:830 -#, c-format -msgid "ERROR: ijsgutenprint: cannot parse %s boolean %s\n" -msgstr "ERROR: ijsgutenprint: cannot parse %s boolean %s\n" +#~ msgid "ERROR: ijsgutenprint: cannot parse %s dimension %s\n" +#~ msgstr "ERROR: ijsgutenprint: cannot parse %s dimension %s\n" -#: src/ghost/ijsgutenprint.c:841 -#, c-format -msgid "ERROR: ijsgutenprint: Bad parameter %s %d\n" -msgstr "ERROR: ijsgutenprint: Bad parameter %s %d\n" +#~ msgid "ERROR: ijsgutenprint: cannot parse %s boolean %s\n" +#~ msgstr "ERROR: ijsgutenprint: cannot parse %s boolean %s\n" -#: src/ghost/ijsgutenprint.c:867 -#, c-format -msgid "ERROR: ijsgutenprint: bad key code %d\n" -msgstr "ERROR: ijsgutenprint: bad key code %d\n" +#~ msgid "ERROR: ijsgutenprint: Bad parameter %s %d\n" +#~ msgstr "ERROR: ijsgutenprint: Bad parameter %s %d\n" -#: src/ghost/ijsgutenprint.c:1308 -#, c-format -msgid "ERROR: ijsgutenprint: image_init failed %d\n" -msgstr "ERROR: ijsgutenprint: image_init failed %d\n" +#~ msgid "ERROR: ijsgutenprint: bad key code %d\n" +#~ msgstr "ERROR: ijsgutenprint: bad key code %d\n" -#: 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" +#~ msgid "ERROR: ijsgutenprint: image_init failed %d\n" +#~ msgstr "ERROR: ijsgutenprint: image_init failed %d\n" -#: 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" +#~ msgid "ERROR: ijsgutenprint: Unable to open file descriptor: %s\n" +#~ msgstr "ERROR: ijsgutenprint: Unable to open file descriptor: %s\n" -#: src/ghost/ijsgutenprint.c:1344 -#, c-format -msgid "ERROR: ijsgutenprint: Unknown printer %s\n" -msgstr "ERROR: ijsgutenprint: Unknown printer %s\n" +#~ msgid "ERROR: ijsgutenprint: Unable to open %s: %s\n" +#~ msgstr "ERROR: ijsgutenprint: Unable to open %s: %s\n" -#: src/ghost/ijsgutenprint.c:1516 -#, c-format -msgid "ERROR: ijsgutenprint: Bad parameters; cannot continue!\n" -msgstr "ERROR: ijsgutenprint: Bad parameters; cannot continue!\n" +#~ msgid "ERROR: ijsgutenprint: Unknown printer %s\n" +#~ msgstr "ERROR: ijsgutenprint: Unknown printer %s\n" -#: 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" +#~ msgid "ERROR: ijsgutenprint: Bad parameters; cannot continue!\n" +#~ msgstr "ERROR: ijsgutenprint: Bad parameters; cannot continue!\n" -#, fuzzy -#~ msgid "Model Name" -#~ msgstr "Channel Names" +#~ msgid "ERROR: ijsgutenprint: Get next row failed at %.0f\n" +#~ msgstr "ERROR: ijsgutenprint: Get next row failed at %.0f\n" #, fuzzy #~ msgid "Canon MULTIPASS MP500" @@ -8144,3 +8526,6 @@ msgstr "ERROR: ijsgutenprint: Get next row failed at %.0f\n" #~ msgid "CMY Color" #~ msgstr "CMY Colour" + +#~ msgid "/File/Print..." +#~ msgstr "/File/Print..." diff --git a/po/es.gmo b/po/es.gmo index 5cd1700..772dda0 100644 Binary files a/po/es.gmo and b/po/es.gmo differ diff --git a/po/es.po b/po/es.po index a156fed..5eecacb 100644 --- a/po/es.po +++ b/po/es.po @@ -6,22 +6,22 @@ msgid "" msgstr "" "Project-Id-Version: es\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2008-01-01 20:47-0500\n" +"POT-Creation-Date: 2008-04-25 21:19-0400\n" "PO-Revision-Date: 2002-04-29 00:38GMT\n" "Last-Translator: Gustavo D. Vranjes \n" "Language-Team: Castellano \n" "MIME-Version: 1.0\n" -"Content-Type: text/plain; charset=utf-8\n" +"Content-Type: text/plain; charset=ISO-8859-1\n" "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:1752 +#: src/main/print-escp2.c:2116 #, fuzzy msgid "Default" -msgstr "Establecer por Omisión" +msgstr "Establecer por Omisión" #: src/main/dither-main.c:47 #, fuzzy @@ -57,67 +57,80 @@ msgstr "" #: src/main/dither-main.c:63 msgid "Adaptive Hybrid" -msgstr "Híbrido Adaptativo" +msgstr "Híbrido Adaptativo" #: src/main/dither-main.c:64 msgid "Ordered" msgstr "Ordenado" #: src/main/dither-main.c:65 -msgid "Fast" -msgstr "Rápido" +#, fuzzy +msgid "Ordered New" +msgstr "Ordenado" #: src/main/dither-main.c:66 -msgid "Very Fast" -msgstr "Muy Rápido" +msgid "Fast" +msgstr "Rápido" #: src/main/dither-main.c:67 -msgid "Hybrid Floyd-Steinberg" -msgstr "Floyd-Steinberg Híbrido" +msgid "Very Fast" +msgstr "Muy Rápido" #: src/main/dither-main.c:68 +msgid "Hybrid Floyd-Steinberg" +msgstr "Floyd-Steinberg Híbrido" + +#: src/main/dither-main.c:69 msgid "Predithered Input" msgstr "" -#: src/main/dither-main.c:88 src/main/print-color.c:56 +#: src/main/dither-main.c:70 +msgid "Drop Size Segmented" +msgstr "" + +#: src/main/dither-main.c:71 +msgid "Drop Size Segmented New" +msgstr "" + +#: src/main/dither-main.c:91 src/main/print-color.c:56 #, fuzzy msgid "Density" msgstr "Densidad:" -#: src/main/dither-main.c:88 src/main/print-canon.c:295 +#: src/main/dither-main.c:91 src/main/print-canon.c:295 #: src/main/print-canon.c:303 src/main/print-canon.c:311 -#: src/main/print-canon.c:319 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-escp2.c:471 -#: src/main/print-escp2.c:479 src/main/print-escp2.c:487 +#: src/main/print-canon.c:319 src/main/print-escp2.c:446 +#: src/main/print-escp2.c:454 src/main/print-escp2.c:462 +#: src/main/print-escp2.c:470 src/main/print-escp2.c:478 +#: src/main/print-escp2.c:486 src/main/print-escp2.c:494 #: 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:1764 src/main/print-olympus.c:1772 -#: src/main/print-olympus.c:1780 src/main/print-olympus.c:1788 -#: src/main/print-pcl.c:1261 src/main/print-pcl.c:1269 -#: src/main/print-pcl.c:1277 src/main/print-pcl.c:1285 +#: src/main/print-olympus.c:1762 src/main/print-olympus.c:1770 +#: src/main/print-olympus.c:1778 src/main/print-olympus.c:1786 +#: src/main/print-pcl.c:1329 src/main/print-pcl.c:1337 +#: src/main/print-pcl.c:1345 src/main/print-pcl.c:1353 msgid "Output Level Adjustment" msgstr "" -#: src/main/dither-main.c:89 +#: src/main/dither-main.c:92 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 "" -"Ajusta la densidad (cantidad de tinta de la impresión.Reducir la densidad si " +"Ajusta la densidad (cantidad de tinta de la impresión.Reducir la densidad si " "la tinta se difumina sobre el papel; aumentar la densidad si las regiones " -"negras no son sólidas." +"negras no son sólidas." -#: src/main/dither-main.c:97 +#: src/main/dither-main.c:100 msgid "Dither Algorithm" msgstr "Algoritmo de Entramado" -#: src/main/dither-main.c:97 +#: src/main/dither-main.c:100 msgid "Screening Adjustment" msgstr "" -#: src/main/dither-main.c:98 +#: src/main/dither-main.c:101 #, fuzzy msgid "" "Choose the dither algorithm to be used.\n" @@ -130,12 +143,12 @@ msgid "" "Hybrid Floyd-Steinberg generally produces inferior output." msgstr "" "Elija el algoritmo de entramado a usar.\n" -"El Híbrido Adaptivo normalmente produce la mejor calidad en general.\n" -"El Ordenado es más rápido y produce una calidad casi tan buena como\n" -"el anterior para fotografías.\n" -"El Rápido y Muy Rápido son considerablemente más rápidos, y funcionan\n" +"El Híbrido Adaptivo normalmente produce la mejor calidad en general.\n" +"El Ordenado es más rápido y produce una calidad casi tan buena como\n" +"el anterior para fotografías.\n" +"El Rápido y Muy Rápido son considerablemente más rápidos, y funcionan\n" "bien para texto y arte lineal.\n" -"El Floyd-Steinberg Híbrido en general produce una salida inferior.\n" +"El Floyd-Steinberg Híbrido en general produce una salida inferior.\n" #: src/main/module.c:52 msgid "Miscellaneous (unclassified)" @@ -154,260 +167,269 @@ msgstr "" msgid "Dither algorithm" msgstr "Algoritmo de Entramado" -#: src/main/print-canon.c:200 src/main/print-escp2.c:180 -#: src/main/print-lexmark.c:266 src/main/print-olympus.c:1699 -#: src/main/print-pcl.c:1196 src/main/print-ps.c:67 +#: src/main/print-canon.c:200 src/main/print-escp2.c:182 +#: src/main/print-lexmark.c:266 src/main/print-olympus.c:1697 +#: src/main/print-pcl.c:1264 #, fuzzy msgid "Page Size" -msgstr "Tamaño" +msgstr "Tamaño" #: src/main/print-canon.c:200 src/main/print-canon.c:206 #: src/main/print-canon.c:212 src/main/print-canon.c:218 #: src/main/print-canon.c:224 src/main/print-canon.c:230 #: src/main/print-canon.c:248 src/main/print-canon.c:272 -#: src/main/print-escp2.c:180 src/main/print-escp2.c:186 -#: src/main/print-escp2.c:192 src/main/print-escp2.c:198 -#: src/main/print-escp2.c:204 src/main/print-escp2.c:210 -#: src/main/print-escp2.c:228 src/main/print-escp2.c:245 -#: src/main/print-escp2.c:251 src/main/print-escp2.c:263 -#: src/main/print-escp2.c:281 src/main/print-lexmark.c:266 +#: src/main/print-escp2.c:182 src/main/print-escp2.c:188 +#: src/main/print-escp2.c:194 src/main/print-escp2.c:200 +#: src/main/print-escp2.c:206 src/main/print-escp2.c:212 +#: src/main/print-escp2.c:230 src/main/print-escp2.c:247 +#: src/main/print-escp2.c:253 src/main/print-escp2.c:265 +#: src/main/print-escp2.c:283 src/main/print-lexmark.c:266 #: src/main/print-lexmark.c:272 src/main/print-lexmark.c:278 -#: src/main/print-lexmark.c:284 src/main/print-olympus.c:1699 -#: src/main/print-olympus.c:1705 src/main/print-olympus.c:1711 -#: src/main/print-olympus.c:1717 src/main/print-pcl.c:1196 -#: src/main/print-pcl.c:1202 src/main/print-pcl.c:1208 -#: src/main/print-pcl.c:1214 src/main/print-pcl.c:1238 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 +#: src/main/print-lexmark.c:284 src/main/print-olympus.c:1697 +#: src/main/print-olympus.c:1703 src/main/print-olympus.c:1709 +#: src/main/print-olympus.c:1715 src/main/print-pcl.c:1264 +#: src/main/print-pcl.c:1270 src/main/print-pcl.c:1276 +#: src/main/print-pcl.c:1282 src/main/print-pcl.c:1306 src/main/print-ps.c:68 +#: src/main/print-ps.c:74 #, fuzzy msgid "Basic Printer Setup" -msgstr "Configuración de la Impresora" +msgstr "Configuración de la Impresora" -#: src/main/print-canon.c:201 src/main/print-escp2.c:181 -#: src/main/print-lexmark.c:267 src/main/print-olympus.c:1700 -#: src/main/print-pcl.c:1197 src/main/print-ps.c:68 +#: src/main/print-canon.c:201 src/main/print-escp2.c:183 +#: src/main/print-lexmark.c:267 src/main/print-olympus.c:1698 +#: src/main/print-pcl.c:1265 #, fuzzy msgid "Size of the paper being printed to" -msgstr "Tamaño del papel al que desea imprimir" +msgstr "Tamaño del papel al que desea imprimir" -#: src/main/print-canon.c:206 src/main/print-escp2.c:186 -#: src/main/print-lexmark.c:272 src/main/print-olympus.c:1705 -#: src/main/print-pcl.c:1202 src/main/print-ps.c:73 src/cups/genppd.c:1417 +#: src/main/print-canon.c:206 src/main/print-escp2.c:188 +#: src/main/print-lexmark.c:272 src/main/print-olympus.c:1703 +#: src/main/print-pcl.c:1270 src/cups/genppd.c:1422 msgid "Media Type" msgstr "Tipo de Medio" -#: src/main/print-canon.c:207 src/main/print-escp2.c:187 -#: src/main/print-lexmark.c:273 src/main/print-olympus.c:1706 -#: src/main/print-pcl.c:1203 src/main/print-ps.c:74 +#: src/main/print-canon.c:207 src/main/print-escp2.c:189 +#: src/main/print-lexmark.c:273 src/main/print-olympus.c:1704 +#: src/main/print-pcl.c:1271 msgid "Type of media (plain paper, photo paper, etc.)" msgstr "" -#: src/main/print-canon.c:212 src/main/print-escp2.c:192 -#: src/main/print-lexmark.c:278 src/main/print-olympus.c:1711 -#: src/main/print-pcl.c:1208 src/main/print-ps.c:79 src/cups/genppd.c:1445 +#: src/main/print-canon.c:212 src/main/print-escp2.c:194 +#: src/main/print-lexmark.c:278 src/main/print-olympus.c:1709 +#: src/main/print-pcl.c:1276 src/cups/genppd.c:1450 msgid "Media Source" msgstr "Fuente de Medio" -#: src/main/print-canon.c:213 src/main/print-escp2.c:193 -#: src/main/print-lexmark.c:279 src/main/print-olympus.c:1712 -#: src/main/print-pcl.c:1209 src/main/print-ps.c:80 +#: src/main/print-canon.c:213 src/main/print-escp2.c:195 +#: src/main/print-lexmark.c:279 src/main/print-olympus.c:1710 +#: src/main/print-pcl.c:1277 #, fuzzy msgid "Source (input slot) of the media" -msgstr "Origen del medio (ranura de entrada) al que está imprimiendo" +msgstr "Origen del medio (ranura de entrada) al que está imprimiendo" -#: src/main/print-canon.c:218 src/main/print-escp2.c:198 +#: src/main/print-canon.c:218 src/main/print-escp2.c:200 msgid "CD Hub Size" msgstr "" -#: src/main/print-canon.c:219 src/main/print-escp2.c:199 +#: src/main/print-canon.c:219 src/main/print-escp2.c:201 msgid "Print only outside of the hub of the CD, or all the way to the hole" msgstr "" -#: src/main/print-canon.c:224 src/main/print-escp2.c:204 +#: src/main/print-canon.c:224 src/main/print-escp2.c:206 msgid "CD Size (Custom)" msgstr "" -#: src/main/print-canon.c:225 src/main/print-escp2.c:205 +#: src/main/print-canon.c:225 src/main/print-escp2.c:207 msgid "Variable adjustment for the outer diameter of CD" msgstr "" -#: src/main/print-canon.c:230 src/main/print-escp2.c:210 +#: src/main/print-canon.c:230 src/main/print-escp2.c:212 msgid "CD Hub Size (Custom)" msgstr "" -#: src/main/print-canon.c:231 src/main/print-escp2.c:211 +#: src/main/print-canon.c:231 src/main/print-escp2.c:213 #, fuzzy msgid "Variable adjustment to the inner hub of the CD" -msgstr "Redimensionar la impresión al tamaño de la página" +msgstr "Redimensionar la impresión al tamaño de la página" -#: src/main/print-canon.c:236 src/main/print-escp2.c:216 +#: src/main/print-canon.c:236 src/main/print-escp2.c:218 msgid "CD Horizontal Fine Adjustment" msgstr "" #: src/main/print-canon.c:236 src/main/print-canon.c:242 -#: src/main/print-canon.c:254 src/main/print-escp2.c:216 -#: src/main/print-escp2.c:222 src/main/print-escp2.c:239 -#: src/main/print-escp2.c:275 src/main/print-lexmark.c:290 -#: src/main/print-olympus.c:1723 src/main/print-olympus.c:1729 -#: src/main/print-olympus.c:1735 src/main/print-pcl.c:1220 -#: src/main/print-ps.c:91 src/main/print-raw.c:80 +#: src/main/print-canon.c:254 src/main/print-escp2.c:218 +#: src/main/print-escp2.c:224 src/main/print-escp2.c:241 +#: src/main/print-escp2.c:277 src/main/print-lexmark.c:290 +#: src/main/print-olympus.c:1721 src/main/print-olympus.c:1727 +#: src/main/print-olympus.c:1733 src/main/print-pcl.c:1288 +#: src/main/print-raw.c:80 msgid "Advanced Printer Setup" msgstr "" #: src/main/print-canon.c:237 src/main/print-canon.c:243 -#: src/main/print-escp2.c:217 src/main/print-escp2.c:223 +#: src/main/print-escp2.c:219 src/main/print-escp2.c:225 msgid "Fine adjustment to horizontal position for CD printing" msgstr "" -#: src/main/print-canon.c:242 src/main/print-escp2.c:222 +#: src/main/print-canon.c:242 src/main/print-escp2.c:224 msgid "CD Vertical Fine Adjustment" msgstr "" -#: src/main/print-canon.c:248 src/main/print-escp2.c:228 -#: src/main/print-lexmark.c:284 src/main/print-olympus.c:1717 -#: src/main/print-pcl.c:1214 src/main/print-ps.c:85 src/cups/genppd.c:1518 +#: src/main/print-canon.c:248 src/main/print-escp2.c:230 +#: src/main/print-lexmark.c:284 src/main/print-olympus.c:1715 +#: src/main/print-pcl.c:1282 src/cups/genppd.c:1523 msgid "Resolution" -msgstr "Resolución" +msgstr "Resolución" #: src/main/print-canon.c:249 src/main/print-lexmark.c:285 -#: src/main/print-olympus.c:1718 src/main/print-pcl.c:1215 -#: src/main/print-ps.c:86 +#: src/main/print-olympus.c:1716 src/main/print-pcl.c:1283 msgid "Resolution and quality of the print" -msgstr "Resolución y calidad de la impresión" +msgstr "Resolución y calidad de la impresión" -#: src/main/print-canon.c:254 src/main/print-escp2.c:239 -#: src/main/print-lexmark.c:290 src/main/print-olympus.c:1723 -#: src/main/print-pcl.c:1220 src/main/print-ps.c:91 src/main/print-raw.c:80 +#: src/main/print-canon.c:254 src/main/print-escp2.c:241 +#: src/main/print-lexmark.c:290 src/main/print-olympus.c:1721 +#: src/main/print-pcl.c:1288 src/main/print-raw.c:80 msgid "Ink Type" msgstr "Tipo de Tinta" -#: src/main/print-canon.c:255 src/main/print-escp2.c:240 -#: src/main/print-escp2.c:252 src/main/print-lexmark.c:291 -#: src/main/print-olympus.c:1724 src/main/print-pcl.c:1221 -#: src/main/print-ps.c:92 src/main/print-raw.c:81 +#: src/main/print-canon.c:255 src/main/print-escp2.c:242 +#: src/main/print-escp2.c:254 src/main/print-lexmark.c:291 +#: src/main/print-olympus.c:1722 src/main/print-pcl.c:1289 +#: 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:260 src/main/print-canon.c:261 -#: src/main/print-escp2.c:329 src/main/print-escp2.c:330 +#: src/main/print-escp2.c:331 src/main/print-escp2.c:332 #: src/main/print-lexmark.c:296 src/main/print-lexmark.c:297 -#: src/main/print-pcl.c:1226 src/main/print-pcl.c:1227 +#: src/main/print-pcl.c:1294 src/main/print-pcl.c:1295 msgid "Ink Channels" msgstr "" -#: src/main/print-canon.c:260 src/main/print-escp2.c:130 -#: src/main/print-escp2.c:137 src/main/print-escp2.c:144 -#: src/main/print-escp2.c:287 src/main/print-escp2.c:293 -#: src/main/print-escp2.c:299 src/main/print-escp2.c:305 -#: src/main/print-escp2.c:311 src/main/print-escp2.c:317 -#: src/main/print-escp2.c:323 src/main/print-escp2.c:329 -#: src/main/print-escp2.c:335 src/main/print-lexmark.c:296 -#: src/main/print-pcl.c:1226 +#: src/main/print-canon.c:260 src/main/print-escp2.c:132 +#: src/main/print-escp2.c:139 src/main/print-escp2.c:146 +#: src/main/print-escp2.c:289 src/main/print-escp2.c:295 +#: src/main/print-escp2.c:301 src/main/print-escp2.c:307 +#: src/main/print-escp2.c:313 src/main/print-escp2.c:319 +#: src/main/print-escp2.c:325 src/main/print-escp2.c:331 +#: src/main/print-escp2.c:337 src/main/print-lexmark.c:296 +#: src/main/print-pcl.c:1294 msgid "Advanced Printer Functionality" msgstr "" -#: src/main/print-canon.c:266 src/main/print-escp2.c:341 -#: src/main/print-lexmark.c:302 src/main/print-olympus.c:1741 -#: src/main/print-pcl.c:1232 src/main/print-ps.c:103 src/main/print-raw.c:86 +#: src/main/print-canon.c:266 src/main/print-escp2.c:343 +#: src/main/print-lexmark.c:302 src/main/print-olympus.c:1739 +#: src/main/print-pcl.c:1300 src/main/print-ps.c:80 src/main/print-raw.c:86 #, fuzzy msgid "Printing Mode" msgstr "Modelo de Impresora:" #: src/main/print-canon.c:266 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:341 -#: src/main/print-escp2.c:347 src/main/print-lexmark.c:302 -#: src/main/print-olympus.c:1741 src/main/print-pcl.c:1232 -#: src/main/print-ps.c:103 src/main/print-raw.c:86 +#: src/main/print-color.c:208 src/main/print-escp2.c:343 +#: src/main/print-escp2.c:349 src/main/print-lexmark.c:302 +#: src/main/print-olympus.c:1739 src/main/print-pcl.c:1300 +#: src/main/print-ps.c:80 src/main/print-raw.c:86 #, fuzzy msgid "Core Parameter" -msgstr "Papel Común" +msgstr "Papel Común" -#: src/main/print-canon.c:267 src/main/print-escp2.c:342 -#: src/main/print-lexmark.c:303 src/main/print-olympus.c:1742 -#: src/main/print-pcl.c:1233 src/main/print-ps.c:104 src/main/print-raw.c:87 +#: src/main/print-canon.c:267 src/main/print-escp2.c:344 +#: src/main/print-lexmark.c:303 src/main/print-olympus.c:1740 +#: src/main/print-pcl.c:1301 src/main/print-ps.c:81 src/main/print-raw.c:87 msgid "Printing Output Mode" msgstr "" -#: src/main/print-canon.c:272 src/main/print-pcl.c:1238 +#: src/main/print-canon.c:272 src/main/print-pcl.c:1306 msgid "Double-Sided Printing" msgstr "" -#: src/main/print-canon.c:273 src/main/print-pcl.c:1239 +#: src/main/print-canon.c:273 src/main/print-pcl.c:1307 msgid "Duplex/Tumble Setting" msgstr "" -#: src/main/print-canon.c:295 src/main/print-escp2.c:439 -#: src/main/print-lexmark.c:325 src/main/print-pcl.c:1261 +#: src/main/print-canon.c:295 src/main/print-escp2.c:446 +#: src/main/print-lexmark.c:325 src/main/print-pcl.c:1329 #, fuzzy msgid "Cyan Density" msgstr "Densidad:" -#: src/main/print-canon.c:296 src/main/print-escp2.c:440 -#: src/main/print-lexmark.c:326 src/main/print-pcl.c:1262 +#: src/main/print-canon.c:296 src/main/print-escp2.c:447 +#: src/main/print-lexmark.c:326 src/main/print-pcl.c:1330 #, fuzzy msgid "Adjust the cyan density" -msgstr "Ajustar el balance de cian de la impresión" +msgstr "Ajustar el balance de cian de la impresión" -#: src/main/print-canon.c:303 src/main/print-escp2.c:447 -#: src/main/print-lexmark.c:333 src/main/print-pcl.c:1269 +#: src/main/print-canon.c:303 src/main/print-escp2.c:454 +#: src/main/print-lexmark.c:333 src/main/print-pcl.c:1337 #, fuzzy msgid "Magenta Density" msgstr "Magenta" -#: src/main/print-canon.c:304 src/main/print-escp2.c:448 -#: src/main/print-lexmark.c:334 src/main/print-pcl.c:1270 +#: src/main/print-canon.c:304 src/main/print-escp2.c:455 +#: src/main/print-lexmark.c:334 src/main/print-pcl.c:1338 #, fuzzy msgid "Adjust the magenta density" -msgstr "Ajusta el balance magenta de la impresión" +msgstr "Ajusta el balance magenta de la impresión" -#: src/main/print-canon.c:311 src/main/print-escp2.c:455 -#: src/main/print-lexmark.c:341 src/main/print-pcl.c:1277 +#: src/main/print-canon.c:311 src/main/print-escp2.c:462 +#: src/main/print-lexmark.c:341 src/main/print-pcl.c:1345 #, fuzzy msgid "Yellow Density" msgstr "Densidad:" -#: src/main/print-canon.c:312 src/main/print-escp2.c:456 -#: src/main/print-lexmark.c:342 src/main/print-pcl.c:1278 +#: src/main/print-canon.c:312 src/main/print-escp2.c:463 +#: src/main/print-lexmark.c:342 src/main/print-pcl.c:1346 #, fuzzy msgid "Adjust the yellow density" -msgstr "Ajusta el balance amarillo de la impresión" +msgstr "Ajusta el balance amarillo de la impresión" -#: src/main/print-canon.c:319 src/main/print-escp2.c:463 -#: src/main/print-lexmark.c:349 src/main/print-pcl.c:1285 +#: src/main/print-canon.c:319 src/main/print-escp2.c:470 +#: src/main/print-lexmark.c:349 src/main/print-pcl.c:1353 #, fuzzy msgid "Black Density" msgstr "Densidad:" -#: src/main/print-canon.c:320 src/main/print-escp2.c:464 -#: src/main/print-lexmark.c:350 src/main/print-pcl.c:1286 +#: src/main/print-canon.c:320 src/main/print-escp2.c:471 +#: src/main/print-lexmark.c:350 src/main/print-pcl.c:1354 #, fuzzy msgid "Adjust the black density" -msgstr "Ajustar el balance de cian de la impresión" +msgstr "Ajustar el balance de cian de la impresión" #: src/main/print-canon.c:327 src/main/print-canon.c:328 -#: src/main/print-escp2.c:495 src/main/print-escp2.c:496 +#: src/main/print-escp2.c:534 src/main/print-escp2.c:535 #: src/main/print-lexmark.c:357 src/main/print-lexmark.c:358 -#: src/main/print-pcl.c:1293 src/main/print-pcl.c:1294 +#: src/main/print-pcl.c:1361 src/main/print-pcl.c:1362 #, fuzzy msgid "Light Cyan Transition" msgstr "Cian Claro" #: src/main/print-canon.c:327 src/main/print-canon.c:335 -#: src/main/print-canon.c:343 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-escp2.c:543 -#: src/main/print-escp2.c:551 src/main/print-escp2.c:559 -#: src/main/print-lexmark.c:357 src/main/print-lexmark.c:365 -#: src/main/print-pcl.c:1293 src/main/print-pcl.c:1301 +#: src/main/print-canon.c:343 src/main/print-escp2.c:502 +#: src/main/print-escp2.c:510 src/main/print-escp2.c:518 +#: src/main/print-escp2.c:526 src/main/print-escp2.c:534 +#: src/main/print-escp2.c:542 src/main/print-escp2.c:550 +#: src/main/print-escp2.c:558 src/main/print-escp2.c:566 +#: src/main/print-escp2.c:574 src/main/print-escp2.c:582 +#: src/main/print-escp2.c:590 src/main/print-escp2.c:598 +#: src/main/print-escp2.c:606 src/main/print-escp2.c:614 +#: src/main/print-escp2.c:622 src/main/print-escp2.c:630 +#: src/main/print-escp2.c:638 src/main/print-escp2.c:646 +#: src/main/print-escp2.c:654 src/main/print-escp2.c:662 +#: src/main/print-escp2.c:670 src/main/print-escp2.c:678 +#: src/main/print-escp2.c:686 src/main/print-escp2.c:694 +#: src/main/print-escp2.c:702 src/main/print-escp2.c:710 +#: src/main/print-escp2.c:718 src/main/print-escp2.c:726 +#: src/main/print-escp2.c:734 src/main/print-lexmark.c:357 +#: src/main/print-lexmark.c:365 src/main/print-pcl.c:1361 +#: src/main/print-pcl.c:1369 msgid "Advanced Ink Adjustment" msgstr "" #: src/main/print-canon.c:335 src/main/print-canon.c:336 -#: src/main/print-escp2.c:503 src/main/print-escp2.c:504 +#: src/main/print-escp2.c:566 src/main/print-escp2.c:567 #: src/main/print-lexmark.c:365 src/main/print-lexmark.c:366 -#: src/main/print-pcl.c:1301 src/main/print-pcl.c:1302 +#: src/main/print-pcl.c:1369 src/main/print-pcl.c:1370 #, fuzzy msgid "Light Magenta Transition" msgstr "Magenta Claro" @@ -417,55 +439,55 @@ msgstr "Magenta Claro" msgid "Light Yellow Transition" msgstr "Cian Claro" -#: src/main/print-canon.c:363 src/main/print-pcl.c:1482 +#: src/main/print-canon.c:363 src/main/print-pcl.c:1550 #: src/main/escp2-resolutions.c:557 src/main/escp2-resolutions.c:565 #: src/main/escp2-resolutions.c:576 src/main/escp2-resolutions.c:588 msgid "Off" msgstr "" -#: src/main/print-canon.c:364 src/main/print-pcl.c:1483 +#: src/main/print-canon.c:364 src/main/print-pcl.c:1551 msgid "Long Edge (Standard)" msgstr "" -#: src/main/print-canon.c:365 src/main/print-pcl.c:1484 +#: src/main/print-canon.c:365 src/main/print-pcl.c:1552 msgid "Short Edge (Flip)" msgstr "" -#: src/main/print-canon.c:629 src/main/print-escp2.c:1648 +#: src/main/print-canon.c:629 src/main/print-escp2.c:2012 #: src/main/xmli18n-tmp.h:6 msgid "CD - 5 inch" msgstr "" -#: src/main/print-canon.c:631 src/main/print-escp2.c:1650 +#: src/main/print-canon.c:631 src/main/print-escp2.c:2014 #: src/main/xmli18n-tmp.h:7 msgid "CD - 3 inch" msgstr "" -#: src/main/print-canon.c:633 src/main/print-escp2.c:1652 +#: src/main/print-canon.c:633 src/main/print-escp2.c:2016 #: src/main/xmli18n-tmp.h:8 #, fuzzy msgid "CD - Custom" msgstr "Personalizado" -#: src/main/print-canon.c:656 src/main/print-escp2.c:1677 +#: src/main/print-canon.c:656 src/main/print-escp2.c:2041 msgid "Normal" msgstr "" -#: src/main/print-canon.c:658 src/main/print-escp2.c:1679 +#: src/main/print-canon.c:658 src/main/print-escp2.c:2043 #, fuzzy msgid "Print To Hub" -msgstr "¿Imprimir a un archivo?" +msgstr "¿Imprimir a un archivo?" -#: src/main/print-canon.c:773 src/main/print-escp2.c:2011 -#: src/main/print-lexmark.c:1279 src/main/print-olympus.c:1996 -#: src/main/print-pcl.c:1776 src/main/print-ps.c:170 src/main/print-raw.c:135 -#: src/gutenprintui/panel.c:289 src/gutenprintui2/panel.c:289 +#: src/main/print-canon.c:773 src/main/print-escp2.c:2450 +#: src/main/print-lexmark.c:1279 src/main/print-olympus.c:1994 +#: src/main/print-pcl.c:1844 src/main/print-ps.c:310 src/main/print-raw.c:135 +#: src/gutenprintui2/panel.c:290 msgid "Color" msgstr "Color" -#: src/main/print-canon.c:775 src/main/print-escp2.c:2013 -#: src/main/print-lexmark.c:1281 src/main/print-pcl.c:1778 -#: src/main/print-ps.c:172 src/main/print-raw.c:137 +#: src/main/print-canon.c:775 src/main/print-escp2.c:2452 +#: src/main/print-lexmark.c:1281 src/main/print-pcl.c:1846 +#: src/main/print-ps.c:312 src/main/print-raw.c:137 #, fuzzy msgid "Black and White" msgstr "Blanco y Negro" @@ -477,7 +499,7 @@ msgstr "" #: src/main/print-color.c:51 #, fuzzy msgid "Bright Colors" -msgstr "Ajuste de Impresión en Color" +msgstr "Ajuste de Impresión en Color" #: src/main/print-color.c:52 msgid "Correct Hue Only" @@ -506,7 +528,7 @@ msgstr "Imprimir" #: src/main/print-color.c:121 src/main/escp2-channels.c:916 #: src/main/escp2-channels.c:929 src/main/escp2-channels.c:943 -#: src/gutenprintui/panel.c:290 src/gutenprintui2/panel.c:290 +#: src/gutenprintui2/panel.c:291 msgid "Grayscale" msgstr "Tonos de gris" @@ -531,7 +553,7 @@ msgstr "" msgid "KCMY" msgstr "" -#: src/main/print-color.c:165 src/main/print-color.c:446 +#: src/main/print-color.c:165 src/main/print-color.c:454 #, fuzzy msgid "Channel " msgstr "Cancelar" @@ -593,7 +615,7 @@ msgid "Output image type" msgstr "Tipo de salida:" #: src/main/print-color.c:208 src/main/print-color.c:209 -#: src/main/print-escp2.c:347 +#: src/main/print-escp2.c:349 msgid "Raw Channels" msgstr "" @@ -614,7 +636,7 @@ msgstr "Brillo:" #: src/main/print-color.c:225 #, fuzzy msgid "Brightness of the print" -msgstr "Establecer el alto de la impresión" +msgstr "Establecer el alto de la impresión" #: src/main/print-color.c:232 #, fuzzy @@ -648,9 +670,9 @@ 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 "" -"Ajusta el gamma de la impresión. Valores más grandes producirán generalmente " -"una impresión más clara, mientras que valores más pequeñosproducirán " -"generalmente una impresión más oscura. Negro y blanco permanecerán iguales, " +"Ajusta el gamma de la impresión. Valores más grandes producirán generalmente " +"una impresión más clara, mientras que valores más pequeñosproducirán " +"generalmente una impresión más oscura. Negro y blanco permanecerán iguales, " "distinto a lo que sucede con el ajuste de brillo.." #: src/main/print-color.c:258 @@ -662,14 +684,14 @@ msgstr "Gamma:" msgid "Gamma value assumed by application" msgstr "" -#: src/main/print-color.c:266 src/main/escp2-channels.c:3048 -#: src/main/escp2-channels.c:3060 src/main/escp2-channels.c:3068 -#: src/main/escp2-channels.c:3078 src/main/escp2-channels.c:3089 -#: src/main/escp2-channels.c:3101 src/main/escp2-channels.c:3117 -#: src/main/escp2-channels.c:3125 src/main/escp2-channels.c:3138 -#: src/main/escp2-channels.c:3151 src/main/escp2-channels.c:3165 -#: src/main/escp2-channels.c:3179 src/main/escp2-channels.c:3194 -#: src/gutenprintui/panel.c:2152 src/gutenprintui2/panel.c:2153 +#: src/main/print-color.c:266 src/main/escp2-channels.c:3087 +#: src/main/escp2-channels.c:3099 src/main/escp2-channels.c:3107 +#: src/main/escp2-channels.c:3117 src/main/escp2-channels.c:3128 +#: src/main/escp2-channels.c:3140 src/main/escp2-channels.c:3156 +#: src/main/escp2-channels.c:3164 src/main/escp2-channels.c:3177 +#: src/main/escp2-channels.c:3190 src/main/escp2-channels.c:3204 +#: src/main/escp2-channels.c:3218 src/main/escp2-channels.c:3230 +#: src/main/escp2-channels.c:3243 src/gutenprintui2/panel.c:2328 #: src/escputil/escputil.c:978 src/escputil/escputil.c:997 #: src/escputil/escputil.c:1201 msgid "Cyan" @@ -678,16 +700,16 @@ msgstr "Cian" #: src/main/print-color.c:267 #, fuzzy msgid "Adjust the cyan gamma" -msgstr "Ajustar el balance de cian de la impresión" - -#: src/main/print-color.c:274 src/main/escp2-channels.c:3049 -#: src/main/escp2-channels.c:3059 src/main/escp2-channels.c:3070 -#: src/main/escp2-channels.c:3079 src/main/escp2-channels.c:3090 -#: src/main/escp2-channels.c:3103 src/main/escp2-channels.c:3116 -#: src/main/escp2-channels.c:3126 src/main/escp2-channels.c:3139 -#: src/main/escp2-channels.c:3152 src/main/escp2-channels.c:3164 -#: src/main/escp2-channels.c:3178 src/main/escp2-channels.c:3195 -#: src/gutenprintui/panel.c:2159 src/gutenprintui2/panel.c:2160 +msgstr "Ajustar el balance de cian de la impresión" + +#: src/main/print-color.c:274 src/main/escp2-channels.c:3088 +#: src/main/escp2-channels.c:3098 src/main/escp2-channels.c:3109 +#: src/main/escp2-channels.c:3118 src/main/escp2-channels.c:3129 +#: src/main/escp2-channels.c:3142 src/main/escp2-channels.c:3155 +#: src/main/escp2-channels.c:3165 src/main/escp2-channels.c:3178 +#: src/main/escp2-channels.c:3191 src/main/escp2-channels.c:3203 +#: src/main/escp2-channels.c:3217 src/main/escp2-channels.c:3229 +#: src/main/escp2-channels.c:3244 src/gutenprintui2/panel.c:2335 #: src/escputil/escputil.c:979 src/escputil/escputil.c:998 #: src/escputil/escputil.c:1202 msgid "Magenta" @@ -696,16 +718,16 @@ msgstr "Magenta" #: src/main/print-color.c:275 #, fuzzy msgid "Adjust the magenta gamma" -msgstr "Ajusta el balance magenta de la impresión" - -#: src/main/print-color.c:282 src/main/escp2-channels.c:3050 -#: src/main/escp2-channels.c:3061 src/main/escp2-channels.c:3069 -#: src/main/escp2-channels.c:3080 src/main/escp2-channels.c:3091 -#: src/main/escp2-channels.c:3105 src/main/escp2-channels.c:3112 -#: src/main/escp2-channels.c:3127 src/main/escp2-channels.c:3140 -#: src/main/escp2-channels.c:3153 src/main/escp2-channels.c:3163 -#: src/main/escp2-channels.c:3177 src/main/escp2-channels.c:3196 -#: src/gutenprintui/panel.c:2166 src/gutenprintui2/panel.c:2167 +msgstr "Ajusta el balance magenta de la impresión" + +#: src/main/print-color.c:282 src/main/escp2-channels.c:3089 +#: src/main/escp2-channels.c:3100 src/main/escp2-channels.c:3108 +#: src/main/escp2-channels.c:3119 src/main/escp2-channels.c:3130 +#: src/main/escp2-channels.c:3144 src/main/escp2-channels.c:3151 +#: src/main/escp2-channels.c:3166 src/main/escp2-channels.c:3179 +#: src/main/escp2-channels.c:3192 src/main/escp2-channels.c:3202 +#: src/main/escp2-channels.c:3216 src/main/escp2-channels.c:3228 +#: src/main/escp2-channels.c:3245 src/gutenprintui2/panel.c:2342 #: src/escputil/escputil.c:980 src/escputil/escputil.c:999 #: src/escputil/escputil.c:1203 msgid "Yellow" @@ -714,51 +736,48 @@ msgstr "Amarillo" #: src/main/print-color.c:283 #, fuzzy msgid "Adjust the yellow gamma" -msgstr "Ajusta el balance amarillo de la impresión" +msgstr "Ajusta el balance amarillo de la impresión" -#: src/main/print-color.c:290 src/main/escp2-channels.c:3168 -#: src/main/escp2-channels.c:3181 src/gutenprintui/panel.c:2180 -#: src/gutenprintui2/panel.c:2181 src/escputil/escputil.c:987 -#: src/escputil/escputil.c:1005 +#: src/main/print-color.c:290 src/main/escp2-channels.c:3207 +#: src/main/escp2-channels.c:3220 src/gutenprintui2/panel.c:2356 +#: src/escputil/escputil.c:987 src/escputil/escputil.c:1005 msgid "Red" msgstr "" #: src/main/print-color.c:291 #, fuzzy msgid "Adjust the red gamma" -msgstr "Ajusta el balance amarillo de la impresión" +msgstr "Ajusta el balance amarillo de la impresión" -#: src/main/print-color.c:298 src/gutenprintui/panel.c:2187 -#: src/gutenprintui2/panel.c:2188 +#: src/main/print-color.c:298 src/gutenprintui2/panel.c:2363 msgid "Green" msgstr "" #: src/main/print-color.c:299 #, fuzzy msgid "Adjust the green gamma" -msgstr "Ajusta el balance magenta de la impresión" +msgstr "Ajusta el balance magenta de la impresión" -#: src/main/print-color.c:306 src/main/escp2-channels.c:3169 -#: src/main/escp2-channels.c:3182 src/gutenprintui/panel.c:2194 -#: src/gutenprintui2/panel.c:2195 src/escputil/escputil.c:988 -#: src/escputil/escputil.c:1006 +#: src/main/print-color.c:306 src/main/escp2-channels.c:3208 +#: src/main/escp2-channels.c:3221 src/gutenprintui2/panel.c:2370 +#: src/escputil/escputil.c:988 src/escputil/escputil.c:1006 msgid "Blue" msgstr "" #: src/main/print-color.c:307 #, fuzzy msgid "Adjust the blue gamma" -msgstr "Ajustar el balance de cian de la impresión" +msgstr "Ajustar el balance de cian de la impresión" #: src/main/print-color.c:314 src/main/print-lexmark.c:613 -#: src/main/escp2-channels.c:3047 src/main/escp2-channels.c:3057 -#: src/main/escp2-channels.c:3058 src/main/escp2-channels.c:3071 -#: src/main/escp2-channels.c:3081 src/main/escp2-channels.c:3088 -#: src/main/escp2-channels.c:3100 src/main/escp2-channels.c:3113 -#: src/main/escp2-channels.c:3124 src/main/escp2-channels.c:3137 -#: src/main/escp2-channels.c:3150 src/main/escp2-channels.c:3156 -#: src/main/escp2-channels.c:3180 src/main/escp2-channels.c:3193 -#: src/gutenprintui/panel.c:2173 src/gutenprintui2/panel.c:2174 +#: src/main/escp2-channels.c:3086 src/main/escp2-channels.c:3096 +#: src/main/escp2-channels.c:3097 src/main/escp2-channels.c:3110 +#: src/main/escp2-channels.c:3120 src/main/escp2-channels.c:3127 +#: src/main/escp2-channels.c:3139 src/main/escp2-channels.c:3152 +#: src/main/escp2-channels.c:3163 src/main/escp2-channels.c:3176 +#: src/main/escp2-channels.c:3189 src/main/escp2-channels.c:3195 +#: src/main/escp2-channels.c:3219 src/main/escp2-channels.c:3231 +#: src/main/escp2-channels.c:3242 src/gutenprintui2/panel.c:2349 #: src/escputil/escputil.c:975 src/escputil/escputil.c:996 #: src/escputil/escputil.c:1200 msgid "Black" @@ -767,9 +786,9 @@ msgstr "Negro" #: src/main/print-color.c:315 #, fuzzy msgid "Adjust the black gamma" -msgstr "Ajustar el balance de cian de la impresión" +msgstr "Ajustar el balance de cian de la impresión" -#: src/main/print-color.c:322 src/main/print-olympus.c:1764 +#: src/main/print-color.c:322 src/main/print-olympus.c:1762 msgid "Cyan Balance" msgstr "" @@ -782,9 +801,9 @@ msgstr "Tonos de gris" #: src/main/print-color.c:323 #, fuzzy msgid "Adjust the cyan gray balance" -msgstr "Ajustar el balance de cian de la impresión" +msgstr "Ajustar el balance de cian de la impresión" -#: src/main/print-color.c:330 src/main/print-olympus.c:1772 +#: src/main/print-color.c:330 src/main/print-olympus.c:1770 #, fuzzy msgid "Magenta Balance" msgstr "Magenta" @@ -792,30 +811,30 @@ msgstr "Magenta" #: src/main/print-color.c:331 #, fuzzy msgid "Adjust the magenta gray balance" -msgstr "Ajusta el balance magenta de la impresión" +msgstr "Ajusta el balance magenta de la impresión" -#: src/main/print-color.c:338 src/main/print-olympus.c:1780 +#: src/main/print-color.c:338 src/main/print-olympus.c:1778 #, fuzzy msgid "Yellow Balance" -msgstr "Ajusta el balance amarillo de la impresión" +msgstr "Ajusta el balance amarillo de la impresión" #: src/main/print-color.c:339 #, fuzzy msgid "Adjust the yellow gray balance" -msgstr "Ajusta el balance amarillo de la impresión" +msgstr "Ajusta el balance amarillo de la impresión" #: src/main/print-color.c:346 #, fuzzy msgid "Saturation" -msgstr "Saturación:" +msgstr "Saturación:" #: 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 "" -"Ajusta la saturación (balance de color) de la impresión\n" -"Usar saturación cero para producir salida de tonos de grises usando tintas " +"Ajusta la saturación (balance de color) de la impresión\n" +"Usar saturación cero para producir salida de tonos de grises usando tintas " "color y negro." #: src/main/print-color.c:357 @@ -825,9 +844,11 @@ msgstr "Tipo de Tinta" #: 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:353 -#: src/main/print-escp2.c:359 src/main/print-escp2.c:365 -#: src/main/print-escp2.c:371 src/main/print-escp2.c:377 +#: src/main/print-color.c:421 src/main/print-color.c:553 +#: src/main/print-escp2.c:355 src/main/print-escp2.c:361 +#: src/main/print-escp2.c:367 src/main/print-escp2.c:373 +#: src/main/print-escp2.c:379 src/main/print-escp2.c:742 +#: src/main/print-escp2.c:750 src/main/print-escp2.c:758 #, fuzzy msgid "Advanced Output Control" msgstr "Tipo de salida:" @@ -836,553 +857,670 @@ msgstr "Tipo de salida:" msgid "Limit the total ink printed to the page" msgstr "" -#: src/main/print-color.c:365 +#: src/main/print-color.c:365 src/main/print-escp2.c:742 msgid "GCR Transition" msgstr "" -#: src/main/print-color.c:366 +#: src/main/print-color.c:366 src/main/print-escp2.c:743 msgid "Adjust the gray component transition rate" msgstr "" -#: src/main/print-color.c:373 +#: src/main/print-color.c:373 src/main/print-escp2.c:750 msgid "GCR Lower Bound" msgstr "" -#: src/main/print-color.c:374 +#: src/main/print-color.c:374 src/main/print-escp2.c:751 msgid "Lower bound of gray component reduction" msgstr "" -#: src/main/print-color.c:381 +#: src/main/print-color.c:381 src/main/print-escp2.c:758 msgid "GCR Upper Bound" msgstr "" -#: src/main/print-color.c:382 +#: src/main/print-color.c:382 src/main/print-escp2.c:759 msgid "Upper bound of gray component reduction" msgstr "" -#: src/main/print-color.c:447 src/main/print-color.c:457 -#: src/main/print-color.c:465 src/main/print-color.c:473 -#: src/main/print-color.c:481 src/main/print-color.c:489 -#: src/main/print-color.c:497 src/main/print-color.c:505 -#: src/main/print-color.c:513 +#: src/main/print-color.c:421 +msgid "LUT dump file" +msgstr "" + +#: src/main/print-color.c:422 +msgid "Dump file for LUT for external color adjustment" +msgstr "" + +#: src/main/print-color.c:455 src/main/print-color.c:465 +#: src/main/print-color.c:473 src/main/print-color.c:481 +#: src/main/print-color.c:489 src/main/print-color.c:497 +#: src/main/print-color.c:505 src/main/print-color.c:513 +#: src/main/print-color.c:521 #, fuzzy msgid "Output Curves" msgstr "Tipo de salida:" -#: src/main/print-color.c:447 +#: src/main/print-color.c:455 msgid "Curve for raw channel " msgstr "" -#: src/main/print-color.c:457 +#: src/main/print-color.c:465 msgid "Cyan Curve" msgstr "" -#: src/main/print-color.c:458 +#: src/main/print-color.c:466 #, fuzzy msgid "Cyan curve" msgstr "Cancelar" -#: src/main/print-color.c:465 +#: src/main/print-color.c:473 #, fuzzy msgid "Magenta Curve" msgstr "Magenta" -#: src/main/print-color.c:466 +#: src/main/print-color.c:474 #, fuzzy msgid "Magenta curve" msgstr "Magenta" -#: src/main/print-color.c:473 +#: src/main/print-color.c:481 #, fuzzy msgid "Yellow Curve" msgstr "Amarillo" -#: src/main/print-color.c:474 +#: src/main/print-color.c:482 #, fuzzy msgid "Yellow curve" msgstr "Amarillo" -#: src/main/print-color.c:481 +#: src/main/print-color.c:489 #, fuzzy msgid "Black Curve" msgstr "Negro" -#: src/main/print-color.c:482 +#: src/main/print-color.c:490 #, fuzzy msgid "Black curve" msgstr "Negro" -#: src/main/print-color.c:489 +#: src/main/print-color.c:497 #, fuzzy msgid "Red Curve" msgstr "Amarillo" -#: src/main/print-color.c:490 +#: src/main/print-color.c:498 #, fuzzy msgid "Red curve" msgstr "Amarillo" -#: src/main/print-color.c:497 +#: src/main/print-color.c:505 #, fuzzy msgid "Green Curve" msgstr "Magenta" -#: src/main/print-color.c:498 +#: src/main/print-color.c:506 #, fuzzy msgid "Green curve" msgstr "Magenta" -#: src/main/print-color.c:505 +#: src/main/print-color.c:513 #, fuzzy msgid "Blue Curve" msgstr "Negro" -#: src/main/print-color.c:506 +#: src/main/print-color.c:514 #, fuzzy msgid "Blue curve" msgstr "Negro" -#: src/main/print-color.c:513 +#: src/main/print-color.c:521 #, fuzzy msgid "White Curve" msgstr "Amarillo" -#: src/main/print-color.c:514 +#: src/main/print-color.c:522 #, fuzzy msgid "White curve" msgstr "Amarillo" -#: src/main/print-color.c:521 +#: src/main/print-color.c:529 msgid "Hue Map" msgstr "" -#: src/main/print-color.c:521 src/main/print-color.c:529 -#: src/main/print-color.c:537 +#: src/main/print-color.c:529 src/main/print-color.c:537 +#: src/main/print-color.c:545 msgid "Advanced HSL Curves" msgstr "" -#: src/main/print-color.c:522 +#: src/main/print-color.c:530 msgid "Hue adjustment curve" msgstr "" -#: src/main/print-color.c:529 +#: src/main/print-color.c:537 #, fuzzy msgid "Saturation Map" -msgstr "Saturación:" +msgstr "Saturación:" -#: src/main/print-color.c:530 +#: src/main/print-color.c:538 msgid "Saturation adjustment curve" msgstr "" -#: src/main/print-color.c:537 +#: src/main/print-color.c:545 msgid "Luminosity Map" msgstr "" -#: src/main/print-color.c:538 +#: src/main/print-color.c:546 msgid "Luminosity adjustment curve" msgstr "" -#: src/main/print-color.c:545 +#: src/main/print-color.c:553 msgid "Gray Component Reduction" msgstr "" -#: src/main/print-color.c:546 +#: src/main/print-color.c:554 msgid "Gray component reduction curve" msgstr "" -#: src/main/print-color.c:1670 +#: src/main/print-color.c:1743 msgid "Traditional Gutenprint color conversion" msgstr "" -#: src/main/printers.c:517 +#: src/main/printers.c:514 #, c-format msgid "Value must be set for %s\n" msgstr "" -#: src/main/printers.c:530 src/main/printers.c:535 +#: src/main/printers.c:527 src/main/printers.c:532 #, fuzzy, c-format msgid "`%s' is not a valid %s\n" -msgstr "%s no es un parámetreo válido del tipo %s\n" +msgstr "%s no es un parámetreo válido del tipo %s\n" -#: src/main/printers.c:554 +#: src/main/printers.c:551 #, c-format msgid "%s must be between %f and %f (is %f)\n" msgstr "" -#: src/main/printers.c:576 src/main/printers.c:600 +#: src/main/printers.c:573 src/main/printers.c:597 #, c-format msgid "%s must be between %d and %d (is %d)\n" msgstr "" -#: src/main/printers.c:631 +#: src/main/printers.c:628 #, c-format msgid "%s bounds must be between %f and %f\n" msgstr "" -#: src/main/printers.c:639 +#: src/main/printers.c:636 #, c-format msgid "%s wrap mode must be %s\n" msgstr "" -#: src/main/printers.c:643 +#: src/main/printers.c:640 msgid "no wrap" msgstr "" -#: src/main/printers.c:643 +#: src/main/printers.c:640 msgid "wrap around" msgstr "" -#: src/main/printers.c:687 +#: src/main/printers.c:684 #, fuzzy, c-format msgid "Unknown type parameter %s (%d)\n" msgstr "Impresora desconocida %s\n" -#: src/main/printers.c:700 src/main/printers.c:711 +#: src/main/printers.c:697 src/main/printers.c:708 #, c-format msgid "%s out of range (value %d, min %d, max %d)\n" -msgstr "%s fuera de rango (valor %d, mín %d, máx %d)\n" +msgstr "%s fuera de rango (valor %d, mín %d, máx %d)\n" -#: src/main/printers.c:772 +#: src/main/printers.c:768 #, fuzzy msgid "Page size is not valid\n" -msgstr "La medida de la imagen no es válida\n" +msgstr "La medida de la imagen no es válida\n" -#: src/main/printers.c:793 +#: src/main/printers.c:789 #, fuzzy, c-format msgid "Top margin must not be less than %d\n" msgstr "El margen superior no debe ser menos que cero\n" -#: src/main/printers.c:799 +#: src/main/printers.c:795 #, fuzzy, c-format msgid "Left margin must not be less than %d\n" msgstr "El margen izquierdo no debe ser menos que cero\n" -#: src/main/printers.c:805 +#: src/main/printers.c:801 #, fuzzy msgid "Height must be greater than zero\n" msgstr "El margen izquierdo no debe ser menos que cero\n" -#: src/main/printers.c:811 +#: src/main/printers.c:807 #, fuzzy msgid "Width must be greater than zero\n" msgstr "El margen superior no debe ser menos que cero\n" -#: src/main/printers.c:817 +#: src/main/printers.c:813 #, c-format msgid "" "Image is too wide for the page: left margin is %d, width %d, right edge is %" "d\n" msgstr "" -#: src/main/printers.c:824 +#: src/main/printers.c:820 #, c-format msgid "" "Image is too long for the page: top margin is %d, height %d, bottom edge is %" "d\n" msgstr "" -#: src/main/print-escp2.c:162 +#: src/main/print-escp2.c:164 msgid "Automatic Printing Mode" msgstr "" -#: src/main/print-escp2.c:162 src/main/print-escp2.c:174 +#: src/main/print-escp2.c:164 src/main/print-escp2.c:176 #: src/main/generic-options.c:62 msgid "Basic Output Adjustment" msgstr "" -#: src/main/print-escp2.c:163 +#: src/main/print-escp2.c:165 msgid "Automatic printing mode" msgstr "" -#: src/main/print-escp2.c:174 src/main/print-escp2.c:175 +#: src/main/print-escp2.c:176 src/main/print-escp2.c:177 #: src/main/generic-options.c:62 src/main/generic-options.c:63 #, fuzzy msgid "Print Quality" -msgstr "720 PPP Altísima Calidad" +msgstr "720 PPP Altísima Calidad" -#: src/main/print-escp2.c:229 +#: src/main/print-escp2.c:231 #, fuzzy msgid "Resolution of the print" -msgstr "Resolución y calidad de la impresión" +msgstr "Resolución y calidad de la impresión" -#: src/main/print-escp2.c:245 +#: src/main/print-escp2.c:247 msgid "Enhanced Gloss" msgstr "" -#: src/main/print-escp2.c:246 +#: src/main/print-escp2.c:248 msgid "Add gloss enhancement" msgstr "" -#: src/main/print-escp2.c:251 +#: src/main/print-escp2.c:253 #, fuzzy msgid "Ink Set" msgstr "Tipo de Tinta" -#: src/main/print-escp2.c:257 +#: src/main/print-escp2.c:259 msgid "Printing Direction" msgstr "" -#: src/main/print-escp2.c:257 src/main/print-escp2.c:269 +#: src/main/print-escp2.c:259 src/main/print-escp2.c:271 msgid "Advanced Output Adjustment" msgstr "" -#: src/main/print-escp2.c:258 +#: src/main/print-escp2.c:260 msgid "Printing direction (unidirectional is higher quality, but slower)" msgstr "" -#: src/main/print-escp2.c:263 src/main/print-olympus.c:1735 +#: src/main/print-escp2.c:265 src/main/print-olympus.c:1733 msgid "Borderless" msgstr "" -#: src/main/print-escp2.c:264 src/main/print-olympus.c:1736 +#: src/main/print-escp2.c:266 src/main/print-olympus.c:1734 msgid "Print without borders" msgstr "" -#: src/main/print-escp2.c:269 +#: src/main/print-escp2.c:271 msgid "Interleave Method" msgstr "" -#: src/main/print-escp2.c:270 +#: src/main/print-escp2.c:272 msgid "Interleave pattern to use" msgstr "" -#: src/main/print-escp2.c:275 +#: src/main/print-escp2.c:277 msgid "Adjust dot size as necessary" msgstr "" -#: src/main/print-escp2.c:276 +#: src/main/print-escp2.c:278 msgid "Adjust dot size as necessary to achieve desired density" msgstr "" -#: src/main/print-escp2.c:281 src/main/print-escp2.c:282 +#: src/main/print-escp2.c:283 src/main/print-escp2.c:284 #, fuzzy msgid "Output Order" msgstr "Tipo de salida:" -#: src/main/print-escp2.c:287 src/main/print-escp2.c:288 +#: src/main/print-escp2.c:289 src/main/print-escp2.c:290 msgid "Alignment Passes" msgstr "" -#: src/main/print-escp2.c:293 src/main/print-escp2.c:294 +#: src/main/print-escp2.c:295 src/main/print-escp2.c:296 msgid "Alignment Choices" msgstr "" -#: src/main/print-escp2.c:299 src/main/print-escp2.c:300 +#: src/main/print-escp2.c:301 src/main/print-escp2.c:302 #, fuzzy msgid "Ink change command" msgstr "Comando no reconocido.\n" -#: src/main/print-escp2.c:305 src/main/print-escp2.c:306 +#: src/main/print-escp2.c:307 src/main/print-escp2.c:308 msgid "Alternate Alignment Passes" msgstr "" -#: src/main/print-escp2.c:311 src/main/print-escp2.c:312 +#: src/main/print-escp2.c:313 src/main/print-escp2.c:314 #, fuzzy msgid "Alternate Alignment Choices" -msgstr "Repitiendo el proceso de alineación.\n" +msgstr "Repitiendo el proceso de alineación.\n" -#: src/main/print-escp2.c:317 +#: src/main/print-escp2.c:319 msgid "Supports Packet Mode" msgstr "" -#: src/main/print-escp2.c:318 +#: src/main/print-escp2.c:320 msgid "Supports D4 Packet Mode" msgstr "" -#: src/main/print-escp2.c:323 +#: src/main/print-escp2.c:325 msgid "Has Interchangeable Ink Cartridges" msgstr "" -#: src/main/print-escp2.c:324 +#: src/main/print-escp2.c:326 msgid "Has multiple choices of ink cartridges" msgstr "" -#: src/main/print-escp2.c:335 src/main/print-escp2.c:336 +#: src/main/print-escp2.c:337 src/main/print-escp2.c:338 #, fuzzy msgid "Channel Names" msgstr "Cancelar" -#: src/main/print-escp2.c:348 +#: src/main/print-escp2.c:350 msgid "Raw Channel Count" msgstr "" -#: src/main/print-escp2.c:353 +#: src/main/print-escp2.c:355 #, fuzzy msgid "Cyan Map" msgstr "Cian" -#: src/main/print-escp2.c:354 +#: src/main/print-escp2.c:356 #, fuzzy msgid "Adjust the cyan map" -msgstr "Ajustar el balance de cian de la impresión" +msgstr "Ajustar el balance de cian de la impresión" -#: src/main/print-escp2.c:359 +#: src/main/print-escp2.c:361 #, fuzzy msgid "Magenta Map" msgstr "Magenta" -#: src/main/print-escp2.c:360 +#: src/main/print-escp2.c:362 #, fuzzy msgid "Adjust the magenta map" -msgstr "Ajusta el balance magenta de la impresión" +msgstr "Ajusta el balance magenta de la impresión" -#: src/main/print-escp2.c:365 +#: src/main/print-escp2.c:367 #, fuzzy msgid "Yellow Map" msgstr "Amarillo" -#: src/main/print-escp2.c:366 +#: src/main/print-escp2.c:368 #, fuzzy msgid "Adjust the yellow map" -msgstr "Ajusta el balance amarillo de la impresión" +msgstr "Ajusta el balance amarillo de la impresión" -#: src/main/print-escp2.c:371 +#: src/main/print-escp2.c:373 #, fuzzy msgid "Blue Map" msgstr "Blanco y Negro" -#: src/main/print-escp2.c:372 +#: src/main/print-escp2.c:374 #, fuzzy msgid "Adjust the blue map" -msgstr "Ajustar el balance de cian de la impresión" +msgstr "Ajustar el balance de cian de la impresión" -#: src/main/print-escp2.c:377 +#: src/main/print-escp2.c:379 msgid "Red Map" msgstr "" -#: src/main/print-escp2.c:378 +#: src/main/print-escp2.c:380 #, fuzzy msgid "Adjust the red map" -msgstr "Ajusta el balance amarillo de la impresión" +msgstr "Ajusta el balance amarillo de la impresión" -#: src/main/print-escp2.c:471 +#: src/main/print-escp2.c:478 #, fuzzy msgid "Red Density" msgstr "Densidad:" -#: src/main/print-escp2.c:472 +#: src/main/print-escp2.c:479 #, fuzzy msgid "Adjust the red density" -msgstr "Ajusta el balance amarillo de la impresión" +msgstr "Ajusta el balance amarillo de la impresión" -#: src/main/print-escp2.c:479 +#: src/main/print-escp2.c:486 #, fuzzy msgid "Blue Density" msgstr "Densidad:" -#: src/main/print-escp2.c:480 +#: src/main/print-escp2.c:487 #, fuzzy msgid "Adjust the blue density" -msgstr "Ajustar el balance de cian de la impresión" +msgstr "Ajustar el balance de cian de la impresión" -#: src/main/print-escp2.c:487 +#: src/main/print-escp2.c:494 #, fuzzy msgid "Gloss Level" -msgstr "Película Brillante" +msgstr "Película Brillante" -#: src/main/print-escp2.c:488 +#: src/main/print-escp2.c:495 #, fuzzy msgid "Adjust the gloss level" -msgstr "Ajusta el balance amarillo de la impresión" +msgstr "Ajusta el balance amarillo de la impresión" + +#: src/main/print-escp2.c:502 +msgid "Drop Size Small" +msgstr "" + +#: src/main/print-escp2.c:503 +msgid "Drop Size 1 (small)" +msgstr "" + +#: src/main/print-escp2.c:510 +msgid "Drop Size Medium" +msgstr "" + +#: src/main/print-escp2.c:511 +msgid "Drop Size 2 (medium)" +msgstr "" + +#: src/main/print-escp2.c:518 +msgid "Drop Size Large" +msgstr "" + +#: src/main/print-escp2.c:519 +msgid "Drop Size 3 (large)" +msgstr "" + +#: src/main/print-escp2.c:526 src/main/print-escp2.c:527 +#, fuzzy +msgid "Light Cyan Value" +msgstr "Cian Claro" + +#: src/main/print-escp2.c:542 src/main/print-escp2.c:543 +#, fuzzy +msgid "Light Cyan Density Scale" +msgstr "Cian Claro" + +#: src/main/print-escp2.c:550 src/main/print-escp2.c:551 +#, fuzzy +msgid "Light Magenta Value" +msgstr "Magenta Claro" + +#: src/main/print-escp2.c:558 src/main/print-escp2.c:559 +#, fuzzy +msgid "Light Magenta Density Scale" +msgstr "Magenta Claro" -#: src/main/print-escp2.c:511 src/main/print-escp2.c:512 +#: src/main/print-escp2.c:574 src/main/print-escp2.c:575 +#, fuzzy +msgid "Dark Yellow Value" +msgstr "Amarillo" + +#: src/main/print-escp2.c:582 src/main/print-escp2.c:583 msgid "Dark Yellow Transition" msgstr "" -#: src/main/print-escp2.c:519 src/main/print-escp2.c:520 -#: src/main/print-escp2.c:527 src/main/print-escp2.c:528 +#: src/main/print-escp2.c:590 src/main/print-escp2.c:591 +#, fuzzy +msgid "Dark Yellow Density Scale" +msgstr "Amarillo" + +#: src/main/print-escp2.c:598 src/main/print-escp2.c:599 +#: src/main/print-escp2.c:622 src/main/print-escp2.c:623 +#, fuzzy +msgid "Gray Value" +msgstr "Tonos de gris" + +#: src/main/print-escp2.c:606 src/main/print-escp2.c:607 +#: src/main/print-escp2.c:630 src/main/print-escp2.c:631 msgid "Gray Transition" msgstr "" -#: src/main/print-escp2.c:535 src/main/print-escp2.c:536 -#: src/main/print-escp2.c:559 src/main/print-escp2.c:560 +#: src/main/print-escp2.c:614 src/main/print-escp2.c:615 +#: src/main/print-escp2.c:638 src/main/print-escp2.c:639 +#, fuzzy +msgid "Gray Density Scale" +msgstr "Tonos de gris" + +#: src/main/print-escp2.c:646 src/main/print-escp2.c:647 +#: src/main/print-escp2.c:718 src/main/print-escp2.c:719 +#, fuzzy +msgid "Light Gray Value" +msgstr "Cian Claro" + +#: src/main/print-escp2.c:654 src/main/print-escp2.c:655 +#: src/main/print-escp2.c:726 src/main/print-escp2.c:727 #, fuzzy msgid "Light Gray Transition" msgstr "Cian Claro" -#: src/main/print-escp2.c:543 src/main/print-escp2.c:544 +#: src/main/print-escp2.c:662 src/main/print-escp2.c:663 +#: src/main/print-escp2.c:734 src/main/print-escp2.c:735 +#, fuzzy +msgid "Light Gray Density Scale" +msgstr "Cian Claro" + +#: src/main/print-escp2.c:670 src/main/print-escp2.c:671 +#, fuzzy +msgid "Dark Gray Value" +msgstr "Cian Claro" + +#: src/main/print-escp2.c:678 src/main/print-escp2.c:679 #, fuzzy msgid "Dark Gray Transition" msgstr "Cian Claro" -#: src/main/print-escp2.c:551 +#: src/main/print-escp2.c:686 src/main/print-escp2.c:687 +#, fuzzy +msgid "Dark Gray Density Scale" +msgstr "Cian Claro" + +#: src/main/print-escp2.c:694 +#, fuzzy +msgid "Mid Gray Value" +msgstr "Tonos de gris" + +#: src/main/print-escp2.c:695 +#, fuzzy +msgid "Medium Gray Value" +msgstr "Cian Claro" + +#: src/main/print-escp2.c:702 #, fuzzy msgid "Mid Gray Transition" msgstr "Cian Claro" -#: src/main/print-escp2.c:552 +#: src/main/print-escp2.c:703 #, fuzzy msgid "Medium Gray Transition" msgstr "Cian Claro" -#: src/main/print-escp2.c:1635 +#: src/main/print-escp2.c:710 +#, fuzzy +msgid "Mid Gray Density Scale" +msgstr "Cian Claro" + +#: src/main/print-escp2.c:711 +#, fuzzy +msgid "Medium Gray Density Scale" +msgstr "Cian Claro" + +#: src/main/print-escp2.c:1999 #, fuzzy msgid "Full Manual Control" msgstr "Tipo de salida:" -#: src/main/print-escp2.c:1637 +#: src/main/print-escp2.c:2001 msgid "Automatic Setting Control" msgstr "" -#: src/main/print-escp2.c:1732 src/main/generic-options.c:213 +#: src/main/print-escp2.c:2096 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:1771 src/main/print-escp2.c:1863 -#: src/main/print-escp2.c:1875 src/main/print-pcl.c:230 -#: src/main/escp2-channels.c:2805 src/main/escp2-papers.c:1707 -#: src/main/escp2-papers.c:1731 src/main/escp2-papers.c:1764 -#: src/main/escp2-papers.c:1815 src/main/escp2-papers.c:1857 -#: src/main/escp2-papers.c:1899 src/main/escp2-papers.c:1992 -#: src/main/escp2-resolutions.c:640 src/main/escp2-resolutions.c:655 -#: src/main/escp2-resolutions.c:668 src/main/generic-options.c:36 -#: src/gutenprintui/panel.c:2613 src/gutenprintui2/panel.c:2639 +#: src/main/print-escp2.c:2139 src/main/print-escp2.c:2231 +#: src/main/print-escp2.c:2243 src/main/print-pcl.c:237 +#: src/main/escp2-channels.c:2827 src/main/escp2-channels.c:2836 +#: src/main/escp2-papers.c:1718 src/main/escp2-papers.c:1742 +#: src/main/escp2-papers.c:1775 src/main/escp2-papers.c:1826 +#: src/main/escp2-papers.c:1868 src/main/escp2-papers.c:1910 +#: src/main/escp2-papers.c:2003 src/main/escp2-resolutions.c:640 +#: src/main/escp2-resolutions.c:655 src/main/escp2-resolutions.c:670 +#: src/main/escp2-resolutions.c:683 src/main/generic-options.c:36 +#: src/gutenprintui2/panel.c:2814 msgid "Standard" -msgstr "Estándar" +msgstr "Estándar" -#: src/main/print-escp2.c:1842 +#: src/main/print-escp2.c:2210 #, fuzzy msgid "Automatic" -msgstr "Tamaño" +msgstr "Tamaño" -#: src/main/print-escp2.c:1844 +#: src/main/print-escp2.c:2212 #, fuzzy msgid "Bidirectional" msgstr "600 PPP Unidireccional" -#: src/main/print-escp2.c:1846 +#: src/main/print-escp2.c:2214 #, fuzzy msgid "Unidirectional" msgstr "600 PPP Unidireccional" -#: src/main/print-escp2.c:1877 +#: src/main/print-escp2.c:2245 msgid "Alternate Fill" msgstr "" -#: src/main/print-escp2.c:1879 +#: src/main/print-escp2.c:2247 msgid "Ascending Fill" msgstr "" -#: src/main/print-escp2.c:1881 +#: src/main/print-escp2.c:2249 msgid "Descending Fill" msgstr "" -#: src/main/print-escp2.c:1883 +#: src/main/print-escp2.c:2251 msgid "Ascending Double" msgstr "" -#: src/main/print-escp2.c:1885 +#: src/main/print-escp2.c:2253 msgid "Nearest Neighbor Avoidance" msgstr "" -#: src/main/print-escp2.c:2328 +#: src/main/print-escp2.c:2771 #, 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:3436 src/main/print-olympus.c:2451 +#: src/main/print-escp2.c:3934 src/main/print-olympus.c:2449 #: src/main/print-raw.c:217 msgid "Print options not verified; cannot print.\n" msgstr "" @@ -1413,7 +1551,7 @@ msgstr "1200 PPP alta calidad" #: src/main/print-lexmark.c:583 src/main/print-lexmark.c:659 msgid "1200 DPI highest quality" -msgstr "1200 PPP altísima calidad" +msgstr "1200 PPP altísima calidad" #: src/main/print-lexmark.c:584 src/main/print-lexmark.c:660 msgid "1200 DPI Unidirectional" @@ -1429,11 +1567,11 @@ msgstr "2400 PPP x 1200 PPP alta calidad" #: src/main/print-lexmark.c:587 msgid "2400 DPI x 1200 DPI highest quality" -msgstr "2400 PPP x 1200 PPP altísima calidad" +msgstr "2400 PPP x 1200 PPP altísima calidad" #: src/main/print-lexmark.c:589 msgid "test print" -msgstr "prueba de impresión" +msgstr "prueba de impresión" #: src/main/print-lexmark.c:601 src/main/print-lexmark.c:671 #: src/main/escp2-channels.c:1288 src/main/escp2-channels.c:1302 @@ -1443,7 +1581,7 @@ msgstr "prueba de impresión" #: src/main/escp2-channels.c:1410 src/main/escp2-channels.c:1424 #: src/main/escp2-channels.c:1438 src/main/escp2-channels.c:1452 msgid "Four Color Standard" -msgstr "Cuatro Colores Estándard" +msgstr "Cuatro Colores Estándard" #: src/main/print-lexmark.c:604 src/main/print-lexmark.c:674 #: src/main/escp2-channels.c:1124 src/main/escp2-channels.c:1138 @@ -1456,109 +1594,109 @@ msgid "Three Color Composite" msgstr "Tres Colores Compuestos" #: src/main/print-lexmark.c:607 src/main/print-lexmark.c:677 -#: src/main/escp2-channels.c:1540 src/main/escp2-channels.c:1554 -#: src/main/escp2-channels.c:1568 src/main/escp2-channels.c:1582 -#: src/main/escp2-channels.c:1808 src/main/escp2-channels.c:1823 -#: src/main/escp2-channels.c:1838 src/main/escp2-channels.c:1855 +#: src/main/escp2-channels.c:1554 src/main/escp2-channels.c:1568 +#: src/main/escp2-channels.c:1582 src/main/escp2-channels.c:1596 +#: src/main/escp2-channels.c:1822 src/main/escp2-channels.c:1837 +#: src/main/escp2-channels.c:1852 src/main/escp2-channels.c:1869 msgid "Six Color Photo" -msgstr "Fotografía de Seis Colores" +msgstr "Fotografía de Seis Colores" #: src/main/print-lexmark.c:610 src/main/print-lexmark.c:680 -#: src/main/escp2-channels.c:1475 src/main/escp2-channels.c:1489 -#: src/main/escp2-channels.c:1503 src/main/escp2-channels.c:1517 -#: src/main/escp2-channels.c:1752 src/main/escp2-channels.c:1767 -#: src/main/escp2-channels.c:1784 +#: src/main/escp2-channels.c:1489 src/main/escp2-channels.c:1503 +#: src/main/escp2-channels.c:1517 src/main/escp2-channels.c:1531 +#: src/main/escp2-channels.c:1766 src/main/escp2-channels.c:1781 +#: src/main/escp2-channels.c:1798 msgid "Five Color Photo Composite" -msgstr "Fotografía Compuesta de Cinco Colores" +msgstr "Fotografía Compuesta de Cinco Colores" -#: src/main/print-lexmark.c:856 src/main/escp2-papers.c:1341 -#: src/main/escp2-papers.c:1385 src/main/escp2-papers.c:1429 -#: src/main/escp2-papers.c:1477 src/main/escp2-papers.c:1525 -#: src/main/escp2-papers.c:1569 +#: src/main/print-lexmark.c:856 src/main/escp2-papers.c:1351 +#: src/main/escp2-papers.c:1395 src/main/escp2-papers.c:1439 +#: src/main/escp2-papers.c:1487 src/main/escp2-papers.c:1535 +#: src/main/escp2-papers.c:1579 msgid "Plain Paper" -msgstr "Papel Común" +msgstr "Papel Común" -#: src/main/print-lexmark.c:860 src/main/escp2-papers.c:1347 -#: src/main/escp2-papers.c:1391 src/main/escp2-papers.c:1435 -#: src/main/escp2-papers.c:1483 src/main/escp2-papers.c:1531 -#: src/main/escp2-papers.c:1575 +#: src/main/print-lexmark.c:860 src/main/escp2-papers.c:1357 +#: src/main/escp2-papers.c:1401 src/main/escp2-papers.c:1445 +#: src/main/escp2-papers.c:1493 src/main/escp2-papers.c:1541 +#: src/main/escp2-papers.c:1585 msgid "Glossy Film" -msgstr "Película Brillante" +msgstr "Película Brillante" -#: src/main/print-lexmark.c:864 src/main/escp2-papers.c:1349 -#: src/main/escp2-papers.c:1393 src/main/escp2-papers.c:1437 -#: src/main/escp2-papers.c:1485 src/main/escp2-papers.c:1533 -#: src/main/escp2-papers.c:1577 +#: src/main/print-lexmark.c:864 src/main/escp2-papers.c:1359 +#: src/main/escp2-papers.c:1403 src/main/escp2-papers.c:1447 +#: src/main/escp2-papers.c:1495 src/main/escp2-papers.c:1543 +#: src/main/escp2-papers.c:1587 msgid "Transparencies" msgstr "Transparencias" -#: src/main/print-lexmark.c:868 src/main/escp2-papers.c:1351 -#: src/main/escp2-papers.c:1395 src/main/escp2-papers.c:1439 -#: src/main/escp2-papers.c:1487 src/main/escp2-papers.c:1535 -#: src/main/escp2-papers.c:1579 +#: src/main/print-lexmark.c:868 src/main/escp2-papers.c:1361 +#: src/main/escp2-papers.c:1405 src/main/escp2-papers.c:1449 +#: src/main/escp2-papers.c:1497 src/main/escp2-papers.c:1545 +#: src/main/escp2-papers.c:1589 msgid "Envelopes" msgstr "Sobres" -#: src/main/print-lexmark.c:872 src/main/escp2-papers.c:1355 -#: src/main/escp2-papers.c:1399 src/main/escp2-papers.c:1443 -#: src/main/escp2-papers.c:1491 src/main/escp2-papers.c:1539 -#: src/main/escp2-papers.c:1583 +#: src/main/print-lexmark.c:872 src/main/escp2-papers.c:1365 +#: src/main/escp2-papers.c:1409 src/main/escp2-papers.c:1453 +#: src/main/escp2-papers.c:1501 src/main/escp2-papers.c:1549 +#: src/main/escp2-papers.c:1593 msgid "Matte Paper" msgstr "Papel Opaco" -#: src/main/print-lexmark.c:876 src/main/escp2-papers.c:1359 -#: src/main/escp2-papers.c:1403 src/main/escp2-papers.c:1447 -#: src/main/escp2-papers.c:1495 src/main/escp2-papers.c:1543 -#: src/main/escp2-papers.c:1587 +#: src/main/print-lexmark.c:876 src/main/escp2-papers.c:1369 +#: src/main/escp2-papers.c:1413 src/main/escp2-papers.c:1457 +#: src/main/escp2-papers.c:1505 src/main/escp2-papers.c:1553 +#: src/main/escp2-papers.c:1597 msgid "Inkjet Paper" msgstr "Papel para Chorro de Tinta" -#: src/main/print-lexmark.c:880 src/main/escp2-papers.c:1361 -#: src/main/escp2-papers.c:1405 src/main/escp2-papers.c:1449 -#: src/main/escp2-papers.c:1497 src/main/escp2-papers.c:1545 -#: src/main/escp2-papers.c:1589 +#: src/main/print-lexmark.c:880 src/main/escp2-papers.c:1371 +#: src/main/escp2-papers.c:1415 src/main/escp2-papers.c:1459 +#: src/main/escp2-papers.c:1507 src/main/escp2-papers.c:1555 +#: src/main/escp2-papers.c:1599 msgid "Photo Quality Inkjet Paper" -msgstr "Papel de Calidad Fotográfica para Chorro de Tinta" +msgstr "Papel de Calidad Fotográfica para Chorro de Tinta" -#: src/main/print-lexmark.c:884 src/main/escp2-papers.c:1363 -#: src/main/escp2-papers.c:1407 src/main/escp2-papers.c:1451 -#: src/main/escp2-papers.c:1499 src/main/escp2-papers.c:1547 -#: src/main/escp2-papers.c:1591 +#: src/main/print-lexmark.c:884 src/main/escp2-papers.c:1373 +#: src/main/escp2-papers.c:1417 src/main/escp2-papers.c:1461 +#: src/main/escp2-papers.c:1509 src/main/escp2-papers.c:1557 +#: src/main/escp2-papers.c:1601 msgid "Photo Paper" -msgstr "Papel para Fotografía" +msgstr "Papel para Fotografía" -#: src/main/print-lexmark.c:888 src/main/escp2-papers.c:1365 -#: src/main/escp2-papers.c:1409 src/main/escp2-papers.c:1453 -#: src/main/escp2-papers.c:1501 src/main/escp2-papers.c:1549 -#: src/main/escp2-papers.c:1593 src/main/escp2-papers.c:1617 +#: src/main/print-lexmark.c:888 src/main/escp2-papers.c:1375 +#: src/main/escp2-papers.c:1419 src/main/escp2-papers.c:1463 +#: src/main/escp2-papers.c:1511 src/main/escp2-papers.c:1559 +#: src/main/escp2-papers.c:1603 src/main/escp2-papers.c:1627 msgid "Premium Glossy Photo Paper" -msgstr "Papel Brillante de Altísima Calidad Fotográfica" +msgstr "Papel Brillante de Altísima Calidad Fotográfica" -#: src/main/print-lexmark.c:892 src/main/escp2-papers.c:1369 -#: src/main/escp2-papers.c:1413 src/main/escp2-papers.c:1457 -#: src/main/escp2-papers.c:1505 src/main/escp2-papers.c:1553 -#: src/main/escp2-papers.c:1597 +#: src/main/print-lexmark.c:892 src/main/escp2-papers.c:1379 +#: src/main/escp2-papers.c:1423 src/main/escp2-papers.c:1467 +#: src/main/escp2-papers.c:1515 src/main/escp2-papers.c:1563 +#: src/main/escp2-papers.c:1607 msgid "Premium Luster Photo Paper" -msgstr "Papel de Fotografía Premium Luster" +msgstr "Papel de Fotografía Premium Luster" -#: src/main/print-lexmark.c:896 src/main/escp2-papers.c:1371 -#: src/main/escp2-papers.c:1415 src/main/escp2-papers.c:1463 -#: src/main/escp2-papers.c:1511 src/main/escp2-papers.c:1555 -#: src/main/escp2-papers.c:1603 +#: src/main/print-lexmark.c:896 src/main/escp2-papers.c:1381 +#: src/main/escp2-papers.c:1425 src/main/escp2-papers.c:1473 +#: src/main/escp2-papers.c:1521 src/main/escp2-papers.c:1565 +#: src/main/escp2-papers.c:1613 msgid "Photo Quality Glossy Paper" -msgstr "Papel Brillante de Calidad Fotográfica" +msgstr "Papel Brillante de Calidad Fotográfica" -#: src/main/print-lexmark.c:900 src/main/escp2-papers.c:1373 -#: src/main/escp2-papers.c:1417 src/main/escp2-papers.c:1465 -#: src/main/escp2-papers.c:1513 src/main/escp2-papers.c:1557 -#: src/main/escp2-papers.c:1605 +#: src/main/print-lexmark.c:900 src/main/escp2-papers.c:1383 +#: src/main/escp2-papers.c:1427 src/main/escp2-papers.c:1475 +#: src/main/escp2-papers.c:1523 src/main/escp2-papers.c:1567 +#: src/main/escp2-papers.c:1615 msgid "Ilford Heavy Paper" msgstr "Papel Pesado Ilford" -#: src/main/print-lexmark.c:904 src/main/escp2-papers.c:1377 -#: src/main/escp2-papers.c:1421 src/main/escp2-papers.c:1469 -#: src/main/escp2-papers.c:1517 src/main/escp2-papers.c:1561 -#: src/main/escp2-papers.c:1609 src/main/escp2-papers.c:1619 +#: src/main/print-lexmark.c:904 src/main/escp2-papers.c:1387 +#: src/main/escp2-papers.c:1431 src/main/escp2-papers.c:1479 +#: src/main/escp2-papers.c:1527 src/main/escp2-papers.c:1571 +#: src/main/escp2-papers.c:1619 src/main/escp2-papers.c:1629 msgid "Other" msgstr "Otro" @@ -1574,63 +1712,63 @@ msgstr "Manual con Pausa" msgid "Manual without Pause" msgstr "Manual sin Pausa" -#: src/main/print-olympus.c:277 +#: src/main/print-olympus.c:275 msgid "Coated" msgstr "" -#: src/main/print-olympus.c:278 src/cups/genppd.c:1726 src/cups/genppd.c:1753 -#: src/cups/genppd.c:1834 +#: src/main/print-olympus.c:276 src/cups/genppd.c:1732 src/cups/genppd.c:1759 +#: src/cups/genppd.c:1840 msgid "None" msgstr "" -#: src/main/print-olympus.c:963 src/main/print-olympus.c:1023 -#: src/main/print-olympus.c:1127 +#: src/main/print-olympus.c:961 src/main/print-olympus.c:1021 +#: src/main/print-olympus.c:1125 #, fuzzy msgid "Glossy" -msgstr "Película Brillante" +msgstr "Película Brillante" -#: src/main/print-olympus.c:964 src/main/print-olympus.c:1024 -#: src/main/print-olympus.c:1128 +#: src/main/print-olympus.c:962 src/main/print-olympus.c:1022 +#: src/main/print-olympus.c:1126 msgid "Texture" msgstr "" -#: src/main/print-olympus.c:1025 src/main/print-olympus.c:1129 +#: src/main/print-olympus.c:1023 src/main/print-olympus.c:1127 #, fuzzy msgid "Matte" msgstr "Papel Opaco" -#: src/main/print-olympus.c:1729 src/main/print-olympus.c:1730 +#: src/main/print-olympus.c:1727 src/main/print-olympus.c:1728 msgid "Laminate Pattern" msgstr "" -#: src/main/print-olympus.c:1765 +#: src/main/print-olympus.c:1763 #, fuzzy msgid "Adjust the cyan balance" -msgstr "Ajustar el balance de cian de la impresión" +msgstr "Ajustar el balance de cian de la impresión" -#: src/main/print-olympus.c:1773 +#: src/main/print-olympus.c:1771 #, fuzzy msgid "Adjust the magenta balance" -msgstr "Ajusta el balance magenta de la impresión" +msgstr "Ajusta el balance magenta de la impresión" -#: src/main/print-olympus.c:1781 +#: src/main/print-olympus.c:1779 #, fuzzy msgid "Adjust the yellow balance" -msgstr "Ajusta el balance amarillo de la impresión" +msgstr "Ajusta el balance amarillo de la impresión" -#: src/main/print-olympus.c:1788 +#: src/main/print-olympus.c:1786 #, fuzzy msgid "Black Balance" msgstr "Blanco y Negro" -#: src/main/print-olympus.c:1789 +#: src/main/print-olympus.c:1787 #, fuzzy msgid "Adjust the black balance" -msgstr "Ajustar el balance de cian de la impresión" +msgstr "Ajustar el balance de cian de la impresión" #: src/main/print-pcl.c:185 msgid "Plain" -msgstr "Común" +msgstr "Común" #: src/main/print-pcl.c:186 msgid "Bond" @@ -1643,7 +1781,7 @@ msgstr "Premium" #: src/main/print-pcl.c:188 msgid "Glossy Photo" -msgstr "Fotografía Brillante" +msgstr "Fotografía Brillante" #: src/main/print-pcl.c:189 msgid "Transparency" @@ -1651,98 +1789,122 @@ msgstr "Transparencia" #: src/main/print-pcl.c:190 msgid "Quick-dry Photo" -msgstr "Fotografía de Secado Rápido" +msgstr "Fotografía de Secado Rápido" #: src/main/print-pcl.c:191 msgid "Quick-dry Transparency" -msgstr "Transparencia de Secado Rápido" +msgstr "Transparencia de Secado Rápido" -#: src/main/print-pcl.c:231 src/main/xmli18n-tmp.h:16 +#: src/main/print-pcl.c:238 src/main/xmli18n-tmp.h:17 msgid "Manual" msgstr "Manual" -#: src/main/print-pcl.c:233 +#: src/main/print-pcl.c:240 +msgid "Tray 1 - Movable Guides" +msgstr "" + +#: src/main/print-pcl.c:241 msgid "Tray 1" msgstr "Bandeja 1" -#: src/main/print-pcl.c:234 src/main/print-pcl.c:240 +#: src/main/print-pcl.c:242 +msgid "Tray 2 - Movable Guides" +msgstr "" + +#: src/main/print-pcl.c:243 src/main/print-pcl.c:251 msgid "Tray 2" msgstr "Bandeja 2" -#: src/main/print-pcl.c:235 +#: src/main/print-pcl.c:244 +msgid "Tray 3 - Movable Guides" +msgstr "" + +#: src/main/print-pcl.c:245 msgid "Tray 3" msgstr "Bandeja 3" -#: src/main/print-pcl.c:236 +#: src/main/print-pcl.c:246 +msgid "Tray 4 - Movable Guides" +msgstr "" + +#: src/main/print-pcl.c:247 msgid "Tray 4" msgstr "Bandeja 4" -#: src/main/print-pcl.c:237 +#: src/main/print-pcl.c:248 msgid "Portable Sheet Feeder" msgstr "Alimentador Portable de Hojas" -#: src/main/print-pcl.c:238 +#: src/main/print-pcl.c:249 msgid "Desktop Sheet Feeder" msgstr "Alimentador de Hojas de Escritorio" -#: src/main/print-pcl.c:239 +#: src/main/print-pcl.c:250 msgid "Tray" msgstr "Bandeja" -#: src/main/print-pcl.c:241 +#: src/main/print-pcl.c:252 msgid "Optional Source" msgstr "Fuente Opcional" -#: src/main/print-pcl.c:242 +#: src/main/print-pcl.c:253 msgid "Autoselect" msgstr "Autoseleccionar" -#: src/main/print-pcl.c:256 +#: src/main/print-pcl.c:267 msgid "150x150 DPI" msgstr "150x150 PPP" -#: src/main/print-pcl.c:257 +#: src/main/print-pcl.c:268 msgid "300x300 DPI" msgstr "300x300 PPP" -#: src/main/print-pcl.c:258 +#: src/main/print-pcl.c:269 msgid "600x300 DPI" msgstr "600x300 PPP" -#: src/main/print-pcl.c:259 +#: src/main/print-pcl.c:270 msgid "600x600 DPI monochrome" msgstr "600x600 PPP monocromo" -#: src/main/print-pcl.c:260 +#: src/main/print-pcl.c:271 msgid "600x600 DPI" msgstr "600x600 PPP" -#: src/main/print-pcl.c:261 +#: src/main/print-pcl.c:272 msgid "1200x600 DPI" msgstr "1200x600 PPP" -#: src/main/print-pcl.c:262 +#: src/main/print-pcl.c:273 msgid "2400x600 DPI" msgstr "2400x600 PPP" -#: src/main/print-pcl.c:1470 +#: src/main/print-pcl.c:1538 msgid "Color + Black Cartridges" msgstr "Cartuchos Negro + Color" -#: src/main/print-pcl.c:1471 +#: src/main/print-pcl.c:1539 msgid "Color + Photo Cartridges" -msgstr "Cartuchos Color + Fotografía" +msgstr "Cartuchos Color + Fotografía" -#: src/main/print-ps.c:97 +#: src/main/print-ps.c:68 #, fuzzy msgid "PPDFile" msgstr "Archivo PPD:" -#: src/main/print-ps.c:98 src/gutenprintui/panel.c:1768 -#: src/gutenprintui2/panel.c:1768 +#: src/main/print-ps.c:69 src/gutenprintui2/panel.c:1943 #, fuzzy msgid "PPD File" -msgstr "¿Archivo PPD?" +msgstr "¿Archivo PPD?" + +#: src/main/print-ps.c:74 +#, fuzzy +msgid "Model Name" +msgstr "Cancelar" + +#: src/main/print-ps.c:75 +msgid "PPD File Model Name" +msgstr "" #: src/main/print-raw.c:223 msgid "Image dimensions must match paper dimensions" @@ -1761,295 +1923,301 @@ msgstr "Tonos de gris" #: src/main/escp2-channels.c:1035 src/main/escp2-channels.c:1048 #: src/main/escp2-channels.c:1061 src/main/escp2-channels.c:1074 #: src/main/escp2-channels.c:1087 src/main/escp2-channels.c:1100 -#: src/main/escp2-channels.c:2505 src/main/escp2-channels.c:2528 -#: src/main/escp2-channels.c:2548 src/main/escp2-channels.c:2568 -#: src/main/escp2-channels.c:2588 src/main/escp2-channels.c:2608 +#: src/main/escp2-channels.c:2525 src/main/escp2-channels.c:2548 +#: src/main/escp2-channels.c:2568 src/main/escp2-channels.c:2588 +#: src/main/escp2-channels.c:2608 src/main/escp2-channels.c:2628 msgid "Quadtone" msgstr "" -#: src/main/escp2-channels.c:1604 src/main/escp2-channels.c:1618 +#: src/main/escp2-channels.c:1466 +#, fuzzy +msgid "Four Color Photo" +msgstr "Fotografía de Seis Colores" + +#: src/main/escp2-channels.c:1618 src/main/escp2-channels.c:1632 msgid "Six Color Enhanced Composite" msgstr "Seis Colores Compuestos Mejorados" -#: src/main/escp2-channels.c:1641 src/main/escp2-channels.c:1655 -#: src/main/escp2-channels.c:1669 src/main/escp2-channels.c:1705 +#: src/main/escp2-channels.c:1655 src/main/escp2-channels.c:1669 +#: src/main/escp2-channels.c:1683 src/main/escp2-channels.c:1719 #, fuzzy msgid "Seven Color Photo" -msgstr "Fotografía de Seis Colores" +msgstr "Fotografía de Seis Colores" -#: src/main/escp2-channels.c:1691 +#: src/main/escp2-channels.c:1705 msgid "Seven Color Enhanced" msgstr "Siete Colores Mejorados" -#: src/main/escp2-channels.c:1728 +#: src/main/escp2-channels.c:1742 #, fuzzy msgid "Eight Color Photo" -msgstr "Fotografía de Seis Colores" +msgstr "Fotografía de Seis Colores" -#: src/main/escp2-channels.c:1876 src/main/escp2-channels.c:1888 -#: src/main/escp2-channels.c:1894 +#: src/main/escp2-channels.c:1890 src/main/escp2-channels.c:1902 +#: src/main/escp2-channels.c:1908 #, fuzzy msgid "One Color Raw" -msgstr "Fotografía de Seis Colores" +msgstr "Fotografía de Seis Colores" -#: src/main/escp2-channels.c:1900 +#: src/main/escp2-channels.c:1914 #, fuzzy msgid "One Color Raw Enhanced Gloss" msgstr "Siete Colores Mejorados" -#: src/main/escp2-channels.c:1913 src/main/escp2-channels.c:1925 +#: src/main/escp2-channels.c:1927 src/main/escp2-channels.c:1939 #, fuzzy msgid "Two Color Raw" -msgstr "Cuatro Colores Estándard" +msgstr "Cuatro Colores Estándard" -#: src/main/escp2-channels.c:1939 src/main/escp2-channels.c:1953 -#: src/main/escp2-channels.c:1980 src/main/escp2-channels.c:1993 -#: src/main/escp2-channels.c:2006 src/main/escp2-channels.c:2019 -#: src/main/escp2-channels.c:2033 src/main/escp2-channels.c:2047 -#: src/main/escp2-channels.c:2060 +#: src/main/escp2-channels.c:1953 src/main/escp2-channels.c:1967 +#: src/main/escp2-channels.c:1994 src/main/escp2-channels.c:2007 +#: src/main/escp2-channels.c:2020 src/main/escp2-channels.c:2033 +#: src/main/escp2-channels.c:2047 src/main/escp2-channels.c:2061 +#: src/main/escp2-channels.c:2074 #, fuzzy msgid "Three Color Raw" msgstr "Tres Colores Compuestos" -#: src/main/escp2-channels.c:1967 +#: src/main/escp2-channels.c:1981 #, fuzzy msgid "Three Color Raw Gloss" msgstr "Tres Colores Compuestos" -#: src/main/escp2-channels.c:2067 src/main/escp2-channels.c:2073 -#: src/main/escp2-channels.c:2079 src/main/escp2-channels.c:2085 -#: src/main/escp2-channels.c:2091 src/main/escp2-channels.c:2097 -#: src/main/escp2-channels.c:2103 src/main/escp2-channels.c:2109 -#: src/main/escp2-channels.c:2115 src/main/escp2-channels.c:2121 +#: src/main/escp2-channels.c:2081 src/main/escp2-channels.c:2087 +#: src/main/escp2-channels.c:2093 src/main/escp2-channels.c:2099 +#: src/main/escp2-channels.c:2105 src/main/escp2-channels.c:2111 +#: src/main/escp2-channels.c:2117 src/main/escp2-channels.c:2123 +#: src/main/escp2-channels.c:2129 src/main/escp2-channels.c:2135 +#: src/main/escp2-channels.c:2141 #, fuzzy msgid "Four Color Raw" -msgstr "Cuatro Colores Estándard" +msgstr "Cuatro Colores Estándard" -#: src/main/escp2-channels.c:2127 +#: src/main/escp2-channels.c:2147 #, fuzzy msgid "Four Color Raw Gloss" -msgstr "Cuatro Colores Estándard" +msgstr "Cuatro Colores Estándard" -#: src/main/escp2-channels.c:2142 src/main/escp2-channels.c:2156 +#: src/main/escp2-channels.c:2162 src/main/escp2-channels.c:2176 #, fuzzy msgid "Five Color Raw" -msgstr "Fotografía de Seis Colores" +msgstr "Fotografía de Seis Colores" -#: src/main/escp2-channels.c:2170 src/main/escp2-channels.c:2186 -#: src/main/escp2-channels.c:2192 src/main/escp2-channels.c:2198 -#: src/main/escp2-channels.c:2213 src/main/escp2-channels.c:2234 +#: src/main/escp2-channels.c:2190 src/main/escp2-channels.c:2206 +#: src/main/escp2-channels.c:2212 src/main/escp2-channels.c:2218 +#: src/main/escp2-channels.c:2233 src/main/escp2-channels.c:2254 #, fuzzy msgid "Six Color Raw" -msgstr "Fotografía de Seis Colores" +msgstr "Fotografía de Seis Colores" -#: src/main/escp2-channels.c:2219 +#: src/main/escp2-channels.c:2239 #, fuzzy msgid "Six Color Enhanced Gloss Raw" msgstr "Seis Colores Compuestos Mejorados" -#: src/main/escp2-channels.c:2250 src/main/escp2-channels.c:2265 -#: src/main/escp2-channels.c:2280 +#: src/main/escp2-channels.c:2270 src/main/escp2-channels.c:2285 +#: src/main/escp2-channels.c:2300 #, fuzzy msgid "Seven Color Raw" -msgstr "Fotografía de Seis Colores" +msgstr "Fotografía de Seis Colores" -#: src/main/escp2-channels.c:2297 +#: src/main/escp2-channels.c:2317 #, fuzzy msgid "Seven Color Enhanced Gloss Raw" msgstr "Siete Colores Mejorados" -#: src/main/escp2-channels.c:2315 +#: src/main/escp2-channels.c:2335 #, fuzzy msgid "Eight Color Raw" -msgstr "Fotografía de Seis Colores" - -#: src/main/escp2-channels.c:2482 src/main/escp2-channels.c:2495 -#: src/main/escp2-channels.c:2497 src/main/escp2-channels.c:2517 -#: src/main/escp2-channels.c:2520 src/main/escp2-channels.c:2540 -#: src/main/escp2-channels.c:2560 src/main/escp2-channels.c:2580 -#: src/main/escp2-channels.c:2600 src/main/escp2-channels.c:2620 -#: src/main/escp2-channels.c:2636 src/main/escp2-channels.c:2638 -#: src/main/escp2-channels.c:2640 src/main/escp2-channels.c:2642 -#: src/main/escp2-channels.c:2658 src/main/escp2-channels.c:2674 -#: src/main/escp2-channels.c:2694 +msgstr "Fotografía de Seis Colores" + +#: src/main/escp2-channels.c:2502 src/main/escp2-channels.c:2515 +#: src/main/escp2-channels.c:2517 src/main/escp2-channels.c:2537 +#: src/main/escp2-channels.c:2540 src/main/escp2-channels.c:2560 +#: src/main/escp2-channels.c:2580 src/main/escp2-channels.c:2600 +#: src/main/escp2-channels.c:2620 src/main/escp2-channels.c:2640 +#: src/main/escp2-channels.c:2656 src/main/escp2-channels.c:2658 +#: src/main/escp2-channels.c:2660 src/main/escp2-channels.c:2662 +#: src/main/escp2-channels.c:2678 src/main/escp2-channels.c:2694 +#: src/main/escp2-channels.c:2714 msgid "EPSON Standard Inks" msgstr "" -#: src/main/escp2-channels.c:2714 src/main/escp2-channels.c:2739 +#: src/main/escp2-channels.c:2734 src/main/escp2-channels.c:2759 #, fuzzy msgid "UltraChrome Photo Black" -msgstr "Fotografía de Seis Colores" +msgstr "Fotografía de Seis Colores" -#: src/main/escp2-channels.c:2718 src/main/escp2-channels.c:2743 +#: src/main/escp2-channels.c:2738 src/main/escp2-channels.c:2763 msgid "UltraChrome Matte Black" msgstr "" -#: src/main/escp2-channels.c:2758 src/main/escp2-channels.c:2796 -#: src/main/escp2-channels.c:3167 src/escputil/escputil.c:976 +#: src/main/escp2-channels.c:2778 src/main/escp2-channels.c:2816 +#: src/main/escp2-channels.c:3206 src/escputil/escputil.c:976 #, fuzzy msgid "Photo Black" -msgstr "Papel para Fotografía" +msgstr "Papel para Fotografía" -#: src/main/escp2-channels.c:2762 src/main/escp2-channels.c:2778 -#: src/main/escp2-channels.c:3166 src/escputil/escputil.c:986 +#: src/main/escp2-channels.c:2782 src/main/escp2-channels.c:2798 +#: src/main/escp2-channels.c:3205 src/escputil/escputil.c:986 #, fuzzy msgid "Matte Black" msgstr "Papel Opaco" -#: src/main/escp2-channels.c:3092 src/main/escp2-channels.c:3102 -#: src/main/escp2-channels.c:3114 src/main/escp2-channels.c:3128 -#: src/main/escp2-channels.c:3141 src/main/escp2-channels.c:3154 -#: src/main/escp2-channels.c:3191 src/escputil/escputil.c:981 +#: src/main/escp2-channels.c:3131 src/main/escp2-channels.c:3141 +#: src/main/escp2-channels.c:3153 src/main/escp2-channels.c:3167 +#: src/main/escp2-channels.c:3180 src/main/escp2-channels.c:3193 +#: src/main/escp2-channels.c:3240 src/escputil/escputil.c:981 #: src/escputil/escputil.c:1204 #, fuzzy msgid "Light Cyan" msgstr "Cian Claro" -#: src/main/escp2-channels.c:3093 src/main/escp2-channels.c:3104 -#: src/main/escp2-channels.c:3115 src/main/escp2-channels.c:3129 -#: src/main/escp2-channels.c:3142 src/main/escp2-channels.c:3155 -#: src/main/escp2-channels.c:3190 src/escputil/escputil.c:982 +#: src/main/escp2-channels.c:3132 src/main/escp2-channels.c:3143 +#: src/main/escp2-channels.c:3154 src/main/escp2-channels.c:3168 +#: src/main/escp2-channels.c:3181 src/main/escp2-channels.c:3194 +#: src/main/escp2-channels.c:3239 src/escputil/escputil.c:982 #: src/escputil/escputil.c:1205 #, fuzzy msgid "Light Magenta" msgstr "Magenta Claro" -#: src/main/escp2-channels.c:3130 src/main/escp2-channels.c:3192 +#: src/main/escp2-channels.c:3169 src/main/escp2-channels.c:3241 #: src/escputil/escputil.c:985 #, fuzzy msgid "Light Black" msgstr "Negro" -#: src/main/escp2-channels.c:3143 +#: src/main/escp2-channels.c:3182 #, fuzzy msgid "Dark Yellow" msgstr "Amarillo" -#: src/main/escp2-channels.c:3170 src/escputil/escputil.c:989 +#: src/main/escp2-channels.c:3209 src/escputil/escputil.c:989 #, fuzzy msgid "Gloss Optimizer" -msgstr "Película Brillante" +msgstr "Película Brillante" -#: src/main/escp2-channels.c:3189 src/escputil/escputil.c:990 +#: src/main/escp2-channels.c:3238 src/escputil/escputil.c:990 #, fuzzy msgid "Light Light Black" msgstr "Negro" -#: src/main/escp2-papers.c:1343 src/main/escp2-papers.c:1387 -#: src/main/escp2-papers.c:1431 src/main/escp2-papers.c:1479 -#: src/main/escp2-papers.c:1527 src/main/escp2-papers.c:1571 +#: src/main/escp2-papers.c:1353 src/main/escp2-papers.c:1397 +#: src/main/escp2-papers.c:1441 src/main/escp2-papers.c:1489 +#: src/main/escp2-papers.c:1537 src/main/escp2-papers.c:1581 msgid "Plain Paper Fast Load" -msgstr "Papel Común Carga Rápida" +msgstr "Papel Común Carga Rápida" -#: src/main/escp2-papers.c:1345 src/main/escp2-papers.c:1389 -#: src/main/escp2-papers.c:1433 src/main/escp2-papers.c:1481 -#: src/main/escp2-papers.c:1529 src/main/escp2-papers.c:1573 +#: src/main/escp2-papers.c:1355 src/main/escp2-papers.c:1399 +#: src/main/escp2-papers.c:1443 src/main/escp2-papers.c:1491 +#: src/main/escp2-papers.c:1539 src/main/escp2-papers.c:1583 #: src/main/xmli18n-tmp.h:5 msgid "Postcard" msgstr "Postal" -#: src/main/escp2-papers.c:1353 src/main/escp2-papers.c:1397 -#: src/main/escp2-papers.c:1441 src/main/escp2-papers.c:1489 -#: src/main/escp2-papers.c:1537 src/main/escp2-papers.c:1581 +#: src/main/escp2-papers.c:1363 src/main/escp2-papers.c:1407 +#: src/main/escp2-papers.c:1451 src/main/escp2-papers.c:1499 +#: src/main/escp2-papers.c:1547 src/main/escp2-papers.c:1591 #, fuzzy msgid "Back Light Film" msgstr "Back Light Film" -#: src/main/escp2-papers.c:1357 src/main/escp2-papers.c:1401 -#: src/main/escp2-papers.c:1445 src/main/escp2-papers.c:1493 -#: src/main/escp2-papers.c:1541 src/main/escp2-papers.c:1585 +#: src/main/escp2-papers.c:1367 src/main/escp2-papers.c:1411 +#: src/main/escp2-papers.c:1455 src/main/escp2-papers.c:1503 +#: src/main/escp2-papers.c:1551 src/main/escp2-papers.c:1595 #, fuzzy msgid "Matte Paper Heavyweight" msgstr "Papel Opaco" -#: src/main/escp2-papers.c:1367 src/main/escp2-papers.c:1411 -#: src/main/escp2-papers.c:1455 src/main/escp2-papers.c:1503 -#: src/main/escp2-papers.c:1551 src/main/escp2-papers.c:1595 +#: src/main/escp2-papers.c:1377 src/main/escp2-papers.c:1421 +#: src/main/escp2-papers.c:1465 src/main/escp2-papers.c:1513 +#: src/main/escp2-papers.c:1561 src/main/escp2-papers.c:1605 #, fuzzy msgid "Premium Semigloss Photo Paper" -msgstr "Papel Brillante de Altísima Calidad Fotográfica" +msgstr "Papel Brillante de Altísima Calidad Fotográfica" -#: src/main/escp2-papers.c:1375 src/main/escp2-papers.c:1419 -#: src/main/escp2-papers.c:1467 src/main/escp2-papers.c:1515 -#: src/main/escp2-papers.c:1559 src/main/escp2-papers.c:1607 +#: src/main/escp2-papers.c:1385 src/main/escp2-papers.c:1429 +#: src/main/escp2-papers.c:1477 src/main/escp2-papers.c:1525 +#: src/main/escp2-papers.c:1569 src/main/escp2-papers.c:1617 #, fuzzy msgid "ColorLife Paper" -msgstr "Papel Común" +msgstr "Papel Común" -#: src/main/escp2-papers.c:1459 src/main/escp2-papers.c:1507 -#: src/main/escp2-papers.c:1599 +#: src/main/escp2-papers.c:1469 src/main/escp2-papers.c:1517 +#: src/main/escp2-papers.c:1609 #, fuzzy msgid "Archival Matte Paper" msgstr "Papel Opaco" -#: src/main/escp2-papers.c:1461 src/main/escp2-papers.c:1509 -#: src/main/escp2-papers.c:1601 +#: src/main/escp2-papers.c:1471 src/main/escp2-papers.c:1519 +#: src/main/escp2-papers.c:1611 msgid "Watercolor Paper - Radiant White" msgstr "" -#: src/main/escp2-papers.c:1716 src/main/escp2-papers.c:1842 -#: src/main/escp2-papers.c:1884 src/main/escp2-papers.c:1926 -#: src/main/escp2-papers.c:2001 +#: src/main/escp2-papers.c:1727 src/main/escp2-papers.c:1853 +#: src/main/escp2-papers.c:1895 src/main/escp2-papers.c:1937 +#: src/main/escp2-papers.c:2012 msgid "Roll Feed" -msgstr "Alimentación por Rollo" +msgstr "Alimentación por Rollo" -#: src/main/escp2-papers.c:1740 src/main/escp2-papers.c:1791 +#: src/main/escp2-papers.c:1751 src/main/escp2-papers.c:1802 msgid "Roll Feed (cut each page)" msgstr "" -#: src/main/escp2-papers.c:1749 src/main/escp2-papers.c:1800 +#: src/main/escp2-papers.c:1760 src/main/escp2-papers.c:1811 msgid "Roll Feed (do not cut)" msgstr "" -#: src/main/escp2-papers.c:1773 src/main/escp2-papers.c:1824 +#: src/main/escp2-papers.c:1784 src/main/escp2-papers.c:1835 #, fuzzy msgid "Manual Feed" msgstr "Manual" -#: src/main/escp2-papers.c:1782 src/main/escp2-papers.c:1833 -#: src/main/escp2-papers.c:1935 src/main/escp2-papers.c:1968 +#: src/main/escp2-papers.c:1793 src/main/escp2-papers.c:1844 +#: src/main/escp2-papers.c:1946 src/main/escp2-papers.c:1979 #, fuzzy msgid "Print to CD" -msgstr "¿Imprimir a un archivo?" +msgstr "¿Imprimir a un archivo?" -#: src/main/escp2-papers.c:1866 src/main/escp2-papers.c:1908 +#: src/main/escp2-papers.c:1877 src/main/escp2-papers.c:1919 #, fuzzy msgid "Manual Sheet Guide" msgstr "Manual" -#: src/main/escp2-papers.c:1875 src/main/escp2-papers.c:1917 +#: src/main/escp2-papers.c:1886 src/main/escp2-papers.c:1928 #, fuzzy msgid "Manual Feed (Front)" msgstr "Manual" -#: src/main/escp2-papers.c:1950 +#: src/main/escp2-papers.c:1961 #, fuzzy msgid "Rear Tray" msgstr "Bandeja" -#: src/main/escp2-papers.c:1959 +#: src/main/escp2-papers.c:1970 msgid "Front Tray" msgstr "" -#: src/main/escp2-papers.c:1977 +#: src/main/escp2-papers.c:1988 #, fuzzy msgid "Photo Board" -msgstr "Papel para Fotografía" +msgstr "Papel para Fotografía" -#: src/main/escp2-papers.c:2016 +#: src/main/escp2-papers.c:2027 msgid "Cut Sheet Bin 1" msgstr "" -#: src/main/escp2-papers.c:2025 +#: src/main/escp2-papers.c:2036 msgid "Cut Sheet Bin 2" msgstr "" -#: src/main/escp2-papers.c:2034 +#: src/main/escp2-papers.c:2045 #, fuzzy msgid "Cut Sheet Autoselect" msgstr "Autoseleccionar" -#: src/main/escp2-papers.c:2043 +#: src/main/escp2-papers.c:2054 msgid "Manual Selection" msgstr "" @@ -2110,7 +2278,7 @@ msgstr "1200 PPP alta calidad" #: src/main/escp2-resolutions.c:103 #, fuzzy msgid "720 DPI Highest Quality" -msgstr "1200 PPP altísima calidad" +msgstr "1200 PPP altísima calidad" #: src/main/escp2-resolutions.c:106 #, fuzzy @@ -2126,7 +2294,7 @@ msgstr "1440 x 720 PPP" #: src/main/escp2-resolutions.c:116 #, fuzzy msgid "1440 x 720 DPI Highest Quality" -msgstr "1440 x 360 PPP Altísima Calidad " +msgstr "1440 x 360 PPP Altísima Calidad " #: src/main/escp2-resolutions.c:119 src/main/escp2-resolutions.c:122 #, fuzzy @@ -2141,7 +2309,7 @@ msgstr "2880 x 720 PPP" #: src/main/escp2-resolutions.c:135 #, fuzzy msgid "2880 x 720 DPI Highest Quality" -msgstr "1440 x 360 PPP Altísima Calidad " +msgstr "1440 x 360 PPP Altísima Calidad " #: src/main/escp2-resolutions.c:139 src/main/escp2-resolutions.c:142 #: src/main/escp2-resolutions.c:145 @@ -2211,46 +2379,52 @@ msgid "Eight Pass" msgstr "Brillo:" #: src/main/escp2-resolutions.c:637 src/main/escp2-resolutions.c:652 -#: src/main/generic-options.c:33 +#: src/main/escp2-resolutions.c:667 src/main/generic-options.c:33 msgid "Fast Economy" msgstr "" #: src/main/escp2-resolutions.c:638 src/main/escp2-resolutions.c:653 -#: src/main/generic-options.c:34 +#: src/main/escp2-resolutions.c:668 src/main/generic-options.c:34 msgid "Economy" msgstr "" #: src/main/escp2-resolutions.c:639 src/main/escp2-resolutions.c:654 -#: src/main/escp2-resolutions.c:667 src/main/generic-options.c:35 +#: src/main/escp2-resolutions.c:669 src/main/escp2-resolutions.c:682 +#: src/main/generic-options.c:35 msgid "Draft" msgstr "" #: src/main/escp2-resolutions.c:641 src/main/escp2-resolutions.c:656 -#: src/main/escp2-resolutions.c:670 src/main/generic-options.c:37 +#: src/main/escp2-resolutions.c:671 src/main/escp2-resolutions.c:685 +#: src/main/generic-options.c:37 #, fuzzy msgid "High" msgstr "Altura:" #: src/main/escp2-resolutions.c:642 src/main/escp2-resolutions.c:657 -#: src/main/escp2-resolutions.c:669 src/main/generic-options.c:38 +#: src/main/escp2-resolutions.c:672 src/main/escp2-resolutions.c:684 +#: src/main/generic-options.c:38 #, fuzzy msgid "Photo" -msgstr "Fotografía" +msgstr "Fotografía" #: src/main/escp2-resolutions.c:643 src/main/escp2-resolutions.c:658 -#: src/main/escp2-resolutions.c:671 src/main/generic-options.c:39 +#: src/main/escp2-resolutions.c:673 src/main/escp2-resolutions.c:686 +#: src/main/generic-options.c:39 #, fuzzy msgid "Super Photo" msgstr "Stylus Photo" #: src/main/escp2-resolutions.c:644 src/main/escp2-resolutions.c:659 -#: src/main/escp2-resolutions.c:672 src/main/generic-options.c:40 +#: src/main/escp2-resolutions.c:674 src/main/escp2-resolutions.c:687 +#: src/main/generic-options.c:40 #, fuzzy msgid "Ultra Photo" -msgstr "Fotografía de Seis Colores" +msgstr "Fotografía de Seis Colores" #: src/main/escp2-resolutions.c:645 src/main/escp2-resolutions.c:660 -#: src/main/escp2-resolutions.c:673 src/main/generic-options.c:41 +#: src/main/escp2-resolutions.c:675 src/main/escp2-resolutions.c:688 +#: src/main/generic-options.c:41 msgid "Best" msgstr "" @@ -2269,7 +2443,7 @@ msgstr "" #: src/main/generic-options.c:49 #, fuzzy msgid "Photograph" -msgstr "Fotografía" +msgstr "Fotografía" #: src/main/generic-options.c:50 msgid "Line Art" @@ -2278,7 +2452,7 @@ msgstr "Arte lineal" #: src/main/generic-options.c:55 #, fuzzy msgid "Page" -msgstr "Tamaño" +msgstr "Tamaño" #: src/main/generic-options.c:56 msgid "Job" @@ -2305,12 +2479,12 @@ msgstr "" #: src/main/generic-options.c:80 #, fuzzy msgid "Page Number" -msgstr "Tamaño" +msgstr "Tamaño" #: src/main/generic-options.c:81 #, fuzzy msgid "Page number" -msgstr "Tamaño" +msgstr "Tamaño" #: src/main/xmli18n-tmp.h:1 msgid "Letter" @@ -2333,4386 +2507,4640 @@ msgid "3x5" msgstr "3x5" #: src/main/xmli18n-tmp.h:10 +msgid "3 1/2 x5" +msgstr "" + +#: src/main/xmli18n-tmp.h:11 msgid "4x6" msgstr "4x6" -#: src/main/xmli18n-tmp.h:11 +#: src/main/xmli18n-tmp.h:12 #, fuzzy msgid "Epson 4x6 Photo Paper (tear-off borders)" -msgstr "Papel Epson 4x6 de Fotografía" +msgstr "Papel Epson 4x6 de Fotografía" -#: src/main/xmli18n-tmp.h:12 +#: src/main/xmli18n-tmp.h:13 msgid "5x7" msgstr "5x7" -#: src/main/xmli18n-tmp.h:13 +#: src/main/xmli18n-tmp.h:14 msgid "5x8" msgstr "5x8" -#: src/main/xmli18n-tmp.h:14 +#: src/main/xmli18n-tmp.h:15 msgid "6x8" msgstr "6x8" -#: src/main/xmli18n-tmp.h:15 +#: src/main/xmli18n-tmp.h:16 msgid "8x10" msgstr "8x10" -#: src/main/xmli18n-tmp.h:17 +#: src/main/xmli18n-tmp.h:18 msgid "12x18" msgstr "12x18" -#: src/main/xmli18n-tmp.h:18 +#: src/main/xmli18n-tmp.h:19 msgid "Super B 13x19" msgstr "Super B 13x19" -#: src/main/xmli18n-tmp.h:19 +#: src/main/xmli18n-tmp.h:20 msgid "Engineering C 17x22" msgstr "" -#: src/main/xmli18n-tmp.h:20 +#: src/main/xmli18n-tmp.h:21 msgid "8x12" msgstr "8x12" -#: src/main/xmli18n-tmp.h:21 +#: src/main/xmli18n-tmp.h:22 msgid "11x14" msgstr "11x14" -#: src/main/xmli18n-tmp.h:22 +#: src/main/xmli18n-tmp.h:23 msgid "16x20" msgstr "16x20" -#: src/main/xmli18n-tmp.h:23 +#: src/main/xmli18n-tmp.h:24 msgid "16x24" msgstr "16x24" -#: src/main/xmli18n-tmp.h:24 +#: src/main/xmli18n-tmp.h:25 msgid "20x24" msgstr "20x24" -#: src/main/xmli18n-tmp.h:25 +#: src/main/xmli18n-tmp.h:26 msgid "20x30" msgstr "20x30" -#: src/main/xmli18n-tmp.h:26 +#: src/main/xmli18n-tmp.h:27 #, fuzzy msgid "22x30" msgstr "20x30" -#: src/main/xmli18n-tmp.h:27 +#: src/main/xmli18n-tmp.h:28 msgid "24x30" msgstr "24x30" -#: src/main/xmli18n-tmp.h:28 +#: src/main/xmli18n-tmp.h:29 msgid "Super A1 24x36" msgstr "" -#: src/main/xmli18n-tmp.h:29 +#: src/main/xmli18n-tmp.h:30 msgid "30x40" msgstr "30x40" -#: src/main/xmli18n-tmp.h:30 +#: src/main/xmli18n-tmp.h:31 msgid "4A" msgstr "4A" -#: src/main/xmli18n-tmp.h:31 +#: src/main/xmli18n-tmp.h:32 msgid "2A" msgstr "2A" -#: src/main/xmli18n-tmp.h:32 +#: src/main/xmli18n-tmp.h:33 #, fuzzy msgid "Super A0" msgstr "Stylus Photo" -#: src/main/xmli18n-tmp.h:33 +#: src/main/xmli18n-tmp.h:34 msgid "A0" msgstr "A0" -#: src/main/xmli18n-tmp.h:34 +#: src/main/xmli18n-tmp.h:35 msgid "A1" msgstr "A1" -#: src/main/xmli18n-tmp.h:35 +#: src/main/xmli18n-tmp.h:36 msgid "A2" msgstr "A2" -#: src/main/xmli18n-tmp.h:36 +#: src/main/xmli18n-tmp.h:37 msgid "A3" msgstr "A3" -#: src/main/xmli18n-tmp.h:37 +#: src/main/xmli18n-tmp.h:38 msgid "A4" msgstr "A4" -#: src/main/xmli18n-tmp.h:38 +#: src/main/xmli18n-tmp.h:39 msgid "A5" msgstr "A5" -#: src/main/xmli18n-tmp.h:39 +#: src/main/xmli18n-tmp.h:40 msgid "A6" msgstr "A6" -#: src/main/xmli18n-tmp.h:40 +#: src/main/xmli18n-tmp.h:41 msgid "A7" msgstr "A7" -#: src/main/xmli18n-tmp.h:41 +#: src/main/xmli18n-tmp.h:42 msgid "A8" msgstr "A8" -#: src/main/xmli18n-tmp.h:42 +#: src/main/xmli18n-tmp.h:43 msgid "A9" msgstr "A9" -#: src/main/xmli18n-tmp.h:43 +#: src/main/xmli18n-tmp.h:44 msgid "A10" msgstr "A10" -#: src/main/xmli18n-tmp.h:44 +#: src/main/xmli18n-tmp.h:45 msgid "RA0" msgstr "RA0" -#: src/main/xmli18n-tmp.h:45 +#: src/main/xmli18n-tmp.h:46 msgid "RA1" msgstr "RA1" -#: src/main/xmli18n-tmp.h:46 +#: src/main/xmli18n-tmp.h:47 msgid "RA2" msgstr "RA2" -#: src/main/xmli18n-tmp.h:47 +#: src/main/xmli18n-tmp.h:48 msgid "RA3" msgstr "RA3" -#: src/main/xmli18n-tmp.h:48 +#: src/main/xmli18n-tmp.h:49 msgid "RA4" msgstr "RA4" -#: src/main/xmli18n-tmp.h:49 +#: src/main/xmli18n-tmp.h:50 msgid "SRA0" msgstr "SRA0" -#: src/main/xmli18n-tmp.h:50 +#: src/main/xmli18n-tmp.h:51 msgid "SRA1" msgstr "SRA1" -#: src/main/xmli18n-tmp.h:51 +#: src/main/xmli18n-tmp.h:52 msgid "SRA2" msgstr "SRA2" -#: src/main/xmli18n-tmp.h:52 +#: src/main/xmli18n-tmp.h:53 msgid "SRA3" msgstr "SRA3" -#: src/main/xmli18n-tmp.h:53 +#: src/main/xmli18n-tmp.h:54 msgid "SRA4" msgstr "SRA4" -#: src/main/xmli18n-tmp.h:54 +#: src/main/xmli18n-tmp.h:55 msgid "4B ISO" msgstr "4B ISO" -#: src/main/xmli18n-tmp.h:55 +#: src/main/xmli18n-tmp.h:56 msgid "2B ISO" msgstr "2B ISO" -#: src/main/xmli18n-tmp.h:56 +#: src/main/xmli18n-tmp.h:57 msgid "B0 ISO" msgstr "B0 ISO" -#: src/main/xmli18n-tmp.h:57 +#: src/main/xmli18n-tmp.h:58 msgid "B1 ISO" msgstr "B1 ISO" -#: src/main/xmli18n-tmp.h:58 +#: src/main/xmli18n-tmp.h:59 msgid "B2 ISO" msgstr "B2 ISO" -#: src/main/xmli18n-tmp.h:59 +#: src/main/xmli18n-tmp.h:60 msgid "B3 ISO" msgstr "B3 ISO" -#: src/main/xmli18n-tmp.h:60 +#: src/main/xmli18n-tmp.h:61 msgid "B4 ISO" msgstr "B4 ISO" -#: src/main/xmli18n-tmp.h:61 +#: src/main/xmli18n-tmp.h:62 msgid "B5 ISO" msgstr "B5 ISO" -#: src/main/xmli18n-tmp.h:62 +#: src/main/xmli18n-tmp.h:63 msgid "B6 ISO" msgstr "B6 ISO" -#: src/main/xmli18n-tmp.h:63 +#: src/main/xmli18n-tmp.h:64 msgid "B7 ISO" msgstr "B7 ISO" -#: src/main/xmli18n-tmp.h:64 +#: src/main/xmli18n-tmp.h:65 msgid "B8 ISO" msgstr "B8 ISO" -#: src/main/xmli18n-tmp.h:65 +#: src/main/xmli18n-tmp.h:66 msgid "B9 ISO" msgstr "B9 ISO" -#: src/main/xmli18n-tmp.h:66 +#: src/main/xmli18n-tmp.h:67 msgid "B10 ISO" msgstr "B10 ISO" -#: src/main/xmli18n-tmp.h:67 +#: src/main/xmli18n-tmp.h:68 #, fuzzy msgid "Super B0 JIS" msgstr "B0 JIS" -#: src/main/xmli18n-tmp.h:68 +#: src/main/xmli18n-tmp.h:69 msgid "B0 JIS" msgstr "B0 JIS" -#: src/main/xmli18n-tmp.h:69 +#: src/main/xmli18n-tmp.h:70 msgid "B1 JIS" msgstr "B1 JIS" -#: src/main/xmli18n-tmp.h:70 +#: src/main/xmli18n-tmp.h:71 msgid "B2 JIS" msgstr "B2 JIS" -#: src/main/xmli18n-tmp.h:71 +#: src/main/xmli18n-tmp.h:72 msgid "B3 JIS" msgstr "B3 JIS" -#: src/main/xmli18n-tmp.h:72 +#: src/main/xmli18n-tmp.h:73 msgid "B4 JIS" msgstr "B4 JIS" -#: src/main/xmli18n-tmp.h:73 +#: src/main/xmli18n-tmp.h:74 msgid "B5 JIS" msgstr "B5 JIS" -#: src/main/xmli18n-tmp.h:74 +#: src/main/xmli18n-tmp.h:75 msgid "B6 JIS" msgstr "B6 JIS" -#: src/main/xmli18n-tmp.h:75 +#: src/main/xmli18n-tmp.h:76 msgid "B7 JIS" msgstr "B7 JIS" -#: src/main/xmli18n-tmp.h:76 +#: src/main/xmli18n-tmp.h:77 msgid "B8 JIS" msgstr "B8 JIS" -#: src/main/xmli18n-tmp.h:77 +#: src/main/xmli18n-tmp.h:78 msgid "B9 JIS" msgstr "B9 JIS" -#: src/main/xmli18n-tmp.h:78 +#: src/main/xmli18n-tmp.h:79 msgid "B10 JIS" msgstr "B10 JIS" -#: src/main/xmli18n-tmp.h:79 +#: src/main/xmli18n-tmp.h:80 msgid "C0" msgstr "C0" -#: src/main/xmli18n-tmp.h:80 +#: src/main/xmli18n-tmp.h:81 +#, fuzzy +msgid "C0 landscape" +msgstr "Apaisado" + +#: src/main/xmli18n-tmp.h:82 msgid "C1" msgstr "C1" -#: src/main/xmli18n-tmp.h:81 +#: src/main/xmli18n-tmp.h:83 +#, fuzzy +msgid "C1 landscape" +msgstr "Apaisado" + +#: src/main/xmli18n-tmp.h:84 msgid "C2" msgstr "C2" -#: src/main/xmli18n-tmp.h:82 +#: src/main/xmli18n-tmp.h:85 +#, fuzzy +msgid "C2 landscape" +msgstr "Apaisado" + +#: src/main/xmli18n-tmp.h:86 msgid "C3" msgstr "C3" -#: src/main/xmli18n-tmp.h:83 +#: src/main/xmli18n-tmp.h:87 +#, fuzzy +msgid "C3 landscape" +msgstr "Apaisado" + +#: src/main/xmli18n-tmp.h:88 msgid "C4" msgstr "C4" -#: src/main/xmli18n-tmp.h:84 +#: src/main/xmli18n-tmp.h:89 +#, fuzzy +msgid "C4 landscape" +msgstr "Apaisado" + +#: src/main/xmli18n-tmp.h:90 msgid "C5" msgstr "C5" -#: src/main/xmli18n-tmp.h:85 +#: src/main/xmli18n-tmp.h:91 +#, fuzzy +msgid "C5 landscape" +msgstr "Apaisado" + +#: src/main/xmli18n-tmp.h:92 msgid "B6-C4" msgstr "B6-C4" -#: src/main/xmli18n-tmp.h:86 +#: src/main/xmli18n-tmp.h:93 +#, fuzzy +msgid "B6-C4 landscape" +msgstr "Apaisado" + +#: src/main/xmli18n-tmp.h:94 msgid "C6" msgstr "C6" -#: src/main/xmli18n-tmp.h:87 +#: src/main/xmli18n-tmp.h:95 +#, fuzzy +msgid "C6 landscape" +msgstr "Apaisado" + +#: src/main/xmli18n-tmp.h:96 msgid "DL" msgstr "DL" -#: src/main/xmli18n-tmp.h:88 +#: src/main/xmli18n-tmp.h:97 +#, fuzzy +msgid "DL landscape" +msgstr "Apaisado" + +#: src/main/xmli18n-tmp.h:98 msgid "C7-6" msgstr "C7-6" -#: src/main/xmli18n-tmp.h:89 +#: src/main/xmli18n-tmp.h:99 +#, fuzzy +msgid "C7-6 landscape" +msgstr "Apaisado" + +#: src/main/xmli18n-tmp.h:100 msgid "C7" msgstr "C7" -#: src/main/xmli18n-tmp.h:90 +#: src/main/xmli18n-tmp.h:101 +#, fuzzy +msgid "C7 landscape" +msgstr "Apaisado" + +#: src/main/xmli18n-tmp.h:102 msgid "C8" msgstr "C8" -#: src/main/xmli18n-tmp.h:91 +#: src/main/xmli18n-tmp.h:103 +#, fuzzy +msgid "C8 landscape" +msgstr "Apaisado" + +#: src/main/xmli18n-tmp.h:104 msgid "C9" msgstr "C9" -#: src/main/xmli18n-tmp.h:92 +#: src/main/xmli18n-tmp.h:105 +#, fuzzy +msgid "C9 landscape" +msgstr "Apaisado" + +#: src/main/xmli18n-tmp.h:106 msgid "C10" msgstr "C10" -#: src/main/xmli18n-tmp.h:93 +#: src/main/xmli18n-tmp.h:107 +#, fuzzy +msgid "C10 landscape" +msgstr "Apaisado" + +#: src/main/xmli18n-tmp.h:108 #, fuzzy msgid "ArchA" msgstr "ArchA" -#: src/main/xmli18n-tmp.h:94 +#: src/main/xmli18n-tmp.h:109 msgid "ArchA transposed" msgstr "" -#: src/main/xmli18n-tmp.h:95 +#: src/main/xmli18n-tmp.h:110 #, fuzzy msgid "ArchB" msgstr "ArchB" -#: src/main/xmli18n-tmp.h:96 +#: src/main/xmli18n-tmp.h:111 msgid "ArchB transposed" msgstr "" -#: src/main/xmli18n-tmp.h:97 +#: src/main/xmli18n-tmp.h:112 #, fuzzy msgid "ArchC" msgstr "ArchC" -#: src/main/xmli18n-tmp.h:98 +#: src/main/xmli18n-tmp.h:113 msgid "ArchC transposed" msgstr "" -#: src/main/xmli18n-tmp.h:99 +#: src/main/xmli18n-tmp.h:114 #, fuzzy msgid "ArchD" msgstr "ArchD" -#: src/main/xmli18n-tmp.h:100 +#: src/main/xmli18n-tmp.h:115 msgid "ArchD transposed" msgstr "" -#: src/main/xmli18n-tmp.h:101 +#: src/main/xmli18n-tmp.h:116 #, fuzzy msgid "ArchE" msgstr "ArchE" -#: src/main/xmli18n-tmp.h:102 +#: src/main/xmli18n-tmp.h:117 msgid "ArchE transposed" msgstr "" -#: src/main/xmli18n-tmp.h:103 +#: src/main/xmli18n-tmp.h:118 #, fuzzy msgid "American foolscap" msgstr "Foolscap Americano" -#: src/main/xmli18n-tmp.h:104 +#: src/main/xmli18n-tmp.h:119 #, fuzzy msgid "European foolscap" msgstr "Foolscap Europeo" -#: src/main/xmli18n-tmp.h:105 +#: src/main/xmli18n-tmp.h:120 #, fuzzy msgid "Crown Quarto" msgstr "Crown Quarto" -#: src/main/xmli18n-tmp.h:106 +#: src/main/xmli18n-tmp.h:121 #, fuzzy msgid "Large Crown Quarto" msgstr "Crown Quarto Grande" -#: src/main/xmli18n-tmp.h:107 +#: src/main/xmli18n-tmp.h:122 #, fuzzy msgid "Demy Quarto" msgstr "Demy Quarto" -#: src/main/xmli18n-tmp.h:108 +#: src/main/xmli18n-tmp.h:123 #, fuzzy msgid "Royal Quarto" msgstr "Royal Quarto" -#: src/main/xmli18n-tmp.h:109 +#: src/main/xmli18n-tmp.h:124 #, fuzzy msgid "ISO A4" msgstr "SRA4" -#: src/main/xmli18n-tmp.h:110 +#: src/main/xmli18n-tmp.h:125 #, fuzzy msgid "Crown Octavo" msgstr "Crown Octavo" -#: src/main/xmli18n-tmp.h:111 +#: src/main/xmli18n-tmp.h:126 #, fuzzy msgid "Large Crown Octavo" msgstr "Crown Octavo Grande" -#: src/main/xmli18n-tmp.h:112 +#: src/main/xmli18n-tmp.h:127 #, fuzzy msgid "Demy Octavo" msgstr "Demy Octavo" -#: src/main/xmli18n-tmp.h:113 +#: src/main/xmli18n-tmp.h:128 #, fuzzy msgid "Royal Octavo" msgstr "Royal Octavo" -#: src/main/xmli18n-tmp.h:114 +#: src/main/xmli18n-tmp.h:129 msgid "ISO A5" msgstr "" -#: src/main/xmli18n-tmp.h:115 +#: src/main/xmli18n-tmp.h:130 #, fuzzy msgid "Small paperback" -msgstr "Paperback pequeño" +msgstr "Paperback pequeño" -#: src/main/xmli18n-tmp.h:116 +#: src/main/xmli18n-tmp.h:131 #, fuzzy msgid "Penguin small paperback" -msgstr "Penguin paperback pequeño" +msgstr "Penguin paperback pequeño" -#: src/main/xmli18n-tmp.h:117 +#: src/main/xmli18n-tmp.h:132 #, fuzzy msgid "Penguin large paperback" msgstr "Penguin paperback grande" -#: src/main/xmli18n-tmp.h:118 +#: src/main/xmli18n-tmp.h:133 msgid "10cm x 15cm" msgstr "" -#: src/main/xmli18n-tmp.h:119 +#: src/main/xmli18n-tmp.h:134 msgid "Hagaki Card" msgstr "Tarjeta Hagaki" -#: src/main/xmli18n-tmp.h:120 +#: src/main/xmli18n-tmp.h:135 msgid "Oufuku Card" msgstr "Tarjeta Oufuku" -#: src/main/xmli18n-tmp.h:121 +#: src/main/xmli18n-tmp.h:136 msgid "Japanese long envelope #3" -msgstr "Sobre Japonés grande #3" +msgstr "Sobre Japonés grande #3" -#: src/main/xmli18n-tmp.h:122 +#: src/main/xmli18n-tmp.h:137 +#, fuzzy +msgid "Japanese long envelope #3 landscape" +msgstr "Sobre Japonés grande #3" + +#: src/main/xmli18n-tmp.h:138 msgid "Japanese long envelope #4" -msgstr "Sobre Japonés grande #4" +msgstr "Sobre Japonés grande #4" -#: src/main/xmli18n-tmp.h:123 +#: src/main/xmli18n-tmp.h:139 +#, fuzzy +msgid "Japanese long envelope #4 landscape" +msgstr "Sobre Japonés grande #4" + +#: src/main/xmli18n-tmp.h:140 msgid "Japanese Kaku envelope #4" -msgstr "Sobre Japonés Kaku #4" +msgstr "Sobre Japonés Kaku #4" -#: src/main/xmli18n-tmp.h:124 +#: src/main/xmli18n-tmp.h:141 +#, fuzzy +msgid "Japanese Kaku envelope #4 landscape" +msgstr "Sobre Japonés Kaku #4" + +#: src/main/xmli18n-tmp.h:142 msgid "Commercial 10" msgstr "Comercial 10" -#: src/main/xmli18n-tmp.h:125 +#: src/main/xmli18n-tmp.h:143 +#, fuzzy +msgid "Commercial 10 landscape" +msgstr "Comercial 10" + +#: src/main/xmli18n-tmp.h:144 msgid "A2 Invitation" -msgstr "A2 Invitación" +msgstr "A2 Invitación" -#: src/main/xmli18n-tmp.h:126 +#: src/main/xmli18n-tmp.h:145 #, fuzzy msgid "Monarch Envelope" msgstr "Sobre" -#: src/main/xmli18n-tmp.h:127 +#: src/main/xmli18n-tmp.h:146 +#, fuzzy +msgid "Monarch Envelope landscape" +msgstr "Sobre" + +#: src/main/xmli18n-tmp.h:147 msgid "4x5 3/8" msgstr "" -#: src/main/xmli18n-tmp.h:128 +#: src/main/xmli18n-tmp.h:148 #, fuzzy msgid "4x7" msgstr "5x7" -#: src/main/xmli18n-tmp.h:129 +#: src/main/xmli18n-tmp.h:149 msgid "CP_L" msgstr "" -#: src/main/xmli18n-tmp.h:130 +#: src/main/xmli18n-tmp.h:150 msgid "Card" msgstr "" -#: src/main/xmli18n-tmp.h:131 +#: src/main/xmli18n-tmp.h:151 #, fuzzy msgid "Wide Postcard" msgstr "Postal" -#: src/main/xmli18n-tmp.h:132 +#: src/main/xmli18n-tmp.h:152 msgid "Chilean Office" msgstr "" -#: src/main/xmli18n-tmp.h:133 +#: src/main/xmli18n-tmp.h:153 msgid "Chilean Double Letter" msgstr "" -#: src/main/xmli18n-tmp.h:134 +#: src/main/xmli18n-tmp.h:154 msgid "Chilean Double Office" msgstr "" -#: src/main/xmli18n-tmp.h:135 +#: src/main/xmli18n-tmp.h:155 msgid "Custom" msgstr "Personalizado" -#: src/main/xmli18n-tmp.h:136 +#: src/main/xmli18n-tmp.h:156 msgid "89 mm Roll Paper" msgstr "Rollo de Papel de 89 mm" -#: src/main/xmli18n-tmp.h:137 +#: src/main/xmli18n-tmp.h:157 msgid "4 Inch Roll Paper" msgstr "Rollo de Papel de 4 Pulgadas" -#: src/main/xmli18n-tmp.h:138 +#: src/main/xmli18n-tmp.h:158 msgid "5 Inch Roll Paper" msgstr "Rollo de Papel de 5 Pulgadas" -#: src/main/xmli18n-tmp.h:139 +#: src/main/xmli18n-tmp.h:159 msgid "210 mm Roll Paper" msgstr "Rollo de Papel de 210 mm" -#: src/main/xmli18n-tmp.h:140 +#: src/main/xmli18n-tmp.h:160 msgid "13 Inch Roll Paper" msgstr "Rollo de Papel de 13 Pulgadas" -#: src/main/xmli18n-tmp.h:141 +#: src/main/xmli18n-tmp.h:161 msgid "22 Inch Roll Paper" msgstr "Rollo de Papel de 22 Pulgadas" -#: src/main/xmli18n-tmp.h:142 +#: src/main/xmli18n-tmp.h:162 msgid "24 Inch Roll Paper" msgstr "Rollo de Papel de 24 Pulgadas" -#: src/main/xmli18n-tmp.h:143 +#: src/main/xmli18n-tmp.h:163 msgid "36 Inch Roll Paper" msgstr "Rollo de Papel de 36 Pulgadas" -#: src/main/xmli18n-tmp.h:144 +#: src/main/xmli18n-tmp.h:164 msgid "44 Inch Roll Paper" msgstr "Rollo de Papel de 44 Pulgadas" -#: src/main/xmli18n-tmp.h:145 +#: src/main/xmli18n-tmp.h:165 msgid "PostScript Level 1" msgstr "" -#: src/main/xmli18n-tmp.h:146 +#: src/main/xmli18n-tmp.h:166 msgid "PostScript Level 2" msgstr "" -#: src/main/xmli18n-tmp.h:147 +#: src/main/xmli18n-tmp.h:167 msgid "Canon BJ-30" msgstr "" -#: src/main/xmli18n-tmp.h:148 +#: src/main/xmli18n-tmp.h:168 msgid "Canon BJC-50" msgstr "" -#: src/main/xmli18n-tmp.h:149 +#: src/main/xmli18n-tmp.h:169 msgid "Canon BJC-55" msgstr "" -#: src/main/xmli18n-tmp.h:150 +#: src/main/xmli18n-tmp.h:170 msgid "Canon BJC-80" msgstr "" -#: src/main/xmli18n-tmp.h:151 +#: src/main/xmli18n-tmp.h:171 msgid "Canon BJC-85" msgstr "" -#: src/main/xmli18n-tmp.h:152 +#: src/main/xmli18n-tmp.h:172 msgid "Canon BJC-210" msgstr "" -#: src/main/xmli18n-tmp.h:153 +#: src/main/xmli18n-tmp.h:173 msgid "Canon BJC-240" msgstr "" -#: src/main/xmli18n-tmp.h:154 +#: src/main/xmli18n-tmp.h:174 msgid "Canon BJC-250" msgstr "" -#: src/main/xmli18n-tmp.h:155 +#: src/main/xmli18n-tmp.h:175 msgid "Canon BJC-1000" msgstr "" -#: src/main/xmli18n-tmp.h:156 +#: src/main/xmli18n-tmp.h:176 msgid "Canon BJC-2000" msgstr "" -#: src/main/xmli18n-tmp.h:157 +#: src/main/xmli18n-tmp.h:177 msgid "Canon BJC-2010" msgstr "" -#: src/main/xmli18n-tmp.h:158 +#: src/main/xmli18n-tmp.h:178 msgid "Canon BJC-2100" msgstr "" -#: src/main/xmli18n-tmp.h:159 +#: src/main/xmli18n-tmp.h:179 msgid "Canon BJC-2110" msgstr "" -#: src/main/xmli18n-tmp.h:160 +#: src/main/xmli18n-tmp.h:180 msgid "Canon BJC-3000" msgstr "" -#: src/main/xmli18n-tmp.h:161 +#: src/main/xmli18n-tmp.h:181 msgid "Canon BJC-4000" msgstr "" -#: src/main/xmli18n-tmp.h:162 +#: src/main/xmli18n-tmp.h:182 msgid "Canon BJC-4300" msgstr "" -#: src/main/xmli18n-tmp.h:163 +#: src/main/xmli18n-tmp.h:183 msgid "Canon BJC-4400" msgstr "" -#: src/main/xmli18n-tmp.h:164 +#: src/main/xmli18n-tmp.h:184 msgid "Canon BJC-5100" msgstr "" -#: src/main/xmli18n-tmp.h:165 +#: src/main/xmli18n-tmp.h:185 msgid "Canon BJC-5500" msgstr "" -#: src/main/xmli18n-tmp.h:166 +#: src/main/xmli18n-tmp.h:186 msgid "Canon BJC-6000" msgstr "" -#: src/main/xmli18n-tmp.h:167 +#: src/main/xmli18n-tmp.h:187 msgid "Canon BJC-6100" msgstr "" -#: src/main/xmli18n-tmp.h:168 +#: src/main/xmli18n-tmp.h:188 msgid "Canon BJC-6200" msgstr "" -#: src/main/xmli18n-tmp.h:169 +#: src/main/xmli18n-tmp.h:189 msgid "Canon BJC-6500" msgstr "" -#: src/main/xmli18n-tmp.h:170 +#: src/main/xmli18n-tmp.h:190 msgid "Canon BJC-7000" msgstr "" -#: src/main/xmli18n-tmp.h:171 +#: src/main/xmli18n-tmp.h:191 msgid "Canon BJC-7100" msgstr "" -#: src/main/xmli18n-tmp.h:172 +#: src/main/xmli18n-tmp.h:192 msgid "Canon BJC-8200" msgstr "" -#: src/main/xmli18n-tmp.h:173 +#: src/main/xmli18n-tmp.h:193 msgid "Canon BJC-8500" msgstr "" -#: src/main/xmli18n-tmp.h:174 +#: src/main/xmli18n-tmp.h:194 msgid "Canon S100" msgstr "" -#: src/main/xmli18n-tmp.h:175 +#: src/main/xmli18n-tmp.h:195 msgid "Canon S200" msgstr "" -#: src/main/xmli18n-tmp.h:176 +#: src/main/xmli18n-tmp.h:196 msgid "Canon S300" msgstr "" -#: src/main/xmli18n-tmp.h:177 +#: src/main/xmli18n-tmp.h:197 msgid "Canon S400" msgstr "" -#: src/main/xmli18n-tmp.h:178 +#: src/main/xmli18n-tmp.h:198 msgid "Canon S450" msgstr "" -#: src/main/xmli18n-tmp.h:179 +#: src/main/xmli18n-tmp.h:199 msgid "Canon S500" msgstr "" -#: src/main/xmli18n-tmp.h:180 +#: src/main/xmli18n-tmp.h:200 msgid "Canon S600" msgstr "" -#: src/main/xmli18n-tmp.h:181 +#: src/main/xmli18n-tmp.h:201 msgid "Canon S630" msgstr "" -#: src/main/xmli18n-tmp.h:182 +#: src/main/xmli18n-tmp.h:202 msgid "Canon S800" msgstr "" -#: src/main/xmli18n-tmp.h:183 +#: src/main/xmli18n-tmp.h:203 msgid "Canon S4500" msgstr "" -#: src/main/xmli18n-tmp.h:184 +#: src/main/xmli18n-tmp.h:204 msgid "Canon PIXMA iP2000" msgstr "" -#: src/main/xmli18n-tmp.h:185 +#: src/main/xmli18n-tmp.h:205 msgid "Canon PIXMA iP3000" msgstr "" -#: src/main/xmli18n-tmp.h:186 +#: src/main/xmli18n-tmp.h:206 msgid "Canon PIXMA iP3100" msgstr "" -#: src/main/xmli18n-tmp.h:187 +#: src/main/xmli18n-tmp.h:207 msgid "Canon PIXMA iP4000" msgstr "" -#: src/main/xmli18n-tmp.h:188 +#: src/main/xmli18n-tmp.h:208 msgid "Canon PIXMA iP4100" msgstr "" -#: src/main/xmli18n-tmp.h:189 +#: src/main/xmli18n-tmp.h:209 msgid "Canon PIXMA iP4200" msgstr "" -#: src/main/xmli18n-tmp.h:190 -#, fuzzy +#: src/main/xmli18n-tmp.h:210 msgid "Canon PIXMA iP4300" -msgstr "Stylus C60" +msgstr "" -#: src/main/xmli18n-tmp.h:191 -#, fuzzy +#: src/main/xmli18n-tmp.h:211 msgid "Canon PIXMA iP4500" -msgstr "Stylus C60" +msgstr "" -#: src/main/xmli18n-tmp.h:192 -#, fuzzy +#: src/main/xmli18n-tmp.h:212 msgid "Canon PIXMA iP5000" -msgstr "Stylus C60" +msgstr "" -#: src/main/xmli18n-tmp.h:193 +#: src/main/xmli18n-tmp.h:213 msgid "Canon PIXMA iP5200" msgstr "" -#: src/main/xmli18n-tmp.h:194 -#, fuzzy +#: src/main/xmli18n-tmp.h:214 msgid "Canon PIXMA iP5300" -msgstr "Stylus C60" +msgstr "" -#: src/main/xmli18n-tmp.h:195 -#, fuzzy +#: src/main/xmli18n-tmp.h:215 +msgid "Canon PIXMA iP6000D" +msgstr "" + +#: src/main/xmli18n-tmp.h:216 msgid "Canon PIXMA iP6700" -msgstr "Stylus C60" +msgstr "" -#: src/main/xmli18n-tmp.h:196 -#, fuzzy +#: src/main/xmli18n-tmp.h:217 msgid "Canon PIXMA iP8500" -msgstr "Stylus C60" +msgstr "" -#: src/main/xmli18n-tmp.h:197 -#, fuzzy +#: src/main/xmli18n-tmp.h:218 msgid "Canon PIXMA iX5000" -msgstr "Stylus C60" +msgstr "" -#: src/main/xmli18n-tmp.h:198 -#, fuzzy +#: src/main/xmli18n-tmp.h:219 msgid "Canon PIXMA Pro9500" -msgstr "Stylus C60" +msgstr "" -#: src/main/xmli18n-tmp.h:199 -#, fuzzy +#: src/main/xmli18n-tmp.h:220 msgid "Canon PIXMA MP150" -msgstr "Stylus C60" +msgstr "" -#: src/main/xmli18n-tmp.h:200 -#, fuzzy +#: src/main/xmli18n-tmp.h:221 msgid "Canon PIXMA MP170" -msgstr "Stylus C60" +msgstr "" -#: src/main/xmli18n-tmp.h:201 -#, fuzzy +#: src/main/xmli18n-tmp.h:222 msgid "Canon PIXMA MP180" -msgstr "Stylus C60" +msgstr "" -#: src/main/xmli18n-tmp.h:202 -#, fuzzy +#: src/main/xmli18n-tmp.h:223 msgid "Canon PIXMA MP500" -msgstr "Stylus C60" +msgstr "" -#: src/main/xmli18n-tmp.h:203 -#, fuzzy +#: src/main/xmli18n-tmp.h:224 +msgid "Canon PIXMA MP520" +msgstr "" + +#: src/main/xmli18n-tmp.h:225 msgid "Canon PIXMA MP610" -msgstr "Stylus C60" +msgstr "" -#: src/main/xmli18n-tmp.h:204 -#, fuzzy +#: src/main/xmli18n-tmp.h:226 msgid "Canon PIXMA MP700" -msgstr "Stylus C60" +msgstr "" -#: src/main/xmli18n-tmp.h:205 -#, fuzzy +#: src/main/xmli18n-tmp.h:227 msgid "Canon PIXMA MP710" -msgstr "Stylus C60" +msgstr "" -#: src/main/xmli18n-tmp.h:206 -#, fuzzy +#: src/main/xmli18n-tmp.h:228 msgid "Canon PIXMA MP730" -msgstr "Stylus C60" +msgstr "" -#: src/main/xmli18n-tmp.h:207 -#, fuzzy +#: src/main/xmli18n-tmp.h:229 msgid "Canon PIXMA MP740" -msgstr "Stylus C60" +msgstr "" -#: src/main/xmli18n-tmp.h:208 -#, fuzzy +#: src/main/xmli18n-tmp.h:230 msgid "Canon PIXMA MP750" -msgstr "Stylus C60" +msgstr "" -#: src/main/xmli18n-tmp.h:209 -#, fuzzy +#: src/main/xmli18n-tmp.h:231 msgid "Canon PIXMA MP760" -msgstr "Stylus C60" +msgstr "" -#: src/main/xmli18n-tmp.h:210 -#, fuzzy +#: src/main/xmli18n-tmp.h:232 msgid "Canon PIXMA MP770" -msgstr "Stylus C60" +msgstr "" -#: src/main/xmli18n-tmp.h:211 -#, fuzzy +#: src/main/xmli18n-tmp.h:233 msgid "Canon PIXMA MP780" -msgstr "Stylus C60" +msgstr "" -#: src/main/xmli18n-tmp.h:212 -#, fuzzy +#: src/main/xmli18n-tmp.h:234 msgid "Canon PIXMA MP790" -msgstr "Stylus C60" +msgstr "" -#: src/main/xmli18n-tmp.h:213 -#, fuzzy +#: src/main/xmli18n-tmp.h:235 msgid "Canon PIXMA MP830" -msgstr "Stylus C60" +msgstr "" -#: src/main/xmli18n-tmp.h:214 +#: src/main/xmli18n-tmp.h:236 msgid "Canon PIXUS iP3100" msgstr "" -#: src/main/xmli18n-tmp.h:215 +#: src/main/xmli18n-tmp.h:237 msgid "Canon PIXUS iP4100" msgstr "" -#: src/main/xmli18n-tmp.h:216 -#, fuzzy +#: src/main/xmli18n-tmp.h:238 msgid "Canon i80" -msgstr "Stylus C60" +msgstr "" -#: src/main/xmli18n-tmp.h:217 +#: src/main/xmli18n-tmp.h:239 msgid "Canon i560" msgstr "" -#: src/main/xmli18n-tmp.h:218 +#: src/main/xmli18n-tmp.h:240 msgid "Canon i850" msgstr "" -#: src/main/xmli18n-tmp.h:219 +#: src/main/xmli18n-tmp.h:241 msgid "Canon i860" msgstr "" -#: src/main/xmli18n-tmp.h:220 +#: src/main/xmli18n-tmp.h:242 msgid "Canon i865" msgstr "" -#: src/main/xmli18n-tmp.h:221 +#: src/main/xmli18n-tmp.h:243 #, fuzzy msgid "Epson Stylus C20" -msgstr "Stylus C20ux" +msgstr "Stylus C20sx" -#: src/main/xmli18n-tmp.h:222 +#: src/main/xmli18n-tmp.h:244 #, fuzzy msgid "Epson Stylus C20SX" msgstr "Stylus C20ux" -#: src/main/xmli18n-tmp.h:223 +#: src/main/xmli18n-tmp.h:245 #, fuzzy msgid "Epson Stylus C20UX" msgstr "Stylus C20ux" -#: src/main/xmli18n-tmp.h:224 +#: src/main/xmli18n-tmp.h:246 #, fuzzy msgid "Epson Stylus C40" -msgstr "Stylus C40ux" +msgstr "Stylus C40sx" -#: src/main/xmli18n-tmp.h:225 +#: src/main/xmli18n-tmp.h:247 #, fuzzy msgid "Epson Stylus C40SX" msgstr "Stylus C40ux" -#: src/main/xmli18n-tmp.h:226 +#: src/main/xmli18n-tmp.h:248 #, fuzzy msgid "Epson Stylus C40UX" msgstr "Stylus C40ux" -#: src/main/xmli18n-tmp.h:227 +#: src/main/xmli18n-tmp.h:249 #, fuzzy msgid "Epson Stylus C41" -msgstr "Stylus C40ux" +msgstr "Stylus C40sx" -#: src/main/xmli18n-tmp.h:228 +#: src/main/xmli18n-tmp.h:250 #, fuzzy msgid "Epson Stylus C41SX" msgstr "Stylus C40ux" -#: src/main/xmli18n-tmp.h:229 +#: src/main/xmli18n-tmp.h:251 #, fuzzy msgid "Epson Stylus C41UX" msgstr "Stylus C40ux" -#: src/main/xmli18n-tmp.h:230 +#: src/main/xmli18n-tmp.h:252 #, fuzzy msgid "Epson Stylus C42" -msgstr "Stylus C40ux" +msgstr "Stylus C40sx" -#: src/main/xmli18n-tmp.h:231 +#: src/main/xmli18n-tmp.h:253 #, fuzzy msgid "Epson Stylus C42SX" msgstr "Stylus C40ux" -#: src/main/xmli18n-tmp.h:232 +#: src/main/xmli18n-tmp.h:254 #, fuzzy msgid "Epson Stylus C42UX" msgstr "Stylus C40ux" -#: src/main/xmli18n-tmp.h:233 +#: src/main/xmli18n-tmp.h:255 #, fuzzy msgid "Epson Stylus C43" msgstr "Stylus C40ux" -#: src/main/xmli18n-tmp.h:234 +#: src/main/xmli18n-tmp.h:256 #, fuzzy msgid "Epson Stylus C43SX" msgstr "Stylus C40ux" -#: src/main/xmli18n-tmp.h:235 +#: src/main/xmli18n-tmp.h:257 #, fuzzy msgid "Epson Stylus C43UX" msgstr "Stylus C40ux" -#: src/main/xmli18n-tmp.h:236 +#: src/main/xmli18n-tmp.h:258 #, fuzzy msgid "Epson Stylus C44" msgstr "Stylus C40ux" -#: src/main/xmli18n-tmp.h:237 +#: src/main/xmli18n-tmp.h:259 #, fuzzy msgid "Epson Stylus C44SX" msgstr "Stylus C40ux" -#: src/main/xmli18n-tmp.h:238 +#: src/main/xmli18n-tmp.h:260 #, fuzzy msgid "Epson Stylus C44UX" msgstr "Stylus C40ux" -#: src/main/xmli18n-tmp.h:239 +#: src/main/xmli18n-tmp.h:261 #, fuzzy msgid "Epson Stylus C45" msgstr "Stylus C60" -#: src/main/xmli18n-tmp.h:240 +#: src/main/xmli18n-tmp.h:262 #, fuzzy msgid "Epson Stylus C46" msgstr "Stylus C60" -#: src/main/xmli18n-tmp.h:241 +#: src/main/xmli18n-tmp.h:263 #, fuzzy msgid "Epson Stylus C48" -msgstr "Stylus C60" +msgstr "Stylus C80" -#: src/main/xmli18n-tmp.h:242 +#: src/main/xmli18n-tmp.h:264 #, fuzzy msgid "Epson Stylus C50" msgstr "Stylus C60" -#: src/main/xmli18n-tmp.h:243 +#: src/main/xmli18n-tmp.h:265 #, fuzzy msgid "Epson Stylus C60" msgstr "Stylus C60" -#: src/main/xmli18n-tmp.h:244 +#: src/main/xmli18n-tmp.h:266 #, fuzzy msgid "Epson Stylus C61" msgstr "Stylus C60" -#: src/main/xmli18n-tmp.h:245 +#: src/main/xmli18n-tmp.h:267 #, fuzzy msgid "Epson Stylus C62" msgstr "Stylus C60" -#: src/main/xmli18n-tmp.h:246 +#: src/main/xmli18n-tmp.h:268 #, fuzzy msgid "Epson Stylus C63" msgstr "Stylus C60" -#: src/main/xmli18n-tmp.h:247 +#: src/main/xmli18n-tmp.h:269 #, fuzzy msgid "Epson Stylus C64" msgstr "Stylus C60" -#: src/main/xmli18n-tmp.h:248 +#: src/main/xmli18n-tmp.h:270 #, fuzzy msgid "Epson Stylus C65" msgstr "Stylus C60" -#: src/main/xmli18n-tmp.h:249 +#: src/main/xmli18n-tmp.h:271 #, fuzzy msgid "Epson Stylus C66" msgstr "Stylus C60" -#: src/main/xmli18n-tmp.h:250 +#: src/main/xmli18n-tmp.h:272 #, fuzzy msgid "Epson Stylus C68" msgstr "Stylus C60" -#: src/main/xmli18n-tmp.h:251 +#: src/main/xmli18n-tmp.h:273 #, fuzzy msgid "Epson Stylus C70" msgstr "Stylus C70" -#: src/main/xmli18n-tmp.h:252 +#: src/main/xmli18n-tmp.h:274 #, fuzzy msgid "Epson Stylus C79" msgstr "Stylus C70" -#: src/main/xmli18n-tmp.h:253 +#: src/main/xmli18n-tmp.h:275 #, fuzzy msgid "Epson Stylus C80" msgstr "Stylus C80" -#: src/main/xmli18n-tmp.h:254 +#: src/main/xmli18n-tmp.h:276 #, fuzzy msgid "Epson Stylus C82" msgstr "Stylus C80" -#: src/main/xmli18n-tmp.h:255 +#: src/main/xmli18n-tmp.h:277 #, fuzzy msgid "Epson Stylus C83" msgstr "Stylus C80" -#: src/main/xmli18n-tmp.h:256 +#: src/main/xmli18n-tmp.h:278 #, fuzzy msgid "Epson Stylus C84" msgstr "Stylus C80" -#: src/main/xmli18n-tmp.h:257 +#: src/main/xmli18n-tmp.h:279 #, fuzzy msgid "Epson Stylus C85" msgstr "Stylus C60" -#: src/main/xmli18n-tmp.h:258 +#: src/main/xmli18n-tmp.h:280 #, fuzzy msgid "Epson Stylus C86" msgstr "Stylus C60" -#: src/main/xmli18n-tmp.h:259 +#: src/main/xmli18n-tmp.h:281 #, fuzzy msgid "Epson Stylus C87" -msgstr "Stylus C60" +msgstr "Stylus C70" -#: src/main/xmli18n-tmp.h:260 +#: src/main/xmli18n-tmp.h:282 #, fuzzy msgid "Epson Stylus C88" msgstr "Stylus C80" -#: src/main/xmli18n-tmp.h:261 +#: src/main/xmli18n-tmp.h:283 #, fuzzy msgid "Epson Stylus C110" -msgstr "Stylus C20ux" +msgstr "Stylus C60" -#: src/main/xmli18n-tmp.h:262 +#: src/main/xmli18n-tmp.h:284 #, fuzzy msgid "Epson Stylus C120" -msgstr "Stylus C20ux" +msgstr "Stylus C20sx" -#: src/main/xmli18n-tmp.h:263 +#: src/main/xmli18n-tmp.h:285 #, fuzzy msgid "Epson Stylus Color" msgstr "Stylus Color" -#: src/main/xmli18n-tmp.h:264 +#: src/main/xmli18n-tmp.h:286 #, fuzzy msgid "Epson Stylus Color I" msgstr "Stylus Color" -#: src/main/xmli18n-tmp.h:265 +#: src/main/xmli18n-tmp.h:287 #, fuzzy msgid "Epson Stylus Color II" msgstr "Stylus Color" -#: src/main/xmli18n-tmp.h:266 +#: src/main/xmli18n-tmp.h:288 #, fuzzy msgid "Epson Stylus Color IIs" msgstr "Stylus Color" -#: src/main/xmli18n-tmp.h:267 +#: src/main/xmli18n-tmp.h:289 #, fuzzy msgid "Epson Stylus Color PRO" msgstr "Stylus Color Pro" -#: src/main/xmli18n-tmp.h:268 +#: src/main/xmli18n-tmp.h:290 #, fuzzy msgid "Epson Stylus Pro XL" msgstr "Stylus Color Pro XL" -#: src/main/xmli18n-tmp.h:269 +#: src/main/xmli18n-tmp.h:291 #, fuzzy msgid "Epson Stylus Color 400" msgstr "Stylus Color 400" -#: src/main/xmli18n-tmp.h:270 +#: src/main/xmli18n-tmp.h:292 #, fuzzy msgid "Epson Stylus Color 440" msgstr "Stylus Color 440" -#: src/main/xmli18n-tmp.h:271 +#: src/main/xmli18n-tmp.h:293 #, fuzzy msgid "Epson Stylus Color 460" msgstr "Stylus Color 460" -#: src/main/xmli18n-tmp.h:272 +#: src/main/xmli18n-tmp.h:294 #, fuzzy msgid "Epson Stylus Color 480" msgstr "Stylus Color 480" -#: src/main/xmli18n-tmp.h:273 +#: src/main/xmli18n-tmp.h:295 #, fuzzy msgid "Epson Stylus Color 500" msgstr "Stylus Color 500" -#: src/main/xmli18n-tmp.h:274 +#: src/main/xmli18n-tmp.h:296 #, fuzzy msgid "Epson Stylus Color 580" msgstr "Stylus Color 580" -#: src/main/xmli18n-tmp.h:275 +#: src/main/xmli18n-tmp.h:297 #, fuzzy msgid "Epson Stylus Color 600" msgstr "Stylus Color 600" -#: src/main/xmli18n-tmp.h:276 +#: src/main/xmli18n-tmp.h:298 #, fuzzy msgid "Epson Stylus Color 640" msgstr "Stylus Color 640" -#: src/main/xmli18n-tmp.h:277 +#: src/main/xmli18n-tmp.h:299 #, fuzzy msgid "Epson Stylus Color 660" msgstr "Stylus Color 660" -#: src/main/xmli18n-tmp.h:278 +#: src/main/xmli18n-tmp.h:300 #, fuzzy msgid "Epson Stylus Color 670" msgstr "Stylus Color 670" -#: src/main/xmli18n-tmp.h:279 +#: src/main/xmli18n-tmp.h:301 #, fuzzy msgid "Epson Stylus Color 680" msgstr "Stylus Color 680" -#: src/main/xmli18n-tmp.h:280 +#: src/main/xmli18n-tmp.h:302 #, fuzzy msgid "Epson Stylus Color 740" msgstr "Stylus Color 740" -#: src/main/xmli18n-tmp.h:281 +#: src/main/xmli18n-tmp.h:303 #, fuzzy msgid "Epson Stylus Color 760" msgstr "Stylus Color 760" -#: src/main/xmli18n-tmp.h:282 +#: src/main/xmli18n-tmp.h:304 #, fuzzy msgid "Epson Stylus Color 777" msgstr "Stylus Color 777" -#: src/main/xmli18n-tmp.h:283 +#: src/main/xmli18n-tmp.h:305 #, fuzzy msgid "Epson Stylus Color 800" msgstr "Stylus Color 800" -#: src/main/xmli18n-tmp.h:284 +#: src/main/xmli18n-tmp.h:306 #, fuzzy msgid "Epson Stylus Color 850" msgstr "Stylus Color 850" -#: src/main/xmli18n-tmp.h:285 +#: src/main/xmli18n-tmp.h:307 #, fuzzy msgid "Epson Stylus Color 860" msgstr "Stylus Color 860" -#: src/main/xmli18n-tmp.h:286 +#: src/main/xmli18n-tmp.h:308 #, fuzzy msgid "Epson Stylus Color 880" msgstr "Stylus Color 880" -#: src/main/xmli18n-tmp.h:287 +#: src/main/xmli18n-tmp.h:309 #, fuzzy msgid "Epson Stylus Color 8 3" msgstr "Stylus Color 83" -#: src/main/xmli18n-tmp.h:288 +#: src/main/xmli18n-tmp.h:310 #, fuzzy msgid "Epson Stylus Color 900" msgstr "Stylus Color 900" -#: src/main/xmli18n-tmp.h:289 +#: src/main/xmli18n-tmp.h:311 #, fuzzy msgid "Epson Stylus Color 980" msgstr "Stylus Color 980" -#: src/main/xmli18n-tmp.h:290 +#: src/main/xmli18n-tmp.h:312 #, fuzzy msgid "Epson Stylus Color 1160" msgstr "Stylus Color 1160" -#: src/main/xmli18n-tmp.h:291 +#: src/main/xmli18n-tmp.h:313 #, fuzzy msgid "Epson Stylus Color 1500" msgstr "Stylus Color 1500" -#: src/main/xmli18n-tmp.h:292 +#: src/main/xmli18n-tmp.h:314 #, fuzzy msgid "Epson Stylus Color 1520" msgstr "Stylus Color 1520" -#: src/main/xmli18n-tmp.h:293 +#: src/main/xmli18n-tmp.h:315 #, fuzzy msgid "Epson Stylus Color 3000" msgstr "Stylus Color 3000" -#: src/main/xmli18n-tmp.h:294 +#: src/main/xmli18n-tmp.h:316 #, fuzzy msgid "Epson Stylus Photo" msgstr "Stylus Photo" -#: src/main/xmli18n-tmp.h:295 +#: src/main/xmli18n-tmp.h:317 #, fuzzy msgid "Epson Stylus Photo 700" msgstr "Stylus Photo 700" -#: src/main/xmli18n-tmp.h:296 +#: src/main/xmli18n-tmp.h:318 #, fuzzy msgid "Epson Stylus Photo EX" msgstr "Stylus Photo EX" -#: src/main/xmli18n-tmp.h:297 +#: src/main/xmli18n-tmp.h:319 #, fuzzy msgid "Epson Stylus Photo EX3" msgstr "Stylus Photo EX" -#: src/main/xmli18n-tmp.h:298 +#: src/main/xmli18n-tmp.h:320 #, fuzzy msgid "Epson Stylus Photo 720" msgstr "Stylus Photo 720" -#: src/main/xmli18n-tmp.h:299 +#: src/main/xmli18n-tmp.h:321 #, fuzzy msgid "Epson Stylus Photo 750" msgstr "Stylus Photo 750" -#: src/main/xmli18n-tmp.h:300 +#: src/main/xmli18n-tmp.h:322 #, fuzzy msgid "Epson Stylus Photo 780" msgstr "Stylus Photo 780" -#: src/main/xmli18n-tmp.h:301 +#: src/main/xmli18n-tmp.h:323 #, fuzzy msgid "Epson Stylus Photo 785" msgstr "Stylus Photo 785" -#: src/main/xmli18n-tmp.h:302 +#: src/main/xmli18n-tmp.h:324 #, fuzzy msgid "Epson Stylus Photo 790" msgstr "Stylus Photo 790" -#: src/main/xmli18n-tmp.h:303 +#: src/main/xmli18n-tmp.h:325 #, fuzzy msgid "Epson Stylus Photo 810" msgstr "Stylus Photo 810" -#: src/main/xmli18n-tmp.h:304 +#: src/main/xmli18n-tmp.h:326 #, fuzzy msgid "Epson Stylus Photo 820" msgstr "Stylus Photo 820" -#: src/main/xmli18n-tmp.h:305 +#: src/main/xmli18n-tmp.h:327 #, fuzzy msgid "Epson Stylus Photo 825" msgstr "Stylus Photo 785" -#: src/main/xmli18n-tmp.h:306 +#: src/main/xmli18n-tmp.h:328 #, fuzzy msgid "Epson Stylus Photo 830" msgstr "Stylus Photo 780" -#: src/main/xmli18n-tmp.h:307 +#: src/main/xmli18n-tmp.h:329 #, fuzzy msgid "Epson Stylus Photo 830U" msgstr "Stylus Photo 780" -#: src/main/xmli18n-tmp.h:308 +#: src/main/xmli18n-tmp.h:330 #, fuzzy msgid "Epson Stylus Photo 870" msgstr "Stylus Photo 870" -#: src/main/xmli18n-tmp.h:309 +#: src/main/xmli18n-tmp.h:331 #, fuzzy msgid "Epson Stylus Photo 875" msgstr "Stylus Photo 875" -#: src/main/xmli18n-tmp.h:310 +#: src/main/xmli18n-tmp.h:332 #, fuzzy msgid "Epson Stylus Photo 890" msgstr "Stylus Photo 890" -#: src/main/xmli18n-tmp.h:311 +#: src/main/xmli18n-tmp.h:333 #, fuzzy msgid "Epson Stylus Photo 895" msgstr "Stylus Photo 895" -#: src/main/xmli18n-tmp.h:312 +#: src/main/xmli18n-tmp.h:334 #, fuzzy msgid "Epson Stylus Photo 900" msgstr "Stylus Photo 700" -#: src/main/xmli18n-tmp.h:313 +#: src/main/xmli18n-tmp.h:335 #, fuzzy msgid "Epson Stylus Photo 915" msgstr "Stylus Photo 895" -#: src/main/xmli18n-tmp.h:314 +#: src/main/xmli18n-tmp.h:336 #, fuzzy msgid "Epson Stylus Photo 925" msgstr "Stylus Photo 895" -#: src/main/xmli18n-tmp.h:315 +#: src/main/xmli18n-tmp.h:337 #, fuzzy msgid "Epson Stylus Photo 935" msgstr "Stylus Photo 895" -#: src/main/xmli18n-tmp.h:316 +#: src/main/xmli18n-tmp.h:338 #, fuzzy msgid "Epson Stylus Photo 950" msgstr "Stylus Photo 750" -#: src/main/xmli18n-tmp.h:317 +#: src/main/xmli18n-tmp.h:339 #, fuzzy msgid "Epson Stylus Photo 960" msgstr "Stylus Photo 790" -#: src/main/xmli18n-tmp.h:318 +#: src/main/xmli18n-tmp.h:340 #, fuzzy msgid "Epson Stylus Photo 1200" msgstr "Stylus Photo 1200" -#: src/main/xmli18n-tmp.h:319 +#: src/main/xmli18n-tmp.h:341 #, fuzzy msgid "Epson Stylus Photo 1270" msgstr "Stylus Photo 1270" -#: src/main/xmli18n-tmp.h:320 +#: src/main/xmli18n-tmp.h:342 #, fuzzy msgid "Epson Stylus Photo 1280" msgstr "Stylus Photo 1280" -#: src/main/xmli18n-tmp.h:321 +#: src/main/xmli18n-tmp.h:343 #, fuzzy msgid "Epson Stylus Photo 1290" msgstr "Stylus Photo 1290" -#: src/main/xmli18n-tmp.h:322 +#: src/main/xmli18n-tmp.h:344 #, fuzzy msgid "Epson Stylus Photo 1400" msgstr "Stylus Photo 1200" -#: src/main/xmli18n-tmp.h:323 +#: src/main/xmli18n-tmp.h:345 #, fuzzy msgid "Epson Stylus Photo 1410" msgstr "Stylus Photo 810" -#: src/main/xmli18n-tmp.h:324 +#: src/main/xmli18n-tmp.h:346 #, fuzzy msgid "Epson Stylus Photo 2000P" msgstr "Stylus Photo 2000P" -#: src/main/xmli18n-tmp.h:325 +#: src/main/xmli18n-tmp.h:347 #, fuzzy msgid "Epson Stylus Photo 2100" msgstr "Stylus Photo 1200" -#: src/main/xmli18n-tmp.h:326 +#: src/main/xmli18n-tmp.h:348 #, fuzzy msgid "Epson Stylus Photo 2200" msgstr "Stylus Photo 1200" -#: src/main/xmli18n-tmp.h:327 +#: src/main/xmli18n-tmp.h:349 #, fuzzy msgid "Epson Stylus Photo R200" msgstr "Stylus Photo 1200" -#: src/main/xmli18n-tmp.h:328 +#: src/main/xmli18n-tmp.h:350 #, fuzzy msgid "Epson Stylus Photo R210" msgstr "Stylus Photo 1200" -#: src/main/xmli18n-tmp.h:329 +#: src/main/xmli18n-tmp.h:351 #, fuzzy msgid "Epson Stylus Photo R220" msgstr "Stylus Photo 1200" -#: src/main/xmli18n-tmp.h:330 +#: src/main/xmli18n-tmp.h:352 #, fuzzy msgid "Epson Stylus Photo R230" msgstr "Stylus Photo 1200" -#: src/main/xmli18n-tmp.h:331 +#: src/main/xmli18n-tmp.h:353 #, fuzzy msgid "Epson Stylus Photo R240" msgstr "Stylus Photo 1200" -#: src/main/xmli18n-tmp.h:332 +#: src/main/xmli18n-tmp.h:354 #, fuzzy msgid "Epson Stylus Photo R245" -msgstr "Stylus Photo 1200" +msgstr "Stylus Photo 895" -#: src/main/xmli18n-tmp.h:333 +#: src/main/xmli18n-tmp.h:355 #, fuzzy msgid "Epson Stylus Photo R260" msgstr "Stylus Photo 1200" -#: src/main/xmli18n-tmp.h:334 +#: src/main/xmli18n-tmp.h:356 #, fuzzy msgid "Epson Stylus Photo R265" -msgstr "Stylus Photo 1200" +msgstr "Stylus Photo 895" -#: src/main/xmli18n-tmp.h:335 +#: src/main/xmli18n-tmp.h:357 #, fuzzy msgid "Epson Stylus Photo R270" msgstr "Stylus Photo 1270" -#: src/main/xmli18n-tmp.h:336 +#: src/main/xmli18n-tmp.h:358 +#, fuzzy +msgid "Epson Stylus Photo R280" +msgstr "Stylus Photo 1280" + +#: src/main/xmli18n-tmp.h:359 +#, fuzzy +msgid "Epson Stylus Photo R285" +msgstr "Stylus Photo 785" + +#: src/main/xmli18n-tmp.h:360 #, fuzzy msgid "Epson Stylus Photo R300" msgstr "Stylus Photo 700" -#: src/main/xmli18n-tmp.h:337 +#: src/main/xmli18n-tmp.h:361 #, fuzzy msgid "Epson Stylus Photo R310" msgstr "Stylus Photo 700" -#: src/main/xmli18n-tmp.h:338 +#: src/main/xmli18n-tmp.h:362 #, fuzzy msgid "Epson Stylus Photo R320" msgstr "Stylus Photo 1200" -#: src/main/xmli18n-tmp.h:339 +#: src/main/xmli18n-tmp.h:363 #, fuzzy msgid "Epson Stylus Photo R340" msgstr "Stylus Photo 700" -#: src/main/xmli18n-tmp.h:340 +#: src/main/xmli18n-tmp.h:364 #, fuzzy msgid "Epson Stylus Photo R350" msgstr "Stylus Photo 700" -#: src/main/xmli18n-tmp.h:341 +#: src/main/xmli18n-tmp.h:365 #, fuzzy msgid "Epson Stylus Photo R360" msgstr "Stylus Photo 700" -#: src/main/xmli18n-tmp.h:342 +#: src/main/xmli18n-tmp.h:366 #, fuzzy msgid "Epson Stylus Photo R380" msgstr "Stylus Photo 700" -#: src/main/xmli18n-tmp.h:343 +#: src/main/xmli18n-tmp.h:367 #, fuzzy msgid "Epson Stylus Photo R390" msgstr "Stylus Photo 700" -#: src/main/xmli18n-tmp.h:344 +#: src/main/xmli18n-tmp.h:368 #, fuzzy msgid "Epson Stylus Photo RX400" msgstr "Stylus Photo 700" -#: src/main/xmli18n-tmp.h:345 +#: src/main/xmli18n-tmp.h:369 #, fuzzy msgid "Epson Stylus Photo RX420" msgstr "Stylus Photo 1200" -#: src/main/xmli18n-tmp.h:346 +#: src/main/xmli18n-tmp.h:370 #, fuzzy msgid "Epson Stylus Photo RX425" msgstr "Stylus Photo 1200" -#: src/main/xmli18n-tmp.h:347 +#: src/main/xmli18n-tmp.h:371 #, fuzzy msgid "Epson Stylus Photo RX430" msgstr "Stylus Photo 700" -#: src/main/xmli18n-tmp.h:348 +#: src/main/xmli18n-tmp.h:372 #, fuzzy msgid "Epson Stylus Photo RX500" msgstr "Stylus Photo 700" -#: src/main/xmli18n-tmp.h:349 +#: src/main/xmli18n-tmp.h:373 #, fuzzy msgid "Epson Stylus Photo RX510" msgstr "Stylus Photo 700" -#: src/main/xmli18n-tmp.h:350 +#: src/main/xmli18n-tmp.h:374 #, fuzzy msgid "Epson Stylus Photo RX560" msgstr "Stylus Photo 700" -#: src/main/xmli18n-tmp.h:351 +#: src/main/xmli18n-tmp.h:375 #, fuzzy msgid "Epson Stylus Photo RX580" msgstr "Stylus Photo 700" -#: src/main/xmli18n-tmp.h:352 +#: src/main/xmli18n-tmp.h:376 +#, fuzzy +msgid "Epson Stylus Photo RX585" +msgstr "Stylus Photo 700" + +#: src/main/xmli18n-tmp.h:377 #, fuzzy msgid "Epson Stylus Photo RX590" msgstr "Stylus Photo 700" -#: src/main/xmli18n-tmp.h:353 +#: src/main/xmli18n-tmp.h:378 #, fuzzy msgid "Epson Stylus Photo RX595" msgstr "Stylus Photo 700" -#: src/main/xmli18n-tmp.h:354 +#: src/main/xmli18n-tmp.h:379 #, fuzzy msgid "Epson Stylus Photo RX600" msgstr "Stylus Photo 700" -#: src/main/xmli18n-tmp.h:355 +#: src/main/xmli18n-tmp.h:380 #, fuzzy msgid "Epson Stylus Photo RX620" msgstr "Stylus Photo 700" -#: src/main/xmli18n-tmp.h:356 +#: src/main/xmli18n-tmp.h:381 #, fuzzy msgid "Epson Stylus Photo RX630" msgstr "Stylus Photo 700" -#: src/main/xmli18n-tmp.h:357 +#: src/main/xmli18n-tmp.h:382 #, fuzzy msgid "Epson Stylus Photo RX640" msgstr "Stylus Photo 700" -#: src/main/xmli18n-tmp.h:358 +#: src/main/xmli18n-tmp.h:383 +#, fuzzy +msgid "Epson Stylus Photo RX680" +msgstr "Stylus Photo 700" + +#: src/main/xmli18n-tmp.h:384 +#, fuzzy +msgid "Epson Stylus Photo RX685" +msgstr "Stylus Photo 700" + +#: src/main/xmli18n-tmp.h:385 #, fuzzy msgid "Epson Stylus Photo RX700" msgstr "Stylus Photo 700" -#: src/main/xmli18n-tmp.h:359 +#: src/main/xmli18n-tmp.h:386 #, fuzzy msgid "Epson Stylus Photo R800" msgstr "Stylus Photo 700" -#: src/main/xmli18n-tmp.h:360 +#: src/main/xmli18n-tmp.h:387 #, fuzzy msgid "Epson Stylus Photo R1800" msgstr "Stylus Photo 700" -#: src/main/xmli18n-tmp.h:361 +#: src/main/xmli18n-tmp.h:388 #, fuzzy msgid "Epson Stylus Photo R2400" msgstr "Stylus Photo 1200" -#: src/main/xmli18n-tmp.h:362 +#: src/main/xmli18n-tmp.h:389 #, fuzzy msgid "Epson Stylus Pro 5000" msgstr "Stylus Pro 5000" -#: src/main/xmli18n-tmp.h:363 +#: src/main/xmli18n-tmp.h:390 #, fuzzy msgid "Epson Stylus Pro 5500" msgstr "Stylus Pro 5500" -#: src/main/xmli18n-tmp.h:364 +#: src/main/xmli18n-tmp.h:391 #, fuzzy msgid "Epson Stylus Pro 7000" msgstr "Stylus Pro 7000" -#: src/main/xmli18n-tmp.h:365 +#: src/main/xmli18n-tmp.h:392 #, fuzzy msgid "Epson Stylus Pro 7500" msgstr "Stylus Pro 7500" -#: src/main/xmli18n-tmp.h:366 +#: src/main/xmli18n-tmp.h:393 #, fuzzy msgid "Epson Stylus Pro 7600" msgstr "Stylus Pro 7000" -#: src/main/xmli18n-tmp.h:367 +#: src/main/xmli18n-tmp.h:394 #, fuzzy msgid "Epson Stylus Pro 9000" msgstr "Stylus Pro 9000" -#: src/main/xmli18n-tmp.h:368 +#: src/main/xmli18n-tmp.h:395 #, fuzzy msgid "Epson Stylus Pro 9500" msgstr "Stylus Pro 9500" -#: src/main/xmli18n-tmp.h:369 +#: src/main/xmli18n-tmp.h:396 #, fuzzy msgid "Epson Stylus Pro 9600" msgstr "Stylus Pro 9000" -#: src/main/xmli18n-tmp.h:370 +#: src/main/xmli18n-tmp.h:397 #, fuzzy msgid "Epson Stylus Pro 10000" msgstr "Stylus Pro 10000" -#: src/main/xmli18n-tmp.h:371 +#: src/main/xmli18n-tmp.h:398 #, fuzzy msgid "Epson Stylus Scan 2000" msgstr "Stylus Scan 2000" -#: src/main/xmli18n-tmp.h:372 +#: src/main/xmli18n-tmp.h:399 #, fuzzy msgid "Epson Stylus Scan 2500" msgstr "Stylus Scan 2500" -#: src/main/xmli18n-tmp.h:373 +#: src/main/xmli18n-tmp.h:400 #, fuzzy msgid "Epson Stylus CX1500" msgstr "Stylus C20sx" -#: src/main/xmli18n-tmp.h:374 +#: src/main/xmli18n-tmp.h:401 #, fuzzy msgid "Epson Stylus CX3100" msgstr "Stylus C20sx" -#: src/main/xmli18n-tmp.h:375 +#: src/main/xmli18n-tmp.h:402 #, fuzzy msgid "Epson Stylus CX3200" msgstr "Stylus C20sx" -#: src/main/xmli18n-tmp.h:376 +#: src/main/xmli18n-tmp.h:403 #, fuzzy msgid "Epson Stylus CX3500" msgstr "Stylus C20sx" -#: src/main/xmli18n-tmp.h:377 +#: src/main/xmli18n-tmp.h:404 #, fuzzy msgid "Epson Stylus CX3600" msgstr "Stylus C20sx" -#: src/main/xmli18n-tmp.h:378 +#: src/main/xmli18n-tmp.h:405 #, fuzzy msgid "Epson Stylus CX3650" msgstr "Stylus C20sx" -#: src/main/xmli18n-tmp.h:379 +#: src/main/xmli18n-tmp.h:406 #, fuzzy msgid "Epson Stylus CX3700" msgstr "Stylus C20sx" -#: src/main/xmli18n-tmp.h:380 +#: src/main/xmli18n-tmp.h:407 #, fuzzy msgid "Epson Stylus CX3800" msgstr "Stylus C20sx" -#: src/main/xmli18n-tmp.h:381 +#: src/main/xmli18n-tmp.h:408 #, fuzzy msgid "Epson Stylus CX3805" -msgstr "Stylus C60" +msgstr "Stylus C80" -#: src/main/xmli18n-tmp.h:382 +#: src/main/xmli18n-tmp.h:409 #, fuzzy msgid "Epson Stylus CX3810" msgstr "Stylus C20sx" -#: src/main/xmli18n-tmp.h:383 +#: src/main/xmli18n-tmp.h:410 #, fuzzy msgid "Epson Stylus CX4100" msgstr "Stylus C20sx" -#: src/main/xmli18n-tmp.h:384 +#: src/main/xmli18n-tmp.h:411 #, fuzzy msgid "Epson Stylus CX4200" msgstr "Stylus C20sx" -#: src/main/xmli18n-tmp.h:385 +#: src/main/xmli18n-tmp.h:412 #, fuzzy msgid "Epson Stylus CX4400" msgstr "Stylus C20sx" -#: src/main/xmli18n-tmp.h:386 +#: src/main/xmli18n-tmp.h:413 #, fuzzy msgid "Epson Stylus CX4500" msgstr "Stylus C20sx" -#: src/main/xmli18n-tmp.h:387 +#: src/main/xmli18n-tmp.h:414 #, fuzzy msgid "Epson Stylus CX4600" msgstr "Stylus C20sx" -#: src/main/xmli18n-tmp.h:388 +#: src/main/xmli18n-tmp.h:415 #, fuzzy msgid "Epson Stylus CX4700" msgstr "Stylus C20sx" -#: src/main/xmli18n-tmp.h:389 +#: src/main/xmli18n-tmp.h:416 #, fuzzy msgid "Epson Stylus CX4800" msgstr "Stylus C20sx" -#: src/main/xmli18n-tmp.h:390 +#: src/main/xmli18n-tmp.h:417 #, fuzzy msgid "Epson Stylus CX4900" msgstr "Stylus C20sx" -#: src/main/xmli18n-tmp.h:391 +#: src/main/xmli18n-tmp.h:418 #, fuzzy msgid "Epson Stylus CX5000" msgstr "Stylus C20sx" -#: src/main/xmli18n-tmp.h:392 +#: src/main/xmli18n-tmp.h:419 #, fuzzy msgid "Epson Stylus CX5000F" msgstr "Stylus C20sx" -#: src/main/xmli18n-tmp.h:393 +#: src/main/xmli18n-tmp.h:420 #, fuzzy msgid "Epson Stylus CX5100" msgstr "Stylus C60" -#: src/main/xmli18n-tmp.h:394 +#: src/main/xmli18n-tmp.h:421 #, fuzzy msgid "Epson Stylus CX5200" msgstr "Stylus C60" -#: src/main/xmli18n-tmp.h:395 +#: src/main/xmli18n-tmp.h:422 #, fuzzy msgid "Epson Stylus CX5300" msgstr "Stylus C20sx" -#: src/main/xmli18n-tmp.h:396 +#: src/main/xmli18n-tmp.h:423 #, fuzzy msgid "Epson Stylus CX5400" msgstr "Stylus C20sx" -#: src/main/xmli18n-tmp.h:397 +#: src/main/xmli18n-tmp.h:424 #, fuzzy msgid "Epson Stylus CX5600" msgstr "Stylus C20sx" -#: src/main/xmli18n-tmp.h:398 +#: src/main/xmli18n-tmp.h:425 #, fuzzy msgid "Epson Stylus CX5700" msgstr "Stylus C20sx" -#: src/main/xmli18n-tmp.h:399 +#: src/main/xmli18n-tmp.h:426 #, fuzzy msgid "Epson Stylus CX5800" msgstr "Stylus C20sx" -#: src/main/xmli18n-tmp.h:400 +#: src/main/xmli18n-tmp.h:427 #, fuzzy msgid "Epson Stylus CX6000" msgstr "Stylus C20sx" -#: src/main/xmli18n-tmp.h:401 +#: src/main/xmli18n-tmp.h:428 #, fuzzy msgid "Epson Stylus CX6300" msgstr "Stylus C20sx" -#: src/main/xmli18n-tmp.h:402 +#: src/main/xmli18n-tmp.h:429 #, fuzzy msgid "Epson Stylus CX6400" msgstr "Stylus C20sx" -#: src/main/xmli18n-tmp.h:403 +#: src/main/xmli18n-tmp.h:430 #, fuzzy msgid "Epson Stylus CX6500" msgstr "Stylus C20sx" -#: src/main/xmli18n-tmp.h:404 +#: src/main/xmli18n-tmp.h:431 #, fuzzy msgid "Epson Stylus CX6600" msgstr "Stylus C20sx" -#: src/main/xmli18n-tmp.h:405 +#: src/main/xmli18n-tmp.h:432 #, fuzzy msgid "Epson Stylus CX7000F" -msgstr "Stylus C20sx" +msgstr "Stylus C70" -#: src/main/xmli18n-tmp.h:406 +#: src/main/xmli18n-tmp.h:433 #, fuzzy msgid "Epson Stylus CX7400" msgstr "Stylus C20sx" -#: src/main/xmli18n-tmp.h:407 +#: src/main/xmli18n-tmp.h:434 #, fuzzy msgid "Epson Stylus CX7700" msgstr "Stylus C70" -#: src/main/xmli18n-tmp.h:408 +#: src/main/xmli18n-tmp.h:435 #, fuzzy msgid "Epson Stylus CX7800" msgstr "Stylus C20sx" -#: src/main/xmli18n-tmp.h:409 +#: src/main/xmli18n-tmp.h:436 #, fuzzy msgid "Epson Stylus CX8300" msgstr "Stylus C20sx" -#: src/main/xmli18n-tmp.h:410 +#: src/main/xmli18n-tmp.h:437 #, fuzzy msgid "Epson Stylus CX8400" msgstr "Stylus C20sx" -#: src/main/xmli18n-tmp.h:411 +#: src/main/xmli18n-tmp.h:438 #, fuzzy msgid "Epson Stylus CX9400" msgstr "Stylus C20sx" -#: src/main/xmli18n-tmp.h:412 +#: src/main/xmli18n-tmp.h:439 #, fuzzy msgid "Epson Stylus D68" msgstr "Stylus C60" -#: src/main/xmli18n-tmp.h:413 +#: src/main/xmli18n-tmp.h:440 #, fuzzy msgid "Epson Stylus D88" msgstr "Stylus C80" -#: src/main/xmli18n-tmp.h:414 +#: src/main/xmli18n-tmp.h:441 +#, fuzzy +msgid "Epson Stylus D92" +msgstr "Stylus C60" + +#: src/main/xmli18n-tmp.h:442 #, fuzzy msgid "Epson Stylus D120" msgstr "Stylus C20ux" -#: src/main/xmli18n-tmp.h:415 +#: src/main/xmli18n-tmp.h:443 #, fuzzy msgid "Epson Stylus DX3800" msgstr "Stylus C20sx" -#: src/main/xmli18n-tmp.h:416 +#: src/main/xmli18n-tmp.h:444 +#, fuzzy +msgid "Epson Stylus DX3850" +msgstr "Stylus C20sx" + +#: src/main/xmli18n-tmp.h:445 +#, fuzzy +msgid "Epson Stylus DX4050" +msgstr "Stylus C20sx" + +#: src/main/xmli18n-tmp.h:446 +#, fuzzy +msgid "Epson Stylus DX4200" +msgstr "Stylus C20sx" + +#: src/main/xmli18n-tmp.h:447 +#, fuzzy +msgid "Epson Stylus DX4250" +msgstr "Stylus C20sx" + +#: src/main/xmli18n-tmp.h:448 +#, fuzzy +msgid "Epson Stylus DX4400" +msgstr "Stylus C20sx" + +#: src/main/xmli18n-tmp.h:449 +#, fuzzy +msgid "Epson Stylus DX4450" +msgstr "Stylus C20sx" + +#: src/main/xmli18n-tmp.h:450 +#, fuzzy +msgid "Epson Stylus DX4800" +msgstr "Stylus C20sx" + +#: src/main/xmli18n-tmp.h:451 #, fuzzy -msgid "Epson Stylus DX3850" -msgstr "Stylus C20sx" +msgid "Epson Stylus DX7000F" +msgstr "Stylus Pro 7000" -#: src/main/xmli18n-tmp.h:417 +#: src/main/xmli18n-tmp.h:452 #, fuzzy -msgid "Epson Stylus DX4050" +msgid "Epson Stylus DX7400" msgstr "Stylus C20sx" -#: src/main/xmli18n-tmp.h:418 +#: src/main/xmli18n-tmp.h:453 #, fuzzy -msgid "Epson Stylus DX4200" +msgid "Epson Stylus DX7450" msgstr "Stylus C20sx" -#: src/main/xmli18n-tmp.h:419 +#: src/main/xmli18n-tmp.h:454 #, fuzzy -msgid "Epson Stylus DX4250" -msgstr "Stylus C60" +msgid "Epson Stylus DX8400" +msgstr "Stylus C20sx" -#: src/main/xmli18n-tmp.h:420 +#: src/main/xmli18n-tmp.h:455 #, fuzzy -msgid "Epson Stylus DX4800" +msgid "Epson Stylus DX8450" msgstr "Stylus C20sx" -#: src/main/xmli18n-tmp.h:421 +#: src/main/xmli18n-tmp.h:456 msgid "Epson PictureMate" msgstr "" -#: src/main/xmli18n-tmp.h:422 +#: src/main/xmli18n-tmp.h:457 +msgid "Epson PictureMate Dash" +msgstr "" + +#: src/main/xmli18n-tmp.h:458 msgid "Epson PictureMate Deluxe" msgstr "" -#: src/main/xmli18n-tmp.h:423 +#: src/main/xmli18n-tmp.h:459 msgid "Epson PictureMate Flash" msgstr "" -#: src/main/xmli18n-tmp.h:424 +#: src/main/xmli18n-tmp.h:460 msgid "Epson PictureMate Pal" msgstr "" -#: src/main/xmli18n-tmp.h:425 +#: src/main/xmli18n-tmp.h:461 msgid "Epson PictureMate Snap" msgstr "" -#: src/main/xmli18n-tmp.h:426 -#, fuzzy +#: src/main/xmli18n-tmp.h:462 +msgid "Epson PictureMate 100" +msgstr "" + +#: src/main/xmli18n-tmp.h:463 msgid "Epson PictureMate 200" -msgstr "Stylus C60" +msgstr "" -#: src/main/xmli18n-tmp.h:427 -#, fuzzy +#: src/main/xmli18n-tmp.h:464 msgid "Epson PictureMate 210" -msgstr "Stylus C60" +msgstr "" -#: src/main/xmli18n-tmp.h:428 -#, fuzzy +#: src/main/xmli18n-tmp.h:465 msgid "Epson PictureMate 240" -msgstr "Stylus C60" +msgstr "" -#: src/main/xmli18n-tmp.h:429 -#, fuzzy +#: src/main/xmli18n-tmp.h:466 msgid "Epson PictureMate 250" -msgstr "Stylus C60" +msgstr "" -#: src/main/xmli18n-tmp.h:430 -#, fuzzy +#: src/main/xmli18n-tmp.h:467 +msgid "Epson PictureMate 260" +msgstr "" + +#: src/main/xmli18n-tmp.h:468 +msgid "Epson PictureMate 270" +msgstr "" + +#: src/main/xmli18n-tmp.h:469 msgid "Epson PictureMate 280" -msgstr "Stylus C60" +msgstr "" -#: src/main/xmli18n-tmp.h:431 +#: src/main/xmli18n-tmp.h:470 +msgid "Epson PictureMate 290" +msgstr "" + +#: src/main/xmli18n-tmp.h:471 +msgid "Epson PictureMate 500" +msgstr "" + +#: src/main/xmli18n-tmp.h:472 +msgid "Epson PictureMate 2005" +msgstr "" + +#: src/main/xmli18n-tmp.h:473 msgid "Epson CL 700" msgstr "" -#: src/main/xmli18n-tmp.h:432 +#: src/main/xmli18n-tmp.h:474 msgid "Epson CL 750" msgstr "" -#: src/main/xmli18n-tmp.h:433 +#: src/main/xmli18n-tmp.h:475 msgid "Epson CL 760" msgstr "" -#: src/main/xmli18n-tmp.h:434 +#: src/main/xmli18n-tmp.h:476 msgid "Epson E 100" msgstr "" -#: src/main/xmli18n-tmp.h:435 +#: src/main/xmli18n-tmp.h:477 msgid "Epson E 150" msgstr "" -#: src/main/xmli18n-tmp.h:436 +#: src/main/xmli18n-tmp.h:478 msgid "Epson E 200" msgstr "" -#: src/main/xmli18n-tmp.h:437 +#: src/main/xmli18n-tmp.h:479 +msgid "Epson E 300" +msgstr "" + +#: src/main/xmli18n-tmp.h:480 +msgid "Epson E 500" +msgstr "" + +#: src/main/xmli18n-tmp.h:481 +msgid "Epson E 520" +msgstr "" + +#: src/main/xmli18n-tmp.h:482 +msgid "Epson E 700" +msgstr "" + +#: src/main/xmli18n-tmp.h:483 +msgid "Epson E 720" +msgstr "" + +#: src/main/xmli18n-tmp.h:484 msgid "Epson EM 900C" msgstr "" -#: src/main/xmli18n-tmp.h:438 +#: src/main/xmli18n-tmp.h:485 msgid "Epson EM 930C" msgstr "" -#: src/main/xmli18n-tmp.h:439 +#: src/main/xmli18n-tmp.h:486 msgid "Epson MC 2000" msgstr "" -#: src/main/xmli18n-tmp.h:440 +#: src/main/xmli18n-tmp.h:487 msgid "Epson MC 5000" msgstr "" -#: src/main/xmli18n-tmp.h:441 +#: src/main/xmli18n-tmp.h:488 msgid "Epson MC 7000" msgstr "" -#: src/main/xmli18n-tmp.h:442 +#: src/main/xmli18n-tmp.h:489 msgid "Epson MC 9000" msgstr "" -#: src/main/xmli18n-tmp.h:443 +#: src/main/xmli18n-tmp.h:490 msgid "Epson MC 10000" msgstr "" -#: src/main/xmli18n-tmp.h:444 +#: src/main/xmli18n-tmp.h:491 msgid "Epson MJ 930C" msgstr "" -#: src/main/xmli18n-tmp.h:445 +#: src/main/xmli18n-tmp.h:492 msgid "Epson MJ 5100C" msgstr "" -#: src/main/xmli18n-tmp.h:446 +#: src/main/xmli18n-tmp.h:493 msgid "Epson MJ 6000C" msgstr "" -#: src/main/xmli18n-tmp.h:447 +#: src/main/xmli18n-tmp.h:494 msgid "Epson MJ 8000C" msgstr "" -#: src/main/xmli18n-tmp.h:448 -#, fuzzy +#: src/main/xmli18n-tmp.h:495 msgid "Epson PM 670C" -msgstr "Stylus C60" +msgstr "" -#: src/main/xmli18n-tmp.h:449 +#: src/main/xmli18n-tmp.h:496 msgid "Epson PM 700C" msgstr "" -#: src/main/xmli18n-tmp.h:450 +#: src/main/xmli18n-tmp.h:497 msgid "Epson PM 730C" msgstr "" -#: src/main/xmli18n-tmp.h:451 +#: src/main/xmli18n-tmp.h:498 msgid "Epson PM 740C" msgstr "" -#: src/main/xmli18n-tmp.h:452 +#: src/main/xmli18n-tmp.h:499 msgid "Epson PM 750C" msgstr "" -#: src/main/xmli18n-tmp.h:453 +#: src/main/xmli18n-tmp.h:500 msgid "Epson PM 760C" msgstr "" -#: src/main/xmli18n-tmp.h:454 +#: src/main/xmli18n-tmp.h:501 msgid "Epson PM 770C" msgstr "" -#: src/main/xmli18n-tmp.h:455 +#: src/main/xmli18n-tmp.h:502 msgid "Epson PM 780C" msgstr "" -#: src/main/xmli18n-tmp.h:456 +#: src/main/xmli18n-tmp.h:503 msgid "Epson PM 790PT" msgstr "" -#: src/main/xmli18n-tmp.h:457 +#: src/main/xmli18n-tmp.h:504 msgid "Epson PM 800C" msgstr "" -#: src/main/xmli18n-tmp.h:458 +#: src/main/xmli18n-tmp.h:505 msgid "Epson PM 850PT" msgstr "" -#: src/main/xmli18n-tmp.h:459 +#: src/main/xmli18n-tmp.h:506 msgid "Epson PM 870C" msgstr "" -#: src/main/xmli18n-tmp.h:460 +#: src/main/xmli18n-tmp.h:507 msgid "Epson PM 880C" msgstr "" -#: src/main/xmli18n-tmp.h:461 +#: src/main/xmli18n-tmp.h:508 msgid "Epson PM 930C" msgstr "" -#: src/main/xmli18n-tmp.h:462 +#: src/main/xmli18n-tmp.h:509 msgid "Epson PM 940C" msgstr "" -#: src/main/xmli18n-tmp.h:463 +#: src/main/xmli18n-tmp.h:510 msgid "Epson PM 950C" msgstr "" -#: src/main/xmli18n-tmp.h:464 +#: src/main/xmli18n-tmp.h:511 msgid "Epson PM 970C" msgstr "" -#: src/main/xmli18n-tmp.h:465 +#: src/main/xmli18n-tmp.h:512 msgid "Epson PM 980C" msgstr "" -#: src/main/xmli18n-tmp.h:466 +#: src/main/xmli18n-tmp.h:513 msgid "Epson PM 2000C" msgstr "" -#: src/main/xmli18n-tmp.h:467 +#: src/main/xmli18n-tmp.h:514 msgid "Epson PM 2200C" msgstr "" -#: src/main/xmli18n-tmp.h:468 +#: src/main/xmli18n-tmp.h:515 msgid "Epson PM 3000C" msgstr "" -#: src/main/xmli18n-tmp.h:469 +#: src/main/xmli18n-tmp.h:516 msgid "Epson PM 3300C" msgstr "" -#: src/main/xmli18n-tmp.h:470 +#: src/main/xmli18n-tmp.h:517 msgid "Epson PM 3500C" msgstr "" -#: src/main/xmli18n-tmp.h:471 +#: src/main/xmli18n-tmp.h:518 msgid "Epson PM 3700C" msgstr "" -#: src/main/xmli18n-tmp.h:472 +#: src/main/xmli18n-tmp.h:519 msgid "Epson PM 4000PX" msgstr "" -#: src/main/xmli18n-tmp.h:473 +#: src/main/xmli18n-tmp.h:520 msgid "Epson PM 5000C" msgstr "" -#: src/main/xmli18n-tmp.h:474 +#: src/main/xmli18n-tmp.h:521 msgid "Epson PM 7000C" msgstr "" -#: src/main/xmli18n-tmp.h:475 +#: src/main/xmli18n-tmp.h:522 msgid "Epson PM 9000C" msgstr "" -#: src/main/xmli18n-tmp.h:476 +#: src/main/xmli18n-tmp.h:523 #, fuzzy msgid "Epson PM 10000" msgstr "Stylus Pro 10000" -#: src/main/xmli18n-tmp.h:477 +#: src/main/xmli18n-tmp.h:524 msgid "Epson PM A650" msgstr "" -#: src/main/xmli18n-tmp.h:478 +#: src/main/xmli18n-tmp.h:525 msgid "Epson PM A750" msgstr "" -#: src/main/xmli18n-tmp.h:479 -#, fuzzy +#: src/main/xmli18n-tmp.h:526 msgid "Epson PM A820" -msgstr "Stylus C60" +msgstr "" -#: src/main/xmli18n-tmp.h:480 +#: src/main/xmli18n-tmp.h:527 msgid "Epson PM A890" msgstr "" -#: src/main/xmli18n-tmp.h:481 -#, fuzzy +#: src/main/xmli18n-tmp.h:528 msgid "Epson PM A900" -msgstr "Stylus C60" +msgstr "" -#: src/main/xmli18n-tmp.h:482 +#: src/main/xmli18n-tmp.h:529 msgid "Epson PM A950" msgstr "" -#: src/main/xmli18n-tmp.h:483 +#: src/main/xmli18n-tmp.h:530 msgid "Epson PM D600" msgstr "" -#: src/main/xmli18n-tmp.h:484 +#: src/main/xmli18n-tmp.h:531 #, fuzzy msgid "Epson PM D750" msgstr "Stylus C60" -#: src/main/xmli18n-tmp.h:485 +#: src/main/xmli18n-tmp.h:532 #, fuzzy msgid "Epson PM D770" msgstr "Stylus C60" -#: src/main/xmli18n-tmp.h:486 +#: src/main/xmli18n-tmp.h:533 msgid "Epson PM D800" msgstr "" -#: src/main/xmli18n-tmp.h:487 -#, fuzzy +#: src/main/xmli18n-tmp.h:534 msgid "Epson PM D870" -msgstr "Stylus C60" +msgstr "" -#: src/main/xmli18n-tmp.h:488 +#: src/main/xmli18n-tmp.h:535 #, fuzzy msgid "Epson PM D1000" msgstr "Stylus C60" -#: src/main/xmli18n-tmp.h:489 +#: src/main/xmli18n-tmp.h:536 #, fuzzy msgid "Epson PM G700" msgstr "Stylus C60" -#: src/main/xmli18n-tmp.h:490 +#: src/main/xmli18n-tmp.h:537 #, fuzzy msgid "Epson PM G720" msgstr "Stylus C60" -#: src/main/xmli18n-tmp.h:491 +#: src/main/xmli18n-tmp.h:538 msgid "Epson PM G730" msgstr "" -#: src/main/xmli18n-tmp.h:492 +#: src/main/xmli18n-tmp.h:539 #, fuzzy msgid "Epson PM G800" msgstr "Stylus C60" -#: src/main/xmli18n-tmp.h:493 +#: src/main/xmli18n-tmp.h:540 #, fuzzy msgid "Epson PM G820" msgstr "Stylus C60" -#: src/main/xmli18n-tmp.h:494 -#, fuzzy +#: src/main/xmli18n-tmp.h:541 msgid "Epson PM G850" -msgstr "Stylus C60" +msgstr "" -#: src/main/xmli18n-tmp.h:495 -#, fuzzy +#: src/main/xmli18n-tmp.h:542 msgid "Epson PM G4500" -msgstr "Stylus C60" +msgstr "" -#: src/main/xmli18n-tmp.h:496 -#, fuzzy +#: src/main/xmli18n-tmp.h:543 msgid "Epson PX A650" -msgstr "Stylus C60" +msgstr "" -#: src/main/xmli18n-tmp.h:497 +#: src/main/xmli18n-tmp.h:544 #, fuzzy msgid "Epson PX G900" msgstr "Stylus C60" -#: src/main/xmli18n-tmp.h:498 +#: src/main/xmli18n-tmp.h:545 #, fuzzy msgid "Epson PX G920" msgstr "Stylus C60" -#: src/main/xmli18n-tmp.h:499 +#: src/main/xmli18n-tmp.h:546 #, fuzzy msgid "Epson PX G5000" msgstr "Stylus C60" -#: src/main/xmli18n-tmp.h:500 +#: src/main/xmli18n-tmp.h:547 #, fuzzy msgid "Epson PX V500" msgstr "Stylus C60" -#: src/main/xmli18n-tmp.h:501 +#: src/main/xmli18n-tmp.h:548 #, fuzzy msgid "Epson PX V600" msgstr "Stylus C60" -#: src/main/xmli18n-tmp.h:502 +#: src/main/xmli18n-tmp.h:549 msgid "Epson PX V630" msgstr "" -#: src/main/xmli18n-tmp.h:503 -#, fuzzy +#: src/main/xmli18n-tmp.h:550 msgid "Epson PX V780" -msgstr "Stylus C60" +msgstr "" -#: src/main/xmli18n-tmp.h:504 -#, fuzzy +#: src/main/xmli18n-tmp.h:551 msgid "Epson PX 5500" -msgstr "Stylus C60" +msgstr "" -#: src/main/xmli18n-tmp.h:505 +#: src/main/xmli18n-tmp.h:552 msgid "Epson PX 7000" msgstr "" -#: src/main/xmli18n-tmp.h:506 +#: src/main/xmli18n-tmp.h:553 msgid "Epson PX 9000" msgstr "" -#: src/main/xmli18n-tmp.h:507 +#: src/main/xmli18n-tmp.h:554 msgid "Apollo P-2100" msgstr "" -#: src/main/xmli18n-tmp.h:508 +#: src/main/xmli18n-tmp.h:555 msgid "Apollo P-2150" msgstr "" -#: src/main/xmli18n-tmp.h:509 +#: src/main/xmli18n-tmp.h:556 msgid "Apollo P-2200" msgstr "" -#: src/main/xmli18n-tmp.h:510 +#: src/main/xmli18n-tmp.h:557 msgid "Apollo P-2250" msgstr "" -#: src/main/xmli18n-tmp.h:511 +#: src/main/xmli18n-tmp.h:558 msgid "Apollo P-2500" msgstr "" -#: src/main/xmli18n-tmp.h:512 +#: src/main/xmli18n-tmp.h:559 msgid "Apollo P-2550" msgstr "" -#: src/main/xmli18n-tmp.h:513 +#: src/main/xmli18n-tmp.h:560 msgid "Apollo P-2600" msgstr "" -#: src/main/xmli18n-tmp.h:514 +#: src/main/xmli18n-tmp.h:561 msgid "Apollo P-2650" msgstr "" -#: src/main/xmli18n-tmp.h:515 +#: src/main/xmli18n-tmp.h:562 msgid "Apple Color StyleWriter 4100" msgstr "" -#: src/main/xmli18n-tmp.h:516 +#: src/main/xmli18n-tmp.h:563 msgid "Apple Color StyleWriter 4500" msgstr "" -#: src/main/xmli18n-tmp.h:517 +#: src/main/xmli18n-tmp.h:564 msgid "Apple Color StyleWriter 6500" msgstr "" -#: src/main/xmli18n-tmp.h:518 +#: src/main/xmli18n-tmp.h:565 msgid "Apple LaserWriter Select 360" msgstr "" -#: src/main/xmli18n-tmp.h:519 +#: src/main/xmli18n-tmp.h:566 msgid "Brother DCP-1200" msgstr "" -#: src/main/xmli18n-tmp.h:520 +#: src/main/xmli18n-tmp.h:567 msgid "Brother HL-4Ve" msgstr "" -#: src/main/xmli18n-tmp.h:521 +#: src/main/xmli18n-tmp.h:568 msgid "Brother HL-10V" msgstr "" -#: src/main/xmli18n-tmp.h:522 +#: src/main/xmli18n-tmp.h:569 msgid "Brother HL-10h" msgstr "" -#: src/main/xmli18n-tmp.h:523 +#: src/main/xmli18n-tmp.h:570 msgid "Brother HL-630" msgstr "" -#: src/main/xmli18n-tmp.h:524 +#: src/main/xmli18n-tmp.h:571 msgid "Brother HL-660" msgstr "" -#: src/main/xmli18n-tmp.h:525 +#: src/main/xmli18n-tmp.h:572 msgid "Brother HL-760" msgstr "" -#: src/main/xmli18n-tmp.h:526 +#: src/main/xmli18n-tmp.h:573 msgid "Brother HL-960" msgstr "" -#: src/main/xmli18n-tmp.h:527 +#: src/main/xmli18n-tmp.h:574 msgid "Brother HL-1040" msgstr "" -#: src/main/xmli18n-tmp.h:528 +#: src/main/xmli18n-tmp.h:575 msgid "Brother HL-1050" msgstr "" -#: src/main/xmli18n-tmp.h:529 +#: src/main/xmli18n-tmp.h:576 msgid "Brother HL-1060" msgstr "" -#: src/main/xmli18n-tmp.h:530 +#: src/main/xmli18n-tmp.h:577 msgid "Brother HL-1070" msgstr "" -#: src/main/xmli18n-tmp.h:531 +#: src/main/xmli18n-tmp.h:578 msgid "Brother HL-1240" msgstr "" -#: src/main/xmli18n-tmp.h:532 +#: src/main/xmli18n-tmp.h:579 msgid "Brother HL-1250" msgstr "" -#: src/main/xmli18n-tmp.h:533 +#: src/main/xmli18n-tmp.h:580 msgid "Brother HL-1260" msgstr "" -#: src/main/xmli18n-tmp.h:534 +#: src/main/xmli18n-tmp.h:581 msgid "Brother HL-1270N" msgstr "" -#: src/main/xmli18n-tmp.h:535 +#: src/main/xmli18n-tmp.h:582 msgid "Brother HL-1440" msgstr "" -#: src/main/xmli18n-tmp.h:536 +#: src/main/xmli18n-tmp.h:583 msgid "Brother HL-1660e" msgstr "" -#: src/main/xmli18n-tmp.h:537 +#: src/main/xmli18n-tmp.h:584 msgid "Brother HL-2060" msgstr "" -#: src/main/xmli18n-tmp.h:538 +#: src/main/xmli18n-tmp.h:585 msgid "Brother MFC-6550MC" msgstr "" -#: src/main/xmli18n-tmp.h:539 +#: src/main/xmli18n-tmp.h:586 msgid "Brother MFC-8300" msgstr "" -#: src/main/xmli18n-tmp.h:540 +#: src/main/xmli18n-tmp.h:587 msgid "Brother MFC-9500" msgstr "" -#: src/main/xmli18n-tmp.h:541 +#: src/main/xmli18n-tmp.h:588 msgid "Brother MFC-9600" msgstr "" -#: src/main/xmli18n-tmp.h:542 +#: src/main/xmli18n-tmp.h:589 msgid "Canon GP 335" msgstr "" -#: src/main/xmli18n-tmp.h:543 +#: src/main/xmli18n-tmp.h:590 msgid "Canon LBP-4sx" msgstr "" -#: src/main/xmli18n-tmp.h:544 +#: src/main/xmli18n-tmp.h:591 msgid "Canon LBP-430" msgstr "" -#: src/main/xmli18n-tmp.h:545 +#: src/main/xmli18n-tmp.h:592 msgid "Canon LBP-1000" msgstr "" -#: src/main/xmli18n-tmp.h:546 +#: src/main/xmli18n-tmp.h:593 msgid "Canon LBP-1260" msgstr "" -#: src/main/xmli18n-tmp.h:547 +#: src/main/xmli18n-tmp.h:594 msgid "Canon LBP-1760" msgstr "" -#: src/main/xmli18n-tmp.h:548 +#: src/main/xmli18n-tmp.h:595 msgid "Canon imageRunner 330s" msgstr "" -#: src/main/xmli18n-tmp.h:549 +#: src/main/xmli18n-tmp.h:596 msgid "Citizen ProJet II" msgstr "" -#: src/main/xmli18n-tmp.h:550 +#: src/main/xmli18n-tmp.h:597 msgid "DEC 1800" msgstr "" -#: src/main/xmli18n-tmp.h:551 +#: src/main/xmli18n-tmp.h:598 msgid "DEC LN17" msgstr "" -#: src/main/xmli18n-tmp.h:552 +#: src/main/xmli18n-tmp.h:599 msgid "Epson ActionLaser 1100" msgstr "" -#: src/main/xmli18n-tmp.h:553 +#: src/main/xmli18n-tmp.h:600 msgid "Epson ActionLaser II" msgstr "" -#: src/main/xmli18n-tmp.h:554 +#: src/main/xmli18n-tmp.h:601 msgid "Epson AcuLaser C2000" msgstr "" -#: src/main/xmli18n-tmp.h:555 +#: src/main/xmli18n-tmp.h:602 msgid "Epson AcuLaser C2000PS" msgstr "" -#: src/main/xmli18n-tmp.h:556 +#: src/main/xmli18n-tmp.h:603 msgid "Epson AcuLaser C8500" msgstr "" -#: src/main/xmli18n-tmp.h:557 +#: src/main/xmli18n-tmp.h:604 msgid "Epson AcuLaser C8500PS" msgstr "" -#: src/main/xmli18n-tmp.h:558 +#: src/main/xmli18n-tmp.h:605 msgid "Epson AcuLaser C8600" msgstr "" -#: src/main/xmli18n-tmp.h:559 +#: src/main/xmli18n-tmp.h:606 msgid "Epson AcuLaser C8600PS" msgstr "" -#: src/main/xmli18n-tmp.h:560 +#: src/main/xmli18n-tmp.h:607 msgid "Epson EPL-5200" msgstr "" -#: src/main/xmli18n-tmp.h:561 +#: src/main/xmli18n-tmp.h:608 msgid "Epson EPL-5200+" msgstr "" -#: src/main/xmli18n-tmp.h:562 +#: src/main/xmli18n-tmp.h:609 msgid "Epson EPL-5700" msgstr "" -#: src/main/xmli18n-tmp.h:563 +#: src/main/xmli18n-tmp.h:610 msgid "Epson EPL-5700PS" msgstr "" -#: src/main/xmli18n-tmp.h:564 +#: src/main/xmli18n-tmp.h:611 msgid "Epson EPL-5800" msgstr "" -#: src/main/xmli18n-tmp.h:565 +#: src/main/xmli18n-tmp.h:612 msgid "Epson EPL-5800PS" msgstr "" -#: src/main/xmli18n-tmp.h:566 +#: src/main/xmli18n-tmp.h:613 msgid "Epson EPL-5900" msgstr "" -#: src/main/xmli18n-tmp.h:567 +#: src/main/xmli18n-tmp.h:614 msgid "Epson EPL-5900PS" msgstr "" -#: src/main/xmli18n-tmp.h:568 +#: src/main/xmli18n-tmp.h:615 msgid "Epson EPL-6100" msgstr "" -#: src/main/xmli18n-tmp.h:569 +#: src/main/xmli18n-tmp.h:616 msgid "Epson EPL-6100PS" msgstr "" -#: src/main/xmli18n-tmp.h:570 +#: src/main/xmli18n-tmp.h:617 msgid "Epson EPL-7100" msgstr "" -#: src/main/xmli18n-tmp.h:571 +#: src/main/xmli18n-tmp.h:618 msgid "Fujitsu PrintPartner 10V" msgstr "" -#: src/main/xmli18n-tmp.h:572 +#: src/main/xmli18n-tmp.h:619 msgid "Fujitsu PrintPartner 16DV" msgstr "" -#: src/main/xmli18n-tmp.h:573 +#: src/main/xmli18n-tmp.h:620 msgid "Fujitsu PrintPartner 20W" msgstr "" -#: src/main/xmli18n-tmp.h:574 +#: src/main/xmli18n-tmp.h:621 msgid "Fujitsu PrintPartner 8000" msgstr "" -#: src/main/xmli18n-tmp.h:575 +#: src/main/xmli18n-tmp.h:622 #, fuzzy msgid "Generic PCL 4 Printer" msgstr "Definir Nueva Impresora" -#: src/main/xmli18n-tmp.h:576 +#: src/main/xmli18n-tmp.h:623 +#, fuzzy +msgid "Generic PCL 4 LF Printer" +msgstr "Definir Nueva Impresora" + +#: src/main/xmli18n-tmp.h:624 #, fuzzy msgid "Generic PCL 5 Printer" msgstr "Definir Nueva Impresora" -#: src/main/xmli18n-tmp.h:577 +#: src/main/xmli18n-tmp.h:625 +#, fuzzy +msgid "Generic PCL 5 LF Printer" +msgstr "Definir Nueva Impresora" + +#: src/main/xmli18n-tmp.h:626 #, fuzzy msgid "Generic PCL 5c Printer" msgstr "Definir Nueva Impresora" -#: src/main/xmli18n-tmp.h:578 +#: src/main/xmli18n-tmp.h:627 +#, fuzzy +msgid "Generic PCL 5c LF Printer" +msgstr "Definir Nueva Impresora" + +#: src/main/xmli18n-tmp.h:628 #, fuzzy msgid "Generic PCL 5e Printer" msgstr "Definir Nueva Impresora" -#: src/main/xmli18n-tmp.h:579 +#: src/main/xmli18n-tmp.h:629 +#, fuzzy +msgid "Generic PCL 5e LF Printer" +msgstr "Definir Nueva Impresora" + +#: src/main/xmli18n-tmp.h:630 msgid "Generic PCL 6/PCL XL Printer" msgstr "" -#: src/main/xmli18n-tmp.h:580 +#: src/main/xmli18n-tmp.h:631 +#, fuzzy +msgid "Generic PCL 6/PCL XL LF Printer" +msgstr "Definir Nueva Impresora" + +#: src/main/xmli18n-tmp.h:632 msgid "HP Business Inkjet 2200" msgstr "" -#: src/main/xmli18n-tmp.h:581 +#: src/main/xmli18n-tmp.h:633 msgid "HP Business Inkjet 2230" msgstr "" -#: src/main/xmli18n-tmp.h:582 +#: src/main/xmli18n-tmp.h:634 msgid "HP Business Inkjet 2250" msgstr "" -#: src/main/xmli18n-tmp.h:583 +#: src/main/xmli18n-tmp.h:635 msgid "HP Business Inkjet 2250TN" msgstr "" -#: src/main/xmli18n-tmp.h:584 +#: src/main/xmli18n-tmp.h:636 msgid "HP Business Inkjet 2280" msgstr "" -#: src/main/xmli18n-tmp.h:585 +#: src/main/xmli18n-tmp.h:637 msgid "HP Color Inkjet Printer CP1160" msgstr "" -#: src/main/xmli18n-tmp.h:586 +#: src/main/xmli18n-tmp.h:638 msgid "HP Color Inkjet Printer CP1700" msgstr "" -#: src/main/xmli18n-tmp.h:587 +#: src/main/xmli18n-tmp.h:639 msgid "HP Color LaserJet 2500" msgstr "" -#: src/main/xmli18n-tmp.h:588 +#: src/main/xmli18n-tmp.h:640 msgid "HP Color LaserJet 4500" msgstr "" -#: src/main/xmli18n-tmp.h:589 +#: src/main/xmli18n-tmp.h:641 msgid "HP Color LaserJet 4550" msgstr "" -#: src/main/xmli18n-tmp.h:590 +#: src/main/xmli18n-tmp.h:642 msgid "HP Color LaserJet 4600" msgstr "" -#: src/main/xmli18n-tmp.h:591 +#: src/main/xmli18n-tmp.h:643 msgid "HP Color LaserJet 5" msgstr "" -#: src/main/xmli18n-tmp.h:592 +#: src/main/xmli18n-tmp.h:644 msgid "HP Color LaserJet 5000" msgstr "" -#: src/main/xmli18n-tmp.h:593 +#: src/main/xmli18n-tmp.h:645 msgid "HP Color LaserJet 5500" msgstr "" -#: src/main/xmli18n-tmp.h:594 +#: src/main/xmli18n-tmp.h:646 msgid "HP Color LaserJet 8550GN" msgstr "" -#: src/main/xmli18n-tmp.h:595 +#: src/main/xmli18n-tmp.h:647 msgid "HP DesignJet 230" msgstr "" -#: src/main/xmli18n-tmp.h:596 +#: src/main/xmli18n-tmp.h:648 msgid "HP DesignJet 250C" msgstr "" -#: src/main/xmli18n-tmp.h:597 +#: src/main/xmli18n-tmp.h:649 msgid "HP DesignJet 430" msgstr "" -#: src/main/xmli18n-tmp.h:598 +#: src/main/xmli18n-tmp.h:650 msgid "HP DesignJet 450C" msgstr "" -#: src/main/xmli18n-tmp.h:599 +#: src/main/xmli18n-tmp.h:651 msgid "HP DesignJet 455CA" msgstr "" -#: src/main/xmli18n-tmp.h:600 +#: src/main/xmli18n-tmp.h:652 msgid "HP DesignJet 488CA" msgstr "" -#: src/main/xmli18n-tmp.h:601 +#: src/main/xmli18n-tmp.h:653 msgid "HP DesignJet 700" msgstr "" -#: src/main/xmli18n-tmp.h:602 +#: src/main/xmli18n-tmp.h:654 msgid "HP DesignJet 750C Plus" msgstr "" -#: src/main/xmli18n-tmp.h:603 +#: src/main/xmli18n-tmp.h:655 msgid "HP DesignJet 750C" msgstr "" -#: src/main/xmli18n-tmp.h:604 +#: src/main/xmli18n-tmp.h:656 msgid "HP DesignJet 2500CP" msgstr "" -#: src/main/xmli18n-tmp.h:605 +#: src/main/xmli18n-tmp.h:657 msgid "HP DesignJet 3500CP" msgstr "" -#: src/main/xmli18n-tmp.h:606 +#: src/main/xmli18n-tmp.h:658 msgid "HP DesignJet ColorPro CAD" msgstr "" -#: src/main/xmli18n-tmp.h:607 +#: src/main/xmli18n-tmp.h:659 msgid "HP DeskJet 400" msgstr "" -#: src/main/xmli18n-tmp.h:608 +#: src/main/xmli18n-tmp.h:660 msgid "HP DeskJet 420C" msgstr "" -#: src/main/xmli18n-tmp.h:609 +#: src/main/xmli18n-tmp.h:661 msgid "HP DeskJet 450" msgstr "" -#: src/main/xmli18n-tmp.h:610 +#: src/main/xmli18n-tmp.h:662 msgid "HP DeskJet 500" msgstr "" -#: src/main/xmli18n-tmp.h:611 +#: src/main/xmli18n-tmp.h:663 msgid "HP DeskJet 500C" msgstr "" -#: src/main/xmli18n-tmp.h:612 +#: src/main/xmli18n-tmp.h:664 msgid "HP DeskJet 505J Plus" msgstr "" -#: src/main/xmli18n-tmp.h:613 +#: src/main/xmli18n-tmp.h:665 msgid "HP DeskJet 510" msgstr "" -#: src/main/xmli18n-tmp.h:614 +#: src/main/xmli18n-tmp.h:666 msgid "HP DeskJet 520" msgstr "" -#: src/main/xmli18n-tmp.h:615 +#: src/main/xmli18n-tmp.h:667 msgid "HP DeskJet 540C" msgstr "" -#: src/main/xmli18n-tmp.h:616 +#: src/main/xmli18n-tmp.h:668 msgid "HP DeskJet 550C" msgstr "" -#: src/main/xmli18n-tmp.h:617 +#: src/main/xmli18n-tmp.h:669 msgid "HP DeskJet 5550" msgstr "" -#: src/main/xmli18n-tmp.h:618 +#: src/main/xmli18n-tmp.h:670 msgid "HP DeskJet 5551" msgstr "" -#: src/main/xmli18n-tmp.h:619 +#: src/main/xmli18n-tmp.h:671 msgid "HP DeskJet 560C" msgstr "" -#: src/main/xmli18n-tmp.h:620 +#: src/main/xmli18n-tmp.h:672 msgid "HP DeskJet 600" msgstr "" -#: src/main/xmli18n-tmp.h:621 +#: src/main/xmli18n-tmp.h:673 msgid "HP DeskJet 600C" msgstr "" -#: src/main/xmli18n-tmp.h:622 +#: src/main/xmli18n-tmp.h:674 msgid "HP DeskJet 610C" msgstr "" -#: src/main/xmli18n-tmp.h:623 +#: src/main/xmli18n-tmp.h:675 msgid "HP DeskJet 610CL" msgstr "" -#: src/main/xmli18n-tmp.h:624 +#: src/main/xmli18n-tmp.h:676 msgid "HP DeskJet 6122" msgstr "" -#: src/main/xmli18n-tmp.h:625 +#: src/main/xmli18n-tmp.h:677 msgid "HP DeskJet 6127" msgstr "" -#: src/main/xmli18n-tmp.h:626 +#: src/main/xmli18n-tmp.h:678 msgid "HP DeskJet 612C" msgstr "" -#: src/main/xmli18n-tmp.h:627 +#: src/main/xmli18n-tmp.h:679 msgid "HP DeskJet 640C" msgstr "" -#: src/main/xmli18n-tmp.h:628 +#: src/main/xmli18n-tmp.h:680 msgid "HP DeskJet 648C" msgstr "" -#: src/main/xmli18n-tmp.h:629 +#: src/main/xmli18n-tmp.h:681 msgid "HP DeskJet 660C" msgstr "" -#: src/main/xmli18n-tmp.h:630 +#: src/main/xmli18n-tmp.h:682 msgid "HP DeskJet 670C" msgstr "" -#: src/main/xmli18n-tmp.h:631 +#: src/main/xmli18n-tmp.h:683 msgid "HP DeskJet 670TV" msgstr "" -#: src/main/xmli18n-tmp.h:632 +#: src/main/xmli18n-tmp.h:684 msgid "HP DeskJet 672C" msgstr "" -#: src/main/xmli18n-tmp.h:633 +#: src/main/xmli18n-tmp.h:685 msgid "HP DeskJet 680C" msgstr "" -#: src/main/xmli18n-tmp.h:634 +#: src/main/xmli18n-tmp.h:686 msgid "HP DeskJet 682C" msgstr "" -#: src/main/xmli18n-tmp.h:635 +#: src/main/xmli18n-tmp.h:687 msgid "HP DeskJet 690C" msgstr "" -#: src/main/xmli18n-tmp.h:636 +#: src/main/xmli18n-tmp.h:688 msgid "HP DeskJet 692C" msgstr "" -#: src/main/xmli18n-tmp.h:637 +#: src/main/xmli18n-tmp.h:689 msgid "HP DeskJet 693C" msgstr "" -#: src/main/xmli18n-tmp.h:638 +#: src/main/xmli18n-tmp.h:690 msgid "HP DeskJet 694C" msgstr "" -#: src/main/xmli18n-tmp.h:639 +#: src/main/xmli18n-tmp.h:691 msgid "HP DeskJet 695C" msgstr "" -#: src/main/xmli18n-tmp.h:640 +#: src/main/xmli18n-tmp.h:692 msgid "HP DeskJet 697C" msgstr "" -#: src/main/xmli18n-tmp.h:641 +#: src/main/xmli18n-tmp.h:693 msgid "HP DeskJet 810C" msgstr "" -#: src/main/xmli18n-tmp.h:642 +#: src/main/xmli18n-tmp.h:694 msgid "HP DeskJet 812C" msgstr "" -#: src/main/xmli18n-tmp.h:643 +#: src/main/xmli18n-tmp.h:695 msgid "HP DeskJet 815C" msgstr "" -#: src/main/xmli18n-tmp.h:644 +#: src/main/xmli18n-tmp.h:696 msgid "HP DeskJet 816C" msgstr "" -#: src/main/xmli18n-tmp.h:645 +#: src/main/xmli18n-tmp.h:697 msgid "HP DeskJet 825C" msgstr "" -#: src/main/xmli18n-tmp.h:646 +#: src/main/xmli18n-tmp.h:698 msgid "HP DeskJet 830C" msgstr "" -#: src/main/xmli18n-tmp.h:647 +#: src/main/xmli18n-tmp.h:699 msgid "HP DeskJet 832C" msgstr "" -#: src/main/xmli18n-tmp.h:648 +#: src/main/xmli18n-tmp.h:700 msgid "HP DeskJet 840C" msgstr "" -#: src/main/xmli18n-tmp.h:649 +#: src/main/xmli18n-tmp.h:701 msgid "HP DeskJet 841C" msgstr "" -#: src/main/xmli18n-tmp.h:650 +#: src/main/xmli18n-tmp.h:702 msgid "HP DeskJet 842C" msgstr "" -#: src/main/xmli18n-tmp.h:651 +#: src/main/xmli18n-tmp.h:703 msgid "HP DeskJet 843C" msgstr "" -#: src/main/xmli18n-tmp.h:652 +#: src/main/xmli18n-tmp.h:704 msgid "HP DeskJet 845C" msgstr "" -#: src/main/xmli18n-tmp.h:653 +#: src/main/xmli18n-tmp.h:705 msgid "HP DeskJet 850C" msgstr "" -#: src/main/xmli18n-tmp.h:654 +#: src/main/xmli18n-tmp.h:706 msgid "HP DeskJet 855C" msgstr "" -#: src/main/xmli18n-tmp.h:655 +#: src/main/xmli18n-tmp.h:707 msgid "HP DeskJet 870C" msgstr "" -#: src/main/xmli18n-tmp.h:656 +#: src/main/xmli18n-tmp.h:708 msgid "HP DeskJet 880C" msgstr "" -#: src/main/xmli18n-tmp.h:657 +#: src/main/xmli18n-tmp.h:709 msgid "HP DeskJet 882C" msgstr "" -#: src/main/xmli18n-tmp.h:658 +#: src/main/xmli18n-tmp.h:710 msgid "HP DeskJet 890C" msgstr "" -#: src/main/xmli18n-tmp.h:659 +#: src/main/xmli18n-tmp.h:711 msgid "HP DeskJet 895C" msgstr "" -#: src/main/xmli18n-tmp.h:660 +#: src/main/xmli18n-tmp.h:712 msgid "HP DeskJet 916C" msgstr "" -#: src/main/xmli18n-tmp.h:661 +#: src/main/xmli18n-tmp.h:713 msgid "HP DeskJet 920C" msgstr "" -#: src/main/xmli18n-tmp.h:662 +#: src/main/xmli18n-tmp.h:714 msgid "HP DeskJet 9300" msgstr "" -#: src/main/xmli18n-tmp.h:663 +#: src/main/xmli18n-tmp.h:715 msgid "HP DeskJet 930C" msgstr "" -#: src/main/xmli18n-tmp.h:664 +#: src/main/xmli18n-tmp.h:716 msgid "HP DeskJet 932C" msgstr "" -#: src/main/xmli18n-tmp.h:665 +#: src/main/xmli18n-tmp.h:717 msgid "HP DeskJet 933C" msgstr "" -#: src/main/xmli18n-tmp.h:666 +#: src/main/xmli18n-tmp.h:718 msgid "HP DeskJet 934C" msgstr "" -#: src/main/xmli18n-tmp.h:667 +#: src/main/xmli18n-tmp.h:719 msgid "HP DeskJet 935C" msgstr "" -#: src/main/xmli18n-tmp.h:668 +#: src/main/xmli18n-tmp.h:720 msgid "HP DeskJet 940C" msgstr "" -#: src/main/xmli18n-tmp.h:669 +#: src/main/xmli18n-tmp.h:721 msgid "HP DeskJet 948C" msgstr "" -#: src/main/xmli18n-tmp.h:670 +#: src/main/xmli18n-tmp.h:722 msgid "HP DeskJet 950C" msgstr "" -#: src/main/xmli18n-tmp.h:671 +#: src/main/xmli18n-tmp.h:723 msgid "HP DeskJet 952C" msgstr "" -#: src/main/xmli18n-tmp.h:672 +#: src/main/xmli18n-tmp.h:724 msgid "HP DeskJet 955C" msgstr "" -#: src/main/xmli18n-tmp.h:673 +#: src/main/xmli18n-tmp.h:725 msgid "HP DeskJet 957C" msgstr "" -#: src/main/xmli18n-tmp.h:674 +#: src/main/xmli18n-tmp.h:726 msgid "HP DeskJet 959C" msgstr "" -#: src/main/xmli18n-tmp.h:675 +#: src/main/xmli18n-tmp.h:727 msgid "HP DeskJet 960C" msgstr "" -#: src/main/xmli18n-tmp.h:676 +#: src/main/xmli18n-tmp.h:728 msgid "HP DeskJet 970C" msgstr "" -#: src/main/xmli18n-tmp.h:677 +#: src/main/xmli18n-tmp.h:729 msgid "HP DeskJet 975C" msgstr "" -#: src/main/xmli18n-tmp.h:678 +#: src/main/xmli18n-tmp.h:730 msgid "HP DeskJet 980C" msgstr "" -#: src/main/xmli18n-tmp.h:679 +#: src/main/xmli18n-tmp.h:731 msgid "HP DeskJet 990C" msgstr "" -#: src/main/xmli18n-tmp.h:680 +#: src/main/xmli18n-tmp.h:732 msgid "HP DeskJet 995C" msgstr "" -#: src/main/xmli18n-tmp.h:681 +#: src/main/xmli18n-tmp.h:733 msgid "HP DeskJet 1100C" msgstr "" -#: src/main/xmli18n-tmp.h:682 +#: src/main/xmli18n-tmp.h:734 msgid "HP DeskJet 1120C" msgstr "" -#: src/main/xmli18n-tmp.h:683 +#: src/main/xmli18n-tmp.h:735 msgid "HP DeskJet 1125C" msgstr "" -#: src/main/xmli18n-tmp.h:684 +#: src/main/xmli18n-tmp.h:736 msgid "HP DeskJet 1200C" msgstr "" -#: src/main/xmli18n-tmp.h:685 +#: src/main/xmli18n-tmp.h:737 msgid "HP DeskJet 1220C" msgstr "" -#: src/main/xmli18n-tmp.h:686 +#: src/main/xmli18n-tmp.h:738 msgid "HP DeskJet 1600C" msgstr "" -#: src/main/xmli18n-tmp.h:687 +#: src/main/xmli18n-tmp.h:739 msgid "HP DeskJet 1600CM" msgstr "" -#: src/main/xmli18n-tmp.h:688 +#: src/main/xmli18n-tmp.h:740 msgid "HP DeskJet 2000" msgstr "" -#: src/main/xmli18n-tmp.h:689 +#: src/main/xmli18n-tmp.h:741 msgid "HP DeskJet 2500" msgstr "" -#: src/main/xmli18n-tmp.h:690 +#: src/main/xmli18n-tmp.h:742 msgid "HP DeskJet 2500CM" msgstr "" -#: src/main/xmli18n-tmp.h:691 +#: src/main/xmli18n-tmp.h:743 msgid "HP DeskJet 340C" msgstr "" -#: src/main/xmli18n-tmp.h:692 +#: src/main/xmli18n-tmp.h:744 msgid "HP DeskJet 3810" msgstr "" -#: src/main/xmli18n-tmp.h:693 +#: src/main/xmli18n-tmp.h:745 msgid "HP DeskJet 3816" msgstr "" -#: src/main/xmli18n-tmp.h:694 +#: src/main/xmli18n-tmp.h:746 msgid "HP DeskJet 3820" msgstr "" -#: src/main/xmli18n-tmp.h:695 +#: src/main/xmli18n-tmp.h:747 msgid "HP DeskJet 3822" msgstr "" -#: src/main/xmli18n-tmp.h:696 +#: src/main/xmli18n-tmp.h:748 msgid "HP LaserJet 2" msgstr "" -#: src/main/xmli18n-tmp.h:697 +#: src/main/xmli18n-tmp.h:749 msgid "HP LaserJet 2D" msgstr "" -#: src/main/xmli18n-tmp.h:698 +#: src/main/xmli18n-tmp.h:750 msgid "HP LaserJet 2P Plus" msgstr "" -#: src/main/xmli18n-tmp.h:699 +#: src/main/xmli18n-tmp.h:751 msgid "HP LaserJet 2P" msgstr "" -#: src/main/xmli18n-tmp.h:700 +#: src/main/xmli18n-tmp.h:752 msgid "HP LaserJet 3" msgstr "" -#: src/main/xmli18n-tmp.h:701 +#: src/main/xmli18n-tmp.h:753 msgid "HP LaserJet 3D" msgstr "" -#: src/main/xmli18n-tmp.h:702 +#: src/main/xmli18n-tmp.h:754 msgid "HP LaserJet 3P w/ PCL5" msgstr "" -#: src/main/xmli18n-tmp.h:703 +#: src/main/xmli18n-tmp.h:755 msgid "HP LaserJet 3P w/PS" msgstr "" -#: src/main/xmli18n-tmp.h:704 +#: src/main/xmli18n-tmp.h:756 msgid "HP LaserJet 4 Plus" msgstr "" -#: src/main/xmli18n-tmp.h:705 +#: src/main/xmli18n-tmp.h:757 msgid "HP LaserJet 4" msgstr "" -#: src/main/xmli18n-tmp.h:706 +#: src/main/xmli18n-tmp.h:758 msgid "HP LaserJet 4L" msgstr "" -#: src/main/xmli18n-tmp.h:707 +#: src/main/xmli18n-tmp.h:759 msgid "HP LaserJet 4M" msgstr "" -#: src/main/xmli18n-tmp.h:708 +#: src/main/xmli18n-tmp.h:760 msgid "HP LaserJet 4ML" msgstr "" -#: src/main/xmli18n-tmp.h:709 +#: src/main/xmli18n-tmp.h:761 msgid "HP LaserJet 4P" msgstr "" -#: src/main/xmli18n-tmp.h:710 +#: src/main/xmli18n-tmp.h:762 msgid "HP LaserJet 4Si" msgstr "" -#: src/main/xmli18n-tmp.h:711 +#: src/main/xmli18n-tmp.h:763 msgid "HP LaserJet 4V" msgstr "" -#: src/main/xmli18n-tmp.h:712 +#: src/main/xmli18n-tmp.h:764 msgid "HP LaserJet 5" msgstr "" -#: src/main/xmli18n-tmp.h:713 +#: src/main/xmli18n-tmp.h:765 msgid "HP LaserJet 5L" msgstr "" -#: src/main/xmli18n-tmp.h:714 +#: src/main/xmli18n-tmp.h:766 msgid "HP LaserJet 5M" msgstr "" -#: src/main/xmli18n-tmp.h:715 +#: src/main/xmli18n-tmp.h:767 msgid "HP LaserJet 5MP" msgstr "" -#: src/main/xmli18n-tmp.h:716 +#: src/main/xmli18n-tmp.h:768 msgid "HP LaserJet 5P" msgstr "" -#: src/main/xmli18n-tmp.h:717 +#: src/main/xmli18n-tmp.h:769 msgid "HP LaserJet 5Si" msgstr "" -#: src/main/xmli18n-tmp.h:718 +#: src/main/xmli18n-tmp.h:770 msgid "HP LaserJet 6" msgstr "" -#: src/main/xmli18n-tmp.h:719 +#: src/main/xmli18n-tmp.h:771 msgid "HP LaserJet 6L" msgstr "" -#: src/main/xmli18n-tmp.h:720 +#: src/main/xmli18n-tmp.h:772 msgid "HP LaserJet 6MP" msgstr "" -#: src/main/xmli18n-tmp.h:721 +#: src/main/xmli18n-tmp.h:773 msgid "HP LaserJet 6P" msgstr "" -#: src/main/xmli18n-tmp.h:722 +#: src/main/xmli18n-tmp.h:774 msgid "HP LaserJet 1010" msgstr "" -#: src/main/xmli18n-tmp.h:723 +#: src/main/xmli18n-tmp.h:775 msgid "HP LaserJet 1012" msgstr "" -#: src/main/xmli18n-tmp.h:724 +#: src/main/xmli18n-tmp.h:776 msgid "HP LaserJet 1015" msgstr "" -#: src/main/xmli18n-tmp.h:725 +#: src/main/xmli18n-tmp.h:777 msgid "HP LaserJet 1022" msgstr "" -#: src/main/xmli18n-tmp.h:726 +#: src/main/xmli18n-tmp.h:778 msgid "HP LaserJet 1100" msgstr "" -#: src/main/xmli18n-tmp.h:727 +#: src/main/xmli18n-tmp.h:779 msgid "HP LaserJet 1100A" msgstr "" -#: src/main/xmli18n-tmp.h:728 +#: src/main/xmli18n-tmp.h:780 msgid "HP LaserJet 1150" msgstr "" -#: src/main/xmli18n-tmp.h:729 +#: src/main/xmli18n-tmp.h:781 msgid "HP LaserJet 1200" msgstr "" -#: src/main/xmli18n-tmp.h:730 +#: src/main/xmli18n-tmp.h:782 msgid "HP LaserJet 1220" msgstr "" -#: src/main/xmli18n-tmp.h:731 +#: src/main/xmli18n-tmp.h:783 msgid "HP LaserJet 1300" msgstr "" -#: src/main/xmli18n-tmp.h:732 +#: src/main/xmli18n-tmp.h:784 msgid "HP LaserJet 2100" msgstr "" -#: src/main/xmli18n-tmp.h:733 +#: src/main/xmli18n-tmp.h:785 msgid "HP LaserJet 2100M" msgstr "" -#: src/main/xmli18n-tmp.h:734 +#: src/main/xmli18n-tmp.h:786 msgid "HP LaserJet 2200" msgstr "" -#: src/main/xmli18n-tmp.h:735 +#: src/main/xmli18n-tmp.h:787 msgid "HP LaserJet 2300" msgstr "" -#: src/main/xmli18n-tmp.h:736 +#: src/main/xmli18n-tmp.h:788 msgid "HP LaserJet 3200" msgstr "" -#: src/main/xmli18n-tmp.h:737 +#: src/main/xmli18n-tmp.h:789 msgid "HP LaserJet 3200m" msgstr "" -#: src/main/xmli18n-tmp.h:738 +#: src/main/xmli18n-tmp.h:790 msgid "HP LaserJet 3200se" msgstr "" -#: src/main/xmli18n-tmp.h:739 +#: src/main/xmli18n-tmp.h:791 msgid "HP LaserJet 3300 MFP" msgstr "" -#: src/main/xmli18n-tmp.h:740 +#: src/main/xmli18n-tmp.h:792 msgid "HP LaserJet 3310 MFP" msgstr "" -#: src/main/xmli18n-tmp.h:741 +#: src/main/xmli18n-tmp.h:793 msgid "HP LaserJet 3320 MFP" msgstr "" -#: src/main/xmli18n-tmp.h:742 +#: src/main/xmli18n-tmp.h:794 msgid "HP LaserJet 3320N MFP" msgstr "" -#: src/main/xmli18n-tmp.h:743 +#: src/main/xmli18n-tmp.h:795 msgid "HP LaserJet 3330 MFP" msgstr "" -#: src/main/xmli18n-tmp.h:744 +#: src/main/xmli18n-tmp.h:796 msgid "HP LaserJet 4000" msgstr "" -#: src/main/xmli18n-tmp.h:745 +#: src/main/xmli18n-tmp.h:797 msgid "HP LaserJet 4050" msgstr "" -#: src/main/xmli18n-tmp.h:746 +#: src/main/xmli18n-tmp.h:798 msgid "HP LaserJet 4100" msgstr "" -#: src/main/xmli18n-tmp.h:747 +#: src/main/xmli18n-tmp.h:799 msgid "HP LaserJet 4200" msgstr "" -#: src/main/xmli18n-tmp.h:748 +#: src/main/xmli18n-tmp.h:800 msgid "HP LaserJet 4300" msgstr "" -#: src/main/xmli18n-tmp.h:749 +#: src/main/xmli18n-tmp.h:801 msgid "HP LaserJet 5000" msgstr "" -#: src/main/xmli18n-tmp.h:750 +#: src/main/xmli18n-tmp.h:802 msgid "HP LaserJet 5100" msgstr "" -#: src/main/xmli18n-tmp.h:751 +#: src/main/xmli18n-tmp.h:803 msgid "HP LaserJet 8000" msgstr "" -#: src/main/xmli18n-tmp.h:752 +#: src/main/xmli18n-tmp.h:804 msgid "HP LaserJet 8100" msgstr "" -#: src/main/xmli18n-tmp.h:753 +#: src/main/xmli18n-tmp.h:805 msgid "HP LaserJet 8150" msgstr "" -#: src/main/xmli18n-tmp.h:754 +#: src/main/xmli18n-tmp.h:806 msgid "HP LaserJet 9000" msgstr "" -#: src/main/xmli18n-tmp.h:755 +#: src/main/xmli18n-tmp.h:807 msgid "HP Mopier 240" msgstr "" -#: src/main/xmli18n-tmp.h:756 +#: src/main/xmli18n-tmp.h:808 msgid "HP Mopier 320" msgstr "" -#: src/main/xmli18n-tmp.h:757 +#: src/main/xmli18n-tmp.h:809 msgid "HP OfficeJet 300" msgstr "" -#: src/main/xmli18n-tmp.h:758 +#: src/main/xmli18n-tmp.h:810 msgid "HP OfficeJet 330" msgstr "" -#: src/main/xmli18n-tmp.h:759 +#: src/main/xmli18n-tmp.h:811 msgid "HP OfficeJet 350" msgstr "" -#: src/main/xmli18n-tmp.h:760 +#: src/main/xmli18n-tmp.h:812 msgid "HP OfficeJet 500" msgstr "" -#: src/main/xmli18n-tmp.h:761 +#: src/main/xmli18n-tmp.h:813 msgid "HP OfficeJet 520" msgstr "" -#: src/main/xmli18n-tmp.h:762 +#: src/main/xmli18n-tmp.h:814 msgid "HP OfficeJet 570" msgstr "" -#: src/main/xmli18n-tmp.h:763 +#: src/main/xmli18n-tmp.h:815 msgid "HP OfficeJet 580" msgstr "" -#: src/main/xmli18n-tmp.h:764 +#: src/main/xmli18n-tmp.h:816 msgid "HP OfficeJet 590" msgstr "" -#: src/main/xmli18n-tmp.h:765 +#: src/main/xmli18n-tmp.h:817 msgid "HP OfficeJet 600" msgstr "" -#: src/main/xmli18n-tmp.h:766 +#: src/main/xmli18n-tmp.h:818 msgid "HP OfficeJet 610" msgstr "" -#: src/main/xmli18n-tmp.h:767 +#: src/main/xmli18n-tmp.h:819 msgid "HP OfficeJet 625" msgstr "" -#: src/main/xmli18n-tmp.h:768 +#: src/main/xmli18n-tmp.h:820 msgid "HP OfficeJet 630" msgstr "" -#: src/main/xmli18n-tmp.h:769 +#: src/main/xmli18n-tmp.h:821 msgid "HP OfficeJet 635" msgstr "" -#: src/main/xmli18n-tmp.h:770 +#: src/main/xmli18n-tmp.h:822 msgid "HP OfficeJet 700" msgstr "" -#: src/main/xmli18n-tmp.h:771 +#: src/main/xmli18n-tmp.h:823 msgid "HP OfficeJet 710" msgstr "" -#: src/main/xmli18n-tmp.h:772 +#: src/main/xmli18n-tmp.h:824 msgid "HP OfficeJet 720" msgstr "" -#: src/main/xmli18n-tmp.h:773 +#: src/main/xmli18n-tmp.h:825 msgid "HP OfficeJet 725" msgstr "" -#: src/main/xmli18n-tmp.h:774 +#: src/main/xmli18n-tmp.h:826 msgid "HP OfficeJet 5105" msgstr "" -#: src/main/xmli18n-tmp.h:775 +#: src/main/xmli18n-tmp.h:827 msgid "HP OfficeJet 5110" msgstr "" -#: src/main/xmli18n-tmp.h:776 +#: src/main/xmli18n-tmp.h:828 msgid "HP OfficeJet 5110xi" msgstr "" -#: src/main/xmli18n-tmp.h:777 +#: src/main/xmli18n-tmp.h:829 msgid "HP OfficeJet 6105" msgstr "" -#: src/main/xmli18n-tmp.h:778 +#: src/main/xmli18n-tmp.h:830 msgid "HP OfficeJet 6110" msgstr "" -#: src/main/xmli18n-tmp.h:779 +#: src/main/xmli18n-tmp.h:831 msgid "HP OfficeJet 7110" msgstr "" -#: src/main/xmli18n-tmp.h:780 +#: src/main/xmli18n-tmp.h:832 msgid "HP OfficeJet 7130" msgstr "" -#: src/main/xmli18n-tmp.h:781 +#: src/main/xmli18n-tmp.h:833 msgid "HP OfficeJet 7140" msgstr "" -#: src/main/xmli18n-tmp.h:782 +#: src/main/xmli18n-tmp.h:834 msgid "HP OfficeJet D125" msgstr "" -#: src/main/xmli18n-tmp.h:783 +#: src/main/xmli18n-tmp.h:835 msgid "HP OfficeJet D135" msgstr "" -#: src/main/xmli18n-tmp.h:784 +#: src/main/xmli18n-tmp.h:836 msgid "HP OfficeJet D145" msgstr "" -#: src/main/xmli18n-tmp.h:785 +#: src/main/xmli18n-tmp.h:837 msgid "HP OfficeJet D155" msgstr "" -#: src/main/xmli18n-tmp.h:786 +#: src/main/xmli18n-tmp.h:838 msgid "HP OfficeJet G55" msgstr "" -#: src/main/xmli18n-tmp.h:787 +#: src/main/xmli18n-tmp.h:839 msgid "HP OfficeJet G85" msgstr "" -#: src/main/xmli18n-tmp.h:788 +#: src/main/xmli18n-tmp.h:840 msgid "HP OfficeJet G95" msgstr "" -#: src/main/xmli18n-tmp.h:789 +#: src/main/xmli18n-tmp.h:841 msgid "HP OfficeJet K60" msgstr "" -#: src/main/xmli18n-tmp.h:790 +#: src/main/xmli18n-tmp.h:842 msgid "HP OfficeJet K60xi" msgstr "" -#: src/main/xmli18n-tmp.h:791 +#: src/main/xmli18n-tmp.h:843 msgid "HP OfficeJet K80" msgstr "" -#: src/main/xmli18n-tmp.h:792 +#: src/main/xmli18n-tmp.h:844 msgid "HP OfficeJet K80xi" msgstr "" -#: src/main/xmli18n-tmp.h:793 +#: src/main/xmli18n-tmp.h:845 msgid "HP OfficeJet LX" msgstr "" -#: src/main/xmli18n-tmp.h:794 +#: src/main/xmli18n-tmp.h:846 msgid "HP OfficeJet Pro 1150C" msgstr "" -#: src/main/xmli18n-tmp.h:795 +#: src/main/xmli18n-tmp.h:847 msgid "HP OfficeJet Pro 1170C" msgstr "" -#: src/main/xmli18n-tmp.h:796 +#: src/main/xmli18n-tmp.h:848 msgid "HP OfficeJet Pro 1175C" msgstr "" -#: src/main/xmli18n-tmp.h:797 +#: src/main/xmli18n-tmp.h:849 msgid "HP OfficeJet R40" msgstr "" -#: src/main/xmli18n-tmp.h:798 +#: src/main/xmli18n-tmp.h:850 msgid "HP OfficeJet R45" msgstr "" -#: src/main/xmli18n-tmp.h:799 +#: src/main/xmli18n-tmp.h:851 msgid "HP OfficeJet R60" msgstr "" -#: src/main/xmli18n-tmp.h:800 +#: src/main/xmli18n-tmp.h:852 msgid "HP OfficeJet R65" msgstr "" -#: src/main/xmli18n-tmp.h:801 +#: src/main/xmli18n-tmp.h:853 msgid "HP OfficeJet R80" msgstr "" -#: src/main/xmli18n-tmp.h:802 +#: src/main/xmli18n-tmp.h:854 msgid "HP OfficeJet T45" msgstr "" -#: src/main/xmli18n-tmp.h:803 +#: src/main/xmli18n-tmp.h:855 msgid "HP OfficeJet T65" msgstr "" -#: src/main/xmli18n-tmp.h:804 +#: src/main/xmli18n-tmp.h:856 msgid "HP OfficeJet V40" msgstr "" -#: src/main/xmli18n-tmp.h:805 +#: src/main/xmli18n-tmp.h:857 msgid "HP OfficeJet V40xi" msgstr "" -#: src/main/xmli18n-tmp.h:806 +#: src/main/xmli18n-tmp.h:858 msgid "HP OfficeJet" msgstr "" -#: src/main/xmli18n-tmp.h:807 +#: src/main/xmli18n-tmp.h:859 msgid "HP PSC 370" msgstr "" -#: src/main/xmli18n-tmp.h:808 +#: src/main/xmli18n-tmp.h:860 msgid "HP PSC 380" msgstr "" -#: src/main/xmli18n-tmp.h:809 +#: src/main/xmli18n-tmp.h:861 msgid "HP PSC 500" msgstr "" -#: src/main/xmli18n-tmp.h:810 +#: src/main/xmli18n-tmp.h:862 msgid "HP PSC 750" msgstr "" -#: src/main/xmli18n-tmp.h:811 +#: src/main/xmli18n-tmp.h:863 msgid "HP PSC 950" msgstr "" -#: src/main/xmli18n-tmp.h:812 +#: src/main/xmli18n-tmp.h:864 msgid "HP PSC 950xi" msgstr "" -#: src/main/xmli18n-tmp.h:813 +#: src/main/xmli18n-tmp.h:865 msgid "HP PSC 2110" msgstr "" -#: src/main/xmli18n-tmp.h:814 +#: src/main/xmli18n-tmp.h:866 msgid "HP PSC 2150" msgstr "" -#: src/main/xmli18n-tmp.h:815 +#: src/main/xmli18n-tmp.h:867 msgid "HP PSC 2210" msgstr "" -#: src/main/xmli18n-tmp.h:816 +#: src/main/xmli18n-tmp.h:868 msgid "HP PhotoSmart 7150" msgstr "" -#: src/main/xmli18n-tmp.h:817 +#: src/main/xmli18n-tmp.h:869 msgid "HP PhotoSmart 7345" msgstr "" -#: src/main/xmli18n-tmp.h:818 +#: src/main/xmli18n-tmp.h:870 msgid "HP PhotoSmart 7350" msgstr "" -#: src/main/xmli18n-tmp.h:819 +#: src/main/xmli18n-tmp.h:871 msgid "HP PhotoSmart 7550" msgstr "" -#: src/main/xmli18n-tmp.h:820 +#: src/main/xmli18n-tmp.h:872 msgid "HP PhotoSmart P100" msgstr "" -#: src/main/xmli18n-tmp.h:821 +#: src/main/xmli18n-tmp.h:873 msgid "HP PhotoSmart P130" msgstr "" -#: src/main/xmli18n-tmp.h:822 +#: src/main/xmli18n-tmp.h:874 msgid "HP PhotoSmart P230" msgstr "" -#: src/main/xmli18n-tmp.h:823 +#: src/main/xmli18n-tmp.h:875 msgid "HP PhotoSmart P1000" msgstr "" -#: src/main/xmli18n-tmp.h:824 +#: src/main/xmli18n-tmp.h:876 msgid "HP PhotoSmart P1100" msgstr "" -#: src/main/xmli18n-tmp.h:825 +#: src/main/xmli18n-tmp.h:877 msgid "HP PhotoSmart P1115" msgstr "" -#: src/main/xmli18n-tmp.h:826 +#: src/main/xmli18n-tmp.h:878 msgid "HP PhotoSmart P1215" msgstr "" -#: src/main/xmli18n-tmp.h:827 +#: src/main/xmli18n-tmp.h:879 msgid "HP PhotoSmart P1218" msgstr "" -#: src/main/xmli18n-tmp.h:828 +#: src/main/xmli18n-tmp.h:880 msgid "HP PhotoSmart P1315" msgstr "" -#: src/main/xmli18n-tmp.h:829 +#: src/main/xmli18n-tmp.h:881 #, fuzzy msgid "HP e-printer e20" msgstr "Nombre de la Impresora:" -#: src/main/xmli18n-tmp.h:830 +#: src/main/xmli18n-tmp.h:882 msgid "IBM 4019" msgstr "" -#: src/main/xmli18n-tmp.h:831 +#: src/main/xmli18n-tmp.h:883 msgid "IBM 4029 030 LaserPrinter 10" msgstr "" -#: src/main/xmli18n-tmp.h:832 +#: src/main/xmli18n-tmp.h:884 msgid "IBM 4312" msgstr "" -#: src/main/xmli18n-tmp.h:833 +#: src/main/xmli18n-tmp.h:885 msgid "IBM Infoprint 12" msgstr "" -#: src/main/xmli18n-tmp.h:834 +#: src/main/xmli18n-tmp.h:886 msgid "IBM Page Printer 3112" msgstr "" -#: src/main/xmli18n-tmp.h:835 +#: src/main/xmli18n-tmp.h:887 msgid "Infotec 4651 MF" msgstr "" -#: src/main/xmli18n-tmp.h:836 +#: src/main/xmli18n-tmp.h:888 msgid "Kyocera F-1010" msgstr "" -#: src/main/xmli18n-tmp.h:837 +#: src/main/xmli18n-tmp.h:889 msgid "Kyocera FS-600 - KPDL-2" msgstr "" -#: src/main/xmli18n-tmp.h:838 +#: src/main/xmli18n-tmp.h:890 msgid "Kyocera FS-600" msgstr "" -#: src/main/xmli18n-tmp.h:839 +#: src/main/xmli18n-tmp.h:891 msgid "Kyocera FS-680" msgstr "" -#: src/main/xmli18n-tmp.h:840 +#: src/main/xmli18n-tmp.h:892 msgid "Kyocera FS-800" msgstr "" -#: src/main/xmli18n-tmp.h:841 +#: src/main/xmli18n-tmp.h:893 msgid "Kyocera FS-1000" msgstr "" -#: src/main/xmli18n-tmp.h:842 +#: src/main/xmli18n-tmp.h:894 msgid "Kyocera FS-1000+" msgstr "" -#: src/main/xmli18n-tmp.h:843 +#: src/main/xmli18n-tmp.h:895 msgid "Kyocera FS-1010" msgstr "" -#: src/main/xmli18n-tmp.h:844 +#: src/main/xmli18n-tmp.h:896 msgid "Kyocera FS-1050" msgstr "" -#: src/main/xmli18n-tmp.h:845 +#: src/main/xmli18n-tmp.h:897 msgid "Kyocera FS-1200" msgstr "" -#: src/main/xmli18n-tmp.h:846 +#: src/main/xmli18n-tmp.h:898 msgid "Kyocera FS-1600" msgstr "" -#: src/main/xmli18n-tmp.h:847 +#: src/main/xmli18n-tmp.h:899 msgid "Kyocera FS-1600+" msgstr "" -#: src/main/xmli18n-tmp.h:848 +#: src/main/xmli18n-tmp.h:900 msgid "Kyocera FS-1700" msgstr "" -#: src/main/xmli18n-tmp.h:849 +#: src/main/xmli18n-tmp.h:901 msgid "Kyocera FS-1700+" msgstr "" -#: src/main/xmli18n-tmp.h:850 +#: src/main/xmli18n-tmp.h:902 msgid "Kyocera FS-1750" msgstr "" -#: src/main/xmli18n-tmp.h:851 +#: src/main/xmli18n-tmp.h:903 msgid "Kyocera FS-1800" msgstr "" -#: src/main/xmli18n-tmp.h:852 +#: src/main/xmli18n-tmp.h:904 msgid "Kyocera FS-1800+" msgstr "" -#: src/main/xmli18n-tmp.h:853 +#: src/main/xmli18n-tmp.h:905 msgid "Kyocera FS-1900" msgstr "" -#: src/main/xmli18n-tmp.h:854 +#: src/main/xmli18n-tmp.h:906 msgid "Kyocera FS-3500" msgstr "" -#: src/main/xmli18n-tmp.h:855 +#: src/main/xmli18n-tmp.h:907 msgid "Kyocera FS-3600" msgstr "" -#: src/main/xmli18n-tmp.h:856 +#: src/main/xmli18n-tmp.h:908 msgid "Kyocera FS-3600+" msgstr "" -#: src/main/xmli18n-tmp.h:857 +#: src/main/xmli18n-tmp.h:909 msgid "Kyocera FS-3700" msgstr "" -#: src/main/xmli18n-tmp.h:858 +#: src/main/xmli18n-tmp.h:910 msgid "Kyocera FS-3700+" msgstr "" -#: src/main/xmli18n-tmp.h:859 +#: src/main/xmli18n-tmp.h:911 msgid "Kyocera FS-3750" msgstr "" -#: src/main/xmli18n-tmp.h:860 +#: src/main/xmli18n-tmp.h:912 msgid "Kyocera FS-3800" msgstr "" -#: src/main/xmli18n-tmp.h:861 +#: src/main/xmli18n-tmp.h:913 msgid "Kyocera FS-5800C" msgstr "" -#: src/main/xmli18n-tmp.h:862 +#: src/main/xmli18n-tmp.h:914 msgid "Kyocera FS-5900C" msgstr "" -#: src/main/xmli18n-tmp.h:863 +#: src/main/xmli18n-tmp.h:915 msgid "Kyocera FS-6500" msgstr "" -#: src/main/xmli18n-tmp.h:864 +#: src/main/xmli18n-tmp.h:916 msgid "Kyocera FS-6500+" msgstr "" -#: src/main/xmli18n-tmp.h:865 +#: src/main/xmli18n-tmp.h:917 msgid "Kyocera FS-6700" msgstr "" -#: src/main/xmli18n-tmp.h:866 +#: src/main/xmli18n-tmp.h:918 msgid "Kyocera FS-7000" msgstr "" -#: src/main/xmli18n-tmp.h:867 +#: src/main/xmli18n-tmp.h:919 msgid "Kyocera FS-7000+" msgstr "" -#: src/main/xmli18n-tmp.h:868 +#: src/main/xmli18n-tmp.h:920 msgid "Kyocera FS-8000C" msgstr "" -#: src/main/xmli18n-tmp.h:869 +#: src/main/xmli18n-tmp.h:921 msgid "Kyocera FS-9000" msgstr "" -#: src/main/xmli18n-tmp.h:870 +#: src/main/xmli18n-tmp.h:922 msgid "Kyocera FS-9100DN" msgstr "" -#: src/main/xmli18n-tmp.h:871 +#: src/main/xmli18n-tmp.h:923 msgid "Kyocera FS-9500DN" msgstr "" -#: src/main/xmli18n-tmp.h:872 +#: src/main/xmli18n-tmp.h:924 msgid "Kyocera KM-1530" msgstr "" -#: src/main/xmli18n-tmp.h:873 +#: src/main/xmli18n-tmp.h:925 msgid "Kyocera KM-1810" msgstr "" -#: src/main/xmli18n-tmp.h:874 +#: src/main/xmli18n-tmp.h:926 msgid "Kyocera KM-2030" msgstr "" -#: src/main/xmli18n-tmp.h:875 +#: src/main/xmli18n-tmp.h:927 msgid "Kyocera KM-2530" msgstr "" -#: src/main/xmli18n-tmp.h:876 +#: src/main/xmli18n-tmp.h:928 msgid "Kyocera KM-3530" msgstr "" -#: src/main/xmli18n-tmp.h:877 +#: src/main/xmli18n-tmp.h:929 msgid "Kyocera KM-4230" msgstr "" -#: src/main/xmli18n-tmp.h:878 +#: src/main/xmli18n-tmp.h:930 msgid "Kyocera KM-4530" msgstr "" -#: src/main/xmli18n-tmp.h:879 +#: src/main/xmli18n-tmp.h:931 msgid "Kyocera KM-5230" msgstr "" -#: src/main/xmli18n-tmp.h:880 +#: src/main/xmli18n-tmp.h:932 msgid "Kyocera KM-5530" msgstr "" -#: src/main/xmli18n-tmp.h:881 +#: src/main/xmli18n-tmp.h:933 msgid "Kyocera KM-6230" msgstr "" -#: src/main/xmli18n-tmp.h:882 +#: src/main/xmli18n-tmp.h:934 msgid "Lexmark 4076" msgstr "" -#: src/main/xmli18n-tmp.h:883 +#: src/main/xmli18n-tmp.h:935 msgid "Lexmark Optra E" msgstr "" -#: src/main/xmli18n-tmp.h:884 +#: src/main/xmli18n-tmp.h:936 msgid "Lexmark Optra E+" msgstr "" -#: src/main/xmli18n-tmp.h:885 +#: src/main/xmli18n-tmp.h:937 msgid "Lexmark Optra E220" msgstr "" -#: src/main/xmli18n-tmp.h:886 +#: src/main/xmli18n-tmp.h:938 msgid "Lexmark Valuewriter 300" msgstr "" -#: src/main/xmli18n-tmp.h:887 +#: src/main/xmli18n-tmp.h:939 msgid "Minolta PagePro 6" msgstr "" -#: src/main/xmli18n-tmp.h:888 +#: src/main/xmli18n-tmp.h:940 msgid "Minolta PagePro 6e" msgstr "" -#: src/main/xmli18n-tmp.h:889 +#: src/main/xmli18n-tmp.h:941 msgid "Minolta PagePro 6ex" msgstr "" -#: src/main/xmli18n-tmp.h:890 +#: src/main/xmli18n-tmp.h:942 msgid "Minolta PagePro 8" msgstr "" -#: src/main/xmli18n-tmp.h:891 +#: src/main/xmli18n-tmp.h:943 msgid "Minolta PagePro 8L" msgstr "" -#: src/main/xmli18n-tmp.h:892 +#: src/main/xmli18n-tmp.h:944 msgid "Minolta PagePro 1100" msgstr "" -#: src/main/xmli18n-tmp.h:893 +#: src/main/xmli18n-tmp.h:945 msgid "NEC SuperScript 660i" msgstr "" -#: src/main/xmli18n-tmp.h:894 +#: src/main/xmli18n-tmp.h:946 msgid "NEC SuperScript 860" msgstr "" -#: src/main/xmli18n-tmp.h:895 +#: src/main/xmli18n-tmp.h:947 msgid "NEC SuperScript 870" msgstr "" -#: src/main/xmli18n-tmp.h:896 +#: src/main/xmli18n-tmp.h:948 msgid "NEC SuperScript 1260" msgstr "" -#: src/main/xmli18n-tmp.h:897 +#: src/main/xmli18n-tmp.h:949 msgid "NEC SuperScript 1400" msgstr "" -#: src/main/xmli18n-tmp.h:898 +#: src/main/xmli18n-tmp.h:950 msgid "NEC SuperScript 1800" msgstr "" -#: src/main/xmli18n-tmp.h:899 +#: src/main/xmli18n-tmp.h:951 msgid "Okidata OL400" msgstr "" -#: src/main/xmli18n-tmp.h:900 +#: src/main/xmli18n-tmp.h:952 msgid "Okidata OL400e" msgstr "" -#: src/main/xmli18n-tmp.h:901 +#: src/main/xmli18n-tmp.h:953 msgid "Okidata OL400ex" msgstr "" -#: src/main/xmli18n-tmp.h:902 +#: src/main/xmli18n-tmp.h:954 msgid "Okidata OL410e" msgstr "" -#: src/main/xmli18n-tmp.h:903 +#: src/main/xmli18n-tmp.h:955 msgid "Okidata OL600e" msgstr "" -#: src/main/xmli18n-tmp.h:904 +#: src/main/xmli18n-tmp.h:956 msgid "Okidata OL610e/S" msgstr "" -#: src/main/xmli18n-tmp.h:905 +#: src/main/xmli18n-tmp.h:957 msgid "Okidata OL800" msgstr "" -#: src/main/xmli18n-tmp.h:906 +#: src/main/xmli18n-tmp.h:958 msgid "Okidata OL810ex" msgstr "" -#: src/main/xmli18n-tmp.h:907 +#: src/main/xmli18n-tmp.h:959 msgid "Okidata Okipage 6e" msgstr "" -#: src/main/xmli18n-tmp.h:908 +#: src/main/xmli18n-tmp.h:960 msgid "Okidata Okipage 6ex" msgstr "" -#: src/main/xmli18n-tmp.h:909 +#: src/main/xmli18n-tmp.h:961 msgid "Okidata Okipage 8p" msgstr "" -#: src/main/xmli18n-tmp.h:910 +#: src/main/xmli18n-tmp.h:962 msgid "Okidata Okipage 10e" msgstr "" -#: src/main/xmli18n-tmp.h:911 +#: src/main/xmli18n-tmp.h:963 msgid "Okidata Okipage 10ex" msgstr "" -#: src/main/xmli18n-tmp.h:912 +#: src/main/xmli18n-tmp.h:964 msgid "Okidata Okipage 14ex" msgstr "" -#: src/main/xmli18n-tmp.h:913 +#: src/main/xmli18n-tmp.h:965 msgid "Okidata Super 6e" msgstr "" -#: src/main/xmli18n-tmp.h:914 +#: src/main/xmli18n-tmp.h:966 msgid "Olivetti JP350S" msgstr "" -#: src/main/xmli18n-tmp.h:915 +#: src/main/xmli18n-tmp.h:967 msgid "Olivetti PG 306" msgstr "" -#: src/main/xmli18n-tmp.h:916 +#: src/main/xmli18n-tmp.h:968 msgid "PCPI 1030" msgstr "" -#: src/main/xmli18n-tmp.h:917 +#: src/main/xmli18n-tmp.h:969 msgid "Panasonic KX-P4410" msgstr "" -#: src/main/xmli18n-tmp.h:918 +#: src/main/xmli18n-tmp.h:970 msgid "Panasonic KX-P4450" msgstr "" -#: src/main/xmli18n-tmp.h:919 +#: src/main/xmli18n-tmp.h:971 msgid "Panasonic KX-P6150" msgstr "" -#: src/main/xmli18n-tmp.h:920 +#: src/main/xmli18n-tmp.h:972 msgid "Panasonic KX-P6500" msgstr "" -#: src/main/xmli18n-tmp.h:921 +#: src/main/xmli18n-tmp.h:973 msgid "Raven LP-410" msgstr "" -#: src/main/xmli18n-tmp.h:922 +#: src/main/xmli18n-tmp.h:974 msgid "Ricoh Aficio 220" msgstr "" -#: src/main/xmli18n-tmp.h:923 +#: src/main/xmli18n-tmp.h:975 msgid "Ricoh Aficio 401" msgstr "" -#: src/main/xmli18n-tmp.h:924 +#: src/main/xmli18n-tmp.h:976 msgid "Ricoh Aficio 700" msgstr "" -#: src/main/xmli18n-tmp.h:925 +#: src/main/xmli18n-tmp.h:977 msgid "Samsung ML-85" msgstr "" -#: src/main/xmli18n-tmp.h:926 +#: src/main/xmli18n-tmp.h:978 msgid "Samsung ML-4600" msgstr "" -#: src/main/xmli18n-tmp.h:927 +#: src/main/xmli18n-tmp.h:979 msgid "Samsung ML-5000a" msgstr "" -#: src/main/xmli18n-tmp.h:928 +#: src/main/xmli18n-tmp.h:980 msgid "Samsung ML-6000" msgstr "" -#: src/main/xmli18n-tmp.h:929 +#: src/main/xmli18n-tmp.h:981 msgid "Samsung ML-6100" msgstr "" -#: src/main/xmli18n-tmp.h:930 +#: src/main/xmli18n-tmp.h:982 msgid "Samsung ML-7000" msgstr "" -#: src/main/xmli18n-tmp.h:931 +#: src/main/xmli18n-tmp.h:983 msgid "Samsung ML-7000N" msgstr "" -#: src/main/xmli18n-tmp.h:932 +#: src/main/xmli18n-tmp.h:984 msgid "Samsung ML-7000P" msgstr "" -#: src/main/xmli18n-tmp.h:933 +#: src/main/xmli18n-tmp.h:985 msgid "Samsung ML-7050" msgstr "" -#: src/main/xmli18n-tmp.h:934 +#: src/main/xmli18n-tmp.h:986 msgid "Samsung QL-5100A" msgstr "" -#: src/main/xmli18n-tmp.h:935 +#: src/main/xmli18n-tmp.h:987 msgid "Samsung QL-6050" msgstr "" -#: src/main/xmli18n-tmp.h:936 +#: src/main/xmli18n-tmp.h:988 msgid "Seiko SpeedJET 200" msgstr "" -#: src/main/xmli18n-tmp.h:937 +#: src/main/xmli18n-tmp.h:989 msgid "Sharp AR-161" msgstr "" -#: src/main/xmli18n-tmp.h:938 +#: src/main/xmli18n-tmp.h:990 msgid "Sharp AR-M257" msgstr "" -#: src/main/xmli18n-tmp.h:939 +#: src/main/xmli18n-tmp.h:991 msgid "Sony IJP-V100" msgstr "" -#: src/main/xmli18n-tmp.h:940 +#: src/main/xmli18n-tmp.h:992 msgid "Star LS-04" msgstr "" -#: src/main/xmli18n-tmp.h:941 +#: src/main/xmli18n-tmp.h:993 #, fuzzy msgid "Star LaserPrinter 8" -msgstr "Configuración de la Impresora" +msgstr "Configuración de la Impresora" -#: src/main/xmli18n-tmp.h:942 +#: src/main/xmli18n-tmp.h:994 msgid "Tally MT908" msgstr "" -#: src/main/xmli18n-tmp.h:943 +#: src/main/xmli18n-tmp.h:995 msgid "Xerox Able 1406" msgstr "" -#: src/main/xmli18n-tmp.h:944 +#: src/main/xmli18n-tmp.h:996 msgid "Xerox DocuPrint 4508" msgstr "" -#: src/main/xmli18n-tmp.h:945 +#: src/main/xmli18n-tmp.h:997 msgid "Xerox DocuPrint C20" msgstr "" -#: src/main/xmli18n-tmp.h:946 +#: src/main/xmli18n-tmp.h:998 msgid "Xerox DocuPrint N4512" msgstr "" -#: src/main/xmli18n-tmp.h:947 +#: src/main/xmli18n-tmp.h:999 msgid "Xerox DocuPrint N4512PS" msgstr "" -#: src/main/xmli18n-tmp.h:948 +#: src/main/xmli18n-tmp.h:1000 msgid "Xerox DocuPrint P12" msgstr "" -#: src/main/xmli18n-tmp.h:949 +#: src/main/xmli18n-tmp.h:1001 msgid "Xerox DocuPrint P1202" msgstr "" -#: src/main/xmli18n-tmp.h:950 +#: src/main/xmli18n-tmp.h:1002 msgid "Xerox DocuPrint P8e" msgstr "" -#: src/main/xmli18n-tmp.h:951 +#: src/main/xmli18n-tmp.h:1003 msgid "Xerox Document Centre 400" msgstr "" -#: src/main/xmli18n-tmp.h:952 +#: src/main/xmli18n-tmp.h:1004 msgid "Xerox WorkCentre M118" msgstr "" -#: src/main/xmli18n-tmp.h:953 +#: src/main/xmli18n-tmp.h:1005 msgid "Compaq IJ1200" msgstr "" -#: src/main/xmli18n-tmp.h:954 +#: src/main/xmli18n-tmp.h:1006 msgid "Lexmark X73" msgstr "" -#: src/main/xmli18n-tmp.h:955 +#: src/main/xmli18n-tmp.h:1007 msgid "Lexmark Z42" msgstr "" -#: src/main/xmli18n-tmp.h:956 +#: src/main/xmli18n-tmp.h:1008 msgid "Lexmark Z43" msgstr "" -#: src/main/xmli18n-tmp.h:957 +#: src/main/xmli18n-tmp.h:1009 msgid "Lexmark Z52" msgstr "" -#: src/main/xmli18n-tmp.h:958 +#: src/main/xmli18n-tmp.h:1010 msgid "Lexmark Z53" msgstr "" -#: src/main/xmli18n-tmp.h:959 +#: src/main/xmli18n-tmp.h:1011 msgid "Olympus P-10" msgstr "" -#: src/main/xmli18n-tmp.h:960 +#: src/main/xmli18n-tmp.h:1012 msgid "Olympus P-11" msgstr "" -#: src/main/xmli18n-tmp.h:961 +#: src/main/xmli18n-tmp.h:1013 msgid "Olympus P-200" msgstr "" -#: src/main/xmli18n-tmp.h:962 +#: src/main/xmli18n-tmp.h:1014 msgid "Olympus P-300" msgstr "" -#: src/main/xmli18n-tmp.h:963 +#: src/main/xmli18n-tmp.h:1015 msgid "Olympus P-300E" msgstr "" -#: src/main/xmli18n-tmp.h:964 +#: src/main/xmli18n-tmp.h:1016 msgid "Olympus P-300U" msgstr "" -#: src/main/xmli18n-tmp.h:965 +#: src/main/xmli18n-tmp.h:1017 msgid "Olympus P-330E" msgstr "" -#: src/main/xmli18n-tmp.h:966 +#: src/main/xmli18n-tmp.h:1018 msgid "Olympus P-330NE" msgstr "" -#: src/main/xmli18n-tmp.h:967 +#: src/main/xmli18n-tmp.h:1019 msgid "Olympus P-400" msgstr "" -#: src/main/xmli18n-tmp.h:968 +#: src/main/xmli18n-tmp.h:1020 msgid "Olympus P-440" msgstr "" -#: src/main/xmli18n-tmp.h:969 +#: src/main/xmli18n-tmp.h:1021 msgid "Olympus P-S100" msgstr "" -#: src/main/xmli18n-tmp.h:970 +#: src/main/xmli18n-tmp.h:1022 msgid "Canon CP-10" msgstr "" -#: src/main/xmli18n-tmp.h:971 +#: src/main/xmli18n-tmp.h:1023 msgid "Canon CP-100" msgstr "" -#: src/main/xmli18n-tmp.h:972 +#: src/main/xmli18n-tmp.h:1024 msgid "Canon CP-200" msgstr "" -#: src/main/xmli18n-tmp.h:973 +#: src/main/xmli18n-tmp.h:1025 msgid "Canon CP-220" msgstr "" -#: src/main/xmli18n-tmp.h:974 +#: src/main/xmli18n-tmp.h:1026 msgid "Canon CP-300" msgstr "" -#: src/main/xmli18n-tmp.h:975 +#: src/main/xmli18n-tmp.h:1027 msgid "Canon CP-330" msgstr "" -#: src/main/xmli18n-tmp.h:976 +#: src/main/xmli18n-tmp.h:1028 msgid "Canon SELPHY-CP-400" msgstr "" -#: src/main/xmli18n-tmp.h:977 +#: src/main/xmli18n-tmp.h:1029 msgid "Canon SELPHY-CP-500" msgstr "" -#: src/main/xmli18n-tmp.h:978 +#: src/main/xmli18n-tmp.h:1030 msgid "Canon SELPHY-CP-510" msgstr "" -#: src/main/xmli18n-tmp.h:979 +#: src/main/xmli18n-tmp.h:1031 msgid "Canon SELPHY-CP-600" msgstr "" -#: src/main/xmli18n-tmp.h:980 +#: src/main/xmli18n-tmp.h:1032 msgid "Canon SELPHY-CP-710" msgstr "" -#: src/main/xmli18n-tmp.h:981 +#: src/main/xmli18n-tmp.h:1033 msgid "Canon SELPHY-CP-720" msgstr "" -#: src/main/xmli18n-tmp.h:982 -#, fuzzy +#: src/main/xmli18n-tmp.h:1034 msgid "Canon SELPHY-CP-730" -msgstr "Stylus C60" +msgstr "" -#: src/main/xmli18n-tmp.h:983 +#: src/main/xmli18n-tmp.h:1035 msgid "Canon SELPHY-CP-740" msgstr "" -#: src/main/xmli18n-tmp.h:984 -#, fuzzy +#: src/main/xmli18n-tmp.h:1036 msgid "Canon SELPHY-CP-750" -msgstr "Stylus C60" +msgstr "" -#: src/main/xmli18n-tmp.h:985 +#: src/main/xmli18n-tmp.h:1037 msgid "Canon SELPHY ES1" msgstr "" -#: src/main/xmli18n-tmp.h:986 +#: src/main/xmli18n-tmp.h:1038 msgid "Canon SELPHY ES2" msgstr "" -#: src/main/xmli18n-tmp.h:987 +#: src/main/xmli18n-tmp.h:1039 msgid "Canon SELPHY ES20" msgstr "" -#: src/main/xmli18n-tmp.h:988 +#: src/main/xmli18n-tmp.h:1040 msgid "Sony DPP-EX5" msgstr "" -#: src/main/xmli18n-tmp.h:989 +#: src/main/xmli18n-tmp.h:1041 msgid "Sony DPP-EX7" msgstr "" -#: src/main/xmli18n-tmp.h:990 +#: src/main/xmli18n-tmp.h:1042 msgid "Sony UP-DP10" msgstr "" -#: src/main/xmli18n-tmp.h:991 +#: src/main/xmli18n-tmp.h:1043 msgid "Sony UP-DR100" msgstr "" -#: src/main/xmli18n-tmp.h:992 +#: src/main/xmli18n-tmp.h:1044 msgid "Sony UP-DR150" msgstr "" -#: src/main/xmli18n-tmp.h:993 +#: src/main/xmli18n-tmp.h:1045 msgid "Fujifilm Printpix-CX-400" msgstr "" -#: src/main/xmli18n-tmp.h:994 +#: src/main/xmli18n-tmp.h:1046 msgid "Fujifilm Printpix-CX-550" msgstr "" -#: src/main/xmli18n-tmp.h:995 +#: src/main/xmli18n-tmp.h:1047 msgid "Fujifilm FinePix-NX-500" msgstr "" -#: src/main/xmli18n-tmp.h:996 +#: src/main/xmli18n-tmp.h:1048 msgid "Kodak Easyshare-Printer-Dock" msgstr "" -#: src/main/xmli18n-tmp.h:997 +#: src/main/xmli18n-tmp.h:1049 msgid "Shinko CHC-S9045" msgstr "" -#: src/main/xmli18n-tmp.h:998 +#: src/main/xmli18n-tmp.h:1050 msgid "RAW DATA 16 bit" msgstr "" -#: src/main/xmli18n-tmp.h:999 +#: src/main/xmli18n-tmp.h:1051 msgid "RAW DATA 8 bit" msgstr "" -#: src/gutenprintui/panel.c:274 src/gutenprintui2/panel.c:274 +#: src/gutenprintui2/curve.c:130 +#, fuzzy +msgid "Curve type" +msgstr "Negro" + +#: src/gutenprintui2/curve.c:131 +msgid "Is this curve linear, spline interpolated, or free-form" +msgstr "" + +#: src/gutenprintui2/curve.c:139 +msgid "Minimum X" +msgstr "" + +#: src/gutenprintui2/curve.c:140 +msgid "Minimum possible value for X" +msgstr "" + +#: src/gutenprintui2/curve.c:149 +msgid "Maximum X" +msgstr "" + +#: src/gutenprintui2/curve.c:150 +msgid "Maximum possible X value" +msgstr "" + +#: src/gutenprintui2/curve.c:159 +msgid "Minimum Y" +msgstr "" + +#: src/gutenprintui2/curve.c:160 +msgid "Minimum possible value for Y" +msgstr "" + +#: src/gutenprintui2/curve.c:169 +msgid "Maximum Y" +msgstr "" + +#: src/gutenprintui2/curve.c:170 +msgid "Maximum possible value for Y" +msgstr "" + +#: src/gutenprintui2/gammacurve.c:418 +msgid "_Gamma value" +msgstr "" + +#: src/gutenprintui2/panel.c:275 msgid "Inch" msgstr "Pulgada" -#: src/gutenprintui/panel.c:274 src/gutenprintui2/panel.c:274 +#: src/gutenprintui2/panel.c:275 msgid "Set the base unit of measurement to inches" msgstr "Seleccionar la unidad base de medida a pulgadas" -#: src/gutenprintui/panel.c:276 src/gutenprintui2/panel.c:276 +#: src/gutenprintui2/panel.c:277 msgid "cm" msgstr "cm" -#: src/gutenprintui/panel.c:276 src/gutenprintui2/panel.c:276 +#: src/gutenprintui2/panel.c:277 msgid "Set the base unit of measurement to centimetres" -msgstr "Seleccionar la unidad base de medida a pulgadas a centímetros" +msgstr "Seleccionar la unidad base de medida a pulgadas a centímetros" -#: src/gutenprintui/panel.c:278 src/gutenprintui2/panel.c:278 +#: src/gutenprintui2/panel.c:279 #, fuzzy msgid "Points" msgstr "Imprimir" -#: src/gutenprintui/panel.c:278 src/gutenprintui2/panel.c:278 +#: src/gutenprintui2/panel.c:279 #, fuzzy msgid "Set the base unit of measurement to points (1/72\")" msgstr "Seleccionar la unidad base de medida a pulgadas" -#: src/gutenprintui/panel.c:280 src/gutenprintui2/panel.c:280 +#: src/gutenprintui2/panel.c:281 msgid "mm" msgstr "" -#: src/gutenprintui/panel.c:280 src/gutenprintui2/panel.c:280 +#: src/gutenprintui2/panel.c:281 #, fuzzy msgid "Set the base unit of measurement to millimetres" -msgstr "Seleccionar la unidad base de medida a pulgadas a centímetros" +msgstr "Seleccionar la unidad base de medida a pulgadas a centímetros" -#: src/gutenprintui/panel.c:282 src/gutenprintui2/panel.c:282 +#: src/gutenprintui2/panel.c:283 msgid "Pica" msgstr "" -#: src/gutenprintui/panel.c:282 src/gutenprintui2/panel.c:282 +#: src/gutenprintui2/panel.c:283 #, fuzzy msgid "Set the base unit of measurement to picas (1/12\")" msgstr "Seleccionar la unidad base de medida a pulgadas" -#: src/gutenprintui/panel.c:289 src/gutenprintui2/panel.c:289 +#: src/gutenprintui2/panel.c:290 msgid "Color output" msgstr "Salida de color" -#: src/gutenprintui/panel.c:291 src/gutenprintui2/panel.c:291 +#: src/gutenprintui2/panel.c:292 msgid "Print in shades of gray using black ink" msgstr "Imprimir en sombras de gris usando tinta negra" -#: src/gutenprintui/panel.c:303 src/gutenprintui2/panel.c:303 +#: src/gutenprintui2/panel.c:304 #, fuzzy msgid "Standard Command" -msgstr "Estándar" +msgstr "Estándar" -#: src/gutenprintui/panel.c:303 src/gutenprintui2/panel.c:303 +#: src/gutenprintui2/panel.c:304 msgid "Use standard print command" msgstr "" -#: src/gutenprintui/panel.c:304 src/gutenprintui2/panel.c:304 +#: src/gutenprintui2/panel.c:305 #, fuzzy msgid "Custom Command" msgstr "Comando:" -#: src/gutenprintui/panel.c:304 src/gutenprintui2/panel.c:304 +#: src/gutenprintui2/panel.c:305 msgid "Use custom print command" msgstr "" -#: src/gutenprintui/panel.c:305 src/gutenprintui/plist.c:704 -#: src/gutenprintui/plist.c:787 src/gutenprintui2/panel.c:305 -#: src/gutenprintui2/plist.c:707 src/gutenprintui2/plist.c:790 +#: src/gutenprintui2/panel.c:306 src/gutenprintui2/plist.c:710 +#: src/gutenprintui2/plist.c:793 msgid "File" msgstr "Archivo" -#: src/gutenprintui/panel.c:305 src/gutenprintui2/panel.c:305 +#: src/gutenprintui2/panel.c:306 #, fuzzy msgid "Print to a file" -msgstr "¿Imprimir a un archivo?" +msgstr "¿Imprimir a un archivo?" -#: src/gutenprintui/panel.c:521 src/gutenprintui2/panel.c:521 +#: src/gutenprintui2/panel.c:522 msgid "Edit Curve..." msgstr "" -#: src/gutenprintui/panel.c:532 src/gutenprintui2/panel.c:532 +#: src/gutenprintui2/panel.c:533 #, fuzzy msgid "Set Default" -msgstr "Establecer por Omisión" +msgstr "Establecer por Omisión" -#: src/gutenprintui/panel.c:534 src/gutenprintui2/panel.c:534 +#: src/gutenprintui2/panel.c:535 msgid "Restore Previous" msgstr "" -#: src/gutenprintui/panel.c:536 src/gutenprintui/panel.c:1532 -#: src/gutenprintui/panel.c:1787 src/gutenprintui/panel.c:1819 -#: src/gutenprintui2/panel.c:536 src/gutenprintui2/panel.c:1533 -#: src/gutenprintui2/panel.c:1787 src/gutenprintui2/panel.c:1819 +#: src/gutenprintui2/panel.c:537 src/gutenprintui2/panel.c:1708 +#: src/gutenprintui2/panel.c:1962 src/gutenprintui2/panel.c:1994 msgid "OK" msgstr "Aceptar" -#: src/gutenprintui/panel.c:538 src/gutenprintui/panel.c:1197 -#: src/gutenprintui/panel.c:1534 src/gutenprintui/panel.c:1789 -#: src/gutenprintui2/panel.c:538 src/gutenprintui2/panel.c:1198 -#: src/gutenprintui2/panel.c:1535 src/gutenprintui2/panel.c:1789 +#: src/gutenprintui2/panel.c:539 src/gutenprintui2/panel.c:1373 +#: src/gutenprintui2/panel.c:1710 src/gutenprintui2/panel.c:1964 msgid "Cancel" msgstr "Cancelar" -#: src/gutenprintui/panel.c:1180 src/gutenprintui2/panel.c:1181 +#: src/gutenprintui2/panel.c:641 +#, fuzzy +msgid "Select File..." +msgstr "Conf. Impresora..." + +#: src/gutenprintui2/panel.c:1018 +msgid "Reset" +msgstr "" + +#: src/gutenprintui2/panel.c:1356 #, c-format msgid "%s -- Print v%s" msgstr "%s -- Imprimir v%s" -#: src/gutenprintui/panel.c:1189 src/gutenprintui2/panel.c:1190 +#: src/gutenprintui2/panel.c:1365 msgid "About" msgstr "Acerca de" -#: src/gutenprintui/panel.c:1191 src/gutenprintui2/panel.c:1192 +#: src/gutenprintui2/panel.c:1367 #, fuzzy msgid "" "Print and\n" "Save Settings" -msgstr "Configuración de la Impresora" +msgstr "Configuración de la Impresora" -#: src/gutenprintui/panel.c:1193 src/gutenprintui2/panel.c:1194 +#: src/gutenprintui2/panel.c:1369 #, fuzzy msgid "" "Save\n" "Settings" msgstr "Guardar Conf." -#: src/gutenprintui/panel.c:1195 src/gutenprintui2/panel.c:1196 +#: src/gutenprintui2/panel.c:1371 msgid "Print" msgstr "Imprimir" -#: src/gutenprintui/panel.c:1247 src/gutenprintui2/panel.c:1248 +#: src/gutenprintui2/panel.c:1423 msgid "Preview" msgstr "Previsualizar" -#: src/gutenprintui/panel.c:1272 src/gutenprintui2/panel.c:1273 +#: src/gutenprintui2/panel.c:1448 #, fuzzy msgid "" "Position the image on the page.\n" @@ -6727,215 +7155,209 @@ msgid "" "to its original position." msgstr "" "Posicione la imagen en la hoja.\n" -"Seleccione y arrastre con el primer botón para posicionar la imagen.\n" -"Seleccione y arrastre con el segundo botón para mover la imagen con\n" -"mayor precisión; cada unidad de movimiento mueve la imagen un punto\n" +"Seleccione y arrastre con el primer botón para posicionar la imagen.\n" +"Seleccione y arrastre con el segundo botón para mover la imagen con\n" +"mayor precisión; cada unidad de movimiento mueve la imagen un punto\n" "(1/72\")\n" -"Seleccione y arrastre con el tercer botón (el medio) para mover la\n" -"imagen en unidades del tamaño de la imagen.\n" +"Seleccione y arrastre con el tercer botón (el medio) para mover la\n" +"imagen en unidades del tamaño de la imagen.\n" "Sosteniendo la tecla 'shift' mientras se hace click y arrastra restringe\n" "el movimiento de la imagen a los ejes vertical y horizontal solamente.\n" -"Si presiona otro botón mientras arrastra el ratón, la imagen volverá a\n" -"posición original\n" +"Si presiona otro botón mientras arrastra el ratón, la imagen volverá a\n" +"posición original\n" -#: src/gutenprintui/panel.c:1319 src/gutenprintui2/panel.c:1320 +#: src/gutenprintui2/panel.c:1495 #, fuzzy msgid "Paper Size" -msgstr "Tamaño" +msgstr "Tamaño" -#: src/gutenprintui/panel.c:1342 src/gutenprintui2/panel.c:1343 +#: src/gutenprintui2/panel.c:1518 msgid "Show All Paper Sizes" msgstr "" -#: src/gutenprintui/panel.c:1358 src/gutenprintui2/panel.c:1359 +#: src/gutenprintui2/panel.c:1534 msgid "Dimensions:" msgstr "Dimensiones:" -#: src/gutenprintui/panel.c:1363 src/gutenprintui/panel.c:2063 -#: src/gutenprintui2/panel.c:1364 src/gutenprintui2/panel.c:2063 +#: src/gutenprintui2/panel.c:1539 src/gutenprintui2/panel.c:2238 msgid "Width:" msgstr "Ancho:" -#: src/gutenprintui/panel.c:1364 src/gutenprintui2/panel.c:1365 +#: src/gutenprintui2/panel.c:1540 msgid "Width of the paper that you wish to print to" msgstr "Ancho del papel al que desea imprimir" -#: src/gutenprintui/panel.c:1368 src/gutenprintui/panel.c:2065 -#: src/gutenprintui2/panel.c:1369 src/gutenprintui2/panel.c:2065 +#: src/gutenprintui2/panel.c:1544 src/gutenprintui2/panel.c:2240 msgid "Height:" msgstr "Altura:" -#: src/gutenprintui/panel.c:1369 src/gutenprintui2/panel.c:1370 +#: src/gutenprintui2/panel.c:1545 msgid "Height of the paper that you wish to print to" msgstr "Altura del papel al que desea imprimir" -#: src/gutenprintui/panel.c:1374 src/gutenprintui2/panel.c:1375 +#: src/gutenprintui2/panel.c:1550 #, fuzzy msgid "Automatic Paper Size" -msgstr "Tamaño" +msgstr "Tamaño" -#: src/gutenprintui/panel.c:1391 src/gutenprintui2/panel.c:1392 +#: src/gutenprintui2/panel.c:1567 msgid "Number of Copies" msgstr "" -#: src/gutenprintui/panel.c:1403 src/gutenprintui2/panel.c:1404 +#: src/gutenprintui2/panel.c:1579 msgid "Select the number of copies to print; a value between 1 and 100" msgstr "" -#: src/gutenprintui/panel.c:1435 src/gutenprintui2/panel.c:1436 +#: src/gutenprintui2/panel.c:1611 #, fuzzy msgid "Image Position" -msgstr "Posición" +msgstr "Posición" -#: src/gutenprintui/panel.c:1452 src/gutenprintui2/panel.c:1453 +#: src/gutenprintui2/panel.c:1628 msgid "Auto" -msgstr "Automático" +msgstr "Automático" -#: src/gutenprintui/panel.c:1454 src/gutenprintui2/panel.c:1455 +#: src/gutenprintui2/panel.c:1630 msgid "Portrait" msgstr "Vertical" -#: src/gutenprintui/panel.c:1456 src/gutenprintui2/panel.c:1457 +#: src/gutenprintui2/panel.c:1632 msgid "Landscape" msgstr "Apaisado" -#: src/gutenprintui/panel.c:1458 src/gutenprintui2/panel.c:1459 +#: src/gutenprintui2/panel.c:1634 msgid "Upside down" msgstr "Invertido" -#: src/gutenprintui/panel.c:1460 src/gutenprintui2/panel.c:1461 +#: src/gutenprintui2/panel.c:1636 msgid "Seascape" msgstr "Horizontal invertido" -#: src/gutenprintui/panel.c:1464 src/gutenprintui2/panel.c:1465 +#: src/gutenprintui2/panel.c:1640 msgid "" "Select the orientation: portrait, landscape, upside down, or seascape " "(upside down landscape)" msgstr "" -"Seleccionar la orientación: vertical, horizontal, invertido, ú horizontal " +"Seleccionar la orientación: vertical, horizontal, invertido, ú horizontal " "invertido " -#: src/gutenprintui/panel.c:1466 src/gutenprintui2/panel.c:1467 +#: src/gutenprintui2/panel.c:1642 msgid "Orientation:" -msgstr "Orientación:" +msgstr "Orientación:" -#: src/gutenprintui/panel.c:1477 src/gutenprintui2/panel.c:1478 +#: src/gutenprintui2/panel.c:1653 msgid "Left:" msgstr "Izquierda:" -#: src/gutenprintui/panel.c:1478 src/gutenprintui2/panel.c:1479 +#: src/gutenprintui2/panel.c:1654 msgid "Distance from the left of the paper to the image" msgstr "Distancia desde el borde izquierdo del papel al borde de la imagen" -#: src/gutenprintui/panel.c:1481 src/gutenprintui/panel.c:1485 -#: src/gutenprintui2/panel.c:1482 src/gutenprintui2/panel.c:1486 +#: src/gutenprintui2/panel.c:1657 src/gutenprintui2/panel.c:1661 msgid "Right:" msgstr "Derecha:" -#: src/gutenprintui/panel.c:1482 src/gutenprintui2/panel.c:1483 +#: src/gutenprintui2/panel.c:1658 msgid "Distance from the left of the paper to the right of the image" msgstr "" "Distancia desde el borde izquierdo del papel al borde derecho de la imagen" -#: src/gutenprintui/panel.c:1486 src/gutenprintui2/panel.c:1487 +#: src/gutenprintui2/panel.c:1662 msgid "Distance from the right of the paper to the image" msgstr "Distancia desde el borde derecho del papel al borde de la imagen" -#: src/gutenprintui/panel.c:1488 src/gutenprintui2/panel.c:1489 +#: src/gutenprintui2/panel.c:1664 msgid "Top:" msgstr "Arriba:" -#: src/gutenprintui/panel.c:1489 src/gutenprintui2/panel.c:1490 +#: src/gutenprintui2/panel.c:1665 msgid "Distance from the top of the paper to the image" msgstr "Distancia desde el borde superior del papel al borde de la imagen" -#: src/gutenprintui/panel.c:1492 src/gutenprintui/panel.c:1496 -#: src/gutenprintui2/panel.c:1493 src/gutenprintui2/panel.c:1497 +#: src/gutenprintui2/panel.c:1668 src/gutenprintui2/panel.c:1672 msgid "Bottom:" msgstr "Abajo:" -#: src/gutenprintui/panel.c:1493 src/gutenprintui2/panel.c:1494 +#: src/gutenprintui2/panel.c:1669 #, fuzzy msgid "Distance from the top of the paper to bottom of the image" msgstr "" "Distancia desde el borde superior del papel al borde inferior de la imagen" -#: src/gutenprintui/panel.c:1497 src/gutenprintui2/panel.c:1498 +#: src/gutenprintui2/panel.c:1673 msgid "Distance from the bottom of the paper to the image" msgstr "Distancia desde el borde inferior del papel al borde de la imagen" -#: src/gutenprintui/panel.c:1507 src/gutenprintui2/panel.c:1508 +#: src/gutenprintui2/panel.c:1683 msgid "Center:" msgstr "Centrado: " -#: src/gutenprintui/panel.c:1510 src/gutenprintui2/panel.c:1511 +#: src/gutenprintui2/panel.c:1686 #, fuzzy msgid "Horizontal" msgstr "Horizontal" -#: src/gutenprintui/panel.c:1511 src/gutenprintui2/panel.c:1512 +#: src/gutenprintui2/panel.c:1687 msgid "Center the image horizontally on the paper" msgstr "Centrar la imagen horizontalmente en el papel" -#: src/gutenprintui/panel.c:1513 src/gutenprintui2/panel.c:1514 +#: src/gutenprintui2/panel.c:1689 msgid "Both" msgstr "Ambos" -#: src/gutenprintui/panel.c:1514 src/gutenprintui2/panel.c:1515 +#: src/gutenprintui2/panel.c:1690 msgid "Center the image on the paper" msgstr "Centrar la imagen en el papel" -#: src/gutenprintui/panel.c:1516 src/gutenprintui2/panel.c:1517 +#: src/gutenprintui2/panel.c:1692 #, fuzzy msgid "Vertical" msgstr "Vertical" -#: src/gutenprintui/panel.c:1517 src/gutenprintui2/panel.c:1518 +#: src/gutenprintui2/panel.c:1693 msgid "Center the image vertically on the paper" msgstr "Centrar la imagen verticalmente en el papel" -#: src/gutenprintui/panel.c:1530 src/gutenprintui2/panel.c:1531 +#: src/gutenprintui2/panel.c:1706 msgid "Setup Printer" -msgstr "Configuración de la Impresora" +msgstr "Configuración de la Impresora" -#: src/gutenprintui/panel.c:1555 src/gutenprintui2/panel.c:1555 +#: src/gutenprintui2/panel.c:1730 #, fuzzy msgid "Printer Make:" msgstr "Nombre de la Impresora:" -#: src/gutenprintui/panel.c:1566 src/gutenprintui2/panel.c:1566 +#: src/gutenprintui2/panel.c:1741 #, fuzzy msgid "Select the make of your printer" msgstr "Seleccionar su madelo de impresora" -#: src/gutenprintui/panel.c:1584 src/gutenprintui/panel.c:1672 -#: src/gutenprintui/panel.c:1890 src/gutenprintui2/panel.c:1584 -#: src/gutenprintui2/panel.c:1672 src/gutenprintui2/panel.c:1890 +#: src/gutenprintui2/panel.c:1759 src/gutenprintui2/panel.c:1847 +#: src/gutenprintui2/panel.c:2065 msgid "Printer Model:" msgstr "Modelo de Impresora:" -#: src/gutenprintui/panel.c:1595 src/gutenprintui2/panel.c:1595 +#: src/gutenprintui2/panel.c:1770 msgid "Select your printer model" msgstr "Seleccionar su madelo de impresora" -#: src/gutenprintui/panel.c:1643 src/gutenprintui2/panel.c:1643 +#: src/gutenprintui2/panel.c:1818 msgid "PPD File:" msgstr "Archivo PPD:" -#: src/gutenprintui/panel.c:1659 src/gutenprintui2/panel.c:1659 +#: src/gutenprintui2/panel.c:1834 msgid "Enter the correct PPD filename for your printer" msgstr "Ingrese el nombre de archivo PPD correcto para su impresora" -#: src/gutenprintui/panel.c:1661 src/gutenprintui/panel.c:1741 -#: src/gutenprintui2/panel.c:1661 src/gutenprintui2/panel.c:1741 +#: src/gutenprintui2/panel.c:1836 src/gutenprintui2/panel.c:1916 msgid "Browse" msgstr "Explorar" -#: src/gutenprintui/panel.c:1668 src/gutenprintui2/panel.c:1668 +#: src/gutenprintui2/panel.c:1843 msgid "Choose the correct PPD filename for your printer" msgstr "Elija el nombre de archivo PPD correcto para su impresora" -#: src/gutenprintui/panel.c:1710 src/gutenprintui2/panel.c:1710 +#: src/gutenprintui2/panel.c:1885 #, fuzzy msgid "" "Select the name of the output queue (not the type, or model, of printer) " @@ -6944,58 +7366,57 @@ msgstr "" "Seleccionar el nombre de la impresora (no el tipo, o modelo de impresora) al " "que desea imprimir" -#: src/gutenprintui/panel.c:1712 src/gutenprintui2/panel.c:1712 +#: src/gutenprintui2/panel.c:1887 #, fuzzy msgid "Printer Queue:" msgstr "Nombre de la Impresora:" -#: src/gutenprintui/panel.c:1728 src/gutenprintui2/panel.c:1728 +#: src/gutenprintui2/panel.c:1903 #, fuzzy msgid "Enter the correct command to print to your printer. " msgstr "Ingrese el nombre de archivo PPD correcto para su impresora" -#: src/gutenprintui/panel.c:1739 src/gutenprintui2/panel.c:1739 +#: src/gutenprintui2/panel.c:1914 msgid "Enter the file to print to. " msgstr "" -#: src/gutenprintui/panel.c:1747 src/gutenprintui2/panel.c:1747 +#: src/gutenprintui2/panel.c:1922 #, fuzzy msgid "File to print to" -msgstr "prueba de impresión" +msgstr "prueba de impresión" -#: src/gutenprintui/panel.c:1755 src/gutenprintui2/panel.c:1755 +#: src/gutenprintui2/panel.c:1930 #, fuzzy msgid "Print To File" -msgstr "¿Imprimir a un archivo?" +msgstr "¿Imprimir a un archivo?" -#: src/gutenprintui/panel.c:1785 src/gutenprintui2/panel.c:1785 +#: src/gutenprintui2/panel.c:1960 msgid "Define New Printer" msgstr "Definir Nueva Impresora" -#: src/gutenprintui/panel.c:1803 src/gutenprintui/panel.c:1887 -#: src/gutenprintui2/panel.c:1803 src/gutenprintui2/panel.c:1887 +#: src/gutenprintui2/panel.c:1978 src/gutenprintui2/panel.c:2062 msgid "Printer Name:" msgstr "Nombre de la Impresora:" -#: src/gutenprintui/panel.c:1807 src/gutenprintui2/panel.c:1807 +#: src/gutenprintui2/panel.c:1982 msgid "Enter the name you wish to give this logical printer" -msgstr "Ingrese el nombre que desea dar a ésta impresora lógica" +msgstr "Ingrese el nombre que desea dar a ésta impresora lógica" -#: src/gutenprintui/panel.c:1817 src/gutenprintui2/panel.c:1817 +#: src/gutenprintui2/panel.c:1992 #, fuzzy msgid "About Gutenprint " msgstr "Acerca de Gimp-Print..." -#: src/gutenprintui/panel.c:1824 src/gutenprintui2/panel.c:1824 +#: src/gutenprintui2/panel.c:1999 #, fuzzy msgid "Gutenprint Version " -msgstr "Versión de Gimp-Print " +msgstr "Versión de Gimp-Print " -#: src/gutenprintui/panel.c:1872 src/gutenprintui2/panel.c:1872 +#: src/gutenprintui2/panel.c:2047 msgid "Printer Settings" -msgstr "Configuración de la Impresora" +msgstr "Configuración de la Impresora" -#: src/gutenprintui/panel.c:1885 src/gutenprintui2/panel.c:1885 +#: src/gutenprintui2/panel.c:2060 msgid "" "Select the name of the printer (not the type, or model, of printer) that you " "wish to print to" @@ -7003,89 +7424,89 @@ msgstr "" "Seleccionar el nombre de la impresora (no el tipo, o modelo de impresora) al " "que desea imprimir" -#: src/gutenprintui/panel.c:1902 src/gutenprintui2/panel.c:1902 +#: src/gutenprintui2/panel.c:2077 msgid "Setup Printer..." msgstr "Conf. Impresora..." -#: src/gutenprintui/panel.c:1904 src/gutenprintui2/panel.c:1904 +#: src/gutenprintui2/panel.c:2079 msgid "" "Choose the printer model, PPD file, and command that is used to print to " "this printer" msgstr "" "Elegir el modelo de impresora, archivo PPD, y comando que se usa para " -"imprimir a ésta impresora" +"imprimir a ésta impresora" -#: src/gutenprintui/panel.c:1917 src/gutenprintui2/panel.c:1917 +#: src/gutenprintui2/panel.c:2092 msgid "New Printer..." msgstr "Impresora Nueva..." -#: src/gutenprintui/panel.c:1918 src/gutenprintui2/panel.c:1918 +#: src/gutenprintui2/panel.c:2093 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 "" -"Definir una nueva impresora lógica. Ésta puede ser usada para nombrar una " -"colección de configuraciones que usted desea recordar para uso futuro." +"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:1948 src/gutenprintui2/panel.c:1948 +#: src/gutenprintui2/panel.c:2123 #, fuzzy msgid "Set Printer Option Defaults" -msgstr "Establecer por Omisión" +msgstr "Establecer por Omisión" -#: src/gutenprintui/panel.c:1949 src/gutenprintui2/panel.c:1949 +#: src/gutenprintui2/panel.c:2124 msgid "Set all printer options to their defaults" msgstr "" -#: src/gutenprintui/panel.c:1972 src/gutenprintui2/panel.c:1972 +#: src/gutenprintui2/panel.c:2147 #, fuzzy msgid "Image Size" -msgstr "Tamaño" +msgstr "Tamaño" -#: src/gutenprintui/panel.c:1997 src/gutenprintui2/panel.c:1997 +#: src/gutenprintui2/panel.c:2172 msgid "Scaling:" msgstr "Escala:" -#: src/gutenprintui/panel.c:2001 src/gutenprintui2/panel.c:2001 +#: src/gutenprintui2/panel.c:2176 msgid "Set the scale (size) of the image" -msgstr "Establecer la escala (el tamaño) de la imagen" +msgstr "Establecer la escala (el tamaño) de la imagen" -#: src/gutenprintui/panel.c:2023 src/gutenprintui2/panel.c:2023 +#: src/gutenprintui2/panel.c:2198 msgid "Scale by:" msgstr "Escalar por:" -#: src/gutenprintui/panel.c:2028 src/gutenprintui2/panel.c:2028 +#: src/gutenprintui2/panel.c:2203 msgid "" "Select whether scaling is measured as percent of available page size or " "number of output dots per inch" 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." +"disponible o número de puntos por pulgada en la salida." -#: src/gutenprintui/panel.c:2031 src/gutenprintui2/panel.c:2031 +#: src/gutenprintui2/panel.c:2206 msgid "Percent" msgstr "Porcentaje" -#: src/gutenprintui/panel.c:2036 src/gutenprintui2/panel.c:2036 +#: src/gutenprintui2/panel.c:2211 msgid "Scale the print to the size of the page" -msgstr "Redimensionar la impresión al tamaño de la página" +msgstr "Redimensionar la impresión al tamaño de la página" -#: src/gutenprintui/panel.c:2040 src/gutenprintui2/panel.c:2040 +#: src/gutenprintui2/panel.c:2215 msgid "PPI" msgstr "PPP" -#: src/gutenprintui/panel.c:2045 src/gutenprintui2/panel.c:2045 +#: src/gutenprintui2/panel.c:2220 msgid "Scale the print to the number of dots per inch" -msgstr "Redimensionar la impresión al tamaño de los puntos por pulgada" +msgstr "Redimensionar la impresión al tamaño de los puntos por pulgada" -#: src/gutenprintui/panel.c:2063 src/gutenprintui2/panel.c:2063 +#: src/gutenprintui2/panel.c:2238 msgid "Set the width of the print" -msgstr "Establecer el ancho de la impresión" +msgstr "Establecer el ancho de la impresión" -#: src/gutenprintui/panel.c:2065 src/gutenprintui2/panel.c:2065 +#: src/gutenprintui2/panel.c:2240 msgid "Set the height of the print" -msgstr "Establecer el alto de la impresión" +msgstr "Establecer el alto de la impresión" -#: src/gutenprintui/panel.c:2071 src/gutenprintui2/panel.c:2071 +#: src/gutenprintui2/panel.c:2246 msgid "" "Use Original\n" "Image Size" @@ -7093,160 +7514,114 @@ msgstr "" "Usar Medida Orig.\n" "de la Imagen" -#: src/gutenprintui/panel.c:2077 src/gutenprintui2/panel.c:2077 +#: src/gutenprintui2/panel.c:2252 msgid "Set the print size to the size of the image" -msgstr "Establecer la medida de impresión a la medida de la imagen" +msgstr "Establecer la medida de impresión a la medida de la imagen" -#: src/gutenprintui/panel.c:2100 src/gutenprintui2/panel.c:2101 +#: src/gutenprintui2/panel.c:2276 msgid "Print Color Adjust" -msgstr "Ajuste de Impresión en Color" +msgstr "Ajuste de Impresión en Color" -#: src/gutenprintui/panel.c:2103 src/gutenprintui2/panel.c:2104 +#: src/gutenprintui2/panel.c:2279 msgid "Set Defaults" -msgstr "Establecer por Omisión" +msgstr "Establecer por Omisión" -#: src/gutenprintui/panel.c:2105 src/gutenprintui2/panel.c:2106 +#: src/gutenprintui2/panel.c:2281 msgid "Close" msgstr "Cerrar" -#: src/gutenprintui/panel.c:2134 src/gutenprintui2/panel.c:2135 +#: src/gutenprintui2/panel.c:2310 msgid "Image preview" msgstr "Vista previa de imagen" -#: src/gutenprintui/panel.c:2148 src/gutenprintui2/panel.c:2149 +#: src/gutenprintui2/panel.c:2324 msgid "View Output Channels:" msgstr "" -#: src/gutenprintui/panel.c:2234 src/gutenprintui2/panel.c:2240 +#: src/gutenprintui2/panel.c:2415 #, fuzzy msgid "Output" msgstr "Tipo de salida:" -#: src/gutenprintui/panel.c:2262 src/gutenprintui2/panel.c:2268 +#: src/gutenprintui2/panel.c:2443 msgid "Output Type:" msgstr "Tipo de salida:" -#: src/gutenprintui/panel.c:2266 src/gutenprintui2/panel.c:2272 +#: src/gutenprintui2/panel.c:2447 msgid "Select the desired output type" msgstr "Seleccionar el tipo de salida deseado" -#: src/gutenprintui/panel.c:2287 src/gutenprintui2/panel.c:2293 +#: src/gutenprintui2/panel.c:2468 msgid "Adjust Output..." msgstr "Ajustar Salida..." -#: src/gutenprintui/panel.c:2296 src/gutenprintui2/panel.c:2302 +#: src/gutenprintui2/panel.c:2477 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:2314 src/gutenprintui2/panel.c:2321 +#: src/gutenprintui2/panel.c:2496 #, fuzzy msgid "Size Units:" msgstr "Unidades:" -#: src/gutenprintui/panel.c:2317 src/gutenprintui2/panel.c:2324 +#: src/gutenprintui2/panel.c:2499 #, fuzzy msgid " " msgstr "> " -#: src/gutenprintui/panel.c:2341 src/gutenprintui2/panel.c:2348 +#: src/gutenprintui2/panel.c:2523 msgid "Units:" msgstr "Unidades:" -#: src/gutenprintui/panel.c:2346 src/gutenprintui2/panel.c:2353 +#: src/gutenprintui2/panel.c:2528 msgid "Select the base unit of measurement for printing" msgstr "Seleccionar la unidad base de medida para imprimir" -#: src/gutenprintui/plist.c:90 src/gutenprintui/plist.c:99 -#: src/gutenprintui2/plist.c:89 src/gutenprintui2/plist.c:98 +#: src/gutenprintui2/plist.c:92 src/gutenprintui2/plist.c:101 msgid "System V lp" msgstr "" -#: src/gutenprintui/plist.c:96 src/gutenprintui2/plist.c:95 +#: src/gutenprintui2/plist.c:98 msgid "CUPS" msgstr "" -#: src/gutenprintui/plist.c:102 src/gutenprintui2/plist.c:101 +#: src/gutenprintui2/plist.c:104 msgid "Berkeley lpd (/etc/lpc)" msgstr "" -#: src/gutenprintui/plist.c:105 src/gutenprintui2/plist.c:104 +#: src/gutenprintui2/plist.c:107 msgid "Berkeley lpd (/usr/bsd/lpc)" msgstr "" -#: src/gutenprintui/plist.c:108 src/gutenprintui2/plist.c:107 +#: src/gutenprintui2/plist.c:110 msgid "Berkeley lpd (/usr/etc/lpc" msgstr "" -#: src/gutenprintui/plist.c:111 src/gutenprintui2/plist.c:110 +#: src/gutenprintui2/plist.c:113 msgid "Berkeley lpd (/usr/libexec/lpc)" msgstr "" -#: src/gutenprintui/plist.c:114 src/gutenprintui2/plist.c:113 +#: src/gutenprintui2/plist.c:116 msgid "Berkeley lpd (/usr/sbin/lpc)" msgstr "" -#: src/gutenprintui/plist.c:1043 src/gutenprintui2/plist.c:1057 +#: src/gutenprintui2/plist.c:1060 #, fuzzy msgid "Printer" msgstr "Imprimir" -#: src/gutenprintui/plist.c:1230 src/gutenprintui2/plist.c:1250 +#: src/gutenprintui2/plist.c:1253 #, fuzzy msgid "(Default Printer)" -msgstr "Configuración de la Impresora" - -#: src/gutenprintui2/curve.c:130 -#, fuzzy -msgid "Curve type" -msgstr "Negro" - -#: src/gutenprintui2/curve.c:131 -msgid "Is this curve linear, spline interpolated, or free-form" -msgstr "" - -#: src/gutenprintui2/curve.c:139 -msgid "Minimum X" -msgstr "" - -#: src/gutenprintui2/curve.c:140 -msgid "Minimum possible value for X" -msgstr "" - -#: src/gutenprintui2/curve.c:149 -msgid "Maximum X" -msgstr "" - -#: src/gutenprintui2/curve.c:150 -msgid "Maximum possible X value" -msgstr "" - -#: src/gutenprintui2/curve.c:159 -msgid "Minimum Y" -msgstr "" - -#: src/gutenprintui2/curve.c:160 -msgid "Minimum possible value for Y" -msgstr "" - -#: src/gutenprintui2/curve.c:169 -msgid "Maximum Y" -msgstr "" - -#: src/gutenprintui2/curve.c:170 -msgid "Maximum possible value for Y" -msgstr "" - -#: src/gutenprintui2/gammacurve.c:418 -msgid "_Gamma value" -msgstr "" +msgstr "Configuración de la Impresora" #: src/cups/genppd.c:145 #, fuzzy msgid "Printer Features" -msgstr "Configuración de la Impresora" +msgstr "Configuración de la Impresora" #: src/cups/genppd.c:146 #, fuzzy @@ -7285,48 +7660,48 @@ msgstr "" #. 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:1058 +#: src/cups/genppd.c:1064 msgid "English" msgstr "Spanish" #. TRANSLATORS: Specify PPD translation encoding e.g. ISOLatin1 -#: src/cups/genppd.c:1060 +#: src/cups/genppd.c:1066 msgid "ISOLatin1" msgstr "ISOLatin1" -#: src/cups/genppd.c:1641 +#: src/cups/genppd.c:1647 msgid "2-Sided Printing" msgstr "" -#: src/cups/genppd.c:1665 +#: src/cups/genppd.c:1671 msgid "Shrink Page If Necessary to Fit Borders" msgstr "" -#: src/cups/genppd.c:1669 +#: src/cups/genppd.c:1675 msgid "Shrink (print the whole page)" msgstr "" -#: src/cups/genppd.c:1670 +#: src/cups/genppd.c:1676 msgid "Crop (preserve dimensions)" msgstr "" -#: src/cups/genppd.c:1671 +#: src/cups/genppd.c:1677 msgid "Expand (use maximum page area)" msgstr "" -#: src/cups/genppd.c:1756 +#: src/cups/genppd.c:1762 msgid "No" msgstr "" -#: src/cups/genppd.c:1758 +#: src/cups/genppd.c:1764 msgid "Yes" msgstr "" -#: src/cups/genppd.c:1795 src/cups/genppd.c:1857 +#: src/cups/genppd.c:1801 src/cups/genppd.c:1863 msgid "Value" msgstr "" -#: src/cups/genppd.c:1800 +#: src/cups/genppd.c:1806 msgid "Fine Adjustment" msgstr "" @@ -7354,18 +7729,18 @@ msgid "" "Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.\n" msgstr "" "Copyright 2000 Robert Krawitz (rlk@alum.mit.edu)\n" -"Éste programa es software libre, usted puede redistribuirlo y/o modificarlo\n" -"bajo los términos de la Licencia General Pública GNU tal como se la publica\n" -"por la Fundación de Software Libre; o la versión 2 de la Licencia, o (a su\n" -"opción) cualquier versión posterior.\n" +"Éste programa es software libre, usted puede redistribuirlo y/o modificarlo\n" +"bajo los términos de la Licencia General Pública GNU tal como se la publica\n" +"por la Fundación de Software Libre; o la versión 2 de la Licencia, o (a su\n" +"opción) cualquier versión posterior.\n" "\n" -"Éste programa se distribuye con el deseo de que sea útil, pero SIN NINGUNA\n" -"GARANTÃA; aún sin la garantía implícita de MERCANTIBILIDAD o AJUSTE PARA UN\n" -"PROPÓSITO PARTICULAR. Vea la Licencia General Pública GNU para más " +"Éste programa se distribuye con el deseo de que sea útil, pero SIN NINGUNA\n" +"GARANTÍA; aún sin la garantía implícita de MERCANTIBILIDAD o AJUSTE PARA UN\n" +"PROPÓSITO PARTICULAR. Vea la Licencia General Pública GNU para más " "detalles.\n" "\n" -"Usted debe haber recibido una copia de la Licencia General Pública GNU\n" -"junto con éste programa; si no, escriba a la Fundación de Software\n" +"Usted debe haber recibido una copia de la Licencia General Pública GNU\n" +"junto con éste programa; si no, escriba a la Fundación de Software\n" "Libre, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307\n" #: src/escputil/escputil.c:119 @@ -7421,44 +7796,44 @@ msgstr "" " escputil --ink-level --new --raw-device /dev/lp0\n" "\n" " Comandos:\n" -" -c|--clean-head Limpia el cabezal de impresión\n" -" -n|--nozzle-check Imprime un patrón de prueba de toberas.\n" -" Toberas sucias o tapadas se mostrarán como vacíos " +" -c|--clean-head Limpia el cabezal de impresión\n" +" -n|--nozzle-check Imprime un patrón de prueba de toberas.\n" +" Toberas sucias o tapadas se mostrarán como vacíos " "en\n" -" el patrón. Si usted ve algún vacío, deberá limpiar\n" -" el cabezal de impresión.\n" -" -a|--align-head Alinear el cabezal de impresión. CUIDADO: El mal uso\n" -" de ésta utilidad puede resultar en una calidad " +" el patrón. Si usted ve algún vacío, deberá limpiar\n" +" el cabezal de impresión.\n" +" -a|--align-head Alinear el cabezal de impresión. CUIDADO: El mal uso\n" +" de ésta utilidad puede resultar en una calidad " "pobre\n" -" de impresión y/o daño a la impresora.\n" -" -o|--align-color Alinear el cabezal de impresión color (Stylus Color\n" -" 480 y 580 solamente). CUIDADO:El mal uso de ésta\n" +" de impresión y/o daño a la impresora.\n" +" -o|--align-color Alinear el cabezal de impresión color (Stylus Color\n" +" 480 y 580 solamente). CUIDADO:El mal uso de ésta\n" " \t\tutilidad puede resultar en una calidad pobre de\n" -"\t \timpresión y/o daño a la impresora.\n" +"\t \timpresión y/o daño a la impresora.\n" " -s|--status Recoger el status de la impresora.\n" -" -i|--ink-level Obtener el nivel de tinta de la impresora. Ésto\n" +" -i|--ink-level Obtener el nivel de tinta de la impresora. Ésto\n" " requiere acceso de lectura/escritura al dispositivo\n" -"\t\t crudo de impresión.\n" -" -d|--identify Consultar la impresora por información de marca y\n" -" modelo. Ésto requiere acceso de lectura/escritura " +"\t\t crudo de impresión.\n" +" -d|--identify Consultar la impresora por información de marca y\n" +" modelo. Ésto requiere acceso de lectura/escritura " "al\n" -"\t\t\tdispositivo crudo de impresión.\n" -" -l|--license Mostrar los términos de la licencia/garantía de éste\n" +"\t\t\tdispositivo crudo de impresión.\n" +" -l|--license Mostrar los términos de la licencia/garantía de éste\n" " \t\tprograma\n" " -M|--list-models Listar los modelos de impresora disponibles.\n" -" -h|--help Imprimir éste mensaje de ayuda.\n" +" -h|--help Imprimir éste mensaje de ayuda.\n" " Opciones:\n" -" -P|--printer-name Especifica el nombre de la cola de impresión en la\n" +" -P|--printer-name Especifica el nombre de la cola de impresión en la\n" "\t\t\tque se opera. Por defecto es la impresora del\n" "\t\t\tsistema.\n" " -r|--raw-device Especifica el nombre del dispositivo a escribir\n" -"\t\t\tdirectamente en vez de mandarlo a través de la cola\n" -" de impresión.\n" +"\t\t\tdirectamente en vez de mandarlo a través de la cola\n" +" de impresión.\n" " -u|--new La impresora es de nuevo modelo (Stylus Color 740 o\n" -" más nueva).\n" +" más nueva).\n" " -q|--quiet Suprimir carteles.\n" " -m|--model Especificar el modelo preciso de impresora para\n" -"\t\t\talineación de cabezal.\n" +"\t\t\talineación de cabezal.\n" #: src/escputil/escputil.c:162 #, fuzzy @@ -7512,51 +7887,51 @@ msgstr "" " escputil -i -u -r /dev/lp0\n" "\n" " Comandos:\n" -" -c Limpia el cabezal de impresión.\n" -" -n Imprime un patrón de prueba de toberas.\n" -" Toberas sucias o tapadas se mostrarán como vacíos en\n" -" el patrón. Si usted ve algún vacío, deberá limpiar\n" -" el cabezal de impresión.\n" -" -a Alinear el cabezal de impresión. CUIDADO: El mal uso\n" -" de ésta utilidad puede resultar en una calidad pobre\n" -" de impresión y/o daño a la impresora.\n" -" -o Alinear el cabezal de impresión color (Stylus Color\n" -" 480 y 580 solamente). CUIDADO:El mal uso de ésta\n" +" -c Limpia el cabezal de impresión.\n" +" -n Imprime un patrón de prueba de toberas.\n" +" Toberas sucias o tapadas se mostrarán como vacíos en\n" +" el patrón. Si usted ve algún vacío, deberá limpiar\n" +" el cabezal de impresión.\n" +" -a Alinear el cabezal de impresión. CUIDADO: El mal uso\n" +" de ésta utilidad puede resultar en una calidad pobre\n" +" de impresión y/o daño a la impresora.\n" +" -o Alinear el cabezal de impresión color (Stylus Color\n" +" 480 y 580 solamente). CUIDADO:El mal uso de ésta\n" " utilidad puede resultar en una calidad pobre de\n" -"\t impresión y/o daño a la impresora.\n" +"\t impresión y/o daño a la impresora.\n" " -s Recoger el status de la impresora.\n" -" -i Obtener el nivel de tinta de la impresora. Ésto\n" +" -i Obtener el nivel de tinta de la impresora. Ésto\n" " requiere acceso de lectura/escritura al dispositivo\n" -"\t crudo de impresión.\n" -" -d Consultar la impresora por información de marca y\n" -" modelo. Ésto requiere acceso de lectura/escritura al\n" -"\t dispositivo crudo de impresión.\n" -" -l Mostrar los términos de la licencia/garantía de éste\n" +"\t crudo de impresión.\n" +" -d Consultar la impresora por información de marca y\n" +" modelo. Ésto requiere acceso de lectura/escritura al\n" +"\t dispositivo crudo de impresión.\n" +" -l Mostrar los términos de la licencia/garantía de éste\n" " programa\n" " -M Listar los modelos de impresora disponibles.\n" -" -h Imprimir éste mensaje de ayuda.\n" +" -h Imprimir éste mensaje de ayuda.\n" " Opciones:\n" -" -P Especifica el nombre de la cola de impresión en la\n" +" -P Especifica el nombre de la cola de impresión en la\n" "\t que se opera. Por defecto es la impresora del\n" "\t sistema.\n" " -r Especifica el nombre del dispositivo a escribir\n" -"\t directamente en vez de mandarlo a través de la cola\n" -" de impresión.\n" +"\t directamente en vez de mandarlo a través de la cola\n" +" de impresión.\n" " -u La impresora es de nuevo modelo (Stylus Color 740 o\n" -" más nueva).\n" +" más nueva).\n" " -q Suprimir carteles.\n" " -m Especificar el modelo preciso de impresora para\n" -"\t alineación de cabezal.\n" +"\t alineación de cabezal.\n" #: src/escputil/escputil.c:333 src/escputil/escputil.c:341 #, c-format msgid "You may only specify one printer or raw device." -msgstr "Usted sólo puede especificar una impresora ó dispositivo crudo." +msgstr "Usted sólo puede especificar una impresora ó dispositivo crudo." #: src/escputil/escputil.c:349 #, c-format msgid "You may only specify one printer model." -msgstr "Usted sólo puede especificar un modelo de impresora" +msgstr "Usted sólo puede especificar un modelo de impresora" #: src/escputil/escputil.c:373 #, c-format @@ -7571,7 +7946,7 @@ msgstr "" #: src/escputil/escputil.c:385 #, c-format msgid "Unknown option %c\n" -msgstr "Opción desconocida %c\n" +msgstr "Opción desconocida %c\n" #: src/escputil/escputil.c:393 #, c-format @@ -7626,7 +8001,7 @@ msgstr "No puedo abrir %s para lectura/escritura: %s\n" #: src/escputil/escputil.c:783 #, fuzzy, c-format msgid "Unknown printer %s!\n" -msgstr "Opción desconocida %s\n" +msgstr "Opción desconocida %s\n" #: src/escputil/escputil.c:819 src/escputil/escputil.c:1414 #, c-format @@ -7677,7 +8052,7 @@ msgstr "" #: src/escputil/escputil.c:1030 #, fuzzy, c-format msgid "Status: Waiting\n" -msgstr "Saturación:" +msgstr "Saturación:" #: src/escputil/escputil.c:1033 #, c-format @@ -7828,13 +8203,13 @@ msgstr "" #, 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" +"La obtención de los niveles de tinta requiere usar un dispositivo crudo.\n" #: src/escputil/escputil.c:1457 #, 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" +"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 @@ -7855,12 +8230,12 @@ msgstr "" #, 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" +"La identificación de la impresora requiere el uso de un dispositivo crudo.\n" #: src/escputil/escputil.c:1689 #, fuzzy, c-format msgid "Cannot identify printer model.\n" -msgstr "Usted sólo puede especificar un modelo de impresora" +msgstr "Usted sólo puede especificar un modelo de impresora" #: src/escputil/escputil.c:1711 #, c-format @@ -7912,45 +8287,45 @@ msgid "" "It is essential that you not turn your printer off during this procedure.\n" "\n" msgstr "" -"Favor de leer éstas instrucciones muy cuidadosamente antes de proceder.\n" +"Favor de leer éstas instrucciones muy cuidadosamente antes de proceder.\n" "\n" -"Ésta utilidad le permite alinear el cabezal de impresión de su impresora\n" -"de chorro de tinta Epson Stylus. El mal uso de ésta utilidad puede causar\n" -"una degradación de la calidad de impresión y posiblemente daño a su " +"Ésta utilidad le permite alinear el cabezal de impresión de su impresora\n" +"de chorro de tinta Epson Stylus. El mal uso de ésta utilidad puede causar\n" +"una degradación de la calidad de impresión y posiblemente daño a su " "impresora.\n" -"Ésta utilidad no fue probada por Seiko Epson en cuanto a correcto\n" -"funcionamiento y se ofrece sin ninguna garantía. El riesgo del uso de ésta\n" +"Ésta utilidad no fue probada por Seiko Epson en cuanto a correcto\n" +"funcionamiento y se ofrece sin ninguna garantía. El riesgo del uso de ésta\n" "utilidad corre por la exclusiva cuenta del usuario.\n" "\n" -"Ésta utilidad imprime %d patrones de prueba. Cada patrón tiene aspecto muy\n" -"similar. Los patrones consisten en una serie de pares de líneas verticales\n" -"que se solapan. Debajo de cada par de líneas hay un número entre %d y %d.\n" +"Ésta utilidad imprime %d patrones de prueba. Cada patrón tiene aspecto muy\n" +"similar. Los patrones consisten en una serie de pares de líneas verticales\n" +"que se solapan. Debajo de cada par de líneas hay un número entre %d y %d.\n" "\n" -"Cuando inspeccione los pares de líneas, deberá encontrar el par de líneas\n" -"que este mejor alineado, es decir, que forma mejor una sola línea vertical.\n" +"Cuando inspeccione los pares de líneas, deberá encontrar el par de líneas\n" +"que este mejor alineado, es decir, que forma mejor una sola línea vertical.\n" "Inspeccione los pares muy cuidadosamente para encontrar el mejor ajuste.\n" -"Se recomienda el uso de una lupa o cristal de aumento para una inspección\n" -"más crítica.\n" -"También se sugiere que use un papel de buena calidad para las pruebas,\n" -"como para que las líneas queden bien formadas y no se dispersen sobre el\n" +"Se recomienda el uso de una lupa o cristal de aumento para una inspección\n" +"más crítica.\n" +"También se sugiere que use un papel de buena calidad para las pruebas,\n" +"como para que las líneas queden bien formadas y no se dispersen sobre el\n" "papel.\n" -"Después de anotar el número correspondiente al par de mejor ajuste, ponga\n" +"Después de anotar el número correspondiente al par de mejor ajuste, ponga\n" "de nuevo el papel en la impresora antes de volver a usarla.\n" "\n" -"Cada patrón es similar, pero los últimos patrones usan puntos más finos\n" -"para una alineación más crítica. Usted debe hacer todas las pasadas para\n" -"alinear correctamente su impresora. Después de ejecutar todas las pasadas\n" -"de alineación, los patrones de alineación se imprimirán una vez más. Debe\n" +"Cada patrón es similar, pero los últimos patrones usan puntos más finos\n" +"para una alineación más crítica. Usted debe hacer todas las pasadas para\n" +"alinear correctamente su impresora. Después de ejecutar todas las pasadas\n" +"de alineación, los patrones de alineación se imprimirán una vez más. Debe\n" "observarse que el par medio entre todos (#%d de %d) es el mejor de todos\n" "los patrones.\n" "\n" -"Después que los patrones sean impresos una vez más, le será ofrecida la\n" -"elección de guardar (s) el resultado en la impresora, repetir el proceso\n" -"(r), o salir sin guardar (q). Salir sin guardar no restaurará la\n" -"configuración previa, pero apagar y volver a encender la impresora lo hará.\n" -"Si sale sin guardar, deberá repetir el proceso por completo si quiere\n" -"guardar más tarde los resultados. Es esencial que no apague la impresora\n" -"durante éste proceso.\n" +"Después que los patrones sean impresos una vez más, le será ofrecida la\n" +"elección de guardar (s) el resultado en la impresora, repetir el proceso\n" +"(r), o salir sin guardar (q). Salir sin guardar no restaurará la\n" +"configuración previa, pero apagar y volver a encender la impresora lo hará.\n" +"Si sale sin guardar, deberá repetir el proceso por completo si quiere\n" +"guardar más tarde los resultados. Es esencial que no apague la impresora\n" +"durante éste proceso.\n" "\n" #: src/escputil/escputil.c:1767 @@ -7988,41 +8363,41 @@ msgid "" "this procedure.\n" "\n" msgstr "" -"Favor de leer éstas instrucciones muy cuidadosamente antes de proceder.\n" +"Favor de leer éstas instrucciones muy cuidadosamente antes de proceder.\n" "\n" -"Ésta utilidad le permite alinear el cabezal de impresión de su impresora\n" -"de chorro de tinta Epson Stylus. El mal uso de ésta utilidad puede causar\n" -"una degradación de la calidad de impresión y posiblemente daño a su " +"Ésta utilidad le permite alinear el cabezal de impresión de su impresora\n" +"de chorro de tinta Epson Stylus. El mal uso de ésta utilidad puede causar\n" +"una degradación de la calidad de impresión y posiblemente daño a su " "impresora.\n" -"Ésta utilidad no fue probada por Seiko Epson en cuanto a correcto\n" -"funcionamiento y se ofrece sin ninguna garantía. El riesgo del uso de ésta\n" +"Ésta utilidad no fue probada por Seiko Epson en cuanto a correcto\n" +"funcionamiento y se ofrece sin ninguna garantía. El riesgo del uso de ésta\n" "utilidad corre por la exclusiva cuenta del usuario.\n" "\n" -"Ésta utilidad imprime un patrón de prueba que consiste en una serie de " +"Ésta utilidad imprime un patrón de prueba que consiste en una serie de " "pares\n" -"de líneas verticales que se solapan. Debajo de cada par de líneas hay un\n" -"número entre %d y %d.\n" +"de líneas verticales que se solapan. Debajo de cada par de líneas hay un\n" +"número entre %d y %d.\n" "\n" -"Cuando inspeccione los pares de líneas, deberá encontrar el par de líneas\n" -"que este mejor alineado, es decir, que forma mejor una sola línea vertical.\n" +"Cuando inspeccione los pares de líneas, deberá encontrar el par de líneas\n" +"que este mejor alineado, es decir, que forma mejor una sola línea vertical.\n" "Inspeccione los pares muy cuidadosamente para encontrar el mejor ajuste.\n" -"Se recomienda el uso de una lupa o cristal de aumento para una inspección\n" -"más crítica.\n" -"También se sugiere que use un papel de buena calidad para la prueba,\n" -"como para que las líneas queden bien formadas y no se dispersen sobre el\n" +"Se recomienda el uso de una lupa o cristal de aumento para una inspección\n" +"más crítica.\n" +"También se sugiere que use un papel de buena calidad para la prueba,\n" +"como para que las líneas queden bien formadas y no se dispersen sobre el\n" "papel.\n" -"Después de anotar el número correspondiente al par de mejor ajuste, ponga\n" +"Después de anotar el número correspondiente al par de mejor ajuste, ponga\n" "de nuevo el papel en la impresora antes de volver a usarla.\n" "\n" -"Después de ejecutar el patrón de alineación, éste se imprimirá una vez más.\n" +"Después de ejecutar el patrón de alineación, éste se imprimirá una vez más.\n" "Debe observarse que el par medio entre todos (#%d de %d) es el mejor.\n" -"Entonces le será ofrecida la elección de guardar (s) el resultado en la\n" +"Entonces le será ofrecida la elección de guardar (s) el resultado en la\n" "impresora, repetir el proceso (r), o salir sin guardar (q). Salir sin\n" -"guardar no restaurará la configuración previa, pero apagar y volver a\n" -"encender la impresora lo hará.\n" -"Si sale sin guardar, deberá repetir el proceso por completo si quiere\n" -"guardar más tarde los resultados. Es esencial que no apague la impresora\n" -"durante éste proceso.\n" +"guardar no restaurará la configuración previa, pero apagar y volver a\n" +"encender la impresora lo hará.\n" +"Si sale sin guardar, deberá repetir el proceso por completo si quiere\n" +"guardar más tarde los resultados. Es esencial que no apague la impresora\n" +"durante éste proceso.\n" "\n" #: src/escputil/escputil.c:1811 @@ -8051,8 +8426,8 @@ msgstr "" " (s) Guardar los resultados en la impresora,\n" " (q) Salir sin guardar los resultados, o\n" " (r) Repetir el proceso completamente desde el principio.\n" -"Luego le será requerido confirmar su elección.\n" -"¿Qué opción elige? (s), (q), (r).\n" +"Luego le será requerido confirmar su elección.\n" +"¿Qué opción elige? (s), (q), (r).\n" #: src/escputil/escputil.c:1836 src/escputil/escputil.c:1845 #: src/escputil/escputil.c:1860 src/escputil/escputil.c:1878 @@ -8074,8 +8449,8 @@ 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 "" -"Bien, su impresora está alineada, pero la alineación no fue guardada.\n" -"Si quiere guardar la alineación, deberá repetir éste proceso.\n" +"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:1857 #, c-format @@ -8089,7 +8464,7 @@ msgstr "" #: src/escputil/escputil.c:1865 #, c-format msgid "Repeating the alignment process.\n" -msgstr "Repitiendo el proceso de alineación.\n" +msgstr "Repitiendo el proceso de alineación.\n" #: src/escputil/escputil.c:1871 #, c-format @@ -8100,21 +8475,21 @@ msgid "" "Please confirm by typing 's' again that you wish to save the settings\n" "to your printer:\n" msgstr "" -"Ésto alterará permanentemente la configuración de su impresora.\n" -"ADVERTENCIA: éste procedimiento no está aprobado por Seiko Epson, y\n" -"puede dañar su impresora. ¿Proceder?\n" -"Favor de confirmar que desea guardar la configuración de su impresora\n" +"Ésto alterará permanentemente la configuración de su impresora.\n" +"ADVERTENCIA: éste procedimiento no está aprobado por Seiko Epson, y\n" +"puede dañar su impresora. ¿Proceder?\n" +"Favor de confirmar que desea guardar la configuración de su impresora\n" "tipeando 's' de nuevo.\n" #: src/escputil/escputil.c:1883 #, c-format msgid "About to save settings..." -msgstr "Acerca de guardar configuración..." +msgstr "Acerca de guardar configuración..." #: src/escputil/escputil.c:1889 #, c-format msgid "failed!\n" -msgstr "¡falló!\n" +msgstr "¡falló!\n" #: src/escputil/escputil.c:1890 #, c-format @@ -8122,18 +8497,18 @@ msgid "" "Your settings were not saved successfully. You must repeat the\n" "alignment procedure.\n" msgstr "" -"Su configuración no fue guardada exitosamente. Debe repetir el\n" -"proceso de alineación.\n" +"Su configuración no fue guardada exitosamente. Debe repetir el\n" +"proceso de alineación.\n" #: src/escputil/escputil.c:1894 #, c-format msgid "succeeded!\n" -msgstr "¡éxito!\n" +msgstr "¡éxito!\n" #: 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" +msgstr "Su configuración de alineación fue guardada a la impresora.\n" #: src/escputil/escputil.c:1900 #, c-format @@ -8155,12 +8530,12 @@ msgid "" "Please place a sheet of paper in your printer to begin the head\n" "alignment procedure.\n" msgstr "" -"Éste procedimiento asume que su impresora is una Epson %s.\n" -"Si éste no es el modelo de su impresora, favor de tipear ctrl-c ahora y\n" +"Éste procedimiento asume que su impresora is una Epson %s.\n" +"Si éste no es el modelo de su impresora, favor de tipear ctrl-c ahora y\n" "elijir el correcto modelo de impresora.\n" "\n" "Favor de poner una hoja de papel en la impresora para comenzar el\n" -"procedimiento de alineación del cabezal.\n" +"procedimiento de alineación del cabezal.\n" #: src/escputil/escputil.c:1977 src/escputil/escputil.c:2008 #: src/escputil/escputil.c:2051 @@ -8174,9 +8549,9 @@ msgid "" "pattern.\n" "Type a pair number, '?' for help, or 'r' to repeat the procedure.\n" msgstr "" -"Favor de inspeccionar la impresión y elegir el mejor par de líneas en cada " -"patrón.\n" -"Tipee un número par, '?' para ayuda, ó 'r' para repetir el procedimiento.\n" +"Favor de inspeccionar la impresión y elegir el mejor par de líneas en cada " +"patrón.\n" +"Tipee un número par, '?' para ayuda, ó 'r' para repetir el procedimiento.\n" #: src/escputil/escputil.c:1997 #, c-format @@ -8191,27 +8566,27 @@ msgstr "Favor de insertar una hoja de papel sin imprimir.\n" #: src/escputil/escputil.c:2024 #, c-format msgid "Number out of range!\n" -msgstr "¡Número fuera de rango!\n" +msgstr "¡Número fuera de rango!\n" #: src/escputil/escputil.c:2029 #, c-format msgid "I cannot understand what you typed!\n" -msgstr "¡No puedo entender lo que usted ha tipeado!\n" +msgstr "¡No puedo entender lo que usted ha tipeado!\n" #: src/escputil/escputil.c:2035 #, 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" +msgstr "El mejor par de líneas debe ser numerado entre 1 y %d.\n" #: src/escputil/escputil.c:2042 #, c-format msgid "Attempting to set alignment..." -msgstr "Intentando definir alineación..." +msgstr "Intentando definir alineación..." #: src/escputil/escputil.c:2045 #, c-format msgid "succeeded.\n" -msgstr "éxito.\n" +msgstr "éxito.\n" #: src/escputil/escputil.c:2046 #, c-format @@ -8221,240 +8596,100 @@ msgid "" "pattern %d. If it is not, you should repeat the process to get the best\n" "quality printing.\n" msgstr "" -"Favor de verificar que la alineación es correcta. Después que el patrón de\n" -"alineación sea impreso nuevamente, favor de asegurarse que el mejor patrón\n" -"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" +"Favor de verificar que la alineación es correcta. Después que el patrón de\n" +"alineación sea impreso nuevamente, favor de asegurarse que el mejor patrón\n" +"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:2092 #, c-format msgid "Error in input\n" msgstr "Error en entrada\n" -#: src/gimp/print-image-gimp.c:225 src/gimp2/print-image-gimp.c:225 +#: src/gimp2/print-image-gimp.c:225 msgid "Printing..." msgstr "Imprimiendo..." -#: src/gimp/print.c:133 -msgid "/File/Print..." -msgstr "/Archivo/Imprimir..." - -#: src/ghost/ijsgutenprint.c:98 -#, c-format -msgid "" -"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" -msgstr "" - -#: 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:199 -#, fuzzy, c-format -msgid "ERROR: ijsgutenprint: No row buffer\n" -msgstr "Sin buffer de filas\n" - -#: 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: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: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:656 -#, c-format -msgid "ijsgutenprint: unknown DeviceModel %s\n" -msgstr "" - -#: 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: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: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: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: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: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:830 -#, fuzzy, c-format -msgid "ERROR: ijsgutenprint: cannot parse %s boolean %s\n" -msgstr "No puedo imprimir a impresora %s con %s\n" +#, fuzzy +#~ 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:841 -#, fuzzy, c-format -msgid "ERROR: ijsgutenprint: Bad parameter %s %d\n" -msgstr "Impresora desconocida %s\n" +#, fuzzy +#~ msgid "ERROR: ijsgutenprint: No row buffer\n" +#~ msgstr "Sin buffer de filas\n" -#: 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" +#, fuzzy +#~ 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:1308 -#, fuzzy, c-format -msgid "ERROR: ijsgutenprint: image_init failed %d\n" -msgstr "falló image_init %d\n" +#, fuzzy +#~ msgid "ERROR: ijsgutenprint: Printer must be specified with -sDeviceModel\n" +#~ msgstr "La impresora debe ser especificada con -sModel\n" -#: 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" +#, fuzzy +#~ 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:1331 -#, fuzzy, c-format -msgid "ERROR: ijsgutenprint: Unable to open %s: %s\n" -msgstr "No puedo abrir %s: %s\n" +#, fuzzy +#~ msgid "ERROR: ijsgutenprint: cannot parse TopLeft %s\n" +#~ msgstr "No puedo imprimir a impresora %s con %s\n" -#: src/ghost/ijsgutenprint.c:1344 -#, fuzzy, c-format -msgid "ERROR: ijsgutenprint: Unknown printer %s\n" -msgstr "Impresora desconocida %s\n" +#, fuzzy +#~ msgid "ERROR: ijsgutenprint: cannot parse PaperSize %s\n" +#~ msgstr "No puedo imprimir a impresora %s con %s\n" -#: src/ghost/ijsgutenprint.c:1516 -#, fuzzy, c-format -msgid "ERROR: ijsgutenprint: Bad parameters; cannot continue!\n" -msgstr "¡Parámetros malos, no puedo continuar!\n" +#, fuzzy +#~ msgid "ERROR: ijsgutenprint: cannot parse curve %s\n" +#~ msgstr "No puedo imprimir a impresora %s con %s\n" -#: 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 "ERROR: ijsgutenprint: cannot parse %s float %s\n" +#~ msgstr "No puedo imprimir a impresora %s con %s\n" #, fuzzy -#~ msgid "Model Name" -#~ msgstr "Cancelar" +#~ msgid "ERROR: ijsgutenprint: cannot parse %s int %s\n" +#~ msgstr "No puedo imprimir a impresora %s con %s\n" #, fuzzy -#~ msgid "Cassette" -#~ msgstr "Papel Opaco" +#~ msgid "ERROR: ijsgutenprint: cannot parse %s dimension %s\n" +#~ msgstr "No puedo imprimir a impresora %s con %s\n" #, fuzzy -#~ msgid " Gamma" -#~ msgstr "Gamma:" +#~ msgid "ERROR: ijsgutenprint: cannot parse %s boolean %s\n" +#~ msgstr "No puedo imprimir a impresora %s con %s\n" #, fuzzy -#~ msgid " Curve" -#~ msgstr "Negro" +#~ msgid "ERROR: ijsgutenprint: Bad parameter %s %d\n" +#~ msgstr "Impresora desconocida %s\n" #, fuzzy -#~ msgid "1440 x 1440" -#~ msgstr "1440 x 1440 PPP" +#~ msgid "ERROR: ijsgutenprint: bad key code %d\n" +#~ msgstr "Traer próxima fila falló en %d\n" #, fuzzy -#~ msgid "1440 x 1440 DPI High Quality" -#~ msgstr "1440 x 360 PPP Altísima Calidad " +#~ msgid "ERROR: ijsgutenprint: image_init failed %d\n" +#~ msgstr "falló image_init %d\n" #, fuzzy -#~ msgid "1440 x 1440 DPI Highest Quality" -#~ msgstr "1440 x 360 PPP Altísima Calidad " +#~ msgid "ERROR: ijsgutenprint: Unable to open file descriptor: %s\n" +#~ msgstr "No puedo abrir el descriptor de archivo: %s\n" #, fuzzy -#~ msgid "2880 x 1440 DPI High Quality" -#~ msgstr "1440 x 360 PPP Altísima Calidad " +#~ msgid "ERROR: ijsgutenprint: Unable to open %s: %s\n" +#~ msgstr "No puedo abrir %s: %s\n" #, fuzzy -#~ msgid "2880 x 1440 DPI Highest Quality" -#~ msgstr "1440 x 360 PPP Altísima Calidad " +#~ msgid "ERROR: ijsgutenprint: Unknown printer %s\n" +#~ msgstr "Impresora desconocida %s\n" #, fuzzy -#~ msgid "" -#~ "\n" -#~ "\n" -#~ "Copyright (C) 1997-2003 Michael Sweet, Robert Krawitz,\n" -#~ "and the rest of the Gutenprint Development Team.\n" -#~ "\n" -#~ "Please visit our web site at http://gimp-print.sourceforge.net.\n" -#~ "\n" -#~ "This program is free software; you can redistribute it and/or modify\n" -#~ "it under the terms of the GNU General Public License as published by\n" -#~ "the Free Software Foundation; either version 2 of the License, or\n" -#~ "(at your option) any later version.\n" -#~ "\n" -#~ "This program is distributed in the hope that it will be useful,\n" -#~ "but WITHOUT ANY WARRANTY; without even the implied warranty of\n" -#~ "MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the\n" -#~ "GNU General Public License for more details.\n" -#~ "\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" -#~ msgstr "" -#~ "\n" -#~ "\n" -#~ "Copyright (C) 1997-2001 Michael Sweet, Robert Krawitz,\n" -#~ "y el resto del Equipo de Desarrollo del Gimp-Print.\n" -#~ "\n" -#~ "Favor de visitar nuetro web site en http://gimp-print.sourceforge.net.\n" -#~ "\n" -#~ "Éste programa es software libre, usted puede redistribuirlo y/o " -#~ "modificarlo\n" -#~ "bajo los términos de la Licencia General Pública GNU tal como se la " -#~ "publica\n" -#~ "por la Fundación de Software Libre; o la versión 2 de la Licencia, o (a " -#~ "su\n" -#~ "opción) cualquier versión posterior.\n" -#~ "\n" -#~ "Éste programa se distribuye con el deseo de que sea útil, pero SIN " -#~ "NINGUNA\n" -#~ "GARANTÃA; aún sin la garantía implícita de MERCANTIBILIDAD o AJUSTE PARA " -#~ "UN\n" -#~ "PROPÓSITO PARTICULAR. Vea la Licencia General Pública GNU para más " -#~ "detalles.\n" -#~ "\n" -#~ "Usted debe haber recibido una copia de la Licencia General Pública GNU\n" -#~ "junto con éste programa; si no, escriba a la Fundación de Software\n" -#~ "Libre, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307 USA\n" +#~ msgid "ERROR: ijsgutenprint: Bad parameters; cannot continue!\n" +#~ msgstr "¡Parámetros malos, no puedo continuar!\n" #, 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 "" -#~ "Escputil se entrega sin NINGUNA GARANTÃA; para detalles tipee 'escputil -" -#~ "l'\n" -#~ "Éste es software libre, y usted es bienvenido a redistribuirlo bajo\n" -#~ "ciertas condiciones; tipee 'escputil -l' para más detalles.\n" +#~ msgid "ERROR: ijsgutenprint: Get next row failed at %.0f\n" +#~ msgstr "Traer próxima fila falló en %d\n" #, fuzzy #~ msgid "90x90 DPI" @@ -8488,10 +8723,6 @@ msgstr "Traer próxima fila falló en %d\n" #~ msgid "720x360 DPI DMT" #~ msgstr "720 x 360 PPP MW2" -#, fuzzy -#~ msgid "720x720 DPI" -#~ msgstr "2880 x 720 PPP" - #, fuzzy #~ msgid "720x720 DPI DMT" #~ msgstr "2880 x 720 PPP" @@ -8556,12 +8787,8 @@ msgstr "Traer próxima fila falló en %d\n" #~ msgid "2400x2400 DPI DMT" #~ msgstr "2400x600 PPP" -#, fuzzy -#~ msgid "Plain Paper PIXMA" -#~ msgstr "Papel Común" - #~ msgid "Back Print Film" -#~ msgstr "Película para Imprimir por Atrás" +#~ msgstr "Película para Imprimir por Atrás" #~ msgid "Fabric Sheets" #~ msgstr "Hojas de Tela" @@ -8570,46 +8797,46 @@ msgstr "Traer próxima fila falló en %d\n" #~ msgstr "Sobre" #~ msgid "High Resolution Paper" -#~ msgstr "Papel de Alta Resolución" +#~ msgstr "Papel de Alta Resolución" #~ msgid "T-Shirt Transfers" #~ msgstr "Transferencias a Remeras" #~ msgid "High Gloss Film" -#~ msgstr "Película de Alto Brillo" +#~ msgstr "Película de Alto Brillo" #~ msgid "Glossy Photo Paper" -#~ msgstr "Papel Brillante de Fotografía" +#~ msgstr "Papel Brillante de Fotografía" #~ msgid "Glossy Photo Cards" -#~ msgstr "Tarjetas Brillantes de Fotografía" +#~ msgstr "Tarjetas Brillantes de Fotografía" #~ msgid "Photo Paper Pro" -#~ msgstr "Papel de Fotografía Profesional" - -#~ msgid "Photo CcMmYK Color" -#~ msgstr "Color CcMmYK para Fotografía" +#~ msgstr "Papel de Fotografía Profesional" -#~ msgid "Photo CcMmY Color" -#~ msgstr "Color CcMmY para Fotografía" +#~ msgid "CMY Color" +#~ msgstr "Color CMY (Cian/Mag/Amar)" #~ msgid "CMYK Color" #~ msgstr "Color CMYK (Cian/Mag/Amar/Negro)" -#~ msgid "CMY Color" -#~ msgstr "Color CMY (Cian/Mag/Amar)" +#~ msgid "Photo CcMmY Color" +#~ msgstr "Color CcMmY para Fotografía" + +#~ msgid "Photo CcMmYK Color" +#~ msgstr "Color CcMmYK para Fotografía" #, fuzzy -#~ msgid "Gutenprint" -#~ msgstr "prueba de impresión" +#~ msgid " Gamma" +#~ msgstr "Gamma:" #, fuzzy -#~ msgid "ERROR: ijsgutenprint: ijs_server_get_page_header failed %d\n" -#~ msgstr "Traer próxima fila falló en %d\n" +#~ msgid " Curve" +#~ msgstr "Negro" #, fuzzy -#~ msgid "EPSON Stylus C50" -#~ msgstr "Stylus C60" +#~ msgid "Red Balance" +#~ msgstr "Ajusta el balance amarillo de la impresión" #, fuzzy #~ msgid "EPSON Stylus C60" @@ -8619,18 +8846,6 @@ msgstr "Traer próxima fila falló en %d\n" #~ msgid "EPSON Stylus C61" #~ msgstr "Stylus C60" -#, fuzzy -#~ msgid "EPSON Stylus C62" -#~ msgstr "Stylus C60" - -#, fuzzy -#~ msgid "EPSON Stylus C70" -#~ msgstr "Stylus C70" - -#, fuzzy -#~ msgid "EPSON Stylus C80" -#~ msgstr "Stylus C80" - #, fuzzy #~ msgid "EPSON Stylus C82" #~ msgstr "Stylus C80" @@ -8863,10 +9078,6 @@ msgstr "Traer próxima fila falló en %d\n" #~ msgid "EPSON Stylus Pro 5500" #~ msgstr "Stylus Pro 5500" -#, fuzzy -#~ msgid "EPSON Stylus Pro 7000" -#~ msgstr "Stylus Pro 7000" - #, fuzzy #~ msgid "EPSON Stylus Pro 7500" #~ msgstr "Stylus Pro 7500" @@ -8900,32 +9111,98 @@ msgstr "Traer próxima fila falló en %d\n" #~ msgstr "Stylus Scan 2500" #, fuzzy -#~ msgid "EPSON E-100" -#~ msgstr "Stylus C60" +#~ msgid "" +#~ "\n" +#~ "\n" +#~ "Copyright (C) 1997-2003 Michael Sweet, Robert Krawitz,\n" +#~ "and the rest of the Gutenprint Development Team.\n" +#~ "\n" +#~ "Please visit our web site at http://gimp-print.sourceforge.net.\n" +#~ "\n" +#~ "This program is free software; you can redistribute it and/or modify\n" +#~ "it under the terms of the GNU General Public License as published by\n" +#~ "the Free Software Foundation; either version 2 of the License, or\n" +#~ "(at your option) any later version.\n" +#~ "\n" +#~ "This program is distributed in the hope that it will be useful,\n" +#~ "but WITHOUT ANY WARRANTY; without even the implied warranty of\n" +#~ "MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the\n" +#~ "GNU General Public License for more details.\n" +#~ "\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" +#~ msgstr "" +#~ "\n" +#~ "\n" +#~ "Copyright (C) 1997-2001 Michael Sweet, Robert Krawitz,\n" +#~ "y el resto del Equipo de Desarrollo del Gimp-Print.\n" +#~ "\n" +#~ "Favor de visitar nuetro web site en http://gimp-print.sourceforge.net.\n" +#~ "\n" +#~ "Éste programa es software libre, usted puede redistribuirlo y/o " +#~ "modificarlo\n" +#~ "bajo los términos de la Licencia General Pública GNU tal como se la " +#~ "publica\n" +#~ "por la Fundación de Software Libre; o la versión 2 de la Licencia, o (a " +#~ "su\n" +#~ "opción) cualquier versión posterior.\n" +#~ "\n" +#~ "Éste programa se distribuye con el deseo de que sea útil, pero SIN " +#~ "NINGUNA\n" +#~ "GARANTÍA; aún sin la garantía implícita de MERCANTIBILIDAD o AJUSTE PARA " +#~ "UN\n" +#~ "PROPÓSITO PARTICULAR. Vea la Licencia General Pública GNU para más " +#~ "detalles.\n" +#~ "\n" +#~ "Usted debe haber recibido una copia de la Licencia General Pública GNU\n" +#~ "junto con éste programa; si no, escriba a la Fundación de Software\n" +#~ "Libre, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307 USA\n" #, fuzzy -#~ msgid "Printer does not support listing ink types!\n" -#~ msgstr "La impresora no soporta salida de color\n" +#~ msgid "Gutenprint" +#~ msgstr "prueba de impresión" + +#, fuzzy +#~ msgid "" +#~ ", Copyright (C) 2000-2003 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 "" +#~ "Escputil se entrega sin NINGUNA GARANTÍA; para detalles tipee 'escputil -" +#~ "l'\n" +#~ "Éste es software libre, y usted es bienvenido a redistribuirlo bajo\n" +#~ "ciertas condiciones; tipee 'escputil -l' para más detalles.\n" #, fuzzy #~ msgid "Cannot identify printer!\n" #~ msgstr "No puedo analizar salida de la impresora\n" #, fuzzy -#~ msgid "Red Balance" -#~ msgstr "Ajusta el balance amarillo de la impresión" +#~ msgid "Printer does not support listing ink types!\n" +#~ msgstr "La impresora no soporta salida de color\n" + +#~ msgid "/File/Print..." +#~ msgstr "/Archivo/Imprimir..." + +#, fuzzy +#~ msgid "ERROR: ijsgutenprint: ijs_server_get_page_header failed %d\n" +#~ msgstr "Traer próxima fila falló en %d\n" #, fuzzy #~ msgid "Gloss Balance" -#~ msgstr "Ajusta el balance amarillo de la impresión" +#~ msgstr "Ajusta el balance amarillo de la impresión" #~ 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 "" -#~ "La alineación de la impresora debe ser hecha con un dispositivo crudo ó " +#~ "La alineación de la impresora debe ser hecha con un dispositivo crudo ó " #~ "sino\n" -#~ "la opción -m debe ser usada para especificar una impresora.\n" +#~ "la opción -m debe ser usada para especificar una impresora.\n" #~ msgid "Attempting to detect printer model..." #~ msgstr "Intentando detectar el modelo de impresora..." @@ -8947,53 +9224,53 @@ msgstr "Traer próxima fila falló en %d\n" #, fuzzy #~ msgid "Brightness of the print (0 is solid black, 2 is solid white)" #~ msgstr "" -#~ "Establecer el brillo de la impresión.\n" -#~ "0 es negro sólido, 2 es blanco sólido" +#~ "Establecer el brillo de la impresión.\n" +#~ "0 es negro sólido, 2 es blanco sólido" #~ 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 "" -#~ "Ingrese el comando correcto para imprimir en su impresora. Nota: ¡Favor " -#~ "de no remover el '-l' ú '-oraw' de la línea de comando o la impresión " +#~ "Ingrese el comando correcto para imprimir en su impresora. Nota: ¡Favor " +#~ "de no remover el '-l' ú '-oraw' de la línea de comando o la impresión " #~ "puede fallar!" #~ msgid "PPD File?" -#~ msgstr "¿Archivo PPD?" +#~ msgstr "¿Archivo PPD?" #~ msgid "%s: option `%s' is ambiguous\n" -#~ msgstr "%s: la opción `%s' es ambigua\n" +#~ msgstr "%s: la opción `%s' es ambigua\n" #~ msgid "%s: option `--%s' doesn't allow an argument\n" -#~ msgstr "%s: la opción `--%s' no permite un argumento\n" +#~ msgstr "%s: la opción `--%s' no permite un argumento\n" #~ msgid "%s: option `%c%s' doesn't allow an argument\n" -#~ msgstr "%s: la opción `%c%s' no permite un argumento\n" +#~ msgstr "%s: la opción `%c%s' no permite un argumento\n" #~ msgid "%s: option `%s' requires an argument\n" -#~ msgstr "%s: la opción `%s' requiere un argumento\n" +#~ msgstr "%s: la opción `%s' requiere un argumento\n" #~ msgid "%s: unrecognized option `--%s'\n" -#~ msgstr "%s: opción `--%s' desconocida\n" +#~ msgstr "%s: opción `--%s' desconocida\n" #~ msgid "%s: unrecognized option `%c%s'\n" -#~ msgstr "%s: opción `%c%s' desconocida\n" +#~ msgstr "%s: opción `%c%s' desconocida\n" #~ msgid "%s: illegal option -- %c\n" -#~ msgstr "%s: opción no permitida -- %c\n" +#~ msgstr "%s: opción no permitida -- %c\n" #~ msgid "%s: invalid option -- %c\n" -#~ msgstr "%s: opción no válida -- %c\n" +#~ msgstr "%s: opción no válida -- %c\n" #~ msgid "%s: option requires an argument -- %c\n" -#~ msgstr "%s: la opción requiere un argumento -- %c\n" +#~ msgstr "%s: la opción requiere un argumento -- %c\n" #~ msgid "%s: option `-W %s' is ambiguous\n" -#~ msgstr "%s: la opción `-W %s' es ambigua\n" +#~ msgstr "%s: la opción `-W %s' es ambigua\n" #~ msgid "%s: option `-W %s' doesn't allow an argument\n" -#~ msgstr "%s: la opción `-W %s' no permite un argumento\n" +#~ msgstr "%s: la opción `-W %s' no permite un argumento\n" #, fuzzy #~ msgid "Bright" @@ -9001,11 +9278,11 @@ msgstr "Traer próxima fila falló en %d\n" #, fuzzy #~ msgid "Image is too wide for the page\n" -#~ msgstr "Redimensionar la impresión al tamaño de la página" +#~ msgstr "Redimensionar la impresión al tamaño de la página" #, fuzzy #~ msgid "Full Bleed" -#~ msgstr "Alimentación por Rollo" +#~ msgstr "Alimentación por Rollo" #, fuzzy #~ msgid "traditional" @@ -9025,32 +9302,18 @@ msgstr "Traer próxima fila falló en %d\n" #~ msgstr "Optimizar la salida para el tipo de imagen a imprimir" #~ msgid "Solid Colors" -#~ msgstr "Colores sólidos" - -#~ msgid "Stylus C20sx" -#~ msgstr "Stylus C20sx" +#~ msgstr "Colores sólidos" #~ 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" @@ -9093,66 +9356,66 @@ msgstr "Traer próxima fila falló en %d\n" #~ "WARNING: THIS FUNCTION IS NOT YET TESTED! It may not work, and it may\n" #~ "damage your printer!\n" #~ msgstr "" -#~ "Favor de leer éstas instrucciones muy cuidadosamente antes de proceder.\n" +#~ "Favor de leer éstas instrucciones muy cuidadosamente antes de proceder.\n" #~ "\n" -#~ "Ésta utilidad le permite alinear el cabezal de impresión de su impresora\n" -#~ "de chorro de tinta Epson Stylus. El mal uso de ésta utilidad puede " +#~ "Ésta utilidad le permite alinear el cabezal de impresión de su impresora\n" +#~ "de chorro de tinta Epson Stylus. El mal uso de ésta utilidad puede " #~ "causar\n" -#~ "una degradación de la calidad de impresión y posiblemente daño a su " +#~ "una degradación de la calidad de impresión y posiblemente daño a su " #~ "impresora.\n" -#~ "Ésta utilidad no fue probada por Seiko Epson en cuanto a correcto\n" -#~ "funcionamiento y se ofrece sin ninguna garantía. El riesgo del uso de " -#~ "ésta\n" +#~ "Ésta utilidad no fue probada por Seiko Epson en cuanto a correcto\n" +#~ "funcionamiento y se ofrece sin ninguna garantía. El riesgo del uso de " +#~ "ésta\n" #~ "utilidad corre por la exclusiva cuenta del usuario.\n" -#~ "Ésta utilidad imprime %d patrones de prueba sobreimpresos sobre una hoja " +#~ "Ésta utilidad imprime %d patrones de prueba sobreimpresos sobre una hoja " #~ "de\n" #~ "papel.\n" -#~ "Ésto es, imprime un patrón y expulsa la página. Luego debe reinsertarse " +#~ "Ésto es, imprime un patrón y expulsa la página. Luego debe reinsertarse " #~ "la\n" -#~ "misma página, e imprime otro patrón. Cada patrón consiste en una serie " +#~ "misma página, e imprime otro patrón. Cada patrón consiste en una serie " #~ "de\n" #~ "elecciones numeradas entre %d y %d.\n" #~ "\n" -#~ "Cuando inspeccione los patrones, deberá encontrar una impresión con la\n" -#~ "textura más suave (menor ``grano''). Deberá inspeccionar las impresiones\n" +#~ "Cuando inspeccione los patrones, deberá encontrar una impresión con la\n" +#~ "textura más suave (menor ``grano''). Deberá inspeccionar las impresiones\n" #~ "muy cuidadosamente para elegir la mejor. Sugerimos que use Papel de " #~ "Chorro\n" -#~ "de Tinta de Calidad Fotográfica o similar de alta calidad para ésta " +#~ "de Tinta de Calidad Fotográfica o similar de alta calidad para ésta " #~ "prueba\n" -#~ "Si no encuentra un patrón suave, deberá repetir la prueba.\n" +#~ "Si no encuentra un patrón suave, deberá repetir la prueba.\n" #~ "\n" -#~ "Después de inspeccionar y elegir una impresión, le será ofrecido guardar " +#~ "Después de inspeccionar y elegir una impresión, le será ofrecido guardar " #~ "(s)\n" #~ "el resultado en la impresora, repetir el proceso (r), o salir sin " #~ "guardar\n" -#~ "(q). Salir sin guardar no restaurará la configuración previa, pero apagar " +#~ "(q). Salir sin guardar no restaurará la configuración previa, pero apagar " #~ "y\n" -#~ "volver encender la impresora lo hará.\n" -#~ "Si sale sin guardar, deberá repetir el proceso por completo si quiere\n" -#~ "guardar más tarde los resultados. Es esencial que no apague la impresora\n" -#~ "durante éste proceso.\n" +#~ "volver encender la impresora lo hará.\n" +#~ "Si sale sin guardar, deberá repetir el proceso por completo si quiere\n" +#~ "guardar más tarde los resultados. Es esencial que no apague la impresora\n" +#~ "durante éste proceso.\n" #~ "\n" -#~ "ADVERTENCIA: ÉSTA FUNCIÓN AÚN NO HA SIDO PROBADA! Puede no funcionar, y " -#~ "aún\n" -#~ "dañar su impresora!\n" +#~ "ADVERTENCIA: ÉSTA FUNCIÓN AÚN NO HA SIDO PROBADA! Puede no funcionar, y " +#~ "aún\n" +#~ "dañar su impresora!\n" #~ msgid "Printer %s does not require color head alignment.\n" #~ msgstr "" -#~ "La impresora %s no requiere alineación de los inyectores de color.\n" +#~ "La impresora %s no requiere alineación de los inyectores de color.\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 "" -#~ "Favor de inspeccionar la impresión y elegir el mejor par de líneas en " -#~ "cada patrón.\n" -#~ "Tipee un número par, '?' para ayuda, ó 'r' para repetir el " +#~ "Favor de inspeccionar la impresión y elegir el mejor par de líneas en " +#~ "cada patrón.\n" +#~ "Tipee un número par, '?' para ayuda, ó 'r' para repetir el " #~ "procedimiento.\n" #, fuzzy #~ msgid "Model %d out of range.\n" -#~ msgstr "¡Número fuera de rango!\n" +#~ msgstr "¡Número fuera de rango!\n" #~ msgid "Right Border:" #~ msgstr "Borde derecho:" @@ -9161,10 +9424,10 @@ msgstr "Traer próxima fila falló en %d\n" #~ msgstr "Borde inferior:" #~ msgid "Size" -#~ msgstr "Tamaño" +#~ msgstr "Tamaño" #~ msgid "Image / Output Settings" -#~ msgstr "Imagen / Configuración de Salida" +#~ msgstr "Imagen / Configuración de Salida" #, fuzzy #~ msgid "GIMP-print" @@ -9172,47 +9435,47 @@ msgstr "Traer próxima fila falló en %d\n" #, fuzzy #~ msgid "Resolutions" -#~ msgstr "Resolución" +#~ msgstr "Resolución" #~ msgid "Media Type:" #~ msgstr "Tipo de medio:" #~ msgid "Type of media you're printing to" -#~ msgstr "Tipo de medio al que usted está imprimiendo" +#~ msgstr "Tipo de medio al que usted está imprimiendo" #~ msgid "Media Size:" -#~ msgstr "Tamaño del medio:" +#~ msgstr "Tamaño del medio:" #~ msgid "Size of paper that you wish to print to" -#~ msgstr "Tamaño del papel al que desea imprimir" +#~ msgstr "Tamaño del papel al que desea imprimir" #~ msgid "Media Source:" #~ msgstr "Fuente del medio:" #~ msgid "Source (input slot) of media you're printing to" -#~ msgstr "Origen del medio (ranura de entrada) al que está imprimiendo" +#~ msgstr "Origen del medio (ranura de entrada) al que está imprimiendo" #~ msgid "Ink Type:" #~ msgstr "Tipo de Tinta:" #~ msgid "Resolution:" -#~ msgstr "Resolución:" +#~ msgstr "Resolución:" #~ msgid "Print in black and white (no color, and no shades of gray)" #~ msgstr "Imprimir en blanco y negro (no color y no sombras de gris)" #~ msgid "Fastest and brightest color for text and line art" -#~ msgstr "Color más rápido y brillante para texto y arte lineal" +#~ msgstr "Color más rápido y brillante para texto y arte lineal" #~ msgid "Best for images dominated by regions of solid color" -#~ msgstr "Mejor para imágenes dominadas por regiones de colores sólidos" +#~ msgstr "Mejor para imágenes dominadas por regiones de colores sólidos" #~ msgid "" #~ "Slowest, but most accurate and smoothest color for continuous tone images " #~ "and photographs" #~ msgstr "" -#~ "Más lento, pero con el color más preciso y suave para imágenes de tono " -#~ "continuo y fotografías" +#~ "Más lento, pero con el color más preciso y suave para imágenes de tono " +#~ "continuo y fotografías" #~ msgid "Dither Algorithm:" #~ msgstr "Algoritmo de entramado:" @@ -9225,16 +9488,16 @@ msgstr "Traer próxima fila falló en %d\n" #~ "No puedo leer desde %s: %s\n" #~ msgid "%s out of range (value %f, min %f, max %f)\n" -#~ msgstr "%s fuera de rango (valor %f, mín %f, máx %f)\n" +#~ msgstr "%s fuera de rango (valor %f, mín %f, máx %f)\n" #~ msgid "%s is not a valid dither algorithm\n" -#~ msgstr "%s no es un algoritmo de entramado válido\n" +#~ msgstr "%s no es un algoritmo de entramado válido\n" #~ msgid "" #~ "Please re-insert the same alignment sheet in the printer when it is\n" #~ "finished printing.\n" #~ msgstr "" -#~ "Favor de re-insertar la misma hoja de alineación en la impresora cuando\n" +#~ "Favor de re-insertar la misma hoja de alineación en la impresora cuando\n" #~ "termine de imprimirse.\n" #~ msgid "" @@ -9245,19 +9508,19 @@ msgstr "Traer próxima fila falló en %d\n" #~ "best pattern, and repeat the procedure.\n" #~ "Type a pattern number, or '?' for help.\n" #~ msgstr "" -#~ "Inspeccione la hoja de alineación, y determine cuál de los patrones es " +#~ "Inspeccione la hoja de alineación, y determine cuál de los patrones es " #~ "el\n" -#~ "más suave. Éste patrón debe verse como el de menor ``grano''.\n" -#~ "Si no puede encontrar un patrón suave, favor de seleccionar el número " +#~ "más suave. Éste patrón debe verse como el de menor ``grano''.\n" +#~ "Si no puede encontrar un patrón suave, favor de seleccionar el número " #~ "del\n" -#~ "mejor patrón, y repita el procedimiento.\n" -#~ "Tipee un número de patrón, o '?' para ayuda.\n" +#~ "mejor patrón, y repita el procedimiento.\n" +#~ "Tipee un número de patrón, o '?' para ayuda.\n" #~ msgid "The best pattern should be numbered between 1 and %d.\n" -#~ msgstr "El mejor patrón debe ser numerado entre 1 y %d.\n" +#~ msgstr "El mejor patrón debe ser numerado entre 1 y %d.\n" #~ msgid "Set the contrast of the print" -#~ msgstr "Establecer el contraste de la impresión" +#~ msgstr "Establecer el contraste de la impresión" #~ msgid "Cyan:" #~ msgstr "Cian:" @@ -9269,10 +9532,10 @@ msgstr "Traer próxima fila falló en %d\n" #~ msgstr "Amarillo:" #~ msgid "Parameter %s out of range (value %f, min %f, max %f)\n" -#~ msgstr "Parámetro %s fuera de rango (valor %f, mín %f, máx %f)\n" +#~ msgstr "Parámetro %s fuera de rango (valor %f, mín %f, máx %f)\n" #~ msgid "Parameter %s out of range (value %d, min %d, max %d)\n" -#~ msgstr "Parámetro %s fuera de rango (valor %d, mín %d, máx %d)\n" +#~ msgstr "Parámetro %s fuera de rango (valor %d, mín %d, máx %d)\n" #~ msgid "1440 x 360 DPI" #~ msgstr "1440 x 360 PPP" @@ -9299,10 +9562,10 @@ msgstr "Traer próxima fila falló en %d\n" #~ msgstr "Kaku" #~ msgid "HP Greeting Card" -#~ msgstr "Tarjeta HP de Salutación" +#~ msgstr "Tarjeta HP de Salutación" #~ msgid "Escputil version 4.2.1, Copyright (C) 2000-2001 Robert Krawitz.\n" -#~ msgstr "Escputil versión 4.2.1, Copyright (C) 2000-2001 Robert Krawitz.\n" +#~ msgstr "Escputil versión 4.2.1, Copyright (C) 2000-2001 Robert Krawitz.\n" #~ msgid "Print/Save Setts." #~ msgstr "Imp./Guard. Conf." diff --git a/po/fr.gmo b/po/fr.gmo index 61d4d48..26eb090 100644 Binary files a/po/fr.gmo and b/po/fr.gmo differ diff --git a/po/fr.po b/po/fr.po index 1a2b2d1..f5f5124 100644 --- a/po/fr.po +++ b/po/fr.po @@ -9,8 +9,8 @@ msgid "" msgstr "" "Project-Id-Version: gimp-print 5.0.0\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2008-01-01 20:47-0500\n" -"PO-Revision-Date: 2007-12-01 21:56-0500\n" +"POT-Creation-Date: 2008-04-25 21:19-0400\n" +"PO-Revision-Date: 2007-11-23 11:55-0500\n" "Last-Translator: regis rampnoux \n" "Language-Team: GNOME French Team \n" "MIME-Version: 1.0\n" @@ -22,7 +22,7 @@ msgstr "" #. 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:1752 +#: src/main/print-escp2.c:2116 msgid "Default" msgstr "Défaut" @@ -62,41 +62,54 @@ msgid "Ordered" msgstr "Ordonné" #: src/main/dither-main.c:65 +#, fuzzy +msgid "Ordered New" +msgstr "Ordonné" + +#: src/main/dither-main.c:66 msgid "Fast" msgstr "Rapide" -#: src/main/dither-main.c:66 +#: src/main/dither-main.c:67 msgid "Very Fast" msgstr "Très rapide" -#: src/main/dither-main.c:67 +#: src/main/dither-main.c:68 msgid "Hybrid Floyd-Steinberg" msgstr "Floyd-Steinberg hybride" -#: src/main/dither-main.c:68 +#: src/main/dither-main.c:69 msgid "Predithered Input" msgstr "Pré tramé" -#: src/main/dither-main.c:88 src/main/print-color.c:56 +#: src/main/dither-main.c:70 +msgid "Drop Size Segmented" +msgstr "" + +#: src/main/dither-main.c:71 +msgid "Drop Size Segmented New" +msgstr "" + +#: src/main/dither-main.c:91 src/main/print-color.c:56 msgid "Density" msgstr "Densité" -#: src/main/dither-main.c:88 src/main/print-canon.c:295 +#: src/main/dither-main.c:91 src/main/print-canon.c:295 #: src/main/print-canon.c:303 src/main/print-canon.c:311 -#: src/main/print-canon.c:319 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-escp2.c:471 -#: src/main/print-escp2.c:479 src/main/print-escp2.c:487 +#: src/main/print-canon.c:319 src/main/print-escp2.c:446 +#: src/main/print-escp2.c:454 src/main/print-escp2.c:462 +#: src/main/print-escp2.c:470 src/main/print-escp2.c:478 +#: src/main/print-escp2.c:486 src/main/print-escp2.c:494 #: 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:1764 src/main/print-olympus.c:1772 -#: src/main/print-olympus.c:1780 src/main/print-olympus.c:1788 -#: src/main/print-pcl.c:1261 src/main/print-pcl.c:1269 -#: src/main/print-pcl.c:1277 src/main/print-pcl.c:1285 +#: src/main/print-olympus.c:1762 src/main/print-olympus.c:1770 +#: src/main/print-olympus.c:1778 src/main/print-olympus.c:1786 +#: src/main/print-pcl.c:1329 src/main/print-pcl.c:1337 +#: src/main/print-pcl.c:1345 src/main/print-pcl.c:1353 msgid "Output Level Adjustment" msgstr "Réglage du niveau de sortie" -#: src/main/dither-main.c:89 +#: src/main/dither-main.c:92 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 " @@ -106,15 +119,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:97 +#: src/main/dither-main.c:100 msgid "Dither Algorithm" msgstr "Algorithme de tramage" -#: src/main/dither-main.c:97 +#: src/main/dither-main.c:100 msgid "Screening Adjustment" msgstr "" -#: src/main/dither-main.c:98 +#: src/main/dither-main.c:101 msgid "" "Choose the dither algorithm to be used.\n" "Adaptive Hybrid usually produces the best all-around quality.\n" @@ -149,9 +162,9 @@ msgstr "Module de conversion de couleur" msgid "Dither algorithm" msgstr "Algorithme de tramage" -#: src/main/print-canon.c:200 src/main/print-escp2.c:180 -#: src/main/print-lexmark.c:266 src/main/print-olympus.c:1699 -#: src/main/print-pcl.c:1196 src/main/print-ps.c:67 +#: src/main/print-canon.c:200 src/main/print-escp2.c:182 +#: src/main/print-lexmark.c:266 src/main/print-olympus.c:1697 +#: src/main/print-pcl.c:1264 msgid "Page Size" msgstr "Format papier " @@ -159,238 +172,247 @@ msgstr "Format papier " #: src/main/print-canon.c:212 src/main/print-canon.c:218 #: src/main/print-canon.c:224 src/main/print-canon.c:230 #: src/main/print-canon.c:248 src/main/print-canon.c:272 -#: src/main/print-escp2.c:180 src/main/print-escp2.c:186 -#: src/main/print-escp2.c:192 src/main/print-escp2.c:198 -#: src/main/print-escp2.c:204 src/main/print-escp2.c:210 -#: src/main/print-escp2.c:228 src/main/print-escp2.c:245 -#: src/main/print-escp2.c:251 src/main/print-escp2.c:263 -#: src/main/print-escp2.c:281 src/main/print-lexmark.c:266 +#: src/main/print-escp2.c:182 src/main/print-escp2.c:188 +#: src/main/print-escp2.c:194 src/main/print-escp2.c:200 +#: src/main/print-escp2.c:206 src/main/print-escp2.c:212 +#: src/main/print-escp2.c:230 src/main/print-escp2.c:247 +#: src/main/print-escp2.c:253 src/main/print-escp2.c:265 +#: src/main/print-escp2.c:283 src/main/print-lexmark.c:266 #: src/main/print-lexmark.c:272 src/main/print-lexmark.c:278 -#: src/main/print-lexmark.c:284 src/main/print-olympus.c:1699 -#: src/main/print-olympus.c:1705 src/main/print-olympus.c:1711 -#: src/main/print-olympus.c:1717 src/main/print-pcl.c:1196 -#: src/main/print-pcl.c:1202 src/main/print-pcl.c:1208 -#: src/main/print-pcl.c:1214 src/main/print-pcl.c:1238 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 +#: src/main/print-lexmark.c:284 src/main/print-olympus.c:1697 +#: src/main/print-olympus.c:1703 src/main/print-olympus.c:1709 +#: src/main/print-olympus.c:1715 src/main/print-pcl.c:1264 +#: src/main/print-pcl.c:1270 src/main/print-pcl.c:1276 +#: src/main/print-pcl.c:1282 src/main/print-pcl.c:1306 src/main/print-ps.c:68 +#: src/main/print-ps.c:74 msgid "Basic Printer Setup" msgstr "Configuration de base de l'imprimante" -#: src/main/print-canon.c:201 src/main/print-escp2.c:181 -#: src/main/print-lexmark.c:267 src/main/print-olympus.c:1700 -#: src/main/print-pcl.c:1197 src/main/print-ps.c:68 +#: src/main/print-canon.c:201 src/main/print-escp2.c:183 +#: src/main/print-lexmark.c:267 src/main/print-olympus.c:1698 +#: src/main/print-pcl.c:1265 msgid "Size of the paper being printed to" msgstr "Taille du papier sur lequel vous imprimez" -#: src/main/print-canon.c:206 src/main/print-escp2.c:186 -#: src/main/print-lexmark.c:272 src/main/print-olympus.c:1705 -#: src/main/print-pcl.c:1202 src/main/print-ps.c:73 src/cups/genppd.c:1417 +#: src/main/print-canon.c:206 src/main/print-escp2.c:188 +#: src/main/print-lexmark.c:272 src/main/print-olympus.c:1703 +#: src/main/print-pcl.c:1270 src/cups/genppd.c:1422 msgid "Media Type" msgstr "Type de support" -#: src/main/print-canon.c:207 src/main/print-escp2.c:187 -#: src/main/print-lexmark.c:273 src/main/print-olympus.c:1706 -#: src/main/print-pcl.c:1203 src/main/print-ps.c:74 +#: src/main/print-canon.c:207 src/main/print-escp2.c:189 +#: src/main/print-lexmark.c:273 src/main/print-olympus.c:1704 +#: src/main/print-pcl.c:1271 msgid "Type of media (plain paper, photo paper, etc.)" msgstr "Type de support (papier ordinaire, papier photo etc.)" -#: src/main/print-canon.c:212 src/main/print-escp2.c:192 -#: src/main/print-lexmark.c:278 src/main/print-olympus.c:1711 -#: src/main/print-pcl.c:1208 src/main/print-ps.c:79 src/cups/genppd.c:1445 +#: src/main/print-canon.c:212 src/main/print-escp2.c:194 +#: src/main/print-lexmark.c:278 src/main/print-olympus.c:1709 +#: src/main/print-pcl.c:1276 src/cups/genppd.c:1450 msgid "Media Source" msgstr "Source du support" -#: src/main/print-canon.c:213 src/main/print-escp2.c:193 -#: src/main/print-lexmark.c:279 src/main/print-olympus.c:1712 -#: src/main/print-pcl.c:1209 src/main/print-ps.c:80 +#: src/main/print-canon.c:213 src/main/print-escp2.c:195 +#: src/main/print-lexmark.c:279 src/main/print-olympus.c:1710 +#: src/main/print-pcl.c:1277 msgid "Source (input slot) of the media" msgstr "Source (bac) du support vers lequel vous imprimez" -#: src/main/print-canon.c:218 src/main/print-escp2.c:198 +#: src/main/print-canon.c:218 src/main/print-escp2.c:200 msgid "CD Hub Size" msgstr "Taille du moyeu du CD" -#: src/main/print-canon.c:219 src/main/print-escp2.c:199 +#: src/main/print-canon.c:219 src/main/print-escp2.c:201 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-canon.c:224 src/main/print-escp2.c:204 +#: src/main/print-canon.c:224 src/main/print-escp2.c:206 msgid "CD Size (Custom)" msgstr "" -#: src/main/print-canon.c:225 src/main/print-escp2.c:205 +#: src/main/print-canon.c:225 src/main/print-escp2.c:207 msgid "Variable adjustment for the outer diameter of CD" msgstr "" -#: src/main/print-canon.c:230 src/main/print-escp2.c:210 +#: src/main/print-canon.c:230 src/main/print-escp2.c:212 #, fuzzy msgid "CD Hub Size (Custom)" msgstr "Taille du moyeu du CD" -#: src/main/print-canon.c:231 src/main/print-escp2.c:211 +#: src/main/print-canon.c:231 src/main/print-escp2.c:213 #, fuzzy msgid "Variable adjustment to the inner hub of the CD" msgstr "Dimensionne l'impression par rapport à la taille de la page" -#: src/main/print-canon.c:236 src/main/print-escp2.c:216 +#: src/main/print-canon.c:236 src/main/print-escp2.c:218 msgid "CD Horizontal Fine Adjustment" msgstr "Réglage horizontal précis du CD" #: src/main/print-canon.c:236 src/main/print-canon.c:242 -#: src/main/print-canon.c:254 src/main/print-escp2.c:216 -#: src/main/print-escp2.c:222 src/main/print-escp2.c:239 -#: src/main/print-escp2.c:275 src/main/print-lexmark.c:290 -#: src/main/print-olympus.c:1723 src/main/print-olympus.c:1729 -#: src/main/print-olympus.c:1735 src/main/print-pcl.c:1220 -#: src/main/print-ps.c:91 src/main/print-raw.c:80 +#: src/main/print-canon.c:254 src/main/print-escp2.c:218 +#: src/main/print-escp2.c:224 src/main/print-escp2.c:241 +#: src/main/print-escp2.c:277 src/main/print-lexmark.c:290 +#: src/main/print-olympus.c:1721 src/main/print-olympus.c:1727 +#: src/main/print-olympus.c:1733 src/main/print-pcl.c:1288 +#: src/main/print-raw.c:80 msgid "Advanced Printer Setup" msgstr "Réglages imprimante avancés" #: src/main/print-canon.c:237 src/main/print-canon.c:243 -#: src/main/print-escp2.c:217 src/main/print-escp2.c:223 +#: src/main/print-escp2.c:219 src/main/print-escp2.c:225 msgid "Fine adjustment to horizontal position for CD printing" msgstr "Réglage précis de la position horizontale pour l'impression sur CD" -#: src/main/print-canon.c:242 src/main/print-escp2.c:222 +#: src/main/print-canon.c:242 src/main/print-escp2.c:224 msgid "CD Vertical Fine Adjustment" msgstr "Réglage vertical précis du CD" -#: src/main/print-canon.c:248 src/main/print-escp2.c:228 -#: src/main/print-lexmark.c:284 src/main/print-olympus.c:1717 -#: src/main/print-pcl.c:1214 src/main/print-ps.c:85 src/cups/genppd.c:1518 +#: src/main/print-canon.c:248 src/main/print-escp2.c:230 +#: src/main/print-lexmark.c:284 src/main/print-olympus.c:1715 +#: src/main/print-pcl.c:1282 src/cups/genppd.c:1523 msgid "Resolution" msgstr "Résolution" #: src/main/print-canon.c:249 src/main/print-lexmark.c:285 -#: src/main/print-olympus.c:1718 src/main/print-pcl.c:1215 -#: src/main/print-ps.c:86 +#: src/main/print-olympus.c:1716 src/main/print-pcl.c:1283 msgid "Resolution and quality of the print" msgstr "Résolution et qualité de l'impression" -#: src/main/print-canon.c:254 src/main/print-escp2.c:239 -#: src/main/print-lexmark.c:290 src/main/print-olympus.c:1723 -#: src/main/print-pcl.c:1220 src/main/print-ps.c:91 src/main/print-raw.c:80 +#: src/main/print-canon.c:254 src/main/print-escp2.c:241 +#: src/main/print-lexmark.c:290 src/main/print-olympus.c:1721 +#: src/main/print-pcl.c:1288 src/main/print-raw.c:80 msgid "Ink Type" msgstr "Type d'encre" -#: src/main/print-canon.c:255 src/main/print-escp2.c:240 -#: src/main/print-escp2.c:252 src/main/print-lexmark.c:291 -#: src/main/print-olympus.c:1724 src/main/print-pcl.c:1221 -#: src/main/print-ps.c:92 src/main/print-raw.c:81 +#: src/main/print-canon.c:255 src/main/print-escp2.c:242 +#: src/main/print-escp2.c:254 src/main/print-lexmark.c:291 +#: src/main/print-olympus.c:1722 src/main/print-pcl.c:1289 +#: src/main/print-raw.c:81 msgid "Type of ink in the printer" msgstr "Encres installées" #: src/main/print-canon.c:260 src/main/print-canon.c:261 -#: src/main/print-escp2.c:329 src/main/print-escp2.c:330 +#: src/main/print-escp2.c:331 src/main/print-escp2.c:332 #: src/main/print-lexmark.c:296 src/main/print-lexmark.c:297 -#: src/main/print-pcl.c:1226 src/main/print-pcl.c:1227 +#: src/main/print-pcl.c:1294 src/main/print-pcl.c:1295 msgid "Ink Channels" msgstr "Encres (canaux)" -#: src/main/print-canon.c:260 src/main/print-escp2.c:130 -#: src/main/print-escp2.c:137 src/main/print-escp2.c:144 -#: src/main/print-escp2.c:287 src/main/print-escp2.c:293 -#: src/main/print-escp2.c:299 src/main/print-escp2.c:305 -#: src/main/print-escp2.c:311 src/main/print-escp2.c:317 -#: src/main/print-escp2.c:323 src/main/print-escp2.c:329 -#: src/main/print-escp2.c:335 src/main/print-lexmark.c:296 -#: src/main/print-pcl.c:1226 +#: src/main/print-canon.c:260 src/main/print-escp2.c:132 +#: src/main/print-escp2.c:139 src/main/print-escp2.c:146 +#: src/main/print-escp2.c:289 src/main/print-escp2.c:295 +#: src/main/print-escp2.c:301 src/main/print-escp2.c:307 +#: src/main/print-escp2.c:313 src/main/print-escp2.c:319 +#: src/main/print-escp2.c:325 src/main/print-escp2.c:331 +#: src/main/print-escp2.c:337 src/main/print-lexmark.c:296 +#: src/main/print-pcl.c:1294 msgid "Advanced Printer Functionality" msgstr "Fonctionalités avancées" -#: src/main/print-canon.c:266 src/main/print-escp2.c:341 -#: src/main/print-lexmark.c:302 src/main/print-olympus.c:1741 -#: src/main/print-pcl.c:1232 src/main/print-ps.c:103 src/main/print-raw.c:86 +#: src/main/print-canon.c:266 src/main/print-escp2.c:343 +#: src/main/print-lexmark.c:302 src/main/print-olympus.c:1739 +#: src/main/print-pcl.c:1300 src/main/print-ps.c:80 src/main/print-raw.c:86 msgid "Printing Mode" msgstr "Mode d'impression" #: src/main/print-canon.c:266 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:341 -#: src/main/print-escp2.c:347 src/main/print-lexmark.c:302 -#: src/main/print-olympus.c:1741 src/main/print-pcl.c:1232 -#: src/main/print-ps.c:103 src/main/print-raw.c:86 +#: src/main/print-color.c:208 src/main/print-escp2.c:343 +#: src/main/print-escp2.c:349 src/main/print-lexmark.c:302 +#: src/main/print-olympus.c:1739 src/main/print-pcl.c:1300 +#: src/main/print-ps.c:80 src/main/print-raw.c:86 msgid "Core Parameter" msgstr "Paramètres principaux" -#: src/main/print-canon.c:267 src/main/print-escp2.c:342 -#: src/main/print-lexmark.c:303 src/main/print-olympus.c:1742 -#: src/main/print-pcl.c:1233 src/main/print-ps.c:104 src/main/print-raw.c:87 +#: src/main/print-canon.c:267 src/main/print-escp2.c:344 +#: src/main/print-lexmark.c:303 src/main/print-olympus.c:1740 +#: src/main/print-pcl.c:1301 src/main/print-ps.c:81 src/main/print-raw.c:87 msgid "Printing Output Mode" msgstr "Mode de sortie" -#: src/main/print-canon.c:272 src/main/print-pcl.c:1238 +#: src/main/print-canon.c:272 src/main/print-pcl.c:1306 msgid "Double-Sided Printing" msgstr "Impression double face" -#: src/main/print-canon.c:273 src/main/print-pcl.c:1239 +#: src/main/print-canon.c:273 src/main/print-pcl.c:1307 msgid "Duplex/Tumble Setting" msgstr "Paramètres Duplex" -#: src/main/print-canon.c:295 src/main/print-escp2.c:439 -#: src/main/print-lexmark.c:325 src/main/print-pcl.c:1261 +#: src/main/print-canon.c:295 src/main/print-escp2.c:446 +#: src/main/print-lexmark.c:325 src/main/print-pcl.c:1329 msgid "Cyan Density" msgstr "Densité cyan" -#: src/main/print-canon.c:296 src/main/print-escp2.c:440 -#: src/main/print-lexmark.c:326 src/main/print-pcl.c:1262 +#: src/main/print-canon.c:296 src/main/print-escp2.c:447 +#: src/main/print-lexmark.c:326 src/main/print-pcl.c:1330 msgid "Adjust the cyan density" msgstr "Ajustement de la densité de cyan" -#: src/main/print-canon.c:303 src/main/print-escp2.c:447 -#: src/main/print-lexmark.c:333 src/main/print-pcl.c:1269 +#: src/main/print-canon.c:303 src/main/print-escp2.c:454 +#: src/main/print-lexmark.c:333 src/main/print-pcl.c:1337 msgid "Magenta Density" msgstr "Densité magenta" -#: src/main/print-canon.c:304 src/main/print-escp2.c:448 -#: src/main/print-lexmark.c:334 src/main/print-pcl.c:1270 +#: src/main/print-canon.c:304 src/main/print-escp2.c:455 +#: src/main/print-lexmark.c:334 src/main/print-pcl.c:1338 msgid "Adjust the magenta density" msgstr "Ajustement de la densité de magenta" -#: src/main/print-canon.c:311 src/main/print-escp2.c:455 -#: src/main/print-lexmark.c:341 src/main/print-pcl.c:1277 +#: src/main/print-canon.c:311 src/main/print-escp2.c:462 +#: src/main/print-lexmark.c:341 src/main/print-pcl.c:1345 msgid "Yellow Density" msgstr "Densité jaune" -#: src/main/print-canon.c:312 src/main/print-escp2.c:456 -#: src/main/print-lexmark.c:342 src/main/print-pcl.c:1278 +#: src/main/print-canon.c:312 src/main/print-escp2.c:463 +#: src/main/print-lexmark.c:342 src/main/print-pcl.c:1346 msgid "Adjust the yellow density" msgstr "Ajustement de la densité de jaune" -#: src/main/print-canon.c:319 src/main/print-escp2.c:463 -#: src/main/print-lexmark.c:349 src/main/print-pcl.c:1285 +#: src/main/print-canon.c:319 src/main/print-escp2.c:470 +#: src/main/print-lexmark.c:349 src/main/print-pcl.c:1353 msgid "Black Density" msgstr "Densité du noir" -#: src/main/print-canon.c:320 src/main/print-escp2.c:464 -#: src/main/print-lexmark.c:350 src/main/print-pcl.c:1286 +#: src/main/print-canon.c:320 src/main/print-escp2.c:471 +#: src/main/print-lexmark.c:350 src/main/print-pcl.c:1354 msgid "Adjust the black density" msgstr "Ajustement du niveau de densité" #: src/main/print-canon.c:327 src/main/print-canon.c:328 -#: src/main/print-escp2.c:495 src/main/print-escp2.c:496 +#: src/main/print-escp2.c:534 src/main/print-escp2.c:535 #: src/main/print-lexmark.c:357 src/main/print-lexmark.c:358 -#: src/main/print-pcl.c:1293 src/main/print-pcl.c:1294 +#: src/main/print-pcl.c:1361 src/main/print-pcl.c:1362 msgid "Light Cyan Transition" msgstr "Passage cyan clair" #: src/main/print-canon.c:327 src/main/print-canon.c:335 -#: src/main/print-canon.c:343 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-escp2.c:543 -#: src/main/print-escp2.c:551 src/main/print-escp2.c:559 -#: src/main/print-lexmark.c:357 src/main/print-lexmark.c:365 -#: src/main/print-pcl.c:1293 src/main/print-pcl.c:1301 +#: src/main/print-canon.c:343 src/main/print-escp2.c:502 +#: src/main/print-escp2.c:510 src/main/print-escp2.c:518 +#: src/main/print-escp2.c:526 src/main/print-escp2.c:534 +#: src/main/print-escp2.c:542 src/main/print-escp2.c:550 +#: src/main/print-escp2.c:558 src/main/print-escp2.c:566 +#: src/main/print-escp2.c:574 src/main/print-escp2.c:582 +#: src/main/print-escp2.c:590 src/main/print-escp2.c:598 +#: src/main/print-escp2.c:606 src/main/print-escp2.c:614 +#: src/main/print-escp2.c:622 src/main/print-escp2.c:630 +#: src/main/print-escp2.c:638 src/main/print-escp2.c:646 +#: src/main/print-escp2.c:654 src/main/print-escp2.c:662 +#: src/main/print-escp2.c:670 src/main/print-escp2.c:678 +#: src/main/print-escp2.c:686 src/main/print-escp2.c:694 +#: src/main/print-escp2.c:702 src/main/print-escp2.c:710 +#: src/main/print-escp2.c:718 src/main/print-escp2.c:726 +#: src/main/print-escp2.c:734 src/main/print-lexmark.c:357 +#: src/main/print-lexmark.c:365 src/main/print-pcl.c:1361 +#: src/main/print-pcl.c:1369 msgid "Advanced Ink Adjustment" msgstr "Réglage avancé des encres" #: src/main/print-canon.c:335 src/main/print-canon.c:336 -#: src/main/print-escp2.c:503 src/main/print-escp2.c:504 +#: src/main/print-escp2.c:566 src/main/print-escp2.c:567 #: src/main/print-lexmark.c:365 src/main/print-lexmark.c:366 -#: src/main/print-pcl.c:1301 src/main/print-pcl.c:1302 +#: src/main/print-pcl.c:1369 src/main/print-pcl.c:1370 msgid "Light Magenta Transition" msgstr "Transition magenta clair" @@ -398,54 +420,54 @@ msgstr "Transition magenta clair" msgid "Light Yellow Transition" msgstr "Transition jaune clair" -#: src/main/print-canon.c:363 src/main/print-pcl.c:1482 +#: src/main/print-canon.c:363 src/main/print-pcl.c:1550 #: src/main/escp2-resolutions.c:557 src/main/escp2-resolutions.c:565 #: src/main/escp2-resolutions.c:576 src/main/escp2-resolutions.c:588 msgid "Off" msgstr "Désactivé" -#: src/main/print-canon.c:364 src/main/print-pcl.c:1483 +#: src/main/print-canon.c:364 src/main/print-pcl.c:1551 msgid "Long Edge (Standard)" msgstr "Côté long (standard)" -#: src/main/print-canon.c:365 src/main/print-pcl.c:1484 +#: src/main/print-canon.c:365 src/main/print-pcl.c:1552 msgid "Short Edge (Flip)" msgstr "Côté court (retourné)" -#: src/main/print-canon.c:629 src/main/print-escp2.c:1648 +#: src/main/print-canon.c:629 src/main/print-escp2.c:2012 #: src/main/xmli18n-tmp.h:6 msgid "CD - 5 inch" msgstr "CD - 5 pouces" -#: src/main/print-canon.c:631 src/main/print-escp2.c:1650 +#: src/main/print-canon.c:631 src/main/print-escp2.c:2014 #: src/main/xmli18n-tmp.h:7 msgid "CD - 3 inch" msgstr "CD - 3 pouces" -#: src/main/print-canon.c:633 src/main/print-escp2.c:1652 +#: src/main/print-canon.c:633 src/main/print-escp2.c:2016 #: src/main/xmli18n-tmp.h:8 #, fuzzy msgid "CD - Custom" msgstr "Personnalisé" -#: src/main/print-canon.c:656 src/main/print-escp2.c:1677 +#: src/main/print-canon.c:656 src/main/print-escp2.c:2041 msgid "Normal" msgstr "Normal" -#: src/main/print-canon.c:658 src/main/print-escp2.c:1679 +#: src/main/print-canon.c:658 src/main/print-escp2.c:2043 msgid "Print To Hub" msgstr "Imprimer sue le moyeu" -#: src/main/print-canon.c:773 src/main/print-escp2.c:2011 -#: src/main/print-lexmark.c:1279 src/main/print-olympus.c:1996 -#: src/main/print-pcl.c:1776 src/main/print-ps.c:170 src/main/print-raw.c:135 -#: src/gutenprintui/panel.c:289 src/gutenprintui2/panel.c:289 +#: src/main/print-canon.c:773 src/main/print-escp2.c:2450 +#: src/main/print-lexmark.c:1279 src/main/print-olympus.c:1994 +#: src/main/print-pcl.c:1844 src/main/print-ps.c:310 src/main/print-raw.c:135 +#: src/gutenprintui2/panel.c:290 msgid "Color" msgstr "Couleur" -#: src/main/print-canon.c:775 src/main/print-escp2.c:2013 -#: src/main/print-lexmark.c:1281 src/main/print-pcl.c:1778 -#: src/main/print-ps.c:172 src/main/print-raw.c:137 +#: src/main/print-canon.c:775 src/main/print-escp2.c:2452 +#: src/main/print-lexmark.c:1281 src/main/print-pcl.c:1846 +#: src/main/print-ps.c:312 src/main/print-raw.c:137 msgid "Black and White" msgstr "Noir et blanc" @@ -483,7 +505,7 @@ msgstr "Pré-tramé" #: src/main/print-color.c:121 src/main/escp2-channels.c:916 #: src/main/escp2-channels.c:929 src/main/escp2-channels.c:943 -#: src/gutenprintui/panel.c:290 src/gutenprintui2/panel.c:290 +#: src/gutenprintui2/panel.c:291 msgid "Grayscale" msgstr "Niveaux de gris" @@ -507,7 +529,7 @@ msgstr "CMJN" msgid "KCMY" msgstr "NCMJ" -#: src/main/print-color.c:165 src/main/print-color.c:446 +#: src/main/print-color.c:165 src/main/print-color.c:454 msgid "Channel " msgstr "Canal" @@ -563,7 +585,7 @@ msgid "Output image type" msgstr "Type de sortie :" #: src/main/print-color.c:208 src/main/print-color.c:209 -#: src/main/print-escp2.c:347 +#: src/main/print-escp2.c:349 msgid "Raw Channels" msgstr "Canaux raw" @@ -626,14 +648,14 @@ msgstr "" msgid "Gamma value assumed by application" msgstr "Valeur gamma prévue par l'application" -#: src/main/print-color.c:266 src/main/escp2-channels.c:3048 -#: src/main/escp2-channels.c:3060 src/main/escp2-channels.c:3068 -#: src/main/escp2-channels.c:3078 src/main/escp2-channels.c:3089 -#: src/main/escp2-channels.c:3101 src/main/escp2-channels.c:3117 -#: src/main/escp2-channels.c:3125 src/main/escp2-channels.c:3138 -#: src/main/escp2-channels.c:3151 src/main/escp2-channels.c:3165 -#: src/main/escp2-channels.c:3179 src/main/escp2-channels.c:3194 -#: src/gutenprintui/panel.c:2152 src/gutenprintui2/panel.c:2153 +#: src/main/print-color.c:266 src/main/escp2-channels.c:3087 +#: src/main/escp2-channels.c:3099 src/main/escp2-channels.c:3107 +#: src/main/escp2-channels.c:3117 src/main/escp2-channels.c:3128 +#: src/main/escp2-channels.c:3140 src/main/escp2-channels.c:3156 +#: src/main/escp2-channels.c:3164 src/main/escp2-channels.c:3177 +#: src/main/escp2-channels.c:3190 src/main/escp2-channels.c:3204 +#: src/main/escp2-channels.c:3218 src/main/escp2-channels.c:3230 +#: src/main/escp2-channels.c:3243 src/gutenprintui2/panel.c:2328 #: src/escputil/escputil.c:978 src/escputil/escputil.c:997 #: src/escputil/escputil.c:1201 msgid "Cyan" @@ -643,14 +665,14 @@ msgstr "Cyan" msgid "Adjust the cyan gamma" msgstr "Réglage du gamma pour le cyan" -#: src/main/print-color.c:274 src/main/escp2-channels.c:3049 -#: src/main/escp2-channels.c:3059 src/main/escp2-channels.c:3070 -#: src/main/escp2-channels.c:3079 src/main/escp2-channels.c:3090 -#: src/main/escp2-channels.c:3103 src/main/escp2-channels.c:3116 -#: src/main/escp2-channels.c:3126 src/main/escp2-channels.c:3139 -#: src/main/escp2-channels.c:3152 src/main/escp2-channels.c:3164 -#: src/main/escp2-channels.c:3178 src/main/escp2-channels.c:3195 -#: src/gutenprintui/panel.c:2159 src/gutenprintui2/panel.c:2160 +#: src/main/print-color.c:274 src/main/escp2-channels.c:3088 +#: src/main/escp2-channels.c:3098 src/main/escp2-channels.c:3109 +#: src/main/escp2-channels.c:3118 src/main/escp2-channels.c:3129 +#: src/main/escp2-channels.c:3142 src/main/escp2-channels.c:3155 +#: src/main/escp2-channels.c:3165 src/main/escp2-channels.c:3178 +#: src/main/escp2-channels.c:3191 src/main/escp2-channels.c:3203 +#: src/main/escp2-channels.c:3217 src/main/escp2-channels.c:3229 +#: src/main/escp2-channels.c:3244 src/gutenprintui2/panel.c:2335 #: src/escputil/escputil.c:979 src/escputil/escputil.c:998 #: src/escputil/escputil.c:1202 msgid "Magenta" @@ -660,14 +682,14 @@ msgstr "Magenta" msgid "Adjust the magenta gamma" msgstr "Réglage du gamma pour le magenta" -#: src/main/print-color.c:282 src/main/escp2-channels.c:3050 -#: src/main/escp2-channels.c:3061 src/main/escp2-channels.c:3069 -#: src/main/escp2-channels.c:3080 src/main/escp2-channels.c:3091 -#: src/main/escp2-channels.c:3105 src/main/escp2-channels.c:3112 -#: src/main/escp2-channels.c:3127 src/main/escp2-channels.c:3140 -#: src/main/escp2-channels.c:3153 src/main/escp2-channels.c:3163 -#: src/main/escp2-channels.c:3177 src/main/escp2-channels.c:3196 -#: src/gutenprintui/panel.c:2166 src/gutenprintui2/panel.c:2167 +#: src/main/print-color.c:282 src/main/escp2-channels.c:3089 +#: src/main/escp2-channels.c:3100 src/main/escp2-channels.c:3108 +#: src/main/escp2-channels.c:3119 src/main/escp2-channels.c:3130 +#: src/main/escp2-channels.c:3144 src/main/escp2-channels.c:3151 +#: src/main/escp2-channels.c:3166 src/main/escp2-channels.c:3179 +#: src/main/escp2-channels.c:3192 src/main/escp2-channels.c:3202 +#: src/main/escp2-channels.c:3216 src/main/escp2-channels.c:3228 +#: src/main/escp2-channels.c:3245 src/gutenprintui2/panel.c:2342 #: src/escputil/escputil.c:980 src/escputil/escputil.c:999 #: src/escputil/escputil.c:1203 msgid "Yellow" @@ -677,10 +699,9 @@ msgstr "Jaune" msgid "Adjust the yellow gamma" msgstr "Réglage du gamma pour le jaune" -#: src/main/print-color.c:290 src/main/escp2-channels.c:3168 -#: src/main/escp2-channels.c:3181 src/gutenprintui/panel.c:2180 -#: src/gutenprintui2/panel.c:2181 src/escputil/escputil.c:987 -#: src/escputil/escputil.c:1005 +#: src/main/print-color.c:290 src/main/escp2-channels.c:3207 +#: src/main/escp2-channels.c:3220 src/gutenprintui2/panel.c:2356 +#: src/escputil/escputil.c:987 src/escputil/escputil.c:1005 msgid "Red" msgstr "Rouge" @@ -688,8 +709,7 @@ msgstr "Rouge" msgid "Adjust the red gamma" msgstr "Réglage du gamma pour le rouge" -#: src/main/print-color.c:298 src/gutenprintui/panel.c:2187 -#: src/gutenprintui2/panel.c:2188 +#: src/main/print-color.c:298 src/gutenprintui2/panel.c:2363 msgid "Green" msgstr "Vert" @@ -697,10 +717,9 @@ msgstr "Vert" msgid "Adjust the green gamma" msgstr "Réglage du gamma pour le vert" -#: src/main/print-color.c:306 src/main/escp2-channels.c:3169 -#: src/main/escp2-channels.c:3182 src/gutenprintui/panel.c:2194 -#: src/gutenprintui2/panel.c:2195 src/escputil/escputil.c:988 -#: src/escputil/escputil.c:1006 +#: src/main/print-color.c:306 src/main/escp2-channels.c:3208 +#: src/main/escp2-channels.c:3221 src/gutenprintui2/panel.c:2370 +#: src/escputil/escputil.c:988 src/escputil/escputil.c:1006 msgid "Blue" msgstr "Bleu" @@ -709,14 +728,14 @@ msgid "Adjust the blue gamma" msgstr "Réglage du gamma pour le bleu" #: src/main/print-color.c:314 src/main/print-lexmark.c:613 -#: src/main/escp2-channels.c:3047 src/main/escp2-channels.c:3057 -#: src/main/escp2-channels.c:3058 src/main/escp2-channels.c:3071 -#: src/main/escp2-channels.c:3081 src/main/escp2-channels.c:3088 -#: src/main/escp2-channels.c:3100 src/main/escp2-channels.c:3113 -#: src/main/escp2-channels.c:3124 src/main/escp2-channels.c:3137 -#: src/main/escp2-channels.c:3150 src/main/escp2-channels.c:3156 -#: src/main/escp2-channels.c:3180 src/main/escp2-channels.c:3193 -#: src/gutenprintui/panel.c:2173 src/gutenprintui2/panel.c:2174 +#: src/main/escp2-channels.c:3086 src/main/escp2-channels.c:3096 +#: src/main/escp2-channels.c:3097 src/main/escp2-channels.c:3110 +#: src/main/escp2-channels.c:3120 src/main/escp2-channels.c:3127 +#: src/main/escp2-channels.c:3139 src/main/escp2-channels.c:3152 +#: src/main/escp2-channels.c:3163 src/main/escp2-channels.c:3176 +#: src/main/escp2-channels.c:3189 src/main/escp2-channels.c:3195 +#: src/main/escp2-channels.c:3219 src/main/escp2-channels.c:3231 +#: src/main/escp2-channels.c:3242 src/gutenprintui2/panel.c:2349 #: src/escputil/escputil.c:975 src/escputil/escputil.c:996 #: src/escputil/escputil.c:1200 msgid "Black" @@ -726,7 +745,7 @@ msgstr "Noir" msgid "Adjust the black gamma" msgstr "Réglage du gamma pour le noir" -#: src/main/print-color.c:322 src/main/print-olympus.c:1764 +#: src/main/print-color.c:322 src/main/print-olympus.c:1762 msgid "Cyan Balance" msgstr "Niveau de cyan" @@ -739,7 +758,7 @@ msgstr "Balance des gris" msgid "Adjust the cyan gray balance" msgstr "Réglage du cyan pour la balance des gris" -#: src/main/print-color.c:330 src/main/print-olympus.c:1772 +#: src/main/print-color.c:330 src/main/print-olympus.c:1770 msgid "Magenta Balance" msgstr "Niveau de magenta" @@ -747,7 +766,7 @@ msgstr "Niveau de magenta" msgid "Adjust the magenta gray balance" msgstr "Réglage du magenta pour la balance des gris" -#: src/main/print-color.c:338 src/main/print-olympus.c:1780 +#: src/main/print-color.c:338 src/main/print-olympus.c:1778 msgid "Yellow Balance" msgstr "Niveau de jaune" @@ -774,9 +793,11 @@ 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:353 -#: src/main/print-escp2.c:359 src/main/print-escp2.c:365 -#: src/main/print-escp2.c:371 src/main/print-escp2.c:377 +#: src/main/print-color.c:421 src/main/print-color.c:553 +#: src/main/print-escp2.c:355 src/main/print-escp2.c:361 +#: src/main/print-escp2.c:367 src/main/print-escp2.c:373 +#: src/main/print-escp2.c:379 src/main/print-escp2.c:742 +#: src/main/print-escp2.c:750 src/main/print-escp2.c:758 msgid "Advanced Output Control" msgstr "Controle avancé de la sortie" @@ -786,218 +807,226 @@ msgstr "" "Limite l'encre utilisée au total\n" "(peut être laissé au nombre d'encres)" -#: src/main/print-color.c:365 +#: src/main/print-color.c:365 src/main/print-escp2.c:742 msgid "GCR Transition" msgstr "Transition GCR" -#: src/main/print-color.c:366 +#: src/main/print-color.c:366 src/main/print-escp2.c:743 msgid "Adjust the gray component transition rate" msgstr "Régle le taux de transition de la composante gris" -#: src/main/print-color.c:373 +#: src/main/print-color.c:373 src/main/print-escp2.c:750 msgid "GCR Lower Bound" msgstr "Limite basse GCR" -#: src/main/print-color.c:374 +#: src/main/print-color.c:374 src/main/print-escp2.c:751 msgid "Lower bound of gray component reduction" msgstr "Limite basse de la composante gris" -#: src/main/print-color.c:381 +#: src/main/print-color.c:381 src/main/print-escp2.c:758 msgid "GCR Upper Bound" msgstr "Limite haute GCR" -#: src/main/print-color.c:382 +#: src/main/print-color.c:382 src/main/print-escp2.c:759 msgid "Upper bound of gray component reduction" msgstr "Limite haute de la composante gris" -#: src/main/print-color.c:447 src/main/print-color.c:457 -#: src/main/print-color.c:465 src/main/print-color.c:473 -#: src/main/print-color.c:481 src/main/print-color.c:489 -#: src/main/print-color.c:497 src/main/print-color.c:505 -#: src/main/print-color.c:513 +#: src/main/print-color.c:421 +msgid "LUT dump file" +msgstr "" + +#: src/main/print-color.c:422 +msgid "Dump file for LUT for external color adjustment" +msgstr "" + +#: src/main/print-color.c:455 src/main/print-color.c:465 +#: src/main/print-color.c:473 src/main/print-color.c:481 +#: src/main/print-color.c:489 src/main/print-color.c:497 +#: src/main/print-color.c:505 src/main/print-color.c:513 +#: src/main/print-color.c:521 msgid "Output Curves" msgstr "Courbes de sortie" -#: src/main/print-color.c:447 +#: src/main/print-color.c:455 msgid "Curve for raw channel " msgstr "Courbe pour données brutes (raw)" -#: src/main/print-color.c:457 +#: src/main/print-color.c:465 msgid "Cyan Curve" msgstr "Courbe cyan" -#: src/main/print-color.c:458 +#: src/main/print-color.c:466 msgid "Cyan curve" msgstr "Courbe cyan" -#: src/main/print-color.c:465 +#: src/main/print-color.c:473 msgid "Magenta Curve" msgstr "Courbe magenta" -#: src/main/print-color.c:466 +#: src/main/print-color.c:474 msgid "Magenta curve" msgstr "Courbe magenta" -#: src/main/print-color.c:473 +#: src/main/print-color.c:481 msgid "Yellow Curve" msgstr "Courbe jaune" -#: src/main/print-color.c:474 +#: src/main/print-color.c:482 msgid "Yellow curve" msgstr "Courbe jaune" -#: src/main/print-color.c:481 +#: src/main/print-color.c:489 msgid "Black Curve" msgstr "Courbe noir" -#: src/main/print-color.c:482 +#: src/main/print-color.c:490 msgid "Black curve" msgstr "Courbe noir" -#: src/main/print-color.c:489 +#: src/main/print-color.c:497 msgid "Red Curve" msgstr "Courbe rouge" -#: src/main/print-color.c:490 +#: src/main/print-color.c:498 msgid "Red curve" msgstr "Courbe rouge" -#: src/main/print-color.c:497 +#: src/main/print-color.c:505 msgid "Green Curve" msgstr "Courbe vert" -#: src/main/print-color.c:498 +#: src/main/print-color.c:506 msgid "Green curve" msgstr "Courbe vert" -#: src/main/print-color.c:505 +#: src/main/print-color.c:513 msgid "Blue Curve" msgstr "Courbe bleu" -#: src/main/print-color.c:506 +#: src/main/print-color.c:514 msgid "Blue curve" msgstr "Courbe bleu" -#: src/main/print-color.c:513 +#: src/main/print-color.c:521 msgid "White Curve" msgstr "Courbe blanc" -#: src/main/print-color.c:514 +#: src/main/print-color.c:522 msgid "White curve" msgstr "Courbe blanc" -#: src/main/print-color.c:521 +#: src/main/print-color.c:529 msgid "Hue Map" msgstr "Carte Hue" -#: src/main/print-color.c:521 src/main/print-color.c:529 -#: src/main/print-color.c:537 +#: src/main/print-color.c:529 src/main/print-color.c:537 +#: src/main/print-color.c:545 msgid "Advanced HSL Curves" msgstr "Courbes HSL avancées" -#: src/main/print-color.c:522 +#: src/main/print-color.c:530 msgid "Hue adjustment curve" msgstr "Courbe de réglage fin HUE" -#: src/main/print-color.c:529 +#: src/main/print-color.c:537 msgid "Saturation Map" msgstr "Carte de saturation" -#: src/main/print-color.c:530 +#: src/main/print-color.c:538 msgid "Saturation adjustment curve" msgstr "Courbe de réglage de la saturation" -#: src/main/print-color.c:537 +#: src/main/print-color.c:545 msgid "Luminosity Map" msgstr "Carte de luminosité" -#: src/main/print-color.c:538 +#: src/main/print-color.c:546 msgid "Luminosity adjustment curve" msgstr "Courbe de réglage de la luminosité" -#: src/main/print-color.c:545 +#: src/main/print-color.c:553 msgid "Gray Component Reduction" msgstr "Composante gris" -#: src/main/print-color.c:546 +#: src/main/print-color.c:554 msgid "Gray component reduction curve" msgstr "Courbe de la composante gris" -#: src/main/print-color.c:1670 +#: src/main/print-color.c:1743 msgid "Traditional Gutenprint color conversion" msgstr "Conversion de couleur traditionelle Gutenprint" -#: src/main/printers.c:517 +#: src/main/printers.c:514 #, c-format msgid "Value must be set for %s\n" msgstr "Valeur à définir pour: %s\n" -#: src/main/printers.c:530 src/main/printers.c:535 +#: src/main/printers.c:527 src/main/printers.c:532 #, c-format msgid "`%s' is not a valid %s\n" msgstr "%s n'est pas une valeur valide pour %s\n" -#: src/main/printers.c:554 +#: src/main/printers.c:551 #, c-format msgid "%s must be between %f and %f (is %f)\n" msgstr "%s doit être entre %f et %f (actuellement %f)\n" -#: src/main/printers.c:576 src/main/printers.c:600 +#: src/main/printers.c:573 src/main/printers.c:597 #, c-format msgid "%s must be between %d and %d (is %d)\n" msgstr "%s doit être entre %d et %d (actuellement %d)\n" -#: src/main/printers.c:631 +#: src/main/printers.c:628 #, c-format msgid "%s bounds must be between %f and %f\n" msgstr "%s limites doivent être entre %f et %f\n" -#: src/main/printers.c:639 +#: src/main/printers.c:636 #, c-format msgid "%s wrap mode must be %s\n" msgstr "%s wrap mode doit être %s\n" -#: src/main/printers.c:643 +#: src/main/printers.c:640 msgid "no wrap" msgstr "" -#: src/main/printers.c:643 +#: src/main/printers.c:640 msgid "wrap around" msgstr "" -#: src/main/printers.c:687 +#: src/main/printers.c:684 #, c-format msgid "Unknown type parameter %s (%d)\n" msgstr "paramètre de type inconnu %s (%d)\n" -#: src/main/printers.c:700 src/main/printers.c:711 +#: src/main/printers.c:697 src/main/printers.c:708 #, c-format msgid "%s out of range (value %d, min %d, max %d)\n" msgstr "%s hors-intervalle (valeur %d, mini %d, maxi %d)\n" -#: src/main/printers.c:772 +#: src/main/printers.c:768 msgid "Page size is not valid\n" msgstr "La taille de la page n'est pas valide\n" -#: src/main/printers.c:793 +#: src/main/printers.c:789 #, c-format msgid "Top margin must not be less than %d\n" msgstr "La marge supérieure ne doit pas être plus petite que %d\n" -#: src/main/printers.c:799 +#: src/main/printers.c:795 #, c-format msgid "Left margin must not be less than %d\n" msgstr "La marge gauche ne doit pas être plus petite que %d\n" -#: src/main/printers.c:805 +#: src/main/printers.c:801 msgid "Height must be greater than zero\n" msgstr "La hauteur doit être supérieure à zéro\n" -#: src/main/printers.c:811 +#: src/main/printers.c:807 msgid "Width must be greater than zero\n" msgstr "La largeur doit être plus grande que zéro\n" -#: src/main/printers.c:817 +#: src/main/printers.c:813 #, c-format msgid "" "Image is too wide for the page: left margin is %d, width %d, right edge is %" @@ -1006,7 +1035,7 @@ msgstr "" "L'image est trop large pour la page: marge gauche %d, largeur %d, bord droit " "%d\n" -#: src/main/printers.c:824 +#: src/main/printers.c:820 #, c-format msgid "" "Image is too long for the page: top margin is %d, height %d, bottom edge is %" @@ -1015,280 +1044,389 @@ msgstr "" "L'image est trop haute pour la page: marge en haut %d, hauteur %d, bord du " "bas %d\n" -#: src/main/print-escp2.c:162 +#: src/main/print-escp2.c:164 msgid "Automatic Printing Mode" msgstr "Mode d'impression automatique" -#: src/main/print-escp2.c:162 src/main/print-escp2.c:174 +#: src/main/print-escp2.c:164 src/main/print-escp2.c:176 #: src/main/generic-options.c:62 msgid "Basic Output Adjustment" msgstr "Réglage de base" -#: src/main/print-escp2.c:163 +#: src/main/print-escp2.c:165 msgid "Automatic printing mode" msgstr "Mode d'impression automatique" -#: src/main/print-escp2.c:174 src/main/print-escp2.c:175 +#: src/main/print-escp2.c:176 src/main/print-escp2.c:177 #: src/main/generic-options.c:62 src/main/generic-options.c:63 msgid "Print Quality" msgstr "Qualité d'impression" -#: src/main/print-escp2.c:229 +#: src/main/print-escp2.c:231 msgid "Resolution of the print" msgstr "Résolution de l'impression" -#: src/main/print-escp2.c:245 +#: src/main/print-escp2.c:247 msgid "Enhanced Gloss" msgstr "Amélioration de la brillance" -#: src/main/print-escp2.c:246 +#: src/main/print-escp2.c:248 msgid "Add gloss enhancement" msgstr "Ajouter l'amélioration de brillance" -#: src/main/print-escp2.c:251 +#: src/main/print-escp2.c:253 msgid "Ink Set" msgstr "Jeu d'encres" -#: src/main/print-escp2.c:257 +#: src/main/print-escp2.c:259 msgid "Printing Direction" msgstr "Sens d'impression" -#: src/main/print-escp2.c:257 src/main/print-escp2.c:269 +#: src/main/print-escp2.c:259 src/main/print-escp2.c:271 msgid "Advanced Output Adjustment" msgstr "Réglage avancé de sorties" -#: src/main/print-escp2.c:258 +#: src/main/print-escp2.c:260 msgid "Printing direction (unidirectional is higher quality, but slower)" msgstr "" "Sens d'impression (unidirectionnel est de meilleure qualité mais plus lent)" -#: src/main/print-escp2.c:263 src/main/print-olympus.c:1735 +#: src/main/print-escp2.c:265 src/main/print-olympus.c:1733 msgid "Borderless" msgstr "sans marges" -#: src/main/print-escp2.c:264 src/main/print-olympus.c:1736 +#: src/main/print-escp2.c:266 src/main/print-olympus.c:1734 msgid "Print without borders" msgstr "Impression sans marges" -#: src/main/print-escp2.c:269 +#: src/main/print-escp2.c:271 msgid "Interleave Method" msgstr "Méthode d'entrelacement" -#: src/main/print-escp2.c:270 +#: src/main/print-escp2.c:272 msgid "Interleave pattern to use" msgstr "Motif d'entrelacement" -#: src/main/print-escp2.c:275 +#: src/main/print-escp2.c:277 msgid "Adjust dot size as necessary" msgstr "Ajuster la taille des gouttes si nécessaire" -#: src/main/print-escp2.c:276 +#: src/main/print-escp2.c:278 msgid "Adjust dot size as necessary to achieve desired density" msgstr "" "Ajuster la taille des gouttes si nécessaire pour obtenir la densité souhaitée" -#: src/main/print-escp2.c:281 src/main/print-escp2.c:282 +#: src/main/print-escp2.c:283 src/main/print-escp2.c:284 msgid "Output Order" msgstr "Ordre de sortie" -#: src/main/print-escp2.c:287 src/main/print-escp2.c:288 +#: src/main/print-escp2.c:289 src/main/print-escp2.c:290 msgid "Alignment Passes" msgstr "" -#: src/main/print-escp2.c:293 src/main/print-escp2.c:294 +#: src/main/print-escp2.c:295 src/main/print-escp2.c:296 msgid "Alignment Choices" msgstr "" -#: src/main/print-escp2.c:299 src/main/print-escp2.c:300 +#: src/main/print-escp2.c:301 src/main/print-escp2.c:302 msgid "Ink change command" msgstr "Commande de changement d'encre" -#: src/main/print-escp2.c:305 src/main/print-escp2.c:306 +#: src/main/print-escp2.c:307 src/main/print-escp2.c:308 msgid "Alternate Alignment Passes" msgstr "" -#: src/main/print-escp2.c:311 src/main/print-escp2.c:312 +#: src/main/print-escp2.c:313 src/main/print-escp2.c:314 msgid "Alternate Alignment Choices" msgstr "Choix d'alignement alternatif" -#: src/main/print-escp2.c:317 +#: src/main/print-escp2.c:319 msgid "Supports Packet Mode" msgstr "Supporte le mode paquet" -#: src/main/print-escp2.c:318 +#: src/main/print-escp2.c:320 #, fuzzy msgid "Supports D4 Packet Mode" msgstr "Supporte le mode paquet" -#: src/main/print-escp2.c:323 +#: src/main/print-escp2.c:325 msgid "Has Interchangeable Ink Cartridges" msgstr "" -#: src/main/print-escp2.c:324 +#: src/main/print-escp2.c:326 msgid "Has multiple choices of ink cartridges" msgstr "" -#: src/main/print-escp2.c:335 src/main/print-escp2.c:336 +#: src/main/print-escp2.c:337 src/main/print-escp2.c:338 msgid "Channel Names" msgstr "Nom des canaux" -#: src/main/print-escp2.c:348 +#: src/main/print-escp2.c:350 msgid "Raw Channel Count" msgstr "" -#: src/main/print-escp2.c:353 +#: src/main/print-escp2.c:355 msgid "Cyan Map" msgstr "Carte du cyan" -#: src/main/print-escp2.c:354 +#: src/main/print-escp2.c:356 msgid "Adjust the cyan map" msgstr "Modification de la carte du cyan" -#: src/main/print-escp2.c:359 +#: src/main/print-escp2.c:361 msgid "Magenta Map" msgstr "Carte du magenta" -#: src/main/print-escp2.c:360 +#: src/main/print-escp2.c:362 msgid "Adjust the magenta map" msgstr "Modification de la carte du majenta" -#: src/main/print-escp2.c:365 +#: src/main/print-escp2.c:367 msgid "Yellow Map" msgstr "Carte du jaune" -#: src/main/print-escp2.c:366 +#: src/main/print-escp2.c:368 msgid "Adjust the yellow map" msgstr "Modification de la carte du jaune" -#: src/main/print-escp2.c:371 +#: src/main/print-escp2.c:373 msgid "Blue Map" msgstr "Carte du bleu" -#: src/main/print-escp2.c:372 +#: src/main/print-escp2.c:374 msgid "Adjust the blue map" msgstr "Modification de la carte du bleu" -#: src/main/print-escp2.c:377 +#: src/main/print-escp2.c:379 msgid "Red Map" msgstr "Carte du rouge" -#: src/main/print-escp2.c:378 +#: src/main/print-escp2.c:380 msgid "Adjust the red map" msgstr "Modification de la carte du rouge" -#: src/main/print-escp2.c:471 +#: src/main/print-escp2.c:478 msgid "Red Density" msgstr "Densité du rouge" -#: src/main/print-escp2.c:472 +#: src/main/print-escp2.c:479 msgid "Adjust the red density" msgstr "Ajuste la densité du rouge" -#: src/main/print-escp2.c:479 +#: src/main/print-escp2.c:486 msgid "Blue Density" msgstr "Densité du bleu" -#: src/main/print-escp2.c:480 +#: src/main/print-escp2.c:487 msgid "Adjust the blue density" msgstr "Ajuste la densité du bleu" -#: src/main/print-escp2.c:487 +#: src/main/print-escp2.c:494 msgid "Gloss Level" msgstr "Niveau de brillance" -#: src/main/print-escp2.c:488 +#: src/main/print-escp2.c:495 msgid "Adjust the gloss level" msgstr "Ajuste le niveau de brillance" -#: src/main/print-escp2.c:511 src/main/print-escp2.c:512 +#: src/main/print-escp2.c:502 +msgid "Drop Size Small" +msgstr "" + +#: src/main/print-escp2.c:503 +msgid "Drop Size 1 (small)" +msgstr "" + +#: src/main/print-escp2.c:510 +msgid "Drop Size Medium" +msgstr "" + +#: src/main/print-escp2.c:511 +msgid "Drop Size 2 (medium)" +msgstr "" + +#: src/main/print-escp2.c:518 +msgid "Drop Size Large" +msgstr "" + +#: src/main/print-escp2.c:519 +msgid "Drop Size 3 (large)" +msgstr "" + +#: src/main/print-escp2.c:526 src/main/print-escp2.c:527 +#, fuzzy +msgid "Light Cyan Value" +msgstr "Cyan clair" + +#: src/main/print-escp2.c:542 src/main/print-escp2.c:543 +#, fuzzy +msgid "Light Cyan Density Scale" +msgstr "Densité cyan" + +#: src/main/print-escp2.c:550 src/main/print-escp2.c:551 +#, fuzzy +msgid "Light Magenta Value" +msgstr "Magenta clair" + +#: src/main/print-escp2.c:558 src/main/print-escp2.c:559 +#, fuzzy +msgid "Light Magenta Density Scale" +msgstr "Densité magenta" + +#: src/main/print-escp2.c:574 src/main/print-escp2.c:575 +#, fuzzy +msgid "Dark Yellow Value" +msgstr "Jaune foncé" + +#: src/main/print-escp2.c:582 src/main/print-escp2.c:583 msgid "Dark Yellow Transition" msgstr "transition jaune foncé" -#: src/main/print-escp2.c:519 src/main/print-escp2.c:520 -#: src/main/print-escp2.c:527 src/main/print-escp2.c:528 +#: src/main/print-escp2.c:590 src/main/print-escp2.c:591 +#, fuzzy +msgid "Dark Yellow Density Scale" +msgstr "Densité jaune" + +#: src/main/print-escp2.c:598 src/main/print-escp2.c:599 +#: src/main/print-escp2.c:622 src/main/print-escp2.c:623 +#, fuzzy +msgid "Gray Value" +msgstr "Niveaux de gris" + +#: src/main/print-escp2.c:606 src/main/print-escp2.c:607 +#: src/main/print-escp2.c:630 src/main/print-escp2.c:631 msgid "Gray Transition" msgstr "Transition gris" -#: src/main/print-escp2.c:535 src/main/print-escp2.c:536 -#: src/main/print-escp2.c:559 src/main/print-escp2.c:560 +#: src/main/print-escp2.c:614 src/main/print-escp2.c:615 +#: src/main/print-escp2.c:638 src/main/print-escp2.c:639 +#, fuzzy +msgid "Gray Density Scale" +msgstr "Niveaux de gris" + +#: src/main/print-escp2.c:646 src/main/print-escp2.c:647 +#: src/main/print-escp2.c:718 src/main/print-escp2.c:719 +#, fuzzy +msgid "Light Gray Value" +msgstr "Transition cyan clair" + +#: src/main/print-escp2.c:654 src/main/print-escp2.c:655 +#: src/main/print-escp2.c:726 src/main/print-escp2.c:727 msgid "Light Gray Transition" msgstr "Transition cyan clair" -#: src/main/print-escp2.c:543 src/main/print-escp2.c:544 +#: src/main/print-escp2.c:662 src/main/print-escp2.c:663 +#: src/main/print-escp2.c:734 src/main/print-escp2.c:735 +#, fuzzy +msgid "Light Gray Density Scale" +msgstr "Transition cyan clair" + +#: src/main/print-escp2.c:670 src/main/print-escp2.c:671 +#, fuzzy +msgid "Dark Gray Value" +msgstr "Transition gris foncé" + +#: src/main/print-escp2.c:678 src/main/print-escp2.c:679 msgid "Dark Gray Transition" msgstr "Transition gris foncé" -#: src/main/print-escp2.c:551 +#: src/main/print-escp2.c:686 src/main/print-escp2.c:687 +#, fuzzy +msgid "Dark Gray Density Scale" +msgstr "Transition gris foncé" + +#: src/main/print-escp2.c:694 +#, fuzzy +msgid "Mid Gray Value" +msgstr "Niveaux de gris" + +#: src/main/print-escp2.c:695 +#, fuzzy +msgid "Medium Gray Value" +msgstr "Transition gris moyen" + +#: src/main/print-escp2.c:702 msgid "Mid Gray Transition" msgstr "Transition gris médian" -#: src/main/print-escp2.c:552 +#: src/main/print-escp2.c:703 msgid "Medium Gray Transition" msgstr "Transition gris moyen" -#: src/main/print-escp2.c:1635 +#: src/main/print-escp2.c:710 +#, fuzzy +msgid "Mid Gray Density Scale" +msgstr "Transition gris médian" + +#: src/main/print-escp2.c:711 +#, fuzzy +msgid "Medium Gray Density Scale" +msgstr "Transition gris moyen" + +#: src/main/print-escp2.c:1999 msgid "Full Manual Control" msgstr "Contrôle manuel complet" -#: src/main/print-escp2.c:1637 +#: src/main/print-escp2.c:2001 msgid "Automatic Setting Control" msgstr "Controle réglage automatique" -#: src/main/print-escp2.c:1732 src/main/generic-options.c:213 +#: src/main/print-escp2.c:2096 src/main/generic-options.c:213 #: src/main/generic-options.c:230 msgid "Manual Control" msgstr "Controle manuel" -#: src/main/print-escp2.c:1771 src/main/print-escp2.c:1863 -#: src/main/print-escp2.c:1875 src/main/print-pcl.c:230 -#: src/main/escp2-channels.c:2805 src/main/escp2-papers.c:1707 -#: src/main/escp2-papers.c:1731 src/main/escp2-papers.c:1764 -#: src/main/escp2-papers.c:1815 src/main/escp2-papers.c:1857 -#: src/main/escp2-papers.c:1899 src/main/escp2-papers.c:1992 -#: src/main/escp2-resolutions.c:640 src/main/escp2-resolutions.c:655 -#: src/main/escp2-resolutions.c:668 src/main/generic-options.c:36 -#: src/gutenprintui/panel.c:2613 src/gutenprintui2/panel.c:2639 +#: src/main/print-escp2.c:2139 src/main/print-escp2.c:2231 +#: src/main/print-escp2.c:2243 src/main/print-pcl.c:237 +#: src/main/escp2-channels.c:2827 src/main/escp2-channels.c:2836 +#: src/main/escp2-papers.c:1718 src/main/escp2-papers.c:1742 +#: src/main/escp2-papers.c:1775 src/main/escp2-papers.c:1826 +#: src/main/escp2-papers.c:1868 src/main/escp2-papers.c:1910 +#: src/main/escp2-papers.c:2003 src/main/escp2-resolutions.c:640 +#: src/main/escp2-resolutions.c:655 src/main/escp2-resolutions.c:670 +#: src/main/escp2-resolutions.c:683 src/main/generic-options.c:36 +#: src/gutenprintui2/panel.c:2814 msgid "Standard" msgstr "Standard" -#: src/main/print-escp2.c:1842 +#: src/main/print-escp2.c:2210 msgid "Automatic" msgstr "Automatique" -#: src/main/print-escp2.c:1844 +#: src/main/print-escp2.c:2212 msgid "Bidirectional" msgstr "Bidirectionnel" -#: src/main/print-escp2.c:1846 +#: src/main/print-escp2.c:2214 msgid "Unidirectional" msgstr "Unirectionnel" -#: src/main/print-escp2.c:1877 +#: src/main/print-escp2.c:2245 msgid "Alternate Fill" msgstr "en alternance" -#: src/main/print-escp2.c:1879 +#: src/main/print-escp2.c:2247 msgid "Ascending Fill" msgstr "en montant" -#: src/main/print-escp2.c:1881 +#: src/main/print-escp2.c:2249 msgid "Descending Fill" msgstr "en descendant" -#: src/main/print-escp2.c:1883 +#: src/main/print-escp2.c:2251 msgid "Ascending Double" msgstr "en montant - double" -#: src/main/print-escp2.c:1885 +#: src/main/print-escp2.c:2253 msgid "Nearest Neighbor Avoidance" msgstr "en évitant les voisins" -#: src/main/print-escp2.c:2328 +#: src/main/print-escp2.c:2771 #, c-format msgid "This printer does not support raw printer output at depth %d\n" msgstr "L'imprimante ne supporte pas les sorties directes en %d bits\n" -#: src/main/print-escp2.c:3436 src/main/print-olympus.c:2451 +#: src/main/print-escp2.c:3934 src/main/print-olympus.c:2449 #: src/main/print-raw.c:217 msgid "Print options not verified; cannot print.\n" msgstr "Options d'impression non vérifiées: ne peut pas imprimer.\n" @@ -1362,109 +1500,109 @@ msgid "Three Color Composite" msgstr "Trois couleurs composite" #: src/main/print-lexmark.c:607 src/main/print-lexmark.c:677 -#: src/main/escp2-channels.c:1540 src/main/escp2-channels.c:1554 -#: src/main/escp2-channels.c:1568 src/main/escp2-channels.c:1582 -#: src/main/escp2-channels.c:1808 src/main/escp2-channels.c:1823 -#: src/main/escp2-channels.c:1838 src/main/escp2-channels.c:1855 +#: src/main/escp2-channels.c:1554 src/main/escp2-channels.c:1568 +#: src/main/escp2-channels.c:1582 src/main/escp2-channels.c:1596 +#: src/main/escp2-channels.c:1822 src/main/escp2-channels.c:1837 +#: src/main/escp2-channels.c:1852 src/main/escp2-channels.c:1869 msgid "Six Color Photo" msgstr "Six couleurs photo" #: src/main/print-lexmark.c:610 src/main/print-lexmark.c:680 -#: src/main/escp2-channels.c:1475 src/main/escp2-channels.c:1489 -#: src/main/escp2-channels.c:1503 src/main/escp2-channels.c:1517 -#: src/main/escp2-channels.c:1752 src/main/escp2-channels.c:1767 -#: src/main/escp2-channels.c:1784 +#: src/main/escp2-channels.c:1489 src/main/escp2-channels.c:1503 +#: src/main/escp2-channels.c:1517 src/main/escp2-channels.c:1531 +#: src/main/escp2-channels.c:1766 src/main/escp2-channels.c:1781 +#: src/main/escp2-channels.c:1798 msgid "Five Color Photo Composite" msgstr "Cinq couleurs photo composite" -#: src/main/print-lexmark.c:856 src/main/escp2-papers.c:1341 -#: src/main/escp2-papers.c:1385 src/main/escp2-papers.c:1429 -#: src/main/escp2-papers.c:1477 src/main/escp2-papers.c:1525 -#: src/main/escp2-papers.c:1569 +#: src/main/print-lexmark.c:856 src/main/escp2-papers.c:1351 +#: src/main/escp2-papers.c:1395 src/main/escp2-papers.c:1439 +#: src/main/escp2-papers.c:1487 src/main/escp2-papers.c:1535 +#: src/main/escp2-papers.c:1579 msgid "Plain Paper" msgstr "Papier ordinaire" -#: src/main/print-lexmark.c:860 src/main/escp2-papers.c:1347 -#: src/main/escp2-papers.c:1391 src/main/escp2-papers.c:1435 -#: src/main/escp2-papers.c:1483 src/main/escp2-papers.c:1531 -#: src/main/escp2-papers.c:1575 +#: src/main/print-lexmark.c:860 src/main/escp2-papers.c:1357 +#: src/main/escp2-papers.c:1401 src/main/escp2-papers.c:1445 +#: src/main/escp2-papers.c:1493 src/main/escp2-papers.c:1541 +#: src/main/escp2-papers.c:1585 msgid "Glossy Film" msgstr "Film brillant" -#: src/main/print-lexmark.c:864 src/main/escp2-papers.c:1349 -#: src/main/escp2-papers.c:1393 src/main/escp2-papers.c:1437 -#: src/main/escp2-papers.c:1485 src/main/escp2-papers.c:1533 -#: src/main/escp2-papers.c:1577 +#: src/main/print-lexmark.c:864 src/main/escp2-papers.c:1359 +#: src/main/escp2-papers.c:1403 src/main/escp2-papers.c:1447 +#: src/main/escp2-papers.c:1495 src/main/escp2-papers.c:1543 +#: src/main/escp2-papers.c:1587 msgid "Transparencies" msgstr "Transparents" -#: src/main/print-lexmark.c:868 src/main/escp2-papers.c:1351 -#: src/main/escp2-papers.c:1395 src/main/escp2-papers.c:1439 -#: src/main/escp2-papers.c:1487 src/main/escp2-papers.c:1535 -#: src/main/escp2-papers.c:1579 +#: src/main/print-lexmark.c:868 src/main/escp2-papers.c:1361 +#: src/main/escp2-papers.c:1405 src/main/escp2-papers.c:1449 +#: src/main/escp2-papers.c:1497 src/main/escp2-papers.c:1545 +#: src/main/escp2-papers.c:1589 msgid "Envelopes" msgstr "Enveloppes" -#: src/main/print-lexmark.c:872 src/main/escp2-papers.c:1355 -#: src/main/escp2-papers.c:1399 src/main/escp2-papers.c:1443 -#: src/main/escp2-papers.c:1491 src/main/escp2-papers.c:1539 -#: src/main/escp2-papers.c:1583 +#: src/main/print-lexmark.c:872 src/main/escp2-papers.c:1365 +#: src/main/escp2-papers.c:1409 src/main/escp2-papers.c:1453 +#: src/main/escp2-papers.c:1501 src/main/escp2-papers.c:1549 +#: src/main/escp2-papers.c:1593 msgid "Matte Paper" msgstr "Papier Mat" -#: src/main/print-lexmark.c:876 src/main/escp2-papers.c:1359 -#: src/main/escp2-papers.c:1403 src/main/escp2-papers.c:1447 -#: src/main/escp2-papers.c:1495 src/main/escp2-papers.c:1543 -#: src/main/escp2-papers.c:1587 +#: src/main/print-lexmark.c:876 src/main/escp2-papers.c:1369 +#: src/main/escp2-papers.c:1413 src/main/escp2-papers.c:1457 +#: src/main/escp2-papers.c:1505 src/main/escp2-papers.c:1553 +#: src/main/escp2-papers.c:1597 msgid "Inkjet Paper" msgstr "Papier jet d'encre" -#: src/main/print-lexmark.c:880 src/main/escp2-papers.c:1361 -#: src/main/escp2-papers.c:1405 src/main/escp2-papers.c:1449 -#: src/main/escp2-papers.c:1497 src/main/escp2-papers.c:1545 -#: src/main/escp2-papers.c:1589 +#: src/main/print-lexmark.c:880 src/main/escp2-papers.c:1371 +#: src/main/escp2-papers.c:1415 src/main/escp2-papers.c:1459 +#: src/main/escp2-papers.c:1507 src/main/escp2-papers.c:1555 +#: src/main/escp2-papers.c:1599 msgid "Photo Quality Inkjet Paper" msgstr "Papier jet d'encre qualité photo" -#: src/main/print-lexmark.c:884 src/main/escp2-papers.c:1363 -#: src/main/escp2-papers.c:1407 src/main/escp2-papers.c:1451 -#: src/main/escp2-papers.c:1499 src/main/escp2-papers.c:1547 -#: src/main/escp2-papers.c:1591 +#: src/main/print-lexmark.c:884 src/main/escp2-papers.c:1373 +#: src/main/escp2-papers.c:1417 src/main/escp2-papers.c:1461 +#: src/main/escp2-papers.c:1509 src/main/escp2-papers.c:1557 +#: src/main/escp2-papers.c:1601 msgid "Photo Paper" msgstr "Papier photo" -#: src/main/print-lexmark.c:888 src/main/escp2-papers.c:1365 -#: src/main/escp2-papers.c:1409 src/main/escp2-papers.c:1453 -#: src/main/escp2-papers.c:1501 src/main/escp2-papers.c:1549 -#: src/main/escp2-papers.c:1593 src/main/escp2-papers.c:1617 +#: src/main/print-lexmark.c:888 src/main/escp2-papers.c:1375 +#: src/main/escp2-papers.c:1419 src/main/escp2-papers.c:1463 +#: src/main/escp2-papers.c:1511 src/main/escp2-papers.c:1559 +#: src/main/escp2-papers.c:1603 src/main/escp2-papers.c:1627 msgid "Premium Glossy Photo Paper" msgstr "Papier glacé photo Premium" -#: src/main/print-lexmark.c:892 src/main/escp2-papers.c:1369 -#: src/main/escp2-papers.c:1413 src/main/escp2-papers.c:1457 -#: src/main/escp2-papers.c:1505 src/main/escp2-papers.c:1553 -#: src/main/escp2-papers.c:1597 +#: src/main/print-lexmark.c:892 src/main/escp2-papers.c:1379 +#: src/main/escp2-papers.c:1423 src/main/escp2-papers.c:1467 +#: src/main/escp2-papers.c:1515 src/main/escp2-papers.c:1563 +#: src/main/escp2-papers.c:1607 msgid "Premium Luster Photo Paper" msgstr "Papier photo Premium Luster" -#: src/main/print-lexmark.c:896 src/main/escp2-papers.c:1371 -#: src/main/escp2-papers.c:1415 src/main/escp2-papers.c:1463 -#: src/main/escp2-papers.c:1511 src/main/escp2-papers.c:1555 -#: src/main/escp2-papers.c:1603 +#: src/main/print-lexmark.c:896 src/main/escp2-papers.c:1381 +#: src/main/escp2-papers.c:1425 src/main/escp2-papers.c:1473 +#: src/main/escp2-papers.c:1521 src/main/escp2-papers.c:1565 +#: src/main/escp2-papers.c:1613 msgid "Photo Quality Glossy Paper" msgstr "Papier glacé qualité photo" -#: src/main/print-lexmark.c:900 src/main/escp2-papers.c:1373 -#: src/main/escp2-papers.c:1417 src/main/escp2-papers.c:1465 -#: src/main/escp2-papers.c:1513 src/main/escp2-papers.c:1557 -#: src/main/escp2-papers.c:1605 +#: src/main/print-lexmark.c:900 src/main/escp2-papers.c:1383 +#: src/main/escp2-papers.c:1427 src/main/escp2-papers.c:1475 +#: src/main/escp2-papers.c:1523 src/main/escp2-papers.c:1567 +#: src/main/escp2-papers.c:1615 msgid "Ilford Heavy Paper" msgstr "Papier épais Ilford" -#: src/main/print-lexmark.c:904 src/main/escp2-papers.c:1377 -#: src/main/escp2-papers.c:1421 src/main/escp2-papers.c:1469 -#: src/main/escp2-papers.c:1517 src/main/escp2-papers.c:1561 -#: src/main/escp2-papers.c:1609 src/main/escp2-papers.c:1619 +#: src/main/print-lexmark.c:904 src/main/escp2-papers.c:1387 +#: src/main/escp2-papers.c:1431 src/main/escp2-papers.c:1479 +#: src/main/escp2-papers.c:1527 src/main/escp2-papers.c:1571 +#: src/main/escp2-papers.c:1619 src/main/escp2-papers.c:1629 msgid "Other" msgstr "Autre" @@ -1480,50 +1618,50 @@ msgstr "Manuel avec pause" msgid "Manual without Pause" msgstr "Manuel sans pause" -#: src/main/print-olympus.c:277 +#: src/main/print-olympus.c:275 msgid "Coated" msgstr "Couché" -#: src/main/print-olympus.c:278 src/cups/genppd.c:1726 src/cups/genppd.c:1753 -#: src/cups/genppd.c:1834 +#: src/main/print-olympus.c:276 src/cups/genppd.c:1732 src/cups/genppd.c:1759 +#: src/cups/genppd.c:1840 msgid "None" msgstr "Aucun" -#: src/main/print-olympus.c:963 src/main/print-olympus.c:1023 -#: src/main/print-olympus.c:1127 +#: src/main/print-olympus.c:961 src/main/print-olympus.c:1021 +#: src/main/print-olympus.c:1125 msgid "Glossy" msgstr "Brillant" -#: src/main/print-olympus.c:964 src/main/print-olympus.c:1024 -#: src/main/print-olympus.c:1128 +#: src/main/print-olympus.c:962 src/main/print-olympus.c:1022 +#: src/main/print-olympus.c:1126 msgid "Texture" msgstr "Texture" -#: src/main/print-olympus.c:1025 src/main/print-olympus.c:1129 +#: src/main/print-olympus.c:1023 src/main/print-olympus.c:1127 msgid "Matte" msgstr "Mat" -#: src/main/print-olympus.c:1729 src/main/print-olympus.c:1730 +#: src/main/print-olympus.c:1727 src/main/print-olympus.c:1728 msgid "Laminate Pattern" msgstr "Motif du vernis protecteur" -#: src/main/print-olympus.c:1765 +#: src/main/print-olympus.c:1763 msgid "Adjust the cyan balance" msgstr "Réglage balance cyan" -#: src/main/print-olympus.c:1773 +#: src/main/print-olympus.c:1771 msgid "Adjust the magenta balance" msgstr "Réglage balance magenta" -#: src/main/print-olympus.c:1781 +#: src/main/print-olympus.c:1779 msgid "Adjust the yellow balance" msgstr "Réglage balance jaune" -#: src/main/print-olympus.c:1788 +#: src/main/print-olympus.c:1786 msgid "Black Balance" msgstr "Balance du noir" -#: src/main/print-olympus.c:1789 +#: src/main/print-olympus.c:1787 msgid "Adjust the black balance" msgstr "Réglage de la balance du noir" @@ -1555,91 +1693,115 @@ msgstr "Photo séchage rapide" msgid "Quick-dry Transparency" msgstr "Transparent séchage rapide" -#: src/main/print-pcl.c:231 src/main/xmli18n-tmp.h:16 +#: src/main/print-pcl.c:238 src/main/xmli18n-tmp.h:17 msgid "Manual" msgstr "Manuel" -#: src/main/print-pcl.c:233 +#: src/main/print-pcl.c:240 +msgid "Tray 1 - Movable Guides" +msgstr "" + +#: src/main/print-pcl.c:241 msgid "Tray 1" msgstr "Bac 1" -#: src/main/print-pcl.c:234 src/main/print-pcl.c:240 +#: src/main/print-pcl.c:242 +msgid "Tray 2 - Movable Guides" +msgstr "" + +#: src/main/print-pcl.c:243 src/main/print-pcl.c:251 msgid "Tray 2" msgstr "Bac 2" -#: src/main/print-pcl.c:235 +#: src/main/print-pcl.c:244 +msgid "Tray 3 - Movable Guides" +msgstr "" + +#: src/main/print-pcl.c:245 msgid "Tray 3" msgstr "Bac 3" -#: src/main/print-pcl.c:236 +#: src/main/print-pcl.c:246 +msgid "Tray 4 - Movable Guides" +msgstr "" + +#: src/main/print-pcl.c:247 msgid "Tray 4" msgstr "Bac 4" -#: src/main/print-pcl.c:237 +#: src/main/print-pcl.c:248 msgid "Portable Sheet Feeder" msgstr "Chargeur de feuille portable" -#: src/main/print-pcl.c:238 +#: src/main/print-pcl.c:249 msgid "Desktop Sheet Feeder" msgstr "Chargeur de feuille de bureau" -#: src/main/print-pcl.c:239 +#: src/main/print-pcl.c:250 msgid "Tray" msgstr "Bac" -#: src/main/print-pcl.c:241 +#: src/main/print-pcl.c:252 msgid "Optional Source" msgstr "Source optionnelle" -#: src/main/print-pcl.c:242 +#: src/main/print-pcl.c:253 msgid "Autoselect" msgstr "Sélection auto" -#: src/main/print-pcl.c:256 +#: src/main/print-pcl.c:267 msgid "150x150 DPI" msgstr "150x150 PPP" -#: src/main/print-pcl.c:257 +#: src/main/print-pcl.c:268 msgid "300x300 DPI" msgstr "300x300 PPP" -#: src/main/print-pcl.c:258 +#: src/main/print-pcl.c:269 msgid "600x300 DPI" msgstr "600x300 PPP" -#: src/main/print-pcl.c:259 +#: src/main/print-pcl.c:270 msgid "600x600 DPI monochrome" msgstr "600 x 600 ppp Monochrome" -#: src/main/print-pcl.c:260 +#: src/main/print-pcl.c:271 msgid "600x600 DPI" msgstr "600x600 PPP" -#: src/main/print-pcl.c:261 +#: src/main/print-pcl.c:272 msgid "1200x600 DPI" msgstr "1200x600 PPP" -#: src/main/print-pcl.c:262 +#: src/main/print-pcl.c:273 msgid "2400x600 DPI" msgstr "2400 x 600 ppp" -#: src/main/print-pcl.c:1470 +#: src/main/print-pcl.c:1538 msgid "Color + Black Cartridges" msgstr "Cartouches couleur et noir" -#: src/main/print-pcl.c:1471 +#: src/main/print-pcl.c:1539 msgid "Color + Photo Cartridges" msgstr "Cartouches couleur et photo" -#: src/main/print-ps.c:97 +#: src/main/print-ps.c:68 msgid "PPDFile" msgstr "Fichier PPD" -#: src/main/print-ps.c:98 src/gutenprintui/panel.c:1768 -#: src/gutenprintui2/panel.c:1768 +#: src/main/print-ps.c:69 src/gutenprintui2/panel.c:1943 msgid "PPD File" msgstr "Fichier PPD" +#: src/main/print-ps.c:74 +#, fuzzy +msgid "Model Name" +msgstr "Nom des canaux" + +#: src/main/print-ps.c:75 +msgid "PPD File Model Name" +msgstr "" + #: src/main/print-raw.c:223 msgid "Image dimensions must match paper dimensions" msgstr "Les dimensions de l'image doivent correspondre à celles du papier" @@ -1655,259 +1817,265 @@ msgstr "Trois niveaux de gris" #: src/main/escp2-channels.c:1035 src/main/escp2-channels.c:1048 #: src/main/escp2-channels.c:1061 src/main/escp2-channels.c:1074 #: src/main/escp2-channels.c:1087 src/main/escp2-channels.c:1100 -#: src/main/escp2-channels.c:2505 src/main/escp2-channels.c:2528 -#: src/main/escp2-channels.c:2548 src/main/escp2-channels.c:2568 -#: src/main/escp2-channels.c:2588 src/main/escp2-channels.c:2608 +#: src/main/escp2-channels.c:2525 src/main/escp2-channels.c:2548 +#: src/main/escp2-channels.c:2568 src/main/escp2-channels.c:2588 +#: src/main/escp2-channels.c:2608 src/main/escp2-channels.c:2628 msgid "Quadtone" msgstr "Quadtone" -#: src/main/escp2-channels.c:1604 src/main/escp2-channels.c:1618 +#: src/main/escp2-channels.c:1466 +#, fuzzy +msgid "Four Color Photo" +msgstr "Six couleurs photo" + +#: src/main/escp2-channels.c:1618 src/main/escp2-channels.c:1632 msgid "Six Color Enhanced Composite" msgstr "Six couleurs amélioré composite" -#: src/main/escp2-channels.c:1641 src/main/escp2-channels.c:1655 -#: src/main/escp2-channels.c:1669 src/main/escp2-channels.c:1705 +#: src/main/escp2-channels.c:1655 src/main/escp2-channels.c:1669 +#: src/main/escp2-channels.c:1683 src/main/escp2-channels.c:1719 msgid "Seven Color Photo" msgstr "Photo sept couleurs" -#: src/main/escp2-channels.c:1691 +#: src/main/escp2-channels.c:1705 msgid "Seven Color Enhanced" msgstr "Sept couleurs amélioré" -#: src/main/escp2-channels.c:1728 +#: src/main/escp2-channels.c:1742 msgid "Eight Color Photo" msgstr "Huit couleurs photo" -#: src/main/escp2-channels.c:1876 src/main/escp2-channels.c:1888 -#: src/main/escp2-channels.c:1894 +#: src/main/escp2-channels.c:1890 src/main/escp2-channels.c:1902 +#: src/main/escp2-channels.c:1908 msgid "One Color Raw" msgstr "Une couleur de base" -#: src/main/escp2-channels.c:1900 +#: src/main/escp2-channels.c:1914 msgid "One Color Raw Enhanced Gloss" msgstr "Une couleur de base optimiseur de brillance" -#: src/main/escp2-channels.c:1913 src/main/escp2-channels.c:1925 +#: src/main/escp2-channels.c:1927 src/main/escp2-channels.c:1939 msgid "Two Color Raw" msgstr "Deux couleurs de base" -#: src/main/escp2-channels.c:1939 src/main/escp2-channels.c:1953 -#: src/main/escp2-channels.c:1980 src/main/escp2-channels.c:1993 -#: src/main/escp2-channels.c:2006 src/main/escp2-channels.c:2019 -#: src/main/escp2-channels.c:2033 src/main/escp2-channels.c:2047 -#: src/main/escp2-channels.c:2060 +#: src/main/escp2-channels.c:1953 src/main/escp2-channels.c:1967 +#: src/main/escp2-channels.c:1994 src/main/escp2-channels.c:2007 +#: src/main/escp2-channels.c:2020 src/main/escp2-channels.c:2033 +#: src/main/escp2-channels.c:2047 src/main/escp2-channels.c:2061 +#: src/main/escp2-channels.c:2074 msgid "Three Color Raw" msgstr "Trois couleurs de base" -#: src/main/escp2-channels.c:1967 +#: src/main/escp2-channels.c:1981 msgid "Three Color Raw Gloss" msgstr "Trois couleurs de base brillant" -#: src/main/escp2-channels.c:2067 src/main/escp2-channels.c:2073 -#: src/main/escp2-channels.c:2079 src/main/escp2-channels.c:2085 -#: src/main/escp2-channels.c:2091 src/main/escp2-channels.c:2097 -#: src/main/escp2-channels.c:2103 src/main/escp2-channels.c:2109 -#: src/main/escp2-channels.c:2115 src/main/escp2-channels.c:2121 +#: src/main/escp2-channels.c:2081 src/main/escp2-channels.c:2087 +#: src/main/escp2-channels.c:2093 src/main/escp2-channels.c:2099 +#: src/main/escp2-channels.c:2105 src/main/escp2-channels.c:2111 +#: src/main/escp2-channels.c:2117 src/main/escp2-channels.c:2123 +#: src/main/escp2-channels.c:2129 src/main/escp2-channels.c:2135 +#: src/main/escp2-channels.c:2141 msgid "Four Color Raw" msgstr "Quatre couleurs de base" -#: src/main/escp2-channels.c:2127 +#: src/main/escp2-channels.c:2147 msgid "Four Color Raw Gloss" msgstr "Quatre couleurs de base brillant" -#: src/main/escp2-channels.c:2142 src/main/escp2-channels.c:2156 +#: src/main/escp2-channels.c:2162 src/main/escp2-channels.c:2176 msgid "Five Color Raw" msgstr "Cinq couleurs de base" -#: src/main/escp2-channels.c:2170 src/main/escp2-channels.c:2186 -#: src/main/escp2-channels.c:2192 src/main/escp2-channels.c:2198 -#: src/main/escp2-channels.c:2213 src/main/escp2-channels.c:2234 +#: src/main/escp2-channels.c:2190 src/main/escp2-channels.c:2206 +#: src/main/escp2-channels.c:2212 src/main/escp2-channels.c:2218 +#: src/main/escp2-channels.c:2233 src/main/escp2-channels.c:2254 msgid "Six Color Raw" msgstr "Six couleurs de base" -#: src/main/escp2-channels.c:2219 +#: src/main/escp2-channels.c:2239 msgid "Six Color Enhanced Gloss Raw" msgstr "Six couleurs de base Optimiseur de brillance" -#: src/main/escp2-channels.c:2250 src/main/escp2-channels.c:2265 -#: src/main/escp2-channels.c:2280 +#: src/main/escp2-channels.c:2270 src/main/escp2-channels.c:2285 +#: src/main/escp2-channels.c:2300 msgid "Seven Color Raw" msgstr "Sept couleurs de base" -#: src/main/escp2-channels.c:2297 +#: src/main/escp2-channels.c:2317 msgid "Seven Color Enhanced Gloss Raw" msgstr "Sept couleurs de base Optimiseur de brillance" -#: src/main/escp2-channels.c:2315 +#: src/main/escp2-channels.c:2335 msgid "Eight Color Raw" msgstr "Huit couleurs de base" -#: src/main/escp2-channels.c:2482 src/main/escp2-channels.c:2495 -#: src/main/escp2-channels.c:2497 src/main/escp2-channels.c:2517 -#: src/main/escp2-channels.c:2520 src/main/escp2-channels.c:2540 -#: src/main/escp2-channels.c:2560 src/main/escp2-channels.c:2580 -#: src/main/escp2-channels.c:2600 src/main/escp2-channels.c:2620 -#: src/main/escp2-channels.c:2636 src/main/escp2-channels.c:2638 -#: src/main/escp2-channels.c:2640 src/main/escp2-channels.c:2642 -#: src/main/escp2-channels.c:2658 src/main/escp2-channels.c:2674 -#: src/main/escp2-channels.c:2694 +#: src/main/escp2-channels.c:2502 src/main/escp2-channels.c:2515 +#: src/main/escp2-channels.c:2517 src/main/escp2-channels.c:2537 +#: src/main/escp2-channels.c:2540 src/main/escp2-channels.c:2560 +#: src/main/escp2-channels.c:2580 src/main/escp2-channels.c:2600 +#: src/main/escp2-channels.c:2620 src/main/escp2-channels.c:2640 +#: src/main/escp2-channels.c:2656 src/main/escp2-channels.c:2658 +#: src/main/escp2-channels.c:2660 src/main/escp2-channels.c:2662 +#: src/main/escp2-channels.c:2678 src/main/escp2-channels.c:2694 +#: src/main/escp2-channels.c:2714 msgid "EPSON Standard Inks" msgstr "Encres standard EPSON" -#: src/main/escp2-channels.c:2714 src/main/escp2-channels.c:2739 +#: src/main/escp2-channels.c:2734 src/main/escp2-channels.c:2759 msgid "UltraChrome Photo Black" msgstr "Ultrachrome noir photo" -#: src/main/escp2-channels.c:2718 src/main/escp2-channels.c:2743 +#: src/main/escp2-channels.c:2738 src/main/escp2-channels.c:2763 msgid "UltraChrome Matte Black" msgstr "Ultrachrome noir mat" -#: src/main/escp2-channels.c:2758 src/main/escp2-channels.c:2796 -#: src/main/escp2-channels.c:3167 src/escputil/escputil.c:976 +#: src/main/escp2-channels.c:2778 src/main/escp2-channels.c:2816 +#: src/main/escp2-channels.c:3206 src/escputil/escputil.c:976 msgid "Photo Black" msgstr "Noir photo" -#: src/main/escp2-channels.c:2762 src/main/escp2-channels.c:2778 -#: src/main/escp2-channels.c:3166 src/escputil/escputil.c:986 +#: src/main/escp2-channels.c:2782 src/main/escp2-channels.c:2798 +#: src/main/escp2-channels.c:3205 src/escputil/escputil.c:986 msgid "Matte Black" msgstr "Noir Mat" -#: src/main/escp2-channels.c:3092 src/main/escp2-channels.c:3102 -#: src/main/escp2-channels.c:3114 src/main/escp2-channels.c:3128 -#: src/main/escp2-channels.c:3141 src/main/escp2-channels.c:3154 -#: src/main/escp2-channels.c:3191 src/escputil/escputil.c:981 +#: src/main/escp2-channels.c:3131 src/main/escp2-channels.c:3141 +#: src/main/escp2-channels.c:3153 src/main/escp2-channels.c:3167 +#: src/main/escp2-channels.c:3180 src/main/escp2-channels.c:3193 +#: src/main/escp2-channels.c:3240 src/escputil/escputil.c:981 #: src/escputil/escputil.c:1204 msgid "Light Cyan" msgstr "Cyan clair" -#: src/main/escp2-channels.c:3093 src/main/escp2-channels.c:3104 -#: src/main/escp2-channels.c:3115 src/main/escp2-channels.c:3129 -#: src/main/escp2-channels.c:3142 src/main/escp2-channels.c:3155 -#: src/main/escp2-channels.c:3190 src/escputil/escputil.c:982 +#: src/main/escp2-channels.c:3132 src/main/escp2-channels.c:3143 +#: src/main/escp2-channels.c:3154 src/main/escp2-channels.c:3168 +#: src/main/escp2-channels.c:3181 src/main/escp2-channels.c:3194 +#: src/main/escp2-channels.c:3239 src/escputil/escputil.c:982 #: src/escputil/escputil.c:1205 msgid "Light Magenta" msgstr "Magenta clair" -#: src/main/escp2-channels.c:3130 src/main/escp2-channels.c:3192 +#: src/main/escp2-channels.c:3169 src/main/escp2-channels.c:3241 #: src/escputil/escputil.c:985 msgid "Light Black" msgstr "Noir clair" -#: src/main/escp2-channels.c:3143 +#: src/main/escp2-channels.c:3182 msgid "Dark Yellow" msgstr "Jaune foncé" -#: src/main/escp2-channels.c:3170 src/escputil/escputil.c:989 +#: src/main/escp2-channels.c:3209 src/escputil/escputil.c:989 msgid "Gloss Optimizer" msgstr "Optimiseur de brillance" -#: src/main/escp2-channels.c:3189 src/escputil/escputil.c:990 +#: src/main/escp2-channels.c:3238 src/escputil/escputil.c:990 msgid "Light Light Black" msgstr "Noir très clair" -#: src/main/escp2-papers.c:1343 src/main/escp2-papers.c:1387 -#: src/main/escp2-papers.c:1431 src/main/escp2-papers.c:1479 -#: src/main/escp2-papers.c:1527 src/main/escp2-papers.c:1571 +#: src/main/escp2-papers.c:1353 src/main/escp2-papers.c:1397 +#: src/main/escp2-papers.c:1441 src/main/escp2-papers.c:1489 +#: src/main/escp2-papers.c:1537 src/main/escp2-papers.c:1581 msgid "Plain Paper Fast Load" msgstr "Papier normal chargement rapide" -#: src/main/escp2-papers.c:1345 src/main/escp2-papers.c:1389 -#: src/main/escp2-papers.c:1433 src/main/escp2-papers.c:1481 -#: src/main/escp2-papers.c:1529 src/main/escp2-papers.c:1573 +#: src/main/escp2-papers.c:1355 src/main/escp2-papers.c:1399 +#: src/main/escp2-papers.c:1443 src/main/escp2-papers.c:1491 +#: src/main/escp2-papers.c:1539 src/main/escp2-papers.c:1583 #: src/main/xmli18n-tmp.h:5 msgid "Postcard" msgstr "Carte postale" -#: src/main/escp2-papers.c:1353 src/main/escp2-papers.c:1397 -#: src/main/escp2-papers.c:1441 src/main/escp2-papers.c:1489 -#: src/main/escp2-papers.c:1537 src/main/escp2-papers.c:1581 +#: src/main/escp2-papers.c:1363 src/main/escp2-papers.c:1407 +#: src/main/escp2-papers.c:1451 src/main/escp2-papers.c:1499 +#: src/main/escp2-papers.c:1547 src/main/escp2-papers.c:1591 msgid "Back Light Film" msgstr "Film back light" -#: src/main/escp2-papers.c:1357 src/main/escp2-papers.c:1401 -#: src/main/escp2-papers.c:1445 src/main/escp2-papers.c:1493 -#: src/main/escp2-papers.c:1541 src/main/escp2-papers.c:1585 -msgid "Matte Paper Heavyweight" -msgstr "Papier Mat Heavyweight" - #: src/main/escp2-papers.c:1367 src/main/escp2-papers.c:1411 #: src/main/escp2-papers.c:1455 src/main/escp2-papers.c:1503 #: src/main/escp2-papers.c:1551 src/main/escp2-papers.c:1595 +msgid "Matte Paper Heavyweight" +msgstr "Papier Mat Heavyweight" + +#: src/main/escp2-papers.c:1377 src/main/escp2-papers.c:1421 +#: src/main/escp2-papers.c:1465 src/main/escp2-papers.c:1513 +#: src/main/escp2-papers.c:1561 src/main/escp2-papers.c:1605 msgid "Premium Semigloss Photo Paper" msgstr "Papier semi-brillant photo Premium" -#: src/main/escp2-papers.c:1375 src/main/escp2-papers.c:1419 -#: src/main/escp2-papers.c:1467 src/main/escp2-papers.c:1515 -#: src/main/escp2-papers.c:1559 src/main/escp2-papers.c:1607 +#: src/main/escp2-papers.c:1385 src/main/escp2-papers.c:1429 +#: src/main/escp2-papers.c:1477 src/main/escp2-papers.c:1525 +#: src/main/escp2-papers.c:1569 src/main/escp2-papers.c:1617 msgid "ColorLife Paper" msgstr "Papier Colorlife" -#: src/main/escp2-papers.c:1459 src/main/escp2-papers.c:1507 -#: src/main/escp2-papers.c:1599 +#: src/main/escp2-papers.c:1469 src/main/escp2-papers.c:1517 +#: src/main/escp2-papers.c:1609 msgid "Archival Matte Paper" msgstr "Papier Mat Archival" -#: src/main/escp2-papers.c:1461 src/main/escp2-papers.c:1509 -#: src/main/escp2-papers.c:1601 +#: src/main/escp2-papers.c:1471 src/main/escp2-papers.c:1519 +#: src/main/escp2-papers.c:1611 msgid "Watercolor Paper - Radiant White" msgstr "Papier aquarelle - radiant white" -#: src/main/escp2-papers.c:1716 src/main/escp2-papers.c:1842 -#: src/main/escp2-papers.c:1884 src/main/escp2-papers.c:1926 -#: src/main/escp2-papers.c:2001 +#: src/main/escp2-papers.c:1727 src/main/escp2-papers.c:1853 +#: src/main/escp2-papers.c:1895 src/main/escp2-papers.c:1937 +#: src/main/escp2-papers.c:2012 msgid "Roll Feed" msgstr "Alimentation rouleau" -#: src/main/escp2-papers.c:1740 src/main/escp2-papers.c:1791 +#: src/main/escp2-papers.c:1751 src/main/escp2-papers.c:1802 msgid "Roll Feed (cut each page)" msgstr "Alimentation rouleau (couper chaque page)" -#: src/main/escp2-papers.c:1749 src/main/escp2-papers.c:1800 +#: src/main/escp2-papers.c:1760 src/main/escp2-papers.c:1811 msgid "Roll Feed (do not cut)" msgstr "Alimentation rouleau (sans découpe des pages)" -#: src/main/escp2-papers.c:1773 src/main/escp2-papers.c:1824 +#: src/main/escp2-papers.c:1784 src/main/escp2-papers.c:1835 msgid "Manual Feed" msgstr "Alimentation manuelle" -#: src/main/escp2-papers.c:1782 src/main/escp2-papers.c:1833 -#: src/main/escp2-papers.c:1935 src/main/escp2-papers.c:1968 +#: src/main/escp2-papers.c:1793 src/main/escp2-papers.c:1844 +#: src/main/escp2-papers.c:1946 src/main/escp2-papers.c:1979 msgid "Print to CD" msgstr "Imprimer un CD" -#: src/main/escp2-papers.c:1866 src/main/escp2-papers.c:1908 +#: src/main/escp2-papers.c:1877 src/main/escp2-papers.c:1919 msgid "Manual Sheet Guide" msgstr "Alimentation guide par feuille (arrière)" -#: src/main/escp2-papers.c:1875 src/main/escp2-papers.c:1917 +#: src/main/escp2-papers.c:1886 src/main/escp2-papers.c:1928 msgid "Manual Feed (Front)" msgstr "Alimentation manuelle (avant)" -#: src/main/escp2-papers.c:1950 +#: src/main/escp2-papers.c:1961 msgid "Rear Tray" msgstr "Bac arrière" -#: src/main/escp2-papers.c:1959 +#: src/main/escp2-papers.c:1970 msgid "Front Tray" msgstr "Bac avant" -#: src/main/escp2-papers.c:1977 +#: src/main/escp2-papers.c:1988 msgid "Photo Board" msgstr "Carte photo" -#: src/main/escp2-papers.c:2016 +#: src/main/escp2-papers.c:2027 msgid "Cut Sheet Bin 1" msgstr "Coupe papier Bin 1" -#: src/main/escp2-papers.c:2025 +#: src/main/escp2-papers.c:2036 msgid "Cut Sheet Bin 2" msgstr "Coupe papier Bin 2" -#: src/main/escp2-papers.c:2034 +#: src/main/escp2-papers.c:2045 msgid "Cut Sheet Autoselect" msgstr "Sélection de coupe automatique" -#: src/main/escp2-papers.c:2043 +#: src/main/escp2-papers.c:2054 msgid "Manual Selection" msgstr "Sélection manuelle" @@ -2045,42 +2213,48 @@ msgid "Eight Pass" msgstr "huit passes" #: src/main/escp2-resolutions.c:637 src/main/escp2-resolutions.c:652 -#: src/main/generic-options.c:33 +#: src/main/escp2-resolutions.c:667 src/main/generic-options.c:33 msgid "Fast Economy" msgstr "Rapide (économique)" #: src/main/escp2-resolutions.c:638 src/main/escp2-resolutions.c:653 -#: src/main/generic-options.c:34 +#: src/main/escp2-resolutions.c:668 src/main/generic-options.c:34 msgid "Economy" msgstr "Economique" #: src/main/escp2-resolutions.c:639 src/main/escp2-resolutions.c:654 -#: src/main/escp2-resolutions.c:667 src/main/generic-options.c:35 +#: src/main/escp2-resolutions.c:669 src/main/escp2-resolutions.c:682 +#: src/main/generic-options.c:35 msgid "Draft" msgstr "Brouillon" #: src/main/escp2-resolutions.c:641 src/main/escp2-resolutions.c:656 -#: src/main/escp2-resolutions.c:670 src/main/generic-options.c:37 +#: src/main/escp2-resolutions.c:671 src/main/escp2-resolutions.c:685 +#: src/main/generic-options.c:37 msgid "High" msgstr "Hauteur" #: src/main/escp2-resolutions.c:642 src/main/escp2-resolutions.c:657 -#: src/main/escp2-resolutions.c:669 src/main/generic-options.c:38 +#: src/main/escp2-resolutions.c:672 src/main/escp2-resolutions.c:684 +#: src/main/generic-options.c:38 msgid "Photo" msgstr "Photo" #: src/main/escp2-resolutions.c:643 src/main/escp2-resolutions.c:658 -#: src/main/escp2-resolutions.c:671 src/main/generic-options.c:39 +#: src/main/escp2-resolutions.c:673 src/main/escp2-resolutions.c:686 +#: src/main/generic-options.c:39 msgid "Super Photo" msgstr "Super Photo" #: src/main/escp2-resolutions.c:644 src/main/escp2-resolutions.c:659 -#: src/main/escp2-resolutions.c:672 src/main/generic-options.c:40 +#: src/main/escp2-resolutions.c:674 src/main/escp2-resolutions.c:687 +#: src/main/generic-options.c:40 msgid "Ultra Photo" msgstr "Ultra photo" #: src/main/escp2-resolutions.c:645 src/main/escp2-resolutions.c:660 -#: src/main/escp2-resolutions.c:673 src/main/generic-options.c:41 +#: src/main/escp2-resolutions.c:675 src/main/escp2-resolutions.c:688 +#: src/main/generic-options.c:41 msgid "Best" msgstr "Meilleur" @@ -2157,4174 +2331,4482 @@ msgid "3x5" msgstr "3x5" #: src/main/xmli18n-tmp.h:10 +msgid "3 1/2 x5" +msgstr "" + +#: src/main/xmli18n-tmp.h:11 msgid "4x6" msgstr "4x6" -#: src/main/xmli18n-tmp.h:11 +#: src/main/xmli18n-tmp.h:12 msgid "Epson 4x6 Photo Paper (tear-off borders)" msgstr "Papier photo Epson 4x6 (bordures pré-découpées)" -#: src/main/xmli18n-tmp.h:12 +#: src/main/xmli18n-tmp.h:13 msgid "5x7" msgstr "5x7" -#: src/main/xmli18n-tmp.h:13 +#: src/main/xmli18n-tmp.h:14 msgid "5x8" msgstr "5x8" -#: src/main/xmli18n-tmp.h:14 +#: src/main/xmli18n-tmp.h:15 msgid "6x8" msgstr "6x8" -#: src/main/xmli18n-tmp.h:15 +#: src/main/xmli18n-tmp.h:16 msgid "8x10" msgstr "8x10" -#: src/main/xmli18n-tmp.h:17 +#: src/main/xmli18n-tmp.h:18 msgid "12x18" msgstr "12x18" -#: src/main/xmli18n-tmp.h:18 +#: src/main/xmli18n-tmp.h:19 msgid "Super B 13x19" msgstr "Super B 13x19" -#: src/main/xmli18n-tmp.h:19 +#: src/main/xmli18n-tmp.h:20 msgid "Engineering C 17x22" msgstr "Engineering C 17x22" -#: src/main/xmli18n-tmp.h:20 +#: src/main/xmli18n-tmp.h:21 msgid "8x12" msgstr "8x12" -#: src/main/xmli18n-tmp.h:21 +#: src/main/xmli18n-tmp.h:22 msgid "11x14" msgstr "11x14" -#: src/main/xmli18n-tmp.h:22 +#: src/main/xmli18n-tmp.h:23 msgid "16x20" msgstr "16x20" -#: src/main/xmli18n-tmp.h:23 +#: src/main/xmli18n-tmp.h:24 msgid "16x24" msgstr "16x24" -#: src/main/xmli18n-tmp.h:24 +#: src/main/xmli18n-tmp.h:25 msgid "20x24" msgstr "20x24" -#: src/main/xmli18n-tmp.h:25 +#: src/main/xmli18n-tmp.h:26 msgid "20x30" msgstr "20x30" -#: src/main/xmli18n-tmp.h:26 +#: src/main/xmli18n-tmp.h:27 msgid "22x30" msgstr "22x30" -#: src/main/xmli18n-tmp.h:27 +#: src/main/xmli18n-tmp.h:28 msgid "24x30" msgstr "24x30" -#: src/main/xmli18n-tmp.h:28 +#: src/main/xmli18n-tmp.h:29 msgid "Super A1 24x36" msgstr "Super A1 24x36" -#: src/main/xmli18n-tmp.h:29 +#: src/main/xmli18n-tmp.h:30 msgid "30x40" msgstr "30x40" -#: src/main/xmli18n-tmp.h:30 +#: src/main/xmli18n-tmp.h:31 msgid "4A" msgstr "4A" -#: src/main/xmli18n-tmp.h:31 +#: src/main/xmli18n-tmp.h:32 msgid "2A" msgstr "2A" -#: src/main/xmli18n-tmp.h:32 +#: src/main/xmli18n-tmp.h:33 msgid "Super A0" msgstr "Super A0" -#: src/main/xmli18n-tmp.h:33 +#: src/main/xmli18n-tmp.h:34 msgid "A0" msgstr "A0" -#: src/main/xmli18n-tmp.h:34 +#: src/main/xmli18n-tmp.h:35 msgid "A1" msgstr "A1" -#: src/main/xmli18n-tmp.h:35 +#: src/main/xmli18n-tmp.h:36 msgid "A2" msgstr "A2" -#: src/main/xmli18n-tmp.h:36 +#: src/main/xmli18n-tmp.h:37 msgid "A3" msgstr "A3" -#: src/main/xmli18n-tmp.h:37 +#: src/main/xmli18n-tmp.h:38 msgid "A4" msgstr "A4" -#: src/main/xmli18n-tmp.h:38 +#: src/main/xmli18n-tmp.h:39 msgid "A5" msgstr "A5" -#: src/main/xmli18n-tmp.h:39 +#: src/main/xmli18n-tmp.h:40 msgid "A6" msgstr "A6" -#: src/main/xmli18n-tmp.h:40 +#: src/main/xmli18n-tmp.h:41 msgid "A7" msgstr "A7" -#: src/main/xmli18n-tmp.h:41 +#: src/main/xmli18n-tmp.h:42 msgid "A8" msgstr "A8" -#: src/main/xmli18n-tmp.h:42 +#: src/main/xmli18n-tmp.h:43 msgid "A9" msgstr "A9" -#: src/main/xmli18n-tmp.h:43 +#: src/main/xmli18n-tmp.h:44 msgid "A10" msgstr "A10" -#: src/main/xmli18n-tmp.h:44 +#: src/main/xmli18n-tmp.h:45 msgid "RA0" msgstr "RA0" -#: src/main/xmli18n-tmp.h:45 +#: src/main/xmli18n-tmp.h:46 msgid "RA1" msgstr "RA1" -#: src/main/xmli18n-tmp.h:46 +#: src/main/xmli18n-tmp.h:47 msgid "RA2" msgstr "RA2" -#: src/main/xmli18n-tmp.h:47 +#: src/main/xmli18n-tmp.h:48 msgid "RA3" msgstr "RA3" -#: src/main/xmli18n-tmp.h:48 +#: src/main/xmli18n-tmp.h:49 msgid "RA4" msgstr "RA4" -#: src/main/xmli18n-tmp.h:49 +#: src/main/xmli18n-tmp.h:50 msgid "SRA0" msgstr "SRA0" -#: src/main/xmli18n-tmp.h:50 +#: src/main/xmli18n-tmp.h:51 msgid "SRA1" msgstr "SRA1" -#: src/main/xmli18n-tmp.h:51 +#: src/main/xmli18n-tmp.h:52 msgid "SRA2" msgstr "SRA2" -#: src/main/xmli18n-tmp.h:52 +#: src/main/xmli18n-tmp.h:53 msgid "SRA3" msgstr "SRA3" -#: src/main/xmli18n-tmp.h:53 +#: src/main/xmli18n-tmp.h:54 msgid "SRA4" msgstr "SRA4" -#: src/main/xmli18n-tmp.h:54 +#: src/main/xmli18n-tmp.h:55 msgid "4B ISO" msgstr "4B ISO" -#: src/main/xmli18n-tmp.h:55 +#: src/main/xmli18n-tmp.h:56 msgid "2B ISO" msgstr "2B ISO" -#: src/main/xmli18n-tmp.h:56 +#: src/main/xmli18n-tmp.h:57 msgid "B0 ISO" msgstr "B0 ISO" -#: src/main/xmli18n-tmp.h:57 +#: src/main/xmli18n-tmp.h:58 msgid "B1 ISO" msgstr "B1 ISO" -#: src/main/xmli18n-tmp.h:58 +#: src/main/xmli18n-tmp.h:59 msgid "B2 ISO" msgstr "B2 ISO" -#: src/main/xmli18n-tmp.h:59 +#: src/main/xmli18n-tmp.h:60 msgid "B3 ISO" msgstr "B3 ISO" -#: src/main/xmli18n-tmp.h:60 +#: src/main/xmli18n-tmp.h:61 msgid "B4 ISO" msgstr "B4 ISO" -#: src/main/xmli18n-tmp.h:61 +#: src/main/xmli18n-tmp.h:62 msgid "B5 ISO" msgstr "B5 ISO" -#: src/main/xmli18n-tmp.h:62 +#: src/main/xmli18n-tmp.h:63 msgid "B6 ISO" msgstr "B6 ISO" -#: src/main/xmli18n-tmp.h:63 +#: src/main/xmli18n-tmp.h:64 msgid "B7 ISO" msgstr "B7 ISO" -#: src/main/xmli18n-tmp.h:64 +#: src/main/xmli18n-tmp.h:65 msgid "B8 ISO" msgstr "B8 ISO" -#: src/main/xmli18n-tmp.h:65 +#: src/main/xmli18n-tmp.h:66 msgid "B9 ISO" msgstr "B9 ISO" -#: src/main/xmli18n-tmp.h:66 +#: src/main/xmli18n-tmp.h:67 msgid "B10 ISO" msgstr "B10 ISO" -#: src/main/xmli18n-tmp.h:67 +#: src/main/xmli18n-tmp.h:68 msgid "Super B0 JIS" msgstr "Super B0 JIS" -#: src/main/xmli18n-tmp.h:68 +#: src/main/xmli18n-tmp.h:69 msgid "B0 JIS" msgstr "B0 JIS" -#: src/main/xmli18n-tmp.h:69 +#: src/main/xmli18n-tmp.h:70 msgid "B1 JIS" msgstr "B1 JIS" -#: src/main/xmli18n-tmp.h:70 +#: src/main/xmli18n-tmp.h:71 msgid "B2 JIS" msgstr "B2 JIS" -#: src/main/xmli18n-tmp.h:71 +#: src/main/xmli18n-tmp.h:72 msgid "B3 JIS" msgstr "B3 JIS" -#: src/main/xmli18n-tmp.h:72 +#: src/main/xmli18n-tmp.h:73 msgid "B4 JIS" msgstr "B4 JIS" -#: src/main/xmli18n-tmp.h:73 +#: src/main/xmli18n-tmp.h:74 msgid "B5 JIS" msgstr "B5 JIS" -#: src/main/xmli18n-tmp.h:74 +#: src/main/xmli18n-tmp.h:75 msgid "B6 JIS" msgstr "B6 JIS" -#: src/main/xmli18n-tmp.h:75 +#: src/main/xmli18n-tmp.h:76 msgid "B7 JIS" msgstr "B7 JIS" -#: src/main/xmli18n-tmp.h:76 +#: src/main/xmli18n-tmp.h:77 msgid "B8 JIS" msgstr "B8 JIS" -#: src/main/xmli18n-tmp.h:77 +#: src/main/xmli18n-tmp.h:78 msgid "B9 JIS" msgstr "B9 JIS" -#: src/main/xmli18n-tmp.h:78 +#: src/main/xmli18n-tmp.h:79 msgid "B10 JIS" msgstr "B10 JIS" -#: src/main/xmli18n-tmp.h:79 +#: src/main/xmli18n-tmp.h:80 msgid "C0" msgstr "C0" -#: src/main/xmli18n-tmp.h:80 +#: src/main/xmli18n-tmp.h:81 +#, fuzzy +msgid "C0 landscape" +msgstr "Paysage" + +#: src/main/xmli18n-tmp.h:82 msgid "C1" msgstr "C1" -#: src/main/xmli18n-tmp.h:81 +#: src/main/xmli18n-tmp.h:83 +#, fuzzy +msgid "C1 landscape" +msgstr "Paysage" + +#: src/main/xmli18n-tmp.h:84 msgid "C2" msgstr "C2" -#: src/main/xmli18n-tmp.h:82 +#: src/main/xmli18n-tmp.h:85 +#, fuzzy +msgid "C2 landscape" +msgstr "Paysage" + +#: src/main/xmli18n-tmp.h:86 msgid "C3" msgstr "C3" -#: src/main/xmli18n-tmp.h:83 +#: src/main/xmli18n-tmp.h:87 +#, fuzzy +msgid "C3 landscape" +msgstr "Paysage" + +#: src/main/xmli18n-tmp.h:88 msgid "C4" msgstr "C4" -#: src/main/xmli18n-tmp.h:84 +#: src/main/xmli18n-tmp.h:89 +#, fuzzy +msgid "C4 landscape" +msgstr "Paysage" + +#: src/main/xmli18n-tmp.h:90 msgid "C5" msgstr "C5" -#: src/main/xmli18n-tmp.h:85 +#: src/main/xmli18n-tmp.h:91 +#, fuzzy +msgid "C5 landscape" +msgstr "Paysage" + +#: src/main/xmli18n-tmp.h:92 msgid "B6-C4" msgstr "B6-C4" -#: src/main/xmli18n-tmp.h:86 +#: src/main/xmli18n-tmp.h:93 +#, fuzzy +msgid "B6-C4 landscape" +msgstr "Paysage" + +#: src/main/xmli18n-tmp.h:94 msgid "C6" msgstr "C6" -#: src/main/xmli18n-tmp.h:87 +#: src/main/xmli18n-tmp.h:95 +#, fuzzy +msgid "C6 landscape" +msgstr "Paysage" + +#: src/main/xmli18n-tmp.h:96 msgid "DL" msgstr "DL" -#: src/main/xmli18n-tmp.h:88 +#: src/main/xmli18n-tmp.h:97 +#, fuzzy +msgid "DL landscape" +msgstr "Paysage" + +#: src/main/xmli18n-tmp.h:98 msgid "C7-6" msgstr "C7-6" -#: src/main/xmli18n-tmp.h:89 +#: src/main/xmli18n-tmp.h:99 +#, fuzzy +msgid "C7-6 landscape" +msgstr "Paysage" + +#: src/main/xmli18n-tmp.h:100 msgid "C7" msgstr "C7" -#: src/main/xmli18n-tmp.h:90 +#: src/main/xmli18n-tmp.h:101 +#, fuzzy +msgid "C7 landscape" +msgstr "Paysage" + +#: src/main/xmli18n-tmp.h:102 msgid "C8" msgstr "C8" -#: src/main/xmli18n-tmp.h:91 +#: src/main/xmli18n-tmp.h:103 +#, fuzzy +msgid "C8 landscape" +msgstr "Paysage" + +#: src/main/xmli18n-tmp.h:104 msgid "C9" msgstr "C9" -#: src/main/xmli18n-tmp.h:92 +#: src/main/xmli18n-tmp.h:105 +#, fuzzy +msgid "C9 landscape" +msgstr "Paysage" + +#: src/main/xmli18n-tmp.h:106 msgid "C10" msgstr "C10" -#: src/main/xmli18n-tmp.h:93 +#: src/main/xmli18n-tmp.h:107 +#, fuzzy +msgid "C10 landscape" +msgstr "Paysage" + +#: src/main/xmli18n-tmp.h:108 msgid "ArchA" msgstr "ArchA" -#: src/main/xmli18n-tmp.h:94 +#: src/main/xmli18n-tmp.h:109 msgid "ArchA transposed" msgstr "ArchA sens paysage" -#: src/main/xmli18n-tmp.h:95 +#: src/main/xmli18n-tmp.h:110 msgid "ArchB" msgstr "ArchB" -#: src/main/xmli18n-tmp.h:96 +#: src/main/xmli18n-tmp.h:111 msgid "ArchB transposed" msgstr "ArchB sens paysage" -#: src/main/xmli18n-tmp.h:97 +#: src/main/xmli18n-tmp.h:112 msgid "ArchC" msgstr "ArchC" -#: src/main/xmli18n-tmp.h:98 +#: src/main/xmli18n-tmp.h:113 msgid "ArchC transposed" msgstr "ArcgC sens paysage" -#: src/main/xmli18n-tmp.h:99 +#: src/main/xmli18n-tmp.h:114 msgid "ArchD" msgstr "ArchD" -#: src/main/xmli18n-tmp.h:100 +#: src/main/xmli18n-tmp.h:115 msgid "ArchD transposed" msgstr "ArchD sens paysage" -#: src/main/xmli18n-tmp.h:101 +#: src/main/xmli18n-tmp.h:116 msgid "ArchE" msgstr "ArchE" -#: src/main/xmli18n-tmp.h:102 +#: src/main/xmli18n-tmp.h:117 msgid "ArchE transposed" msgstr "ArchE sens paysage" -#: src/main/xmli18n-tmp.h:103 +#: src/main/xmli18n-tmp.h:118 msgid "American foolscap" msgstr "Foolscap américain" -#: src/main/xmli18n-tmp.h:104 +#: src/main/xmli18n-tmp.h:119 msgid "European foolscap" msgstr "Foolscap européen" -#: src/main/xmli18n-tmp.h:105 +#: src/main/xmli18n-tmp.h:120 msgid "Crown Quarto" msgstr "Crown Quarto" -#: src/main/xmli18n-tmp.h:106 +#: src/main/xmli18n-tmp.h:121 msgid "Large Crown Quarto" msgstr "Quatro couronne large" -#: src/main/xmli18n-tmp.h:107 +#: src/main/xmli18n-tmp.h:122 msgid "Demy Quarto" msgstr "Demi-quatro" -#: src/main/xmli18n-tmp.h:108 +#: src/main/xmli18n-tmp.h:123 msgid "Royal Quarto" msgstr "Quatro royal" -#: src/main/xmli18n-tmp.h:109 +#: src/main/xmli18n-tmp.h:124 msgid "ISO A4" msgstr "ISO A4" -#: src/main/xmli18n-tmp.h:110 +#: src/main/xmli18n-tmp.h:125 msgid "Crown Octavo" msgstr "Octave couronne" -#: src/main/xmli18n-tmp.h:111 +#: src/main/xmli18n-tmp.h:126 msgid "Large Crown Octavo" msgstr "Octave couronne large" -#: src/main/xmli18n-tmp.h:112 +#: src/main/xmli18n-tmp.h:127 msgid "Demy Octavo" msgstr "Demi-octave" -#: src/main/xmli18n-tmp.h:113 +#: src/main/xmli18n-tmp.h:128 msgid "Royal Octavo" msgstr "Octave royale" -#: src/main/xmli18n-tmp.h:114 +#: src/main/xmli18n-tmp.h:129 msgid "ISO A5" msgstr "ISO A5" -#: src/main/xmli18n-tmp.h:115 +#: src/main/xmli18n-tmp.h:130 msgid "Small paperback" msgstr "Petite reliure" -#: src/main/xmli18n-tmp.h:116 +#: src/main/xmli18n-tmp.h:131 msgid "Penguin small paperback" msgstr "Petite reliure Penguin" -#: src/main/xmli18n-tmp.h:117 +#: src/main/xmli18n-tmp.h:132 msgid "Penguin large paperback" msgstr "Grande reliure Penguin" -#: src/main/xmli18n-tmp.h:118 +#: src/main/xmli18n-tmp.h:133 msgid "10cm x 15cm" msgstr "10cm x 15cm" -#: src/main/xmli18n-tmp.h:119 +#: src/main/xmli18n-tmp.h:134 msgid "Hagaki Card" msgstr "Carte Hagaki" -#: src/main/xmli18n-tmp.h:120 +#: src/main/xmli18n-tmp.h:135 msgid "Oufuku Card" msgstr "Carte Oufuku" -#: src/main/xmli18n-tmp.h:121 +#: src/main/xmli18n-tmp.h:136 msgid "Japanese long envelope #3" msgstr "Enveloppe longue japonaise n°3" -#: src/main/xmli18n-tmp.h:122 +#: src/main/xmli18n-tmp.h:137 +#, fuzzy +msgid "Japanese long envelope #3 landscape" +msgstr "Enveloppe longue japonaise n°3" + +#: src/main/xmli18n-tmp.h:138 msgid "Japanese long envelope #4" msgstr "Enveloppe longue japonaise n°4" -#: src/main/xmli18n-tmp.h:123 +#: src/main/xmli18n-tmp.h:139 +#, fuzzy +msgid "Japanese long envelope #4 landscape" +msgstr "Enveloppe longue japonaise n°4" + +#: src/main/xmli18n-tmp.h:140 msgid "Japanese Kaku envelope #4" msgstr "Enveloppe Kaku japonaise n°4" -#: src/main/xmli18n-tmp.h:124 +#: src/main/xmli18n-tmp.h:141 +#, fuzzy +msgid "Japanese Kaku envelope #4 landscape" +msgstr "Enveloppe Kaku japonaise n°4" + +#: src/main/xmli18n-tmp.h:142 msgid "Commercial 10" msgstr "Commercial 10" -#: src/main/xmli18n-tmp.h:125 +#: src/main/xmli18n-tmp.h:143 +#, fuzzy +msgid "Commercial 10 landscape" +msgstr "Commercial 10" + +#: src/main/xmli18n-tmp.h:144 msgid "A2 Invitation" msgstr "A2 Invitation" -#: src/main/xmli18n-tmp.h:126 +#: src/main/xmli18n-tmp.h:145 msgid "Monarch Envelope" msgstr "Enveloppe Monarch" -#: src/main/xmli18n-tmp.h:127 +#: src/main/xmli18n-tmp.h:146 +#, fuzzy +msgid "Monarch Envelope landscape" +msgstr "Enveloppe Monarch" + +#: src/main/xmli18n-tmp.h:147 msgid "4x5 3/8" msgstr "4x5 3/8" -#: src/main/xmli18n-tmp.h:128 +#: src/main/xmli18n-tmp.h:148 msgid "4x7" msgstr "4x7" -#: src/main/xmli18n-tmp.h:129 +#: src/main/xmli18n-tmp.h:149 msgid "CP_L" msgstr "CP_L" -#: src/main/xmli18n-tmp.h:130 +#: src/main/xmli18n-tmp.h:150 msgid "Card" msgstr "Carte" -#: src/main/xmli18n-tmp.h:131 +#: src/main/xmli18n-tmp.h:151 msgid "Wide Postcard" msgstr "Carte postale large" -#: src/main/xmli18n-tmp.h:132 +#: src/main/xmli18n-tmp.h:152 msgid "Chilean Office" msgstr "Chilean Office" -#: src/main/xmli18n-tmp.h:133 +#: src/main/xmli18n-tmp.h:153 msgid "Chilean Double Letter" msgstr "Chilean Double Letter" -#: src/main/xmli18n-tmp.h:134 +#: src/main/xmli18n-tmp.h:154 msgid "Chilean Double Office" msgstr "Chilean Double Office" -#: src/main/xmli18n-tmp.h:135 +#: src/main/xmli18n-tmp.h:155 msgid "Custom" msgstr "Personnalisé" -#: src/main/xmli18n-tmp.h:136 +#: src/main/xmli18n-tmp.h:156 msgid "89 mm Roll Paper" msgstr "Rouleau 89mm" -#: src/main/xmli18n-tmp.h:137 +#: src/main/xmli18n-tmp.h:157 msgid "4 Inch Roll Paper" msgstr "Rouleau 4 pouces" -#: src/main/xmli18n-tmp.h:138 +#: src/main/xmli18n-tmp.h:158 msgid "5 Inch Roll Paper" msgstr "Rouleau 5 pouces" -#: src/main/xmli18n-tmp.h:139 +#: src/main/xmli18n-tmp.h:159 msgid "210 mm Roll Paper" msgstr "Rouleau 210mm" -#: src/main/xmli18n-tmp.h:140 +#: src/main/xmli18n-tmp.h:160 msgid "13 Inch Roll Paper" msgstr "Rouleau 13 pouces" -#: src/main/xmli18n-tmp.h:141 +#: src/main/xmli18n-tmp.h:161 msgid "22 Inch Roll Paper" msgstr "Rouleau 22 pouces" -#: src/main/xmli18n-tmp.h:142 +#: src/main/xmli18n-tmp.h:162 msgid "24 Inch Roll Paper" msgstr "Rouleau 24 pouces" -#: src/main/xmli18n-tmp.h:143 +#: src/main/xmli18n-tmp.h:163 msgid "36 Inch Roll Paper" msgstr "Rouleau 36 pouces" -#: src/main/xmli18n-tmp.h:144 +#: src/main/xmli18n-tmp.h:164 msgid "44 Inch Roll Paper" msgstr "Rouleau 44 pouces" -#: src/main/xmli18n-tmp.h:145 +#: src/main/xmli18n-tmp.h:165 msgid "PostScript Level 1" msgstr "Postscript level 1" -#: src/main/xmli18n-tmp.h:146 +#: src/main/xmli18n-tmp.h:166 msgid "PostScript Level 2" msgstr "Postscript level 2" -#: src/main/xmli18n-tmp.h:147 +#: src/main/xmli18n-tmp.h:167 msgid "Canon BJ-30" msgstr "Canon BJC-30" -#: src/main/xmli18n-tmp.h:148 +#: src/main/xmli18n-tmp.h:168 msgid "Canon BJC-50" msgstr "Canon BJC-50" -#: src/main/xmli18n-tmp.h:149 +#: src/main/xmli18n-tmp.h:169 msgid "Canon BJC-55" msgstr "Canon BJC-55" -#: src/main/xmli18n-tmp.h:150 +#: src/main/xmli18n-tmp.h:170 msgid "Canon BJC-80" msgstr "Canon BJC-80" -#: src/main/xmli18n-tmp.h:151 +#: src/main/xmli18n-tmp.h:171 msgid "Canon BJC-85" msgstr "Canon BJC-85" -#: src/main/xmli18n-tmp.h:152 +#: src/main/xmli18n-tmp.h:172 msgid "Canon BJC-210" msgstr "Canon BJC-210" -#: src/main/xmli18n-tmp.h:153 +#: src/main/xmli18n-tmp.h:173 msgid "Canon BJC-240" msgstr "Canon BJC-240" -#: src/main/xmli18n-tmp.h:154 +#: src/main/xmli18n-tmp.h:174 msgid "Canon BJC-250" msgstr "Canon BJC-250" -#: src/main/xmli18n-tmp.h:155 +#: src/main/xmli18n-tmp.h:175 msgid "Canon BJC-1000" msgstr "Canon BJC-1000" -#: src/main/xmli18n-tmp.h:156 +#: src/main/xmli18n-tmp.h:176 msgid "Canon BJC-2000" msgstr "Canon BJC-2000" -#: src/main/xmli18n-tmp.h:157 +#: src/main/xmli18n-tmp.h:177 msgid "Canon BJC-2010" msgstr "Canon BJC-2010" -#: src/main/xmli18n-tmp.h:158 +#: src/main/xmli18n-tmp.h:178 msgid "Canon BJC-2100" msgstr "Canon BJC-2100" -#: src/main/xmli18n-tmp.h:159 +#: src/main/xmli18n-tmp.h:179 msgid "Canon BJC-2110" msgstr "Canon BJC-2110" -#: src/main/xmli18n-tmp.h:160 +#: src/main/xmli18n-tmp.h:180 msgid "Canon BJC-3000" msgstr "Canon BJC-3000" -#: src/main/xmli18n-tmp.h:161 +#: src/main/xmli18n-tmp.h:181 msgid "Canon BJC-4000" msgstr "Canon BJC-4000" -#: src/main/xmli18n-tmp.h:162 +#: src/main/xmli18n-tmp.h:182 msgid "Canon BJC-4300" msgstr "Canon BJC-4300" -#: src/main/xmli18n-tmp.h:163 +#: src/main/xmli18n-tmp.h:183 msgid "Canon BJC-4400" msgstr "Canon BJC-4400" -#: src/main/xmli18n-tmp.h:164 +#: src/main/xmli18n-tmp.h:184 #, fuzzy msgid "Canon BJC-5100" msgstr "Canon BJC-1000" -#: src/main/xmli18n-tmp.h:165 +#: src/main/xmli18n-tmp.h:185 #, fuzzy msgid "Canon BJC-5500" msgstr "Canon BJC-6500" -#: src/main/xmli18n-tmp.h:166 +#: src/main/xmli18n-tmp.h:186 msgid "Canon BJC-6000" msgstr "Canon BJC-6000" -#: src/main/xmli18n-tmp.h:167 +#: src/main/xmli18n-tmp.h:187 msgid "Canon BJC-6100" msgstr "Canon BJC-6100" -#: src/main/xmli18n-tmp.h:168 +#: src/main/xmli18n-tmp.h:188 msgid "Canon BJC-6200" msgstr "Canon BJC-6200" -#: src/main/xmli18n-tmp.h:169 +#: src/main/xmli18n-tmp.h:189 msgid "Canon BJC-6500" msgstr "Canon BJC-6500" -#: src/main/xmli18n-tmp.h:170 +#: src/main/xmli18n-tmp.h:190 msgid "Canon BJC-7000" msgstr "Canon BJC-7000" -#: src/main/xmli18n-tmp.h:171 +#: src/main/xmli18n-tmp.h:191 msgid "Canon BJC-7100" msgstr "Canon BJC-7100" -#: src/main/xmli18n-tmp.h:172 +#: src/main/xmli18n-tmp.h:192 msgid "Canon BJC-8200" msgstr "Canon BJC-8200" -#: src/main/xmli18n-tmp.h:173 +#: src/main/xmli18n-tmp.h:193 #, fuzzy msgid "Canon BJC-8500" msgstr "Canon BJC-6500" -#: src/main/xmli18n-tmp.h:174 +#: src/main/xmli18n-tmp.h:194 msgid "Canon S100" msgstr "Canon S100" -#: src/main/xmli18n-tmp.h:175 +#: src/main/xmli18n-tmp.h:195 msgid "Canon S200" msgstr "Canon S200" -#: src/main/xmli18n-tmp.h:176 +#: src/main/xmli18n-tmp.h:196 msgid "Canon S300" msgstr "Canon S300" -#: src/main/xmli18n-tmp.h:177 +#: src/main/xmli18n-tmp.h:197 msgid "Canon S400" msgstr "Canon S400" -#: src/main/xmli18n-tmp.h:178 +#: src/main/xmli18n-tmp.h:198 msgid "Canon S450" msgstr "Canon S450" -#: src/main/xmli18n-tmp.h:179 +#: src/main/xmli18n-tmp.h:199 msgid "Canon S500" msgstr "Canon S500" -#: src/main/xmli18n-tmp.h:180 +#: src/main/xmli18n-tmp.h:200 msgid "Canon S600" msgstr "Canon S600" -#: src/main/xmli18n-tmp.h:181 +#: src/main/xmli18n-tmp.h:201 msgid "Canon S630" msgstr "Canon S630" -#: src/main/xmli18n-tmp.h:182 +#: src/main/xmli18n-tmp.h:202 msgid "Canon S800" msgstr "Canon S800" -#: src/main/xmli18n-tmp.h:183 +#: src/main/xmli18n-tmp.h:203 msgid "Canon S4500" msgstr "Canon S4500" -#: src/main/xmli18n-tmp.h:184 +#: src/main/xmli18n-tmp.h:204 #, fuzzy msgid "Canon PIXMA iP2000" msgstr "Canon iP4000" -#: src/main/xmli18n-tmp.h:185 +#: src/main/xmli18n-tmp.h:205 #, fuzzy msgid "Canon PIXMA iP3000" msgstr "Canon iP4000" -#: src/main/xmli18n-tmp.h:186 +#: src/main/xmli18n-tmp.h:206 #, fuzzy msgid "Canon PIXMA iP3100" msgstr "Canon CP-300" -#: src/main/xmli18n-tmp.h:187 +#: src/main/xmli18n-tmp.h:207 #, fuzzy msgid "Canon PIXMA iP4000" msgstr "Canon iP4000" -#: src/main/xmli18n-tmp.h:188 +#: src/main/xmli18n-tmp.h:208 #, fuzzy msgid "Canon PIXMA iP4100" msgstr "Canon iP4000" -#: src/main/xmli18n-tmp.h:189 +#: src/main/xmli18n-tmp.h:209 #, fuzzy msgid "Canon PIXMA iP4200" msgstr "Canon iP4000" -#: src/main/xmli18n-tmp.h:190 +#: src/main/xmli18n-tmp.h:210 #, fuzzy msgid "Canon PIXMA iP4300" msgstr "Canon iP4000" -#: src/main/xmli18n-tmp.h:191 +#: src/main/xmli18n-tmp.h:211 #, fuzzy msgid "Canon PIXMA iP4500" msgstr "Canon iP4000" -#: src/main/xmli18n-tmp.h:192 +#: src/main/xmli18n-tmp.h:212 #, fuzzy msgid "Canon PIXMA iP5000" msgstr "Canon iP4000" -#: src/main/xmli18n-tmp.h:193 +#: src/main/xmli18n-tmp.h:213 #, fuzzy msgid "Canon PIXMA iP5200" msgstr "Canon CP-200" -#: src/main/xmli18n-tmp.h:194 +#: src/main/xmli18n-tmp.h:214 #, fuzzy msgid "Canon PIXMA iP5300" msgstr "Canon iP4000" -#: src/main/xmli18n-tmp.h:195 +#: src/main/xmli18n-tmp.h:215 +#, fuzzy +msgid "Canon PIXMA iP6000D" +msgstr "Canon iP4000" + +#: src/main/xmli18n-tmp.h:216 #, fuzzy msgid "Canon PIXMA iP6700" msgstr "Canon iP4000" -#: src/main/xmli18n-tmp.h:196 +#: src/main/xmli18n-tmp.h:217 #, fuzzy msgid "Canon PIXMA iP8500" msgstr "Canon iP4000" -#: src/main/xmli18n-tmp.h:197 +#: src/main/xmli18n-tmp.h:218 #, fuzzy msgid "Canon PIXMA iX5000" msgstr "Canon iP4000" -#: src/main/xmli18n-tmp.h:198 +#: src/main/xmli18n-tmp.h:219 #, fuzzy msgid "Canon PIXMA Pro9500" msgstr "Canon iP4000" -#: src/main/xmli18n-tmp.h:199 +#: src/main/xmli18n-tmp.h:220 #, fuzzy msgid "Canon PIXMA MP150" msgstr "Canon CP-300" -#: src/main/xmli18n-tmp.h:200 +#: src/main/xmli18n-tmp.h:221 #, fuzzy msgid "Canon PIXMA MP170" msgstr "Canon CP-300" -#: src/main/xmli18n-tmp.h:201 +#: src/main/xmli18n-tmp.h:222 #, fuzzy msgid "Canon PIXMA MP180" msgstr "Canon CP-300" -#: src/main/xmli18n-tmp.h:202 +#: src/main/xmli18n-tmp.h:223 #, fuzzy msgid "Canon PIXMA MP500" msgstr "Canon iP4000" -#: src/main/xmli18n-tmp.h:203 +#: src/main/xmli18n-tmp.h:224 +#, fuzzy +msgid "Canon PIXMA MP520" +msgstr "Canon CP-300" + +#: src/main/xmli18n-tmp.h:225 #, fuzzy msgid "Canon PIXMA MP610" msgstr "Canon CP-300" -#: src/main/xmli18n-tmp.h:204 +#: src/main/xmli18n-tmp.h:226 #, fuzzy msgid "Canon PIXMA MP700" msgstr "Canon iP4000" -#: src/main/xmli18n-tmp.h:205 +#: src/main/xmli18n-tmp.h:227 #, fuzzy msgid "Canon PIXMA MP710" msgstr "Canon CP-300" -#: src/main/xmli18n-tmp.h:206 +#: src/main/xmli18n-tmp.h:228 #, fuzzy msgid "Canon PIXMA MP730" msgstr "Canon iP4000" -#: src/main/xmli18n-tmp.h:207 +#: src/main/xmli18n-tmp.h:229 #, fuzzy msgid "Canon PIXMA MP740" msgstr "Canon iP4000" -#: src/main/xmli18n-tmp.h:208 +#: src/main/xmli18n-tmp.h:230 #, fuzzy msgid "Canon PIXMA MP750" msgstr "Canon iP4000" -#: src/main/xmli18n-tmp.h:209 +#: src/main/xmli18n-tmp.h:231 #, fuzzy msgid "Canon PIXMA MP760" msgstr "Canon iP4000" -#: src/main/xmli18n-tmp.h:210 +#: src/main/xmli18n-tmp.h:232 #, fuzzy msgid "Canon PIXMA MP770" msgstr "Canon iP4000" -#: src/main/xmli18n-tmp.h:211 +#: src/main/xmli18n-tmp.h:233 #, fuzzy msgid "Canon PIXMA MP780" msgstr "Canon iP4000" -#: src/main/xmli18n-tmp.h:212 +#: src/main/xmli18n-tmp.h:234 #, fuzzy msgid "Canon PIXMA MP790" msgstr "Canon iP4000" -#: src/main/xmli18n-tmp.h:213 +#: src/main/xmli18n-tmp.h:235 #, fuzzy msgid "Canon PIXMA MP830" msgstr "Canon iP4000" -#: src/main/xmli18n-tmp.h:214 +#: src/main/xmli18n-tmp.h:236 #, fuzzy msgid "Canon PIXUS iP3100" msgstr "Canon S100" -#: src/main/xmli18n-tmp.h:215 +#: src/main/xmli18n-tmp.h:237 #, fuzzy msgid "Canon PIXUS iP4100" msgstr "Canon iP4000" -#: src/main/xmli18n-tmp.h:216 +#: src/main/xmli18n-tmp.h:238 #, fuzzy msgid "Canon i80" msgstr "Canon S450" -#: src/main/xmli18n-tmp.h:217 +#: src/main/xmli18n-tmp.h:239 #, fuzzy msgid "Canon i560" msgstr "Canon S450" -#: src/main/xmli18n-tmp.h:218 +#: src/main/xmli18n-tmp.h:240 #, fuzzy msgid "Canon i850" msgstr "Canon S450" -#: src/main/xmli18n-tmp.h:219 +#: src/main/xmli18n-tmp.h:241 #, fuzzy msgid "Canon i860" msgstr "Canon S600" -#: src/main/xmli18n-tmp.h:220 +#: src/main/xmli18n-tmp.h:242 #, fuzzy msgid "Canon i865" msgstr "Canon BJC-85" -#: src/main/xmli18n-tmp.h:221 +#: src/main/xmli18n-tmp.h:243 msgid "Epson Stylus C20" msgstr "Epson Stylus C20" -#: src/main/xmli18n-tmp.h:222 +#: src/main/xmli18n-tmp.h:244 msgid "Epson Stylus C20SX" msgstr "Epson Stylus C20SX" -#: src/main/xmli18n-tmp.h:223 +#: src/main/xmli18n-tmp.h:245 msgid "Epson Stylus C20UX" msgstr "Epson Stylus C20UX" -#: src/main/xmli18n-tmp.h:224 +#: src/main/xmli18n-tmp.h:246 msgid "Epson Stylus C40" msgstr "Epson Stylus C40" -#: src/main/xmli18n-tmp.h:225 +#: src/main/xmli18n-tmp.h:247 msgid "Epson Stylus C40SX" msgstr "Epson Stylus C40SX" -#: src/main/xmli18n-tmp.h:226 +#: src/main/xmli18n-tmp.h:248 msgid "Epson Stylus C40UX" msgstr "Epson Stylus C40UX" -#: src/main/xmli18n-tmp.h:227 +#: src/main/xmli18n-tmp.h:249 msgid "Epson Stylus C41" msgstr "Epson Stylus C41" -#: src/main/xmli18n-tmp.h:228 +#: src/main/xmli18n-tmp.h:250 msgid "Epson Stylus C41SX" msgstr "Epson Stylus C41SX" -#: src/main/xmli18n-tmp.h:229 +#: src/main/xmli18n-tmp.h:251 msgid "Epson Stylus C41UX" msgstr "Epson Stylus C41UX" -#: src/main/xmli18n-tmp.h:230 +#: src/main/xmli18n-tmp.h:252 msgid "Epson Stylus C42" msgstr "Epson Stylus C42" -#: src/main/xmli18n-tmp.h:231 +#: src/main/xmli18n-tmp.h:253 msgid "Epson Stylus C42SX" msgstr "Epson Stylus C42SX" -#: src/main/xmli18n-tmp.h:232 +#: src/main/xmli18n-tmp.h:254 msgid "Epson Stylus C42UX" msgstr "Epson Stylus C42UX" -#: src/main/xmli18n-tmp.h:233 +#: src/main/xmli18n-tmp.h:255 msgid "Epson Stylus C43" msgstr "Epson Stylus C43" -#: src/main/xmli18n-tmp.h:234 +#: src/main/xmli18n-tmp.h:256 msgid "Epson Stylus C43SX" msgstr "Epson Stylus C43SX" -#: src/main/xmli18n-tmp.h:235 +#: src/main/xmli18n-tmp.h:257 msgid "Epson Stylus C43UX" msgstr "Epson Stylus C43UX" -#: src/main/xmli18n-tmp.h:236 +#: src/main/xmli18n-tmp.h:258 msgid "Epson Stylus C44" msgstr "EPSON Stylus C44" -#: src/main/xmli18n-tmp.h:237 +#: src/main/xmli18n-tmp.h:259 msgid "Epson Stylus C44SX" msgstr "Epson Stylus C44SX" -#: src/main/xmli18n-tmp.h:238 +#: src/main/xmli18n-tmp.h:260 msgid "Epson Stylus C44UX" msgstr "Epson Stylus C44UX" -#: src/main/xmli18n-tmp.h:239 +#: src/main/xmli18n-tmp.h:261 msgid "Epson Stylus C45" msgstr "Epson Stylus C45" -#: src/main/xmli18n-tmp.h:240 +#: src/main/xmli18n-tmp.h:262 msgid "Epson Stylus C46" msgstr "Epson Stylus C46" -#: src/main/xmli18n-tmp.h:241 +#: src/main/xmli18n-tmp.h:263 msgid "Epson Stylus C48" msgstr "Epson Stylus C48" -#: src/main/xmli18n-tmp.h:242 +#: src/main/xmli18n-tmp.h:264 msgid "Epson Stylus C50" msgstr "Epson Stylus C50" -#: src/main/xmli18n-tmp.h:243 +#: src/main/xmli18n-tmp.h:265 msgid "Epson Stylus C60" msgstr "Epson Stylus C60" -#: src/main/xmli18n-tmp.h:244 +#: src/main/xmli18n-tmp.h:266 msgid "Epson Stylus C61" msgstr "Epson Stylus C61" -#: src/main/xmli18n-tmp.h:245 +#: src/main/xmli18n-tmp.h:267 msgid "Epson Stylus C62" msgstr "Epson Stylus C62" -#: src/main/xmli18n-tmp.h:246 +#: src/main/xmli18n-tmp.h:268 msgid "Epson Stylus C63" msgstr "Epson Stylus C63" -#: src/main/xmli18n-tmp.h:247 +#: src/main/xmli18n-tmp.h:269 msgid "Epson Stylus C64" msgstr "Epson Stylus C64" -#: src/main/xmli18n-tmp.h:248 +#: src/main/xmli18n-tmp.h:270 msgid "Epson Stylus C65" msgstr "Epson Stylus C65" -#: src/main/xmli18n-tmp.h:249 +#: src/main/xmli18n-tmp.h:271 msgid "Epson Stylus C66" msgstr "Epson Stylus C66" -#: src/main/xmli18n-tmp.h:250 +#: src/main/xmli18n-tmp.h:272 msgid "Epson Stylus C68" msgstr "Epson Stylus C68" -#: src/main/xmli18n-tmp.h:251 +#: src/main/xmli18n-tmp.h:273 msgid "Epson Stylus C70" msgstr "Epson Stylus C70" -#: src/main/xmli18n-tmp.h:252 +#: src/main/xmli18n-tmp.h:274 #, fuzzy msgid "Epson Stylus C79" msgstr "Epson Stylus C70" -#: src/main/xmli18n-tmp.h:253 +#: src/main/xmli18n-tmp.h:275 msgid "Epson Stylus C80" msgstr "Epson Stylus C80" -#: src/main/xmli18n-tmp.h:254 +#: src/main/xmli18n-tmp.h:276 msgid "Epson Stylus C82" msgstr "Epson Stylus C82" -#: src/main/xmli18n-tmp.h:255 +#: src/main/xmli18n-tmp.h:277 msgid "Epson Stylus C83" msgstr "Epson Stylus C83" -#: src/main/xmli18n-tmp.h:256 +#: src/main/xmli18n-tmp.h:278 msgid "Epson Stylus C84" msgstr "Epson Stylus C84" -#: src/main/xmli18n-tmp.h:257 +#: src/main/xmli18n-tmp.h:279 msgid "Epson Stylus C85" msgstr "Epson Stylus C85" -#: src/main/xmli18n-tmp.h:258 +#: src/main/xmli18n-tmp.h:280 msgid "Epson Stylus C86" msgstr "Epson Stylus C86" -#: src/main/xmli18n-tmp.h:259 +#: src/main/xmli18n-tmp.h:281 #, fuzzy msgid "Epson Stylus C87" msgstr "Epson Stylus C48" -#: src/main/xmli18n-tmp.h:260 +#: src/main/xmli18n-tmp.h:282 msgid "Epson Stylus C88" msgstr "Epson Stylus C88" -#: src/main/xmli18n-tmp.h:261 +#: src/main/xmli18n-tmp.h:283 #, fuzzy msgid "Epson Stylus C110" msgstr "Epson Stylus C20" -#: src/main/xmli18n-tmp.h:262 +#: src/main/xmli18n-tmp.h:284 #, fuzzy msgid "Epson Stylus C120" msgstr "Epson Stylus C20" -#: src/main/xmli18n-tmp.h:263 +#: src/main/xmli18n-tmp.h:285 msgid "Epson Stylus Color" msgstr "Epson Stylus Color" -#: src/main/xmli18n-tmp.h:264 +#: src/main/xmli18n-tmp.h:286 msgid "Epson Stylus Color I" msgstr "Epson Stylus Color I" -#: src/main/xmli18n-tmp.h:265 +#: src/main/xmli18n-tmp.h:287 msgid "Epson Stylus Color II" msgstr "Epson Stylus Color II" -#: src/main/xmli18n-tmp.h:266 +#: src/main/xmli18n-tmp.h:288 msgid "Epson Stylus Color IIs" msgstr "Epson Stylus Color IIs" -#: src/main/xmli18n-tmp.h:267 +#: src/main/xmli18n-tmp.h:289 msgid "Epson Stylus Color PRO" msgstr "Epson Stylus Color PRO" -#: src/main/xmli18n-tmp.h:268 +#: src/main/xmli18n-tmp.h:290 msgid "Epson Stylus Pro XL" msgstr "Epson Stylus Pro XL" -#: src/main/xmli18n-tmp.h:269 +#: src/main/xmli18n-tmp.h:291 msgid "Epson Stylus Color 400" msgstr "Epson Stylus Color 400" -#: src/main/xmli18n-tmp.h:270 +#: src/main/xmli18n-tmp.h:292 msgid "Epson Stylus Color 440" msgstr "Epson Stylus Color 440" -#: src/main/xmli18n-tmp.h:271 +#: src/main/xmli18n-tmp.h:293 msgid "Epson Stylus Color 460" msgstr "Epson Stylus Color 460" -#: src/main/xmli18n-tmp.h:272 +#: src/main/xmli18n-tmp.h:294 msgid "Epson Stylus Color 480" msgstr "Epson Stylus Color 480" -#: src/main/xmli18n-tmp.h:273 +#: src/main/xmli18n-tmp.h:295 msgid "Epson Stylus Color 500" msgstr "Epson Stylus Color 500" -#: src/main/xmli18n-tmp.h:274 +#: src/main/xmli18n-tmp.h:296 msgid "Epson Stylus Color 580" msgstr "Epson Stylus Color 580" -#: src/main/xmli18n-tmp.h:275 +#: src/main/xmli18n-tmp.h:297 msgid "Epson Stylus Color 600" msgstr "Epson Stylus Color 600" -#: src/main/xmli18n-tmp.h:276 +#: src/main/xmli18n-tmp.h:298 msgid "Epson Stylus Color 640" msgstr "Epson Stylus Color 640" -#: src/main/xmli18n-tmp.h:277 +#: src/main/xmli18n-tmp.h:299 msgid "Epson Stylus Color 660" msgstr "Epson Stylus Color 660" -#: src/main/xmli18n-tmp.h:278 +#: src/main/xmli18n-tmp.h:300 msgid "Epson Stylus Color 670" msgstr "Epson Stylus Color 670" -#: src/main/xmli18n-tmp.h:279 +#: src/main/xmli18n-tmp.h:301 msgid "Epson Stylus Color 680" msgstr "Epson Stylus Color 680" -#: src/main/xmli18n-tmp.h:280 +#: src/main/xmli18n-tmp.h:302 msgid "Epson Stylus Color 740" msgstr "Epson Stylus Color 740" -#: src/main/xmli18n-tmp.h:281 +#: src/main/xmli18n-tmp.h:303 msgid "Epson Stylus Color 760" msgstr "Epson Stylus Color 760" -#: src/main/xmli18n-tmp.h:282 +#: src/main/xmli18n-tmp.h:304 msgid "Epson Stylus Color 777" msgstr "Epson Stylus Color 777" -#: src/main/xmli18n-tmp.h:283 +#: src/main/xmli18n-tmp.h:305 msgid "Epson Stylus Color 800" msgstr "Epson Stylus Color 800" -#: src/main/xmli18n-tmp.h:284 +#: src/main/xmli18n-tmp.h:306 msgid "Epson Stylus Color 850" msgstr "Epson Stylus Color 850" -#: src/main/xmli18n-tmp.h:285 +#: src/main/xmli18n-tmp.h:307 msgid "Epson Stylus Color 860" msgstr "Epson Stylus Color 860" -#: src/main/xmli18n-tmp.h:286 +#: src/main/xmli18n-tmp.h:308 msgid "Epson Stylus Color 880" msgstr "Epson Stylus Color 880" -#: src/main/xmli18n-tmp.h:287 +#: src/main/xmli18n-tmp.h:309 msgid "Epson Stylus Color 8 3" msgstr "Epson Stylus Color 8 3" -#: src/main/xmli18n-tmp.h:288 +#: src/main/xmli18n-tmp.h:310 msgid "Epson Stylus Color 900" msgstr "Epson Stylus Color 900" -#: src/main/xmli18n-tmp.h:289 +#: src/main/xmli18n-tmp.h:311 msgid "Epson Stylus Color 980" msgstr "Epson Stylus Color 980" -#: src/main/xmli18n-tmp.h:290 +#: src/main/xmli18n-tmp.h:312 msgid "Epson Stylus Color 1160" msgstr "Epson Stylus Color 1160" -#: src/main/xmli18n-tmp.h:291 +#: src/main/xmli18n-tmp.h:313 msgid "Epson Stylus Color 1500" msgstr "Epson Stylus Color 1500" -#: src/main/xmli18n-tmp.h:292 +#: src/main/xmli18n-tmp.h:314 msgid "Epson Stylus Color 1520" msgstr "Epson Stylus Color 1520" -#: src/main/xmli18n-tmp.h:293 +#: src/main/xmli18n-tmp.h:315 msgid "Epson Stylus Color 3000" msgstr "Epson Stylus Color 3000" -#: src/main/xmli18n-tmp.h:294 +#: src/main/xmli18n-tmp.h:316 msgid "Epson Stylus Photo" msgstr "Epson Stylus Photo" -#: src/main/xmli18n-tmp.h:295 +#: src/main/xmli18n-tmp.h:317 msgid "Epson Stylus Photo 700" msgstr "Epson Stylus Photo 700" -#: src/main/xmli18n-tmp.h:296 +#: src/main/xmli18n-tmp.h:318 msgid "Epson Stylus Photo EX" msgstr "Epson Stylus Photo EX" -#: src/main/xmli18n-tmp.h:297 +#: src/main/xmli18n-tmp.h:319 msgid "Epson Stylus Photo EX3" msgstr "Epson Stylus Photo EX3" -#: src/main/xmli18n-tmp.h:298 +#: src/main/xmli18n-tmp.h:320 msgid "Epson Stylus Photo 720" msgstr "Epson Stylus Photo 720" -#: src/main/xmli18n-tmp.h:299 +#: src/main/xmli18n-tmp.h:321 msgid "Epson Stylus Photo 750" msgstr "Epson Stylus Photo 750" -#: src/main/xmli18n-tmp.h:300 +#: src/main/xmli18n-tmp.h:322 msgid "Epson Stylus Photo 780" msgstr "Epson Stylus Photo 780" -#: src/main/xmli18n-tmp.h:301 +#: src/main/xmli18n-tmp.h:323 msgid "Epson Stylus Photo 785" msgstr "Epson Stylus Photo 785" -#: src/main/xmli18n-tmp.h:302 +#: src/main/xmli18n-tmp.h:324 msgid "Epson Stylus Photo 790" msgstr "Epson Stylus Photo 790" -#: src/main/xmli18n-tmp.h:303 +#: src/main/xmli18n-tmp.h:325 msgid "Epson Stylus Photo 810" msgstr "Epson Stylus Photo 810" -#: src/main/xmli18n-tmp.h:304 +#: src/main/xmli18n-tmp.h:326 msgid "Epson Stylus Photo 820" msgstr "Epson Stylus Photo 820" -#: src/main/xmli18n-tmp.h:305 +#: src/main/xmli18n-tmp.h:327 msgid "Epson Stylus Photo 825" msgstr "Epson Stylus Photo 825" -#: src/main/xmli18n-tmp.h:306 +#: src/main/xmli18n-tmp.h:328 msgid "Epson Stylus Photo 830" msgstr "Epson Stylus Photo 830" -#: src/main/xmli18n-tmp.h:307 +#: src/main/xmli18n-tmp.h:329 msgid "Epson Stylus Photo 830U" msgstr "Epson Stylus Photo 830U" -#: src/main/xmli18n-tmp.h:308 +#: src/main/xmli18n-tmp.h:330 msgid "Epson Stylus Photo 870" msgstr "Epson Stylus Photo 870" -#: src/main/xmli18n-tmp.h:309 +#: src/main/xmli18n-tmp.h:331 msgid "Epson Stylus Photo 875" msgstr "Epson Stylus Photo 875" -#: src/main/xmli18n-tmp.h:310 +#: src/main/xmli18n-tmp.h:332 msgid "Epson Stylus Photo 890" msgstr "Epson Stylus Photo 890" -#: src/main/xmli18n-tmp.h:311 +#: src/main/xmli18n-tmp.h:333 msgid "Epson Stylus Photo 895" msgstr "Epson Stylus Photo 895" -#: src/main/xmli18n-tmp.h:312 +#: src/main/xmli18n-tmp.h:334 msgid "Epson Stylus Photo 900" msgstr "Epson Stylus Photo 900" -#: src/main/xmli18n-tmp.h:313 +#: src/main/xmli18n-tmp.h:335 msgid "Epson Stylus Photo 915" msgstr "Epson Stylus Photo 915" -#: src/main/xmli18n-tmp.h:314 +#: src/main/xmli18n-tmp.h:336 msgid "Epson Stylus Photo 925" msgstr "Epson Stylus Photo 925" -#: src/main/xmli18n-tmp.h:315 +#: src/main/xmli18n-tmp.h:337 msgid "Epson Stylus Photo 935" msgstr "Epson Stylus Photo 935" -#: src/main/xmli18n-tmp.h:316 +#: src/main/xmli18n-tmp.h:338 msgid "Epson Stylus Photo 950" msgstr "Epson Stylus Photo 950" -#: src/main/xmli18n-tmp.h:317 +#: src/main/xmli18n-tmp.h:339 msgid "Epson Stylus Photo 960" msgstr "Epson Stylus Photo 960" -#: src/main/xmli18n-tmp.h:318 +#: src/main/xmli18n-tmp.h:340 msgid "Epson Stylus Photo 1200" msgstr "Epson Stylus Photo 1200" -#: src/main/xmli18n-tmp.h:319 +#: src/main/xmli18n-tmp.h:341 msgid "Epson Stylus Photo 1270" msgstr "Epson Stylus Photo 1270" -#: src/main/xmli18n-tmp.h:320 +#: src/main/xmli18n-tmp.h:342 msgid "Epson Stylus Photo 1280" msgstr "Epson Stylus Photo 1280" -#: src/main/xmli18n-tmp.h:321 +#: src/main/xmli18n-tmp.h:343 msgid "Epson Stylus Photo 1290" msgstr "Epson Stylus Photo 1290" -#: src/main/xmli18n-tmp.h:322 +#: src/main/xmli18n-tmp.h:344 #, fuzzy msgid "Epson Stylus Photo 1400" msgstr "Epson Stylus Photo 1200" -#: src/main/xmli18n-tmp.h:323 +#: src/main/xmli18n-tmp.h:345 #, fuzzy msgid "Epson Stylus Photo 1410" msgstr "Epson Stylus Photo 810" -#: src/main/xmli18n-tmp.h:324 +#: src/main/xmli18n-tmp.h:346 msgid "Epson Stylus Photo 2000P" msgstr "Epson Stylus Photo 2000P" -#: src/main/xmli18n-tmp.h:325 +#: src/main/xmli18n-tmp.h:347 msgid "Epson Stylus Photo 2100" msgstr "Epson Stylus Photo 2100" -#: src/main/xmli18n-tmp.h:326 +#: src/main/xmli18n-tmp.h:348 msgid "Epson Stylus Photo 2200" msgstr "Epson Stylus Photo 2200" -#: src/main/xmli18n-tmp.h:327 +#: src/main/xmli18n-tmp.h:349 msgid "Epson Stylus Photo R200" msgstr "Epson Stylus Photo R200" -#: src/main/xmli18n-tmp.h:328 +#: src/main/xmli18n-tmp.h:350 msgid "Epson Stylus Photo R210" msgstr "Epson Stylus Photo R210" -#: src/main/xmli18n-tmp.h:329 +#: src/main/xmli18n-tmp.h:351 msgid "Epson Stylus Photo R220" msgstr "Epson Stylus Photo R220" -#: src/main/xmli18n-tmp.h:330 +#: src/main/xmli18n-tmp.h:352 #, fuzzy msgid "Epson Stylus Photo R230" msgstr "Epson Stylus Photo R200" -#: src/main/xmli18n-tmp.h:331 +#: src/main/xmli18n-tmp.h:353 #, fuzzy msgid "Epson Stylus Photo R240" msgstr "Epson Stylus Photo R2400" -#: src/main/xmli18n-tmp.h:332 +#: src/main/xmli18n-tmp.h:354 #, fuzzy msgid "Epson Stylus Photo R245" msgstr "Epson Stylus Photo RX425" -#: src/main/xmli18n-tmp.h:333 +#: src/main/xmli18n-tmp.h:355 #, fuzzy msgid "Epson Stylus Photo R260" msgstr "Epson Stylus Photo R200" -#: src/main/xmli18n-tmp.h:334 +#: src/main/xmli18n-tmp.h:356 #, fuzzy msgid "Epson Stylus Photo R265" msgstr "Epson Stylus Photo RX425" -#: src/main/xmli18n-tmp.h:335 +#: src/main/xmli18n-tmp.h:357 #, fuzzy msgid "Epson Stylus Photo R270" msgstr "Epson Stylus Photo 1270" -#: src/main/xmli18n-tmp.h:336 +#: src/main/xmli18n-tmp.h:358 +#, fuzzy +msgid "Epson Stylus Photo R280" +msgstr "Epson Stylus Photo 1280" + +#: src/main/xmli18n-tmp.h:359 +#, fuzzy +msgid "Epson Stylus Photo R285" +msgstr "Epson Stylus Photo RX425" + +#: src/main/xmli18n-tmp.h:360 msgid "Epson Stylus Photo R300" msgstr "Epson Stylus Photo R300" -#: src/main/xmli18n-tmp.h:337 +#: src/main/xmli18n-tmp.h:361 msgid "Epson Stylus Photo R310" msgstr "Epson Stylus Photo R310" -#: src/main/xmli18n-tmp.h:338 +#: src/main/xmli18n-tmp.h:362 msgid "Epson Stylus Photo R320" msgstr "Epson Stylus Photo R320" -#: src/main/xmli18n-tmp.h:339 +#: src/main/xmli18n-tmp.h:363 msgid "Epson Stylus Photo R340" msgstr "Epson Stylus Photo R340" -#: src/main/xmli18n-tmp.h:340 +#: src/main/xmli18n-tmp.h:364 #, fuzzy msgid "Epson Stylus Photo R350" msgstr "Epson Stylus Photo R300" -#: src/main/xmli18n-tmp.h:341 +#: src/main/xmli18n-tmp.h:365 #, fuzzy msgid "Epson Stylus Photo R360" msgstr "Epson Stylus Photo R300" -#: src/main/xmli18n-tmp.h:342 +#: src/main/xmli18n-tmp.h:366 #, fuzzy msgid "Epson Stylus Photo R380" msgstr "Epson Stylus Photo R300" -#: src/main/xmli18n-tmp.h:343 +#: src/main/xmli18n-tmp.h:367 #, fuzzy msgid "Epson Stylus Photo R390" msgstr "Epson Stylus Photo R300" -#: src/main/xmli18n-tmp.h:344 +#: src/main/xmli18n-tmp.h:368 msgid "Epson Stylus Photo RX400" msgstr "Epson Stylus Photo RX400" -#: src/main/xmli18n-tmp.h:345 +#: src/main/xmli18n-tmp.h:369 msgid "Epson Stylus Photo RX420" msgstr "Epson Stylus Photo RX420" -#: src/main/xmli18n-tmp.h:346 +#: src/main/xmli18n-tmp.h:370 msgid "Epson Stylus Photo RX425" msgstr "Epson Stylus Photo RX425" -#: src/main/xmli18n-tmp.h:347 +#: src/main/xmli18n-tmp.h:371 msgid "Epson Stylus Photo RX430" msgstr "Epson Stylus Photo RX430" -#: src/main/xmli18n-tmp.h:348 +#: src/main/xmli18n-tmp.h:372 msgid "Epson Stylus Photo RX500" msgstr "Epson Stylus Photo RX500" -#: src/main/xmli18n-tmp.h:349 +#: src/main/xmli18n-tmp.h:373 msgid "Epson Stylus Photo RX510" msgstr "Epson Stylus Photo RX510" -#: src/main/xmli18n-tmp.h:350 +#: src/main/xmli18n-tmp.h:374 #, fuzzy msgid "Epson Stylus Photo RX560" msgstr "Epson Stylus Photo RX500" -#: src/main/xmli18n-tmp.h:351 +#: src/main/xmli18n-tmp.h:375 #, fuzzy msgid "Epson Stylus Photo RX580" msgstr "Epson Stylus Photo RX500" -#: src/main/xmli18n-tmp.h:352 +#: src/main/xmli18n-tmp.h:376 +#, fuzzy +msgid "Epson Stylus Photo RX585" +msgstr "Epson Stylus Photo RX500" + +#: src/main/xmli18n-tmp.h:377 #, fuzzy msgid "Epson Stylus Photo RX590" msgstr "Epson Stylus Photo RX500" -#: src/main/xmli18n-tmp.h:353 +#: src/main/xmli18n-tmp.h:378 #, fuzzy msgid "Epson Stylus Photo RX595" msgstr "Epson Stylus Photo RX500" -#: src/main/xmli18n-tmp.h:354 +#: src/main/xmli18n-tmp.h:379 msgid "Epson Stylus Photo RX600" msgstr "Epson Stylus Photo RX600" -#: src/main/xmli18n-tmp.h:355 +#: src/main/xmli18n-tmp.h:380 msgid "Epson Stylus Photo RX620" msgstr "Epson Stylus Photo RX620" -#: src/main/xmli18n-tmp.h:356 +#: src/main/xmli18n-tmp.h:381 msgid "Epson Stylus Photo RX630" msgstr "Epson Stylus Photo RX630" -#: src/main/xmli18n-tmp.h:357 +#: src/main/xmli18n-tmp.h:382 #, fuzzy msgid "Epson Stylus Photo RX640" msgstr "Epson Stylus Photo RX400" -#: src/main/xmli18n-tmp.h:358 +#: src/main/xmli18n-tmp.h:383 +#, fuzzy +msgid "Epson Stylus Photo RX680" +msgstr "Epson Stylus Photo RX500" + +#: src/main/xmli18n-tmp.h:384 +#, fuzzy +msgid "Epson Stylus Photo RX685" +msgstr "Epson Stylus Photo RX425" + +#: src/main/xmli18n-tmp.h:385 msgid "Epson Stylus Photo RX700" msgstr "Epson Stylus Photo RX700" -#: src/main/xmli18n-tmp.h:359 +#: src/main/xmli18n-tmp.h:386 msgid "Epson Stylus Photo R800" msgstr "Epson Stylus Photo R800" -#: src/main/xmli18n-tmp.h:360 +#: src/main/xmli18n-tmp.h:387 msgid "Epson Stylus Photo R1800" msgstr "Epson Stylus Photo R1800" -#: src/main/xmli18n-tmp.h:361 +#: src/main/xmli18n-tmp.h:388 msgid "Epson Stylus Photo R2400" msgstr "Epson Stylus Photo R2400" -#: src/main/xmli18n-tmp.h:362 +#: src/main/xmli18n-tmp.h:389 msgid "Epson Stylus Pro 5000" msgstr "Epson Stylus Pro 5000" -#: src/main/xmli18n-tmp.h:363 +#: src/main/xmli18n-tmp.h:390 msgid "Epson Stylus Pro 5500" msgstr "Epson Stylus Pro 5500" -#: src/main/xmli18n-tmp.h:364 +#: src/main/xmli18n-tmp.h:391 msgid "Epson Stylus Pro 7000" msgstr "Epson Stylus Pro 7000" -#: src/main/xmli18n-tmp.h:365 +#: src/main/xmli18n-tmp.h:392 msgid "Epson Stylus Pro 7500" msgstr "Epson Stylus Pro 7500" -#: src/main/xmli18n-tmp.h:366 +#: src/main/xmli18n-tmp.h:393 msgid "Epson Stylus Pro 7600" msgstr "Epson Stylus Pro 7600" -#: src/main/xmli18n-tmp.h:367 +#: src/main/xmli18n-tmp.h:394 msgid "Epson Stylus Pro 9000" msgstr "Epson Stylus Pro 9000" -#: src/main/xmli18n-tmp.h:368 +#: src/main/xmli18n-tmp.h:395 msgid "Epson Stylus Pro 9500" msgstr "Epson Stylus Pro 9500" -#: src/main/xmli18n-tmp.h:369 +#: src/main/xmli18n-tmp.h:396 msgid "Epson Stylus Pro 9600" msgstr "Epson Stylus Pro 9600" -#: src/main/xmli18n-tmp.h:370 +#: src/main/xmli18n-tmp.h:397 msgid "Epson Stylus Pro 10000" msgstr "Epson Stylus Pro 10000" -#: src/main/xmli18n-tmp.h:371 +#: src/main/xmli18n-tmp.h:398 msgid "Epson Stylus Scan 2000" msgstr "Epson Stylus Scan 2000" -#: src/main/xmli18n-tmp.h:372 +#: src/main/xmli18n-tmp.h:399 msgid "Epson Stylus Scan 2500" msgstr "Epson Stylus Scan 2500" -#: src/main/xmli18n-tmp.h:373 +#: src/main/xmli18n-tmp.h:400 msgid "Epson Stylus CX1500" msgstr "Epson Stylus CX1500" -#: src/main/xmli18n-tmp.h:374 +#: src/main/xmli18n-tmp.h:401 msgid "Epson Stylus CX3100" msgstr "Epson Stylus CX3100" -#: src/main/xmli18n-tmp.h:375 +#: src/main/xmli18n-tmp.h:402 msgid "Epson Stylus CX3200" msgstr "Epson Stylus CX3200" -#: src/main/xmli18n-tmp.h:376 +#: src/main/xmli18n-tmp.h:403 msgid "Epson Stylus CX3500" msgstr "Epson Stylus CX3500" -#: src/main/xmli18n-tmp.h:377 +#: src/main/xmli18n-tmp.h:404 msgid "Epson Stylus CX3600" msgstr "Epson Stylus CX3600" -#: src/main/xmli18n-tmp.h:378 +#: src/main/xmli18n-tmp.h:405 msgid "Epson Stylus CX3650" msgstr "Epson Stylus CX3650" -#: src/main/xmli18n-tmp.h:379 +#: src/main/xmli18n-tmp.h:406 msgid "Epson Stylus CX3700" msgstr "Epson Stylus CX3100" -#: src/main/xmli18n-tmp.h:380 +#: src/main/xmli18n-tmp.h:407 msgid "Epson Stylus CX3800" msgstr "Epson Stylus CX3800" -#: src/main/xmli18n-tmp.h:381 +#: src/main/xmli18n-tmp.h:408 msgid "Epson Stylus CX3805" msgstr "Epson Stylus CX3805" -#: src/main/xmli18n-tmp.h:382 +#: src/main/xmli18n-tmp.h:409 msgid "Epson Stylus CX3810" msgstr "Epson Stylus CX3810" -#: src/main/xmli18n-tmp.h:383 +#: src/main/xmli18n-tmp.h:410 msgid "Epson Stylus CX4100" msgstr "Epson Stylus CX4100" -#: src/main/xmli18n-tmp.h:384 +#: src/main/xmli18n-tmp.h:411 msgid "Epson Stylus CX4200" msgstr "Epson Stylus CX4200" -#: src/main/xmli18n-tmp.h:385 +#: src/main/xmli18n-tmp.h:412 #, fuzzy msgid "Epson Stylus CX4400" msgstr "Epson Stylus CX4100" -#: src/main/xmli18n-tmp.h:386 +#: src/main/xmli18n-tmp.h:413 msgid "Epson Stylus CX4500" msgstr "Epson Stylus CX4500" -#: src/main/xmli18n-tmp.h:387 +#: src/main/xmli18n-tmp.h:414 msgid "Epson Stylus CX4600" msgstr "Epson Stylus CX4600" -#: src/main/xmli18n-tmp.h:388 +#: src/main/xmli18n-tmp.h:415 msgid "Epson Stylus CX4700" msgstr "Epson Stylus CX4700" -#: src/main/xmli18n-tmp.h:389 +#: src/main/xmli18n-tmp.h:416 msgid "Epson Stylus CX4800" msgstr "Epson Stylus CX4800" -#: src/main/xmli18n-tmp.h:390 +#: src/main/xmli18n-tmp.h:417 #, fuzzy msgid "Epson Stylus CX4900" msgstr "Epson Stylus CX4100" -#: src/main/xmli18n-tmp.h:391 +#: src/main/xmli18n-tmp.h:418 #, fuzzy msgid "Epson Stylus CX5000" msgstr "Epson Stylus CX1500" -#: src/main/xmli18n-tmp.h:392 +#: src/main/xmli18n-tmp.h:419 #, fuzzy msgid "Epson Stylus CX5000F" msgstr "Epson Stylus CX1500" -#: src/main/xmli18n-tmp.h:393 +#: src/main/xmli18n-tmp.h:420 msgid "Epson Stylus CX5100" msgstr "Epson Stylus CX5100" -#: src/main/xmli18n-tmp.h:394 +#: src/main/xmli18n-tmp.h:421 msgid "Epson Stylus CX5200" msgstr "Epson Stylus CX5200" -#: src/main/xmli18n-tmp.h:395 +#: src/main/xmli18n-tmp.h:422 msgid "Epson Stylus CX5300" msgstr "Epson Stylus CX5300" -#: src/main/xmli18n-tmp.h:396 +#: src/main/xmli18n-tmp.h:423 msgid "Epson Stylus CX5400" msgstr "Epson Stylus CX5400" -#: src/main/xmli18n-tmp.h:397 +#: src/main/xmli18n-tmp.h:424 #, fuzzy msgid "Epson Stylus CX5600" msgstr "Epson Stylus CX1500" -#: src/main/xmli18n-tmp.h:398 +#: src/main/xmli18n-tmp.h:425 msgid "Epson Stylus CX5700" msgstr "Epson Stylus CX5700" -#: src/main/xmli18n-tmp.h:399 +#: src/main/xmli18n-tmp.h:426 msgid "Epson Stylus CX5800" msgstr "Epson Stylus CX5800" -#: src/main/xmli18n-tmp.h:400 +#: src/main/xmli18n-tmp.h:427 #, fuzzy msgid "Epson Stylus CX6000" msgstr "Epson Stylus CX3600" -#: src/main/xmli18n-tmp.h:401 +#: src/main/xmli18n-tmp.h:428 msgid "Epson Stylus CX6300" msgstr "Epson Stylus CX6300" -#: src/main/xmli18n-tmp.h:402 +#: src/main/xmli18n-tmp.h:429 msgid "Epson Stylus CX6400" msgstr "Epson Stylus CX6400" -#: src/main/xmli18n-tmp.h:403 +#: src/main/xmli18n-tmp.h:430 msgid "Epson Stylus CX6500" msgstr "Epson Stylus CX6500" -#: src/main/xmli18n-tmp.h:404 +#: src/main/xmli18n-tmp.h:431 msgid "Epson Stylus CX6600" msgstr "Epson Stylus CX6600" -#: src/main/xmli18n-tmp.h:405 +#: src/main/xmli18n-tmp.h:432 #, fuzzy msgid "Epson Stylus CX7000F" msgstr "Epson Stylus CX3100" -#: src/main/xmli18n-tmp.h:406 +#: src/main/xmli18n-tmp.h:433 #, fuzzy msgid "Epson Stylus CX7400" msgstr "Epson Stylus CX3100" -#: src/main/xmli18n-tmp.h:407 +#: src/main/xmli18n-tmp.h:434 msgid "Epson Stylus CX7700" msgstr "Epson Stylus CX7700" -#: src/main/xmli18n-tmp.h:408 +#: src/main/xmli18n-tmp.h:435 msgid "Epson Stylus CX7800" msgstr "Epson Stylus CX7800" -#: src/main/xmli18n-tmp.h:409 +#: src/main/xmli18n-tmp.h:436 msgid "Epson Stylus CX8300" msgstr "Epson Stylus CX8300" -#: src/main/xmli18n-tmp.h:410 +#: src/main/xmli18n-tmp.h:437 msgid "Epson Stylus CX8400" msgstr "Epson Stylus CX8400" -#: src/main/xmli18n-tmp.h:411 +#: src/main/xmli18n-tmp.h:438 #, fuzzy msgid "Epson Stylus CX9400" msgstr "Epson Stylus CX4100" -#: src/main/xmli18n-tmp.h:412 +#: src/main/xmli18n-tmp.h:439 msgid "Epson Stylus D68" msgstr "Epson Stylus D68" -#: src/main/xmli18n-tmp.h:413 +#: src/main/xmli18n-tmp.h:440 msgid "Epson Stylus D88" msgstr "Epson Stylus D88" -#: src/main/xmli18n-tmp.h:414 +#: src/main/xmli18n-tmp.h:441 +#, fuzzy +msgid "Epson Stylus D92" +msgstr "Epson Stylus C20" + +#: src/main/xmli18n-tmp.h:442 #, fuzzy msgid "Epson Stylus D120" msgstr "Epson Stylus C20" -#: src/main/xmli18n-tmp.h:415 +#: src/main/xmli18n-tmp.h:443 msgid "Epson Stylus DX3800" msgstr "Epson Stylus DX3600" -#: src/main/xmli18n-tmp.h:416 +#: src/main/xmli18n-tmp.h:444 msgid "Epson Stylus DX3850" msgstr "Epson Stylus DX3850" -#: src/main/xmli18n-tmp.h:417 +#: src/main/xmli18n-tmp.h:445 #, fuzzy msgid "Epson Stylus DX4050" msgstr "Epson Stylus DX4200" -#: src/main/xmli18n-tmp.h:418 +#: src/main/xmli18n-tmp.h:446 msgid "Epson Stylus DX4200" msgstr "Epson Stylus DX4200" -#: src/main/xmli18n-tmp.h:419 +#: src/main/xmli18n-tmp.h:447 msgid "Epson Stylus DX4250" msgstr "Epson Stylus DX4250" -#: src/main/xmli18n-tmp.h:420 +#: src/main/xmli18n-tmp.h:448 +#, fuzzy +msgid "Epson Stylus DX4400" +msgstr "Epson Stylus CX4100" + +#: src/main/xmli18n-tmp.h:449 +#, fuzzy +msgid "Epson Stylus DX4450" +msgstr "Epson Stylus DX4200" + +#: src/main/xmli18n-tmp.h:450 msgid "Epson Stylus DX4800" msgstr "Epson Stylus DX4800" -#: src/main/xmli18n-tmp.h:421 +#: src/main/xmli18n-tmp.h:451 +#, fuzzy +msgid "Epson Stylus DX7000F" +msgstr "Epson Stylus CX3100" + +#: src/main/xmli18n-tmp.h:452 +#, fuzzy +msgid "Epson Stylus DX7400" +msgstr "Epson Stylus CX3100" + +#: src/main/xmli18n-tmp.h:453 +#, fuzzy +msgid "Epson Stylus DX7450" +msgstr "Epson Stylus DX4200" + +#: src/main/xmli18n-tmp.h:454 +#, fuzzy +msgid "Epson Stylus DX8400" +msgstr "Epson Stylus CX8400" + +#: src/main/xmli18n-tmp.h:455 +#, fuzzy +msgid "Epson Stylus DX8450" +msgstr "Epson Stylus DX3850" + +#: src/main/xmli18n-tmp.h:456 msgid "Epson PictureMate" msgstr "Epson PictureMate" -#: src/main/xmli18n-tmp.h:422 +#: src/main/xmli18n-tmp.h:457 +#, fuzzy +msgid "Epson PictureMate Dash" +msgstr "Epson PictureMate" + +#: src/main/xmli18n-tmp.h:458 msgid "Epson PictureMate Deluxe" msgstr "Epson PictureMate Deluxe" -#: src/main/xmli18n-tmp.h:423 +#: src/main/xmli18n-tmp.h:459 #, fuzzy msgid "Epson PictureMate Flash" msgstr "Epson PictureMate" -#: src/main/xmli18n-tmp.h:424 +#: src/main/xmli18n-tmp.h:460 #, fuzzy msgid "Epson PictureMate Pal" msgstr "Epson PictureMate" -#: src/main/xmli18n-tmp.h:425 +#: src/main/xmli18n-tmp.h:461 +#, fuzzy +msgid "Epson PictureMate Snap" +msgstr "Epson PictureMate" + +#: src/main/xmli18n-tmp.h:462 +#, fuzzy +msgid "Epson PictureMate 100" +msgstr "Epson PictureMate" + +#: src/main/xmli18n-tmp.h:463 +#, fuzzy +msgid "Epson PictureMate 200" +msgstr "Epson PictureMate" + +#: src/main/xmli18n-tmp.h:464 +#, fuzzy +msgid "Epson PictureMate 210" +msgstr "Epson PictureMate" + +#: src/main/xmli18n-tmp.h:465 +#, fuzzy +msgid "Epson PictureMate 240" +msgstr "Epson PictureMate" + +#: src/main/xmli18n-tmp.h:466 +#, fuzzy +msgid "Epson PictureMate 250" +msgstr "Epson PictureMate" + +#: src/main/xmli18n-tmp.h:467 #, fuzzy -msgid "Epson PictureMate Snap" +msgid "Epson PictureMate 260" msgstr "Epson PictureMate" -#: src/main/xmli18n-tmp.h:426 +#: src/main/xmli18n-tmp.h:468 #, fuzzy -msgid "Epson PictureMate 200" +msgid "Epson PictureMate 270" msgstr "Epson PictureMate" -#: src/main/xmli18n-tmp.h:427 +#: src/main/xmli18n-tmp.h:469 #, fuzzy -msgid "Epson PictureMate 210" +msgid "Epson PictureMate 280" msgstr "Epson PictureMate" -#: src/main/xmli18n-tmp.h:428 +#: src/main/xmli18n-tmp.h:470 #, fuzzy -msgid "Epson PictureMate 240" +msgid "Epson PictureMate 290" msgstr "Epson PictureMate" -#: src/main/xmli18n-tmp.h:429 +#: src/main/xmli18n-tmp.h:471 #, fuzzy -msgid "Epson PictureMate 250" +msgid "Epson PictureMate 500" msgstr "Epson PictureMate" -#: src/main/xmli18n-tmp.h:430 +#: src/main/xmli18n-tmp.h:472 #, fuzzy -msgid "Epson PictureMate 280" +msgid "Epson PictureMate 2005" msgstr "Epson PictureMate" -#: src/main/xmli18n-tmp.h:431 +#: src/main/xmli18n-tmp.h:473 msgid "Epson CL 700" msgstr "Canon CL 700" -#: src/main/xmli18n-tmp.h:432 +#: src/main/xmli18n-tmp.h:474 msgid "Epson CL 750" msgstr "Epson CL 750" -#: src/main/xmli18n-tmp.h:433 +#: src/main/xmli18n-tmp.h:475 msgid "Epson CL 760" msgstr "Epson CL 760" -#: src/main/xmli18n-tmp.h:434 +#: src/main/xmli18n-tmp.h:476 msgid "Epson E 100" msgstr "Epson E 100" -#: src/main/xmli18n-tmp.h:435 +#: src/main/xmli18n-tmp.h:477 msgid "Epson E 150" msgstr "Epson E 150" -#: src/main/xmli18n-tmp.h:436 +#: src/main/xmli18n-tmp.h:478 msgid "Epson E 200" msgstr "Epson E 200" -#: src/main/xmli18n-tmp.h:437 +#: src/main/xmli18n-tmp.h:479 +#, fuzzy +msgid "Epson E 300" +msgstr "Epson E 100" + +#: src/main/xmli18n-tmp.h:480 +#, fuzzy +msgid "Epson E 500" +msgstr "Epson E 100" + +#: src/main/xmli18n-tmp.h:481 +#, fuzzy +msgid "Epson E 520" +msgstr "Epson E 150" + +#: src/main/xmli18n-tmp.h:482 +#, fuzzy +msgid "Epson E 700" +msgstr "Epson E 100" + +#: src/main/xmli18n-tmp.h:483 +#, fuzzy +msgid "Epson E 720" +msgstr "Epson E 200" + +#: src/main/xmli18n-tmp.h:484 msgid "Epson EM 900C" msgstr "Epson EM 900C" -#: src/main/xmli18n-tmp.h:438 +#: src/main/xmli18n-tmp.h:485 msgid "Epson EM 930C" msgstr "Epson EM 930C" -#: src/main/xmli18n-tmp.h:439 +#: src/main/xmli18n-tmp.h:486 msgid "Epson MC 2000" msgstr "Epson MC 2000" -#: src/main/xmli18n-tmp.h:440 +#: src/main/xmli18n-tmp.h:487 msgid "Epson MC 5000" msgstr "Epson MC 5000" -#: src/main/xmli18n-tmp.h:441 +#: src/main/xmli18n-tmp.h:488 msgid "Epson MC 7000" msgstr "Epson MC 7000" -#: src/main/xmli18n-tmp.h:442 +#: src/main/xmli18n-tmp.h:489 msgid "Epson MC 9000" msgstr "Epson MC 9000" -#: src/main/xmli18n-tmp.h:443 +#: src/main/xmli18n-tmp.h:490 msgid "Epson MC 10000" msgstr "Epson MC 10000" -#: src/main/xmli18n-tmp.h:444 +#: src/main/xmli18n-tmp.h:491 msgid "Epson MJ 930C" msgstr "Epson MJ 930C" -#: src/main/xmli18n-tmp.h:445 +#: src/main/xmli18n-tmp.h:492 msgid "Epson MJ 5100C" msgstr "Epson MJ 5100C" -#: src/main/xmli18n-tmp.h:446 +#: src/main/xmli18n-tmp.h:493 msgid "Epson MJ 6000C" msgstr "Epson MJ 6000C" -#: src/main/xmli18n-tmp.h:447 +#: src/main/xmli18n-tmp.h:494 msgid "Epson MJ 8000C" msgstr "Epson MJ 8000C" -#: src/main/xmli18n-tmp.h:448 +#: src/main/xmli18n-tmp.h:495 #, fuzzy msgid "Epson PM 670C" msgstr "Epson PM 700C" -#: src/main/xmli18n-tmp.h:449 +#: src/main/xmli18n-tmp.h:496 msgid "Epson PM 700C" msgstr "Epson PM 700C" -#: src/main/xmli18n-tmp.h:450 +#: src/main/xmli18n-tmp.h:497 msgid "Epson PM 730C" msgstr "Epson PM 730C" -#: src/main/xmli18n-tmp.h:451 +#: src/main/xmli18n-tmp.h:498 msgid "Epson PM 740C" msgstr "Epson PM 740C" -#: src/main/xmli18n-tmp.h:452 +#: src/main/xmli18n-tmp.h:499 msgid "Epson PM 750C" msgstr "Epson PM 750C" -#: src/main/xmli18n-tmp.h:453 +#: src/main/xmli18n-tmp.h:500 msgid "Epson PM 760C" msgstr "Epson PM 760C" -#: src/main/xmli18n-tmp.h:454 +#: src/main/xmli18n-tmp.h:501 msgid "Epson PM 770C" msgstr "Epson PM 770C" -#: src/main/xmli18n-tmp.h:455 +#: src/main/xmli18n-tmp.h:502 msgid "Epson PM 780C" msgstr "Epson PM 780C" -#: src/main/xmli18n-tmp.h:456 +#: src/main/xmli18n-tmp.h:503 msgid "Epson PM 790PT" msgstr "Epson PM 790PT" -#: src/main/xmli18n-tmp.h:457 +#: src/main/xmli18n-tmp.h:504 msgid "Epson PM 800C" msgstr "Epson PM 800C" -#: src/main/xmli18n-tmp.h:458 +#: src/main/xmli18n-tmp.h:505 msgid "Epson PM 850PT" msgstr "Epson PM 850PT" -#: src/main/xmli18n-tmp.h:459 +#: src/main/xmli18n-tmp.h:506 msgid "Epson PM 870C" msgstr "Epson PM 870C" -#: src/main/xmli18n-tmp.h:460 +#: src/main/xmli18n-tmp.h:507 msgid "Epson PM 880C" msgstr "Epson PM 880C" -#: src/main/xmli18n-tmp.h:461 +#: src/main/xmli18n-tmp.h:508 msgid "Epson PM 930C" msgstr "Epson PM 930C" -#: src/main/xmli18n-tmp.h:462 +#: src/main/xmli18n-tmp.h:509 msgid "Epson PM 940C" msgstr "Epson PM 940C" -#: src/main/xmli18n-tmp.h:463 +#: src/main/xmli18n-tmp.h:510 msgid "Epson PM 950C" msgstr "Epson PM 950C" -#: src/main/xmli18n-tmp.h:464 +#: src/main/xmli18n-tmp.h:511 msgid "Epson PM 970C" msgstr "Epson PM 970C" -#: src/main/xmli18n-tmp.h:465 +#: src/main/xmli18n-tmp.h:512 msgid "Epson PM 980C" msgstr "Epson PM 980C" -#: src/main/xmli18n-tmp.h:466 +#: src/main/xmli18n-tmp.h:513 msgid "Epson PM 2000C" msgstr "Epson PM 2000C" -#: src/main/xmli18n-tmp.h:467 +#: src/main/xmli18n-tmp.h:514 msgid "Epson PM 2200C" msgstr "Epson PM 2200C" -#: src/main/xmli18n-tmp.h:468 +#: src/main/xmli18n-tmp.h:515 msgid "Epson PM 3000C" msgstr "Epson PM 3000C" -#: src/main/xmli18n-tmp.h:469 +#: src/main/xmli18n-tmp.h:516 msgid "Epson PM 3300C" msgstr "Epson PM 3300C" -#: src/main/xmli18n-tmp.h:470 +#: src/main/xmli18n-tmp.h:517 msgid "Epson PM 3500C" msgstr "Epson PM 3500C" -#: src/main/xmli18n-tmp.h:471 +#: src/main/xmli18n-tmp.h:518 msgid "Epson PM 3700C" msgstr "Epson PM 3700C" -#: src/main/xmli18n-tmp.h:472 +#: src/main/xmli18n-tmp.h:519 msgid "Epson PM 4000PX" msgstr "Epson PM 4000PX" -#: src/main/xmli18n-tmp.h:473 +#: src/main/xmli18n-tmp.h:520 msgid "Epson PM 5000C" msgstr "Epson PM 5000C" -#: src/main/xmli18n-tmp.h:474 +#: src/main/xmli18n-tmp.h:521 msgid "Epson PM 7000C" msgstr "Epson PM 7000C" -#: src/main/xmli18n-tmp.h:475 +#: src/main/xmli18n-tmp.h:522 msgid "Epson PM 9000C" msgstr "Epson PM 9000C" -#: src/main/xmli18n-tmp.h:476 +#: src/main/xmli18n-tmp.h:523 msgid "Epson PM 10000" msgstr "Epson PM 10000" -#: src/main/xmli18n-tmp.h:477 +#: src/main/xmli18n-tmp.h:524 msgid "Epson PM A650" msgstr "Epson PM A650" -#: src/main/xmli18n-tmp.h:478 +#: src/main/xmli18n-tmp.h:525 msgid "Epson PM A750" msgstr "Epson PM A750" -#: src/main/xmli18n-tmp.h:479 +#: src/main/xmli18n-tmp.h:526 #, fuzzy msgid "Epson PM A820" msgstr "Epson PM A890" -#: src/main/xmli18n-tmp.h:480 +#: src/main/xmli18n-tmp.h:527 msgid "Epson PM A890" msgstr "Epson PM A890" -#: src/main/xmli18n-tmp.h:481 +#: src/main/xmli18n-tmp.h:528 msgid "Epson PM A900" msgstr "Epson PM A900" -#: src/main/xmli18n-tmp.h:482 +#: src/main/xmli18n-tmp.h:529 msgid "Epson PM A950" msgstr "Epson PM A950" -#: src/main/xmli18n-tmp.h:483 +#: src/main/xmli18n-tmp.h:530 msgid "Epson PM D600" msgstr "Epson PM D600" -#: src/main/xmli18n-tmp.h:484 +#: src/main/xmli18n-tmp.h:531 msgid "Epson PM D750" msgstr "Epson PM D750" -#: src/main/xmli18n-tmp.h:485 +#: src/main/xmli18n-tmp.h:532 msgid "Epson PM D770" msgstr "Epson PM D770" -#: src/main/xmli18n-tmp.h:486 +#: src/main/xmli18n-tmp.h:533 msgid "Epson PM D800" msgstr "Epson PM D800" -#: src/main/xmli18n-tmp.h:487 +#: src/main/xmli18n-tmp.h:534 #, fuzzy msgid "Epson PM D870" msgstr "Epson PM 870C" -#: src/main/xmli18n-tmp.h:488 +#: src/main/xmli18n-tmp.h:535 msgid "Epson PM D1000" msgstr "Epson PM D1000" -#: src/main/xmli18n-tmp.h:489 +#: src/main/xmli18n-tmp.h:536 msgid "Epson PM G700" msgstr "Epson PM G700" -#: src/main/xmli18n-tmp.h:490 +#: src/main/xmli18n-tmp.h:537 msgid "Epson PM G720" msgstr "Epson PM G720" -#: src/main/xmli18n-tmp.h:491 +#: src/main/xmli18n-tmp.h:538 msgid "Epson PM G730" msgstr "Epson PM G730" -#: src/main/xmli18n-tmp.h:492 +#: src/main/xmli18n-tmp.h:539 msgid "Epson PM G800" msgstr "Epson PM G800" -#: src/main/xmli18n-tmp.h:493 +#: src/main/xmli18n-tmp.h:540 msgid "Epson PM G820" msgstr "Epson PM G820" -#: src/main/xmli18n-tmp.h:494 +#: src/main/xmli18n-tmp.h:541 #, fuzzy msgid "Epson PM G850" msgstr "Epson PM G800" -#: src/main/xmli18n-tmp.h:495 +#: src/main/xmli18n-tmp.h:542 #, fuzzy msgid "Epson PM G4500" msgstr "Epson PM G700" -#: src/main/xmli18n-tmp.h:496 +#: src/main/xmli18n-tmp.h:543 msgid "Epson PX A650" msgstr "Epson PX A650" -#: src/main/xmli18n-tmp.h:497 +#: src/main/xmli18n-tmp.h:544 msgid "Epson PX G900" msgstr "Epson PX G900" -#: src/main/xmli18n-tmp.h:498 +#: src/main/xmli18n-tmp.h:545 msgid "Epson PX G920" msgstr "Epson PX G920" -#: src/main/xmli18n-tmp.h:499 +#: src/main/xmli18n-tmp.h:546 msgid "Epson PX G5000" msgstr "Epson PX G5000" -#: src/main/xmli18n-tmp.h:500 +#: src/main/xmli18n-tmp.h:547 msgid "Epson PX V500" msgstr "Epson PX V500" -#: src/main/xmli18n-tmp.h:501 +#: src/main/xmli18n-tmp.h:548 msgid "Epson PX V600" msgstr "Epson PX V600" -#: src/main/xmli18n-tmp.h:502 +#: src/main/xmli18n-tmp.h:549 msgid "Epson PX V630" msgstr "Epson PX V630" -#: src/main/xmli18n-tmp.h:503 +#: src/main/xmli18n-tmp.h:550 #, fuzzy msgid "Epson PX V780" msgstr "Epson PM 780C" -#: src/main/xmli18n-tmp.h:504 +#: src/main/xmli18n-tmp.h:551 msgid "Epson PX 5500" msgstr "Epson PX 5500" -#: src/main/xmli18n-tmp.h:505 +#: src/main/xmli18n-tmp.h:552 msgid "Epson PX 7000" msgstr "Epson PX 7000" -#: src/main/xmli18n-tmp.h:506 +#: src/main/xmli18n-tmp.h:553 msgid "Epson PX 9000" msgstr "Epson PX 9000" -#: src/main/xmli18n-tmp.h:507 +#: src/main/xmli18n-tmp.h:554 msgid "Apollo P-2100" msgstr "Apollo P-2100" -#: src/main/xmli18n-tmp.h:508 +#: src/main/xmli18n-tmp.h:555 msgid "Apollo P-2150" msgstr "Apollo P-2150" -#: src/main/xmli18n-tmp.h:509 +#: src/main/xmli18n-tmp.h:556 msgid "Apollo P-2200" msgstr "Apollo P-2200" -#: src/main/xmli18n-tmp.h:510 +#: src/main/xmli18n-tmp.h:557 msgid "Apollo P-2250" msgstr "Apollo P-2250" -#: src/main/xmli18n-tmp.h:511 +#: src/main/xmli18n-tmp.h:558 msgid "Apollo P-2500" msgstr "Apollo P-2500" -#: src/main/xmli18n-tmp.h:512 +#: src/main/xmli18n-tmp.h:559 msgid "Apollo P-2550" msgstr "Apollo P-2550" -#: src/main/xmli18n-tmp.h:513 +#: src/main/xmli18n-tmp.h:560 msgid "Apollo P-2600" msgstr "Apollo P-2600" -#: src/main/xmli18n-tmp.h:514 +#: src/main/xmli18n-tmp.h:561 msgid "Apollo P-2650" msgstr "Apollo P-2650" -#: src/main/xmli18n-tmp.h:515 +#: src/main/xmli18n-tmp.h:562 msgid "Apple Color StyleWriter 4100" msgstr "Apple Color StyleWriter 4100" -#: src/main/xmli18n-tmp.h:516 +#: src/main/xmli18n-tmp.h:563 msgid "Apple Color StyleWriter 4500" msgstr "Apple Color StyleWriter 4500" -#: src/main/xmli18n-tmp.h:517 +#: src/main/xmli18n-tmp.h:564 msgid "Apple Color StyleWriter 6500" msgstr "Apple Color StyleWriter 6500" -#: src/main/xmli18n-tmp.h:518 +#: src/main/xmli18n-tmp.h:565 msgid "Apple LaserWriter Select 360" msgstr "Apple LaserWriter Select 360" -#: src/main/xmli18n-tmp.h:519 +#: src/main/xmli18n-tmp.h:566 msgid "Brother DCP-1200" msgstr "Brother DCP-1200" -#: src/main/xmli18n-tmp.h:520 +#: src/main/xmli18n-tmp.h:567 msgid "Brother HL-4Ve" msgstr "Brother HL-4Ve" -#: src/main/xmli18n-tmp.h:521 +#: src/main/xmli18n-tmp.h:568 msgid "Brother HL-10V" msgstr "Brother HL-10V" -#: src/main/xmli18n-tmp.h:522 +#: src/main/xmli18n-tmp.h:569 msgid "Brother HL-10h" msgstr "Brother HL-10h" -#: src/main/xmli18n-tmp.h:523 +#: src/main/xmli18n-tmp.h:570 msgid "Brother HL-630" msgstr "Brother HL-630" -#: src/main/xmli18n-tmp.h:524 +#: src/main/xmli18n-tmp.h:571 msgid "Brother HL-660" msgstr "Brother HL-660" -#: src/main/xmli18n-tmp.h:525 +#: src/main/xmli18n-tmp.h:572 msgid "Brother HL-760" msgstr "Brother HL-760" -#: src/main/xmli18n-tmp.h:526 +#: src/main/xmli18n-tmp.h:573 msgid "Brother HL-960" msgstr "Brother HL-960" -#: src/main/xmli18n-tmp.h:527 +#: src/main/xmli18n-tmp.h:574 msgid "Brother HL-1040" msgstr "Brother HL-1040" -#: src/main/xmli18n-tmp.h:528 +#: src/main/xmli18n-tmp.h:575 msgid "Brother HL-1050" msgstr "Brother HL-1050" -#: src/main/xmli18n-tmp.h:529 +#: src/main/xmli18n-tmp.h:576 msgid "Brother HL-1060" msgstr "Brother HL-1060" -#: src/main/xmli18n-tmp.h:530 +#: src/main/xmli18n-tmp.h:577 msgid "Brother HL-1070" msgstr "Brother HL-1070" -#: src/main/xmli18n-tmp.h:531 +#: src/main/xmli18n-tmp.h:578 msgid "Brother HL-1240" msgstr "Brother HL-1240" -#: src/main/xmli18n-tmp.h:532 +#: src/main/xmli18n-tmp.h:579 msgid "Brother HL-1250" msgstr "Brother HL-1250" -#: src/main/xmli18n-tmp.h:533 +#: src/main/xmli18n-tmp.h:580 msgid "Brother HL-1260" msgstr "Brother HL-1260" -#: src/main/xmli18n-tmp.h:534 +#: src/main/xmli18n-tmp.h:581 msgid "Brother HL-1270N" msgstr "Brother HL-1270N" -#: src/main/xmli18n-tmp.h:535 +#: src/main/xmli18n-tmp.h:582 msgid "Brother HL-1440" msgstr "Brother HL-1440" -#: src/main/xmli18n-tmp.h:536 +#: src/main/xmli18n-tmp.h:583 msgid "Brother HL-1660e" msgstr "Brother HL-1660e" -#: src/main/xmli18n-tmp.h:537 +#: src/main/xmli18n-tmp.h:584 msgid "Brother HL-2060" msgstr "Brother HL-2060" -#: src/main/xmli18n-tmp.h:538 +#: src/main/xmli18n-tmp.h:585 msgid "Brother MFC-6550MC" msgstr "Brother MFC-6550MC" -#: src/main/xmli18n-tmp.h:539 +#: src/main/xmli18n-tmp.h:586 msgid "Brother MFC-8300" msgstr "Brother MFC-8300" -#: src/main/xmli18n-tmp.h:540 +#: src/main/xmli18n-tmp.h:587 msgid "Brother MFC-9500" msgstr "Brother MFC-9500" -#: src/main/xmli18n-tmp.h:541 +#: src/main/xmli18n-tmp.h:588 msgid "Brother MFC-9600" msgstr "Brother MFC-9600" -#: src/main/xmli18n-tmp.h:542 +#: src/main/xmli18n-tmp.h:589 msgid "Canon GP 335" msgstr "Canon GP 335" -#: src/main/xmli18n-tmp.h:543 +#: src/main/xmli18n-tmp.h:590 msgid "Canon LBP-4sx" msgstr "Canon LBP-4sx" -#: src/main/xmli18n-tmp.h:544 +#: src/main/xmli18n-tmp.h:591 msgid "Canon LBP-430" msgstr "Canon LBP-430" -#: src/main/xmli18n-tmp.h:545 +#: src/main/xmli18n-tmp.h:592 msgid "Canon LBP-1000" msgstr "Canon LBP-1000" -#: src/main/xmli18n-tmp.h:546 +#: src/main/xmli18n-tmp.h:593 msgid "Canon LBP-1260" msgstr "Canon LBP-1260" -#: src/main/xmli18n-tmp.h:547 +#: src/main/xmli18n-tmp.h:594 msgid "Canon LBP-1760" msgstr "Canon LBP-1760" -#: src/main/xmli18n-tmp.h:548 +#: src/main/xmli18n-tmp.h:595 msgid "Canon imageRunner 330s" msgstr "Canon imageRunner 330s" -#: src/main/xmli18n-tmp.h:549 +#: src/main/xmli18n-tmp.h:596 msgid "Citizen ProJet II" msgstr "Citizen ProJet II" -#: src/main/xmli18n-tmp.h:550 +#: src/main/xmli18n-tmp.h:597 msgid "DEC 1800" msgstr "DEC 1800" -#: src/main/xmli18n-tmp.h:551 +#: src/main/xmli18n-tmp.h:598 msgid "DEC LN17" msgstr "DEC LN17" -#: src/main/xmli18n-tmp.h:552 +#: src/main/xmli18n-tmp.h:599 msgid "Epson ActionLaser 1100" msgstr "Epson ActionLaser 1100" -#: src/main/xmli18n-tmp.h:553 +#: src/main/xmli18n-tmp.h:600 msgid "Epson ActionLaser II" msgstr "Epson ActionLaser II" -#: src/main/xmli18n-tmp.h:554 +#: src/main/xmli18n-tmp.h:601 msgid "Epson AcuLaser C2000" msgstr "Epson AcuLaser C2000" -#: src/main/xmli18n-tmp.h:555 +#: src/main/xmli18n-tmp.h:602 msgid "Epson AcuLaser C2000PS" msgstr "Epson AcuLaser C2000PS" -#: src/main/xmli18n-tmp.h:556 +#: src/main/xmli18n-tmp.h:603 msgid "Epson AcuLaser C8500" msgstr "Epson AcuLaser C8500" -#: src/main/xmli18n-tmp.h:557 +#: src/main/xmli18n-tmp.h:604 msgid "Epson AcuLaser C8500PS" msgstr "Epson AcuLaser C8500PS" -#: src/main/xmli18n-tmp.h:558 +#: src/main/xmli18n-tmp.h:605 msgid "Epson AcuLaser C8600" msgstr "Epson AcuLaser C8600" -#: src/main/xmli18n-tmp.h:559 +#: src/main/xmli18n-tmp.h:606 msgid "Epson AcuLaser C8600PS" msgstr "Epson AcuLaser C8600PS" -#: src/main/xmli18n-tmp.h:560 +#: src/main/xmli18n-tmp.h:607 msgid "Epson EPL-5200" msgstr "Epson EPL-5200" -#: src/main/xmli18n-tmp.h:561 +#: src/main/xmli18n-tmp.h:608 msgid "Epson EPL-5200+" msgstr "Epson EPL-5200+" -#: src/main/xmli18n-tmp.h:562 +#: src/main/xmli18n-tmp.h:609 msgid "Epson EPL-5700" msgstr "Epson EPL-5700" -#: src/main/xmli18n-tmp.h:563 +#: src/main/xmli18n-tmp.h:610 msgid "Epson EPL-5700PS" msgstr "Epson EPL-5700PS" -#: src/main/xmli18n-tmp.h:564 +#: src/main/xmli18n-tmp.h:611 msgid "Epson EPL-5800" msgstr "Epson EPL-5800" -#: src/main/xmli18n-tmp.h:565 +#: src/main/xmli18n-tmp.h:612 msgid "Epson EPL-5800PS" msgstr "Epson EPL-5800PS" -#: src/main/xmli18n-tmp.h:566 +#: src/main/xmli18n-tmp.h:613 msgid "Epson EPL-5900" msgstr "Epson EPL-5900" -#: src/main/xmli18n-tmp.h:567 +#: src/main/xmli18n-tmp.h:614 msgid "Epson EPL-5900PS" msgstr "Epson EPL-5900PS" -#: src/main/xmli18n-tmp.h:568 +#: src/main/xmli18n-tmp.h:615 msgid "Epson EPL-6100" msgstr "Epson EPL-6100" -#: src/main/xmli18n-tmp.h:569 +#: src/main/xmli18n-tmp.h:616 msgid "Epson EPL-6100PS" msgstr "Epson EPL-6100PS" -#: src/main/xmli18n-tmp.h:570 +#: src/main/xmli18n-tmp.h:617 msgid "Epson EPL-7100" msgstr "Epson EPL-7100" -#: src/main/xmli18n-tmp.h:571 +#: src/main/xmli18n-tmp.h:618 msgid "Fujitsu PrintPartner 10V" msgstr "Fujitsu PrintPartner 10V" -#: src/main/xmli18n-tmp.h:572 +#: src/main/xmli18n-tmp.h:619 msgid "Fujitsu PrintPartner 16DV" msgstr "Fujitsu PrintPartner 16DV" -#: src/main/xmli18n-tmp.h:573 +#: src/main/xmli18n-tmp.h:620 msgid "Fujitsu PrintPartner 20W" msgstr "Fujitsu PrintPartner 20W" -#: src/main/xmli18n-tmp.h:574 +#: src/main/xmli18n-tmp.h:621 msgid "Fujitsu PrintPartner 8000" msgstr "Fujitsu PrintPartner 8000" -#: src/main/xmli18n-tmp.h:575 +#: src/main/xmli18n-tmp.h:622 msgid "Generic PCL 4 Printer" msgstr "Imprimante générique PCL 4" -#: src/main/xmli18n-tmp.h:576 +#: src/main/xmli18n-tmp.h:623 +#, fuzzy +msgid "Generic PCL 4 LF Printer" +msgstr "Imprimante générique PCL 4" + +#: src/main/xmli18n-tmp.h:624 msgid "Generic PCL 5 Printer" msgstr "Imprimante générique PCL 5" -#: src/main/xmli18n-tmp.h:577 +#: src/main/xmli18n-tmp.h:625 +#, fuzzy +msgid "Generic PCL 5 LF Printer" +msgstr "Imprimante générique PCL 5" + +#: src/main/xmli18n-tmp.h:626 msgid "Generic PCL 5c Printer" msgstr "Imprimante générique PCL5 c" -#: src/main/xmli18n-tmp.h:578 +#: src/main/xmli18n-tmp.h:627 +#, fuzzy +msgid "Generic PCL 5c LF Printer" +msgstr "Imprimante générique PCL5 c" + +#: src/main/xmli18n-tmp.h:628 msgid "Generic PCL 5e Printer" msgstr "Imprimante générique PCL 5e" -#: src/main/xmli18n-tmp.h:579 +#: src/main/xmli18n-tmp.h:629 +#, fuzzy +msgid "Generic PCL 5e LF Printer" +msgstr "Imprimante générique PCL 5e" + +#: src/main/xmli18n-tmp.h:630 msgid "Generic PCL 6/PCL XL Printer" msgstr "Imprimante générique PCL 6/PCL XL" -#: src/main/xmli18n-tmp.h:580 +#: src/main/xmli18n-tmp.h:631 +#, fuzzy +msgid "Generic PCL 6/PCL XL LF Printer" +msgstr "Imprimante générique PCL 6/PCL XL" + +#: src/main/xmli18n-tmp.h:632 msgid "HP Business Inkjet 2200" msgstr "HP Business Inkjet 2200" -#: src/main/xmli18n-tmp.h:581 +#: src/main/xmli18n-tmp.h:633 msgid "HP Business Inkjet 2230" msgstr "HP Business Inkjet 2230" -#: src/main/xmli18n-tmp.h:582 +#: src/main/xmli18n-tmp.h:634 msgid "HP Business Inkjet 2250" msgstr "HP Business Inkjet 2250" -#: src/main/xmli18n-tmp.h:583 +#: src/main/xmli18n-tmp.h:635 msgid "HP Business Inkjet 2250TN" msgstr "HP Business Inkjet 2250TN" -#: src/main/xmli18n-tmp.h:584 +#: src/main/xmli18n-tmp.h:636 msgid "HP Business Inkjet 2280" msgstr "HP Business Inkjet 2280" -#: src/main/xmli18n-tmp.h:585 +#: src/main/xmli18n-tmp.h:637 msgid "HP Color Inkjet Printer CP1160" msgstr "HP Color Inkjet Printer CP1160" -#: src/main/xmli18n-tmp.h:586 +#: src/main/xmli18n-tmp.h:638 msgid "HP Color Inkjet Printer CP1700" msgstr "HP Color Inkjet Printer CP1700" -#: src/main/xmli18n-tmp.h:587 +#: src/main/xmli18n-tmp.h:639 msgid "HP Color LaserJet 2500" msgstr "HP Color LaserJet 2500" -#: src/main/xmli18n-tmp.h:588 +#: src/main/xmli18n-tmp.h:640 msgid "HP Color LaserJet 4500" msgstr "HP Color LaserJet 4500" -#: src/main/xmli18n-tmp.h:589 +#: src/main/xmli18n-tmp.h:641 msgid "HP Color LaserJet 4550" msgstr "HP Color LaserJet 4550" -#: src/main/xmli18n-tmp.h:590 +#: src/main/xmli18n-tmp.h:642 msgid "HP Color LaserJet 4600" msgstr "HP Color LaserJet 4600" -#: src/main/xmli18n-tmp.h:591 +#: src/main/xmli18n-tmp.h:643 msgid "HP Color LaserJet 5" msgstr "HP Color LaserJet 5" -#: src/main/xmli18n-tmp.h:592 +#: src/main/xmli18n-tmp.h:644 msgid "HP Color LaserJet 5000" msgstr "HP Color LaserJet 5000" -#: src/main/xmli18n-tmp.h:593 +#: src/main/xmli18n-tmp.h:645 msgid "HP Color LaserJet 5500" msgstr "HP Color LaserJet 5500" -#: src/main/xmli18n-tmp.h:594 +#: src/main/xmli18n-tmp.h:646 msgid "HP Color LaserJet 8550GN" msgstr "HP Color LaserJet 8550GN" -#: src/main/xmli18n-tmp.h:595 +#: src/main/xmli18n-tmp.h:647 msgid "HP DesignJet 230" msgstr "HP DesignJet 230" -#: src/main/xmli18n-tmp.h:596 +#: src/main/xmli18n-tmp.h:648 msgid "HP DesignJet 250C" msgstr "HP DesignJet 250C" -#: src/main/xmli18n-tmp.h:597 +#: src/main/xmli18n-tmp.h:649 msgid "HP DesignJet 430" msgstr "HP DesignJet 430" -#: src/main/xmli18n-tmp.h:598 +#: src/main/xmli18n-tmp.h:650 msgid "HP DesignJet 450C" msgstr "HP DesignJet 450C" -#: src/main/xmli18n-tmp.h:599 +#: src/main/xmli18n-tmp.h:651 msgid "HP DesignJet 455CA" msgstr "HP DesignJet 455CA" -#: src/main/xmli18n-tmp.h:600 +#: src/main/xmli18n-tmp.h:652 msgid "HP DesignJet 488CA" msgstr "HP DesignJet 488CA" -#: src/main/xmli18n-tmp.h:601 +#: src/main/xmli18n-tmp.h:653 msgid "HP DesignJet 700" msgstr "HP DesignJet 700" -#: src/main/xmli18n-tmp.h:602 +#: src/main/xmli18n-tmp.h:654 msgid "HP DesignJet 750C Plus" msgstr "HP DesignJet 750C Plus" -#: src/main/xmli18n-tmp.h:603 +#: src/main/xmli18n-tmp.h:655 msgid "HP DesignJet 750C" msgstr "HP DesignJet 750C" -#: src/main/xmli18n-tmp.h:604 +#: src/main/xmli18n-tmp.h:656 msgid "HP DesignJet 2500CP" msgstr "HP DesignJet 2500CP" -#: src/main/xmli18n-tmp.h:605 +#: src/main/xmli18n-tmp.h:657 msgid "HP DesignJet 3500CP" msgstr "HP DesignJet 3500CP" -#: src/main/xmli18n-tmp.h:606 +#: src/main/xmli18n-tmp.h:658 msgid "HP DesignJet ColorPro CAD" msgstr "HP DesignJet ColorPro CAD" -#: src/main/xmli18n-tmp.h:607 +#: src/main/xmli18n-tmp.h:659 msgid "HP DeskJet 400" msgstr "HP DeskJet 400" -#: src/main/xmli18n-tmp.h:608 +#: src/main/xmli18n-tmp.h:660 msgid "HP DeskJet 420C" msgstr "HP DeskJet 420C" -#: src/main/xmli18n-tmp.h:609 +#: src/main/xmli18n-tmp.h:661 msgid "HP DeskJet 450" msgstr "HP DeskJet 450" -#: src/main/xmli18n-tmp.h:610 +#: src/main/xmli18n-tmp.h:662 msgid "HP DeskJet 500" msgstr "HP DeskJet 500" -#: src/main/xmli18n-tmp.h:611 +#: src/main/xmli18n-tmp.h:663 msgid "HP DeskJet 500C" msgstr "HP DeskJet 500C" -#: src/main/xmli18n-tmp.h:612 +#: src/main/xmli18n-tmp.h:664 msgid "HP DeskJet 505J Plus" msgstr "HP DeskJet 505J Plus" -#: src/main/xmli18n-tmp.h:613 +#: src/main/xmli18n-tmp.h:665 msgid "HP DeskJet 510" msgstr "HP DeskJet 510" -#: src/main/xmli18n-tmp.h:614 +#: src/main/xmli18n-tmp.h:666 msgid "HP DeskJet 520" msgstr "HP DeskJet 520" -#: src/main/xmli18n-tmp.h:615 +#: src/main/xmli18n-tmp.h:667 msgid "HP DeskJet 540C" msgstr "HP DeskJet 540C" -#: src/main/xmli18n-tmp.h:616 +#: src/main/xmli18n-tmp.h:668 msgid "HP DeskJet 550C" msgstr "HP DeskJet 550C" -#: src/main/xmli18n-tmp.h:617 +#: src/main/xmli18n-tmp.h:669 msgid "HP DeskJet 5550" msgstr "HP DeskJet 5500" -#: src/main/xmli18n-tmp.h:618 +#: src/main/xmli18n-tmp.h:670 msgid "HP DeskJet 5551" msgstr "HP DeskJet 5551" -#: src/main/xmli18n-tmp.h:619 +#: src/main/xmli18n-tmp.h:671 msgid "HP DeskJet 560C" msgstr "HP DeskJet 560C" -#: src/main/xmli18n-tmp.h:620 +#: src/main/xmli18n-tmp.h:672 msgid "HP DeskJet 600" msgstr "HP DeskJet 600" -#: src/main/xmli18n-tmp.h:621 +#: src/main/xmli18n-tmp.h:673 msgid "HP DeskJet 600C" msgstr "HP DeskJet 600C" -#: src/main/xmli18n-tmp.h:622 +#: src/main/xmli18n-tmp.h:674 msgid "HP DeskJet 610C" msgstr "HP DeskJet 610C" -#: src/main/xmli18n-tmp.h:623 +#: src/main/xmli18n-tmp.h:675 msgid "HP DeskJet 610CL" msgstr "HP DeskJet 610CL" -#: src/main/xmli18n-tmp.h:624 +#: src/main/xmli18n-tmp.h:676 msgid "HP DeskJet 6122" msgstr "HP DeskJet 6122" -#: src/main/xmli18n-tmp.h:625 +#: src/main/xmli18n-tmp.h:677 msgid "HP DeskJet 6127" msgstr "HP DeskJet 6127" -#: src/main/xmli18n-tmp.h:626 +#: src/main/xmli18n-tmp.h:678 msgid "HP DeskJet 612C" msgstr "HP DeskJet 612C" -#: src/main/xmli18n-tmp.h:627 +#: src/main/xmli18n-tmp.h:679 msgid "HP DeskJet 640C" msgstr "HP DeskJet 640C" -#: src/main/xmli18n-tmp.h:628 +#: src/main/xmli18n-tmp.h:680 msgid "HP DeskJet 648C" msgstr "HP DeskJet 648C" -#: src/main/xmli18n-tmp.h:629 +#: src/main/xmli18n-tmp.h:681 msgid "HP DeskJet 660C" msgstr "HP DeskJet 660C" -#: src/main/xmli18n-tmp.h:630 +#: src/main/xmli18n-tmp.h:682 msgid "HP DeskJet 670C" msgstr "HP DeskJet 670C" -#: src/main/xmli18n-tmp.h:631 +#: src/main/xmli18n-tmp.h:683 msgid "HP DeskJet 670TV" msgstr "HP DeskJet 670TV" -#: src/main/xmli18n-tmp.h:632 +#: src/main/xmli18n-tmp.h:684 msgid "HP DeskJet 672C" msgstr "HP DeskJet 672C" -#: src/main/xmli18n-tmp.h:633 +#: src/main/xmli18n-tmp.h:685 msgid "HP DeskJet 680C" msgstr "HP DeskJet 680C" -#: src/main/xmli18n-tmp.h:634 +#: src/main/xmli18n-tmp.h:686 msgid "HP DeskJet 682C" msgstr "HP DeskJet 682C" -#: src/main/xmli18n-tmp.h:635 +#: src/main/xmli18n-tmp.h:687 msgid "HP DeskJet 690C" msgstr "HP DeskJet 690C" -#: src/main/xmli18n-tmp.h:636 +#: src/main/xmli18n-tmp.h:688 msgid "HP DeskJet 692C" msgstr "HP DeskJet 692C" -#: src/main/xmli18n-tmp.h:637 +#: src/main/xmli18n-tmp.h:689 msgid "HP DeskJet 693C" msgstr "HP DeskJet 693C" -#: src/main/xmli18n-tmp.h:638 +#: src/main/xmli18n-tmp.h:690 msgid "HP DeskJet 694C" msgstr "HP DeskJet 694C" -#: src/main/xmli18n-tmp.h:639 +#: src/main/xmli18n-tmp.h:691 msgid "HP DeskJet 695C" msgstr "HP DeskJet 695C" -#: src/main/xmli18n-tmp.h:640 +#: src/main/xmli18n-tmp.h:692 msgid "HP DeskJet 697C" msgstr "HP DeskJet 697C" -#: src/main/xmli18n-tmp.h:641 +#: src/main/xmli18n-tmp.h:693 msgid "HP DeskJet 810C" msgstr "HP DeskJet 810C" -#: src/main/xmli18n-tmp.h:642 +#: src/main/xmli18n-tmp.h:694 msgid "HP DeskJet 812C" msgstr "HP DeskJet 812C" -#: src/main/xmli18n-tmp.h:643 +#: src/main/xmli18n-tmp.h:695 msgid "HP DeskJet 815C" msgstr "HP DeskJet 815C" -#: src/main/xmli18n-tmp.h:644 +#: src/main/xmli18n-tmp.h:696 msgid "HP DeskJet 816C" msgstr "HP DeskJet 816C" -#: src/main/xmli18n-tmp.h:645 +#: src/main/xmli18n-tmp.h:697 msgid "HP DeskJet 825C" msgstr "HP DeskJet 825C" -#: src/main/xmli18n-tmp.h:646 +#: src/main/xmli18n-tmp.h:698 msgid "HP DeskJet 830C" msgstr "HP DeskJet 830C" -#: src/main/xmli18n-tmp.h:647 +#: src/main/xmli18n-tmp.h:699 msgid "HP DeskJet 832C" msgstr "HP DeskJet 832C" -#: src/main/xmli18n-tmp.h:648 +#: src/main/xmli18n-tmp.h:700 msgid "HP DeskJet 840C" msgstr "HP DeskJet 840C" -#: src/main/xmli18n-tmp.h:649 +#: src/main/xmli18n-tmp.h:701 msgid "HP DeskJet 841C" msgstr "HP DeskJet 841C" -#: src/main/xmli18n-tmp.h:650 +#: src/main/xmli18n-tmp.h:702 msgid "HP DeskJet 842C" msgstr "HP DeskJet 842C" -#: src/main/xmli18n-tmp.h:651 +#: src/main/xmli18n-tmp.h:703 msgid "HP DeskJet 843C" msgstr "HP DeskJet 843C" -#: src/main/xmli18n-tmp.h:652 +#: src/main/xmli18n-tmp.h:704 msgid "HP DeskJet 845C" msgstr "HP DeskJet 845C" -#: src/main/xmli18n-tmp.h:653 +#: src/main/xmli18n-tmp.h:705 msgid "HP DeskJet 850C" msgstr "HP DeskJet 850C" -#: src/main/xmli18n-tmp.h:654 +#: src/main/xmli18n-tmp.h:706 msgid "HP DeskJet 855C" msgstr "HP DeskJet 855C" -#: src/main/xmli18n-tmp.h:655 +#: src/main/xmli18n-tmp.h:707 msgid "HP DeskJet 870C" msgstr "HP DeskJet 870C" -#: src/main/xmli18n-tmp.h:656 +#: src/main/xmli18n-tmp.h:708 msgid "HP DeskJet 880C" msgstr "HP DeskJet 880C" -#: src/main/xmli18n-tmp.h:657 +#: src/main/xmli18n-tmp.h:709 msgid "HP DeskJet 882C" msgstr "HP DeskJet 882C" -#: src/main/xmli18n-tmp.h:658 +#: src/main/xmli18n-tmp.h:710 msgid "HP DeskJet 890C" msgstr "HP DeskJet 890C" -#: src/main/xmli18n-tmp.h:659 +#: src/main/xmli18n-tmp.h:711 msgid "HP DeskJet 895C" msgstr "HP DeskJet 895C" -#: src/main/xmli18n-tmp.h:660 +#: src/main/xmli18n-tmp.h:712 msgid "HP DeskJet 916C" msgstr "HP DeskJet 916C" -#: src/main/xmli18n-tmp.h:661 +#: src/main/xmli18n-tmp.h:713 msgid "HP DeskJet 920C" msgstr "HP DeskJet 920C" -#: src/main/xmli18n-tmp.h:662 +#: src/main/xmli18n-tmp.h:714 msgid "HP DeskJet 9300" msgstr "HP DeskJet 9300" -#: src/main/xmli18n-tmp.h:663 +#: src/main/xmli18n-tmp.h:715 msgid "HP DeskJet 930C" msgstr "HP DeskJet 930C" -#: src/main/xmli18n-tmp.h:664 +#: src/main/xmli18n-tmp.h:716 msgid "HP DeskJet 932C" msgstr "HP DeskJet 932C" -#: src/main/xmli18n-tmp.h:665 +#: src/main/xmli18n-tmp.h:717 msgid "HP DeskJet 933C" msgstr "HP DeskJet 933C" -#: src/main/xmli18n-tmp.h:666 +#: src/main/xmli18n-tmp.h:718 msgid "HP DeskJet 934C" msgstr "HP DeskJet 934C" -#: src/main/xmli18n-tmp.h:667 +#: src/main/xmli18n-tmp.h:719 msgid "HP DeskJet 935C" msgstr "HP DeskJet 935C" -#: src/main/xmli18n-tmp.h:668 +#: src/main/xmli18n-tmp.h:720 msgid "HP DeskJet 940C" msgstr "HP DeskJet 940C" -#: src/main/xmli18n-tmp.h:669 +#: src/main/xmli18n-tmp.h:721 msgid "HP DeskJet 948C" msgstr "HP DeskJet 948C" -#: src/main/xmli18n-tmp.h:670 +#: src/main/xmli18n-tmp.h:722 msgid "HP DeskJet 950C" msgstr "HP DeskJet 950C" -#: src/main/xmli18n-tmp.h:671 +#: src/main/xmli18n-tmp.h:723 msgid "HP DeskJet 952C" msgstr "HP DeskJet 952C" -#: src/main/xmli18n-tmp.h:672 +#: src/main/xmli18n-tmp.h:724 msgid "HP DeskJet 955C" msgstr "HP DeskJet 955C" -#: src/main/xmli18n-tmp.h:673 +#: src/main/xmli18n-tmp.h:725 msgid "HP DeskJet 957C" msgstr "HP DeskJet 957C" -#: src/main/xmli18n-tmp.h:674 +#: src/main/xmli18n-tmp.h:726 msgid "HP DeskJet 959C" msgstr "HP DeskJet 959C" -#: src/main/xmli18n-tmp.h:675 +#: src/main/xmli18n-tmp.h:727 msgid "HP DeskJet 960C" msgstr "HP DeskJet 960C" -#: src/main/xmli18n-tmp.h:676 +#: src/main/xmli18n-tmp.h:728 msgid "HP DeskJet 970C" msgstr "HP DeskJet 970C" -#: src/main/xmli18n-tmp.h:677 +#: src/main/xmli18n-tmp.h:729 msgid "HP DeskJet 975C" msgstr "HP DeskJet 975C" -#: src/main/xmli18n-tmp.h:678 +#: src/main/xmli18n-tmp.h:730 msgid "HP DeskJet 980C" msgstr "HP DeskJet 980C" -#: src/main/xmli18n-tmp.h:679 +#: src/main/xmli18n-tmp.h:731 msgid "HP DeskJet 990C" msgstr "HP DeskJet 990C" -#: src/main/xmli18n-tmp.h:680 +#: src/main/xmli18n-tmp.h:732 msgid "HP DeskJet 995C" msgstr "HP DeskJet 995C" -#: src/main/xmli18n-tmp.h:681 +#: src/main/xmli18n-tmp.h:733 msgid "HP DeskJet 1100C" msgstr "HP DeskJet 1100C" -#: src/main/xmli18n-tmp.h:682 +#: src/main/xmli18n-tmp.h:734 msgid "HP DeskJet 1120C" msgstr "HP DeskJet 1120C" -#: src/main/xmli18n-tmp.h:683 +#: src/main/xmli18n-tmp.h:735 msgid "HP DeskJet 1125C" msgstr "HP DeskJet 1125C" -#: src/main/xmli18n-tmp.h:684 +#: src/main/xmli18n-tmp.h:736 msgid "HP DeskJet 1200C" msgstr "HP DeskJet 1200C" -#: src/main/xmli18n-tmp.h:685 +#: src/main/xmli18n-tmp.h:737 msgid "HP DeskJet 1220C" msgstr "HP DeskJet 1220C" -#: src/main/xmli18n-tmp.h:686 +#: src/main/xmli18n-tmp.h:738 msgid "HP DeskJet 1600C" msgstr "HP DeskJet 1600C" -#: src/main/xmli18n-tmp.h:687 +#: src/main/xmli18n-tmp.h:739 msgid "HP DeskJet 1600CM" msgstr "HP DeskJet 1600CM" -#: src/main/xmli18n-tmp.h:688 +#: src/main/xmli18n-tmp.h:740 msgid "HP DeskJet 2000" msgstr "HP DeskJet 2000" -#: src/main/xmli18n-tmp.h:689 +#: src/main/xmli18n-tmp.h:741 msgid "HP DeskJet 2500" msgstr "HP DeskJet 2500" -#: src/main/xmli18n-tmp.h:690 +#: src/main/xmli18n-tmp.h:742 msgid "HP DeskJet 2500CM" msgstr "HP DeskJet 2500CM" -#: src/main/xmli18n-tmp.h:691 +#: src/main/xmli18n-tmp.h:743 msgid "HP DeskJet 340C" msgstr "HP DeskJet 340C" -#: src/main/xmli18n-tmp.h:692 +#: src/main/xmli18n-tmp.h:744 msgid "HP DeskJet 3810" msgstr "HP DeskJet 3810" -#: src/main/xmli18n-tmp.h:693 +#: src/main/xmli18n-tmp.h:745 msgid "HP DeskJet 3816" msgstr "HP DeskJet 3816" -#: src/main/xmli18n-tmp.h:694 +#: src/main/xmli18n-tmp.h:746 msgid "HP DeskJet 3820" msgstr "HP DeskJet 3820" -#: src/main/xmli18n-tmp.h:695 +#: src/main/xmli18n-tmp.h:747 msgid "HP DeskJet 3822" msgstr "HP DeskJet 3822" -#: src/main/xmli18n-tmp.h:696 +#: src/main/xmli18n-tmp.h:748 msgid "HP LaserJet 2" msgstr "HP LaserJet 2" -#: src/main/xmli18n-tmp.h:697 +#: src/main/xmli18n-tmp.h:749 msgid "HP LaserJet 2D" msgstr "HP LaserJet 2D" -#: src/main/xmli18n-tmp.h:698 +#: src/main/xmli18n-tmp.h:750 msgid "HP LaserJet 2P Plus" msgstr "HP LaserJet 2P Plus" -#: src/main/xmli18n-tmp.h:699 +#: src/main/xmli18n-tmp.h:751 msgid "HP LaserJet 2P" msgstr "HP LaserJet 2P" -#: src/main/xmli18n-tmp.h:700 +#: src/main/xmli18n-tmp.h:752 msgid "HP LaserJet 3" msgstr "HP LaserJet 3" -#: src/main/xmli18n-tmp.h:701 +#: src/main/xmli18n-tmp.h:753 msgid "HP LaserJet 3D" msgstr "HP LaserJet 3D" -#: src/main/xmli18n-tmp.h:702 +#: src/main/xmli18n-tmp.h:754 msgid "HP LaserJet 3P w/ PCL5" msgstr "HP LaserJet 3P w/ PCL5" -#: src/main/xmli18n-tmp.h:703 +#: src/main/xmli18n-tmp.h:755 msgid "HP LaserJet 3P w/PS" msgstr "HP LaserJet 3P w/PS" -#: src/main/xmli18n-tmp.h:704 +#: src/main/xmli18n-tmp.h:756 msgid "HP LaserJet 4 Plus" msgstr "HP LaserJet 4 Plus" -#: src/main/xmli18n-tmp.h:705 +#: src/main/xmli18n-tmp.h:757 msgid "HP LaserJet 4" msgstr "HP LaserJet 4" -#: src/main/xmli18n-tmp.h:706 +#: src/main/xmli18n-tmp.h:758 msgid "HP LaserJet 4L" msgstr "HP LaserJet 4L" -#: src/main/xmli18n-tmp.h:707 +#: src/main/xmli18n-tmp.h:759 msgid "HP LaserJet 4M" msgstr "HP LaserJet 4M" -#: src/main/xmli18n-tmp.h:708 +#: src/main/xmli18n-tmp.h:760 msgid "HP LaserJet 4ML" msgstr "HP LaserJet 4ML" -#: src/main/xmli18n-tmp.h:709 +#: src/main/xmli18n-tmp.h:761 msgid "HP LaserJet 4P" msgstr "HP LaserJet 4O" -#: src/main/xmli18n-tmp.h:710 +#: src/main/xmli18n-tmp.h:762 msgid "HP LaserJet 4Si" msgstr "HP LaserJet 4Si" -#: src/main/xmli18n-tmp.h:711 +#: src/main/xmli18n-tmp.h:763 msgid "HP LaserJet 4V" msgstr "HP LaserJet 4V" -#: src/main/xmli18n-tmp.h:712 +#: src/main/xmli18n-tmp.h:764 msgid "HP LaserJet 5" msgstr "HP LaserJet 5" -#: src/main/xmli18n-tmp.h:713 +#: src/main/xmli18n-tmp.h:765 msgid "HP LaserJet 5L" msgstr "HP LaserJet 5L" -#: src/main/xmli18n-tmp.h:714 +#: src/main/xmli18n-tmp.h:766 msgid "HP LaserJet 5M" msgstr "HP LaserJet 5M" -#: src/main/xmli18n-tmp.h:715 +#: src/main/xmli18n-tmp.h:767 msgid "HP LaserJet 5MP" msgstr "HP LaserJet 5MP" -#: src/main/xmli18n-tmp.h:716 +#: src/main/xmli18n-tmp.h:768 msgid "HP LaserJet 5P" msgstr "HP LaserJet 5P" -#: src/main/xmli18n-tmp.h:717 +#: src/main/xmli18n-tmp.h:769 msgid "HP LaserJet 5Si" msgstr "HP LaserJet 5Si" -#: src/main/xmli18n-tmp.h:718 +#: src/main/xmli18n-tmp.h:770 msgid "HP LaserJet 6" msgstr "HP LaserJet 6" -#: src/main/xmli18n-tmp.h:719 +#: src/main/xmli18n-tmp.h:771 msgid "HP LaserJet 6L" msgstr "HP LaserJet 6L" -#: src/main/xmli18n-tmp.h:720 +#: src/main/xmli18n-tmp.h:772 msgid "HP LaserJet 6MP" msgstr "HP LaserJet 6MP" -#: src/main/xmli18n-tmp.h:721 +#: src/main/xmli18n-tmp.h:773 msgid "HP LaserJet 6P" msgstr "HP LaserJet 6P" -#: src/main/xmli18n-tmp.h:722 +#: src/main/xmli18n-tmp.h:774 msgid "HP LaserJet 1010" msgstr "HP LaserJet 1010" -#: src/main/xmli18n-tmp.h:723 +#: src/main/xmli18n-tmp.h:775 msgid "HP LaserJet 1012" msgstr "HP LaserJet 1012" -#: src/main/xmli18n-tmp.h:724 +#: src/main/xmli18n-tmp.h:776 msgid "HP LaserJet 1015" msgstr "HP LaserJet 1015" -#: src/main/xmli18n-tmp.h:725 +#: src/main/xmli18n-tmp.h:777 #, fuzzy msgid "HP LaserJet 1022" msgstr "HP LaserJet 1012" -#: src/main/xmli18n-tmp.h:726 +#: src/main/xmli18n-tmp.h:778 msgid "HP LaserJet 1100" msgstr "HP LaserJet 1100" -#: src/main/xmli18n-tmp.h:727 +#: src/main/xmli18n-tmp.h:779 msgid "HP LaserJet 1100A" msgstr "HP LaserJet 1100A" -#: src/main/xmli18n-tmp.h:728 +#: src/main/xmli18n-tmp.h:780 msgid "HP LaserJet 1150" msgstr "HP LaserJet 1150" -#: src/main/xmli18n-tmp.h:729 +#: src/main/xmli18n-tmp.h:781 msgid "HP LaserJet 1200" msgstr "HP LaserJet 1200" -#: src/main/xmli18n-tmp.h:730 +#: src/main/xmli18n-tmp.h:782 msgid "HP LaserJet 1220" msgstr "HP LaserJet 1120" -#: src/main/xmli18n-tmp.h:731 +#: src/main/xmli18n-tmp.h:783 msgid "HP LaserJet 1300" msgstr "HP LaserJet 1300" -#: src/main/xmli18n-tmp.h:732 +#: src/main/xmli18n-tmp.h:784 msgid "HP LaserJet 2100" msgstr "HP LaserJet 2100" -#: src/main/xmli18n-tmp.h:733 +#: src/main/xmli18n-tmp.h:785 msgid "HP LaserJet 2100M" msgstr "HP LaserJet 2100M" -#: src/main/xmli18n-tmp.h:734 +#: src/main/xmli18n-tmp.h:786 msgid "HP LaserJet 2200" msgstr "HP LaserJet 2200" -#: src/main/xmli18n-tmp.h:735 +#: src/main/xmli18n-tmp.h:787 msgid "HP LaserJet 2300" msgstr "HP LaserJet 2300" -#: src/main/xmli18n-tmp.h:736 +#: src/main/xmli18n-tmp.h:788 msgid "HP LaserJet 3200" msgstr "HP LaserJet 3200" -#: src/main/xmli18n-tmp.h:737 +#: src/main/xmli18n-tmp.h:789 msgid "HP LaserJet 3200m" msgstr "HP LaserJet 3200m" -#: src/main/xmli18n-tmp.h:738 +#: src/main/xmli18n-tmp.h:790 msgid "HP LaserJet 3200se" msgstr "HP LaserJet 3200se" -#: src/main/xmli18n-tmp.h:739 +#: src/main/xmli18n-tmp.h:791 msgid "HP LaserJet 3300 MFP" msgstr "HP LaserJet 3300 MFP" -#: src/main/xmli18n-tmp.h:740 +#: src/main/xmli18n-tmp.h:792 msgid "HP LaserJet 3310 MFP" msgstr "HP LaserJet 3310 MFP" -#: src/main/xmli18n-tmp.h:741 +#: src/main/xmli18n-tmp.h:793 msgid "HP LaserJet 3320 MFP" msgstr "HP LaserJet 3320 MFP" -#: src/main/xmli18n-tmp.h:742 +#: src/main/xmli18n-tmp.h:794 msgid "HP LaserJet 3320N MFP" msgstr "HP LaserJet 3320N MFP" -#: src/main/xmli18n-tmp.h:743 +#: src/main/xmli18n-tmp.h:795 msgid "HP LaserJet 3330 MFP" msgstr "HP LaserJet 3330 MFP" -#: src/main/xmli18n-tmp.h:744 +#: src/main/xmli18n-tmp.h:796 msgid "HP LaserJet 4000" msgstr "HP LaserJet 4000" -#: src/main/xmli18n-tmp.h:745 +#: src/main/xmli18n-tmp.h:797 msgid "HP LaserJet 4050" msgstr "HP LaserJet 4050" -#: src/main/xmli18n-tmp.h:746 +#: src/main/xmli18n-tmp.h:798 msgid "HP LaserJet 4100" msgstr "HP LaserJet 4100" -#: src/main/xmli18n-tmp.h:747 +#: src/main/xmli18n-tmp.h:799 msgid "HP LaserJet 4200" msgstr "HP LaserJet 4200" -#: src/main/xmli18n-tmp.h:748 +#: src/main/xmli18n-tmp.h:800 msgid "HP LaserJet 4300" msgstr "HP LaserJet 4300" -#: src/main/xmli18n-tmp.h:749 +#: src/main/xmli18n-tmp.h:801 msgid "HP LaserJet 5000" msgstr "HP LaserJet 5000" -#: src/main/xmli18n-tmp.h:750 +#: src/main/xmli18n-tmp.h:802 msgid "HP LaserJet 5100" msgstr "HP LaserJet 5100" -#: src/main/xmli18n-tmp.h:751 +#: src/main/xmli18n-tmp.h:803 msgid "HP LaserJet 8000" msgstr "HP LaserJet 8000" -#: src/main/xmli18n-tmp.h:752 +#: src/main/xmli18n-tmp.h:804 msgid "HP LaserJet 8100" msgstr "HP LaserJet 8100" -#: src/main/xmli18n-tmp.h:753 +#: src/main/xmli18n-tmp.h:805 msgid "HP LaserJet 8150" msgstr "HP LaserJet 8150" -#: src/main/xmli18n-tmp.h:754 +#: src/main/xmli18n-tmp.h:806 msgid "HP LaserJet 9000" msgstr "HP LaserJet 9000" -#: src/main/xmli18n-tmp.h:755 +#: src/main/xmli18n-tmp.h:807 msgid "HP Mopier 240" msgstr "HP Mopier 240" -#: src/main/xmli18n-tmp.h:756 +#: src/main/xmli18n-tmp.h:808 msgid "HP Mopier 320" msgstr "HP Mopier 320" -#: src/main/xmli18n-tmp.h:757 +#: src/main/xmli18n-tmp.h:809 msgid "HP OfficeJet 300" msgstr "HP OfficeJet 300" -#: src/main/xmli18n-tmp.h:758 +#: src/main/xmli18n-tmp.h:810 msgid "HP OfficeJet 330" msgstr "HP OfficeJet 330" -#: src/main/xmli18n-tmp.h:759 +#: src/main/xmli18n-tmp.h:811 msgid "HP OfficeJet 350" msgstr "HP OfficeJet 350" -#: src/main/xmli18n-tmp.h:760 +#: src/main/xmli18n-tmp.h:812 msgid "HP OfficeJet 500" msgstr "HP OfficeJet 500" -#: src/main/xmli18n-tmp.h:761 +#: src/main/xmli18n-tmp.h:813 msgid "HP OfficeJet 520" msgstr "HP OfficeJet 520" -#: src/main/xmli18n-tmp.h:762 +#: src/main/xmli18n-tmp.h:814 msgid "HP OfficeJet 570" msgstr "HP OfficeJet 570" -#: src/main/xmli18n-tmp.h:763 +#: src/main/xmli18n-tmp.h:815 msgid "HP OfficeJet 580" msgstr "HP OfficeJet 580" -#: src/main/xmli18n-tmp.h:764 +#: src/main/xmli18n-tmp.h:816 msgid "HP OfficeJet 590" msgstr "HP OfficeJet 590" -#: src/main/xmli18n-tmp.h:765 +#: src/main/xmli18n-tmp.h:817 msgid "HP OfficeJet 600" msgstr "HP OfficeJet 600" -#: src/main/xmli18n-tmp.h:766 +#: src/main/xmli18n-tmp.h:818 msgid "HP OfficeJet 610" msgstr "HP OfficeJet 610" -#: src/main/xmli18n-tmp.h:767 +#: src/main/xmli18n-tmp.h:819 msgid "HP OfficeJet 625" msgstr "HP OfficeJet 625" -#: src/main/xmli18n-tmp.h:768 +#: src/main/xmli18n-tmp.h:820 msgid "HP OfficeJet 630" msgstr "HP OfficeJet 630" -#: src/main/xmli18n-tmp.h:769 +#: src/main/xmli18n-tmp.h:821 msgid "HP OfficeJet 635" msgstr "HP OfficeJet 635" -#: src/main/xmli18n-tmp.h:770 +#: src/main/xmli18n-tmp.h:822 msgid "HP OfficeJet 700" msgstr "HP OfficeJet 700" -#: src/main/xmli18n-tmp.h:771 +#: src/main/xmli18n-tmp.h:823 msgid "HP OfficeJet 710" msgstr "HP OfficeJet 710" -#: src/main/xmli18n-tmp.h:772 +#: src/main/xmli18n-tmp.h:824 msgid "HP OfficeJet 720" msgstr "HP OfficeJet 720" -#: src/main/xmli18n-tmp.h:773 +#: src/main/xmli18n-tmp.h:825 msgid "HP OfficeJet 725" msgstr "HP OfficeJet 725" -#: src/main/xmli18n-tmp.h:774 +#: src/main/xmli18n-tmp.h:826 msgid "HP OfficeJet 5105" msgstr "HP OfficeJet 5105" -#: src/main/xmli18n-tmp.h:775 +#: src/main/xmli18n-tmp.h:827 msgid "HP OfficeJet 5110" msgstr "HP OfficeJet 5110" -#: src/main/xmli18n-tmp.h:776 +#: src/main/xmli18n-tmp.h:828 msgid "HP OfficeJet 5110xi" msgstr "HP OfficeJet 5110xi" -#: src/main/xmli18n-tmp.h:777 +#: src/main/xmli18n-tmp.h:829 msgid "HP OfficeJet 6105" msgstr "HP OfficeJet 6105" -#: src/main/xmli18n-tmp.h:778 +#: src/main/xmli18n-tmp.h:830 msgid "HP OfficeJet 6110" msgstr "HP OfficeJet 6110" -#: src/main/xmli18n-tmp.h:779 +#: src/main/xmli18n-tmp.h:831 msgid "HP OfficeJet 7110" msgstr "HP OfficeJet 7110" -#: src/main/xmli18n-tmp.h:780 +#: src/main/xmli18n-tmp.h:832 msgid "HP OfficeJet 7130" msgstr "HP OfficeJet 7130" -#: src/main/xmli18n-tmp.h:781 +#: src/main/xmli18n-tmp.h:833 msgid "HP OfficeJet 7140" msgstr "HP OfficeJet 7140" -#: src/main/xmli18n-tmp.h:782 +#: src/main/xmli18n-tmp.h:834 msgid "HP OfficeJet D125" msgstr "HP OfficeJet D125" -#: src/main/xmli18n-tmp.h:783 +#: src/main/xmli18n-tmp.h:835 msgid "HP OfficeJet D135" msgstr "HP OfficeJet D135" -#: src/main/xmli18n-tmp.h:784 +#: src/main/xmli18n-tmp.h:836 msgid "HP OfficeJet D145" msgstr "HP OfficeJet D145" -#: src/main/xmli18n-tmp.h:785 +#: src/main/xmli18n-tmp.h:837 msgid "HP OfficeJet D155" msgstr "HP OfficeJet D155" -#: src/main/xmli18n-tmp.h:786 +#: src/main/xmli18n-tmp.h:838 msgid "HP OfficeJet G55" msgstr "HP OfficeJet G55" -#: src/main/xmli18n-tmp.h:787 +#: src/main/xmli18n-tmp.h:839 msgid "HP OfficeJet G85" msgstr "HP OfficeJet G85" -#: src/main/xmli18n-tmp.h:788 +#: src/main/xmli18n-tmp.h:840 msgid "HP OfficeJet G95" msgstr "HP OfficeJet G95" -#: src/main/xmli18n-tmp.h:789 +#: src/main/xmli18n-tmp.h:841 msgid "HP OfficeJet K60" msgstr "HP OfficeJet K60" -#: src/main/xmli18n-tmp.h:790 +#: src/main/xmli18n-tmp.h:842 msgid "HP OfficeJet K60xi" msgstr "HP OfficeJet K60xi" -#: src/main/xmli18n-tmp.h:791 +#: src/main/xmli18n-tmp.h:843 msgid "HP OfficeJet K80" msgstr "HP OfficeJet K80" -#: src/main/xmli18n-tmp.h:792 +#: src/main/xmli18n-tmp.h:844 msgid "HP OfficeJet K80xi" msgstr "HP OfficeJet K80xi" -#: src/main/xmli18n-tmp.h:793 +#: src/main/xmli18n-tmp.h:845 msgid "HP OfficeJet LX" msgstr "HP OfficeJet LX" -#: src/main/xmli18n-tmp.h:794 +#: src/main/xmli18n-tmp.h:846 msgid "HP OfficeJet Pro 1150C" msgstr "HP OfficeJet Pro 1150C" -#: src/main/xmli18n-tmp.h:795 +#: src/main/xmli18n-tmp.h:847 msgid "HP OfficeJet Pro 1170C" msgstr "HP OfficeJet Pro 1170C" -#: src/main/xmli18n-tmp.h:796 +#: src/main/xmli18n-tmp.h:848 msgid "HP OfficeJet Pro 1175C" msgstr "HP OfficeJet Pro 1175C" -#: src/main/xmli18n-tmp.h:797 +#: src/main/xmli18n-tmp.h:849 msgid "HP OfficeJet R40" msgstr "HP OfficeJet R40" -#: src/main/xmli18n-tmp.h:798 +#: src/main/xmli18n-tmp.h:850 msgid "HP OfficeJet R45" msgstr "HP OfficeJet R45" -#: src/main/xmli18n-tmp.h:799 +#: src/main/xmli18n-tmp.h:851 msgid "HP OfficeJet R60" msgstr "HP OfficeJet R60" -#: src/main/xmli18n-tmp.h:800 +#: src/main/xmli18n-tmp.h:852 msgid "HP OfficeJet R65" msgstr "HP OfficeJet R65" -#: src/main/xmli18n-tmp.h:801 +#: src/main/xmli18n-tmp.h:853 msgid "HP OfficeJet R80" msgstr "HP OfficeJet R80" -#: src/main/xmli18n-tmp.h:802 +#: src/main/xmli18n-tmp.h:854 msgid "HP OfficeJet T45" msgstr "HP OfficeJet T45" -#: src/main/xmli18n-tmp.h:803 +#: src/main/xmli18n-tmp.h:855 msgid "HP OfficeJet T65" msgstr "HP OfficeJet T65" -#: src/main/xmli18n-tmp.h:804 +#: src/main/xmli18n-tmp.h:856 msgid "HP OfficeJet V40" msgstr "HP OfficeJet V40" -#: src/main/xmli18n-tmp.h:805 +#: src/main/xmli18n-tmp.h:857 msgid "HP OfficeJet V40xi" msgstr "HP OfficeJet V40xi" -#: src/main/xmli18n-tmp.h:806 +#: src/main/xmli18n-tmp.h:858 msgid "HP OfficeJet" msgstr "HP OfficeJet" -#: src/main/xmli18n-tmp.h:807 +#: src/main/xmli18n-tmp.h:859 msgid "HP PSC 370" msgstr "HP PSC 370" -#: src/main/xmli18n-tmp.h:808 +#: src/main/xmli18n-tmp.h:860 msgid "HP PSC 380" msgstr "HP PSC 380" -#: src/main/xmli18n-tmp.h:809 +#: src/main/xmli18n-tmp.h:861 msgid "HP PSC 500" msgstr "HP PSC 500" -#: src/main/xmli18n-tmp.h:810 +#: src/main/xmli18n-tmp.h:862 msgid "HP PSC 750" msgstr "HP PSC 750" -#: src/main/xmli18n-tmp.h:811 +#: src/main/xmli18n-tmp.h:863 msgid "HP PSC 950" msgstr "HP PSC 950" -#: src/main/xmli18n-tmp.h:812 +#: src/main/xmli18n-tmp.h:864 msgid "HP PSC 950xi" msgstr "HP PSC 950xi" -#: src/main/xmli18n-tmp.h:813 +#: src/main/xmli18n-tmp.h:865 msgid "HP PSC 2110" msgstr "HP PSC 2110" -#: src/main/xmli18n-tmp.h:814 +#: src/main/xmli18n-tmp.h:866 msgid "HP PSC 2150" msgstr "HP PSC 2150" -#: src/main/xmli18n-tmp.h:815 +#: src/main/xmli18n-tmp.h:867 msgid "HP PSC 2210" msgstr "HP PSC 2210" -#: src/main/xmli18n-tmp.h:816 +#: src/main/xmli18n-tmp.h:868 msgid "HP PhotoSmart 7150" msgstr "HP PhotoSmart 7150" -#: src/main/xmli18n-tmp.h:817 +#: src/main/xmli18n-tmp.h:869 msgid "HP PhotoSmart 7345" msgstr "HP PhotoSmart 7345" -#: src/main/xmli18n-tmp.h:818 +#: src/main/xmli18n-tmp.h:870 msgid "HP PhotoSmart 7350" msgstr "HP PhotoSmart 7350" -#: src/main/xmli18n-tmp.h:819 +#: src/main/xmli18n-tmp.h:871 msgid "HP PhotoSmart 7550" msgstr "HP PhotoSmart 7550" -#: src/main/xmli18n-tmp.h:820 +#: src/main/xmli18n-tmp.h:872 msgid "HP PhotoSmart P100" msgstr "HP PhotoSmart P100" -#: src/main/xmli18n-tmp.h:821 +#: src/main/xmli18n-tmp.h:873 msgid "HP PhotoSmart P130" msgstr "HP PhotoSmart P130" -#: src/main/xmli18n-tmp.h:822 +#: src/main/xmli18n-tmp.h:874 msgid "HP PhotoSmart P230" msgstr "HP PhotoSmart P230" -#: src/main/xmli18n-tmp.h:823 +#: src/main/xmli18n-tmp.h:875 msgid "HP PhotoSmart P1000" msgstr "HP PhotoSmart P1000" -#: src/main/xmli18n-tmp.h:824 +#: src/main/xmli18n-tmp.h:876 msgid "HP PhotoSmart P1100" msgstr "HP PhotoSmart P1100" -#: src/main/xmli18n-tmp.h:825 +#: src/main/xmli18n-tmp.h:877 msgid "HP PhotoSmart P1115" msgstr "HP PhotoSmart P1115" -#: src/main/xmli18n-tmp.h:826 +#: src/main/xmli18n-tmp.h:878 msgid "HP PhotoSmart P1215" msgstr "HP PhotoSmart P1215" -#: src/main/xmli18n-tmp.h:827 +#: src/main/xmli18n-tmp.h:879 msgid "HP PhotoSmart P1218" msgstr "HP PhotoSmart P1218" -#: src/main/xmli18n-tmp.h:828 +#: src/main/xmli18n-tmp.h:880 msgid "HP PhotoSmart P1315" msgstr "HP PhotoSmart P1315" -#: src/main/xmli18n-tmp.h:829 +#: src/main/xmli18n-tmp.h:881 msgid "HP e-printer e20" msgstr "HP e-printer e20" -#: src/main/xmli18n-tmp.h:830 +#: src/main/xmli18n-tmp.h:882 msgid "IBM 4019" msgstr "IBM 4019" -#: src/main/xmli18n-tmp.h:831 +#: src/main/xmli18n-tmp.h:883 msgid "IBM 4029 030 LaserPrinter 10" msgstr "IBM 4029 030 LaserPrinter 10" -#: src/main/xmli18n-tmp.h:832 +#: src/main/xmli18n-tmp.h:884 msgid "IBM 4312" msgstr "IBM 4312" -#: src/main/xmli18n-tmp.h:833 +#: src/main/xmli18n-tmp.h:885 msgid "IBM Infoprint 12" msgstr "IBM Infoprint 12" -#: src/main/xmli18n-tmp.h:834 +#: src/main/xmli18n-tmp.h:886 msgid "IBM Page Printer 3112" msgstr "IBM Page Printer 3112" -#: src/main/xmli18n-tmp.h:835 +#: src/main/xmli18n-tmp.h:887 msgid "Infotec 4651 MF" msgstr "Infotec 4651 MF" -#: src/main/xmli18n-tmp.h:836 +#: src/main/xmli18n-tmp.h:888 msgid "Kyocera F-1010" msgstr "Kyocera F-1010" -#: src/main/xmli18n-tmp.h:837 +#: src/main/xmli18n-tmp.h:889 msgid "Kyocera FS-600 - KPDL-2" msgstr "Kyocera FS-600 - KPDL-2" -#: src/main/xmli18n-tmp.h:838 +#: src/main/xmli18n-tmp.h:890 msgid "Kyocera FS-600" msgstr "Kyocera FS-600" -#: src/main/xmli18n-tmp.h:839 +#: src/main/xmli18n-tmp.h:891 msgid "Kyocera FS-680" msgstr "Kyocera FS-680" -#: src/main/xmli18n-tmp.h:840 +#: src/main/xmli18n-tmp.h:892 msgid "Kyocera FS-800" msgstr "Kyocera FS-800" -#: src/main/xmli18n-tmp.h:841 +#: src/main/xmli18n-tmp.h:893 msgid "Kyocera FS-1000" msgstr "Kyocera FS-1000" -#: src/main/xmli18n-tmp.h:842 +#: src/main/xmli18n-tmp.h:894 msgid "Kyocera FS-1000+" msgstr "Kyocera FS-1000+" -#: src/main/xmli18n-tmp.h:843 +#: src/main/xmli18n-tmp.h:895 msgid "Kyocera FS-1010" msgstr "Kyocera FS-1010" -#: src/main/xmli18n-tmp.h:844 +#: src/main/xmli18n-tmp.h:896 msgid "Kyocera FS-1050" msgstr "Kyocera FS-1050" -#: src/main/xmli18n-tmp.h:845 +#: src/main/xmli18n-tmp.h:897 msgid "Kyocera FS-1200" msgstr "Kyocera FS-1200" -#: src/main/xmli18n-tmp.h:846 +#: src/main/xmli18n-tmp.h:898 msgid "Kyocera FS-1600" msgstr "Kyocera FS-1600" -#: src/main/xmli18n-tmp.h:847 +#: src/main/xmli18n-tmp.h:899 msgid "Kyocera FS-1600+" msgstr "Kyocera FS-1600+" -#: src/main/xmli18n-tmp.h:848 +#: src/main/xmli18n-tmp.h:900 msgid "Kyocera FS-1700" msgstr "Kyocera FS-1700" -#: src/main/xmli18n-tmp.h:849 +#: src/main/xmli18n-tmp.h:901 msgid "Kyocera FS-1700+" msgstr "Kyocera FS-1700+" -#: src/main/xmli18n-tmp.h:850 +#: src/main/xmli18n-tmp.h:902 msgid "Kyocera FS-1750" msgstr "Kyocera FS-1750" -#: src/main/xmli18n-tmp.h:851 +#: src/main/xmli18n-tmp.h:903 msgid "Kyocera FS-1800" msgstr "Kyocera FS-1800" -#: src/main/xmli18n-tmp.h:852 +#: src/main/xmli18n-tmp.h:904 msgid "Kyocera FS-1800+" msgstr "Kyocera FS-1800+" -#: src/main/xmli18n-tmp.h:853 +#: src/main/xmli18n-tmp.h:905 msgid "Kyocera FS-1900" msgstr "Kyocera FS-1900" -#: src/main/xmli18n-tmp.h:854 +#: src/main/xmli18n-tmp.h:906 msgid "Kyocera FS-3500" msgstr "Kyocera FS-3500" -#: src/main/xmli18n-tmp.h:855 +#: src/main/xmli18n-tmp.h:907 msgid "Kyocera FS-3600" msgstr "Kyocera FS-3600" -#: src/main/xmli18n-tmp.h:856 +#: src/main/xmli18n-tmp.h:908 msgid "Kyocera FS-3600+" msgstr "Kyocera FS-3600+" -#: src/main/xmli18n-tmp.h:857 +#: src/main/xmli18n-tmp.h:909 msgid "Kyocera FS-3700" msgstr "Kyocera FS-3700" -#: src/main/xmli18n-tmp.h:858 +#: src/main/xmli18n-tmp.h:910 msgid "Kyocera FS-3700+" msgstr "Kyocera FS-3700+" -#: src/main/xmli18n-tmp.h:859 +#: src/main/xmli18n-tmp.h:911 msgid "Kyocera FS-3750" msgstr "Kyocera FS-3750" -#: src/main/xmli18n-tmp.h:860 +#: src/main/xmli18n-tmp.h:912 msgid "Kyocera FS-3800" msgstr "Kyocera FS-3800" -#: src/main/xmli18n-tmp.h:861 +#: src/main/xmli18n-tmp.h:913 msgid "Kyocera FS-5800C" msgstr "Kyocera FS-5800C" -#: src/main/xmli18n-tmp.h:862 +#: src/main/xmli18n-tmp.h:914 msgid "Kyocera FS-5900C" msgstr "Kyocera FS-5900C" -#: src/main/xmli18n-tmp.h:863 +#: src/main/xmli18n-tmp.h:915 msgid "Kyocera FS-6500" msgstr "Kyocera FS-6500" -#: src/main/xmli18n-tmp.h:864 +#: src/main/xmli18n-tmp.h:916 msgid "Kyocera FS-6500+" msgstr "Kyocera FS-6500+" -#: src/main/xmli18n-tmp.h:865 +#: src/main/xmli18n-tmp.h:917 msgid "Kyocera FS-6700" msgstr "Kyocera FS-6700" -#: src/main/xmli18n-tmp.h:866 +#: src/main/xmli18n-tmp.h:918 msgid "Kyocera FS-7000" msgstr "Kyocera FS-7000" -#: src/main/xmli18n-tmp.h:867 +#: src/main/xmli18n-tmp.h:919 msgid "Kyocera FS-7000+" msgstr "Kyocera FS-7000+" -#: src/main/xmli18n-tmp.h:868 +#: src/main/xmli18n-tmp.h:920 msgid "Kyocera FS-8000C" msgstr "Kyocera FS-9100DN" -#: src/main/xmli18n-tmp.h:869 +#: src/main/xmli18n-tmp.h:921 msgid "Kyocera FS-9000" msgstr "Kyocera FS-9000" -#: src/main/xmli18n-tmp.h:870 +#: src/main/xmli18n-tmp.h:922 msgid "Kyocera FS-9100DN" msgstr "Kyocera FS-9100DN" -#: src/main/xmli18n-tmp.h:871 +#: src/main/xmli18n-tmp.h:923 msgid "Kyocera FS-9500DN" msgstr "Kyocera FS-9500DN" -#: src/main/xmli18n-tmp.h:872 +#: src/main/xmli18n-tmp.h:924 msgid "Kyocera KM-1530" msgstr "Kyocera KM-1530" -#: src/main/xmli18n-tmp.h:873 +#: src/main/xmli18n-tmp.h:925 msgid "Kyocera KM-1810" msgstr "Kyocera KM-1810" -#: src/main/xmli18n-tmp.h:874 +#: src/main/xmli18n-tmp.h:926 msgid "Kyocera KM-2030" msgstr "Kyocera KM-2030" -#: src/main/xmli18n-tmp.h:875 +#: src/main/xmli18n-tmp.h:927 msgid "Kyocera KM-2530" msgstr "Kyocera KM-2530" -#: src/main/xmli18n-tmp.h:876 +#: src/main/xmli18n-tmp.h:928 msgid "Kyocera KM-3530" msgstr "Kyocera KM-3530" -#: src/main/xmli18n-tmp.h:877 +#: src/main/xmli18n-tmp.h:929 msgid "Kyocera KM-4230" msgstr "Kyocera KM-4230" -#: src/main/xmli18n-tmp.h:878 +#: src/main/xmli18n-tmp.h:930 msgid "Kyocera KM-4530" msgstr "Kyocera KM-4530" -#: src/main/xmli18n-tmp.h:879 +#: src/main/xmli18n-tmp.h:931 msgid "Kyocera KM-5230" msgstr "Kyocera KM-5230" -#: src/main/xmli18n-tmp.h:880 +#: src/main/xmli18n-tmp.h:932 msgid "Kyocera KM-5530" msgstr "Kyocera KM-5530" -#: src/main/xmli18n-tmp.h:881 +#: src/main/xmli18n-tmp.h:933 msgid "Kyocera KM-6230" msgstr "Kyocera KM-6230" -#: src/main/xmli18n-tmp.h:882 +#: src/main/xmli18n-tmp.h:934 msgid "Lexmark 4076" msgstr "Lexmark 4076" -#: src/main/xmli18n-tmp.h:883 +#: src/main/xmli18n-tmp.h:935 msgid "Lexmark Optra E" msgstr "Lexmark Optra E" -#: src/main/xmli18n-tmp.h:884 +#: src/main/xmli18n-tmp.h:936 msgid "Lexmark Optra E+" msgstr "Lexmark Optra E+" -#: src/main/xmli18n-tmp.h:885 +#: src/main/xmli18n-tmp.h:937 #, fuzzy msgid "Lexmark Optra E220" msgstr "Lexmark Optra E" -#: src/main/xmli18n-tmp.h:886 +#: src/main/xmli18n-tmp.h:938 msgid "Lexmark Valuewriter 300" msgstr "Lexmark Valuewriter 300" -#: src/main/xmli18n-tmp.h:887 +#: src/main/xmli18n-tmp.h:939 msgid "Minolta PagePro 6" msgstr "Minolta PagePro 6" -#: src/main/xmli18n-tmp.h:888 +#: src/main/xmli18n-tmp.h:940 msgid "Minolta PagePro 6e" msgstr "Minolta PagePro 6e" -#: src/main/xmli18n-tmp.h:889 +#: src/main/xmli18n-tmp.h:941 msgid "Minolta PagePro 6ex" msgstr "Minolta PagePro 6ex" -#: src/main/xmli18n-tmp.h:890 +#: src/main/xmli18n-tmp.h:942 msgid "Minolta PagePro 8" msgstr "Minolta PagePro 8" -#: src/main/xmli18n-tmp.h:891 +#: src/main/xmli18n-tmp.h:943 msgid "Minolta PagePro 8L" msgstr "Minolta PagePro 8L" -#: src/main/xmli18n-tmp.h:892 +#: src/main/xmli18n-tmp.h:944 msgid "Minolta PagePro 1100" msgstr "Minolta PagePro 1100" -#: src/main/xmli18n-tmp.h:893 +#: src/main/xmli18n-tmp.h:945 msgid "NEC SuperScript 660i" msgstr "NEC SuperScript 660i" -#: src/main/xmli18n-tmp.h:894 +#: src/main/xmli18n-tmp.h:946 msgid "NEC SuperScript 860" msgstr "NEC SuperScript 860" -#: src/main/xmli18n-tmp.h:895 +#: src/main/xmli18n-tmp.h:947 msgid "NEC SuperScript 870" msgstr "NEC SuperScript 870" -#: src/main/xmli18n-tmp.h:896 +#: src/main/xmli18n-tmp.h:948 msgid "NEC SuperScript 1260" msgstr "NEC SuperScript 1260" -#: src/main/xmli18n-tmp.h:897 +#: src/main/xmli18n-tmp.h:949 msgid "NEC SuperScript 1400" msgstr "NEC SuperScript 1400" -#: src/main/xmli18n-tmp.h:898 +#: src/main/xmli18n-tmp.h:950 msgid "NEC SuperScript 1800" msgstr "NEC SuperScript 1800" -#: src/main/xmli18n-tmp.h:899 +#: src/main/xmli18n-tmp.h:951 msgid "Okidata OL400" msgstr "Okidata OL400" -#: src/main/xmli18n-tmp.h:900 +#: src/main/xmli18n-tmp.h:952 msgid "Okidata OL400e" msgstr "Okidata OL400e" -#: src/main/xmli18n-tmp.h:901 +#: src/main/xmli18n-tmp.h:953 msgid "Okidata OL400ex" msgstr "Okidata OL400ex" -#: src/main/xmli18n-tmp.h:902 +#: src/main/xmli18n-tmp.h:954 msgid "Okidata OL410e" msgstr "Okidata OL410e" -#: src/main/xmli18n-tmp.h:903 +#: src/main/xmli18n-tmp.h:955 msgid "Okidata OL600e" msgstr "Okidata OL600e" -#: src/main/xmli18n-tmp.h:904 +#: src/main/xmli18n-tmp.h:956 msgid "Okidata OL610e/S" msgstr "Okidata OL610e/S" -#: src/main/xmli18n-tmp.h:905 +#: src/main/xmli18n-tmp.h:957 msgid "Okidata OL800" msgstr "Okidata OL800" -#: src/main/xmli18n-tmp.h:906 +#: src/main/xmli18n-tmp.h:958 msgid "Okidata OL810ex" msgstr "Okidata OL810ex" -#: src/main/xmli18n-tmp.h:907 +#: src/main/xmli18n-tmp.h:959 msgid "Okidata Okipage 6e" msgstr "Okidata Okipage 6e" -#: src/main/xmli18n-tmp.h:908 +#: src/main/xmli18n-tmp.h:960 msgid "Okidata Okipage 6ex" msgstr "Okidata Okipage 6ex" -#: src/main/xmli18n-tmp.h:909 +#: src/main/xmli18n-tmp.h:961 msgid "Okidata Okipage 8p" msgstr "Okidata Okipage 8p" -#: src/main/xmli18n-tmp.h:910 +#: src/main/xmli18n-tmp.h:962 msgid "Okidata Okipage 10e" msgstr "Okidata Okipage 10e" -#: src/main/xmli18n-tmp.h:911 +#: src/main/xmli18n-tmp.h:963 msgid "Okidata Okipage 10ex" msgstr "Okidata Okipage 10ex" -#: src/main/xmli18n-tmp.h:912 +#: src/main/xmli18n-tmp.h:964 msgid "Okidata Okipage 14ex" msgstr "Okidata Okipage 14ex" -#: src/main/xmli18n-tmp.h:913 +#: src/main/xmli18n-tmp.h:965 msgid "Okidata Super 6e" msgstr "Okidata Super 6e" -#: src/main/xmli18n-tmp.h:914 +#: src/main/xmli18n-tmp.h:966 msgid "Olivetti JP350S" msgstr "Olivetti JP350S" -#: src/main/xmli18n-tmp.h:915 +#: src/main/xmli18n-tmp.h:967 msgid "Olivetti PG 306" msgstr "Olivetti PG 306" -#: src/main/xmli18n-tmp.h:916 +#: src/main/xmli18n-tmp.h:968 msgid "PCPI 1030" msgstr "PCPI 1030" -#: src/main/xmli18n-tmp.h:917 +#: src/main/xmli18n-tmp.h:969 msgid "Panasonic KX-P4410" msgstr "Panasonic KX-P4410" -#: src/main/xmli18n-tmp.h:918 +#: src/main/xmli18n-tmp.h:970 msgid "Panasonic KX-P4450" msgstr "Panasonic KX-P4450" -#: src/main/xmli18n-tmp.h:919 +#: src/main/xmli18n-tmp.h:971 msgid "Panasonic KX-P6150" msgstr "Panasonic KX-P6150" -#: src/main/xmli18n-tmp.h:920 +#: src/main/xmli18n-tmp.h:972 msgid "Panasonic KX-P6500" msgstr "Panasonic KX-P6500" -#: src/main/xmli18n-tmp.h:921 +#: src/main/xmli18n-tmp.h:973 msgid "Raven LP-410" msgstr "Raven LP-410" -#: src/main/xmli18n-tmp.h:922 +#: src/main/xmli18n-tmp.h:974 msgid "Ricoh Aficio 220" msgstr "Ricoh Aficio 220" -#: src/main/xmli18n-tmp.h:923 +#: src/main/xmli18n-tmp.h:975 msgid "Ricoh Aficio 401" msgstr "Ricoh Aficio 401" -#: src/main/xmli18n-tmp.h:924 +#: src/main/xmli18n-tmp.h:976 msgid "Ricoh Aficio 700" msgstr "Ricoh Aficio 700" -#: src/main/xmli18n-tmp.h:925 +#: src/main/xmli18n-tmp.h:977 msgid "Samsung ML-85" msgstr "Samsung ML-85" -#: src/main/xmli18n-tmp.h:926 +#: src/main/xmli18n-tmp.h:978 msgid "Samsung ML-4600" msgstr "Samsung ML-4600" -#: src/main/xmli18n-tmp.h:927 +#: src/main/xmli18n-tmp.h:979 msgid "Samsung ML-5000a" msgstr "Samsung ML-5000a" -#: src/main/xmli18n-tmp.h:928 +#: src/main/xmli18n-tmp.h:980 msgid "Samsung ML-6000" msgstr "\"Samsung ML-6000" -#: src/main/xmli18n-tmp.h:929 +#: src/main/xmli18n-tmp.h:981 msgid "Samsung ML-6100" msgstr "Samsung ML-6100" -#: src/main/xmli18n-tmp.h:930 +#: src/main/xmli18n-tmp.h:982 msgid "Samsung ML-7000" msgstr "Samsung ML-7000" -#: src/main/xmli18n-tmp.h:931 +#: src/main/xmli18n-tmp.h:983 msgid "Samsung ML-7000N" msgstr "Samsung ML-7000N" -#: src/main/xmli18n-tmp.h:932 +#: src/main/xmli18n-tmp.h:984 msgid "Samsung ML-7000P" msgstr "Samsung ML-7000P" -#: src/main/xmli18n-tmp.h:933 +#: src/main/xmli18n-tmp.h:985 msgid "Samsung ML-7050" msgstr "Samsung ML-7050" -#: src/main/xmli18n-tmp.h:934 +#: src/main/xmli18n-tmp.h:986 msgid "Samsung QL-5100A" msgstr "Samsung QL-5100A" -#: src/main/xmli18n-tmp.h:935 +#: src/main/xmli18n-tmp.h:987 msgid "Samsung QL-6050" msgstr "Samsung QL-6050" -#: src/main/xmli18n-tmp.h:936 +#: src/main/xmli18n-tmp.h:988 msgid "Seiko SpeedJET 200" msgstr "Seiko SpeedJET 200" -#: src/main/xmli18n-tmp.h:937 +#: src/main/xmli18n-tmp.h:989 msgid "Sharp AR-161" msgstr "Sharp AR-161" -#: src/main/xmli18n-tmp.h:938 +#: src/main/xmli18n-tmp.h:990 #, fuzzy msgid "Sharp AR-M257" msgstr "Sharp AR-161" -#: src/main/xmli18n-tmp.h:939 +#: src/main/xmli18n-tmp.h:991 msgid "Sony IJP-V100" msgstr "Sony IJP-V100" -#: src/main/xmli18n-tmp.h:940 +#: src/main/xmli18n-tmp.h:992 msgid "Star LS-04" msgstr "Star LS-04" -#: src/main/xmli18n-tmp.h:941 +#: src/main/xmli18n-tmp.h:993 msgid "Star LaserPrinter 8" msgstr "Star LaserPrinter 8" -#: src/main/xmli18n-tmp.h:942 +#: src/main/xmli18n-tmp.h:994 msgid "Tally MT908" msgstr "Tally MT908" -#: src/main/xmli18n-tmp.h:943 +#: src/main/xmli18n-tmp.h:995 msgid "Xerox Able 1406" msgstr "Xerox Able 1406" -#: src/main/xmli18n-tmp.h:944 +#: src/main/xmli18n-tmp.h:996 msgid "Xerox DocuPrint 4508" msgstr "Xerox DocuPrint 4508" -#: src/main/xmli18n-tmp.h:945 +#: src/main/xmli18n-tmp.h:997 msgid "Xerox DocuPrint C20" msgstr "Xerox DocuPrint C20" -#: src/main/xmli18n-tmp.h:946 +#: src/main/xmli18n-tmp.h:998 msgid "Xerox DocuPrint N4512" msgstr "Xerox DocuPrint N4512" -#: src/main/xmli18n-tmp.h:947 +#: src/main/xmli18n-tmp.h:999 msgid "Xerox DocuPrint N4512PS" msgstr "Xerox DocuPrint N4512PS" -#: src/main/xmli18n-tmp.h:948 +#: src/main/xmli18n-tmp.h:1000 msgid "Xerox DocuPrint P12" msgstr "Xerox DocuPrint P12" -#: src/main/xmli18n-tmp.h:949 +#: src/main/xmli18n-tmp.h:1001 msgid "Xerox DocuPrint P1202" msgstr "Xerox DocuPrint P1202" -#: src/main/xmli18n-tmp.h:950 +#: src/main/xmli18n-tmp.h:1002 msgid "Xerox DocuPrint P8e" msgstr "Xerox DocuPrint P8e" -#: src/main/xmli18n-tmp.h:951 +#: src/main/xmli18n-tmp.h:1003 msgid "Xerox Document Centre 400" msgstr "Xerox Document Centre 400" -#: src/main/xmli18n-tmp.h:952 +#: src/main/xmli18n-tmp.h:1004 #, fuzzy msgid "Xerox WorkCentre M118" msgstr "Xerox Document Centre 400" -#: src/main/xmli18n-tmp.h:953 +#: src/main/xmli18n-tmp.h:1005 msgid "Compaq IJ1200" msgstr "" -#: src/main/xmli18n-tmp.h:954 +#: src/main/xmli18n-tmp.h:1006 #, fuzzy msgid "Lexmark X73" msgstr "Lexmark Z43" -#: src/main/xmli18n-tmp.h:955 +#: src/main/xmli18n-tmp.h:1007 msgid "Lexmark Z42" msgstr "Lexmark Z42" -#: src/main/xmli18n-tmp.h:956 +#: src/main/xmli18n-tmp.h:1008 msgid "Lexmark Z43" msgstr "Lexmark Z43" -#: src/main/xmli18n-tmp.h:957 +#: src/main/xmli18n-tmp.h:1009 msgid "Lexmark Z52" msgstr "Lexmark Z52" -#: src/main/xmli18n-tmp.h:958 +#: src/main/xmli18n-tmp.h:1010 msgid "Lexmark Z53" msgstr "Lexmark Z53" -#: src/main/xmli18n-tmp.h:959 +#: src/main/xmli18n-tmp.h:1011 msgid "Olympus P-10" msgstr "Olympus P-10" -#: src/main/xmli18n-tmp.h:960 +#: src/main/xmli18n-tmp.h:1012 msgid "Olympus P-11" msgstr "Olympus P-11" -#: src/main/xmli18n-tmp.h:961 +#: src/main/xmli18n-tmp.h:1013 msgid "Olympus P-200" msgstr "Olympus P-200" -#: src/main/xmli18n-tmp.h:962 +#: src/main/xmli18n-tmp.h:1014 msgid "Olympus P-300" msgstr "Olympus P-300" -#: src/main/xmli18n-tmp.h:963 +#: src/main/xmli18n-tmp.h:1015 msgid "Olympus P-300E" msgstr "Olympus P-300E" -#: src/main/xmli18n-tmp.h:964 +#: src/main/xmli18n-tmp.h:1016 msgid "Olympus P-300U" msgstr "Olympus P-3000" -#: src/main/xmli18n-tmp.h:965 +#: src/main/xmli18n-tmp.h:1017 msgid "Olympus P-330E" msgstr "Olympus P-330E" -#: src/main/xmli18n-tmp.h:966 +#: src/main/xmli18n-tmp.h:1018 msgid "Olympus P-330NE" msgstr "Olympus P-330NE" -#: src/main/xmli18n-tmp.h:967 +#: src/main/xmli18n-tmp.h:1019 msgid "Olympus P-400" msgstr "Olympus P-400" -#: src/main/xmli18n-tmp.h:968 +#: src/main/xmli18n-tmp.h:1020 msgid "Olympus P-440" msgstr "Olympus P-440" -#: src/main/xmli18n-tmp.h:969 +#: src/main/xmli18n-tmp.h:1021 #, fuzzy msgid "Olympus P-S100" msgstr "Olympus P-10" -#: src/main/xmli18n-tmp.h:970 +#: src/main/xmli18n-tmp.h:1022 #, fuzzy msgid "Canon CP-10" msgstr "Canon CP-100" -#: src/main/xmli18n-tmp.h:971 +#: src/main/xmli18n-tmp.h:1023 msgid "Canon CP-100" msgstr "Canon CP-100" -#: src/main/xmli18n-tmp.h:972 +#: src/main/xmli18n-tmp.h:1024 msgid "Canon CP-200" msgstr "Canon CP-200" -#: src/main/xmli18n-tmp.h:973 +#: src/main/xmli18n-tmp.h:1025 msgid "Canon CP-220" msgstr "Canon CP-220" -#: src/main/xmli18n-tmp.h:974 +#: src/main/xmli18n-tmp.h:1026 msgid "Canon CP-300" msgstr "Canon CP-300" -#: src/main/xmli18n-tmp.h:975 +#: src/main/xmli18n-tmp.h:1027 msgid "Canon CP-330" msgstr "Canon CP-330" -#: src/main/xmli18n-tmp.h:976 +#: src/main/xmli18n-tmp.h:1028 msgid "Canon SELPHY-CP-400" msgstr "Canon SELPHY-CP-400" -#: src/main/xmli18n-tmp.h:977 +#: src/main/xmli18n-tmp.h:1029 msgid "Canon SELPHY-CP-500" msgstr "Canon SELPHY-CP-500" -#: src/main/xmli18n-tmp.h:978 +#: src/main/xmli18n-tmp.h:1030 msgid "Canon SELPHY-CP-510" msgstr "Canon SELPHY-CP-510" -#: src/main/xmli18n-tmp.h:979 +#: src/main/xmli18n-tmp.h:1031 msgid "Canon SELPHY-CP-600" msgstr "Canon SELPHY-CP-600" -#: src/main/xmli18n-tmp.h:980 +#: src/main/xmli18n-tmp.h:1032 msgid "Canon SELPHY-CP-710" msgstr "Canon SELPHY-CP-710" -#: src/main/xmli18n-tmp.h:981 +#: src/main/xmli18n-tmp.h:1033 #, fuzzy msgid "Canon SELPHY-CP-720" msgstr "Canon SELPHY-CP-710" -#: src/main/xmli18n-tmp.h:982 +#: src/main/xmli18n-tmp.h:1034 #, fuzzy msgid "Canon SELPHY-CP-730" msgstr "Canon SELPHY-CP-710" -#: src/main/xmli18n-tmp.h:983 +#: src/main/xmli18n-tmp.h:1035 #, fuzzy msgid "Canon SELPHY-CP-740" msgstr "Canon SELPHY-CP-400" -#: src/main/xmli18n-tmp.h:984 +#: src/main/xmli18n-tmp.h:1036 #, fuzzy msgid "Canon SELPHY-CP-750" msgstr "Canon SELPHY-CP-500" -#: src/main/xmli18n-tmp.h:985 +#: src/main/xmli18n-tmp.h:1037 #, fuzzy msgid "Canon SELPHY ES1" msgstr "Canon SELPHY-CP-510" -#: src/main/xmli18n-tmp.h:986 +#: src/main/xmli18n-tmp.h:1038 #, fuzzy msgid "Canon SELPHY ES2" msgstr "Canon SELPHY-CP-400" -#: src/main/xmli18n-tmp.h:987 +#: src/main/xmli18n-tmp.h:1039 #, fuzzy msgid "Canon SELPHY ES20" msgstr "Canon SELPHY-CP-400" -#: src/main/xmli18n-tmp.h:988 +#: src/main/xmli18n-tmp.h:1040 #, fuzzy msgid "Sony DPP-EX5" msgstr "Sony UP-DR150" -#: src/main/xmli18n-tmp.h:989 +#: src/main/xmli18n-tmp.h:1041 msgid "Sony DPP-EX7" msgstr "" -#: src/main/xmli18n-tmp.h:990 +#: src/main/xmli18n-tmp.h:1042 msgid "Sony UP-DP10" msgstr "Sony UP-DP10" -#: src/main/xmli18n-tmp.h:991 +#: src/main/xmli18n-tmp.h:1043 #, fuzzy msgid "Sony UP-DR100" msgstr "Sony UP-DR150" -#: src/main/xmli18n-tmp.h:992 +#: src/main/xmli18n-tmp.h:1044 msgid "Sony UP-DR150" msgstr "Sony UP-DR150" -#: src/main/xmli18n-tmp.h:993 +#: src/main/xmli18n-tmp.h:1045 msgid "Fujifilm Printpix-CX-400" msgstr "Fujifilm Printpix-CX-400" -#: src/main/xmli18n-tmp.h:994 +#: src/main/xmli18n-tmp.h:1046 msgid "Fujifilm Printpix-CX-550" msgstr "Fujifilm Printpix-CX-550" -#: src/main/xmli18n-tmp.h:995 +#: src/main/xmli18n-tmp.h:1047 #, fuzzy msgid "Fujifilm FinePix-NX-500" msgstr "Fujifilm Printpix-CX-400" -#: src/main/xmli18n-tmp.h:996 +#: src/main/xmli18n-tmp.h:1048 msgid "Kodak Easyshare-Printer-Dock" msgstr "" -#: src/main/xmli18n-tmp.h:997 +#: src/main/xmli18n-tmp.h:1049 msgid "Shinko CHC-S9045" msgstr "" -#: src/main/xmli18n-tmp.h:998 +#: src/main/xmli18n-tmp.h:1050 msgid "RAW DATA 16 bit" msgstr "Données brutes (raw) 16 bits" -#: src/main/xmli18n-tmp.h:999 +#: src/main/xmli18n-tmp.h:1051 msgid "RAW DATA 8 bit" msgstr "Données brutes (raw) 8 bits" -#: src/gutenprintui/panel.c:274 src/gutenprintui2/panel.c:274 +#: src/gutenprintui2/curve.c:130 +msgid "Curve type" +msgstr "Type de courbe" + +#: src/gutenprintui2/curve.c:131 +msgid "Is this curve linear, spline interpolated, or free-form" +msgstr "Courbe linéaire, interpolée ou libre" + +#: src/gutenprintui2/curve.c:139 +msgid "Minimum X" +msgstr "Minimum X" + +#: src/gutenprintui2/curve.c:140 +msgid "Minimum possible value for X" +msgstr "Valeur minimum possible pour X" + +#: src/gutenprintui2/curve.c:149 +msgid "Maximum X" +msgstr "Maximum X" + +#: src/gutenprintui2/curve.c:150 +msgid "Maximum possible X value" +msgstr "Valeur maximum possible pour X" + +#: src/gutenprintui2/curve.c:159 +msgid "Minimum Y" +msgstr "Minimum Y" + +#: src/gutenprintui2/curve.c:160 +msgid "Minimum possible value for Y" +msgstr "Valeur minimum possible pour Y" + +#: src/gutenprintui2/curve.c:169 +msgid "Maximum Y" +msgstr "Maximum Y" + +#: src/gutenprintui2/curve.c:170 +msgid "Maximum possible value for Y" +msgstr "Valeur maximum possible pour Y" + +#: src/gutenprintui2/gammacurve.c:418 +msgid "_Gamma value" +msgstr "Valeur gamma" + +#: src/gutenprintui2/panel.c:275 msgid "Inch" msgstr "Pouce" -#: src/gutenprintui/panel.c:274 src/gutenprintui2/panel.c:274 +#: src/gutenprintui2/panel.c:275 msgid "Set the base unit of measurement to inches" msgstr "Défini l'unité de base de mesure en pouce" -#: src/gutenprintui/panel.c:276 src/gutenprintui2/panel.c:276 +#: src/gutenprintui2/panel.c:277 msgid "cm" msgstr "cm" -#: src/gutenprintui/panel.c:276 src/gutenprintui2/panel.c:276 +#: src/gutenprintui2/panel.c:277 msgid "Set the base unit of measurement to centimetres" msgstr "Défini l'unité de base de mesure en centimètres" -#: src/gutenprintui/panel.c:278 src/gutenprintui2/panel.c:278 +#: src/gutenprintui2/panel.c:279 msgid "Points" msgstr "Points" -#: src/gutenprintui/panel.c:278 src/gutenprintui2/panel.c:278 +#: src/gutenprintui2/panel.c:279 msgid "Set the base unit of measurement to points (1/72\")" msgstr "Défini l'unité de base de mesure en points (1/72\")" -#: src/gutenprintui/panel.c:280 src/gutenprintui2/panel.c:280 +#: src/gutenprintui2/panel.c:281 msgid "mm" msgstr "mm" -#: src/gutenprintui/panel.c:280 src/gutenprintui2/panel.c:280 +#: src/gutenprintui2/panel.c:281 msgid "Set the base unit of measurement to millimetres" msgstr "Défini l'unité de base de mesure en millimètres" -#: src/gutenprintui/panel.c:282 src/gutenprintui2/panel.c:282 +#: src/gutenprintui2/panel.c:283 msgid "Pica" msgstr "Pica" -#: src/gutenprintui/panel.c:282 src/gutenprintui2/panel.c:282 +#: src/gutenprintui2/panel.c:283 msgid "Set the base unit of measurement to picas (1/12\")" msgstr "Défini l'unité de base de mesure en pica (1/72\")" -#: src/gutenprintui/panel.c:289 src/gutenprintui2/panel.c:289 +#: src/gutenprintui2/panel.c:290 msgid "Color output" msgstr "Sortie couleur" -#: src/gutenprintui/panel.c:291 src/gutenprintui2/panel.c:291 +#: src/gutenprintui2/panel.c:292 msgid "Print in shades of gray using black ink" msgstr "Imprimer en niveaux de gris en utilisant l'encre noire" -#: src/gutenprintui/panel.c:303 src/gutenprintui2/panel.c:303 +#: src/gutenprintui2/panel.c:304 msgid "Standard Command" msgstr "Commande standard" -#: src/gutenprintui/panel.c:303 src/gutenprintui2/panel.c:303 +#: src/gutenprintui2/panel.c:304 msgid "Use standard print command" msgstr "Utiliser la commande d'impression standard" -#: src/gutenprintui/panel.c:304 src/gutenprintui2/panel.c:304 +#: src/gutenprintui2/panel.c:305 msgid "Custom Command" msgstr "Commande personnalisée" -#: src/gutenprintui/panel.c:304 src/gutenprintui2/panel.c:304 +#: src/gutenprintui2/panel.c:305 msgid "Use custom print command" msgstr "Utiliser une commande personnalisée" -#: src/gutenprintui/panel.c:305 src/gutenprintui/plist.c:704 -#: src/gutenprintui/plist.c:787 src/gutenprintui2/panel.c:305 -#: src/gutenprintui2/plist.c:707 src/gutenprintui2/plist.c:790 +#: src/gutenprintui2/panel.c:306 src/gutenprintui2/plist.c:710 +#: src/gutenprintui2/plist.c:793 msgid "File" msgstr "Fichier" -#: src/gutenprintui/panel.c:305 src/gutenprintui2/panel.c:305 +#: src/gutenprintui2/panel.c:306 msgid "Print to a file" msgstr "Imprimer dans un fichier" -#: src/gutenprintui/panel.c:521 src/gutenprintui2/panel.c:521 +#: src/gutenprintui2/panel.c:522 msgid "Edit Curve..." msgstr "Editer la courbe..." -#: src/gutenprintui/panel.c:532 src/gutenprintui2/panel.c:532 +#: src/gutenprintui2/panel.c:533 msgid "Set Default" msgstr "Valeurs par défaut" -#: src/gutenprintui/panel.c:534 src/gutenprintui2/panel.c:534 +#: src/gutenprintui2/panel.c:535 msgid "Restore Previous" msgstr "Valeurs précédentes" -#: src/gutenprintui/panel.c:536 src/gutenprintui/panel.c:1532 -#: src/gutenprintui/panel.c:1787 src/gutenprintui/panel.c:1819 -#: src/gutenprintui2/panel.c:536 src/gutenprintui2/panel.c:1533 -#: src/gutenprintui2/panel.c:1787 src/gutenprintui2/panel.c:1819 +#: src/gutenprintui2/panel.c:537 src/gutenprintui2/panel.c:1708 +#: src/gutenprintui2/panel.c:1962 src/gutenprintui2/panel.c:1994 msgid "OK" msgstr "Valider" -#: src/gutenprintui/panel.c:538 src/gutenprintui/panel.c:1197 -#: src/gutenprintui/panel.c:1534 src/gutenprintui/panel.c:1789 -#: src/gutenprintui2/panel.c:538 src/gutenprintui2/panel.c:1198 -#: src/gutenprintui2/panel.c:1535 src/gutenprintui2/panel.c:1789 +#: src/gutenprintui2/panel.c:539 src/gutenprintui2/panel.c:1373 +#: src/gutenprintui2/panel.c:1710 src/gutenprintui2/panel.c:1964 msgid "Cancel" msgstr "Annuler" -#: src/gutenprintui/panel.c:1180 src/gutenprintui2/panel.c:1181 +#: src/gutenprintui2/panel.c:641 +#, fuzzy +msgid "Select File..." +msgstr "Configurer l'imprimante..." + +#: src/gutenprintui2/panel.c:1018 +#, fuzzy +msgid "Reset" +msgstr "Meilleur" + +#: src/gutenprintui2/panel.c:1356 #, c-format msgid "%s -- Print v%s" msgstr "%s -- Print v%s" -#: src/gutenprintui/panel.c:1189 src/gutenprintui2/panel.c:1190 +#: src/gutenprintui2/panel.c:1365 msgid "About" msgstr "À propos" -#: src/gutenprintui/panel.c:1191 src/gutenprintui2/panel.c:1192 +#: src/gutenprintui2/panel.c:1367 msgid "" "Print and\n" "Save Settings" @@ -6332,7 +6814,7 @@ msgstr "" "Imprimer et enregistrer\n" "les réglages" -#: src/gutenprintui/panel.c:1193 src/gutenprintui2/panel.c:1194 +#: src/gutenprintui2/panel.c:1369 msgid "" "Save\n" "Settings" @@ -6340,15 +6822,15 @@ msgstr "" "Enregistrer\n" "les réglages" -#: src/gutenprintui/panel.c:1195 src/gutenprintui2/panel.c:1196 +#: src/gutenprintui2/panel.c:1371 msgid "Print" msgstr "Imprimer" -#: src/gutenprintui/panel.c:1247 src/gutenprintui2/panel.c:1248 +#: src/gutenprintui2/panel.c:1423 msgid "Preview" msgstr "Aperçu" -#: src/gutenprintui/panel.c:1272 src/gutenprintui2/panel.c:1273 +#: src/gutenprintui2/panel.c:1448 msgid "" "Position the image on the page.\n" "Click and drag with the primary button to position the image.\n" @@ -6373,73 +6855,71 @@ msgstr "" "Si vous cliquez un autre bouton tandis que vous bougez la souris, l'image " "retournera à sa position de départ." -#: src/gutenprintui/panel.c:1319 src/gutenprintui2/panel.c:1320 +#: src/gutenprintui2/panel.c:1495 msgid "Paper Size" msgstr "Taille du papier" -#: src/gutenprintui/panel.c:1342 src/gutenprintui2/panel.c:1343 +#: src/gutenprintui2/panel.c:1518 msgid "Show All Paper Sizes" msgstr "Afficher tout les formats" -#: src/gutenprintui/panel.c:1358 src/gutenprintui2/panel.c:1359 +#: src/gutenprintui2/panel.c:1534 msgid "Dimensions:" msgstr "Dimensions :" -#: src/gutenprintui/panel.c:1363 src/gutenprintui/panel.c:2063 -#: src/gutenprintui2/panel.c:1364 src/gutenprintui2/panel.c:2063 +#: src/gutenprintui2/panel.c:1539 src/gutenprintui2/panel.c:2238 msgid "Width:" msgstr "Largeur :" -#: src/gutenprintui/panel.c:1364 src/gutenprintui2/panel.c:1365 +#: src/gutenprintui2/panel.c:1540 msgid "Width of the paper that you wish to print to" msgstr "Largeur du papier sur lequel vous souhaitez imprimer" -#: src/gutenprintui/panel.c:1368 src/gutenprintui/panel.c:2065 -#: src/gutenprintui2/panel.c:1369 src/gutenprintui2/panel.c:2065 +#: src/gutenprintui2/panel.c:1544 src/gutenprintui2/panel.c:2240 msgid "Height:" msgstr "Hauteur :" -#: src/gutenprintui/panel.c:1369 src/gutenprintui2/panel.c:1370 +#: src/gutenprintui2/panel.c:1545 msgid "Height of the paper that you wish to print to" msgstr "Hauteur du papier sur lequel vous souhaitez imprimer" -#: src/gutenprintui/panel.c:1374 src/gutenprintui2/panel.c:1375 +#: src/gutenprintui2/panel.c:1550 msgid "Automatic Paper Size" msgstr "Taille papier automatique" -#: src/gutenprintui/panel.c:1391 src/gutenprintui2/panel.c:1392 +#: src/gutenprintui2/panel.c:1567 msgid "Number of Copies" msgstr "Nombre d'exemplaires" -#: src/gutenprintui/panel.c:1403 src/gutenprintui2/panel.c:1404 +#: src/gutenprintui2/panel.c:1579 msgid "Select the number of copies to print; a value between 1 and 100" msgstr "Choisir le nombre d'exemplaires à imprimer, entre 1 et 100" -#: src/gutenprintui/panel.c:1435 src/gutenprintui2/panel.c:1436 +#: src/gutenprintui2/panel.c:1611 msgid "Image Position" msgstr "Position de l'image" -#: src/gutenprintui/panel.c:1452 src/gutenprintui2/panel.c:1453 +#: src/gutenprintui2/panel.c:1628 msgid "Auto" msgstr "Auto" -#: src/gutenprintui/panel.c:1454 src/gutenprintui2/panel.c:1455 +#: src/gutenprintui2/panel.c:1630 msgid "Portrait" msgstr "Portrait" -#: src/gutenprintui/panel.c:1456 src/gutenprintui2/panel.c:1457 +#: src/gutenprintui2/panel.c:1632 msgid "Landscape" msgstr "Paysage" -#: src/gutenprintui/panel.c:1458 src/gutenprintui2/panel.c:1459 +#: src/gutenprintui2/panel.c:1634 msgid "Upside down" msgstr "Retourné (haut/bas)" -#: src/gutenprintui/panel.c:1460 src/gutenprintui2/panel.c:1461 +#: src/gutenprintui2/panel.c:1636 msgid "Seascape" msgstr "Paysage retourné (haut/bas)" -#: src/gutenprintui/panel.c:1464 src/gutenprintui2/panel.c:1465 +#: src/gutenprintui2/panel.c:1640 msgid "" "Select the orientation: portrait, landscape, upside down, or seascape " "(upside down landscape)" @@ -6447,121 +6927,117 @@ msgstr "" "Sélectionnez l'orientation : portrait, paysage, retourné ou paysage retourné " "(retourné haut/bas)" -#: src/gutenprintui/panel.c:1466 src/gutenprintui2/panel.c:1467 +#: src/gutenprintui2/panel.c:1642 msgid "Orientation:" msgstr "Orientation :" -#: src/gutenprintui/panel.c:1477 src/gutenprintui2/panel.c:1478 +#: src/gutenprintui2/panel.c:1653 msgid "Left:" msgstr "Gauche:" -#: src/gutenprintui/panel.c:1478 src/gutenprintui2/panel.c:1479 +#: src/gutenprintui2/panel.c:1654 msgid "Distance from the left of the paper to the image" msgstr "Distance entre le bord gauche du papier et l'image" -#: src/gutenprintui/panel.c:1481 src/gutenprintui/panel.c:1485 -#: src/gutenprintui2/panel.c:1482 src/gutenprintui2/panel.c:1486 +#: src/gutenprintui2/panel.c:1657 src/gutenprintui2/panel.c:1661 msgid "Right:" msgstr "Droite:" -#: src/gutenprintui/panel.c:1482 src/gutenprintui2/panel.c:1483 +#: src/gutenprintui2/panel.c:1658 msgid "Distance from the left of the paper to the right of the image" msgstr "Distance entre le bord gauche du papier et le bord droit de l'image" -#: src/gutenprintui/panel.c:1486 src/gutenprintui2/panel.c:1487 +#: src/gutenprintui2/panel.c:1662 msgid "Distance from the right of the paper to the image" msgstr "Distance entre le bord droit du papier et l'image" -#: src/gutenprintui/panel.c:1488 src/gutenprintui2/panel.c:1489 +#: src/gutenprintui2/panel.c:1664 msgid "Top:" msgstr "Haut:" -#: src/gutenprintui/panel.c:1489 src/gutenprintui2/panel.c:1490 +#: src/gutenprintui2/panel.c:1665 msgid "Distance from the top of the paper to the image" msgstr "Distance entre le bord supérieur du papier et l'image" -#: src/gutenprintui/panel.c:1492 src/gutenprintui/panel.c:1496 -#: src/gutenprintui2/panel.c:1493 src/gutenprintui2/panel.c:1497 +#: src/gutenprintui2/panel.c:1668 src/gutenprintui2/panel.c:1672 msgid "Bottom:" msgstr "Bas :" -#: src/gutenprintui/panel.c:1493 src/gutenprintui2/panel.c:1494 +#: src/gutenprintui2/panel.c:1669 msgid "Distance from the top of the paper to bottom of the image" msgstr "" "Distance entre le bord supérieur du papier et le bord inférieur de l'image" -#: src/gutenprintui/panel.c:1497 src/gutenprintui2/panel.c:1498 +#: src/gutenprintui2/panel.c:1673 msgid "Distance from the bottom of the paper to the image" msgstr "Distance entre le bord inférieur du papier et l'image" -#: src/gutenprintui/panel.c:1507 src/gutenprintui2/panel.c:1508 +#: src/gutenprintui2/panel.c:1683 msgid "Center:" msgstr "Centrer:" -#: src/gutenprintui/panel.c:1510 src/gutenprintui2/panel.c:1511 +#: src/gutenprintui2/panel.c:1686 msgid "Horizontal" msgstr "Horizontalement" -#: src/gutenprintui/panel.c:1511 src/gutenprintui2/panel.c:1512 +#: src/gutenprintui2/panel.c:1687 msgid "Center the image horizontally on the paper" msgstr "Centrer l'image horizontalement sur le papier" -#: src/gutenprintui/panel.c:1513 src/gutenprintui2/panel.c:1514 +#: src/gutenprintui2/panel.c:1689 msgid "Both" msgstr "Les deux" -#: src/gutenprintui/panel.c:1514 src/gutenprintui2/panel.c:1515 +#: src/gutenprintui2/panel.c:1690 msgid "Center the image on the paper" msgstr "Centrer l'image sur le papier" -#: src/gutenprintui/panel.c:1516 src/gutenprintui2/panel.c:1517 +#: src/gutenprintui2/panel.c:1692 msgid "Vertical" msgstr "Verticalement" -#: src/gutenprintui/panel.c:1517 src/gutenprintui2/panel.c:1518 +#: src/gutenprintui2/panel.c:1693 msgid "Center the image vertically on the paper" msgstr "Centrer l'image verticalement sur le papier" -#: src/gutenprintui/panel.c:1530 src/gutenprintui2/panel.c:1531 +#: src/gutenprintui2/panel.c:1706 msgid "Setup Printer" msgstr "Configuration de l'imprimante" -#: src/gutenprintui/panel.c:1555 src/gutenprintui2/panel.c:1555 +#: src/gutenprintui2/panel.c:1730 msgid "Printer Make:" msgstr "Marque de l'imprimante :" -#: src/gutenprintui/panel.c:1566 src/gutenprintui2/panel.c:1566 +#: src/gutenprintui2/panel.c:1741 msgid "Select the make of your printer" msgstr "Sélectionnez la marque de votre imprimante" -#: src/gutenprintui/panel.c:1584 src/gutenprintui/panel.c:1672 -#: src/gutenprintui/panel.c:1890 src/gutenprintui2/panel.c:1584 -#: src/gutenprintui2/panel.c:1672 src/gutenprintui2/panel.c:1890 +#: src/gutenprintui2/panel.c:1759 src/gutenprintui2/panel.c:1847 +#: src/gutenprintui2/panel.c:2065 msgid "Printer Model:" msgstr "Modèle d'imprimante :" -#: src/gutenprintui/panel.c:1595 src/gutenprintui2/panel.c:1595 +#: src/gutenprintui2/panel.c:1770 msgid "Select your printer model" msgstr "Sélectionnez le modèle de votre imprimante" -#: src/gutenprintui/panel.c:1643 src/gutenprintui2/panel.c:1643 +#: src/gutenprintui2/panel.c:1818 msgid "PPD File:" msgstr "Fichier PPD:" -#: src/gutenprintui/panel.c:1659 src/gutenprintui2/panel.c:1659 +#: src/gutenprintui2/panel.c:1834 msgid "Enter the correct PPD filename for your printer" msgstr "Entrez le nom de fichier PPD pour votre imprimante" -#: src/gutenprintui/panel.c:1661 src/gutenprintui/panel.c:1741 -#: src/gutenprintui2/panel.c:1661 src/gutenprintui2/panel.c:1741 +#: src/gutenprintui2/panel.c:1836 src/gutenprintui2/panel.c:1916 msgid "Browse" msgstr "Parcourir" -#: src/gutenprintui/panel.c:1668 src/gutenprintui2/panel.c:1668 +#: src/gutenprintui2/panel.c:1843 msgid "Choose the correct PPD filename for your printer" msgstr "Choisissez le fichier PPD correct pour votre imprimante" -#: src/gutenprintui/panel.c:1710 src/gutenprintui2/panel.c:1710 +#: src/gutenprintui2/panel.c:1885 msgid "" "Select the name of the output queue (not the type, or model, of printer) " "that you wish to print to" @@ -6569,52 +7045,51 @@ msgstr "" "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:1712 src/gutenprintui2/panel.c:1712 +#: src/gutenprintui2/panel.c:1887 msgid "Printer Queue:" msgstr "File d'attente:" -#: src/gutenprintui/panel.c:1728 src/gutenprintui2/panel.c:1728 +#: src/gutenprintui2/panel.c:1903 msgid "Enter the correct command to print to your printer. " msgstr "Entrez la commande pour imprimer sur votre imprimante" -#: src/gutenprintui/panel.c:1739 src/gutenprintui2/panel.c:1739 +#: src/gutenprintui2/panel.c:1914 msgid "Enter the file to print to. " msgstr "Entrez le nom du fichier." -#: src/gutenprintui/panel.c:1747 src/gutenprintui2/panel.c:1747 +#: src/gutenprintui2/panel.c:1922 msgid "File to print to" msgstr "fichier d'impression" -#: src/gutenprintui/panel.c:1755 src/gutenprintui2/panel.c:1755 +#: src/gutenprintui2/panel.c:1930 msgid "Print To File" msgstr "Imprimer dans un fichier ?" -#: src/gutenprintui/panel.c:1785 src/gutenprintui2/panel.c:1785 +#: src/gutenprintui2/panel.c:1960 msgid "Define New Printer" msgstr "Définir une nouvelle imprimante" -#: src/gutenprintui/panel.c:1803 src/gutenprintui/panel.c:1887 -#: src/gutenprintui2/panel.c:1803 src/gutenprintui2/panel.c:1887 +#: src/gutenprintui2/panel.c:1978 src/gutenprintui2/panel.c:2062 msgid "Printer Name:" msgstr "Nom de l'imprimante :" -#: src/gutenprintui/panel.c:1807 src/gutenprintui2/panel.c:1807 +#: src/gutenprintui2/panel.c:1982 msgid "Enter the name you wish to give this logical printer" msgstr "Saisissez le nom que vous voulez donner à cette imprimante logique" -#: src/gutenprintui/panel.c:1817 src/gutenprintui2/panel.c:1817 +#: src/gutenprintui2/panel.c:1992 msgid "About Gutenprint " msgstr "À propos de Gutenprint" -#: src/gutenprintui/panel.c:1824 src/gutenprintui2/panel.c:1824 +#: src/gutenprintui2/panel.c:1999 msgid "Gutenprint Version " msgstr "Version de Gutenprint" -#: src/gutenprintui/panel.c:1872 src/gutenprintui2/panel.c:1872 +#: src/gutenprintui2/panel.c:2047 msgid "Printer Settings" msgstr "Paramètres de l'imprimante" -#: src/gutenprintui/panel.c:1885 src/gutenprintui2/panel.c:1885 +#: src/gutenprintui2/panel.c:2060 msgid "" "Select the name of the printer (not the type, or model, of printer) that you " "wish to print to" @@ -6622,11 +7097,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:1902 src/gutenprintui2/panel.c:1902 +#: src/gutenprintui2/panel.c:2077 msgid "Setup Printer..." msgstr "Configurer l'imprimante..." -#: src/gutenprintui/panel.c:1904 src/gutenprintui2/panel.c:1904 +#: src/gutenprintui2/panel.c:2079 msgid "" "Choose the printer model, PPD file, and command that is used to print to " "this printer" @@ -6634,11 +7109,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:1917 src/gutenprintui2/panel.c:1917 +#: src/gutenprintui2/panel.c:2092 msgid "New Printer..." msgstr "Nouvelle imprimante..." -#: src/gutenprintui/panel.c:1918 src/gutenprintui2/panel.c:1918 +#: src/gutenprintui2/panel.c:2093 msgid "" "Define a new logical printer. This can be used to name a collection of " "settings that you wish to remember for future use." @@ -6646,32 +7121,32 @@ 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:1948 src/gutenprintui2/panel.c:1948 +#: src/gutenprintui2/panel.c:2123 #, fuzzy msgid "Set Printer Option Defaults" msgstr "Valeurs par défaut" -#: src/gutenprintui/panel.c:1949 src/gutenprintui2/panel.c:1949 +#: src/gutenprintui2/panel.c:2124 msgid "Set all printer options to their defaults" msgstr "" -#: src/gutenprintui/panel.c:1972 src/gutenprintui2/panel.c:1972 +#: src/gutenprintui2/panel.c:2147 msgid "Image Size" msgstr "Taille de l'image" -#: src/gutenprintui/panel.c:1997 src/gutenprintui2/panel.c:1997 +#: src/gutenprintui2/panel.c:2172 msgid "Scaling:" msgstr "Échelle:" -#: src/gutenprintui/panel.c:2001 src/gutenprintui2/panel.c:2001 +#: src/gutenprintui2/panel.c:2176 msgid "Set the scale (size) of the image" msgstr "Régler l'échelle (taille) de l'image" -#: src/gutenprintui/panel.c:2023 src/gutenprintui2/panel.c:2023 +#: src/gutenprintui2/panel.c:2198 msgid "Scale by:" msgstr "Mise à l'échelle en " -#: src/gutenprintui/panel.c:2028 src/gutenprintui2/panel.c:2028 +#: src/gutenprintui2/panel.c:2203 msgid "" "Select whether scaling is measured as percent of available page size or " "number of output dots per inch" @@ -6679,31 +7154,31 @@ 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:2031 src/gutenprintui2/panel.c:2031 +#: src/gutenprintui2/panel.c:2206 msgid "Percent" msgstr "Pourcentage" -#: src/gutenprintui/panel.c:2036 src/gutenprintui2/panel.c:2036 +#: src/gutenprintui2/panel.c:2211 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:2040 src/gutenprintui2/panel.c:2040 +#: src/gutenprintui2/panel.c:2215 msgid "PPI" msgstr "points par pouce" -#: src/gutenprintui/panel.c:2045 src/gutenprintui2/panel.c:2045 +#: src/gutenprintui2/panel.c:2220 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:2063 src/gutenprintui2/panel.c:2063 +#: src/gutenprintui2/panel.c:2238 msgid "Set the width of the print" msgstr "Défini la largeur de l'impression" -#: src/gutenprintui/panel.c:2065 src/gutenprintui2/panel.c:2065 +#: src/gutenprintui2/panel.c:2240 msgid "Set the height of the print" msgstr "Défini la hauteur de l'impression" -#: src/gutenprintui/panel.c:2071 src/gutenprintui2/panel.c:2071 +#: src/gutenprintui2/panel.c:2246 msgid "" "Use Original\n" "Image Size" @@ -6711,150 +7186,105 @@ msgstr "" "Utiliser la taille \n" "de l'image originale" -#: src/gutenprintui/panel.c:2077 src/gutenprintui2/panel.c:2077 +#: src/gutenprintui2/panel.c:2252 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:2100 src/gutenprintui2/panel.c:2101 +#: src/gutenprintui2/panel.c:2276 msgid "Print Color Adjust" msgstr "Ajustement des couleurs d'impression" -#: src/gutenprintui/panel.c:2103 src/gutenprintui2/panel.c:2104 +#: src/gutenprintui2/panel.c:2279 msgid "Set Defaults" msgstr "Valeurs par défaut" -#: src/gutenprintui/panel.c:2105 src/gutenprintui2/panel.c:2106 +#: src/gutenprintui2/panel.c:2281 msgid "Close" msgstr "Fermer" -#: src/gutenprintui/panel.c:2134 src/gutenprintui2/panel.c:2135 +#: src/gutenprintui2/panel.c:2310 msgid "Image preview" msgstr "Aperçu de l'image" -#: src/gutenprintui/panel.c:2148 src/gutenprintui2/panel.c:2149 +#: src/gutenprintui2/panel.c:2324 msgid "View Output Channels:" msgstr "Visualisation canaux de sortie" -#: src/gutenprintui/panel.c:2234 src/gutenprintui2/panel.c:2240 +#: src/gutenprintui2/panel.c:2415 msgid "Output" msgstr "Sortie" -#: src/gutenprintui/panel.c:2262 src/gutenprintui2/panel.c:2268 +#: src/gutenprintui2/panel.c:2443 msgid "Output Type:" msgstr "Type de sortie:" -#: src/gutenprintui/panel.c:2266 src/gutenprintui2/panel.c:2272 +#: src/gutenprintui2/panel.c:2447 msgid "Select the desired output type" msgstr "Sélectionnez le type de sortie désiré" -#: src/gutenprintui/panel.c:2287 src/gutenprintui2/panel.c:2293 +#: src/gutenprintui2/panel.c:2468 msgid "Adjust Output..." msgstr "Réglages fins..." -#: src/gutenprintui/panel.c:2296 src/gutenprintui2/panel.c:2302 +#: src/gutenprintui2/panel.c:2477 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:2314 src/gutenprintui2/panel.c:2321 +#: src/gutenprintui2/panel.c:2496 msgid "Size Units:" msgstr "Unités de taille:" -#: src/gutenprintui/panel.c:2317 src/gutenprintui2/panel.c:2324 +#: src/gutenprintui2/panel.c:2499 msgid " " msgstr " " -#: src/gutenprintui/panel.c:2341 src/gutenprintui2/panel.c:2348 +#: src/gutenprintui2/panel.c:2523 msgid "Units:" msgstr "Unités:" -#: src/gutenprintui/panel.c:2346 src/gutenprintui2/panel.c:2353 +#: src/gutenprintui2/panel.c:2528 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:89 src/gutenprintui2/plist.c:98 +#: src/gutenprintui2/plist.c:92 src/gutenprintui2/plist.c:101 msgid "System V lp" msgstr "System V lp" -#: src/gutenprintui/plist.c:96 src/gutenprintui2/plist.c:95 +#: src/gutenprintui2/plist.c:98 msgid "CUPS" msgstr "CUPS" -#: src/gutenprintui/plist.c:102 src/gutenprintui2/plist.c:101 +#: src/gutenprintui2/plist.c:104 msgid "Berkeley lpd (/etc/lpc)" msgstr "Berkeley lpd (/etc/lpc)" -#: src/gutenprintui/plist.c:105 src/gutenprintui2/plist.c:104 +#: src/gutenprintui2/plist.c:107 msgid "Berkeley lpd (/usr/bsd/lpc)" msgstr "Berkeley lpd (/usr/bsd/lpc)" -#: src/gutenprintui/plist.c:108 src/gutenprintui2/plist.c:107 +#: src/gutenprintui2/plist.c:110 msgid "Berkeley lpd (/usr/etc/lpc" msgstr "Berkeley lpd (/usr/etc/lpc" -#: src/gutenprintui/plist.c:111 src/gutenprintui2/plist.c:110 +#: src/gutenprintui2/plist.c:113 msgid "Berkeley lpd (/usr/libexec/lpc)" msgstr "Berkeley lpd (/usr/libexec/lpc)" -#: src/gutenprintui/plist.c:114 src/gutenprintui2/plist.c:113 +#: src/gutenprintui2/plist.c:116 msgid "Berkeley lpd (/usr/sbin/lpc)" msgstr "Berkeley lpd (/usr/sbin/lpc)" -#: src/gutenprintui/plist.c:1043 src/gutenprintui2/plist.c:1057 +#: src/gutenprintui2/plist.c:1060 msgid "Printer" msgstr "Imprimante" -#: src/gutenprintui/plist.c:1230 src/gutenprintui2/plist.c:1250 +#: src/gutenprintui2/plist.c:1253 msgid "(Default Printer)" msgstr "(imprimante par défaut)" -#: src/gutenprintui2/curve.c:130 -msgid "Curve type" -msgstr "Type de courbe" - -#: src/gutenprintui2/curve.c:131 -msgid "Is this curve linear, spline interpolated, or free-form" -msgstr "Courbe linéaire, interpolée ou libre" - -#: src/gutenprintui2/curve.c:139 -msgid "Minimum X" -msgstr "Minimum X" - -#: src/gutenprintui2/curve.c:140 -msgid "Minimum possible value for X" -msgstr "Valeur minimum possible pour X" - -#: src/gutenprintui2/curve.c:149 -msgid "Maximum X" -msgstr "Maximum X" - -#: src/gutenprintui2/curve.c:150 -msgid "Maximum possible X value" -msgstr "Valeur maximum possible pour X" - -#: src/gutenprintui2/curve.c:159 -msgid "Minimum Y" -msgstr "Minimum Y" - -#: src/gutenprintui2/curve.c:160 -msgid "Minimum possible value for Y" -msgstr "Valeur minimum possible pour Y" - -#: src/gutenprintui2/curve.c:169 -msgid "Maximum Y" -msgstr "Maximum Y" - -#: src/gutenprintui2/curve.c:170 -msgid "Maximum possible value for Y" -msgstr "Valeur maximum possible pour Y" - -#: src/gutenprintui2/gammacurve.c:418 -msgid "_Gamma value" -msgstr "Valeur gamma" - #: src/cups/genppd.c:145 msgid "Printer Features" msgstr "Caractéristiques de l'imprimante" @@ -6890,50 +7320,50 @@ msgstr "Extra5" #. 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:1058 +#: src/cups/genppd.c:1064 msgid "English" msgstr "French" #. TRANSLATORS: Specify PPD translation encoding e.g. ISOLatin1 -#: src/cups/genppd.c:1060 +#: src/cups/genppd.c:1066 msgid "ISOLatin1" msgstr "ISOLatin1" -#: src/cups/genppd.c:1641 +#: src/cups/genppd.c:1647 #, fuzzy msgid "2-Sided Printing" msgstr "Impression double face" -#: src/cups/genppd.c:1665 +#: src/cups/genppd.c:1671 msgid "Shrink Page If Necessary to Fit Borders" msgstr "" -#: src/cups/genppd.c:1669 +#: src/cups/genppd.c:1675 msgid "Shrink (print the whole page)" msgstr "" -#: src/cups/genppd.c:1670 +#: src/cups/genppd.c:1676 msgid "Crop (preserve dimensions)" msgstr "" -#: src/cups/genppd.c:1671 +#: src/cups/genppd.c:1677 msgid "Expand (use maximum page area)" msgstr "" -#: src/cups/genppd.c:1756 +#: src/cups/genppd.c:1762 msgid "No" msgstr "Non" -#: src/cups/genppd.c:1758 +#: src/cups/genppd.c:1764 msgid "Yes" msgstr "Oui" -#: src/cups/genppd.c:1795 src/cups/genppd.c:1857 +#: src/cups/genppd.c:1801 src/cups/genppd.c:1863 #, fuzzy msgid "Value" msgstr "Bleu" -#: src/cups/genppd.c:1800 +#: src/cups/genppd.c:1806 msgid "Fine Adjustment" msgstr "Réglage fin" @@ -7861,141 +8291,82 @@ msgstr "" msgid "Error in input\n" msgstr "Erreur en entrée\n" -#: src/gimp/print-image-gimp.c:225 src/gimp2/print-image-gimp.c:225 +#: src/gimp2/print-image-gimp.c:225 msgid "Printing..." msgstr "Impression en cours..." -#: src/gimp/print.c:133 -msgid "/File/Print..." -msgstr "/Fichier/Imprimer..." - -#: src/ghost/ijsgutenprint.c:98 -#, c-format -msgid "" -"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" -msgstr "" - -#: src/ghost/ijsgutenprint.c:191 -#, c-format -msgid "ERROR: ijsgutenprint: Bad color space: bps %d channels %d space %s\n" -msgstr "" -"Erreur: ijsgutenprint: Mauvais espace de couleur : bps %d canaux %d espace %" -"s\n" - -#: src/ghost/ijsgutenprint.c:199 -#, c-format -msgid "ERROR: ijsgutenprint: No row buffer\n" -msgstr "Erreur: ijsgutenprint: Pas de buffer de ligne\n" +#~ msgid "ERROR: ijsgutenprint: Bad color space: bps %d channels %d space %s\n" +#~ msgstr "" +#~ "Erreur: ijsgutenprint: Mauvais espace de couleur : bps %d canaux %d " +#~ "espace %s\n" -#: 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 "" -"Erreur: ijsgutenprint: Impossible d'interpréter le paramètre %s=%s (un " -"nombre est attendu)\n" +#~ msgid "ERROR: ijsgutenprint: No row buffer\n" +#~ msgstr "Erreur: ijsgutenprint: Pas de buffer de ligne\n" -#: src/ghost/ijsgutenprint.c:498 -#, c-format -msgid "ERROR: ijsgutenprint: Printer must be specified with -sDeviceModel\n" -msgstr "" -"Erreur: ijsgutenprint:L'imprimante doit être spécifiée avec -sDeviceModel\n" +#~ msgid "" +#~ "ERROR: ijsgutenprint: Unable to parse parameter %s=%s (expect a number)\n" +#~ msgstr "" +#~ "Erreur: ijsgutenprint: Impossible d'interpréter le paramètre %s=%s (un " +#~ "nombre est attendu)\n" -#: src/ghost/ijsgutenprint.c:500 -#, c-format -msgid "ERROR: ijsgutenprint: Printer %s is not a known model\n" -msgstr "Erreur: ijsgutenprint: L'imprimante %s n'est pas un modèle connu\n" +#~ msgid "ERROR: ijsgutenprint: Printer must be specified with -sDeviceModel\n" +#~ msgstr "" +#~ "Erreur: ijsgutenprint:L'imprimante doit être spécifiée avec -" +#~ "sDeviceModel\n" -#: src/ghost/ijsgutenprint.c:656 -#, c-format -msgid "ijsgutenprint: unknown DeviceModel %s\n" -msgstr "ijsgutenprint: DeviceModel %s inconnu\n" +#~ msgid "ERROR: ijsgutenprint: Printer %s is not a known model\n" +#~ msgstr "Erreur: ijsgutenprint: L'imprimante %s n'est pas un modèle connu\n" -#: src/ghost/ijsgutenprint.c:700 -#, c-format -msgid "ERROR: ijsgutenprint: cannot parse TopLeft %s\n" -msgstr "Erreur: ijsgutenprint: ne peut pas analyser TopLeft %s\n" +#~ msgid "ijsgutenprint: unknown DeviceModel %s\n" +#~ msgstr "ijsgutenprint: DeviceModel %s inconnu\n" -#: src/ghost/ijsgutenprint.c:723 -#, c-format -msgid "ERROR: ijsgutenprint: cannot parse PaperSize %s\n" -msgstr "Erreur: ijsgutenprint:: ne peut pas analyser PaperSize %s\n" +#~ msgid "ERROR: ijsgutenprint: cannot parse TopLeft %s\n" +#~ msgstr "Erreur: ijsgutenprint: ne peut pas analyser TopLeft %s\n" -#: src/ghost/ijsgutenprint.c:795 -#, c-format -msgid "ERROR: ijsgutenprint: cannot parse curve %s\n" -msgstr "Erreur: ijsgutenprint: ne peux pas analyser la courbe %s\n" +#~ msgid "ERROR: ijsgutenprint: cannot parse PaperSize %s\n" +#~ msgstr "Erreur: ijsgutenprint:: ne peut pas analyser PaperSize %s\n" -#: src/ghost/ijsgutenprint.c:802 -#, c-format -msgid "ERROR: ijsgutenprint: cannot parse %s float %s\n" -msgstr "Erreur: ijsguteprint: ne peut pas analyser %s float %s\n" +#~ msgid "ERROR: ijsgutenprint: cannot parse curve %s\n" +#~ msgstr "Erreur: ijsgutenprint: ne peux pas analyser la courbe %s\n" -#: src/ghost/ijsgutenprint.c:809 -#, c-format -msgid "ERROR: ijsgutenprint: cannot parse %s int %s\n" -msgstr "Erreur: ijsgutenprint: ne peut pas analyser %s int %s\n" +#~ msgid "ERROR: ijsgutenprint: cannot parse %s float %s\n" +#~ msgstr "Erreur: ijsguteprint: ne peut pas analyser %s float %s\n" -#: src/ghost/ijsgutenprint.c:816 -#, c-format -msgid "ERROR: ijsgutenprint: cannot parse %s dimension %s\n" -msgstr "Erreur: ijsgutenprint: ne peut pas analyser %s dimension %s\n" +#~ msgid "ERROR: ijsgutenprint: cannot parse %s int %s\n" +#~ msgstr "Erreur: ijsgutenprint: ne peut pas analyser %s int %s\n" -#: src/ghost/ijsgutenprint.c:830 -#, c-format -msgid "ERROR: ijsgutenprint: cannot parse %s boolean %s\n" -msgstr "Erreur: ijsgutenprint: ne peut pas analyser %s booléen %s\n" +#~ msgid "ERROR: ijsgutenprint: cannot parse %s dimension %s\n" +#~ msgstr "Erreur: ijsgutenprint: ne peut pas analyser %s dimension %s\n" -#: src/ghost/ijsgutenprint.c:841 -#, c-format -msgid "ERROR: ijsgutenprint: Bad parameter %s %d\n" -msgstr "Erreur: ijsgutenprint: mauvais paramètre %s %d\n" +#~ msgid "ERROR: ijsgutenprint: cannot parse %s boolean %s\n" +#~ msgstr "Erreur: ijsgutenprint: ne peut pas analyser %s booléen %s\n" -#: src/ghost/ijsgutenprint.c:867 -#, c-format -msgid "ERROR: ijsgutenprint: bad key code %d\n" -msgstr "Erreur: ijsgutenprint: mauvais code (clef) %d\n" +#~ msgid "ERROR: ijsgutenprint: Bad parameter %s %d\n" +#~ msgstr "Erreur: ijsgutenprint: mauvais paramètre %s %d\n" -#: src/ghost/ijsgutenprint.c:1308 -#, c-format -msgid "ERROR: ijsgutenprint: image_init failed %d\n" -msgstr "Erreur: ijsgutenprint: image_init échec %d\n" +#~ msgid "ERROR: ijsgutenprint: bad key code %d\n" +#~ msgstr "Erreur: ijsgutenprint: mauvais code (clef) %d\n" -#: src/ghost/ijsgutenprint.c:1319 -#, c-format -msgid "ERROR: ijsgutenprint: Unable to open file descriptor: %s\n" -msgstr "" -"Erreur: ijsgutenprint: Impossible d'ouvrir le descripteur de fichier : %s\n" +#~ msgid "ERROR: ijsgutenprint: image_init failed %d\n" +#~ msgstr "Erreur: ijsgutenprint: image_init échec %d\n" -#: src/ghost/ijsgutenprint.c:1331 -#, c-format -msgid "ERROR: ijsgutenprint: Unable to open %s: %s\n" -msgstr "Erreur: ijsgutenprint: Impossible d'ouvrir %s : %s\n" +#~ msgid "ERROR: ijsgutenprint: Unable to open file descriptor: %s\n" +#~ msgstr "" +#~ "Erreur: ijsgutenprint: Impossible d'ouvrir le descripteur de fichier : %" +#~ "s\n" -#: src/ghost/ijsgutenprint.c:1344 -#, c-format -msgid "ERROR: ijsgutenprint: Unknown printer %s\n" -msgstr "Erreur: ijsgutenprint: Imprimante inconnue %s\n" +#~ msgid "ERROR: ijsgutenprint: Unable to open %s: %s\n" +#~ msgstr "Erreur: ijsgutenprint: Impossible d'ouvrir %s : %s\n" -#: src/ghost/ijsgutenprint.c:1516 -#, c-format -msgid "ERROR: ijsgutenprint: Bad parameters; cannot continue!\n" -msgstr "Erreur: ijsgutenprint: Mauvais paramètres, ne peut pas continuer !\n" +#~ msgid "ERROR: ijsgutenprint: Unknown printer %s\n" +#~ msgstr "Erreur: ijsgutenprint: Imprimante inconnue %s\n" -#: src/ghost/ijsgutenprint.c:1534 -#, c-format -msgid "ERROR: ijsgutenprint: Get next row failed at %.0f\n" -msgstr "Erreur: ijsgutenprint: Obtenir la ligne suivante à échoué à %.0f\n" +#~ msgid "ERROR: ijsgutenprint: Bad parameters; cannot continue!\n" +#~ msgstr "" +#~ "Erreur: ijsgutenprint: Mauvais paramètres, ne peut pas continuer !\n" -#, fuzzy -#~ msgid "Model Name" -#~ msgstr "Nom des canaux" +#~ msgid "ERROR: ijsgutenprint: Get next row failed at %.0f\n" +#~ msgstr "Erreur: ijsgutenprint: Obtenir la ligne suivante à échoué à %.0f\n" #, fuzzy #~ msgid "Canon MULTIPASS MP500" @@ -8211,5 +8582,8 @@ msgstr "Erreur: ijsgutenprint: Obtenir la ligne suivante à échoué à %.0f\n" #~ msgid "CMY Color" #~ msgstr "Couleur CMJ" +#~ msgid "/File/Print..." +#~ msgstr "/Fichier/Imprimer..." + #~ msgid "Gutenprint" #~ msgstr "Gutenprint" diff --git a/po/gutenprint.pot b/po/gutenprint.pot index 2b060b8..02c38f7 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: 2008-01-01 20:47-0500\n" +"POT-Creation-Date: 2008-04-25 21:19-0400\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -19,7 +19,7 @@ msgstr "" #. 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:1752 +#: src/main/print-escp2.c:2116 msgid "Default" msgstr "" @@ -59,56 +59,68 @@ msgid "Ordered" msgstr "" #: src/main/dither-main.c:65 -msgid "Fast" +msgid "Ordered New" msgstr "" #: src/main/dither-main.c:66 -msgid "Very Fast" +msgid "Fast" msgstr "" #: src/main/dither-main.c:67 -msgid "Hybrid Floyd-Steinberg" +msgid "Very Fast" msgstr "" #: src/main/dither-main.c:68 +msgid "Hybrid Floyd-Steinberg" +msgstr "" + +#: src/main/dither-main.c:69 msgid "Predithered Input" msgstr "" -#: src/main/dither-main.c:88 src/main/print-color.c:56 +#: src/main/dither-main.c:70 +msgid "Drop Size Segmented" +msgstr "" + +#: src/main/dither-main.c:71 +msgid "Drop Size Segmented New" +msgstr "" + +#: src/main/dither-main.c:91 src/main/print-color.c:56 msgid "Density" msgstr "" -#: src/main/dither-main.c:88 src/main/print-canon.c:295 +#: src/main/dither-main.c:91 src/main/print-canon.c:295 #: src/main/print-canon.c:303 src/main/print-canon.c:311 -#: src/main/print-canon.c:319 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-escp2.c:471 -#: src/main/print-escp2.c:479 src/main/print-escp2.c:487 +#: src/main/print-canon.c:319 src/main/print-escp2.c:446 +#: src/main/print-escp2.c:454 src/main/print-escp2.c:462 +#: src/main/print-escp2.c:470 src/main/print-escp2.c:478 +#: src/main/print-escp2.c:486 src/main/print-escp2.c:494 #: 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:1764 src/main/print-olympus.c:1772 -#: src/main/print-olympus.c:1780 src/main/print-olympus.c:1788 -#: src/main/print-pcl.c:1261 src/main/print-pcl.c:1269 -#: src/main/print-pcl.c:1277 src/main/print-pcl.c:1285 +#: src/main/print-olympus.c:1762 src/main/print-olympus.c:1770 +#: src/main/print-olympus.c:1778 src/main/print-olympus.c:1786 +#: src/main/print-pcl.c:1329 src/main/print-pcl.c:1337 +#: src/main/print-pcl.c:1345 src/main/print-pcl.c:1353 msgid "Output Level Adjustment" msgstr "" -#: src/main/dither-main.c:89 +#: src/main/dither-main.c:92 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:97 +#: src/main/dither-main.c:100 msgid "Dither Algorithm" msgstr "" -#: src/main/dither-main.c:97 +#: src/main/dither-main.c:100 msgid "Screening Adjustment" msgstr "" -#: src/main/dither-main.c:98 +#: src/main/dither-main.c:101 msgid "" "Choose the dither algorithm to be used.\n" "Adaptive Hybrid usually produces the best all-around quality.\n" @@ -136,9 +148,9 @@ msgstr "" msgid "Dither algorithm" msgstr "" -#: src/main/print-canon.c:200 src/main/print-escp2.c:180 -#: src/main/print-lexmark.c:266 src/main/print-olympus.c:1699 -#: src/main/print-pcl.c:1196 src/main/print-ps.c:67 +#: src/main/print-canon.c:200 src/main/print-escp2.c:182 +#: src/main/print-lexmark.c:266 src/main/print-olympus.c:1697 +#: src/main/print-pcl.c:1264 msgid "Page Size" msgstr "" @@ -146,234 +158,243 @@ msgstr "" #: src/main/print-canon.c:212 src/main/print-canon.c:218 #: src/main/print-canon.c:224 src/main/print-canon.c:230 #: src/main/print-canon.c:248 src/main/print-canon.c:272 -#: src/main/print-escp2.c:180 src/main/print-escp2.c:186 -#: src/main/print-escp2.c:192 src/main/print-escp2.c:198 -#: src/main/print-escp2.c:204 src/main/print-escp2.c:210 -#: src/main/print-escp2.c:228 src/main/print-escp2.c:245 -#: src/main/print-escp2.c:251 src/main/print-escp2.c:263 -#: src/main/print-escp2.c:281 src/main/print-lexmark.c:266 +#: src/main/print-escp2.c:182 src/main/print-escp2.c:188 +#: src/main/print-escp2.c:194 src/main/print-escp2.c:200 +#: src/main/print-escp2.c:206 src/main/print-escp2.c:212 +#: src/main/print-escp2.c:230 src/main/print-escp2.c:247 +#: src/main/print-escp2.c:253 src/main/print-escp2.c:265 +#: src/main/print-escp2.c:283 src/main/print-lexmark.c:266 #: src/main/print-lexmark.c:272 src/main/print-lexmark.c:278 -#: src/main/print-lexmark.c:284 src/main/print-olympus.c:1699 -#: src/main/print-olympus.c:1705 src/main/print-olympus.c:1711 -#: src/main/print-olympus.c:1717 src/main/print-pcl.c:1196 -#: src/main/print-pcl.c:1202 src/main/print-pcl.c:1208 -#: src/main/print-pcl.c:1214 src/main/print-pcl.c:1238 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 +#: src/main/print-lexmark.c:284 src/main/print-olympus.c:1697 +#: src/main/print-olympus.c:1703 src/main/print-olympus.c:1709 +#: src/main/print-olympus.c:1715 src/main/print-pcl.c:1264 +#: src/main/print-pcl.c:1270 src/main/print-pcl.c:1276 +#: src/main/print-pcl.c:1282 src/main/print-pcl.c:1306 src/main/print-ps.c:68 +#: src/main/print-ps.c:74 msgid "Basic Printer Setup" msgstr "" -#: src/main/print-canon.c:201 src/main/print-escp2.c:181 -#: src/main/print-lexmark.c:267 src/main/print-olympus.c:1700 -#: src/main/print-pcl.c:1197 src/main/print-ps.c:68 +#: src/main/print-canon.c:201 src/main/print-escp2.c:183 +#: src/main/print-lexmark.c:267 src/main/print-olympus.c:1698 +#: src/main/print-pcl.c:1265 msgid "Size of the paper being printed to" msgstr "" -#: src/main/print-canon.c:206 src/main/print-escp2.c:186 -#: src/main/print-lexmark.c:272 src/main/print-olympus.c:1705 -#: src/main/print-pcl.c:1202 src/main/print-ps.c:73 src/cups/genppd.c:1417 +#: src/main/print-canon.c:206 src/main/print-escp2.c:188 +#: src/main/print-lexmark.c:272 src/main/print-olympus.c:1703 +#: src/main/print-pcl.c:1270 src/cups/genppd.c:1422 msgid "Media Type" msgstr "" -#: src/main/print-canon.c:207 src/main/print-escp2.c:187 -#: src/main/print-lexmark.c:273 src/main/print-olympus.c:1706 -#: src/main/print-pcl.c:1203 src/main/print-ps.c:74 +#: src/main/print-canon.c:207 src/main/print-escp2.c:189 +#: src/main/print-lexmark.c:273 src/main/print-olympus.c:1704 +#: src/main/print-pcl.c:1271 msgid "Type of media (plain paper, photo paper, etc.)" msgstr "" -#: src/main/print-canon.c:212 src/main/print-escp2.c:192 -#: src/main/print-lexmark.c:278 src/main/print-olympus.c:1711 -#: src/main/print-pcl.c:1208 src/main/print-ps.c:79 src/cups/genppd.c:1445 +#: src/main/print-canon.c:212 src/main/print-escp2.c:194 +#: src/main/print-lexmark.c:278 src/main/print-olympus.c:1709 +#: src/main/print-pcl.c:1276 src/cups/genppd.c:1450 msgid "Media Source" msgstr "" -#: src/main/print-canon.c:213 src/main/print-escp2.c:193 -#: src/main/print-lexmark.c:279 src/main/print-olympus.c:1712 -#: src/main/print-pcl.c:1209 src/main/print-ps.c:80 +#: src/main/print-canon.c:213 src/main/print-escp2.c:195 +#: src/main/print-lexmark.c:279 src/main/print-olympus.c:1710 +#: src/main/print-pcl.c:1277 msgid "Source (input slot) of the media" msgstr "" -#: src/main/print-canon.c:218 src/main/print-escp2.c:198 +#: src/main/print-canon.c:218 src/main/print-escp2.c:200 msgid "CD Hub Size" msgstr "" -#: src/main/print-canon.c:219 src/main/print-escp2.c:199 +#: src/main/print-canon.c:219 src/main/print-escp2.c:201 msgid "Print only outside of the hub of the CD, or all the way to the hole" msgstr "" -#: src/main/print-canon.c:224 src/main/print-escp2.c:204 +#: src/main/print-canon.c:224 src/main/print-escp2.c:206 msgid "CD Size (Custom)" msgstr "" -#: src/main/print-canon.c:225 src/main/print-escp2.c:205 +#: src/main/print-canon.c:225 src/main/print-escp2.c:207 msgid "Variable adjustment for the outer diameter of CD" msgstr "" -#: src/main/print-canon.c:230 src/main/print-escp2.c:210 +#: src/main/print-canon.c:230 src/main/print-escp2.c:212 msgid "CD Hub Size (Custom)" msgstr "" -#: src/main/print-canon.c:231 src/main/print-escp2.c:211 +#: src/main/print-canon.c:231 src/main/print-escp2.c:213 msgid "Variable adjustment to the inner hub of the CD" msgstr "" -#: src/main/print-canon.c:236 src/main/print-escp2.c:216 +#: src/main/print-canon.c:236 src/main/print-escp2.c:218 msgid "CD Horizontal Fine Adjustment" msgstr "" #: src/main/print-canon.c:236 src/main/print-canon.c:242 -#: src/main/print-canon.c:254 src/main/print-escp2.c:216 -#: src/main/print-escp2.c:222 src/main/print-escp2.c:239 -#: src/main/print-escp2.c:275 src/main/print-lexmark.c:290 -#: src/main/print-olympus.c:1723 src/main/print-olympus.c:1729 -#: src/main/print-olympus.c:1735 src/main/print-pcl.c:1220 -#: src/main/print-ps.c:91 src/main/print-raw.c:80 +#: src/main/print-canon.c:254 src/main/print-escp2.c:218 +#: src/main/print-escp2.c:224 src/main/print-escp2.c:241 +#: src/main/print-escp2.c:277 src/main/print-lexmark.c:290 +#: src/main/print-olympus.c:1721 src/main/print-olympus.c:1727 +#: src/main/print-olympus.c:1733 src/main/print-pcl.c:1288 +#: src/main/print-raw.c:80 msgid "Advanced Printer Setup" msgstr "" #: src/main/print-canon.c:237 src/main/print-canon.c:243 -#: src/main/print-escp2.c:217 src/main/print-escp2.c:223 +#: src/main/print-escp2.c:219 src/main/print-escp2.c:225 msgid "Fine adjustment to horizontal position for CD printing" msgstr "" -#: src/main/print-canon.c:242 src/main/print-escp2.c:222 +#: src/main/print-canon.c:242 src/main/print-escp2.c:224 msgid "CD Vertical Fine Adjustment" msgstr "" -#: src/main/print-canon.c:248 src/main/print-escp2.c:228 -#: src/main/print-lexmark.c:284 src/main/print-olympus.c:1717 -#: src/main/print-pcl.c:1214 src/main/print-ps.c:85 src/cups/genppd.c:1518 +#: src/main/print-canon.c:248 src/main/print-escp2.c:230 +#: src/main/print-lexmark.c:284 src/main/print-olympus.c:1715 +#: src/main/print-pcl.c:1282 src/cups/genppd.c:1523 msgid "Resolution" msgstr "" #: src/main/print-canon.c:249 src/main/print-lexmark.c:285 -#: src/main/print-olympus.c:1718 src/main/print-pcl.c:1215 -#: src/main/print-ps.c:86 +#: src/main/print-olympus.c:1716 src/main/print-pcl.c:1283 msgid "Resolution and quality of the print" msgstr "" -#: src/main/print-canon.c:254 src/main/print-escp2.c:239 -#: src/main/print-lexmark.c:290 src/main/print-olympus.c:1723 -#: src/main/print-pcl.c:1220 src/main/print-ps.c:91 src/main/print-raw.c:80 +#: src/main/print-canon.c:254 src/main/print-escp2.c:241 +#: src/main/print-lexmark.c:290 src/main/print-olympus.c:1721 +#: src/main/print-pcl.c:1288 src/main/print-raw.c:80 msgid "Ink Type" msgstr "" -#: src/main/print-canon.c:255 src/main/print-escp2.c:240 -#: src/main/print-escp2.c:252 src/main/print-lexmark.c:291 -#: src/main/print-olympus.c:1724 src/main/print-pcl.c:1221 -#: src/main/print-ps.c:92 src/main/print-raw.c:81 +#: src/main/print-canon.c:255 src/main/print-escp2.c:242 +#: src/main/print-escp2.c:254 src/main/print-lexmark.c:291 +#: src/main/print-olympus.c:1722 src/main/print-pcl.c:1289 +#: src/main/print-raw.c:81 msgid "Type of ink in the printer" msgstr "" #: src/main/print-canon.c:260 src/main/print-canon.c:261 -#: src/main/print-escp2.c:329 src/main/print-escp2.c:330 +#: src/main/print-escp2.c:331 src/main/print-escp2.c:332 #: src/main/print-lexmark.c:296 src/main/print-lexmark.c:297 -#: src/main/print-pcl.c:1226 src/main/print-pcl.c:1227 +#: src/main/print-pcl.c:1294 src/main/print-pcl.c:1295 msgid "Ink Channels" msgstr "" -#: src/main/print-canon.c:260 src/main/print-escp2.c:130 -#: src/main/print-escp2.c:137 src/main/print-escp2.c:144 -#: src/main/print-escp2.c:287 src/main/print-escp2.c:293 -#: src/main/print-escp2.c:299 src/main/print-escp2.c:305 -#: src/main/print-escp2.c:311 src/main/print-escp2.c:317 -#: src/main/print-escp2.c:323 src/main/print-escp2.c:329 -#: src/main/print-escp2.c:335 src/main/print-lexmark.c:296 -#: src/main/print-pcl.c:1226 +#: src/main/print-canon.c:260 src/main/print-escp2.c:132 +#: src/main/print-escp2.c:139 src/main/print-escp2.c:146 +#: src/main/print-escp2.c:289 src/main/print-escp2.c:295 +#: src/main/print-escp2.c:301 src/main/print-escp2.c:307 +#: src/main/print-escp2.c:313 src/main/print-escp2.c:319 +#: src/main/print-escp2.c:325 src/main/print-escp2.c:331 +#: src/main/print-escp2.c:337 src/main/print-lexmark.c:296 +#: src/main/print-pcl.c:1294 msgid "Advanced Printer Functionality" msgstr "" -#: src/main/print-canon.c:266 src/main/print-escp2.c:341 -#: src/main/print-lexmark.c:302 src/main/print-olympus.c:1741 -#: src/main/print-pcl.c:1232 src/main/print-ps.c:103 src/main/print-raw.c:86 +#: src/main/print-canon.c:266 src/main/print-escp2.c:343 +#: src/main/print-lexmark.c:302 src/main/print-olympus.c:1739 +#: src/main/print-pcl.c:1300 src/main/print-ps.c:80 src/main/print-raw.c:86 msgid "Printing Mode" msgstr "" #: src/main/print-canon.c:266 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:341 -#: src/main/print-escp2.c:347 src/main/print-lexmark.c:302 -#: src/main/print-olympus.c:1741 src/main/print-pcl.c:1232 -#: src/main/print-ps.c:103 src/main/print-raw.c:86 +#: src/main/print-color.c:208 src/main/print-escp2.c:343 +#: src/main/print-escp2.c:349 src/main/print-lexmark.c:302 +#: src/main/print-olympus.c:1739 src/main/print-pcl.c:1300 +#: src/main/print-ps.c:80 src/main/print-raw.c:86 msgid "Core Parameter" msgstr "" -#: src/main/print-canon.c:267 src/main/print-escp2.c:342 -#: src/main/print-lexmark.c:303 src/main/print-olympus.c:1742 -#: src/main/print-pcl.c:1233 src/main/print-ps.c:104 src/main/print-raw.c:87 +#: src/main/print-canon.c:267 src/main/print-escp2.c:344 +#: src/main/print-lexmark.c:303 src/main/print-olympus.c:1740 +#: src/main/print-pcl.c:1301 src/main/print-ps.c:81 src/main/print-raw.c:87 msgid "Printing Output Mode" msgstr "" -#: src/main/print-canon.c:272 src/main/print-pcl.c:1238 +#: src/main/print-canon.c:272 src/main/print-pcl.c:1306 msgid "Double-Sided Printing" msgstr "" -#: src/main/print-canon.c:273 src/main/print-pcl.c:1239 +#: src/main/print-canon.c:273 src/main/print-pcl.c:1307 msgid "Duplex/Tumble Setting" msgstr "" -#: src/main/print-canon.c:295 src/main/print-escp2.c:439 -#: src/main/print-lexmark.c:325 src/main/print-pcl.c:1261 +#: src/main/print-canon.c:295 src/main/print-escp2.c:446 +#: src/main/print-lexmark.c:325 src/main/print-pcl.c:1329 msgid "Cyan Density" msgstr "" -#: src/main/print-canon.c:296 src/main/print-escp2.c:440 -#: src/main/print-lexmark.c:326 src/main/print-pcl.c:1262 +#: src/main/print-canon.c:296 src/main/print-escp2.c:447 +#: src/main/print-lexmark.c:326 src/main/print-pcl.c:1330 msgid "Adjust the cyan density" msgstr "" -#: src/main/print-canon.c:303 src/main/print-escp2.c:447 -#: src/main/print-lexmark.c:333 src/main/print-pcl.c:1269 +#: src/main/print-canon.c:303 src/main/print-escp2.c:454 +#: src/main/print-lexmark.c:333 src/main/print-pcl.c:1337 msgid "Magenta Density" msgstr "" -#: src/main/print-canon.c:304 src/main/print-escp2.c:448 -#: src/main/print-lexmark.c:334 src/main/print-pcl.c:1270 +#: src/main/print-canon.c:304 src/main/print-escp2.c:455 +#: src/main/print-lexmark.c:334 src/main/print-pcl.c:1338 msgid "Adjust the magenta density" msgstr "" -#: src/main/print-canon.c:311 src/main/print-escp2.c:455 -#: src/main/print-lexmark.c:341 src/main/print-pcl.c:1277 +#: src/main/print-canon.c:311 src/main/print-escp2.c:462 +#: src/main/print-lexmark.c:341 src/main/print-pcl.c:1345 msgid "Yellow Density" msgstr "" -#: src/main/print-canon.c:312 src/main/print-escp2.c:456 -#: src/main/print-lexmark.c:342 src/main/print-pcl.c:1278 +#: src/main/print-canon.c:312 src/main/print-escp2.c:463 +#: src/main/print-lexmark.c:342 src/main/print-pcl.c:1346 msgid "Adjust the yellow density" msgstr "" -#: src/main/print-canon.c:319 src/main/print-escp2.c:463 -#: src/main/print-lexmark.c:349 src/main/print-pcl.c:1285 +#: src/main/print-canon.c:319 src/main/print-escp2.c:470 +#: src/main/print-lexmark.c:349 src/main/print-pcl.c:1353 msgid "Black Density" msgstr "" -#: src/main/print-canon.c:320 src/main/print-escp2.c:464 -#: src/main/print-lexmark.c:350 src/main/print-pcl.c:1286 +#: src/main/print-canon.c:320 src/main/print-escp2.c:471 +#: src/main/print-lexmark.c:350 src/main/print-pcl.c:1354 msgid "Adjust the black density" msgstr "" #: src/main/print-canon.c:327 src/main/print-canon.c:328 -#: src/main/print-escp2.c:495 src/main/print-escp2.c:496 +#: src/main/print-escp2.c:534 src/main/print-escp2.c:535 #: src/main/print-lexmark.c:357 src/main/print-lexmark.c:358 -#: src/main/print-pcl.c:1293 src/main/print-pcl.c:1294 +#: src/main/print-pcl.c:1361 src/main/print-pcl.c:1362 msgid "Light Cyan Transition" msgstr "" #: src/main/print-canon.c:327 src/main/print-canon.c:335 -#: src/main/print-canon.c:343 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-escp2.c:543 -#: src/main/print-escp2.c:551 src/main/print-escp2.c:559 -#: src/main/print-lexmark.c:357 src/main/print-lexmark.c:365 -#: src/main/print-pcl.c:1293 src/main/print-pcl.c:1301 +#: src/main/print-canon.c:343 src/main/print-escp2.c:502 +#: src/main/print-escp2.c:510 src/main/print-escp2.c:518 +#: src/main/print-escp2.c:526 src/main/print-escp2.c:534 +#: src/main/print-escp2.c:542 src/main/print-escp2.c:550 +#: src/main/print-escp2.c:558 src/main/print-escp2.c:566 +#: src/main/print-escp2.c:574 src/main/print-escp2.c:582 +#: src/main/print-escp2.c:590 src/main/print-escp2.c:598 +#: src/main/print-escp2.c:606 src/main/print-escp2.c:614 +#: src/main/print-escp2.c:622 src/main/print-escp2.c:630 +#: src/main/print-escp2.c:638 src/main/print-escp2.c:646 +#: src/main/print-escp2.c:654 src/main/print-escp2.c:662 +#: src/main/print-escp2.c:670 src/main/print-escp2.c:678 +#: src/main/print-escp2.c:686 src/main/print-escp2.c:694 +#: src/main/print-escp2.c:702 src/main/print-escp2.c:710 +#: src/main/print-escp2.c:718 src/main/print-escp2.c:726 +#: src/main/print-escp2.c:734 src/main/print-lexmark.c:357 +#: src/main/print-lexmark.c:365 src/main/print-pcl.c:1361 +#: src/main/print-pcl.c:1369 msgid "Advanced Ink Adjustment" msgstr "" #: src/main/print-canon.c:335 src/main/print-canon.c:336 -#: src/main/print-escp2.c:503 src/main/print-escp2.c:504 +#: src/main/print-escp2.c:566 src/main/print-escp2.c:567 #: src/main/print-lexmark.c:365 src/main/print-lexmark.c:366 -#: src/main/print-pcl.c:1301 src/main/print-pcl.c:1302 +#: src/main/print-pcl.c:1369 src/main/print-pcl.c:1370 msgid "Light Magenta Transition" msgstr "" @@ -381,53 +402,53 @@ msgstr "" msgid "Light Yellow Transition" msgstr "" -#: src/main/print-canon.c:363 src/main/print-pcl.c:1482 +#: src/main/print-canon.c:363 src/main/print-pcl.c:1550 #: src/main/escp2-resolutions.c:557 src/main/escp2-resolutions.c:565 #: src/main/escp2-resolutions.c:576 src/main/escp2-resolutions.c:588 msgid "Off" msgstr "" -#: src/main/print-canon.c:364 src/main/print-pcl.c:1483 +#: src/main/print-canon.c:364 src/main/print-pcl.c:1551 msgid "Long Edge (Standard)" msgstr "" -#: src/main/print-canon.c:365 src/main/print-pcl.c:1484 +#: src/main/print-canon.c:365 src/main/print-pcl.c:1552 msgid "Short Edge (Flip)" msgstr "" -#: src/main/print-canon.c:629 src/main/print-escp2.c:1648 +#: src/main/print-canon.c:629 src/main/print-escp2.c:2012 #: src/main/xmli18n-tmp.h:6 msgid "CD - 5 inch" msgstr "" -#: src/main/print-canon.c:631 src/main/print-escp2.c:1650 +#: src/main/print-canon.c:631 src/main/print-escp2.c:2014 #: src/main/xmli18n-tmp.h:7 msgid "CD - 3 inch" msgstr "" -#: src/main/print-canon.c:633 src/main/print-escp2.c:1652 +#: src/main/print-canon.c:633 src/main/print-escp2.c:2016 #: src/main/xmli18n-tmp.h:8 msgid "CD - Custom" msgstr "" -#: src/main/print-canon.c:656 src/main/print-escp2.c:1677 +#: src/main/print-canon.c:656 src/main/print-escp2.c:2041 msgid "Normal" msgstr "" -#: src/main/print-canon.c:658 src/main/print-escp2.c:1679 +#: src/main/print-canon.c:658 src/main/print-escp2.c:2043 msgid "Print To Hub" msgstr "" -#: src/main/print-canon.c:773 src/main/print-escp2.c:2011 -#: src/main/print-lexmark.c:1279 src/main/print-olympus.c:1996 -#: src/main/print-pcl.c:1776 src/main/print-ps.c:170 src/main/print-raw.c:135 -#: src/gutenprintui/panel.c:289 src/gutenprintui2/panel.c:289 +#: src/main/print-canon.c:773 src/main/print-escp2.c:2450 +#: src/main/print-lexmark.c:1279 src/main/print-olympus.c:1994 +#: src/main/print-pcl.c:1844 src/main/print-ps.c:310 src/main/print-raw.c:135 +#: src/gutenprintui2/panel.c:290 msgid "Color" msgstr "" -#: src/main/print-canon.c:775 src/main/print-escp2.c:2013 -#: src/main/print-lexmark.c:1281 src/main/print-pcl.c:1778 -#: src/main/print-ps.c:172 src/main/print-raw.c:137 +#: src/main/print-canon.c:775 src/main/print-escp2.c:2452 +#: src/main/print-lexmark.c:1281 src/main/print-pcl.c:1846 +#: src/main/print-ps.c:312 src/main/print-raw.c:137 msgid "Black and White" msgstr "" @@ -465,7 +486,7 @@ msgstr "" #: src/main/print-color.c:121 src/main/escp2-channels.c:916 #: src/main/escp2-channels.c:929 src/main/escp2-channels.c:943 -#: src/gutenprintui/panel.c:290 src/gutenprintui2/panel.c:290 +#: src/gutenprintui2/panel.c:291 msgid "Grayscale" msgstr "" @@ -489,7 +510,7 @@ msgstr "" msgid "KCMY" msgstr "" -#: src/main/print-color.c:165 src/main/print-color.c:446 +#: src/main/print-color.c:165 src/main/print-color.c:454 msgid "Channel " msgstr "" @@ -545,7 +566,7 @@ msgid "Output image type" msgstr "" #: src/main/print-color.c:208 src/main/print-color.c:209 -#: src/main/print-escp2.c:347 +#: src/main/print-escp2.c:349 msgid "Raw Channels" msgstr "" @@ -603,14 +624,14 @@ msgstr "" msgid "Gamma value assumed by application" msgstr "" -#: src/main/print-color.c:266 src/main/escp2-channels.c:3048 -#: src/main/escp2-channels.c:3060 src/main/escp2-channels.c:3068 -#: src/main/escp2-channels.c:3078 src/main/escp2-channels.c:3089 -#: src/main/escp2-channels.c:3101 src/main/escp2-channels.c:3117 -#: src/main/escp2-channels.c:3125 src/main/escp2-channels.c:3138 -#: src/main/escp2-channels.c:3151 src/main/escp2-channels.c:3165 -#: src/main/escp2-channels.c:3179 src/main/escp2-channels.c:3194 -#: src/gutenprintui/panel.c:2152 src/gutenprintui2/panel.c:2153 +#: src/main/print-color.c:266 src/main/escp2-channels.c:3087 +#: src/main/escp2-channels.c:3099 src/main/escp2-channels.c:3107 +#: src/main/escp2-channels.c:3117 src/main/escp2-channels.c:3128 +#: src/main/escp2-channels.c:3140 src/main/escp2-channels.c:3156 +#: src/main/escp2-channels.c:3164 src/main/escp2-channels.c:3177 +#: src/main/escp2-channels.c:3190 src/main/escp2-channels.c:3204 +#: src/main/escp2-channels.c:3218 src/main/escp2-channels.c:3230 +#: src/main/escp2-channels.c:3243 src/gutenprintui2/panel.c:2328 #: src/escputil/escputil.c:978 src/escputil/escputil.c:997 #: src/escputil/escputil.c:1201 msgid "Cyan" @@ -620,14 +641,14 @@ msgstr "" msgid "Adjust the cyan gamma" msgstr "" -#: src/main/print-color.c:274 src/main/escp2-channels.c:3049 -#: src/main/escp2-channels.c:3059 src/main/escp2-channels.c:3070 -#: src/main/escp2-channels.c:3079 src/main/escp2-channels.c:3090 -#: src/main/escp2-channels.c:3103 src/main/escp2-channels.c:3116 -#: src/main/escp2-channels.c:3126 src/main/escp2-channels.c:3139 -#: src/main/escp2-channels.c:3152 src/main/escp2-channels.c:3164 -#: src/main/escp2-channels.c:3178 src/main/escp2-channels.c:3195 -#: src/gutenprintui/panel.c:2159 src/gutenprintui2/panel.c:2160 +#: src/main/print-color.c:274 src/main/escp2-channels.c:3088 +#: src/main/escp2-channels.c:3098 src/main/escp2-channels.c:3109 +#: src/main/escp2-channels.c:3118 src/main/escp2-channels.c:3129 +#: src/main/escp2-channels.c:3142 src/main/escp2-channels.c:3155 +#: src/main/escp2-channels.c:3165 src/main/escp2-channels.c:3178 +#: src/main/escp2-channels.c:3191 src/main/escp2-channels.c:3203 +#: src/main/escp2-channels.c:3217 src/main/escp2-channels.c:3229 +#: src/main/escp2-channels.c:3244 src/gutenprintui2/panel.c:2335 #: src/escputil/escputil.c:979 src/escputil/escputil.c:998 #: src/escputil/escputil.c:1202 msgid "Magenta" @@ -637,14 +658,14 @@ msgstr "" msgid "Adjust the magenta gamma" msgstr "" -#: src/main/print-color.c:282 src/main/escp2-channels.c:3050 -#: src/main/escp2-channels.c:3061 src/main/escp2-channels.c:3069 -#: src/main/escp2-channels.c:3080 src/main/escp2-channels.c:3091 -#: src/main/escp2-channels.c:3105 src/main/escp2-channels.c:3112 -#: src/main/escp2-channels.c:3127 src/main/escp2-channels.c:3140 -#: src/main/escp2-channels.c:3153 src/main/escp2-channels.c:3163 -#: src/main/escp2-channels.c:3177 src/main/escp2-channels.c:3196 -#: src/gutenprintui/panel.c:2166 src/gutenprintui2/panel.c:2167 +#: src/main/print-color.c:282 src/main/escp2-channels.c:3089 +#: src/main/escp2-channels.c:3100 src/main/escp2-channels.c:3108 +#: src/main/escp2-channels.c:3119 src/main/escp2-channels.c:3130 +#: src/main/escp2-channels.c:3144 src/main/escp2-channels.c:3151 +#: src/main/escp2-channels.c:3166 src/main/escp2-channels.c:3179 +#: src/main/escp2-channels.c:3192 src/main/escp2-channels.c:3202 +#: src/main/escp2-channels.c:3216 src/main/escp2-channels.c:3228 +#: src/main/escp2-channels.c:3245 src/gutenprintui2/panel.c:2342 #: src/escputil/escputil.c:980 src/escputil/escputil.c:999 #: src/escputil/escputil.c:1203 msgid "Yellow" @@ -654,10 +675,9 @@ msgstr "" msgid "Adjust the yellow gamma" msgstr "" -#: src/main/print-color.c:290 src/main/escp2-channels.c:3168 -#: src/main/escp2-channels.c:3181 src/gutenprintui/panel.c:2180 -#: src/gutenprintui2/panel.c:2181 src/escputil/escputil.c:987 -#: src/escputil/escputil.c:1005 +#: src/main/print-color.c:290 src/main/escp2-channels.c:3207 +#: src/main/escp2-channels.c:3220 src/gutenprintui2/panel.c:2356 +#: src/escputil/escputil.c:987 src/escputil/escputil.c:1005 msgid "Red" msgstr "" @@ -665,8 +685,7 @@ msgstr "" msgid "Adjust the red gamma" msgstr "" -#: src/main/print-color.c:298 src/gutenprintui/panel.c:2187 -#: src/gutenprintui2/panel.c:2188 +#: src/main/print-color.c:298 src/gutenprintui2/panel.c:2363 msgid "Green" msgstr "" @@ -674,10 +693,9 @@ msgstr "" msgid "Adjust the green gamma" msgstr "" -#: src/main/print-color.c:306 src/main/escp2-channels.c:3169 -#: src/main/escp2-channels.c:3182 src/gutenprintui/panel.c:2194 -#: src/gutenprintui2/panel.c:2195 src/escputil/escputil.c:988 -#: src/escputil/escputil.c:1006 +#: src/main/print-color.c:306 src/main/escp2-channels.c:3208 +#: src/main/escp2-channels.c:3221 src/gutenprintui2/panel.c:2370 +#: src/escputil/escputil.c:988 src/escputil/escputil.c:1006 msgid "Blue" msgstr "" @@ -686,14 +704,14 @@ msgid "Adjust the blue gamma" msgstr "" #: src/main/print-color.c:314 src/main/print-lexmark.c:613 -#: src/main/escp2-channels.c:3047 src/main/escp2-channels.c:3057 -#: src/main/escp2-channels.c:3058 src/main/escp2-channels.c:3071 -#: src/main/escp2-channels.c:3081 src/main/escp2-channels.c:3088 -#: src/main/escp2-channels.c:3100 src/main/escp2-channels.c:3113 -#: src/main/escp2-channels.c:3124 src/main/escp2-channels.c:3137 -#: src/main/escp2-channels.c:3150 src/main/escp2-channels.c:3156 -#: src/main/escp2-channels.c:3180 src/main/escp2-channels.c:3193 -#: src/gutenprintui/panel.c:2173 src/gutenprintui2/panel.c:2174 +#: src/main/escp2-channels.c:3086 src/main/escp2-channels.c:3096 +#: src/main/escp2-channels.c:3097 src/main/escp2-channels.c:3110 +#: src/main/escp2-channels.c:3120 src/main/escp2-channels.c:3127 +#: src/main/escp2-channels.c:3139 src/main/escp2-channels.c:3152 +#: src/main/escp2-channels.c:3163 src/main/escp2-channels.c:3176 +#: src/main/escp2-channels.c:3189 src/main/escp2-channels.c:3195 +#: src/main/escp2-channels.c:3219 src/main/escp2-channels.c:3231 +#: src/main/escp2-channels.c:3242 src/gutenprintui2/panel.c:2349 #: src/escputil/escputil.c:975 src/escputil/escputil.c:996 #: src/escputil/escputil.c:1200 msgid "Black" @@ -703,7 +721,7 @@ msgstr "" msgid "Adjust the black gamma" msgstr "" -#: src/main/print-color.c:322 src/main/print-olympus.c:1764 +#: src/main/print-color.c:322 src/main/print-olympus.c:1762 msgid "Cyan Balance" msgstr "" @@ -716,7 +734,7 @@ msgstr "" msgid "Adjust the cyan gray balance" msgstr "" -#: src/main/print-color.c:330 src/main/print-olympus.c:1772 +#: src/main/print-color.c:330 src/main/print-olympus.c:1770 msgid "Magenta Balance" msgstr "" @@ -724,7 +742,7 @@ msgstr "" msgid "Adjust the magenta gray balance" msgstr "" -#: src/main/print-color.c:338 src/main/print-olympus.c:1780 +#: src/main/print-color.c:338 src/main/print-olympus.c:1778 msgid "Yellow Balance" msgstr "" @@ -748,9 +766,11 @@ msgstr "" #: 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:353 -#: src/main/print-escp2.c:359 src/main/print-escp2.c:365 -#: src/main/print-escp2.c:371 src/main/print-escp2.c:377 +#: src/main/print-color.c:421 src/main/print-color.c:553 +#: src/main/print-escp2.c:355 src/main/print-escp2.c:361 +#: src/main/print-escp2.c:367 src/main/print-escp2.c:373 +#: src/main/print-escp2.c:379 src/main/print-escp2.c:742 +#: src/main/print-escp2.c:750 src/main/print-escp2.c:758 msgid "Advanced Output Control" msgstr "" @@ -758,502 +778,603 @@ msgstr "" msgid "Limit the total ink printed to the page" msgstr "" -#: src/main/print-color.c:365 +#: src/main/print-color.c:365 src/main/print-escp2.c:742 msgid "GCR Transition" msgstr "" -#: src/main/print-color.c:366 +#: src/main/print-color.c:366 src/main/print-escp2.c:743 msgid "Adjust the gray component transition rate" msgstr "" -#: src/main/print-color.c:373 +#: src/main/print-color.c:373 src/main/print-escp2.c:750 msgid "GCR Lower Bound" msgstr "" -#: src/main/print-color.c:374 +#: src/main/print-color.c:374 src/main/print-escp2.c:751 msgid "Lower bound of gray component reduction" msgstr "" -#: src/main/print-color.c:381 +#: src/main/print-color.c:381 src/main/print-escp2.c:758 msgid "GCR Upper Bound" msgstr "" -#: src/main/print-color.c:382 +#: src/main/print-color.c:382 src/main/print-escp2.c:759 msgid "Upper bound of gray component reduction" msgstr "" -#: src/main/print-color.c:447 src/main/print-color.c:457 -#: src/main/print-color.c:465 src/main/print-color.c:473 -#: src/main/print-color.c:481 src/main/print-color.c:489 -#: src/main/print-color.c:497 src/main/print-color.c:505 -#: src/main/print-color.c:513 +#: src/main/print-color.c:421 +msgid "LUT dump file" +msgstr "" + +#: src/main/print-color.c:422 +msgid "Dump file for LUT for external color adjustment" +msgstr "" + +#: src/main/print-color.c:455 src/main/print-color.c:465 +#: src/main/print-color.c:473 src/main/print-color.c:481 +#: src/main/print-color.c:489 src/main/print-color.c:497 +#: src/main/print-color.c:505 src/main/print-color.c:513 +#: src/main/print-color.c:521 msgid "Output Curves" msgstr "" -#: src/main/print-color.c:447 +#: src/main/print-color.c:455 msgid "Curve for raw channel " msgstr "" -#: src/main/print-color.c:457 +#: src/main/print-color.c:465 msgid "Cyan Curve" msgstr "" -#: src/main/print-color.c:458 +#: src/main/print-color.c:466 msgid "Cyan curve" msgstr "" -#: src/main/print-color.c:465 +#: src/main/print-color.c:473 msgid "Magenta Curve" msgstr "" -#: src/main/print-color.c:466 +#: src/main/print-color.c:474 msgid "Magenta curve" msgstr "" -#: src/main/print-color.c:473 +#: src/main/print-color.c:481 msgid "Yellow Curve" msgstr "" -#: src/main/print-color.c:474 +#: src/main/print-color.c:482 msgid "Yellow curve" msgstr "" -#: src/main/print-color.c:481 +#: src/main/print-color.c:489 msgid "Black Curve" msgstr "" -#: src/main/print-color.c:482 +#: src/main/print-color.c:490 msgid "Black curve" msgstr "" -#: src/main/print-color.c:489 +#: src/main/print-color.c:497 msgid "Red Curve" msgstr "" -#: src/main/print-color.c:490 +#: src/main/print-color.c:498 msgid "Red curve" msgstr "" -#: src/main/print-color.c:497 +#: src/main/print-color.c:505 msgid "Green Curve" msgstr "" -#: src/main/print-color.c:498 +#: src/main/print-color.c:506 msgid "Green curve" msgstr "" -#: src/main/print-color.c:505 +#: src/main/print-color.c:513 msgid "Blue Curve" msgstr "" -#: src/main/print-color.c:506 +#: src/main/print-color.c:514 msgid "Blue curve" msgstr "" -#: src/main/print-color.c:513 +#: src/main/print-color.c:521 msgid "White Curve" msgstr "" -#: src/main/print-color.c:514 +#: src/main/print-color.c:522 msgid "White curve" msgstr "" -#: src/main/print-color.c:521 +#: src/main/print-color.c:529 msgid "Hue Map" msgstr "" -#: src/main/print-color.c:521 src/main/print-color.c:529 -#: src/main/print-color.c:537 +#: src/main/print-color.c:529 src/main/print-color.c:537 +#: src/main/print-color.c:545 msgid "Advanced HSL Curves" msgstr "" -#: src/main/print-color.c:522 +#: src/main/print-color.c:530 msgid "Hue adjustment curve" msgstr "" -#: src/main/print-color.c:529 +#: src/main/print-color.c:537 msgid "Saturation Map" msgstr "" -#: src/main/print-color.c:530 +#: src/main/print-color.c:538 msgid "Saturation adjustment curve" msgstr "" -#: src/main/print-color.c:537 +#: src/main/print-color.c:545 msgid "Luminosity Map" msgstr "" -#: src/main/print-color.c:538 +#: src/main/print-color.c:546 msgid "Luminosity adjustment curve" msgstr "" -#: src/main/print-color.c:545 +#: src/main/print-color.c:553 msgid "Gray Component Reduction" msgstr "" -#: src/main/print-color.c:546 +#: src/main/print-color.c:554 msgid "Gray component reduction curve" msgstr "" -#: src/main/print-color.c:1670 +#: src/main/print-color.c:1743 msgid "Traditional Gutenprint color conversion" msgstr "" -#: src/main/printers.c:517 +#: src/main/printers.c:514 #, c-format msgid "Value must be set for %s\n" msgstr "" -#: src/main/printers.c:530 src/main/printers.c:535 +#: src/main/printers.c:527 src/main/printers.c:532 #, c-format msgid "`%s' is not a valid %s\n" msgstr "" -#: src/main/printers.c:554 +#: src/main/printers.c:551 #, c-format msgid "%s must be between %f and %f (is %f)\n" msgstr "" -#: src/main/printers.c:576 src/main/printers.c:600 +#: src/main/printers.c:573 src/main/printers.c:597 #, c-format msgid "%s must be between %d and %d (is %d)\n" msgstr "" -#: src/main/printers.c:631 +#: src/main/printers.c:628 #, c-format msgid "%s bounds must be between %f and %f\n" msgstr "" -#: src/main/printers.c:639 +#: src/main/printers.c:636 #, c-format msgid "%s wrap mode must be %s\n" msgstr "" -#: src/main/printers.c:643 +#: src/main/printers.c:640 msgid "no wrap" msgstr "" -#: src/main/printers.c:643 +#: src/main/printers.c:640 msgid "wrap around" msgstr "" -#: src/main/printers.c:687 +#: src/main/printers.c:684 #, c-format msgid "Unknown type parameter %s (%d)\n" msgstr "" -#: src/main/printers.c:700 src/main/printers.c:711 +#: src/main/printers.c:697 src/main/printers.c:708 #, c-format msgid "%s out of range (value %d, min %d, max %d)\n" msgstr "" -#: src/main/printers.c:772 +#: src/main/printers.c:768 msgid "Page size is not valid\n" msgstr "" -#: src/main/printers.c:793 +#: src/main/printers.c:789 #, c-format msgid "Top margin must not be less than %d\n" msgstr "" -#: src/main/printers.c:799 +#: src/main/printers.c:795 #, c-format msgid "Left margin must not be less than %d\n" msgstr "" -#: src/main/printers.c:805 +#: src/main/printers.c:801 msgid "Height must be greater than zero\n" msgstr "" -#: src/main/printers.c:811 +#: src/main/printers.c:807 msgid "Width must be greater than zero\n" msgstr "" -#: src/main/printers.c:817 +#: src/main/printers.c:813 #, c-format msgid "" "Image is too wide for the page: left margin is %d, width %d, right edge is %" "d\n" msgstr "" -#: src/main/printers.c:824 +#: src/main/printers.c:820 #, c-format msgid "" "Image is too long for the page: top margin is %d, height %d, bottom edge is %" "d\n" msgstr "" -#: src/main/print-escp2.c:162 +#: src/main/print-escp2.c:164 msgid "Automatic Printing Mode" msgstr "" -#: src/main/print-escp2.c:162 src/main/print-escp2.c:174 +#: src/main/print-escp2.c:164 src/main/print-escp2.c:176 #: src/main/generic-options.c:62 msgid "Basic Output Adjustment" msgstr "" -#: src/main/print-escp2.c:163 +#: src/main/print-escp2.c:165 msgid "Automatic printing mode" msgstr "" -#: src/main/print-escp2.c:174 src/main/print-escp2.c:175 +#: src/main/print-escp2.c:176 src/main/print-escp2.c:177 #: src/main/generic-options.c:62 src/main/generic-options.c:63 msgid "Print Quality" msgstr "" -#: src/main/print-escp2.c:229 +#: src/main/print-escp2.c:231 msgid "Resolution of the print" msgstr "" -#: src/main/print-escp2.c:245 +#: src/main/print-escp2.c:247 msgid "Enhanced Gloss" msgstr "" -#: src/main/print-escp2.c:246 +#: src/main/print-escp2.c:248 msgid "Add gloss enhancement" msgstr "" -#: src/main/print-escp2.c:251 +#: src/main/print-escp2.c:253 msgid "Ink Set" msgstr "" -#: src/main/print-escp2.c:257 +#: src/main/print-escp2.c:259 msgid "Printing Direction" msgstr "" -#: src/main/print-escp2.c:257 src/main/print-escp2.c:269 +#: src/main/print-escp2.c:259 src/main/print-escp2.c:271 msgid "Advanced Output Adjustment" msgstr "" -#: src/main/print-escp2.c:258 +#: src/main/print-escp2.c:260 msgid "Printing direction (unidirectional is higher quality, but slower)" msgstr "" -#: src/main/print-escp2.c:263 src/main/print-olympus.c:1735 +#: src/main/print-escp2.c:265 src/main/print-olympus.c:1733 msgid "Borderless" msgstr "" -#: src/main/print-escp2.c:264 src/main/print-olympus.c:1736 +#: src/main/print-escp2.c:266 src/main/print-olympus.c:1734 msgid "Print without borders" msgstr "" -#: src/main/print-escp2.c:269 +#: src/main/print-escp2.c:271 msgid "Interleave Method" msgstr "" -#: src/main/print-escp2.c:270 +#: src/main/print-escp2.c:272 msgid "Interleave pattern to use" msgstr "" -#: src/main/print-escp2.c:275 +#: src/main/print-escp2.c:277 msgid "Adjust dot size as necessary" msgstr "" -#: src/main/print-escp2.c:276 +#: src/main/print-escp2.c:278 msgid "Adjust dot size as necessary to achieve desired density" msgstr "" -#: src/main/print-escp2.c:281 src/main/print-escp2.c:282 +#: src/main/print-escp2.c:283 src/main/print-escp2.c:284 msgid "Output Order" msgstr "" -#: src/main/print-escp2.c:287 src/main/print-escp2.c:288 +#: src/main/print-escp2.c:289 src/main/print-escp2.c:290 msgid "Alignment Passes" msgstr "" -#: src/main/print-escp2.c:293 src/main/print-escp2.c:294 +#: src/main/print-escp2.c:295 src/main/print-escp2.c:296 msgid "Alignment Choices" msgstr "" -#: src/main/print-escp2.c:299 src/main/print-escp2.c:300 +#: src/main/print-escp2.c:301 src/main/print-escp2.c:302 msgid "Ink change command" msgstr "" -#: src/main/print-escp2.c:305 src/main/print-escp2.c:306 +#: src/main/print-escp2.c:307 src/main/print-escp2.c:308 msgid "Alternate Alignment Passes" msgstr "" -#: src/main/print-escp2.c:311 src/main/print-escp2.c:312 +#: src/main/print-escp2.c:313 src/main/print-escp2.c:314 msgid "Alternate Alignment Choices" msgstr "" -#: src/main/print-escp2.c:317 +#: src/main/print-escp2.c:319 msgid "Supports Packet Mode" msgstr "" -#: src/main/print-escp2.c:318 +#: src/main/print-escp2.c:320 msgid "Supports D4 Packet Mode" msgstr "" -#: src/main/print-escp2.c:323 +#: src/main/print-escp2.c:325 msgid "Has Interchangeable Ink Cartridges" msgstr "" -#: src/main/print-escp2.c:324 +#: src/main/print-escp2.c:326 msgid "Has multiple choices of ink cartridges" msgstr "" -#: src/main/print-escp2.c:335 src/main/print-escp2.c:336 +#: src/main/print-escp2.c:337 src/main/print-escp2.c:338 msgid "Channel Names" msgstr "" -#: src/main/print-escp2.c:348 +#: src/main/print-escp2.c:350 msgid "Raw Channel Count" msgstr "" -#: src/main/print-escp2.c:353 +#: src/main/print-escp2.c:355 msgid "Cyan Map" msgstr "" -#: src/main/print-escp2.c:354 +#: src/main/print-escp2.c:356 msgid "Adjust the cyan map" msgstr "" -#: src/main/print-escp2.c:359 +#: src/main/print-escp2.c:361 msgid "Magenta Map" msgstr "" -#: src/main/print-escp2.c:360 +#: src/main/print-escp2.c:362 msgid "Adjust the magenta map" msgstr "" -#: src/main/print-escp2.c:365 +#: src/main/print-escp2.c:367 msgid "Yellow Map" msgstr "" -#: src/main/print-escp2.c:366 +#: src/main/print-escp2.c:368 msgid "Adjust the yellow map" msgstr "" -#: src/main/print-escp2.c:371 +#: src/main/print-escp2.c:373 msgid "Blue Map" msgstr "" -#: src/main/print-escp2.c:372 +#: src/main/print-escp2.c:374 msgid "Adjust the blue map" msgstr "" -#: src/main/print-escp2.c:377 +#: src/main/print-escp2.c:379 msgid "Red Map" msgstr "" -#: src/main/print-escp2.c:378 +#: src/main/print-escp2.c:380 msgid "Adjust the red map" msgstr "" -#: src/main/print-escp2.c:471 +#: src/main/print-escp2.c:478 msgid "Red Density" msgstr "" -#: src/main/print-escp2.c:472 +#: src/main/print-escp2.c:479 msgid "Adjust the red density" msgstr "" -#: src/main/print-escp2.c:479 +#: src/main/print-escp2.c:486 msgid "Blue Density" msgstr "" -#: src/main/print-escp2.c:480 +#: src/main/print-escp2.c:487 msgid "Adjust the blue density" msgstr "" -#: src/main/print-escp2.c:487 +#: src/main/print-escp2.c:494 msgid "Gloss Level" msgstr "" -#: src/main/print-escp2.c:488 +#: src/main/print-escp2.c:495 msgid "Adjust the gloss level" msgstr "" -#: src/main/print-escp2.c:511 src/main/print-escp2.c:512 +#: src/main/print-escp2.c:502 +msgid "Drop Size Small" +msgstr "" + +#: src/main/print-escp2.c:503 +msgid "Drop Size 1 (small)" +msgstr "" + +#: src/main/print-escp2.c:510 +msgid "Drop Size Medium" +msgstr "" + +#: src/main/print-escp2.c:511 +msgid "Drop Size 2 (medium)" +msgstr "" + +#: src/main/print-escp2.c:518 +msgid "Drop Size Large" +msgstr "" + +#: src/main/print-escp2.c:519 +msgid "Drop Size 3 (large)" +msgstr "" + +#: src/main/print-escp2.c:526 src/main/print-escp2.c:527 +msgid "Light Cyan Value" +msgstr "" + +#: src/main/print-escp2.c:542 src/main/print-escp2.c:543 +msgid "Light Cyan Density Scale" +msgstr "" + +#: src/main/print-escp2.c:550 src/main/print-escp2.c:551 +msgid "Light Magenta Value" +msgstr "" + +#: src/main/print-escp2.c:558 src/main/print-escp2.c:559 +msgid "Light Magenta Density Scale" +msgstr "" + +#: src/main/print-escp2.c:574 src/main/print-escp2.c:575 +msgid "Dark Yellow Value" +msgstr "" + +#: src/main/print-escp2.c:582 src/main/print-escp2.c:583 msgid "Dark Yellow Transition" msgstr "" -#: src/main/print-escp2.c:519 src/main/print-escp2.c:520 -#: src/main/print-escp2.c:527 src/main/print-escp2.c:528 +#: src/main/print-escp2.c:590 src/main/print-escp2.c:591 +msgid "Dark Yellow Density Scale" +msgstr "" + +#: src/main/print-escp2.c:598 src/main/print-escp2.c:599 +#: src/main/print-escp2.c:622 src/main/print-escp2.c:623 +msgid "Gray Value" +msgstr "" + +#: src/main/print-escp2.c:606 src/main/print-escp2.c:607 +#: src/main/print-escp2.c:630 src/main/print-escp2.c:631 msgid "Gray Transition" msgstr "" -#: src/main/print-escp2.c:535 src/main/print-escp2.c:536 -#: src/main/print-escp2.c:559 src/main/print-escp2.c:560 +#: src/main/print-escp2.c:614 src/main/print-escp2.c:615 +#: src/main/print-escp2.c:638 src/main/print-escp2.c:639 +msgid "Gray Density Scale" +msgstr "" + +#: src/main/print-escp2.c:646 src/main/print-escp2.c:647 +#: src/main/print-escp2.c:718 src/main/print-escp2.c:719 +msgid "Light Gray Value" +msgstr "" + +#: src/main/print-escp2.c:654 src/main/print-escp2.c:655 +#: src/main/print-escp2.c:726 src/main/print-escp2.c:727 msgid "Light Gray Transition" msgstr "" -#: src/main/print-escp2.c:543 src/main/print-escp2.c:544 +#: src/main/print-escp2.c:662 src/main/print-escp2.c:663 +#: src/main/print-escp2.c:734 src/main/print-escp2.c:735 +msgid "Light Gray Density Scale" +msgstr "" + +#: src/main/print-escp2.c:670 src/main/print-escp2.c:671 +msgid "Dark Gray Value" +msgstr "" + +#: src/main/print-escp2.c:678 src/main/print-escp2.c:679 msgid "Dark Gray Transition" msgstr "" -#: src/main/print-escp2.c:551 +#: src/main/print-escp2.c:686 src/main/print-escp2.c:687 +msgid "Dark Gray Density Scale" +msgstr "" + +#: src/main/print-escp2.c:694 +msgid "Mid Gray Value" +msgstr "" + +#: src/main/print-escp2.c:695 +msgid "Medium Gray Value" +msgstr "" + +#: src/main/print-escp2.c:702 msgid "Mid Gray Transition" msgstr "" -#: src/main/print-escp2.c:552 +#: src/main/print-escp2.c:703 msgid "Medium Gray Transition" msgstr "" -#: src/main/print-escp2.c:1635 +#: src/main/print-escp2.c:710 +msgid "Mid Gray Density Scale" +msgstr "" + +#: src/main/print-escp2.c:711 +msgid "Medium Gray Density Scale" +msgstr "" + +#: src/main/print-escp2.c:1999 msgid "Full Manual Control" msgstr "" -#: src/main/print-escp2.c:1637 +#: src/main/print-escp2.c:2001 msgid "Automatic Setting Control" msgstr "" -#: src/main/print-escp2.c:1732 src/main/generic-options.c:213 +#: src/main/print-escp2.c:2096 src/main/generic-options.c:213 #: src/main/generic-options.c:230 msgid "Manual Control" msgstr "" -#: src/main/print-escp2.c:1771 src/main/print-escp2.c:1863 -#: src/main/print-escp2.c:1875 src/main/print-pcl.c:230 -#: src/main/escp2-channels.c:2805 src/main/escp2-papers.c:1707 -#: src/main/escp2-papers.c:1731 src/main/escp2-papers.c:1764 -#: src/main/escp2-papers.c:1815 src/main/escp2-papers.c:1857 -#: src/main/escp2-papers.c:1899 src/main/escp2-papers.c:1992 -#: src/main/escp2-resolutions.c:640 src/main/escp2-resolutions.c:655 -#: src/main/escp2-resolutions.c:668 src/main/generic-options.c:36 -#: src/gutenprintui/panel.c:2613 src/gutenprintui2/panel.c:2639 +#: src/main/print-escp2.c:2139 src/main/print-escp2.c:2231 +#: src/main/print-escp2.c:2243 src/main/print-pcl.c:237 +#: src/main/escp2-channels.c:2827 src/main/escp2-channels.c:2836 +#: src/main/escp2-papers.c:1718 src/main/escp2-papers.c:1742 +#: src/main/escp2-papers.c:1775 src/main/escp2-papers.c:1826 +#: src/main/escp2-papers.c:1868 src/main/escp2-papers.c:1910 +#: src/main/escp2-papers.c:2003 src/main/escp2-resolutions.c:640 +#: src/main/escp2-resolutions.c:655 src/main/escp2-resolutions.c:670 +#: src/main/escp2-resolutions.c:683 src/main/generic-options.c:36 +#: src/gutenprintui2/panel.c:2814 msgid "Standard" msgstr "" -#: src/main/print-escp2.c:1842 +#: src/main/print-escp2.c:2210 msgid "Automatic" msgstr "" -#: src/main/print-escp2.c:1844 +#: src/main/print-escp2.c:2212 msgid "Bidirectional" msgstr "" -#: src/main/print-escp2.c:1846 +#: src/main/print-escp2.c:2214 msgid "Unidirectional" msgstr "" -#: src/main/print-escp2.c:1877 +#: src/main/print-escp2.c:2245 msgid "Alternate Fill" msgstr "" -#: src/main/print-escp2.c:1879 +#: src/main/print-escp2.c:2247 msgid "Ascending Fill" msgstr "" -#: src/main/print-escp2.c:1881 +#: src/main/print-escp2.c:2249 msgid "Descending Fill" msgstr "" -#: src/main/print-escp2.c:1883 +#: src/main/print-escp2.c:2251 msgid "Ascending Double" msgstr "" -#: src/main/print-escp2.c:1885 +#: src/main/print-escp2.c:2253 msgid "Nearest Neighbor Avoidance" msgstr "" -#: src/main/print-escp2.c:2328 +#: src/main/print-escp2.c:2771 #, c-format msgid "This printer does not support raw printer output at depth %d\n" msgstr "" -#: src/main/print-escp2.c:3436 src/main/print-olympus.c:2451 +#: src/main/print-escp2.c:3934 src/main/print-olympus.c:2449 #: src/main/print-raw.c:217 msgid "Print options not verified; cannot print.\n" msgstr "" @@ -1327,109 +1448,109 @@ msgid "Three Color Composite" msgstr "" #: src/main/print-lexmark.c:607 src/main/print-lexmark.c:677 -#: src/main/escp2-channels.c:1540 src/main/escp2-channels.c:1554 -#: src/main/escp2-channels.c:1568 src/main/escp2-channels.c:1582 -#: src/main/escp2-channels.c:1808 src/main/escp2-channels.c:1823 -#: src/main/escp2-channels.c:1838 src/main/escp2-channels.c:1855 +#: src/main/escp2-channels.c:1554 src/main/escp2-channels.c:1568 +#: src/main/escp2-channels.c:1582 src/main/escp2-channels.c:1596 +#: src/main/escp2-channels.c:1822 src/main/escp2-channels.c:1837 +#: src/main/escp2-channels.c:1852 src/main/escp2-channels.c:1869 msgid "Six Color Photo" msgstr "" #: src/main/print-lexmark.c:610 src/main/print-lexmark.c:680 -#: src/main/escp2-channels.c:1475 src/main/escp2-channels.c:1489 -#: src/main/escp2-channels.c:1503 src/main/escp2-channels.c:1517 -#: src/main/escp2-channels.c:1752 src/main/escp2-channels.c:1767 -#: src/main/escp2-channels.c:1784 +#: src/main/escp2-channels.c:1489 src/main/escp2-channels.c:1503 +#: src/main/escp2-channels.c:1517 src/main/escp2-channels.c:1531 +#: src/main/escp2-channels.c:1766 src/main/escp2-channels.c:1781 +#: src/main/escp2-channels.c:1798 msgid "Five Color Photo Composite" msgstr "" -#: src/main/print-lexmark.c:856 src/main/escp2-papers.c:1341 -#: src/main/escp2-papers.c:1385 src/main/escp2-papers.c:1429 -#: src/main/escp2-papers.c:1477 src/main/escp2-papers.c:1525 -#: src/main/escp2-papers.c:1569 +#: src/main/print-lexmark.c:856 src/main/escp2-papers.c:1351 +#: src/main/escp2-papers.c:1395 src/main/escp2-papers.c:1439 +#: src/main/escp2-papers.c:1487 src/main/escp2-papers.c:1535 +#: src/main/escp2-papers.c:1579 msgid "Plain Paper" msgstr "" -#: src/main/print-lexmark.c:860 src/main/escp2-papers.c:1347 -#: src/main/escp2-papers.c:1391 src/main/escp2-papers.c:1435 -#: src/main/escp2-papers.c:1483 src/main/escp2-papers.c:1531 -#: src/main/escp2-papers.c:1575 +#: src/main/print-lexmark.c:860 src/main/escp2-papers.c:1357 +#: src/main/escp2-papers.c:1401 src/main/escp2-papers.c:1445 +#: src/main/escp2-papers.c:1493 src/main/escp2-papers.c:1541 +#: src/main/escp2-papers.c:1585 msgid "Glossy Film" msgstr "" -#: src/main/print-lexmark.c:864 src/main/escp2-papers.c:1349 -#: src/main/escp2-papers.c:1393 src/main/escp2-papers.c:1437 -#: src/main/escp2-papers.c:1485 src/main/escp2-papers.c:1533 -#: src/main/escp2-papers.c:1577 +#: src/main/print-lexmark.c:864 src/main/escp2-papers.c:1359 +#: src/main/escp2-papers.c:1403 src/main/escp2-papers.c:1447 +#: src/main/escp2-papers.c:1495 src/main/escp2-papers.c:1543 +#: src/main/escp2-papers.c:1587 msgid "Transparencies" msgstr "" -#: src/main/print-lexmark.c:868 src/main/escp2-papers.c:1351 -#: src/main/escp2-papers.c:1395 src/main/escp2-papers.c:1439 -#: src/main/escp2-papers.c:1487 src/main/escp2-papers.c:1535 -#: src/main/escp2-papers.c:1579 +#: src/main/print-lexmark.c:868 src/main/escp2-papers.c:1361 +#: src/main/escp2-papers.c:1405 src/main/escp2-papers.c:1449 +#: src/main/escp2-papers.c:1497 src/main/escp2-papers.c:1545 +#: src/main/escp2-papers.c:1589 msgid "Envelopes" msgstr "" -#: src/main/print-lexmark.c:872 src/main/escp2-papers.c:1355 -#: src/main/escp2-papers.c:1399 src/main/escp2-papers.c:1443 -#: src/main/escp2-papers.c:1491 src/main/escp2-papers.c:1539 -#: src/main/escp2-papers.c:1583 +#: src/main/print-lexmark.c:872 src/main/escp2-papers.c:1365 +#: src/main/escp2-papers.c:1409 src/main/escp2-papers.c:1453 +#: src/main/escp2-papers.c:1501 src/main/escp2-papers.c:1549 +#: src/main/escp2-papers.c:1593 msgid "Matte Paper" msgstr "" -#: src/main/print-lexmark.c:876 src/main/escp2-papers.c:1359 -#: src/main/escp2-papers.c:1403 src/main/escp2-papers.c:1447 -#: src/main/escp2-papers.c:1495 src/main/escp2-papers.c:1543 -#: src/main/escp2-papers.c:1587 +#: src/main/print-lexmark.c:876 src/main/escp2-papers.c:1369 +#: src/main/escp2-papers.c:1413 src/main/escp2-papers.c:1457 +#: src/main/escp2-papers.c:1505 src/main/escp2-papers.c:1553 +#: src/main/escp2-papers.c:1597 msgid "Inkjet Paper" msgstr "" -#: src/main/print-lexmark.c:880 src/main/escp2-papers.c:1361 -#: src/main/escp2-papers.c:1405 src/main/escp2-papers.c:1449 -#: src/main/escp2-papers.c:1497 src/main/escp2-papers.c:1545 -#: src/main/escp2-papers.c:1589 +#: src/main/print-lexmark.c:880 src/main/escp2-papers.c:1371 +#: src/main/escp2-papers.c:1415 src/main/escp2-papers.c:1459 +#: src/main/escp2-papers.c:1507 src/main/escp2-papers.c:1555 +#: src/main/escp2-papers.c:1599 msgid "Photo Quality Inkjet Paper" msgstr "" -#: src/main/print-lexmark.c:884 src/main/escp2-papers.c:1363 -#: src/main/escp2-papers.c:1407 src/main/escp2-papers.c:1451 -#: src/main/escp2-papers.c:1499 src/main/escp2-papers.c:1547 -#: src/main/escp2-papers.c:1591 +#: src/main/print-lexmark.c:884 src/main/escp2-papers.c:1373 +#: src/main/escp2-papers.c:1417 src/main/escp2-papers.c:1461 +#: src/main/escp2-papers.c:1509 src/main/escp2-papers.c:1557 +#: src/main/escp2-papers.c:1601 msgid "Photo Paper" msgstr "" -#: src/main/print-lexmark.c:888 src/main/escp2-papers.c:1365 -#: src/main/escp2-papers.c:1409 src/main/escp2-papers.c:1453 -#: src/main/escp2-papers.c:1501 src/main/escp2-papers.c:1549 -#: src/main/escp2-papers.c:1593 src/main/escp2-papers.c:1617 +#: src/main/print-lexmark.c:888 src/main/escp2-papers.c:1375 +#: src/main/escp2-papers.c:1419 src/main/escp2-papers.c:1463 +#: src/main/escp2-papers.c:1511 src/main/escp2-papers.c:1559 +#: src/main/escp2-papers.c:1603 src/main/escp2-papers.c:1627 msgid "Premium Glossy Photo Paper" msgstr "" -#: src/main/print-lexmark.c:892 src/main/escp2-papers.c:1369 -#: src/main/escp2-papers.c:1413 src/main/escp2-papers.c:1457 -#: src/main/escp2-papers.c:1505 src/main/escp2-papers.c:1553 -#: src/main/escp2-papers.c:1597 +#: src/main/print-lexmark.c:892 src/main/escp2-papers.c:1379 +#: src/main/escp2-papers.c:1423 src/main/escp2-papers.c:1467 +#: src/main/escp2-papers.c:1515 src/main/escp2-papers.c:1563 +#: src/main/escp2-papers.c:1607 msgid "Premium Luster Photo Paper" msgstr "" -#: src/main/print-lexmark.c:896 src/main/escp2-papers.c:1371 -#: src/main/escp2-papers.c:1415 src/main/escp2-papers.c:1463 -#: src/main/escp2-papers.c:1511 src/main/escp2-papers.c:1555 -#: src/main/escp2-papers.c:1603 +#: src/main/print-lexmark.c:896 src/main/escp2-papers.c:1381 +#: src/main/escp2-papers.c:1425 src/main/escp2-papers.c:1473 +#: src/main/escp2-papers.c:1521 src/main/escp2-papers.c:1565 +#: src/main/escp2-papers.c:1613 msgid "Photo Quality Glossy Paper" msgstr "" -#: src/main/print-lexmark.c:900 src/main/escp2-papers.c:1373 -#: src/main/escp2-papers.c:1417 src/main/escp2-papers.c:1465 -#: src/main/escp2-papers.c:1513 src/main/escp2-papers.c:1557 -#: src/main/escp2-papers.c:1605 +#: src/main/print-lexmark.c:900 src/main/escp2-papers.c:1383 +#: src/main/escp2-papers.c:1427 src/main/escp2-papers.c:1475 +#: src/main/escp2-papers.c:1523 src/main/escp2-papers.c:1567 +#: src/main/escp2-papers.c:1615 msgid "Ilford Heavy Paper" msgstr "" -#: src/main/print-lexmark.c:904 src/main/escp2-papers.c:1377 -#: src/main/escp2-papers.c:1421 src/main/escp2-papers.c:1469 -#: src/main/escp2-papers.c:1517 src/main/escp2-papers.c:1561 -#: src/main/escp2-papers.c:1609 src/main/escp2-papers.c:1619 +#: src/main/print-lexmark.c:904 src/main/escp2-papers.c:1387 +#: src/main/escp2-papers.c:1431 src/main/escp2-papers.c:1479 +#: src/main/escp2-papers.c:1527 src/main/escp2-papers.c:1571 +#: src/main/escp2-papers.c:1619 src/main/escp2-papers.c:1629 msgid "Other" msgstr "" @@ -1445,50 +1566,50 @@ msgstr "" msgid "Manual without Pause" msgstr "" -#: src/main/print-olympus.c:277 +#: src/main/print-olympus.c:275 msgid "Coated" msgstr "" -#: src/main/print-olympus.c:278 src/cups/genppd.c:1726 src/cups/genppd.c:1753 -#: src/cups/genppd.c:1834 +#: src/main/print-olympus.c:276 src/cups/genppd.c:1732 src/cups/genppd.c:1759 +#: src/cups/genppd.c:1840 msgid "None" msgstr "" -#: src/main/print-olympus.c:963 src/main/print-olympus.c:1023 -#: src/main/print-olympus.c:1127 +#: src/main/print-olympus.c:961 src/main/print-olympus.c:1021 +#: src/main/print-olympus.c:1125 msgid "Glossy" msgstr "" -#: src/main/print-olympus.c:964 src/main/print-olympus.c:1024 -#: src/main/print-olympus.c:1128 +#: src/main/print-olympus.c:962 src/main/print-olympus.c:1022 +#: src/main/print-olympus.c:1126 msgid "Texture" msgstr "" -#: src/main/print-olympus.c:1025 src/main/print-olympus.c:1129 +#: src/main/print-olympus.c:1023 src/main/print-olympus.c:1127 msgid "Matte" msgstr "" -#: src/main/print-olympus.c:1729 src/main/print-olympus.c:1730 +#: src/main/print-olympus.c:1727 src/main/print-olympus.c:1728 msgid "Laminate Pattern" msgstr "" -#: src/main/print-olympus.c:1765 +#: src/main/print-olympus.c:1763 msgid "Adjust the cyan balance" msgstr "" -#: src/main/print-olympus.c:1773 +#: src/main/print-olympus.c:1771 msgid "Adjust the magenta balance" msgstr "" -#: src/main/print-olympus.c:1781 +#: src/main/print-olympus.c:1779 msgid "Adjust the yellow balance" msgstr "" -#: src/main/print-olympus.c:1788 +#: src/main/print-olympus.c:1786 msgid "Black Balance" msgstr "" -#: src/main/print-olympus.c:1789 +#: src/main/print-olympus.c:1787 msgid "Adjust the black balance" msgstr "" @@ -1520,91 +1641,114 @@ msgstr "" msgid "Quick-dry Transparency" msgstr "" -#: src/main/print-pcl.c:231 src/main/xmli18n-tmp.h:16 +#: src/main/print-pcl.c:238 src/main/xmli18n-tmp.h:17 msgid "Manual" msgstr "" -#: src/main/print-pcl.c:233 +#: src/main/print-pcl.c:240 +msgid "Tray 1 - Movable Guides" +msgstr "" + +#: src/main/print-pcl.c:241 msgid "Tray 1" msgstr "" -#: src/main/print-pcl.c:234 src/main/print-pcl.c:240 +#: src/main/print-pcl.c:242 +msgid "Tray 2 - Movable Guides" +msgstr "" + +#: src/main/print-pcl.c:243 src/main/print-pcl.c:251 msgid "Tray 2" msgstr "" -#: src/main/print-pcl.c:235 +#: src/main/print-pcl.c:244 +msgid "Tray 3 - Movable Guides" +msgstr "" + +#: src/main/print-pcl.c:245 msgid "Tray 3" msgstr "" -#: src/main/print-pcl.c:236 +#: src/main/print-pcl.c:246 +msgid "Tray 4 - Movable Guides" +msgstr "" + +#: src/main/print-pcl.c:247 msgid "Tray 4" msgstr "" -#: src/main/print-pcl.c:237 +#: src/main/print-pcl.c:248 msgid "Portable Sheet Feeder" msgstr "" -#: src/main/print-pcl.c:238 +#: src/main/print-pcl.c:249 msgid "Desktop Sheet Feeder" msgstr "" -#: src/main/print-pcl.c:239 +#: src/main/print-pcl.c:250 msgid "Tray" msgstr "" -#: src/main/print-pcl.c:241 +#: src/main/print-pcl.c:252 msgid "Optional Source" msgstr "" -#: src/main/print-pcl.c:242 +#: src/main/print-pcl.c:253 msgid "Autoselect" msgstr "" -#: src/main/print-pcl.c:256 +#: src/main/print-pcl.c:267 msgid "150x150 DPI" msgstr "" -#: src/main/print-pcl.c:257 +#: src/main/print-pcl.c:268 msgid "300x300 DPI" msgstr "" -#: src/main/print-pcl.c:258 +#: src/main/print-pcl.c:269 msgid "600x300 DPI" msgstr "" -#: src/main/print-pcl.c:259 +#: src/main/print-pcl.c:270 msgid "600x600 DPI monochrome" msgstr "" -#: src/main/print-pcl.c:260 +#: src/main/print-pcl.c:271 msgid "600x600 DPI" msgstr "" -#: src/main/print-pcl.c:261 +#: src/main/print-pcl.c:272 msgid "1200x600 DPI" msgstr "" -#: src/main/print-pcl.c:262 +#: src/main/print-pcl.c:273 msgid "2400x600 DPI" msgstr "" -#: src/main/print-pcl.c:1470 +#: src/main/print-pcl.c:1538 msgid "Color + Black Cartridges" msgstr "" -#: src/main/print-pcl.c:1471 +#: src/main/print-pcl.c:1539 msgid "Color + Photo Cartridges" msgstr "" -#: src/main/print-ps.c:97 +#: src/main/print-ps.c:68 msgid "PPDFile" msgstr "" -#: src/main/print-ps.c:98 src/gutenprintui/panel.c:1768 -#: src/gutenprintui2/panel.c:1768 +#: src/main/print-ps.c:69 src/gutenprintui2/panel.c:1943 msgid "PPD File" msgstr "" +#: src/main/print-ps.c:74 +msgid "Model Name" +msgstr "" + +#: src/main/print-ps.c:75 +msgid "PPD File Model Name" +msgstr "" + #: src/main/print-raw.c:223 msgid "Image dimensions must match paper dimensions" msgstr "" @@ -1620,259 +1764,264 @@ msgstr "" #: src/main/escp2-channels.c:1035 src/main/escp2-channels.c:1048 #: src/main/escp2-channels.c:1061 src/main/escp2-channels.c:1074 #: src/main/escp2-channels.c:1087 src/main/escp2-channels.c:1100 -#: src/main/escp2-channels.c:2505 src/main/escp2-channels.c:2528 -#: src/main/escp2-channels.c:2548 src/main/escp2-channels.c:2568 -#: src/main/escp2-channels.c:2588 src/main/escp2-channels.c:2608 +#: src/main/escp2-channels.c:2525 src/main/escp2-channels.c:2548 +#: src/main/escp2-channels.c:2568 src/main/escp2-channels.c:2588 +#: src/main/escp2-channels.c:2608 src/main/escp2-channels.c:2628 msgid "Quadtone" msgstr "" -#: src/main/escp2-channels.c:1604 src/main/escp2-channels.c:1618 +#: src/main/escp2-channels.c:1466 +msgid "Four Color Photo" +msgstr "" + +#: src/main/escp2-channels.c:1618 src/main/escp2-channels.c:1632 msgid "Six Color Enhanced Composite" msgstr "" -#: src/main/escp2-channels.c:1641 src/main/escp2-channels.c:1655 -#: src/main/escp2-channels.c:1669 src/main/escp2-channels.c:1705 +#: src/main/escp2-channels.c:1655 src/main/escp2-channels.c:1669 +#: src/main/escp2-channels.c:1683 src/main/escp2-channels.c:1719 msgid "Seven Color Photo" msgstr "" -#: src/main/escp2-channels.c:1691 +#: src/main/escp2-channels.c:1705 msgid "Seven Color Enhanced" msgstr "" -#: src/main/escp2-channels.c:1728 +#: src/main/escp2-channels.c:1742 msgid "Eight Color Photo" msgstr "" -#: src/main/escp2-channels.c:1876 src/main/escp2-channels.c:1888 -#: src/main/escp2-channels.c:1894 +#: src/main/escp2-channels.c:1890 src/main/escp2-channels.c:1902 +#: src/main/escp2-channels.c:1908 msgid "One Color Raw" msgstr "" -#: src/main/escp2-channels.c:1900 +#: src/main/escp2-channels.c:1914 msgid "One Color Raw Enhanced Gloss" msgstr "" -#: src/main/escp2-channels.c:1913 src/main/escp2-channels.c:1925 +#: src/main/escp2-channels.c:1927 src/main/escp2-channels.c:1939 msgid "Two Color Raw" msgstr "" -#: src/main/escp2-channels.c:1939 src/main/escp2-channels.c:1953 -#: src/main/escp2-channels.c:1980 src/main/escp2-channels.c:1993 -#: src/main/escp2-channels.c:2006 src/main/escp2-channels.c:2019 -#: src/main/escp2-channels.c:2033 src/main/escp2-channels.c:2047 -#: src/main/escp2-channels.c:2060 +#: src/main/escp2-channels.c:1953 src/main/escp2-channels.c:1967 +#: src/main/escp2-channels.c:1994 src/main/escp2-channels.c:2007 +#: src/main/escp2-channels.c:2020 src/main/escp2-channels.c:2033 +#: src/main/escp2-channels.c:2047 src/main/escp2-channels.c:2061 +#: src/main/escp2-channels.c:2074 msgid "Three Color Raw" msgstr "" -#: src/main/escp2-channels.c:1967 +#: src/main/escp2-channels.c:1981 msgid "Three Color Raw Gloss" msgstr "" -#: src/main/escp2-channels.c:2067 src/main/escp2-channels.c:2073 -#: src/main/escp2-channels.c:2079 src/main/escp2-channels.c:2085 -#: src/main/escp2-channels.c:2091 src/main/escp2-channels.c:2097 -#: src/main/escp2-channels.c:2103 src/main/escp2-channels.c:2109 -#: src/main/escp2-channels.c:2115 src/main/escp2-channels.c:2121 +#: src/main/escp2-channels.c:2081 src/main/escp2-channels.c:2087 +#: src/main/escp2-channels.c:2093 src/main/escp2-channels.c:2099 +#: src/main/escp2-channels.c:2105 src/main/escp2-channels.c:2111 +#: src/main/escp2-channels.c:2117 src/main/escp2-channels.c:2123 +#: src/main/escp2-channels.c:2129 src/main/escp2-channels.c:2135 +#: src/main/escp2-channels.c:2141 msgid "Four Color Raw" msgstr "" -#: src/main/escp2-channels.c:2127 +#: src/main/escp2-channels.c:2147 msgid "Four Color Raw Gloss" msgstr "" -#: src/main/escp2-channels.c:2142 src/main/escp2-channels.c:2156 +#: src/main/escp2-channels.c:2162 src/main/escp2-channels.c:2176 msgid "Five Color Raw" msgstr "" -#: src/main/escp2-channels.c:2170 src/main/escp2-channels.c:2186 -#: src/main/escp2-channels.c:2192 src/main/escp2-channels.c:2198 -#: src/main/escp2-channels.c:2213 src/main/escp2-channels.c:2234 +#: src/main/escp2-channels.c:2190 src/main/escp2-channels.c:2206 +#: src/main/escp2-channels.c:2212 src/main/escp2-channels.c:2218 +#: src/main/escp2-channels.c:2233 src/main/escp2-channels.c:2254 msgid "Six Color Raw" msgstr "" -#: src/main/escp2-channels.c:2219 +#: src/main/escp2-channels.c:2239 msgid "Six Color Enhanced Gloss Raw" msgstr "" -#: src/main/escp2-channels.c:2250 src/main/escp2-channels.c:2265 -#: src/main/escp2-channels.c:2280 +#: src/main/escp2-channels.c:2270 src/main/escp2-channels.c:2285 +#: src/main/escp2-channels.c:2300 msgid "Seven Color Raw" msgstr "" -#: src/main/escp2-channels.c:2297 +#: src/main/escp2-channels.c:2317 msgid "Seven Color Enhanced Gloss Raw" msgstr "" -#: src/main/escp2-channels.c:2315 +#: src/main/escp2-channels.c:2335 msgid "Eight Color Raw" msgstr "" -#: src/main/escp2-channels.c:2482 src/main/escp2-channels.c:2495 -#: src/main/escp2-channels.c:2497 src/main/escp2-channels.c:2517 -#: src/main/escp2-channels.c:2520 src/main/escp2-channels.c:2540 -#: src/main/escp2-channels.c:2560 src/main/escp2-channels.c:2580 -#: src/main/escp2-channels.c:2600 src/main/escp2-channels.c:2620 -#: src/main/escp2-channels.c:2636 src/main/escp2-channels.c:2638 -#: src/main/escp2-channels.c:2640 src/main/escp2-channels.c:2642 -#: src/main/escp2-channels.c:2658 src/main/escp2-channels.c:2674 -#: src/main/escp2-channels.c:2694 +#: src/main/escp2-channels.c:2502 src/main/escp2-channels.c:2515 +#: src/main/escp2-channels.c:2517 src/main/escp2-channels.c:2537 +#: src/main/escp2-channels.c:2540 src/main/escp2-channels.c:2560 +#: src/main/escp2-channels.c:2580 src/main/escp2-channels.c:2600 +#: src/main/escp2-channels.c:2620 src/main/escp2-channels.c:2640 +#: src/main/escp2-channels.c:2656 src/main/escp2-channels.c:2658 +#: src/main/escp2-channels.c:2660 src/main/escp2-channels.c:2662 +#: src/main/escp2-channels.c:2678 src/main/escp2-channels.c:2694 +#: src/main/escp2-channels.c:2714 msgid "EPSON Standard Inks" msgstr "" -#: src/main/escp2-channels.c:2714 src/main/escp2-channels.c:2739 +#: src/main/escp2-channels.c:2734 src/main/escp2-channels.c:2759 msgid "UltraChrome Photo Black" msgstr "" -#: src/main/escp2-channels.c:2718 src/main/escp2-channels.c:2743 +#: src/main/escp2-channels.c:2738 src/main/escp2-channels.c:2763 msgid "UltraChrome Matte Black" msgstr "" -#: src/main/escp2-channels.c:2758 src/main/escp2-channels.c:2796 -#: src/main/escp2-channels.c:3167 src/escputil/escputil.c:976 +#: src/main/escp2-channels.c:2778 src/main/escp2-channels.c:2816 +#: src/main/escp2-channels.c:3206 src/escputil/escputil.c:976 msgid "Photo Black" msgstr "" -#: src/main/escp2-channels.c:2762 src/main/escp2-channels.c:2778 -#: src/main/escp2-channels.c:3166 src/escputil/escputil.c:986 +#: src/main/escp2-channels.c:2782 src/main/escp2-channels.c:2798 +#: src/main/escp2-channels.c:3205 src/escputil/escputil.c:986 msgid "Matte Black" msgstr "" -#: src/main/escp2-channels.c:3092 src/main/escp2-channels.c:3102 -#: src/main/escp2-channels.c:3114 src/main/escp2-channels.c:3128 -#: src/main/escp2-channels.c:3141 src/main/escp2-channels.c:3154 -#: src/main/escp2-channels.c:3191 src/escputil/escputil.c:981 +#: src/main/escp2-channels.c:3131 src/main/escp2-channels.c:3141 +#: src/main/escp2-channels.c:3153 src/main/escp2-channels.c:3167 +#: src/main/escp2-channels.c:3180 src/main/escp2-channels.c:3193 +#: src/main/escp2-channels.c:3240 src/escputil/escputil.c:981 #: src/escputil/escputil.c:1204 msgid "Light Cyan" msgstr "" -#: src/main/escp2-channels.c:3093 src/main/escp2-channels.c:3104 -#: src/main/escp2-channels.c:3115 src/main/escp2-channels.c:3129 -#: src/main/escp2-channels.c:3142 src/main/escp2-channels.c:3155 -#: src/main/escp2-channels.c:3190 src/escputil/escputil.c:982 +#: src/main/escp2-channels.c:3132 src/main/escp2-channels.c:3143 +#: src/main/escp2-channels.c:3154 src/main/escp2-channels.c:3168 +#: src/main/escp2-channels.c:3181 src/main/escp2-channels.c:3194 +#: src/main/escp2-channels.c:3239 src/escputil/escputil.c:982 #: src/escputil/escputil.c:1205 msgid "Light Magenta" msgstr "" -#: src/main/escp2-channels.c:3130 src/main/escp2-channels.c:3192 +#: src/main/escp2-channels.c:3169 src/main/escp2-channels.c:3241 #: src/escputil/escputil.c:985 msgid "Light Black" msgstr "" -#: src/main/escp2-channels.c:3143 +#: src/main/escp2-channels.c:3182 msgid "Dark Yellow" msgstr "" -#: src/main/escp2-channels.c:3170 src/escputil/escputil.c:989 +#: src/main/escp2-channels.c:3209 src/escputil/escputil.c:989 msgid "Gloss Optimizer" msgstr "" -#: src/main/escp2-channels.c:3189 src/escputil/escputil.c:990 +#: src/main/escp2-channels.c:3238 src/escputil/escputil.c:990 msgid "Light Light Black" msgstr "" -#: src/main/escp2-papers.c:1343 src/main/escp2-papers.c:1387 -#: src/main/escp2-papers.c:1431 src/main/escp2-papers.c:1479 -#: src/main/escp2-papers.c:1527 src/main/escp2-papers.c:1571 +#: src/main/escp2-papers.c:1353 src/main/escp2-papers.c:1397 +#: src/main/escp2-papers.c:1441 src/main/escp2-papers.c:1489 +#: src/main/escp2-papers.c:1537 src/main/escp2-papers.c:1581 msgid "Plain Paper Fast Load" msgstr "" -#: src/main/escp2-papers.c:1345 src/main/escp2-papers.c:1389 -#: src/main/escp2-papers.c:1433 src/main/escp2-papers.c:1481 -#: src/main/escp2-papers.c:1529 src/main/escp2-papers.c:1573 +#: src/main/escp2-papers.c:1355 src/main/escp2-papers.c:1399 +#: src/main/escp2-papers.c:1443 src/main/escp2-papers.c:1491 +#: src/main/escp2-papers.c:1539 src/main/escp2-papers.c:1583 #: src/main/xmli18n-tmp.h:5 msgid "Postcard" msgstr "" -#: src/main/escp2-papers.c:1353 src/main/escp2-papers.c:1397 -#: src/main/escp2-papers.c:1441 src/main/escp2-papers.c:1489 -#: src/main/escp2-papers.c:1537 src/main/escp2-papers.c:1581 +#: src/main/escp2-papers.c:1363 src/main/escp2-papers.c:1407 +#: src/main/escp2-papers.c:1451 src/main/escp2-papers.c:1499 +#: src/main/escp2-papers.c:1547 src/main/escp2-papers.c:1591 msgid "Back Light Film" msgstr "" -#: src/main/escp2-papers.c:1357 src/main/escp2-papers.c:1401 -#: src/main/escp2-papers.c:1445 src/main/escp2-papers.c:1493 -#: src/main/escp2-papers.c:1541 src/main/escp2-papers.c:1585 -msgid "Matte Paper Heavyweight" -msgstr "" - #: src/main/escp2-papers.c:1367 src/main/escp2-papers.c:1411 #: src/main/escp2-papers.c:1455 src/main/escp2-papers.c:1503 #: src/main/escp2-papers.c:1551 src/main/escp2-papers.c:1595 +msgid "Matte Paper Heavyweight" +msgstr "" + +#: src/main/escp2-papers.c:1377 src/main/escp2-papers.c:1421 +#: src/main/escp2-papers.c:1465 src/main/escp2-papers.c:1513 +#: src/main/escp2-papers.c:1561 src/main/escp2-papers.c:1605 msgid "Premium Semigloss Photo Paper" msgstr "" -#: src/main/escp2-papers.c:1375 src/main/escp2-papers.c:1419 -#: src/main/escp2-papers.c:1467 src/main/escp2-papers.c:1515 -#: src/main/escp2-papers.c:1559 src/main/escp2-papers.c:1607 +#: src/main/escp2-papers.c:1385 src/main/escp2-papers.c:1429 +#: src/main/escp2-papers.c:1477 src/main/escp2-papers.c:1525 +#: src/main/escp2-papers.c:1569 src/main/escp2-papers.c:1617 msgid "ColorLife Paper" msgstr "" -#: src/main/escp2-papers.c:1459 src/main/escp2-papers.c:1507 -#: src/main/escp2-papers.c:1599 +#: src/main/escp2-papers.c:1469 src/main/escp2-papers.c:1517 +#: src/main/escp2-papers.c:1609 msgid "Archival Matte Paper" msgstr "" -#: src/main/escp2-papers.c:1461 src/main/escp2-papers.c:1509 -#: src/main/escp2-papers.c:1601 +#: src/main/escp2-papers.c:1471 src/main/escp2-papers.c:1519 +#: src/main/escp2-papers.c:1611 msgid "Watercolor Paper - Radiant White" msgstr "" -#: src/main/escp2-papers.c:1716 src/main/escp2-papers.c:1842 -#: src/main/escp2-papers.c:1884 src/main/escp2-papers.c:1926 -#: src/main/escp2-papers.c:2001 +#: src/main/escp2-papers.c:1727 src/main/escp2-papers.c:1853 +#: src/main/escp2-papers.c:1895 src/main/escp2-papers.c:1937 +#: src/main/escp2-papers.c:2012 msgid "Roll Feed" msgstr "" -#: src/main/escp2-papers.c:1740 src/main/escp2-papers.c:1791 +#: src/main/escp2-papers.c:1751 src/main/escp2-papers.c:1802 msgid "Roll Feed (cut each page)" msgstr "" -#: src/main/escp2-papers.c:1749 src/main/escp2-papers.c:1800 +#: src/main/escp2-papers.c:1760 src/main/escp2-papers.c:1811 msgid "Roll Feed (do not cut)" msgstr "" -#: src/main/escp2-papers.c:1773 src/main/escp2-papers.c:1824 +#: src/main/escp2-papers.c:1784 src/main/escp2-papers.c:1835 msgid "Manual Feed" msgstr "" -#: src/main/escp2-papers.c:1782 src/main/escp2-papers.c:1833 -#: src/main/escp2-papers.c:1935 src/main/escp2-papers.c:1968 +#: src/main/escp2-papers.c:1793 src/main/escp2-papers.c:1844 +#: src/main/escp2-papers.c:1946 src/main/escp2-papers.c:1979 msgid "Print to CD" msgstr "" -#: src/main/escp2-papers.c:1866 src/main/escp2-papers.c:1908 +#: src/main/escp2-papers.c:1877 src/main/escp2-papers.c:1919 msgid "Manual Sheet Guide" msgstr "" -#: src/main/escp2-papers.c:1875 src/main/escp2-papers.c:1917 +#: src/main/escp2-papers.c:1886 src/main/escp2-papers.c:1928 msgid "Manual Feed (Front)" msgstr "" -#: src/main/escp2-papers.c:1950 +#: src/main/escp2-papers.c:1961 msgid "Rear Tray" msgstr "" -#: src/main/escp2-papers.c:1959 +#: src/main/escp2-papers.c:1970 msgid "Front Tray" msgstr "" -#: src/main/escp2-papers.c:1977 +#: src/main/escp2-papers.c:1988 msgid "Photo Board" msgstr "" -#: src/main/escp2-papers.c:2016 +#: src/main/escp2-papers.c:2027 msgid "Cut Sheet Bin 1" msgstr "" -#: src/main/escp2-papers.c:2025 +#: src/main/escp2-papers.c:2036 msgid "Cut Sheet Bin 2" msgstr "" -#: src/main/escp2-papers.c:2034 +#: src/main/escp2-papers.c:2045 msgid "Cut Sheet Autoselect" msgstr "" -#: src/main/escp2-papers.c:2043 +#: src/main/escp2-papers.c:2054 msgid "Manual Selection" msgstr "" @@ -2009,42 +2158,48 @@ msgid "Eight Pass" msgstr "" #: src/main/escp2-resolutions.c:637 src/main/escp2-resolutions.c:652 -#: src/main/generic-options.c:33 +#: src/main/escp2-resolutions.c:667 src/main/generic-options.c:33 msgid "Fast Economy" msgstr "" #: src/main/escp2-resolutions.c:638 src/main/escp2-resolutions.c:653 -#: src/main/generic-options.c:34 +#: src/main/escp2-resolutions.c:668 src/main/generic-options.c:34 msgid "Economy" msgstr "" #: src/main/escp2-resolutions.c:639 src/main/escp2-resolutions.c:654 -#: src/main/escp2-resolutions.c:667 src/main/generic-options.c:35 +#: src/main/escp2-resolutions.c:669 src/main/escp2-resolutions.c:682 +#: src/main/generic-options.c:35 msgid "Draft" msgstr "" #: src/main/escp2-resolutions.c:641 src/main/escp2-resolutions.c:656 -#: src/main/escp2-resolutions.c:670 src/main/generic-options.c:37 +#: src/main/escp2-resolutions.c:671 src/main/escp2-resolutions.c:685 +#: src/main/generic-options.c:37 msgid "High" msgstr "" #: src/main/escp2-resolutions.c:642 src/main/escp2-resolutions.c:657 -#: src/main/escp2-resolutions.c:669 src/main/generic-options.c:38 +#: src/main/escp2-resolutions.c:672 src/main/escp2-resolutions.c:684 +#: src/main/generic-options.c:38 msgid "Photo" msgstr "" #: src/main/escp2-resolutions.c:643 src/main/escp2-resolutions.c:658 -#: src/main/escp2-resolutions.c:671 src/main/generic-options.c:39 +#: src/main/escp2-resolutions.c:673 src/main/escp2-resolutions.c:686 +#: src/main/generic-options.c:39 msgid "Super Photo" msgstr "" #: src/main/escp2-resolutions.c:644 src/main/escp2-resolutions.c:659 -#: src/main/escp2-resolutions.c:672 src/main/generic-options.c:40 +#: src/main/escp2-resolutions.c:674 src/main/escp2-resolutions.c:687 +#: src/main/generic-options.c:40 msgid "Ultra Photo" msgstr "" #: src/main/escp2-resolutions.c:645 src/main/escp2-resolutions.c:660 -#: src/main/escp2-resolutions.c:673 src/main/generic-options.c:41 +#: src/main/escp2-resolutions.c:675 src/main/escp2-resolutions.c:688 +#: src/main/generic-options.c:41 msgid "Best" msgstr "" @@ -2121,4091 +2276,4346 @@ msgid "3x5" msgstr "" #: src/main/xmli18n-tmp.h:10 -msgid "4x6" +msgid "3 1/2 x5" msgstr "" #: src/main/xmli18n-tmp.h:11 -msgid "Epson 4x6 Photo Paper (tear-off borders)" +msgid "4x6" msgstr "" #: src/main/xmli18n-tmp.h:12 -msgid "5x7" +msgid "Epson 4x6 Photo Paper (tear-off borders)" msgstr "" #: src/main/xmli18n-tmp.h:13 -msgid "5x8" +msgid "5x7" msgstr "" #: src/main/xmli18n-tmp.h:14 -msgid "6x8" +msgid "5x8" msgstr "" #: src/main/xmli18n-tmp.h:15 +msgid "6x8" +msgstr "" + +#: src/main/xmli18n-tmp.h:16 msgid "8x10" msgstr "" -#: src/main/xmli18n-tmp.h:17 +#: src/main/xmli18n-tmp.h:18 msgid "12x18" msgstr "" -#: src/main/xmli18n-tmp.h:18 +#: src/main/xmli18n-tmp.h:19 msgid "Super B 13x19" msgstr "" -#: src/main/xmli18n-tmp.h:19 +#: src/main/xmli18n-tmp.h:20 msgid "Engineering C 17x22" msgstr "" -#: src/main/xmli18n-tmp.h:20 +#: src/main/xmli18n-tmp.h:21 msgid "8x12" msgstr "" -#: src/main/xmli18n-tmp.h:21 +#: src/main/xmli18n-tmp.h:22 msgid "11x14" msgstr "" -#: src/main/xmli18n-tmp.h:22 +#: src/main/xmli18n-tmp.h:23 msgid "16x20" msgstr "" -#: src/main/xmli18n-tmp.h:23 +#: src/main/xmli18n-tmp.h:24 msgid "16x24" msgstr "" -#: src/main/xmli18n-tmp.h:24 +#: src/main/xmli18n-tmp.h:25 msgid "20x24" msgstr "" -#: src/main/xmli18n-tmp.h:25 +#: src/main/xmli18n-tmp.h:26 msgid "20x30" msgstr "" -#: src/main/xmli18n-tmp.h:26 +#: src/main/xmli18n-tmp.h:27 msgid "22x30" msgstr "" -#: src/main/xmli18n-tmp.h:27 +#: src/main/xmli18n-tmp.h:28 msgid "24x30" msgstr "" -#: src/main/xmli18n-tmp.h:28 +#: src/main/xmli18n-tmp.h:29 msgid "Super A1 24x36" msgstr "" -#: src/main/xmli18n-tmp.h:29 +#: src/main/xmli18n-tmp.h:30 msgid "30x40" msgstr "" -#: src/main/xmli18n-tmp.h:30 +#: src/main/xmli18n-tmp.h:31 msgid "4A" msgstr "" -#: src/main/xmli18n-tmp.h:31 +#: src/main/xmli18n-tmp.h:32 msgid "2A" msgstr "" -#: src/main/xmli18n-tmp.h:32 +#: src/main/xmli18n-tmp.h:33 msgid "Super A0" msgstr "" -#: src/main/xmli18n-tmp.h:33 +#: src/main/xmli18n-tmp.h:34 msgid "A0" msgstr "" -#: src/main/xmli18n-tmp.h:34 +#: src/main/xmli18n-tmp.h:35 msgid "A1" msgstr "" -#: src/main/xmli18n-tmp.h:35 +#: src/main/xmli18n-tmp.h:36 msgid "A2" msgstr "" -#: src/main/xmli18n-tmp.h:36 +#: src/main/xmli18n-tmp.h:37 msgid "A3" msgstr "" -#: src/main/xmli18n-tmp.h:37 +#: src/main/xmli18n-tmp.h:38 msgid "A4" msgstr "" -#: src/main/xmli18n-tmp.h:38 +#: src/main/xmli18n-tmp.h:39 msgid "A5" msgstr "" -#: src/main/xmli18n-tmp.h:39 +#: src/main/xmli18n-tmp.h:40 msgid "A6" msgstr "" -#: src/main/xmli18n-tmp.h:40 +#: src/main/xmli18n-tmp.h:41 msgid "A7" msgstr "" -#: src/main/xmli18n-tmp.h:41 +#: src/main/xmli18n-tmp.h:42 msgid "A8" msgstr "" -#: src/main/xmli18n-tmp.h:42 +#: src/main/xmli18n-tmp.h:43 msgid "A9" msgstr "" -#: src/main/xmli18n-tmp.h:43 +#: src/main/xmli18n-tmp.h:44 msgid "A10" msgstr "" -#: src/main/xmli18n-tmp.h:44 +#: src/main/xmli18n-tmp.h:45 msgid "RA0" msgstr "" -#: src/main/xmli18n-tmp.h:45 +#: src/main/xmli18n-tmp.h:46 msgid "RA1" msgstr "" -#: src/main/xmli18n-tmp.h:46 -msgid "RA2" -msgstr "" - #: src/main/xmli18n-tmp.h:47 -msgid "RA3" +msgid "RA2" msgstr "" #: src/main/xmli18n-tmp.h:48 -msgid "RA4" +msgid "RA3" msgstr "" #: src/main/xmli18n-tmp.h:49 -msgid "SRA0" +msgid "RA4" msgstr "" #: src/main/xmli18n-tmp.h:50 -msgid "SRA1" +msgid "SRA0" msgstr "" #: src/main/xmli18n-tmp.h:51 -msgid "SRA2" +msgid "SRA1" msgstr "" #: src/main/xmli18n-tmp.h:52 -msgid "SRA3" +msgid "SRA2" msgstr "" #: src/main/xmli18n-tmp.h:53 -msgid "SRA4" +msgid "SRA3" msgstr "" #: src/main/xmli18n-tmp.h:54 -msgid "4B ISO" +msgid "SRA4" msgstr "" #: src/main/xmli18n-tmp.h:55 -msgid "2B ISO" +msgid "4B ISO" msgstr "" #: src/main/xmli18n-tmp.h:56 -msgid "B0 ISO" +msgid "2B ISO" msgstr "" #: src/main/xmli18n-tmp.h:57 -msgid "B1 ISO" +msgid "B0 ISO" msgstr "" #: src/main/xmli18n-tmp.h:58 -msgid "B2 ISO" +msgid "B1 ISO" msgstr "" #: src/main/xmli18n-tmp.h:59 -msgid "B3 ISO" +msgid "B2 ISO" msgstr "" #: src/main/xmli18n-tmp.h:60 -msgid "B4 ISO" +msgid "B3 ISO" msgstr "" #: src/main/xmli18n-tmp.h:61 -msgid "B5 ISO" +msgid "B4 ISO" msgstr "" #: src/main/xmli18n-tmp.h:62 -msgid "B6 ISO" +msgid "B5 ISO" msgstr "" #: src/main/xmli18n-tmp.h:63 -msgid "B7 ISO" +msgid "B6 ISO" msgstr "" #: src/main/xmli18n-tmp.h:64 -msgid "B8 ISO" +msgid "B7 ISO" msgstr "" #: src/main/xmli18n-tmp.h:65 -msgid "B9 ISO" +msgid "B8 ISO" msgstr "" #: src/main/xmli18n-tmp.h:66 -msgid "B10 ISO" +msgid "B9 ISO" msgstr "" #: src/main/xmli18n-tmp.h:67 -msgid "Super B0 JIS" +msgid "B10 ISO" msgstr "" #: src/main/xmli18n-tmp.h:68 -msgid "B0 JIS" +msgid "Super B0 JIS" msgstr "" #: src/main/xmli18n-tmp.h:69 -msgid "B1 JIS" +msgid "B0 JIS" msgstr "" #: src/main/xmli18n-tmp.h:70 -msgid "B2 JIS" +msgid "B1 JIS" msgstr "" #: src/main/xmli18n-tmp.h:71 -msgid "B3 JIS" +msgid "B2 JIS" msgstr "" #: src/main/xmli18n-tmp.h:72 -msgid "B4 JIS" +msgid "B3 JIS" msgstr "" #: src/main/xmli18n-tmp.h:73 -msgid "B5 JIS" +msgid "B4 JIS" msgstr "" #: src/main/xmli18n-tmp.h:74 -msgid "B6 JIS" +msgid "B5 JIS" msgstr "" #: src/main/xmli18n-tmp.h:75 -msgid "B7 JIS" +msgid "B6 JIS" msgstr "" #: src/main/xmli18n-tmp.h:76 -msgid "B8 JIS" +msgid "B7 JIS" msgstr "" #: src/main/xmli18n-tmp.h:77 -msgid "B9 JIS" +msgid "B8 JIS" msgstr "" #: src/main/xmli18n-tmp.h:78 -msgid "B10 JIS" +msgid "B9 JIS" msgstr "" #: src/main/xmli18n-tmp.h:79 -msgid "C0" +msgid "B10 JIS" msgstr "" #: src/main/xmli18n-tmp.h:80 -msgid "C1" +msgid "C0" msgstr "" #: src/main/xmli18n-tmp.h:81 -msgid "C2" +msgid "C0 landscape" msgstr "" #: src/main/xmli18n-tmp.h:82 -msgid "C3" +msgid "C1" msgstr "" #: src/main/xmli18n-tmp.h:83 -msgid "C4" +msgid "C1 landscape" msgstr "" #: src/main/xmli18n-tmp.h:84 -msgid "C5" +msgid "C2" msgstr "" #: src/main/xmli18n-tmp.h:85 -msgid "B6-C4" +msgid "C2 landscape" msgstr "" #: src/main/xmli18n-tmp.h:86 -msgid "C6" +msgid "C3" msgstr "" #: src/main/xmli18n-tmp.h:87 -msgid "DL" +msgid "C3 landscape" msgstr "" #: src/main/xmli18n-tmp.h:88 -msgid "C7-6" +msgid "C4" msgstr "" #: src/main/xmli18n-tmp.h:89 -msgid "C7" +msgid "C4 landscape" msgstr "" #: src/main/xmli18n-tmp.h:90 -msgid "C8" +msgid "C5" msgstr "" #: src/main/xmli18n-tmp.h:91 -msgid "C9" +msgid "C5 landscape" msgstr "" #: src/main/xmli18n-tmp.h:92 -msgid "C10" +msgid "B6-C4" msgstr "" #: src/main/xmli18n-tmp.h:93 -msgid "ArchA" +msgid "B6-C4 landscape" msgstr "" #: src/main/xmli18n-tmp.h:94 -msgid "ArchA transposed" +msgid "C6" msgstr "" #: src/main/xmli18n-tmp.h:95 -msgid "ArchB" +msgid "C6 landscape" msgstr "" #: src/main/xmli18n-tmp.h:96 -msgid "ArchB transposed" +msgid "DL" msgstr "" #: src/main/xmli18n-tmp.h:97 -msgid "ArchC" +msgid "DL landscape" msgstr "" #: src/main/xmli18n-tmp.h:98 -msgid "ArchC transposed" +msgid "C7-6" msgstr "" #: src/main/xmli18n-tmp.h:99 -msgid "ArchD" +msgid "C7-6 landscape" msgstr "" #: src/main/xmli18n-tmp.h:100 -msgid "ArchD transposed" +msgid "C7" msgstr "" #: src/main/xmli18n-tmp.h:101 -msgid "ArchE" +msgid "C7 landscape" msgstr "" #: src/main/xmli18n-tmp.h:102 -msgid "ArchE transposed" +msgid "C8" msgstr "" #: src/main/xmli18n-tmp.h:103 -msgid "American foolscap" +msgid "C8 landscape" msgstr "" #: src/main/xmli18n-tmp.h:104 -msgid "European foolscap" +msgid "C9" msgstr "" #: src/main/xmli18n-tmp.h:105 -msgid "Crown Quarto" +msgid "C9 landscape" msgstr "" #: src/main/xmli18n-tmp.h:106 -msgid "Large Crown Quarto" +msgid "C10" msgstr "" #: src/main/xmli18n-tmp.h:107 -msgid "Demy Quarto" +msgid "C10 landscape" msgstr "" #: src/main/xmli18n-tmp.h:108 -msgid "Royal Quarto" +msgid "ArchA" msgstr "" #: src/main/xmli18n-tmp.h:109 -msgid "ISO A4" +msgid "ArchA transposed" msgstr "" #: src/main/xmli18n-tmp.h:110 -msgid "Crown Octavo" +msgid "ArchB" msgstr "" #: src/main/xmli18n-tmp.h:111 -msgid "Large Crown Octavo" +msgid "ArchB transposed" msgstr "" #: src/main/xmli18n-tmp.h:112 -msgid "Demy Octavo" +msgid "ArchC" msgstr "" #: src/main/xmli18n-tmp.h:113 -msgid "Royal Octavo" +msgid "ArchC transposed" msgstr "" #: src/main/xmli18n-tmp.h:114 -msgid "ISO A5" +msgid "ArchD" msgstr "" #: src/main/xmli18n-tmp.h:115 -msgid "Small paperback" +msgid "ArchD transposed" msgstr "" #: src/main/xmli18n-tmp.h:116 -msgid "Penguin small paperback" +msgid "ArchE" msgstr "" #: src/main/xmli18n-tmp.h:117 -msgid "Penguin large paperback" +msgid "ArchE transposed" msgstr "" #: src/main/xmli18n-tmp.h:118 -msgid "10cm x 15cm" +msgid "American foolscap" msgstr "" #: src/main/xmli18n-tmp.h:119 -msgid "Hagaki Card" +msgid "European foolscap" msgstr "" #: src/main/xmli18n-tmp.h:120 -msgid "Oufuku Card" +msgid "Crown Quarto" msgstr "" #: src/main/xmli18n-tmp.h:121 -msgid "Japanese long envelope #3" +msgid "Large Crown Quarto" msgstr "" #: src/main/xmli18n-tmp.h:122 -msgid "Japanese long envelope #4" +msgid "Demy Quarto" msgstr "" #: src/main/xmli18n-tmp.h:123 -msgid "Japanese Kaku envelope #4" +msgid "Royal Quarto" msgstr "" #: src/main/xmli18n-tmp.h:124 -msgid "Commercial 10" +msgid "ISO A4" msgstr "" #: src/main/xmli18n-tmp.h:125 -msgid "A2 Invitation" +msgid "Crown Octavo" msgstr "" #: src/main/xmli18n-tmp.h:126 -msgid "Monarch Envelope" +msgid "Large Crown Octavo" msgstr "" #: src/main/xmli18n-tmp.h:127 -msgid "4x5 3/8" +msgid "Demy Octavo" msgstr "" #: src/main/xmli18n-tmp.h:128 -msgid "4x7" +msgid "Royal Octavo" msgstr "" #: src/main/xmli18n-tmp.h:129 -msgid "CP_L" +msgid "ISO A5" msgstr "" #: src/main/xmli18n-tmp.h:130 -msgid "Card" +msgid "Small paperback" msgstr "" #: src/main/xmli18n-tmp.h:131 -msgid "Wide Postcard" +msgid "Penguin small paperback" msgstr "" #: src/main/xmli18n-tmp.h:132 -msgid "Chilean Office" +msgid "Penguin large paperback" msgstr "" #: src/main/xmli18n-tmp.h:133 -msgid "Chilean Double Letter" +msgid "10cm x 15cm" msgstr "" #: src/main/xmli18n-tmp.h:134 -msgid "Chilean Double Office" +msgid "Hagaki Card" msgstr "" #: src/main/xmli18n-tmp.h:135 -msgid "Custom" +msgid "Oufuku Card" msgstr "" #: src/main/xmli18n-tmp.h:136 -msgid "89 mm Roll Paper" +msgid "Japanese long envelope #3" msgstr "" #: src/main/xmli18n-tmp.h:137 -msgid "4 Inch Roll Paper" +msgid "Japanese long envelope #3 landscape" msgstr "" #: src/main/xmli18n-tmp.h:138 -msgid "5 Inch Roll Paper" +msgid "Japanese long envelope #4" msgstr "" #: src/main/xmli18n-tmp.h:139 -msgid "210 mm Roll Paper" +msgid "Japanese long envelope #4 landscape" msgstr "" #: src/main/xmli18n-tmp.h:140 -msgid "13 Inch Roll Paper" +msgid "Japanese Kaku envelope #4" msgstr "" #: src/main/xmli18n-tmp.h:141 -msgid "22 Inch Roll Paper" +msgid "Japanese Kaku envelope #4 landscape" msgstr "" #: src/main/xmli18n-tmp.h:142 -msgid "24 Inch Roll Paper" +msgid "Commercial 10" msgstr "" #: src/main/xmli18n-tmp.h:143 -msgid "36 Inch Roll Paper" +msgid "Commercial 10 landscape" msgstr "" #: src/main/xmli18n-tmp.h:144 -msgid "44 Inch Roll Paper" +msgid "A2 Invitation" msgstr "" #: src/main/xmli18n-tmp.h:145 -msgid "PostScript Level 1" +msgid "Monarch Envelope" msgstr "" #: src/main/xmli18n-tmp.h:146 -msgid "PostScript Level 2" +msgid "Monarch Envelope landscape" msgstr "" #: src/main/xmli18n-tmp.h:147 -msgid "Canon BJ-30" +msgid "4x5 3/8" msgstr "" #: src/main/xmli18n-tmp.h:148 -msgid "Canon BJC-50" +msgid "4x7" msgstr "" #: src/main/xmli18n-tmp.h:149 -msgid "Canon BJC-55" +msgid "CP_L" msgstr "" #: src/main/xmli18n-tmp.h:150 -msgid "Canon BJC-80" +msgid "Card" msgstr "" #: src/main/xmli18n-tmp.h:151 -msgid "Canon BJC-85" +msgid "Wide Postcard" msgstr "" #: src/main/xmli18n-tmp.h:152 -msgid "Canon BJC-210" +msgid "Chilean Office" msgstr "" #: src/main/xmli18n-tmp.h:153 -msgid "Canon BJC-240" +msgid "Chilean Double Letter" msgstr "" #: src/main/xmli18n-tmp.h:154 -msgid "Canon BJC-250" +msgid "Chilean Double Office" msgstr "" #: src/main/xmli18n-tmp.h:155 -msgid "Canon BJC-1000" +msgid "Custom" msgstr "" #: src/main/xmli18n-tmp.h:156 -msgid "Canon BJC-2000" +msgid "89 mm Roll Paper" msgstr "" #: src/main/xmli18n-tmp.h:157 -msgid "Canon BJC-2010" +msgid "4 Inch Roll Paper" msgstr "" #: src/main/xmli18n-tmp.h:158 -msgid "Canon BJC-2100" +msgid "5 Inch Roll Paper" msgstr "" #: src/main/xmli18n-tmp.h:159 -msgid "Canon BJC-2110" +msgid "210 mm Roll Paper" msgstr "" #: src/main/xmli18n-tmp.h:160 -msgid "Canon BJC-3000" +msgid "13 Inch Roll Paper" msgstr "" #: src/main/xmli18n-tmp.h:161 -msgid "Canon BJC-4000" +msgid "22 Inch Roll Paper" msgstr "" #: src/main/xmli18n-tmp.h:162 -msgid "Canon BJC-4300" +msgid "24 Inch Roll Paper" msgstr "" #: src/main/xmli18n-tmp.h:163 -msgid "Canon BJC-4400" +msgid "36 Inch Roll Paper" msgstr "" #: src/main/xmli18n-tmp.h:164 -msgid "Canon BJC-5100" +msgid "44 Inch Roll Paper" msgstr "" #: src/main/xmli18n-tmp.h:165 -msgid "Canon BJC-5500" +msgid "PostScript Level 1" msgstr "" #: src/main/xmli18n-tmp.h:166 -msgid "Canon BJC-6000" +msgid "PostScript Level 2" msgstr "" #: src/main/xmli18n-tmp.h:167 -msgid "Canon BJC-6100" +msgid "Canon BJ-30" msgstr "" #: src/main/xmli18n-tmp.h:168 -msgid "Canon BJC-6200" +msgid "Canon BJC-50" msgstr "" #: src/main/xmli18n-tmp.h:169 -msgid "Canon BJC-6500" +msgid "Canon BJC-55" msgstr "" #: src/main/xmli18n-tmp.h:170 -msgid "Canon BJC-7000" +msgid "Canon BJC-80" msgstr "" #: src/main/xmli18n-tmp.h:171 -msgid "Canon BJC-7100" +msgid "Canon BJC-85" msgstr "" #: src/main/xmli18n-tmp.h:172 -msgid "Canon BJC-8200" +msgid "Canon BJC-210" msgstr "" #: src/main/xmli18n-tmp.h:173 -msgid "Canon BJC-8500" +msgid "Canon BJC-240" msgstr "" #: src/main/xmli18n-tmp.h:174 -msgid "Canon S100" +msgid "Canon BJC-250" msgstr "" #: src/main/xmli18n-tmp.h:175 -msgid "Canon S200" +msgid "Canon BJC-1000" msgstr "" #: src/main/xmli18n-tmp.h:176 -msgid "Canon S300" +msgid "Canon BJC-2000" msgstr "" #: src/main/xmli18n-tmp.h:177 -msgid "Canon S400" +msgid "Canon BJC-2010" msgstr "" #: src/main/xmli18n-tmp.h:178 -msgid "Canon S450" +msgid "Canon BJC-2100" msgstr "" #: src/main/xmli18n-tmp.h:179 -msgid "Canon S500" +msgid "Canon BJC-2110" msgstr "" #: src/main/xmli18n-tmp.h:180 -msgid "Canon S600" +msgid "Canon BJC-3000" msgstr "" #: src/main/xmli18n-tmp.h:181 -msgid "Canon S630" +msgid "Canon BJC-4000" msgstr "" #: src/main/xmli18n-tmp.h:182 -msgid "Canon S800" +msgid "Canon BJC-4300" msgstr "" #: src/main/xmli18n-tmp.h:183 -msgid "Canon S4500" +msgid "Canon BJC-4400" msgstr "" #: src/main/xmli18n-tmp.h:184 -msgid "Canon PIXMA iP2000" +msgid "Canon BJC-5100" msgstr "" #: src/main/xmli18n-tmp.h:185 -msgid "Canon PIXMA iP3000" +msgid "Canon BJC-5500" msgstr "" #: src/main/xmli18n-tmp.h:186 -msgid "Canon PIXMA iP3100" +msgid "Canon BJC-6000" msgstr "" #: src/main/xmli18n-tmp.h:187 -msgid "Canon PIXMA iP4000" +msgid "Canon BJC-6100" msgstr "" #: src/main/xmli18n-tmp.h:188 -msgid "Canon PIXMA iP4100" +msgid "Canon BJC-6200" msgstr "" #: src/main/xmli18n-tmp.h:189 -msgid "Canon PIXMA iP4200" +msgid "Canon BJC-6500" msgstr "" #: src/main/xmli18n-tmp.h:190 -msgid "Canon PIXMA iP4300" +msgid "Canon BJC-7000" msgstr "" #: src/main/xmli18n-tmp.h:191 -msgid "Canon PIXMA iP4500" +msgid "Canon BJC-7100" msgstr "" #: src/main/xmli18n-tmp.h:192 -msgid "Canon PIXMA iP5000" +msgid "Canon BJC-8200" msgstr "" #: src/main/xmli18n-tmp.h:193 -msgid "Canon PIXMA iP5200" +msgid "Canon BJC-8500" msgstr "" #: src/main/xmli18n-tmp.h:194 -msgid "Canon PIXMA iP5300" +msgid "Canon S100" msgstr "" #: src/main/xmli18n-tmp.h:195 -msgid "Canon PIXMA iP6700" +msgid "Canon S200" msgstr "" #: src/main/xmli18n-tmp.h:196 -msgid "Canon PIXMA iP8500" +msgid "Canon S300" msgstr "" #: src/main/xmli18n-tmp.h:197 -msgid "Canon PIXMA iX5000" +msgid "Canon S400" msgstr "" #: src/main/xmli18n-tmp.h:198 -msgid "Canon PIXMA Pro9500" +msgid "Canon S450" msgstr "" #: src/main/xmli18n-tmp.h:199 -msgid "Canon PIXMA MP150" +msgid "Canon S500" msgstr "" #: src/main/xmli18n-tmp.h:200 -msgid "Canon PIXMA MP170" +msgid "Canon S600" msgstr "" #: src/main/xmli18n-tmp.h:201 -msgid "Canon PIXMA MP180" +msgid "Canon S630" msgstr "" #: src/main/xmli18n-tmp.h:202 -msgid "Canon PIXMA MP500" +msgid "Canon S800" msgstr "" #: src/main/xmli18n-tmp.h:203 -msgid "Canon PIXMA MP610" +msgid "Canon S4500" msgstr "" #: src/main/xmli18n-tmp.h:204 -msgid "Canon PIXMA MP700" +msgid "Canon PIXMA iP2000" msgstr "" #: src/main/xmli18n-tmp.h:205 -msgid "Canon PIXMA MP710" +msgid "Canon PIXMA iP3000" msgstr "" #: src/main/xmli18n-tmp.h:206 -msgid "Canon PIXMA MP730" +msgid "Canon PIXMA iP3100" msgstr "" #: src/main/xmli18n-tmp.h:207 -msgid "Canon PIXMA MP740" +msgid "Canon PIXMA iP4000" msgstr "" #: src/main/xmli18n-tmp.h:208 -msgid "Canon PIXMA MP750" +msgid "Canon PIXMA iP4100" msgstr "" #: src/main/xmli18n-tmp.h:209 -msgid "Canon PIXMA MP760" +msgid "Canon PIXMA iP4200" msgstr "" #: src/main/xmli18n-tmp.h:210 -msgid "Canon PIXMA MP770" +msgid "Canon PIXMA iP4300" msgstr "" #: src/main/xmli18n-tmp.h:211 -msgid "Canon PIXMA MP780" +msgid "Canon PIXMA iP4500" msgstr "" #: src/main/xmli18n-tmp.h:212 -msgid "Canon PIXMA MP790" +msgid "Canon PIXMA iP5000" msgstr "" #: src/main/xmli18n-tmp.h:213 -msgid "Canon PIXMA MP830" +msgid "Canon PIXMA iP5200" msgstr "" #: src/main/xmli18n-tmp.h:214 -msgid "Canon PIXUS iP3100" +msgid "Canon PIXMA iP5300" msgstr "" #: src/main/xmli18n-tmp.h:215 -msgid "Canon PIXUS iP4100" +msgid "Canon PIXMA iP6000D" msgstr "" #: src/main/xmli18n-tmp.h:216 -msgid "Canon i80" +msgid "Canon PIXMA iP6700" msgstr "" #: src/main/xmli18n-tmp.h:217 -msgid "Canon i560" +msgid "Canon PIXMA iP8500" msgstr "" #: src/main/xmli18n-tmp.h:218 -msgid "Canon i850" +msgid "Canon PIXMA iX5000" msgstr "" #: src/main/xmli18n-tmp.h:219 -msgid "Canon i860" +msgid "Canon PIXMA Pro9500" msgstr "" #: src/main/xmli18n-tmp.h:220 -msgid "Canon i865" +msgid "Canon PIXMA MP150" msgstr "" #: src/main/xmli18n-tmp.h:221 -msgid "Epson Stylus C20" +msgid "Canon PIXMA MP170" msgstr "" #: src/main/xmli18n-tmp.h:222 -msgid "Epson Stylus C20SX" +msgid "Canon PIXMA MP180" msgstr "" #: src/main/xmli18n-tmp.h:223 -msgid "Epson Stylus C20UX" +msgid "Canon PIXMA MP500" msgstr "" #: src/main/xmli18n-tmp.h:224 -msgid "Epson Stylus C40" +msgid "Canon PIXMA MP520" msgstr "" #: src/main/xmli18n-tmp.h:225 -msgid "Epson Stylus C40SX" +msgid "Canon PIXMA MP610" msgstr "" #: src/main/xmli18n-tmp.h:226 -msgid "Epson Stylus C40UX" +msgid "Canon PIXMA MP700" msgstr "" #: src/main/xmli18n-tmp.h:227 -msgid "Epson Stylus C41" +msgid "Canon PIXMA MP710" msgstr "" #: src/main/xmli18n-tmp.h:228 -msgid "Epson Stylus C41SX" +msgid "Canon PIXMA MP730" msgstr "" #: src/main/xmli18n-tmp.h:229 -msgid "Epson Stylus C41UX" +msgid "Canon PIXMA MP740" msgstr "" #: src/main/xmli18n-tmp.h:230 -msgid "Epson Stylus C42" +msgid "Canon PIXMA MP750" msgstr "" #: src/main/xmli18n-tmp.h:231 -msgid "Epson Stylus C42SX" +msgid "Canon PIXMA MP760" msgstr "" #: src/main/xmli18n-tmp.h:232 -msgid "Epson Stylus C42UX" +msgid "Canon PIXMA MP770" msgstr "" #: src/main/xmli18n-tmp.h:233 -msgid "Epson Stylus C43" +msgid "Canon PIXMA MP780" msgstr "" #: src/main/xmli18n-tmp.h:234 -msgid "Epson Stylus C43SX" +msgid "Canon PIXMA MP790" msgstr "" #: src/main/xmli18n-tmp.h:235 -msgid "Epson Stylus C43UX" +msgid "Canon PIXMA MP830" msgstr "" #: src/main/xmli18n-tmp.h:236 -msgid "Epson Stylus C44" +msgid "Canon PIXUS iP3100" msgstr "" #: src/main/xmli18n-tmp.h:237 -msgid "Epson Stylus C44SX" +msgid "Canon PIXUS iP4100" msgstr "" #: src/main/xmli18n-tmp.h:238 -msgid "Epson Stylus C44UX" +msgid "Canon i80" msgstr "" #: src/main/xmli18n-tmp.h:239 -msgid "Epson Stylus C45" +msgid "Canon i560" msgstr "" #: src/main/xmli18n-tmp.h:240 -msgid "Epson Stylus C46" +msgid "Canon i850" msgstr "" #: src/main/xmli18n-tmp.h:241 -msgid "Epson Stylus C48" +msgid "Canon i860" msgstr "" #: src/main/xmli18n-tmp.h:242 -msgid "Epson Stylus C50" +msgid "Canon i865" msgstr "" #: src/main/xmli18n-tmp.h:243 -msgid "Epson Stylus C60" +msgid "Epson Stylus C20" msgstr "" #: src/main/xmli18n-tmp.h:244 -msgid "Epson Stylus C61" +msgid "Epson Stylus C20SX" msgstr "" #: src/main/xmli18n-tmp.h:245 -msgid "Epson Stylus C62" +msgid "Epson Stylus C20UX" msgstr "" #: src/main/xmli18n-tmp.h:246 -msgid "Epson Stylus C63" +msgid "Epson Stylus C40" msgstr "" #: src/main/xmli18n-tmp.h:247 -msgid "Epson Stylus C64" +msgid "Epson Stylus C40SX" msgstr "" #: src/main/xmli18n-tmp.h:248 -msgid "Epson Stylus C65" +msgid "Epson Stylus C40UX" msgstr "" #: src/main/xmli18n-tmp.h:249 -msgid "Epson Stylus C66" +msgid "Epson Stylus C41" msgstr "" #: src/main/xmli18n-tmp.h:250 -msgid "Epson Stylus C68" +msgid "Epson Stylus C41SX" msgstr "" #: src/main/xmli18n-tmp.h:251 -msgid "Epson Stylus C70" +msgid "Epson Stylus C41UX" msgstr "" #: src/main/xmli18n-tmp.h:252 -msgid "Epson Stylus C79" +msgid "Epson Stylus C42" msgstr "" #: src/main/xmli18n-tmp.h:253 -msgid "Epson Stylus C80" +msgid "Epson Stylus C42SX" msgstr "" #: src/main/xmli18n-tmp.h:254 -msgid "Epson Stylus C82" +msgid "Epson Stylus C42UX" msgstr "" #: src/main/xmli18n-tmp.h:255 -msgid "Epson Stylus C83" +msgid "Epson Stylus C43" msgstr "" #: src/main/xmli18n-tmp.h:256 -msgid "Epson Stylus C84" +msgid "Epson Stylus C43SX" msgstr "" #: src/main/xmli18n-tmp.h:257 -msgid "Epson Stylus C85" +msgid "Epson Stylus C43UX" msgstr "" #: src/main/xmli18n-tmp.h:258 -msgid "Epson Stylus C86" +msgid "Epson Stylus C44" msgstr "" #: src/main/xmli18n-tmp.h:259 -msgid "Epson Stylus C87" +msgid "Epson Stylus C44SX" msgstr "" #: src/main/xmli18n-tmp.h:260 -msgid "Epson Stylus C88" +msgid "Epson Stylus C44UX" msgstr "" #: src/main/xmli18n-tmp.h:261 -msgid "Epson Stylus C110" +msgid "Epson Stylus C45" msgstr "" #: src/main/xmli18n-tmp.h:262 -msgid "Epson Stylus C120" +msgid "Epson Stylus C46" msgstr "" #: src/main/xmli18n-tmp.h:263 -msgid "Epson Stylus Color" +msgid "Epson Stylus C48" msgstr "" #: src/main/xmli18n-tmp.h:264 -msgid "Epson Stylus Color I" +msgid "Epson Stylus C50" msgstr "" #: src/main/xmli18n-tmp.h:265 -msgid "Epson Stylus Color II" +msgid "Epson Stylus C60" msgstr "" #: src/main/xmli18n-tmp.h:266 -msgid "Epson Stylus Color IIs" +msgid "Epson Stylus C61" msgstr "" #: src/main/xmli18n-tmp.h:267 -msgid "Epson Stylus Color PRO" +msgid "Epson Stylus C62" msgstr "" #: src/main/xmli18n-tmp.h:268 -msgid "Epson Stylus Pro XL" +msgid "Epson Stylus C63" msgstr "" #: src/main/xmli18n-tmp.h:269 -msgid "Epson Stylus Color 400" +msgid "Epson Stylus C64" msgstr "" #: src/main/xmli18n-tmp.h:270 -msgid "Epson Stylus Color 440" +msgid "Epson Stylus C65" msgstr "" #: src/main/xmli18n-tmp.h:271 -msgid "Epson Stylus Color 460" +msgid "Epson Stylus C66" msgstr "" #: src/main/xmli18n-tmp.h:272 -msgid "Epson Stylus Color 480" +msgid "Epson Stylus C68" msgstr "" #: src/main/xmli18n-tmp.h:273 -msgid "Epson Stylus Color 500" +msgid "Epson Stylus C70" msgstr "" #: src/main/xmli18n-tmp.h:274 -msgid "Epson Stylus Color 580" +msgid "Epson Stylus C79" msgstr "" #: src/main/xmli18n-tmp.h:275 -msgid "Epson Stylus Color 600" +msgid "Epson Stylus C80" msgstr "" #: src/main/xmli18n-tmp.h:276 -msgid "Epson Stylus Color 640" +msgid "Epson Stylus C82" msgstr "" #: src/main/xmli18n-tmp.h:277 -msgid "Epson Stylus Color 660" +msgid "Epson Stylus C83" msgstr "" #: src/main/xmli18n-tmp.h:278 -msgid "Epson Stylus Color 670" +msgid "Epson Stylus C84" msgstr "" #: src/main/xmli18n-tmp.h:279 -msgid "Epson Stylus Color 680" +msgid "Epson Stylus C85" msgstr "" #: src/main/xmli18n-tmp.h:280 -msgid "Epson Stylus Color 740" +msgid "Epson Stylus C86" msgstr "" #: src/main/xmli18n-tmp.h:281 -msgid "Epson Stylus Color 760" +msgid "Epson Stylus C87" msgstr "" #: src/main/xmli18n-tmp.h:282 -msgid "Epson Stylus Color 777" +msgid "Epson Stylus C88" msgstr "" #: src/main/xmli18n-tmp.h:283 -msgid "Epson Stylus Color 800" +msgid "Epson Stylus C110" msgstr "" #: src/main/xmli18n-tmp.h:284 -msgid "Epson Stylus Color 850" +msgid "Epson Stylus C120" msgstr "" #: src/main/xmli18n-tmp.h:285 -msgid "Epson Stylus Color 860" +msgid "Epson Stylus Color" msgstr "" #: src/main/xmli18n-tmp.h:286 -msgid "Epson Stylus Color 880" +msgid "Epson Stylus Color I" msgstr "" #: src/main/xmli18n-tmp.h:287 -msgid "Epson Stylus Color 8 3" +msgid "Epson Stylus Color II" msgstr "" #: src/main/xmli18n-tmp.h:288 -msgid "Epson Stylus Color 900" +msgid "Epson Stylus Color IIs" msgstr "" #: src/main/xmli18n-tmp.h:289 -msgid "Epson Stylus Color 980" +msgid "Epson Stylus Color PRO" msgstr "" #: src/main/xmli18n-tmp.h:290 -msgid "Epson Stylus Color 1160" +msgid "Epson Stylus Pro XL" msgstr "" #: src/main/xmli18n-tmp.h:291 -msgid "Epson Stylus Color 1500" +msgid "Epson Stylus Color 400" msgstr "" #: src/main/xmli18n-tmp.h:292 -msgid "Epson Stylus Color 1520" +msgid "Epson Stylus Color 440" msgstr "" #: src/main/xmli18n-tmp.h:293 -msgid "Epson Stylus Color 3000" +msgid "Epson Stylus Color 460" msgstr "" #: src/main/xmli18n-tmp.h:294 -msgid "Epson Stylus Photo" +msgid "Epson Stylus Color 480" msgstr "" #: src/main/xmli18n-tmp.h:295 -msgid "Epson Stylus Photo 700" +msgid "Epson Stylus Color 500" msgstr "" #: src/main/xmli18n-tmp.h:296 -msgid "Epson Stylus Photo EX" +msgid "Epson Stylus Color 580" msgstr "" #: src/main/xmli18n-tmp.h:297 -msgid "Epson Stylus Photo EX3" +msgid "Epson Stylus Color 600" msgstr "" #: src/main/xmli18n-tmp.h:298 -msgid "Epson Stylus Photo 720" +msgid "Epson Stylus Color 640" msgstr "" #: src/main/xmli18n-tmp.h:299 -msgid "Epson Stylus Photo 750" +msgid "Epson Stylus Color 660" msgstr "" #: src/main/xmli18n-tmp.h:300 -msgid "Epson Stylus Photo 780" +msgid "Epson Stylus Color 670" msgstr "" #: src/main/xmli18n-tmp.h:301 -msgid "Epson Stylus Photo 785" +msgid "Epson Stylus Color 680" msgstr "" #: src/main/xmli18n-tmp.h:302 -msgid "Epson Stylus Photo 790" +msgid "Epson Stylus Color 740" msgstr "" #: src/main/xmli18n-tmp.h:303 -msgid "Epson Stylus Photo 810" +msgid "Epson Stylus Color 760" msgstr "" #: src/main/xmli18n-tmp.h:304 -msgid "Epson Stylus Photo 820" +msgid "Epson Stylus Color 777" msgstr "" #: src/main/xmli18n-tmp.h:305 -msgid "Epson Stylus Photo 825" +msgid "Epson Stylus Color 800" msgstr "" #: src/main/xmli18n-tmp.h:306 -msgid "Epson Stylus Photo 830" +msgid "Epson Stylus Color 850" msgstr "" #: src/main/xmli18n-tmp.h:307 -msgid "Epson Stylus Photo 830U" +msgid "Epson Stylus Color 860" msgstr "" #: src/main/xmli18n-tmp.h:308 -msgid "Epson Stylus Photo 870" +msgid "Epson Stylus Color 880" msgstr "" #: src/main/xmli18n-tmp.h:309 -msgid "Epson Stylus Photo 875" +msgid "Epson Stylus Color 8 3" msgstr "" #: src/main/xmli18n-tmp.h:310 -msgid "Epson Stylus Photo 890" +msgid "Epson Stylus Color 900" msgstr "" #: src/main/xmli18n-tmp.h:311 -msgid "Epson Stylus Photo 895" +msgid "Epson Stylus Color 980" msgstr "" #: src/main/xmli18n-tmp.h:312 -msgid "Epson Stylus Photo 900" +msgid "Epson Stylus Color 1160" msgstr "" #: src/main/xmli18n-tmp.h:313 -msgid "Epson Stylus Photo 915" +msgid "Epson Stylus Color 1500" msgstr "" #: src/main/xmli18n-tmp.h:314 -msgid "Epson Stylus Photo 925" +msgid "Epson Stylus Color 1520" msgstr "" #: src/main/xmli18n-tmp.h:315 -msgid "Epson Stylus Photo 935" +msgid "Epson Stylus Color 3000" msgstr "" #: src/main/xmli18n-tmp.h:316 -msgid "Epson Stylus Photo 950" +msgid "Epson Stylus Photo" msgstr "" #: src/main/xmli18n-tmp.h:317 -msgid "Epson Stylus Photo 960" +msgid "Epson Stylus Photo 700" msgstr "" #: src/main/xmli18n-tmp.h:318 -msgid "Epson Stylus Photo 1200" +msgid "Epson Stylus Photo EX" msgstr "" #: src/main/xmli18n-tmp.h:319 -msgid "Epson Stylus Photo 1270" +msgid "Epson Stylus Photo EX3" msgstr "" #: src/main/xmli18n-tmp.h:320 -msgid "Epson Stylus Photo 1280" +msgid "Epson Stylus Photo 720" msgstr "" #: src/main/xmli18n-tmp.h:321 -msgid "Epson Stylus Photo 1290" +msgid "Epson Stylus Photo 750" msgstr "" #: src/main/xmli18n-tmp.h:322 -msgid "Epson Stylus Photo 1400" +msgid "Epson Stylus Photo 780" msgstr "" #: src/main/xmli18n-tmp.h:323 -msgid "Epson Stylus Photo 1410" +msgid "Epson Stylus Photo 785" msgstr "" #: src/main/xmli18n-tmp.h:324 -msgid "Epson Stylus Photo 2000P" +msgid "Epson Stylus Photo 790" msgstr "" #: src/main/xmli18n-tmp.h:325 -msgid "Epson Stylus Photo 2100" +msgid "Epson Stylus Photo 810" msgstr "" #: src/main/xmli18n-tmp.h:326 -msgid "Epson Stylus Photo 2200" +msgid "Epson Stylus Photo 820" msgstr "" #: src/main/xmli18n-tmp.h:327 -msgid "Epson Stylus Photo R200" +msgid "Epson Stylus Photo 825" msgstr "" #: src/main/xmli18n-tmp.h:328 -msgid "Epson Stylus Photo R210" +msgid "Epson Stylus Photo 830" msgstr "" #: src/main/xmli18n-tmp.h:329 -msgid "Epson Stylus Photo R220" +msgid "Epson Stylus Photo 830U" msgstr "" #: src/main/xmli18n-tmp.h:330 -msgid "Epson Stylus Photo R230" +msgid "Epson Stylus Photo 870" msgstr "" #: src/main/xmli18n-tmp.h:331 -msgid "Epson Stylus Photo R240" +msgid "Epson Stylus Photo 875" msgstr "" #: src/main/xmli18n-tmp.h:332 -msgid "Epson Stylus Photo R245" +msgid "Epson Stylus Photo 890" msgstr "" #: src/main/xmli18n-tmp.h:333 -msgid "Epson Stylus Photo R260" +msgid "Epson Stylus Photo 895" msgstr "" #: src/main/xmli18n-tmp.h:334 -msgid "Epson Stylus Photo R265" +msgid "Epson Stylus Photo 900" msgstr "" #: src/main/xmli18n-tmp.h:335 -msgid "Epson Stylus Photo R270" +msgid "Epson Stylus Photo 915" msgstr "" #: src/main/xmli18n-tmp.h:336 -msgid "Epson Stylus Photo R300" +msgid "Epson Stylus Photo 925" msgstr "" #: src/main/xmli18n-tmp.h:337 -msgid "Epson Stylus Photo R310" +msgid "Epson Stylus Photo 935" msgstr "" #: src/main/xmli18n-tmp.h:338 -msgid "Epson Stylus Photo R320" +msgid "Epson Stylus Photo 950" msgstr "" #: src/main/xmli18n-tmp.h:339 -msgid "Epson Stylus Photo R340" +msgid "Epson Stylus Photo 960" msgstr "" #: src/main/xmli18n-tmp.h:340 -msgid "Epson Stylus Photo R350" +msgid "Epson Stylus Photo 1200" msgstr "" #: src/main/xmli18n-tmp.h:341 -msgid "Epson Stylus Photo R360" +msgid "Epson Stylus Photo 1270" msgstr "" #: src/main/xmli18n-tmp.h:342 -msgid "Epson Stylus Photo R380" +msgid "Epson Stylus Photo 1280" msgstr "" #: src/main/xmli18n-tmp.h:343 -msgid "Epson Stylus Photo R390" +msgid "Epson Stylus Photo 1290" msgstr "" #: src/main/xmli18n-tmp.h:344 -msgid "Epson Stylus Photo RX400" +msgid "Epson Stylus Photo 1400" msgstr "" #: src/main/xmli18n-tmp.h:345 -msgid "Epson Stylus Photo RX420" +msgid "Epson Stylus Photo 1410" msgstr "" #: src/main/xmli18n-tmp.h:346 -msgid "Epson Stylus Photo RX425" +msgid "Epson Stylus Photo 2000P" msgstr "" #: src/main/xmli18n-tmp.h:347 -msgid "Epson Stylus Photo RX430" +msgid "Epson Stylus Photo 2100" msgstr "" #: src/main/xmli18n-tmp.h:348 -msgid "Epson Stylus Photo RX500" +msgid "Epson Stylus Photo 2200" msgstr "" #: src/main/xmli18n-tmp.h:349 -msgid "Epson Stylus Photo RX510" +msgid "Epson Stylus Photo R200" msgstr "" #: src/main/xmli18n-tmp.h:350 -msgid "Epson Stylus Photo RX560" +msgid "Epson Stylus Photo R210" msgstr "" #: src/main/xmli18n-tmp.h:351 -msgid "Epson Stylus Photo RX580" +msgid "Epson Stylus Photo R220" msgstr "" #: src/main/xmli18n-tmp.h:352 -msgid "Epson Stylus Photo RX590" +msgid "Epson Stylus Photo R230" msgstr "" #: src/main/xmli18n-tmp.h:353 -msgid "Epson Stylus Photo RX595" +msgid "Epson Stylus Photo R240" msgstr "" #: src/main/xmli18n-tmp.h:354 -msgid "Epson Stylus Photo RX600" +msgid "Epson Stylus Photo R245" msgstr "" #: src/main/xmli18n-tmp.h:355 -msgid "Epson Stylus Photo RX620" +msgid "Epson Stylus Photo R260" msgstr "" #: src/main/xmli18n-tmp.h:356 -msgid "Epson Stylus Photo RX630" +msgid "Epson Stylus Photo R265" msgstr "" #: src/main/xmli18n-tmp.h:357 -msgid "Epson Stylus Photo RX640" +msgid "Epson Stylus Photo R270" msgstr "" #: src/main/xmli18n-tmp.h:358 -msgid "Epson Stylus Photo RX700" +msgid "Epson Stylus Photo R280" msgstr "" #: src/main/xmli18n-tmp.h:359 -msgid "Epson Stylus Photo R800" +msgid "Epson Stylus Photo R285" msgstr "" #: src/main/xmli18n-tmp.h:360 -msgid "Epson Stylus Photo R1800" +msgid "Epson Stylus Photo R300" msgstr "" #: src/main/xmli18n-tmp.h:361 -msgid "Epson Stylus Photo R2400" +msgid "Epson Stylus Photo R310" msgstr "" #: src/main/xmli18n-tmp.h:362 -msgid "Epson Stylus Pro 5000" +msgid "Epson Stylus Photo R320" msgstr "" #: src/main/xmli18n-tmp.h:363 -msgid "Epson Stylus Pro 5500" +msgid "Epson Stylus Photo R340" msgstr "" #: src/main/xmli18n-tmp.h:364 -msgid "Epson Stylus Pro 7000" +msgid "Epson Stylus Photo R350" msgstr "" #: src/main/xmli18n-tmp.h:365 -msgid "Epson Stylus Pro 7500" +msgid "Epson Stylus Photo R360" msgstr "" #: src/main/xmli18n-tmp.h:366 -msgid "Epson Stylus Pro 7600" +msgid "Epson Stylus Photo R380" msgstr "" #: src/main/xmli18n-tmp.h:367 -msgid "Epson Stylus Pro 9000" +msgid "Epson Stylus Photo R390" msgstr "" #: src/main/xmli18n-tmp.h:368 -msgid "Epson Stylus Pro 9500" +msgid "Epson Stylus Photo RX400" msgstr "" #: src/main/xmli18n-tmp.h:369 -msgid "Epson Stylus Pro 9600" +msgid "Epson Stylus Photo RX420" msgstr "" #: src/main/xmli18n-tmp.h:370 -msgid "Epson Stylus Pro 10000" +msgid "Epson Stylus Photo RX425" msgstr "" #: src/main/xmli18n-tmp.h:371 -msgid "Epson Stylus Scan 2000" +msgid "Epson Stylus Photo RX430" msgstr "" #: src/main/xmli18n-tmp.h:372 -msgid "Epson Stylus Scan 2500" +msgid "Epson Stylus Photo RX500" msgstr "" #: src/main/xmli18n-tmp.h:373 -msgid "Epson Stylus CX1500" +msgid "Epson Stylus Photo RX510" msgstr "" #: src/main/xmli18n-tmp.h:374 -msgid "Epson Stylus CX3100" +msgid "Epson Stylus Photo RX560" msgstr "" #: src/main/xmli18n-tmp.h:375 -msgid "Epson Stylus CX3200" +msgid "Epson Stylus Photo RX580" msgstr "" #: src/main/xmli18n-tmp.h:376 -msgid "Epson Stylus CX3500" +msgid "Epson Stylus Photo RX585" msgstr "" #: src/main/xmli18n-tmp.h:377 -msgid "Epson Stylus CX3600" +msgid "Epson Stylus Photo RX590" msgstr "" #: src/main/xmli18n-tmp.h:378 -msgid "Epson Stylus CX3650" +msgid "Epson Stylus Photo RX595" msgstr "" #: src/main/xmli18n-tmp.h:379 -msgid "Epson Stylus CX3700" +msgid "Epson Stylus Photo RX600" msgstr "" #: src/main/xmli18n-tmp.h:380 -msgid "Epson Stylus CX3800" +msgid "Epson Stylus Photo RX620" msgstr "" #: src/main/xmli18n-tmp.h:381 -msgid "Epson Stylus CX3805" +msgid "Epson Stylus Photo RX630" msgstr "" #: src/main/xmli18n-tmp.h:382 -msgid "Epson Stylus CX3810" +msgid "Epson Stylus Photo RX640" msgstr "" #: src/main/xmli18n-tmp.h:383 -msgid "Epson Stylus CX4100" +msgid "Epson Stylus Photo RX680" msgstr "" #: src/main/xmli18n-tmp.h:384 -msgid "Epson Stylus CX4200" +msgid "Epson Stylus Photo RX685" msgstr "" #: src/main/xmli18n-tmp.h:385 -msgid "Epson Stylus CX4400" +msgid "Epson Stylus Photo RX700" msgstr "" #: src/main/xmli18n-tmp.h:386 -msgid "Epson Stylus CX4500" +msgid "Epson Stylus Photo R800" msgstr "" #: src/main/xmli18n-tmp.h:387 -msgid "Epson Stylus CX4600" +msgid "Epson Stylus Photo R1800" msgstr "" #: src/main/xmli18n-tmp.h:388 -msgid "Epson Stylus CX4700" +msgid "Epson Stylus Photo R2400" msgstr "" #: src/main/xmli18n-tmp.h:389 -msgid "Epson Stylus CX4800" +msgid "Epson Stylus Pro 5000" msgstr "" #: src/main/xmli18n-tmp.h:390 -msgid "Epson Stylus CX4900" +msgid "Epson Stylus Pro 5500" msgstr "" #: src/main/xmli18n-tmp.h:391 -msgid "Epson Stylus CX5000" +msgid "Epson Stylus Pro 7000" msgstr "" #: src/main/xmli18n-tmp.h:392 -msgid "Epson Stylus CX5000F" +msgid "Epson Stylus Pro 7500" msgstr "" #: src/main/xmli18n-tmp.h:393 -msgid "Epson Stylus CX5100" +msgid "Epson Stylus Pro 7600" msgstr "" #: src/main/xmli18n-tmp.h:394 -msgid "Epson Stylus CX5200" +msgid "Epson Stylus Pro 9000" msgstr "" #: src/main/xmli18n-tmp.h:395 -msgid "Epson Stylus CX5300" +msgid "Epson Stylus Pro 9500" msgstr "" #: src/main/xmli18n-tmp.h:396 -msgid "Epson Stylus CX5400" +msgid "Epson Stylus Pro 9600" msgstr "" #: src/main/xmli18n-tmp.h:397 -msgid "Epson Stylus CX5600" +msgid "Epson Stylus Pro 10000" msgstr "" #: src/main/xmli18n-tmp.h:398 -msgid "Epson Stylus CX5700" +msgid "Epson Stylus Scan 2000" msgstr "" #: src/main/xmli18n-tmp.h:399 -msgid "Epson Stylus CX5800" +msgid "Epson Stylus Scan 2500" msgstr "" #: src/main/xmli18n-tmp.h:400 -msgid "Epson Stylus CX6000" +msgid "Epson Stylus CX1500" msgstr "" #: src/main/xmli18n-tmp.h:401 -msgid "Epson Stylus CX6300" +msgid "Epson Stylus CX3100" msgstr "" #: src/main/xmli18n-tmp.h:402 -msgid "Epson Stylus CX6400" +msgid "Epson Stylus CX3200" msgstr "" #: src/main/xmli18n-tmp.h:403 -msgid "Epson Stylus CX6500" +msgid "Epson Stylus CX3500" msgstr "" #: src/main/xmli18n-tmp.h:404 -msgid "Epson Stylus CX6600" +msgid "Epson Stylus CX3600" msgstr "" #: src/main/xmli18n-tmp.h:405 -msgid "Epson Stylus CX7000F" +msgid "Epson Stylus CX3650" msgstr "" #: src/main/xmli18n-tmp.h:406 -msgid "Epson Stylus CX7400" +msgid "Epson Stylus CX3700" msgstr "" #: src/main/xmli18n-tmp.h:407 -msgid "Epson Stylus CX7700" +msgid "Epson Stylus CX3800" msgstr "" #: src/main/xmli18n-tmp.h:408 -msgid "Epson Stylus CX7800" +msgid "Epson Stylus CX3805" msgstr "" #: src/main/xmli18n-tmp.h:409 -msgid "Epson Stylus CX8300" +msgid "Epson Stylus CX3810" msgstr "" #: src/main/xmli18n-tmp.h:410 -msgid "Epson Stylus CX8400" +msgid "Epson Stylus CX4100" msgstr "" #: src/main/xmli18n-tmp.h:411 -msgid "Epson Stylus CX9400" +msgid "Epson Stylus CX4200" msgstr "" #: src/main/xmli18n-tmp.h:412 -msgid "Epson Stylus D68" +msgid "Epson Stylus CX4400" msgstr "" #: src/main/xmli18n-tmp.h:413 -msgid "Epson Stylus D88" +msgid "Epson Stylus CX4500" msgstr "" #: src/main/xmli18n-tmp.h:414 -msgid "Epson Stylus D120" +msgid "Epson Stylus CX4600" msgstr "" #: src/main/xmli18n-tmp.h:415 -msgid "Epson Stylus DX3800" +msgid "Epson Stylus CX4700" msgstr "" #: src/main/xmli18n-tmp.h:416 -msgid "Epson Stylus DX3850" +msgid "Epson Stylus CX4800" msgstr "" #: src/main/xmli18n-tmp.h:417 -msgid "Epson Stylus DX4050" +msgid "Epson Stylus CX4900" msgstr "" #: src/main/xmli18n-tmp.h:418 -msgid "Epson Stylus DX4200" +msgid "Epson Stylus CX5000" msgstr "" #: src/main/xmli18n-tmp.h:419 -msgid "Epson Stylus DX4250" +msgid "Epson Stylus CX5000F" msgstr "" #: src/main/xmli18n-tmp.h:420 -msgid "Epson Stylus DX4800" +msgid "Epson Stylus CX5100" msgstr "" #: src/main/xmli18n-tmp.h:421 -msgid "Epson PictureMate" +msgid "Epson Stylus CX5200" msgstr "" #: src/main/xmli18n-tmp.h:422 -msgid "Epson PictureMate Deluxe" +msgid "Epson Stylus CX5300" msgstr "" #: src/main/xmli18n-tmp.h:423 -msgid "Epson PictureMate Flash" +msgid "Epson Stylus CX5400" msgstr "" #: src/main/xmli18n-tmp.h:424 -msgid "Epson PictureMate Pal" +msgid "Epson Stylus CX5600" msgstr "" #: src/main/xmli18n-tmp.h:425 -msgid "Epson PictureMate Snap" +msgid "Epson Stylus CX5700" msgstr "" #: src/main/xmli18n-tmp.h:426 -msgid "Epson PictureMate 200" +msgid "Epson Stylus CX5800" msgstr "" #: src/main/xmli18n-tmp.h:427 -msgid "Epson PictureMate 210" +msgid "Epson Stylus CX6000" msgstr "" #: src/main/xmli18n-tmp.h:428 -msgid "Epson PictureMate 240" +msgid "Epson Stylus CX6300" msgstr "" #: src/main/xmli18n-tmp.h:429 -msgid "Epson PictureMate 250" +msgid "Epson Stylus CX6400" msgstr "" #: src/main/xmli18n-tmp.h:430 -msgid "Epson PictureMate 280" +msgid "Epson Stylus CX6500" msgstr "" #: src/main/xmli18n-tmp.h:431 -msgid "Epson CL 700" +msgid "Epson Stylus CX6600" msgstr "" #: src/main/xmli18n-tmp.h:432 -msgid "Epson CL 750" +msgid "Epson Stylus CX7000F" msgstr "" #: src/main/xmli18n-tmp.h:433 -msgid "Epson CL 760" +msgid "Epson Stylus CX7400" msgstr "" #: src/main/xmli18n-tmp.h:434 -msgid "Epson E 100" +msgid "Epson Stylus CX7700" msgstr "" #: src/main/xmli18n-tmp.h:435 -msgid "Epson E 150" +msgid "Epson Stylus CX7800" msgstr "" #: src/main/xmli18n-tmp.h:436 -msgid "Epson E 200" +msgid "Epson Stylus CX8300" msgstr "" #: src/main/xmli18n-tmp.h:437 -msgid "Epson EM 900C" +msgid "Epson Stylus CX8400" msgstr "" #: src/main/xmli18n-tmp.h:438 -msgid "Epson EM 930C" +msgid "Epson Stylus CX9400" msgstr "" #: src/main/xmli18n-tmp.h:439 -msgid "Epson MC 2000" +msgid "Epson Stylus D68" msgstr "" #: src/main/xmli18n-tmp.h:440 -msgid "Epson MC 5000" +msgid "Epson Stylus D88" msgstr "" #: src/main/xmli18n-tmp.h:441 -msgid "Epson MC 7000" +msgid "Epson Stylus D92" msgstr "" #: src/main/xmli18n-tmp.h:442 -msgid "Epson MC 9000" +msgid "Epson Stylus D120" msgstr "" #: src/main/xmli18n-tmp.h:443 -msgid "Epson MC 10000" +msgid "Epson Stylus DX3800" msgstr "" #: src/main/xmli18n-tmp.h:444 -msgid "Epson MJ 930C" +msgid "Epson Stylus DX3850" msgstr "" #: src/main/xmli18n-tmp.h:445 -msgid "Epson MJ 5100C" +msgid "Epson Stylus DX4050" msgstr "" #: src/main/xmli18n-tmp.h:446 -msgid "Epson MJ 6000C" +msgid "Epson Stylus DX4200" msgstr "" #: src/main/xmli18n-tmp.h:447 -msgid "Epson MJ 8000C" +msgid "Epson Stylus DX4250" msgstr "" #: src/main/xmli18n-tmp.h:448 -msgid "Epson PM 670C" +msgid "Epson Stylus DX4400" msgstr "" #: src/main/xmli18n-tmp.h:449 -msgid "Epson PM 700C" +msgid "Epson Stylus DX4450" msgstr "" #: src/main/xmli18n-tmp.h:450 -msgid "Epson PM 730C" +msgid "Epson Stylus DX4800" msgstr "" #: src/main/xmli18n-tmp.h:451 -msgid "Epson PM 740C" +msgid "Epson Stylus DX7000F" msgstr "" #: src/main/xmli18n-tmp.h:452 -msgid "Epson PM 750C" +msgid "Epson Stylus DX7400" msgstr "" #: src/main/xmli18n-tmp.h:453 -msgid "Epson PM 760C" +msgid "Epson Stylus DX7450" msgstr "" #: src/main/xmli18n-tmp.h:454 -msgid "Epson PM 770C" +msgid "Epson Stylus DX8400" msgstr "" #: src/main/xmli18n-tmp.h:455 -msgid "Epson PM 780C" +msgid "Epson Stylus DX8450" msgstr "" #: src/main/xmli18n-tmp.h:456 -msgid "Epson PM 790PT" +msgid "Epson PictureMate" msgstr "" #: src/main/xmli18n-tmp.h:457 -msgid "Epson PM 800C" +msgid "Epson PictureMate Dash" msgstr "" #: src/main/xmli18n-tmp.h:458 -msgid "Epson PM 850PT" +msgid "Epson PictureMate Deluxe" msgstr "" #: src/main/xmli18n-tmp.h:459 -msgid "Epson PM 870C" +msgid "Epson PictureMate Flash" msgstr "" #: src/main/xmli18n-tmp.h:460 -msgid "Epson PM 880C" +msgid "Epson PictureMate Pal" msgstr "" #: src/main/xmli18n-tmp.h:461 -msgid "Epson PM 930C" +msgid "Epson PictureMate Snap" msgstr "" #: src/main/xmli18n-tmp.h:462 -msgid "Epson PM 940C" +msgid "Epson PictureMate 100" msgstr "" #: src/main/xmli18n-tmp.h:463 -msgid "Epson PM 950C" +msgid "Epson PictureMate 200" msgstr "" #: src/main/xmli18n-tmp.h:464 -msgid "Epson PM 970C" +msgid "Epson PictureMate 210" msgstr "" #: src/main/xmli18n-tmp.h:465 -msgid "Epson PM 980C" +msgid "Epson PictureMate 240" msgstr "" #: src/main/xmli18n-tmp.h:466 -msgid "Epson PM 2000C" +msgid "Epson PictureMate 250" msgstr "" #: src/main/xmli18n-tmp.h:467 -msgid "Epson PM 2200C" +msgid "Epson PictureMate 260" msgstr "" #: src/main/xmli18n-tmp.h:468 -msgid "Epson PM 3000C" +msgid "Epson PictureMate 270" msgstr "" #: src/main/xmli18n-tmp.h:469 -msgid "Epson PM 3300C" +msgid "Epson PictureMate 280" msgstr "" #: src/main/xmli18n-tmp.h:470 -msgid "Epson PM 3500C" +msgid "Epson PictureMate 290" msgstr "" #: src/main/xmli18n-tmp.h:471 -msgid "Epson PM 3700C" +msgid "Epson PictureMate 500" msgstr "" #: src/main/xmli18n-tmp.h:472 -msgid "Epson PM 4000PX" +msgid "Epson PictureMate 2005" msgstr "" #: src/main/xmli18n-tmp.h:473 -msgid "Epson PM 5000C" +msgid "Epson CL 700" msgstr "" #: src/main/xmli18n-tmp.h:474 -msgid "Epson PM 7000C" +msgid "Epson CL 750" msgstr "" #: src/main/xmli18n-tmp.h:475 -msgid "Epson PM 9000C" +msgid "Epson CL 760" msgstr "" #: src/main/xmli18n-tmp.h:476 -msgid "Epson PM 10000" +msgid "Epson E 100" msgstr "" #: src/main/xmli18n-tmp.h:477 -msgid "Epson PM A650" +msgid "Epson E 150" msgstr "" #: src/main/xmli18n-tmp.h:478 -msgid "Epson PM A750" +msgid "Epson E 200" msgstr "" #: src/main/xmli18n-tmp.h:479 -msgid "Epson PM A820" +msgid "Epson E 300" msgstr "" #: src/main/xmli18n-tmp.h:480 -msgid "Epson PM A890" +msgid "Epson E 500" msgstr "" #: src/main/xmli18n-tmp.h:481 -msgid "Epson PM A900" +msgid "Epson E 520" msgstr "" #: src/main/xmli18n-tmp.h:482 -msgid "Epson PM A950" +msgid "Epson E 700" msgstr "" #: src/main/xmli18n-tmp.h:483 -msgid "Epson PM D600" +msgid "Epson E 720" msgstr "" #: src/main/xmli18n-tmp.h:484 -msgid "Epson PM D750" +msgid "Epson EM 900C" msgstr "" #: src/main/xmli18n-tmp.h:485 -msgid "Epson PM D770" +msgid "Epson EM 930C" msgstr "" #: src/main/xmli18n-tmp.h:486 -msgid "Epson PM D800" +msgid "Epson MC 2000" msgstr "" #: src/main/xmli18n-tmp.h:487 -msgid "Epson PM D870" +msgid "Epson MC 5000" msgstr "" #: src/main/xmli18n-tmp.h:488 -msgid "Epson PM D1000" +msgid "Epson MC 7000" msgstr "" #: src/main/xmli18n-tmp.h:489 -msgid "Epson PM G700" +msgid "Epson MC 9000" msgstr "" #: src/main/xmli18n-tmp.h:490 -msgid "Epson PM G720" +msgid "Epson MC 10000" msgstr "" #: src/main/xmli18n-tmp.h:491 -msgid "Epson PM G730" +msgid "Epson MJ 930C" msgstr "" #: src/main/xmli18n-tmp.h:492 -msgid "Epson PM G800" +msgid "Epson MJ 5100C" msgstr "" #: src/main/xmli18n-tmp.h:493 -msgid "Epson PM G820" +msgid "Epson MJ 6000C" msgstr "" #: src/main/xmli18n-tmp.h:494 -msgid "Epson PM G850" +msgid "Epson MJ 8000C" msgstr "" #: src/main/xmli18n-tmp.h:495 -msgid "Epson PM G4500" +msgid "Epson PM 670C" msgstr "" #: src/main/xmli18n-tmp.h:496 -msgid "Epson PX A650" +msgid "Epson PM 700C" msgstr "" #: src/main/xmli18n-tmp.h:497 -msgid "Epson PX G900" +msgid "Epson PM 730C" msgstr "" #: src/main/xmli18n-tmp.h:498 -msgid "Epson PX G920" +msgid "Epson PM 740C" msgstr "" #: src/main/xmli18n-tmp.h:499 -msgid "Epson PX G5000" +msgid "Epson PM 750C" msgstr "" #: src/main/xmli18n-tmp.h:500 -msgid "Epson PX V500" +msgid "Epson PM 760C" msgstr "" #: src/main/xmli18n-tmp.h:501 -msgid "Epson PX V600" +msgid "Epson PM 770C" msgstr "" #: src/main/xmli18n-tmp.h:502 -msgid "Epson PX V630" +msgid "Epson PM 780C" msgstr "" #: src/main/xmli18n-tmp.h:503 -msgid "Epson PX V780" +msgid "Epson PM 790PT" msgstr "" #: src/main/xmli18n-tmp.h:504 -msgid "Epson PX 5500" +msgid "Epson PM 800C" msgstr "" #: src/main/xmli18n-tmp.h:505 -msgid "Epson PX 7000" +msgid "Epson PM 850PT" msgstr "" #: src/main/xmli18n-tmp.h:506 -msgid "Epson PX 9000" +msgid "Epson PM 870C" msgstr "" #: src/main/xmli18n-tmp.h:507 -msgid "Apollo P-2100" +msgid "Epson PM 880C" msgstr "" #: src/main/xmli18n-tmp.h:508 -msgid "Apollo P-2150" +msgid "Epson PM 930C" msgstr "" #: src/main/xmli18n-tmp.h:509 -msgid "Apollo P-2200" +msgid "Epson PM 940C" msgstr "" #: src/main/xmli18n-tmp.h:510 -msgid "Apollo P-2250" +msgid "Epson PM 950C" msgstr "" #: src/main/xmli18n-tmp.h:511 -msgid "Apollo P-2500" +msgid "Epson PM 970C" msgstr "" #: src/main/xmli18n-tmp.h:512 -msgid "Apollo P-2550" +msgid "Epson PM 980C" msgstr "" #: src/main/xmli18n-tmp.h:513 -msgid "Apollo P-2600" +msgid "Epson PM 2000C" msgstr "" #: src/main/xmli18n-tmp.h:514 -msgid "Apollo P-2650" +msgid "Epson PM 2200C" msgstr "" #: src/main/xmli18n-tmp.h:515 -msgid "Apple Color StyleWriter 4100" +msgid "Epson PM 3000C" msgstr "" #: src/main/xmli18n-tmp.h:516 -msgid "Apple Color StyleWriter 4500" +msgid "Epson PM 3300C" msgstr "" #: src/main/xmli18n-tmp.h:517 -msgid "Apple Color StyleWriter 6500" +msgid "Epson PM 3500C" msgstr "" #: src/main/xmli18n-tmp.h:518 -msgid "Apple LaserWriter Select 360" +msgid "Epson PM 3700C" msgstr "" #: src/main/xmli18n-tmp.h:519 -msgid "Brother DCP-1200" +msgid "Epson PM 4000PX" msgstr "" #: src/main/xmli18n-tmp.h:520 -msgid "Brother HL-4Ve" +msgid "Epson PM 5000C" msgstr "" #: src/main/xmli18n-tmp.h:521 -msgid "Brother HL-10V" +msgid "Epson PM 7000C" msgstr "" #: src/main/xmli18n-tmp.h:522 -msgid "Brother HL-10h" +msgid "Epson PM 9000C" msgstr "" #: src/main/xmli18n-tmp.h:523 -msgid "Brother HL-630" +msgid "Epson PM 10000" msgstr "" #: src/main/xmli18n-tmp.h:524 -msgid "Brother HL-660" +msgid "Epson PM A650" msgstr "" #: src/main/xmli18n-tmp.h:525 -msgid "Brother HL-760" +msgid "Epson PM A750" msgstr "" #: src/main/xmli18n-tmp.h:526 -msgid "Brother HL-960" +msgid "Epson PM A820" msgstr "" #: src/main/xmli18n-tmp.h:527 -msgid "Brother HL-1040" +msgid "Epson PM A890" msgstr "" #: src/main/xmli18n-tmp.h:528 -msgid "Brother HL-1050" +msgid "Epson PM A900" msgstr "" #: src/main/xmli18n-tmp.h:529 -msgid "Brother HL-1060" +msgid "Epson PM A950" msgstr "" #: src/main/xmli18n-tmp.h:530 -msgid "Brother HL-1070" +msgid "Epson PM D600" msgstr "" #: src/main/xmli18n-tmp.h:531 -msgid "Brother HL-1240" +msgid "Epson PM D750" msgstr "" #: src/main/xmli18n-tmp.h:532 -msgid "Brother HL-1250" +msgid "Epson PM D770" msgstr "" #: src/main/xmli18n-tmp.h:533 -msgid "Brother HL-1260" +msgid "Epson PM D800" msgstr "" #: src/main/xmli18n-tmp.h:534 -msgid "Brother HL-1270N" +msgid "Epson PM D870" msgstr "" #: src/main/xmli18n-tmp.h:535 -msgid "Brother HL-1440" +msgid "Epson PM D1000" msgstr "" #: src/main/xmli18n-tmp.h:536 -msgid "Brother HL-1660e" +msgid "Epson PM G700" msgstr "" #: src/main/xmli18n-tmp.h:537 -msgid "Brother HL-2060" +msgid "Epson PM G720" msgstr "" #: src/main/xmli18n-tmp.h:538 -msgid "Brother MFC-6550MC" +msgid "Epson PM G730" msgstr "" #: src/main/xmli18n-tmp.h:539 -msgid "Brother MFC-8300" +msgid "Epson PM G800" msgstr "" #: src/main/xmli18n-tmp.h:540 -msgid "Brother MFC-9500" +msgid "Epson PM G820" msgstr "" #: src/main/xmli18n-tmp.h:541 -msgid "Brother MFC-9600" +msgid "Epson PM G850" msgstr "" #: src/main/xmli18n-tmp.h:542 -msgid "Canon GP 335" +msgid "Epson PM G4500" msgstr "" #: src/main/xmli18n-tmp.h:543 -msgid "Canon LBP-4sx" +msgid "Epson PX A650" msgstr "" #: src/main/xmli18n-tmp.h:544 -msgid "Canon LBP-430" +msgid "Epson PX G900" msgstr "" #: src/main/xmli18n-tmp.h:545 -msgid "Canon LBP-1000" +msgid "Epson PX G920" msgstr "" #: src/main/xmli18n-tmp.h:546 -msgid "Canon LBP-1260" +msgid "Epson PX G5000" msgstr "" #: src/main/xmli18n-tmp.h:547 -msgid "Canon LBP-1760" +msgid "Epson PX V500" msgstr "" #: src/main/xmli18n-tmp.h:548 -msgid "Canon imageRunner 330s" +msgid "Epson PX V600" msgstr "" #: src/main/xmli18n-tmp.h:549 -msgid "Citizen ProJet II" +msgid "Epson PX V630" msgstr "" #: src/main/xmli18n-tmp.h:550 -msgid "DEC 1800" +msgid "Epson PX V780" msgstr "" #: src/main/xmli18n-tmp.h:551 -msgid "DEC LN17" +msgid "Epson PX 5500" msgstr "" #: src/main/xmli18n-tmp.h:552 -msgid "Epson ActionLaser 1100" +msgid "Epson PX 7000" msgstr "" #: src/main/xmli18n-tmp.h:553 -msgid "Epson ActionLaser II" +msgid "Epson PX 9000" msgstr "" #: src/main/xmli18n-tmp.h:554 -msgid "Epson AcuLaser C2000" +msgid "Apollo P-2100" msgstr "" #: src/main/xmli18n-tmp.h:555 -msgid "Epson AcuLaser C2000PS" +msgid "Apollo P-2150" msgstr "" #: src/main/xmli18n-tmp.h:556 -msgid "Epson AcuLaser C8500" +msgid "Apollo P-2200" msgstr "" #: src/main/xmli18n-tmp.h:557 -msgid "Epson AcuLaser C8500PS" +msgid "Apollo P-2250" msgstr "" #: src/main/xmli18n-tmp.h:558 -msgid "Epson AcuLaser C8600" +msgid "Apollo P-2500" msgstr "" #: src/main/xmli18n-tmp.h:559 -msgid "Epson AcuLaser C8600PS" +msgid "Apollo P-2550" msgstr "" #: src/main/xmli18n-tmp.h:560 -msgid "Epson EPL-5200" +msgid "Apollo P-2600" msgstr "" #: src/main/xmli18n-tmp.h:561 -msgid "Epson EPL-5200+" +msgid "Apollo P-2650" msgstr "" #: src/main/xmli18n-tmp.h:562 -msgid "Epson EPL-5700" +msgid "Apple Color StyleWriter 4100" msgstr "" #: src/main/xmli18n-tmp.h:563 -msgid "Epson EPL-5700PS" +msgid "Apple Color StyleWriter 4500" msgstr "" #: src/main/xmli18n-tmp.h:564 -msgid "Epson EPL-5800" +msgid "Apple Color StyleWriter 6500" msgstr "" #: src/main/xmli18n-tmp.h:565 -msgid "Epson EPL-5800PS" +msgid "Apple LaserWriter Select 360" msgstr "" #: src/main/xmli18n-tmp.h:566 -msgid "Epson EPL-5900" +msgid "Brother DCP-1200" msgstr "" #: src/main/xmli18n-tmp.h:567 -msgid "Epson EPL-5900PS" +msgid "Brother HL-4Ve" msgstr "" #: src/main/xmli18n-tmp.h:568 -msgid "Epson EPL-6100" +msgid "Brother HL-10V" msgstr "" #: src/main/xmli18n-tmp.h:569 -msgid "Epson EPL-6100PS" +msgid "Brother HL-10h" msgstr "" #: src/main/xmli18n-tmp.h:570 -msgid "Epson EPL-7100" +msgid "Brother HL-630" msgstr "" #: src/main/xmli18n-tmp.h:571 -msgid "Fujitsu PrintPartner 10V" +msgid "Brother HL-660" msgstr "" #: src/main/xmli18n-tmp.h:572 -msgid "Fujitsu PrintPartner 16DV" +msgid "Brother HL-760" msgstr "" #: src/main/xmli18n-tmp.h:573 -msgid "Fujitsu PrintPartner 20W" +msgid "Brother HL-960" msgstr "" #: src/main/xmli18n-tmp.h:574 -msgid "Fujitsu PrintPartner 8000" +msgid "Brother HL-1040" msgstr "" #: src/main/xmli18n-tmp.h:575 -msgid "Generic PCL 4 Printer" +msgid "Brother HL-1050" msgstr "" #: src/main/xmli18n-tmp.h:576 -msgid "Generic PCL 5 Printer" +msgid "Brother HL-1060" msgstr "" #: src/main/xmli18n-tmp.h:577 -msgid "Generic PCL 5c Printer" +msgid "Brother HL-1070" msgstr "" #: src/main/xmli18n-tmp.h:578 -msgid "Generic PCL 5e Printer" +msgid "Brother HL-1240" msgstr "" #: src/main/xmli18n-tmp.h:579 -msgid "Generic PCL 6/PCL XL Printer" +msgid "Brother HL-1250" msgstr "" #: src/main/xmli18n-tmp.h:580 -msgid "HP Business Inkjet 2200" +msgid "Brother HL-1260" msgstr "" #: src/main/xmli18n-tmp.h:581 -msgid "HP Business Inkjet 2230" +msgid "Brother HL-1270N" msgstr "" #: src/main/xmli18n-tmp.h:582 -msgid "HP Business Inkjet 2250" +msgid "Brother HL-1440" msgstr "" #: src/main/xmli18n-tmp.h:583 -msgid "HP Business Inkjet 2250TN" +msgid "Brother HL-1660e" msgstr "" #: src/main/xmli18n-tmp.h:584 -msgid "HP Business Inkjet 2280" +msgid "Brother HL-2060" msgstr "" #: src/main/xmli18n-tmp.h:585 -msgid "HP Color Inkjet Printer CP1160" +msgid "Brother MFC-6550MC" msgstr "" #: src/main/xmli18n-tmp.h:586 -msgid "HP Color Inkjet Printer CP1700" +msgid "Brother MFC-8300" msgstr "" #: src/main/xmli18n-tmp.h:587 -msgid "HP Color LaserJet 2500" +msgid "Brother MFC-9500" msgstr "" #: src/main/xmli18n-tmp.h:588 -msgid "HP Color LaserJet 4500" +msgid "Brother MFC-9600" msgstr "" #: src/main/xmli18n-tmp.h:589 -msgid "HP Color LaserJet 4550" +msgid "Canon GP 335" msgstr "" #: src/main/xmli18n-tmp.h:590 -msgid "HP Color LaserJet 4600" +msgid "Canon LBP-4sx" msgstr "" #: src/main/xmli18n-tmp.h:591 -msgid "HP Color LaserJet 5" +msgid "Canon LBP-430" msgstr "" #: src/main/xmli18n-tmp.h:592 -msgid "HP Color LaserJet 5000" +msgid "Canon LBP-1000" msgstr "" #: src/main/xmli18n-tmp.h:593 -msgid "HP Color LaserJet 5500" +msgid "Canon LBP-1260" msgstr "" #: src/main/xmli18n-tmp.h:594 -msgid "HP Color LaserJet 8550GN" +msgid "Canon LBP-1760" msgstr "" #: src/main/xmli18n-tmp.h:595 -msgid "HP DesignJet 230" +msgid "Canon imageRunner 330s" msgstr "" #: src/main/xmli18n-tmp.h:596 -msgid "HP DesignJet 250C" +msgid "Citizen ProJet II" msgstr "" #: src/main/xmli18n-tmp.h:597 -msgid "HP DesignJet 430" +msgid "DEC 1800" msgstr "" #: src/main/xmli18n-tmp.h:598 -msgid "HP DesignJet 450C" +msgid "DEC LN17" msgstr "" #: src/main/xmli18n-tmp.h:599 -msgid "HP DesignJet 455CA" +msgid "Epson ActionLaser 1100" msgstr "" #: src/main/xmli18n-tmp.h:600 -msgid "HP DesignJet 488CA" +msgid "Epson ActionLaser II" msgstr "" #: src/main/xmli18n-tmp.h:601 -msgid "HP DesignJet 700" +msgid "Epson AcuLaser C2000" msgstr "" #: src/main/xmli18n-tmp.h:602 -msgid "HP DesignJet 750C Plus" +msgid "Epson AcuLaser C2000PS" msgstr "" #: src/main/xmli18n-tmp.h:603 -msgid "HP DesignJet 750C" +msgid "Epson AcuLaser C8500" msgstr "" #: src/main/xmli18n-tmp.h:604 -msgid "HP DesignJet 2500CP" +msgid "Epson AcuLaser C8500PS" msgstr "" #: src/main/xmli18n-tmp.h:605 -msgid "HP DesignJet 3500CP" +msgid "Epson AcuLaser C8600" msgstr "" #: src/main/xmli18n-tmp.h:606 -msgid "HP DesignJet ColorPro CAD" +msgid "Epson AcuLaser C8600PS" msgstr "" #: src/main/xmli18n-tmp.h:607 -msgid "HP DeskJet 400" +msgid "Epson EPL-5200" msgstr "" #: src/main/xmli18n-tmp.h:608 -msgid "HP DeskJet 420C" +msgid "Epson EPL-5200+" msgstr "" #: src/main/xmli18n-tmp.h:609 -msgid "HP DeskJet 450" +msgid "Epson EPL-5700" msgstr "" #: src/main/xmli18n-tmp.h:610 -msgid "HP DeskJet 500" +msgid "Epson EPL-5700PS" msgstr "" #: src/main/xmli18n-tmp.h:611 -msgid "HP DeskJet 500C" +msgid "Epson EPL-5800" msgstr "" #: src/main/xmli18n-tmp.h:612 -msgid "HP DeskJet 505J Plus" +msgid "Epson EPL-5800PS" msgstr "" #: src/main/xmli18n-tmp.h:613 -msgid "HP DeskJet 510" +msgid "Epson EPL-5900" msgstr "" #: src/main/xmli18n-tmp.h:614 -msgid "HP DeskJet 520" +msgid "Epson EPL-5900PS" msgstr "" #: src/main/xmli18n-tmp.h:615 -msgid "HP DeskJet 540C" +msgid "Epson EPL-6100" msgstr "" #: src/main/xmli18n-tmp.h:616 -msgid "HP DeskJet 550C" +msgid "Epson EPL-6100PS" msgstr "" #: src/main/xmli18n-tmp.h:617 -msgid "HP DeskJet 5550" +msgid "Epson EPL-7100" msgstr "" #: src/main/xmli18n-tmp.h:618 -msgid "HP DeskJet 5551" +msgid "Fujitsu PrintPartner 10V" msgstr "" #: src/main/xmli18n-tmp.h:619 -msgid "HP DeskJet 560C" +msgid "Fujitsu PrintPartner 16DV" msgstr "" #: src/main/xmli18n-tmp.h:620 -msgid "HP DeskJet 600" +msgid "Fujitsu PrintPartner 20W" msgstr "" #: src/main/xmli18n-tmp.h:621 -msgid "HP DeskJet 600C" +msgid "Fujitsu PrintPartner 8000" msgstr "" #: src/main/xmli18n-tmp.h:622 -msgid "HP DeskJet 610C" +msgid "Generic PCL 4 Printer" msgstr "" #: src/main/xmli18n-tmp.h:623 -msgid "HP DeskJet 610CL" +msgid "Generic PCL 4 LF Printer" msgstr "" #: src/main/xmli18n-tmp.h:624 -msgid "HP DeskJet 6122" +msgid "Generic PCL 5 Printer" msgstr "" #: src/main/xmli18n-tmp.h:625 -msgid "HP DeskJet 6127" +msgid "Generic PCL 5 LF Printer" msgstr "" #: src/main/xmli18n-tmp.h:626 -msgid "HP DeskJet 612C" +msgid "Generic PCL 5c Printer" msgstr "" #: src/main/xmli18n-tmp.h:627 -msgid "HP DeskJet 640C" +msgid "Generic PCL 5c LF Printer" msgstr "" #: src/main/xmli18n-tmp.h:628 -msgid "HP DeskJet 648C" +msgid "Generic PCL 5e Printer" msgstr "" #: src/main/xmli18n-tmp.h:629 -msgid "HP DeskJet 660C" +msgid "Generic PCL 5e LF Printer" msgstr "" #: src/main/xmli18n-tmp.h:630 -msgid "HP DeskJet 670C" +msgid "Generic PCL 6/PCL XL Printer" msgstr "" #: src/main/xmli18n-tmp.h:631 -msgid "HP DeskJet 670TV" +msgid "Generic PCL 6/PCL XL LF Printer" msgstr "" #: src/main/xmli18n-tmp.h:632 -msgid "HP DeskJet 672C" +msgid "HP Business Inkjet 2200" msgstr "" #: src/main/xmli18n-tmp.h:633 -msgid "HP DeskJet 680C" +msgid "HP Business Inkjet 2230" msgstr "" #: src/main/xmli18n-tmp.h:634 -msgid "HP DeskJet 682C" +msgid "HP Business Inkjet 2250" msgstr "" #: src/main/xmli18n-tmp.h:635 -msgid "HP DeskJet 690C" +msgid "HP Business Inkjet 2250TN" msgstr "" #: src/main/xmli18n-tmp.h:636 -msgid "HP DeskJet 692C" +msgid "HP Business Inkjet 2280" msgstr "" #: src/main/xmli18n-tmp.h:637 -msgid "HP DeskJet 693C" +msgid "HP Color Inkjet Printer CP1160" msgstr "" #: src/main/xmli18n-tmp.h:638 -msgid "HP DeskJet 694C" +msgid "HP Color Inkjet Printer CP1700" msgstr "" #: src/main/xmli18n-tmp.h:639 -msgid "HP DeskJet 695C" +msgid "HP Color LaserJet 2500" msgstr "" #: src/main/xmli18n-tmp.h:640 -msgid "HP DeskJet 697C" +msgid "HP Color LaserJet 4500" msgstr "" #: src/main/xmli18n-tmp.h:641 -msgid "HP DeskJet 810C" +msgid "HP Color LaserJet 4550" msgstr "" #: src/main/xmli18n-tmp.h:642 -msgid "HP DeskJet 812C" +msgid "HP Color LaserJet 4600" msgstr "" #: src/main/xmli18n-tmp.h:643 -msgid "HP DeskJet 815C" +msgid "HP Color LaserJet 5" msgstr "" #: src/main/xmli18n-tmp.h:644 -msgid "HP DeskJet 816C" +msgid "HP Color LaserJet 5000" msgstr "" #: src/main/xmli18n-tmp.h:645 -msgid "HP DeskJet 825C" +msgid "HP Color LaserJet 5500" msgstr "" #: src/main/xmli18n-tmp.h:646 -msgid "HP DeskJet 830C" +msgid "HP Color LaserJet 8550GN" msgstr "" #: src/main/xmli18n-tmp.h:647 -msgid "HP DeskJet 832C" +msgid "HP DesignJet 230" msgstr "" #: src/main/xmli18n-tmp.h:648 -msgid "HP DeskJet 840C" +msgid "HP DesignJet 250C" msgstr "" #: src/main/xmli18n-tmp.h:649 -msgid "HP DeskJet 841C" +msgid "HP DesignJet 430" msgstr "" #: src/main/xmli18n-tmp.h:650 -msgid "HP DeskJet 842C" +msgid "HP DesignJet 450C" msgstr "" #: src/main/xmli18n-tmp.h:651 -msgid "HP DeskJet 843C" +msgid "HP DesignJet 455CA" msgstr "" #: src/main/xmli18n-tmp.h:652 -msgid "HP DeskJet 845C" +msgid "HP DesignJet 488CA" msgstr "" #: src/main/xmli18n-tmp.h:653 -msgid "HP DeskJet 850C" +msgid "HP DesignJet 700" msgstr "" #: src/main/xmli18n-tmp.h:654 -msgid "HP DeskJet 855C" +msgid "HP DesignJet 750C Plus" msgstr "" #: src/main/xmli18n-tmp.h:655 -msgid "HP DeskJet 870C" +msgid "HP DesignJet 750C" msgstr "" #: src/main/xmli18n-tmp.h:656 -msgid "HP DeskJet 880C" +msgid "HP DesignJet 2500CP" msgstr "" #: src/main/xmli18n-tmp.h:657 -msgid "HP DeskJet 882C" +msgid "HP DesignJet 3500CP" msgstr "" #: src/main/xmli18n-tmp.h:658 -msgid "HP DeskJet 890C" +msgid "HP DesignJet ColorPro CAD" msgstr "" #: src/main/xmli18n-tmp.h:659 -msgid "HP DeskJet 895C" +msgid "HP DeskJet 400" msgstr "" #: src/main/xmli18n-tmp.h:660 -msgid "HP DeskJet 916C" +msgid "HP DeskJet 420C" msgstr "" #: src/main/xmli18n-tmp.h:661 -msgid "HP DeskJet 920C" +msgid "HP DeskJet 450" msgstr "" #: src/main/xmli18n-tmp.h:662 -msgid "HP DeskJet 9300" +msgid "HP DeskJet 500" msgstr "" #: src/main/xmli18n-tmp.h:663 -msgid "HP DeskJet 930C" +msgid "HP DeskJet 500C" msgstr "" #: src/main/xmli18n-tmp.h:664 -msgid "HP DeskJet 932C" +msgid "HP DeskJet 505J Plus" msgstr "" #: src/main/xmli18n-tmp.h:665 -msgid "HP DeskJet 933C" +msgid "HP DeskJet 510" msgstr "" #: src/main/xmli18n-tmp.h:666 -msgid "HP DeskJet 934C" +msgid "HP DeskJet 520" msgstr "" #: src/main/xmli18n-tmp.h:667 -msgid "HP DeskJet 935C" +msgid "HP DeskJet 540C" msgstr "" #: src/main/xmli18n-tmp.h:668 -msgid "HP DeskJet 940C" +msgid "HP DeskJet 550C" msgstr "" #: src/main/xmli18n-tmp.h:669 -msgid "HP DeskJet 948C" +msgid "HP DeskJet 5550" msgstr "" #: src/main/xmli18n-tmp.h:670 -msgid "HP DeskJet 950C" +msgid "HP DeskJet 5551" msgstr "" #: src/main/xmli18n-tmp.h:671 -msgid "HP DeskJet 952C" +msgid "HP DeskJet 560C" msgstr "" #: src/main/xmli18n-tmp.h:672 -msgid "HP DeskJet 955C" +msgid "HP DeskJet 600" msgstr "" #: src/main/xmli18n-tmp.h:673 -msgid "HP DeskJet 957C" +msgid "HP DeskJet 600C" msgstr "" #: src/main/xmli18n-tmp.h:674 -msgid "HP DeskJet 959C" +msgid "HP DeskJet 610C" msgstr "" #: src/main/xmli18n-tmp.h:675 -msgid "HP DeskJet 960C" +msgid "HP DeskJet 610CL" msgstr "" #: src/main/xmli18n-tmp.h:676 -msgid "HP DeskJet 970C" +msgid "HP DeskJet 6122" msgstr "" #: src/main/xmli18n-tmp.h:677 -msgid "HP DeskJet 975C" +msgid "HP DeskJet 6127" msgstr "" #: src/main/xmli18n-tmp.h:678 -msgid "HP DeskJet 980C" +msgid "HP DeskJet 612C" msgstr "" #: src/main/xmli18n-tmp.h:679 -msgid "HP DeskJet 990C" +msgid "HP DeskJet 640C" msgstr "" #: src/main/xmli18n-tmp.h:680 -msgid "HP DeskJet 995C" +msgid "HP DeskJet 648C" msgstr "" #: src/main/xmli18n-tmp.h:681 -msgid "HP DeskJet 1100C" +msgid "HP DeskJet 660C" msgstr "" #: src/main/xmli18n-tmp.h:682 -msgid "HP DeskJet 1120C" +msgid "HP DeskJet 670C" msgstr "" #: src/main/xmli18n-tmp.h:683 -msgid "HP DeskJet 1125C" +msgid "HP DeskJet 670TV" msgstr "" #: src/main/xmli18n-tmp.h:684 -msgid "HP DeskJet 1200C" +msgid "HP DeskJet 672C" msgstr "" #: src/main/xmli18n-tmp.h:685 -msgid "HP DeskJet 1220C" +msgid "HP DeskJet 680C" msgstr "" #: src/main/xmli18n-tmp.h:686 -msgid "HP DeskJet 1600C" +msgid "HP DeskJet 682C" msgstr "" #: src/main/xmli18n-tmp.h:687 -msgid "HP DeskJet 1600CM" +msgid "HP DeskJet 690C" msgstr "" #: src/main/xmli18n-tmp.h:688 -msgid "HP DeskJet 2000" +msgid "HP DeskJet 692C" msgstr "" #: src/main/xmli18n-tmp.h:689 -msgid "HP DeskJet 2500" +msgid "HP DeskJet 693C" msgstr "" #: src/main/xmli18n-tmp.h:690 -msgid "HP DeskJet 2500CM" +msgid "HP DeskJet 694C" msgstr "" #: src/main/xmli18n-tmp.h:691 -msgid "HP DeskJet 340C" +msgid "HP DeskJet 695C" msgstr "" #: src/main/xmli18n-tmp.h:692 -msgid "HP DeskJet 3810" +msgid "HP DeskJet 697C" msgstr "" #: src/main/xmli18n-tmp.h:693 -msgid "HP DeskJet 3816" +msgid "HP DeskJet 810C" msgstr "" #: src/main/xmli18n-tmp.h:694 -msgid "HP DeskJet 3820" +msgid "HP DeskJet 812C" msgstr "" #: src/main/xmli18n-tmp.h:695 -msgid "HP DeskJet 3822" +msgid "HP DeskJet 815C" msgstr "" #: src/main/xmli18n-tmp.h:696 -msgid "HP LaserJet 2" +msgid "HP DeskJet 816C" msgstr "" #: src/main/xmli18n-tmp.h:697 -msgid "HP LaserJet 2D" +msgid "HP DeskJet 825C" msgstr "" #: src/main/xmli18n-tmp.h:698 -msgid "HP LaserJet 2P Plus" +msgid "HP DeskJet 830C" msgstr "" #: src/main/xmli18n-tmp.h:699 -msgid "HP LaserJet 2P" +msgid "HP DeskJet 832C" msgstr "" #: src/main/xmli18n-tmp.h:700 -msgid "HP LaserJet 3" +msgid "HP DeskJet 840C" msgstr "" #: src/main/xmli18n-tmp.h:701 -msgid "HP LaserJet 3D" +msgid "HP DeskJet 841C" msgstr "" #: src/main/xmli18n-tmp.h:702 -msgid "HP LaserJet 3P w/ PCL5" +msgid "HP DeskJet 842C" msgstr "" #: src/main/xmli18n-tmp.h:703 -msgid "HP LaserJet 3P w/PS" +msgid "HP DeskJet 843C" msgstr "" #: src/main/xmli18n-tmp.h:704 -msgid "HP LaserJet 4 Plus" +msgid "HP DeskJet 845C" msgstr "" #: src/main/xmli18n-tmp.h:705 -msgid "HP LaserJet 4" +msgid "HP DeskJet 850C" msgstr "" #: src/main/xmli18n-tmp.h:706 -msgid "HP LaserJet 4L" +msgid "HP DeskJet 855C" msgstr "" #: src/main/xmli18n-tmp.h:707 -msgid "HP LaserJet 4M" +msgid "HP DeskJet 870C" msgstr "" #: src/main/xmli18n-tmp.h:708 -msgid "HP LaserJet 4ML" +msgid "HP DeskJet 880C" msgstr "" #: src/main/xmli18n-tmp.h:709 -msgid "HP LaserJet 4P" +msgid "HP DeskJet 882C" msgstr "" #: src/main/xmli18n-tmp.h:710 -msgid "HP LaserJet 4Si" +msgid "HP DeskJet 890C" msgstr "" #: src/main/xmli18n-tmp.h:711 -msgid "HP LaserJet 4V" +msgid "HP DeskJet 895C" msgstr "" #: src/main/xmli18n-tmp.h:712 -msgid "HP LaserJet 5" +msgid "HP DeskJet 916C" msgstr "" #: src/main/xmli18n-tmp.h:713 -msgid "HP LaserJet 5L" +msgid "HP DeskJet 920C" msgstr "" #: src/main/xmli18n-tmp.h:714 -msgid "HP LaserJet 5M" +msgid "HP DeskJet 9300" msgstr "" #: src/main/xmli18n-tmp.h:715 -msgid "HP LaserJet 5MP" +msgid "HP DeskJet 930C" msgstr "" #: src/main/xmli18n-tmp.h:716 -msgid "HP LaserJet 5P" +msgid "HP DeskJet 932C" msgstr "" #: src/main/xmli18n-tmp.h:717 -msgid "HP LaserJet 5Si" +msgid "HP DeskJet 933C" msgstr "" #: src/main/xmli18n-tmp.h:718 -msgid "HP LaserJet 6" +msgid "HP DeskJet 934C" msgstr "" #: src/main/xmli18n-tmp.h:719 -msgid "HP LaserJet 6L" +msgid "HP DeskJet 935C" msgstr "" #: src/main/xmli18n-tmp.h:720 -msgid "HP LaserJet 6MP" +msgid "HP DeskJet 940C" msgstr "" #: src/main/xmli18n-tmp.h:721 -msgid "HP LaserJet 6P" +msgid "HP DeskJet 948C" msgstr "" #: src/main/xmli18n-tmp.h:722 -msgid "HP LaserJet 1010" +msgid "HP DeskJet 950C" msgstr "" #: src/main/xmli18n-tmp.h:723 -msgid "HP LaserJet 1012" +msgid "HP DeskJet 952C" msgstr "" #: src/main/xmli18n-tmp.h:724 -msgid "HP LaserJet 1015" +msgid "HP DeskJet 955C" msgstr "" #: src/main/xmli18n-tmp.h:725 -msgid "HP LaserJet 1022" +msgid "HP DeskJet 957C" msgstr "" #: src/main/xmli18n-tmp.h:726 -msgid "HP LaserJet 1100" +msgid "HP DeskJet 959C" msgstr "" #: src/main/xmli18n-tmp.h:727 -msgid "HP LaserJet 1100A" +msgid "HP DeskJet 960C" msgstr "" #: src/main/xmli18n-tmp.h:728 -msgid "HP LaserJet 1150" +msgid "HP DeskJet 970C" msgstr "" #: src/main/xmli18n-tmp.h:729 -msgid "HP LaserJet 1200" +msgid "HP DeskJet 975C" msgstr "" #: src/main/xmli18n-tmp.h:730 -msgid "HP LaserJet 1220" +msgid "HP DeskJet 980C" msgstr "" #: src/main/xmli18n-tmp.h:731 -msgid "HP LaserJet 1300" +msgid "HP DeskJet 990C" msgstr "" #: src/main/xmli18n-tmp.h:732 -msgid "HP LaserJet 2100" +msgid "HP DeskJet 995C" msgstr "" #: src/main/xmli18n-tmp.h:733 -msgid "HP LaserJet 2100M" +msgid "HP DeskJet 1100C" msgstr "" #: src/main/xmli18n-tmp.h:734 -msgid "HP LaserJet 2200" +msgid "HP DeskJet 1120C" msgstr "" #: src/main/xmli18n-tmp.h:735 -msgid "HP LaserJet 2300" +msgid "HP DeskJet 1125C" msgstr "" #: src/main/xmli18n-tmp.h:736 -msgid "HP LaserJet 3200" +msgid "HP DeskJet 1200C" msgstr "" #: src/main/xmli18n-tmp.h:737 -msgid "HP LaserJet 3200m" +msgid "HP DeskJet 1220C" msgstr "" #: src/main/xmli18n-tmp.h:738 -msgid "HP LaserJet 3200se" +msgid "HP DeskJet 1600C" msgstr "" #: src/main/xmli18n-tmp.h:739 -msgid "HP LaserJet 3300 MFP" +msgid "HP DeskJet 1600CM" msgstr "" #: src/main/xmli18n-tmp.h:740 -msgid "HP LaserJet 3310 MFP" +msgid "HP DeskJet 2000" msgstr "" #: src/main/xmli18n-tmp.h:741 -msgid "HP LaserJet 3320 MFP" +msgid "HP DeskJet 2500" msgstr "" #: src/main/xmli18n-tmp.h:742 -msgid "HP LaserJet 3320N MFP" +msgid "HP DeskJet 2500CM" msgstr "" #: src/main/xmli18n-tmp.h:743 -msgid "HP LaserJet 3330 MFP" +msgid "HP DeskJet 340C" msgstr "" #: src/main/xmli18n-tmp.h:744 -msgid "HP LaserJet 4000" +msgid "HP DeskJet 3810" msgstr "" #: src/main/xmli18n-tmp.h:745 -msgid "HP LaserJet 4050" +msgid "HP DeskJet 3816" msgstr "" #: src/main/xmli18n-tmp.h:746 -msgid "HP LaserJet 4100" +msgid "HP DeskJet 3820" msgstr "" #: src/main/xmli18n-tmp.h:747 -msgid "HP LaserJet 4200" +msgid "HP DeskJet 3822" msgstr "" #: src/main/xmli18n-tmp.h:748 -msgid "HP LaserJet 4300" +msgid "HP LaserJet 2" msgstr "" #: src/main/xmli18n-tmp.h:749 -msgid "HP LaserJet 5000" +msgid "HP LaserJet 2D" msgstr "" #: src/main/xmli18n-tmp.h:750 -msgid "HP LaserJet 5100" +msgid "HP LaserJet 2P Plus" msgstr "" #: src/main/xmli18n-tmp.h:751 -msgid "HP LaserJet 8000" +msgid "HP LaserJet 2P" msgstr "" #: src/main/xmli18n-tmp.h:752 -msgid "HP LaserJet 8100" +msgid "HP LaserJet 3" msgstr "" #: src/main/xmli18n-tmp.h:753 -msgid "HP LaserJet 8150" +msgid "HP LaserJet 3D" msgstr "" #: src/main/xmli18n-tmp.h:754 -msgid "HP LaserJet 9000" +msgid "HP LaserJet 3P w/ PCL5" msgstr "" #: src/main/xmli18n-tmp.h:755 -msgid "HP Mopier 240" +msgid "HP LaserJet 3P w/PS" msgstr "" #: src/main/xmli18n-tmp.h:756 -msgid "HP Mopier 320" +msgid "HP LaserJet 4 Plus" msgstr "" #: src/main/xmli18n-tmp.h:757 -msgid "HP OfficeJet 300" +msgid "HP LaserJet 4" msgstr "" #: src/main/xmli18n-tmp.h:758 -msgid "HP OfficeJet 330" +msgid "HP LaserJet 4L" msgstr "" #: src/main/xmli18n-tmp.h:759 -msgid "HP OfficeJet 350" +msgid "HP LaserJet 4M" msgstr "" #: src/main/xmli18n-tmp.h:760 -msgid "HP OfficeJet 500" +msgid "HP LaserJet 4ML" msgstr "" #: src/main/xmli18n-tmp.h:761 -msgid "HP OfficeJet 520" +msgid "HP LaserJet 4P" msgstr "" #: src/main/xmli18n-tmp.h:762 -msgid "HP OfficeJet 570" +msgid "HP LaserJet 4Si" msgstr "" #: src/main/xmli18n-tmp.h:763 -msgid "HP OfficeJet 580" +msgid "HP LaserJet 4V" msgstr "" #: src/main/xmli18n-tmp.h:764 -msgid "HP OfficeJet 590" +msgid "HP LaserJet 5" msgstr "" #: src/main/xmli18n-tmp.h:765 -msgid "HP OfficeJet 600" +msgid "HP LaserJet 5L" msgstr "" #: src/main/xmli18n-tmp.h:766 -msgid "HP OfficeJet 610" +msgid "HP LaserJet 5M" msgstr "" #: src/main/xmli18n-tmp.h:767 -msgid "HP OfficeJet 625" +msgid "HP LaserJet 5MP" msgstr "" #: src/main/xmli18n-tmp.h:768 -msgid "HP OfficeJet 630" +msgid "HP LaserJet 5P" msgstr "" #: src/main/xmli18n-tmp.h:769 -msgid "HP OfficeJet 635" +msgid "HP LaserJet 5Si" msgstr "" #: src/main/xmli18n-tmp.h:770 -msgid "HP OfficeJet 700" +msgid "HP LaserJet 6" msgstr "" #: src/main/xmli18n-tmp.h:771 -msgid "HP OfficeJet 710" +msgid "HP LaserJet 6L" msgstr "" #: src/main/xmli18n-tmp.h:772 -msgid "HP OfficeJet 720" +msgid "HP LaserJet 6MP" msgstr "" #: src/main/xmli18n-tmp.h:773 -msgid "HP OfficeJet 725" +msgid "HP LaserJet 6P" msgstr "" #: src/main/xmli18n-tmp.h:774 -msgid "HP OfficeJet 5105" +msgid "HP LaserJet 1010" msgstr "" #: src/main/xmli18n-tmp.h:775 -msgid "HP OfficeJet 5110" +msgid "HP LaserJet 1012" msgstr "" #: src/main/xmli18n-tmp.h:776 -msgid "HP OfficeJet 5110xi" +msgid "HP LaserJet 1015" msgstr "" #: src/main/xmli18n-tmp.h:777 -msgid "HP OfficeJet 6105" +msgid "HP LaserJet 1022" msgstr "" #: src/main/xmli18n-tmp.h:778 -msgid "HP OfficeJet 6110" +msgid "HP LaserJet 1100" msgstr "" #: src/main/xmli18n-tmp.h:779 -msgid "HP OfficeJet 7110" +msgid "HP LaserJet 1100A" msgstr "" #: src/main/xmli18n-tmp.h:780 -msgid "HP OfficeJet 7130" +msgid "HP LaserJet 1150" msgstr "" #: src/main/xmli18n-tmp.h:781 -msgid "HP OfficeJet 7140" +msgid "HP LaserJet 1200" msgstr "" #: src/main/xmli18n-tmp.h:782 -msgid "HP OfficeJet D125" +msgid "HP LaserJet 1220" msgstr "" #: src/main/xmli18n-tmp.h:783 -msgid "HP OfficeJet D135" +msgid "HP LaserJet 1300" msgstr "" #: src/main/xmli18n-tmp.h:784 -msgid "HP OfficeJet D145" +msgid "HP LaserJet 2100" msgstr "" #: src/main/xmli18n-tmp.h:785 -msgid "HP OfficeJet D155" +msgid "HP LaserJet 2100M" msgstr "" #: src/main/xmli18n-tmp.h:786 -msgid "HP OfficeJet G55" +msgid "HP LaserJet 2200" msgstr "" #: src/main/xmli18n-tmp.h:787 -msgid "HP OfficeJet G85" +msgid "HP LaserJet 2300" msgstr "" #: src/main/xmli18n-tmp.h:788 -msgid "HP OfficeJet G95" +msgid "HP LaserJet 3200" msgstr "" #: src/main/xmli18n-tmp.h:789 -msgid "HP OfficeJet K60" +msgid "HP LaserJet 3200m" msgstr "" #: src/main/xmli18n-tmp.h:790 -msgid "HP OfficeJet K60xi" +msgid "HP LaserJet 3200se" msgstr "" #: src/main/xmli18n-tmp.h:791 -msgid "HP OfficeJet K80" +msgid "HP LaserJet 3300 MFP" msgstr "" #: src/main/xmli18n-tmp.h:792 -msgid "HP OfficeJet K80xi" +msgid "HP LaserJet 3310 MFP" msgstr "" #: src/main/xmli18n-tmp.h:793 -msgid "HP OfficeJet LX" +msgid "HP LaserJet 3320 MFP" msgstr "" #: src/main/xmli18n-tmp.h:794 -msgid "HP OfficeJet Pro 1150C" +msgid "HP LaserJet 3320N MFP" msgstr "" #: src/main/xmli18n-tmp.h:795 -msgid "HP OfficeJet Pro 1170C" +msgid "HP LaserJet 3330 MFP" msgstr "" #: src/main/xmli18n-tmp.h:796 -msgid "HP OfficeJet Pro 1175C" +msgid "HP LaserJet 4000" msgstr "" #: src/main/xmli18n-tmp.h:797 -msgid "HP OfficeJet R40" +msgid "HP LaserJet 4050" msgstr "" #: src/main/xmli18n-tmp.h:798 -msgid "HP OfficeJet R45" +msgid "HP LaserJet 4100" msgstr "" #: src/main/xmli18n-tmp.h:799 +msgid "HP LaserJet 4200" +msgstr "" + +#: src/main/xmli18n-tmp.h:800 +msgid "HP LaserJet 4300" +msgstr "" + +#: src/main/xmli18n-tmp.h:801 +msgid "HP LaserJet 5000" +msgstr "" + +#: src/main/xmli18n-tmp.h:802 +msgid "HP LaserJet 5100" +msgstr "" + +#: src/main/xmli18n-tmp.h:803 +msgid "HP LaserJet 8000" +msgstr "" + +#: src/main/xmli18n-tmp.h:804 +msgid "HP LaserJet 8100" +msgstr "" + +#: src/main/xmli18n-tmp.h:805 +msgid "HP LaserJet 8150" +msgstr "" + +#: src/main/xmli18n-tmp.h:806 +msgid "HP LaserJet 9000" +msgstr "" + +#: src/main/xmli18n-tmp.h:807 +msgid "HP Mopier 240" +msgstr "" + +#: src/main/xmli18n-tmp.h:808 +msgid "HP Mopier 320" +msgstr "" + +#: src/main/xmli18n-tmp.h:809 +msgid "HP OfficeJet 300" +msgstr "" + +#: src/main/xmli18n-tmp.h:810 +msgid "HP OfficeJet 330" +msgstr "" + +#: src/main/xmli18n-tmp.h:811 +msgid "HP OfficeJet 350" +msgstr "" + +#: src/main/xmli18n-tmp.h:812 +msgid "HP OfficeJet 500" +msgstr "" + +#: src/main/xmli18n-tmp.h:813 +msgid "HP OfficeJet 520" +msgstr "" + +#: src/main/xmli18n-tmp.h:814 +msgid "HP OfficeJet 570" +msgstr "" + +#: src/main/xmli18n-tmp.h:815 +msgid "HP OfficeJet 580" +msgstr "" + +#: src/main/xmli18n-tmp.h:816 +msgid "HP OfficeJet 590" +msgstr "" + +#: src/main/xmli18n-tmp.h:817 +msgid "HP OfficeJet 600" +msgstr "" + +#: src/main/xmli18n-tmp.h:818 +msgid "HP OfficeJet 610" +msgstr "" + +#: src/main/xmli18n-tmp.h:819 +msgid "HP OfficeJet 625" +msgstr "" + +#: src/main/xmli18n-tmp.h:820 +msgid "HP OfficeJet 630" +msgstr "" + +#: src/main/xmli18n-tmp.h:821 +msgid "HP OfficeJet 635" +msgstr "" + +#: src/main/xmli18n-tmp.h:822 +msgid "HP OfficeJet 700" +msgstr "" + +#: src/main/xmli18n-tmp.h:823 +msgid "HP OfficeJet 710" +msgstr "" + +#: src/main/xmli18n-tmp.h:824 +msgid "HP OfficeJet 720" +msgstr "" + +#: src/main/xmli18n-tmp.h:825 +msgid "HP OfficeJet 725" +msgstr "" + +#: src/main/xmli18n-tmp.h:826 +msgid "HP OfficeJet 5105" +msgstr "" + +#: src/main/xmli18n-tmp.h:827 +msgid "HP OfficeJet 5110" +msgstr "" + +#: src/main/xmli18n-tmp.h:828 +msgid "HP OfficeJet 5110xi" +msgstr "" + +#: src/main/xmli18n-tmp.h:829 +msgid "HP OfficeJet 6105" +msgstr "" + +#: src/main/xmli18n-tmp.h:830 +msgid "HP OfficeJet 6110" +msgstr "" + +#: src/main/xmli18n-tmp.h:831 +msgid "HP OfficeJet 7110" +msgstr "" + +#: src/main/xmli18n-tmp.h:832 +msgid "HP OfficeJet 7130" +msgstr "" + +#: src/main/xmli18n-tmp.h:833 +msgid "HP OfficeJet 7140" +msgstr "" + +#: src/main/xmli18n-tmp.h:834 +msgid "HP OfficeJet D125" +msgstr "" + +#: src/main/xmli18n-tmp.h:835 +msgid "HP OfficeJet D135" +msgstr "" + +#: src/main/xmli18n-tmp.h:836 +msgid "HP OfficeJet D145" +msgstr "" + +#: src/main/xmli18n-tmp.h:837 +msgid "HP OfficeJet D155" +msgstr "" + +#: src/main/xmli18n-tmp.h:838 +msgid "HP OfficeJet G55" +msgstr "" + +#: src/main/xmli18n-tmp.h:839 +msgid "HP OfficeJet G85" +msgstr "" + +#: src/main/xmli18n-tmp.h:840 +msgid "HP OfficeJet G95" +msgstr "" + +#: src/main/xmli18n-tmp.h:841 +msgid "HP OfficeJet K60" +msgstr "" + +#: src/main/xmli18n-tmp.h:842 +msgid "HP OfficeJet K60xi" +msgstr "" + +#: src/main/xmli18n-tmp.h:843 +msgid "HP OfficeJet K80" +msgstr "" + +#: src/main/xmli18n-tmp.h:844 +msgid "HP OfficeJet K80xi" +msgstr "" + +#: src/main/xmli18n-tmp.h:845 +msgid "HP OfficeJet LX" +msgstr "" + +#: src/main/xmli18n-tmp.h:846 +msgid "HP OfficeJet Pro 1150C" +msgstr "" + +#: src/main/xmli18n-tmp.h:847 +msgid "HP OfficeJet Pro 1170C" +msgstr "" + +#: src/main/xmli18n-tmp.h:848 +msgid "HP OfficeJet Pro 1175C" +msgstr "" + +#: src/main/xmli18n-tmp.h:849 +msgid "HP OfficeJet R40" +msgstr "" + +#: src/main/xmli18n-tmp.h:850 +msgid "HP OfficeJet R45" +msgstr "" + +#: src/main/xmli18n-tmp.h:851 msgid "HP OfficeJet R60" msgstr "" -#: src/main/xmli18n-tmp.h:800 +#: src/main/xmli18n-tmp.h:852 msgid "HP OfficeJet R65" msgstr "" -#: src/main/xmli18n-tmp.h:801 +#: src/main/xmli18n-tmp.h:853 msgid "HP OfficeJet R80" msgstr "" -#: src/main/xmli18n-tmp.h:802 +#: src/main/xmli18n-tmp.h:854 msgid "HP OfficeJet T45" msgstr "" -#: src/main/xmli18n-tmp.h:803 +#: src/main/xmli18n-tmp.h:855 msgid "HP OfficeJet T65" msgstr "" -#: src/main/xmli18n-tmp.h:804 +#: src/main/xmli18n-tmp.h:856 msgid "HP OfficeJet V40" msgstr "" -#: src/main/xmli18n-tmp.h:805 +#: src/main/xmli18n-tmp.h:857 msgid "HP OfficeJet V40xi" msgstr "" -#: src/main/xmli18n-tmp.h:806 +#: src/main/xmli18n-tmp.h:858 msgid "HP OfficeJet" msgstr "" -#: src/main/xmli18n-tmp.h:807 +#: src/main/xmli18n-tmp.h:859 msgid "HP PSC 370" msgstr "" -#: src/main/xmli18n-tmp.h:808 +#: src/main/xmli18n-tmp.h:860 msgid "HP PSC 380" msgstr "" -#: src/main/xmli18n-tmp.h:809 +#: src/main/xmli18n-tmp.h:861 msgid "HP PSC 500" msgstr "" -#: src/main/xmli18n-tmp.h:810 +#: src/main/xmli18n-tmp.h:862 msgid "HP PSC 750" msgstr "" -#: src/main/xmli18n-tmp.h:811 +#: src/main/xmli18n-tmp.h:863 msgid "HP PSC 950" msgstr "" -#: src/main/xmli18n-tmp.h:812 +#: src/main/xmli18n-tmp.h:864 msgid "HP PSC 950xi" msgstr "" -#: src/main/xmli18n-tmp.h:813 +#: src/main/xmli18n-tmp.h:865 msgid "HP PSC 2110" msgstr "" -#: src/main/xmli18n-tmp.h:814 +#: src/main/xmli18n-tmp.h:866 msgid "HP PSC 2150" msgstr "" -#: src/main/xmli18n-tmp.h:815 +#: src/main/xmli18n-tmp.h:867 msgid "HP PSC 2210" msgstr "" -#: src/main/xmli18n-tmp.h:816 +#: src/main/xmli18n-tmp.h:868 msgid "HP PhotoSmart 7150" msgstr "" -#: src/main/xmli18n-tmp.h:817 +#: src/main/xmli18n-tmp.h:869 msgid "HP PhotoSmart 7345" msgstr "" -#: src/main/xmli18n-tmp.h:818 +#: src/main/xmli18n-tmp.h:870 msgid "HP PhotoSmart 7350" msgstr "" -#: src/main/xmli18n-tmp.h:819 +#: src/main/xmli18n-tmp.h:871 msgid "HP PhotoSmart 7550" msgstr "" -#: src/main/xmli18n-tmp.h:820 +#: src/main/xmli18n-tmp.h:872 msgid "HP PhotoSmart P100" msgstr "" -#: src/main/xmli18n-tmp.h:821 +#: src/main/xmli18n-tmp.h:873 msgid "HP PhotoSmart P130" msgstr "" -#: src/main/xmli18n-tmp.h:822 +#: src/main/xmli18n-tmp.h:874 msgid "HP PhotoSmart P230" msgstr "" -#: src/main/xmli18n-tmp.h:823 +#: src/main/xmli18n-tmp.h:875 msgid "HP PhotoSmart P1000" msgstr "" -#: src/main/xmli18n-tmp.h:824 +#: src/main/xmli18n-tmp.h:876 msgid "HP PhotoSmart P1100" msgstr "" -#: src/main/xmli18n-tmp.h:825 +#: src/main/xmli18n-tmp.h:877 msgid "HP PhotoSmart P1115" msgstr "" -#: src/main/xmli18n-tmp.h:826 +#: src/main/xmli18n-tmp.h:878 msgid "HP PhotoSmart P1215" msgstr "" -#: src/main/xmli18n-tmp.h:827 +#: src/main/xmli18n-tmp.h:879 msgid "HP PhotoSmart P1218" msgstr "" -#: src/main/xmli18n-tmp.h:828 +#: src/main/xmli18n-tmp.h:880 msgid "HP PhotoSmart P1315" msgstr "" -#: src/main/xmli18n-tmp.h:829 +#: src/main/xmli18n-tmp.h:881 msgid "HP e-printer e20" msgstr "" -#: src/main/xmli18n-tmp.h:830 +#: src/main/xmli18n-tmp.h:882 msgid "IBM 4019" msgstr "" -#: src/main/xmli18n-tmp.h:831 +#: src/main/xmli18n-tmp.h:883 msgid "IBM 4029 030 LaserPrinter 10" msgstr "" -#: src/main/xmli18n-tmp.h:832 +#: src/main/xmli18n-tmp.h:884 msgid "IBM 4312" msgstr "" -#: src/main/xmli18n-tmp.h:833 +#: src/main/xmli18n-tmp.h:885 msgid "IBM Infoprint 12" msgstr "" -#: src/main/xmli18n-tmp.h:834 +#: src/main/xmli18n-tmp.h:886 msgid "IBM Page Printer 3112" msgstr "" -#: src/main/xmli18n-tmp.h:835 +#: src/main/xmli18n-tmp.h:887 msgid "Infotec 4651 MF" msgstr "" -#: src/main/xmli18n-tmp.h:836 +#: src/main/xmli18n-tmp.h:888 msgid "Kyocera F-1010" msgstr "" -#: src/main/xmli18n-tmp.h:837 +#: src/main/xmli18n-tmp.h:889 msgid "Kyocera FS-600 - KPDL-2" msgstr "" -#: src/main/xmli18n-tmp.h:838 +#: src/main/xmli18n-tmp.h:890 msgid "Kyocera FS-600" msgstr "" -#: src/main/xmli18n-tmp.h:839 +#: src/main/xmli18n-tmp.h:891 msgid "Kyocera FS-680" msgstr "" -#: src/main/xmli18n-tmp.h:840 +#: src/main/xmli18n-tmp.h:892 msgid "Kyocera FS-800" msgstr "" -#: src/main/xmli18n-tmp.h:841 +#: src/main/xmli18n-tmp.h:893 msgid "Kyocera FS-1000" msgstr "" -#: src/main/xmli18n-tmp.h:842 +#: src/main/xmli18n-tmp.h:894 msgid "Kyocera FS-1000+" msgstr "" -#: src/main/xmli18n-tmp.h:843 +#: src/main/xmli18n-tmp.h:895 msgid "Kyocera FS-1010" msgstr "" -#: src/main/xmli18n-tmp.h:844 +#: src/main/xmli18n-tmp.h:896 msgid "Kyocera FS-1050" msgstr "" -#: src/main/xmli18n-tmp.h:845 +#: src/main/xmli18n-tmp.h:897 msgid "Kyocera FS-1200" msgstr "" -#: src/main/xmli18n-tmp.h:846 +#: src/main/xmli18n-tmp.h:898 msgid "Kyocera FS-1600" msgstr "" -#: src/main/xmli18n-tmp.h:847 +#: src/main/xmli18n-tmp.h:899 msgid "Kyocera FS-1600+" msgstr "" -#: src/main/xmli18n-tmp.h:848 +#: src/main/xmli18n-tmp.h:900 msgid "Kyocera FS-1700" msgstr "" -#: src/main/xmli18n-tmp.h:849 +#: src/main/xmli18n-tmp.h:901 msgid "Kyocera FS-1700+" msgstr "" -#: src/main/xmli18n-tmp.h:850 +#: src/main/xmli18n-tmp.h:902 msgid "Kyocera FS-1750" msgstr "" -#: src/main/xmli18n-tmp.h:851 +#: src/main/xmli18n-tmp.h:903 msgid "Kyocera FS-1800" msgstr "" -#: src/main/xmli18n-tmp.h:852 +#: src/main/xmli18n-tmp.h:904 msgid "Kyocera FS-1800+" msgstr "" -#: src/main/xmli18n-tmp.h:853 +#: src/main/xmli18n-tmp.h:905 msgid "Kyocera FS-1900" msgstr "" -#: src/main/xmli18n-tmp.h:854 +#: src/main/xmli18n-tmp.h:906 msgid "Kyocera FS-3500" msgstr "" -#: src/main/xmli18n-tmp.h:855 +#: src/main/xmli18n-tmp.h:907 msgid "Kyocera FS-3600" msgstr "" -#: src/main/xmli18n-tmp.h:856 +#: src/main/xmli18n-tmp.h:908 msgid "Kyocera FS-3600+" msgstr "" -#: src/main/xmli18n-tmp.h:857 +#: src/main/xmli18n-tmp.h:909 msgid "Kyocera FS-3700" msgstr "" -#: src/main/xmli18n-tmp.h:858 +#: src/main/xmli18n-tmp.h:910 msgid "Kyocera FS-3700+" msgstr "" -#: src/main/xmli18n-tmp.h:859 +#: src/main/xmli18n-tmp.h:911 msgid "Kyocera FS-3750" msgstr "" -#: src/main/xmli18n-tmp.h:860 +#: src/main/xmli18n-tmp.h:912 msgid "Kyocera FS-3800" msgstr "" -#: src/main/xmli18n-tmp.h:861 +#: src/main/xmli18n-tmp.h:913 msgid "Kyocera FS-5800C" msgstr "" -#: src/main/xmli18n-tmp.h:862 +#: src/main/xmli18n-tmp.h:914 msgid "Kyocera FS-5900C" msgstr "" -#: src/main/xmli18n-tmp.h:863 +#: src/main/xmli18n-tmp.h:915 msgid "Kyocera FS-6500" msgstr "" -#: src/main/xmli18n-tmp.h:864 +#: src/main/xmli18n-tmp.h:916 msgid "Kyocera FS-6500+" msgstr "" -#: src/main/xmli18n-tmp.h:865 +#: src/main/xmli18n-tmp.h:917 msgid "Kyocera FS-6700" msgstr "" -#: src/main/xmli18n-tmp.h:866 +#: src/main/xmli18n-tmp.h:918 msgid "Kyocera FS-7000" msgstr "" -#: src/main/xmli18n-tmp.h:867 +#: src/main/xmli18n-tmp.h:919 msgid "Kyocera FS-7000+" msgstr "" -#: src/main/xmli18n-tmp.h:868 +#: src/main/xmli18n-tmp.h:920 msgid "Kyocera FS-8000C" msgstr "" -#: src/main/xmli18n-tmp.h:869 +#: src/main/xmli18n-tmp.h:921 msgid "Kyocera FS-9000" msgstr "" -#: src/main/xmli18n-tmp.h:870 +#: src/main/xmli18n-tmp.h:922 msgid "Kyocera FS-9100DN" msgstr "" -#: src/main/xmli18n-tmp.h:871 +#: src/main/xmli18n-tmp.h:923 msgid "Kyocera FS-9500DN" msgstr "" -#: src/main/xmli18n-tmp.h:872 +#: src/main/xmli18n-tmp.h:924 msgid "Kyocera KM-1530" msgstr "" -#: src/main/xmli18n-tmp.h:873 +#: src/main/xmli18n-tmp.h:925 msgid "Kyocera KM-1810" msgstr "" -#: src/main/xmli18n-tmp.h:874 +#: src/main/xmli18n-tmp.h:926 msgid "Kyocera KM-2030" msgstr "" -#: src/main/xmli18n-tmp.h:875 +#: src/main/xmli18n-tmp.h:927 msgid "Kyocera KM-2530" msgstr "" -#: src/main/xmli18n-tmp.h:876 +#: src/main/xmli18n-tmp.h:928 msgid "Kyocera KM-3530" msgstr "" -#: src/main/xmli18n-tmp.h:877 +#: src/main/xmli18n-tmp.h:929 msgid "Kyocera KM-4230" msgstr "" -#: src/main/xmli18n-tmp.h:878 +#: src/main/xmli18n-tmp.h:930 msgid "Kyocera KM-4530" msgstr "" -#: src/main/xmli18n-tmp.h:879 +#: src/main/xmli18n-tmp.h:931 msgid "Kyocera KM-5230" msgstr "" -#: src/main/xmli18n-tmp.h:880 +#: src/main/xmli18n-tmp.h:932 msgid "Kyocera KM-5530" msgstr "" -#: src/main/xmli18n-tmp.h:881 +#: src/main/xmli18n-tmp.h:933 msgid "Kyocera KM-6230" msgstr "" -#: src/main/xmli18n-tmp.h:882 +#: src/main/xmli18n-tmp.h:934 msgid "Lexmark 4076" msgstr "" -#: src/main/xmli18n-tmp.h:883 +#: src/main/xmli18n-tmp.h:935 msgid "Lexmark Optra E" msgstr "" -#: src/main/xmli18n-tmp.h:884 +#: src/main/xmli18n-tmp.h:936 msgid "Lexmark Optra E+" msgstr "" -#: src/main/xmli18n-tmp.h:885 +#: src/main/xmli18n-tmp.h:937 msgid "Lexmark Optra E220" msgstr "" -#: src/main/xmli18n-tmp.h:886 +#: src/main/xmli18n-tmp.h:938 msgid "Lexmark Valuewriter 300" msgstr "" -#: src/main/xmli18n-tmp.h:887 +#: src/main/xmli18n-tmp.h:939 msgid "Minolta PagePro 6" msgstr "" -#: src/main/xmli18n-tmp.h:888 +#: src/main/xmli18n-tmp.h:940 msgid "Minolta PagePro 6e" msgstr "" -#: src/main/xmli18n-tmp.h:889 +#: src/main/xmli18n-tmp.h:941 msgid "Minolta PagePro 6ex" msgstr "" -#: src/main/xmli18n-tmp.h:890 +#: src/main/xmli18n-tmp.h:942 msgid "Minolta PagePro 8" msgstr "" -#: src/main/xmli18n-tmp.h:891 +#: src/main/xmli18n-tmp.h:943 msgid "Minolta PagePro 8L" msgstr "" -#: src/main/xmli18n-tmp.h:892 +#: src/main/xmli18n-tmp.h:944 msgid "Minolta PagePro 1100" msgstr "" -#: src/main/xmli18n-tmp.h:893 +#: src/main/xmli18n-tmp.h:945 msgid "NEC SuperScript 660i" msgstr "" -#: src/main/xmli18n-tmp.h:894 +#: src/main/xmli18n-tmp.h:946 msgid "NEC SuperScript 860" msgstr "" -#: src/main/xmli18n-tmp.h:895 +#: src/main/xmli18n-tmp.h:947 msgid "NEC SuperScript 870" msgstr "" -#: src/main/xmli18n-tmp.h:896 +#: src/main/xmli18n-tmp.h:948 msgid "NEC SuperScript 1260" msgstr "" -#: src/main/xmli18n-tmp.h:897 +#: src/main/xmli18n-tmp.h:949 msgid "NEC SuperScript 1400" msgstr "" -#: src/main/xmli18n-tmp.h:898 +#: src/main/xmli18n-tmp.h:950 msgid "NEC SuperScript 1800" msgstr "" -#: src/main/xmli18n-tmp.h:899 +#: src/main/xmli18n-tmp.h:951 msgid "Okidata OL400" msgstr "" -#: src/main/xmli18n-tmp.h:900 +#: src/main/xmli18n-tmp.h:952 msgid "Okidata OL400e" msgstr "" -#: src/main/xmli18n-tmp.h:901 +#: src/main/xmli18n-tmp.h:953 msgid "Okidata OL400ex" msgstr "" -#: src/main/xmli18n-tmp.h:902 +#: src/main/xmli18n-tmp.h:954 msgid "Okidata OL410e" msgstr "" -#: src/main/xmli18n-tmp.h:903 +#: src/main/xmli18n-tmp.h:955 msgid "Okidata OL600e" msgstr "" -#: src/main/xmli18n-tmp.h:904 +#: src/main/xmli18n-tmp.h:956 msgid "Okidata OL610e/S" msgstr "" -#: src/main/xmli18n-tmp.h:905 +#: src/main/xmli18n-tmp.h:957 msgid "Okidata OL800" msgstr "" -#: src/main/xmli18n-tmp.h:906 +#: src/main/xmli18n-tmp.h:958 msgid "Okidata OL810ex" msgstr "" -#: src/main/xmli18n-tmp.h:907 +#: src/main/xmli18n-tmp.h:959 msgid "Okidata Okipage 6e" msgstr "" -#: src/main/xmli18n-tmp.h:908 +#: src/main/xmli18n-tmp.h:960 msgid "Okidata Okipage 6ex" msgstr "" -#: src/main/xmli18n-tmp.h:909 +#: src/main/xmli18n-tmp.h:961 msgid "Okidata Okipage 8p" msgstr "" -#: src/main/xmli18n-tmp.h:910 +#: src/main/xmli18n-tmp.h:962 msgid "Okidata Okipage 10e" msgstr "" -#: src/main/xmli18n-tmp.h:911 +#: src/main/xmli18n-tmp.h:963 msgid "Okidata Okipage 10ex" msgstr "" -#: src/main/xmli18n-tmp.h:912 +#: src/main/xmli18n-tmp.h:964 msgid "Okidata Okipage 14ex" msgstr "" -#: src/main/xmli18n-tmp.h:913 +#: src/main/xmli18n-tmp.h:965 msgid "Okidata Super 6e" msgstr "" -#: src/main/xmli18n-tmp.h:914 +#: src/main/xmli18n-tmp.h:966 msgid "Olivetti JP350S" msgstr "" -#: src/main/xmli18n-tmp.h:915 +#: src/main/xmli18n-tmp.h:967 msgid "Olivetti PG 306" msgstr "" -#: src/main/xmli18n-tmp.h:916 +#: src/main/xmli18n-tmp.h:968 msgid "PCPI 1030" msgstr "" -#: src/main/xmli18n-tmp.h:917 +#: src/main/xmli18n-tmp.h:969 msgid "Panasonic KX-P4410" msgstr "" -#: src/main/xmli18n-tmp.h:918 +#: src/main/xmli18n-tmp.h:970 msgid "Panasonic KX-P4450" msgstr "" -#: src/main/xmli18n-tmp.h:919 +#: src/main/xmli18n-tmp.h:971 msgid "Panasonic KX-P6150" msgstr "" -#: src/main/xmli18n-tmp.h:920 +#: src/main/xmli18n-tmp.h:972 msgid "Panasonic KX-P6500" msgstr "" -#: src/main/xmli18n-tmp.h:921 +#: src/main/xmli18n-tmp.h:973 msgid "Raven LP-410" msgstr "" -#: src/main/xmli18n-tmp.h:922 +#: src/main/xmli18n-tmp.h:974 msgid "Ricoh Aficio 220" msgstr "" -#: src/main/xmli18n-tmp.h:923 +#: src/main/xmli18n-tmp.h:975 msgid "Ricoh Aficio 401" msgstr "" -#: src/main/xmli18n-tmp.h:924 +#: src/main/xmli18n-tmp.h:976 msgid "Ricoh Aficio 700" msgstr "" -#: src/main/xmli18n-tmp.h:925 +#: src/main/xmli18n-tmp.h:977 msgid "Samsung ML-85" msgstr "" -#: src/main/xmli18n-tmp.h:926 +#: src/main/xmli18n-tmp.h:978 msgid "Samsung ML-4600" msgstr "" -#: src/main/xmli18n-tmp.h:927 +#: src/main/xmli18n-tmp.h:979 msgid "Samsung ML-5000a" msgstr "" -#: src/main/xmli18n-tmp.h:928 +#: src/main/xmli18n-tmp.h:980 msgid "Samsung ML-6000" msgstr "" -#: src/main/xmli18n-tmp.h:929 +#: src/main/xmli18n-tmp.h:981 msgid "Samsung ML-6100" msgstr "" -#: src/main/xmli18n-tmp.h:930 +#: src/main/xmli18n-tmp.h:982 msgid "Samsung ML-7000" msgstr "" -#: src/main/xmli18n-tmp.h:931 +#: src/main/xmli18n-tmp.h:983 msgid "Samsung ML-7000N" msgstr "" -#: src/main/xmli18n-tmp.h:932 +#: src/main/xmli18n-tmp.h:984 msgid "Samsung ML-7000P" msgstr "" -#: src/main/xmli18n-tmp.h:933 +#: src/main/xmli18n-tmp.h:985 msgid "Samsung ML-7050" msgstr "" -#: src/main/xmli18n-tmp.h:934 +#: src/main/xmli18n-tmp.h:986 msgid "Samsung QL-5100A" msgstr "" -#: src/main/xmli18n-tmp.h:935 +#: src/main/xmli18n-tmp.h:987 msgid "Samsung QL-6050" msgstr "" -#: src/main/xmli18n-tmp.h:936 +#: src/main/xmli18n-tmp.h:988 msgid "Seiko SpeedJET 200" msgstr "" -#: src/main/xmli18n-tmp.h:937 +#: src/main/xmli18n-tmp.h:989 msgid "Sharp AR-161" msgstr "" -#: src/main/xmli18n-tmp.h:938 +#: src/main/xmli18n-tmp.h:990 msgid "Sharp AR-M257" msgstr "" -#: src/main/xmli18n-tmp.h:939 +#: src/main/xmli18n-tmp.h:991 msgid "Sony IJP-V100" msgstr "" -#: src/main/xmli18n-tmp.h:940 +#: src/main/xmli18n-tmp.h:992 msgid "Star LS-04" msgstr "" -#: src/main/xmli18n-tmp.h:941 +#: src/main/xmli18n-tmp.h:993 msgid "Star LaserPrinter 8" msgstr "" -#: src/main/xmli18n-tmp.h:942 +#: src/main/xmli18n-tmp.h:994 msgid "Tally MT908" msgstr "" -#: src/main/xmli18n-tmp.h:943 +#: src/main/xmli18n-tmp.h:995 msgid "Xerox Able 1406" msgstr "" -#: src/main/xmli18n-tmp.h:944 +#: src/main/xmli18n-tmp.h:996 msgid "Xerox DocuPrint 4508" msgstr "" -#: src/main/xmli18n-tmp.h:945 +#: src/main/xmli18n-tmp.h:997 msgid "Xerox DocuPrint C20" msgstr "" -#: src/main/xmli18n-tmp.h:946 +#: src/main/xmli18n-tmp.h:998 msgid "Xerox DocuPrint N4512" msgstr "" -#: src/main/xmli18n-tmp.h:947 +#: src/main/xmli18n-tmp.h:999 msgid "Xerox DocuPrint N4512PS" msgstr "" -#: src/main/xmli18n-tmp.h:948 +#: src/main/xmli18n-tmp.h:1000 msgid "Xerox DocuPrint P12" msgstr "" -#: src/main/xmli18n-tmp.h:949 +#: src/main/xmli18n-tmp.h:1001 msgid "Xerox DocuPrint P1202" msgstr "" -#: src/main/xmli18n-tmp.h:950 +#: src/main/xmli18n-tmp.h:1002 msgid "Xerox DocuPrint P8e" msgstr "" -#: src/main/xmli18n-tmp.h:951 +#: src/main/xmli18n-tmp.h:1003 msgid "Xerox Document Centre 400" msgstr "" -#: src/main/xmli18n-tmp.h:952 +#: src/main/xmli18n-tmp.h:1004 msgid "Xerox WorkCentre M118" msgstr "" -#: src/main/xmli18n-tmp.h:953 +#: src/main/xmli18n-tmp.h:1005 msgid "Compaq IJ1200" msgstr "" -#: src/main/xmli18n-tmp.h:954 +#: src/main/xmli18n-tmp.h:1006 msgid "Lexmark X73" msgstr "" -#: src/main/xmli18n-tmp.h:955 +#: src/main/xmli18n-tmp.h:1007 msgid "Lexmark Z42" msgstr "" -#: src/main/xmli18n-tmp.h:956 +#: src/main/xmli18n-tmp.h:1008 msgid "Lexmark Z43" msgstr "" -#: src/main/xmli18n-tmp.h:957 +#: src/main/xmli18n-tmp.h:1009 msgid "Lexmark Z52" msgstr "" -#: src/main/xmli18n-tmp.h:958 +#: src/main/xmli18n-tmp.h:1010 msgid "Lexmark Z53" msgstr "" -#: src/main/xmli18n-tmp.h:959 +#: src/main/xmli18n-tmp.h:1011 msgid "Olympus P-10" msgstr "" -#: src/main/xmli18n-tmp.h:960 +#: src/main/xmli18n-tmp.h:1012 msgid "Olympus P-11" msgstr "" -#: src/main/xmli18n-tmp.h:961 +#: src/main/xmli18n-tmp.h:1013 msgid "Olympus P-200" msgstr "" -#: src/main/xmli18n-tmp.h:962 +#: src/main/xmli18n-tmp.h:1014 msgid "Olympus P-300" msgstr "" -#: src/main/xmli18n-tmp.h:963 +#: src/main/xmli18n-tmp.h:1015 msgid "Olympus P-300E" msgstr "" -#: src/main/xmli18n-tmp.h:964 +#: src/main/xmli18n-tmp.h:1016 msgid "Olympus P-300U" msgstr "" -#: src/main/xmli18n-tmp.h:965 +#: src/main/xmli18n-tmp.h:1017 msgid "Olympus P-330E" msgstr "" -#: src/main/xmli18n-tmp.h:966 +#: src/main/xmli18n-tmp.h:1018 msgid "Olympus P-330NE" msgstr "" -#: src/main/xmli18n-tmp.h:967 +#: src/main/xmli18n-tmp.h:1019 msgid "Olympus P-400" msgstr "" -#: src/main/xmli18n-tmp.h:968 +#: src/main/xmli18n-tmp.h:1020 msgid "Olympus P-440" msgstr "" -#: src/main/xmli18n-tmp.h:969 +#: src/main/xmli18n-tmp.h:1021 msgid "Olympus P-S100" msgstr "" -#: src/main/xmli18n-tmp.h:970 +#: src/main/xmli18n-tmp.h:1022 msgid "Canon CP-10" msgstr "" -#: src/main/xmli18n-tmp.h:971 +#: src/main/xmli18n-tmp.h:1023 msgid "Canon CP-100" msgstr "" -#: src/main/xmli18n-tmp.h:972 +#: src/main/xmli18n-tmp.h:1024 msgid "Canon CP-200" msgstr "" -#: src/main/xmli18n-tmp.h:973 +#: src/main/xmli18n-tmp.h:1025 msgid "Canon CP-220" msgstr "" -#: src/main/xmli18n-tmp.h:974 +#: src/main/xmli18n-tmp.h:1026 msgid "Canon CP-300" msgstr "" -#: src/main/xmli18n-tmp.h:975 +#: src/main/xmli18n-tmp.h:1027 msgid "Canon CP-330" msgstr "" -#: src/main/xmli18n-tmp.h:976 +#: src/main/xmli18n-tmp.h:1028 msgid "Canon SELPHY-CP-400" msgstr "" -#: src/main/xmli18n-tmp.h:977 +#: src/main/xmli18n-tmp.h:1029 msgid "Canon SELPHY-CP-500" msgstr "" -#: src/main/xmli18n-tmp.h:978 +#: src/main/xmli18n-tmp.h:1030 msgid "Canon SELPHY-CP-510" msgstr "" -#: src/main/xmli18n-tmp.h:979 +#: src/main/xmli18n-tmp.h:1031 msgid "Canon SELPHY-CP-600" msgstr "" -#: src/main/xmli18n-tmp.h:980 +#: src/main/xmli18n-tmp.h:1032 msgid "Canon SELPHY-CP-710" msgstr "" -#: src/main/xmli18n-tmp.h:981 +#: src/main/xmli18n-tmp.h:1033 msgid "Canon SELPHY-CP-720" msgstr "" -#: src/main/xmli18n-tmp.h:982 +#: src/main/xmli18n-tmp.h:1034 msgid "Canon SELPHY-CP-730" msgstr "" -#: src/main/xmli18n-tmp.h:983 +#: src/main/xmli18n-tmp.h:1035 msgid "Canon SELPHY-CP-740" msgstr "" -#: src/main/xmli18n-tmp.h:984 +#: src/main/xmli18n-tmp.h:1036 msgid "Canon SELPHY-CP-750" msgstr "" -#: src/main/xmli18n-tmp.h:985 +#: src/main/xmli18n-tmp.h:1037 msgid "Canon SELPHY ES1" msgstr "" -#: src/main/xmli18n-tmp.h:986 +#: src/main/xmli18n-tmp.h:1038 msgid "Canon SELPHY ES2" msgstr "" -#: src/main/xmli18n-tmp.h:987 +#: src/main/xmli18n-tmp.h:1039 msgid "Canon SELPHY ES20" msgstr "" -#: src/main/xmli18n-tmp.h:988 +#: src/main/xmli18n-tmp.h:1040 msgid "Sony DPP-EX5" msgstr "" -#: src/main/xmli18n-tmp.h:989 +#: src/main/xmli18n-tmp.h:1041 msgid "Sony DPP-EX7" msgstr "" -#: src/main/xmli18n-tmp.h:990 +#: src/main/xmli18n-tmp.h:1042 msgid "Sony UP-DP10" msgstr "" -#: src/main/xmli18n-tmp.h:991 +#: src/main/xmli18n-tmp.h:1043 msgid "Sony UP-DR100" msgstr "" -#: src/main/xmli18n-tmp.h:992 +#: src/main/xmli18n-tmp.h:1044 msgid "Sony UP-DR150" msgstr "" -#: src/main/xmli18n-tmp.h:993 +#: src/main/xmli18n-tmp.h:1045 msgid "Fujifilm Printpix-CX-400" msgstr "" -#: src/main/xmli18n-tmp.h:994 +#: src/main/xmli18n-tmp.h:1046 msgid "Fujifilm Printpix-CX-550" msgstr "" -#: src/main/xmli18n-tmp.h:995 +#: src/main/xmli18n-tmp.h:1047 msgid "Fujifilm FinePix-NX-500" msgstr "" -#: src/main/xmli18n-tmp.h:996 +#: src/main/xmli18n-tmp.h:1048 msgid "Kodak Easyshare-Printer-Dock" msgstr "" -#: src/main/xmli18n-tmp.h:997 +#: src/main/xmli18n-tmp.h:1049 msgid "Shinko CHC-S9045" msgstr "" -#: src/main/xmli18n-tmp.h:998 +#: src/main/xmli18n-tmp.h:1050 msgid "RAW DATA 16 bit" msgstr "" -#: src/main/xmli18n-tmp.h:999 +#: src/main/xmli18n-tmp.h:1051 msgid "RAW DATA 8 bit" msgstr "" -#: src/gutenprintui/panel.c:274 src/gutenprintui2/panel.c:274 +#: src/gutenprintui2/curve.c:130 +msgid "Curve type" +msgstr "" + +#: src/gutenprintui2/curve.c:131 +msgid "Is this curve linear, spline interpolated, or free-form" +msgstr "" + +#: src/gutenprintui2/curve.c:139 +msgid "Minimum X" +msgstr "" + +#: src/gutenprintui2/curve.c:140 +msgid "Minimum possible value for X" +msgstr "" + +#: src/gutenprintui2/curve.c:149 +msgid "Maximum X" +msgstr "" + +#: src/gutenprintui2/curve.c:150 +msgid "Maximum possible X value" +msgstr "" + +#: src/gutenprintui2/curve.c:159 +msgid "Minimum Y" +msgstr "" + +#: src/gutenprintui2/curve.c:160 +msgid "Minimum possible value for Y" +msgstr "" + +#: src/gutenprintui2/curve.c:169 +msgid "Maximum Y" +msgstr "" + +#: src/gutenprintui2/curve.c:170 +msgid "Maximum possible value for Y" +msgstr "" + +#: src/gutenprintui2/gammacurve.c:418 +msgid "_Gamma value" +msgstr "" + +#: src/gutenprintui2/panel.c:275 msgid "Inch" msgstr "" -#: src/gutenprintui/panel.c:274 src/gutenprintui2/panel.c:274 +#: src/gutenprintui2/panel.c:275 msgid "Set the base unit of measurement to inches" msgstr "" -#: src/gutenprintui/panel.c:276 src/gutenprintui2/panel.c:276 +#: src/gutenprintui2/panel.c:277 msgid "cm" msgstr "" -#: src/gutenprintui/panel.c:276 src/gutenprintui2/panel.c:276 +#: src/gutenprintui2/panel.c:277 msgid "Set the base unit of measurement to centimetres" msgstr "" -#: src/gutenprintui/panel.c:278 src/gutenprintui2/panel.c:278 +#: src/gutenprintui2/panel.c:279 msgid "Points" msgstr "" -#: src/gutenprintui/panel.c:278 src/gutenprintui2/panel.c:278 +#: src/gutenprintui2/panel.c:279 msgid "Set the base unit of measurement to points (1/72\")" msgstr "" -#: src/gutenprintui/panel.c:280 src/gutenprintui2/panel.c:280 +#: src/gutenprintui2/panel.c:281 msgid "mm" msgstr "" -#: src/gutenprintui/panel.c:280 src/gutenprintui2/panel.c:280 +#: src/gutenprintui2/panel.c:281 msgid "Set the base unit of measurement to millimetres" msgstr "" -#: src/gutenprintui/panel.c:282 src/gutenprintui2/panel.c:282 +#: src/gutenprintui2/panel.c:283 msgid "Pica" msgstr "" -#: src/gutenprintui/panel.c:282 src/gutenprintui2/panel.c:282 +#: src/gutenprintui2/panel.c:283 msgid "Set the base unit of measurement to picas (1/12\")" msgstr "" -#: src/gutenprintui/panel.c:289 src/gutenprintui2/panel.c:289 +#: src/gutenprintui2/panel.c:290 msgid "Color output" msgstr "" -#: src/gutenprintui/panel.c:291 src/gutenprintui2/panel.c:291 +#: src/gutenprintui2/panel.c:292 msgid "Print in shades of gray using black ink" msgstr "" -#: src/gutenprintui/panel.c:303 src/gutenprintui2/panel.c:303 +#: src/gutenprintui2/panel.c:304 msgid "Standard Command" msgstr "" -#: src/gutenprintui/panel.c:303 src/gutenprintui2/panel.c:303 +#: src/gutenprintui2/panel.c:304 msgid "Use standard print command" msgstr "" -#: src/gutenprintui/panel.c:304 src/gutenprintui2/panel.c:304 +#: src/gutenprintui2/panel.c:305 msgid "Custom Command" msgstr "" -#: src/gutenprintui/panel.c:304 src/gutenprintui2/panel.c:304 +#: src/gutenprintui2/panel.c:305 msgid "Use custom print command" msgstr "" -#: src/gutenprintui/panel.c:305 src/gutenprintui/plist.c:704 -#: src/gutenprintui/plist.c:787 src/gutenprintui2/panel.c:305 -#: src/gutenprintui2/plist.c:707 src/gutenprintui2/plist.c:790 +#: src/gutenprintui2/panel.c:306 src/gutenprintui2/plist.c:710 +#: src/gutenprintui2/plist.c:793 msgid "File" msgstr "" -#: src/gutenprintui/panel.c:305 src/gutenprintui2/panel.c:305 +#: src/gutenprintui2/panel.c:306 msgid "Print to a file" msgstr "" -#: src/gutenprintui/panel.c:521 src/gutenprintui2/panel.c:521 +#: src/gutenprintui2/panel.c:522 msgid "Edit Curve..." msgstr "" -#: src/gutenprintui/panel.c:532 src/gutenprintui2/panel.c:532 +#: src/gutenprintui2/panel.c:533 msgid "Set Default" msgstr "" -#: src/gutenprintui/panel.c:534 src/gutenprintui2/panel.c:534 +#: src/gutenprintui2/panel.c:535 msgid "Restore Previous" msgstr "" -#: src/gutenprintui/panel.c:536 src/gutenprintui/panel.c:1532 -#: src/gutenprintui/panel.c:1787 src/gutenprintui/panel.c:1819 -#: src/gutenprintui2/panel.c:536 src/gutenprintui2/panel.c:1533 -#: src/gutenprintui2/panel.c:1787 src/gutenprintui2/panel.c:1819 +#: src/gutenprintui2/panel.c:537 src/gutenprintui2/panel.c:1708 +#: src/gutenprintui2/panel.c:1962 src/gutenprintui2/panel.c:1994 msgid "OK" msgstr "" -#: src/gutenprintui/panel.c:538 src/gutenprintui/panel.c:1197 -#: src/gutenprintui/panel.c:1534 src/gutenprintui/panel.c:1789 -#: src/gutenprintui2/panel.c:538 src/gutenprintui2/panel.c:1198 -#: src/gutenprintui2/panel.c:1535 src/gutenprintui2/panel.c:1789 +#: src/gutenprintui2/panel.c:539 src/gutenprintui2/panel.c:1373 +#: src/gutenprintui2/panel.c:1710 src/gutenprintui2/panel.c:1964 msgid "Cancel" msgstr "" -#: src/gutenprintui/panel.c:1180 src/gutenprintui2/panel.c:1181 +#: src/gutenprintui2/panel.c:641 +msgid "Select File..." +msgstr "" + +#: src/gutenprintui2/panel.c:1018 +msgid "Reset" +msgstr "" + +#: src/gutenprintui2/panel.c:1356 #, c-format msgid "%s -- Print v%s" msgstr "" -#: src/gutenprintui/panel.c:1189 src/gutenprintui2/panel.c:1190 +#: src/gutenprintui2/panel.c:1365 msgid "About" msgstr "" -#: src/gutenprintui/panel.c:1191 src/gutenprintui2/panel.c:1192 +#: src/gutenprintui2/panel.c:1367 msgid "" "Print and\n" "Save Settings" msgstr "" -#: src/gutenprintui/panel.c:1193 src/gutenprintui2/panel.c:1194 +#: src/gutenprintui2/panel.c:1369 msgid "" "Save\n" "Settings" msgstr "" -#: src/gutenprintui/panel.c:1195 src/gutenprintui2/panel.c:1196 +#: src/gutenprintui2/panel.c:1371 msgid "Print" msgstr "" -#: src/gutenprintui/panel.c:1247 src/gutenprintui2/panel.c:1248 +#: src/gutenprintui2/panel.c:1423 msgid "Preview" msgstr "" -#: src/gutenprintui/panel.c:1272 src/gutenprintui2/panel.c:1273 +#: src/gutenprintui2/panel.c:1448 msgid "" "Position the image on the page.\n" "Click and drag with the primary button to position the image.\n" @@ -6219,470 +6629,418 @@ msgid "" "to its original position." msgstr "" -#: src/gutenprintui/panel.c:1319 src/gutenprintui2/panel.c:1320 +#: src/gutenprintui2/panel.c:1495 msgid "Paper Size" msgstr "" -#: src/gutenprintui/panel.c:1342 src/gutenprintui2/panel.c:1343 +#: src/gutenprintui2/panel.c:1518 msgid "Show All Paper Sizes" msgstr "" -#: src/gutenprintui/panel.c:1358 src/gutenprintui2/panel.c:1359 +#: src/gutenprintui2/panel.c:1534 msgid "Dimensions:" msgstr "" -#: src/gutenprintui/panel.c:1363 src/gutenprintui/panel.c:2063 -#: src/gutenprintui2/panel.c:1364 src/gutenprintui2/panel.c:2063 +#: src/gutenprintui2/panel.c:1539 src/gutenprintui2/panel.c:2238 msgid "Width:" msgstr "" -#: src/gutenprintui/panel.c:1364 src/gutenprintui2/panel.c:1365 +#: src/gutenprintui2/panel.c:1540 msgid "Width of the paper that you wish to print to" msgstr "" -#: src/gutenprintui/panel.c:1368 src/gutenprintui/panel.c:2065 -#: src/gutenprintui2/panel.c:1369 src/gutenprintui2/panel.c:2065 +#: src/gutenprintui2/panel.c:1544 src/gutenprintui2/panel.c:2240 msgid "Height:" msgstr "" -#: src/gutenprintui/panel.c:1369 src/gutenprintui2/panel.c:1370 +#: src/gutenprintui2/panel.c:1545 msgid "Height of the paper that you wish to print to" msgstr "" -#: src/gutenprintui/panel.c:1374 src/gutenprintui2/panel.c:1375 +#: src/gutenprintui2/panel.c:1550 msgid "Automatic Paper Size" msgstr "" -#: src/gutenprintui/panel.c:1391 src/gutenprintui2/panel.c:1392 +#: src/gutenprintui2/panel.c:1567 msgid "Number of Copies" msgstr "" -#: src/gutenprintui/panel.c:1403 src/gutenprintui2/panel.c:1404 +#: src/gutenprintui2/panel.c:1579 msgid "Select the number of copies to print; a value between 1 and 100" msgstr "" -#: src/gutenprintui/panel.c:1435 src/gutenprintui2/panel.c:1436 +#: src/gutenprintui2/panel.c:1611 msgid "Image Position" msgstr "" -#: src/gutenprintui/panel.c:1452 src/gutenprintui2/panel.c:1453 +#: src/gutenprintui2/panel.c:1628 msgid "Auto" msgstr "" -#: src/gutenprintui/panel.c:1454 src/gutenprintui2/panel.c:1455 +#: src/gutenprintui2/panel.c:1630 msgid "Portrait" msgstr "" -#: src/gutenprintui/panel.c:1456 src/gutenprintui2/panel.c:1457 +#: src/gutenprintui2/panel.c:1632 msgid "Landscape" msgstr "" -#: src/gutenprintui/panel.c:1458 src/gutenprintui2/panel.c:1459 +#: src/gutenprintui2/panel.c:1634 msgid "Upside down" msgstr "" -#: src/gutenprintui/panel.c:1460 src/gutenprintui2/panel.c:1461 +#: src/gutenprintui2/panel.c:1636 msgid "Seascape" msgstr "" -#: src/gutenprintui/panel.c:1464 src/gutenprintui2/panel.c:1465 +#: src/gutenprintui2/panel.c:1640 msgid "" "Select the orientation: portrait, landscape, upside down, or seascape " "(upside down landscape)" msgstr "" -#: src/gutenprintui/panel.c:1466 src/gutenprintui2/panel.c:1467 +#: src/gutenprintui2/panel.c:1642 msgid "Orientation:" msgstr "" -#: src/gutenprintui/panel.c:1477 src/gutenprintui2/panel.c:1478 +#: src/gutenprintui2/panel.c:1653 msgid "Left:" msgstr "" -#: src/gutenprintui/panel.c:1478 src/gutenprintui2/panel.c:1479 +#: src/gutenprintui2/panel.c:1654 msgid "Distance from the left of the paper to the image" msgstr "" -#: src/gutenprintui/panel.c:1481 src/gutenprintui/panel.c:1485 -#: src/gutenprintui2/panel.c:1482 src/gutenprintui2/panel.c:1486 +#: src/gutenprintui2/panel.c:1657 src/gutenprintui2/panel.c:1661 msgid "Right:" msgstr "" -#: src/gutenprintui/panel.c:1482 src/gutenprintui2/panel.c:1483 +#: src/gutenprintui2/panel.c:1658 msgid "Distance from the left of the paper to the right of the image" msgstr "" -#: src/gutenprintui/panel.c:1486 src/gutenprintui2/panel.c:1487 +#: src/gutenprintui2/panel.c:1662 msgid "Distance from the right of the paper to the image" msgstr "" -#: src/gutenprintui/panel.c:1488 src/gutenprintui2/panel.c:1489 +#: src/gutenprintui2/panel.c:1664 msgid "Top:" msgstr "" -#: src/gutenprintui/panel.c:1489 src/gutenprintui2/panel.c:1490 +#: src/gutenprintui2/panel.c:1665 msgid "Distance from the top of the paper to the image" msgstr "" -#: src/gutenprintui/panel.c:1492 src/gutenprintui/panel.c:1496 -#: src/gutenprintui2/panel.c:1493 src/gutenprintui2/panel.c:1497 +#: src/gutenprintui2/panel.c:1668 src/gutenprintui2/panel.c:1672 msgid "Bottom:" msgstr "" -#: src/gutenprintui/panel.c:1493 src/gutenprintui2/panel.c:1494 +#: src/gutenprintui2/panel.c:1669 msgid "Distance from the top of the paper to bottom of the image" msgstr "" -#: src/gutenprintui/panel.c:1497 src/gutenprintui2/panel.c:1498 +#: src/gutenprintui2/panel.c:1673 msgid "Distance from the bottom of the paper to the image" msgstr "" -#: src/gutenprintui/panel.c:1507 src/gutenprintui2/panel.c:1508 +#: src/gutenprintui2/panel.c:1683 msgid "Center:" msgstr "" -#: src/gutenprintui/panel.c:1510 src/gutenprintui2/panel.c:1511 +#: src/gutenprintui2/panel.c:1686 msgid "Horizontal" msgstr "" -#: src/gutenprintui/panel.c:1511 src/gutenprintui2/panel.c:1512 +#: src/gutenprintui2/panel.c:1687 msgid "Center the image horizontally on the paper" msgstr "" -#: src/gutenprintui/panel.c:1513 src/gutenprintui2/panel.c:1514 +#: src/gutenprintui2/panel.c:1689 msgid "Both" msgstr "" -#: src/gutenprintui/panel.c:1514 src/gutenprintui2/panel.c:1515 +#: src/gutenprintui2/panel.c:1690 msgid "Center the image on the paper" msgstr "" -#: src/gutenprintui/panel.c:1516 src/gutenprintui2/panel.c:1517 +#: src/gutenprintui2/panel.c:1692 msgid "Vertical" msgstr "" -#: src/gutenprintui/panel.c:1517 src/gutenprintui2/panel.c:1518 +#: src/gutenprintui2/panel.c:1693 msgid "Center the image vertically on the paper" msgstr "" -#: src/gutenprintui/panel.c:1530 src/gutenprintui2/panel.c:1531 +#: src/gutenprintui2/panel.c:1706 msgid "Setup Printer" msgstr "" -#: src/gutenprintui/panel.c:1555 src/gutenprintui2/panel.c:1555 +#: src/gutenprintui2/panel.c:1730 msgid "Printer Make:" msgstr "" -#: src/gutenprintui/panel.c:1566 src/gutenprintui2/panel.c:1566 +#: src/gutenprintui2/panel.c:1741 msgid "Select the make of your printer" msgstr "" -#: src/gutenprintui/panel.c:1584 src/gutenprintui/panel.c:1672 -#: src/gutenprintui/panel.c:1890 src/gutenprintui2/panel.c:1584 -#: src/gutenprintui2/panel.c:1672 src/gutenprintui2/panel.c:1890 +#: src/gutenprintui2/panel.c:1759 src/gutenprintui2/panel.c:1847 +#: src/gutenprintui2/panel.c:2065 msgid "Printer Model:" msgstr "" -#: src/gutenprintui/panel.c:1595 src/gutenprintui2/panel.c:1595 +#: src/gutenprintui2/panel.c:1770 msgid "Select your printer model" msgstr "" -#: src/gutenprintui/panel.c:1643 src/gutenprintui2/panel.c:1643 +#: src/gutenprintui2/panel.c:1818 msgid "PPD File:" msgstr "" -#: src/gutenprintui/panel.c:1659 src/gutenprintui2/panel.c:1659 +#: src/gutenprintui2/panel.c:1834 msgid "Enter the correct PPD filename for your printer" msgstr "" -#: src/gutenprintui/panel.c:1661 src/gutenprintui/panel.c:1741 -#: src/gutenprintui2/panel.c:1661 src/gutenprintui2/panel.c:1741 +#: src/gutenprintui2/panel.c:1836 src/gutenprintui2/panel.c:1916 msgid "Browse" msgstr "" -#: src/gutenprintui/panel.c:1668 src/gutenprintui2/panel.c:1668 +#: src/gutenprintui2/panel.c:1843 msgid "Choose the correct PPD filename for your printer" msgstr "" -#: src/gutenprintui/panel.c:1710 src/gutenprintui2/panel.c:1710 +#: src/gutenprintui2/panel.c:1885 msgid "" "Select the name of the output queue (not the type, or model, of printer) " "that you wish to print to" msgstr "" -#: src/gutenprintui/panel.c:1712 src/gutenprintui2/panel.c:1712 +#: src/gutenprintui2/panel.c:1887 msgid "Printer Queue:" msgstr "" -#: src/gutenprintui/panel.c:1728 src/gutenprintui2/panel.c:1728 +#: src/gutenprintui2/panel.c:1903 msgid "Enter the correct command to print to your printer. " msgstr "" -#: src/gutenprintui/panel.c:1739 src/gutenprintui2/panel.c:1739 +#: src/gutenprintui2/panel.c:1914 msgid "Enter the file to print to. " msgstr "" -#: src/gutenprintui/panel.c:1747 src/gutenprintui2/panel.c:1747 +#: src/gutenprintui2/panel.c:1922 msgid "File to print to" msgstr "" -#: src/gutenprintui/panel.c:1755 src/gutenprintui2/panel.c:1755 +#: src/gutenprintui2/panel.c:1930 msgid "Print To File" msgstr "" -#: src/gutenprintui/panel.c:1785 src/gutenprintui2/panel.c:1785 +#: src/gutenprintui2/panel.c:1960 msgid "Define New Printer" msgstr "" -#: src/gutenprintui/panel.c:1803 src/gutenprintui/panel.c:1887 -#: src/gutenprintui2/panel.c:1803 src/gutenprintui2/panel.c:1887 +#: src/gutenprintui2/panel.c:1978 src/gutenprintui2/panel.c:2062 msgid "Printer Name:" msgstr "" -#: src/gutenprintui/panel.c:1807 src/gutenprintui2/panel.c:1807 +#: src/gutenprintui2/panel.c:1982 msgid "Enter the name you wish to give this logical printer" msgstr "" -#: src/gutenprintui/panel.c:1817 src/gutenprintui2/panel.c:1817 +#: src/gutenprintui2/panel.c:1992 msgid "About Gutenprint " msgstr "" -#: src/gutenprintui/panel.c:1824 src/gutenprintui2/panel.c:1824 +#: src/gutenprintui2/panel.c:1999 msgid "Gutenprint Version " msgstr "" -#: src/gutenprintui/panel.c:1872 src/gutenprintui2/panel.c:1872 +#: src/gutenprintui2/panel.c:2047 msgid "Printer Settings" msgstr "" -#: src/gutenprintui/panel.c:1885 src/gutenprintui2/panel.c:1885 +#: src/gutenprintui2/panel.c:2060 msgid "" "Select the name of the printer (not the type, or model, of printer) that you " "wish to print to" msgstr "" -#: src/gutenprintui/panel.c:1902 src/gutenprintui2/panel.c:1902 +#: src/gutenprintui2/panel.c:2077 msgid "Setup Printer..." msgstr "" -#: src/gutenprintui/panel.c:1904 src/gutenprintui2/panel.c:1904 +#: src/gutenprintui2/panel.c:2079 msgid "" "Choose the printer model, PPD file, and command that is used to print to " "this printer" msgstr "" -#: src/gutenprintui/panel.c:1917 src/gutenprintui2/panel.c:1917 +#: src/gutenprintui2/panel.c:2092 msgid "New Printer..." msgstr "" -#: src/gutenprintui/panel.c:1918 src/gutenprintui2/panel.c:1918 +#: src/gutenprintui2/panel.c:2093 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:1948 src/gutenprintui2/panel.c:1948 +#: src/gutenprintui2/panel.c:2123 msgid "Set Printer Option Defaults" msgstr "" -#: src/gutenprintui/panel.c:1949 src/gutenprintui2/panel.c:1949 +#: src/gutenprintui2/panel.c:2124 msgid "Set all printer options to their defaults" msgstr "" -#: src/gutenprintui/panel.c:1972 src/gutenprintui2/panel.c:1972 +#: src/gutenprintui2/panel.c:2147 msgid "Image Size" msgstr "" -#: src/gutenprintui/panel.c:1997 src/gutenprintui2/panel.c:1997 +#: src/gutenprintui2/panel.c:2172 msgid "Scaling:" msgstr "" -#: src/gutenprintui/panel.c:2001 src/gutenprintui2/panel.c:2001 +#: src/gutenprintui2/panel.c:2176 msgid "Set the scale (size) of the image" msgstr "" -#: src/gutenprintui/panel.c:2023 src/gutenprintui2/panel.c:2023 +#: src/gutenprintui2/panel.c:2198 msgid "Scale by:" msgstr "" -#: src/gutenprintui/panel.c:2028 src/gutenprintui2/panel.c:2028 +#: src/gutenprintui2/panel.c:2203 msgid "" "Select whether scaling is measured as percent of available page size or " "number of output dots per inch" msgstr "" -#: src/gutenprintui/panel.c:2031 src/gutenprintui2/panel.c:2031 +#: src/gutenprintui2/panel.c:2206 msgid "Percent" msgstr "" -#: src/gutenprintui/panel.c:2036 src/gutenprintui2/panel.c:2036 +#: src/gutenprintui2/panel.c:2211 msgid "Scale the print to the size of the page" msgstr "" -#: src/gutenprintui/panel.c:2040 src/gutenprintui2/panel.c:2040 +#: src/gutenprintui2/panel.c:2215 msgid "PPI" msgstr "" -#: src/gutenprintui/panel.c:2045 src/gutenprintui2/panel.c:2045 +#: src/gutenprintui2/panel.c:2220 msgid "Scale the print to the number of dots per inch" msgstr "" -#: src/gutenprintui/panel.c:2063 src/gutenprintui2/panel.c:2063 +#: src/gutenprintui2/panel.c:2238 msgid "Set the width of the print" msgstr "" -#: src/gutenprintui/panel.c:2065 src/gutenprintui2/panel.c:2065 +#: src/gutenprintui2/panel.c:2240 msgid "Set the height of the print" msgstr "" -#: src/gutenprintui/panel.c:2071 src/gutenprintui2/panel.c:2071 +#: src/gutenprintui2/panel.c:2246 msgid "" "Use Original\n" "Image Size" msgstr "" -#: src/gutenprintui/panel.c:2077 src/gutenprintui2/panel.c:2077 +#: src/gutenprintui2/panel.c:2252 msgid "Set the print size to the size of the image" msgstr "" -#: src/gutenprintui/panel.c:2100 src/gutenprintui2/panel.c:2101 +#: src/gutenprintui2/panel.c:2276 msgid "Print Color Adjust" msgstr "" -#: src/gutenprintui/panel.c:2103 src/gutenprintui2/panel.c:2104 +#: src/gutenprintui2/panel.c:2279 msgid "Set Defaults" msgstr "" -#: src/gutenprintui/panel.c:2105 src/gutenprintui2/panel.c:2106 +#: src/gutenprintui2/panel.c:2281 msgid "Close" msgstr "" -#: src/gutenprintui/panel.c:2134 src/gutenprintui2/panel.c:2135 +#: src/gutenprintui2/panel.c:2310 msgid "Image preview" msgstr "" -#: src/gutenprintui/panel.c:2148 src/gutenprintui2/panel.c:2149 +#: src/gutenprintui2/panel.c:2324 msgid "View Output Channels:" msgstr "" -#: src/gutenprintui/panel.c:2234 src/gutenprintui2/panel.c:2240 +#: src/gutenprintui2/panel.c:2415 msgid "Output" msgstr "" -#: src/gutenprintui/panel.c:2262 src/gutenprintui2/panel.c:2268 +#: src/gutenprintui2/panel.c:2443 msgid "Output Type:" msgstr "" -#: src/gutenprintui/panel.c:2266 src/gutenprintui2/panel.c:2272 +#: src/gutenprintui2/panel.c:2447 msgid "Select the desired output type" msgstr "" -#: src/gutenprintui/panel.c:2287 src/gutenprintui2/panel.c:2293 +#: src/gutenprintui2/panel.c:2468 msgid "Adjust Output..." msgstr "" -#: src/gutenprintui/panel.c:2296 src/gutenprintui2/panel.c:2302 +#: src/gutenprintui2/panel.c:2477 msgid "" "Adjust color balance, brightness, contrast, saturation, and dither algorithm" msgstr "" -#: src/gutenprintui/panel.c:2314 src/gutenprintui2/panel.c:2321 +#: src/gutenprintui2/panel.c:2496 msgid "Size Units:" msgstr "" -#: src/gutenprintui/panel.c:2317 src/gutenprintui2/panel.c:2324 +#: src/gutenprintui2/panel.c:2499 msgid " " msgstr "" -#: src/gutenprintui/panel.c:2341 src/gutenprintui2/panel.c:2348 +#: src/gutenprintui2/panel.c:2523 msgid "Units:" msgstr "" -#: src/gutenprintui/panel.c:2346 src/gutenprintui2/panel.c:2353 +#: src/gutenprintui2/panel.c:2528 msgid "Select the base unit of measurement for printing" msgstr "" -#: src/gutenprintui/plist.c:90 src/gutenprintui/plist.c:99 -#: src/gutenprintui2/plist.c:89 src/gutenprintui2/plist.c:98 +#: src/gutenprintui2/plist.c:92 src/gutenprintui2/plist.c:101 msgid "System V lp" msgstr "" -#: src/gutenprintui/plist.c:96 src/gutenprintui2/plist.c:95 +#: src/gutenprintui2/plist.c:98 msgid "CUPS" msgstr "" -#: src/gutenprintui/plist.c:102 src/gutenprintui2/plist.c:101 +#: src/gutenprintui2/plist.c:104 msgid "Berkeley lpd (/etc/lpc)" msgstr "" -#: src/gutenprintui/plist.c:105 src/gutenprintui2/plist.c:104 +#: src/gutenprintui2/plist.c:107 msgid "Berkeley lpd (/usr/bsd/lpc)" msgstr "" -#: src/gutenprintui/plist.c:108 src/gutenprintui2/plist.c:107 +#: src/gutenprintui2/plist.c:110 msgid "Berkeley lpd (/usr/etc/lpc" msgstr "" -#: src/gutenprintui/plist.c:111 src/gutenprintui2/plist.c:110 +#: src/gutenprintui2/plist.c:113 msgid "Berkeley lpd (/usr/libexec/lpc)" msgstr "" -#: src/gutenprintui/plist.c:114 src/gutenprintui2/plist.c:113 +#: src/gutenprintui2/plist.c:116 msgid "Berkeley lpd (/usr/sbin/lpc)" msgstr "" -#: src/gutenprintui/plist.c:1043 src/gutenprintui2/plist.c:1057 +#: src/gutenprintui2/plist.c:1060 msgid "Printer" msgstr "" -#: src/gutenprintui/plist.c:1230 src/gutenprintui2/plist.c:1250 +#: src/gutenprintui2/plist.c:1253 msgid "(Default Printer)" msgstr "" -#: src/gutenprintui2/curve.c:130 -msgid "Curve type" -msgstr "" - -#: src/gutenprintui2/curve.c:131 -msgid "Is this curve linear, spline interpolated, or free-form" -msgstr "" - -#: src/gutenprintui2/curve.c:139 -msgid "Minimum X" -msgstr "" - -#: src/gutenprintui2/curve.c:140 -msgid "Minimum possible value for X" -msgstr "" - -#: src/gutenprintui2/curve.c:149 -msgid "Maximum X" -msgstr "" - -#: src/gutenprintui2/curve.c:150 -msgid "Maximum possible X value" -msgstr "" - -#: src/gutenprintui2/curve.c:159 -msgid "Minimum Y" -msgstr "" - -#: src/gutenprintui2/curve.c:160 -msgid "Minimum possible value for Y" -msgstr "" - -#: src/gutenprintui2/curve.c:169 -msgid "Maximum Y" -msgstr "" - -#: src/gutenprintui2/curve.c:170 -msgid "Maximum possible value for Y" -msgstr "" - -#: src/gutenprintui2/gammacurve.c:418 -msgid "_Gamma value" -msgstr "" - #: src/cups/genppd.c:145 msgid "Printer Features" msgstr "" @@ -6718,48 +7076,48 @@ msgstr "" #. 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:1058 +#: src/cups/genppd.c:1064 msgid "English" msgstr "" #. TRANSLATORS: Specify PPD translation encoding e.g. ISOLatin1 -#: src/cups/genppd.c:1060 +#: src/cups/genppd.c:1066 msgid "ISOLatin1" msgstr "" -#: src/cups/genppd.c:1641 +#: src/cups/genppd.c:1647 msgid "2-Sided Printing" msgstr "" -#: src/cups/genppd.c:1665 +#: src/cups/genppd.c:1671 msgid "Shrink Page If Necessary to Fit Borders" msgstr "" -#: src/cups/genppd.c:1669 +#: src/cups/genppd.c:1675 msgid "Shrink (print the whole page)" msgstr "" -#: src/cups/genppd.c:1670 +#: src/cups/genppd.c:1676 msgid "Crop (preserve dimensions)" msgstr "" -#: src/cups/genppd.c:1671 +#: src/cups/genppd.c:1677 msgid "Expand (use maximum page area)" msgstr "" -#: src/cups/genppd.c:1756 +#: src/cups/genppd.c:1762 msgid "No" msgstr "" -#: src/cups/genppd.c:1758 +#: src/cups/genppd.c:1764 msgid "Yes" msgstr "" -#: src/cups/genppd.c:1795 src/cups/genppd.c:1857 +#: src/cups/genppd.c:1801 src/cups/genppd.c:1863 msgid "Value" msgstr "" -#: src/cups/genppd.c:1800 +#: src/cups/genppd.c:1806 msgid "Fine Adjustment" msgstr "" @@ -7440,128 +7798,6 @@ msgstr "" msgid "Error in input\n" msgstr "" -#: src/gimp/print-image-gimp.c:225 src/gimp2/print-image-gimp.c:225 +#: src/gimp2/print-image-gimp.c:225 msgid "Printing..." msgstr "" - -#: src/gimp/print.c:133 -msgid "/File/Print..." -msgstr "" - -#: src/ghost/ijsgutenprint.c:98 -#, c-format -msgid "" -"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" -msgstr "" - -#: 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:199 -#, c-format -msgid "ERROR: ijsgutenprint: No row buffer\n" -msgstr "" - -#: 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:498 -#, c-format -msgid "ERROR: ijsgutenprint: Printer must be specified with -sDeviceModel\n" -msgstr "" - -#: src/ghost/ijsgutenprint.c:500 -#, c-format -msgid "ERROR: ijsgutenprint: Printer %s is not a known model\n" -msgstr "" - -#: src/ghost/ijsgutenprint.c:656 -#, c-format -msgid "ijsgutenprint: unknown DeviceModel %s\n" -msgstr "" - -#: src/ghost/ijsgutenprint.c:700 -#, c-format -msgid "ERROR: ijsgutenprint: cannot parse TopLeft %s\n" -msgstr "" - -#: src/ghost/ijsgutenprint.c:723 -#, c-format -msgid "ERROR: ijsgutenprint: cannot parse PaperSize %s\n" -msgstr "" - -#: src/ghost/ijsgutenprint.c:795 -#, c-format -msgid "ERROR: ijsgutenprint: cannot parse curve %s\n" -msgstr "" - -#: src/ghost/ijsgutenprint.c:802 -#, c-format -msgid "ERROR: ijsgutenprint: cannot parse %s float %s\n" -msgstr "" - -#: src/ghost/ijsgutenprint.c:809 -#, c-format -msgid "ERROR: ijsgutenprint: cannot parse %s int %s\n" -msgstr "" - -#: src/ghost/ijsgutenprint.c:816 -#, c-format -msgid "ERROR: ijsgutenprint: cannot parse %s dimension %s\n" -msgstr "" - -#: src/ghost/ijsgutenprint.c:830 -#, c-format -msgid "ERROR: ijsgutenprint: cannot parse %s boolean %s\n" -msgstr "" - -#: src/ghost/ijsgutenprint.c:841 -#, c-format -msgid "ERROR: ijsgutenprint: Bad parameter %s %d\n" -msgstr "" - -#: src/ghost/ijsgutenprint.c:867 -#, c-format -msgid "ERROR: ijsgutenprint: bad key code %d\n" -msgstr "" - -#: src/ghost/ijsgutenprint.c:1308 -#, c-format -msgid "ERROR: ijsgutenprint: image_init failed %d\n" -msgstr "" - -#: src/ghost/ijsgutenprint.c:1319 -#, c-format -msgid "ERROR: ijsgutenprint: Unable to open file descriptor: %s\n" -msgstr "" - -#: src/ghost/ijsgutenprint.c:1331 -#, c-format -msgid "ERROR: ijsgutenprint: Unable to open %s: %s\n" -msgstr "" - -#: src/ghost/ijsgutenprint.c:1344 -#, c-format -msgid "ERROR: ijsgutenprint: Unknown printer %s\n" -msgstr "" - -#: src/ghost/ijsgutenprint.c:1516 -#, c-format -msgid "ERROR: ijsgutenprint: Bad parameters; cannot continue!\n" -msgstr "" - -#: 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 0c650d4..d8bc0cc 100644 Binary files a/po/hu.gmo and b/po/hu.gmo differ diff --git a/po/hu.po b/po/hu.po index 507381c..3b0b25f 100644 --- a/po/hu.po +++ b/po/hu.po @@ -1,27 +1,27 @@ # Hungarian translation of gutenprint. -# Copyright (C) 2004, 2006 Free Software Foundation, Inc. +# Copyright (C) 2004, 2006, 2007 Free Software Foundation, Inc. # # Laszlo Dvornik , 2004. # Andras Timar , 2004. -# Gabor Kelemen , 2005, 2006. +# Gabor Kelemen , 2005, 2006, 2007. msgid "" msgstr "" -"Project-Id-Version: gutenprint 5.0.0\n" +"Project-Id-Version: gutenprint 5.0.1\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2008-01-01 20:47-0500\n" -"PO-Revision-Date: 2006-06-16 16:40+0200\n" +"POT-Creation-Date: 2008-04-25 21:19-0400\n" +"PO-Revision-Date: 2007-11-06 19:32+0100\n" "Last-Translator: Gabor Kelemen \n" "Language-Team: Hungarian \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Generator: KBabel 1.11.2\n" -"Plural-Forms: nplurals=1; plural=0;\n" +"X-Generator: KBabel 1.11.4\n" +"Plural-Forms: nplurals=2; plural=(n != 1);\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:1752 +#: src/main/print-escp2.c:2116 msgid "Default" msgstr "Alapértelmezett" @@ -61,41 +61,54 @@ msgid "Ordered" msgstr "Rendezett" #: src/main/dither-main.c:65 +#, fuzzy +msgid "Ordered New" +msgstr "Rendezett" + +#: src/main/dither-main.c:66 msgid "Fast" msgstr "Gyors" -#: src/main/dither-main.c:66 +#: src/main/dither-main.c:67 msgid "Very Fast" msgstr "Nagyon gyors" -#: src/main/dither-main.c:67 +#: src/main/dither-main.c:68 msgid "Hybrid Floyd-Steinberg" msgstr "Floyd-Steinberg hibrid" -#: src/main/dither-main.c:68 +#: src/main/dither-main.c:69 msgid "Predithered Input" msgstr "ElÅ‘szórt bemenet" -#: src/main/dither-main.c:88 src/main/print-color.c:56 +#: src/main/dither-main.c:70 +msgid "Drop Size Segmented" +msgstr "" + +#: src/main/dither-main.c:71 +msgid "Drop Size Segmented New" +msgstr "" + +#: src/main/dither-main.c:91 src/main/print-color.c:56 msgid "Density" msgstr "Sűrűség" -#: src/main/dither-main.c:88 src/main/print-canon.c:295 +#: src/main/dither-main.c:91 src/main/print-canon.c:295 #: src/main/print-canon.c:303 src/main/print-canon.c:311 -#: src/main/print-canon.c:319 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-escp2.c:471 -#: src/main/print-escp2.c:479 src/main/print-escp2.c:487 +#: src/main/print-canon.c:319 src/main/print-escp2.c:446 +#: src/main/print-escp2.c:454 src/main/print-escp2.c:462 +#: src/main/print-escp2.c:470 src/main/print-escp2.c:478 +#: src/main/print-escp2.c:486 src/main/print-escp2.c:494 #: 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:1764 src/main/print-olympus.c:1772 -#: src/main/print-olympus.c:1780 src/main/print-olympus.c:1788 -#: src/main/print-pcl.c:1261 src/main/print-pcl.c:1269 -#: src/main/print-pcl.c:1277 src/main/print-pcl.c:1285 +#: src/main/print-olympus.c:1762 src/main/print-olympus.c:1770 +#: src/main/print-olympus.c:1778 src/main/print-olympus.c:1786 +#: src/main/print-pcl.c:1329 src/main/print-pcl.c:1337 +#: src/main/print-pcl.c:1345 src/main/print-pcl.c:1353 msgid "Output Level Adjustment" msgstr "Kimeneti szint igazítása" -#: src/main/dither-main.c:89 +#: src/main/dither-main.c:92 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 +118,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:97 +#: src/main/dither-main.c:100 msgid "Dither Algorithm" msgstr "Szórási algoritmus" -#: src/main/dither-main.c:97 +#: src/main/dither-main.c:100 msgid "Screening Adjustment" msgstr "KépernyÅ‘zési igazítás" -#: src/main/dither-main.c:98 +#: src/main/dither-main.c:101 msgid "" "Choose the dither algorithm to be used.\n" "Adaptive Hybrid usually produces the best all-around quality.\n" @@ -152,9 +165,9 @@ msgstr "Színátalakítási modul" msgid "Dither algorithm" msgstr "Szórási algoritmus" -#: src/main/print-canon.c:200 src/main/print-escp2.c:180 -#: src/main/print-lexmark.c:266 src/main/print-olympus.c:1699 -#: src/main/print-pcl.c:1196 src/main/print-ps.c:67 +#: src/main/print-canon.c:200 src/main/print-escp2.c:182 +#: src/main/print-lexmark.c:266 src/main/print-olympus.c:1697 +#: src/main/print-pcl.c:1264 msgid "Page Size" msgstr "Oldalméret" @@ -162,236 +175,243 @@ msgstr "Oldalméret" #: src/main/print-canon.c:212 src/main/print-canon.c:218 #: src/main/print-canon.c:224 src/main/print-canon.c:230 #: src/main/print-canon.c:248 src/main/print-canon.c:272 -#: src/main/print-escp2.c:180 src/main/print-escp2.c:186 -#: src/main/print-escp2.c:192 src/main/print-escp2.c:198 -#: src/main/print-escp2.c:204 src/main/print-escp2.c:210 -#: src/main/print-escp2.c:228 src/main/print-escp2.c:245 -#: src/main/print-escp2.c:251 src/main/print-escp2.c:263 -#: src/main/print-escp2.c:281 src/main/print-lexmark.c:266 +#: src/main/print-escp2.c:182 src/main/print-escp2.c:188 +#: src/main/print-escp2.c:194 src/main/print-escp2.c:200 +#: src/main/print-escp2.c:206 src/main/print-escp2.c:212 +#: src/main/print-escp2.c:230 src/main/print-escp2.c:247 +#: src/main/print-escp2.c:253 src/main/print-escp2.c:265 +#: src/main/print-escp2.c:283 src/main/print-lexmark.c:266 #: src/main/print-lexmark.c:272 src/main/print-lexmark.c:278 -#: src/main/print-lexmark.c:284 src/main/print-olympus.c:1699 -#: src/main/print-olympus.c:1705 src/main/print-olympus.c:1711 -#: src/main/print-olympus.c:1717 src/main/print-pcl.c:1196 -#: src/main/print-pcl.c:1202 src/main/print-pcl.c:1208 -#: src/main/print-pcl.c:1214 src/main/print-pcl.c:1238 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 +#: src/main/print-lexmark.c:284 src/main/print-olympus.c:1697 +#: src/main/print-olympus.c:1703 src/main/print-olympus.c:1709 +#: src/main/print-olympus.c:1715 src/main/print-pcl.c:1264 +#: src/main/print-pcl.c:1270 src/main/print-pcl.c:1276 +#: src/main/print-pcl.c:1282 src/main/print-pcl.c:1306 src/main/print-ps.c:68 +#: src/main/print-ps.c:74 msgid "Basic Printer Setup" msgstr "Nyomtató alapbeállításai" -#: src/main/print-canon.c:201 src/main/print-escp2.c:181 -#: src/main/print-lexmark.c:267 src/main/print-olympus.c:1700 -#: src/main/print-pcl.c:1197 src/main/print-ps.c:68 +#: src/main/print-canon.c:201 src/main/print-escp2.c:183 +#: src/main/print-lexmark.c:267 src/main/print-olympus.c:1698 +#: src/main/print-pcl.c:1265 msgid "Size of the paper being printed to" msgstr "A nyomtatáshoz használt papír mérete" -#: src/main/print-canon.c:206 src/main/print-escp2.c:186 -#: src/main/print-lexmark.c:272 src/main/print-olympus.c:1705 -#: src/main/print-pcl.c:1202 src/main/print-ps.c:73 src/cups/genppd.c:1417 +#: src/main/print-canon.c:206 src/main/print-escp2.c:188 +#: src/main/print-lexmark.c:272 src/main/print-olympus.c:1703 +#: src/main/print-pcl.c:1270 src/cups/genppd.c:1422 msgid "Media Type" msgstr "Papír típusa" -#: src/main/print-canon.c:207 src/main/print-escp2.c:187 -#: src/main/print-lexmark.c:273 src/main/print-olympus.c:1706 -#: src/main/print-pcl.c:1203 src/main/print-ps.c:74 +#: src/main/print-canon.c:207 src/main/print-escp2.c:189 +#: src/main/print-lexmark.c:273 src/main/print-olympus.c:1704 +#: src/main/print-pcl.c:1271 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:212 src/main/print-escp2.c:192 -#: src/main/print-lexmark.c:278 src/main/print-olympus.c:1711 -#: src/main/print-pcl.c:1208 src/main/print-ps.c:79 src/cups/genppd.c:1445 +#: src/main/print-canon.c:212 src/main/print-escp2.c:194 +#: src/main/print-lexmark.c:278 src/main/print-olympus.c:1709 +#: src/main/print-pcl.c:1276 src/cups/genppd.c:1450 msgid "Media Source" msgstr "Papír forrása" -#: src/main/print-canon.c:213 src/main/print-escp2.c:193 -#: src/main/print-lexmark.c:279 src/main/print-olympus.c:1712 -#: src/main/print-pcl.c:1209 src/main/print-ps.c:80 +#: src/main/print-canon.c:213 src/main/print-escp2.c:195 +#: src/main/print-lexmark.c:279 src/main/print-olympus.c:1710 +#: src/main/print-pcl.c:1277 msgid "Source (input slot) of the media" msgstr "A nyomtatáshoz használt hordozó forrása" -#: src/main/print-canon.c:218 src/main/print-escp2.c:198 +#: src/main/print-canon.c:218 src/main/print-escp2.c:200 msgid "CD Hub Size" msgstr "CD középpontjának mérete" -#: src/main/print-canon.c:219 src/main/print-escp2.c:199 +#: src/main/print-canon.c:219 src/main/print-escp2.c:201 msgid "Print only outside of the hub of the CD, or all the way to the hole" msgstr "Csak a CD középpontján kívülre nyomtatás, vagy a lyuk felé vezetÅ‘ úton" -#: src/main/print-canon.c:224 src/main/print-escp2.c:204 +#: src/main/print-canon.c:224 src/main/print-escp2.c:206 msgid "CD Size (Custom)" -msgstr "" +msgstr "CD méret (egyéni)" -#: src/main/print-canon.c:225 src/main/print-escp2.c:205 +#: src/main/print-canon.c:225 src/main/print-escp2.c:207 msgid "Variable adjustment for the outer diameter of CD" -msgstr "" +msgstr "A CD külsÅ‘ átmérÅ‘jének változtatható beállítása" -#: src/main/print-canon.c:230 src/main/print-escp2.c:210 -#, fuzzy +#: src/main/print-canon.c:230 src/main/print-escp2.c:212 msgid "CD Hub Size (Custom)" -msgstr "CD középpontjának mérete" +msgstr "CD középpontjának mérete (egyéni)" -#: src/main/print-canon.c:231 src/main/print-escp2.c:211 -#, fuzzy +#: src/main/print-canon.c:231 src/main/print-escp2.c:213 msgid "Variable adjustment to the inner hub of the CD" -msgstr "Nyomat méretezése a lap mérete szerint" +msgstr "A CD középpontjának változtatható beállítása" -#: src/main/print-canon.c:236 src/main/print-escp2.c:216 +#: src/main/print-canon.c:236 src/main/print-escp2.c:218 msgid "CD Horizontal Fine Adjustment" msgstr "CD vízszintes finomhangolása" #: src/main/print-canon.c:236 src/main/print-canon.c:242 -#: src/main/print-canon.c:254 src/main/print-escp2.c:216 -#: src/main/print-escp2.c:222 src/main/print-escp2.c:239 -#: src/main/print-escp2.c:275 src/main/print-lexmark.c:290 -#: src/main/print-olympus.c:1723 src/main/print-olympus.c:1729 -#: src/main/print-olympus.c:1735 src/main/print-pcl.c:1220 -#: src/main/print-ps.c:91 src/main/print-raw.c:80 +#: src/main/print-canon.c:254 src/main/print-escp2.c:218 +#: src/main/print-escp2.c:224 src/main/print-escp2.c:241 +#: src/main/print-escp2.c:277 src/main/print-lexmark.c:290 +#: src/main/print-olympus.c:1721 src/main/print-olympus.c:1727 +#: src/main/print-olympus.c:1733 src/main/print-pcl.c:1288 +#: src/main/print-raw.c:80 msgid "Advanced Printer Setup" msgstr "Haladó nyomtatóbeállítások" #: src/main/print-canon.c:237 src/main/print-canon.c:243 -#: src/main/print-escp2.c:217 src/main/print-escp2.c:223 +#: src/main/print-escp2.c:219 src/main/print-escp2.c:225 msgid "Fine adjustment to horizontal position for CD printing" msgstr "Finomhangolás a vízszintes pozícióig a CD-re nyomtatáshoz" -#: src/main/print-canon.c:242 src/main/print-escp2.c:222 +#: src/main/print-canon.c:242 src/main/print-escp2.c:224 msgid "CD Vertical Fine Adjustment" msgstr "CD függÅ‘leges finomhangolása" -#: src/main/print-canon.c:248 src/main/print-escp2.c:228 -#: src/main/print-lexmark.c:284 src/main/print-olympus.c:1717 -#: src/main/print-pcl.c:1214 src/main/print-ps.c:85 src/cups/genppd.c:1518 +#: src/main/print-canon.c:248 src/main/print-escp2.c:230 +#: src/main/print-lexmark.c:284 src/main/print-olympus.c:1715 +#: src/main/print-pcl.c:1282 src/cups/genppd.c:1523 msgid "Resolution" msgstr "Felbontás" #: src/main/print-canon.c:249 src/main/print-lexmark.c:285 -#: src/main/print-olympus.c:1718 src/main/print-pcl.c:1215 -#: src/main/print-ps.c:86 +#: src/main/print-olympus.c:1716 src/main/print-pcl.c:1283 msgid "Resolution and quality of the print" msgstr "A nyomtatás felbontása és minÅ‘sége" -#: src/main/print-canon.c:254 src/main/print-escp2.c:239 -#: src/main/print-lexmark.c:290 src/main/print-olympus.c:1723 -#: src/main/print-pcl.c:1220 src/main/print-ps.c:91 src/main/print-raw.c:80 +#: src/main/print-canon.c:254 src/main/print-escp2.c:241 +#: src/main/print-lexmark.c:290 src/main/print-olympus.c:1721 +#: src/main/print-pcl.c:1288 src/main/print-raw.c:80 msgid "Ink Type" msgstr "Tinta típusa" -#: src/main/print-canon.c:255 src/main/print-escp2.c:240 -#: src/main/print-escp2.c:252 src/main/print-lexmark.c:291 -#: src/main/print-olympus.c:1724 src/main/print-pcl.c:1221 -#: src/main/print-ps.c:92 src/main/print-raw.c:81 +#: src/main/print-canon.c:255 src/main/print-escp2.c:242 +#: src/main/print-escp2.c:254 src/main/print-lexmark.c:291 +#: src/main/print-olympus.c:1722 src/main/print-pcl.c:1289 +#: 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:260 src/main/print-canon.c:261 -#: src/main/print-escp2.c:329 src/main/print-escp2.c:330 +#: src/main/print-escp2.c:331 src/main/print-escp2.c:332 #: src/main/print-lexmark.c:296 src/main/print-lexmark.c:297 -#: src/main/print-pcl.c:1226 src/main/print-pcl.c:1227 +#: src/main/print-pcl.c:1294 src/main/print-pcl.c:1295 msgid "Ink Channels" msgstr "Tintacsatornák" -#: src/main/print-canon.c:260 src/main/print-escp2.c:130 -#: src/main/print-escp2.c:137 src/main/print-escp2.c:144 -#: src/main/print-escp2.c:287 src/main/print-escp2.c:293 -#: src/main/print-escp2.c:299 src/main/print-escp2.c:305 -#: src/main/print-escp2.c:311 src/main/print-escp2.c:317 -#: src/main/print-escp2.c:323 src/main/print-escp2.c:329 -#: src/main/print-escp2.c:335 src/main/print-lexmark.c:296 -#: src/main/print-pcl.c:1226 +#: src/main/print-canon.c:260 src/main/print-escp2.c:132 +#: src/main/print-escp2.c:139 src/main/print-escp2.c:146 +#: src/main/print-escp2.c:289 src/main/print-escp2.c:295 +#: src/main/print-escp2.c:301 src/main/print-escp2.c:307 +#: src/main/print-escp2.c:313 src/main/print-escp2.c:319 +#: src/main/print-escp2.c:325 src/main/print-escp2.c:331 +#: src/main/print-escp2.c:337 src/main/print-lexmark.c:296 +#: src/main/print-pcl.c:1294 msgid "Advanced Printer Functionality" msgstr "Haladó nyomtatófunkciók" -#: src/main/print-canon.c:266 src/main/print-escp2.c:341 -#: src/main/print-lexmark.c:302 src/main/print-olympus.c:1741 -#: src/main/print-pcl.c:1232 src/main/print-ps.c:103 src/main/print-raw.c:86 +#: src/main/print-canon.c:266 src/main/print-escp2.c:343 +#: src/main/print-lexmark.c:302 src/main/print-olympus.c:1739 +#: src/main/print-pcl.c:1300 src/main/print-ps.c:80 src/main/print-raw.c:86 msgid "Printing Mode" msgstr "Nyomtatási mód" #: src/main/print-canon.c:266 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:341 -#: src/main/print-escp2.c:347 src/main/print-lexmark.c:302 -#: src/main/print-olympus.c:1741 src/main/print-pcl.c:1232 -#: src/main/print-ps.c:103 src/main/print-raw.c:86 +#: src/main/print-color.c:208 src/main/print-escp2.c:343 +#: src/main/print-escp2.c:349 src/main/print-lexmark.c:302 +#: src/main/print-olympus.c:1739 src/main/print-pcl.c:1300 +#: src/main/print-ps.c:80 src/main/print-raw.c:86 msgid "Core Parameter" msgstr "Alap paraméter" -#: src/main/print-canon.c:267 src/main/print-escp2.c:342 -#: src/main/print-lexmark.c:303 src/main/print-olympus.c:1742 -#: src/main/print-pcl.c:1233 src/main/print-ps.c:104 src/main/print-raw.c:87 +#: src/main/print-canon.c:267 src/main/print-escp2.c:344 +#: src/main/print-lexmark.c:303 src/main/print-olympus.c:1740 +#: src/main/print-pcl.c:1301 src/main/print-ps.c:81 src/main/print-raw.c:87 msgid "Printing Output Mode" msgstr "Nyomtatás kimeneti módja" -#: src/main/print-canon.c:272 src/main/print-pcl.c:1238 +#: src/main/print-canon.c:272 src/main/print-pcl.c:1306 msgid "Double-Sided Printing" msgstr "Kétoldalas nyomtatás" -#: src/main/print-canon.c:273 src/main/print-pcl.c:1239 +#: src/main/print-canon.c:273 src/main/print-pcl.c:1307 msgid "Duplex/Tumble Setting" msgstr "Kétoldalas/fordítva beállítás" -#: src/main/print-canon.c:295 src/main/print-escp2.c:439 -#: src/main/print-lexmark.c:325 src/main/print-pcl.c:1261 +#: src/main/print-canon.c:295 src/main/print-escp2.c:446 +#: src/main/print-lexmark.c:325 src/main/print-pcl.c:1329 msgid "Cyan Density" msgstr "Ciánkék sűrűsége" -#: src/main/print-canon.c:296 src/main/print-escp2.c:440 -#: src/main/print-lexmark.c:326 src/main/print-pcl.c:1262 +#: src/main/print-canon.c:296 src/main/print-escp2.c:447 +#: src/main/print-lexmark.c:326 src/main/print-pcl.c:1330 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:303 src/main/print-escp2.c:447 -#: src/main/print-lexmark.c:333 src/main/print-pcl.c:1269 +#: src/main/print-canon.c:303 src/main/print-escp2.c:454 +#: src/main/print-lexmark.c:333 src/main/print-pcl.c:1337 msgid "Magenta Density" msgstr "Bíborvörös sűrűsége" -#: src/main/print-canon.c:304 src/main/print-escp2.c:448 -#: src/main/print-lexmark.c:334 src/main/print-pcl.c:1270 +#: src/main/print-canon.c:304 src/main/print-escp2.c:455 +#: src/main/print-lexmark.c:334 src/main/print-pcl.c:1338 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:311 src/main/print-escp2.c:455 -#: src/main/print-lexmark.c:341 src/main/print-pcl.c:1277 +#: src/main/print-canon.c:311 src/main/print-escp2.c:462 +#: src/main/print-lexmark.c:341 src/main/print-pcl.c:1345 msgid "Yellow Density" msgstr "Sárga sűrűsége" -#: src/main/print-canon.c:312 src/main/print-escp2.c:456 -#: src/main/print-lexmark.c:342 src/main/print-pcl.c:1278 +#: src/main/print-canon.c:312 src/main/print-escp2.c:463 +#: src/main/print-lexmark.c:342 src/main/print-pcl.c:1346 msgid "Adjust the yellow density" msgstr "A nyomat sárga-sűrűségének beállítása" -#: src/main/print-canon.c:319 src/main/print-escp2.c:463 -#: src/main/print-lexmark.c:349 src/main/print-pcl.c:1285 +#: src/main/print-canon.c:319 src/main/print-escp2.c:470 +#: src/main/print-lexmark.c:349 src/main/print-pcl.c:1353 msgid "Black Density" msgstr "Fekete sűrűsége" -#: src/main/print-canon.c:320 src/main/print-escp2.c:464 -#: src/main/print-lexmark.c:350 src/main/print-pcl.c:1286 +#: src/main/print-canon.c:320 src/main/print-escp2.c:471 +#: src/main/print-lexmark.c:350 src/main/print-pcl.c:1354 msgid "Adjust the black density" msgstr "A nyomat fekete-sűrűségének beállítása" #: src/main/print-canon.c:327 src/main/print-canon.c:328 -#: src/main/print-escp2.c:495 src/main/print-escp2.c:496 +#: src/main/print-escp2.c:534 src/main/print-escp2.c:535 #: src/main/print-lexmark.c:357 src/main/print-lexmark.c:358 -#: src/main/print-pcl.c:1293 src/main/print-pcl.c:1294 +#: src/main/print-pcl.c:1361 src/main/print-pcl.c:1362 msgid "Light Cyan Transition" msgstr "Világos ciánkék átmenet" #: src/main/print-canon.c:327 src/main/print-canon.c:335 -#: src/main/print-canon.c:343 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-escp2.c:543 -#: src/main/print-escp2.c:551 src/main/print-escp2.c:559 -#: src/main/print-lexmark.c:357 src/main/print-lexmark.c:365 -#: src/main/print-pcl.c:1293 src/main/print-pcl.c:1301 +#: src/main/print-canon.c:343 src/main/print-escp2.c:502 +#: src/main/print-escp2.c:510 src/main/print-escp2.c:518 +#: src/main/print-escp2.c:526 src/main/print-escp2.c:534 +#: src/main/print-escp2.c:542 src/main/print-escp2.c:550 +#: src/main/print-escp2.c:558 src/main/print-escp2.c:566 +#: src/main/print-escp2.c:574 src/main/print-escp2.c:582 +#: src/main/print-escp2.c:590 src/main/print-escp2.c:598 +#: src/main/print-escp2.c:606 src/main/print-escp2.c:614 +#: src/main/print-escp2.c:622 src/main/print-escp2.c:630 +#: src/main/print-escp2.c:638 src/main/print-escp2.c:646 +#: src/main/print-escp2.c:654 src/main/print-escp2.c:662 +#: src/main/print-escp2.c:670 src/main/print-escp2.c:678 +#: src/main/print-escp2.c:686 src/main/print-escp2.c:694 +#: src/main/print-escp2.c:702 src/main/print-escp2.c:710 +#: src/main/print-escp2.c:718 src/main/print-escp2.c:726 +#: src/main/print-escp2.c:734 src/main/print-lexmark.c:357 +#: src/main/print-lexmark.c:365 src/main/print-pcl.c:1361 +#: src/main/print-pcl.c:1369 msgid "Advanced Ink Adjustment" msgstr "Haladó tintabeállítás" #: src/main/print-canon.c:335 src/main/print-canon.c:336 -#: src/main/print-escp2.c:503 src/main/print-escp2.c:504 +#: src/main/print-escp2.c:566 src/main/print-escp2.c:567 #: src/main/print-lexmark.c:365 src/main/print-lexmark.c:366 -#: src/main/print-pcl.c:1301 src/main/print-pcl.c:1302 +#: src/main/print-pcl.c:1369 src/main/print-pcl.c:1370 msgid "Light Magenta Transition" msgstr "Világos bíborvörös átmenet" @@ -399,54 +419,53 @@ msgstr "Világos bíborvörös átmenet" msgid "Light Yellow Transition" msgstr "Világossárga átmenet" -#: src/main/print-canon.c:363 src/main/print-pcl.c:1482 +#: src/main/print-canon.c:363 src/main/print-pcl.c:1550 #: src/main/escp2-resolutions.c:557 src/main/escp2-resolutions.c:565 #: src/main/escp2-resolutions.c:576 src/main/escp2-resolutions.c:588 msgid "Off" msgstr "Kikapcsolva" -#: src/main/print-canon.c:364 src/main/print-pcl.c:1483 +#: src/main/print-canon.c:364 src/main/print-pcl.c:1551 msgid "Long Edge (Standard)" msgstr "hosszabbik él (szabvány)" -#: src/main/print-canon.c:365 src/main/print-pcl.c:1484 +#: src/main/print-canon.c:365 src/main/print-pcl.c:1552 msgid "Short Edge (Flip)" msgstr "Rövidebbik él (tükrözve)" -#: src/main/print-canon.c:629 src/main/print-escp2.c:1648 +#: src/main/print-canon.c:629 src/main/print-escp2.c:2012 #: src/main/xmli18n-tmp.h:6 msgid "CD - 5 inch" msgstr "5 hüvelykes CD" -#: src/main/print-canon.c:631 src/main/print-escp2.c:1650 +#: src/main/print-canon.c:631 src/main/print-escp2.c:2014 #: src/main/xmli18n-tmp.h:7 msgid "CD - 3 inch" msgstr "3 hüvelykes CD" -#: src/main/print-canon.c:633 src/main/print-escp2.c:1652 +#: src/main/print-canon.c:633 src/main/print-escp2.c:2016 #: src/main/xmli18n-tmp.h:8 -#, fuzzy msgid "CD - Custom" -msgstr "Egyéni" +msgstr "CD - Egyéni" -#: src/main/print-canon.c:656 src/main/print-escp2.c:1677 +#: src/main/print-canon.c:656 src/main/print-escp2.c:2041 msgid "Normal" msgstr "Normál" -#: src/main/print-canon.c:658 src/main/print-escp2.c:1679 +#: src/main/print-canon.c:658 src/main/print-escp2.c:2043 msgid "Print To Hub" msgstr "Nyomtatás a középpontig" -#: src/main/print-canon.c:773 src/main/print-escp2.c:2011 -#: src/main/print-lexmark.c:1279 src/main/print-olympus.c:1996 -#: src/main/print-pcl.c:1776 src/main/print-ps.c:170 src/main/print-raw.c:135 -#: src/gutenprintui/panel.c:289 src/gutenprintui2/panel.c:289 +#: src/main/print-canon.c:773 src/main/print-escp2.c:2450 +#: src/main/print-lexmark.c:1279 src/main/print-olympus.c:1994 +#: src/main/print-pcl.c:1844 src/main/print-ps.c:310 src/main/print-raw.c:135 +#: src/gutenprintui2/panel.c:290 msgid "Color" msgstr "Színes" -#: src/main/print-canon.c:775 src/main/print-escp2.c:2013 -#: src/main/print-lexmark.c:1281 src/main/print-pcl.c:1778 -#: src/main/print-ps.c:172 src/main/print-raw.c:137 +#: src/main/print-canon.c:775 src/main/print-escp2.c:2452 +#: src/main/print-lexmark.c:1281 src/main/print-pcl.c:1846 +#: src/main/print-ps.c:312 src/main/print-raw.c:137 msgid "Black and White" msgstr "Fekete-fehér" @@ -484,7 +503,7 @@ msgstr "ElÅ‘szórt" #: src/main/print-color.c:121 src/main/escp2-channels.c:916 #: src/main/escp2-channels.c:929 src/main/escp2-channels.c:943 -#: src/gutenprintui/panel.c:290 src/gutenprintui2/panel.c:290 +#: src/gutenprintui2/panel.c:291 msgid "Grayscale" msgstr "Szürkeárnyalatos" @@ -508,7 +527,7 @@ msgstr "CMYK" msgid "KCMY" msgstr "KCMY" -#: src/main/print-color.c:165 src/main/print-color.c:446 +#: src/main/print-color.c:165 src/main/print-color.c:454 msgid "Channel " msgstr "Csatorna " @@ -564,7 +583,7 @@ msgid "Output image type" msgstr "Kimeneti kép típusa" #: src/main/print-color.c:208 src/main/print-color.c:209 -#: src/main/print-escp2.c:347 +#: src/main/print-escp2.c:349 msgid "Raw Channels" msgstr "Nyers csatornák" @@ -624,14 +643,14 @@ 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/escp2-channels.c:3048 -#: src/main/escp2-channels.c:3060 src/main/escp2-channels.c:3068 -#: src/main/escp2-channels.c:3078 src/main/escp2-channels.c:3089 -#: src/main/escp2-channels.c:3101 src/main/escp2-channels.c:3117 -#: src/main/escp2-channels.c:3125 src/main/escp2-channels.c:3138 -#: src/main/escp2-channels.c:3151 src/main/escp2-channels.c:3165 -#: src/main/escp2-channels.c:3179 src/main/escp2-channels.c:3194 -#: src/gutenprintui/panel.c:2152 src/gutenprintui2/panel.c:2153 +#: src/main/print-color.c:266 src/main/escp2-channels.c:3087 +#: src/main/escp2-channels.c:3099 src/main/escp2-channels.c:3107 +#: src/main/escp2-channels.c:3117 src/main/escp2-channels.c:3128 +#: src/main/escp2-channels.c:3140 src/main/escp2-channels.c:3156 +#: src/main/escp2-channels.c:3164 src/main/escp2-channels.c:3177 +#: src/main/escp2-channels.c:3190 src/main/escp2-channels.c:3204 +#: src/main/escp2-channels.c:3218 src/main/escp2-channels.c:3230 +#: src/main/escp2-channels.c:3243 src/gutenprintui2/panel.c:2328 #: src/escputil/escputil.c:978 src/escputil/escputil.c:997 #: src/escputil/escputil.c:1201 msgid "Cyan" @@ -641,14 +660,14 @@ 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/escp2-channels.c:3049 -#: src/main/escp2-channels.c:3059 src/main/escp2-channels.c:3070 -#: src/main/escp2-channels.c:3079 src/main/escp2-channels.c:3090 -#: src/main/escp2-channels.c:3103 src/main/escp2-channels.c:3116 -#: src/main/escp2-channels.c:3126 src/main/escp2-channels.c:3139 -#: src/main/escp2-channels.c:3152 src/main/escp2-channels.c:3164 -#: src/main/escp2-channels.c:3178 src/main/escp2-channels.c:3195 -#: src/gutenprintui/panel.c:2159 src/gutenprintui2/panel.c:2160 +#: src/main/print-color.c:274 src/main/escp2-channels.c:3088 +#: src/main/escp2-channels.c:3098 src/main/escp2-channels.c:3109 +#: src/main/escp2-channels.c:3118 src/main/escp2-channels.c:3129 +#: src/main/escp2-channels.c:3142 src/main/escp2-channels.c:3155 +#: src/main/escp2-channels.c:3165 src/main/escp2-channels.c:3178 +#: src/main/escp2-channels.c:3191 src/main/escp2-channels.c:3203 +#: src/main/escp2-channels.c:3217 src/main/escp2-channels.c:3229 +#: src/main/escp2-channels.c:3244 src/gutenprintui2/panel.c:2335 #: src/escputil/escputil.c:979 src/escputil/escputil.c:998 #: src/escputil/escputil.c:1202 msgid "Magenta" @@ -658,14 +677,14 @@ 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/escp2-channels.c:3050 -#: src/main/escp2-channels.c:3061 src/main/escp2-channels.c:3069 -#: src/main/escp2-channels.c:3080 src/main/escp2-channels.c:3091 -#: src/main/escp2-channels.c:3105 src/main/escp2-channels.c:3112 -#: src/main/escp2-channels.c:3127 src/main/escp2-channels.c:3140 -#: src/main/escp2-channels.c:3153 src/main/escp2-channels.c:3163 -#: src/main/escp2-channels.c:3177 src/main/escp2-channels.c:3196 -#: src/gutenprintui/panel.c:2166 src/gutenprintui2/panel.c:2167 +#: src/main/print-color.c:282 src/main/escp2-channels.c:3089 +#: src/main/escp2-channels.c:3100 src/main/escp2-channels.c:3108 +#: src/main/escp2-channels.c:3119 src/main/escp2-channels.c:3130 +#: src/main/escp2-channels.c:3144 src/main/escp2-channels.c:3151 +#: src/main/escp2-channels.c:3166 src/main/escp2-channels.c:3179 +#: src/main/escp2-channels.c:3192 src/main/escp2-channels.c:3202 +#: src/main/escp2-channels.c:3216 src/main/escp2-channels.c:3228 +#: src/main/escp2-channels.c:3245 src/gutenprintui2/panel.c:2342 #: src/escputil/escputil.c:980 src/escputil/escputil.c:999 #: src/escputil/escputil.c:1203 msgid "Yellow" @@ -675,10 +694,9 @@ 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/escp2-channels.c:3168 -#: src/main/escp2-channels.c:3181 src/gutenprintui/panel.c:2180 -#: src/gutenprintui2/panel.c:2181 src/escputil/escputil.c:987 -#: src/escputil/escputil.c:1005 +#: src/main/print-color.c:290 src/main/escp2-channels.c:3207 +#: src/main/escp2-channels.c:3220 src/gutenprintui2/panel.c:2356 +#: src/escputil/escputil.c:987 src/escputil/escputil.c:1005 msgid "Red" msgstr "Vörös" @@ -686,8 +704,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:2187 -#: src/gutenprintui2/panel.c:2188 +#: src/main/print-color.c:298 src/gutenprintui2/panel.c:2363 msgid "Green" msgstr "Zöld" @@ -695,10 +712,9 @@ 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/escp2-channels.c:3169 -#: src/main/escp2-channels.c:3182 src/gutenprintui/panel.c:2194 -#: src/gutenprintui2/panel.c:2195 src/escputil/escputil.c:988 -#: src/escputil/escputil.c:1006 +#: src/main/print-color.c:306 src/main/escp2-channels.c:3208 +#: src/main/escp2-channels.c:3221 src/gutenprintui2/panel.c:2370 +#: src/escputil/escputil.c:988 src/escputil/escputil.c:1006 msgid "Blue" msgstr "Kék" @@ -707,14 +723,14 @@ msgid "Adjust the blue gamma" msgstr "A kék gamma értékének beállítása" #: src/main/print-color.c:314 src/main/print-lexmark.c:613 -#: src/main/escp2-channels.c:3047 src/main/escp2-channels.c:3057 -#: src/main/escp2-channels.c:3058 src/main/escp2-channels.c:3071 -#: src/main/escp2-channels.c:3081 src/main/escp2-channels.c:3088 -#: src/main/escp2-channels.c:3100 src/main/escp2-channels.c:3113 -#: src/main/escp2-channels.c:3124 src/main/escp2-channels.c:3137 -#: src/main/escp2-channels.c:3150 src/main/escp2-channels.c:3156 -#: src/main/escp2-channels.c:3180 src/main/escp2-channels.c:3193 -#: src/gutenprintui/panel.c:2173 src/gutenprintui2/panel.c:2174 +#: src/main/escp2-channels.c:3086 src/main/escp2-channels.c:3096 +#: src/main/escp2-channels.c:3097 src/main/escp2-channels.c:3110 +#: src/main/escp2-channels.c:3120 src/main/escp2-channels.c:3127 +#: src/main/escp2-channels.c:3139 src/main/escp2-channels.c:3152 +#: src/main/escp2-channels.c:3163 src/main/escp2-channels.c:3176 +#: src/main/escp2-channels.c:3189 src/main/escp2-channels.c:3195 +#: src/main/escp2-channels.c:3219 src/main/escp2-channels.c:3231 +#: src/main/escp2-channels.c:3242 src/gutenprintui2/panel.c:2349 #: src/escputil/escputil.c:975 src/escputil/escputil.c:996 #: src/escputil/escputil.c:1200 msgid "Black" @@ -724,7 +740,7 @@ msgstr "Fekete" msgid "Adjust the black gamma" msgstr "A fekete gamma értékének beállítása" -#: src/main/print-color.c:322 src/main/print-olympus.c:1764 +#: src/main/print-color.c:322 src/main/print-olympus.c:1762 msgid "Cyan Balance" msgstr "Ciánkékegyensúly" @@ -737,7 +753,7 @@ msgstr "Szürkeegyensúly" msgid "Adjust the cyan gray balance" msgstr "A ciánkék szürkeegyensúlyának beállítása" -#: src/main/print-color.c:330 src/main/print-olympus.c:1772 +#: src/main/print-color.c:330 src/main/print-olympus.c:1770 msgid "Magenta Balance" msgstr "Bíborvörös-egyensúly" @@ -745,7 +761,7 @@ msgstr "Bíborvörös-egyensúly" msgid "Adjust the magenta gray balance" msgstr "A bíborvörös szürkeegyensúlyának beállítása" -#: src/main/print-color.c:338 src/main/print-olympus.c:1780 +#: src/main/print-color.c:338 src/main/print-olympus.c:1778 msgid "Yellow Balance" msgstr "Sárgaegyensúly" @@ -772,9 +788,11 @@ msgstr "Tintakorlát" #: 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:353 -#: src/main/print-escp2.c:359 src/main/print-escp2.c:365 -#: src/main/print-escp2.c:371 src/main/print-escp2.c:377 +#: src/main/print-color.c:421 src/main/print-color.c:553 +#: src/main/print-escp2.c:355 src/main/print-escp2.c:361 +#: src/main/print-escp2.c:367 src/main/print-escp2.c:373 +#: src/main/print-escp2.c:379 src/main/print-escp2.c:742 +#: src/main/print-escp2.c:750 src/main/print-escp2.c:758 msgid "Advanced Output Control" msgstr "Haladó kimenetvezérlés" @@ -782,218 +800,226 @@ msgstr "Haladó kimenetvezérlés" msgid "Limit the total ink printed to the page" msgstr "Az oldalra összesen kinyomtatott tinta korlátozása" -#: src/main/print-color.c:365 +#: src/main/print-color.c:365 src/main/print-escp2.c:742 msgid "GCR Transition" msgstr "GCR áttérés" -#: src/main/print-color.c:366 +#: src/main/print-color.c:366 src/main/print-escp2.c:743 msgid "Adjust the gray component transition rate" msgstr "A szürkeösszetevÅ‘ áttérési sebességének beállítása" -#: src/main/print-color.c:373 +#: src/main/print-color.c:373 src/main/print-escp2.c:750 msgid "GCR Lower Bound" msgstr "GCR alsó korlát" -#: src/main/print-color.c:374 +#: src/main/print-color.c:374 src/main/print-escp2.c:751 msgid "Lower bound of gray component reduction" msgstr "A szürkeösszetevÅ‘ csökkentésének alsó korlátja" -#: src/main/print-color.c:381 +#: src/main/print-color.c:381 src/main/print-escp2.c:758 msgid "GCR Upper Bound" msgstr "GCR felsÅ‘ korlát" -#: src/main/print-color.c:382 +#: src/main/print-color.c:382 src/main/print-escp2.c:759 msgid "Upper bound of gray component reduction" msgstr "A szürkeösszetevÅ‘ csökkentésének felsÅ‘ korlátja" -#: src/main/print-color.c:447 src/main/print-color.c:457 -#: src/main/print-color.c:465 src/main/print-color.c:473 -#: src/main/print-color.c:481 src/main/print-color.c:489 -#: src/main/print-color.c:497 src/main/print-color.c:505 -#: src/main/print-color.c:513 +#: src/main/print-color.c:421 +msgid "LUT dump file" +msgstr "" + +#: src/main/print-color.c:422 +msgid "Dump file for LUT for external color adjustment" +msgstr "" + +#: src/main/print-color.c:455 src/main/print-color.c:465 +#: src/main/print-color.c:473 src/main/print-color.c:481 +#: src/main/print-color.c:489 src/main/print-color.c:497 +#: src/main/print-color.c:505 src/main/print-color.c:513 +#: src/main/print-color.c:521 msgid "Output Curves" msgstr "Kimeneti görbék" -#: src/main/print-color.c:447 +#: src/main/print-color.c:455 msgid "Curve for raw channel " msgstr "A nyers csatorna görbéje " -#: src/main/print-color.c:457 +#: src/main/print-color.c:465 msgid "Cyan Curve" msgstr "Ciánkék görbe" -#: src/main/print-color.c:458 +#: src/main/print-color.c:466 msgid "Cyan curve" msgstr "Ciánkék görbe" -#: src/main/print-color.c:465 +#: src/main/print-color.c:473 msgid "Magenta Curve" msgstr "Bíborvörös görbe" -#: src/main/print-color.c:466 +#: src/main/print-color.c:474 msgid "Magenta curve" msgstr "Bíborvörös görbe" -#: src/main/print-color.c:473 +#: src/main/print-color.c:481 msgid "Yellow Curve" msgstr "Sárga görbe" -#: src/main/print-color.c:474 +#: src/main/print-color.c:482 msgid "Yellow curve" msgstr "Sárga görbe" -#: src/main/print-color.c:481 +#: src/main/print-color.c:489 msgid "Black Curve" msgstr "Fekete görbe" -#: src/main/print-color.c:482 +#: src/main/print-color.c:490 msgid "Black curve" msgstr "Fekete görbe" -#: src/main/print-color.c:489 +#: src/main/print-color.c:497 msgid "Red Curve" msgstr "Vörös görbe" -#: src/main/print-color.c:490 +#: src/main/print-color.c:498 msgid "Red curve" msgstr "Vörös görbe" -#: src/main/print-color.c:497 +#: src/main/print-color.c:505 msgid "Green Curve" msgstr "Zöld görbe" -#: src/main/print-color.c:498 +#: src/main/print-color.c:506 msgid "Green curve" msgstr "Zöld görbe" -#: src/main/print-color.c:505 +#: src/main/print-color.c:513 msgid "Blue Curve" msgstr "Kék görbe" -#: src/main/print-color.c:506 +#: src/main/print-color.c:514 msgid "Blue curve" msgstr "Kék görbe" -#: src/main/print-color.c:513 +#: src/main/print-color.c:521 msgid "White Curve" msgstr "Fehér görbe" -#: src/main/print-color.c:514 +#: src/main/print-color.c:522 msgid "White curve" msgstr "Fehér görbe" -#: src/main/print-color.c:521 +#: src/main/print-color.c:529 msgid "Hue Map" msgstr "Ãrnyalattérkép" -#: src/main/print-color.c:521 src/main/print-color.c:529 -#: src/main/print-color.c:537 +#: src/main/print-color.c:529 src/main/print-color.c:537 +#: src/main/print-color.c:545 msgid "Advanced HSL Curves" msgstr "Haladó HSL görbék" -#: src/main/print-color.c:522 +#: src/main/print-color.c:530 msgid "Hue adjustment curve" msgstr "Ãrnyalatbeállítási görbe" -#: src/main/print-color.c:529 +#: src/main/print-color.c:537 msgid "Saturation Map" msgstr "Telítettségtérkép" -#: src/main/print-color.c:530 +#: src/main/print-color.c:538 msgid "Saturation adjustment curve" msgstr "Telítettségbeállítási görbe" -#: src/main/print-color.c:537 +#: src/main/print-color.c:545 msgid "Luminosity Map" msgstr "Fényességtérkép" -#: src/main/print-color.c:538 +#: src/main/print-color.c:546 msgid "Luminosity adjustment curve" msgstr "Fényességbeállítási görbe" -#: src/main/print-color.c:545 +#: src/main/print-color.c:553 msgid "Gray Component Reduction" msgstr "SzürkeösszetevÅ‘-csökkentés (GCR)" -#: src/main/print-color.c:546 +#: src/main/print-color.c:554 msgid "Gray component reduction curve" msgstr "SzürkeösszetevÅ‘-csökkentési görbe" -#: src/main/print-color.c:1670 +#: src/main/print-color.c:1743 msgid "Traditional Gutenprint color conversion" msgstr "Hagyományos Gutenprint színátalakítás" -#: src/main/printers.c:517 +#: src/main/printers.c:514 #, c-format msgid "Value must be set for %s\n" msgstr "A(z) %s számára be kell állítani egy értéket\n" -#: src/main/printers.c:530 src/main/printers.c:535 +#: src/main/printers.c:527 src/main/printers.c:532 #, c-format msgid "`%s' is not a valid %s\n" msgstr "\"%s\" nem érvényes %s\n" -#: src/main/printers.c:554 +#: src/main/printers.c:551 #, c-format msgid "%s must be between %f and %f (is %f)\n" msgstr "A(z) %s %f és %f között kell legyen (jelenleg %f)\n" -#: src/main/printers.c:576 src/main/printers.c:600 +#: src/main/printers.c:573 src/main/printers.c:597 #, c-format msgid "%s must be between %d and %d (is %d)\n" msgstr "A(z) %s %d és %d között kell legyen (jelenleg %d)\n" -#: src/main/printers.c:631 +#: src/main/printers.c:628 #, c-format msgid "%s bounds must be between %f and %f\n" msgstr "A(z) %s határainak %f és %f között kell lenniük\n" -#: src/main/printers.c:639 +#: src/main/printers.c:636 #, c-format msgid "%s wrap mode must be %s\n" msgstr "A(z) %s tördelési módja a következÅ‘ kell legyen: %s\n" -#: src/main/printers.c:643 +#: src/main/printers.c:640 msgid "no wrap" msgstr "nincs tördelés" -#: src/main/printers.c:643 +#: src/main/printers.c:640 msgid "wrap around" msgstr "tördelés" -#: src/main/printers.c:687 +#: src/main/printers.c:684 #, c-format msgid "Unknown type parameter %s (%d)\n" msgstr "Ismeretlen típusú paraméter: %s (%d)\n" -#: src/main/printers.c:700 src/main/printers.c:711 +#: src/main/printers.c:697 src/main/printers.c:708 #, c-format msgid "%s out of range (value %d, min %d, max %d)\n" msgstr "A(z) %s kívül esik a tartományon (érték: %d, min.: %d, max.: %d)\n" -#: src/main/printers.c:772 +#: src/main/printers.c:768 msgid "Page size is not valid\n" msgstr "Érvénytelen oldalméret\n" -#: src/main/printers.c:793 +#: src/main/printers.c:789 #, c-format msgid "Top margin must not be less than %d\n" msgstr "A felsÅ‘ szegély kevesebb kell legyen, mint %d\n" -#: src/main/printers.c:799 +#: src/main/printers.c:795 #, c-format msgid "Left margin must not be less than %d\n" msgstr "A bal szegély nem lehet kevesebb, mint %d\n" -#: src/main/printers.c:805 +#: src/main/printers.c:801 msgid "Height must be greater than zero\n" msgstr "A magasság nullánál nagyobb kell legyen\n" -#: src/main/printers.c:811 +#: src/main/printers.c:807 msgid "Width must be greater than zero\n" msgstr "A szélesség nullánál nagyobb kell legyen\n" -#: src/main/printers.c:817 +#: src/main/printers.c:813 #, c-format msgid "" "Image is too wide for the page: left margin is %d, width %d, right edge is %" @@ -1002,7 +1028,7 @@ msgstr "" "A kép túl széles az oldalhoz: a bal margó %d, a szélesség %d, a jobb szél %" "d\n" -#: src/main/printers.c:824 +#: src/main/printers.c:820 #, c-format msgid "" "Image is too long for the page: top margin is %d, height %d, bottom edge is %" @@ -1011,278 +1037,389 @@ 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.c:162 +#: src/main/print-escp2.c:164 msgid "Automatic Printing Mode" msgstr "Automatikus nyomtatási mód" -#: src/main/print-escp2.c:162 src/main/print-escp2.c:174 +#: src/main/print-escp2.c:164 src/main/print-escp2.c:176 #: src/main/generic-options.c:62 msgid "Basic Output Adjustment" msgstr "Alap kimenetvezérlés" -#: src/main/print-escp2.c:163 +#: src/main/print-escp2.c:165 msgid "Automatic printing mode" msgstr "Automatikus nyomtatási mód" -#: src/main/print-escp2.c:174 src/main/print-escp2.c:175 +#: src/main/print-escp2.c:176 src/main/print-escp2.c:177 #: src/main/generic-options.c:62 src/main/generic-options.c:63 msgid "Print Quality" msgstr "Nyomtatási minÅ‘ség" -#: src/main/print-escp2.c:229 +#: src/main/print-escp2.c:231 msgid "Resolution of the print" msgstr "A nyomat felbontása" -#: src/main/print-escp2.c:245 +#: src/main/print-escp2.c:247 msgid "Enhanced Gloss" msgstr "Kiterjesztett fényesség" -#: src/main/print-escp2.c:246 +#: src/main/print-escp2.c:248 msgid "Add gloss enhancement" msgstr "Fényességkiterjesztés hozzáadása" -#: src/main/print-escp2.c:251 +#: src/main/print-escp2.c:253 msgid "Ink Set" msgstr "Tintakészlet" -#: src/main/print-escp2.c:257 +#: src/main/print-escp2.c:259 msgid "Printing Direction" msgstr "Nyomtatás iránya" -#: src/main/print-escp2.c:257 src/main/print-escp2.c:269 +#: src/main/print-escp2.c:259 src/main/print-escp2.c:271 msgid "Advanced Output Adjustment" msgstr "Haladó kimenetvezérlés" -#: src/main/print-escp2.c:258 +#: src/main/print-escp2.c:260 msgid "Printing direction (unidirectional is higher quality, but slower)" msgstr "Nyomtatás iránya (az egyirányú jobb minÅ‘ségű, de lassabb)" -#: src/main/print-escp2.c:263 src/main/print-olympus.c:1735 +#: src/main/print-escp2.c:265 src/main/print-olympus.c:1733 msgid "Borderless" msgstr "Szegély nélküli" -#: src/main/print-escp2.c:264 src/main/print-olympus.c:1736 +#: src/main/print-escp2.c:266 src/main/print-olympus.c:1734 msgid "Print without borders" msgstr "Nyomtatás szegélyek nélkül" -#: src/main/print-escp2.c:269 +#: src/main/print-escp2.c:271 msgid "Interleave Method" msgstr "Kihagyási módszer" -#: src/main/print-escp2.c:270 +#: src/main/print-escp2.c:272 msgid "Interleave pattern to use" msgstr "A használandó kihagyásminta" -#: src/main/print-escp2.c:275 +#: src/main/print-escp2.c:277 msgid "Adjust dot size as necessary" msgstr "Hangolja szükség szerint a pontméretet" -#: src/main/print-escp2.c:276 +#: src/main/print-escp2.c:278 msgid "Adjust dot size as necessary to achieve desired density" msgstr "Hangolja szükség szerint a pontméretet a kívánt sűrűség eléréséhez" -#: src/main/print-escp2.c:281 src/main/print-escp2.c:282 +#: src/main/print-escp2.c:283 src/main/print-escp2.c:284 msgid "Output Order" msgstr "Kimeneti sorrend" -#: src/main/print-escp2.c:287 src/main/print-escp2.c:288 +#: src/main/print-escp2.c:289 src/main/print-escp2.c:290 msgid "Alignment Passes" msgstr "Igazítási lépések" -#: src/main/print-escp2.c:293 src/main/print-escp2.c:294 +#: src/main/print-escp2.c:295 src/main/print-escp2.c:296 msgid "Alignment Choices" msgstr "Igazítási lehetÅ‘ségek" -#: src/main/print-escp2.c:299 src/main/print-escp2.c:300 +#: src/main/print-escp2.c:301 src/main/print-escp2.c:302 msgid "Ink change command" msgstr "Tintacsere parancsa" -#: src/main/print-escp2.c:305 src/main/print-escp2.c:306 +#: src/main/print-escp2.c:307 src/main/print-escp2.c:308 msgid "Alternate Alignment Passes" msgstr "Alternatív igazítási lépések" -#: src/main/print-escp2.c:311 src/main/print-escp2.c:312 +#: src/main/print-escp2.c:313 src/main/print-escp2.c:314 msgid "Alternate Alignment Choices" msgstr "Alternatív igazítási lehetÅ‘ségek" -#: src/main/print-escp2.c:317 +#: src/main/print-escp2.c:319 msgid "Supports Packet Mode" msgstr "Támogatja a csomag módot" -#: src/main/print-escp2.c:318 +#: src/main/print-escp2.c:320 #, fuzzy msgid "Supports D4 Packet Mode" msgstr "Támogatja a csomag módot" -#: src/main/print-escp2.c:323 +#: src/main/print-escp2.c:325 msgid "Has Interchangeable Ink Cartridges" msgstr "" -#: src/main/print-escp2.c:324 +#: src/main/print-escp2.c:326 msgid "Has multiple choices of ink cartridges" msgstr "" -#: src/main/print-escp2.c:335 src/main/print-escp2.c:336 +#: src/main/print-escp2.c:337 src/main/print-escp2.c:338 msgid "Channel Names" msgstr "Csatornanevek" -#: src/main/print-escp2.c:348 +#: src/main/print-escp2.c:350 msgid "Raw Channel Count" msgstr "Nyers csatornaszám" -#: src/main/print-escp2.c:353 +#: src/main/print-escp2.c:355 msgid "Cyan Map" msgstr "Ciánkék-leképezés" -#: src/main/print-escp2.c:354 +#: src/main/print-escp2.c:356 msgid "Adjust the cyan map" msgstr "A ciánkék-leképezés beállítása" -#: src/main/print-escp2.c:359 +#: src/main/print-escp2.c:361 msgid "Magenta Map" msgstr "Bíborvörös-leképezés" -#: src/main/print-escp2.c:360 +#: src/main/print-escp2.c:362 msgid "Adjust the magenta map" msgstr "A bíborvörös-leképezés beállítása" -#: src/main/print-escp2.c:365 +#: src/main/print-escp2.c:367 msgid "Yellow Map" msgstr "Sárga-leképezés" -#: src/main/print-escp2.c:366 +#: src/main/print-escp2.c:368 msgid "Adjust the yellow map" msgstr "A sárga-leképezés beállítása" -#: src/main/print-escp2.c:371 +#: src/main/print-escp2.c:373 msgid "Blue Map" msgstr "Kék-leképezés" -#: src/main/print-escp2.c:372 +#: src/main/print-escp2.c:374 msgid "Adjust the blue map" msgstr "A kék-leképezés beállítása" -#: src/main/print-escp2.c:377 +#: src/main/print-escp2.c:379 msgid "Red Map" msgstr "Vörös-leképezés" -#: src/main/print-escp2.c:378 +#: src/main/print-escp2.c:380 msgid "Adjust the red map" msgstr "A vörös-leképezés beállítása" -#: src/main/print-escp2.c:471 +#: src/main/print-escp2.c:478 msgid "Red Density" msgstr "Vörös sűrűsége" -#: src/main/print-escp2.c:472 +#: src/main/print-escp2.c:479 msgid "Adjust the red density" msgstr "A vörös sűrűségének beállítása" -#: src/main/print-escp2.c:479 +#: src/main/print-escp2.c:486 msgid "Blue Density" msgstr "Kék sűrűsége" -#: src/main/print-escp2.c:480 +#: src/main/print-escp2.c:487 msgid "Adjust the blue density" msgstr "A kék sűrűségének beállítása" -#: src/main/print-escp2.c:487 +#: src/main/print-escp2.c:494 msgid "Gloss Level" msgstr "Fényesség szintje" -#: src/main/print-escp2.c:488 +#: src/main/print-escp2.c:495 msgid "Adjust the gloss level" msgstr "A fényesség szintjének beállítása" -#: src/main/print-escp2.c:511 src/main/print-escp2.c:512 +#: src/main/print-escp2.c:502 +msgid "Drop Size Small" +msgstr "" + +#: src/main/print-escp2.c:503 +#, fuzzy +msgid "Drop Size 1 (small)" +msgstr "CD méret (egyéni)" + +#: src/main/print-escp2.c:510 +msgid "Drop Size Medium" +msgstr "" + +#: src/main/print-escp2.c:511 +#, fuzzy +msgid "Drop Size 2 (medium)" +msgstr "CD méret (egyéni)" + +#: src/main/print-escp2.c:518 +msgid "Drop Size Large" +msgstr "" + +#: src/main/print-escp2.c:519 +msgid "Drop Size 3 (large)" +msgstr "" + +#: src/main/print-escp2.c:526 src/main/print-escp2.c:527 +#, fuzzy +msgid "Light Cyan Value" +msgstr "Világos ciánkék" + +#: src/main/print-escp2.c:542 src/main/print-escp2.c:543 +#, fuzzy +msgid "Light Cyan Density Scale" +msgstr "Ciánkék sűrűsége" + +#: src/main/print-escp2.c:550 src/main/print-escp2.c:551 +#, fuzzy +msgid "Light Magenta Value" +msgstr "Világos bíborvörös" + +#: src/main/print-escp2.c:558 src/main/print-escp2.c:559 +#, fuzzy +msgid "Light Magenta Density Scale" +msgstr "Bíborvörös sűrűsége" + +#: src/main/print-escp2.c:574 src/main/print-escp2.c:575 +#, fuzzy +msgid "Dark Yellow Value" +msgstr "Sötétsárga" + +#: src/main/print-escp2.c:582 src/main/print-escp2.c:583 msgid "Dark Yellow Transition" msgstr "Sötétsárga átmenet" -#: src/main/print-escp2.c:519 src/main/print-escp2.c:520 -#: src/main/print-escp2.c:527 src/main/print-escp2.c:528 +#: src/main/print-escp2.c:590 src/main/print-escp2.c:591 +#, fuzzy +msgid "Dark Yellow Density Scale" +msgstr "Sárga sűrűsége" + +#: src/main/print-escp2.c:598 src/main/print-escp2.c:599 +#: src/main/print-escp2.c:622 src/main/print-escp2.c:623 +#, fuzzy +msgid "Gray Value" +msgstr "Szürkeárnyalatos" + +#: src/main/print-escp2.c:606 src/main/print-escp2.c:607 +#: src/main/print-escp2.c:630 src/main/print-escp2.c:631 msgid "Gray Transition" msgstr "Szürkeátmenet" -#: src/main/print-escp2.c:535 src/main/print-escp2.c:536 -#: src/main/print-escp2.c:559 src/main/print-escp2.c:560 +#: src/main/print-escp2.c:614 src/main/print-escp2.c:615 +#: src/main/print-escp2.c:638 src/main/print-escp2.c:639 +#, fuzzy +msgid "Gray Density Scale" +msgstr "Szürkeárnyalatos" + +#: src/main/print-escp2.c:646 src/main/print-escp2.c:647 +#: src/main/print-escp2.c:718 src/main/print-escp2.c:719 +#, fuzzy +msgid "Light Gray Value" +msgstr "Világosszürke-átmenet" + +#: src/main/print-escp2.c:654 src/main/print-escp2.c:655 +#: src/main/print-escp2.c:726 src/main/print-escp2.c:727 msgid "Light Gray Transition" msgstr "Világosszürke-átmenet" -#: src/main/print-escp2.c:543 src/main/print-escp2.c:544 +#: src/main/print-escp2.c:662 src/main/print-escp2.c:663 +#: src/main/print-escp2.c:734 src/main/print-escp2.c:735 +#, fuzzy +msgid "Light Gray Density Scale" +msgstr "Világosszürke-átmenet" + +#: src/main/print-escp2.c:670 src/main/print-escp2.c:671 +#, fuzzy +msgid "Dark Gray Value" +msgstr "Sötétszürke-átmenet" + +#: src/main/print-escp2.c:678 src/main/print-escp2.c:679 msgid "Dark Gray Transition" msgstr "Sötétszürke-átmenet" -#: src/main/print-escp2.c:551 +#: src/main/print-escp2.c:686 src/main/print-escp2.c:687 +#, fuzzy +msgid "Dark Gray Density Scale" +msgstr "Sötétszürke-átmenet" + +#: src/main/print-escp2.c:694 +#, fuzzy +msgid "Mid Gray Value" +msgstr "Szürkeárnyalatos" + +#: src/main/print-escp2.c:695 +#, fuzzy +msgid "Medium Gray Value" +msgstr "Közepesszürke-átmenet" + +#: src/main/print-escp2.c:702 msgid "Mid Gray Transition" msgstr "KözépsÅ‘szürke-átmenet" -#: src/main/print-escp2.c:552 +#: src/main/print-escp2.c:703 msgid "Medium Gray Transition" msgstr "Közepesszürke-átmenet" -#: src/main/print-escp2.c:1635 +#: src/main/print-escp2.c:710 +#, fuzzy +msgid "Mid Gray Density Scale" +msgstr "KözépsÅ‘szürke-átmenet" + +#: src/main/print-escp2.c:711 +#, fuzzy +msgid "Medium Gray Density Scale" +msgstr "Közepesszürke-átmenet" + +#: src/main/print-escp2.c:1999 msgid "Full Manual Control" msgstr "Teljesen kézi vezérlés" -#: src/main/print-escp2.c:1637 +#: src/main/print-escp2.c:2001 msgid "Automatic Setting Control" msgstr "Automatikus beállításvezérlés" -#: src/main/print-escp2.c:1732 src/main/generic-options.c:213 +#: src/main/print-escp2.c:2096 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:1771 src/main/print-escp2.c:1863 -#: src/main/print-escp2.c:1875 src/main/print-pcl.c:230 -#: src/main/escp2-channels.c:2805 src/main/escp2-papers.c:1707 -#: src/main/escp2-papers.c:1731 src/main/escp2-papers.c:1764 -#: src/main/escp2-papers.c:1815 src/main/escp2-papers.c:1857 -#: src/main/escp2-papers.c:1899 src/main/escp2-papers.c:1992 -#: src/main/escp2-resolutions.c:640 src/main/escp2-resolutions.c:655 -#: src/main/escp2-resolutions.c:668 src/main/generic-options.c:36 -#: src/gutenprintui/panel.c:2613 src/gutenprintui2/panel.c:2639 +#: src/main/print-escp2.c:2139 src/main/print-escp2.c:2231 +#: src/main/print-escp2.c:2243 src/main/print-pcl.c:237 +#: src/main/escp2-channels.c:2827 src/main/escp2-channels.c:2836 +#: src/main/escp2-papers.c:1718 src/main/escp2-papers.c:1742 +#: src/main/escp2-papers.c:1775 src/main/escp2-papers.c:1826 +#: src/main/escp2-papers.c:1868 src/main/escp2-papers.c:1910 +#: src/main/escp2-papers.c:2003 src/main/escp2-resolutions.c:640 +#: src/main/escp2-resolutions.c:655 src/main/escp2-resolutions.c:670 +#: src/main/escp2-resolutions.c:683 src/main/generic-options.c:36 +#: src/gutenprintui2/panel.c:2814 msgid "Standard" msgstr "Szabványos" -#: src/main/print-escp2.c:1842 +#: src/main/print-escp2.c:2210 msgid "Automatic" msgstr "Automatikus" -#: src/main/print-escp2.c:1844 +#: src/main/print-escp2.c:2212 msgid "Bidirectional" msgstr "Kétirányú" -#: src/main/print-escp2.c:1846 +#: src/main/print-escp2.c:2214 msgid "Unidirectional" msgstr "Egyirányú" -#: src/main/print-escp2.c:1877 +#: src/main/print-escp2.c:2245 msgid "Alternate Fill" msgstr "Alternatív kitöltés" -#: src/main/print-escp2.c:1879 +#: src/main/print-escp2.c:2247 msgid "Ascending Fill" msgstr "NövekvÅ‘ kitöltés" -#: src/main/print-escp2.c:1881 +#: src/main/print-escp2.c:2249 msgid "Descending Fill" msgstr "CsökkenÅ‘ kitöltés" -#: src/main/print-escp2.c:1883 +#: src/main/print-escp2.c:2251 msgid "Ascending Double" msgstr "NövekvÅ‘ dupla" -#: src/main/print-escp2.c:1885 +#: src/main/print-escp2.c:2253 msgid "Nearest Neighbor Avoidance" msgstr "Legközelebbi szomszéd elkerülése" -#: src/main/print-escp2.c:2328 +#: src/main/print-escp2.c:2771 #, 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:3436 src/main/print-olympus.c:2451 +#: src/main/print-escp2.c:3934 src/main/print-olympus.c:2449 #: 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" @@ -1356,109 +1493,109 @@ msgid "Three Color Composite" msgstr "Háromszínű kompozit" #: src/main/print-lexmark.c:607 src/main/print-lexmark.c:677 -#: src/main/escp2-channels.c:1540 src/main/escp2-channels.c:1554 -#: src/main/escp2-channels.c:1568 src/main/escp2-channels.c:1582 -#: src/main/escp2-channels.c:1808 src/main/escp2-channels.c:1823 -#: src/main/escp2-channels.c:1838 src/main/escp2-channels.c:1855 +#: src/main/escp2-channels.c:1554 src/main/escp2-channels.c:1568 +#: src/main/escp2-channels.c:1582 src/main/escp2-channels.c:1596 +#: src/main/escp2-channels.c:1822 src/main/escp2-channels.c:1837 +#: src/main/escp2-channels.c:1852 src/main/escp2-channels.c:1869 msgid "Six Color Photo" msgstr "Hatszínes fénykép" #: src/main/print-lexmark.c:610 src/main/print-lexmark.c:680 -#: src/main/escp2-channels.c:1475 src/main/escp2-channels.c:1489 -#: src/main/escp2-channels.c:1503 src/main/escp2-channels.c:1517 -#: src/main/escp2-channels.c:1752 src/main/escp2-channels.c:1767 -#: src/main/escp2-channels.c:1784 +#: src/main/escp2-channels.c:1489 src/main/escp2-channels.c:1503 +#: src/main/escp2-channels.c:1517 src/main/escp2-channels.c:1531 +#: src/main/escp2-channels.c:1766 src/main/escp2-channels.c:1781 +#: src/main/escp2-channels.c:1798 msgid "Five Color Photo Composite" msgstr "Ötszínes fénykép (kompozit)" -#: src/main/print-lexmark.c:856 src/main/escp2-papers.c:1341 -#: src/main/escp2-papers.c:1385 src/main/escp2-papers.c:1429 -#: src/main/escp2-papers.c:1477 src/main/escp2-papers.c:1525 -#: src/main/escp2-papers.c:1569 +#: src/main/print-lexmark.c:856 src/main/escp2-papers.c:1351 +#: src/main/escp2-papers.c:1395 src/main/escp2-papers.c:1439 +#: src/main/escp2-papers.c:1487 src/main/escp2-papers.c:1535 +#: src/main/escp2-papers.c:1579 msgid "Plain Paper" msgstr "Egyszerű lap" -#: src/main/print-lexmark.c:860 src/main/escp2-papers.c:1347 -#: src/main/escp2-papers.c:1391 src/main/escp2-papers.c:1435 -#: src/main/escp2-papers.c:1483 src/main/escp2-papers.c:1531 -#: src/main/escp2-papers.c:1575 +#: src/main/print-lexmark.c:860 src/main/escp2-papers.c:1357 +#: src/main/escp2-papers.c:1401 src/main/escp2-papers.c:1445 +#: src/main/escp2-papers.c:1493 src/main/escp2-papers.c:1541 +#: src/main/escp2-papers.c:1585 msgid "Glossy Film" msgstr "Fényes film" -#: src/main/print-lexmark.c:864 src/main/escp2-papers.c:1349 -#: src/main/escp2-papers.c:1393 src/main/escp2-papers.c:1437 -#: src/main/escp2-papers.c:1485 src/main/escp2-papers.c:1533 -#: src/main/escp2-papers.c:1577 +#: src/main/print-lexmark.c:864 src/main/escp2-papers.c:1359 +#: src/main/escp2-papers.c:1403 src/main/escp2-papers.c:1447 +#: src/main/escp2-papers.c:1495 src/main/escp2-papers.c:1543 +#: src/main/escp2-papers.c:1587 msgid "Transparencies" msgstr "Ãtlátszóságok" -#: src/main/print-lexmark.c:868 src/main/escp2-papers.c:1351 -#: src/main/escp2-papers.c:1395 src/main/escp2-papers.c:1439 -#: src/main/escp2-papers.c:1487 src/main/escp2-papers.c:1535 -#: src/main/escp2-papers.c:1579 +#: src/main/print-lexmark.c:868 src/main/escp2-papers.c:1361 +#: src/main/escp2-papers.c:1405 src/main/escp2-papers.c:1449 +#: src/main/escp2-papers.c:1497 src/main/escp2-papers.c:1545 +#: src/main/escp2-papers.c:1589 msgid "Envelopes" msgstr "Borítékok" -#: src/main/print-lexmark.c:872 src/main/escp2-papers.c:1355 -#: src/main/escp2-papers.c:1399 src/main/escp2-papers.c:1443 -#: src/main/escp2-papers.c:1491 src/main/escp2-papers.c:1539 -#: src/main/escp2-papers.c:1583 +#: src/main/print-lexmark.c:872 src/main/escp2-papers.c:1365 +#: src/main/escp2-papers.c:1409 src/main/escp2-papers.c:1453 +#: src/main/escp2-papers.c:1501 src/main/escp2-papers.c:1549 +#: src/main/escp2-papers.c:1593 msgid "Matte Paper" msgstr "Matt papír" -#: src/main/print-lexmark.c:876 src/main/escp2-papers.c:1359 -#: src/main/escp2-papers.c:1403 src/main/escp2-papers.c:1447 -#: src/main/escp2-papers.c:1495 src/main/escp2-papers.c:1543 -#: src/main/escp2-papers.c:1587 +#: src/main/print-lexmark.c:876 src/main/escp2-papers.c:1369 +#: src/main/escp2-papers.c:1413 src/main/escp2-papers.c:1457 +#: src/main/escp2-papers.c:1505 src/main/escp2-papers.c:1553 +#: src/main/escp2-papers.c:1597 msgid "Inkjet Paper" msgstr "Inkjet papír" -#: src/main/print-lexmark.c:880 src/main/escp2-papers.c:1361 -#: src/main/escp2-papers.c:1405 src/main/escp2-papers.c:1449 -#: src/main/escp2-papers.c:1497 src/main/escp2-papers.c:1545 -#: src/main/escp2-papers.c:1589 +#: src/main/print-lexmark.c:880 src/main/escp2-papers.c:1371 +#: src/main/escp2-papers.c:1415 src/main/escp2-papers.c:1459 +#: src/main/escp2-papers.c:1507 src/main/escp2-papers.c:1555 +#: src/main/escp2-papers.c:1599 msgid "Photo Quality Inkjet Paper" msgstr "Fotó minÅ‘ségű Inkjet papír" -#: src/main/print-lexmark.c:884 src/main/escp2-papers.c:1363 -#: src/main/escp2-papers.c:1407 src/main/escp2-papers.c:1451 -#: src/main/escp2-papers.c:1499 src/main/escp2-papers.c:1547 -#: src/main/escp2-papers.c:1591 +#: src/main/print-lexmark.c:884 src/main/escp2-papers.c:1373 +#: src/main/escp2-papers.c:1417 src/main/escp2-papers.c:1461 +#: src/main/escp2-papers.c:1509 src/main/escp2-papers.c:1557 +#: src/main/escp2-papers.c:1601 msgid "Photo Paper" msgstr "Fotópapír" -#: src/main/print-lexmark.c:888 src/main/escp2-papers.c:1365 -#: src/main/escp2-papers.c:1409 src/main/escp2-papers.c:1453 -#: src/main/escp2-papers.c:1501 src/main/escp2-papers.c:1549 -#: src/main/escp2-papers.c:1593 src/main/escp2-papers.c:1617 +#: src/main/print-lexmark.c:888 src/main/escp2-papers.c:1375 +#: src/main/escp2-papers.c:1419 src/main/escp2-papers.c:1463 +#: src/main/escp2-papers.c:1511 src/main/escp2-papers.c:1559 +#: src/main/escp2-papers.c:1603 src/main/escp2-papers.c:1627 msgid "Premium Glossy Photo Paper" msgstr "Kiváló minÅ‘ségű fényes fotópapír" -#: src/main/print-lexmark.c:892 src/main/escp2-papers.c:1369 -#: src/main/escp2-papers.c:1413 src/main/escp2-papers.c:1457 -#: src/main/escp2-papers.c:1505 src/main/escp2-papers.c:1553 -#: src/main/escp2-papers.c:1597 +#: src/main/print-lexmark.c:892 src/main/escp2-papers.c:1379 +#: src/main/escp2-papers.c:1423 src/main/escp2-papers.c:1467 +#: src/main/escp2-papers.c:1515 src/main/escp2-papers.c:1563 +#: src/main/escp2-papers.c:1607 msgid "Premium Luster Photo Paper" msgstr "Premium Luster fotópapír" -#: src/main/print-lexmark.c:896 src/main/escp2-papers.c:1371 -#: src/main/escp2-papers.c:1415 src/main/escp2-papers.c:1463 -#: src/main/escp2-papers.c:1511 src/main/escp2-papers.c:1555 -#: src/main/escp2-papers.c:1603 +#: src/main/print-lexmark.c:896 src/main/escp2-papers.c:1381 +#: src/main/escp2-papers.c:1425 src/main/escp2-papers.c:1473 +#: src/main/escp2-papers.c:1521 src/main/escp2-papers.c:1565 +#: src/main/escp2-papers.c:1613 msgid "Photo Quality Glossy Paper" msgstr "Fotó minÅ‘ségű fényes papír" -#: src/main/print-lexmark.c:900 src/main/escp2-papers.c:1373 -#: src/main/escp2-papers.c:1417 src/main/escp2-papers.c:1465 -#: src/main/escp2-papers.c:1513 src/main/escp2-papers.c:1557 -#: src/main/escp2-papers.c:1605 +#: src/main/print-lexmark.c:900 src/main/escp2-papers.c:1383 +#: src/main/escp2-papers.c:1427 src/main/escp2-papers.c:1475 +#: src/main/escp2-papers.c:1523 src/main/escp2-papers.c:1567 +#: src/main/escp2-papers.c:1615 msgid "Ilford Heavy Paper" msgstr "Ilford-féle nehéz papír" -#: src/main/print-lexmark.c:904 src/main/escp2-papers.c:1377 -#: src/main/escp2-papers.c:1421 src/main/escp2-papers.c:1469 -#: src/main/escp2-papers.c:1517 src/main/escp2-papers.c:1561 -#: src/main/escp2-papers.c:1609 src/main/escp2-papers.c:1619 +#: src/main/print-lexmark.c:904 src/main/escp2-papers.c:1387 +#: src/main/escp2-papers.c:1431 src/main/escp2-papers.c:1479 +#: src/main/escp2-papers.c:1527 src/main/escp2-papers.c:1571 +#: src/main/escp2-papers.c:1619 src/main/escp2-papers.c:1629 msgid "Other" msgstr "Egyéb" @@ -1474,50 +1611,50 @@ msgstr "Kézzel szünetekkel" msgid "Manual without Pause" msgstr "Kézzel szünetek nélkül" -#: src/main/print-olympus.c:277 +#: src/main/print-olympus.c:275 msgid "Coated" msgstr "Bevont" -#: src/main/print-olympus.c:278 src/cups/genppd.c:1726 src/cups/genppd.c:1753 -#: src/cups/genppd.c:1834 +#: src/main/print-olympus.c:276 src/cups/genppd.c:1732 src/cups/genppd.c:1759 +#: src/cups/genppd.c:1840 msgid "None" msgstr "Nincs" -#: src/main/print-olympus.c:963 src/main/print-olympus.c:1023 -#: src/main/print-olympus.c:1127 +#: src/main/print-olympus.c:961 src/main/print-olympus.c:1021 +#: src/main/print-olympus.c:1125 msgid "Glossy" msgstr "Fényes" -#: src/main/print-olympus.c:964 src/main/print-olympus.c:1024 -#: src/main/print-olympus.c:1128 +#: src/main/print-olympus.c:962 src/main/print-olympus.c:1022 +#: src/main/print-olympus.c:1126 msgid "Texture" msgstr "Textúra" -#: src/main/print-olympus.c:1025 src/main/print-olympus.c:1129 +#: src/main/print-olympus.c:1023 src/main/print-olympus.c:1127 msgid "Matte" msgstr "Matt" -#: src/main/print-olympus.c:1729 src/main/print-olympus.c:1730 +#: src/main/print-olympus.c:1727 src/main/print-olympus.c:1728 msgid "Laminate Pattern" msgstr "Laminált minta" -#: src/main/print-olympus.c:1765 +#: src/main/print-olympus.c:1763 msgid "Adjust the cyan balance" msgstr "A ciánkék-egyensúly beállítása" -#: src/main/print-olympus.c:1773 +#: src/main/print-olympus.c:1771 msgid "Adjust the magenta balance" msgstr "A bíborvörös-egyensúly beállítása" -#: src/main/print-olympus.c:1781 +#: src/main/print-olympus.c:1779 msgid "Adjust the yellow balance" msgstr "A sárgaegyensúly beállítása" -#: src/main/print-olympus.c:1788 +#: src/main/print-olympus.c:1786 msgid "Black Balance" msgstr "Feketeegyensúly" -#: src/main/print-olympus.c:1789 +#: src/main/print-olympus.c:1787 msgid "Adjust the black balance" msgstr "A feketeegyensúly beállítása" @@ -1549,91 +1686,115 @@ msgstr "Gyorsan száradó fénykép" msgid "Quick-dry Transparency" msgstr "Gyorsan száradó fólia" -#: src/main/print-pcl.c:231 src/main/xmli18n-tmp.h:16 +#: src/main/print-pcl.c:238 src/main/xmli18n-tmp.h:17 msgid "Manual" msgstr "Kézi" -#: src/main/print-pcl.c:233 +#: src/main/print-pcl.c:240 +msgid "Tray 1 - Movable Guides" +msgstr "" + +#: src/main/print-pcl.c:241 msgid "Tray 1" msgstr "1. tálca" -#: src/main/print-pcl.c:234 src/main/print-pcl.c:240 +#: src/main/print-pcl.c:242 +msgid "Tray 2 - Movable Guides" +msgstr "" + +#: src/main/print-pcl.c:243 src/main/print-pcl.c:251 msgid "Tray 2" msgstr "2. tálca" -#: src/main/print-pcl.c:235 +#: src/main/print-pcl.c:244 +msgid "Tray 3 - Movable Guides" +msgstr "" + +#: src/main/print-pcl.c:245 msgid "Tray 3" msgstr "3. tálca" -#: src/main/print-pcl.c:236 +#: src/main/print-pcl.c:246 +msgid "Tray 4 - Movable Guides" +msgstr "" + +#: src/main/print-pcl.c:247 msgid "Tray 4" msgstr "4. tálca" -#: src/main/print-pcl.c:237 +#: src/main/print-pcl.c:248 msgid "Portable Sheet Feeder" msgstr "Hordozható lapadagoló" -#: src/main/print-pcl.c:238 +#: src/main/print-pcl.c:249 msgid "Desktop Sheet Feeder" msgstr "Asztali lapadagoló" -#: src/main/print-pcl.c:239 +#: src/main/print-pcl.c:250 msgid "Tray" msgstr "Tálca" -#: src/main/print-pcl.c:241 +#: src/main/print-pcl.c:252 msgid "Optional Source" msgstr "Opcionális forrás" -#: src/main/print-pcl.c:242 +#: src/main/print-pcl.c:253 msgid "Autoselect" msgstr "Automatikus választás" -#: src/main/print-pcl.c:256 +#: src/main/print-pcl.c:267 msgid "150x150 DPI" msgstr "150x150 DPI" -#: src/main/print-pcl.c:257 +#: src/main/print-pcl.c:268 msgid "300x300 DPI" msgstr "300x300 DPI" -#: src/main/print-pcl.c:258 +#: src/main/print-pcl.c:269 msgid "600x300 DPI" msgstr "600x300 DPI" -#: src/main/print-pcl.c:259 +#: src/main/print-pcl.c:270 msgid "600x600 DPI monochrome" msgstr "600x600 DPI fekete-fehér" -#: src/main/print-pcl.c:260 +#: src/main/print-pcl.c:271 msgid "600x600 DPI" msgstr "600x600 DPI" -#: src/main/print-pcl.c:261 +#: src/main/print-pcl.c:272 msgid "1200x600 DPI" msgstr "1200x600 DPI" -#: src/main/print-pcl.c:262 +#: src/main/print-pcl.c:273 msgid "2400x600 DPI" msgstr "2400x600 DPI" -#: src/main/print-pcl.c:1470 +#: src/main/print-pcl.c:1538 msgid "Color + Black Cartridges" msgstr "Színes + fekete patron" -#: src/main/print-pcl.c:1471 +#: src/main/print-pcl.c:1539 msgid "Color + Photo Cartridges" msgstr "Színes + fotó patronok" -#: src/main/print-ps.c:97 +#: src/main/print-ps.c:68 msgid "PPDFile" msgstr "PPD fájl" -#: src/main/print-ps.c:98 src/gutenprintui/panel.c:1768 -#: src/gutenprintui2/panel.c:1768 +#: src/main/print-ps.c:69 src/gutenprintui2/panel.c:1943 msgid "PPD File" msgstr "PPD fájl" +#: src/main/print-ps.c:74 +#, fuzzy +msgid "Model Name" +msgstr "Csatornanevek" + +#: src/main/print-ps.c:75 +msgid "PPD File Model Name" +msgstr "" + #: src/main/print-raw.c:223 msgid "Image dimensions must match paper dimensions" msgstr "A kép méretének meg kell felelnie a papír méretének" @@ -1649,259 +1810,265 @@ msgstr "Háromszintű szürkeárnyalatos" #: src/main/escp2-channels.c:1035 src/main/escp2-channels.c:1048 #: src/main/escp2-channels.c:1061 src/main/escp2-channels.c:1074 #: src/main/escp2-channels.c:1087 src/main/escp2-channels.c:1100 -#: src/main/escp2-channels.c:2505 src/main/escp2-channels.c:2528 -#: src/main/escp2-channels.c:2548 src/main/escp2-channels.c:2568 -#: src/main/escp2-channels.c:2588 src/main/escp2-channels.c:2608 +#: src/main/escp2-channels.c:2525 src/main/escp2-channels.c:2548 +#: src/main/escp2-channels.c:2568 src/main/escp2-channels.c:2588 +#: src/main/escp2-channels.c:2608 src/main/escp2-channels.c:2628 msgid "Quadtone" msgstr "Quadtone" -#: src/main/escp2-channels.c:1604 src/main/escp2-channels.c:1618 +#: src/main/escp2-channels.c:1466 +#, fuzzy +msgid "Four Color Photo" +msgstr "Hatszínes fénykép" + +#: src/main/escp2-channels.c:1618 src/main/escp2-channels.c:1632 msgid "Six Color Enhanced Composite" msgstr "Hatszínes (továbbfejlesztett, kompozit)" -#: src/main/escp2-channels.c:1641 src/main/escp2-channels.c:1655 -#: src/main/escp2-channels.c:1669 src/main/escp2-channels.c:1705 +#: src/main/escp2-channels.c:1655 src/main/escp2-channels.c:1669 +#: src/main/escp2-channels.c:1683 src/main/escp2-channels.c:1719 msgid "Seven Color Photo" msgstr "Hétszínes fénykép" -#: src/main/escp2-channels.c:1691 +#: src/main/escp2-channels.c:1705 msgid "Seven Color Enhanced" msgstr "Hétszínes (továbbfejlesztett)" -#: src/main/escp2-channels.c:1728 +#: src/main/escp2-channels.c:1742 msgid "Eight Color Photo" msgstr "Nyolcszínes fénykép" -#: src/main/escp2-channels.c:1876 src/main/escp2-channels.c:1888 -#: src/main/escp2-channels.c:1894 +#: src/main/escp2-channels.c:1890 src/main/escp2-channels.c:1902 +#: src/main/escp2-channels.c:1908 msgid "One Color Raw" msgstr "Egyszínű nyers" -#: src/main/escp2-channels.c:1900 +#: src/main/escp2-channels.c:1914 msgid "One Color Raw Enhanced Gloss" msgstr "Egyszínű nyers (továbbfejlesztett fényesség)" -#: src/main/escp2-channels.c:1913 src/main/escp2-channels.c:1925 +#: src/main/escp2-channels.c:1927 src/main/escp2-channels.c:1939 msgid "Two Color Raw" msgstr "Kétszínű nyers" -#: src/main/escp2-channels.c:1939 src/main/escp2-channels.c:1953 -#: src/main/escp2-channels.c:1980 src/main/escp2-channels.c:1993 -#: src/main/escp2-channels.c:2006 src/main/escp2-channels.c:2019 -#: src/main/escp2-channels.c:2033 src/main/escp2-channels.c:2047 -#: src/main/escp2-channels.c:2060 +#: src/main/escp2-channels.c:1953 src/main/escp2-channels.c:1967 +#: src/main/escp2-channels.c:1994 src/main/escp2-channels.c:2007 +#: src/main/escp2-channels.c:2020 src/main/escp2-channels.c:2033 +#: src/main/escp2-channels.c:2047 src/main/escp2-channels.c:2061 +#: src/main/escp2-channels.c:2074 msgid "Three Color Raw" msgstr "Háromszínű nyers" -#: src/main/escp2-channels.c:1967 +#: src/main/escp2-channels.c:1981 msgid "Three Color Raw Gloss" msgstr "Háromszínű nyers fényes" -#: src/main/escp2-channels.c:2067 src/main/escp2-channels.c:2073 -#: src/main/escp2-channels.c:2079 src/main/escp2-channels.c:2085 -#: src/main/escp2-channels.c:2091 src/main/escp2-channels.c:2097 -#: src/main/escp2-channels.c:2103 src/main/escp2-channels.c:2109 -#: src/main/escp2-channels.c:2115 src/main/escp2-channels.c:2121 +#: src/main/escp2-channels.c:2081 src/main/escp2-channels.c:2087 +#: src/main/escp2-channels.c:2093 src/main/escp2-channels.c:2099 +#: src/main/escp2-channels.c:2105 src/main/escp2-channels.c:2111 +#: src/main/escp2-channels.c:2117 src/main/escp2-channels.c:2123 +#: src/main/escp2-channels.c:2129 src/main/escp2-channels.c:2135 +#: src/main/escp2-channels.c:2141 msgid "Four Color Raw" msgstr "Négyszínű nyers" -#: src/main/escp2-channels.c:2127 +#: src/main/escp2-channels.c:2147 msgid "Four Color Raw Gloss" msgstr "Négyszínű nyers fényes" -#: src/main/escp2-channels.c:2142 src/main/escp2-channels.c:2156 +#: src/main/escp2-channels.c:2162 src/main/escp2-channels.c:2176 msgid "Five Color Raw" msgstr "Ötszínes nyers" -#: src/main/escp2-channels.c:2170 src/main/escp2-channels.c:2186 -#: src/main/escp2-channels.c:2192 src/main/escp2-channels.c:2198 -#: src/main/escp2-channels.c:2213 src/main/escp2-channels.c:2234 +#: src/main/escp2-channels.c:2190 src/main/escp2-channels.c:2206 +#: src/main/escp2-channels.c:2212 src/main/escp2-channels.c:2218 +#: src/main/escp2-channels.c:2233 src/main/escp2-channels.c:2254 msgid "Six Color Raw" msgstr "Hatszínes nyers" -#: src/main/escp2-channels.c:2219 +#: src/main/escp2-channels.c:2239 msgid "Six Color Enhanced Gloss Raw" msgstr "Hatszínes továbbfejlesztett, fényes nyers" -#: src/main/escp2-channels.c:2250 src/main/escp2-channels.c:2265 -#: src/main/escp2-channels.c:2280 +#: src/main/escp2-channels.c:2270 src/main/escp2-channels.c:2285 +#: src/main/escp2-channels.c:2300 msgid "Seven Color Raw" msgstr "Hétszínes nyers" -#: src/main/escp2-channels.c:2297 +#: src/main/escp2-channels.c:2317 msgid "Seven Color Enhanced Gloss Raw" msgstr "Hétszínes továbbfejlesztett, fényes nyers" -#: src/main/escp2-channels.c:2315 +#: src/main/escp2-channels.c:2335 msgid "Eight Color Raw" msgstr "Nyolcszínes nyers" -#: src/main/escp2-channels.c:2482 src/main/escp2-channels.c:2495 -#: src/main/escp2-channels.c:2497 src/main/escp2-channels.c:2517 -#: src/main/escp2-channels.c:2520 src/main/escp2-channels.c:2540 -#: src/main/escp2-channels.c:2560 src/main/escp2-channels.c:2580 -#: src/main/escp2-channels.c:2600 src/main/escp2-channels.c:2620 -#: src/main/escp2-channels.c:2636 src/main/escp2-channels.c:2638 -#: src/main/escp2-channels.c:2640 src/main/escp2-channels.c:2642 -#: src/main/escp2-channels.c:2658 src/main/escp2-channels.c:2674 -#: src/main/escp2-channels.c:2694 +#: src/main/escp2-channels.c:2502 src/main/escp2-channels.c:2515 +#: src/main/escp2-channels.c:2517 src/main/escp2-channels.c:2537 +#: src/main/escp2-channels.c:2540 src/main/escp2-channels.c:2560 +#: src/main/escp2-channels.c:2580 src/main/escp2-channels.c:2600 +#: src/main/escp2-channels.c:2620 src/main/escp2-channels.c:2640 +#: src/main/escp2-channels.c:2656 src/main/escp2-channels.c:2658 +#: src/main/escp2-channels.c:2660 src/main/escp2-channels.c:2662 +#: src/main/escp2-channels.c:2678 src/main/escp2-channels.c:2694 +#: src/main/escp2-channels.c:2714 msgid "EPSON Standard Inks" msgstr "Epson szabvány tinták" -#: src/main/escp2-channels.c:2714 src/main/escp2-channels.c:2739 +#: src/main/escp2-channels.c:2734 src/main/escp2-channels.c:2759 msgid "UltraChrome Photo Black" msgstr "UltraChrome fotó fekete" -#: src/main/escp2-channels.c:2718 src/main/escp2-channels.c:2743 +#: src/main/escp2-channels.c:2738 src/main/escp2-channels.c:2763 msgid "UltraChrome Matte Black" msgstr "UltraChrome matt fekete" -#: src/main/escp2-channels.c:2758 src/main/escp2-channels.c:2796 -#: src/main/escp2-channels.c:3167 src/escputil/escputil.c:976 +#: src/main/escp2-channels.c:2778 src/main/escp2-channels.c:2816 +#: src/main/escp2-channels.c:3206 src/escputil/escputil.c:976 msgid "Photo Black" msgstr "Fotófekete" -#: src/main/escp2-channels.c:2762 src/main/escp2-channels.c:2778 -#: src/main/escp2-channels.c:3166 src/escputil/escputil.c:986 +#: src/main/escp2-channels.c:2782 src/main/escp2-channels.c:2798 +#: src/main/escp2-channels.c:3205 src/escputil/escputil.c:986 msgid "Matte Black" msgstr "Matt fekete" -#: src/main/escp2-channels.c:3092 src/main/escp2-channels.c:3102 -#: src/main/escp2-channels.c:3114 src/main/escp2-channels.c:3128 -#: src/main/escp2-channels.c:3141 src/main/escp2-channels.c:3154 -#: src/main/escp2-channels.c:3191 src/escputil/escputil.c:981 +#: src/main/escp2-channels.c:3131 src/main/escp2-channels.c:3141 +#: src/main/escp2-channels.c:3153 src/main/escp2-channels.c:3167 +#: src/main/escp2-channels.c:3180 src/main/escp2-channels.c:3193 +#: src/main/escp2-channels.c:3240 src/escputil/escputil.c:981 #: src/escputil/escputil.c:1204 msgid "Light Cyan" msgstr "Világos ciánkék" -#: src/main/escp2-channels.c:3093 src/main/escp2-channels.c:3104 -#: src/main/escp2-channels.c:3115 src/main/escp2-channels.c:3129 -#: src/main/escp2-channels.c:3142 src/main/escp2-channels.c:3155 -#: src/main/escp2-channels.c:3190 src/escputil/escputil.c:982 +#: src/main/escp2-channels.c:3132 src/main/escp2-channels.c:3143 +#: src/main/escp2-channels.c:3154 src/main/escp2-channels.c:3168 +#: src/main/escp2-channels.c:3181 src/main/escp2-channels.c:3194 +#: src/main/escp2-channels.c:3239 src/escputil/escputil.c:982 #: src/escputil/escputil.c:1205 msgid "Light Magenta" msgstr "Világos bíborvörös" -#: src/main/escp2-channels.c:3130 src/main/escp2-channels.c:3192 +#: src/main/escp2-channels.c:3169 src/main/escp2-channels.c:3241 #: src/escputil/escputil.c:985 msgid "Light Black" msgstr "Világos fekete" -#: src/main/escp2-channels.c:3143 +#: src/main/escp2-channels.c:3182 msgid "Dark Yellow" msgstr "Sötétsárga" -#: src/main/escp2-channels.c:3170 src/escputil/escputil.c:989 +#: src/main/escp2-channels.c:3209 src/escputil/escputil.c:989 msgid "Gloss Optimizer" msgstr "Fényességoptimalizáló" -#: src/main/escp2-channels.c:3189 src/escputil/escputil.c:990 +#: src/main/escp2-channels.c:3238 src/escputil/escputil.c:990 msgid "Light Light Black" msgstr "Világosszürke" -#: src/main/escp2-papers.c:1343 src/main/escp2-papers.c:1387 -#: src/main/escp2-papers.c:1431 src/main/escp2-papers.c:1479 -#: src/main/escp2-papers.c:1527 src/main/escp2-papers.c:1571 +#: src/main/escp2-papers.c:1353 src/main/escp2-papers.c:1397 +#: src/main/escp2-papers.c:1441 src/main/escp2-papers.c:1489 +#: src/main/escp2-papers.c:1537 src/main/escp2-papers.c:1581 msgid "Plain Paper Fast Load" msgstr "Egyszerű papír, gyors betöltéssel" -#: src/main/escp2-papers.c:1345 src/main/escp2-papers.c:1389 -#: src/main/escp2-papers.c:1433 src/main/escp2-papers.c:1481 -#: src/main/escp2-papers.c:1529 src/main/escp2-papers.c:1573 +#: src/main/escp2-papers.c:1355 src/main/escp2-papers.c:1399 +#: src/main/escp2-papers.c:1443 src/main/escp2-papers.c:1491 +#: src/main/escp2-papers.c:1539 src/main/escp2-papers.c:1583 #: src/main/xmli18n-tmp.h:5 msgid "Postcard" msgstr "LevelezÅ‘lap" -#: src/main/escp2-papers.c:1353 src/main/escp2-papers.c:1397 -#: src/main/escp2-papers.c:1441 src/main/escp2-papers.c:1489 -#: src/main/escp2-papers.c:1537 src/main/escp2-papers.c:1581 +#: src/main/escp2-papers.c:1363 src/main/escp2-papers.c:1407 +#: src/main/escp2-papers.c:1451 src/main/escp2-papers.c:1499 +#: src/main/escp2-papers.c:1547 src/main/escp2-papers.c:1591 msgid "Back Light Film" msgstr "Hátulról megvilágított film" -#: src/main/escp2-papers.c:1357 src/main/escp2-papers.c:1401 -#: src/main/escp2-papers.c:1445 src/main/escp2-papers.c:1493 -#: src/main/escp2-papers.c:1541 src/main/escp2-papers.c:1585 -msgid "Matte Paper Heavyweight" -msgstr "Matt papír, nehéz" - #: src/main/escp2-papers.c:1367 src/main/escp2-papers.c:1411 #: src/main/escp2-papers.c:1455 src/main/escp2-papers.c:1503 #: src/main/escp2-papers.c:1551 src/main/escp2-papers.c:1595 +msgid "Matte Paper Heavyweight" +msgstr "Matt papír, nehéz" + +#: src/main/escp2-papers.c:1377 src/main/escp2-papers.c:1421 +#: src/main/escp2-papers.c:1465 src/main/escp2-papers.c:1513 +#: src/main/escp2-papers.c:1561 src/main/escp2-papers.c:1605 msgid "Premium Semigloss Photo Paper" msgstr "Kiváló minÅ‘ségű félig fényes fotópapír" -#: src/main/escp2-papers.c:1375 src/main/escp2-papers.c:1419 -#: src/main/escp2-papers.c:1467 src/main/escp2-papers.c:1515 -#: src/main/escp2-papers.c:1559 src/main/escp2-papers.c:1607 +#: src/main/escp2-papers.c:1385 src/main/escp2-papers.c:1429 +#: src/main/escp2-papers.c:1477 src/main/escp2-papers.c:1525 +#: src/main/escp2-papers.c:1569 src/main/escp2-papers.c:1617 msgid "ColorLife Paper" msgstr "ColorLife papír" -#: src/main/escp2-papers.c:1459 src/main/escp2-papers.c:1507 -#: src/main/escp2-papers.c:1599 +#: src/main/escp2-papers.c:1469 src/main/escp2-papers.c:1517 +#: src/main/escp2-papers.c:1609 msgid "Archival Matte Paper" msgstr "Archiválási matt papír" -#: src/main/escp2-papers.c:1461 src/main/escp2-papers.c:1509 -#: src/main/escp2-papers.c:1601 +#: src/main/escp2-papers.c:1471 src/main/escp2-papers.c:1519 +#: src/main/escp2-papers.c:1611 msgid "Watercolor Paper - Radiant White" msgstr "Vízfesték papír - Ragyogó fehér" -#: src/main/escp2-papers.c:1716 src/main/escp2-papers.c:1842 -#: src/main/escp2-papers.c:1884 src/main/escp2-papers.c:1926 -#: src/main/escp2-papers.c:2001 +#: src/main/escp2-papers.c:1727 src/main/escp2-papers.c:1853 +#: src/main/escp2-papers.c:1895 src/main/escp2-papers.c:1937 +#: src/main/escp2-papers.c:2012 msgid "Roll Feed" msgstr "Tekercses adagoló" -#: src/main/escp2-papers.c:1740 src/main/escp2-papers.c:1791 +#: src/main/escp2-papers.c:1751 src/main/escp2-papers.c:1802 msgid "Roll Feed (cut each page)" msgstr "Tekercses adagoló (levágás minden lap után)" -#: src/main/escp2-papers.c:1749 src/main/escp2-papers.c:1800 +#: src/main/escp2-papers.c:1760 src/main/escp2-papers.c:1811 msgid "Roll Feed (do not cut)" msgstr "Tekercses adagoló (levágás nélkül)" -#: src/main/escp2-papers.c:1773 src/main/escp2-papers.c:1824 +#: src/main/escp2-papers.c:1784 src/main/escp2-papers.c:1835 msgid "Manual Feed" msgstr "Kézi adagolás" -#: src/main/escp2-papers.c:1782 src/main/escp2-papers.c:1833 -#: src/main/escp2-papers.c:1935 src/main/escp2-papers.c:1968 +#: src/main/escp2-papers.c:1793 src/main/escp2-papers.c:1844 +#: src/main/escp2-papers.c:1946 src/main/escp2-papers.c:1979 msgid "Print to CD" msgstr "Nyomtatás CD-re" -#: src/main/escp2-papers.c:1866 src/main/escp2-papers.c:1908 +#: src/main/escp2-papers.c:1877 src/main/escp2-papers.c:1919 msgid "Manual Sheet Guide" msgstr "Kézi lapvezérlÅ‘" -#: src/main/escp2-papers.c:1875 src/main/escp2-papers.c:1917 +#: src/main/escp2-papers.c:1886 src/main/escp2-papers.c:1928 msgid "Manual Feed (Front)" msgstr "Kézi adagolás (elöl)" -#: src/main/escp2-papers.c:1950 +#: src/main/escp2-papers.c:1961 msgid "Rear Tray" msgstr "Hátsó tálca" -#: src/main/escp2-papers.c:1959 +#: src/main/escp2-papers.c:1970 msgid "Front Tray" msgstr "ElsÅ‘ tálca" -#: src/main/escp2-papers.c:1977 +#: src/main/escp2-papers.c:1988 msgid "Photo Board" msgstr "Fotókarton" -#: src/main/escp2-papers.c:2016 +#: src/main/escp2-papers.c:2027 msgid "Cut Sheet Bin 1" msgstr "Vágólap, 1. tálca" -#: src/main/escp2-papers.c:2025 +#: src/main/escp2-papers.c:2036 msgid "Cut Sheet Bin 2" msgstr "Vágólap, 2. tálca" -#: src/main/escp2-papers.c:2034 +#: src/main/escp2-papers.c:2045 msgid "Cut Sheet Autoselect" msgstr "Vágólap, automatikus tálcaválasztás" -#: src/main/escp2-papers.c:2043 +#: src/main/escp2-papers.c:2054 msgid "Manual Selection" msgstr "Kézi kijelölés" @@ -1939,9 +2106,8 @@ msgid "720 x 360 DPI" msgstr "720 x 360 DPI" #: src/main/escp2-resolutions.c:87 -#, fuzzy msgid "720 x 360 DPI Enhanced" -msgstr "720 x 360 DPI" +msgstr "720 x 360 DPI továbbfejlesztett" #: src/main/escp2-resolutions.c:91 src/main/escp2-resolutions.c:94 msgid "720 DPI" @@ -2039,42 +2205,48 @@ msgid "Eight Pass" msgstr "Nyolclépéses" #: src/main/escp2-resolutions.c:637 src/main/escp2-resolutions.c:652 -#: src/main/generic-options.c:33 +#: src/main/escp2-resolutions.c:667 src/main/generic-options.c:33 msgid "Fast Economy" msgstr "Gyors, gazdaságos" #: src/main/escp2-resolutions.c:638 src/main/escp2-resolutions.c:653 -#: src/main/generic-options.c:34 +#: src/main/escp2-resolutions.c:668 src/main/generic-options.c:34 msgid "Economy" msgstr "Gazdaságos" #: src/main/escp2-resolutions.c:639 src/main/escp2-resolutions.c:654 -#: src/main/escp2-resolutions.c:667 src/main/generic-options.c:35 +#: src/main/escp2-resolutions.c:669 src/main/escp2-resolutions.c:682 +#: src/main/generic-options.c:35 msgid "Draft" msgstr "Piszkozat" #: src/main/escp2-resolutions.c:641 src/main/escp2-resolutions.c:656 -#: src/main/escp2-resolutions.c:670 src/main/generic-options.c:37 +#: src/main/escp2-resolutions.c:671 src/main/escp2-resolutions.c:685 +#: src/main/generic-options.c:37 msgid "High" msgstr "Magas" #: src/main/escp2-resolutions.c:642 src/main/escp2-resolutions.c:657 -#: src/main/escp2-resolutions.c:669 src/main/generic-options.c:38 +#: src/main/escp2-resolutions.c:672 src/main/escp2-resolutions.c:684 +#: src/main/generic-options.c:38 msgid "Photo" msgstr "Fotó" #: src/main/escp2-resolutions.c:643 src/main/escp2-resolutions.c:658 -#: src/main/escp2-resolutions.c:671 src/main/generic-options.c:39 +#: src/main/escp2-resolutions.c:673 src/main/escp2-resolutions.c:686 +#: src/main/generic-options.c:39 msgid "Super Photo" msgstr "Szuper fotó" #: src/main/escp2-resolutions.c:644 src/main/escp2-resolutions.c:659 -#: src/main/escp2-resolutions.c:672 src/main/generic-options.c:40 +#: src/main/escp2-resolutions.c:674 src/main/escp2-resolutions.c:687 +#: src/main/generic-options.c:40 msgid "Ultra Photo" msgstr "Ultra fotó" #: src/main/escp2-resolutions.c:645 src/main/escp2-resolutions.c:660 -#: src/main/escp2-resolutions.c:673 src/main/generic-options.c:41 +#: src/main/escp2-resolutions.c:675 src/main/escp2-resolutions.c:688 +#: src/main/generic-options.c:41 msgid "Best" msgstr "Legjobb" @@ -2151,4174 +2323,4414 @@ msgid "3x5" msgstr "3x5" #: src/main/xmli18n-tmp.h:10 +msgid "3 1/2 x5" +msgstr "" + +#: src/main/xmli18n-tmp.h:11 msgid "4x6" msgstr "4x6" -#: src/main/xmli18n-tmp.h:11 +#: src/main/xmli18n-tmp.h:12 msgid "Epson 4x6 Photo Paper (tear-off borders)" msgstr "Epson 4x6-os fotópapír (letéphetÅ‘ szegélyek)" -#: src/main/xmli18n-tmp.h:12 +#: src/main/xmli18n-tmp.h:13 msgid "5x7" msgstr "5x7" -#: src/main/xmli18n-tmp.h:13 +#: src/main/xmli18n-tmp.h:14 msgid "5x8" msgstr "5x8" -#: src/main/xmli18n-tmp.h:14 +#: src/main/xmli18n-tmp.h:15 msgid "6x8" msgstr "6x8" -#: src/main/xmli18n-tmp.h:15 +#: src/main/xmli18n-tmp.h:16 msgid "8x10" msgstr "8x10" -#: src/main/xmli18n-tmp.h:17 +#: src/main/xmli18n-tmp.h:18 msgid "12x18" msgstr "12x18" -#: src/main/xmli18n-tmp.h:18 +#: src/main/xmli18n-tmp.h:19 msgid "Super B 13x19" msgstr "Super B 13x19" -#: src/main/xmli18n-tmp.h:19 +#: src/main/xmli18n-tmp.h:20 msgid "Engineering C 17x22" msgstr "Mérnöki C 17x22" -#: src/main/xmli18n-tmp.h:20 +#: src/main/xmli18n-tmp.h:21 msgid "8x12" msgstr "8x12" -#: src/main/xmli18n-tmp.h:21 +#: src/main/xmli18n-tmp.h:22 msgid "11x14" msgstr "11x14" -#: src/main/xmli18n-tmp.h:22 +#: src/main/xmli18n-tmp.h:23 msgid "16x20" msgstr "16x20" -#: src/main/xmli18n-tmp.h:23 +#: src/main/xmli18n-tmp.h:24 msgid "16x24" msgstr "16x24" -#: src/main/xmli18n-tmp.h:24 +#: src/main/xmli18n-tmp.h:25 msgid "20x24" msgstr "20x24" -#: src/main/xmli18n-tmp.h:25 +#: src/main/xmli18n-tmp.h:26 msgid "20x30" msgstr "20x30" -#: src/main/xmli18n-tmp.h:26 +#: src/main/xmli18n-tmp.h:27 msgid "22x30" msgstr "22x30" -#: src/main/xmli18n-tmp.h:27 +#: src/main/xmli18n-tmp.h:28 msgid "24x30" msgstr "24x30" -#: src/main/xmli18n-tmp.h:28 +#: src/main/xmli18n-tmp.h:29 msgid "Super A1 24x36" msgstr "Super A1 24x36" -#: src/main/xmli18n-tmp.h:29 +#: src/main/xmli18n-tmp.h:30 msgid "30x40" msgstr "30x40" -#: src/main/xmli18n-tmp.h:30 +#: src/main/xmli18n-tmp.h:31 msgid "4A" msgstr "4A" -#: src/main/xmli18n-tmp.h:31 +#: src/main/xmli18n-tmp.h:32 msgid "2A" msgstr "2A" -#: src/main/xmli18n-tmp.h:32 +#: src/main/xmli18n-tmp.h:33 msgid "Super A0" msgstr "Super A0" -#: src/main/xmli18n-tmp.h:33 +#: src/main/xmli18n-tmp.h:34 msgid "A0" msgstr "A0" -#: src/main/xmli18n-tmp.h:34 +#: src/main/xmli18n-tmp.h:35 msgid "A1" msgstr "A1" -#: src/main/xmli18n-tmp.h:35 +#: src/main/xmli18n-tmp.h:36 msgid "A2" msgstr "A2" -#: src/main/xmli18n-tmp.h:36 +#: src/main/xmli18n-tmp.h:37 msgid "A3" msgstr "A3" -#: src/main/xmli18n-tmp.h:37 +#: src/main/xmli18n-tmp.h:38 msgid "A4" msgstr "A4" -#: src/main/xmli18n-tmp.h:38 +#: src/main/xmli18n-tmp.h:39 msgid "A5" msgstr "A5" -#: src/main/xmli18n-tmp.h:39 +#: src/main/xmli18n-tmp.h:40 msgid "A6" msgstr "A6" -#: src/main/xmli18n-tmp.h:40 +#: src/main/xmli18n-tmp.h:41 msgid "A7" msgstr "A7" -#: src/main/xmli18n-tmp.h:41 +#: src/main/xmli18n-tmp.h:42 msgid "A8" msgstr "A8" -#: src/main/xmli18n-tmp.h:42 +#: src/main/xmli18n-tmp.h:43 msgid "A9" msgstr "A9" -#: src/main/xmli18n-tmp.h:43 +#: src/main/xmli18n-tmp.h:44 msgid "A10" msgstr "A10" -#: src/main/xmli18n-tmp.h:44 +#: src/main/xmli18n-tmp.h:45 msgid "RA0" msgstr "RA0" -#: src/main/xmli18n-tmp.h:45 +#: src/main/xmli18n-tmp.h:46 msgid "RA1" msgstr "RA1" -#: src/main/xmli18n-tmp.h:46 +#: src/main/xmli18n-tmp.h:47 msgid "RA2" msgstr "RA2" -#: src/main/xmli18n-tmp.h:47 +#: src/main/xmli18n-tmp.h:48 msgid "RA3" msgstr "RA3" -#: src/main/xmli18n-tmp.h:48 +#: src/main/xmli18n-tmp.h:49 msgid "RA4" msgstr "RA4" -#: src/main/xmli18n-tmp.h:49 +#: src/main/xmli18n-tmp.h:50 msgid "SRA0" msgstr "SRA0" -#: src/main/xmli18n-tmp.h:50 +#: src/main/xmli18n-tmp.h:51 msgid "SRA1" msgstr "SRA1" -#: src/main/xmli18n-tmp.h:51 +#: src/main/xmli18n-tmp.h:52 msgid "SRA2" msgstr "SRA2" -#: src/main/xmli18n-tmp.h:52 +#: src/main/xmli18n-tmp.h:53 msgid "SRA3" msgstr "SRA3" -#: src/main/xmli18n-tmp.h:53 +#: src/main/xmli18n-tmp.h:54 msgid "SRA4" msgstr "SRA4" -#: src/main/xmli18n-tmp.h:54 +#: src/main/xmli18n-tmp.h:55 msgid "4B ISO" msgstr "4B ISO" -#: src/main/xmli18n-tmp.h:55 +#: src/main/xmli18n-tmp.h:56 msgid "2B ISO" msgstr "2B ISO" -#: src/main/xmli18n-tmp.h:56 +#: src/main/xmli18n-tmp.h:57 msgid "B0 ISO" msgstr "B0 ISO" -#: src/main/xmli18n-tmp.h:57 +#: src/main/xmli18n-tmp.h:58 msgid "B1 ISO" msgstr "B1 ISO" -#: src/main/xmli18n-tmp.h:58 +#: src/main/xmli18n-tmp.h:59 msgid "B2 ISO" msgstr "B2 ISO" -#: src/main/xmli18n-tmp.h:59 +#: src/main/xmli18n-tmp.h:60 msgid "B3 ISO" msgstr "B3 ISO" -#: src/main/xmli18n-tmp.h:60 +#: src/main/xmli18n-tmp.h:61 msgid "B4 ISO" msgstr "B4 ISO" -#: src/main/xmli18n-tmp.h:61 +#: src/main/xmli18n-tmp.h:62 msgid "B5 ISO" msgstr "B5 ISO" -#: src/main/xmli18n-tmp.h:62 +#: src/main/xmli18n-tmp.h:63 msgid "B6 ISO" msgstr "B6 ISO" -#: src/main/xmli18n-tmp.h:63 +#: src/main/xmli18n-tmp.h:64 msgid "B7 ISO" msgstr "B7 ISO" -#: src/main/xmli18n-tmp.h:64 +#: src/main/xmli18n-tmp.h:65 msgid "B8 ISO" msgstr "B8 ISO" -#: src/main/xmli18n-tmp.h:65 +#: src/main/xmli18n-tmp.h:66 msgid "B9 ISO" msgstr "B9 ISO" -#: src/main/xmli18n-tmp.h:66 +#: src/main/xmli18n-tmp.h:67 msgid "B10 ISO" msgstr "B10 ISO" -#: src/main/xmli18n-tmp.h:67 +#: src/main/xmli18n-tmp.h:68 msgid "Super B0 JIS" msgstr "Super B0 JIS" -#: src/main/xmli18n-tmp.h:68 +#: src/main/xmli18n-tmp.h:69 msgid "B0 JIS" msgstr "B0 JIS" -#: src/main/xmli18n-tmp.h:69 +#: src/main/xmli18n-tmp.h:70 msgid "B1 JIS" msgstr "B1 JIS" -#: src/main/xmli18n-tmp.h:70 +#: src/main/xmli18n-tmp.h:71 msgid "B2 JIS" msgstr "B2 JIS" -#: src/main/xmli18n-tmp.h:71 +#: src/main/xmli18n-tmp.h:72 msgid "B3 JIS" msgstr "B3 JIS" -#: src/main/xmli18n-tmp.h:72 +#: src/main/xmli18n-tmp.h:73 msgid "B4 JIS" msgstr "B4 JIS" -#: src/main/xmli18n-tmp.h:73 +#: src/main/xmli18n-tmp.h:74 msgid "B5 JIS" msgstr "B5 JIS" -#: src/main/xmli18n-tmp.h:74 +#: src/main/xmli18n-tmp.h:75 msgid "B6 JIS" msgstr "B6 JIS" -#: src/main/xmli18n-tmp.h:75 +#: src/main/xmli18n-tmp.h:76 msgid "B7 JIS" msgstr "B7 JIS" -#: src/main/xmli18n-tmp.h:76 +#: src/main/xmli18n-tmp.h:77 msgid "B8 JIS" msgstr "B8 JIS" -#: src/main/xmli18n-tmp.h:77 +#: src/main/xmli18n-tmp.h:78 msgid "B9 JIS" msgstr "B9 JIS" -#: src/main/xmli18n-tmp.h:78 +#: src/main/xmli18n-tmp.h:79 msgid "B10 JIS" msgstr "B10 JIS" -#: src/main/xmli18n-tmp.h:79 +#: src/main/xmli18n-tmp.h:80 msgid "C0" msgstr "C0" -#: src/main/xmli18n-tmp.h:80 +#: src/main/xmli18n-tmp.h:81 +#, fuzzy +msgid "C0 landscape" +msgstr "FekvÅ‘" + +#: src/main/xmli18n-tmp.h:82 msgid "C1" msgstr "C1" -#: src/main/xmli18n-tmp.h:81 +#: src/main/xmli18n-tmp.h:83 +#, fuzzy +msgid "C1 landscape" +msgstr "FekvÅ‘" + +#: src/main/xmli18n-tmp.h:84 msgid "C2" msgstr "C2" -#: src/main/xmli18n-tmp.h:82 +#: src/main/xmli18n-tmp.h:85 +#, fuzzy +msgid "C2 landscape" +msgstr "FekvÅ‘" + +#: src/main/xmli18n-tmp.h:86 msgid "C3" msgstr "C3" -#: src/main/xmli18n-tmp.h:83 +#: src/main/xmli18n-tmp.h:87 +#, fuzzy +msgid "C3 landscape" +msgstr "FekvÅ‘" + +#: src/main/xmli18n-tmp.h:88 msgid "C4" msgstr "C4" -#: src/main/xmli18n-tmp.h:84 +#: src/main/xmli18n-tmp.h:89 +#, fuzzy +msgid "C4 landscape" +msgstr "FekvÅ‘" + +#: src/main/xmli18n-tmp.h:90 msgid "C5" msgstr "C5" -#: src/main/xmli18n-tmp.h:85 +#: src/main/xmli18n-tmp.h:91 +#, fuzzy +msgid "C5 landscape" +msgstr "FekvÅ‘" + +#: src/main/xmli18n-tmp.h:92 msgid "B6-C4" msgstr "B6-C4" -#: src/main/xmli18n-tmp.h:86 +#: src/main/xmli18n-tmp.h:93 +#, fuzzy +msgid "B6-C4 landscape" +msgstr "FekvÅ‘" + +#: src/main/xmli18n-tmp.h:94 msgid "C6" msgstr "C6" -#: src/main/xmli18n-tmp.h:87 +#: src/main/xmli18n-tmp.h:95 +#, fuzzy +msgid "C6 landscape" +msgstr "FekvÅ‘" + +#: src/main/xmli18n-tmp.h:96 msgid "DL" msgstr "DL" -#: src/main/xmli18n-tmp.h:88 +#: src/main/xmli18n-tmp.h:97 +#, fuzzy +msgid "DL landscape" +msgstr "FekvÅ‘" + +#: src/main/xmli18n-tmp.h:98 msgid "C7-6" msgstr "C7-6" -#: src/main/xmli18n-tmp.h:89 +#: src/main/xmli18n-tmp.h:99 +#, fuzzy +msgid "C7-6 landscape" +msgstr "FekvÅ‘" + +#: src/main/xmli18n-tmp.h:100 msgid "C7" msgstr "C7" -#: src/main/xmli18n-tmp.h:90 +#: src/main/xmli18n-tmp.h:101 +#, fuzzy +msgid "C7 landscape" +msgstr "FekvÅ‘" + +#: src/main/xmli18n-tmp.h:102 msgid "C8" msgstr "C8" -#: src/main/xmli18n-tmp.h:91 +#: src/main/xmli18n-tmp.h:103 +#, fuzzy +msgid "C8 landscape" +msgstr "FekvÅ‘" + +#: src/main/xmli18n-tmp.h:104 msgid "C9" msgstr "C9" -#: src/main/xmli18n-tmp.h:92 +#: src/main/xmli18n-tmp.h:105 +#, fuzzy +msgid "C9 landscape" +msgstr "FekvÅ‘" + +#: src/main/xmli18n-tmp.h:106 msgid "C10" msgstr "C10" -#: src/main/xmli18n-tmp.h:93 +#: src/main/xmli18n-tmp.h:107 +#, fuzzy +msgid "C10 landscape" +msgstr "FekvÅ‘" + +#: src/main/xmli18n-tmp.h:108 msgid "ArchA" msgstr "ArchA" -#: src/main/xmli18n-tmp.h:94 +#: src/main/xmli18n-tmp.h:109 msgid "ArchA transposed" msgstr "ArchA felcserélt" -#: src/main/xmli18n-tmp.h:95 +#: src/main/xmli18n-tmp.h:110 msgid "ArchB" msgstr "ArchB" -#: src/main/xmli18n-tmp.h:96 +#: src/main/xmli18n-tmp.h:111 msgid "ArchB transposed" msgstr "ArchB felcserélt" -#: src/main/xmli18n-tmp.h:97 +#: src/main/xmli18n-tmp.h:112 msgid "ArchC" msgstr "ArchC" -#: src/main/xmli18n-tmp.h:98 +#: src/main/xmli18n-tmp.h:113 msgid "ArchC transposed" msgstr "ArchC felcserélt" -#: src/main/xmli18n-tmp.h:99 +#: src/main/xmli18n-tmp.h:114 msgid "ArchD" msgstr "ArchD" -#: src/main/xmli18n-tmp.h:100 +#: src/main/xmli18n-tmp.h:115 msgid "ArchD transposed" msgstr "ArchD felcserélt" -#: src/main/xmli18n-tmp.h:101 +#: src/main/xmli18n-tmp.h:116 msgid "ArchE" msgstr "ArchE" -#: src/main/xmli18n-tmp.h:102 +#: src/main/xmli18n-tmp.h:117 msgid "ArchE transposed" msgstr "ArchE felcserélt" -#: src/main/xmli18n-tmp.h:103 +#: src/main/xmli18n-tmp.h:118 msgid "American foolscap" msgstr "Amerikai írólap" -#: src/main/xmli18n-tmp.h:104 +#: src/main/xmli18n-tmp.h:119 msgid "European foolscap" msgstr "Európai írólap" -#: src/main/xmli18n-tmp.h:105 +#: src/main/xmli18n-tmp.h:120 msgid "Crown Quarto" msgstr "Crown Quarto" -#: src/main/xmli18n-tmp.h:106 +#: src/main/xmli18n-tmp.h:121 msgid "Large Crown Quarto" msgstr "Nagy Crown Quarto" -#: src/main/xmli18n-tmp.h:107 +#: src/main/xmli18n-tmp.h:122 msgid "Demy Quarto" msgstr "Demy Quarto" -#: src/main/xmli18n-tmp.h:108 +#: src/main/xmli18n-tmp.h:123 msgid "Royal Quarto" msgstr "Royal Quarto" -#: src/main/xmli18n-tmp.h:109 +#: src/main/xmli18n-tmp.h:124 msgid "ISO A4" msgstr "ISO A4" -#: src/main/xmli18n-tmp.h:110 +#: src/main/xmli18n-tmp.h:125 msgid "Crown Octavo" msgstr "Crown Octavo" -#: src/main/xmli18n-tmp.h:111 +#: src/main/xmli18n-tmp.h:126 msgid "Large Crown Octavo" msgstr "Nagy Crown Octavo" -#: src/main/xmli18n-tmp.h:112 +#: src/main/xmli18n-tmp.h:127 msgid "Demy Octavo" msgstr "Demy Octavo" -#: src/main/xmli18n-tmp.h:113 +#: src/main/xmli18n-tmp.h:128 msgid "Royal Octavo" msgstr "Royal Octavo" -#: src/main/xmli18n-tmp.h:114 +#: src/main/xmli18n-tmp.h:129 msgid "ISO A5" msgstr "ISO A5" -#: src/main/xmli18n-tmp.h:115 +#: src/main/xmli18n-tmp.h:130 msgid "Small paperback" msgstr "Kis paperback" -#: src/main/xmli18n-tmp.h:116 +#: src/main/xmli18n-tmp.h:131 msgid "Penguin small paperback" msgstr "Penguin, kis paperback" -#: src/main/xmli18n-tmp.h:117 +#: src/main/xmli18n-tmp.h:132 msgid "Penguin large paperback" msgstr "Penguin, nagy paperback" -#: src/main/xmli18n-tmp.h:118 +#: src/main/xmli18n-tmp.h:133 msgid "10cm x 15cm" msgstr "10cm x 15cm" -#: src/main/xmli18n-tmp.h:119 +#: src/main/xmli18n-tmp.h:134 msgid "Hagaki Card" msgstr "Hagaki kártya" -#: src/main/xmli18n-tmp.h:120 +#: src/main/xmli18n-tmp.h:135 msgid "Oufuku Card" msgstr "Oufuku kártya" -#: src/main/xmli18n-tmp.h:121 +#: src/main/xmli18n-tmp.h:136 msgid "Japanese long envelope #3" msgstr "Japán hosszú boríték #3" -#: src/main/xmli18n-tmp.h:122 +#: src/main/xmli18n-tmp.h:137 +#, fuzzy +msgid "Japanese long envelope #3 landscape" +msgstr "Japán hosszú boríték #3" + +#: src/main/xmli18n-tmp.h:138 msgid "Japanese long envelope #4" msgstr "Japán hosszú boríték #4" -#: src/main/xmli18n-tmp.h:123 +#: src/main/xmli18n-tmp.h:139 +#, fuzzy +msgid "Japanese long envelope #4 landscape" +msgstr "Japán hosszú boríték #4" + +#: src/main/xmli18n-tmp.h:140 msgid "Japanese Kaku envelope #4" msgstr "Japán Kaku boríték #4" -#: src/main/xmli18n-tmp.h:124 +#: src/main/xmli18n-tmp.h:141 +#, fuzzy +msgid "Japanese Kaku envelope #4 landscape" +msgstr "Japán Kaku boríték #4" + +#: src/main/xmli18n-tmp.h:142 msgid "Commercial 10" msgstr "Commercial 10" -#: src/main/xmli18n-tmp.h:125 -msgid "A2 Invitation" +#: src/main/xmli18n-tmp.h:143 +#, fuzzy +msgid "Commercial 10 landscape" +msgstr "Commercial 10" + +#: src/main/xmli18n-tmp.h:144 +msgid "A2 Invitation" msgstr "A2 meghívó" -#: src/main/xmli18n-tmp.h:126 +#: src/main/xmli18n-tmp.h:145 msgid "Monarch Envelope" msgstr "Monarch boríték" -#: src/main/xmli18n-tmp.h:127 +#: src/main/xmli18n-tmp.h:146 +#, fuzzy +msgid "Monarch Envelope landscape" +msgstr "Monarch boríték" + +#: src/main/xmli18n-tmp.h:147 msgid "4x5 3/8" msgstr "4x5 3/8" -#: src/main/xmli18n-tmp.h:128 +#: src/main/xmli18n-tmp.h:148 msgid "4x7" msgstr "4x7" -#: src/main/xmli18n-tmp.h:129 +#: src/main/xmli18n-tmp.h:149 msgid "CP_L" msgstr "CP_L" -#: src/main/xmli18n-tmp.h:130 +#: src/main/xmli18n-tmp.h:150 msgid "Card" msgstr "Kártya" -#: src/main/xmli18n-tmp.h:131 +#: src/main/xmli18n-tmp.h:151 msgid "Wide Postcard" msgstr "Széles levelezÅ‘lap" -#: src/main/xmli18n-tmp.h:132 +#: src/main/xmli18n-tmp.h:152 msgid "Chilean Office" msgstr "Chilei Office" -#: src/main/xmli18n-tmp.h:133 +#: src/main/xmli18n-tmp.h:153 msgid "Chilean Double Letter" msgstr "Chilei dupla levél" -#: src/main/xmli18n-tmp.h:134 +#: src/main/xmli18n-tmp.h:154 msgid "Chilean Double Office" msgstr "Chilei dupla Office" -#: src/main/xmli18n-tmp.h:135 +#: src/main/xmli18n-tmp.h:155 msgid "Custom" msgstr "Egyéni" -#: src/main/xmli18n-tmp.h:136 +#: src/main/xmli18n-tmp.h:156 msgid "89 mm Roll Paper" msgstr "89mm-es papírtekercs" -#: src/main/xmli18n-tmp.h:137 +#: src/main/xmli18n-tmp.h:157 msgid "4 Inch Roll Paper" msgstr "4 hüvelykes papírtekercs" -#: src/main/xmli18n-tmp.h:138 +#: src/main/xmli18n-tmp.h:158 msgid "5 Inch Roll Paper" msgstr "5 hüvelykes papírtekercs" -#: src/main/xmli18n-tmp.h:139 +#: src/main/xmli18n-tmp.h:159 msgid "210 mm Roll Paper" msgstr "210 mm-es papírtekercs" -#: src/main/xmli18n-tmp.h:140 +#: src/main/xmli18n-tmp.h:160 msgid "13 Inch Roll Paper" msgstr "13 hüvelykes papírtekercs" -#: src/main/xmli18n-tmp.h:141 +#: src/main/xmli18n-tmp.h:161 msgid "22 Inch Roll Paper" msgstr "22 hüvelykes papírtekercs" -#: src/main/xmli18n-tmp.h:142 +#: src/main/xmli18n-tmp.h:162 msgid "24 Inch Roll Paper" msgstr "24 hüvelykes papírtekercs" -#: src/main/xmli18n-tmp.h:143 +#: src/main/xmli18n-tmp.h:163 msgid "36 Inch Roll Paper" msgstr "36 hüvelykes papírtekercs" -#: src/main/xmli18n-tmp.h:144 +#: src/main/xmli18n-tmp.h:164 msgid "44 Inch Roll Paper" msgstr "44 hüvelykes papírtekercs" -#: src/main/xmli18n-tmp.h:145 +#: src/main/xmli18n-tmp.h:165 msgid "PostScript Level 1" msgstr "1. szintű PostScript" -#: src/main/xmli18n-tmp.h:146 +#: src/main/xmli18n-tmp.h:166 msgid "PostScript Level 2" msgstr "2. szintű PostScript" -#: src/main/xmli18n-tmp.h:147 +#: src/main/xmli18n-tmp.h:167 msgid "Canon BJ-30" msgstr "Canon BJ-30" -#: src/main/xmli18n-tmp.h:148 +#: src/main/xmli18n-tmp.h:168 msgid "Canon BJC-50" msgstr "Canon BJC-50" -#: src/main/xmli18n-tmp.h:149 +#: src/main/xmli18n-tmp.h:169 msgid "Canon BJC-55" msgstr "Canon BJC-55" -#: src/main/xmli18n-tmp.h:150 +#: src/main/xmli18n-tmp.h:170 msgid "Canon BJC-80" msgstr "Canon BJC-80" -#: src/main/xmli18n-tmp.h:151 +#: src/main/xmli18n-tmp.h:171 msgid "Canon BJC-85" msgstr "Canon BJC-85" -#: src/main/xmli18n-tmp.h:152 +#: src/main/xmli18n-tmp.h:172 msgid "Canon BJC-210" msgstr "Canon BJC-210" -#: src/main/xmli18n-tmp.h:153 +#: src/main/xmli18n-tmp.h:173 msgid "Canon BJC-240" msgstr "Canon BJC-240" -#: src/main/xmli18n-tmp.h:154 +#: src/main/xmli18n-tmp.h:174 msgid "Canon BJC-250" msgstr "Canon BJC-250" -#: src/main/xmli18n-tmp.h:155 +#: src/main/xmli18n-tmp.h:175 msgid "Canon BJC-1000" msgstr "Canon BJC-1000" -#: src/main/xmli18n-tmp.h:156 +#: src/main/xmli18n-tmp.h:176 msgid "Canon BJC-2000" msgstr "Canon BJC-2000" -#: src/main/xmli18n-tmp.h:157 +#: src/main/xmli18n-tmp.h:177 msgid "Canon BJC-2010" msgstr "Canon BJC-2010" -#: src/main/xmli18n-tmp.h:158 +#: src/main/xmli18n-tmp.h:178 msgid "Canon BJC-2100" msgstr "Canon BJC-2100" -#: src/main/xmli18n-tmp.h:159 +#: src/main/xmli18n-tmp.h:179 msgid "Canon BJC-2110" msgstr "Canon BJC-2110" -#: src/main/xmli18n-tmp.h:160 +#: src/main/xmli18n-tmp.h:180 msgid "Canon BJC-3000" msgstr "Canon BJC-3000" -#: src/main/xmli18n-tmp.h:161 +#: src/main/xmli18n-tmp.h:181 msgid "Canon BJC-4000" msgstr "Canon BJC-4000" -#: src/main/xmli18n-tmp.h:162 +#: src/main/xmli18n-tmp.h:182 msgid "Canon BJC-4300" msgstr "Canon BJC-4300" -#: src/main/xmli18n-tmp.h:163 +#: src/main/xmli18n-tmp.h:183 msgid "Canon BJC-4400" msgstr "Canon BJC-4400" -#: src/main/xmli18n-tmp.h:164 +#: src/main/xmli18n-tmp.h:184 #, fuzzy msgid "Canon BJC-5100" msgstr "Canon BJC-1000" -#: src/main/xmli18n-tmp.h:165 +#: src/main/xmli18n-tmp.h:185 #, fuzzy msgid "Canon BJC-5500" msgstr "Canon BJC-6500" -#: src/main/xmli18n-tmp.h:166 +#: src/main/xmli18n-tmp.h:186 msgid "Canon BJC-6000" msgstr "Canon BJC-6000" -#: src/main/xmli18n-tmp.h:167 +#: src/main/xmli18n-tmp.h:187 msgid "Canon BJC-6100" msgstr "Canon BJC-6100" -#: src/main/xmli18n-tmp.h:168 +#: src/main/xmli18n-tmp.h:188 msgid "Canon BJC-6200" msgstr "Canon BJC-6200" -#: src/main/xmli18n-tmp.h:169 +#: src/main/xmli18n-tmp.h:189 msgid "Canon BJC-6500" msgstr "Canon BJC-6500" -#: src/main/xmli18n-tmp.h:170 +#: src/main/xmli18n-tmp.h:190 msgid "Canon BJC-7000" msgstr "Canon BJC-7000" -#: src/main/xmli18n-tmp.h:171 +#: src/main/xmli18n-tmp.h:191 msgid "Canon BJC-7100" msgstr "Canon BJC-7100" -#: src/main/xmli18n-tmp.h:172 +#: src/main/xmli18n-tmp.h:192 msgid "Canon BJC-8200" msgstr "Canon BJC-8200" -#: src/main/xmli18n-tmp.h:173 +#: src/main/xmli18n-tmp.h:193 #, fuzzy msgid "Canon BJC-8500" msgstr "Canon BJC-6500" -#: src/main/xmli18n-tmp.h:174 +#: src/main/xmli18n-tmp.h:194 msgid "Canon S100" msgstr "Canon S100" -#: src/main/xmli18n-tmp.h:175 +#: src/main/xmli18n-tmp.h:195 msgid "Canon S200" msgstr "Canon S200" -#: src/main/xmli18n-tmp.h:176 +#: src/main/xmli18n-tmp.h:196 msgid "Canon S300" msgstr "Canon S300" -#: src/main/xmli18n-tmp.h:177 +#: src/main/xmli18n-tmp.h:197 msgid "Canon S400" msgstr "Canon S400" -#: src/main/xmli18n-tmp.h:178 +#: src/main/xmli18n-tmp.h:198 msgid "Canon S450" msgstr "Canon S450" -#: src/main/xmli18n-tmp.h:179 +#: src/main/xmli18n-tmp.h:199 msgid "Canon S500" msgstr "Canon S500" -#: src/main/xmli18n-tmp.h:180 +#: src/main/xmli18n-tmp.h:200 msgid "Canon S600" msgstr "Canon S600" -#: src/main/xmli18n-tmp.h:181 +#: src/main/xmli18n-tmp.h:201 msgid "Canon S630" msgstr "Canon S630" -#: src/main/xmli18n-tmp.h:182 +#: src/main/xmli18n-tmp.h:202 msgid "Canon S800" msgstr "Canon S800" -#: src/main/xmli18n-tmp.h:183 +#: src/main/xmli18n-tmp.h:203 msgid "Canon S4500" msgstr "Canon S4500" -#: src/main/xmli18n-tmp.h:184 -#, fuzzy +#: src/main/xmli18n-tmp.h:204 msgid "Canon PIXMA iP2000" -msgstr "Canon iP4000" +msgstr "Canon PIXMA iP2000" -#: src/main/xmli18n-tmp.h:185 -#, fuzzy +#: src/main/xmli18n-tmp.h:205 msgid "Canon PIXMA iP3000" -msgstr "Canon iP4000" +msgstr "Canon PIXMA iP3000" -#: src/main/xmli18n-tmp.h:186 -#, fuzzy +#: src/main/xmli18n-tmp.h:206 msgid "Canon PIXMA iP3100" -msgstr "Canon CP-300" +msgstr "Canon PIXMA iP3100" -#: src/main/xmli18n-tmp.h:187 -#, fuzzy +#: src/main/xmli18n-tmp.h:207 msgid "Canon PIXMA iP4000" -msgstr "Canon iP4000" +msgstr "Canon PIXMA iP4000" -#: src/main/xmli18n-tmp.h:188 -#, fuzzy +#: src/main/xmli18n-tmp.h:208 msgid "Canon PIXMA iP4100" -msgstr "Canon iP4000" +msgstr "Canon PIXMA iP4100" -#: src/main/xmli18n-tmp.h:189 -#, fuzzy +#: src/main/xmli18n-tmp.h:209 msgid "Canon PIXMA iP4200" -msgstr "Canon iP4000" +msgstr "Canon PIXMA iP4200" -#: src/main/xmli18n-tmp.h:190 -#, fuzzy +#: src/main/xmli18n-tmp.h:210 msgid "Canon PIXMA iP4300" -msgstr "Canon iP4000" +msgstr "Canon PIXMA iP4300" -#: src/main/xmli18n-tmp.h:191 +#: src/main/xmli18n-tmp.h:211 #, fuzzy msgid "Canon PIXMA iP4500" -msgstr "Canon iP4000" +msgstr "Canon PIXMA iP4000" -#: src/main/xmli18n-tmp.h:192 -#, fuzzy +#: src/main/xmli18n-tmp.h:212 msgid "Canon PIXMA iP5000" -msgstr "Canon iP4000" +msgstr "Canon PIXMA iP5000" -#: src/main/xmli18n-tmp.h:193 -#, fuzzy +#: src/main/xmli18n-tmp.h:213 msgid "Canon PIXMA iP5200" -msgstr "Canon CP-200" +msgstr "Canon PIXMA iP5200" -#: src/main/xmli18n-tmp.h:194 +#: src/main/xmli18n-tmp.h:214 #, fuzzy msgid "Canon PIXMA iP5300" -msgstr "Canon iP4000" +msgstr "Canon PIXMA iP3000" -#: src/main/xmli18n-tmp.h:195 +#: src/main/xmli18n-tmp.h:215 #, fuzzy +msgid "Canon PIXMA iP6000D" +msgstr "Canon PIXMA iP2000" + +#: src/main/xmli18n-tmp.h:216 msgid "Canon PIXMA iP6700" -msgstr "Canon iP4000" +msgstr "Canon PIXMA iP6700" -#: src/main/xmli18n-tmp.h:196 +#: src/main/xmli18n-tmp.h:217 #, fuzzy msgid "Canon PIXMA iP8500" -msgstr "Canon iP4000" +msgstr "Canon PIXMA iP5000" -#: src/main/xmli18n-tmp.h:197 +#: src/main/xmli18n-tmp.h:218 #, fuzzy msgid "Canon PIXMA iX5000" -msgstr "Canon iP4000" +msgstr "Canon PIXMA iP5000" -#: src/main/xmli18n-tmp.h:198 +#: src/main/xmli18n-tmp.h:219 #, fuzzy msgid "Canon PIXMA Pro9500" -msgstr "Canon iP4000" +msgstr "Canon PIXMA MP500" -#: src/main/xmli18n-tmp.h:199 -#, fuzzy +#: src/main/xmli18n-tmp.h:220 msgid "Canon PIXMA MP150" -msgstr "Canon CP-300" +msgstr "Canon PIXMA MP150" -#: src/main/xmli18n-tmp.h:200 +#: src/main/xmli18n-tmp.h:221 #, fuzzy msgid "Canon PIXMA MP170" -msgstr "Canon CP-300" +msgstr "Canon PIXMA MP150" -#: src/main/xmli18n-tmp.h:201 +#: src/main/xmli18n-tmp.h:222 #, fuzzy msgid "Canon PIXMA MP180" -msgstr "Canon CP-300" +msgstr "Canon PIXMA MP150" -#: src/main/xmli18n-tmp.h:202 -#, fuzzy +#: src/main/xmli18n-tmp.h:223 msgid "Canon PIXMA MP500" -msgstr "Canon iP4000" +msgstr "Canon PIXMA MP500" -#: src/main/xmli18n-tmp.h:203 +#: src/main/xmli18n-tmp.h:224 #, fuzzy -msgid "Canon PIXMA MP610" -msgstr "Canon CP-300" +msgid "Canon PIXMA MP520" +msgstr "Canon PIXMA MP150" -#: src/main/xmli18n-tmp.h:204 +#: src/main/xmli18n-tmp.h:225 #, fuzzy +msgid "Canon PIXMA MP610" +msgstr "Canon PIXMA MP150" + +#: src/main/xmli18n-tmp.h:226 msgid "Canon PIXMA MP700" -msgstr "Canon iP4000" +msgstr "Canon PIXMA MP700" -#: src/main/xmli18n-tmp.h:205 +#: src/main/xmli18n-tmp.h:227 #, fuzzy msgid "Canon PIXMA MP710" -msgstr "Canon CP-300" +msgstr "Canon PIXMA MP150" -#: src/main/xmli18n-tmp.h:206 -#, fuzzy +#: src/main/xmli18n-tmp.h:228 msgid "Canon PIXMA MP730" -msgstr "Canon iP4000" +msgstr "Canon PIXMA MP730" -#: src/main/xmli18n-tmp.h:207 +#: src/main/xmli18n-tmp.h:229 #, fuzzy msgid "Canon PIXMA MP740" -msgstr "Canon iP4000" +msgstr "Canon PIXMA MP700" -#: src/main/xmli18n-tmp.h:208 -#, fuzzy +#: src/main/xmli18n-tmp.h:230 msgid "Canon PIXMA MP750" -msgstr "Canon iP4000" +msgstr "Canon PIXMA MP750" -#: src/main/xmli18n-tmp.h:209 -#, fuzzy +#: src/main/xmli18n-tmp.h:231 msgid "Canon PIXMA MP760" -msgstr "Canon iP4000" +msgstr "Canon PIXMA MP760" -#: src/main/xmli18n-tmp.h:210 -#, fuzzy +#: src/main/xmli18n-tmp.h:232 msgid "Canon PIXMA MP770" -msgstr "Canon iP4000" +msgstr "Canon PIXMA MP770" -#: src/main/xmli18n-tmp.h:211 -#, fuzzy +#: src/main/xmli18n-tmp.h:233 msgid "Canon PIXMA MP780" -msgstr "Canon iP4000" +msgstr "Canon PIXMA MP780" -#: src/main/xmli18n-tmp.h:212 -#, fuzzy +#: src/main/xmli18n-tmp.h:234 msgid "Canon PIXMA MP790" -msgstr "Canon iP4000" +msgstr "Canon PIXMA MP790" -#: src/main/xmli18n-tmp.h:213 -#, fuzzy +#: src/main/xmli18n-tmp.h:235 msgid "Canon PIXMA MP830" -msgstr "Canon iP4000" +msgstr "Canon PIXMA MP830" -#: src/main/xmli18n-tmp.h:214 -#, fuzzy +#: src/main/xmli18n-tmp.h:236 msgid "Canon PIXUS iP3100" -msgstr "Canon S100" +msgstr "Canon PIXUS iP3100" -#: src/main/xmli18n-tmp.h:215 -#, fuzzy +#: src/main/xmli18n-tmp.h:237 msgid "Canon PIXUS iP4100" -msgstr "Canon iP4000" +msgstr "Canon PIXUS iP4100" -#: src/main/xmli18n-tmp.h:216 +#: src/main/xmli18n-tmp.h:238 #, fuzzy msgid "Canon i80" -msgstr "Canon S450" +msgstr "Canon i850" -#: src/main/xmli18n-tmp.h:217 -#, fuzzy +#: src/main/xmli18n-tmp.h:239 msgid "Canon i560" -msgstr "Canon S450" +msgstr "Canon i560" -#: src/main/xmli18n-tmp.h:218 -#, fuzzy +#: src/main/xmli18n-tmp.h:240 msgid "Canon i850" -msgstr "Canon S450" +msgstr "Canon i850" -#: src/main/xmli18n-tmp.h:219 -#, fuzzy +#: src/main/xmli18n-tmp.h:241 msgid "Canon i860" -msgstr "Canon S600" +msgstr "Canon i860" -#: src/main/xmli18n-tmp.h:220 -#, fuzzy +#: src/main/xmli18n-tmp.h:242 msgid "Canon i865" -msgstr "Canon BJC-85" +msgstr "Canon i865" -#: src/main/xmli18n-tmp.h:221 +#: src/main/xmli18n-tmp.h:243 msgid "Epson Stylus C20" msgstr "Epson Stylus C20" -#: src/main/xmli18n-tmp.h:222 +#: src/main/xmli18n-tmp.h:244 msgid "Epson Stylus C20SX" msgstr "Epson Stylus C20SX" -#: src/main/xmli18n-tmp.h:223 +#: src/main/xmli18n-tmp.h:245 msgid "Epson Stylus C20UX" msgstr "Epson Stylus C20UX" -#: src/main/xmli18n-tmp.h:224 +#: src/main/xmli18n-tmp.h:246 msgid "Epson Stylus C40" msgstr "Epson Stylus C40" -#: src/main/xmli18n-tmp.h:225 +#: src/main/xmli18n-tmp.h:247 msgid "Epson Stylus C40SX" msgstr "Epson Stylus C40SX" -#: src/main/xmli18n-tmp.h:226 +#: src/main/xmli18n-tmp.h:248 msgid "Epson Stylus C40UX" msgstr "Epson Stylus C40UX" -#: src/main/xmli18n-tmp.h:227 +#: src/main/xmli18n-tmp.h:249 msgid "Epson Stylus C41" msgstr "Epson Stylus C41" -#: src/main/xmli18n-tmp.h:228 +#: src/main/xmli18n-tmp.h:250 msgid "Epson Stylus C41SX" msgstr "Epson Stylus C41SX" -#: src/main/xmli18n-tmp.h:229 +#: src/main/xmli18n-tmp.h:251 msgid "Epson Stylus C41UX" msgstr "Epson Stylus C41UX" -#: src/main/xmli18n-tmp.h:230 +#: src/main/xmli18n-tmp.h:252 msgid "Epson Stylus C42" msgstr "Epson Stylus C42" -#: src/main/xmli18n-tmp.h:231 +#: src/main/xmli18n-tmp.h:253 msgid "Epson Stylus C42SX" msgstr "Epson Stylus C42SX" -#: src/main/xmli18n-tmp.h:232 +#: src/main/xmli18n-tmp.h:254 msgid "Epson Stylus C42UX" msgstr "Epson Stylus C42UX" -#: src/main/xmli18n-tmp.h:233 +#: src/main/xmli18n-tmp.h:255 msgid "Epson Stylus C43" msgstr "Epson Stylus C43" -#: src/main/xmli18n-tmp.h:234 +#: src/main/xmli18n-tmp.h:256 msgid "Epson Stylus C43SX" msgstr "Epson Stylus C43SX" -#: src/main/xmli18n-tmp.h:235 +#: src/main/xmli18n-tmp.h:257 msgid "Epson Stylus C43UX" msgstr "Epson Stylus C43UX" -#: src/main/xmli18n-tmp.h:236 +#: src/main/xmli18n-tmp.h:258 msgid "Epson Stylus C44" msgstr "Epson Stylus C44" -#: src/main/xmli18n-tmp.h:237 +#: src/main/xmli18n-tmp.h:259 msgid "Epson Stylus C44SX" msgstr "Epson Stylus C44SX" -#: src/main/xmli18n-tmp.h:238 +#: src/main/xmli18n-tmp.h:260 msgid "Epson Stylus C44UX" msgstr "Epson Stylus C44UX" -#: src/main/xmli18n-tmp.h:239 +#: src/main/xmli18n-tmp.h:261 msgid "Epson Stylus C45" msgstr "Epson Stylus C45" -#: src/main/xmli18n-tmp.h:240 +#: src/main/xmli18n-tmp.h:262 msgid "Epson Stylus C46" msgstr "Epson Stylus C46" -#: src/main/xmli18n-tmp.h:241 +#: src/main/xmli18n-tmp.h:263 msgid "Epson Stylus C48" msgstr "Epson Stylus C48" -#: src/main/xmli18n-tmp.h:242 +#: src/main/xmli18n-tmp.h:264 msgid "Epson Stylus C50" msgstr "Epson Stylus C50" -#: src/main/xmli18n-tmp.h:243 +#: src/main/xmli18n-tmp.h:265 msgid "Epson Stylus C60" msgstr "Epson Stylus C60" -#: src/main/xmli18n-tmp.h:244 +#: src/main/xmli18n-tmp.h:266 msgid "Epson Stylus C61" msgstr "Epson Stylus C61" -#: src/main/xmli18n-tmp.h:245 +#: src/main/xmli18n-tmp.h:267 msgid "Epson Stylus C62" msgstr "Epson Stylus C62" -#: src/main/xmli18n-tmp.h:246 +#: src/main/xmli18n-tmp.h:268 msgid "Epson Stylus C63" msgstr "Epson Stylus C63" -#: src/main/xmli18n-tmp.h:247 +#: src/main/xmli18n-tmp.h:269 msgid "Epson Stylus C64" msgstr "Epson Stylus C64" -#: src/main/xmli18n-tmp.h:248 +#: src/main/xmli18n-tmp.h:270 msgid "Epson Stylus C65" msgstr "Epson Stylus C65" -#: src/main/xmli18n-tmp.h:249 +#: src/main/xmli18n-tmp.h:271 msgid "Epson Stylus C66" msgstr "Epson Stylus C66" -#: src/main/xmli18n-tmp.h:250 +#: src/main/xmli18n-tmp.h:272 msgid "Epson Stylus C68" msgstr "Epson Stylus C68" -#: src/main/xmli18n-tmp.h:251 +#: src/main/xmli18n-tmp.h:273 msgid "Epson Stylus C70" msgstr "Epson Stylus C70" -#: src/main/xmli18n-tmp.h:252 -#, fuzzy +#: src/main/xmli18n-tmp.h:274 msgid "Epson Stylus C79" -msgstr "Epson Stylus C70" +msgstr "Epson Stylus C79" -#: src/main/xmli18n-tmp.h:253 +#: src/main/xmli18n-tmp.h:275 msgid "Epson Stylus C80" msgstr "Epson Stylus C80" -#: src/main/xmli18n-tmp.h:254 +#: src/main/xmli18n-tmp.h:276 msgid "Epson Stylus C82" msgstr "Epson Stylus C82" -#: src/main/xmli18n-tmp.h:255 +#: src/main/xmli18n-tmp.h:277 msgid "Epson Stylus C83" msgstr "Epson Stylus C83" -#: src/main/xmli18n-tmp.h:256 +#: src/main/xmli18n-tmp.h:278 msgid "Epson Stylus C84" msgstr "Epson Stylus C84" -#: src/main/xmli18n-tmp.h:257 +#: src/main/xmli18n-tmp.h:279 msgid "Epson Stylus C85" msgstr "Epson Stylus C85" -#: src/main/xmli18n-tmp.h:258 +#: src/main/xmli18n-tmp.h:280 msgid "Epson Stylus C86" msgstr "Epson Stylus C86" -#: src/main/xmli18n-tmp.h:259 -#, fuzzy +#: src/main/xmli18n-tmp.h:281 msgid "Epson Stylus C87" -msgstr "Epson Stylus C48" +msgstr "Epson Stylus C87" -#: src/main/xmli18n-tmp.h:260 +#: src/main/xmli18n-tmp.h:282 msgid "Epson Stylus C88" msgstr "Epson Stylus C88" -#: src/main/xmli18n-tmp.h:261 +#: src/main/xmli18n-tmp.h:283 #, fuzzy msgid "Epson Stylus C110" msgstr "Epson Stylus C20" -#: src/main/xmli18n-tmp.h:262 +#: src/main/xmli18n-tmp.h:284 #, fuzzy msgid "Epson Stylus C120" msgstr "Epson Stylus C20" -#: src/main/xmli18n-tmp.h:263 +#: src/main/xmli18n-tmp.h:285 msgid "Epson Stylus Color" msgstr "Epson Stylus Color" -#: src/main/xmli18n-tmp.h:264 +#: src/main/xmli18n-tmp.h:286 msgid "Epson Stylus Color I" msgstr "Epson Stylus Color I" -#: src/main/xmli18n-tmp.h:265 +#: src/main/xmli18n-tmp.h:287 msgid "Epson Stylus Color II" msgstr "Epson Stylus Color II" -#: src/main/xmli18n-tmp.h:266 +#: src/main/xmli18n-tmp.h:288 msgid "Epson Stylus Color IIs" msgstr "Epson Stylus Color IIs" -#: src/main/xmli18n-tmp.h:267 +#: src/main/xmli18n-tmp.h:289 msgid "Epson Stylus Color PRO" msgstr "Epson Stylus Color PRO" -#: src/main/xmli18n-tmp.h:268 +#: src/main/xmli18n-tmp.h:290 msgid "Epson Stylus Pro XL" msgstr "Epson Stylus Pro XL" -#: src/main/xmli18n-tmp.h:269 +#: src/main/xmli18n-tmp.h:291 msgid "Epson Stylus Color 400" msgstr "Epson Stylus Color 400" -#: src/main/xmli18n-tmp.h:270 +#: src/main/xmli18n-tmp.h:292 msgid "Epson Stylus Color 440" msgstr "Epson Stylus Color 440" -#: src/main/xmli18n-tmp.h:271 +#: src/main/xmli18n-tmp.h:293 msgid "Epson Stylus Color 460" msgstr "Epson Stylus Color 460" -#: src/main/xmli18n-tmp.h:272 +#: src/main/xmli18n-tmp.h:294 msgid "Epson Stylus Color 480" msgstr "Epson Stylus Color 480" -#: src/main/xmli18n-tmp.h:273 +#: src/main/xmli18n-tmp.h:295 msgid "Epson Stylus Color 500" msgstr "Epson Stylus Color 500" -#: src/main/xmli18n-tmp.h:274 +#: src/main/xmli18n-tmp.h:296 msgid "Epson Stylus Color 580" msgstr "Epson Stylus Color 580" -#: src/main/xmli18n-tmp.h:275 +#: src/main/xmli18n-tmp.h:297 msgid "Epson Stylus Color 600" msgstr "Epson Stylus Color 600" -#: src/main/xmli18n-tmp.h:276 +#: src/main/xmli18n-tmp.h:298 msgid "Epson Stylus Color 640" msgstr "Epson Stylus Color 640" -#: src/main/xmli18n-tmp.h:277 +#: src/main/xmli18n-tmp.h:299 msgid "Epson Stylus Color 660" msgstr "Epson Stylus Color 660" -#: src/main/xmli18n-tmp.h:278 +#: src/main/xmli18n-tmp.h:300 msgid "Epson Stylus Color 670" msgstr "Epson Stylus Color 670" -#: src/main/xmli18n-tmp.h:279 +#: src/main/xmli18n-tmp.h:301 msgid "Epson Stylus Color 680" msgstr "Epson Stylus Color 680" -#: src/main/xmli18n-tmp.h:280 +#: src/main/xmli18n-tmp.h:302 msgid "Epson Stylus Color 740" msgstr "Epson Stylus Color 740" -#: src/main/xmli18n-tmp.h:281 +#: src/main/xmli18n-tmp.h:303 msgid "Epson Stylus Color 760" msgstr "Epson Stylus Color 760" -#: src/main/xmli18n-tmp.h:282 +#: src/main/xmli18n-tmp.h:304 msgid "Epson Stylus Color 777" msgstr "Epson Stylus Color 777" -#: src/main/xmli18n-tmp.h:283 +#: src/main/xmli18n-tmp.h:305 msgid "Epson Stylus Color 800" msgstr "Epson Stylus Color 800" -#: src/main/xmli18n-tmp.h:284 +#: src/main/xmli18n-tmp.h:306 msgid "Epson Stylus Color 850" msgstr "Epson Stylus Color 850" -#: src/main/xmli18n-tmp.h:285 +#: src/main/xmli18n-tmp.h:307 msgid "Epson Stylus Color 860" msgstr "Epson Stylus Color 860" -#: src/main/xmli18n-tmp.h:286 +#: src/main/xmli18n-tmp.h:308 msgid "Epson Stylus Color 880" msgstr "Epson Stylus Color 880" -#: src/main/xmli18n-tmp.h:287 +#: src/main/xmli18n-tmp.h:309 msgid "Epson Stylus Color 8 3" msgstr "Epson Stylus Color 8 3" -#: src/main/xmli18n-tmp.h:288 +#: src/main/xmli18n-tmp.h:310 msgid "Epson Stylus Color 900" msgstr "Epson Stylus Color 900" -#: src/main/xmli18n-tmp.h:289 +#: src/main/xmli18n-tmp.h:311 msgid "Epson Stylus Color 980" msgstr "Epson Stylus Color 980" -#: src/main/xmli18n-tmp.h:290 +#: src/main/xmli18n-tmp.h:312 msgid "Epson Stylus Color 1160" msgstr "Epson Stylus Color 1160" -#: src/main/xmli18n-tmp.h:291 +#: src/main/xmli18n-tmp.h:313 msgid "Epson Stylus Color 1500" msgstr "Epson Stylus Color 1500" -#: src/main/xmli18n-tmp.h:292 +#: src/main/xmli18n-tmp.h:314 msgid "Epson Stylus Color 1520" msgstr "Epson Stylus Color 1520" -#: src/main/xmli18n-tmp.h:293 +#: src/main/xmli18n-tmp.h:315 msgid "Epson Stylus Color 3000" msgstr "Epson Stylus Color 3000" -#: src/main/xmli18n-tmp.h:294 +#: src/main/xmli18n-tmp.h:316 msgid "Epson Stylus Photo" msgstr "Epson Stylus Photo" -#: src/main/xmli18n-tmp.h:295 +#: src/main/xmli18n-tmp.h:317 msgid "Epson Stylus Photo 700" msgstr "Epson Stylus Photo 700" -#: src/main/xmli18n-tmp.h:296 +#: src/main/xmli18n-tmp.h:318 msgid "Epson Stylus Photo EX" msgstr "Epson Stylus Photo EX" -#: src/main/xmli18n-tmp.h:297 +#: src/main/xmli18n-tmp.h:319 msgid "Epson Stylus Photo EX3" msgstr "Epson Stylus Photo EX3" -#: src/main/xmli18n-tmp.h:298 +#: src/main/xmli18n-tmp.h:320 msgid "Epson Stylus Photo 720" msgstr "Epson Stylus Photo 720" -#: src/main/xmli18n-tmp.h:299 +#: src/main/xmli18n-tmp.h:321 msgid "Epson Stylus Photo 750" msgstr "Epson Stylus Photo 750" -#: src/main/xmli18n-tmp.h:300 +#: src/main/xmli18n-tmp.h:322 msgid "Epson Stylus Photo 780" msgstr "Epson Stylus Photo 780" -#: src/main/xmli18n-tmp.h:301 +#: src/main/xmli18n-tmp.h:323 msgid "Epson Stylus Photo 785" msgstr "Epson Stylus Photo 785" -#: src/main/xmli18n-tmp.h:302 +#: src/main/xmli18n-tmp.h:324 msgid "Epson Stylus Photo 790" msgstr "Epson Stylus Photo 790" -#: src/main/xmli18n-tmp.h:303 +#: src/main/xmli18n-tmp.h:325 msgid "Epson Stylus Photo 810" msgstr "Epson Stylus Photo 810" -#: src/main/xmli18n-tmp.h:304 +#: src/main/xmli18n-tmp.h:326 msgid "Epson Stylus Photo 820" msgstr "Epson Stylus Photo 820" -#: src/main/xmli18n-tmp.h:305 +#: src/main/xmli18n-tmp.h:327 msgid "Epson Stylus Photo 825" msgstr "Epson Stylus Photo 825" -#: src/main/xmli18n-tmp.h:306 +#: src/main/xmli18n-tmp.h:328 msgid "Epson Stylus Photo 830" msgstr "Epson Stylus Photo 830" -#: src/main/xmli18n-tmp.h:307 +#: src/main/xmli18n-tmp.h:329 msgid "Epson Stylus Photo 830U" msgstr "Epson Stylus Photo 830U" -#: src/main/xmli18n-tmp.h:308 +#: src/main/xmli18n-tmp.h:330 msgid "Epson Stylus Photo 870" msgstr "Epson Stylus Photo 870" -#: src/main/xmli18n-tmp.h:309 +#: src/main/xmli18n-tmp.h:331 msgid "Epson Stylus Photo 875" msgstr "Epson Stylus Photo 875" -#: src/main/xmli18n-tmp.h:310 +#: src/main/xmli18n-tmp.h:332 msgid "Epson Stylus Photo 890" msgstr "Epson Stylus Photo 890" -#: src/main/xmli18n-tmp.h:311 +#: src/main/xmli18n-tmp.h:333 msgid "Epson Stylus Photo 895" msgstr "Epson Stylus Photo 895" -#: src/main/xmli18n-tmp.h:312 +#: src/main/xmli18n-tmp.h:334 msgid "Epson Stylus Photo 900" msgstr "Epson Stylus Photo 900" -#: src/main/xmli18n-tmp.h:313 +#: src/main/xmli18n-tmp.h:335 msgid "Epson Stylus Photo 915" msgstr "Epson Stylus Photo 915" -#: src/main/xmli18n-tmp.h:314 +#: src/main/xmli18n-tmp.h:336 msgid "Epson Stylus Photo 925" msgstr "Epson Stylus Photo 925" -#: src/main/xmli18n-tmp.h:315 +#: src/main/xmli18n-tmp.h:337 msgid "Epson Stylus Photo 935" msgstr "Epson Stylus Photo 935" -#: src/main/xmli18n-tmp.h:316 +#: src/main/xmli18n-tmp.h:338 msgid "Epson Stylus Photo 950" msgstr "Epson Stylus Photo 950" -#: src/main/xmli18n-tmp.h:317 +#: src/main/xmli18n-tmp.h:339 msgid "Epson Stylus Photo 960" msgstr "Epson Stylus Photo 960" -#: src/main/xmli18n-tmp.h:318 +#: src/main/xmli18n-tmp.h:340 msgid "Epson Stylus Photo 1200" msgstr "Epson Stylus Photo 1200" -#: src/main/xmli18n-tmp.h:319 +#: src/main/xmli18n-tmp.h:341 msgid "Epson Stylus Photo 1270" msgstr "Epson Stylus Photo 1270" -#: src/main/xmli18n-tmp.h:320 +#: src/main/xmli18n-tmp.h:342 msgid "Epson Stylus Photo 1280" msgstr "Epson Stylus Photo 1280" -#: src/main/xmli18n-tmp.h:321 +#: src/main/xmli18n-tmp.h:343 msgid "Epson Stylus Photo 1290" msgstr "Epson Stylus Photo 1290" -#: src/main/xmli18n-tmp.h:322 -#, fuzzy +#: src/main/xmli18n-tmp.h:344 msgid "Epson Stylus Photo 1400" -msgstr "Epson Stylus Photo 1200" +msgstr "Epson Stylus Photo 1400" -#: src/main/xmli18n-tmp.h:323 -#, fuzzy +#: src/main/xmli18n-tmp.h:345 msgid "Epson Stylus Photo 1410" -msgstr "Epson Stylus Photo 810" +msgstr "Epson Stylus Photo 1410" -#: src/main/xmli18n-tmp.h:324 +#: src/main/xmli18n-tmp.h:346 msgid "Epson Stylus Photo 2000P" msgstr "Epson Stylus Photo 2000P" -#: src/main/xmli18n-tmp.h:325 +#: src/main/xmli18n-tmp.h:347 msgid "Epson Stylus Photo 2100" msgstr "Epson Stylus Photo 2100" -#: src/main/xmli18n-tmp.h:326 +#: src/main/xmli18n-tmp.h:348 msgid "Epson Stylus Photo 2200" msgstr "Epson Stylus Photo 2200" -#: src/main/xmli18n-tmp.h:327 +#: src/main/xmli18n-tmp.h:349 msgid "Epson Stylus Photo R200" msgstr "Epson Stylus Photo R200" -#: src/main/xmli18n-tmp.h:328 +#: src/main/xmli18n-tmp.h:350 msgid "Epson Stylus Photo R210" msgstr "Epson Stylus Photo R210" -#: src/main/xmli18n-tmp.h:329 +#: src/main/xmli18n-tmp.h:351 msgid "Epson Stylus Photo R220" msgstr "Epson Stylus Photo R220" -#: src/main/xmli18n-tmp.h:330 -#, fuzzy +#: src/main/xmli18n-tmp.h:352 msgid "Epson Stylus Photo R230" -msgstr "Epson Stylus Photo R200" +msgstr "Epson Stylus Photo R230" -#: src/main/xmli18n-tmp.h:331 -#, fuzzy +#: src/main/xmli18n-tmp.h:353 msgid "Epson Stylus Photo R240" -msgstr "Epson Stylus Photo R2400" +msgstr "Epson Stylus Photo R240" -#: src/main/xmli18n-tmp.h:332 -#, fuzzy +#: src/main/xmli18n-tmp.h:354 msgid "Epson Stylus Photo R245" -msgstr "Epson Stylus Photo RX425" +msgstr "Epson Stylus Photo R245" -#: src/main/xmli18n-tmp.h:333 -#, fuzzy +#: src/main/xmli18n-tmp.h:355 msgid "Epson Stylus Photo R260" -msgstr "Epson Stylus Photo R200" +msgstr "Epson Stylus Photo R260" -#: src/main/xmli18n-tmp.h:334 -#, fuzzy +#: src/main/xmli18n-tmp.h:356 msgid "Epson Stylus Photo R265" -msgstr "Epson Stylus Photo RX425" +msgstr "Epson Stylus Photo R265" -#: src/main/xmli18n-tmp.h:335 -#, fuzzy +#: src/main/xmli18n-tmp.h:357 msgid "Epson Stylus Photo R270" -msgstr "Epson Stylus Photo 1270" +msgstr "Epson Stylus Photo R270" -#: src/main/xmli18n-tmp.h:336 +#: src/main/xmli18n-tmp.h:358 +#, fuzzy +msgid "Epson Stylus Photo R280" +msgstr "Epson Stylus Photo 1280" + +#: src/main/xmli18n-tmp.h:359 +#, fuzzy +msgid "Epson Stylus Photo R285" +msgstr "Epson Stylus Photo R245" + +#: src/main/xmli18n-tmp.h:360 msgid "Epson Stylus Photo R300" msgstr "Epson Stylus Photo R300" -#: src/main/xmli18n-tmp.h:337 +#: src/main/xmli18n-tmp.h:361 msgid "Epson Stylus Photo R310" msgstr "Epson Stylus Photo R310" -#: src/main/xmli18n-tmp.h:338 +#: src/main/xmli18n-tmp.h:362 msgid "Epson Stylus Photo R320" msgstr "Epson Stylus Photo R200" -#: src/main/xmli18n-tmp.h:339 +#: src/main/xmli18n-tmp.h:363 msgid "Epson Stylus Photo R340" msgstr "Epson Stylus Photo R340" -#: src/main/xmli18n-tmp.h:340 -#, fuzzy +#: src/main/xmli18n-tmp.h:364 msgid "Epson Stylus Photo R350" -msgstr "Epson Stylus Photo R300" +msgstr "Epson Stylus Photo R350" -#: src/main/xmli18n-tmp.h:341 -#, fuzzy +#: src/main/xmli18n-tmp.h:365 msgid "Epson Stylus Photo R360" -msgstr "Epson Stylus Photo R300" +msgstr "Epson Stylus Photo R360" -#: src/main/xmli18n-tmp.h:342 -#, fuzzy +#: src/main/xmli18n-tmp.h:366 msgid "Epson Stylus Photo R380" -msgstr "Epson Stylus Photo R300" +msgstr "Epson Stylus Photo R380" -#: src/main/xmli18n-tmp.h:343 -#, fuzzy +#: src/main/xmli18n-tmp.h:367 msgid "Epson Stylus Photo R390" -msgstr "Epson Stylus Photo R300" +msgstr "Epson Stylus Photo R390" -#: src/main/xmli18n-tmp.h:344 +#: src/main/xmli18n-tmp.h:368 msgid "Epson Stylus Photo RX400" msgstr "Epson Stylus Photo RX400" -#: src/main/xmli18n-tmp.h:345 +#: src/main/xmli18n-tmp.h:369 msgid "Epson Stylus Photo RX420" msgstr "Epson Stylus Photo RX420" -#: src/main/xmli18n-tmp.h:346 +#: src/main/xmli18n-tmp.h:370 msgid "Epson Stylus Photo RX425" msgstr "Epson Stylus Photo RX425" -#: src/main/xmli18n-tmp.h:347 +#: src/main/xmli18n-tmp.h:371 msgid "Epson Stylus Photo RX430" msgstr "Epson Stylus Photo RX430" -#: src/main/xmli18n-tmp.h:348 +#: src/main/xmli18n-tmp.h:372 msgid "Epson Stylus Photo RX500" msgstr "Epson Stylus Photo RX500" -#: src/main/xmli18n-tmp.h:349 +#: src/main/xmli18n-tmp.h:373 msgid "Epson Stylus Photo RX510" msgstr "Epson Stylus Photo RX510" -#: src/main/xmli18n-tmp.h:350 -#, fuzzy +#: src/main/xmli18n-tmp.h:374 msgid "Epson Stylus Photo RX560" -msgstr "Epson Stylus Photo RX500" +msgstr "Epson Stylus Photo RX560" -#: src/main/xmli18n-tmp.h:351 -#, fuzzy +#: src/main/xmli18n-tmp.h:375 msgid "Epson Stylus Photo RX580" -msgstr "Epson Stylus Photo RX500" +msgstr "Epson Stylus Photo RX580" -#: src/main/xmli18n-tmp.h:352 +#: src/main/xmli18n-tmp.h:376 #, fuzzy +msgid "Epson Stylus Photo RX585" +msgstr "Epson Stylus Photo RX580" + +#: src/main/xmli18n-tmp.h:377 msgid "Epson Stylus Photo RX590" -msgstr "Epson Stylus Photo RX500" +msgstr "Epson Stylus Photo RX590" -#: src/main/xmli18n-tmp.h:353 +#: src/main/xmli18n-tmp.h:378 #, fuzzy msgid "Epson Stylus Photo RX595" -msgstr "Epson Stylus Photo RX500" +msgstr "Epson Stylus Photo RX590" -#: src/main/xmli18n-tmp.h:354 +#: src/main/xmli18n-tmp.h:379 msgid "Epson Stylus Photo RX600" msgstr "Epson Stylus Photo RX600" -#: src/main/xmli18n-tmp.h:355 +#: src/main/xmli18n-tmp.h:380 msgid "Epson Stylus Photo RX620" msgstr "Epson Stylus Photo RX620" -#: src/main/xmli18n-tmp.h:356 +#: src/main/xmli18n-tmp.h:381 msgid "Epson Stylus Photo RX630" msgstr "Epson Stylus Photo RX630" -#: src/main/xmli18n-tmp.h:357 -#, fuzzy +#: src/main/xmli18n-tmp.h:382 msgid "Epson Stylus Photo RX640" -msgstr "Epson Stylus Photo RX400" +msgstr "Epson Stylus Photo RX640" -#: src/main/xmli18n-tmp.h:358 +#: src/main/xmli18n-tmp.h:383 +#, fuzzy +msgid "Epson Stylus Photo RX680" +msgstr "Epson Stylus Photo RX560" + +#: src/main/xmli18n-tmp.h:384 +#, fuzzy +msgid "Epson Stylus Photo RX685" +msgstr "Epson Stylus Photo R265" + +#: src/main/xmli18n-tmp.h:385 msgid "Epson Stylus Photo RX700" msgstr "Epson Stylus Photo RX700" -#: src/main/xmli18n-tmp.h:359 +#: src/main/xmli18n-tmp.h:386 msgid "Epson Stylus Photo R800" msgstr "Epson Stylus Photo R800" -#: src/main/xmli18n-tmp.h:360 +#: src/main/xmli18n-tmp.h:387 msgid "Epson Stylus Photo R1800" msgstr "Epson Stylus Photo R1800" -#: src/main/xmli18n-tmp.h:361 +#: src/main/xmli18n-tmp.h:388 msgid "Epson Stylus Photo R2400" msgstr "Epson Stylus Photo R2400" -#: src/main/xmli18n-tmp.h:362 +#: src/main/xmli18n-tmp.h:389 msgid "Epson Stylus Pro 5000" msgstr "Epson Stylus Pro 5000" -#: src/main/xmli18n-tmp.h:363 +#: src/main/xmli18n-tmp.h:390 msgid "Epson Stylus Pro 5500" msgstr "Epson Stylus Pro 5500" -#: src/main/xmli18n-tmp.h:364 +#: src/main/xmli18n-tmp.h:391 msgid "Epson Stylus Pro 7000" msgstr "Epson Stylus Pro 7000" -#: src/main/xmli18n-tmp.h:365 +#: src/main/xmli18n-tmp.h:392 msgid "Epson Stylus Pro 7500" msgstr "Epson Stylus Pro 7500" -#: src/main/xmli18n-tmp.h:366 +#: src/main/xmli18n-tmp.h:393 msgid "Epson Stylus Pro 7600" msgstr "Epson Stylus Pro 7600" -#: src/main/xmli18n-tmp.h:367 +#: src/main/xmli18n-tmp.h:394 msgid "Epson Stylus Pro 9000" msgstr "Epson Stylus Pro 9000" -#: src/main/xmli18n-tmp.h:368 +#: src/main/xmli18n-tmp.h:395 msgid "Epson Stylus Pro 9500" msgstr "Epson Stylus Pro 9500" -#: src/main/xmli18n-tmp.h:369 +#: src/main/xmli18n-tmp.h:396 msgid "Epson Stylus Pro 9600" msgstr "Epson Stylus Pro 9600" -#: src/main/xmli18n-tmp.h:370 +#: src/main/xmli18n-tmp.h:397 msgid "Epson Stylus Pro 10000" msgstr "Epson Stylus Pro 10000" -#: src/main/xmli18n-tmp.h:371 +#: src/main/xmli18n-tmp.h:398 msgid "Epson Stylus Scan 2000" msgstr "Epson Stylus Scan 2000" -#: src/main/xmli18n-tmp.h:372 +#: src/main/xmli18n-tmp.h:399 msgid "Epson Stylus Scan 2500" msgstr "Epson Stylus Scan 2500" -#: src/main/xmli18n-tmp.h:373 +#: src/main/xmli18n-tmp.h:400 msgid "Epson Stylus CX1500" msgstr "Epson Stylus CX1500" -#: src/main/xmli18n-tmp.h:374 +#: src/main/xmli18n-tmp.h:401 msgid "Epson Stylus CX3100" msgstr "Epson Stylus CX3100" -#: src/main/xmli18n-tmp.h:375 +#: src/main/xmli18n-tmp.h:402 msgid "Epson Stylus CX3200" msgstr "Epson Stylus CX3200" -#: src/main/xmli18n-tmp.h:376 +#: src/main/xmli18n-tmp.h:403 msgid "Epson Stylus CX3500" msgstr "Epson Stylus CX3500" -#: src/main/xmli18n-tmp.h:377 +#: src/main/xmli18n-tmp.h:404 msgid "Epson Stylus CX3600" msgstr "Epson Stylus CX3600" -#: src/main/xmli18n-tmp.h:378 +#: src/main/xmli18n-tmp.h:405 msgid "Epson Stylus CX3650" msgstr "Epson Stylus CX3650" -#: src/main/xmli18n-tmp.h:379 +#: src/main/xmli18n-tmp.h:406 msgid "Epson Stylus CX3700" msgstr "Epson Stylus CX3700" -#: src/main/xmli18n-tmp.h:380 +#: src/main/xmli18n-tmp.h:407 msgid "Epson Stylus CX3800" msgstr "Epson Stylus CX3800" -#: src/main/xmli18n-tmp.h:381 +#: src/main/xmli18n-tmp.h:408 msgid "Epson Stylus CX3805" msgstr "Epson Stylus CX3805" -#: src/main/xmli18n-tmp.h:382 +#: src/main/xmli18n-tmp.h:409 msgid "Epson Stylus CX3810" msgstr "Epson Stylus CX3810" -#: src/main/xmli18n-tmp.h:383 +#: src/main/xmli18n-tmp.h:410 msgid "Epson Stylus CX4100" msgstr "Epson Stylus CX4100" -#: src/main/xmli18n-tmp.h:384 +#: src/main/xmli18n-tmp.h:411 msgid "Epson Stylus CX4200" msgstr "Epson Stylus CX4200" -#: src/main/xmli18n-tmp.h:385 +#: src/main/xmli18n-tmp.h:412 #, fuzzy msgid "Epson Stylus CX4400" msgstr "Epson Stylus CX4100" -#: src/main/xmli18n-tmp.h:386 +#: src/main/xmli18n-tmp.h:413 msgid "Epson Stylus CX4500" msgstr "Epson Stylus CX4500" -#: src/main/xmli18n-tmp.h:387 +#: src/main/xmli18n-tmp.h:414 msgid "Epson Stylus CX4600" msgstr "Epson Stylus CX4600" -#: src/main/xmli18n-tmp.h:388 +#: src/main/xmli18n-tmp.h:415 msgid "Epson Stylus CX4700" msgstr "Epson Stylus CX4700" -#: src/main/xmli18n-tmp.h:389 +#: src/main/xmli18n-tmp.h:416 msgid "Epson Stylus CX4800" msgstr "Epson Stylus CX4800" -#: src/main/xmli18n-tmp.h:390 +#: src/main/xmli18n-tmp.h:417 #, fuzzy msgid "Epson Stylus CX4900" msgstr "Epson Stylus CX4100" -#: src/main/xmli18n-tmp.h:391 -#, fuzzy +#: src/main/xmli18n-tmp.h:418 msgid "Epson Stylus CX5000" -msgstr "Epson Stylus CX1500" +msgstr "Epson Stylus CX5000" -#: src/main/xmli18n-tmp.h:392 -#, fuzzy +#: src/main/xmli18n-tmp.h:419 msgid "Epson Stylus CX5000F" -msgstr "Epson Stylus CX1500" +msgstr "Epson Stylus CX5000F" -#: src/main/xmli18n-tmp.h:393 +#: src/main/xmli18n-tmp.h:420 msgid "Epson Stylus CX5100" msgstr "Epson Stylus CX5100" -#: src/main/xmli18n-tmp.h:394 +#: src/main/xmli18n-tmp.h:421 msgid "Epson Stylus CX5200" msgstr "Epson Stylus CX5200" -#: src/main/xmli18n-tmp.h:395 +#: src/main/xmli18n-tmp.h:422 msgid "Epson Stylus CX5300" msgstr "Epson Stylus CX5300" -#: src/main/xmli18n-tmp.h:396 +#: src/main/xmli18n-tmp.h:423 msgid "Epson Stylus CX5400" msgstr "Epson Stylus CX5400" -#: src/main/xmli18n-tmp.h:397 +#: src/main/xmli18n-tmp.h:424 #, fuzzy msgid "Epson Stylus CX5600" msgstr "Epson Stylus CX1500" -#: src/main/xmli18n-tmp.h:398 +#: src/main/xmli18n-tmp.h:425 msgid "Epson Stylus CX5700" msgstr "Epson Stylus CX5700" -#: src/main/xmli18n-tmp.h:399 +#: src/main/xmli18n-tmp.h:426 msgid "Epson Stylus CX5800" msgstr "Epson Stylus CX5800" -#: src/main/xmli18n-tmp.h:400 -#, fuzzy +#: src/main/xmli18n-tmp.h:427 msgid "Epson Stylus CX6000" -msgstr "Epson Stylus CX3600" +msgstr "Epson Stylus CX6000" -#: src/main/xmli18n-tmp.h:401 +#: src/main/xmli18n-tmp.h:428 msgid "Epson Stylus CX6300" msgstr "Epson Stylus CX6300" -#: src/main/xmli18n-tmp.h:402 +#: src/main/xmli18n-tmp.h:429 msgid "Epson Stylus CX6400" msgstr "Epson Stylus CX6400" -#: src/main/xmli18n-tmp.h:403 +#: src/main/xmli18n-tmp.h:430 msgid "Epson Stylus CX6500" msgstr "Epson Stylus CX6500" -#: src/main/xmli18n-tmp.h:404 +#: src/main/xmli18n-tmp.h:431 msgid "Epson Stylus CX6600" msgstr "Epson Stylus CX6600" -#: src/main/xmli18n-tmp.h:405 -#, fuzzy +#: src/main/xmli18n-tmp.h:432 msgid "Epson Stylus CX7000F" -msgstr "Epson Stylus CX3700" +msgstr "Epson Stylus CX7000F" -#: src/main/xmli18n-tmp.h:406 +#: src/main/xmli18n-tmp.h:433 #, fuzzy msgid "Epson Stylus CX7400" msgstr "Epson Stylus CX3700" -#: src/main/xmli18n-tmp.h:407 +#: src/main/xmli18n-tmp.h:434 msgid "Epson Stylus CX7700" msgstr "Epson Stylus CX7700" -#: src/main/xmli18n-tmp.h:408 +#: src/main/xmli18n-tmp.h:435 msgid "Epson Stylus CX7800" msgstr "Epson Stylus CX7800" -#: src/main/xmli18n-tmp.h:409 +#: src/main/xmli18n-tmp.h:436 msgid "Epson Stylus CX8300" msgstr "Epson Stylus CX8300" -#: src/main/xmli18n-tmp.h:410 +#: src/main/xmli18n-tmp.h:437 msgid "Epson Stylus CX8400" msgstr "Epson Stylus CX8400" -#: src/main/xmli18n-tmp.h:411 +#: src/main/xmli18n-tmp.h:438 #, fuzzy msgid "Epson Stylus CX9400" msgstr "Epson Stylus CX4100" -#: src/main/xmli18n-tmp.h:412 +#: src/main/xmli18n-tmp.h:439 msgid "Epson Stylus D68" msgstr "Epson Stylus D68" -#: src/main/xmli18n-tmp.h:413 +#: src/main/xmli18n-tmp.h:440 msgid "Epson Stylus D88" msgstr "Epson Stylus D88" -#: src/main/xmli18n-tmp.h:414 +#: src/main/xmli18n-tmp.h:441 +#, fuzzy +msgid "Epson Stylus D92" +msgstr "Epson Stylus C20" + +#: src/main/xmli18n-tmp.h:442 #, fuzzy msgid "Epson Stylus D120" msgstr "Epson Stylus C20" -#: src/main/xmli18n-tmp.h:415 +#: src/main/xmli18n-tmp.h:443 msgid "Epson Stylus DX3800" msgstr "Epson Stylus DX3800" -#: src/main/xmli18n-tmp.h:416 +#: src/main/xmli18n-tmp.h:444 msgid "Epson Stylus DX3850" msgstr "Epson Stylus DX3850" -#: src/main/xmli18n-tmp.h:417 +#: src/main/xmli18n-tmp.h:445 #, fuzzy msgid "Epson Stylus DX4050" msgstr "Epson Stylus DX4200" -#: src/main/xmli18n-tmp.h:418 +#: src/main/xmli18n-tmp.h:446 msgid "Epson Stylus DX4200" msgstr "Epson Stylus DX4200" -#: src/main/xmli18n-tmp.h:419 +#: src/main/xmli18n-tmp.h:447 msgid "Epson Stylus DX4250" msgstr "Epson Stylus DX4250" -#: src/main/xmli18n-tmp.h:420 +#: src/main/xmli18n-tmp.h:448 +#, fuzzy +msgid "Epson Stylus DX4400" +msgstr "Epson Stylus DX4200" + +#: src/main/xmli18n-tmp.h:449 +#, fuzzy +msgid "Epson Stylus DX4450" +msgstr "Epson Stylus DX4250" + +#: src/main/xmli18n-tmp.h:450 msgid "Epson Stylus DX4800" msgstr "Epson Stylus DX4800" -#: src/main/xmli18n-tmp.h:421 +#: src/main/xmli18n-tmp.h:451 +#, fuzzy +msgid "Epson Stylus DX7000F" +msgstr "Epson Stylus CX7000F" + +#: src/main/xmli18n-tmp.h:452 +#, fuzzy +msgid "Epson Stylus DX7400" +msgstr "Epson Stylus DX4200" + +#: src/main/xmli18n-tmp.h:453 +#, fuzzy +msgid "Epson Stylus DX7450" +msgstr "Epson Stylus DX4250" + +#: src/main/xmli18n-tmp.h:454 +#, fuzzy +msgid "Epson Stylus DX8400" +msgstr "Epson Stylus CX8400" + +#: src/main/xmli18n-tmp.h:455 +#, fuzzy +msgid "Epson Stylus DX8450" +msgstr "Epson Stylus DX3850" + +#: src/main/xmli18n-tmp.h:456 msgid "Epson PictureMate" msgstr "Epson PictureMate" -#: src/main/xmli18n-tmp.h:422 +#: src/main/xmli18n-tmp.h:457 +#, fuzzy +msgid "Epson PictureMate Dash" +msgstr "Epson PictureMate Flash" + +#: src/main/xmli18n-tmp.h:458 msgid "Epson PictureMate Deluxe" msgstr "Epson PictureMate Deluxe" -#: src/main/xmli18n-tmp.h:423 -#, fuzzy +#: src/main/xmli18n-tmp.h:459 msgid "Epson PictureMate Flash" -msgstr "Epson PictureMate" +msgstr "Epson PictureMate Flash" -#: src/main/xmli18n-tmp.h:424 -#, fuzzy +#: src/main/xmli18n-tmp.h:460 msgid "Epson PictureMate Pal" -msgstr "Epson PictureMate" +msgstr "Epson PictureMate Pal" -#: src/main/xmli18n-tmp.h:425 -#, fuzzy +#: src/main/xmli18n-tmp.h:461 msgid "Epson PictureMate Snap" -msgstr "Epson PictureMate" +msgstr "Epson PictureMate Snap" -#: src/main/xmli18n-tmp.h:426 +#: src/main/xmli18n-tmp.h:462 #, fuzzy +msgid "Epson PictureMate 100" +msgstr "Epson PictureMate 200" + +#: src/main/xmli18n-tmp.h:463 msgid "Epson PictureMate 200" -msgstr "Epson PictureMate" +msgstr "Epson PictureMate 200" -#: src/main/xmli18n-tmp.h:427 -#, fuzzy +#: src/main/xmli18n-tmp.h:464 msgid "Epson PictureMate 210" -msgstr "Epson PictureMate" +msgstr "Epson PictureMate 210" -#: src/main/xmli18n-tmp.h:428 -#, fuzzy +#: src/main/xmli18n-tmp.h:465 msgid "Epson PictureMate 240" -msgstr "Epson PictureMate" +msgstr "Epson PictureMate 240" -#: src/main/xmli18n-tmp.h:429 -#, fuzzy +#: src/main/xmli18n-tmp.h:466 msgid "Epson PictureMate 250" -msgstr "Epson PictureMate" +msgstr "Epson PictureMate 250" -#: src/main/xmli18n-tmp.h:430 +#: src/main/xmli18n-tmp.h:467 +#, fuzzy +msgid "Epson PictureMate 260" +msgstr "Epson PictureMate 200" + +#: src/main/xmli18n-tmp.h:468 #, fuzzy +msgid "Epson PictureMate 270" +msgstr "Epson PictureMate 200" + +#: src/main/xmli18n-tmp.h:469 msgid "Epson PictureMate 280" -msgstr "Epson PictureMate" +msgstr "Epson PictureMate 280" -#: src/main/xmli18n-tmp.h:431 +#: src/main/xmli18n-tmp.h:470 +#, fuzzy +msgid "Epson PictureMate 290" +msgstr "Epson PictureMate 200" + +#: src/main/xmli18n-tmp.h:471 +#, fuzzy +msgid "Epson PictureMate 500" +msgstr "Epson PictureMate 200" + +#: src/main/xmli18n-tmp.h:472 +#, fuzzy +msgid "Epson PictureMate 2005" +msgstr "Epson PictureMate 200" + +#: src/main/xmli18n-tmp.h:473 msgid "Epson CL 700" msgstr "Epson CL 700" -#: src/main/xmli18n-tmp.h:432 +#: src/main/xmli18n-tmp.h:474 msgid "Epson CL 750" msgstr "Epson CL 750" -#: src/main/xmli18n-tmp.h:433 +#: src/main/xmli18n-tmp.h:475 msgid "Epson CL 760" msgstr "Epson CL 760" -#: src/main/xmli18n-tmp.h:434 +#: src/main/xmli18n-tmp.h:476 msgid "Epson E 100" msgstr "Epson E 100" -#: src/main/xmli18n-tmp.h:435 +#: src/main/xmli18n-tmp.h:477 msgid "Epson E 150" msgstr "Epson E 150" -#: src/main/xmli18n-tmp.h:436 +#: src/main/xmli18n-tmp.h:478 msgid "Epson E 200" msgstr "Epson E 200" -#: src/main/xmli18n-tmp.h:437 +#: src/main/xmli18n-tmp.h:479 +#, fuzzy +msgid "Epson E 300" +msgstr "Epson E 100" + +#: src/main/xmli18n-tmp.h:480 +#, fuzzy +msgid "Epson E 500" +msgstr "Epson E 100" + +#: src/main/xmli18n-tmp.h:481 +#, fuzzy +msgid "Epson E 520" +msgstr "Epson E 150" + +#: src/main/xmli18n-tmp.h:482 +#, fuzzy +msgid "Epson E 700" +msgstr "Epson E 100" + +#: src/main/xmli18n-tmp.h:483 +#, fuzzy +msgid "Epson E 720" +msgstr "Epson E 200" + +#: src/main/xmli18n-tmp.h:484 msgid "Epson EM 900C" msgstr "Epson EM 900C" -#: src/main/xmli18n-tmp.h:438 +#: src/main/xmli18n-tmp.h:485 msgid "Epson EM 930C" msgstr "Epson EM 930C" -#: src/main/xmli18n-tmp.h:439 +#: src/main/xmli18n-tmp.h:486 msgid "Epson MC 2000" msgstr "Epson MC 2000" -#: src/main/xmli18n-tmp.h:440 +#: src/main/xmli18n-tmp.h:487 msgid "Epson MC 5000" msgstr "Epson MC 5000" -#: src/main/xmli18n-tmp.h:441 +#: src/main/xmli18n-tmp.h:488 msgid "Epson MC 7000" msgstr "Epson MC 7000" -#: src/main/xmli18n-tmp.h:442 +#: src/main/xmli18n-tmp.h:489 msgid "Epson MC 9000" msgstr "Epson MC 9000" -#: src/main/xmli18n-tmp.h:443 +#: src/main/xmli18n-tmp.h:490 msgid "Epson MC 10000" msgstr "Epson MC 10000" -#: src/main/xmli18n-tmp.h:444 +#: src/main/xmli18n-tmp.h:491 msgid "Epson MJ 930C" msgstr "Epson MJ 930C" -#: src/main/xmli18n-tmp.h:445 +#: src/main/xmli18n-tmp.h:492 msgid "Epson MJ 5100C" msgstr "Epson MJ 5100C" -#: src/main/xmli18n-tmp.h:446 +#: src/main/xmli18n-tmp.h:493 msgid "Epson MJ 6000C" msgstr "Epson MJ 6000C" -#: src/main/xmli18n-tmp.h:447 +#: src/main/xmli18n-tmp.h:494 msgid "Epson MJ 8000C" msgstr "Epson MJ 8000C" -#: src/main/xmli18n-tmp.h:448 +#: src/main/xmli18n-tmp.h:495 #, fuzzy msgid "Epson PM 670C" msgstr "Epson PM 700C" -#: src/main/xmli18n-tmp.h:449 +#: src/main/xmli18n-tmp.h:496 msgid "Epson PM 700C" msgstr "Epson PM 700C" -#: src/main/xmli18n-tmp.h:450 +#: src/main/xmli18n-tmp.h:497 msgid "Epson PM 730C" msgstr "Epson PM 730C" -#: src/main/xmli18n-tmp.h:451 +#: src/main/xmli18n-tmp.h:498 msgid "Epson PM 740C" msgstr "Epson PM 740C" -#: src/main/xmli18n-tmp.h:452 +#: src/main/xmli18n-tmp.h:499 msgid "Epson PM 750C" msgstr "Epson PM 750C" -#: src/main/xmli18n-tmp.h:453 +#: src/main/xmli18n-tmp.h:500 msgid "Epson PM 760C" msgstr "Epson PM 760C" -#: src/main/xmli18n-tmp.h:454 +#: src/main/xmli18n-tmp.h:501 msgid "Epson PM 770C" msgstr "Epson PM 770C" -#: src/main/xmli18n-tmp.h:455 +#: src/main/xmli18n-tmp.h:502 msgid "Epson PM 780C" msgstr "Epson PM 780C" -#: src/main/xmli18n-tmp.h:456 +#: src/main/xmli18n-tmp.h:503 msgid "Epson PM 790PT" msgstr "Epson PM 790PT" -#: src/main/xmli18n-tmp.h:457 +#: src/main/xmli18n-tmp.h:504 msgid "Epson PM 800C" msgstr "Epson PM 800C" -#: src/main/xmli18n-tmp.h:458 +#: src/main/xmli18n-tmp.h:505 msgid "Epson PM 850PT" msgstr "Epson PM 850PT" -#: src/main/xmli18n-tmp.h:459 +#: src/main/xmli18n-tmp.h:506 msgid "Epson PM 870C" msgstr "Epson PM 870C" -#: src/main/xmli18n-tmp.h:460 +#: src/main/xmli18n-tmp.h:507 msgid "Epson PM 880C" msgstr "Epson PM 880C" -#: src/main/xmli18n-tmp.h:461 +#: src/main/xmli18n-tmp.h:508 msgid "Epson PM 930C" msgstr "Epson PM 930C" -#: src/main/xmli18n-tmp.h:462 +#: src/main/xmli18n-tmp.h:509 msgid "Epson PM 940C" msgstr "Epson PM 940C" -#: src/main/xmli18n-tmp.h:463 +#: src/main/xmli18n-tmp.h:510 msgid "Epson PM 950C" msgstr "Epson PM 950C" -#: src/main/xmli18n-tmp.h:464 +#: src/main/xmli18n-tmp.h:511 msgid "Epson PM 970C" msgstr "Epson PM 970C" -#: src/main/xmli18n-tmp.h:465 +#: src/main/xmli18n-tmp.h:512 msgid "Epson PM 980C" msgstr "Epson PM 980C" -#: src/main/xmli18n-tmp.h:466 +#: src/main/xmli18n-tmp.h:513 msgid "Epson PM 2000C" msgstr "Epson PM 2000C" -#: src/main/xmli18n-tmp.h:467 +#: src/main/xmli18n-tmp.h:514 msgid "Epson PM 2200C" msgstr "Epson PM 2200C" -#: src/main/xmli18n-tmp.h:468 +#: src/main/xmli18n-tmp.h:515 msgid "Epson PM 3000C" msgstr "Epson PM 3000C" -#: src/main/xmli18n-tmp.h:469 +#: src/main/xmli18n-tmp.h:516 msgid "Epson PM 3300C" msgstr "Epson PM 3300C" -#: src/main/xmli18n-tmp.h:470 +#: src/main/xmli18n-tmp.h:517 msgid "Epson PM 3500C" msgstr "Epson PM 3500C" -#: src/main/xmli18n-tmp.h:471 +#: src/main/xmli18n-tmp.h:518 msgid "Epson PM 3700C" msgstr "Epson PM 3700C" -#: src/main/xmli18n-tmp.h:472 +#: src/main/xmli18n-tmp.h:519 msgid "Epson PM 4000PX" msgstr "Epson PM 4000PX" -#: src/main/xmli18n-tmp.h:473 +#: src/main/xmli18n-tmp.h:520 msgid "Epson PM 5000C" msgstr "Epson PM 5000C" -#: src/main/xmli18n-tmp.h:474 +#: src/main/xmli18n-tmp.h:521 msgid "Epson PM 7000C" msgstr "Epson PM 7000C" -#: src/main/xmli18n-tmp.h:475 +#: src/main/xmli18n-tmp.h:522 msgid "Epson PM 9000C" msgstr "Epson PM 9000C" -#: src/main/xmli18n-tmp.h:476 +#: src/main/xmli18n-tmp.h:523 msgid "Epson PM 10000" msgstr "Epson PM 10000" -#: src/main/xmli18n-tmp.h:477 +#: src/main/xmli18n-tmp.h:524 msgid "Epson PM A650" msgstr "Epson PM A650" -#: src/main/xmli18n-tmp.h:478 +#: src/main/xmli18n-tmp.h:525 msgid "Epson PM A750" msgstr "Epson PM A750" -#: src/main/xmli18n-tmp.h:479 -#, fuzzy +#: src/main/xmli18n-tmp.h:526 msgid "Epson PM A820" -msgstr "Epson PM A890" +msgstr "Epson PM A820" -#: src/main/xmli18n-tmp.h:480 +#: src/main/xmli18n-tmp.h:527 msgid "Epson PM A890" msgstr "Epson PM A890" -#: src/main/xmli18n-tmp.h:481 +#: src/main/xmli18n-tmp.h:528 msgid "Epson PM A900" msgstr "Epson PM A900" -#: src/main/xmli18n-tmp.h:482 +#: src/main/xmli18n-tmp.h:529 msgid "Epson PM A950" msgstr "Epson PM A950" -#: src/main/xmli18n-tmp.h:483 +#: src/main/xmli18n-tmp.h:530 msgid "Epson PM D600" msgstr "Epson PM D600" -#: src/main/xmli18n-tmp.h:484 +#: src/main/xmli18n-tmp.h:531 msgid "Epson PM D750" msgstr "Epson PM D750" -#: src/main/xmli18n-tmp.h:485 +#: src/main/xmli18n-tmp.h:532 msgid "Epson PM D770" msgstr "Epson PM D770" -#: src/main/xmli18n-tmp.h:486 +#: src/main/xmli18n-tmp.h:533 msgid "Epson PM D800" msgstr "Epson PM D800" -#: src/main/xmli18n-tmp.h:487 -#, fuzzy +#: src/main/xmli18n-tmp.h:534 msgid "Epson PM D870" -msgstr "Epson PM 870C" +msgstr "Epson PM D870" -#: src/main/xmli18n-tmp.h:488 +#: src/main/xmli18n-tmp.h:535 msgid "Epson PM D1000" msgstr "Epson PM D1000" -#: src/main/xmli18n-tmp.h:489 +#: src/main/xmli18n-tmp.h:536 msgid "Epson PM G700" msgstr "Epson PM G700" -#: src/main/xmli18n-tmp.h:490 +#: src/main/xmli18n-tmp.h:537 msgid "Epson PM G720" msgstr "Epson PM G720" -#: src/main/xmli18n-tmp.h:491 +#: src/main/xmli18n-tmp.h:538 msgid "Epson PM G730" msgstr "Epson PM G730" -#: src/main/xmli18n-tmp.h:492 +#: src/main/xmli18n-tmp.h:539 msgid "Epson PM G800" msgstr "Epson PM G800" -#: src/main/xmli18n-tmp.h:493 +#: src/main/xmli18n-tmp.h:540 msgid "Epson PM G820" msgstr "Epson PM G820" -#: src/main/xmli18n-tmp.h:494 -#, fuzzy +#: src/main/xmli18n-tmp.h:541 msgid "Epson PM G850" -msgstr "Epson PM G800" +msgstr "Epson PM G850" -#: src/main/xmli18n-tmp.h:495 -#, fuzzy +#: src/main/xmli18n-tmp.h:542 msgid "Epson PM G4500" -msgstr "Epson PM G700" +msgstr "Epson PM G4500" -#: src/main/xmli18n-tmp.h:496 +#: src/main/xmli18n-tmp.h:543 msgid "Epson PX A650" msgstr "Epson PX A650" -#: src/main/xmli18n-tmp.h:497 +#: src/main/xmli18n-tmp.h:544 msgid "Epson PX G900" msgstr "Epson PX G900" -#: src/main/xmli18n-tmp.h:498 +#: src/main/xmli18n-tmp.h:545 msgid "Epson PX G920" msgstr "Epson PX G920" -#: src/main/xmli18n-tmp.h:499 +#: src/main/xmli18n-tmp.h:546 msgid "Epson PX G5000" msgstr "Epson PX G5000" -#: src/main/xmli18n-tmp.h:500 +#: src/main/xmli18n-tmp.h:547 msgid "Epson PX V500" msgstr "Epson PX V500" -#: src/main/xmli18n-tmp.h:501 +#: src/main/xmli18n-tmp.h:548 msgid "Epson PX V600" msgstr "Epson PX V600" -#: src/main/xmli18n-tmp.h:502 +#: src/main/xmli18n-tmp.h:549 msgid "Epson PX V630" msgstr "Epson PX V630" -#: src/main/xmli18n-tmp.h:503 +#: src/main/xmli18n-tmp.h:550 #, fuzzy msgid "Epson PX V780" msgstr "Epson PM 780C" -#: src/main/xmli18n-tmp.h:504 +#: src/main/xmli18n-tmp.h:551 msgid "Epson PX 5500" msgstr "Epson PX 5500" -#: src/main/xmli18n-tmp.h:505 +#: src/main/xmli18n-tmp.h:552 msgid "Epson PX 7000" msgstr "Epson PX 7000" -#: src/main/xmli18n-tmp.h:506 +#: src/main/xmli18n-tmp.h:553 msgid "Epson PX 9000" msgstr "Epson PX 9000" -#: src/main/xmli18n-tmp.h:507 +#: src/main/xmli18n-tmp.h:554 msgid "Apollo P-2100" msgstr "Apollo P-2100" -#: src/main/xmli18n-tmp.h:508 +#: src/main/xmli18n-tmp.h:555 msgid "Apollo P-2150" msgstr "Apollo P-2150" -#: src/main/xmli18n-tmp.h:509 +#: src/main/xmli18n-tmp.h:556 msgid "Apollo P-2200" msgstr "Apollo P-2200" -#: src/main/xmli18n-tmp.h:510 +#: src/main/xmli18n-tmp.h:557 msgid "Apollo P-2250" msgstr "Apollo P-2250" -#: src/main/xmli18n-tmp.h:511 +#: src/main/xmli18n-tmp.h:558 msgid "Apollo P-2500" msgstr "Apollo P-2500" -#: src/main/xmli18n-tmp.h:512 +#: src/main/xmli18n-tmp.h:559 msgid "Apollo P-2550" msgstr "Apollo P-2550" -#: src/main/xmli18n-tmp.h:513 +#: src/main/xmli18n-tmp.h:560 msgid "Apollo P-2600" msgstr "Apollo P-2600" -#: src/main/xmli18n-tmp.h:514 +#: src/main/xmli18n-tmp.h:561 msgid "Apollo P-2650" msgstr "Apollo P-2650" -#: src/main/xmli18n-tmp.h:515 +#: src/main/xmli18n-tmp.h:562 msgid "Apple Color StyleWriter 4100" msgstr "Apple Color StyleWriter 4100" -#: src/main/xmli18n-tmp.h:516 +#: src/main/xmli18n-tmp.h:563 msgid "Apple Color StyleWriter 4500" msgstr "Apple Color StyleWriter 4500" -#: src/main/xmli18n-tmp.h:517 +#: src/main/xmli18n-tmp.h:564 msgid "Apple Color StyleWriter 6500" msgstr "Apple Color StyleWriter 6500" -#: src/main/xmli18n-tmp.h:518 +#: src/main/xmli18n-tmp.h:565 msgid "Apple LaserWriter Select 360" msgstr "Apple LaserWriter Select 360" -#: src/main/xmli18n-tmp.h:519 +#: src/main/xmli18n-tmp.h:566 msgid "Brother DCP-1200" msgstr "Brother DCP-1200" -#: src/main/xmli18n-tmp.h:520 +#: src/main/xmli18n-tmp.h:567 msgid "Brother HL-4Ve" msgstr "Brother HL-4Ve" -#: src/main/xmli18n-tmp.h:521 +#: src/main/xmli18n-tmp.h:568 msgid "Brother HL-10V" msgstr "Brother HL-10V" -#: src/main/xmli18n-tmp.h:522 +#: src/main/xmli18n-tmp.h:569 msgid "Brother HL-10h" msgstr "Brother HL-10h" -#: src/main/xmli18n-tmp.h:523 +#: src/main/xmli18n-tmp.h:570 msgid "Brother HL-630" msgstr "Brother HL-630" -#: src/main/xmli18n-tmp.h:524 +#: src/main/xmli18n-tmp.h:571 msgid "Brother HL-660" msgstr "Brother HL-660" -#: src/main/xmli18n-tmp.h:525 +#: src/main/xmli18n-tmp.h:572 msgid "Brother HL-760" msgstr "Brother HL-760" -#: src/main/xmli18n-tmp.h:526 +#: src/main/xmli18n-tmp.h:573 msgid "Brother HL-960" msgstr "Brother HL-960" -#: src/main/xmli18n-tmp.h:527 +#: src/main/xmli18n-tmp.h:574 msgid "Brother HL-1040" msgstr "Brother HL-1040" -#: src/main/xmli18n-tmp.h:528 +#: src/main/xmli18n-tmp.h:575 msgid "Brother HL-1050" msgstr "Brother HL-1050" -#: src/main/xmli18n-tmp.h:529 +#: src/main/xmli18n-tmp.h:576 msgid "Brother HL-1060" msgstr "Brother HL-1060" -#: src/main/xmli18n-tmp.h:530 +#: src/main/xmli18n-tmp.h:577 msgid "Brother HL-1070" msgstr "Brother HL-1070" -#: src/main/xmli18n-tmp.h:531 +#: src/main/xmli18n-tmp.h:578 msgid "Brother HL-1240" msgstr "Brother HL-1240" -#: src/main/xmli18n-tmp.h:532 +#: src/main/xmli18n-tmp.h:579 msgid "Brother HL-1250" msgstr "Brother HL-1250" -#: src/main/xmli18n-tmp.h:533 +#: src/main/xmli18n-tmp.h:580 msgid "Brother HL-1260" msgstr "Brother HL-1260" -#: src/main/xmli18n-tmp.h:534 +#: src/main/xmli18n-tmp.h:581 msgid "Brother HL-1270N" msgstr "Brother HL-1270N" -#: src/main/xmli18n-tmp.h:535 +#: src/main/xmli18n-tmp.h:582 msgid "Brother HL-1440" msgstr "Brother HL-1440" -#: src/main/xmli18n-tmp.h:536 +#: src/main/xmli18n-tmp.h:583 msgid "Brother HL-1660e" msgstr "Brother HL-1660e" -#: src/main/xmli18n-tmp.h:537 +#: src/main/xmli18n-tmp.h:584 msgid "Brother HL-2060" msgstr "Brother HL-2060" -#: src/main/xmli18n-tmp.h:538 +#: src/main/xmli18n-tmp.h:585 msgid "Brother MFC-6550MC" msgstr "Brother MFC-6550MC" -#: src/main/xmli18n-tmp.h:539 +#: src/main/xmli18n-tmp.h:586 msgid "Brother MFC-8300" msgstr "Brother MFC-8300" -#: src/main/xmli18n-tmp.h:540 +#: src/main/xmli18n-tmp.h:587 msgid "Brother MFC-9500" msgstr "Brother MFC-9500" -#: src/main/xmli18n-tmp.h:541 +#: src/main/xmli18n-tmp.h:588 msgid "Brother MFC-9600" msgstr "Brother MFC-9600" -#: src/main/xmli18n-tmp.h:542 +#: src/main/xmli18n-tmp.h:589 msgid "Canon GP 335" msgstr "Canon GP 335" -#: src/main/xmli18n-tmp.h:543 +#: src/main/xmli18n-tmp.h:590 msgid "Canon LBP-4sx" msgstr "Canon LBP-4sx" -#: src/main/xmli18n-tmp.h:544 +#: src/main/xmli18n-tmp.h:591 msgid "Canon LBP-430" msgstr "Canon LBP-430" -#: src/main/xmli18n-tmp.h:545 +#: src/main/xmli18n-tmp.h:592 msgid "Canon LBP-1000" msgstr "Canon LBP-1000" -#: src/main/xmli18n-tmp.h:546 +#: src/main/xmli18n-tmp.h:593 msgid "Canon LBP-1260" msgstr "Canon LBP-1260" -#: src/main/xmli18n-tmp.h:547 +#: src/main/xmli18n-tmp.h:594 msgid "Canon LBP-1760" msgstr "Canon LBP-1760" -#: src/main/xmli18n-tmp.h:548 +#: src/main/xmli18n-tmp.h:595 msgid "Canon imageRunner 330s" msgstr "Canon imageRunner 330s" -#: src/main/xmli18n-tmp.h:549 +#: src/main/xmli18n-tmp.h:596 msgid "Citizen ProJet II" msgstr "Citizen ProJet II" -#: src/main/xmli18n-tmp.h:550 +#: src/main/xmli18n-tmp.h:597 msgid "DEC 1800" msgstr "DEC 1800" -#: src/main/xmli18n-tmp.h:551 +#: src/main/xmli18n-tmp.h:598 msgid "DEC LN17" msgstr "DEC LN17" -#: src/main/xmli18n-tmp.h:552 +#: src/main/xmli18n-tmp.h:599 msgid "Epson ActionLaser 1100" msgstr "Epson ActionLaser 1100" -#: src/main/xmli18n-tmp.h:553 +#: src/main/xmli18n-tmp.h:600 msgid "Epson ActionLaser II" msgstr "Epson ActionLaser II" -#: src/main/xmli18n-tmp.h:554 +#: src/main/xmli18n-tmp.h:601 msgid "Epson AcuLaser C2000" msgstr "Epson AcuLaser C2000" -#: src/main/xmli18n-tmp.h:555 +#: src/main/xmli18n-tmp.h:602 msgid "Epson AcuLaser C2000PS" msgstr "Epson AcuLaser C2000PS" -#: src/main/xmli18n-tmp.h:556 +#: src/main/xmli18n-tmp.h:603 msgid "Epson AcuLaser C8500" msgstr "Epson AcuLaser C8500" -#: src/main/xmli18n-tmp.h:557 +#: src/main/xmli18n-tmp.h:604 msgid "Epson AcuLaser C8500PS" msgstr "Epson AcuLaser C8500PS" -#: src/main/xmli18n-tmp.h:558 +#: src/main/xmli18n-tmp.h:605 msgid "Epson AcuLaser C8600" msgstr "Epson AcuLaser C8600" -#: src/main/xmli18n-tmp.h:559 +#: src/main/xmli18n-tmp.h:606 msgid "Epson AcuLaser C8600PS" msgstr "Epson AcuLaser C8600PS" -#: src/main/xmli18n-tmp.h:560 +#: src/main/xmli18n-tmp.h:607 msgid "Epson EPL-5200" msgstr "Epson EPL-5200" -#: src/main/xmli18n-tmp.h:561 +#: src/main/xmli18n-tmp.h:608 msgid "Epson EPL-5200+" msgstr "Epson EPL-5200+" -#: src/main/xmli18n-tmp.h:562 +#: src/main/xmli18n-tmp.h:609 msgid "Epson EPL-5700" msgstr "Epson EPL-5700" -#: src/main/xmli18n-tmp.h:563 +#: src/main/xmli18n-tmp.h:610 msgid "Epson EPL-5700PS" msgstr "Epson EPL-5700PS" -#: src/main/xmli18n-tmp.h:564 +#: src/main/xmli18n-tmp.h:611 msgid "Epson EPL-5800" msgstr "Epson EPL-5800" -#: src/main/xmli18n-tmp.h:565 +#: src/main/xmli18n-tmp.h:612 msgid "Epson EPL-5800PS" msgstr "Epson EPL-5800PS" -#: src/main/xmli18n-tmp.h:566 +#: src/main/xmli18n-tmp.h:613 msgid "Epson EPL-5900" msgstr "Epson EPL-5900" -#: src/main/xmli18n-tmp.h:567 +#: src/main/xmli18n-tmp.h:614 msgid "Epson EPL-5900PS" msgstr "Epson EPL-5900PS" -#: src/main/xmli18n-tmp.h:568 +#: src/main/xmli18n-tmp.h:615 msgid "Epson EPL-6100" msgstr "Epson EPL-6100" -#: src/main/xmli18n-tmp.h:569 +#: src/main/xmli18n-tmp.h:616 msgid "Epson EPL-6100PS" msgstr "Epson EPL-6100PS" -#: src/main/xmli18n-tmp.h:570 +#: src/main/xmli18n-tmp.h:617 msgid "Epson EPL-7100" msgstr "Epson EPL-7100" -#: src/main/xmli18n-tmp.h:571 +#: src/main/xmli18n-tmp.h:618 msgid "Fujitsu PrintPartner 10V" msgstr "Fujitsu PrintPartner 10V" -#: src/main/xmli18n-tmp.h:572 +#: src/main/xmli18n-tmp.h:619 msgid "Fujitsu PrintPartner 16DV" msgstr "Fujitsu PrintPartner 16DV" -#: src/main/xmli18n-tmp.h:573 +#: src/main/xmli18n-tmp.h:620 msgid "Fujitsu PrintPartner 20W" msgstr "Fujitsu PrintPartner 20W" -#: src/main/xmli18n-tmp.h:574 +#: src/main/xmli18n-tmp.h:621 msgid "Fujitsu PrintPartner 8000" msgstr "Fujitsu PrintPartner 8000" -#: src/main/xmli18n-tmp.h:575 +#: src/main/xmli18n-tmp.h:622 msgid "Generic PCL 4 Printer" msgstr "Ãltalános PCL 4 nyomtató" -#: src/main/xmli18n-tmp.h:576 +#: src/main/xmli18n-tmp.h:623 +#, fuzzy +msgid "Generic PCL 4 LF Printer" +msgstr "Ãltalános PCL 4 nyomtató" + +#: src/main/xmli18n-tmp.h:624 msgid "Generic PCL 5 Printer" msgstr "Ãltalános PCL 5 nyomtató" -#: src/main/xmli18n-tmp.h:577 +#: src/main/xmli18n-tmp.h:625 +#, fuzzy +msgid "Generic PCL 5 LF Printer" +msgstr "Ãltalános PCL 5 nyomtató" + +#: src/main/xmli18n-tmp.h:626 msgid "Generic PCL 5c Printer" msgstr "Ãltalános PCL 5c nyomtató" -#: src/main/xmli18n-tmp.h:578 +#: src/main/xmli18n-tmp.h:627 +#, fuzzy +msgid "Generic PCL 5c LF Printer" +msgstr "Ãltalános PCL 5c nyomtató" + +#: src/main/xmli18n-tmp.h:628 msgid "Generic PCL 5e Printer" msgstr "Ãltalános PCL 5e nyomtató" -#: src/main/xmli18n-tmp.h:579 +#: src/main/xmli18n-tmp.h:629 +#, fuzzy +msgid "Generic PCL 5e LF Printer" +msgstr "Ãltalános PCL 5e nyomtató" + +#: src/main/xmli18n-tmp.h:630 msgid "Generic PCL 6/PCL XL Printer" msgstr "Ãltalános PCL 6/PCL XL nyomtató" -#: src/main/xmli18n-tmp.h:580 +#: src/main/xmli18n-tmp.h:631 +#, fuzzy +msgid "Generic PCL 6/PCL XL LF Printer" +msgstr "Ãltalános PCL 6/PCL XL nyomtató" + +#: src/main/xmli18n-tmp.h:632 msgid "HP Business Inkjet 2200" msgstr "HP Business Inkjet 2200" -#: src/main/xmli18n-tmp.h:581 +#: src/main/xmli18n-tmp.h:633 msgid "HP Business Inkjet 2230" msgstr "HP Business Inkjet 2230" -#: src/main/xmli18n-tmp.h:582 +#: src/main/xmli18n-tmp.h:634 msgid "HP Business Inkjet 2250" msgstr "HP Business Inkjet 2250" -#: src/main/xmli18n-tmp.h:583 +#: src/main/xmli18n-tmp.h:635 msgid "HP Business Inkjet 2250TN" msgstr "HP Business Inkjet 2250TN" -#: src/main/xmli18n-tmp.h:584 +#: src/main/xmli18n-tmp.h:636 msgid "HP Business Inkjet 2280" msgstr "HP Business Inkjet 2280" -#: src/main/xmli18n-tmp.h:585 +#: src/main/xmli18n-tmp.h:637 msgid "HP Color Inkjet Printer CP1160" msgstr "HP Color Inkjet Printer CP1160" -#: src/main/xmli18n-tmp.h:586 +#: src/main/xmli18n-tmp.h:638 msgid "HP Color Inkjet Printer CP1700" msgstr "HP Color Inkjet Printer CP1700" -#: src/main/xmli18n-tmp.h:587 +#: src/main/xmli18n-tmp.h:639 msgid "HP Color LaserJet 2500" msgstr "HP Color LaserJet 2500" -#: src/main/xmli18n-tmp.h:588 +#: src/main/xmli18n-tmp.h:640 msgid "HP Color LaserJet 4500" msgstr "HP Color LaserJet 4500" -#: src/main/xmli18n-tmp.h:589 +#: src/main/xmli18n-tmp.h:641 msgid "HP Color LaserJet 4550" msgstr "HP Color LaserJet 4550" -#: src/main/xmli18n-tmp.h:590 +#: src/main/xmli18n-tmp.h:642 msgid "HP Color LaserJet 4600" msgstr "HP Color LaserJet 4600" -#: src/main/xmli18n-tmp.h:591 +#: src/main/xmli18n-tmp.h:643 msgid "HP Color LaserJet 5" msgstr "HP Color LaserJet 5" -#: src/main/xmli18n-tmp.h:592 +#: src/main/xmli18n-tmp.h:644 msgid "HP Color LaserJet 5000" msgstr "HP Color LaserJet 5000" -#: src/main/xmli18n-tmp.h:593 +#: src/main/xmli18n-tmp.h:645 msgid "HP Color LaserJet 5500" msgstr "HP Color LaserJet 5500" -#: src/main/xmli18n-tmp.h:594 +#: src/main/xmli18n-tmp.h:646 msgid "HP Color LaserJet 8550GN" msgstr "HP Color LaserJet 8550GN" -#: src/main/xmli18n-tmp.h:595 +#: src/main/xmli18n-tmp.h:647 msgid "HP DesignJet 230" msgstr "HP DesignJet 230" -#: src/main/xmli18n-tmp.h:596 +#: src/main/xmli18n-tmp.h:648 msgid "HP DesignJet 250C" msgstr "HP DesignJet 250C" -#: src/main/xmli18n-tmp.h:597 +#: src/main/xmli18n-tmp.h:649 msgid "HP DesignJet 430" msgstr "HP DesignJet 430" -#: src/main/xmli18n-tmp.h:598 +#: src/main/xmli18n-tmp.h:650 msgid "HP DesignJet 450C" msgstr "HP DesignJet 450C" -#: src/main/xmli18n-tmp.h:599 +#: src/main/xmli18n-tmp.h:651 msgid "HP DesignJet 455CA" msgstr "HP DesignJet 455CA" -#: src/main/xmli18n-tmp.h:600 +#: src/main/xmli18n-tmp.h:652 msgid "HP DesignJet 488CA" msgstr "HP DesignJet 488CA" -#: src/main/xmli18n-tmp.h:601 +#: src/main/xmli18n-tmp.h:653 msgid "HP DesignJet 700" msgstr "HP DesignJet 700" -#: src/main/xmli18n-tmp.h:602 +#: src/main/xmli18n-tmp.h:654 msgid "HP DesignJet 750C Plus" msgstr "HP DesignJet 750C Plus" -#: src/main/xmli18n-tmp.h:603 +#: src/main/xmli18n-tmp.h:655 msgid "HP DesignJet 750C" msgstr "HP DesignJet 750C" -#: src/main/xmli18n-tmp.h:604 +#: src/main/xmli18n-tmp.h:656 msgid "HP DesignJet 2500CP" msgstr "HP DesignJet 2500CP" -#: src/main/xmli18n-tmp.h:605 +#: src/main/xmli18n-tmp.h:657 msgid "HP DesignJet 3500CP" msgstr "HP DesignJet 3500CP" -#: src/main/xmli18n-tmp.h:606 +#: src/main/xmli18n-tmp.h:658 msgid "HP DesignJet ColorPro CAD" msgstr "HP DesignJet ColorPro CAD" -#: src/main/xmli18n-tmp.h:607 +#: src/main/xmli18n-tmp.h:659 msgid "HP DeskJet 400" msgstr "HP DeskJet 400" -#: src/main/xmli18n-tmp.h:608 +#: src/main/xmli18n-tmp.h:660 msgid "HP DeskJet 420C" msgstr "HP DeskJet 420C" -#: src/main/xmli18n-tmp.h:609 +#: src/main/xmli18n-tmp.h:661 msgid "HP DeskJet 450" msgstr "HP DeskJet 450" -#: src/main/xmli18n-tmp.h:610 +#: src/main/xmli18n-tmp.h:662 msgid "HP DeskJet 500" msgstr "HP DeskJet 500" -#: src/main/xmli18n-tmp.h:611 +#: src/main/xmli18n-tmp.h:663 msgid "HP DeskJet 500C" msgstr "HP DeskJet 500C" -#: src/main/xmli18n-tmp.h:612 +#: src/main/xmli18n-tmp.h:664 msgid "HP DeskJet 505J Plus" msgstr "HP DeskJet 505J Plus" -#: src/main/xmli18n-tmp.h:613 +#: src/main/xmli18n-tmp.h:665 msgid "HP DeskJet 510" msgstr "HP DeskJet 510" -#: src/main/xmli18n-tmp.h:614 +#: src/main/xmli18n-tmp.h:666 msgid "HP DeskJet 520" msgstr "HP DeskJet 520" -#: src/main/xmli18n-tmp.h:615 +#: src/main/xmli18n-tmp.h:667 msgid "HP DeskJet 540C" msgstr "HP DeskJet 540C" -#: src/main/xmli18n-tmp.h:616 +#: src/main/xmli18n-tmp.h:668 msgid "HP DeskJet 550C" msgstr "HP DeskJet 550C" -#: src/main/xmli18n-tmp.h:617 +#: src/main/xmli18n-tmp.h:669 msgid "HP DeskJet 5550" msgstr "HP DeskJet 5550" -#: src/main/xmli18n-tmp.h:618 +#: src/main/xmli18n-tmp.h:670 msgid "HP DeskJet 5551" msgstr "HP DeskJet 5551" -#: src/main/xmli18n-tmp.h:619 +#: src/main/xmli18n-tmp.h:671 msgid "HP DeskJet 560C" msgstr "HP DeskJet 560C" -#: src/main/xmli18n-tmp.h:620 +#: src/main/xmli18n-tmp.h:672 msgid "HP DeskJet 600" msgstr "HP DeskJet 600" -#: src/main/xmli18n-tmp.h:621 +#: src/main/xmli18n-tmp.h:673 msgid "HP DeskJet 600C" msgstr "HP DeskJet 600C" -#: src/main/xmli18n-tmp.h:622 +#: src/main/xmli18n-tmp.h:674 msgid "HP DeskJet 610C" msgstr "HP DeskJet 610C" -#: src/main/xmli18n-tmp.h:623 +#: src/main/xmli18n-tmp.h:675 msgid "HP DeskJet 610CL" msgstr "HP DeskJet 610CL" -#: src/main/xmli18n-tmp.h:624 +#: src/main/xmli18n-tmp.h:676 msgid "HP DeskJet 6122" msgstr "HP DeskJet 6122" -#: src/main/xmli18n-tmp.h:625 +#: src/main/xmli18n-tmp.h:677 msgid "HP DeskJet 6127" msgstr "HP DeskJet 6127" -#: src/main/xmli18n-tmp.h:626 +#: src/main/xmli18n-tmp.h:678 msgid "HP DeskJet 612C" msgstr "HP DeskJet 612C" -#: src/main/xmli18n-tmp.h:627 +#: src/main/xmli18n-tmp.h:679 msgid "HP DeskJet 640C" msgstr "HP DeskJet 640C" -#: src/main/xmli18n-tmp.h:628 +#: src/main/xmli18n-tmp.h:680 msgid "HP DeskJet 648C" msgstr "HP DeskJet 648C" -#: src/main/xmli18n-tmp.h:629 +#: src/main/xmli18n-tmp.h:681 msgid "HP DeskJet 660C" msgstr "HP DeskJet 660C" -#: src/main/xmli18n-tmp.h:630 +#: src/main/xmli18n-tmp.h:682 msgid "HP DeskJet 670C" msgstr "HP DeskJet 670C" -#: src/main/xmli18n-tmp.h:631 +#: src/main/xmli18n-tmp.h:683 msgid "HP DeskJet 670TV" msgstr "HP DeskJet 670TV" -#: src/main/xmli18n-tmp.h:632 +#: src/main/xmli18n-tmp.h:684 msgid "HP DeskJet 672C" msgstr "HP DeskJet 672C" -#: src/main/xmli18n-tmp.h:633 +#: src/main/xmli18n-tmp.h:685 msgid "HP DeskJet 680C" msgstr "HP DeskJet 680C" -#: src/main/xmli18n-tmp.h:634 +#: src/main/xmli18n-tmp.h:686 msgid "HP DeskJet 682C" msgstr "HP DeskJet 682C" -#: src/main/xmli18n-tmp.h:635 +#: src/main/xmli18n-tmp.h:687 msgid "HP DeskJet 690C" msgstr "HP DeskJet 690C" -#: src/main/xmli18n-tmp.h:636 +#: src/main/xmli18n-tmp.h:688 msgid "HP DeskJet 692C" msgstr "HP DeskJet 692C" -#: src/main/xmli18n-tmp.h:637 +#: src/main/xmli18n-tmp.h:689 msgid "HP DeskJet 693C" msgstr "HP DeskJet 693C" -#: src/main/xmli18n-tmp.h:638 +#: src/main/xmli18n-tmp.h:690 msgid "HP DeskJet 694C" msgstr "HP DeskJet 694C" -#: src/main/xmli18n-tmp.h:639 +#: src/main/xmli18n-tmp.h:691 msgid "HP DeskJet 695C" msgstr "HP DeskJet 695C" -#: src/main/xmli18n-tmp.h:640 +#: src/main/xmli18n-tmp.h:692 msgid "HP DeskJet 697C" msgstr "HP DeskJet 697C" -#: src/main/xmli18n-tmp.h:641 +#: src/main/xmli18n-tmp.h:693 msgid "HP DeskJet 810C" msgstr "HP DeskJet 810C" -#: src/main/xmli18n-tmp.h:642 +#: src/main/xmli18n-tmp.h:694 msgid "HP DeskJet 812C" msgstr "HP DeskJet 812C" -#: src/main/xmli18n-tmp.h:643 +#: src/main/xmli18n-tmp.h:695 msgid "HP DeskJet 815C" msgstr "HP DeskJet 815C" -#: src/main/xmli18n-tmp.h:644 +#: src/main/xmli18n-tmp.h:696 msgid "HP DeskJet 816C" msgstr "HP DeskJet 816C" -#: src/main/xmli18n-tmp.h:645 +#: src/main/xmli18n-tmp.h:697 msgid "HP DeskJet 825C" msgstr "HP DeskJet 825C" -#: src/main/xmli18n-tmp.h:646 +#: src/main/xmli18n-tmp.h:698 msgid "HP DeskJet 830C" msgstr "HP DeskJet 830C" -#: src/main/xmli18n-tmp.h:647 +#: src/main/xmli18n-tmp.h:699 msgid "HP DeskJet 832C" msgstr "HP DeskJet 832C" -#: src/main/xmli18n-tmp.h:648 +#: src/main/xmli18n-tmp.h:700 msgid "HP DeskJet 840C" msgstr "HP DeskJet 840C" -#: src/main/xmli18n-tmp.h:649 +#: src/main/xmli18n-tmp.h:701 msgid "HP DeskJet 841C" msgstr "HP DeskJet 841C" -#: src/main/xmli18n-tmp.h:650 +#: src/main/xmli18n-tmp.h:702 msgid "HP DeskJet 842C" msgstr "HP DeskJet 842C" -#: src/main/xmli18n-tmp.h:651 +#: src/main/xmli18n-tmp.h:703 msgid "HP DeskJet 843C" msgstr "HP DeskJet 843C" -#: src/main/xmli18n-tmp.h:652 +#: src/main/xmli18n-tmp.h:704 msgid "HP DeskJet 845C" msgstr "HP DeskJet 845C" -#: src/main/xmli18n-tmp.h:653 +#: src/main/xmli18n-tmp.h:705 msgid "HP DeskJet 850C" msgstr "HP DeskJet 850C" -#: src/main/xmli18n-tmp.h:654 +#: src/main/xmli18n-tmp.h:706 msgid "HP DeskJet 855C" msgstr "HP DeskJet 855C" -#: src/main/xmli18n-tmp.h:655 +#: src/main/xmli18n-tmp.h:707 msgid "HP DeskJet 870C" msgstr "HP DeskJet 870C" -#: src/main/xmli18n-tmp.h:656 +#: src/main/xmli18n-tmp.h:708 msgid "HP DeskJet 880C" msgstr "HP DeskJet 880C" -#: src/main/xmli18n-tmp.h:657 +#: src/main/xmli18n-tmp.h:709 msgid "HP DeskJet 882C" msgstr "HP DeskJet 882C" -#: src/main/xmli18n-tmp.h:658 +#: src/main/xmli18n-tmp.h:710 msgid "HP DeskJet 890C" msgstr "HP DeskJet 890C" -#: src/main/xmli18n-tmp.h:659 +#: src/main/xmli18n-tmp.h:711 msgid "HP DeskJet 895C" msgstr "HP DeskJet 895C" -#: src/main/xmli18n-tmp.h:660 +#: src/main/xmli18n-tmp.h:712 msgid "HP DeskJet 916C" msgstr "HP DeskJet 916C" -#: src/main/xmli18n-tmp.h:661 +#: src/main/xmli18n-tmp.h:713 msgid "HP DeskJet 920C" msgstr "HP DeskJet 920C" -#: src/main/xmli18n-tmp.h:662 +#: src/main/xmli18n-tmp.h:714 msgid "HP DeskJet 9300" msgstr "HP DeskJet 9300" -#: src/main/xmli18n-tmp.h:663 +#: src/main/xmli18n-tmp.h:715 msgid "HP DeskJet 930C" msgstr "HP DeskJet 930C" -#: src/main/xmli18n-tmp.h:664 +#: src/main/xmli18n-tmp.h:716 msgid "HP DeskJet 932C" msgstr "HP DeskJet 932C" -#: src/main/xmli18n-tmp.h:665 +#: src/main/xmli18n-tmp.h:717 msgid "HP DeskJet 933C" msgstr "HP DeskJet 933C" -#: src/main/xmli18n-tmp.h:666 +#: src/main/xmli18n-tmp.h:718 msgid "HP DeskJet 934C" msgstr "HP DeskJet 934C" -#: src/main/xmli18n-tmp.h:667 +#: src/main/xmli18n-tmp.h:719 msgid "HP DeskJet 935C" msgstr "HP DeskJet 935C" -#: src/main/xmli18n-tmp.h:668 +#: src/main/xmli18n-tmp.h:720 msgid "HP DeskJet 940C" msgstr "HP DeskJet 940C" -#: src/main/xmli18n-tmp.h:669 +#: src/main/xmli18n-tmp.h:721 msgid "HP DeskJet 948C" msgstr "HP DeskJet 948C" -#: src/main/xmli18n-tmp.h:670 +#: src/main/xmli18n-tmp.h:722 msgid "HP DeskJet 950C" msgstr "HP DeskJet 950C" -#: src/main/xmli18n-tmp.h:671 +#: src/main/xmli18n-tmp.h:723 msgid "HP DeskJet 952C" msgstr "HP DeskJet 952C" -#: src/main/xmli18n-tmp.h:672 +#: src/main/xmli18n-tmp.h:724 msgid "HP DeskJet 955C" msgstr "HP DeskJet 955C" -#: src/main/xmli18n-tmp.h:673 +#: src/main/xmli18n-tmp.h:725 msgid "HP DeskJet 957C" msgstr "HP DeskJet 957C" -#: src/main/xmli18n-tmp.h:674 +#: src/main/xmli18n-tmp.h:726 msgid "HP DeskJet 959C" msgstr "HP DeskJet 959C" -#: src/main/xmli18n-tmp.h:675 +#: src/main/xmli18n-tmp.h:727 msgid "HP DeskJet 960C" msgstr "HP DeskJet 960C" -#: src/main/xmli18n-tmp.h:676 +#: src/main/xmli18n-tmp.h:728 msgid "HP DeskJet 970C" msgstr "HP DeskJet 970C" -#: src/main/xmli18n-tmp.h:677 +#: src/main/xmli18n-tmp.h:729 msgid "HP DeskJet 975C" msgstr "HP DeskJet 975C" -#: src/main/xmli18n-tmp.h:678 +#: src/main/xmli18n-tmp.h:730 msgid "HP DeskJet 980C" msgstr "HP DeskJet 980C" -#: src/main/xmli18n-tmp.h:679 +#: src/main/xmli18n-tmp.h:731 msgid "HP DeskJet 990C" msgstr "HP DeskJet 990C" -#: src/main/xmli18n-tmp.h:680 +#: src/main/xmli18n-tmp.h:732 msgid "HP DeskJet 995C" msgstr "HP DeskJet 995C" -#: src/main/xmli18n-tmp.h:681 +#: src/main/xmli18n-tmp.h:733 msgid "HP DeskJet 1100C" msgstr "HP DeskJet 1100C" -#: src/main/xmli18n-tmp.h:682 +#: src/main/xmli18n-tmp.h:734 msgid "HP DeskJet 1120C" msgstr "HP DeskJet 1120C" -#: src/main/xmli18n-tmp.h:683 +#: src/main/xmli18n-tmp.h:735 msgid "HP DeskJet 1125C" msgstr "HP DeskJet 1125C" -#: src/main/xmli18n-tmp.h:684 +#: src/main/xmli18n-tmp.h:736 msgid "HP DeskJet 1200C" msgstr "HP DeskJet 1200C" -#: src/main/xmli18n-tmp.h:685 +#: src/main/xmli18n-tmp.h:737 msgid "HP DeskJet 1220C" msgstr "HP DeskJet 1220C" -#: src/main/xmli18n-tmp.h:686 +#: src/main/xmli18n-tmp.h:738 msgid "HP DeskJet 1600C" msgstr "HP DeskJet 1600C" -#: src/main/xmli18n-tmp.h:687 +#: src/main/xmli18n-tmp.h:739 msgid "HP DeskJet 1600CM" msgstr "HP DeskJet 1600CM" -#: src/main/xmli18n-tmp.h:688 +#: src/main/xmli18n-tmp.h:740 msgid "HP DeskJet 2000" msgstr "HP DeskJet 2000" -#: src/main/xmli18n-tmp.h:689 +#: src/main/xmli18n-tmp.h:741 msgid "HP DeskJet 2500" msgstr "HP DeskJet 2500" -#: src/main/xmli18n-tmp.h:690 +#: src/main/xmli18n-tmp.h:742 msgid "HP DeskJet 2500CM" msgstr "HP DeskJet 2500CM" -#: src/main/xmli18n-tmp.h:691 +#: src/main/xmli18n-tmp.h:743 msgid "HP DeskJet 340C" msgstr "HP DeskJet 340C" -#: src/main/xmli18n-tmp.h:692 +#: src/main/xmli18n-tmp.h:744 msgid "HP DeskJet 3810" msgstr "HP DeskJet 3810" -#: src/main/xmli18n-tmp.h:693 +#: src/main/xmli18n-tmp.h:745 msgid "HP DeskJet 3816" msgstr "HP DeskJet 3816" -#: src/main/xmli18n-tmp.h:694 +#: src/main/xmli18n-tmp.h:746 msgid "HP DeskJet 3820" msgstr "HP DeskJet 3820" -#: src/main/xmli18n-tmp.h:695 +#: src/main/xmli18n-tmp.h:747 msgid "HP DeskJet 3822" msgstr "HP DeskJet 3822" -#: src/main/xmli18n-tmp.h:696 +#: src/main/xmli18n-tmp.h:748 msgid "HP LaserJet 2" msgstr "HP LaserJet 2" -#: src/main/xmli18n-tmp.h:697 +#: src/main/xmli18n-tmp.h:749 msgid "HP LaserJet 2D" msgstr "HP LaserJet 2D" -#: src/main/xmli18n-tmp.h:698 +#: src/main/xmli18n-tmp.h:750 msgid "HP LaserJet 2P Plus" msgstr "HP LaserJet 2P Plus" -#: src/main/xmli18n-tmp.h:699 +#: src/main/xmli18n-tmp.h:751 msgid "HP LaserJet 2P" msgstr "HP LaserJet 2P" -#: src/main/xmli18n-tmp.h:700 +#: src/main/xmli18n-tmp.h:752 msgid "HP LaserJet 3" msgstr "HP LaserJet 3" -#: src/main/xmli18n-tmp.h:701 +#: src/main/xmli18n-tmp.h:753 msgid "HP LaserJet 3D" msgstr "HP LaserJet 3D" -#: src/main/xmli18n-tmp.h:702 +#: src/main/xmli18n-tmp.h:754 msgid "HP LaserJet 3P w/ PCL5" msgstr "HP LaserJet 3P PCL5 támogatással" -#: src/main/xmli18n-tmp.h:703 +#: src/main/xmli18n-tmp.h:755 msgid "HP LaserJet 3P w/PS" msgstr "HP LaserJet 3P PS támogatással" -#: src/main/xmli18n-tmp.h:704 +#: src/main/xmli18n-tmp.h:756 msgid "HP LaserJet 4 Plus" msgstr "HP LaserJet 4 Plus" -#: src/main/xmli18n-tmp.h:705 +#: src/main/xmli18n-tmp.h:757 msgid "HP LaserJet 4" msgstr "HP LaserJet 4" -#: src/main/xmli18n-tmp.h:706 +#: src/main/xmli18n-tmp.h:758 msgid "HP LaserJet 4L" msgstr "HP LaserJet 4L" -#: src/main/xmli18n-tmp.h:707 +#: src/main/xmli18n-tmp.h:759 msgid "HP LaserJet 4M" msgstr "HP LaserJet 4M" -#: src/main/xmli18n-tmp.h:708 +#: src/main/xmli18n-tmp.h:760 msgid "HP LaserJet 4ML" msgstr "HP LaserJet 4ML" -#: src/main/xmli18n-tmp.h:709 +#: src/main/xmli18n-tmp.h:761 msgid "HP LaserJet 4P" msgstr "HP LaserJet 4P" -#: src/main/xmli18n-tmp.h:710 +#: src/main/xmli18n-tmp.h:762 msgid "HP LaserJet 4Si" msgstr "HP LaserJet 4Si" -#: src/main/xmli18n-tmp.h:711 +#: src/main/xmli18n-tmp.h:763 msgid "HP LaserJet 4V" msgstr "HP LaserJet 4V" -#: src/main/xmli18n-tmp.h:712 +#: src/main/xmli18n-tmp.h:764 msgid "HP LaserJet 5" msgstr "HP LaserJet 5" -#: src/main/xmli18n-tmp.h:713 +#: src/main/xmli18n-tmp.h:765 msgid "HP LaserJet 5L" msgstr "HP LaserJet 5L" -#: src/main/xmli18n-tmp.h:714 +#: src/main/xmli18n-tmp.h:766 msgid "HP LaserJet 5M" msgstr "HP LaserJet 5M" -#: src/main/xmli18n-tmp.h:715 +#: src/main/xmli18n-tmp.h:767 msgid "HP LaserJet 5MP" msgstr "HP LaserJet 5MP" -#: src/main/xmli18n-tmp.h:716 +#: src/main/xmli18n-tmp.h:768 msgid "HP LaserJet 5P" msgstr "HP LaserJet 5P" -#: src/main/xmli18n-tmp.h:717 +#: src/main/xmli18n-tmp.h:769 msgid "HP LaserJet 5Si" msgstr "HP LaserJet 5Si" -#: src/main/xmli18n-tmp.h:718 +#: src/main/xmli18n-tmp.h:770 msgid "HP LaserJet 6" msgstr "HP LaserJet 6" -#: src/main/xmli18n-tmp.h:719 +#: src/main/xmli18n-tmp.h:771 msgid "HP LaserJet 6L" msgstr "HP LaserJet 6L" -#: src/main/xmli18n-tmp.h:720 +#: src/main/xmli18n-tmp.h:772 msgid "HP LaserJet 6MP" msgstr "HP LaserJet 6MP" -#: src/main/xmli18n-tmp.h:721 +#: src/main/xmli18n-tmp.h:773 msgid "HP LaserJet 6P" msgstr "HP LaserJet 6P" -#: src/main/xmli18n-tmp.h:722 +#: src/main/xmli18n-tmp.h:774 msgid "HP LaserJet 1010" msgstr "HP LaserJet 1010" -#: src/main/xmli18n-tmp.h:723 +#: src/main/xmli18n-tmp.h:775 msgid "HP LaserJet 1012" msgstr "HP LaserJet 1012" -#: src/main/xmli18n-tmp.h:724 +#: src/main/xmli18n-tmp.h:776 msgid "HP LaserJet 1015" msgstr "HP LaserJet 1015" -#: src/main/xmli18n-tmp.h:725 +#: src/main/xmli18n-tmp.h:777 #, fuzzy msgid "HP LaserJet 1022" msgstr "HP LaserJet 1012" -#: src/main/xmli18n-tmp.h:726 +#: src/main/xmli18n-tmp.h:778 msgid "HP LaserJet 1100" msgstr "HP LaserJet 1100" -#: src/main/xmli18n-tmp.h:727 +#: src/main/xmli18n-tmp.h:779 msgid "HP LaserJet 1100A" msgstr "HP LaserJet 1100A" -#: src/main/xmli18n-tmp.h:728 +#: src/main/xmli18n-tmp.h:780 msgid "HP LaserJet 1150" msgstr "HP LaserJet 1150" -#: src/main/xmli18n-tmp.h:729 +#: src/main/xmli18n-tmp.h:781 msgid "HP LaserJet 1200" msgstr "HP LaserJet 1200" -#: src/main/xmli18n-tmp.h:730 +#: src/main/xmli18n-tmp.h:782 msgid "HP LaserJet 1220" msgstr "HP LaserJet 1220" -#: src/main/xmli18n-tmp.h:731 +#: src/main/xmli18n-tmp.h:783 msgid "HP LaserJet 1300" msgstr "HP LaserJet 1300" -#: src/main/xmli18n-tmp.h:732 +#: src/main/xmli18n-tmp.h:784 msgid "HP LaserJet 2100" msgstr "HP LaserJet 2100" -#: src/main/xmli18n-tmp.h:733 +#: src/main/xmli18n-tmp.h:785 msgid "HP LaserJet 2100M" msgstr "HP LaserJet 2100M" -#: src/main/xmli18n-tmp.h:734 +#: src/main/xmli18n-tmp.h:786 msgid "HP LaserJet 2200" msgstr "HP LaserJet 2200" -#: src/main/xmli18n-tmp.h:735 +#: src/main/xmli18n-tmp.h:787 msgid "HP LaserJet 2300" msgstr "HP LaserJet 2300" -#: src/main/xmli18n-tmp.h:736 +#: src/main/xmli18n-tmp.h:788 msgid "HP LaserJet 3200" msgstr "HP LaserJet 3200" -#: src/main/xmli18n-tmp.h:737 +#: src/main/xmli18n-tmp.h:789 msgid "HP LaserJet 3200m" msgstr "HP LaserJet 3200m" -#: src/main/xmli18n-tmp.h:738 +#: src/main/xmli18n-tmp.h:790 msgid "HP LaserJet 3200se" msgstr "HP LaserJet 3200se" -#: src/main/xmli18n-tmp.h:739 +#: src/main/xmli18n-tmp.h:791 msgid "HP LaserJet 3300 MFP" msgstr "HP LaserJet 3300 MFP" -#: src/main/xmli18n-tmp.h:740 +#: src/main/xmli18n-tmp.h:792 msgid "HP LaserJet 3310 MFP" msgstr "HP LaserJet 3310 MFP" -#: src/main/xmli18n-tmp.h:741 +#: src/main/xmli18n-tmp.h:793 msgid "HP LaserJet 3320 MFP" msgstr "HP LaserJet 3320 MFP" -#: src/main/xmli18n-tmp.h:742 +#: src/main/xmli18n-tmp.h:794 msgid "HP LaserJet 3320N MFP" msgstr "HP LaserJet 3320N MFP" -#: src/main/xmli18n-tmp.h:743 +#: src/main/xmli18n-tmp.h:795 msgid "HP LaserJet 3330 MFP" msgstr "HP LaserJet 3330 MFP" -#: src/main/xmli18n-tmp.h:744 +#: src/main/xmli18n-tmp.h:796 msgid "HP LaserJet 4000" msgstr "HP LaserJet 4000" -#: src/main/xmli18n-tmp.h:745 +#: src/main/xmli18n-tmp.h:797 msgid "HP LaserJet 4050" msgstr "HP LaserJet 4050" -#: src/main/xmli18n-tmp.h:746 +#: src/main/xmli18n-tmp.h:798 msgid "HP LaserJet 4100" msgstr "HP LaserJet 4100" -#: src/main/xmli18n-tmp.h:747 +#: src/main/xmli18n-tmp.h:799 msgid "HP LaserJet 4200" msgstr "HP LaserJet 4200" -#: src/main/xmli18n-tmp.h:748 +#: src/main/xmli18n-tmp.h:800 msgid "HP LaserJet 4300" msgstr "HP LaserJet 4300" -#: src/main/xmli18n-tmp.h:749 +#: src/main/xmli18n-tmp.h:801 msgid "HP LaserJet 5000" msgstr "HP LaserJet 5000" -#: src/main/xmli18n-tmp.h:750 +#: src/main/xmli18n-tmp.h:802 msgid "HP LaserJet 5100" msgstr "HP LaserJet 5100" -#: src/main/xmli18n-tmp.h:751 +#: src/main/xmli18n-tmp.h:803 msgid "HP LaserJet 8000" msgstr "HP LaserJet 8000" -#: src/main/xmli18n-tmp.h:752 +#: src/main/xmli18n-tmp.h:804 msgid "HP LaserJet 8100" msgstr "HP LaserJet 8100" -#: src/main/xmli18n-tmp.h:753 +#: src/main/xmli18n-tmp.h:805 msgid "HP LaserJet 8150" msgstr "HP LaserJet 8150" -#: src/main/xmli18n-tmp.h:754 +#: src/main/xmli18n-tmp.h:806 msgid "HP LaserJet 9000" msgstr "HP LaserJet 9000" -#: src/main/xmli18n-tmp.h:755 +#: src/main/xmli18n-tmp.h:807 msgid "HP Mopier 240" msgstr "HP Mopier 240" -#: src/main/xmli18n-tmp.h:756 +#: src/main/xmli18n-tmp.h:808 msgid "HP Mopier 320" msgstr "HP Mopier 320" -#: src/main/xmli18n-tmp.h:757 +#: src/main/xmli18n-tmp.h:809 msgid "HP OfficeJet 300" msgstr "HP OfficeJet 300" -#: src/main/xmli18n-tmp.h:758 +#: src/main/xmli18n-tmp.h:810 msgid "HP OfficeJet 330" msgstr "HP OfficeJet 330" -#: src/main/xmli18n-tmp.h:759 +#: src/main/xmli18n-tmp.h:811 msgid "HP OfficeJet 350" msgstr "HP OfficeJet 350" -#: src/main/xmli18n-tmp.h:760 +#: src/main/xmli18n-tmp.h:812 msgid "HP OfficeJet 500" msgstr "HP OfficeJet 500" -#: src/main/xmli18n-tmp.h:761 +#: src/main/xmli18n-tmp.h:813 msgid "HP OfficeJet 520" msgstr "HP OfficeJet 520" -#: src/main/xmli18n-tmp.h:762 +#: src/main/xmli18n-tmp.h:814 msgid "HP OfficeJet 570" msgstr "HP OfficeJet 570" -#: src/main/xmli18n-tmp.h:763 +#: src/main/xmli18n-tmp.h:815 msgid "HP OfficeJet 580" msgstr "HP OfficeJet 580" -#: src/main/xmli18n-tmp.h:764 +#: src/main/xmli18n-tmp.h:816 msgid "HP OfficeJet 590" msgstr "HP OfficeJet 590" -#: src/main/xmli18n-tmp.h:765 +#: src/main/xmli18n-tmp.h:817 msgid "HP OfficeJet 600" msgstr "HP OfficeJet 600" -#: src/main/xmli18n-tmp.h:766 +#: src/main/xmli18n-tmp.h:818 msgid "HP OfficeJet 610" msgstr "HP OfficeJet 610" -#: src/main/xmli18n-tmp.h:767 +#: src/main/xmli18n-tmp.h:819 msgid "HP OfficeJet 625" msgstr "HP OfficeJet 625" -#: src/main/xmli18n-tmp.h:768 +#: src/main/xmli18n-tmp.h:820 msgid "HP OfficeJet 630" msgstr "HP OfficeJet 630" -#: src/main/xmli18n-tmp.h:769 +#: src/main/xmli18n-tmp.h:821 msgid "HP OfficeJet 635" msgstr "HP OfficeJet 635" -#: src/main/xmli18n-tmp.h:770 +#: src/main/xmli18n-tmp.h:822 msgid "HP OfficeJet 700" msgstr "HP OfficeJet 700" -#: src/main/xmli18n-tmp.h:771 +#: src/main/xmli18n-tmp.h:823 msgid "HP OfficeJet 710" msgstr "HP OfficeJet 710" -#: src/main/xmli18n-tmp.h:772 +#: src/main/xmli18n-tmp.h:824 msgid "HP OfficeJet 720" msgstr "HP OfficeJet 720" -#: src/main/xmli18n-tmp.h:773 +#: src/main/xmli18n-tmp.h:825 msgid "HP OfficeJet 725" msgstr "HP OfficeJet 725" -#: src/main/xmli18n-tmp.h:774 +#: src/main/xmli18n-tmp.h:826 msgid "HP OfficeJet 5105" msgstr "HP OfficeJet 5105" -#: src/main/xmli18n-tmp.h:775 +#: src/main/xmli18n-tmp.h:827 msgid "HP OfficeJet 5110" msgstr "HP OfficeJet 5110" -#: src/main/xmli18n-tmp.h:776 +#: src/main/xmli18n-tmp.h:828 msgid "HP OfficeJet 5110xi" msgstr "HP OfficeJet 5110xi" -#: src/main/xmli18n-tmp.h:777 +#: src/main/xmli18n-tmp.h:829 msgid "HP OfficeJet 6105" msgstr "HP OfficeJet 6105" -#: src/main/xmli18n-tmp.h:778 +#: src/main/xmli18n-tmp.h:830 msgid "HP OfficeJet 6110" msgstr "HP OfficeJet 6110" -#: src/main/xmli18n-tmp.h:779 +#: src/main/xmli18n-tmp.h:831 msgid "HP OfficeJet 7110" msgstr "HP OfficeJet 7110" -#: src/main/xmli18n-tmp.h:780 +#: src/main/xmli18n-tmp.h:832 msgid "HP OfficeJet 7130" msgstr "HP OfficeJet 7130" -#: src/main/xmli18n-tmp.h:781 +#: src/main/xmli18n-tmp.h:833 msgid "HP OfficeJet 7140" msgstr "HP OfficeJet 7140" -#: src/main/xmli18n-tmp.h:782 +#: src/main/xmli18n-tmp.h:834 msgid "HP OfficeJet D125" msgstr "HP OfficeJet D125" -#: src/main/xmli18n-tmp.h:783 +#: src/main/xmli18n-tmp.h:835 msgid "HP OfficeJet D135" msgstr "HP OfficeJet D135" -#: src/main/xmli18n-tmp.h:784 +#: src/main/xmli18n-tmp.h:836 msgid "HP OfficeJet D145" msgstr "HP OfficeJet D145" -#: src/main/xmli18n-tmp.h:785 +#: src/main/xmli18n-tmp.h:837 msgid "HP OfficeJet D155" msgstr "HP OfficeJet D155" -#: src/main/xmli18n-tmp.h:786 +#: src/main/xmli18n-tmp.h:838 msgid "HP OfficeJet G55" msgstr "HP OfficeJet G55" -#: src/main/xmli18n-tmp.h:787 +#: src/main/xmli18n-tmp.h:839 msgid "HP OfficeJet G85" msgstr "HP OfficeJet G85" -#: src/main/xmli18n-tmp.h:788 +#: src/main/xmli18n-tmp.h:840 msgid "HP OfficeJet G95" msgstr "HP OfficeJet G95" -#: src/main/xmli18n-tmp.h:789 +#: src/main/xmli18n-tmp.h:841 msgid "HP OfficeJet K60" msgstr "HP OfficeJet K60" -#: src/main/xmli18n-tmp.h:790 +#: src/main/xmli18n-tmp.h:842 msgid "HP OfficeJet K60xi" msgstr "HP OfficeJet K60xi" -#: src/main/xmli18n-tmp.h:791 +#: src/main/xmli18n-tmp.h:843 msgid "HP OfficeJet K80" msgstr "HP OfficeJet K80" -#: src/main/xmli18n-tmp.h:792 +#: src/main/xmli18n-tmp.h:844 msgid "HP OfficeJet K80xi" msgstr "HP OfficeJet K80xi" -#: src/main/xmli18n-tmp.h:793 +#: src/main/xmli18n-tmp.h:845 msgid "HP OfficeJet LX" msgstr "HP OfficeJet LX" -#: src/main/xmli18n-tmp.h:794 +#: src/main/xmli18n-tmp.h:846 msgid "HP OfficeJet Pro 1150C" msgstr "HP OfficeJet Pro 1150C" -#: src/main/xmli18n-tmp.h:795 +#: src/main/xmli18n-tmp.h:847 msgid "HP OfficeJet Pro 1170C" msgstr "HP OfficeJet Pro 1170C" -#: src/main/xmli18n-tmp.h:796 +#: src/main/xmli18n-tmp.h:848 msgid "HP OfficeJet Pro 1175C" msgstr "HP OfficeJet Pro 1175C" -#: src/main/xmli18n-tmp.h:797 +#: src/main/xmli18n-tmp.h:849 msgid "HP OfficeJet R40" msgstr "HP OfficeJet R40" -#: src/main/xmli18n-tmp.h:798 +#: src/main/xmli18n-tmp.h:850 msgid "HP OfficeJet R45" msgstr "HP OfficeJet R45" -#: src/main/xmli18n-tmp.h:799 +#: src/main/xmli18n-tmp.h:851 msgid "HP OfficeJet R60" msgstr "HP OfficeJet R60" -#: src/main/xmli18n-tmp.h:800 +#: src/main/xmli18n-tmp.h:852 msgid "HP OfficeJet R65" msgstr "HP OfficeJet R65" -#: src/main/xmli18n-tmp.h:801 +#: src/main/xmli18n-tmp.h:853 msgid "HP OfficeJet R80" msgstr "HP OfficeJet R80" -#: src/main/xmli18n-tmp.h:802 +#: src/main/xmli18n-tmp.h:854 msgid "HP OfficeJet T45" msgstr "HP OfficeJet T45" -#: src/main/xmli18n-tmp.h:803 +#: src/main/xmli18n-tmp.h:855 msgid "HP OfficeJet T65" msgstr "HP OfficeJet T65" -#: src/main/xmli18n-tmp.h:804 +#: src/main/xmli18n-tmp.h:856 msgid "HP OfficeJet V40" msgstr "HP OfficeJet V40" -#: src/main/xmli18n-tmp.h:805 +#: src/main/xmli18n-tmp.h:857 msgid "HP OfficeJet V40xi" msgstr "HP OfficeJet V40xi" -#: src/main/xmli18n-tmp.h:806 +#: src/main/xmli18n-tmp.h:858 msgid "HP OfficeJet" msgstr "HP OfficeJet" -#: src/main/xmli18n-tmp.h:807 +#: src/main/xmli18n-tmp.h:859 msgid "HP PSC 370" msgstr "HP PSC 370" -#: src/main/xmli18n-tmp.h:808 +#: src/main/xmli18n-tmp.h:860 msgid "HP PSC 380" msgstr "HP PSC 380" -#: src/main/xmli18n-tmp.h:809 +#: src/main/xmli18n-tmp.h:861 msgid "HP PSC 500" msgstr "HP PSC 500" -#: src/main/xmli18n-tmp.h:810 +#: src/main/xmli18n-tmp.h:862 msgid "HP PSC 750" msgstr "HP PSC 750" -#: src/main/xmli18n-tmp.h:811 +#: src/main/xmli18n-tmp.h:863 msgid "HP PSC 950" msgstr "HP PSC 950" -#: src/main/xmli18n-tmp.h:812 +#: src/main/xmli18n-tmp.h:864 msgid "HP PSC 950xi" msgstr "HP PSC 950xi" -#: src/main/xmli18n-tmp.h:813 +#: src/main/xmli18n-tmp.h:865 msgid "HP PSC 2110" msgstr "HP PSC 2110" -#: src/main/xmli18n-tmp.h:814 +#: src/main/xmli18n-tmp.h:866 msgid "HP PSC 2150" msgstr "HP PSC 2150" -#: src/main/xmli18n-tmp.h:815 +#: src/main/xmli18n-tmp.h:867 msgid "HP PSC 2210" msgstr "HP PSC 2210" -#: src/main/xmli18n-tmp.h:816 +#: src/main/xmli18n-tmp.h:868 msgid "HP PhotoSmart 7150" msgstr "HP PhotoSmart 7150" -#: src/main/xmli18n-tmp.h:817 +#: src/main/xmli18n-tmp.h:869 msgid "HP PhotoSmart 7345" msgstr "HP PhotoSmart 7345" -#: src/main/xmli18n-tmp.h:818 +#: src/main/xmli18n-tmp.h:870 msgid "HP PhotoSmart 7350" msgstr "HP PhotoSmart 7350" -#: src/main/xmli18n-tmp.h:819 +#: src/main/xmli18n-tmp.h:871 msgid "HP PhotoSmart 7550" msgstr "HP PhotoSmart 7550" -#: src/main/xmli18n-tmp.h:820 +#: src/main/xmli18n-tmp.h:872 msgid "HP PhotoSmart P100" msgstr "HP PhotoSmart P100" -#: src/main/xmli18n-tmp.h:821 +#: src/main/xmli18n-tmp.h:873 msgid "HP PhotoSmart P130" msgstr "HP PhotoSmart P130" -#: src/main/xmli18n-tmp.h:822 +#: src/main/xmli18n-tmp.h:874 msgid "HP PhotoSmart P230" msgstr "HP PhotoSmart P230" -#: src/main/xmli18n-tmp.h:823 +#: src/main/xmli18n-tmp.h:875 msgid "HP PhotoSmart P1000" msgstr "HP PhotoSmart P1000" -#: src/main/xmli18n-tmp.h:824 +#: src/main/xmli18n-tmp.h:876 msgid "HP PhotoSmart P1100" msgstr "HP PhotoSmart P1100" -#: src/main/xmli18n-tmp.h:825 +#: src/main/xmli18n-tmp.h:877 msgid "HP PhotoSmart P1115" msgstr "HP PhotoSmart P1115" -#: src/main/xmli18n-tmp.h:826 +#: src/main/xmli18n-tmp.h:878 msgid "HP PhotoSmart P1215" msgstr "HP PhotoSmart P1215" -#: src/main/xmli18n-tmp.h:827 +#: src/main/xmli18n-tmp.h:879 msgid "HP PhotoSmart P1218" msgstr "HP PhotoSmart P1218" -#: src/main/xmli18n-tmp.h:828 +#: src/main/xmli18n-tmp.h:880 msgid "HP PhotoSmart P1315" msgstr "HP PhotoSmart P1315" -#: src/main/xmli18n-tmp.h:829 +#: src/main/xmli18n-tmp.h:881 msgid "HP e-printer e20" msgstr "HP e-printer e20" -#: src/main/xmli18n-tmp.h:830 +#: src/main/xmli18n-tmp.h:882 msgid "IBM 4019" msgstr "IBM 4019" -#: src/main/xmli18n-tmp.h:831 +#: src/main/xmli18n-tmp.h:883 msgid "IBM 4029 030 LaserPrinter 10" msgstr "IBM 4029 030 LaserPrinter 10" -#: src/main/xmli18n-tmp.h:832 +#: src/main/xmli18n-tmp.h:884 msgid "IBM 4312" msgstr "IBM 4312" -#: src/main/xmli18n-tmp.h:833 +#: src/main/xmli18n-tmp.h:885 msgid "IBM Infoprint 12" msgstr "IBM Infoprint 12" -#: src/main/xmli18n-tmp.h:834 +#: src/main/xmli18n-tmp.h:886 msgid "IBM Page Printer 3112" msgstr "IBM Page Printer 3112" -#: src/main/xmli18n-tmp.h:835 +#: src/main/xmli18n-tmp.h:887 msgid "Infotec 4651 MF" msgstr "Infotec 4651 MF" -#: src/main/xmli18n-tmp.h:836 +#: src/main/xmli18n-tmp.h:888 msgid "Kyocera F-1010" msgstr "Kyocera F-1010" -#: src/main/xmli18n-tmp.h:837 +#: src/main/xmli18n-tmp.h:889 msgid "Kyocera FS-600 - KPDL-2" msgstr "Kyocera FS-600 - KPDL-2" -#: src/main/xmli18n-tmp.h:838 +#: src/main/xmli18n-tmp.h:890 msgid "Kyocera FS-600" msgstr "Kyocera FS-600" -#: src/main/xmli18n-tmp.h:839 +#: src/main/xmli18n-tmp.h:891 msgid "Kyocera FS-680" msgstr "Kyocera FS-680" -#: src/main/xmli18n-tmp.h:840 +#: src/main/xmli18n-tmp.h:892 msgid "Kyocera FS-800" msgstr "Kyocera FS-800" -#: src/main/xmli18n-tmp.h:841 +#: src/main/xmli18n-tmp.h:893 msgid "Kyocera FS-1000" msgstr "Kyocera FS-1000" -#: src/main/xmli18n-tmp.h:842 +#: src/main/xmli18n-tmp.h:894 msgid "Kyocera FS-1000+" msgstr "Kyocera FS-1000+" -#: src/main/xmli18n-tmp.h:843 +#: src/main/xmli18n-tmp.h:895 msgid "Kyocera FS-1010" msgstr "Kyocera FS-1010" -#: src/main/xmli18n-tmp.h:844 +#: src/main/xmli18n-tmp.h:896 msgid "Kyocera FS-1050" msgstr "Kyocera FS-1050" -#: src/main/xmli18n-tmp.h:845 +#: src/main/xmli18n-tmp.h:897 msgid "Kyocera FS-1200" msgstr "Kyocera FS-1200" -#: src/main/xmli18n-tmp.h:846 +#: src/main/xmli18n-tmp.h:898 msgid "Kyocera FS-1600" msgstr "Kyocera FS-1600" -#: src/main/xmli18n-tmp.h:847 +#: src/main/xmli18n-tmp.h:899 msgid "Kyocera FS-1600+" msgstr "Kyocera FS-1600+" -#: src/main/xmli18n-tmp.h:848 +#: src/main/xmli18n-tmp.h:900 msgid "Kyocera FS-1700" msgstr "Kyocera FS-1700" -#: src/main/xmli18n-tmp.h:849 +#: src/main/xmli18n-tmp.h:901 msgid "Kyocera FS-1700+" msgstr "Kyocera FS-1700+" -#: src/main/xmli18n-tmp.h:850 +#: src/main/xmli18n-tmp.h:902 msgid "Kyocera FS-1750" msgstr "Kyocera FS-1750" -#: src/main/xmli18n-tmp.h:851 +#: src/main/xmli18n-tmp.h:903 msgid "Kyocera FS-1800" msgstr "Kyocera FS-1800" -#: src/main/xmli18n-tmp.h:852 +#: src/main/xmli18n-tmp.h:904 msgid "Kyocera FS-1800+" msgstr "Kyocera FS-1800+" -#: src/main/xmli18n-tmp.h:853 +#: src/main/xmli18n-tmp.h:905 msgid "Kyocera FS-1900" msgstr "Kyocera FS-1900" -#: src/main/xmli18n-tmp.h:854 +#: src/main/xmli18n-tmp.h:906 msgid "Kyocera FS-3500" msgstr "Kyocera FS-3500" -#: src/main/xmli18n-tmp.h:855 +#: src/main/xmli18n-tmp.h:907 msgid "Kyocera FS-3600" msgstr "Kyocera FS-3600" -#: src/main/xmli18n-tmp.h:856 +#: src/main/xmli18n-tmp.h:908 msgid "Kyocera FS-3600+" msgstr "Kyocera FS-3600+" -#: src/main/xmli18n-tmp.h:857 +#: src/main/xmli18n-tmp.h:909 msgid "Kyocera FS-3700" msgstr "Kyocera FS-3700" -#: src/main/xmli18n-tmp.h:858 +#: src/main/xmli18n-tmp.h:910 msgid "Kyocera FS-3700+" msgstr "Kyocera FS-3700+" -#: src/main/xmli18n-tmp.h:859 +#: src/main/xmli18n-tmp.h:911 msgid "Kyocera FS-3750" msgstr "Kyocera FS-3750" -#: src/main/xmli18n-tmp.h:860 +#: src/main/xmli18n-tmp.h:912 msgid "Kyocera FS-3800" msgstr "Kyocera FS-3800" -#: src/main/xmli18n-tmp.h:861 +#: src/main/xmli18n-tmp.h:913 msgid "Kyocera FS-5800C" msgstr "Kyocera FS-5800C" -#: src/main/xmli18n-tmp.h:862 +#: src/main/xmli18n-tmp.h:914 msgid "Kyocera FS-5900C" msgstr "Kyocera FS-5900C" -#: src/main/xmli18n-tmp.h:863 +#: src/main/xmli18n-tmp.h:915 msgid "Kyocera FS-6500" msgstr "Kyocera FS-6500" -#: src/main/xmli18n-tmp.h:864 +#: src/main/xmli18n-tmp.h:916 msgid "Kyocera FS-6500+" msgstr "Kyocera FS-6500+" -#: src/main/xmli18n-tmp.h:865 +#: src/main/xmli18n-tmp.h:917 msgid "Kyocera FS-6700" msgstr "Kyocera FS-6700" -#: src/main/xmli18n-tmp.h:866 +#: src/main/xmli18n-tmp.h:918 msgid "Kyocera FS-7000" msgstr "Kyocera FS-7000" -#: src/main/xmli18n-tmp.h:867 +#: src/main/xmli18n-tmp.h:919 msgid "Kyocera FS-7000+" msgstr "Kyocera FS-7000+" -#: src/main/xmli18n-tmp.h:868 +#: src/main/xmli18n-tmp.h:920 msgid "Kyocera FS-8000C" msgstr "Kyocera FS-8000C" -#: src/main/xmli18n-tmp.h:869 +#: src/main/xmli18n-tmp.h:921 msgid "Kyocera FS-9000" msgstr "Kyocera FS-9000" -#: src/main/xmli18n-tmp.h:870 +#: src/main/xmli18n-tmp.h:922 msgid "Kyocera FS-9100DN" msgstr "Kyocera FS-9100DN" -#: src/main/xmli18n-tmp.h:871 +#: src/main/xmli18n-tmp.h:923 msgid "Kyocera FS-9500DN" msgstr "Kyocera FS-9500DN" -#: src/main/xmli18n-tmp.h:872 +#: src/main/xmli18n-tmp.h:924 msgid "Kyocera KM-1530" msgstr "Kyocera KM-1530" -#: src/main/xmli18n-tmp.h:873 +#: src/main/xmli18n-tmp.h:925 msgid "Kyocera KM-1810" msgstr "Kyocera KM-1810" -#: src/main/xmli18n-tmp.h:874 +#: src/main/xmli18n-tmp.h:926 msgid "Kyocera KM-2030" msgstr "Kyocera KM-2030" -#: src/main/xmli18n-tmp.h:875 +#: src/main/xmli18n-tmp.h:927 msgid "Kyocera KM-2530" msgstr "Kyocera KM-2530" -#: src/main/xmli18n-tmp.h:876 +#: src/main/xmli18n-tmp.h:928 msgid "Kyocera KM-3530" msgstr "Kyocera KM-3530" -#: src/main/xmli18n-tmp.h:877 +#: src/main/xmli18n-tmp.h:929 msgid "Kyocera KM-4230" msgstr "Kyocera KM-4230" -#: src/main/xmli18n-tmp.h:878 +#: src/main/xmli18n-tmp.h:930 msgid "Kyocera KM-4530" msgstr "Kyocera KM-4530" -#: src/main/xmli18n-tmp.h:879 +#: src/main/xmli18n-tmp.h:931 msgid "Kyocera KM-5230" msgstr "Kyocera KM-5230" -#: src/main/xmli18n-tmp.h:880 +#: src/main/xmli18n-tmp.h:932 msgid "Kyocera KM-5530" msgstr "Kyocera KM-5530" -#: src/main/xmli18n-tmp.h:881 +#: src/main/xmli18n-tmp.h:933 msgid "Kyocera KM-6230" msgstr "Kyocera KM-6230" -#: src/main/xmli18n-tmp.h:882 +#: src/main/xmli18n-tmp.h:934 msgid "Lexmark 4076" msgstr "Lexmark 4076" -#: src/main/xmli18n-tmp.h:883 +#: src/main/xmli18n-tmp.h:935 msgid "Lexmark Optra E" msgstr "Lexmark Optra E" -#: src/main/xmli18n-tmp.h:884 +#: src/main/xmli18n-tmp.h:936 msgid "Lexmark Optra E+" msgstr "Lexmark Optra E+" -#: src/main/xmli18n-tmp.h:885 -#, fuzzy +#: src/main/xmli18n-tmp.h:937 msgid "Lexmark Optra E220" -msgstr "Lexmark Optra E" +msgstr "Lexmark Optra E220" -#: src/main/xmli18n-tmp.h:886 +#: src/main/xmli18n-tmp.h:938 msgid "Lexmark Valuewriter 300" msgstr "Lexmark Valuewriter 300" -#: src/main/xmli18n-tmp.h:887 +#: src/main/xmli18n-tmp.h:939 msgid "Minolta PagePro 6" msgstr "Minolta PagePro 6" -#: src/main/xmli18n-tmp.h:888 +#: src/main/xmli18n-tmp.h:940 msgid "Minolta PagePro 6e" msgstr "Minolta PagePro 6e" -#: src/main/xmli18n-tmp.h:889 +#: src/main/xmli18n-tmp.h:941 msgid "Minolta PagePro 6ex" msgstr "Minolta PagePro 6ex" -#: src/main/xmli18n-tmp.h:890 +#: src/main/xmli18n-tmp.h:942 msgid "Minolta PagePro 8" msgstr "Minolta PagePro 8" -#: src/main/xmli18n-tmp.h:891 +#: src/main/xmli18n-tmp.h:943 msgid "Minolta PagePro 8L" msgstr "Minolta PagePro 8L" -#: src/main/xmli18n-tmp.h:892 +#: src/main/xmli18n-tmp.h:944 msgid "Minolta PagePro 1100" msgstr "Minolta PagePro 1100" -#: src/main/xmli18n-tmp.h:893 +#: src/main/xmli18n-tmp.h:945 msgid "NEC SuperScript 660i" msgstr "NEC SuperScript 660i" -#: src/main/xmli18n-tmp.h:894 +#: src/main/xmli18n-tmp.h:946 msgid "NEC SuperScript 860" msgstr "NEC SuperScript 860" -#: src/main/xmli18n-tmp.h:895 +#: src/main/xmli18n-tmp.h:947 msgid "NEC SuperScript 870" msgstr "NEC SuperScript 870" -#: src/main/xmli18n-tmp.h:896 +#: src/main/xmli18n-tmp.h:948 msgid "NEC SuperScript 1260" msgstr "NEC SuperScript 1260" -#: src/main/xmli18n-tmp.h:897 +#: src/main/xmli18n-tmp.h:949 msgid "NEC SuperScript 1400" msgstr "NEC SuperScript 1400" -#: src/main/xmli18n-tmp.h:898 +#: src/main/xmli18n-tmp.h:950 msgid "NEC SuperScript 1800" msgstr "NEC SuperScript 1800" -#: src/main/xmli18n-tmp.h:899 +#: src/main/xmli18n-tmp.h:951 msgid "Okidata OL400" msgstr "Okidata OL400" -#: src/main/xmli18n-tmp.h:900 +#: src/main/xmli18n-tmp.h:952 msgid "Okidata OL400e" msgstr "Okidata OL400e" -#: src/main/xmli18n-tmp.h:901 +#: src/main/xmli18n-tmp.h:953 msgid "Okidata OL400ex" msgstr "Okidata OL400ex" -#: src/main/xmli18n-tmp.h:902 +#: src/main/xmli18n-tmp.h:954 msgid "Okidata OL410e" msgstr "Okidata OL410e" -#: src/main/xmli18n-tmp.h:903 +#: src/main/xmli18n-tmp.h:955 msgid "Okidata OL600e" msgstr "Okidata OL600e" -#: src/main/xmli18n-tmp.h:904 +#: src/main/xmli18n-tmp.h:956 msgid "Okidata OL610e/S" msgstr "Okidata OL610e/S" -#: src/main/xmli18n-tmp.h:905 +#: src/main/xmli18n-tmp.h:957 msgid "Okidata OL800" msgstr "Okidata OL800" -#: src/main/xmli18n-tmp.h:906 +#: src/main/xmli18n-tmp.h:958 msgid "Okidata OL810ex" msgstr "Okidata OL810ex" -#: src/main/xmli18n-tmp.h:907 +#: src/main/xmli18n-tmp.h:959 msgid "Okidata Okipage 6e" msgstr "Okidata Okipage 6e" -#: src/main/xmli18n-tmp.h:908 +#: src/main/xmli18n-tmp.h:960 msgid "Okidata Okipage 6ex" msgstr "Okidata Okipage 6ex" -#: src/main/xmli18n-tmp.h:909 +#: src/main/xmli18n-tmp.h:961 msgid "Okidata Okipage 8p" msgstr "Okidata Okipage 8p" -#: src/main/xmli18n-tmp.h:910 +#: src/main/xmli18n-tmp.h:962 msgid "Okidata Okipage 10e" msgstr "Okidata Okipage 10e" -#: src/main/xmli18n-tmp.h:911 +#: src/main/xmli18n-tmp.h:963 msgid "Okidata Okipage 10ex" msgstr "Okidata Okipage 10ex" -#: src/main/xmli18n-tmp.h:912 +#: src/main/xmli18n-tmp.h:964 msgid "Okidata Okipage 14ex" msgstr "Okidata Okipage 14ex" -#: src/main/xmli18n-tmp.h:913 +#: src/main/xmli18n-tmp.h:965 msgid "Okidata Super 6e" msgstr "Okidata Super 6e" -#: src/main/xmli18n-tmp.h:914 +#: src/main/xmli18n-tmp.h:966 msgid "Olivetti JP350S" msgstr "Olivetti JP350S" -#: src/main/xmli18n-tmp.h:915 +#: src/main/xmli18n-tmp.h:967 msgid "Olivetti PG 306" msgstr "Olivetti PG 306" -#: src/main/xmli18n-tmp.h:916 +#: src/main/xmli18n-tmp.h:968 msgid "PCPI 1030" msgstr "PCPI 1030" -#: src/main/xmli18n-tmp.h:917 +#: src/main/xmli18n-tmp.h:969 msgid "Panasonic KX-P4410" msgstr "Panasonic KX-P4410" -#: src/main/xmli18n-tmp.h:918 +#: src/main/xmli18n-tmp.h:970 msgid "Panasonic KX-P4450" msgstr "Panasonic KX-P4450" -#: src/main/xmli18n-tmp.h:919 +#: src/main/xmli18n-tmp.h:971 msgid "Panasonic KX-P6150" msgstr "Panasonic KX-P6150" -#: src/main/xmli18n-tmp.h:920 +#: src/main/xmli18n-tmp.h:972 msgid "Panasonic KX-P6500" msgstr "Panasonic KX-P6500" -#: src/main/xmli18n-tmp.h:921 +#: src/main/xmli18n-tmp.h:973 msgid "Raven LP-410" msgstr "Raven LP-410" -#: src/main/xmli18n-tmp.h:922 +#: src/main/xmli18n-tmp.h:974 msgid "Ricoh Aficio 220" msgstr "Ricoh Aficio 220" -#: src/main/xmli18n-tmp.h:923 +#: src/main/xmli18n-tmp.h:975 msgid "Ricoh Aficio 401" msgstr "Ricoh Aficio 401" -#: src/main/xmli18n-tmp.h:924 +#: src/main/xmli18n-tmp.h:976 msgid "Ricoh Aficio 700" msgstr "Ricoh Aficio 700" -#: src/main/xmli18n-tmp.h:925 +#: src/main/xmli18n-tmp.h:977 msgid "Samsung ML-85" msgstr "Samsung ML-85" -#: src/main/xmli18n-tmp.h:926 +#: src/main/xmli18n-tmp.h:978 msgid "Samsung ML-4600" msgstr "Samsung ML-4600" -#: src/main/xmli18n-tmp.h:927 +#: src/main/xmli18n-tmp.h:979 msgid "Samsung ML-5000a" msgstr "Samsung ML-5000a" -#: src/main/xmli18n-tmp.h:928 +#: src/main/xmli18n-tmp.h:980 msgid "Samsung ML-6000" msgstr "Samsung ML-6000" -#: src/main/xmli18n-tmp.h:929 +#: src/main/xmli18n-tmp.h:981 msgid "Samsung ML-6100" msgstr "Samsung ML-6100" -#: src/main/xmli18n-tmp.h:930 +#: src/main/xmli18n-tmp.h:982 msgid "Samsung ML-7000" msgstr "Samsung ML-7000" -#: src/main/xmli18n-tmp.h:931 +#: src/main/xmli18n-tmp.h:983 msgid "Samsung ML-7000N" msgstr "Samsung ML-7000N" -#: src/main/xmli18n-tmp.h:932 +#: src/main/xmli18n-tmp.h:984 msgid "Samsung ML-7000P" msgstr "Samsung ML-7000P" -#: src/main/xmli18n-tmp.h:933 +#: src/main/xmli18n-tmp.h:985 msgid "Samsung ML-7050" msgstr "Samsung ML-7050" -#: src/main/xmli18n-tmp.h:934 +#: src/main/xmli18n-tmp.h:986 msgid "Samsung QL-5100A" msgstr "Samsung QL-5100A" -#: src/main/xmli18n-tmp.h:935 +#: src/main/xmli18n-tmp.h:987 msgid "Samsung QL-6050" msgstr "Samsung QL-6050" -#: src/main/xmli18n-tmp.h:936 +#: src/main/xmli18n-tmp.h:988 msgid "Seiko SpeedJET 200" msgstr "Seiko SpeedJET 200" -#: src/main/xmli18n-tmp.h:937 +#: src/main/xmli18n-tmp.h:989 msgid "Sharp AR-161" msgstr "Sharp AR-161" -#: src/main/xmli18n-tmp.h:938 +#: src/main/xmli18n-tmp.h:990 #, fuzzy msgid "Sharp AR-M257" msgstr "Sharp AR-161" -#: src/main/xmli18n-tmp.h:939 +#: src/main/xmli18n-tmp.h:991 msgid "Sony IJP-V100" msgstr "Sony IJP-V100" -#: src/main/xmli18n-tmp.h:940 +#: src/main/xmli18n-tmp.h:992 msgid "Star LS-04" msgstr "Star LS-04" -#: src/main/xmli18n-tmp.h:941 +#: src/main/xmli18n-tmp.h:993 msgid "Star LaserPrinter 8" msgstr "Star LaserPrinter 8" -#: src/main/xmli18n-tmp.h:942 +#: src/main/xmli18n-tmp.h:994 msgid "Tally MT908" msgstr "Tally MT908" -#: src/main/xmli18n-tmp.h:943 +#: src/main/xmli18n-tmp.h:995 msgid "Xerox Able 1406" msgstr "Xerox Able 1406" -#: src/main/xmli18n-tmp.h:944 +#: src/main/xmli18n-tmp.h:996 msgid "Xerox DocuPrint 4508" msgstr "Xerox DocuPrint 4508" -#: src/main/xmli18n-tmp.h:945 +#: src/main/xmli18n-tmp.h:997 msgid "Xerox DocuPrint C20" msgstr "Xerox DocuPrint C20" -#: src/main/xmli18n-tmp.h:946 +#: src/main/xmli18n-tmp.h:998 msgid "Xerox DocuPrint N4512" msgstr "Xerox DocuPrint N4512" -#: src/main/xmli18n-tmp.h:947 +#: src/main/xmli18n-tmp.h:999 msgid "Xerox DocuPrint N4512PS" msgstr "Xerox DocuPrint N4512PS" -#: src/main/xmli18n-tmp.h:948 +#: src/main/xmli18n-tmp.h:1000 msgid "Xerox DocuPrint P12" msgstr "Xerox DocuPrint P12" -#: src/main/xmli18n-tmp.h:949 +#: src/main/xmli18n-tmp.h:1001 msgid "Xerox DocuPrint P1202" msgstr "Xerox DocuPrint P1202" -#: src/main/xmli18n-tmp.h:950 +#: src/main/xmli18n-tmp.h:1002 msgid "Xerox DocuPrint P8e" msgstr "Xerox DocuPrint P8e" -#: src/main/xmli18n-tmp.h:951 +#: src/main/xmli18n-tmp.h:1003 msgid "Xerox Document Centre 400" msgstr "Xerox Document Centre 400" -#: src/main/xmli18n-tmp.h:952 -#, fuzzy -msgid "Xerox WorkCentre M118" -msgstr "Xerox Document Centre 400" - -#: src/main/xmli18n-tmp.h:953 +#: src/main/xmli18n-tmp.h:1004 +msgid "Xerox WorkCentre M118" +msgstr "Xerox WorkCentre M118" + +#: src/main/xmli18n-tmp.h:1005 msgid "Compaq IJ1200" -msgstr "" +msgstr "Compaq IJ1200" -#: src/main/xmli18n-tmp.h:954 -#, fuzzy +#: src/main/xmli18n-tmp.h:1006 msgid "Lexmark X73" -msgstr "Lexmark Z43" +msgstr "Lexmark X73" -#: src/main/xmli18n-tmp.h:955 +#: src/main/xmli18n-tmp.h:1007 msgid "Lexmark Z42" msgstr "Lexmark Z42" -#: src/main/xmli18n-tmp.h:956 +#: src/main/xmli18n-tmp.h:1008 msgid "Lexmark Z43" msgstr "Lexmark Z43" -#: src/main/xmli18n-tmp.h:957 +#: src/main/xmli18n-tmp.h:1009 msgid "Lexmark Z52" msgstr "Lexmark Z52" -#: src/main/xmli18n-tmp.h:958 +#: src/main/xmli18n-tmp.h:1010 msgid "Lexmark Z53" msgstr "Lexmark Z53" -#: src/main/xmli18n-tmp.h:959 +#: src/main/xmli18n-tmp.h:1011 msgid "Olympus P-10" msgstr "Olympus P-10" -#: src/main/xmli18n-tmp.h:960 +#: src/main/xmli18n-tmp.h:1012 msgid "Olympus P-11" msgstr "Olympus P-11" -#: src/main/xmli18n-tmp.h:961 +#: src/main/xmli18n-tmp.h:1013 msgid "Olympus P-200" msgstr "Olympus P-200" -#: src/main/xmli18n-tmp.h:962 +#: src/main/xmli18n-tmp.h:1014 msgid "Olympus P-300" msgstr "Olympus P-300" -#: src/main/xmli18n-tmp.h:963 +#: src/main/xmli18n-tmp.h:1015 msgid "Olympus P-300E" msgstr "Olympus P-300E" -#: src/main/xmli18n-tmp.h:964 +#: src/main/xmli18n-tmp.h:1016 msgid "Olympus P-300U" msgstr "Olympus P-300U" -#: src/main/xmli18n-tmp.h:965 +#: src/main/xmli18n-tmp.h:1017 msgid "Olympus P-330E" msgstr "Olympus P-330E" -#: src/main/xmli18n-tmp.h:966 +#: src/main/xmli18n-tmp.h:1018 msgid "Olympus P-330NE" msgstr "Olympus P-330NE" -#: src/main/xmli18n-tmp.h:967 +#: src/main/xmli18n-tmp.h:1019 msgid "Olympus P-400" msgstr "Olympus P-400" -#: src/main/xmli18n-tmp.h:968 +#: src/main/xmli18n-tmp.h:1020 msgid "Olympus P-440" msgstr "Olympus P-440" -#: src/main/xmli18n-tmp.h:969 -#, fuzzy +#: src/main/xmli18n-tmp.h:1021 msgid "Olympus P-S100" -msgstr "Olympus P-10" +msgstr "Olympus P-S100" -#: src/main/xmli18n-tmp.h:970 -#, fuzzy +#: src/main/xmli18n-tmp.h:1022 msgid "Canon CP-10" -msgstr "Canon CP-100" +msgstr "Canon CP-10" -#: src/main/xmli18n-tmp.h:971 +#: src/main/xmli18n-tmp.h:1023 msgid "Canon CP-100" msgstr "Canon CP-100" -#: src/main/xmli18n-tmp.h:972 +#: src/main/xmli18n-tmp.h:1024 msgid "Canon CP-200" msgstr "Canon CP-200" -#: src/main/xmli18n-tmp.h:973 +#: src/main/xmli18n-tmp.h:1025 msgid "Canon CP-220" msgstr "Canon CP-220" -#: src/main/xmli18n-tmp.h:974 +#: src/main/xmli18n-tmp.h:1026 msgid "Canon CP-300" msgstr "Canon CP-300" -#: src/main/xmli18n-tmp.h:975 +#: src/main/xmli18n-tmp.h:1027 msgid "Canon CP-330" msgstr "Canon CP-330" -#: src/main/xmli18n-tmp.h:976 +#: src/main/xmli18n-tmp.h:1028 msgid "Canon SELPHY-CP-400" msgstr "Canon SELPHY-CP-400" -#: src/main/xmli18n-tmp.h:977 +#: src/main/xmli18n-tmp.h:1029 msgid "Canon SELPHY-CP-500" msgstr "Canon SELPHY-CP-500" -#: src/main/xmli18n-tmp.h:978 +#: src/main/xmli18n-tmp.h:1030 msgid "Canon SELPHY-CP-510" msgstr "Canon SELPHY-CP-510" -#: src/main/xmli18n-tmp.h:979 +#: src/main/xmli18n-tmp.h:1031 msgid "Canon SELPHY-CP-600" msgstr "Canon SELPHY-CP-600" -#: src/main/xmli18n-tmp.h:980 +#: src/main/xmli18n-tmp.h:1032 msgid "Canon SELPHY-CP-710" msgstr "Canon SELPHY-CP-710" -#: src/main/xmli18n-tmp.h:981 +#: src/main/xmli18n-tmp.h:1033 #, fuzzy msgid "Canon SELPHY-CP-720" msgstr "Canon SELPHY-CP-710" -#: src/main/xmli18n-tmp.h:982 +#: src/main/xmli18n-tmp.h:1034 #, fuzzy msgid "Canon SELPHY-CP-730" msgstr "Canon SELPHY-CP-710" -#: src/main/xmli18n-tmp.h:983 +#: src/main/xmli18n-tmp.h:1035 #, fuzzy msgid "Canon SELPHY-CP-740" msgstr "Canon SELPHY-CP-400" -#: src/main/xmli18n-tmp.h:984 +#: src/main/xmli18n-tmp.h:1036 #, fuzzy msgid "Canon SELPHY-CP-750" msgstr "Canon SELPHY-CP-500" -#: src/main/xmli18n-tmp.h:985 +#: src/main/xmli18n-tmp.h:1037 #, fuzzy msgid "Canon SELPHY ES1" msgstr "Canon SELPHY-CP-510" -#: src/main/xmli18n-tmp.h:986 +#: src/main/xmli18n-tmp.h:1038 #, fuzzy msgid "Canon SELPHY ES2" msgstr "Canon SELPHY-CP-400" -#: src/main/xmli18n-tmp.h:987 +#: src/main/xmli18n-tmp.h:1039 #, fuzzy msgid "Canon SELPHY ES20" msgstr "Canon SELPHY-CP-400" -#: src/main/xmli18n-tmp.h:988 -#, fuzzy +#: src/main/xmli18n-tmp.h:1040 msgid "Sony DPP-EX5" -msgstr "Sony UP-DR150" +msgstr "Sony DPP-EX5" -#: src/main/xmli18n-tmp.h:989 +#: src/main/xmli18n-tmp.h:1041 msgid "Sony DPP-EX7" -msgstr "" +msgstr "Sony DPP-EX7" -#: src/main/xmli18n-tmp.h:990 +#: src/main/xmli18n-tmp.h:1042 msgid "Sony UP-DP10" msgstr "Sony UP-DP10" -#: src/main/xmli18n-tmp.h:991 -#, fuzzy +#: src/main/xmli18n-tmp.h:1043 msgid "Sony UP-DR100" -msgstr "Sony UP-DR150" +msgstr "Sony UP-DR100" -#: src/main/xmli18n-tmp.h:992 +#: src/main/xmli18n-tmp.h:1044 msgid "Sony UP-DR150" msgstr "Sony UP-DR150" -#: src/main/xmli18n-tmp.h:993 +#: src/main/xmli18n-tmp.h:1045 msgid "Fujifilm Printpix-CX-400" msgstr "Fujifilm Printpix-CX-400" -#: src/main/xmli18n-tmp.h:994 +#: src/main/xmli18n-tmp.h:1046 msgid "Fujifilm Printpix-CX-550" msgstr "Fujifilm Printpix-CX-550" -#: src/main/xmli18n-tmp.h:995 -#, fuzzy +#: src/main/xmli18n-tmp.h:1047 msgid "Fujifilm FinePix-NX-500" -msgstr "Fujifilm Printpix-CX-400" +msgstr "Fujifilm FinePix-NX-500" -#: src/main/xmli18n-tmp.h:996 +#: src/main/xmli18n-tmp.h:1048 msgid "Kodak Easyshare-Printer-Dock" -msgstr "" +msgstr "Kodak Easyshare nyomtatódokk" -#: src/main/xmli18n-tmp.h:997 +#: src/main/xmli18n-tmp.h:1049 msgid "Shinko CHC-S9045" msgstr "" -#: src/main/xmli18n-tmp.h:998 +#: src/main/xmli18n-tmp.h:1050 msgid "RAW DATA 16 bit" msgstr "NYERS ADAT 16 bit" -#: src/main/xmli18n-tmp.h:999 +#: src/main/xmli18n-tmp.h:1051 msgid "RAW DATA 8 bit" msgstr "NYERS ADAT 8 bit" -#: src/gutenprintui/panel.c:274 src/gutenprintui2/panel.c:274 +#: src/gutenprintui2/curve.c:130 +msgid "Curve type" +msgstr "Görbetípus" + +#: src/gutenprintui2/curve.c:131 +msgid "Is this curve linear, spline interpolated, or free-form" +msgstr "A görbe lineáris, spline-interpolált vagy szabadkézi-e" + +#: src/gutenprintui2/curve.c:139 +msgid "Minimum X" +msgstr "Minimális X" + +#: src/gutenprintui2/curve.c:140 +msgid "Minimum possible value for X" +msgstr "X minimális lehetséges értéke" + +#: src/gutenprintui2/curve.c:149 +msgid "Maximum X" +msgstr "Maximum X" + +#: src/gutenprintui2/curve.c:150 +msgid "Maximum possible X value" +msgstr "X maximális lehetséges értéke" + +#: src/gutenprintui2/curve.c:159 +msgid "Minimum Y" +msgstr "Minimális Y" + +#: src/gutenprintui2/curve.c:160 +msgid "Minimum possible value for Y" +msgstr "Y minimális lehetséges értéke" + +#: src/gutenprintui2/curve.c:169 +msgid "Maximum Y" +msgstr "Maximum Y" + +#: src/gutenprintui2/curve.c:170 +msgid "Maximum possible value for Y" +msgstr "Y maximális lehetséges értéke" + +#: src/gutenprintui2/gammacurve.c:418 +msgid "_Gamma value" +msgstr "_Gamma érték" + +#: src/gutenprintui2/panel.c:275 msgid "Inch" msgstr "Hüvelyk" -#: src/gutenprintui/panel.c:274 src/gutenprintui2/panel.c:274 +#: src/gutenprintui2/panel.c:275 msgid "Set the base unit of measurement to inches" msgstr "Az alapmértékegység hüvelykre állítása" -#: src/gutenprintui/panel.c:276 src/gutenprintui2/panel.c:276 +#: src/gutenprintui2/panel.c:277 msgid "cm" msgstr "cm" -#: src/gutenprintui/panel.c:276 src/gutenprintui2/panel.c:276 +#: src/gutenprintui2/panel.c:277 msgid "Set the base unit of measurement to centimetres" msgstr "Az alapmértékegység centiméterre állítása" -#: src/gutenprintui/panel.c:278 src/gutenprintui2/panel.c:278 +#: src/gutenprintui2/panel.c:279 msgid "Points" msgstr "Pont" -#: src/gutenprintui/panel.c:278 src/gutenprintui2/panel.c:278 +#: src/gutenprintui2/panel.c:279 msgid "Set the base unit of measurement to points (1/72\")" msgstr "Az alapmértékegység pontra (1/72 hüvelyk) állítása" -#: src/gutenprintui/panel.c:280 src/gutenprintui2/panel.c:280 +#: src/gutenprintui2/panel.c:281 msgid "mm" msgstr "mm" -#: src/gutenprintui/panel.c:280 src/gutenprintui2/panel.c:280 +#: src/gutenprintui2/panel.c:281 msgid "Set the base unit of measurement to millimetres" msgstr "Az alapmértékegység milliméterre állítása" -#: src/gutenprintui/panel.c:282 src/gutenprintui2/panel.c:282 +#: src/gutenprintui2/panel.c:283 msgid "Pica" msgstr "Pica" -#: src/gutenprintui/panel.c:282 src/gutenprintui2/panel.c:282 +#: src/gutenprintui2/panel.c:283 msgid "Set the base unit of measurement to picas (1/12\")" msgstr "Az alapmértékegység pica-ra (1/12 hüvelyk) állítása" -#: src/gutenprintui/panel.c:289 src/gutenprintui2/panel.c:289 +#: src/gutenprintui2/panel.c:290 msgid "Color output" msgstr "Színes kimenet" -#: src/gutenprintui/panel.c:291 src/gutenprintui2/panel.c:291 +#: src/gutenprintui2/panel.c:292 msgid "Print in shades of gray using black ink" msgstr "A szürke szín árnyalataival való nyomtatás fekete tintával" -#: src/gutenprintui/panel.c:303 src/gutenprintui2/panel.c:303 +#: src/gutenprintui2/panel.c:304 msgid "Standard Command" msgstr "Szabványos parancs" -#: src/gutenprintui/panel.c:303 src/gutenprintui2/panel.c:303 +#: src/gutenprintui2/panel.c:304 msgid "Use standard print command" msgstr "Szabványos nyomtatóparancs használata" -#: src/gutenprintui/panel.c:304 src/gutenprintui2/panel.c:304 +#: src/gutenprintui2/panel.c:305 msgid "Custom Command" msgstr "Egyéni parancs" -#: src/gutenprintui/panel.c:304 src/gutenprintui2/panel.c:304 +#: src/gutenprintui2/panel.c:305 msgid "Use custom print command" msgstr "Egyéni nyomtatóparancs használata" -#: src/gutenprintui/panel.c:305 src/gutenprintui/plist.c:704 -#: src/gutenprintui/plist.c:787 src/gutenprintui2/panel.c:305 -#: src/gutenprintui2/plist.c:707 src/gutenprintui2/plist.c:790 +#: src/gutenprintui2/panel.c:306 src/gutenprintui2/plist.c:710 +#: src/gutenprintui2/plist.c:793 msgid "File" msgstr "Fájl" -#: src/gutenprintui/panel.c:305 src/gutenprintui2/panel.c:305 +#: src/gutenprintui2/panel.c:306 msgid "Print to a file" msgstr "Nyomtatás fájlba" -#: src/gutenprintui/panel.c:521 src/gutenprintui2/panel.c:521 +#: src/gutenprintui2/panel.c:522 msgid "Edit Curve..." msgstr "Görbe szerkesztése..." -#: src/gutenprintui/panel.c:532 src/gutenprintui2/panel.c:532 +#: src/gutenprintui2/panel.c:533 msgid "Set Default" msgstr "Alapértelmezés beállítása" -#: src/gutenprintui/panel.c:534 src/gutenprintui2/panel.c:534 +#: src/gutenprintui2/panel.c:535 msgid "Restore Previous" msgstr "ElÅ‘zÅ‘ helyreállítása" -#: src/gutenprintui/panel.c:536 src/gutenprintui/panel.c:1532 -#: src/gutenprintui/panel.c:1787 src/gutenprintui/panel.c:1819 -#: src/gutenprintui2/panel.c:536 src/gutenprintui2/panel.c:1533 -#: src/gutenprintui2/panel.c:1787 src/gutenprintui2/panel.c:1819 +#: src/gutenprintui2/panel.c:537 src/gutenprintui2/panel.c:1708 +#: src/gutenprintui2/panel.c:1962 src/gutenprintui2/panel.c:1994 msgid "OK" msgstr "OK" -#: src/gutenprintui/panel.c:538 src/gutenprintui/panel.c:1197 -#: src/gutenprintui/panel.c:1534 src/gutenprintui/panel.c:1789 -#: src/gutenprintui2/panel.c:538 src/gutenprintui2/panel.c:1198 -#: src/gutenprintui2/panel.c:1535 src/gutenprintui2/panel.c:1789 +#: src/gutenprintui2/panel.c:539 src/gutenprintui2/panel.c:1373 +#: src/gutenprintui2/panel.c:1710 src/gutenprintui2/panel.c:1964 msgid "Cancel" msgstr "Mégsem" -#: src/gutenprintui/panel.c:1180 src/gutenprintui2/panel.c:1181 +#: src/gutenprintui2/panel.c:641 +#, fuzzy +msgid "Select File..." +msgstr "Nyomtató beállítása..." + +#: src/gutenprintui2/panel.c:1018 +#, fuzzy +msgid "Reset" +msgstr "Legjobb" + +#: src/gutenprintui2/panel.c:1356 #, c-format msgid "%s -- Print v%s" msgstr "%s -- nyomtatás v%s" -#: src/gutenprintui/panel.c:1189 src/gutenprintui2/panel.c:1190 +#: src/gutenprintui2/panel.c:1365 msgid "About" msgstr "Névjegy" -#: src/gutenprintui/panel.c:1191 src/gutenprintui2/panel.c:1192 +#: src/gutenprintui2/panel.c:1367 msgid "" "Print and\n" "Save Settings" @@ -6326,7 +6738,7 @@ msgstr "" "Nyomtatás és a\n" "beállítások mentése" -#: src/gutenprintui/panel.c:1193 src/gutenprintui2/panel.c:1194 +#: src/gutenprintui2/panel.c:1369 msgid "" "Save\n" "Settings" @@ -6334,15 +6746,15 @@ msgstr "" "Beállítások\n" "mentése" -#: src/gutenprintui/panel.c:1195 src/gutenprintui2/panel.c:1196 +#: src/gutenprintui2/panel.c:1371 msgid "Print" msgstr "Nyomtatás" -#: src/gutenprintui/panel.c:1247 src/gutenprintui2/panel.c:1248 +#: src/gutenprintui2/panel.c:1423 msgid "Preview" msgstr "ElÅ‘nézet" -#: src/gutenprintui/panel.c:1272 src/gutenprintui2/panel.c:1273 +#: src/gutenprintui2/panel.c:1448 msgid "" "Position the image on the page.\n" "Click and drag with the primary button to position the image.\n" @@ -6367,73 +6779,71 @@ msgstr "" "Ha húzás közben lenyom egy másik egérgombot, akkor a kép visszakerül az " "eredeti helyére." -#: src/gutenprintui/panel.c:1319 src/gutenprintui2/panel.c:1320 +#: src/gutenprintui2/panel.c:1495 msgid "Paper Size" msgstr "Papírméret" -#: src/gutenprintui/panel.c:1342 src/gutenprintui2/panel.c:1343 +#: src/gutenprintui2/panel.c:1518 msgid "Show All Paper Sizes" msgstr "Minden papírméret mutatása" -#: src/gutenprintui/panel.c:1358 src/gutenprintui2/panel.c:1359 +#: src/gutenprintui2/panel.c:1534 msgid "Dimensions:" msgstr "Méretek:" -#: src/gutenprintui/panel.c:1363 src/gutenprintui/panel.c:2063 -#: src/gutenprintui2/panel.c:1364 src/gutenprintui2/panel.c:2063 +#: src/gutenprintui2/panel.c:1539 src/gutenprintui2/panel.c:2238 msgid "Width:" msgstr "Szélesség:" -#: src/gutenprintui/panel.c:1364 src/gutenprintui2/panel.c:1365 +#: src/gutenprintui2/panel.c:1540 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:1368 src/gutenprintui/panel.c:2065 -#: src/gutenprintui2/panel.c:1369 src/gutenprintui2/panel.c:2065 +#: src/gutenprintui2/panel.c:1544 src/gutenprintui2/panel.c:2240 msgid "Height:" msgstr "Magasság:" -#: src/gutenprintui/panel.c:1369 src/gutenprintui2/panel.c:1370 +#: src/gutenprintui2/panel.c:1545 msgid "Height of the paper that you wish to print to" msgstr "A nyomtatáshoz használt papír magassága" -#: src/gutenprintui/panel.c:1374 src/gutenprintui2/panel.c:1375 +#: src/gutenprintui2/panel.c:1550 msgid "Automatic Paper Size" msgstr "Automatikus papírméret" -#: src/gutenprintui/panel.c:1391 src/gutenprintui2/panel.c:1392 +#: src/gutenprintui2/panel.c:1567 msgid "Number of Copies" msgstr "Példányszám" -#: src/gutenprintui/panel.c:1403 src/gutenprintui2/panel.c:1404 +#: src/gutenprintui2/panel.c:1579 msgid "Select the number of copies to print; a value between 1 and 100" msgstr "Válassza ki a nyomtatandó példányok számát, 1 és 100 között" -#: src/gutenprintui/panel.c:1435 src/gutenprintui2/panel.c:1436 +#: src/gutenprintui2/panel.c:1611 msgid "Image Position" msgstr "Képpozíció" -#: src/gutenprintui/panel.c:1452 src/gutenprintui2/panel.c:1453 +#: src/gutenprintui2/panel.c:1628 msgid "Auto" msgstr "Automatikus" -#: src/gutenprintui/panel.c:1454 src/gutenprintui2/panel.c:1455 +#: src/gutenprintui2/panel.c:1630 msgid "Portrait" msgstr "Ãlló" -#: src/gutenprintui/panel.c:1456 src/gutenprintui2/panel.c:1457 +#: src/gutenprintui2/panel.c:1632 msgid "Landscape" msgstr "FekvÅ‘" -#: src/gutenprintui/panel.c:1458 src/gutenprintui2/panel.c:1459 +#: src/gutenprintui2/panel.c:1634 msgid "Upside down" msgstr "Fejjel lefelé" -#: src/gutenprintui/panel.c:1460 src/gutenprintui2/panel.c:1461 +#: src/gutenprintui2/panel.c:1636 msgid "Seascape" msgstr "EllenkezÅ‘ fekvÅ‘" -#: src/gutenprintui/panel.c:1464 src/gutenprintui2/panel.c:1465 +#: src/gutenprintui2/panel.c:1640 msgid "" "Select the orientation: portrait, landscape, upside down, or seascape " "(upside down landscape)" @@ -6441,120 +6851,116 @@ msgstr "" "Válasszon irányt: álló, fekvÅ‘, fejjel lefelé levÅ‘ vagy fordított fekvÅ‘ " "(fejjel lefelé levÅ‘ fekvÅ‘)" -#: src/gutenprintui/panel.c:1466 src/gutenprintui2/panel.c:1467 +#: src/gutenprintui2/panel.c:1642 msgid "Orientation:" msgstr "Elhelyezkedés:" -#: src/gutenprintui/panel.c:1477 src/gutenprintui2/panel.c:1478 +#: src/gutenprintui2/panel.c:1653 msgid "Left:" msgstr "Bal:" -#: src/gutenprintui/panel.c:1478 src/gutenprintui2/panel.c:1479 +#: src/gutenprintui2/panel.c:1654 msgid "Distance from the left of the paper to the image" msgstr "A képnek a papír bal oldalától mért távolsága" -#: src/gutenprintui/panel.c:1481 src/gutenprintui/panel.c:1485 -#: src/gutenprintui2/panel.c:1482 src/gutenprintui2/panel.c:1486 +#: src/gutenprintui2/panel.c:1657 src/gutenprintui2/panel.c:1661 msgid "Right:" msgstr "Jobb:" -#: src/gutenprintui/panel.c:1482 src/gutenprintui2/panel.c:1483 +#: src/gutenprintui2/panel.c:1658 msgid "Distance from the left of the paper to the right of the image" msgstr "A kép jobb oldalának a papír bal oldalától mért távolsága" -#: src/gutenprintui/panel.c:1486 src/gutenprintui2/panel.c:1487 +#: src/gutenprintui2/panel.c:1662 msgid "Distance from the right of the paper to the image" msgstr "A képnek a papír jobb oldalától mért távolsága" -#: src/gutenprintui/panel.c:1488 src/gutenprintui2/panel.c:1489 +#: src/gutenprintui2/panel.c:1664 msgid "Top:" msgstr "Fent:" -#: src/gutenprintui/panel.c:1489 src/gutenprintui2/panel.c:1490 +#: src/gutenprintui2/panel.c:1665 msgid "Distance from the top of the paper to the image" msgstr "A képnek a papír tetejétÅ‘l mért távolsága" -#: src/gutenprintui/panel.c:1492 src/gutenprintui/panel.c:1496 -#: src/gutenprintui2/panel.c:1493 src/gutenprintui2/panel.c:1497 +#: src/gutenprintui2/panel.c:1668 src/gutenprintui2/panel.c:1672 msgid "Bottom:" msgstr "Lent:" -#: src/gutenprintui/panel.c:1493 src/gutenprintui2/panel.c:1494 +#: src/gutenprintui2/panel.c:1669 msgid "Distance from the top of the paper to bottom of the image" msgstr "A kép aljának a papír tetejétÅ‘l mért távolsága" -#: src/gutenprintui/panel.c:1497 src/gutenprintui2/panel.c:1498 +#: src/gutenprintui2/panel.c:1673 msgid "Distance from the bottom of the paper to the image" msgstr "A képnek a papír aljától mért távolsága" -#: src/gutenprintui/panel.c:1507 src/gutenprintui2/panel.c:1508 +#: src/gutenprintui2/panel.c:1683 msgid "Center:" msgstr "Középre:" -#: src/gutenprintui/panel.c:1510 src/gutenprintui2/panel.c:1511 +#: src/gutenprintui2/panel.c:1686 msgid "Horizontal" msgstr "Vízszintes" -#: src/gutenprintui/panel.c:1511 src/gutenprintui2/panel.c:1512 +#: src/gutenprintui2/panel.c:1687 msgid "Center the image horizontally on the paper" msgstr "A kép középre igazítása vízszintes irányban a papíron" -#: src/gutenprintui/panel.c:1513 src/gutenprintui2/panel.c:1514 +#: src/gutenprintui2/panel.c:1689 msgid "Both" msgstr "MindkettÅ‘" -#: src/gutenprintui/panel.c:1514 src/gutenprintui2/panel.c:1515 +#: src/gutenprintui2/panel.c:1690 msgid "Center the image on the paper" msgstr "A kép középre igazítása a papíron" -#: src/gutenprintui/panel.c:1516 src/gutenprintui2/panel.c:1517 +#: src/gutenprintui2/panel.c:1692 msgid "Vertical" msgstr "FüggÅ‘leges" -#: src/gutenprintui/panel.c:1517 src/gutenprintui2/panel.c:1518 +#: src/gutenprintui2/panel.c:1693 msgid "Center the image vertically on the paper" msgstr "A kép középre igazítása függÅ‘leges irányban a papíron" -#: src/gutenprintui/panel.c:1530 src/gutenprintui2/panel.c:1531 +#: src/gutenprintui2/panel.c:1706 msgid "Setup Printer" msgstr "Nyomtató beállítása" -#: src/gutenprintui/panel.c:1555 src/gutenprintui2/panel.c:1555 +#: src/gutenprintui2/panel.c:1730 msgid "Printer Make:" msgstr "Nyomtató gyártója:" -#: src/gutenprintui/panel.c:1566 src/gutenprintui2/panel.c:1566 +#: src/gutenprintui2/panel.c:1741 msgid "Select the make of your printer" msgstr "Válassza ki a nyomtató gyártóját" -#: src/gutenprintui/panel.c:1584 src/gutenprintui/panel.c:1672 -#: src/gutenprintui/panel.c:1890 src/gutenprintui2/panel.c:1584 -#: src/gutenprintui2/panel.c:1672 src/gutenprintui2/panel.c:1890 +#: src/gutenprintui2/panel.c:1759 src/gutenprintui2/panel.c:1847 +#: src/gutenprintui2/panel.c:2065 msgid "Printer Model:" msgstr "Nyomtató típusa:" -#: src/gutenprintui/panel.c:1595 src/gutenprintui2/panel.c:1595 +#: src/gutenprintui2/panel.c:1770 msgid "Select your printer model" msgstr "Válassza ki a nyomtató típusát" -#: src/gutenprintui/panel.c:1643 src/gutenprintui2/panel.c:1643 +#: src/gutenprintui2/panel.c:1818 msgid "PPD File:" msgstr "PPD fájl:" -#: src/gutenprintui/panel.c:1659 src/gutenprintui2/panel.c:1659 +#: src/gutenprintui2/panel.c:1834 msgid "Enter the correct PPD filename for your printer" msgstr "Adja meg a nyomtatóhoz tartozó PPD fájl nevét" -#: src/gutenprintui/panel.c:1661 src/gutenprintui/panel.c:1741 -#: src/gutenprintui2/panel.c:1661 src/gutenprintui2/panel.c:1741 +#: src/gutenprintui2/panel.c:1836 src/gutenprintui2/panel.c:1916 msgid "Browse" msgstr "Tallózás" -#: src/gutenprintui/panel.c:1668 src/gutenprintui2/panel.c:1668 +#: src/gutenprintui2/panel.c:1843 msgid "Choose the correct PPD filename for your printer" msgstr "Válassza ki a nyomtatóhoz tartozó PPD fájl nevét" -#: src/gutenprintui/panel.c:1710 src/gutenprintui2/panel.c:1710 +#: src/gutenprintui2/panel.c:1885 msgid "" "Select the name of the output queue (not the type, or model, of printer) " "that you wish to print to" @@ -6562,52 +6968,51 @@ msgstr "" "Adja meg azon kimeneti sor nevét (ne a nyomtató típusát vagy a modelljét), " "amelyikbe nyomtatni kíván" -#: src/gutenprintui/panel.c:1712 src/gutenprintui2/panel.c:1712 +#: src/gutenprintui2/panel.c:1887 msgid "Printer Queue:" msgstr "Nyomtatási sor:" -#: src/gutenprintui/panel.c:1728 src/gutenprintui2/panel.c:1728 +#: src/gutenprintui2/panel.c:1903 msgid "Enter the correct command to print to your printer. " msgstr "Adja meg a nyomtatójára való nyomtatáshoz használandó parancsot. " -#: src/gutenprintui/panel.c:1739 src/gutenprintui2/panel.c:1739 +#: src/gutenprintui2/panel.c:1914 msgid "Enter the file to print to. " msgstr "Adja meg a fájlt, amelybe nyomtatni kíván. " -#: src/gutenprintui/panel.c:1747 src/gutenprintui2/panel.c:1747 +#: src/gutenprintui2/panel.c:1922 msgid "File to print to" msgstr "Nyomtatás ebbe a fájlba" -#: src/gutenprintui/panel.c:1755 src/gutenprintui2/panel.c:1755 +#: src/gutenprintui2/panel.c:1930 msgid "Print To File" msgstr "Nyomtatás fájlba" -#: src/gutenprintui/panel.c:1785 src/gutenprintui2/panel.c:1785 +#: src/gutenprintui2/panel.c:1960 msgid "Define New Printer" msgstr "Új nyomtató meghatározása" -#: src/gutenprintui/panel.c:1803 src/gutenprintui/panel.c:1887 -#: src/gutenprintui2/panel.c:1803 src/gutenprintui2/panel.c:1887 +#: src/gutenprintui2/panel.c:1978 src/gutenprintui2/panel.c:2062 msgid "Printer Name:" msgstr "Nyomtató neve:" -#: src/gutenprintui/panel.c:1807 src/gutenprintui2/panel.c:1807 +#: src/gutenprintui2/panel.c:1982 msgid "Enter the name you wish to give this logical printer" msgstr "Adja meg a logikai nyomtatóhoz használandó nevet" -#: src/gutenprintui/panel.c:1817 src/gutenprintui2/panel.c:1817 +#: src/gutenprintui2/panel.c:1992 msgid "About Gutenprint " msgstr "A Gutenprint névjegye " -#: src/gutenprintui/panel.c:1824 src/gutenprintui2/panel.c:1824 +#: src/gutenprintui2/panel.c:1999 msgid "Gutenprint Version " msgstr "Gutenprint verzió: " -#: src/gutenprintui/panel.c:1872 src/gutenprintui2/panel.c:1872 +#: src/gutenprintui2/panel.c:2047 msgid "Printer Settings" msgstr "Nyomtató beállításai" -#: src/gutenprintui/panel.c:1885 src/gutenprintui2/panel.c:1885 +#: src/gutenprintui2/panel.c:2060 msgid "" "Select the name of the printer (not the type, or model, of printer) that you " "wish to print to" @@ -6615,21 +7020,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:1902 src/gutenprintui2/panel.c:1902 +#: src/gutenprintui2/panel.c:2077 msgid "Setup Printer..." msgstr "Nyomtató beállítása..." -#: src/gutenprintui/panel.c:1904 src/gutenprintui2/panel.c:1904 +#: src/gutenprintui2/panel.c:2079 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:1917 src/gutenprintui2/panel.c:1917 +#: src/gutenprintui2/panel.c:2092 msgid "New Printer..." msgstr "Új nyomtató..." -#: src/gutenprintui/panel.c:1918 src/gutenprintui2/panel.c:1918 +#: src/gutenprintui2/panel.c:2093 msgid "" "Define a new logical printer. This can be used to name a collection of " "settings that you wish to remember for future use." @@ -6637,32 +7042,32 @@ 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:1948 src/gutenprintui2/panel.c:1948 +#: src/gutenprintui2/panel.c:2123 #, fuzzy msgid "Set Printer Option Defaults" msgstr "Alapértelmezések beállítása" -#: src/gutenprintui/panel.c:1949 src/gutenprintui2/panel.c:1949 +#: src/gutenprintui2/panel.c:2124 msgid "Set all printer options to their defaults" msgstr "" -#: src/gutenprintui/panel.c:1972 src/gutenprintui2/panel.c:1972 +#: src/gutenprintui2/panel.c:2147 msgid "Image Size" msgstr "Képméret" -#: src/gutenprintui/panel.c:1997 src/gutenprintui2/panel.c:1997 +#: src/gutenprintui2/panel.c:2172 msgid "Scaling:" msgstr "Méretezés:" -#: src/gutenprintui/panel.c:2001 src/gutenprintui2/panel.c:2001 +#: src/gutenprintui2/panel.c:2176 msgid "Set the scale (size) of the image" msgstr "Megadja a kép méretezését (méretét)" -#: src/gutenprintui/panel.c:2023 src/gutenprintui2/panel.c:2023 +#: src/gutenprintui2/panel.c:2198 msgid "Scale by:" msgstr "Méretezés:" -#: src/gutenprintui/panel.c:2028 src/gutenprintui2/panel.c:2028 +#: src/gutenprintui2/panel.c:2203 msgid "" "Select whether scaling is measured as percent of available page size or " "number of output dots per inch" @@ -6670,31 +7075,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:2031 src/gutenprintui2/panel.c:2031 +#: src/gutenprintui2/panel.c:2206 msgid "Percent" msgstr "Százalék" -#: src/gutenprintui/panel.c:2036 src/gutenprintui2/panel.c:2036 +#: src/gutenprintui2/panel.c:2211 msgid "Scale the print to the size of the page" msgstr "Nyomat méretezése a lap mérete szerint" -#: src/gutenprintui/panel.c:2040 src/gutenprintui2/panel.c:2040 +#: src/gutenprintui2/panel.c:2215 msgid "PPI" msgstr "PPI" -#: src/gutenprintui/panel.c:2045 src/gutenprintui2/panel.c:2045 +#: src/gutenprintui2/panel.c:2220 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:2063 src/gutenprintui2/panel.c:2063 +#: src/gutenprintui2/panel.c:2238 msgid "Set the width of the print" msgstr "A nyomat szélessége" -#: src/gutenprintui/panel.c:2065 src/gutenprintui2/panel.c:2065 +#: src/gutenprintui2/panel.c:2240 msgid "Set the height of the print" msgstr "A nyomat magassága" -#: src/gutenprintui/panel.c:2071 src/gutenprintui2/panel.c:2071 +#: src/gutenprintui2/panel.c:2246 msgid "" "Use Original\n" "Image Size" @@ -6702,150 +7107,105 @@ msgstr "" "Eredeti képméret\n" "használata" -#: src/gutenprintui/panel.c:2077 src/gutenprintui2/panel.c:2077 +#: src/gutenprintui2/panel.c:2252 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:2100 src/gutenprintui2/panel.c:2101 +#: src/gutenprintui2/panel.c:2276 msgid "Print Color Adjust" msgstr "Nyomat színeinek beállítása" -#: src/gutenprintui/panel.c:2103 src/gutenprintui2/panel.c:2104 +#: src/gutenprintui2/panel.c:2279 msgid "Set Defaults" msgstr "Alapértelmezések beállítása" -#: src/gutenprintui/panel.c:2105 src/gutenprintui2/panel.c:2106 +#: src/gutenprintui2/panel.c:2281 msgid "Close" msgstr "Bezárás" -#: src/gutenprintui/panel.c:2134 src/gutenprintui2/panel.c:2135 +#: src/gutenprintui2/panel.c:2310 msgid "Image preview" msgstr "ElÅ‘nézeti kép" -#: src/gutenprintui/panel.c:2148 src/gutenprintui2/panel.c:2149 +#: src/gutenprintui2/panel.c:2324 msgid "View Output Channels:" msgstr "Kimeneti csatornák megjelenítése:" -#: src/gutenprintui/panel.c:2234 src/gutenprintui2/panel.c:2240 +#: src/gutenprintui2/panel.c:2415 msgid "Output" msgstr "Kimenet" -#: src/gutenprintui/panel.c:2262 src/gutenprintui2/panel.c:2268 +#: src/gutenprintui2/panel.c:2443 msgid "Output Type:" msgstr "Kimenet típusa:" -#: src/gutenprintui/panel.c:2266 src/gutenprintui2/panel.c:2272 +#: src/gutenprintui2/panel.c:2447 msgid "Select the desired output type" msgstr "Válassza ki a kívánt kimeneti típust" -#: src/gutenprintui/panel.c:2287 src/gutenprintui2/panel.c:2293 +#: src/gutenprintui2/panel.c:2468 msgid "Adjust Output..." msgstr "Kimenet beállítása..." -#: src/gutenprintui/panel.c:2296 src/gutenprintui2/panel.c:2302 +#: src/gutenprintui2/panel.c:2477 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:2314 src/gutenprintui2/panel.c:2321 +#: src/gutenprintui2/panel.c:2496 msgid "Size Units:" msgstr "Mértékegységek:" -#: src/gutenprintui/panel.c:2317 src/gutenprintui2/panel.c:2324 +#: src/gutenprintui2/panel.c:2499 msgid " " msgstr " " -#: src/gutenprintui/panel.c:2341 src/gutenprintui2/panel.c:2348 +#: src/gutenprintui2/panel.c:2523 msgid "Units:" msgstr "Mértékegységek:" -#: src/gutenprintui/panel.c:2346 src/gutenprintui2/panel.c:2353 +#: src/gutenprintui2/panel.c:2528 msgid "Select the base unit of measurement for printing" msgstr "Válassza ki a nyomtatáshoz használt alapmértékegységet" -#: src/gutenprintui/plist.c:90 src/gutenprintui/plist.c:99 -#: src/gutenprintui2/plist.c:89 src/gutenprintui2/plist.c:98 +#: src/gutenprintui2/plist.c:92 src/gutenprintui2/plist.c:101 msgid "System V lp" msgstr "System V lp" -#: src/gutenprintui/plist.c:96 src/gutenprintui2/plist.c:95 +#: src/gutenprintui2/plist.c:98 msgid "CUPS" msgstr "CUPS" -#: src/gutenprintui/plist.c:102 src/gutenprintui2/plist.c:101 +#: src/gutenprintui2/plist.c:104 msgid "Berkeley lpd (/etc/lpc)" msgstr "Berkeley lpd (/etc/lpc)" -#: src/gutenprintui/plist.c:105 src/gutenprintui2/plist.c:104 +#: src/gutenprintui2/plist.c:107 msgid "Berkeley lpd (/usr/bsd/lpc)" msgstr "Berkeley lpd (/usr/bsd/lpc)" -#: src/gutenprintui/plist.c:108 src/gutenprintui2/plist.c:107 +#: src/gutenprintui2/plist.c:110 msgid "Berkeley lpd (/usr/etc/lpc" msgstr "Berkeley lpd (/usr/etc/lpc" -#: src/gutenprintui/plist.c:111 src/gutenprintui2/plist.c:110 +#: src/gutenprintui2/plist.c:113 msgid "Berkeley lpd (/usr/libexec/lpc)" msgstr "Berkeley lpd (/usr/libexec/lpc)" -#: src/gutenprintui/plist.c:114 src/gutenprintui2/plist.c:113 +#: src/gutenprintui2/plist.c:116 msgid "Berkeley lpd (/usr/sbin/lpc)" msgstr "Berkeley lpd (/usr/sbin/lpc)" -#: src/gutenprintui/plist.c:1043 src/gutenprintui2/plist.c:1057 +#: src/gutenprintui2/plist.c:1060 msgid "Printer" msgstr "Nyomtató" -#: src/gutenprintui/plist.c:1230 src/gutenprintui2/plist.c:1250 +#: src/gutenprintui2/plist.c:1253 msgid "(Default Printer)" msgstr "(Alapértelmezett nyomtató)" -#: src/gutenprintui2/curve.c:130 -msgid "Curve type" -msgstr "Görbetípus" - -#: src/gutenprintui2/curve.c:131 -msgid "Is this curve linear, spline interpolated, or free-form" -msgstr "A görbe lineáris, spline-interpolált vagy szabadkézi-e" - -#: src/gutenprintui2/curve.c:139 -msgid "Minimum X" -msgstr "Minimális X" - -#: src/gutenprintui2/curve.c:140 -msgid "Minimum possible value for X" -msgstr "X minimális lehetséges értéke" - -#: src/gutenprintui2/curve.c:149 -msgid "Maximum X" -msgstr "Maximum X" - -#: src/gutenprintui2/curve.c:150 -msgid "Maximum possible X value" -msgstr "X maximális lehetséges értéke" - -#: src/gutenprintui2/curve.c:159 -msgid "Minimum Y" -msgstr "Minimális Y" - -#: src/gutenprintui2/curve.c:160 -msgid "Minimum possible value for Y" -msgstr "Y minimális lehetséges értéke" - -#: src/gutenprintui2/curve.c:169 -msgid "Maximum Y" -msgstr "Maximum Y" - -#: src/gutenprintui2/curve.c:170 -msgid "Maximum possible value for Y" -msgstr "Y maximális lehetséges értéke" - -#: src/gutenprintui2/gammacurve.c:418 -msgid "_Gamma value" -msgstr "_Gamma érték" - #: src/cups/genppd.c:145 msgid "Printer Features" msgstr "Nyomtató szolgáltatásai" @@ -6881,50 +7241,48 @@ msgstr "5. extra" #. 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:1058 +#: src/cups/genppd.c:1064 msgid "English" msgstr "Hungarian" #. TRANSLATORS: Specify PPD translation encoding e.g. ISOLatin1 -#: src/cups/genppd.c:1060 +#: src/cups/genppd.c:1066 msgid "ISOLatin1" msgstr "ISOLatin2" -#: src/cups/genppd.c:1641 -#, fuzzy +#: src/cups/genppd.c:1647 msgid "2-Sided Printing" msgstr "Kétoldalas nyomtatás" -#: src/cups/genppd.c:1665 +#: src/cups/genppd.c:1671 msgid "Shrink Page If Necessary to Fit Borders" -msgstr "" +msgstr "Oldal zsugorítása szükség esetén a szegélyekig" -#: src/cups/genppd.c:1669 +#: src/cups/genppd.c:1675 msgid "Shrink (print the whole page)" -msgstr "" +msgstr "Zsugorítás (teljes oldal nyomtatása)" -#: src/cups/genppd.c:1670 +#: src/cups/genppd.c:1676 msgid "Crop (preserve dimensions)" -msgstr "" +msgstr "Levágás (méretek megÅ‘rzése)" -#: src/cups/genppd.c:1671 +#: src/cups/genppd.c:1677 msgid "Expand (use maximum page area)" -msgstr "" +msgstr "Nagyítás (teljes oldalterület használata)" -#: src/cups/genppd.c:1756 +#: src/cups/genppd.c:1762 msgid "No" msgstr "Nem" -#: src/cups/genppd.c:1758 +#: src/cups/genppd.c:1764 msgid "Yes" msgstr "Igen" -#: src/cups/genppd.c:1795 src/cups/genppd.c:1857 -#, fuzzy +#: src/cups/genppd.c:1801 src/cups/genppd.c:1863 msgid "Value" -msgstr "Kék" +msgstr "Érték" -#: src/cups/genppd.c:1800 +#: src/cups/genppd.c:1806 msgid "Fine Adjustment" msgstr "Finomhangolás" @@ -7124,7 +7482,7 @@ msgstr "Nem lehet olvasni a következÅ‘rÅ‘l: %s: %s\n" #: src/escputil/escputil.c:729 #, c-format msgid "Please specify a raw device\n" -msgstr "" +msgstr "Adjon meg egy nyers eszközt\n" #: src/escputil/escputil.c:736 #, c-format @@ -7644,349 +8002,78 @@ msgstr "" msgid "Error in input\n" msgstr "Hiba a bemenetben\n" -#: src/gimp/print-image-gimp.c:225 src/gimp2/print-image-gimp.c:225 +#: src/gimp2/print-image-gimp.c:225 msgid "Printing..." msgstr "Nyomtatás..." -#: src/gimp/print.c:133 -msgid "/File/Print..." -msgstr "/Fájl/Nyomtatás..." - -#: src/ghost/ijsgutenprint.c:98 -#, c-format -msgid "" -"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" -msgstr "" - -#: 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:199 -#, c-format -msgid "ERROR: ijsgutenprint: No row buffer\n" -msgstr "HIBA: ijsgutenprint: Nincs sorpuffer\n" - -#: 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 "" -"HIBA: ijsgutenprint: A(z) %s=%s paraméter nem dolgozható fel (a rendszer egy " -"számot várt)\n" - -#: 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: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:656 -#, c-format -msgid "ijsgutenprint: unknown DeviceModel %s\n" -msgstr "ijsgutenprint: ismeretlen DeviceModel: %s\n" - -#: 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: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: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: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: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: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: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: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: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:1308 -#, c-format -msgid "ERROR: ijsgutenprint: image_init failed %d\n" -msgstr "HIBA: ijsgutenprint: image_init meghiúsult %d\n" - -#: 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: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:1344 -#, c-format -msgid "ERROR: ijsgutenprint: Unknown printer %s\n" -msgstr "HIBA: ijsgutenprint: Ismeretlen nyomtató: %s\n" - -#: 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: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" - -#, fuzzy -#~ msgid "Model Name" -#~ msgstr "Csatornanevek" - -#, fuzzy -#~ msgid "Canon MULTIPASS MP500" -#~ msgstr "Canon S500" - -#, fuzzy -#~ msgid "Canon MULTIPASS MP760" -#~ msgstr "Canon LBP-1760" - -#~ msgid "Cassette" -#~ msgstr "Kazetta" - -#~ msgid "CD tray" -#~ msgstr "CD tálca" - -#~ msgid " Gamma" -#~ msgstr " Gamma" - -#~ msgid " Curve" -#~ msgstr " Görbe" - -#~ msgid "1440 x 1440" -#~ msgstr "1440 x 1440" - -#~ msgid "1440 x 1440 DPI High Quality" -#~ msgstr "1440 x 1440 DPI Jó minÅ‘ségű" - -#~ msgid "1440 x 1440 DPI Highest Quality" -#~ msgstr "1440 x 1440 DPI Legjobb minÅ‘ségű" - -#~ msgid "2880 x 1440 DPI High Quality" -#~ msgstr "2880 x 720 DPI Jó minÅ‘ségű" +#~ 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" -#~ msgid "2880 x 1440 DPI Highest Quality" -#~ msgstr "2880 x 720 DPI Legjobb minÅ‘ségű" +#~ msgid "ERROR: ijsgutenprint: No row buffer\n" +#~ msgstr "HIBA: ijsgutenprint: Nincs sorpuffer\n" #~ msgid "" -#~ "\n" -#~ "\n" -#~ "Copyright (C) 1997-2003 Michael Sweet, Robert Krawitz,\n" -#~ "and the rest of the Gutenprint Development Team.\n" -#~ "\n" -#~ "Please visit our web site at http://gimp-print.sourceforge.net.\n" -#~ "\n" -#~ "This program is free software; you can redistribute it and/or modify\n" -#~ "it under the terms of the GNU General Public License as published by\n" -#~ "the Free Software Foundation; either version 2 of the License, or\n" -#~ "(at your option) any later version.\n" -#~ "\n" -#~ "This program is distributed in the hope that it will be useful,\n" -#~ "but WITHOUT ANY WARRANTY; without even the implied warranty of\n" -#~ "MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the\n" -#~ "GNU General Public License for more details.\n" -#~ "\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" +#~ "ERROR: ijsgutenprint: Unable to parse parameter %s=%s (expect a number)\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" -#~ "\n" -#~ "Ez a program szabad szoftver; terjeszthetÅ‘ és/vagy módosítható\n" -#~ "a Free Software Foundation által publikált GNU General Public\n" -#~ "License 2. vagy annál újabb verziója alapján.\n" -#~ "\n" -#~ "A program annak reményében kerül terjesztésre, hogy hasznosnak\n" -#~ "bizonyul, de GARANCIA NÉLKÃœL; még a PIACKÉPESSÉG illetve\n" -#~ "egy BIZONYOS CÉLRA VALÓ ALKALMASSÃG sincs garantálva. További\n" -#~ "részletek a GNU General Public License-ben.\n" -#~ "\n" -#~ "A programmal együtt Önnek kapnia kellett egy példányt a GNU General\n" -#~ "Public License-bÅ‘l; ha nem így történt, írjon a következÅ‘ címre:\n" -#~ "Free Software Foundation, Inc., 59 Temple Place, Suite 330, Boston,\n" -#~ "MA 02111-1307, USA.\n" +#~ "HIBA: ijsgutenprint: A(z) %s=%s paraméter nem dolgozható fel (a rendszer " +#~ "egy számot várt)\n" -#~ 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" +#~ msgid "ERROR: ijsgutenprint: Printer must be specified with -sDeviceModel\n" #~ msgstr "" -#~ ", 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" -#~ "Ez egy szabad szoftver és örülünk, ha bizonyos feltételek mellett " -#~ "terjeszti,\n" -#~ "a részletekért adja ki a következÅ‘ parancsot: 'escputil -l'.\n" - -#~ msgid "90x90 DPI" -#~ msgstr "90x90 DPI" - -#~ msgid "90x90 DPI DMT" -#~ msgstr "90x90 DPI DMT" - -#~ msgid "180x180 DPI" -#~ msgstr "180x180 DPI" - -#~ msgid "180x180 DPI DMT" -#~ msgstr "180x180 DPI DMT" - -#~ msgid "360x360 DPI" -#~ msgstr "360x360 DPI" - -#~ msgid "360x360 DPI DMT" -#~ msgstr "360x360 DPI DMT" - -#~ msgid "720x360 DPI" -#~ msgstr "720x360 DPI" +#~ "HIBA: ijsgutenprint: A nyomtatót a -sDeviceModel paranccsal kell megadni\n" -#~ msgid "720x360 DPI DMT" -#~ msgstr "720x360 DPI DMT" +#~ msgid "ERROR: ijsgutenprint: Printer %s is not a known model\n" +#~ msgstr "HIBA: ijsgutenprint: A(z) %s nyomtató egy ismeretlen típus\n" -#~ msgid "720x720 DPI" -#~ msgstr "720x720 DPI" +#~ msgid "ijsgutenprint: unknown DeviceModel %s\n" +#~ msgstr "ijsgutenprint: ismeretlen DeviceModel: %s\n" -#~ msgid "720x720 DPI DMT" -#~ msgstr "720x720 DPI DMT" +#~ msgid "ERROR: ijsgutenprint: cannot parse TopLeft %s\n" +#~ msgstr "HIBA: ijsgutenprint: a TopLeft %s értéke nem dolgozható fel\n" -#~ msgid "1440x720 DPI" -#~ msgstr "1440x720 DPI" +#~ msgid "ERROR: ijsgutenprint: cannot parse PaperSize %s\n" +#~ msgstr "HIBA: ijsgutenprint: a PaperSize %s értéke nem dolgozható fel\n" -#~ msgid "1440x720 DPI DMT" -#~ msgstr "1440x720 DPI DMT" +#~ msgid "ERROR: ijsgutenprint: cannot parse curve %s\n" +#~ msgstr "HIBA: ijsgutenprint: a(z) %s görbe nem dolgozható fel\n" -#~ msgid "1440x1440 DPI" -#~ msgstr "1440x1440 DPI" +#~ msgid "ERROR: ijsgutenprint: cannot parse %s float %s\n" +#~ msgstr "HIBA: ijsgutenprint: a(z) %s lebegÅ‘pontos %s nem dolgozható fel\n" -#~ msgid "1440x1440 DPI DMT" -#~ msgstr "1440x1440 DPI DMT" +#~ msgid "ERROR: ijsgutenprint: cannot parse %s int %s\n" +#~ msgstr "HIBA: ijsgutenprint: a(z) %s egész %s nem dolgozható fel\n" -#~ msgid "2880x2880 DPI" -#~ msgstr "2880x2880 DPI" +#~ msgid "ERROR: ijsgutenprint: cannot parse %s dimension %s\n" +#~ msgstr "HIBA: ijsgutenprint: a(z) %s %s mérete nem dolgozható fel\n" -#~ msgid "2880x2880 DPI DMT" -#~ msgstr "2880x2880 DPI DMT" +#~ msgid "ERROR: ijsgutenprint: cannot parse %s boolean %s\n" +#~ msgstr "HIBA: ijsgutenprint: a(z) %s logikai %s nem dolgozható fel\n" -#~ msgid "150x150 DPI DMT" -#~ msgstr "150x150 DPI DMT" +#~ msgid "ERROR: ijsgutenprint: Bad parameter %s %d\n" +#~ msgstr "HIBA: ijsgutenprint: Hibás paraméter: %s %d\n" -#~ msgid "300x300 DPI DMT" -#~ msgstr "300x300 DPI DMT" +#~ msgid "ERROR: ijsgutenprint: bad key code %d\n" +#~ msgstr "HIBA: ijsgutenprint: hibás billentyűkód: %d\n" -#~ msgid "600x300 DPI DMT" -#~ msgstr "600x300 DPI DMT" +#~ msgid "ERROR: ijsgutenprint: image_init failed %d\n" +#~ msgstr "HIBA: ijsgutenprint: image_init meghiúsult %d\n" -#~ msgid "600x600 DPI DMT" -#~ msgstr "600x600 DPI DMT" +#~ msgid "ERROR: ijsgutenprint: Unable to open file descriptor: %s\n" +#~ msgstr "HIBA: ijsgutenprint: A következÅ‘ fájlleíró nem nyitható meg: %s\n" -#~ msgid "1200x600 DPI DMT" -#~ msgstr "1200x600 DPI DMT" +#~ msgid "ERROR: ijsgutenprint: Unable to open %s: %s\n" +#~ msgstr "HIBA: ijsgutenprint: Nem lehet megnyitni a(z) %s-t: %s\n" -#~ msgid "1200x1200 DPI" -#~ msgstr "1200x1200 DPI" +#~ msgid "ERROR: ijsgutenprint: Unknown printer %s\n" +#~ msgstr "HIBA: ijsgutenprint: Ismeretlen nyomtató: %s\n" -#~ msgid "1200x1200 DPI DMT" -#~ msgstr "1200x1200 DPI DMT" +#~ msgid "ERROR: ijsgutenprint: Bad parameters; cannot continue!\n" +#~ msgstr "HIBA: ijsgutenprint: Hibás paraméterek, nem lehet folytatni!\n" -#~ msgid "2400x2400 DPI" -#~ msgstr "2400x2400 DPI" - -#~ msgid "2400x2400 DPI DMT" -#~ msgstr "2400x2400 DPI DMT" - -#~ msgid "Plain Paper PIXMA" -#~ msgstr "Egyszerű PIXMA lap" - -#~ msgid "Back Print Film" -#~ msgstr "Hátulnyomásos film" - -#~ msgid "Fabric Sheets" -#~ msgstr "Szövet" - -#~ msgid "Envelope" -#~ msgstr "Boríték" - -#~ msgid "High Resolution Paper" -#~ msgstr "Magas felbontású papír" - -#~ msgid "T-Shirt Transfers" -#~ msgstr "Pólóra vasalható" - -#~ msgid "High Gloss Film" -#~ msgstr "Magasfényű film" - -#~ msgid "Glossy Photo Paper" -#~ msgstr "Fényes fotópapír" - -#~ msgid "Glossy Photo Cards" -#~ msgstr "Fényes fotókártya" - -#~ msgid "Photo Paper Pro" -#~ msgstr "Fotópapír pro" - -#~ msgid "Photo CcMmYK Color" -#~ msgstr "Fotó CcMmYK szín" - -#~ msgid "Photo CcMmY Color" -#~ msgstr "Fotó CcMmY szín" - -#~ msgid "CMYK Color" -#~ msgstr "CMYK szín" - -#~ msgid "CMY Color" -#~ msgstr "CMY szín" +#~ 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 "Gutenprint" -#~ msgstr "Gutenprint" +#~ msgid "/File/Print..." +#~ msgstr "/Fájl/Nyomtatás..." diff --git a/po/ja.gmo b/po/ja.gmo index 391e327..99270b9 100644 Binary files a/po/ja.gmo and b/po/ja.gmo differ diff --git a/po/ja.po b/po/ja.po index 6607541..b8e4cdd 100644 --- a/po/ja.po +++ b/po/ja.po @@ -6,30 +6,30 @@ msgid "" msgstr "" "Project-Id-Version: gimp-print Version 4.2.3\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2008-01-01 20:47-0500\n" +"POT-Creation-Date: 2008-04-25 21:19-0400\n" "PO-Revision-Date: 2002-10-07 19:10+0900\n" "Last-Translator: Takeshi AIHANA \n" "Language-Team: Japanese \n" "MIME-Version: 1.0\n" -"Content-Type: text/plain; charset=utf-8\n" +"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:1752 +#: src/main/print-escp2.c:2116 #, fuzzy msgid "Default" -msgstr "åˆæœŸå€¤ã«æˆ»ã™" +msgstr "½é´üÃͤËÌ᤹" #: src/main/dither-main.c:47 msgid "EvenTone" -msgstr "イベントトーン方å¼" +msgstr "¥¤¥Ù¥ó¥È¥È¡¼¥óÊý¼°" #: src/main/dither-main.c:48 #, fuzzy msgid "Hybrid EvenTone" -msgstr "イベントトーン方å¼" +msgstr "¥¤¥Ù¥ó¥È¥È¡¼¥óÊý¼°" #. TRANSLATORS: EvenTone, EvenBetter, and UniTone are proper #. * names, not descriptive. @@ -37,17 +37,17 @@ msgstr "イベントトーン方å¼" #: src/main/dither-main.c:53 #, fuzzy msgid "EvenBetter" -msgstr "レター" +msgstr "¥ì¥¿¡¼" #: src/main/dither-main.c:54 #, fuzzy msgid "Hybrid EvenBetter" -msgstr "イベントトーン方å¼" +msgstr "¥¤¥Ù¥ó¥È¥È¡¼¥óÊý¼°" #: src/main/dither-main.c:60 #, fuzzy msgid "UniTone" -msgstr "イベントトーン方å¼" +msgstr "¥¤¥Ù¥ó¥È¥È¡¼¥óÊý¼°" #: src/main/dither-main.c:61 msgid "Hybrid UniTone" @@ -55,67 +55,80 @@ msgstr "" #: src/main/dither-main.c:63 msgid "Adaptive Hybrid" -msgstr "アダプティブ・ãƒã‚¤ãƒ–リッド方å¼" +msgstr "¥¢¥À¥×¥Æ¥£¥Ö¡¦¥Ï¥¤¥Ö¥ê¥Ã¥ÉÊý¼°" #: src/main/dither-main.c:64 msgid "Ordered" -msgstr "é©å¿œé †åºæ–¹å¼" +msgstr "Ŭ±þ½ç½øÊý¼°" #: src/main/dither-main.c:65 -msgid "Fast" -msgstr "高速方å¼" +#, fuzzy +msgid "Ordered New" +msgstr "Ŭ±þ½ç½øÊý¼°" #: src/main/dither-main.c:66 -msgid "Very Fast" -msgstr "超高速方å¼" +msgid "Fast" +msgstr "¹â®Êý¼°" #: src/main/dither-main.c:67 -msgid "Hybrid Floyd-Steinberg" -msgstr "ãƒã‚¤ãƒ–リッド・フロイド-スタインãƒãƒ¼ã‚°æ–¹å¼" +msgid "Very Fast" +msgstr "Ķ¹â®Êý¼°" #: src/main/dither-main.c:68 +msgid "Hybrid Floyd-Steinberg" +msgstr "¥Ï¥¤¥Ö¥ê¥Ã¥É¡¦¥Õ¥í¥¤¥É-¥¹¥¿¥¤¥ó¥Ð¡¼¥°Êý¼°" + +#: src/main/dither-main.c:69 msgid "Predithered Input" msgstr "" -#: src/main/dither-main.c:88 src/main/print-color.c:56 +#: src/main/dither-main.c:70 +msgid "Drop Size Segmented" +msgstr "" + +#: src/main/dither-main.c:71 +msgid "Drop Size Segmented New" +msgstr "" + +#: src/main/dither-main.c:91 src/main/print-color.c:56 #, fuzzy msgid "Density" -msgstr "濃度:" +msgstr "Ç»ÅÙ:" -#: src/main/dither-main.c:88 src/main/print-canon.c:295 +#: src/main/dither-main.c:91 src/main/print-canon.c:295 #: src/main/print-canon.c:303 src/main/print-canon.c:311 -#: src/main/print-canon.c:319 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-escp2.c:471 -#: src/main/print-escp2.c:479 src/main/print-escp2.c:487 +#: src/main/print-canon.c:319 src/main/print-escp2.c:446 +#: src/main/print-escp2.c:454 src/main/print-escp2.c:462 +#: src/main/print-escp2.c:470 src/main/print-escp2.c:478 +#: src/main/print-escp2.c:486 src/main/print-escp2.c:494 #: 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:1764 src/main/print-olympus.c:1772 -#: src/main/print-olympus.c:1780 src/main/print-olympus.c:1788 -#: src/main/print-pcl.c:1261 src/main/print-pcl.c:1269 -#: src/main/print-pcl.c:1277 src/main/print-pcl.c:1285 +#: src/main/print-olympus.c:1762 src/main/print-olympus.c:1770 +#: src/main/print-olympus.c:1778 src/main/print-olympus.c:1786 +#: src/main/print-pcl.c:1329 src/main/print-pcl.c:1337 +#: src/main/print-pcl.c:1345 src/main/print-pcl.c:1353 msgid "Output Level Adjustment" msgstr "" -#: src/main/dither-main.c:89 +#: src/main/dither-main.c:92 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 "" -"å°åˆ·æ™‚ã®æ¿ƒåº¦ (インクã®é‡) を調整ã—ã¾ã™ã€‚\n" -"用紙ã«å¤§é‡ã®ã‚¤ãƒ³ã‚¯ãŒä»˜ã„ãŸã‚Šæ±šã‚ŒãŸã‚Šã™ã‚‹å ´åˆã¯æ¿ƒåº¦ã‚’低ãã—ã¦ä¸‹ã•ã„;\n" -"é»’ã®éƒ¨åˆ†ãŒã¾ã°ã‚‰ã«ãªã‚‹å ´åˆã¯æ¿ƒåº¦ã‚’高ãã—ã¦ä¸‹ã•ã„。" +"°õºþ»þ¤ÎÇ»ÅÙ (¥¤¥ó¥¯¤ÎÎÌ) ¤òÄ´À°¤·¤Þ¤¹¡£\n" +"ÍÑ»æ¤ËÂçÎ̤Υ¤¥ó¥¯¤¬ÉÕ¤¤¤¿¤ê±ø¤ì¤¿¤ê¤¹¤ë¾ì¹ç¤ÏÇ»ÅÙ¤òÄ㤯¤·¤Æ²¼¤µ¤¤;\n" +"¹õ¤ÎÉôʬ¤¬¤Þ¤Ð¤é¤Ë¤Ê¤ë¾ì¹ç¤ÏÇ»ÅÙ¤ò¹â¤¯¤·¤Æ²¼¤µ¤¤¡£" -#: src/main/dither-main.c:97 +#: src/main/dither-main.c:100 msgid "Dither Algorithm" -msgstr "ディザ方å¼" +msgstr "¥Ç¥£¥¶Êý¼°" -#: src/main/dither-main.c:97 +#: src/main/dither-main.c:100 msgid "Screening Adjustment" msgstr "" -#: src/main/dither-main.c:98 +#: src/main/dither-main.c:101 #, fuzzy msgid "" "Choose the dither algorithm to be used.\n" @@ -127,13 +140,13 @@ msgid "" "art.\n" "Hybrid Floyd-Steinberg generally produces inferior output." msgstr "" -"使用ã™ã‚‹ãƒ‡ã‚£ã‚¶ãƒªãƒ³ã‚°æ–¹å¼ã‚’é¸æŠžã—ã¾ã™ã€‚\n" -"\"アダプティブ・ãƒã‚¤ãƒ–リッド方å¼\": 一般的ã«æœ€é©ãªå“質をæä¾›ã—ã¾ã™ã€‚\n" -"\"é©å¿œé †åºæ–¹å¼\": 高速ã§å†™çœŸãªã©ã®é«˜å“質ãªå‡ºåŠ›ã‚’æä¾›ã—ã¾ã™ã€‚\n" -"\"高速方å¼\",\"超高速方å¼\": ã‹ãªã‚Šé«˜é€Ÿã«å°åˆ·ã—ã€ãƒ†ã‚­ã‚¹ãƒˆã‚„ラインアートã«é©ã—" -"ã¦ã„ã¾ã™ã€‚\n" -"\"ãƒã‚¤ãƒ–リッド・フロイド-スタインãƒãƒ¼ã‚°æ–¹å¼\": 一般的ã«ä½Žå“質ãªå‡ºåŠ›ã‚’æä¾›ã—ã¾" -"ã™ã€‚" +"»ÈÍѤ¹¤ë¥Ç¥£¥¶¥ê¥ó¥°Êý¼°¤òÁªÂò¤·¤Þ¤¹¡£\n" +"\"¥¢¥À¥×¥Æ¥£¥Ö¡¦¥Ï¥¤¥Ö¥ê¥Ã¥ÉÊý¼°\": °ìÈÌŪ¤ËºÇŬ¤ÊÉʼÁ¤òÄ󶡤·¤Þ¤¹¡£\n" +"\"Ŭ±þ½ç½øÊý¼°\": ¹â®¤Ç¼Ì¿¿¤Ê¤É¤Î¹âÉʼÁ¤Ê½ÐÎϤòÄ󶡤·¤Þ¤¹¡£\n" +"\"¹â®Êý¼°\",\"Ķ¹â®Êý¼°\": ¤«¤Ê¤ê¹â®¤Ë°õºþ¤·¡¢¥Æ¥­¥¹¥È¤ä¥é¥¤¥ó¥¢¡¼¥È¤ËŬ¤·" +"¤Æ¤¤¤Þ¤¹¡£\n" +"\"¥Ï¥¤¥Ö¥ê¥Ã¥É¡¦¥Õ¥í¥¤¥É-¥¹¥¿¥¤¥ó¥Ð¡¼¥°Êý¼°\": °ìÈÌŪ¤ËÄãÉʼÁ¤Ê½ÐÎϤòÄ󶡤·¤Þ" +"¤¹¡£" #: src/main/module.c:52 msgid "Miscellaneous (unclassified)" @@ -150,323 +163,332 @@ msgstr "" #: src/main/module.c:55 #, fuzzy msgid "Dither algorithm" -msgstr "ディザ方å¼" +msgstr "¥Ç¥£¥¶Êý¼°" -#: src/main/print-canon.c:200 src/main/print-escp2.c:180 -#: src/main/print-lexmark.c:266 src/main/print-olympus.c:1699 -#: src/main/print-pcl.c:1196 src/main/print-ps.c:67 +#: src/main/print-canon.c:200 src/main/print-escp2.c:182 +#: src/main/print-lexmark.c:266 src/main/print-olympus.c:1697 +#: src/main/print-pcl.c:1264 #, fuzzy msgid "Page Size" -msgstr "ç”»åƒã®ã‚µã‚¤ã‚º" +msgstr "²èÁü¤Î¥µ¥¤¥º" #: src/main/print-canon.c:200 src/main/print-canon.c:206 #: src/main/print-canon.c:212 src/main/print-canon.c:218 #: src/main/print-canon.c:224 src/main/print-canon.c:230 #: src/main/print-canon.c:248 src/main/print-canon.c:272 -#: src/main/print-escp2.c:180 src/main/print-escp2.c:186 -#: src/main/print-escp2.c:192 src/main/print-escp2.c:198 -#: src/main/print-escp2.c:204 src/main/print-escp2.c:210 -#: src/main/print-escp2.c:228 src/main/print-escp2.c:245 -#: src/main/print-escp2.c:251 src/main/print-escp2.c:263 -#: src/main/print-escp2.c:281 src/main/print-lexmark.c:266 +#: src/main/print-escp2.c:182 src/main/print-escp2.c:188 +#: src/main/print-escp2.c:194 src/main/print-escp2.c:200 +#: src/main/print-escp2.c:206 src/main/print-escp2.c:212 +#: src/main/print-escp2.c:230 src/main/print-escp2.c:247 +#: src/main/print-escp2.c:253 src/main/print-escp2.c:265 +#: src/main/print-escp2.c:283 src/main/print-lexmark.c:266 #: src/main/print-lexmark.c:272 src/main/print-lexmark.c:278 -#: src/main/print-lexmark.c:284 src/main/print-olympus.c:1699 -#: src/main/print-olympus.c:1705 src/main/print-olympus.c:1711 -#: src/main/print-olympus.c:1717 src/main/print-pcl.c:1196 -#: src/main/print-pcl.c:1202 src/main/print-pcl.c:1208 -#: src/main/print-pcl.c:1214 src/main/print-pcl.c:1238 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 +#: src/main/print-lexmark.c:284 src/main/print-olympus.c:1697 +#: src/main/print-olympus.c:1703 src/main/print-olympus.c:1709 +#: src/main/print-olympus.c:1715 src/main/print-pcl.c:1264 +#: src/main/print-pcl.c:1270 src/main/print-pcl.c:1276 +#: src/main/print-pcl.c:1282 src/main/print-pcl.c:1306 src/main/print-ps.c:68 +#: src/main/print-ps.c:74 #, fuzzy msgid "Basic Printer Setup" -msgstr "プリンタã®è¨­å®š" +msgstr "¥×¥ê¥ó¥¿¤ÎÀßÄê" -#: src/main/print-canon.c:201 src/main/print-escp2.c:181 -#: src/main/print-lexmark.c:267 src/main/print-olympus.c:1700 -#: src/main/print-pcl.c:1197 src/main/print-ps.c:68 +#: src/main/print-canon.c:201 src/main/print-escp2.c:183 +#: src/main/print-lexmark.c:267 src/main/print-olympus.c:1698 +#: src/main/print-pcl.c:1265 #, fuzzy msgid "Size of the paper being printed to" -msgstr "å°åˆ·ã™ã‚‹ç”¨ç´™ã®ã‚µã‚¤ã‚ºã§ã™ã€‚" +msgstr "°õºþ¤¹¤ëÍÑ»æ¤Î¥µ¥¤¥º¤Ç¤¹¡£" -#: src/main/print-canon.c:206 src/main/print-escp2.c:186 -#: src/main/print-lexmark.c:272 src/main/print-olympus.c:1705 -#: src/main/print-pcl.c:1202 src/main/print-ps.c:73 src/cups/genppd.c:1417 +#: src/main/print-canon.c:206 src/main/print-escp2.c:188 +#: src/main/print-lexmark.c:272 src/main/print-olympus.c:1703 +#: src/main/print-pcl.c:1270 src/cups/genppd.c:1422 msgid "Media Type" -msgstr "用紙ã®ç¨®é¡ž" +msgstr "ÍÑ»æ¤Î¼ïÎà" -#: src/main/print-canon.c:207 src/main/print-escp2.c:187 -#: src/main/print-lexmark.c:273 src/main/print-olympus.c:1706 -#: src/main/print-pcl.c:1203 src/main/print-ps.c:74 +#: src/main/print-canon.c:207 src/main/print-escp2.c:189 +#: src/main/print-lexmark.c:273 src/main/print-olympus.c:1704 +#: src/main/print-pcl.c:1271 msgid "Type of media (plain paper, photo paper, etc.)" msgstr "" -#: src/main/print-canon.c:212 src/main/print-escp2.c:192 -#: src/main/print-lexmark.c:278 src/main/print-olympus.c:1711 -#: src/main/print-pcl.c:1208 src/main/print-ps.c:79 src/cups/genppd.c:1445 +#: src/main/print-canon.c:212 src/main/print-escp2.c:194 +#: src/main/print-lexmark.c:278 src/main/print-olympus.c:1709 +#: src/main/print-pcl.c:1276 src/cups/genppd.c:1450 msgid "Media Source" -msgstr "給紙方法" +msgstr "µë»æÊýË¡" -#: src/main/print-canon.c:213 src/main/print-escp2.c:193 -#: src/main/print-lexmark.c:279 src/main/print-olympus.c:1712 -#: src/main/print-pcl.c:1209 src/main/print-ps.c:80 +#: src/main/print-canon.c:213 src/main/print-escp2.c:195 +#: src/main/print-lexmark.c:279 src/main/print-olympus.c:1710 +#: src/main/print-pcl.c:1277 #, fuzzy msgid "Source (input slot) of the media" -msgstr "å°åˆ·æ™‚ã®çµ¦ç´™æ–¹å¼ã§ã™ã€‚" +msgstr "°õºþ»þ¤Îµë»æÊý¼°¤Ç¤¹¡£" -#: src/main/print-canon.c:218 src/main/print-escp2.c:198 +#: src/main/print-canon.c:218 src/main/print-escp2.c:200 msgid "CD Hub Size" msgstr "" -#: src/main/print-canon.c:219 src/main/print-escp2.c:199 +#: src/main/print-canon.c:219 src/main/print-escp2.c:201 msgid "Print only outside of the hub of the CD, or all the way to the hole" msgstr "" -#: src/main/print-canon.c:224 src/main/print-escp2.c:204 +#: src/main/print-canon.c:224 src/main/print-escp2.c:206 msgid "CD Size (Custom)" msgstr "" -#: src/main/print-canon.c:225 src/main/print-escp2.c:205 +#: src/main/print-canon.c:225 src/main/print-escp2.c:207 msgid "Variable adjustment for the outer diameter of CD" msgstr "" -#: src/main/print-canon.c:230 src/main/print-escp2.c:210 +#: src/main/print-canon.c:230 src/main/print-escp2.c:212 msgid "CD Hub Size (Custom)" msgstr "" -#: src/main/print-canon.c:231 src/main/print-escp2.c:211 +#: src/main/print-canon.c:231 src/main/print-escp2.c:213 #, fuzzy msgid "Variable adjustment to the inner hub of the CD" -msgstr "用紙サイズを 100 ã¨ã—ãŸå ´åˆã®æ¯”率ã§ã™ã€‚" +msgstr "Íѻ極¥¤¥º¤ò 100 ¤È¤·¤¿¾ì¹ç¤ÎÈæΨ¤Ç¤¹¡£" -#: src/main/print-canon.c:236 src/main/print-escp2.c:216 +#: src/main/print-canon.c:236 src/main/print-escp2.c:218 msgid "CD Horizontal Fine Adjustment" msgstr "" #: src/main/print-canon.c:236 src/main/print-canon.c:242 -#: src/main/print-canon.c:254 src/main/print-escp2.c:216 -#: src/main/print-escp2.c:222 src/main/print-escp2.c:239 -#: src/main/print-escp2.c:275 src/main/print-lexmark.c:290 -#: src/main/print-olympus.c:1723 src/main/print-olympus.c:1729 -#: src/main/print-olympus.c:1735 src/main/print-pcl.c:1220 -#: src/main/print-ps.c:91 src/main/print-raw.c:80 +#: src/main/print-canon.c:254 src/main/print-escp2.c:218 +#: src/main/print-escp2.c:224 src/main/print-escp2.c:241 +#: src/main/print-escp2.c:277 src/main/print-lexmark.c:290 +#: src/main/print-olympus.c:1721 src/main/print-olympus.c:1727 +#: src/main/print-olympus.c:1733 src/main/print-pcl.c:1288 +#: src/main/print-raw.c:80 msgid "Advanced Printer Setup" msgstr "" #: src/main/print-canon.c:237 src/main/print-canon.c:243 -#: src/main/print-escp2.c:217 src/main/print-escp2.c:223 +#: src/main/print-escp2.c:219 src/main/print-escp2.c:225 msgid "Fine adjustment to horizontal position for CD printing" msgstr "" -#: src/main/print-canon.c:242 src/main/print-escp2.c:222 +#: src/main/print-canon.c:242 src/main/print-escp2.c:224 msgid "CD Vertical Fine Adjustment" msgstr "" -#: src/main/print-canon.c:248 src/main/print-escp2.c:228 -#: src/main/print-lexmark.c:284 src/main/print-olympus.c:1717 -#: src/main/print-pcl.c:1214 src/main/print-ps.c:85 src/cups/genppd.c:1518 +#: src/main/print-canon.c:248 src/main/print-escp2.c:230 +#: src/main/print-lexmark.c:284 src/main/print-olympus.c:1715 +#: src/main/print-pcl.c:1282 src/cups/genppd.c:1523 msgid "Resolution" -msgstr "解åƒåº¦" +msgstr "²òÁüÅÙ" #: src/main/print-canon.c:249 src/main/print-lexmark.c:285 -#: src/main/print-olympus.c:1718 src/main/print-pcl.c:1215 -#: src/main/print-ps.c:86 +#: src/main/print-olympus.c:1716 src/main/print-pcl.c:1283 msgid "Resolution and quality of the print" -msgstr "å°åˆ·æ™‚ã®è§£åƒåº¦ã¨å“質ã§ã™ã€‚" +msgstr "°õºþ»þ¤Î²òÁüÅÙ¤ÈÉʼÁ¤Ç¤¹¡£" -#: src/main/print-canon.c:254 src/main/print-escp2.c:239 -#: src/main/print-lexmark.c:290 src/main/print-olympus.c:1723 -#: src/main/print-pcl.c:1220 src/main/print-ps.c:91 src/main/print-raw.c:80 +#: src/main/print-canon.c:254 src/main/print-escp2.c:241 +#: src/main/print-lexmark.c:290 src/main/print-olympus.c:1721 +#: src/main/print-pcl.c:1288 src/main/print-raw.c:80 msgid "Ink Type" -msgstr "インクã®ç¨®é¡ž" +msgstr "¥¤¥ó¥¯¤Î¼ïÎà" -#: src/main/print-canon.c:255 src/main/print-escp2.c:240 -#: src/main/print-escp2.c:252 src/main/print-lexmark.c:291 -#: src/main/print-olympus.c:1724 src/main/print-pcl.c:1221 -#: src/main/print-ps.c:92 src/main/print-raw.c:81 +#: src/main/print-canon.c:255 src/main/print-escp2.c:242 +#: src/main/print-escp2.c:254 src/main/print-lexmark.c:291 +#: src/main/print-olympus.c:1722 src/main/print-pcl.c:1289 +#: src/main/print-raw.c:81 msgid "Type of ink in the printer" -msgstr "å°åˆ·æ™‚ã®ã‚¤ãƒ³ã‚¯ã®ç¨®é¡žã§ã™ã€‚" +msgstr "°õºþ»þ¤Î¥¤¥ó¥¯¤Î¼ïÎà¤Ç¤¹¡£" #: src/main/print-canon.c:260 src/main/print-canon.c:261 -#: src/main/print-escp2.c:329 src/main/print-escp2.c:330 +#: src/main/print-escp2.c:331 src/main/print-escp2.c:332 #: src/main/print-lexmark.c:296 src/main/print-lexmark.c:297 -#: src/main/print-pcl.c:1226 src/main/print-pcl.c:1227 +#: src/main/print-pcl.c:1294 src/main/print-pcl.c:1295 msgid "Ink Channels" msgstr "" -#: src/main/print-canon.c:260 src/main/print-escp2.c:130 -#: src/main/print-escp2.c:137 src/main/print-escp2.c:144 -#: src/main/print-escp2.c:287 src/main/print-escp2.c:293 -#: src/main/print-escp2.c:299 src/main/print-escp2.c:305 -#: src/main/print-escp2.c:311 src/main/print-escp2.c:317 -#: src/main/print-escp2.c:323 src/main/print-escp2.c:329 -#: src/main/print-escp2.c:335 src/main/print-lexmark.c:296 -#: src/main/print-pcl.c:1226 +#: src/main/print-canon.c:260 src/main/print-escp2.c:132 +#: src/main/print-escp2.c:139 src/main/print-escp2.c:146 +#: src/main/print-escp2.c:289 src/main/print-escp2.c:295 +#: src/main/print-escp2.c:301 src/main/print-escp2.c:307 +#: src/main/print-escp2.c:313 src/main/print-escp2.c:319 +#: src/main/print-escp2.c:325 src/main/print-escp2.c:331 +#: src/main/print-escp2.c:337 src/main/print-lexmark.c:296 +#: src/main/print-pcl.c:1294 msgid "Advanced Printer Functionality" msgstr "" -#: src/main/print-canon.c:266 src/main/print-escp2.c:341 -#: src/main/print-lexmark.c:302 src/main/print-olympus.c:1741 -#: src/main/print-pcl.c:1232 src/main/print-ps.c:103 src/main/print-raw.c:86 +#: src/main/print-canon.c:266 src/main/print-escp2.c:343 +#: src/main/print-lexmark.c:302 src/main/print-olympus.c:1739 +#: src/main/print-pcl.c:1300 src/main/print-ps.c:80 src/main/print-raw.c:86 #, fuzzy msgid "Printing Mode" -msgstr "プリンタã®åž‹å¼:" +msgstr "¥×¥ê¥ó¥¿¤Î·¿¼°:" #: src/main/print-canon.c:266 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:341 -#: src/main/print-escp2.c:347 src/main/print-lexmark.c:302 -#: src/main/print-olympus.c:1741 src/main/print-pcl.c:1232 -#: src/main/print-ps.c:103 src/main/print-raw.c:86 +#: src/main/print-color.c:208 src/main/print-escp2.c:343 +#: src/main/print-escp2.c:349 src/main/print-lexmark.c:302 +#: src/main/print-olympus.c:1739 src/main/print-pcl.c:1300 +#: src/main/print-ps.c:80 src/main/print-raw.c:86 #, fuzzy msgid "Core Parameter" msgstr "ColorLife Paper" -#: src/main/print-canon.c:267 src/main/print-escp2.c:342 -#: src/main/print-lexmark.c:303 src/main/print-olympus.c:1742 -#: src/main/print-pcl.c:1233 src/main/print-ps.c:104 src/main/print-raw.c:87 +#: src/main/print-canon.c:267 src/main/print-escp2.c:344 +#: src/main/print-lexmark.c:303 src/main/print-olympus.c:1740 +#: src/main/print-pcl.c:1301 src/main/print-ps.c:81 src/main/print-raw.c:87 msgid "Printing Output Mode" msgstr "" -#: src/main/print-canon.c:272 src/main/print-pcl.c:1238 +#: src/main/print-canon.c:272 src/main/print-pcl.c:1306 msgid "Double-Sided Printing" msgstr "" -#: src/main/print-canon.c:273 src/main/print-pcl.c:1239 +#: src/main/print-canon.c:273 src/main/print-pcl.c:1307 msgid "Duplex/Tumble Setting" msgstr "" -#: src/main/print-canon.c:295 src/main/print-escp2.c:439 -#: src/main/print-lexmark.c:325 src/main/print-pcl.c:1261 +#: src/main/print-canon.c:295 src/main/print-escp2.c:446 +#: src/main/print-lexmark.c:325 src/main/print-pcl.c:1329 #, fuzzy msgid "Cyan Density" -msgstr "濃度:" +msgstr "Ç»ÅÙ:" -#: src/main/print-canon.c:296 src/main/print-escp2.c:440 -#: src/main/print-lexmark.c:326 src/main/print-pcl.c:1262 +#: src/main/print-canon.c:296 src/main/print-escp2.c:447 +#: src/main/print-lexmark.c:326 src/main/print-pcl.c:1330 #, fuzzy msgid "Adjust the cyan density" -msgstr "å°åˆ·æ™‚ã®ã‚·ã‚¢ãƒ³è‰²ã®ãƒãƒ©ãƒ³ã‚¹ã‚’調整ã—ã¾ã™ã€‚" +msgstr "°õºþ»þ¤Î¥·¥¢¥ó¿§¤Î¥Ð¥é¥ó¥¹¤òÄ´À°¤·¤Þ¤¹¡£" -#: src/main/print-canon.c:303 src/main/print-escp2.c:447 -#: src/main/print-lexmark.c:333 src/main/print-pcl.c:1269 +#: src/main/print-canon.c:303 src/main/print-escp2.c:454 +#: src/main/print-lexmark.c:333 src/main/print-pcl.c:1337 #, fuzzy msgid "Magenta Density" -msgstr "マゼンタ (M)" +msgstr "¥Þ¥¼¥ó¥¿ (M)" -#: src/main/print-canon.c:304 src/main/print-escp2.c:448 -#: src/main/print-lexmark.c:334 src/main/print-pcl.c:1270 +#: src/main/print-canon.c:304 src/main/print-escp2.c:455 +#: src/main/print-lexmark.c:334 src/main/print-pcl.c:1338 #, fuzzy msgid "Adjust the magenta density" -msgstr "å°åˆ·æ™‚ã®ãƒžã‚¼ãƒ³ã‚¿è‰²ã®ãƒãƒ©ãƒ³ã‚¹ã‚’調整ã—ã¾ã™ã€‚" +msgstr "°õºþ»þ¤Î¥Þ¥¼¥ó¥¿¿§¤Î¥Ð¥é¥ó¥¹¤òÄ´À°¤·¤Þ¤¹¡£" -#: src/main/print-canon.c:311 src/main/print-escp2.c:455 -#: src/main/print-lexmark.c:341 src/main/print-pcl.c:1277 +#: src/main/print-canon.c:311 src/main/print-escp2.c:462 +#: src/main/print-lexmark.c:341 src/main/print-pcl.c:1345 #, fuzzy msgid "Yellow Density" -msgstr "濃度:" +msgstr "Ç»ÅÙ:" -#: src/main/print-canon.c:312 src/main/print-escp2.c:456 -#: src/main/print-lexmark.c:342 src/main/print-pcl.c:1278 +#: src/main/print-canon.c:312 src/main/print-escp2.c:463 +#: src/main/print-lexmark.c:342 src/main/print-pcl.c:1346 #, fuzzy msgid "Adjust the yellow density" -msgstr "å°åˆ·æ™‚ã®é»„色ã®ãƒãƒ©ãƒ³ã‚¹ã‚’調整ã—ã¾ã™ã€‚" +msgstr "°õºþ»þ¤Î²«¿§¤Î¥Ð¥é¥ó¥¹¤òÄ´À°¤·¤Þ¤¹¡£" -#: src/main/print-canon.c:319 src/main/print-escp2.c:463 -#: src/main/print-lexmark.c:349 src/main/print-pcl.c:1285 +#: src/main/print-canon.c:319 src/main/print-escp2.c:470 +#: src/main/print-lexmark.c:349 src/main/print-pcl.c:1353 #, fuzzy msgid "Black Density" -msgstr "濃度:" +msgstr "Ç»ÅÙ:" -#: src/main/print-canon.c:320 src/main/print-escp2.c:464 -#: src/main/print-lexmark.c:350 src/main/print-pcl.c:1286 +#: src/main/print-canon.c:320 src/main/print-escp2.c:471 +#: src/main/print-lexmark.c:350 src/main/print-pcl.c:1354 #, fuzzy msgid "Adjust the black density" -msgstr "å°åˆ·æ™‚ã®ã‚·ã‚¢ãƒ³è‰²ã®ãƒãƒ©ãƒ³ã‚¹ã‚’調整ã—ã¾ã™ã€‚" +msgstr "°õºþ»þ¤Î¥·¥¢¥ó¿§¤Î¥Ð¥é¥ó¥¹¤òÄ´À°¤·¤Þ¤¹¡£" #: src/main/print-canon.c:327 src/main/print-canon.c:328 -#: src/main/print-escp2.c:495 src/main/print-escp2.c:496 +#: src/main/print-escp2.c:534 src/main/print-escp2.c:535 #: src/main/print-lexmark.c:357 src/main/print-lexmark.c:358 -#: src/main/print-pcl.c:1293 src/main/print-pcl.c:1294 +#: src/main/print-pcl.c:1361 src/main/print-pcl.c:1362 #, fuzzy msgid "Light Cyan Transition" -msgstr "明るã„シアン" +msgstr "ÌÀ¤ë¤¤¥·¥¢¥ó" #: src/main/print-canon.c:327 src/main/print-canon.c:335 -#: src/main/print-canon.c:343 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-escp2.c:543 -#: src/main/print-escp2.c:551 src/main/print-escp2.c:559 -#: src/main/print-lexmark.c:357 src/main/print-lexmark.c:365 -#: src/main/print-pcl.c:1293 src/main/print-pcl.c:1301 +#: src/main/print-canon.c:343 src/main/print-escp2.c:502 +#: src/main/print-escp2.c:510 src/main/print-escp2.c:518 +#: src/main/print-escp2.c:526 src/main/print-escp2.c:534 +#: src/main/print-escp2.c:542 src/main/print-escp2.c:550 +#: src/main/print-escp2.c:558 src/main/print-escp2.c:566 +#: src/main/print-escp2.c:574 src/main/print-escp2.c:582 +#: src/main/print-escp2.c:590 src/main/print-escp2.c:598 +#: src/main/print-escp2.c:606 src/main/print-escp2.c:614 +#: src/main/print-escp2.c:622 src/main/print-escp2.c:630 +#: src/main/print-escp2.c:638 src/main/print-escp2.c:646 +#: src/main/print-escp2.c:654 src/main/print-escp2.c:662 +#: src/main/print-escp2.c:670 src/main/print-escp2.c:678 +#: src/main/print-escp2.c:686 src/main/print-escp2.c:694 +#: src/main/print-escp2.c:702 src/main/print-escp2.c:710 +#: src/main/print-escp2.c:718 src/main/print-escp2.c:726 +#: src/main/print-escp2.c:734 src/main/print-lexmark.c:357 +#: src/main/print-lexmark.c:365 src/main/print-pcl.c:1361 +#: src/main/print-pcl.c:1369 msgid "Advanced Ink Adjustment" msgstr "" #: src/main/print-canon.c:335 src/main/print-canon.c:336 -#: src/main/print-escp2.c:503 src/main/print-escp2.c:504 +#: src/main/print-escp2.c:566 src/main/print-escp2.c:567 #: src/main/print-lexmark.c:365 src/main/print-lexmark.c:366 -#: src/main/print-pcl.c:1301 src/main/print-pcl.c:1302 +#: src/main/print-pcl.c:1369 src/main/print-pcl.c:1370 #, fuzzy msgid "Light Magenta Transition" -msgstr "明るã„マゼンタ" +msgstr "ÌÀ¤ë¤¤¥Þ¥¼¥ó¥¿" #: src/main/print-canon.c:343 src/main/print-canon.c:344 #, fuzzy msgid "Light Yellow Transition" -msgstr "明るã„シアン" +msgstr "ÌÀ¤ë¤¤¥·¥¢¥ó" -#: src/main/print-canon.c:363 src/main/print-pcl.c:1482 +#: src/main/print-canon.c:363 src/main/print-pcl.c:1550 #: src/main/escp2-resolutions.c:557 src/main/escp2-resolutions.c:565 #: src/main/escp2-resolutions.c:576 src/main/escp2-resolutions.c:588 msgid "Off" msgstr "" -#: src/main/print-canon.c:364 src/main/print-pcl.c:1483 +#: src/main/print-canon.c:364 src/main/print-pcl.c:1551 msgid "Long Edge (Standard)" msgstr "" -#: src/main/print-canon.c:365 src/main/print-pcl.c:1484 +#: src/main/print-canon.c:365 src/main/print-pcl.c:1552 msgid "Short Edge (Flip)" msgstr "" -#: src/main/print-canon.c:629 src/main/print-escp2.c:1648 +#: src/main/print-canon.c:629 src/main/print-escp2.c:2012 #: src/main/xmli18n-tmp.h:6 msgid "CD - 5 inch" msgstr "" -#: src/main/print-canon.c:631 src/main/print-escp2.c:1650 +#: src/main/print-canon.c:631 src/main/print-escp2.c:2014 #: src/main/xmli18n-tmp.h:7 msgid "CD - 3 inch" msgstr "" -#: src/main/print-canon.c:633 src/main/print-escp2.c:1652 +#: src/main/print-canon.c:633 src/main/print-escp2.c:2016 #: src/main/xmli18n-tmp.h:8 #, fuzzy msgid "CD - Custom" -msgstr "カスタム" +msgstr "¥«¥¹¥¿¥à" -#: src/main/print-canon.c:656 src/main/print-escp2.c:1677 +#: src/main/print-canon.c:656 src/main/print-escp2.c:2041 msgid "Normal" msgstr "" -#: src/main/print-canon.c:658 src/main/print-escp2.c:1679 +#: src/main/print-canon.c:658 src/main/print-escp2.c:2043 #, fuzzy msgid "Print To Hub" -msgstr "ファイルã«å°åˆ·ã—ã¾ã™ã‹ï¼Ÿ" +msgstr "¥Õ¥¡¥¤¥ë¤Ë°õºþ¤·¤Þ¤¹¤«¡©" -#: src/main/print-canon.c:773 src/main/print-escp2.c:2011 -#: src/main/print-lexmark.c:1279 src/main/print-olympus.c:1996 -#: src/main/print-pcl.c:1776 src/main/print-ps.c:170 src/main/print-raw.c:135 -#: src/gutenprintui/panel.c:289 src/gutenprintui2/panel.c:289 +#: src/main/print-canon.c:773 src/main/print-escp2.c:2450 +#: src/main/print-lexmark.c:1279 src/main/print-olympus.c:1994 +#: src/main/print-pcl.c:1844 src/main/print-ps.c:310 src/main/print-raw.c:135 +#: src/gutenprintui2/panel.c:290 msgid "Color" -msgstr "カラー" +msgstr "¥«¥é¡¼" -#: src/main/print-canon.c:775 src/main/print-escp2.c:2013 -#: src/main/print-lexmark.c:1281 src/main/print-pcl.c:1778 -#: src/main/print-ps.c:172 src/main/print-raw.c:137 +#: src/main/print-canon.c:775 src/main/print-escp2.c:2452 +#: src/main/print-lexmark.c:1281 src/main/print-pcl.c:1846 +#: src/main/print-ps.c:312 src/main/print-raw.c:137 #, fuzzy msgid "Black and White" -msgstr "é»’ã¨ç™½" +msgstr "¹õ¤ÈÇò" #: src/main/print-color.c:50 msgid "High Accuracy" @@ -475,7 +497,7 @@ msgstr "" #: src/main/print-color.c:51 #, fuzzy msgid "Bright Colors" -msgstr "å°åˆ·ã‚«ãƒ©ãƒ¼èª¿æ•´" +msgstr "°õºþ¥«¥é¡¼Ä´À°" #: src/main/print-color.c:52 msgid "Correct Hue Only" @@ -500,18 +522,18 @@ msgstr "" #: src/main/print-color.c:58 #, fuzzy msgid "Pre-Dithered" -msgstr "å°åˆ·" +msgstr "°õºþ" #: src/main/print-color.c:121 src/main/escp2-channels.c:916 #: src/main/escp2-channels.c:929 src/main/escp2-channels.c:943 -#: src/gutenprintui/panel.c:290 src/gutenprintui2/panel.c:290 +#: src/gutenprintui2/panel.c:291 msgid "Grayscale" -msgstr "グレースケール" +msgstr "¥°¥ì¡¼¥¹¥±¡¼¥ë" #: src/main/print-color.c:123 #, fuzzy msgid "Whitescale" -msgstr "黄色 (Y)" +msgstr "²«¿§ (Y)" #: src/main/print-color.c:125 msgid "RGB" @@ -529,10 +551,10 @@ msgstr "" msgid "KCMY" msgstr "" -#: src/main/print-color.c:165 src/main/print-color.c:446 +#: src/main/print-color.c:165 src/main/print-color.c:454 #, fuzzy msgid "Channel " -msgstr "å–り消ã—" +msgstr "¼è¤ê¾Ã¤·" #: src/main/print-color.c:165 src/main/print-color.c:216 #: src/main/print-color.c:248 src/main/print-color.c:258 @@ -542,7 +564,7 @@ msgstr "å–り消ã—" #: src/main/print-color.c:314 src/gutenprintui2/gammacurve.c:408 #, fuzzy msgid "Gamma" -msgstr "ガンマ:" +msgstr "¥¬¥ó¥Þ:" #: src/main/print-color.c:166 msgid "Gamma for raw channel " @@ -573,32 +595,32 @@ msgstr "" #: src/main/print-color.c:192 #, fuzzy msgid "Input Image Type" -msgstr "ç”»åƒã®ç¨®é¡ž" +msgstr "²èÁü¤Î¼ïÎà" #: src/main/print-color.c:193 #, fuzzy msgid "Input image type" -msgstr "ç”»åƒã®ç¨®é¡ž" +msgstr "²èÁü¤Î¼ïÎà" #: src/main/print-color.c:200 #, fuzzy msgid "Output Image Type" -msgstr "出力ã®ç¨®é¡ž:" +msgstr "½ÐÎϤμïÎà:" #: src/main/print-color.c:201 #, fuzzy msgid "Output image type" -msgstr "出力ã®ç¨®é¡ž:" +msgstr "½ÐÎϤμïÎà:" #: src/main/print-color.c:208 src/main/print-color.c:209 -#: src/main/print-escp2.c:347 +#: src/main/print-escp2.c:349 msgid "Raw Channels" msgstr "" #: src/main/print-color.c:216 #, fuzzy msgid "SimpleGamma" -msgstr "ガンマ:" +msgstr "¥¬¥ó¥Þ:" #: src/main/print-color.c:217 msgid "Do not correct for screen gamma" @@ -607,17 +629,17 @@ msgstr "" #: src/main/print-color.c:224 #, fuzzy msgid "Brightness" -msgstr "明るã•:" +msgstr "ÌÀ¤ë¤µ:" #: src/main/print-color.c:225 #, fuzzy msgid "Brightness of the print" -msgstr "å°åˆ·æ™‚ã®é«˜ã•ã‚’セットã—ã¾ã™ã€‚" +msgstr "°õºþ»þ¤Î¹â¤µ¤ò¥»¥Ã¥È¤·¤Þ¤¹¡£" #: src/main/print-color.c:232 #, fuzzy msgid "Contrast" -msgstr "コントラスト:" +msgstr "¥³¥ó¥È¥é¥¹¥È:" #: src/main/print-color.c:233 msgid "Contrast of the print (0 is solid gray)" @@ -630,7 +652,7 @@ msgstr "" #: src/main/print-color.c:240 #, fuzzy msgid "Advanced Image Control" -msgstr "出力ã®ç¨®é¡ž:" +msgstr "½ÐÎϤμïÎà:" #: src/main/print-color.c:241 msgid "Use linear vs. fixed end point contrast adjustment" @@ -646,127 +668,124 @@ 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 "" -"å°åˆ·æ™‚ã®ã‚¬ãƒ³ãƒžå€¤ã‚’調整ã—ã¾ã™ã€‚\n" -"値を大ããã™ã‚‹ã¨ä¸€èˆ¬çš„ã«æ˜Žã‚‹ã„å°åˆ·ã«ãªã‚Šã€å°ã•ãã™ã‚‹ã¨æš—ã„å°åˆ·ã«ãªã‚Šã¾ã™ã€‚\n" -"明るã•ã®èª¿æ•´ã¨ã¯ç•°ãªã‚Šã€é»’色ã¨ç™½è‰²ã¯åŒã˜ã¾ã¾ã§ã™ã€‚" +"°õºþ»þ¤Î¥¬¥ó¥ÞÃͤòÄ´À°¤·¤Þ¤¹¡£\n" +"ÃͤòÂ礭¤¯¤¹¤ë¤È°ìÈÌŪ¤ËÌÀ¤ë¤¤°õºþ¤Ë¤Ê¤ê¡¢¾®¤µ¤¯¤¹¤ë¤È°Å¤¤°õºþ¤Ë¤Ê¤ê¤Þ¤¹¡£\n" +"ÌÀ¤ë¤µ¤ÎÄ´À°¤È¤Ï°Û¤Ê¤ê¡¢¹õ¿§¤ÈÇò¿§¤ÏƱ¤¸¤Þ¤Þ¤Ç¤¹¡£" #: src/main/print-color.c:258 #, fuzzy msgid "AppGamma" -msgstr "ガンマ:" +msgstr "¥¬¥ó¥Þ:" #: src/main/print-color.c:259 msgid "Gamma value assumed by application" msgstr "" -#: src/main/print-color.c:266 src/main/escp2-channels.c:3048 -#: src/main/escp2-channels.c:3060 src/main/escp2-channels.c:3068 -#: src/main/escp2-channels.c:3078 src/main/escp2-channels.c:3089 -#: src/main/escp2-channels.c:3101 src/main/escp2-channels.c:3117 -#: src/main/escp2-channels.c:3125 src/main/escp2-channels.c:3138 -#: src/main/escp2-channels.c:3151 src/main/escp2-channels.c:3165 -#: src/main/escp2-channels.c:3179 src/main/escp2-channels.c:3194 -#: src/gutenprintui/panel.c:2152 src/gutenprintui2/panel.c:2153 +#: src/main/print-color.c:266 src/main/escp2-channels.c:3087 +#: src/main/escp2-channels.c:3099 src/main/escp2-channels.c:3107 +#: src/main/escp2-channels.c:3117 src/main/escp2-channels.c:3128 +#: src/main/escp2-channels.c:3140 src/main/escp2-channels.c:3156 +#: src/main/escp2-channels.c:3164 src/main/escp2-channels.c:3177 +#: src/main/escp2-channels.c:3190 src/main/escp2-channels.c:3204 +#: src/main/escp2-channels.c:3218 src/main/escp2-channels.c:3230 +#: src/main/escp2-channels.c:3243 src/gutenprintui2/panel.c:2328 #: src/escputil/escputil.c:978 src/escputil/escputil.c:997 #: src/escputil/escputil.c:1201 msgid "Cyan" -msgstr "シアン (C)" +msgstr "¥·¥¢¥ó (C)" #: src/main/print-color.c:267 #, fuzzy msgid "Adjust the cyan gamma" -msgstr "å°åˆ·æ™‚ã®ã‚·ã‚¢ãƒ³è‰²ã®ãƒãƒ©ãƒ³ã‚¹ã‚’調整ã—ã¾ã™ã€‚" - -#: src/main/print-color.c:274 src/main/escp2-channels.c:3049 -#: src/main/escp2-channels.c:3059 src/main/escp2-channels.c:3070 -#: src/main/escp2-channels.c:3079 src/main/escp2-channels.c:3090 -#: src/main/escp2-channels.c:3103 src/main/escp2-channels.c:3116 -#: src/main/escp2-channels.c:3126 src/main/escp2-channels.c:3139 -#: src/main/escp2-channels.c:3152 src/main/escp2-channels.c:3164 -#: src/main/escp2-channels.c:3178 src/main/escp2-channels.c:3195 -#: src/gutenprintui/panel.c:2159 src/gutenprintui2/panel.c:2160 +msgstr "°õºþ»þ¤Î¥·¥¢¥ó¿§¤Î¥Ð¥é¥ó¥¹¤òÄ´À°¤·¤Þ¤¹¡£" + +#: src/main/print-color.c:274 src/main/escp2-channels.c:3088 +#: src/main/escp2-channels.c:3098 src/main/escp2-channels.c:3109 +#: src/main/escp2-channels.c:3118 src/main/escp2-channels.c:3129 +#: src/main/escp2-channels.c:3142 src/main/escp2-channels.c:3155 +#: src/main/escp2-channels.c:3165 src/main/escp2-channels.c:3178 +#: src/main/escp2-channels.c:3191 src/main/escp2-channels.c:3203 +#: src/main/escp2-channels.c:3217 src/main/escp2-channels.c:3229 +#: src/main/escp2-channels.c:3244 src/gutenprintui2/panel.c:2335 #: src/escputil/escputil.c:979 src/escputil/escputil.c:998 #: src/escputil/escputil.c:1202 msgid "Magenta" -msgstr "マゼンタ (M)" +msgstr "¥Þ¥¼¥ó¥¿ (M)" #: src/main/print-color.c:275 #, fuzzy msgid "Adjust the magenta gamma" -msgstr "å°åˆ·æ™‚ã®ãƒžã‚¼ãƒ³ã‚¿è‰²ã®ãƒãƒ©ãƒ³ã‚¹ã‚’調整ã—ã¾ã™ã€‚" - -#: src/main/print-color.c:282 src/main/escp2-channels.c:3050 -#: src/main/escp2-channels.c:3061 src/main/escp2-channels.c:3069 -#: src/main/escp2-channels.c:3080 src/main/escp2-channels.c:3091 -#: src/main/escp2-channels.c:3105 src/main/escp2-channels.c:3112 -#: src/main/escp2-channels.c:3127 src/main/escp2-channels.c:3140 -#: src/main/escp2-channels.c:3153 src/main/escp2-channels.c:3163 -#: src/main/escp2-channels.c:3177 src/main/escp2-channels.c:3196 -#: src/gutenprintui/panel.c:2166 src/gutenprintui2/panel.c:2167 +msgstr "°õºþ»þ¤Î¥Þ¥¼¥ó¥¿¿§¤Î¥Ð¥é¥ó¥¹¤òÄ´À°¤·¤Þ¤¹¡£" + +#: src/main/print-color.c:282 src/main/escp2-channels.c:3089 +#: src/main/escp2-channels.c:3100 src/main/escp2-channels.c:3108 +#: src/main/escp2-channels.c:3119 src/main/escp2-channels.c:3130 +#: src/main/escp2-channels.c:3144 src/main/escp2-channels.c:3151 +#: src/main/escp2-channels.c:3166 src/main/escp2-channels.c:3179 +#: src/main/escp2-channels.c:3192 src/main/escp2-channels.c:3202 +#: src/main/escp2-channels.c:3216 src/main/escp2-channels.c:3228 +#: src/main/escp2-channels.c:3245 src/gutenprintui2/panel.c:2342 #: src/escputil/escputil.c:980 src/escputil/escputil.c:999 #: src/escputil/escputil.c:1203 msgid "Yellow" -msgstr "黄色 (Y)" +msgstr "²«¿§ (Y)" #: src/main/print-color.c:283 #, fuzzy msgid "Adjust the yellow gamma" -msgstr "å°åˆ·æ™‚ã®é»„色ã®ãƒãƒ©ãƒ³ã‚¹ã‚’調整ã—ã¾ã™ã€‚" +msgstr "°õºþ»þ¤Î²«¿§¤Î¥Ð¥é¥ó¥¹¤òÄ´À°¤·¤Þ¤¹¡£" -#: src/main/print-color.c:290 src/main/escp2-channels.c:3168 -#: src/main/escp2-channels.c:3181 src/gutenprintui/panel.c:2180 -#: src/gutenprintui2/panel.c:2181 src/escputil/escputil.c:987 -#: src/escputil/escputil.c:1005 +#: src/main/print-color.c:290 src/main/escp2-channels.c:3207 +#: src/main/escp2-channels.c:3220 src/gutenprintui2/panel.c:2356 +#: src/escputil/escputil.c:987 src/escputil/escputil.c:1005 msgid "Red" msgstr "" #: src/main/print-color.c:291 #, fuzzy msgid "Adjust the red gamma" -msgstr "å°åˆ·æ™‚ã®é»„色ã®ãƒãƒ©ãƒ³ã‚¹ã‚’調整ã—ã¾ã™ã€‚" +msgstr "°õºþ»þ¤Î²«¿§¤Î¥Ð¥é¥ó¥¹¤òÄ´À°¤·¤Þ¤¹¡£" -#: src/main/print-color.c:298 src/gutenprintui/panel.c:2187 -#: src/gutenprintui2/panel.c:2188 +#: src/main/print-color.c:298 src/gutenprintui2/panel.c:2363 msgid "Green" msgstr "" #: src/main/print-color.c:299 #, fuzzy msgid "Adjust the green gamma" -msgstr "å°åˆ·æ™‚ã®ãƒžã‚¼ãƒ³ã‚¿è‰²ã®ãƒãƒ©ãƒ³ã‚¹ã‚’調整ã—ã¾ã™ã€‚" +msgstr "°õºþ»þ¤Î¥Þ¥¼¥ó¥¿¿§¤Î¥Ð¥é¥ó¥¹¤òÄ´À°¤·¤Þ¤¹¡£" -#: src/main/print-color.c:306 src/main/escp2-channels.c:3169 -#: src/main/escp2-channels.c:3182 src/gutenprintui/panel.c:2194 -#: src/gutenprintui2/panel.c:2195 src/escputil/escputil.c:988 -#: src/escputil/escputil.c:1006 +#: src/main/print-color.c:306 src/main/escp2-channels.c:3208 +#: src/main/escp2-channels.c:3221 src/gutenprintui2/panel.c:2370 +#: src/escputil/escputil.c:988 src/escputil/escputil.c:1006 msgid "Blue" msgstr "" #: src/main/print-color.c:307 #, fuzzy msgid "Adjust the blue gamma" -msgstr "å°åˆ·æ™‚ã®ã‚·ã‚¢ãƒ³è‰²ã®ãƒãƒ©ãƒ³ã‚¹ã‚’調整ã—ã¾ã™ã€‚" +msgstr "°õºþ»þ¤Î¥·¥¢¥ó¿§¤Î¥Ð¥é¥ó¥¹¤òÄ´À°¤·¤Þ¤¹¡£" #: src/main/print-color.c:314 src/main/print-lexmark.c:613 -#: src/main/escp2-channels.c:3047 src/main/escp2-channels.c:3057 -#: src/main/escp2-channels.c:3058 src/main/escp2-channels.c:3071 -#: src/main/escp2-channels.c:3081 src/main/escp2-channels.c:3088 -#: src/main/escp2-channels.c:3100 src/main/escp2-channels.c:3113 -#: src/main/escp2-channels.c:3124 src/main/escp2-channels.c:3137 -#: src/main/escp2-channels.c:3150 src/main/escp2-channels.c:3156 -#: src/main/escp2-channels.c:3180 src/main/escp2-channels.c:3193 -#: src/gutenprintui/panel.c:2173 src/gutenprintui2/panel.c:2174 +#: src/main/escp2-channels.c:3086 src/main/escp2-channels.c:3096 +#: src/main/escp2-channels.c:3097 src/main/escp2-channels.c:3110 +#: src/main/escp2-channels.c:3120 src/main/escp2-channels.c:3127 +#: src/main/escp2-channels.c:3139 src/main/escp2-channels.c:3152 +#: src/main/escp2-channels.c:3163 src/main/escp2-channels.c:3176 +#: src/main/escp2-channels.c:3189 src/main/escp2-channels.c:3195 +#: src/main/escp2-channels.c:3219 src/main/escp2-channels.c:3231 +#: src/main/escp2-channels.c:3242 src/gutenprintui2/panel.c:2349 #: src/escputil/escputil.c:975 src/escputil/escputil.c:996 #: src/escputil/escputil.c:1200 msgid "Black" -msgstr "黒色" +msgstr "¹õ¿§" #: src/main/print-color.c:315 #, fuzzy msgid "Adjust the black gamma" -msgstr "å°åˆ·æ™‚ã®ã‚·ã‚¢ãƒ³è‰²ã®ãƒãƒ©ãƒ³ã‚¹ã‚’調整ã—ã¾ã™ã€‚" +msgstr "°õºþ»þ¤Î¥·¥¢¥ó¿§¤Î¥Ð¥é¥ó¥¹¤òÄ´À°¤·¤Þ¤¹¡£" -#: src/main/print-color.c:322 src/main/print-olympus.c:1764 +#: src/main/print-color.c:322 src/main/print-olympus.c:1762 msgid "Cyan Balance" msgstr "" @@ -774,611 +793,730 @@ msgstr "" #: src/main/print-color.c:338 #, fuzzy msgid "GrayBalance" -msgstr "グレースケール" +msgstr "¥°¥ì¡¼¥¹¥±¡¼¥ë" #: src/main/print-color.c:323 #, fuzzy msgid "Adjust the cyan gray balance" -msgstr "å°åˆ·æ™‚ã®ã‚·ã‚¢ãƒ³è‰²ã®ãƒãƒ©ãƒ³ã‚¹ã‚’調整ã—ã¾ã™ã€‚" +msgstr "°õºþ»þ¤Î¥·¥¢¥ó¿§¤Î¥Ð¥é¥ó¥¹¤òÄ´À°¤·¤Þ¤¹¡£" -#: src/main/print-color.c:330 src/main/print-olympus.c:1772 +#: src/main/print-color.c:330 src/main/print-olympus.c:1770 #, fuzzy msgid "Magenta Balance" -msgstr "マゼンタ (M)" +msgstr "¥Þ¥¼¥ó¥¿ (M)" #: src/main/print-color.c:331 #, fuzzy msgid "Adjust the magenta gray balance" -msgstr "å°åˆ·æ™‚ã®ãƒžã‚¼ãƒ³ã‚¿è‰²ã®ãƒãƒ©ãƒ³ã‚¹ã‚’調整ã—ã¾ã™ã€‚" +msgstr "°õºþ»þ¤Î¥Þ¥¼¥ó¥¿¿§¤Î¥Ð¥é¥ó¥¹¤òÄ´À°¤·¤Þ¤¹¡£" -#: src/main/print-color.c:338 src/main/print-olympus.c:1780 +#: src/main/print-color.c:338 src/main/print-olympus.c:1778 #, fuzzy msgid "Yellow Balance" -msgstr "å°åˆ·æ™‚ã®é»„色ã®ãƒãƒ©ãƒ³ã‚¹ã‚’調整ã—ã¾ã™ã€‚" +msgstr "°õºþ»þ¤Î²«¿§¤Î¥Ð¥é¥ó¥¹¤òÄ´À°¤·¤Þ¤¹¡£" #: src/main/print-color.c:339 #, fuzzy msgid "Adjust the yellow gray balance" -msgstr "å°åˆ·æ™‚ã®é»„色ã®ãƒãƒ©ãƒ³ã‚¹ã‚’調整ã—ã¾ã™ã€‚" +msgstr "°õºþ»þ¤Î²«¿§¤Î¥Ð¥é¥ó¥¹¤òÄ´À°¤·¤Þ¤¹¡£" #: src/main/print-color.c:346 #, fuzzy msgid "Saturation" -msgstr "彩度:" +msgstr "ºÌÅÙ:" #: 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 "" -"å°åˆ·æ™‚ã®å½©åº¦ (カラー・ãƒãƒ©ãƒ³ã‚¹) を調整ã—ã¾ã™ã€‚\n" -"カラーã¨é»’ã®ä¸¡æ–¹ã®ã‚¤ãƒ³ã‚¯ã‚’使ã£ã¦ã‚°ãƒ¬ãƒ¼ã‚¹ã‚±ãƒ¼ãƒ«å‡ºåŠ›ã™ã‚‹å ´åˆã¯ 0 ã«ã—ã¦ä¸‹ã•ã„。" +"°õºþ»þ¤ÎºÌÅÙ (¥«¥é¡¼¡¦¥Ð¥é¥ó¥¹) ¤òÄ´À°¤·¤Þ¤¹¡£\n" +"¥«¥é¡¼¤È¹õ¤ÎξÊý¤Î¥¤¥ó¥¯¤ò»È¤Ã¤Æ¥°¥ì¡¼¥¹¥±¡¼¥ë½ÐÎϤ¹¤ë¾ì¹ç¤Ï 0 ¤Ë¤·¤Æ²¼¤µ¤¤¡£" #: src/main/print-color.c:357 #, fuzzy msgid "Ink Limit" -msgstr "インクã®ç¨®é¡ž" +msgstr "¥¤¥ó¥¯¤Î¼ïÎà" #: 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:353 -#: src/main/print-escp2.c:359 src/main/print-escp2.c:365 -#: src/main/print-escp2.c:371 src/main/print-escp2.c:377 +#: src/main/print-color.c:421 src/main/print-color.c:553 +#: src/main/print-escp2.c:355 src/main/print-escp2.c:361 +#: src/main/print-escp2.c:367 src/main/print-escp2.c:373 +#: src/main/print-escp2.c:379 src/main/print-escp2.c:742 +#: src/main/print-escp2.c:750 src/main/print-escp2.c:758 #, fuzzy msgid "Advanced Output Control" -msgstr "出力ã®ç¨®é¡ž:" +msgstr "½ÐÎϤμïÎà:" #: src/main/print-color.c:358 msgid "Limit the total ink printed to the page" msgstr "" -#: src/main/print-color.c:365 +#: src/main/print-color.c:365 src/main/print-escp2.c:742 msgid "GCR Transition" msgstr "" -#: src/main/print-color.c:366 +#: src/main/print-color.c:366 src/main/print-escp2.c:743 msgid "Adjust the gray component transition rate" msgstr "" -#: src/main/print-color.c:373 +#: src/main/print-color.c:373 src/main/print-escp2.c:750 msgid "GCR Lower Bound" msgstr "" -#: src/main/print-color.c:374 +#: src/main/print-color.c:374 src/main/print-escp2.c:751 msgid "Lower bound of gray component reduction" msgstr "" -#: src/main/print-color.c:381 +#: src/main/print-color.c:381 src/main/print-escp2.c:758 msgid "GCR Upper Bound" msgstr "" -#: src/main/print-color.c:382 +#: src/main/print-color.c:382 src/main/print-escp2.c:759 msgid "Upper bound of gray component reduction" msgstr "" -#: src/main/print-color.c:447 src/main/print-color.c:457 -#: src/main/print-color.c:465 src/main/print-color.c:473 -#: src/main/print-color.c:481 src/main/print-color.c:489 -#: src/main/print-color.c:497 src/main/print-color.c:505 -#: src/main/print-color.c:513 +#: src/main/print-color.c:421 +msgid "LUT dump file" +msgstr "" + +#: src/main/print-color.c:422 +msgid "Dump file for LUT for external color adjustment" +msgstr "" + +#: src/main/print-color.c:455 src/main/print-color.c:465 +#: src/main/print-color.c:473 src/main/print-color.c:481 +#: src/main/print-color.c:489 src/main/print-color.c:497 +#: src/main/print-color.c:505 src/main/print-color.c:513 +#: src/main/print-color.c:521 #, fuzzy msgid "Output Curves" -msgstr "出力ã®ç¨®é¡ž:" +msgstr "½ÐÎϤμïÎà:" -#: src/main/print-color.c:447 +#: src/main/print-color.c:455 msgid "Curve for raw channel " msgstr "" -#: src/main/print-color.c:457 +#: src/main/print-color.c:465 msgid "Cyan Curve" msgstr "" -#: src/main/print-color.c:458 +#: src/main/print-color.c:466 #, fuzzy msgid "Cyan curve" -msgstr "å–り消ã—" +msgstr "¼è¤ê¾Ã¤·" -#: src/main/print-color.c:465 +#: src/main/print-color.c:473 #, fuzzy msgid "Magenta Curve" -msgstr "マゼンタ (M)" +msgstr "¥Þ¥¼¥ó¥¿ (M)" -#: src/main/print-color.c:466 +#: src/main/print-color.c:474 #, fuzzy msgid "Magenta curve" -msgstr "マゼンタ (M)" +msgstr "¥Þ¥¼¥ó¥¿ (M)" -#: src/main/print-color.c:473 +#: src/main/print-color.c:481 #, fuzzy msgid "Yellow Curve" -msgstr "黄色 (Y)" +msgstr "²«¿§ (Y)" -#: src/main/print-color.c:474 +#: src/main/print-color.c:482 #, fuzzy msgid "Yellow curve" -msgstr "黄色 (Y)" +msgstr "²«¿§ (Y)" -#: src/main/print-color.c:481 +#: src/main/print-color.c:489 #, fuzzy msgid "Black Curve" -msgstr "黒色" +msgstr "¹õ¿§" -#: src/main/print-color.c:482 +#: src/main/print-color.c:490 #, fuzzy msgid "Black curve" -msgstr "黒色" +msgstr "¹õ¿§" -#: src/main/print-color.c:489 +#: src/main/print-color.c:497 #, fuzzy msgid "Red Curve" -msgstr "黄色 (Y)" +msgstr "²«¿§ (Y)" -#: src/main/print-color.c:490 +#: src/main/print-color.c:498 #, fuzzy msgid "Red curve" -msgstr "黄色 (Y)" +msgstr "²«¿§ (Y)" -#: src/main/print-color.c:497 +#: src/main/print-color.c:505 #, fuzzy msgid "Green Curve" -msgstr "マゼンタ (M)" +msgstr "¥Þ¥¼¥ó¥¿ (M)" -#: src/main/print-color.c:498 +#: src/main/print-color.c:506 #, fuzzy msgid "Green curve" -msgstr "マゼンタ (M)" +msgstr "¥Þ¥¼¥ó¥¿ (M)" -#: src/main/print-color.c:505 +#: src/main/print-color.c:513 #, fuzzy msgid "Blue Curve" -msgstr "黒色" +msgstr "¹õ¿§" -#: src/main/print-color.c:506 +#: src/main/print-color.c:514 #, fuzzy msgid "Blue curve" -msgstr "黒色" +msgstr "¹õ¿§" -#: src/main/print-color.c:513 +#: src/main/print-color.c:521 #, fuzzy msgid "White Curve" -msgstr "黄色 (Y)" +msgstr "²«¿§ (Y)" -#: src/main/print-color.c:514 +#: src/main/print-color.c:522 #, fuzzy msgid "White curve" -msgstr "黄色 (Y)" +msgstr "²«¿§ (Y)" -#: src/main/print-color.c:521 +#: src/main/print-color.c:529 msgid "Hue Map" msgstr "" -#: src/main/print-color.c:521 src/main/print-color.c:529 -#: src/main/print-color.c:537 +#: src/main/print-color.c:529 src/main/print-color.c:537 +#: src/main/print-color.c:545 msgid "Advanced HSL Curves" msgstr "" -#: src/main/print-color.c:522 +#: src/main/print-color.c:530 msgid "Hue adjustment curve" msgstr "" -#: src/main/print-color.c:529 +#: src/main/print-color.c:537 #, fuzzy msgid "Saturation Map" -msgstr "彩度:" +msgstr "ºÌÅÙ:" -#: src/main/print-color.c:530 +#: src/main/print-color.c:538 msgid "Saturation adjustment curve" msgstr "" -#: src/main/print-color.c:537 +#: src/main/print-color.c:545 msgid "Luminosity Map" msgstr "" -#: src/main/print-color.c:538 +#: src/main/print-color.c:546 msgid "Luminosity adjustment curve" msgstr "" -#: src/main/print-color.c:545 +#: src/main/print-color.c:553 msgid "Gray Component Reduction" msgstr "" -#: src/main/print-color.c:546 +#: src/main/print-color.c:554 msgid "Gray component reduction curve" msgstr "" -#: src/main/print-color.c:1670 +#: src/main/print-color.c:1743 msgid "Traditional Gutenprint color conversion" msgstr "" -#: src/main/printers.c:517 +#: src/main/printers.c:514 #, c-format msgid "Value must be set for %s\n" msgstr "" -#: src/main/printers.c:530 src/main/printers.c:535 +#: src/main/printers.c:527 src/main/printers.c:532 #, fuzzy, c-format msgid "`%s' is not a valid %s\n" -msgstr "%s ã¯ç¨®é¡ž %s ã«å¯¾ã™ã‚‹é©åˆ‡ãªãƒ‘ラメータã§ã¯ã‚ã‚Šã¾ã›ã‚“\n" +msgstr "%s ¤Ï¼ïÎà %s ¤ËÂФ¹¤ëŬÀڤʥѥé¥á¡¼¥¿¤Ç¤Ï¤¢¤ê¤Þ¤»¤ó\n" -#: src/main/printers.c:554 +#: src/main/printers.c:551 #, c-format msgid "%s must be between %f and %f (is %f)\n" msgstr "" -#: src/main/printers.c:576 src/main/printers.c:600 +#: src/main/printers.c:573 src/main/printers.c:597 #, c-format msgid "%s must be between %d and %d (is %d)\n" msgstr "" -#: src/main/printers.c:631 +#: src/main/printers.c:628 #, c-format msgid "%s bounds must be between %f and %f\n" msgstr "" -#: src/main/printers.c:639 +#: src/main/printers.c:636 #, c-format msgid "%s wrap mode must be %s\n" msgstr "" -#: src/main/printers.c:643 +#: src/main/printers.c:640 msgid "no wrap" msgstr "" -#: src/main/printers.c:643 +#: src/main/printers.c:640 msgid "wrap around" msgstr "" -#: src/main/printers.c:687 +#: src/main/printers.c:684 #, fuzzy, c-format msgid "Unknown type parameter %s (%d)\n" -msgstr "プリンタ %s ãŒä¸æ˜Žã§ã™\n" +msgstr "¥×¥ê¥ó¥¿ %s ¤¬ÉÔÌÀ¤Ç¤¹\n" -#: src/main/printers.c:700 src/main/printers.c:711 +#: src/main/printers.c:697 src/main/printers.c:708 #, c-format msgid "%s out of range (value %d, min %d, max %d)\n" -msgstr "%s ã®ç¯„囲を越ãˆã¾ã—㟠(ç¾åœ¨ã®å€¤ %d, æœ€å° %d, 最大 %d)\n" +msgstr "%s ¤ÎÈϰϤò±Û¤¨¤Þ¤·¤¿ (¸½ºß¤ÎÃÍ %d, ºÇ¾® %d, ºÇÂç %d)\n" -#: src/main/printers.c:772 +#: src/main/printers.c:768 #, fuzzy msgid "Page size is not valid\n" -msgstr "ç”»åƒã‚µã‚¤ã‚ºãŒæ­£ã—ãã‚ã‚Šã¾ã›ã‚“\n" +msgstr "²èÁü¥µ¥¤¥º¤¬Àµ¤·¤¯¤¢¤ê¤Þ¤»¤ó\n" -#: src/main/printers.c:793 +#: src/main/printers.c:789 #, fuzzy, c-format msgid "Top margin must not be less than %d\n" -msgstr "上マージン㯠0 よりå°ã•ãã—ãªã„ã§ä¸‹ã•ã„\n" +msgstr "¾å¥Þ¡¼¥¸¥ó¤Ï 0 ¤è¤ê¾®¤µ¤¯¤·¤Ê¤¤¤Ç²¼¤µ¤¤\n" -#: src/main/printers.c:799 +#: src/main/printers.c:795 #, fuzzy, c-format msgid "Left margin must not be less than %d\n" -msgstr "左マージン㯠0 よりå°ã•ãã—ãªã„ã§ä¸‹ã•ã„\n" +msgstr "º¸¥Þ¡¼¥¸¥ó¤Ï 0 ¤è¤ê¾®¤µ¤¯¤·¤Ê¤¤¤Ç²¼¤µ¤¤\n" -#: src/main/printers.c:805 +#: src/main/printers.c:801 #, fuzzy msgid "Height must be greater than zero\n" -msgstr "左マージン㯠0 よりå°ã•ãã—ãªã„ã§ä¸‹ã•ã„\n" +msgstr "º¸¥Þ¡¼¥¸¥ó¤Ï 0 ¤è¤ê¾®¤µ¤¯¤·¤Ê¤¤¤Ç²¼¤µ¤¤\n" -#: src/main/printers.c:811 +#: src/main/printers.c:807 #, fuzzy msgid "Width must be greater than zero\n" -msgstr "上マージン㯠0 よりå°ã•ãã—ãªã„ã§ä¸‹ã•ã„\n" +msgstr "¾å¥Þ¡¼¥¸¥ó¤Ï 0 ¤è¤ê¾®¤µ¤¯¤·¤Ê¤¤¤Ç²¼¤µ¤¤\n" -#: src/main/printers.c:817 +#: src/main/printers.c:813 #, c-format msgid "" "Image is too wide for the page: left margin is %d, width %d, right edge is %" "d\n" msgstr "" -#: src/main/printers.c:824 +#: src/main/printers.c:820 #, c-format msgid "" "Image is too long for the page: top margin is %d, height %d, bottom edge is %" "d\n" msgstr "" -#: src/main/print-escp2.c:162 +#: src/main/print-escp2.c:164 msgid "Automatic Printing Mode" msgstr "" -#: src/main/print-escp2.c:162 src/main/print-escp2.c:174 +#: src/main/print-escp2.c:164 src/main/print-escp2.c:176 #: src/main/generic-options.c:62 msgid "Basic Output Adjustment" msgstr "" -#: src/main/print-escp2.c:163 +#: src/main/print-escp2.c:165 msgid "Automatic printing mode" msgstr "" -#: src/main/print-escp2.c:174 src/main/print-escp2.c:175 +#: src/main/print-escp2.c:176 src/main/print-escp2.c:177 #: src/main/generic-options.c:62 src/main/generic-options.c:63 #, fuzzy msgid "Print Quality" msgstr "720 DPI Highest Quality" -#: src/main/print-escp2.c:229 +#: src/main/print-escp2.c:231 #, fuzzy msgid "Resolution of the print" -msgstr "å°åˆ·æ™‚ã®è§£åƒåº¦ã¨å“質ã§ã™ã€‚" +msgstr "°õºþ»þ¤Î²òÁüÅÙ¤ÈÉʼÁ¤Ç¤¹¡£" -#: src/main/print-escp2.c:245 +#: src/main/print-escp2.c:247 msgid "Enhanced Gloss" msgstr "" -#: src/main/print-escp2.c:246 +#: src/main/print-escp2.c:248 msgid "Add gloss enhancement" msgstr "" -#: src/main/print-escp2.c:251 +#: src/main/print-escp2.c:253 #, fuzzy msgid "Ink Set" -msgstr "インクã®ç¨®é¡ž" +msgstr "¥¤¥ó¥¯¤Î¼ïÎà" -#: src/main/print-escp2.c:257 +#: src/main/print-escp2.c:259 msgid "Printing Direction" msgstr "" -#: src/main/print-escp2.c:257 src/main/print-escp2.c:269 +#: src/main/print-escp2.c:259 src/main/print-escp2.c:271 msgid "Advanced Output Adjustment" msgstr "" -#: src/main/print-escp2.c:258 +#: src/main/print-escp2.c:260 msgid "Printing direction (unidirectional is higher quality, but slower)" msgstr "" -#: src/main/print-escp2.c:263 src/main/print-olympus.c:1735 +#: src/main/print-escp2.c:265 src/main/print-olympus.c:1733 msgid "Borderless" msgstr "" -#: src/main/print-escp2.c:264 src/main/print-olympus.c:1736 +#: src/main/print-escp2.c:266 src/main/print-olympus.c:1734 msgid "Print without borders" msgstr "" -#: src/main/print-escp2.c:269 +#: src/main/print-escp2.c:271 msgid "Interleave Method" msgstr "" -#: src/main/print-escp2.c:270 +#: src/main/print-escp2.c:272 msgid "Interleave pattern to use" msgstr "" -#: src/main/print-escp2.c:275 +#: src/main/print-escp2.c:277 msgid "Adjust dot size as necessary" msgstr "" -#: src/main/print-escp2.c:276 +#: src/main/print-escp2.c:278 msgid "Adjust dot size as necessary to achieve desired density" msgstr "" -#: src/main/print-escp2.c:281 src/main/print-escp2.c:282 +#: src/main/print-escp2.c:283 src/main/print-escp2.c:284 #, fuzzy msgid "Output Order" -msgstr "出力ã®ç¨®é¡ž:" +msgstr "½ÐÎϤμïÎà:" -#: src/main/print-escp2.c:287 src/main/print-escp2.c:288 +#: src/main/print-escp2.c:289 src/main/print-escp2.c:290 msgid "Alignment Passes" msgstr "" -#: src/main/print-escp2.c:293 src/main/print-escp2.c:294 +#: src/main/print-escp2.c:295 src/main/print-escp2.c:296 msgid "Alignment Choices" msgstr "" -#: src/main/print-escp2.c:299 src/main/print-escp2.c:300 +#: src/main/print-escp2.c:301 src/main/print-escp2.c:302 #, fuzzy msgid "Ink change command" -msgstr "èªè­˜ã§ããªã„コマンドã§ã™ã€‚\n" +msgstr "ǧ¼±¤Ç¤­¤Ê¤¤¥³¥Þ¥ó¥É¤Ç¤¹¡£\n" -#: src/main/print-escp2.c:305 src/main/print-escp2.c:306 +#: src/main/print-escp2.c:307 src/main/print-escp2.c:308 msgid "Alternate Alignment Passes" msgstr "" -#: src/main/print-escp2.c:311 src/main/print-escp2.c:312 +#: src/main/print-escp2.c:313 src/main/print-escp2.c:314 #, fuzzy msgid "Alternate Alignment Choices" -msgstr "間隔補正ã®è¨­å®šã‚’ç¹°ã‚Šè¿”ã—ã¾ã™ã€‚\n" +msgstr "´Ö³ÖÊäÀµ¤ÎÀßÄê¤ò·«¤êÊÖ¤·¤Þ¤¹¡£\n" -#: src/main/print-escp2.c:317 +#: src/main/print-escp2.c:319 msgid "Supports Packet Mode" msgstr "" -#: src/main/print-escp2.c:318 +#: src/main/print-escp2.c:320 msgid "Supports D4 Packet Mode" msgstr "" -#: src/main/print-escp2.c:323 +#: src/main/print-escp2.c:325 msgid "Has Interchangeable Ink Cartridges" msgstr "" -#: src/main/print-escp2.c:324 +#: src/main/print-escp2.c:326 msgid "Has multiple choices of ink cartridges" msgstr "" -#: src/main/print-escp2.c:335 src/main/print-escp2.c:336 +#: src/main/print-escp2.c:337 src/main/print-escp2.c:338 #, fuzzy msgid "Channel Names" -msgstr "å–り消ã—" +msgstr "¼è¤ê¾Ã¤·" -#: src/main/print-escp2.c:348 +#: src/main/print-escp2.c:350 msgid "Raw Channel Count" msgstr "" -#: src/main/print-escp2.c:353 +#: src/main/print-escp2.c:355 #, fuzzy msgid "Cyan Map" -msgstr "シアン (C)" +msgstr "¥·¥¢¥ó (C)" -#: src/main/print-escp2.c:354 +#: src/main/print-escp2.c:356 #, fuzzy msgid "Adjust the cyan map" -msgstr "å°åˆ·æ™‚ã®ã‚·ã‚¢ãƒ³è‰²ã®ãƒãƒ©ãƒ³ã‚¹ã‚’調整ã—ã¾ã™ã€‚" +msgstr "°õºþ»þ¤Î¥·¥¢¥ó¿§¤Î¥Ð¥é¥ó¥¹¤òÄ´À°¤·¤Þ¤¹¡£" -#: src/main/print-escp2.c:359 +#: src/main/print-escp2.c:361 #, fuzzy msgid "Magenta Map" -msgstr "マゼンタ (M)" +msgstr "¥Þ¥¼¥ó¥¿ (M)" -#: src/main/print-escp2.c:360 +#: src/main/print-escp2.c:362 #, fuzzy msgid "Adjust the magenta map" -msgstr "å°åˆ·æ™‚ã®ãƒžã‚¼ãƒ³ã‚¿è‰²ã®ãƒãƒ©ãƒ³ã‚¹ã‚’調整ã—ã¾ã™ã€‚" +msgstr "°õºþ»þ¤Î¥Þ¥¼¥ó¥¿¿§¤Î¥Ð¥é¥ó¥¹¤òÄ´À°¤·¤Þ¤¹¡£" -#: src/main/print-escp2.c:365 +#: src/main/print-escp2.c:367 #, fuzzy msgid "Yellow Map" -msgstr "黄色 (Y)" +msgstr "²«¿§ (Y)" -#: src/main/print-escp2.c:366 +#: src/main/print-escp2.c:368 #, fuzzy msgid "Adjust the yellow map" -msgstr "å°åˆ·æ™‚ã®é»„色ã®ãƒãƒ©ãƒ³ã‚¹ã‚’調整ã—ã¾ã™ã€‚" +msgstr "°õºþ»þ¤Î²«¿§¤Î¥Ð¥é¥ó¥¹¤òÄ´À°¤·¤Þ¤¹¡£" -#: src/main/print-escp2.c:371 +#: src/main/print-escp2.c:373 #, fuzzy msgid "Blue Map" -msgstr "é»’ã¨ç™½" +msgstr "¹õ¤ÈÇò" -#: src/main/print-escp2.c:372 +#: src/main/print-escp2.c:374 #, fuzzy msgid "Adjust the blue map" -msgstr "å°åˆ·æ™‚ã®ã‚·ã‚¢ãƒ³è‰²ã®ãƒãƒ©ãƒ³ã‚¹ã‚’調整ã—ã¾ã™ã€‚" +msgstr "°õºþ»þ¤Î¥·¥¢¥ó¿§¤Î¥Ð¥é¥ó¥¹¤òÄ´À°¤·¤Þ¤¹¡£" -#: src/main/print-escp2.c:377 +#: src/main/print-escp2.c:379 msgid "Red Map" msgstr "" -#: src/main/print-escp2.c:378 +#: src/main/print-escp2.c:380 #, fuzzy msgid "Adjust the red map" -msgstr "å°åˆ·æ™‚ã®é»„色ã®ãƒãƒ©ãƒ³ã‚¹ã‚’調整ã—ã¾ã™ã€‚" +msgstr "°õºþ»þ¤Î²«¿§¤Î¥Ð¥é¥ó¥¹¤òÄ´À°¤·¤Þ¤¹¡£" -#: src/main/print-escp2.c:471 +#: src/main/print-escp2.c:478 #, fuzzy msgid "Red Density" -msgstr "濃度:" +msgstr "Ç»ÅÙ:" -#: src/main/print-escp2.c:472 +#: src/main/print-escp2.c:479 #, fuzzy msgid "Adjust the red density" -msgstr "å°åˆ·æ™‚ã®é»„色ã®ãƒãƒ©ãƒ³ã‚¹ã‚’調整ã—ã¾ã™ã€‚" +msgstr "°õºþ»þ¤Î²«¿§¤Î¥Ð¥é¥ó¥¹¤òÄ´À°¤·¤Þ¤¹¡£" -#: src/main/print-escp2.c:479 +#: src/main/print-escp2.c:486 #, fuzzy msgid "Blue Density" -msgstr "濃度:" +msgstr "Ç»ÅÙ:" -#: src/main/print-escp2.c:480 +#: src/main/print-escp2.c:487 #, fuzzy msgid "Adjust the blue density" -msgstr "å°åˆ·æ™‚ã®ã‚·ã‚¢ãƒ³è‰²ã®ãƒãƒ©ãƒ³ã‚¹ã‚’調整ã—ã¾ã™ã€‚" +msgstr "°õºþ»þ¤Î¥·¥¢¥ó¿§¤Î¥Ð¥é¥ó¥¹¤òÄ´À°¤·¤Þ¤¹¡£" -#: src/main/print-escp2.c:487 +#: src/main/print-escp2.c:494 #, fuzzy msgid "Gloss Level" -msgstr "光沢付ãフイルム" +msgstr "¸÷ÂôÉÕ¤­¥Õ¥¤¥ë¥à" -#: src/main/print-escp2.c:488 +#: src/main/print-escp2.c:495 #, fuzzy msgid "Adjust the gloss level" -msgstr "å°åˆ·æ™‚ã®é»„色ã®ãƒãƒ©ãƒ³ã‚¹ã‚’調整ã—ã¾ã™ã€‚" +msgstr "°õºþ»þ¤Î²«¿§¤Î¥Ð¥é¥ó¥¹¤òÄ´À°¤·¤Þ¤¹¡£" + +#: src/main/print-escp2.c:502 +msgid "Drop Size Small" +msgstr "" + +#: src/main/print-escp2.c:503 +msgid "Drop Size 1 (small)" +msgstr "" + +#: src/main/print-escp2.c:510 +msgid "Drop Size Medium" +msgstr "" + +#: src/main/print-escp2.c:511 +msgid "Drop Size 2 (medium)" +msgstr "" + +#: src/main/print-escp2.c:518 +msgid "Drop Size Large" +msgstr "" + +#: src/main/print-escp2.c:519 +msgid "Drop Size 3 (large)" +msgstr "" + +#: src/main/print-escp2.c:526 src/main/print-escp2.c:527 +#, fuzzy +msgid "Light Cyan Value" +msgstr "ÌÀ¤ë¤¤¥·¥¢¥ó" + +#: src/main/print-escp2.c:542 src/main/print-escp2.c:543 +#, fuzzy +msgid "Light Cyan Density Scale" +msgstr "ÌÀ¤ë¤¤¥·¥¢¥ó" + +#: src/main/print-escp2.c:550 src/main/print-escp2.c:551 +#, fuzzy +msgid "Light Magenta Value" +msgstr "ÌÀ¤ë¤¤¥Þ¥¼¥ó¥¿" + +#: src/main/print-escp2.c:558 src/main/print-escp2.c:559 +#, fuzzy +msgid "Light Magenta Density Scale" +msgstr "ÌÀ¤ë¤¤¥Þ¥¼¥ó¥¿" + +#: src/main/print-escp2.c:574 src/main/print-escp2.c:575 +#, fuzzy +msgid "Dark Yellow Value" +msgstr "²«¿§ (Y)" -#: src/main/print-escp2.c:511 src/main/print-escp2.c:512 +#: src/main/print-escp2.c:582 src/main/print-escp2.c:583 msgid "Dark Yellow Transition" msgstr "" -#: src/main/print-escp2.c:519 src/main/print-escp2.c:520 -#: src/main/print-escp2.c:527 src/main/print-escp2.c:528 +#: src/main/print-escp2.c:590 src/main/print-escp2.c:591 +#, fuzzy +msgid "Dark Yellow Density Scale" +msgstr "²«¿§ (Y)" + +#: src/main/print-escp2.c:598 src/main/print-escp2.c:599 +#: src/main/print-escp2.c:622 src/main/print-escp2.c:623 +#, fuzzy +msgid "Gray Value" +msgstr "¥°¥ì¡¼¥¹¥±¡¼¥ë" + +#: src/main/print-escp2.c:606 src/main/print-escp2.c:607 +#: src/main/print-escp2.c:630 src/main/print-escp2.c:631 msgid "Gray Transition" msgstr "" -#: src/main/print-escp2.c:535 src/main/print-escp2.c:536 -#: src/main/print-escp2.c:559 src/main/print-escp2.c:560 +#: src/main/print-escp2.c:614 src/main/print-escp2.c:615 +#: src/main/print-escp2.c:638 src/main/print-escp2.c:639 +#, fuzzy +msgid "Gray Density Scale" +msgstr "¥°¥ì¡¼¥¹¥±¡¼¥ë" + +#: src/main/print-escp2.c:646 src/main/print-escp2.c:647 +#: src/main/print-escp2.c:718 src/main/print-escp2.c:719 +#, fuzzy +msgid "Light Gray Value" +msgstr "ÌÀ¤ë¤¤¥·¥¢¥ó" + +#: src/main/print-escp2.c:654 src/main/print-escp2.c:655 +#: src/main/print-escp2.c:726 src/main/print-escp2.c:727 #, fuzzy msgid "Light Gray Transition" -msgstr "明るã„シアン" +msgstr "ÌÀ¤ë¤¤¥·¥¢¥ó" + +#: src/main/print-escp2.c:662 src/main/print-escp2.c:663 +#: src/main/print-escp2.c:734 src/main/print-escp2.c:735 +#, fuzzy +msgid "Light Gray Density Scale" +msgstr "ÌÀ¤ë¤¤¥·¥¢¥ó" + +#: src/main/print-escp2.c:670 src/main/print-escp2.c:671 +#, fuzzy +msgid "Dark Gray Value" +msgstr "ÌÀ¤ë¤¤¥·¥¢¥ó" -#: src/main/print-escp2.c:543 src/main/print-escp2.c:544 +#: src/main/print-escp2.c:678 src/main/print-escp2.c:679 #, fuzzy msgid "Dark Gray Transition" -msgstr "明るã„シアン" +msgstr "ÌÀ¤ë¤¤¥·¥¢¥ó" + +#: src/main/print-escp2.c:686 src/main/print-escp2.c:687 +#, fuzzy +msgid "Dark Gray Density Scale" +msgstr "ÌÀ¤ë¤¤¥·¥¢¥ó" + +#: src/main/print-escp2.c:694 +#, fuzzy +msgid "Mid Gray Value" +msgstr "¥°¥ì¡¼¥¹¥±¡¼¥ë" + +#: src/main/print-escp2.c:695 +#, fuzzy +msgid "Medium Gray Value" +msgstr "ÌÀ¤ë¤¤¥·¥¢¥ó" -#: src/main/print-escp2.c:551 +#: src/main/print-escp2.c:702 #, fuzzy msgid "Mid Gray Transition" -msgstr "明るã„シアン" +msgstr "ÌÀ¤ë¤¤¥·¥¢¥ó" -#: src/main/print-escp2.c:552 +#: src/main/print-escp2.c:703 #, fuzzy msgid "Medium Gray Transition" -msgstr "明るã„シアン" +msgstr "ÌÀ¤ë¤¤¥·¥¢¥ó" + +#: src/main/print-escp2.c:710 +#, fuzzy +msgid "Mid Gray Density Scale" +msgstr "ÌÀ¤ë¤¤¥·¥¢¥ó" + +#: src/main/print-escp2.c:711 +#, fuzzy +msgid "Medium Gray Density Scale" +msgstr "ÌÀ¤ë¤¤¥·¥¢¥ó" -#: src/main/print-escp2.c:1635 +#: src/main/print-escp2.c:1999 #, fuzzy msgid "Full Manual Control" -msgstr "出力ã®ç¨®é¡ž:" +msgstr "½ÐÎϤμïÎà:" -#: src/main/print-escp2.c:1637 +#: src/main/print-escp2.c:2001 msgid "Automatic Setting Control" msgstr "" -#: src/main/print-escp2.c:1732 src/main/generic-options.c:213 +#: src/main/print-escp2.c:2096 src/main/generic-options.c:213 #: src/main/generic-options.c:230 #, fuzzy msgid "Manual Control" -msgstr "出力ã®ç¨®é¡ž:" - -#: src/main/print-escp2.c:1771 src/main/print-escp2.c:1863 -#: src/main/print-escp2.c:1875 src/main/print-pcl.c:230 -#: src/main/escp2-channels.c:2805 src/main/escp2-papers.c:1707 -#: src/main/escp2-papers.c:1731 src/main/escp2-papers.c:1764 -#: src/main/escp2-papers.c:1815 src/main/escp2-papers.c:1857 -#: src/main/escp2-papers.c:1899 src/main/escp2-papers.c:1992 -#: src/main/escp2-resolutions.c:640 src/main/escp2-resolutions.c:655 -#: src/main/escp2-resolutions.c:668 src/main/generic-options.c:36 -#: src/gutenprintui/panel.c:2613 src/gutenprintui2/panel.c:2639 +msgstr "½ÐÎϤμïÎà:" + +#: src/main/print-escp2.c:2139 src/main/print-escp2.c:2231 +#: src/main/print-escp2.c:2243 src/main/print-pcl.c:237 +#: src/main/escp2-channels.c:2827 src/main/escp2-channels.c:2836 +#: src/main/escp2-papers.c:1718 src/main/escp2-papers.c:1742 +#: src/main/escp2-papers.c:1775 src/main/escp2-papers.c:1826 +#: src/main/escp2-papers.c:1868 src/main/escp2-papers.c:1910 +#: src/main/escp2-papers.c:2003 src/main/escp2-resolutions.c:640 +#: src/main/escp2-resolutions.c:655 src/main/escp2-resolutions.c:670 +#: src/main/escp2-resolutions.c:683 src/main/generic-options.c:36 +#: src/gutenprintui2/panel.c:2814 msgid "Standard" -msgstr "標準" +msgstr "ɸ½à" -#: src/main/print-escp2.c:1842 +#: src/main/print-escp2.c:2210 #, fuzzy msgid "Automatic" -msgstr "ç”»åƒã®ã‚µã‚¤ã‚º" +msgstr "²èÁü¤Î¥µ¥¤¥º" -#: src/main/print-escp2.c:1844 +#: src/main/print-escp2.c:2212 #, fuzzy msgid "Bidirectional" msgstr "600 DPI Unidirectional" -#: src/main/print-escp2.c:1846 +#: src/main/print-escp2.c:2214 #, fuzzy msgid "Unidirectional" msgstr "600 DPI Unidirectional" -#: src/main/print-escp2.c:1877 +#: src/main/print-escp2.c:2245 msgid "Alternate Fill" msgstr "" -#: src/main/print-escp2.c:1879 +#: src/main/print-escp2.c:2247 msgid "Ascending Fill" msgstr "" -#: src/main/print-escp2.c:1881 +#: src/main/print-escp2.c:2249 msgid "Descending Fill" msgstr "" -#: src/main/print-escp2.c:1883 +#: src/main/print-escp2.c:2251 msgid "Ascending Double" msgstr "" -#: src/main/print-escp2.c:1885 +#: src/main/print-escp2.c:2253 msgid "Nearest Neighbor Avoidance" msgstr "" -#: src/main/print-escp2.c:2328 +#: src/main/print-escp2.c:2771 #, fuzzy, c-format msgid "This printer does not support raw printer output at depth %d\n" -msgstr "プリンタã¯ã‚«ãƒ©ãƒ¼å°åˆ·ã‚’サãƒãƒ¼ãƒˆã—ã¦ã„ã¾ã›ã‚“\n" +msgstr "¥×¥ê¥ó¥¿¤Ï¥«¥é¡¼°õºþ¤ò¥µ¥Ý¡¼¥È¤·¤Æ¤¤¤Þ¤»¤ó\n" -#: src/main/print-escp2.c:3436 src/main/print-olympus.c:2451 +#: src/main/print-escp2.c:3934 src/main/print-olympus.c:2449 #: src/main/print-raw.c:217 msgid "Print options not verified; cannot print.\n" msgstr "" @@ -1393,7 +1531,7 @@ msgstr "600 DPI" #: src/main/print-lexmark.c:579 src/main/print-lexmark.c:655 msgid "600 DPI high quality" -msgstr "600 DPI 高å“質" +msgstr "600 DPI ¹âÉʼÁ" #: src/main/print-lexmark.c:580 src/main/print-lexmark.c:656 msgid "600 DPI Unidirectional" @@ -1405,11 +1543,11 @@ msgstr "1200 DPI" #: src/main/print-lexmark.c:582 src/main/print-lexmark.c:658 msgid "1200 DPI high quality" -msgstr "1200 DPI 高å“質" +msgstr "1200 DPI ¹âÉʼÁ" #: src/main/print-lexmark.c:583 src/main/print-lexmark.c:659 msgid "1200 DPI highest quality" -msgstr "1200 DPI 高å“質" +msgstr "1200 DPI ¹âÉʼÁ" #: src/main/print-lexmark.c:584 src/main/print-lexmark.c:660 msgid "1200 DPI Unidirectional" @@ -1421,15 +1559,15 @@ msgstr "2400 DPI x 1200 DPI" #: src/main/print-lexmark.c:586 msgid "2400 DPI x 1200 DPI high quality" -msgstr "2400 DPI x 1200 DPI 高å“質" +msgstr "2400 DPI x 1200 DPI ¹âÉʼÁ" #: src/main/print-lexmark.c:587 msgid "2400 DPI x 1200 DPI highest quality" -msgstr "2400 DPI x 1200 DPI 高å“質" +msgstr "2400 DPI x 1200 DPI ¹âÉʼÁ" #: src/main/print-lexmark.c:589 msgid "test print" -msgstr "テストå°åˆ·" +msgstr "¥Æ¥¹¥È°õºþ" #: src/main/print-lexmark.c:601 src/main/print-lexmark.c:671 #: src/main/escp2-channels.c:1288 src/main/escp2-channels.c:1302 @@ -1452,181 +1590,181 @@ msgid "Three Color Composite" msgstr "Three Color Composite" #: src/main/print-lexmark.c:607 src/main/print-lexmark.c:677 -#: src/main/escp2-channels.c:1540 src/main/escp2-channels.c:1554 -#: src/main/escp2-channels.c:1568 src/main/escp2-channels.c:1582 -#: src/main/escp2-channels.c:1808 src/main/escp2-channels.c:1823 -#: src/main/escp2-channels.c:1838 src/main/escp2-channels.c:1855 +#: src/main/escp2-channels.c:1554 src/main/escp2-channels.c:1568 +#: src/main/escp2-channels.c:1582 src/main/escp2-channels.c:1596 +#: src/main/escp2-channels.c:1822 src/main/escp2-channels.c:1837 +#: src/main/escp2-channels.c:1852 src/main/escp2-channels.c:1869 msgid "Six Color Photo" msgstr "Six Color Photo" #: src/main/print-lexmark.c:610 src/main/print-lexmark.c:680 -#: src/main/escp2-channels.c:1475 src/main/escp2-channels.c:1489 -#: src/main/escp2-channels.c:1503 src/main/escp2-channels.c:1517 -#: src/main/escp2-channels.c:1752 src/main/escp2-channels.c:1767 -#: src/main/escp2-channels.c:1784 +#: src/main/escp2-channels.c:1489 src/main/escp2-channels.c:1503 +#: src/main/escp2-channels.c:1517 src/main/escp2-channels.c:1531 +#: src/main/escp2-channels.c:1766 src/main/escp2-channels.c:1781 +#: src/main/escp2-channels.c:1798 msgid "Five Color Photo Composite" msgstr "Five Color Photo Composite" -#: src/main/print-lexmark.c:856 src/main/escp2-papers.c:1341 -#: src/main/escp2-papers.c:1385 src/main/escp2-papers.c:1429 -#: src/main/escp2-papers.c:1477 src/main/escp2-papers.c:1525 -#: src/main/escp2-papers.c:1569 -msgid "Plain Paper" -msgstr "通常ã®ç”¨ç´™" - -#: src/main/print-lexmark.c:860 src/main/escp2-papers.c:1347 -#: src/main/escp2-papers.c:1391 src/main/escp2-papers.c:1435 -#: src/main/escp2-papers.c:1483 src/main/escp2-papers.c:1531 -#: src/main/escp2-papers.c:1575 -msgid "Glossy Film" -msgstr "光沢付ãフイルム" - -#: src/main/print-lexmark.c:864 src/main/escp2-papers.c:1349 -#: src/main/escp2-papers.c:1393 src/main/escp2-papers.c:1437 -#: src/main/escp2-papers.c:1485 src/main/escp2-papers.c:1533 -#: src/main/escp2-papers.c:1577 -msgid "Transparencies" -msgstr "スライド用紙" - -#: src/main/print-lexmark.c:868 src/main/escp2-papers.c:1351 +#: src/main/print-lexmark.c:856 src/main/escp2-papers.c:1351 #: src/main/escp2-papers.c:1395 src/main/escp2-papers.c:1439 #: src/main/escp2-papers.c:1487 src/main/escp2-papers.c:1535 #: src/main/escp2-papers.c:1579 -msgid "Envelopes" -msgstr "å°ç­’" +msgid "Plain Paper" +msgstr "Ä̾ï¤ÎÍÑ»æ" -#: src/main/print-lexmark.c:872 src/main/escp2-papers.c:1355 -#: src/main/escp2-papers.c:1399 src/main/escp2-papers.c:1443 -#: src/main/escp2-papers.c:1491 src/main/escp2-papers.c:1539 -#: src/main/escp2-papers.c:1583 -msgid "Matte Paper" -msgstr "マット用紙" +#: src/main/print-lexmark.c:860 src/main/escp2-papers.c:1357 +#: src/main/escp2-papers.c:1401 src/main/escp2-papers.c:1445 +#: src/main/escp2-papers.c:1493 src/main/escp2-papers.c:1541 +#: src/main/escp2-papers.c:1585 +msgid "Glossy Film" +msgstr "¸÷ÂôÉÕ¤­¥Õ¥¤¥ë¥à" -#: src/main/print-lexmark.c:876 src/main/escp2-papers.c:1359 +#: src/main/print-lexmark.c:864 src/main/escp2-papers.c:1359 #: src/main/escp2-papers.c:1403 src/main/escp2-papers.c:1447 #: src/main/escp2-papers.c:1495 src/main/escp2-papers.c:1543 #: src/main/escp2-papers.c:1587 -msgid "Inkjet Paper" -msgstr "インクジェット用紙" +msgid "Transparencies" +msgstr "¥¹¥é¥¤¥ÉÍÑ»æ" -#: src/main/print-lexmark.c:880 src/main/escp2-papers.c:1361 +#: src/main/print-lexmark.c:868 src/main/escp2-papers.c:1361 #: src/main/escp2-papers.c:1405 src/main/escp2-papers.c:1449 #: src/main/escp2-papers.c:1497 src/main/escp2-papers.c:1545 #: src/main/escp2-papers.c:1589 -msgid "Photo Quality Inkjet Paper" -msgstr "インクジェット用紙 (フォト用高å“質)" - -#: src/main/print-lexmark.c:884 src/main/escp2-papers.c:1363 -#: src/main/escp2-papers.c:1407 src/main/escp2-papers.c:1451 -#: src/main/escp2-papers.c:1499 src/main/escp2-papers.c:1547 -#: src/main/escp2-papers.c:1591 -msgid "Photo Paper" -msgstr "フォト用紙" +msgid "Envelopes" +msgstr "ÉõÅû" -#: src/main/print-lexmark.c:888 src/main/escp2-papers.c:1365 +#: src/main/print-lexmark.c:872 src/main/escp2-papers.c:1365 #: src/main/escp2-papers.c:1409 src/main/escp2-papers.c:1453 #: src/main/escp2-papers.c:1501 src/main/escp2-papers.c:1549 -#: src/main/escp2-papers.c:1593 src/main/escp2-papers.c:1617 -msgid "Premium Glossy Photo Paper" -msgstr "高級光沢付ãフォト用紙" +#: src/main/escp2-papers.c:1593 +msgid "Matte Paper" +msgstr "¥Þ¥Ã¥ÈÍÑ»æ" -#: src/main/print-lexmark.c:892 src/main/escp2-papers.c:1369 +#: src/main/print-lexmark.c:876 src/main/escp2-papers.c:1369 #: src/main/escp2-papers.c:1413 src/main/escp2-papers.c:1457 #: src/main/escp2-papers.c:1505 src/main/escp2-papers.c:1553 #: src/main/escp2-papers.c:1597 +msgid "Inkjet Paper" +msgstr "¥¤¥ó¥¯¥¸¥§¥Ã¥ÈÍÑ»æ" + +#: src/main/print-lexmark.c:880 src/main/escp2-papers.c:1371 +#: src/main/escp2-papers.c:1415 src/main/escp2-papers.c:1459 +#: src/main/escp2-papers.c:1507 src/main/escp2-papers.c:1555 +#: src/main/escp2-papers.c:1599 +msgid "Photo Quality Inkjet Paper" +msgstr "¥¤¥ó¥¯¥¸¥§¥Ã¥ÈÍÑ»æ (¥Õ¥©¥ÈÍѹâÉʼÁ)" + +#: src/main/print-lexmark.c:884 src/main/escp2-papers.c:1373 +#: src/main/escp2-papers.c:1417 src/main/escp2-papers.c:1461 +#: src/main/escp2-papers.c:1509 src/main/escp2-papers.c:1557 +#: src/main/escp2-papers.c:1601 +msgid "Photo Paper" +msgstr "¥Õ¥©¥ÈÍÑ»æ" + +#: src/main/print-lexmark.c:888 src/main/escp2-papers.c:1375 +#: src/main/escp2-papers.c:1419 src/main/escp2-papers.c:1463 +#: src/main/escp2-papers.c:1511 src/main/escp2-papers.c:1559 +#: src/main/escp2-papers.c:1603 src/main/escp2-papers.c:1627 +msgid "Premium Glossy Photo Paper" +msgstr "¹âµé¸÷ÂôÉÕ¤­¥Õ¥©¥ÈÍÑ»æ" + +#: src/main/print-lexmark.c:892 src/main/escp2-papers.c:1379 +#: src/main/escp2-papers.c:1423 src/main/escp2-papers.c:1467 +#: src/main/escp2-papers.c:1515 src/main/escp2-papers.c:1563 +#: src/main/escp2-papers.c:1607 msgid "Premium Luster Photo Paper" -msgstr "高級ã¤ã‚„出ã—フォト用紙" +msgstr "¹âµé¤Ä¤ä½Ð¤·¥Õ¥©¥ÈÍÑ»æ" -#: src/main/print-lexmark.c:896 src/main/escp2-papers.c:1371 -#: src/main/escp2-papers.c:1415 src/main/escp2-papers.c:1463 -#: src/main/escp2-papers.c:1511 src/main/escp2-papers.c:1555 -#: src/main/escp2-papers.c:1603 +#: src/main/print-lexmark.c:896 src/main/escp2-papers.c:1381 +#: src/main/escp2-papers.c:1425 src/main/escp2-papers.c:1473 +#: src/main/escp2-papers.c:1521 src/main/escp2-papers.c:1565 +#: src/main/escp2-papers.c:1613 msgid "Photo Quality Glossy Paper" -msgstr "光沢付ã用紙 (フォト用高å“質)" +msgstr "¸÷ÂôÉÕ¤­ÍÑ»æ (¥Õ¥©¥ÈÍѹâÉʼÁ)" -#: src/main/print-lexmark.c:900 src/main/escp2-papers.c:1373 -#: src/main/escp2-papers.c:1417 src/main/escp2-papers.c:1465 -#: src/main/escp2-papers.c:1513 src/main/escp2-papers.c:1557 -#: src/main/escp2-papers.c:1605 +#: src/main/print-lexmark.c:900 src/main/escp2-papers.c:1383 +#: src/main/escp2-papers.c:1427 src/main/escp2-papers.c:1475 +#: src/main/escp2-papers.c:1523 src/main/escp2-papers.c:1567 +#: src/main/escp2-papers.c:1615 msgid "Ilford Heavy Paper" msgstr "Ilford Heavy Paper" -#: src/main/print-lexmark.c:904 src/main/escp2-papers.c:1377 -#: src/main/escp2-papers.c:1421 src/main/escp2-papers.c:1469 -#: src/main/escp2-papers.c:1517 src/main/escp2-papers.c:1561 -#: src/main/escp2-papers.c:1609 src/main/escp2-papers.c:1619 +#: src/main/print-lexmark.c:904 src/main/escp2-papers.c:1387 +#: src/main/escp2-papers.c:1431 src/main/escp2-papers.c:1479 +#: src/main/escp2-papers.c:1527 src/main/escp2-papers.c:1571 +#: src/main/escp2-papers.c:1619 src/main/escp2-papers.c:1629 msgid "Other" -msgstr "ãã®ä»–" +msgstr "¤½¤Î¾" #: src/main/print-lexmark.c:1113 msgid "Auto Sheet Feeder" -msgstr "自動給紙" +msgstr "¼«Æ°µë»æ" #: src/main/print-lexmark.c:1114 msgid "Manual with Pause" -msgstr "ãƒãƒ¼ã‚ºä»˜ã手動給紙" +msgstr "¥Ý¡¼¥ºÉÕ¤­¼êÆ°µë»æ" #: src/main/print-lexmark.c:1115 msgid "Manual without Pause" -msgstr "ãƒãƒ¼ã‚ºãªã—手動給紙" +msgstr "¥Ý¡¼¥º¤Ê¤·¼êÆ°µë»æ" -#: src/main/print-olympus.c:277 +#: src/main/print-olympus.c:275 msgid "Coated" msgstr "" -#: src/main/print-olympus.c:278 src/cups/genppd.c:1726 src/cups/genppd.c:1753 -#: src/cups/genppd.c:1834 +#: src/main/print-olympus.c:276 src/cups/genppd.c:1732 src/cups/genppd.c:1759 +#: src/cups/genppd.c:1840 msgid "None" msgstr "" -#: src/main/print-olympus.c:963 src/main/print-olympus.c:1023 -#: src/main/print-olympus.c:1127 +#: src/main/print-olympus.c:961 src/main/print-olympus.c:1021 +#: src/main/print-olympus.c:1125 #, fuzzy msgid "Glossy" -msgstr "光沢付ãフイルム" +msgstr "¸÷ÂôÉÕ¤­¥Õ¥¤¥ë¥à" -#: src/main/print-olympus.c:964 src/main/print-olympus.c:1024 -#: src/main/print-olympus.c:1128 +#: src/main/print-olympus.c:962 src/main/print-olympus.c:1022 +#: src/main/print-olympus.c:1126 msgid "Texture" msgstr "" -#: src/main/print-olympus.c:1025 src/main/print-olympus.c:1129 +#: src/main/print-olympus.c:1023 src/main/print-olympus.c:1127 #, fuzzy msgid "Matte" -msgstr "マット用紙" +msgstr "¥Þ¥Ã¥ÈÍÑ»æ" -#: src/main/print-olympus.c:1729 src/main/print-olympus.c:1730 +#: src/main/print-olympus.c:1727 src/main/print-olympus.c:1728 msgid "Laminate Pattern" msgstr "" -#: src/main/print-olympus.c:1765 +#: src/main/print-olympus.c:1763 #, fuzzy msgid "Adjust the cyan balance" -msgstr "å°åˆ·æ™‚ã®ã‚·ã‚¢ãƒ³è‰²ã®ãƒãƒ©ãƒ³ã‚¹ã‚’調整ã—ã¾ã™ã€‚" +msgstr "°õºþ»þ¤Î¥·¥¢¥ó¿§¤Î¥Ð¥é¥ó¥¹¤òÄ´À°¤·¤Þ¤¹¡£" -#: src/main/print-olympus.c:1773 +#: src/main/print-olympus.c:1771 #, fuzzy msgid "Adjust the magenta balance" -msgstr "å°åˆ·æ™‚ã®ãƒžã‚¼ãƒ³ã‚¿è‰²ã®ãƒãƒ©ãƒ³ã‚¹ã‚’調整ã—ã¾ã™ã€‚" +msgstr "°õºþ»þ¤Î¥Þ¥¼¥ó¥¿¿§¤Î¥Ð¥é¥ó¥¹¤òÄ´À°¤·¤Þ¤¹¡£" -#: src/main/print-olympus.c:1781 +#: src/main/print-olympus.c:1779 #, fuzzy msgid "Adjust the yellow balance" -msgstr "å°åˆ·æ™‚ã®é»„色ã®ãƒãƒ©ãƒ³ã‚¹ã‚’調整ã—ã¾ã™ã€‚" +msgstr "°õºþ»þ¤Î²«¿§¤Î¥Ð¥é¥ó¥¹¤òÄ´À°¤·¤Þ¤¹¡£" -#: src/main/print-olympus.c:1788 +#: src/main/print-olympus.c:1786 #, fuzzy msgid "Black Balance" -msgstr "é»’ã¨ç™½" +msgstr "¹õ¤ÈÇò" -#: src/main/print-olympus.c:1789 +#: src/main/print-olympus.c:1787 #, fuzzy msgid "Adjust the black balance" -msgstr "å°åˆ·æ™‚ã®ã‚·ã‚¢ãƒ³è‰²ã®ãƒãƒ©ãƒ³ã‚¹ã‚’調整ã—ã¾ã™ã€‚" +msgstr "°õºþ»þ¤Î¥·¥¢¥ó¿§¤Î¥Ð¥é¥ó¥¹¤òÄ´À°¤·¤Þ¤¹¡£" #: src/main/print-pcl.c:185 msgid "Plain" -msgstr "通常" +msgstr "Ä̾ï" #: src/main/print-pcl.c:186 msgid "Bond" @@ -1634,110 +1772,134 @@ msgstr "Bond" #: src/main/print-pcl.c:187 msgid "Premium" -msgstr "高級" +msgstr "¹âµé" #: src/main/print-pcl.c:188 msgid "Glossy Photo" -msgstr "光沢付ãフォト" +msgstr "¸÷ÂôÉÕ¤­¥Õ¥©¥È" #: src/main/print-pcl.c:189 msgid "Transparency" -msgstr "スライド" +msgstr "¥¹¥é¥¤¥É" #: src/main/print-pcl.c:190 msgid "Quick-dry Photo" -msgstr "å³ä¹¾ãƒ•ã‚©ãƒˆ" +msgstr "¨´¥¥Õ¥©¥È" #: src/main/print-pcl.c:191 msgid "Quick-dry Transparency" -msgstr "å³ä¹¾ã‚¹ãƒ©ã‚¤ãƒ‰" +msgstr "¨´¥¥¹¥é¥¤¥É" -#: src/main/print-pcl.c:231 src/main/xmli18n-tmp.h:16 +#: src/main/print-pcl.c:238 src/main/xmli18n-tmp.h:17 msgid "Manual" -msgstr "手動" +msgstr "¼êÆ°" + +#: src/main/print-pcl.c:240 +msgid "Tray 1 - Movable Guides" +msgstr "" -#: src/main/print-pcl.c:233 +#: src/main/print-pcl.c:241 msgid "Tray 1" -msgstr "トレイ１" +msgstr "¥È¥ì¥¤£±" + +#: src/main/print-pcl.c:242 +msgid "Tray 2 - Movable Guides" +msgstr "" -#: src/main/print-pcl.c:234 src/main/print-pcl.c:240 +#: src/main/print-pcl.c:243 src/main/print-pcl.c:251 msgid "Tray 2" -msgstr "トレイ２" +msgstr "¥È¥ì¥¤£²" + +#: src/main/print-pcl.c:244 +msgid "Tray 3 - Movable Guides" +msgstr "" -#: src/main/print-pcl.c:235 +#: src/main/print-pcl.c:245 msgid "Tray 3" -msgstr "トレイ３" +msgstr "¥È¥ì¥¤£³" + +#: src/main/print-pcl.c:246 +msgid "Tray 4 - Movable Guides" +msgstr "" -#: src/main/print-pcl.c:236 +#: src/main/print-pcl.c:247 msgid "Tray 4" -msgstr "トレイ４" +msgstr "¥È¥ì¥¤£´" -#: src/main/print-pcl.c:237 +#: src/main/print-pcl.c:248 msgid "Portable Sheet Feeder" -msgstr "æºå¸¯å¼çµ¦ç´™" +msgstr "·ÈÂÓ¼°µë»æ" -#: src/main/print-pcl.c:238 +#: src/main/print-pcl.c:249 msgid "Desktop Sheet Feeder" -msgstr "デスクトップ給紙" +msgstr "¥Ç¥¹¥¯¥È¥Ã¥×µë»æ" -#: src/main/print-pcl.c:239 +#: src/main/print-pcl.c:250 msgid "Tray" -msgstr "トレイ" +msgstr "¥È¥ì¥¤" -#: src/main/print-pcl.c:241 +#: src/main/print-pcl.c:252 msgid "Optional Source" -msgstr "オプション" +msgstr "¥ª¥×¥·¥ç¥ó" -#: src/main/print-pcl.c:242 +#: src/main/print-pcl.c:253 msgid "Autoselect" -msgstr "自動é¸æŠž" +msgstr "¼«Æ°ÁªÂò" -#: src/main/print-pcl.c:256 +#: src/main/print-pcl.c:267 msgid "150x150 DPI" msgstr "150x150 DPI" -#: src/main/print-pcl.c:257 +#: src/main/print-pcl.c:268 msgid "300x300 DPI" msgstr "300x300 DPI" -#: src/main/print-pcl.c:258 +#: src/main/print-pcl.c:269 msgid "600x300 DPI" msgstr "600x300 DPI" -#: src/main/print-pcl.c:259 +#: src/main/print-pcl.c:270 msgid "600x600 DPI monochrome" -msgstr "600x600 DPI モノクロ" +msgstr "600x600 DPI ¥â¥Î¥¯¥í" -#: src/main/print-pcl.c:260 +#: src/main/print-pcl.c:271 msgid "600x600 DPI" msgstr "600x600 DPI" -#: src/main/print-pcl.c:261 +#: src/main/print-pcl.c:272 msgid "1200x600 DPI" msgstr "1200x600 DPI" -#: src/main/print-pcl.c:262 +#: src/main/print-pcl.c:273 msgid "2400x600 DPI" msgstr "2400x600 DPI" -#: src/main/print-pcl.c:1470 +#: src/main/print-pcl.c:1538 msgid "Color + Black Cartridges" -msgstr "カラー + 黒カートリッジ" +msgstr "¥«¥é¡¼ + ¹õ¥«¡¼¥È¥ê¥Ã¥¸" -#: src/main/print-pcl.c:1471 +#: src/main/print-pcl.c:1539 msgid "Color + Photo Cartridges" -msgstr "カラー + フォト・カートリッジ" +msgstr "¥«¥é¡¼ + ¥Õ¥©¥È¡¦¥«¡¼¥È¥ê¥Ã¥¸" -#: src/main/print-ps.c:97 +#: src/main/print-ps.c:68 #, fuzzy msgid "PPDFile" -msgstr "PPD ファイル:" +msgstr "PPD ¥Õ¥¡¥¤¥ë:" -#: src/main/print-ps.c:98 src/gutenprintui/panel.c:1768 -#: src/gutenprintui2/panel.c:1768 +#: src/main/print-ps.c:69 src/gutenprintui2/panel.c:1943 #, fuzzy msgid "PPD File" -msgstr "PPD ファイルã§ã™ã‹ï¼Ÿ" +msgstr "PPD ¥Õ¥¡¥¤¥ë¤Ç¤¹¤«¡©" + +#: src/main/print-ps.c:74 +#, fuzzy +msgid "Model Name" +msgstr "¼è¤ê¾Ã¤·" + +#: src/main/print-ps.c:75 +msgid "PPD File Model Name" +msgstr "" #: src/main/print-raw.c:223 msgid "Image dimensions must match paper dimensions" @@ -1755,293 +1917,299 @@ msgstr "Two Level Grayscale" #: src/main/escp2-channels.c:1035 src/main/escp2-channels.c:1048 #: src/main/escp2-channels.c:1061 src/main/escp2-channels.c:1074 #: src/main/escp2-channels.c:1087 src/main/escp2-channels.c:1100 -#: src/main/escp2-channels.c:2505 src/main/escp2-channels.c:2528 -#: src/main/escp2-channels.c:2548 src/main/escp2-channels.c:2568 -#: src/main/escp2-channels.c:2588 src/main/escp2-channels.c:2608 +#: src/main/escp2-channels.c:2525 src/main/escp2-channels.c:2548 +#: src/main/escp2-channels.c:2568 src/main/escp2-channels.c:2588 +#: src/main/escp2-channels.c:2608 src/main/escp2-channels.c:2628 msgid "Quadtone" msgstr "Quadtone" -#: src/main/escp2-channels.c:1604 src/main/escp2-channels.c:1618 +#: src/main/escp2-channels.c:1466 +#, fuzzy +msgid "Four Color Photo" +msgstr "Six Color Photo" + +#: src/main/escp2-channels.c:1618 src/main/escp2-channels.c:1632 msgid "Six Color Enhanced Composite" msgstr "Six Color Enhanced Composite" -#: src/main/escp2-channels.c:1641 src/main/escp2-channels.c:1655 -#: src/main/escp2-channels.c:1669 src/main/escp2-channels.c:1705 +#: src/main/escp2-channels.c:1655 src/main/escp2-channels.c:1669 +#: src/main/escp2-channels.c:1683 src/main/escp2-channels.c:1719 msgid "Seven Color Photo" msgstr "Seven Color Photo" -#: src/main/escp2-channels.c:1691 +#: src/main/escp2-channels.c:1705 msgid "Seven Color Enhanced" msgstr "Seven Color Enhanced" -#: src/main/escp2-channels.c:1728 +#: src/main/escp2-channels.c:1742 #, fuzzy msgid "Eight Color Photo" msgstr "Six Color Photo" -#: src/main/escp2-channels.c:1876 src/main/escp2-channels.c:1888 -#: src/main/escp2-channels.c:1894 +#: src/main/escp2-channels.c:1890 src/main/escp2-channels.c:1902 +#: src/main/escp2-channels.c:1908 #, fuzzy msgid "One Color Raw" msgstr "Seven Color Photo" -#: src/main/escp2-channels.c:1900 +#: src/main/escp2-channels.c:1914 #, fuzzy msgid "One Color Raw Enhanced Gloss" msgstr "Seven Color Enhanced" -#: src/main/escp2-channels.c:1913 src/main/escp2-channels.c:1925 +#: src/main/escp2-channels.c:1927 src/main/escp2-channels.c:1939 #, fuzzy msgid "Two Color Raw" msgstr "Four Color Standard" -#: src/main/escp2-channels.c:1939 src/main/escp2-channels.c:1953 -#: src/main/escp2-channels.c:1980 src/main/escp2-channels.c:1993 -#: src/main/escp2-channels.c:2006 src/main/escp2-channels.c:2019 -#: src/main/escp2-channels.c:2033 src/main/escp2-channels.c:2047 -#: src/main/escp2-channels.c:2060 +#: src/main/escp2-channels.c:1953 src/main/escp2-channels.c:1967 +#: src/main/escp2-channels.c:1994 src/main/escp2-channels.c:2007 +#: src/main/escp2-channels.c:2020 src/main/escp2-channels.c:2033 +#: src/main/escp2-channels.c:2047 src/main/escp2-channels.c:2061 +#: src/main/escp2-channels.c:2074 #, fuzzy msgid "Three Color Raw" msgstr "Three Color Composite" -#: src/main/escp2-channels.c:1967 +#: src/main/escp2-channels.c:1981 #, fuzzy msgid "Three Color Raw Gloss" msgstr "Three Color Composite" -#: src/main/escp2-channels.c:2067 src/main/escp2-channels.c:2073 -#: src/main/escp2-channels.c:2079 src/main/escp2-channels.c:2085 -#: src/main/escp2-channels.c:2091 src/main/escp2-channels.c:2097 -#: src/main/escp2-channels.c:2103 src/main/escp2-channels.c:2109 -#: src/main/escp2-channels.c:2115 src/main/escp2-channels.c:2121 +#: src/main/escp2-channels.c:2081 src/main/escp2-channels.c:2087 +#: src/main/escp2-channels.c:2093 src/main/escp2-channels.c:2099 +#: src/main/escp2-channels.c:2105 src/main/escp2-channels.c:2111 +#: src/main/escp2-channels.c:2117 src/main/escp2-channels.c:2123 +#: src/main/escp2-channels.c:2129 src/main/escp2-channels.c:2135 +#: src/main/escp2-channels.c:2141 #, fuzzy msgid "Four Color Raw" msgstr "Four Color Standard" -#: src/main/escp2-channels.c:2127 +#: src/main/escp2-channels.c:2147 #, fuzzy msgid "Four Color Raw Gloss" msgstr "Four Color Standard" -#: src/main/escp2-channels.c:2142 src/main/escp2-channels.c:2156 +#: src/main/escp2-channels.c:2162 src/main/escp2-channels.c:2176 #, fuzzy msgid "Five Color Raw" msgstr "Seven Color Photo" -#: src/main/escp2-channels.c:2170 src/main/escp2-channels.c:2186 -#: src/main/escp2-channels.c:2192 src/main/escp2-channels.c:2198 -#: src/main/escp2-channels.c:2213 src/main/escp2-channels.c:2234 +#: src/main/escp2-channels.c:2190 src/main/escp2-channels.c:2206 +#: src/main/escp2-channels.c:2212 src/main/escp2-channels.c:2218 +#: src/main/escp2-channels.c:2233 src/main/escp2-channels.c:2254 #, fuzzy msgid "Six Color Raw" msgstr "Six Color Photo" -#: src/main/escp2-channels.c:2219 +#: src/main/escp2-channels.c:2239 #, fuzzy msgid "Six Color Enhanced Gloss Raw" msgstr "Six Color Enhanced Composite" -#: src/main/escp2-channels.c:2250 src/main/escp2-channels.c:2265 -#: src/main/escp2-channels.c:2280 +#: src/main/escp2-channels.c:2270 src/main/escp2-channels.c:2285 +#: src/main/escp2-channels.c:2300 #, fuzzy msgid "Seven Color Raw" msgstr "Seven Color Photo" -#: src/main/escp2-channels.c:2297 +#: src/main/escp2-channels.c:2317 #, fuzzy msgid "Seven Color Enhanced Gloss Raw" msgstr "Seven Color Enhanced" -#: src/main/escp2-channels.c:2315 +#: src/main/escp2-channels.c:2335 #, fuzzy msgid "Eight Color Raw" msgstr "Six Color Photo" -#: src/main/escp2-channels.c:2482 src/main/escp2-channels.c:2495 -#: src/main/escp2-channels.c:2497 src/main/escp2-channels.c:2517 -#: src/main/escp2-channels.c:2520 src/main/escp2-channels.c:2540 -#: src/main/escp2-channels.c:2560 src/main/escp2-channels.c:2580 -#: src/main/escp2-channels.c:2600 src/main/escp2-channels.c:2620 -#: src/main/escp2-channels.c:2636 src/main/escp2-channels.c:2638 -#: src/main/escp2-channels.c:2640 src/main/escp2-channels.c:2642 -#: src/main/escp2-channels.c:2658 src/main/escp2-channels.c:2674 -#: src/main/escp2-channels.c:2694 +#: src/main/escp2-channels.c:2502 src/main/escp2-channels.c:2515 +#: src/main/escp2-channels.c:2517 src/main/escp2-channels.c:2537 +#: src/main/escp2-channels.c:2540 src/main/escp2-channels.c:2560 +#: src/main/escp2-channels.c:2580 src/main/escp2-channels.c:2600 +#: src/main/escp2-channels.c:2620 src/main/escp2-channels.c:2640 +#: src/main/escp2-channels.c:2656 src/main/escp2-channels.c:2658 +#: src/main/escp2-channels.c:2660 src/main/escp2-channels.c:2662 +#: src/main/escp2-channels.c:2678 src/main/escp2-channels.c:2694 +#: src/main/escp2-channels.c:2714 msgid "EPSON Standard Inks" msgstr "" -#: src/main/escp2-channels.c:2714 src/main/escp2-channels.c:2739 +#: src/main/escp2-channels.c:2734 src/main/escp2-channels.c:2759 #, fuzzy msgid "UltraChrome Photo Black" msgstr "Six Color Photo" -#: src/main/escp2-channels.c:2718 src/main/escp2-channels.c:2743 +#: src/main/escp2-channels.c:2738 src/main/escp2-channels.c:2763 msgid "UltraChrome Matte Black" msgstr "" -#: src/main/escp2-channels.c:2758 src/main/escp2-channels.c:2796 -#: src/main/escp2-channels.c:3167 src/escputil/escputil.c:976 +#: src/main/escp2-channels.c:2778 src/main/escp2-channels.c:2816 +#: src/main/escp2-channels.c:3206 src/escputil/escputil.c:976 #, fuzzy msgid "Photo Black" -msgstr "フォト用紙" +msgstr "¥Õ¥©¥ÈÍÑ»æ" -#: src/main/escp2-channels.c:2762 src/main/escp2-channels.c:2778 -#: src/main/escp2-channels.c:3166 src/escputil/escputil.c:986 +#: src/main/escp2-channels.c:2782 src/main/escp2-channels.c:2798 +#: src/main/escp2-channels.c:3205 src/escputil/escputil.c:986 #, fuzzy msgid "Matte Black" -msgstr "マット用紙" +msgstr "¥Þ¥Ã¥ÈÍÑ»æ" -#: src/main/escp2-channels.c:3092 src/main/escp2-channels.c:3102 -#: src/main/escp2-channels.c:3114 src/main/escp2-channels.c:3128 -#: src/main/escp2-channels.c:3141 src/main/escp2-channels.c:3154 -#: src/main/escp2-channels.c:3191 src/escputil/escputil.c:981 +#: src/main/escp2-channels.c:3131 src/main/escp2-channels.c:3141 +#: src/main/escp2-channels.c:3153 src/main/escp2-channels.c:3167 +#: src/main/escp2-channels.c:3180 src/main/escp2-channels.c:3193 +#: src/main/escp2-channels.c:3240 src/escputil/escputil.c:981 #: src/escputil/escputil.c:1204 #, fuzzy msgid "Light Cyan" -msgstr "明るã„シアン" +msgstr "ÌÀ¤ë¤¤¥·¥¢¥ó" -#: src/main/escp2-channels.c:3093 src/main/escp2-channels.c:3104 -#: src/main/escp2-channels.c:3115 src/main/escp2-channels.c:3129 -#: src/main/escp2-channels.c:3142 src/main/escp2-channels.c:3155 -#: src/main/escp2-channels.c:3190 src/escputil/escputil.c:982 +#: src/main/escp2-channels.c:3132 src/main/escp2-channels.c:3143 +#: src/main/escp2-channels.c:3154 src/main/escp2-channels.c:3168 +#: src/main/escp2-channels.c:3181 src/main/escp2-channels.c:3194 +#: src/main/escp2-channels.c:3239 src/escputil/escputil.c:982 #: src/escputil/escputil.c:1205 #, fuzzy msgid "Light Magenta" -msgstr "明るã„マゼンタ" +msgstr "ÌÀ¤ë¤¤¥Þ¥¼¥ó¥¿" -#: src/main/escp2-channels.c:3130 src/main/escp2-channels.c:3192 +#: src/main/escp2-channels.c:3169 src/main/escp2-channels.c:3241 #: src/escputil/escputil.c:985 #, fuzzy msgid "Light Black" -msgstr "黒色" +msgstr "¹õ¿§" -#: src/main/escp2-channels.c:3143 +#: src/main/escp2-channels.c:3182 #, fuzzy msgid "Dark Yellow" -msgstr "黄色 (Y)" +msgstr "²«¿§ (Y)" -#: src/main/escp2-channels.c:3170 src/escputil/escputil.c:989 +#: src/main/escp2-channels.c:3209 src/escputil/escputil.c:989 #, fuzzy msgid "Gloss Optimizer" -msgstr "光沢付ãフイルム" +msgstr "¸÷ÂôÉÕ¤­¥Õ¥¤¥ë¥à" -#: src/main/escp2-channels.c:3189 src/escputil/escputil.c:990 +#: src/main/escp2-channels.c:3238 src/escputil/escputil.c:990 #, fuzzy msgid "Light Light Black" -msgstr "黒色" +msgstr "¹õ¿§" -#: src/main/escp2-papers.c:1343 src/main/escp2-papers.c:1387 -#: src/main/escp2-papers.c:1431 src/main/escp2-papers.c:1479 -#: src/main/escp2-papers.c:1527 src/main/escp2-papers.c:1571 +#: src/main/escp2-papers.c:1353 src/main/escp2-papers.c:1397 +#: src/main/escp2-papers.c:1441 src/main/escp2-papers.c:1489 +#: src/main/escp2-papers.c:1537 src/main/escp2-papers.c:1581 msgid "Plain Paper Fast Load" -msgstr "通常用紙ã®é«˜é€Ÿèª­è¾¼ã¿" +msgstr "Ä̾ïÍÑ»æ¤Î¹â®Æɹþ¤ß" -#: src/main/escp2-papers.c:1345 src/main/escp2-papers.c:1389 -#: src/main/escp2-papers.c:1433 src/main/escp2-papers.c:1481 -#: src/main/escp2-papers.c:1529 src/main/escp2-papers.c:1573 +#: src/main/escp2-papers.c:1355 src/main/escp2-papers.c:1399 +#: src/main/escp2-papers.c:1443 src/main/escp2-papers.c:1491 +#: src/main/escp2-papers.c:1539 src/main/escp2-papers.c:1583 #: src/main/xmli18n-tmp.h:5 msgid "Postcard" -msgstr "ã¯ãŒã" +msgstr "¤Ï¤¬¤­" -#: src/main/escp2-papers.c:1353 src/main/escp2-papers.c:1397 -#: src/main/escp2-papers.c:1441 src/main/escp2-papers.c:1489 -#: src/main/escp2-papers.c:1537 src/main/escp2-papers.c:1581 +#: src/main/escp2-papers.c:1363 src/main/escp2-papers.c:1407 +#: src/main/escp2-papers.c:1451 src/main/escp2-papers.c:1499 +#: src/main/escp2-papers.c:1547 src/main/escp2-papers.c:1591 msgid "Back Light Film" -msgstr "ãƒãƒƒã‚¯ãƒ©ã‚¤ãƒˆãƒ»ãƒ•ã‚£ãƒ«ãƒ " - -#: src/main/escp2-papers.c:1357 src/main/escp2-papers.c:1401 -#: src/main/escp2-papers.c:1445 src/main/escp2-papers.c:1493 -#: src/main/escp2-papers.c:1541 src/main/escp2-papers.c:1585 -#, fuzzy -msgid "Matte Paper Heavyweight" -msgstr "マット用紙" +msgstr "¥Ð¥Ã¥¯¥é¥¤¥È¡¦¥Õ¥£¥ë¥à" #: src/main/escp2-papers.c:1367 src/main/escp2-papers.c:1411 #: src/main/escp2-papers.c:1455 src/main/escp2-papers.c:1503 #: src/main/escp2-papers.c:1551 src/main/escp2-papers.c:1595 #, fuzzy +msgid "Matte Paper Heavyweight" +msgstr "¥Þ¥Ã¥ÈÍÑ»æ" + +#: src/main/escp2-papers.c:1377 src/main/escp2-papers.c:1421 +#: src/main/escp2-papers.c:1465 src/main/escp2-papers.c:1513 +#: src/main/escp2-papers.c:1561 src/main/escp2-papers.c:1605 +#, fuzzy msgid "Premium Semigloss Photo Paper" -msgstr "高級光沢付ãフォト用紙" +msgstr "¹âµé¸÷ÂôÉÕ¤­¥Õ¥©¥ÈÍÑ»æ" -#: src/main/escp2-papers.c:1375 src/main/escp2-papers.c:1419 -#: src/main/escp2-papers.c:1467 src/main/escp2-papers.c:1515 -#: src/main/escp2-papers.c:1559 src/main/escp2-papers.c:1607 +#: src/main/escp2-papers.c:1385 src/main/escp2-papers.c:1429 +#: src/main/escp2-papers.c:1477 src/main/escp2-papers.c:1525 +#: src/main/escp2-papers.c:1569 src/main/escp2-papers.c:1617 #, fuzzy msgid "ColorLife Paper" msgstr "ColorLife Paper" -#: src/main/escp2-papers.c:1459 src/main/escp2-papers.c:1507 -#: src/main/escp2-papers.c:1599 +#: src/main/escp2-papers.c:1469 src/main/escp2-papers.c:1517 +#: src/main/escp2-papers.c:1609 #, fuzzy msgid "Archival Matte Paper" -msgstr "マット用紙" +msgstr "¥Þ¥Ã¥ÈÍÑ»æ" -#: src/main/escp2-papers.c:1461 src/main/escp2-papers.c:1509 -#: src/main/escp2-papers.c:1601 +#: src/main/escp2-papers.c:1471 src/main/escp2-papers.c:1519 +#: src/main/escp2-papers.c:1611 msgid "Watercolor Paper - Radiant White" msgstr "" -#: src/main/escp2-papers.c:1716 src/main/escp2-papers.c:1842 -#: src/main/escp2-papers.c:1884 src/main/escp2-papers.c:1926 -#: src/main/escp2-papers.c:2001 +#: src/main/escp2-papers.c:1727 src/main/escp2-papers.c:1853 +#: src/main/escp2-papers.c:1895 src/main/escp2-papers.c:1937 +#: src/main/escp2-papers.c:2012 msgid "Roll Feed" -msgstr "ロールå¼çµ¦ç´™" +msgstr "¥í¡¼¥ë¼°µë»æ" -#: src/main/escp2-papers.c:1740 src/main/escp2-papers.c:1791 +#: src/main/escp2-papers.c:1751 src/main/escp2-papers.c:1802 msgid "Roll Feed (cut each page)" msgstr "" -#: src/main/escp2-papers.c:1749 src/main/escp2-papers.c:1800 +#: src/main/escp2-papers.c:1760 src/main/escp2-papers.c:1811 msgid "Roll Feed (do not cut)" msgstr "" -#: src/main/escp2-papers.c:1773 src/main/escp2-papers.c:1824 +#: src/main/escp2-papers.c:1784 src/main/escp2-papers.c:1835 #, fuzzy msgid "Manual Feed" -msgstr "手動" +msgstr "¼êÆ°" -#: src/main/escp2-papers.c:1782 src/main/escp2-papers.c:1833 -#: src/main/escp2-papers.c:1935 src/main/escp2-papers.c:1968 +#: src/main/escp2-papers.c:1793 src/main/escp2-papers.c:1844 +#: src/main/escp2-papers.c:1946 src/main/escp2-papers.c:1979 #, fuzzy msgid "Print to CD" -msgstr "ファイルã«å°åˆ·ã—ã¾ã™ã‹ï¼Ÿ" +msgstr "¥Õ¥¡¥¤¥ë¤Ë°õºþ¤·¤Þ¤¹¤«¡©" -#: src/main/escp2-papers.c:1866 src/main/escp2-papers.c:1908 +#: src/main/escp2-papers.c:1877 src/main/escp2-papers.c:1919 #, fuzzy msgid "Manual Sheet Guide" -msgstr "手動" +msgstr "¼êÆ°" -#: src/main/escp2-papers.c:1875 src/main/escp2-papers.c:1917 +#: src/main/escp2-papers.c:1886 src/main/escp2-papers.c:1928 #, fuzzy msgid "Manual Feed (Front)" -msgstr "手動" +msgstr "¼êÆ°" -#: src/main/escp2-papers.c:1950 +#: src/main/escp2-papers.c:1961 #, fuzzy msgid "Rear Tray" -msgstr "トレイ" +msgstr "¥È¥ì¥¤" -#: src/main/escp2-papers.c:1959 +#: src/main/escp2-papers.c:1970 msgid "Front Tray" msgstr "" -#: src/main/escp2-papers.c:1977 +#: src/main/escp2-papers.c:1988 #, fuzzy msgid "Photo Board" -msgstr "フォト用紙" +msgstr "¥Õ¥©¥ÈÍÑ»æ" -#: src/main/escp2-papers.c:2016 +#: src/main/escp2-papers.c:2027 msgid "Cut Sheet Bin 1" msgstr "" -#: src/main/escp2-papers.c:2025 +#: src/main/escp2-papers.c:2036 msgid "Cut Sheet Bin 2" msgstr "" -#: src/main/escp2-papers.c:2034 +#: src/main/escp2-papers.c:2045 #, fuzzy msgid "Cut Sheet Autoselect" -msgstr "自動é¸æŠž" +msgstr "¼«Æ°ÁªÂò" -#: src/main/escp2-papers.c:2043 +#: src/main/escp2-papers.c:2054 msgid "Manual Selection" msgstr "" @@ -2052,7 +2220,7 @@ msgstr "" #: src/main/escp2-resolutions.c:40 src/main/escp2-resolutions.c:43 #, fuzzy msgid "360 x 120 DPI Economy" -msgstr "600x600 DPI モノクロ" +msgstr "600x600 DPI ¥â¥Î¥¯¥í" #: src/main/escp2-resolutions.c:47 src/main/escp2-resolutions.c:50 msgid "180 DPI Economy" @@ -2071,7 +2239,7 @@ msgstr "600x600 DPI" #: src/main/escp2-resolutions.c:68 #, fuzzy msgid "360 DPI High Quality" -msgstr "600 DPI 高å“質" +msgstr "600 DPI ¹âÉʼÁ" #: src/main/escp2-resolutions.c:71 src/main/escp2-resolutions.c:74 #: src/main/escp2-resolutions.c:77 @@ -2097,12 +2265,12 @@ msgstr "1200 DPI" #: src/main/escp2-resolutions.c:97 src/main/escp2-resolutions.c:100 #, fuzzy msgid "720 DPI High Quality" -msgstr "1200 DPI 高å“質" +msgstr "1200 DPI ¹âÉʼÁ" #: src/main/escp2-resolutions.c:103 #, fuzzy msgid "720 DPI Highest Quality" -msgstr "1200 DPI 高å“質" +msgstr "1200 DPI ¹âÉʼÁ" #: src/main/escp2-resolutions.c:106 #, fuzzy @@ -2118,7 +2286,7 @@ msgstr "1440 x 720 DPI" #: src/main/escp2-resolutions.c:116 #, fuzzy msgid "1440 x 720 DPI Highest Quality" -msgstr "1200 DPI 高å“質" +msgstr "1200 DPI ¹âÉʼÁ" #: src/main/escp2-resolutions.c:119 src/main/escp2-resolutions.c:122 #, fuzzy @@ -2133,7 +2301,7 @@ msgstr "2880 x 720 DPI" #: src/main/escp2-resolutions.c:135 #, fuzzy msgid "2880 x 720 DPI Highest Quality" -msgstr "1200 DPI 高å“質" +msgstr "1200 DPI ¹âÉʼÁ" #: src/main/escp2-resolutions.c:139 src/main/escp2-resolutions.c:142 #: src/main/escp2-resolutions.c:145 @@ -2175,7 +2343,7 @@ msgstr "" #: src/main/escp2-resolutions.c:589 #, fuzzy msgid "Interleave" -msgstr "プリンタå:" +msgstr "¥×¥ê¥ó¥¿Ì¾:" #: src/main/escp2-resolutions.c:567 src/main/escp2-resolutions.c:578 #: src/main/escp2-resolutions.c:590 @@ -2195,54 +2363,60 @@ msgstr "" #: src/main/escp2-resolutions.c:581 src/main/escp2-resolutions.c:593 #, fuzzy msgid "Interleave 2" -msgstr "プリンタå:" +msgstr "¥×¥ê¥ó¥¿Ì¾:" #: src/main/escp2-resolutions.c:594 #, fuzzy msgid "Eight Pass" -msgstr "明るã•:" +msgstr "ÌÀ¤ë¤µ:" #: src/main/escp2-resolutions.c:637 src/main/escp2-resolutions.c:652 -#: src/main/generic-options.c:33 +#: src/main/escp2-resolutions.c:667 src/main/generic-options.c:33 msgid "Fast Economy" msgstr "" #: src/main/escp2-resolutions.c:638 src/main/escp2-resolutions.c:653 -#: src/main/generic-options.c:34 +#: src/main/escp2-resolutions.c:668 src/main/generic-options.c:34 msgid "Economy" msgstr "" #: src/main/escp2-resolutions.c:639 src/main/escp2-resolutions.c:654 -#: src/main/escp2-resolutions.c:667 src/main/generic-options.c:35 +#: src/main/escp2-resolutions.c:669 src/main/escp2-resolutions.c:682 +#: src/main/generic-options.c:35 msgid "Draft" msgstr "" #: src/main/escp2-resolutions.c:641 src/main/escp2-resolutions.c:656 -#: src/main/escp2-resolutions.c:670 src/main/generic-options.c:37 +#: src/main/escp2-resolutions.c:671 src/main/escp2-resolutions.c:685 +#: src/main/generic-options.c:37 #, fuzzy msgid "High" -msgstr "高ã•:" +msgstr "¹â¤µ:" #: src/main/escp2-resolutions.c:642 src/main/escp2-resolutions.c:657 -#: src/main/escp2-resolutions.c:669 src/main/generic-options.c:38 +#: src/main/escp2-resolutions.c:672 src/main/escp2-resolutions.c:684 +#: src/main/generic-options.c:38 #, fuzzy msgid "Photo" -msgstr "写真" +msgstr "¼Ì¿¿" #: src/main/escp2-resolutions.c:643 src/main/escp2-resolutions.c:658 -#: src/main/escp2-resolutions.c:671 src/main/generic-options.c:39 +#: src/main/escp2-resolutions.c:673 src/main/escp2-resolutions.c:686 +#: src/main/generic-options.c:39 #, fuzzy msgid "Super Photo" msgstr "Stylus Photo" #: src/main/escp2-resolutions.c:644 src/main/escp2-resolutions.c:659 -#: src/main/escp2-resolutions.c:672 src/main/generic-options.c:40 +#: src/main/escp2-resolutions.c:674 src/main/escp2-resolutions.c:687 +#: src/main/generic-options.c:40 #, fuzzy msgid "Ultra Photo" msgstr "Six Color Photo" #: src/main/escp2-resolutions.c:645 src/main/escp2-resolutions.c:660 -#: src/main/escp2-resolutions.c:673 src/main/generic-options.c:41 +#: src/main/escp2-resolutions.c:675 src/main/escp2-resolutions.c:688 +#: src/main/generic-options.c:41 msgid "Best" msgstr "" @@ -2261,16 +2435,16 @@ msgstr "" #: src/main/generic-options.c:49 #, fuzzy msgid "Photograph" -msgstr "写真" +msgstr "¼Ì¿¿" #: src/main/generic-options.c:50 msgid "Line Art" -msgstr "ライン・アート" +msgstr "¥é¥¤¥ó¡¦¥¢¡¼¥È" #: src/main/generic-options.c:55 #, fuzzy msgid "Page" -msgstr "ç”»åƒã®ã‚µã‚¤ã‚º" +msgstr "²èÁü¤Î¥µ¥¤¥º" #: src/main/generic-options.c:56 msgid "Job" @@ -2279,12 +2453,12 @@ msgstr "" #: src/main/generic-options.c:68 #, fuzzy msgid "Image Type" -msgstr "ç”»åƒã®ç¨®é¡ž:" +msgstr "²èÁü¤Î¼ïÎà:" #: src/main/generic-options.c:69 #, fuzzy msgid "Type of image being printed" -msgstr "å°åˆ·æ™‚ã®ã‚¤ãƒ³ã‚¯ã®ç¨®é¡žã§ã™ã€‚" +msgstr "°õºþ»þ¤Î¥¤¥ó¥¯¤Î¼ïÎà¤Ç¤¹¡£" #: src/main/generic-options.c:74 src/main/generic-options.c:80 msgid "Job Mode" @@ -2297,4397 +2471,4651 @@ msgstr "" #: src/main/generic-options.c:80 #, fuzzy msgid "Page Number" -msgstr "ç”»åƒã®ã‚µã‚¤ã‚º" +msgstr "²èÁü¤Î¥µ¥¤¥º" #: src/main/generic-options.c:81 #, fuzzy msgid "Page number" -msgstr "ç”»åƒã®ã‚µã‚¤ã‚º" +msgstr "²èÁü¤Î¥µ¥¤¥º" #: src/main/xmli18n-tmp.h:1 msgid "Letter" -msgstr "レター" +msgstr "¥ì¥¿¡¼" #: src/main/xmli18n-tmp.h:2 msgid "Legal" -msgstr "リーガル" +msgstr "¥ê¡¼¥¬¥ë" #: src/main/xmli18n-tmp.h:3 msgid "Tabloid" -msgstr "タブロイド" +msgstr "¥¿¥Ö¥í¥¤¥É" #: src/main/xmli18n-tmp.h:4 msgid "Executive" -msgstr "エクゼクティブ" +msgstr "¥¨¥¯¥¼¥¯¥Æ¥£¥Ö" #: src/main/xmli18n-tmp.h:9 msgid "3x5" msgstr "3x5" #: src/main/xmli18n-tmp.h:10 +msgid "3 1/2 x5" +msgstr "" + +#: src/main/xmli18n-tmp.h:11 msgid "4x6" msgstr "4x6" -#: src/main/xmli18n-tmp.h:11 +#: src/main/xmli18n-tmp.h:12 #, fuzzy msgid "Epson 4x6 Photo Paper (tear-off borders)" -msgstr "EPSON 4x6 フォト用紙" +msgstr "EPSON 4x6 ¥Õ¥©¥ÈÍÑ»æ" -#: src/main/xmli18n-tmp.h:12 +#: src/main/xmli18n-tmp.h:13 msgid "5x7" msgstr "5x7" -#: src/main/xmli18n-tmp.h:13 +#: src/main/xmli18n-tmp.h:14 msgid "5x8" msgstr "5x8" -#: src/main/xmli18n-tmp.h:14 +#: src/main/xmli18n-tmp.h:15 msgid "6x8" msgstr "6x8" -#: src/main/xmli18n-tmp.h:15 +#: src/main/xmli18n-tmp.h:16 msgid "8x10" msgstr "8x10" -#: src/main/xmli18n-tmp.h:17 +#: src/main/xmli18n-tmp.h:18 msgid "12x18" msgstr "12x18" -#: src/main/xmli18n-tmp.h:18 +#: src/main/xmli18n-tmp.h:19 msgid "Super B 13x19" -msgstr "スーパー B 13x19" +msgstr "¥¹¡¼¥Ñ¡¼ B 13x19" -#: src/main/xmli18n-tmp.h:19 +#: src/main/xmli18n-tmp.h:20 msgid "Engineering C 17x22" msgstr "" -#: src/main/xmli18n-tmp.h:20 +#: src/main/xmli18n-tmp.h:21 msgid "8x12" msgstr "8x12" -#: src/main/xmli18n-tmp.h:21 +#: src/main/xmli18n-tmp.h:22 msgid "11x14" msgstr "11x14" -#: src/main/xmli18n-tmp.h:22 +#: src/main/xmli18n-tmp.h:23 msgid "16x20" msgstr "16x20" -#: src/main/xmli18n-tmp.h:23 +#: src/main/xmli18n-tmp.h:24 msgid "16x24" msgstr "16x24" -#: src/main/xmli18n-tmp.h:24 +#: src/main/xmli18n-tmp.h:25 msgid "20x24" msgstr "20x24" -#: src/main/xmli18n-tmp.h:25 +#: src/main/xmli18n-tmp.h:26 msgid "20x30" msgstr "20x30" -#: src/main/xmli18n-tmp.h:26 +#: src/main/xmli18n-tmp.h:27 #, fuzzy msgid "22x30" msgstr "20x30" -#: src/main/xmli18n-tmp.h:27 +#: src/main/xmli18n-tmp.h:28 msgid "24x30" msgstr "24x30" -#: src/main/xmli18n-tmp.h:28 +#: src/main/xmli18n-tmp.h:29 msgid "Super A1 24x36" msgstr "" -#: src/main/xmli18n-tmp.h:29 +#: src/main/xmli18n-tmp.h:30 msgid "30x40" msgstr "30x40" -#: src/main/xmli18n-tmp.h:30 +#: src/main/xmli18n-tmp.h:31 msgid "4A" -msgstr "4A版" +msgstr "4AÈÇ" -#: src/main/xmli18n-tmp.h:31 +#: src/main/xmli18n-tmp.h:32 msgid "2A" -msgstr "2A版" +msgstr "2AÈÇ" -#: src/main/xmli18n-tmp.h:32 +#: src/main/xmli18n-tmp.h:33 #, fuzzy msgid "Super A0" msgstr "Stylus Photo" -#: src/main/xmli18n-tmp.h:33 +#: src/main/xmli18n-tmp.h:34 msgid "A0" -msgstr "A0版" +msgstr "A0ÈÇ" -#: src/main/xmli18n-tmp.h:34 +#: src/main/xmli18n-tmp.h:35 msgid "A1" -msgstr "A1版" +msgstr "A1ÈÇ" -#: src/main/xmli18n-tmp.h:35 +#: src/main/xmli18n-tmp.h:36 msgid "A2" -msgstr "A2版" +msgstr "A2ÈÇ" -#: src/main/xmli18n-tmp.h:36 +#: src/main/xmli18n-tmp.h:37 msgid "A3" -msgstr "A3版" +msgstr "A3ÈÇ" -#: src/main/xmli18n-tmp.h:37 +#: src/main/xmli18n-tmp.h:38 msgid "A4" -msgstr "A4版" +msgstr "A4ÈÇ" -#: src/main/xmli18n-tmp.h:38 +#: src/main/xmli18n-tmp.h:39 msgid "A5" -msgstr "A5版" +msgstr "A5ÈÇ" -#: src/main/xmli18n-tmp.h:39 +#: src/main/xmli18n-tmp.h:40 msgid "A6" -msgstr "A6版" +msgstr "A6ÈÇ" -#: src/main/xmli18n-tmp.h:40 +#: src/main/xmli18n-tmp.h:41 msgid "A7" -msgstr "A7版" +msgstr "A7ÈÇ" -#: src/main/xmli18n-tmp.h:41 +#: src/main/xmli18n-tmp.h:42 msgid "A8" -msgstr "A8版" +msgstr "A8ÈÇ" -#: src/main/xmli18n-tmp.h:42 +#: src/main/xmli18n-tmp.h:43 msgid "A9" -msgstr "A9版" +msgstr "A9ÈÇ" -#: src/main/xmli18n-tmp.h:43 +#: src/main/xmli18n-tmp.h:44 msgid "A10" -msgstr "A10版" +msgstr "A10ÈÇ" -#: src/main/xmli18n-tmp.h:44 +#: src/main/xmli18n-tmp.h:45 msgid "RA0" msgstr "RA0" -#: src/main/xmli18n-tmp.h:45 +#: src/main/xmli18n-tmp.h:46 msgid "RA1" msgstr "RA1" -#: src/main/xmli18n-tmp.h:46 +#: src/main/xmli18n-tmp.h:47 msgid "RA2" msgstr "RA2" -#: src/main/xmli18n-tmp.h:47 +#: src/main/xmli18n-tmp.h:48 msgid "RA3" msgstr "RA3" -#: src/main/xmli18n-tmp.h:48 +#: src/main/xmli18n-tmp.h:49 msgid "RA4" msgstr "RA4" -#: src/main/xmli18n-tmp.h:49 +#: src/main/xmli18n-tmp.h:50 msgid "SRA0" msgstr "SRA0" -#: src/main/xmli18n-tmp.h:50 +#: src/main/xmli18n-tmp.h:51 msgid "SRA1" msgstr "SRA1" -#: src/main/xmli18n-tmp.h:51 +#: src/main/xmli18n-tmp.h:52 msgid "SRA2" msgstr "SRA2" -#: src/main/xmli18n-tmp.h:52 +#: src/main/xmli18n-tmp.h:53 msgid "SRA3" msgstr "SRA3" -#: src/main/xmli18n-tmp.h:53 +#: src/main/xmli18n-tmp.h:54 msgid "SRA4" msgstr "SRA4" -#: src/main/xmli18n-tmp.h:54 +#: src/main/xmli18n-tmp.h:55 msgid "4B ISO" msgstr "4B (ISO)" -#: src/main/xmli18n-tmp.h:55 +#: src/main/xmli18n-tmp.h:56 msgid "2B ISO" msgstr "2B (ISO)" -#: src/main/xmli18n-tmp.h:56 +#: src/main/xmli18n-tmp.h:57 msgid "B0 ISO" msgstr "B0 (ISO)" -#: src/main/xmli18n-tmp.h:57 +#: src/main/xmli18n-tmp.h:58 msgid "B1 ISO" msgstr "B1 (ISO)" -#: src/main/xmli18n-tmp.h:58 +#: src/main/xmli18n-tmp.h:59 msgid "B2 ISO" msgstr "B2 (ISO)" -#: src/main/xmli18n-tmp.h:59 +#: src/main/xmli18n-tmp.h:60 msgid "B3 ISO" msgstr "B3 (ISO)" -#: src/main/xmli18n-tmp.h:60 +#: src/main/xmli18n-tmp.h:61 msgid "B4 ISO" msgstr "B4 (ISO)" -#: src/main/xmli18n-tmp.h:61 +#: src/main/xmli18n-tmp.h:62 msgid "B5 ISO" msgstr "B5 (ISO)" -#: src/main/xmli18n-tmp.h:62 +#: src/main/xmli18n-tmp.h:63 msgid "B6 ISO" msgstr "B6 (ISO)" -#: src/main/xmli18n-tmp.h:63 +#: src/main/xmli18n-tmp.h:64 msgid "B7 ISO" msgstr "B7 (ISO)" -#: src/main/xmli18n-tmp.h:64 +#: src/main/xmli18n-tmp.h:65 msgid "B8 ISO" msgstr "B8 (ISO)" -#: src/main/xmli18n-tmp.h:65 +#: src/main/xmli18n-tmp.h:66 msgid "B9 ISO" msgstr "B9 (ISO)" -#: src/main/xmli18n-tmp.h:66 +#: src/main/xmli18n-tmp.h:67 msgid "B10 ISO" msgstr "B10 (ISO)" -#: src/main/xmli18n-tmp.h:67 +#: src/main/xmli18n-tmp.h:68 #, fuzzy msgid "Super B0 JIS" msgstr "B0 (JIS)" -#: src/main/xmli18n-tmp.h:68 +#: src/main/xmli18n-tmp.h:69 msgid "B0 JIS" msgstr "B0 (JIS)" -#: src/main/xmli18n-tmp.h:69 +#: src/main/xmli18n-tmp.h:70 msgid "B1 JIS" msgstr "B1 (JIS)" -#: src/main/xmli18n-tmp.h:70 +#: src/main/xmli18n-tmp.h:71 msgid "B2 JIS" msgstr "B2 (JIS)" -#: src/main/xmli18n-tmp.h:71 +#: src/main/xmli18n-tmp.h:72 msgid "B3 JIS" msgstr "B3 (JIS)" -#: src/main/xmli18n-tmp.h:72 +#: src/main/xmli18n-tmp.h:73 msgid "B4 JIS" msgstr "B4 (JIS)" -#: src/main/xmli18n-tmp.h:73 +#: src/main/xmli18n-tmp.h:74 msgid "B5 JIS" msgstr "B5 (JIS)" -#: src/main/xmli18n-tmp.h:74 +#: src/main/xmli18n-tmp.h:75 msgid "B6 JIS" msgstr "B6 (JIS)" -#: src/main/xmli18n-tmp.h:75 +#: src/main/xmli18n-tmp.h:76 msgid "B7 JIS" msgstr "B7 (JIS)" -#: src/main/xmli18n-tmp.h:76 +#: src/main/xmli18n-tmp.h:77 msgid "B8 JIS" msgstr "B8 (JIS)" -#: src/main/xmli18n-tmp.h:77 +#: src/main/xmli18n-tmp.h:78 msgid "B9 JIS" msgstr "B9 (JIS)" -#: src/main/xmli18n-tmp.h:78 +#: src/main/xmli18n-tmp.h:79 msgid "B10 JIS" msgstr "B10 (JIS)" -#: src/main/xmli18n-tmp.h:79 +#: src/main/xmli18n-tmp.h:80 msgid "C0" msgstr "C0" -#: src/main/xmli18n-tmp.h:80 +#: src/main/xmli18n-tmp.h:81 +#, fuzzy +msgid "C0 landscape" +msgstr "²£ÃÖ¤­" + +#: src/main/xmli18n-tmp.h:82 msgid "C1" msgstr "C1" -#: src/main/xmli18n-tmp.h:81 +#: src/main/xmli18n-tmp.h:83 +#, fuzzy +msgid "C1 landscape" +msgstr "²£ÃÖ¤­" + +#: src/main/xmli18n-tmp.h:84 msgid "C2" msgstr "C2" -#: src/main/xmli18n-tmp.h:82 +#: src/main/xmli18n-tmp.h:85 +#, fuzzy +msgid "C2 landscape" +msgstr "²£ÃÖ¤­" + +#: src/main/xmli18n-tmp.h:86 msgid "C3" msgstr "C3" -#: src/main/xmli18n-tmp.h:83 +#: src/main/xmli18n-tmp.h:87 +#, fuzzy +msgid "C3 landscape" +msgstr "²£ÃÖ¤­" + +#: src/main/xmli18n-tmp.h:88 msgid "C4" msgstr "C4" -#: src/main/xmli18n-tmp.h:84 +#: src/main/xmli18n-tmp.h:89 +#, fuzzy +msgid "C4 landscape" +msgstr "²£ÃÖ¤­" + +#: src/main/xmli18n-tmp.h:90 msgid "C5" msgstr "C5" -#: src/main/xmli18n-tmp.h:85 +#: src/main/xmli18n-tmp.h:91 +#, fuzzy +msgid "C5 landscape" +msgstr "²£ÃÖ¤­" + +#: src/main/xmli18n-tmp.h:92 msgid "B6-C4" msgstr "B6-C4" -#: src/main/xmli18n-tmp.h:86 +#: src/main/xmli18n-tmp.h:93 +#, fuzzy +msgid "B6-C4 landscape" +msgstr "²£ÃÖ¤­" + +#: src/main/xmli18n-tmp.h:94 msgid "C6" msgstr "C6" -#: src/main/xmli18n-tmp.h:87 +#: src/main/xmli18n-tmp.h:95 +#, fuzzy +msgid "C6 landscape" +msgstr "²£ÃÖ¤­" + +#: src/main/xmli18n-tmp.h:96 msgid "DL" msgstr "DL" -#: src/main/xmli18n-tmp.h:88 +#: src/main/xmli18n-tmp.h:97 +#, fuzzy +msgid "DL landscape" +msgstr "²£ÃÖ¤­" + +#: src/main/xmli18n-tmp.h:98 msgid "C7-6" msgstr "C7-6" -#: src/main/xmli18n-tmp.h:89 +#: src/main/xmli18n-tmp.h:99 +#, fuzzy +msgid "C7-6 landscape" +msgstr "²£ÃÖ¤­" + +#: src/main/xmli18n-tmp.h:100 msgid "C7" msgstr "C7" -#: src/main/xmli18n-tmp.h:90 +#: src/main/xmli18n-tmp.h:101 +#, fuzzy +msgid "C7 landscape" +msgstr "²£ÃÖ¤­" + +#: src/main/xmli18n-tmp.h:102 msgid "C8" msgstr "C8" -#: src/main/xmli18n-tmp.h:91 +#: src/main/xmli18n-tmp.h:103 +#, fuzzy +msgid "C8 landscape" +msgstr "²£ÃÖ¤­" + +#: src/main/xmli18n-tmp.h:104 msgid "C9" msgstr "C9" -#: src/main/xmli18n-tmp.h:92 +#: src/main/xmli18n-tmp.h:105 +#, fuzzy +msgid "C9 landscape" +msgstr "²£ÃÖ¤­" + +#: src/main/xmli18n-tmp.h:106 msgid "C10" msgstr "C10" -#: src/main/xmli18n-tmp.h:93 +#: src/main/xmli18n-tmp.h:107 +#, fuzzy +msgid "C10 landscape" +msgstr "²£ÃÖ¤­" + +#: src/main/xmli18n-tmp.h:108 msgid "ArchA" msgstr "ArchA" -#: src/main/xmli18n-tmp.h:94 +#: src/main/xmli18n-tmp.h:109 msgid "ArchA transposed" msgstr "" -#: src/main/xmli18n-tmp.h:95 +#: src/main/xmli18n-tmp.h:110 msgid "ArchB" msgstr "ArchB" -#: src/main/xmli18n-tmp.h:96 +#: src/main/xmli18n-tmp.h:111 msgid "ArchB transposed" msgstr "" -#: src/main/xmli18n-tmp.h:97 +#: src/main/xmli18n-tmp.h:112 msgid "ArchC" msgstr "ArchC" -#: src/main/xmli18n-tmp.h:98 +#: src/main/xmli18n-tmp.h:113 msgid "ArchC transposed" msgstr "" -#: src/main/xmli18n-tmp.h:99 +#: src/main/xmli18n-tmp.h:114 msgid "ArchD" msgstr "ArchD" -#: src/main/xmli18n-tmp.h:100 +#: src/main/xmli18n-tmp.h:115 msgid "ArchD transposed" msgstr "" -#: src/main/xmli18n-tmp.h:101 +#: src/main/xmli18n-tmp.h:116 msgid "ArchE" msgstr "ArchE" -#: src/main/xmli18n-tmp.h:102 +#: src/main/xmli18n-tmp.h:117 msgid "ArchE transposed" msgstr "" -#: src/main/xmli18n-tmp.h:103 +#: src/main/xmli18n-tmp.h:118 msgid "American foolscap" msgstr "American foolscap" -#: src/main/xmli18n-tmp.h:104 +#: src/main/xmli18n-tmp.h:119 msgid "European foolscap" msgstr "European foolscap" -#: src/main/xmli18n-tmp.h:105 +#: src/main/xmli18n-tmp.h:120 msgid "Crown Quarto" msgstr "Crown Quarto" -#: src/main/xmli18n-tmp.h:106 +#: src/main/xmli18n-tmp.h:121 msgid "Large Crown Quarto" msgstr "Large Crown Quarto" -#: src/main/xmli18n-tmp.h:107 +#: src/main/xmli18n-tmp.h:122 msgid "Demy Quarto" msgstr "Demy Quarto" -#: src/main/xmli18n-tmp.h:108 +#: src/main/xmli18n-tmp.h:123 msgid "Royal Quarto" msgstr "Royal Quarto" -#: src/main/xmli18n-tmp.h:109 +#: src/main/xmli18n-tmp.h:124 #, fuzzy msgid "ISO A4" msgstr "SRA4" -#: src/main/xmli18n-tmp.h:110 +#: src/main/xmli18n-tmp.h:125 msgid "Crown Octavo" msgstr "Crown Octavo" -#: src/main/xmli18n-tmp.h:111 +#: src/main/xmli18n-tmp.h:126 msgid "Large Crown Octavo" msgstr "Large Crown Octavo" -#: src/main/xmli18n-tmp.h:112 +#: src/main/xmli18n-tmp.h:127 msgid "Demy Octavo" msgstr "Demy Octavo" -#: src/main/xmli18n-tmp.h:113 +#: src/main/xmli18n-tmp.h:128 msgid "Royal Octavo" msgstr "Royal Octavo" -#: src/main/xmli18n-tmp.h:114 +#: src/main/xmli18n-tmp.h:129 msgid "ISO A5" msgstr "" -#: src/main/xmli18n-tmp.h:115 +#: src/main/xmli18n-tmp.h:130 msgid "Small paperback" msgstr "Small paperback" -#: src/main/xmli18n-tmp.h:116 +#: src/main/xmli18n-tmp.h:131 msgid "Penguin small paperback" msgstr "Penguin small paperback" -#: src/main/xmli18n-tmp.h:117 +#: src/main/xmli18n-tmp.h:132 msgid "Penguin large paperback" msgstr "Penguin large paperback" -#: src/main/xmli18n-tmp.h:118 +#: src/main/xmli18n-tmp.h:133 msgid "10cm x 15cm" msgstr "" -#: src/main/xmli18n-tmp.h:119 +#: src/main/xmli18n-tmp.h:134 msgid "Hagaki Card" msgstr "Hagaki Card" -#: src/main/xmli18n-tmp.h:120 +#: src/main/xmli18n-tmp.h:135 msgid "Oufuku Card" msgstr "Oufuku Card" -#: src/main/xmli18n-tmp.h:121 +#: src/main/xmli18n-tmp.h:136 msgid "Japanese long envelope #3" -msgstr "日本ã®é•·ã„å°ç­’ #3" +msgstr "ÆüËܤÎŤ¤ÉõÅû #3" -#: src/main/xmli18n-tmp.h:122 +#: src/main/xmli18n-tmp.h:137 +#, fuzzy +msgid "Japanese long envelope #3 landscape" +msgstr "ÆüËܤÎŤ¤ÉõÅû #3" + +#: src/main/xmli18n-tmp.h:138 msgid "Japanese long envelope #4" -msgstr "日本ã®é•·ã„å°ç­’ #4" +msgstr "ÆüËܤÎŤ¤ÉõÅû #4" -#: src/main/xmli18n-tmp.h:123 +#: src/main/xmli18n-tmp.h:139 +#, fuzzy +msgid "Japanese long envelope #4 landscape" +msgstr "ÆüËܤÎŤ¤ÉõÅû #4" + +#: src/main/xmli18n-tmp.h:140 msgid "Japanese Kaku envelope #4" -msgstr "日本ã®å››è§’ã„å°ç­’ #4" +msgstr "ÆüËܤλͳѤ¤ÉõÅû #4" -#: src/main/xmli18n-tmp.h:124 +#: src/main/xmli18n-tmp.h:141 +#, fuzzy +msgid "Japanese Kaku envelope #4 landscape" +msgstr "ÆüËܤλͳѤ¤ÉõÅû #4" + +#: src/main/xmli18n-tmp.h:142 msgid "Commercial 10" msgstr "Commercial 10" -#: src/main/xmli18n-tmp.h:125 +#: src/main/xmli18n-tmp.h:143 +#, fuzzy +msgid "Commercial 10 landscape" +msgstr "Commercial 10" + +#: src/main/xmli18n-tmp.h:144 msgid "A2 Invitation" msgstr "A2 Invitation" -#: src/main/xmli18n-tmp.h:126 +#: src/main/xmli18n-tmp.h:145 msgid "Monarch Envelope" msgstr "Monarch Envelope" -#: src/main/xmli18n-tmp.h:127 +#: src/main/xmli18n-tmp.h:146 +#, fuzzy +msgid "Monarch Envelope landscape" +msgstr "Monarch Envelope" + +#: src/main/xmli18n-tmp.h:147 msgid "4x5 3/8" msgstr "" -#: src/main/xmli18n-tmp.h:128 +#: src/main/xmli18n-tmp.h:148 #, fuzzy msgid "4x7" msgstr "5x7" -#: src/main/xmli18n-tmp.h:129 +#: src/main/xmli18n-tmp.h:149 msgid "CP_L" msgstr "" -#: src/main/xmli18n-tmp.h:130 +#: src/main/xmli18n-tmp.h:150 msgid "Card" msgstr "" -#: src/main/xmli18n-tmp.h:131 +#: src/main/xmli18n-tmp.h:151 #, fuzzy msgid "Wide Postcard" -msgstr "ã¯ãŒã" +msgstr "¤Ï¤¬¤­" -#: src/main/xmli18n-tmp.h:132 +#: src/main/xmli18n-tmp.h:152 msgid "Chilean Office" msgstr "" -#: src/main/xmli18n-tmp.h:133 +#: src/main/xmli18n-tmp.h:153 msgid "Chilean Double Letter" msgstr "" -#: src/main/xmli18n-tmp.h:134 +#: src/main/xmli18n-tmp.h:154 msgid "Chilean Double Office" msgstr "" -#: src/main/xmli18n-tmp.h:135 +#: src/main/xmli18n-tmp.h:155 msgid "Custom" -msgstr "カスタム" +msgstr "¥«¥¹¥¿¥à" -#: src/main/xmli18n-tmp.h:136 +#: src/main/xmli18n-tmp.h:156 msgid "89 mm Roll Paper" -msgstr "89mm ロール紙" +msgstr "89mm ¥í¡¼¥ë»æ" -#: src/main/xmli18n-tmp.h:137 +#: src/main/xmli18n-tmp.h:157 msgid "4 Inch Roll Paper" -msgstr "4 インãƒãƒ­ãƒ¼ãƒ«ç´™" +msgstr "4 ¥¤¥ó¥Á¥í¡¼¥ë»æ" -#: src/main/xmli18n-tmp.h:138 +#: src/main/xmli18n-tmp.h:158 msgid "5 Inch Roll Paper" -msgstr "5 インãƒãƒ­ãƒ¼ãƒ«ç´™" +msgstr "5 ¥¤¥ó¥Á¥í¡¼¥ë»æ" -#: src/main/xmli18n-tmp.h:139 +#: src/main/xmli18n-tmp.h:159 msgid "210 mm Roll Paper" -msgstr "210mm インãƒãƒ­ãƒ¼ãƒ«ç´™" +msgstr "210mm ¥¤¥ó¥Á¥í¡¼¥ë»æ" -#: src/main/xmli18n-tmp.h:140 +#: src/main/xmli18n-tmp.h:160 msgid "13 Inch Roll Paper" -msgstr "13 インãƒãƒ­ãƒ¼ãƒ«ç´™" +msgstr "13 ¥¤¥ó¥Á¥í¡¼¥ë»æ" -#: src/main/xmli18n-tmp.h:141 +#: src/main/xmli18n-tmp.h:161 msgid "22 Inch Roll Paper" -msgstr "22 インãƒãƒ­ãƒ¼ãƒ«ç´™" +msgstr "22 ¥¤¥ó¥Á¥í¡¼¥ë»æ" -#: src/main/xmli18n-tmp.h:142 +#: src/main/xmli18n-tmp.h:162 msgid "24 Inch Roll Paper" -msgstr "24 インãƒãƒ­ãƒ¼ãƒ«ç´™" +msgstr "24 ¥¤¥ó¥Á¥í¡¼¥ë»æ" -#: src/main/xmli18n-tmp.h:143 +#: src/main/xmli18n-tmp.h:163 msgid "36 Inch Roll Paper" -msgstr "36 インãƒãƒ­ãƒ¼ãƒ«ç´™" +msgstr "36 ¥¤¥ó¥Á¥í¡¼¥ë»æ" -#: src/main/xmli18n-tmp.h:144 +#: src/main/xmli18n-tmp.h:164 msgid "44 Inch Roll Paper" -msgstr "44 インãƒãƒ­ãƒ¼ãƒ«ç´™" +msgstr "44 ¥¤¥ó¥Á¥í¡¼¥ë»æ" -#: src/main/xmli18n-tmp.h:145 +#: src/main/xmli18n-tmp.h:165 msgid "PostScript Level 1" msgstr "" -#: src/main/xmli18n-tmp.h:146 +#: src/main/xmli18n-tmp.h:166 msgid "PostScript Level 2" msgstr "" -#: src/main/xmli18n-tmp.h:147 +#: src/main/xmli18n-tmp.h:167 msgid "Canon BJ-30" msgstr "" -#: src/main/xmli18n-tmp.h:148 +#: src/main/xmli18n-tmp.h:168 msgid "Canon BJC-50" msgstr "" -#: src/main/xmli18n-tmp.h:149 +#: src/main/xmli18n-tmp.h:169 msgid "Canon BJC-55" msgstr "" -#: src/main/xmli18n-tmp.h:150 +#: src/main/xmli18n-tmp.h:170 msgid "Canon BJC-80" msgstr "" -#: src/main/xmli18n-tmp.h:151 +#: src/main/xmli18n-tmp.h:171 msgid "Canon BJC-85" msgstr "" -#: src/main/xmli18n-tmp.h:152 +#: src/main/xmli18n-tmp.h:172 msgid "Canon BJC-210" msgstr "" -#: src/main/xmli18n-tmp.h:153 +#: src/main/xmli18n-tmp.h:173 msgid "Canon BJC-240" msgstr "" -#: src/main/xmli18n-tmp.h:154 +#: src/main/xmli18n-tmp.h:174 msgid "Canon BJC-250" msgstr "" -#: src/main/xmli18n-tmp.h:155 +#: src/main/xmli18n-tmp.h:175 msgid "Canon BJC-1000" msgstr "" -#: src/main/xmli18n-tmp.h:156 +#: src/main/xmli18n-tmp.h:176 msgid "Canon BJC-2000" msgstr "" -#: src/main/xmli18n-tmp.h:157 +#: src/main/xmli18n-tmp.h:177 msgid "Canon BJC-2010" msgstr "" -#: src/main/xmli18n-tmp.h:158 +#: src/main/xmli18n-tmp.h:178 msgid "Canon BJC-2100" msgstr "" -#: src/main/xmli18n-tmp.h:159 +#: src/main/xmli18n-tmp.h:179 msgid "Canon BJC-2110" msgstr "" -#: src/main/xmli18n-tmp.h:160 +#: src/main/xmli18n-tmp.h:180 msgid "Canon BJC-3000" msgstr "" -#: src/main/xmli18n-tmp.h:161 +#: src/main/xmli18n-tmp.h:181 msgid "Canon BJC-4000" msgstr "" -#: src/main/xmli18n-tmp.h:162 +#: src/main/xmli18n-tmp.h:182 msgid "Canon BJC-4300" msgstr "" -#: src/main/xmli18n-tmp.h:163 +#: src/main/xmli18n-tmp.h:183 msgid "Canon BJC-4400" msgstr "" -#: src/main/xmli18n-tmp.h:164 +#: src/main/xmli18n-tmp.h:184 msgid "Canon BJC-5100" msgstr "" -#: src/main/xmli18n-tmp.h:165 +#: src/main/xmli18n-tmp.h:185 msgid "Canon BJC-5500" msgstr "" -#: src/main/xmli18n-tmp.h:166 +#: src/main/xmli18n-tmp.h:186 msgid "Canon BJC-6000" msgstr "" -#: src/main/xmli18n-tmp.h:167 +#: src/main/xmli18n-tmp.h:187 msgid "Canon BJC-6100" msgstr "" -#: src/main/xmli18n-tmp.h:168 +#: src/main/xmli18n-tmp.h:188 msgid "Canon BJC-6200" msgstr "" -#: src/main/xmli18n-tmp.h:169 +#: src/main/xmli18n-tmp.h:189 msgid "Canon BJC-6500" msgstr "" -#: src/main/xmli18n-tmp.h:170 +#: src/main/xmli18n-tmp.h:190 msgid "Canon BJC-7000" msgstr "" -#: src/main/xmli18n-tmp.h:171 +#: src/main/xmli18n-tmp.h:191 msgid "Canon BJC-7100" msgstr "" -#: src/main/xmli18n-tmp.h:172 +#: src/main/xmli18n-tmp.h:192 msgid "Canon BJC-8200" msgstr "" -#: src/main/xmli18n-tmp.h:173 +#: src/main/xmli18n-tmp.h:193 msgid "Canon BJC-8500" msgstr "" -#: src/main/xmli18n-tmp.h:174 +#: src/main/xmli18n-tmp.h:194 msgid "Canon S100" msgstr "" -#: src/main/xmli18n-tmp.h:175 +#: src/main/xmli18n-tmp.h:195 msgid "Canon S200" msgstr "" -#: src/main/xmli18n-tmp.h:176 +#: src/main/xmli18n-tmp.h:196 msgid "Canon S300" msgstr "" -#: src/main/xmli18n-tmp.h:177 +#: src/main/xmli18n-tmp.h:197 msgid "Canon S400" msgstr "" -#: src/main/xmli18n-tmp.h:178 +#: src/main/xmli18n-tmp.h:198 msgid "Canon S450" msgstr "" -#: src/main/xmli18n-tmp.h:179 +#: src/main/xmli18n-tmp.h:199 msgid "Canon S500" msgstr "" -#: src/main/xmli18n-tmp.h:180 +#: src/main/xmli18n-tmp.h:200 msgid "Canon S600" msgstr "" -#: src/main/xmli18n-tmp.h:181 +#: src/main/xmli18n-tmp.h:201 msgid "Canon S630" msgstr "" -#: src/main/xmli18n-tmp.h:182 +#: src/main/xmli18n-tmp.h:202 msgid "Canon S800" msgstr "" -#: src/main/xmli18n-tmp.h:183 +#: src/main/xmli18n-tmp.h:203 msgid "Canon S4500" msgstr "" -#: src/main/xmli18n-tmp.h:184 +#: src/main/xmli18n-tmp.h:204 msgid "Canon PIXMA iP2000" msgstr "" -#: src/main/xmli18n-tmp.h:185 +#: src/main/xmli18n-tmp.h:205 msgid "Canon PIXMA iP3000" msgstr "" -#: src/main/xmli18n-tmp.h:186 +#: src/main/xmli18n-tmp.h:206 msgid "Canon PIXMA iP3100" msgstr "" -#: src/main/xmli18n-tmp.h:187 +#: src/main/xmli18n-tmp.h:207 msgid "Canon PIXMA iP4000" msgstr "" -#: src/main/xmli18n-tmp.h:188 +#: src/main/xmli18n-tmp.h:208 msgid "Canon PIXMA iP4100" msgstr "" -#: src/main/xmli18n-tmp.h:189 +#: src/main/xmli18n-tmp.h:209 msgid "Canon PIXMA iP4200" msgstr "" -#: src/main/xmli18n-tmp.h:190 -#, fuzzy +#: src/main/xmli18n-tmp.h:210 msgid "Canon PIXMA iP4300" -msgstr "Stylus C60" +msgstr "" -#: src/main/xmli18n-tmp.h:191 -#, fuzzy +#: src/main/xmli18n-tmp.h:211 msgid "Canon PIXMA iP4500" -msgstr "Stylus C60" +msgstr "" -#: src/main/xmli18n-tmp.h:192 -#, fuzzy +#: src/main/xmli18n-tmp.h:212 msgid "Canon PIXMA iP5000" -msgstr "Stylus C60" +msgstr "" -#: src/main/xmli18n-tmp.h:193 +#: src/main/xmli18n-tmp.h:213 msgid "Canon PIXMA iP5200" msgstr "" -#: src/main/xmli18n-tmp.h:194 -#, fuzzy +#: src/main/xmli18n-tmp.h:214 msgid "Canon PIXMA iP5300" -msgstr "Stylus C60" +msgstr "" -#: src/main/xmli18n-tmp.h:195 -#, fuzzy +#: src/main/xmli18n-tmp.h:215 +msgid "Canon PIXMA iP6000D" +msgstr "" + +#: src/main/xmli18n-tmp.h:216 msgid "Canon PIXMA iP6700" -msgstr "Stylus C60" +msgstr "" -#: src/main/xmli18n-tmp.h:196 -#, fuzzy +#: src/main/xmli18n-tmp.h:217 msgid "Canon PIXMA iP8500" -msgstr "Stylus C60" +msgstr "" -#: src/main/xmli18n-tmp.h:197 -#, fuzzy +#: src/main/xmli18n-tmp.h:218 msgid "Canon PIXMA iX5000" -msgstr "Stylus C60" +msgstr "" -#: src/main/xmli18n-tmp.h:198 -#, fuzzy +#: src/main/xmli18n-tmp.h:219 msgid "Canon PIXMA Pro9500" -msgstr "Stylus C60" +msgstr "" -#: src/main/xmli18n-tmp.h:199 -#, fuzzy +#: src/main/xmli18n-tmp.h:220 msgid "Canon PIXMA MP150" -msgstr "Stylus C60" +msgstr "" -#: src/main/xmli18n-tmp.h:200 -#, fuzzy +#: src/main/xmli18n-tmp.h:221 msgid "Canon PIXMA MP170" -msgstr "Stylus C60" +msgstr "" -#: src/main/xmli18n-tmp.h:201 -#, fuzzy +#: src/main/xmli18n-tmp.h:222 msgid "Canon PIXMA MP180" -msgstr "Stylus C60" +msgstr "" -#: src/main/xmli18n-tmp.h:202 -#, fuzzy +#: src/main/xmli18n-tmp.h:223 msgid "Canon PIXMA MP500" -msgstr "Stylus C60" +msgstr "" -#: src/main/xmli18n-tmp.h:203 -#, fuzzy +#: src/main/xmli18n-tmp.h:224 +msgid "Canon PIXMA MP520" +msgstr "" + +#: src/main/xmli18n-tmp.h:225 msgid "Canon PIXMA MP610" -msgstr "Stylus C60" +msgstr "" -#: src/main/xmli18n-tmp.h:204 -#, fuzzy +#: src/main/xmli18n-tmp.h:226 msgid "Canon PIXMA MP700" -msgstr "Stylus C60" +msgstr "" -#: src/main/xmli18n-tmp.h:205 -#, fuzzy +#: src/main/xmli18n-tmp.h:227 msgid "Canon PIXMA MP710" -msgstr "Stylus C60" +msgstr "" -#: src/main/xmli18n-tmp.h:206 -#, fuzzy +#: src/main/xmli18n-tmp.h:228 msgid "Canon PIXMA MP730" -msgstr "Stylus C60" +msgstr "" -#: src/main/xmli18n-tmp.h:207 -#, fuzzy +#: src/main/xmli18n-tmp.h:229 msgid "Canon PIXMA MP740" -msgstr "Stylus C60" +msgstr "" -#: src/main/xmli18n-tmp.h:208 -#, fuzzy +#: src/main/xmli18n-tmp.h:230 msgid "Canon PIXMA MP750" -msgstr "Stylus C60" +msgstr "" -#: src/main/xmli18n-tmp.h:209 -#, fuzzy +#: src/main/xmli18n-tmp.h:231 msgid "Canon PIXMA MP760" -msgstr "Stylus C60" +msgstr "" -#: src/main/xmli18n-tmp.h:210 -#, fuzzy +#: src/main/xmli18n-tmp.h:232 msgid "Canon PIXMA MP770" -msgstr "Stylus C60" +msgstr "" -#: src/main/xmli18n-tmp.h:211 -#, fuzzy +#: src/main/xmli18n-tmp.h:233 msgid "Canon PIXMA MP780" -msgstr "Stylus C60" +msgstr "" -#: src/main/xmli18n-tmp.h:212 -#, fuzzy +#: src/main/xmli18n-tmp.h:234 msgid "Canon PIXMA MP790" -msgstr "Stylus C60" +msgstr "" -#: src/main/xmli18n-tmp.h:213 -#, fuzzy +#: src/main/xmli18n-tmp.h:235 msgid "Canon PIXMA MP830" -msgstr "Stylus C60" +msgstr "" -#: src/main/xmli18n-tmp.h:214 +#: src/main/xmli18n-tmp.h:236 msgid "Canon PIXUS iP3100" msgstr "" -#: src/main/xmli18n-tmp.h:215 +#: src/main/xmli18n-tmp.h:237 msgid "Canon PIXUS iP4100" msgstr "" -#: src/main/xmli18n-tmp.h:216 -#, fuzzy +#: src/main/xmli18n-tmp.h:238 msgid "Canon i80" -msgstr "Stylus C60" +msgstr "" -#: src/main/xmli18n-tmp.h:217 +#: src/main/xmli18n-tmp.h:239 msgid "Canon i560" msgstr "" -#: src/main/xmli18n-tmp.h:218 +#: src/main/xmli18n-tmp.h:240 msgid "Canon i850" msgstr "" -#: src/main/xmli18n-tmp.h:219 +#: src/main/xmli18n-tmp.h:241 msgid "Canon i860" msgstr "" -#: src/main/xmli18n-tmp.h:220 +#: src/main/xmli18n-tmp.h:242 msgid "Canon i865" msgstr "" -#: src/main/xmli18n-tmp.h:221 +#: src/main/xmli18n-tmp.h:243 #, fuzzy msgid "Epson Stylus C20" -msgstr "Stylus C20ux" +msgstr "Stylus C20sx" -#: src/main/xmli18n-tmp.h:222 +#: src/main/xmli18n-tmp.h:244 #, fuzzy msgid "Epson Stylus C20SX" msgstr "Stylus C20ux" -#: src/main/xmli18n-tmp.h:223 +#: src/main/xmli18n-tmp.h:245 #, fuzzy msgid "Epson Stylus C20UX" msgstr "Stylus C20ux" -#: src/main/xmli18n-tmp.h:224 +#: src/main/xmli18n-tmp.h:246 #, fuzzy msgid "Epson Stylus C40" -msgstr "Stylus C40ux" +msgstr "Stylus C40sx" -#: src/main/xmli18n-tmp.h:225 +#: src/main/xmli18n-tmp.h:247 #, fuzzy msgid "Epson Stylus C40SX" msgstr "Stylus C40ux" -#: src/main/xmli18n-tmp.h:226 +#: src/main/xmli18n-tmp.h:248 #, fuzzy msgid "Epson Stylus C40UX" msgstr "Stylus C40ux" -#: src/main/xmli18n-tmp.h:227 +#: src/main/xmli18n-tmp.h:249 #, fuzzy msgid "Epson Stylus C41" -msgstr "Stylus C41ux" +msgstr "Stylus C41sx" -#: src/main/xmli18n-tmp.h:228 +#: src/main/xmli18n-tmp.h:250 #, fuzzy msgid "Epson Stylus C41SX" msgstr "Stylus C41ux" -#: src/main/xmli18n-tmp.h:229 +#: src/main/xmli18n-tmp.h:251 #, fuzzy msgid "Epson Stylus C41UX" msgstr "Stylus C41ux" -#: src/main/xmli18n-tmp.h:230 +#: src/main/xmli18n-tmp.h:252 #, fuzzy msgid "Epson Stylus C42" -msgstr "Stylus C42ux" +msgstr "Stylus C42sx" -#: src/main/xmli18n-tmp.h:231 +#: src/main/xmli18n-tmp.h:253 #, fuzzy msgid "Epson Stylus C42SX" msgstr "Stylus C42ux" -#: src/main/xmli18n-tmp.h:232 +#: src/main/xmli18n-tmp.h:254 #, fuzzy msgid "Epson Stylus C42UX" msgstr "Stylus C42ux" -#: src/main/xmli18n-tmp.h:233 +#: src/main/xmli18n-tmp.h:255 #, fuzzy msgid "Epson Stylus C43" msgstr "Stylus C42ux" -#: src/main/xmli18n-tmp.h:234 +#: src/main/xmli18n-tmp.h:256 #, fuzzy msgid "Epson Stylus C43SX" msgstr "Stylus C42ux" -#: src/main/xmli18n-tmp.h:235 +#: src/main/xmli18n-tmp.h:257 #, fuzzy msgid "Epson Stylus C43UX" msgstr "Stylus C42ux" -#: src/main/xmli18n-tmp.h:236 +#: src/main/xmli18n-tmp.h:258 #, fuzzy msgid "Epson Stylus C44" msgstr "Stylus C42ux" -#: src/main/xmli18n-tmp.h:237 +#: src/main/xmli18n-tmp.h:259 #, fuzzy msgid "Epson Stylus C44SX" msgstr "Stylus C42ux" -#: src/main/xmli18n-tmp.h:238 +#: src/main/xmli18n-tmp.h:260 #, fuzzy msgid "Epson Stylus C44UX" msgstr "Stylus C42ux" -#: src/main/xmli18n-tmp.h:239 +#: src/main/xmli18n-tmp.h:261 #, fuzzy msgid "Epson Stylus C45" msgstr "Stylus C60" -#: src/main/xmli18n-tmp.h:240 +#: src/main/xmli18n-tmp.h:262 #, fuzzy msgid "Epson Stylus C46" msgstr "Stylus C60" -#: src/main/xmli18n-tmp.h:241 +#: src/main/xmli18n-tmp.h:263 #, fuzzy msgid "Epson Stylus C48" -msgstr "Stylus C60" +msgstr "Stylus C80" -#: src/main/xmli18n-tmp.h:242 +#: src/main/xmli18n-tmp.h:264 #, fuzzy msgid "Epson Stylus C50" msgstr "Stylus C60" -#: src/main/xmli18n-tmp.h:243 +#: src/main/xmli18n-tmp.h:265 #, fuzzy msgid "Epson Stylus C60" msgstr "Stylus C60" -#: src/main/xmli18n-tmp.h:244 +#: src/main/xmli18n-tmp.h:266 #, fuzzy msgid "Epson Stylus C61" msgstr "Stylus C61" -#: src/main/xmli18n-tmp.h:245 +#: src/main/xmli18n-tmp.h:267 #, fuzzy msgid "Epson Stylus C62" msgstr "Stylus C62" -#: src/main/xmli18n-tmp.h:246 +#: src/main/xmli18n-tmp.h:268 #, fuzzy msgid "Epson Stylus C63" msgstr "Stylus C60" -#: src/main/xmli18n-tmp.h:247 +#: src/main/xmli18n-tmp.h:269 #, fuzzy msgid "Epson Stylus C64" msgstr "Stylus C60" -#: src/main/xmli18n-tmp.h:248 +#: src/main/xmli18n-tmp.h:270 #, fuzzy msgid "Epson Stylus C65" msgstr "Stylus C60" -#: src/main/xmli18n-tmp.h:249 +#: src/main/xmli18n-tmp.h:271 #, fuzzy msgid "Epson Stylus C66" msgstr "Stylus C60" -#: src/main/xmli18n-tmp.h:250 +#: src/main/xmli18n-tmp.h:272 #, fuzzy msgid "Epson Stylus C68" msgstr "Stylus C60" -#: src/main/xmli18n-tmp.h:251 +#: src/main/xmli18n-tmp.h:273 #, fuzzy msgid "Epson Stylus C70" msgstr "Stylus C70" -#: src/main/xmli18n-tmp.h:252 +#: src/main/xmli18n-tmp.h:274 #, fuzzy msgid "Epson Stylus C79" msgstr "Stylus C70" -#: src/main/xmli18n-tmp.h:253 +#: src/main/xmli18n-tmp.h:275 #, fuzzy msgid "Epson Stylus C80" msgstr "Stylus C80" -#: src/main/xmli18n-tmp.h:254 +#: src/main/xmli18n-tmp.h:276 #, fuzzy msgid "Epson Stylus C82" msgstr "Stylus C82" -#: src/main/xmli18n-tmp.h:255 +#: src/main/xmli18n-tmp.h:277 #, fuzzy msgid "Epson Stylus C83" msgstr "Stylus C80" -#: src/main/xmli18n-tmp.h:256 +#: src/main/xmli18n-tmp.h:278 #, fuzzy msgid "Epson Stylus C84" msgstr "Stylus C80" -#: src/main/xmli18n-tmp.h:257 +#: src/main/xmli18n-tmp.h:279 #, fuzzy msgid "Epson Stylus C85" msgstr "Stylus C60" -#: src/main/xmli18n-tmp.h:258 +#: src/main/xmli18n-tmp.h:280 #, fuzzy msgid "Epson Stylus C86" msgstr "Stylus C60" -#: src/main/xmli18n-tmp.h:259 +#: src/main/xmli18n-tmp.h:281 #, fuzzy msgid "Epson Stylus C87" -msgstr "Stylus C60" +msgstr "Stylus C70" -#: src/main/xmli18n-tmp.h:260 +#: src/main/xmli18n-tmp.h:282 #, fuzzy msgid "Epson Stylus C88" msgstr "Stylus C80" -#: src/main/xmli18n-tmp.h:261 +#: src/main/xmli18n-tmp.h:283 #, fuzzy msgid "Epson Stylus C110" -msgstr "Stylus C20ux" +msgstr "Stylus C60" -#: src/main/xmli18n-tmp.h:262 +#: src/main/xmli18n-tmp.h:284 #, fuzzy msgid "Epson Stylus C120" -msgstr "Stylus C20ux" +msgstr "Stylus C20sx" -#: src/main/xmli18n-tmp.h:263 +#: src/main/xmli18n-tmp.h:285 #, fuzzy msgid "Epson Stylus Color" msgstr "Stylus Color" -#: src/main/xmli18n-tmp.h:264 +#: src/main/xmli18n-tmp.h:286 #, fuzzy msgid "Epson Stylus Color I" msgstr "Stylus Color" -#: src/main/xmli18n-tmp.h:265 +#: src/main/xmli18n-tmp.h:287 #, fuzzy msgid "Epson Stylus Color II" msgstr "Stylus Color" -#: src/main/xmli18n-tmp.h:266 +#: src/main/xmli18n-tmp.h:288 #, fuzzy msgid "Epson Stylus Color IIs" msgstr "Stylus Color" -#: src/main/xmli18n-tmp.h:267 +#: src/main/xmli18n-tmp.h:289 #, fuzzy msgid "Epson Stylus Color PRO" msgstr "Stylus Color Pro" -#: src/main/xmli18n-tmp.h:268 +#: src/main/xmli18n-tmp.h:290 #, fuzzy msgid "Epson Stylus Pro XL" msgstr "Stylus Color Pro XL" -#: src/main/xmli18n-tmp.h:269 +#: src/main/xmli18n-tmp.h:291 #, fuzzy msgid "Epson Stylus Color 400" msgstr "Stylus Color 400" -#: src/main/xmli18n-tmp.h:270 +#: src/main/xmli18n-tmp.h:292 #, fuzzy msgid "Epson Stylus Color 440" msgstr "Stylus Color 440" -#: src/main/xmli18n-tmp.h:271 +#: src/main/xmli18n-tmp.h:293 #, fuzzy msgid "Epson Stylus Color 460" msgstr "Stylus Color 460" -#: src/main/xmli18n-tmp.h:272 +#: src/main/xmli18n-tmp.h:294 #, fuzzy msgid "Epson Stylus Color 480" msgstr "Stylus Color 480" -#: src/main/xmli18n-tmp.h:273 +#: src/main/xmli18n-tmp.h:295 #, fuzzy msgid "Epson Stylus Color 500" msgstr "Stylus Color 500" -#: src/main/xmli18n-tmp.h:274 +#: src/main/xmli18n-tmp.h:296 #, fuzzy msgid "Epson Stylus Color 580" msgstr "Stylus Color 580" -#: src/main/xmli18n-tmp.h:275 +#: src/main/xmli18n-tmp.h:297 #, fuzzy msgid "Epson Stylus Color 600" msgstr "Stylus Color 600" -#: src/main/xmli18n-tmp.h:276 +#: src/main/xmli18n-tmp.h:298 #, fuzzy msgid "Epson Stylus Color 640" msgstr "Stylus Color 640" -#: src/main/xmli18n-tmp.h:277 +#: src/main/xmli18n-tmp.h:299 #, fuzzy msgid "Epson Stylus Color 660" msgstr "Stylus Color 660" -#: src/main/xmli18n-tmp.h:278 +#: src/main/xmli18n-tmp.h:300 #, fuzzy msgid "Epson Stylus Color 670" msgstr "Stylus Color 670" -#: src/main/xmli18n-tmp.h:279 +#: src/main/xmli18n-tmp.h:301 #, fuzzy msgid "Epson Stylus Color 680" msgstr "Stylus Color 680" -#: src/main/xmli18n-tmp.h:280 +#: src/main/xmli18n-tmp.h:302 #, fuzzy msgid "Epson Stylus Color 740" msgstr "Stylus Color 740" -#: src/main/xmli18n-tmp.h:281 +#: src/main/xmli18n-tmp.h:303 #, fuzzy msgid "Epson Stylus Color 760" msgstr "Stylus Color 760" -#: src/main/xmli18n-tmp.h:282 +#: src/main/xmli18n-tmp.h:304 #, fuzzy msgid "Epson Stylus Color 777" msgstr "Stylus Color 777" -#: src/main/xmli18n-tmp.h:283 +#: src/main/xmli18n-tmp.h:305 #, fuzzy msgid "Epson Stylus Color 800" msgstr "Stylus Color 800" -#: src/main/xmli18n-tmp.h:284 +#: src/main/xmli18n-tmp.h:306 #, fuzzy msgid "Epson Stylus Color 850" msgstr "Stylus Color 850" -#: src/main/xmli18n-tmp.h:285 +#: src/main/xmli18n-tmp.h:307 #, fuzzy msgid "Epson Stylus Color 860" msgstr "Stylus Color 860" -#: src/main/xmli18n-tmp.h:286 +#: src/main/xmli18n-tmp.h:308 #, fuzzy msgid "Epson Stylus Color 880" msgstr "Stylus Color 880" -#: src/main/xmli18n-tmp.h:287 +#: src/main/xmli18n-tmp.h:309 #, fuzzy msgid "Epson Stylus Color 8 3" msgstr "Stylus Color 83" -#: src/main/xmli18n-tmp.h:288 +#: src/main/xmli18n-tmp.h:310 #, fuzzy msgid "Epson Stylus Color 900" msgstr "Stylus Color 900" -#: src/main/xmli18n-tmp.h:289 +#: src/main/xmli18n-tmp.h:311 #, fuzzy msgid "Epson Stylus Color 980" msgstr "Stylus Color 980" -#: src/main/xmli18n-tmp.h:290 +#: src/main/xmli18n-tmp.h:312 #, fuzzy msgid "Epson Stylus Color 1160" msgstr "Stylus Color 1160" -#: src/main/xmli18n-tmp.h:291 +#: src/main/xmli18n-tmp.h:313 #, fuzzy msgid "Epson Stylus Color 1500" msgstr "Stylus Color 1500" -#: src/main/xmli18n-tmp.h:292 +#: src/main/xmli18n-tmp.h:314 #, fuzzy msgid "Epson Stylus Color 1520" msgstr "Stylus Color 1520" -#: src/main/xmli18n-tmp.h:293 +#: src/main/xmli18n-tmp.h:315 #, fuzzy msgid "Epson Stylus Color 3000" msgstr "Stylus Color 3000" -#: src/main/xmli18n-tmp.h:294 +#: src/main/xmli18n-tmp.h:316 #, fuzzy msgid "Epson Stylus Photo" msgstr "Stylus Photo" -#: src/main/xmli18n-tmp.h:295 +#: src/main/xmli18n-tmp.h:317 #, fuzzy msgid "Epson Stylus Photo 700" msgstr "Stylus Photo 700" -#: src/main/xmli18n-tmp.h:296 +#: src/main/xmli18n-tmp.h:318 #, fuzzy msgid "Epson Stylus Photo EX" msgstr "Stylus Photo EX" -#: src/main/xmli18n-tmp.h:297 +#: src/main/xmli18n-tmp.h:319 #, fuzzy msgid "Epson Stylus Photo EX3" msgstr "Stylus Photo EX" -#: src/main/xmli18n-tmp.h:298 +#: src/main/xmli18n-tmp.h:320 #, fuzzy msgid "Epson Stylus Photo 720" msgstr "Stylus Photo 720" -#: src/main/xmli18n-tmp.h:299 +#: src/main/xmli18n-tmp.h:321 #, fuzzy msgid "Epson Stylus Photo 750" msgstr "Stylus Photo 750" -#: src/main/xmli18n-tmp.h:300 +#: src/main/xmli18n-tmp.h:322 #, fuzzy msgid "Epson Stylus Photo 780" msgstr "Stylus Photo 780" -#: src/main/xmli18n-tmp.h:301 +#: src/main/xmli18n-tmp.h:323 #, fuzzy msgid "Epson Stylus Photo 785" msgstr "Stylus Photo 785" -#: src/main/xmli18n-tmp.h:302 +#: src/main/xmli18n-tmp.h:324 #, fuzzy msgid "Epson Stylus Photo 790" msgstr "Stylus Photo 790" -#: src/main/xmli18n-tmp.h:303 +#: src/main/xmli18n-tmp.h:325 #, fuzzy msgid "Epson Stylus Photo 810" msgstr "Stylus Photo 810" -#: src/main/xmli18n-tmp.h:304 +#: src/main/xmli18n-tmp.h:326 #, fuzzy msgid "Epson Stylus Photo 820" msgstr "Stylus Photo 820" -#: src/main/xmli18n-tmp.h:305 +#: src/main/xmli18n-tmp.h:327 #, fuzzy msgid "Epson Stylus Photo 825" msgstr "Stylus Photo 785" -#: src/main/xmli18n-tmp.h:306 +#: src/main/xmli18n-tmp.h:328 #, fuzzy msgid "Epson Stylus Photo 830" msgstr "Stylus Photo 830" -#: src/main/xmli18n-tmp.h:307 +#: src/main/xmli18n-tmp.h:329 #, fuzzy msgid "Epson Stylus Photo 830U" msgstr "Stylus Photo 830" -#: src/main/xmli18n-tmp.h:308 +#: src/main/xmli18n-tmp.h:330 #, fuzzy msgid "Epson Stylus Photo 870" msgstr "Stylus Photo 870" -#: src/main/xmli18n-tmp.h:309 +#: src/main/xmli18n-tmp.h:331 #, fuzzy msgid "Epson Stylus Photo 875" msgstr "Stylus Photo 875" -#: src/main/xmli18n-tmp.h:310 +#: src/main/xmli18n-tmp.h:332 #, fuzzy msgid "Epson Stylus Photo 890" msgstr "Stylus Photo 890" -#: src/main/xmli18n-tmp.h:311 +#: src/main/xmli18n-tmp.h:333 #, fuzzy msgid "Epson Stylus Photo 895" msgstr "Stylus Photo 895" -#: src/main/xmli18n-tmp.h:312 +#: src/main/xmli18n-tmp.h:334 #, fuzzy msgid "Epson Stylus Photo 900" msgstr "Stylus Photo 700" -#: src/main/xmli18n-tmp.h:313 +#: src/main/xmli18n-tmp.h:335 #, fuzzy msgid "Epson Stylus Photo 915" msgstr "Stylus Photo 915" -#: src/main/xmli18n-tmp.h:314 +#: src/main/xmli18n-tmp.h:336 #, fuzzy msgid "Epson Stylus Photo 925" msgstr "Stylus Photo 925" -#: src/main/xmli18n-tmp.h:315 +#: src/main/xmli18n-tmp.h:337 #, fuzzy msgid "Epson Stylus Photo 935" msgstr "Stylus Photo 895" -#: src/main/xmli18n-tmp.h:316 +#: src/main/xmli18n-tmp.h:338 #, fuzzy msgid "Epson Stylus Photo 950" msgstr "Stylus Photo 950" -#: src/main/xmli18n-tmp.h:317 +#: src/main/xmli18n-tmp.h:339 #, fuzzy msgid "Epson Stylus Photo 960" msgstr "Stylus Photo 960" -#: src/main/xmli18n-tmp.h:318 +#: src/main/xmli18n-tmp.h:340 #, fuzzy msgid "Epson Stylus Photo 1200" msgstr "Stylus Photo 1200" -#: src/main/xmli18n-tmp.h:319 +#: src/main/xmli18n-tmp.h:341 #, fuzzy msgid "Epson Stylus Photo 1270" msgstr "Stylus Photo 1270" -#: src/main/xmli18n-tmp.h:320 +#: src/main/xmli18n-tmp.h:342 #, fuzzy msgid "Epson Stylus Photo 1280" msgstr "Stylus Photo 1280" -#: src/main/xmli18n-tmp.h:321 +#: src/main/xmli18n-tmp.h:343 #, fuzzy msgid "Epson Stylus Photo 1290" msgstr "Stylus Photo 1290" -#: src/main/xmli18n-tmp.h:322 +#: src/main/xmli18n-tmp.h:344 #, fuzzy msgid "Epson Stylus Photo 1400" msgstr "Stylus Photo 1200" -#: src/main/xmli18n-tmp.h:323 +#: src/main/xmli18n-tmp.h:345 #, fuzzy msgid "Epson Stylus Photo 1410" msgstr "Stylus Photo 810" -#: src/main/xmli18n-tmp.h:324 +#: src/main/xmli18n-tmp.h:346 #, fuzzy msgid "Epson Stylus Photo 2000P" msgstr "Stylus Photo 2000P" -#: src/main/xmli18n-tmp.h:325 +#: src/main/xmli18n-tmp.h:347 #, fuzzy msgid "Epson Stylus Photo 2100" msgstr "Stylus Photo 2100" -#: src/main/xmli18n-tmp.h:326 +#: src/main/xmli18n-tmp.h:348 #, fuzzy msgid "Epson Stylus Photo 2200" msgstr "Stylus Photo 2200" -#: src/main/xmli18n-tmp.h:327 +#: src/main/xmli18n-tmp.h:349 #, fuzzy msgid "Epson Stylus Photo R200" msgstr "Stylus Photo 1200" -#: src/main/xmli18n-tmp.h:328 +#: src/main/xmli18n-tmp.h:350 #, fuzzy msgid "Epson Stylus Photo R210" msgstr "Stylus Photo 2100" -#: src/main/xmli18n-tmp.h:329 +#: src/main/xmli18n-tmp.h:351 #, fuzzy msgid "Epson Stylus Photo R220" msgstr "Stylus Photo 2200" -#: src/main/xmli18n-tmp.h:330 +#: src/main/xmli18n-tmp.h:352 #, fuzzy msgid "Epson Stylus Photo R230" msgstr "Stylus Photo 1200" -#: src/main/xmli18n-tmp.h:331 +#: src/main/xmli18n-tmp.h:353 #, fuzzy msgid "Epson Stylus Photo R240" msgstr "Stylus Photo 1200" -#: src/main/xmli18n-tmp.h:332 +#: src/main/xmli18n-tmp.h:354 #, fuzzy msgid "Epson Stylus Photo R245" -msgstr "Stylus Photo 1200" +msgstr "Stylus Photo 925" -#: src/main/xmli18n-tmp.h:333 +#: src/main/xmli18n-tmp.h:355 #, fuzzy msgid "Epson Stylus Photo R260" msgstr "Stylus Photo 1200" -#: src/main/xmli18n-tmp.h:334 +#: src/main/xmli18n-tmp.h:356 #, fuzzy msgid "Epson Stylus Photo R265" -msgstr "Stylus Photo 1200" +msgstr "Stylus Photo 925" -#: src/main/xmli18n-tmp.h:335 +#: src/main/xmli18n-tmp.h:357 #, fuzzy msgid "Epson Stylus Photo R270" msgstr "Stylus Photo 1270" -#: src/main/xmli18n-tmp.h:336 +#: src/main/xmli18n-tmp.h:358 +#, fuzzy +msgid "Epson Stylus Photo R280" +msgstr "Stylus Photo 1280" + +#: src/main/xmli18n-tmp.h:359 +#, fuzzy +msgid "Epson Stylus Photo R285" +msgstr "Stylus Photo 785" + +#: src/main/xmli18n-tmp.h:360 #, fuzzy msgid "Epson Stylus Photo R300" msgstr "Stylus Photo 700" -#: src/main/xmli18n-tmp.h:337 +#: src/main/xmli18n-tmp.h:361 #, fuzzy msgid "Epson Stylus Photo R310" msgstr "Stylus Photo 700" -#: src/main/xmli18n-tmp.h:338 +#: src/main/xmli18n-tmp.h:362 #, fuzzy msgid "Epson Stylus Photo R320" msgstr "Stylus Photo 1200" -#: src/main/xmli18n-tmp.h:339 +#: src/main/xmli18n-tmp.h:363 #, fuzzy msgid "Epson Stylus Photo R340" msgstr "Stylus Photo 700" -#: src/main/xmli18n-tmp.h:340 +#: src/main/xmli18n-tmp.h:364 #, fuzzy msgid "Epson Stylus Photo R350" msgstr "Stylus Photo 700" -#: src/main/xmli18n-tmp.h:341 +#: src/main/xmli18n-tmp.h:365 #, fuzzy msgid "Epson Stylus Photo R360" msgstr "Stylus Photo 700" -#: src/main/xmli18n-tmp.h:342 +#: src/main/xmli18n-tmp.h:366 #, fuzzy msgid "Epson Stylus Photo R380" msgstr "Stylus Photo 700" -#: src/main/xmli18n-tmp.h:343 +#: src/main/xmli18n-tmp.h:367 #, fuzzy msgid "Epson Stylus Photo R390" msgstr "Stylus Photo 700" -#: src/main/xmli18n-tmp.h:344 +#: src/main/xmli18n-tmp.h:368 #, fuzzy msgid "Epson Stylus Photo RX400" msgstr "Stylus Photo 700" -#: src/main/xmli18n-tmp.h:345 +#: src/main/xmli18n-tmp.h:369 #, fuzzy msgid "Epson Stylus Photo RX420" msgstr "Stylus Photo 1200" -#: src/main/xmli18n-tmp.h:346 +#: src/main/xmli18n-tmp.h:370 #, fuzzy msgid "Epson Stylus Photo RX425" msgstr "Stylus Photo 1200" -#: src/main/xmli18n-tmp.h:347 +#: src/main/xmli18n-tmp.h:371 #, fuzzy msgid "Epson Stylus Photo RX430" msgstr "Stylus Photo 700" -#: src/main/xmli18n-tmp.h:348 +#: src/main/xmli18n-tmp.h:372 #, fuzzy msgid "Epson Stylus Photo RX500" msgstr "Stylus Photo 700" -#: src/main/xmli18n-tmp.h:349 +#: src/main/xmli18n-tmp.h:373 #, fuzzy msgid "Epson Stylus Photo RX510" msgstr "Stylus Photo 700" -#: src/main/xmli18n-tmp.h:350 +#: src/main/xmli18n-tmp.h:374 #, fuzzy msgid "Epson Stylus Photo RX560" msgstr "Stylus Photo 700" -#: src/main/xmli18n-tmp.h:351 +#: src/main/xmli18n-tmp.h:375 #, fuzzy msgid "Epson Stylus Photo RX580" msgstr "Stylus Photo 700" -#: src/main/xmli18n-tmp.h:352 +#: src/main/xmli18n-tmp.h:376 +#, fuzzy +msgid "Epson Stylus Photo RX585" +msgstr "Stylus Photo 700" + +#: src/main/xmli18n-tmp.h:377 #, fuzzy msgid "Epson Stylus Photo RX590" msgstr "Stylus Photo 700" -#: src/main/xmli18n-tmp.h:353 +#: src/main/xmli18n-tmp.h:378 #, fuzzy msgid "Epson Stylus Photo RX595" msgstr "Stylus Photo 700" -#: src/main/xmli18n-tmp.h:354 +#: src/main/xmli18n-tmp.h:379 #, fuzzy msgid "Epson Stylus Photo RX600" msgstr "Stylus Photo 700" -#: src/main/xmli18n-tmp.h:355 +#: src/main/xmli18n-tmp.h:380 #, fuzzy msgid "Epson Stylus Photo RX620" msgstr "Stylus Photo 700" -#: src/main/xmli18n-tmp.h:356 +#: src/main/xmli18n-tmp.h:381 #, fuzzy msgid "Epson Stylus Photo RX630" msgstr "Stylus Photo 700" -#: src/main/xmli18n-tmp.h:357 +#: src/main/xmli18n-tmp.h:382 #, fuzzy msgid "Epson Stylus Photo RX640" msgstr "Stylus Photo 700" -#: src/main/xmli18n-tmp.h:358 +#: src/main/xmli18n-tmp.h:383 +#, fuzzy +msgid "Epson Stylus Photo RX680" +msgstr "Stylus Photo 700" + +#: src/main/xmli18n-tmp.h:384 +#, fuzzy +msgid "Epson Stylus Photo RX685" +msgstr "Stylus Photo 700" + +#: src/main/xmli18n-tmp.h:385 #, fuzzy msgid "Epson Stylus Photo RX700" msgstr "Stylus Photo 700" -#: src/main/xmli18n-tmp.h:359 +#: src/main/xmli18n-tmp.h:386 #, fuzzy msgid "Epson Stylus Photo R800" msgstr "Stylus Photo 700" -#: src/main/xmli18n-tmp.h:360 +#: src/main/xmli18n-tmp.h:387 #, fuzzy msgid "Epson Stylus Photo R1800" msgstr "Stylus Photo 700" -#: src/main/xmli18n-tmp.h:361 +#: src/main/xmli18n-tmp.h:388 #, fuzzy msgid "Epson Stylus Photo R2400" msgstr "Stylus Photo 1200" -#: src/main/xmli18n-tmp.h:362 +#: src/main/xmli18n-tmp.h:389 #, fuzzy msgid "Epson Stylus Pro 5000" msgstr "Stylus Pro 5000" -#: src/main/xmli18n-tmp.h:363 +#: src/main/xmli18n-tmp.h:390 #, fuzzy msgid "Epson Stylus Pro 5500" msgstr "Stylus Pro 5500" -#: src/main/xmli18n-tmp.h:364 +#: src/main/xmli18n-tmp.h:391 #, fuzzy msgid "Epson Stylus Pro 7000" msgstr "Stylus Pro 7000" -#: src/main/xmli18n-tmp.h:365 +#: src/main/xmli18n-tmp.h:392 #, fuzzy msgid "Epson Stylus Pro 7500" msgstr "Stylus Pro 7500" -#: src/main/xmli18n-tmp.h:366 +#: src/main/xmli18n-tmp.h:393 #, fuzzy msgid "Epson Stylus Pro 7600" msgstr "Stylus Pro 7600" -#: src/main/xmli18n-tmp.h:367 +#: src/main/xmli18n-tmp.h:394 #, fuzzy msgid "Epson Stylus Pro 9000" msgstr "Stylus Pro 9000" -#: src/main/xmli18n-tmp.h:368 +#: src/main/xmli18n-tmp.h:395 #, fuzzy msgid "Epson Stylus Pro 9500" msgstr "Stylus Pro 9500" -#: src/main/xmli18n-tmp.h:369 +#: src/main/xmli18n-tmp.h:396 #, fuzzy msgid "Epson Stylus Pro 9600" msgstr "Stylus Pro 9600" -#: src/main/xmli18n-tmp.h:370 +#: src/main/xmli18n-tmp.h:397 #, fuzzy msgid "Epson Stylus Pro 10000" msgstr "Stylus Pro 10000" -#: src/main/xmli18n-tmp.h:371 +#: src/main/xmli18n-tmp.h:398 #, fuzzy msgid "Epson Stylus Scan 2000" msgstr "Stylus Scan 2000" -#: src/main/xmli18n-tmp.h:372 +#: src/main/xmli18n-tmp.h:399 #, fuzzy msgid "Epson Stylus Scan 2500" msgstr "Stylus Scan 2500" -#: src/main/xmli18n-tmp.h:373 +#: src/main/xmli18n-tmp.h:400 #, fuzzy msgid "Epson Stylus CX1500" msgstr "Stylus C20sx" -#: src/main/xmli18n-tmp.h:374 +#: src/main/xmli18n-tmp.h:401 #, fuzzy msgid "Epson Stylus CX3100" msgstr "Stylus C20sx" -#: src/main/xmli18n-tmp.h:375 +#: src/main/xmli18n-tmp.h:402 #, fuzzy msgid "Epson Stylus CX3200" msgstr "Stylus C20sx" -#: src/main/xmli18n-tmp.h:376 +#: src/main/xmli18n-tmp.h:403 #, fuzzy msgid "Epson Stylus CX3500" msgstr "Stylus C20sx" -#: src/main/xmli18n-tmp.h:377 +#: src/main/xmli18n-tmp.h:404 #, fuzzy msgid "Epson Stylus CX3600" msgstr "Stylus C20sx" -#: src/main/xmli18n-tmp.h:378 +#: src/main/xmli18n-tmp.h:405 #, fuzzy msgid "Epson Stylus CX3650" msgstr "Stylus C20sx" -#: src/main/xmli18n-tmp.h:379 +#: src/main/xmli18n-tmp.h:406 #, fuzzy msgid "Epson Stylus CX3700" msgstr "Stylus C20sx" -#: src/main/xmli18n-tmp.h:380 +#: src/main/xmli18n-tmp.h:407 #, fuzzy msgid "Epson Stylus CX3800" msgstr "Stylus C20sx" -#: src/main/xmli18n-tmp.h:381 +#: src/main/xmli18n-tmp.h:408 #, fuzzy msgid "Epson Stylus CX3805" -msgstr "Stylus C60" +msgstr "Stylus C80" -#: src/main/xmli18n-tmp.h:382 +#: src/main/xmli18n-tmp.h:409 #, fuzzy msgid "Epson Stylus CX3810" msgstr "Stylus C20sx" -#: src/main/xmli18n-tmp.h:383 +#: src/main/xmli18n-tmp.h:410 #, fuzzy msgid "Epson Stylus CX4100" msgstr "Stylus C20sx" -#: src/main/xmli18n-tmp.h:384 +#: src/main/xmli18n-tmp.h:411 #, fuzzy msgid "Epson Stylus CX4200" msgstr "Stylus C20sx" -#: src/main/xmli18n-tmp.h:385 +#: src/main/xmli18n-tmp.h:412 #, fuzzy msgid "Epson Stylus CX4400" msgstr "Stylus C20sx" -#: src/main/xmli18n-tmp.h:386 +#: src/main/xmli18n-tmp.h:413 #, fuzzy msgid "Epson Stylus CX4500" msgstr "Stylus C20sx" -#: src/main/xmli18n-tmp.h:387 +#: src/main/xmli18n-tmp.h:414 #, fuzzy msgid "Epson Stylus CX4600" msgstr "Stylus C20sx" -#: src/main/xmli18n-tmp.h:388 +#: src/main/xmli18n-tmp.h:415 #, fuzzy msgid "Epson Stylus CX4700" msgstr "Stylus C20sx" -#: src/main/xmli18n-tmp.h:389 +#: src/main/xmli18n-tmp.h:416 #, fuzzy msgid "Epson Stylus CX4800" msgstr "Stylus C20sx" -#: src/main/xmli18n-tmp.h:390 +#: src/main/xmli18n-tmp.h:417 #, fuzzy msgid "Epson Stylus CX4900" msgstr "Stylus C20sx" -#: src/main/xmli18n-tmp.h:391 +#: src/main/xmli18n-tmp.h:418 #, fuzzy msgid "Epson Stylus CX5000" msgstr "Stylus C20sx" -#: src/main/xmli18n-tmp.h:392 +#: src/main/xmli18n-tmp.h:419 #, fuzzy msgid "Epson Stylus CX5000F" msgstr "Stylus C20sx" -#: src/main/xmli18n-tmp.h:393 +#: src/main/xmli18n-tmp.h:420 #, fuzzy msgid "Epson Stylus CX5100" msgstr "Stylus C60" -#: src/main/xmli18n-tmp.h:394 +#: src/main/xmli18n-tmp.h:421 #, fuzzy msgid "Epson Stylus CX5200" msgstr "Stylus C60" -#: src/main/xmli18n-tmp.h:395 +#: src/main/xmli18n-tmp.h:422 #, fuzzy msgid "Epson Stylus CX5300" msgstr "Stylus C20sx" -#: src/main/xmli18n-tmp.h:396 +#: src/main/xmli18n-tmp.h:423 #, fuzzy msgid "Epson Stylus CX5400" msgstr "Stylus C20sx" -#: src/main/xmli18n-tmp.h:397 +#: src/main/xmli18n-tmp.h:424 #, fuzzy msgid "Epson Stylus CX5600" msgstr "Stylus C20sx" -#: src/main/xmli18n-tmp.h:398 +#: src/main/xmli18n-tmp.h:425 #, fuzzy msgid "Epson Stylus CX5700" msgstr "Stylus C20sx" -#: src/main/xmli18n-tmp.h:399 +#: src/main/xmli18n-tmp.h:426 #, fuzzy msgid "Epson Stylus CX5800" msgstr "Stylus C20sx" -#: src/main/xmli18n-tmp.h:400 +#: src/main/xmli18n-tmp.h:427 #, fuzzy msgid "Epson Stylus CX6000" msgstr "Stylus C20sx" -#: src/main/xmli18n-tmp.h:401 +#: src/main/xmli18n-tmp.h:428 #, fuzzy msgid "Epson Stylus CX6300" msgstr "Stylus C20sx" -#: src/main/xmli18n-tmp.h:402 +#: src/main/xmli18n-tmp.h:429 #, fuzzy msgid "Epson Stylus CX6400" msgstr "Stylus C20sx" -#: src/main/xmli18n-tmp.h:403 +#: src/main/xmli18n-tmp.h:430 #, fuzzy msgid "Epson Stylus CX6500" msgstr "Stylus C20sx" -#: src/main/xmli18n-tmp.h:404 +#: src/main/xmli18n-tmp.h:431 #, fuzzy msgid "Epson Stylus CX6600" msgstr "Stylus C20sx" -#: src/main/xmli18n-tmp.h:405 +#: src/main/xmli18n-tmp.h:432 #, fuzzy msgid "Epson Stylus CX7000F" -msgstr "Stylus C20sx" +msgstr "Stylus C70" -#: src/main/xmli18n-tmp.h:406 +#: src/main/xmli18n-tmp.h:433 #, fuzzy msgid "Epson Stylus CX7400" msgstr "Stylus C20sx" -#: src/main/xmli18n-tmp.h:407 +#: src/main/xmli18n-tmp.h:434 #, fuzzy msgid "Epson Stylus CX7700" msgstr "Stylus C70" -#: src/main/xmli18n-tmp.h:408 +#: src/main/xmli18n-tmp.h:435 #, fuzzy msgid "Epson Stylus CX7800" msgstr "Stylus C20sx" -#: src/main/xmli18n-tmp.h:409 +#: src/main/xmli18n-tmp.h:436 #, fuzzy msgid "Epson Stylus CX8300" msgstr "Stylus C20sx" -#: src/main/xmli18n-tmp.h:410 +#: src/main/xmli18n-tmp.h:437 #, fuzzy msgid "Epson Stylus CX8400" msgstr "Stylus C20sx" -#: src/main/xmli18n-tmp.h:411 +#: src/main/xmli18n-tmp.h:438 #, fuzzy msgid "Epson Stylus CX9400" msgstr "Stylus C20sx" -#: src/main/xmli18n-tmp.h:412 +#: src/main/xmli18n-tmp.h:439 #, fuzzy msgid "Epson Stylus D68" msgstr "Stylus C60" -#: src/main/xmli18n-tmp.h:413 +#: src/main/xmli18n-tmp.h:440 #, fuzzy msgid "Epson Stylus D88" msgstr "Stylus C80" -#: src/main/xmli18n-tmp.h:414 +#: src/main/xmli18n-tmp.h:441 +#, fuzzy +msgid "Epson Stylus D92" +msgstr "Stylus C62" + +#: src/main/xmli18n-tmp.h:442 #, fuzzy msgid "Epson Stylus D120" msgstr "Stylus C20ux" -#: src/main/xmli18n-tmp.h:415 +#: src/main/xmli18n-tmp.h:443 #, fuzzy msgid "Epson Stylus DX3800" msgstr "Stylus C20sx" -#: src/main/xmli18n-tmp.h:416 +#: src/main/xmli18n-tmp.h:444 #, fuzzy msgid "Epson Stylus DX3850" msgstr "Stylus C20sx" -#: src/main/xmli18n-tmp.h:417 +#: src/main/xmli18n-tmp.h:445 #, fuzzy msgid "Epson Stylus DX4050" msgstr "Stylus C20sx" -#: src/main/xmli18n-tmp.h:418 +#: src/main/xmli18n-tmp.h:446 #, fuzzy msgid "Epson Stylus DX4200" msgstr "Stylus C20sx" -#: src/main/xmli18n-tmp.h:419 +#: src/main/xmli18n-tmp.h:447 #, fuzzy msgid "Epson Stylus DX4250" -msgstr "Stylus C60" +msgstr "Stylus C20sx" -#: src/main/xmli18n-tmp.h:420 +#: src/main/xmli18n-tmp.h:448 +#, fuzzy +msgid "Epson Stylus DX4400" +msgstr "Stylus C20sx" + +#: src/main/xmli18n-tmp.h:449 +#, fuzzy +msgid "Epson Stylus DX4450" +msgstr "Stylus C20sx" + +#: src/main/xmli18n-tmp.h:450 #, fuzzy msgid "Epson Stylus DX4800" msgstr "Stylus C20sx" -#: src/main/xmli18n-tmp.h:421 +#: src/main/xmli18n-tmp.h:451 +#, fuzzy +msgid "Epson Stylus DX7000F" +msgstr "Stylus Pro 7000" + +#: src/main/xmli18n-tmp.h:452 +#, fuzzy +msgid "Epson Stylus DX7400" +msgstr "Stylus C20sx" + +#: src/main/xmli18n-tmp.h:453 +#, fuzzy +msgid "Epson Stylus DX7450" +msgstr "Stylus C20sx" + +#: src/main/xmli18n-tmp.h:454 +#, fuzzy +msgid "Epson Stylus DX8400" +msgstr "Stylus C20sx" + +#: src/main/xmli18n-tmp.h:455 +#, fuzzy +msgid "Epson Stylus DX8450" +msgstr "Stylus C20sx" + +#: src/main/xmli18n-tmp.h:456 msgid "Epson PictureMate" msgstr "" -#: src/main/xmli18n-tmp.h:422 +#: src/main/xmli18n-tmp.h:457 +msgid "Epson PictureMate Dash" +msgstr "" + +#: src/main/xmli18n-tmp.h:458 msgid "Epson PictureMate Deluxe" msgstr "" -#: src/main/xmli18n-tmp.h:423 +#: src/main/xmli18n-tmp.h:459 msgid "Epson PictureMate Flash" msgstr "" -#: src/main/xmli18n-tmp.h:424 +#: src/main/xmli18n-tmp.h:460 msgid "Epson PictureMate Pal" msgstr "" -#: src/main/xmli18n-tmp.h:425 +#: src/main/xmli18n-tmp.h:461 msgid "Epson PictureMate Snap" msgstr "" -#: src/main/xmli18n-tmp.h:426 -#, fuzzy +#: src/main/xmli18n-tmp.h:462 +msgid "Epson PictureMate 100" +msgstr "" + +#: src/main/xmli18n-tmp.h:463 msgid "Epson PictureMate 200" -msgstr "Stylus C60" +msgstr "" -#: src/main/xmli18n-tmp.h:427 -#, fuzzy +#: src/main/xmli18n-tmp.h:464 msgid "Epson PictureMate 210" -msgstr "Stylus C60" +msgstr "" -#: src/main/xmli18n-tmp.h:428 -#, fuzzy +#: src/main/xmli18n-tmp.h:465 msgid "Epson PictureMate 240" -msgstr "Stylus C60" +msgstr "" -#: src/main/xmli18n-tmp.h:429 -#, fuzzy +#: src/main/xmli18n-tmp.h:466 msgid "Epson PictureMate 250" -msgstr "Stylus C60" +msgstr "" -#: src/main/xmli18n-tmp.h:430 -#, fuzzy +#: src/main/xmli18n-tmp.h:467 +msgid "Epson PictureMate 260" +msgstr "" + +#: src/main/xmli18n-tmp.h:468 +msgid "Epson PictureMate 270" +msgstr "" + +#: src/main/xmli18n-tmp.h:469 msgid "Epson PictureMate 280" -msgstr "Stylus C60" +msgstr "" -#: src/main/xmli18n-tmp.h:431 +#: src/main/xmli18n-tmp.h:470 +msgid "Epson PictureMate 290" +msgstr "" + +#: src/main/xmli18n-tmp.h:471 +msgid "Epson PictureMate 500" +msgstr "" + +#: src/main/xmli18n-tmp.h:472 +msgid "Epson PictureMate 2005" +msgstr "" + +#: src/main/xmli18n-tmp.h:473 msgid "Epson CL 700" msgstr "" -#: src/main/xmli18n-tmp.h:432 +#: src/main/xmli18n-tmp.h:474 msgid "Epson CL 750" msgstr "" -#: src/main/xmli18n-tmp.h:433 +#: src/main/xmli18n-tmp.h:475 msgid "Epson CL 760" msgstr "" -#: src/main/xmli18n-tmp.h:434 +#: src/main/xmli18n-tmp.h:476 msgid "Epson E 100" msgstr "" -#: src/main/xmli18n-tmp.h:435 +#: src/main/xmli18n-tmp.h:477 msgid "Epson E 150" msgstr "" -#: src/main/xmli18n-tmp.h:436 +#: src/main/xmli18n-tmp.h:478 msgid "Epson E 200" msgstr "" -#: src/main/xmli18n-tmp.h:437 +#: src/main/xmli18n-tmp.h:479 +msgid "Epson E 300" +msgstr "" + +#: src/main/xmli18n-tmp.h:480 +msgid "Epson E 500" +msgstr "" + +#: src/main/xmli18n-tmp.h:481 +msgid "Epson E 520" +msgstr "" + +#: src/main/xmli18n-tmp.h:482 +msgid "Epson E 700" +msgstr "" + +#: src/main/xmli18n-tmp.h:483 +msgid "Epson E 720" +msgstr "" + +#: src/main/xmli18n-tmp.h:484 msgid "Epson EM 900C" msgstr "" -#: src/main/xmli18n-tmp.h:438 +#: src/main/xmli18n-tmp.h:485 msgid "Epson EM 930C" msgstr "" -#: src/main/xmli18n-tmp.h:439 +#: src/main/xmli18n-tmp.h:486 msgid "Epson MC 2000" msgstr "" -#: src/main/xmli18n-tmp.h:440 +#: src/main/xmli18n-tmp.h:487 msgid "Epson MC 5000" msgstr "" -#: src/main/xmli18n-tmp.h:441 +#: src/main/xmli18n-tmp.h:488 msgid "Epson MC 7000" msgstr "" -#: src/main/xmli18n-tmp.h:442 +#: src/main/xmli18n-tmp.h:489 msgid "Epson MC 9000" msgstr "" -#: src/main/xmli18n-tmp.h:443 +#: src/main/xmli18n-tmp.h:490 msgid "Epson MC 10000" msgstr "" -#: src/main/xmli18n-tmp.h:444 +#: src/main/xmli18n-tmp.h:491 msgid "Epson MJ 930C" msgstr "" -#: src/main/xmli18n-tmp.h:445 +#: src/main/xmli18n-tmp.h:492 msgid "Epson MJ 5100C" msgstr "" -#: src/main/xmli18n-tmp.h:446 +#: src/main/xmli18n-tmp.h:493 msgid "Epson MJ 6000C" msgstr "" -#: src/main/xmli18n-tmp.h:447 +#: src/main/xmli18n-tmp.h:494 msgid "Epson MJ 8000C" msgstr "" -#: src/main/xmli18n-tmp.h:448 -#, fuzzy +#: src/main/xmli18n-tmp.h:495 msgid "Epson PM 670C" -msgstr "Stylus C60" +msgstr "" -#: src/main/xmli18n-tmp.h:449 +#: src/main/xmli18n-tmp.h:496 msgid "Epson PM 700C" msgstr "" -#: src/main/xmli18n-tmp.h:450 +#: src/main/xmli18n-tmp.h:497 msgid "Epson PM 730C" msgstr "" -#: src/main/xmli18n-tmp.h:451 +#: src/main/xmli18n-tmp.h:498 msgid "Epson PM 740C" msgstr "" -#: src/main/xmli18n-tmp.h:452 +#: src/main/xmli18n-tmp.h:499 msgid "Epson PM 750C" msgstr "" -#: src/main/xmli18n-tmp.h:453 +#: src/main/xmli18n-tmp.h:500 msgid "Epson PM 760C" msgstr "" -#: src/main/xmli18n-tmp.h:454 +#: src/main/xmli18n-tmp.h:501 msgid "Epson PM 770C" msgstr "" -#: src/main/xmli18n-tmp.h:455 +#: src/main/xmli18n-tmp.h:502 msgid "Epson PM 780C" msgstr "" -#: src/main/xmli18n-tmp.h:456 +#: src/main/xmli18n-tmp.h:503 msgid "Epson PM 790PT" msgstr "" -#: src/main/xmli18n-tmp.h:457 +#: src/main/xmli18n-tmp.h:504 msgid "Epson PM 800C" msgstr "" -#: src/main/xmli18n-tmp.h:458 +#: src/main/xmli18n-tmp.h:505 msgid "Epson PM 850PT" msgstr "" -#: src/main/xmli18n-tmp.h:459 +#: src/main/xmli18n-tmp.h:506 msgid "Epson PM 870C" msgstr "" -#: src/main/xmli18n-tmp.h:460 +#: src/main/xmli18n-tmp.h:507 msgid "Epson PM 880C" msgstr "" -#: src/main/xmli18n-tmp.h:461 +#: src/main/xmli18n-tmp.h:508 msgid "Epson PM 930C" msgstr "" -#: src/main/xmli18n-tmp.h:462 +#: src/main/xmli18n-tmp.h:509 msgid "Epson PM 940C" msgstr "" -#: src/main/xmli18n-tmp.h:463 +#: src/main/xmli18n-tmp.h:510 msgid "Epson PM 950C" msgstr "" -#: src/main/xmli18n-tmp.h:464 +#: src/main/xmli18n-tmp.h:511 msgid "Epson PM 970C" msgstr "" -#: src/main/xmli18n-tmp.h:465 +#: src/main/xmli18n-tmp.h:512 msgid "Epson PM 980C" msgstr "" -#: src/main/xmli18n-tmp.h:466 +#: src/main/xmli18n-tmp.h:513 msgid "Epson PM 2000C" msgstr "" -#: src/main/xmli18n-tmp.h:467 +#: src/main/xmli18n-tmp.h:514 msgid "Epson PM 2200C" msgstr "" -#: src/main/xmli18n-tmp.h:468 +#: src/main/xmli18n-tmp.h:515 msgid "Epson PM 3000C" msgstr "" -#: src/main/xmli18n-tmp.h:469 +#: src/main/xmli18n-tmp.h:516 msgid "Epson PM 3300C" msgstr "" -#: src/main/xmli18n-tmp.h:470 +#: src/main/xmli18n-tmp.h:517 msgid "Epson PM 3500C" msgstr "" -#: src/main/xmli18n-tmp.h:471 +#: src/main/xmli18n-tmp.h:518 msgid "Epson PM 3700C" msgstr "" -#: src/main/xmli18n-tmp.h:472 +#: src/main/xmli18n-tmp.h:519 msgid "Epson PM 4000PX" msgstr "" -#: src/main/xmli18n-tmp.h:473 +#: src/main/xmli18n-tmp.h:520 msgid "Epson PM 5000C" msgstr "" -#: src/main/xmli18n-tmp.h:474 +#: src/main/xmli18n-tmp.h:521 msgid "Epson PM 7000C" msgstr "" -#: src/main/xmli18n-tmp.h:475 +#: src/main/xmli18n-tmp.h:522 msgid "Epson PM 9000C" msgstr "" -#: src/main/xmli18n-tmp.h:476 +#: src/main/xmli18n-tmp.h:523 #, fuzzy msgid "Epson PM 10000" msgstr "Stylus Pro 10000" -#: src/main/xmli18n-tmp.h:477 +#: src/main/xmli18n-tmp.h:524 msgid "Epson PM A650" msgstr "" -#: src/main/xmli18n-tmp.h:478 +#: src/main/xmli18n-tmp.h:525 msgid "Epson PM A750" msgstr "" -#: src/main/xmli18n-tmp.h:479 -#, fuzzy +#: src/main/xmli18n-tmp.h:526 msgid "Epson PM A820" -msgstr "Stylus C60" +msgstr "" -#: src/main/xmli18n-tmp.h:480 +#: src/main/xmli18n-tmp.h:527 msgid "Epson PM A890" msgstr "" -#: src/main/xmli18n-tmp.h:481 -#, fuzzy +#: src/main/xmli18n-tmp.h:528 msgid "Epson PM A900" -msgstr "Stylus C60" +msgstr "" -#: src/main/xmli18n-tmp.h:482 +#: src/main/xmli18n-tmp.h:529 msgid "Epson PM A950" msgstr "" -#: src/main/xmli18n-tmp.h:483 +#: src/main/xmli18n-tmp.h:530 msgid "Epson PM D600" msgstr "" -#: src/main/xmli18n-tmp.h:484 +#: src/main/xmli18n-tmp.h:531 #, fuzzy msgid "Epson PM D750" msgstr "Stylus C60" -#: src/main/xmli18n-tmp.h:485 +#: src/main/xmli18n-tmp.h:532 #, fuzzy msgid "Epson PM D770" msgstr "Stylus C60" -#: src/main/xmli18n-tmp.h:486 +#: src/main/xmli18n-tmp.h:533 msgid "Epson PM D800" msgstr "" -#: src/main/xmli18n-tmp.h:487 -#, fuzzy +#: src/main/xmli18n-tmp.h:534 msgid "Epson PM D870" -msgstr "Stylus C60" +msgstr "" -#: src/main/xmli18n-tmp.h:488 +#: src/main/xmli18n-tmp.h:535 #, fuzzy msgid "Epson PM D1000" msgstr "Stylus C60" -#: src/main/xmli18n-tmp.h:489 +#: src/main/xmli18n-tmp.h:536 #, fuzzy msgid "Epson PM G700" msgstr "Stylus C60" -#: src/main/xmli18n-tmp.h:490 +#: src/main/xmli18n-tmp.h:537 #, fuzzy msgid "Epson PM G720" msgstr "Stylus C60" -#: src/main/xmli18n-tmp.h:491 +#: src/main/xmli18n-tmp.h:538 msgid "Epson PM G730" msgstr "" -#: src/main/xmli18n-tmp.h:492 +#: src/main/xmli18n-tmp.h:539 #, fuzzy msgid "Epson PM G800" msgstr "Stylus C60" -#: src/main/xmli18n-tmp.h:493 +#: src/main/xmli18n-tmp.h:540 #, fuzzy msgid "Epson PM G820" msgstr "Stylus C60" -#: src/main/xmli18n-tmp.h:494 -#, fuzzy +#: src/main/xmli18n-tmp.h:541 msgid "Epson PM G850" -msgstr "Stylus C60" +msgstr "" -#: src/main/xmli18n-tmp.h:495 -#, fuzzy +#: src/main/xmli18n-tmp.h:542 msgid "Epson PM G4500" -msgstr "Stylus C60" +msgstr "" -#: src/main/xmli18n-tmp.h:496 -#, fuzzy +#: src/main/xmli18n-tmp.h:543 msgid "Epson PX A650" -msgstr "Stylus C60" +msgstr "" -#: src/main/xmli18n-tmp.h:497 +#: src/main/xmli18n-tmp.h:544 #, fuzzy msgid "Epson PX G900" msgstr "Stylus C60" -#: src/main/xmli18n-tmp.h:498 +#: src/main/xmli18n-tmp.h:545 #, fuzzy msgid "Epson PX G920" msgstr "Stylus C60" -#: src/main/xmli18n-tmp.h:499 +#: src/main/xmli18n-tmp.h:546 #, fuzzy msgid "Epson PX G5000" msgstr "Stylus C60" -#: src/main/xmli18n-tmp.h:500 +#: src/main/xmli18n-tmp.h:547 #, fuzzy msgid "Epson PX V500" msgstr "Stylus C60" -#: src/main/xmli18n-tmp.h:501 +#: src/main/xmli18n-tmp.h:548 #, fuzzy msgid "Epson PX V600" msgstr "Stylus C60" -#: src/main/xmli18n-tmp.h:502 +#: src/main/xmli18n-tmp.h:549 msgid "Epson PX V630" msgstr "" -#: src/main/xmli18n-tmp.h:503 -#, fuzzy +#: src/main/xmli18n-tmp.h:550 msgid "Epson PX V780" -msgstr "Stylus C60" +msgstr "" -#: src/main/xmli18n-tmp.h:504 -#, fuzzy +#: src/main/xmli18n-tmp.h:551 msgid "Epson PX 5500" -msgstr "Stylus C60" +msgstr "" -#: src/main/xmli18n-tmp.h:505 +#: src/main/xmli18n-tmp.h:552 msgid "Epson PX 7000" msgstr "" -#: src/main/xmli18n-tmp.h:506 +#: src/main/xmli18n-tmp.h:553 msgid "Epson PX 9000" msgstr "" -#: src/main/xmli18n-tmp.h:507 +#: src/main/xmli18n-tmp.h:554 msgid "Apollo P-2100" msgstr "" -#: src/main/xmli18n-tmp.h:508 +#: src/main/xmli18n-tmp.h:555 msgid "Apollo P-2150" msgstr "" -#: src/main/xmli18n-tmp.h:509 +#: src/main/xmli18n-tmp.h:556 msgid "Apollo P-2200" msgstr "" -#: src/main/xmli18n-tmp.h:510 +#: src/main/xmli18n-tmp.h:557 msgid "Apollo P-2250" msgstr "" -#: src/main/xmli18n-tmp.h:511 +#: src/main/xmli18n-tmp.h:558 msgid "Apollo P-2500" msgstr "" -#: src/main/xmli18n-tmp.h:512 +#: src/main/xmli18n-tmp.h:559 msgid "Apollo P-2550" msgstr "" -#: src/main/xmli18n-tmp.h:513 +#: src/main/xmli18n-tmp.h:560 msgid "Apollo P-2600" msgstr "" -#: src/main/xmli18n-tmp.h:514 +#: src/main/xmli18n-tmp.h:561 msgid "Apollo P-2650" msgstr "" -#: src/main/xmli18n-tmp.h:515 +#: src/main/xmli18n-tmp.h:562 msgid "Apple Color StyleWriter 4100" msgstr "" -#: src/main/xmli18n-tmp.h:516 +#: src/main/xmli18n-tmp.h:563 msgid "Apple Color StyleWriter 4500" msgstr "" -#: src/main/xmli18n-tmp.h:517 +#: src/main/xmli18n-tmp.h:564 msgid "Apple Color StyleWriter 6500" msgstr "" -#: src/main/xmli18n-tmp.h:518 +#: src/main/xmli18n-tmp.h:565 msgid "Apple LaserWriter Select 360" msgstr "" -#: src/main/xmli18n-tmp.h:519 +#: src/main/xmli18n-tmp.h:566 msgid "Brother DCP-1200" msgstr "" -#: src/main/xmli18n-tmp.h:520 +#: src/main/xmli18n-tmp.h:567 msgid "Brother HL-4Ve" msgstr "" -#: src/main/xmli18n-tmp.h:521 +#: src/main/xmli18n-tmp.h:568 msgid "Brother HL-10V" msgstr "" -#: src/main/xmli18n-tmp.h:522 +#: src/main/xmli18n-tmp.h:569 msgid "Brother HL-10h" msgstr "" -#: src/main/xmli18n-tmp.h:523 +#: src/main/xmli18n-tmp.h:570 msgid "Brother HL-630" msgstr "" -#: src/main/xmli18n-tmp.h:524 +#: src/main/xmli18n-tmp.h:571 msgid "Brother HL-660" msgstr "" -#: src/main/xmli18n-tmp.h:525 +#: src/main/xmli18n-tmp.h:572 msgid "Brother HL-760" msgstr "" -#: src/main/xmli18n-tmp.h:526 +#: src/main/xmli18n-tmp.h:573 msgid "Brother HL-960" msgstr "" -#: src/main/xmli18n-tmp.h:527 +#: src/main/xmli18n-tmp.h:574 msgid "Brother HL-1040" msgstr "" -#: src/main/xmli18n-tmp.h:528 +#: src/main/xmli18n-tmp.h:575 msgid "Brother HL-1050" msgstr "" -#: src/main/xmli18n-tmp.h:529 +#: src/main/xmli18n-tmp.h:576 msgid "Brother HL-1060" msgstr "" -#: src/main/xmli18n-tmp.h:530 +#: src/main/xmli18n-tmp.h:577 msgid "Brother HL-1070" msgstr "" -#: src/main/xmli18n-tmp.h:531 +#: src/main/xmli18n-tmp.h:578 msgid "Brother HL-1240" msgstr "" -#: src/main/xmli18n-tmp.h:532 +#: src/main/xmli18n-tmp.h:579 msgid "Brother HL-1250" msgstr "" -#: src/main/xmli18n-tmp.h:533 +#: src/main/xmli18n-tmp.h:580 msgid "Brother HL-1260" msgstr "" -#: src/main/xmli18n-tmp.h:534 +#: src/main/xmli18n-tmp.h:581 msgid "Brother HL-1270N" msgstr "" -#: src/main/xmli18n-tmp.h:535 +#: src/main/xmli18n-tmp.h:582 msgid "Brother HL-1440" msgstr "" -#: src/main/xmli18n-tmp.h:536 +#: src/main/xmli18n-tmp.h:583 msgid "Brother HL-1660e" msgstr "" -#: src/main/xmli18n-tmp.h:537 +#: src/main/xmli18n-tmp.h:584 msgid "Brother HL-2060" msgstr "" -#: src/main/xmli18n-tmp.h:538 +#: src/main/xmli18n-tmp.h:585 msgid "Brother MFC-6550MC" msgstr "" -#: src/main/xmli18n-tmp.h:539 +#: src/main/xmli18n-tmp.h:586 msgid "Brother MFC-8300" msgstr "" -#: src/main/xmli18n-tmp.h:540 +#: src/main/xmli18n-tmp.h:587 msgid "Brother MFC-9500" msgstr "" -#: src/main/xmli18n-tmp.h:541 +#: src/main/xmli18n-tmp.h:588 msgid "Brother MFC-9600" msgstr "" -#: src/main/xmli18n-tmp.h:542 +#: src/main/xmli18n-tmp.h:589 msgid "Canon GP 335" msgstr "" -#: src/main/xmli18n-tmp.h:543 +#: src/main/xmli18n-tmp.h:590 msgid "Canon LBP-4sx" msgstr "" -#: src/main/xmli18n-tmp.h:544 +#: src/main/xmli18n-tmp.h:591 msgid "Canon LBP-430" msgstr "" -#: src/main/xmli18n-tmp.h:545 +#: src/main/xmli18n-tmp.h:592 msgid "Canon LBP-1000" msgstr "" -#: src/main/xmli18n-tmp.h:546 +#: src/main/xmli18n-tmp.h:593 msgid "Canon LBP-1260" msgstr "" -#: src/main/xmli18n-tmp.h:547 +#: src/main/xmli18n-tmp.h:594 msgid "Canon LBP-1760" msgstr "" -#: src/main/xmli18n-tmp.h:548 +#: src/main/xmli18n-tmp.h:595 msgid "Canon imageRunner 330s" msgstr "" -#: src/main/xmli18n-tmp.h:549 +#: src/main/xmli18n-tmp.h:596 msgid "Citizen ProJet II" msgstr "" -#: src/main/xmli18n-tmp.h:550 +#: src/main/xmli18n-tmp.h:597 msgid "DEC 1800" msgstr "" -#: src/main/xmli18n-tmp.h:551 +#: src/main/xmli18n-tmp.h:598 msgid "DEC LN17" msgstr "" -#: src/main/xmli18n-tmp.h:552 +#: src/main/xmli18n-tmp.h:599 msgid "Epson ActionLaser 1100" msgstr "" -#: src/main/xmli18n-tmp.h:553 +#: src/main/xmli18n-tmp.h:600 msgid "Epson ActionLaser II" msgstr "" -#: src/main/xmli18n-tmp.h:554 +#: src/main/xmli18n-tmp.h:601 msgid "Epson AcuLaser C2000" msgstr "" -#: src/main/xmli18n-tmp.h:555 +#: src/main/xmli18n-tmp.h:602 msgid "Epson AcuLaser C2000PS" msgstr "" -#: src/main/xmli18n-tmp.h:556 +#: src/main/xmli18n-tmp.h:603 msgid "Epson AcuLaser C8500" msgstr "" -#: src/main/xmli18n-tmp.h:557 +#: src/main/xmli18n-tmp.h:604 msgid "Epson AcuLaser C8500PS" msgstr "" -#: src/main/xmli18n-tmp.h:558 +#: src/main/xmli18n-tmp.h:605 msgid "Epson AcuLaser C8600" msgstr "" -#: src/main/xmli18n-tmp.h:559 +#: src/main/xmli18n-tmp.h:606 msgid "Epson AcuLaser C8600PS" msgstr "" -#: src/main/xmli18n-tmp.h:560 +#: src/main/xmli18n-tmp.h:607 msgid "Epson EPL-5200" msgstr "" -#: src/main/xmli18n-tmp.h:561 +#: src/main/xmli18n-tmp.h:608 msgid "Epson EPL-5200+" msgstr "" -#: src/main/xmli18n-tmp.h:562 +#: src/main/xmli18n-tmp.h:609 msgid "Epson EPL-5700" msgstr "" -#: src/main/xmli18n-tmp.h:563 +#: src/main/xmli18n-tmp.h:610 msgid "Epson EPL-5700PS" msgstr "" -#: src/main/xmli18n-tmp.h:564 +#: src/main/xmli18n-tmp.h:611 msgid "Epson EPL-5800" msgstr "" -#: src/main/xmli18n-tmp.h:565 +#: src/main/xmli18n-tmp.h:612 msgid "Epson EPL-5800PS" msgstr "" -#: src/main/xmli18n-tmp.h:566 +#: src/main/xmli18n-tmp.h:613 msgid "Epson EPL-5900" msgstr "" -#: src/main/xmli18n-tmp.h:567 +#: src/main/xmli18n-tmp.h:614 msgid "Epson EPL-5900PS" msgstr "" -#: src/main/xmli18n-tmp.h:568 +#: src/main/xmli18n-tmp.h:615 msgid "Epson EPL-6100" msgstr "" -#: src/main/xmli18n-tmp.h:569 +#: src/main/xmli18n-tmp.h:616 msgid "Epson EPL-6100PS" msgstr "" -#: src/main/xmli18n-tmp.h:570 +#: src/main/xmli18n-tmp.h:617 msgid "Epson EPL-7100" msgstr "" -#: src/main/xmli18n-tmp.h:571 +#: src/main/xmli18n-tmp.h:618 msgid "Fujitsu PrintPartner 10V" msgstr "" -#: src/main/xmli18n-tmp.h:572 +#: src/main/xmli18n-tmp.h:619 msgid "Fujitsu PrintPartner 16DV" msgstr "" -#: src/main/xmli18n-tmp.h:573 +#: src/main/xmli18n-tmp.h:620 msgid "Fujitsu PrintPartner 20W" msgstr "" -#: src/main/xmli18n-tmp.h:574 +#: src/main/xmli18n-tmp.h:621 msgid "Fujitsu PrintPartner 8000" msgstr "" -#: src/main/xmli18n-tmp.h:575 +#: src/main/xmli18n-tmp.h:622 #, fuzzy msgid "Generic PCL 4 Printer" -msgstr "æ–°ã—ã„プリンタã®å®šç¾©" +msgstr "¿·¤·¤¤¥×¥ê¥ó¥¿¤ÎÄêµÁ" -#: src/main/xmli18n-tmp.h:576 +#: src/main/xmli18n-tmp.h:623 +#, fuzzy +msgid "Generic PCL 4 LF Printer" +msgstr "¿·¤·¤¤¥×¥ê¥ó¥¿¤ÎÄêµÁ" + +#: src/main/xmli18n-tmp.h:624 #, fuzzy msgid "Generic PCL 5 Printer" -msgstr "æ–°ã—ã„プリンタã®å®šç¾©" +msgstr "¿·¤·¤¤¥×¥ê¥ó¥¿¤ÎÄêµÁ" -#: src/main/xmli18n-tmp.h:577 +#: src/main/xmli18n-tmp.h:625 +#, fuzzy +msgid "Generic PCL 5 LF Printer" +msgstr "¿·¤·¤¤¥×¥ê¥ó¥¿¤ÎÄêµÁ" + +#: src/main/xmli18n-tmp.h:626 #, fuzzy msgid "Generic PCL 5c Printer" -msgstr "æ–°ã—ã„プリンタã®å®šç¾©" +msgstr "¿·¤·¤¤¥×¥ê¥ó¥¿¤ÎÄêµÁ" -#: src/main/xmli18n-tmp.h:578 +#: src/main/xmli18n-tmp.h:627 +#, fuzzy +msgid "Generic PCL 5c LF Printer" +msgstr "¿·¤·¤¤¥×¥ê¥ó¥¿¤ÎÄêµÁ" + +#: src/main/xmli18n-tmp.h:628 #, fuzzy msgid "Generic PCL 5e Printer" -msgstr "æ–°ã—ã„プリンタã®å®šç¾©" +msgstr "¿·¤·¤¤¥×¥ê¥ó¥¿¤ÎÄêµÁ" -#: src/main/xmli18n-tmp.h:579 +#: src/main/xmli18n-tmp.h:629 +#, fuzzy +msgid "Generic PCL 5e LF Printer" +msgstr "¿·¤·¤¤¥×¥ê¥ó¥¿¤ÎÄêµÁ" + +#: src/main/xmli18n-tmp.h:630 msgid "Generic PCL 6/PCL XL Printer" msgstr "" -#: src/main/xmli18n-tmp.h:580 +#: src/main/xmli18n-tmp.h:631 +#, fuzzy +msgid "Generic PCL 6/PCL XL LF Printer" +msgstr "¿·¤·¤¤¥×¥ê¥ó¥¿¤ÎÄêµÁ" + +#: src/main/xmli18n-tmp.h:632 msgid "HP Business Inkjet 2200" msgstr "" -#: src/main/xmli18n-tmp.h:581 +#: src/main/xmli18n-tmp.h:633 msgid "HP Business Inkjet 2230" msgstr "" -#: src/main/xmli18n-tmp.h:582 +#: src/main/xmli18n-tmp.h:634 msgid "HP Business Inkjet 2250" msgstr "" -#: src/main/xmli18n-tmp.h:583 +#: src/main/xmli18n-tmp.h:635 msgid "HP Business Inkjet 2250TN" msgstr "" -#: src/main/xmli18n-tmp.h:584 +#: src/main/xmli18n-tmp.h:636 msgid "HP Business Inkjet 2280" msgstr "" -#: src/main/xmli18n-tmp.h:585 +#: src/main/xmli18n-tmp.h:637 msgid "HP Color Inkjet Printer CP1160" msgstr "" -#: src/main/xmli18n-tmp.h:586 +#: src/main/xmli18n-tmp.h:638 msgid "HP Color Inkjet Printer CP1700" msgstr "" -#: src/main/xmli18n-tmp.h:587 +#: src/main/xmli18n-tmp.h:639 msgid "HP Color LaserJet 2500" msgstr "" -#: src/main/xmli18n-tmp.h:588 +#: src/main/xmli18n-tmp.h:640 msgid "HP Color LaserJet 4500" msgstr "" -#: src/main/xmli18n-tmp.h:589 +#: src/main/xmli18n-tmp.h:641 msgid "HP Color LaserJet 4550" msgstr "" -#: src/main/xmli18n-tmp.h:590 +#: src/main/xmli18n-tmp.h:642 msgid "HP Color LaserJet 4600" msgstr "" -#: src/main/xmli18n-tmp.h:591 +#: src/main/xmli18n-tmp.h:643 msgid "HP Color LaserJet 5" msgstr "" -#: src/main/xmli18n-tmp.h:592 +#: src/main/xmli18n-tmp.h:644 msgid "HP Color LaserJet 5000" msgstr "" -#: src/main/xmli18n-tmp.h:593 +#: src/main/xmli18n-tmp.h:645 msgid "HP Color LaserJet 5500" msgstr "" -#: src/main/xmli18n-tmp.h:594 +#: src/main/xmli18n-tmp.h:646 msgid "HP Color LaserJet 8550GN" msgstr "" -#: src/main/xmli18n-tmp.h:595 +#: src/main/xmli18n-tmp.h:647 msgid "HP DesignJet 230" msgstr "" -#: src/main/xmli18n-tmp.h:596 +#: src/main/xmli18n-tmp.h:648 msgid "HP DesignJet 250C" msgstr "" -#: src/main/xmli18n-tmp.h:597 +#: src/main/xmli18n-tmp.h:649 msgid "HP DesignJet 430" msgstr "" -#: src/main/xmli18n-tmp.h:598 +#: src/main/xmli18n-tmp.h:650 msgid "HP DesignJet 450C" msgstr "" -#: src/main/xmli18n-tmp.h:599 +#: src/main/xmli18n-tmp.h:651 msgid "HP DesignJet 455CA" msgstr "" -#: src/main/xmli18n-tmp.h:600 +#: src/main/xmli18n-tmp.h:652 msgid "HP DesignJet 488CA" msgstr "" -#: src/main/xmli18n-tmp.h:601 +#: src/main/xmli18n-tmp.h:653 msgid "HP DesignJet 700" msgstr "" -#: src/main/xmli18n-tmp.h:602 +#: src/main/xmli18n-tmp.h:654 msgid "HP DesignJet 750C Plus" msgstr "" -#: src/main/xmli18n-tmp.h:603 +#: src/main/xmli18n-tmp.h:655 msgid "HP DesignJet 750C" msgstr "" -#: src/main/xmli18n-tmp.h:604 +#: src/main/xmli18n-tmp.h:656 msgid "HP DesignJet 2500CP" msgstr "" -#: src/main/xmli18n-tmp.h:605 +#: src/main/xmli18n-tmp.h:657 msgid "HP DesignJet 3500CP" msgstr "" -#: src/main/xmli18n-tmp.h:606 +#: src/main/xmli18n-tmp.h:658 msgid "HP DesignJet ColorPro CAD" msgstr "" -#: src/main/xmli18n-tmp.h:607 +#: src/main/xmli18n-tmp.h:659 msgid "HP DeskJet 400" msgstr "" -#: src/main/xmli18n-tmp.h:608 +#: src/main/xmli18n-tmp.h:660 msgid "HP DeskJet 420C" msgstr "" -#: src/main/xmli18n-tmp.h:609 +#: src/main/xmli18n-tmp.h:661 msgid "HP DeskJet 450" msgstr "" -#: src/main/xmli18n-tmp.h:610 +#: src/main/xmli18n-tmp.h:662 msgid "HP DeskJet 500" msgstr "" -#: src/main/xmli18n-tmp.h:611 +#: src/main/xmli18n-tmp.h:663 msgid "HP DeskJet 500C" msgstr "" -#: src/main/xmli18n-tmp.h:612 +#: src/main/xmli18n-tmp.h:664 msgid "HP DeskJet 505J Plus" msgstr "" -#: src/main/xmli18n-tmp.h:613 +#: src/main/xmli18n-tmp.h:665 msgid "HP DeskJet 510" msgstr "" -#: src/main/xmli18n-tmp.h:614 +#: src/main/xmli18n-tmp.h:666 msgid "HP DeskJet 520" msgstr "" -#: src/main/xmli18n-tmp.h:615 +#: src/main/xmli18n-tmp.h:667 msgid "HP DeskJet 540C" msgstr "" -#: src/main/xmli18n-tmp.h:616 +#: src/main/xmli18n-tmp.h:668 msgid "HP DeskJet 550C" msgstr "" -#: src/main/xmli18n-tmp.h:617 +#: src/main/xmli18n-tmp.h:669 msgid "HP DeskJet 5550" msgstr "" -#: src/main/xmli18n-tmp.h:618 +#: src/main/xmli18n-tmp.h:670 msgid "HP DeskJet 5551" msgstr "" -#: src/main/xmli18n-tmp.h:619 +#: src/main/xmli18n-tmp.h:671 msgid "HP DeskJet 560C" msgstr "" -#: src/main/xmli18n-tmp.h:620 +#: src/main/xmli18n-tmp.h:672 msgid "HP DeskJet 600" msgstr "" -#: src/main/xmli18n-tmp.h:621 +#: src/main/xmli18n-tmp.h:673 msgid "HP DeskJet 600C" msgstr "" -#: src/main/xmli18n-tmp.h:622 +#: src/main/xmli18n-tmp.h:674 msgid "HP DeskJet 610C" msgstr "" -#: src/main/xmli18n-tmp.h:623 +#: src/main/xmli18n-tmp.h:675 msgid "HP DeskJet 610CL" msgstr "" -#: src/main/xmli18n-tmp.h:624 +#: src/main/xmli18n-tmp.h:676 msgid "HP DeskJet 6122" msgstr "" -#: src/main/xmli18n-tmp.h:625 +#: src/main/xmli18n-tmp.h:677 msgid "HP DeskJet 6127" msgstr "" -#: src/main/xmli18n-tmp.h:626 +#: src/main/xmli18n-tmp.h:678 msgid "HP DeskJet 612C" msgstr "" -#: src/main/xmli18n-tmp.h:627 +#: src/main/xmli18n-tmp.h:679 msgid "HP DeskJet 640C" msgstr "" -#: src/main/xmli18n-tmp.h:628 +#: src/main/xmli18n-tmp.h:680 msgid "HP DeskJet 648C" msgstr "" -#: src/main/xmli18n-tmp.h:629 +#: src/main/xmli18n-tmp.h:681 msgid "HP DeskJet 660C" msgstr "" -#: src/main/xmli18n-tmp.h:630 +#: src/main/xmli18n-tmp.h:682 msgid "HP DeskJet 670C" msgstr "" -#: src/main/xmli18n-tmp.h:631 +#: src/main/xmli18n-tmp.h:683 msgid "HP DeskJet 670TV" msgstr "" -#: src/main/xmli18n-tmp.h:632 +#: src/main/xmli18n-tmp.h:684 msgid "HP DeskJet 672C" msgstr "" -#: src/main/xmli18n-tmp.h:633 +#: src/main/xmli18n-tmp.h:685 msgid "HP DeskJet 680C" msgstr "" -#: src/main/xmli18n-tmp.h:634 +#: src/main/xmli18n-tmp.h:686 msgid "HP DeskJet 682C" msgstr "" -#: src/main/xmli18n-tmp.h:635 +#: src/main/xmli18n-tmp.h:687 msgid "HP DeskJet 690C" msgstr "" -#: src/main/xmli18n-tmp.h:636 +#: src/main/xmli18n-tmp.h:688 msgid "HP DeskJet 692C" msgstr "" -#: src/main/xmli18n-tmp.h:637 +#: src/main/xmli18n-tmp.h:689 msgid "HP DeskJet 693C" msgstr "" -#: src/main/xmli18n-tmp.h:638 +#: src/main/xmli18n-tmp.h:690 msgid "HP DeskJet 694C" msgstr "" -#: src/main/xmli18n-tmp.h:639 +#: src/main/xmli18n-tmp.h:691 msgid "HP DeskJet 695C" msgstr "" -#: src/main/xmli18n-tmp.h:640 +#: src/main/xmli18n-tmp.h:692 msgid "HP DeskJet 697C" msgstr "" -#: src/main/xmli18n-tmp.h:641 +#: src/main/xmli18n-tmp.h:693 msgid "HP DeskJet 810C" msgstr "" -#: src/main/xmli18n-tmp.h:642 +#: src/main/xmli18n-tmp.h:694 msgid "HP DeskJet 812C" msgstr "" -#: src/main/xmli18n-tmp.h:643 +#: src/main/xmli18n-tmp.h:695 msgid "HP DeskJet 815C" msgstr "" -#: src/main/xmli18n-tmp.h:644 +#: src/main/xmli18n-tmp.h:696 msgid "HP DeskJet 816C" msgstr "" -#: src/main/xmli18n-tmp.h:645 +#: src/main/xmli18n-tmp.h:697 msgid "HP DeskJet 825C" msgstr "" -#: src/main/xmli18n-tmp.h:646 +#: src/main/xmli18n-tmp.h:698 msgid "HP DeskJet 830C" msgstr "" -#: src/main/xmli18n-tmp.h:647 +#: src/main/xmli18n-tmp.h:699 msgid "HP DeskJet 832C" msgstr "" -#: src/main/xmli18n-tmp.h:648 +#: src/main/xmli18n-tmp.h:700 msgid "HP DeskJet 840C" msgstr "" -#: src/main/xmli18n-tmp.h:649 +#: src/main/xmli18n-tmp.h:701 msgid "HP DeskJet 841C" msgstr "" -#: src/main/xmli18n-tmp.h:650 +#: src/main/xmli18n-tmp.h:702 msgid "HP DeskJet 842C" msgstr "" -#: src/main/xmli18n-tmp.h:651 +#: src/main/xmli18n-tmp.h:703 msgid "HP DeskJet 843C" msgstr "" -#: src/main/xmli18n-tmp.h:652 +#: src/main/xmli18n-tmp.h:704 msgid "HP DeskJet 845C" msgstr "" -#: src/main/xmli18n-tmp.h:653 +#: src/main/xmli18n-tmp.h:705 msgid "HP DeskJet 850C" msgstr "" -#: src/main/xmli18n-tmp.h:654 +#: src/main/xmli18n-tmp.h:706 msgid "HP DeskJet 855C" msgstr "" -#: src/main/xmli18n-tmp.h:655 +#: src/main/xmli18n-tmp.h:707 msgid "HP DeskJet 870C" msgstr "" -#: src/main/xmli18n-tmp.h:656 +#: src/main/xmli18n-tmp.h:708 msgid "HP DeskJet 880C" msgstr "" -#: src/main/xmli18n-tmp.h:657 +#: src/main/xmli18n-tmp.h:709 msgid "HP DeskJet 882C" msgstr "" -#: src/main/xmli18n-tmp.h:658 +#: src/main/xmli18n-tmp.h:710 msgid "HP DeskJet 890C" msgstr "" -#: src/main/xmli18n-tmp.h:659 +#: src/main/xmli18n-tmp.h:711 msgid "HP DeskJet 895C" msgstr "" -#: src/main/xmli18n-tmp.h:660 +#: src/main/xmli18n-tmp.h:712 msgid "HP DeskJet 916C" msgstr "" -#: src/main/xmli18n-tmp.h:661 +#: src/main/xmli18n-tmp.h:713 msgid "HP DeskJet 920C" msgstr "" -#: src/main/xmli18n-tmp.h:662 +#: src/main/xmli18n-tmp.h:714 msgid "HP DeskJet 9300" msgstr "" -#: src/main/xmli18n-tmp.h:663 +#: src/main/xmli18n-tmp.h:715 msgid "HP DeskJet 930C" msgstr "" -#: src/main/xmli18n-tmp.h:664 +#: src/main/xmli18n-tmp.h:716 msgid "HP DeskJet 932C" msgstr "" -#: src/main/xmli18n-tmp.h:665 +#: src/main/xmli18n-tmp.h:717 msgid "HP DeskJet 933C" msgstr "" -#: src/main/xmli18n-tmp.h:666 +#: src/main/xmli18n-tmp.h:718 msgid "HP DeskJet 934C" msgstr "" -#: src/main/xmli18n-tmp.h:667 +#: src/main/xmli18n-tmp.h:719 msgid "HP DeskJet 935C" msgstr "" -#: src/main/xmli18n-tmp.h:668 +#: src/main/xmli18n-tmp.h:720 msgid "HP DeskJet 940C" msgstr "" -#: src/main/xmli18n-tmp.h:669 +#: src/main/xmli18n-tmp.h:721 msgid "HP DeskJet 948C" msgstr "" -#: src/main/xmli18n-tmp.h:670 +#: src/main/xmli18n-tmp.h:722 msgid "HP DeskJet 950C" msgstr "" -#: src/main/xmli18n-tmp.h:671 +#: src/main/xmli18n-tmp.h:723 msgid "HP DeskJet 952C" msgstr "" -#: src/main/xmli18n-tmp.h:672 +#: src/main/xmli18n-tmp.h:724 msgid "HP DeskJet 955C" msgstr "" -#: src/main/xmli18n-tmp.h:673 +#: src/main/xmli18n-tmp.h:725 msgid "HP DeskJet 957C" msgstr "" -#: src/main/xmli18n-tmp.h:674 +#: src/main/xmli18n-tmp.h:726 msgid "HP DeskJet 959C" msgstr "" -#: src/main/xmli18n-tmp.h:675 +#: src/main/xmli18n-tmp.h:727 msgid "HP DeskJet 960C" msgstr "" -#: src/main/xmli18n-tmp.h:676 +#: src/main/xmli18n-tmp.h:728 msgid "HP DeskJet 970C" msgstr "" -#: src/main/xmli18n-tmp.h:677 +#: src/main/xmli18n-tmp.h:729 msgid "HP DeskJet 975C" msgstr "" -#: src/main/xmli18n-tmp.h:678 +#: src/main/xmli18n-tmp.h:730 msgid "HP DeskJet 980C" msgstr "" -#: src/main/xmli18n-tmp.h:679 +#: src/main/xmli18n-tmp.h:731 msgid "HP DeskJet 990C" msgstr "" -#: src/main/xmli18n-tmp.h:680 +#: src/main/xmli18n-tmp.h:732 msgid "HP DeskJet 995C" msgstr "" -#: src/main/xmli18n-tmp.h:681 +#: src/main/xmli18n-tmp.h:733 msgid "HP DeskJet 1100C" msgstr "" -#: src/main/xmli18n-tmp.h:682 +#: src/main/xmli18n-tmp.h:734 msgid "HP DeskJet 1120C" msgstr "" -#: src/main/xmli18n-tmp.h:683 +#: src/main/xmli18n-tmp.h:735 msgid "HP DeskJet 1125C" msgstr "" -#: src/main/xmli18n-tmp.h:684 +#: src/main/xmli18n-tmp.h:736 msgid "HP DeskJet 1200C" msgstr "" -#: src/main/xmli18n-tmp.h:685 +#: src/main/xmli18n-tmp.h:737 msgid "HP DeskJet 1220C" msgstr "" -#: src/main/xmli18n-tmp.h:686 +#: src/main/xmli18n-tmp.h:738 msgid "HP DeskJet 1600C" msgstr "" -#: src/main/xmli18n-tmp.h:687 +#: src/main/xmli18n-tmp.h:739 msgid "HP DeskJet 1600CM" msgstr "" -#: src/main/xmli18n-tmp.h:688 +#: src/main/xmli18n-tmp.h:740 msgid "HP DeskJet 2000" msgstr "" -#: src/main/xmli18n-tmp.h:689 +#: src/main/xmli18n-tmp.h:741 msgid "HP DeskJet 2500" msgstr "" -#: src/main/xmli18n-tmp.h:690 +#: src/main/xmli18n-tmp.h:742 msgid "HP DeskJet 2500CM" msgstr "" -#: src/main/xmli18n-tmp.h:691 +#: src/main/xmli18n-tmp.h:743 msgid "HP DeskJet 340C" msgstr "" -#: src/main/xmli18n-tmp.h:692 +#: src/main/xmli18n-tmp.h:744 msgid "HP DeskJet 3810" msgstr "" -#: src/main/xmli18n-tmp.h:693 +#: src/main/xmli18n-tmp.h:745 msgid "HP DeskJet 3816" msgstr "" -#: src/main/xmli18n-tmp.h:694 +#: src/main/xmli18n-tmp.h:746 msgid "HP DeskJet 3820" msgstr "" -#: src/main/xmli18n-tmp.h:695 +#: src/main/xmli18n-tmp.h:747 msgid "HP DeskJet 3822" msgstr "" -#: src/main/xmli18n-tmp.h:696 +#: src/main/xmli18n-tmp.h:748 msgid "HP LaserJet 2" msgstr "" -#: src/main/xmli18n-tmp.h:697 +#: src/main/xmli18n-tmp.h:749 msgid "HP LaserJet 2D" msgstr "" -#: src/main/xmli18n-tmp.h:698 +#: src/main/xmli18n-tmp.h:750 msgid "HP LaserJet 2P Plus" msgstr "" -#: src/main/xmli18n-tmp.h:699 +#: src/main/xmli18n-tmp.h:751 msgid "HP LaserJet 2P" msgstr "" -#: src/main/xmli18n-tmp.h:700 +#: src/main/xmli18n-tmp.h:752 msgid "HP LaserJet 3" msgstr "" -#: src/main/xmli18n-tmp.h:701 +#: src/main/xmli18n-tmp.h:753 msgid "HP LaserJet 3D" msgstr "" -#: src/main/xmli18n-tmp.h:702 +#: src/main/xmli18n-tmp.h:754 msgid "HP LaserJet 3P w/ PCL5" msgstr "" -#: src/main/xmli18n-tmp.h:703 +#: src/main/xmli18n-tmp.h:755 msgid "HP LaserJet 3P w/PS" msgstr "" -#: src/main/xmli18n-tmp.h:704 +#: src/main/xmli18n-tmp.h:756 msgid "HP LaserJet 4 Plus" msgstr "" -#: src/main/xmli18n-tmp.h:705 +#: src/main/xmli18n-tmp.h:757 msgid "HP LaserJet 4" msgstr "" -#: src/main/xmli18n-tmp.h:706 +#: src/main/xmli18n-tmp.h:758 msgid "HP LaserJet 4L" msgstr "" -#: src/main/xmli18n-tmp.h:707 +#: src/main/xmli18n-tmp.h:759 msgid "HP LaserJet 4M" msgstr "" -#: src/main/xmli18n-tmp.h:708 +#: src/main/xmli18n-tmp.h:760 msgid "HP LaserJet 4ML" msgstr "" -#: src/main/xmli18n-tmp.h:709 +#: src/main/xmli18n-tmp.h:761 msgid "HP LaserJet 4P" msgstr "" -#: src/main/xmli18n-tmp.h:710 +#: src/main/xmli18n-tmp.h:762 msgid "HP LaserJet 4Si" msgstr "" -#: src/main/xmli18n-tmp.h:711 +#: src/main/xmli18n-tmp.h:763 msgid "HP LaserJet 4V" msgstr "" -#: src/main/xmli18n-tmp.h:712 +#: src/main/xmli18n-tmp.h:764 msgid "HP LaserJet 5" msgstr "" -#: src/main/xmli18n-tmp.h:713 +#: src/main/xmli18n-tmp.h:765 msgid "HP LaserJet 5L" msgstr "" -#: src/main/xmli18n-tmp.h:714 +#: src/main/xmli18n-tmp.h:766 msgid "HP LaserJet 5M" msgstr "" -#: src/main/xmli18n-tmp.h:715 +#: src/main/xmli18n-tmp.h:767 msgid "HP LaserJet 5MP" msgstr "" -#: src/main/xmli18n-tmp.h:716 +#: src/main/xmli18n-tmp.h:768 msgid "HP LaserJet 5P" msgstr "" -#: src/main/xmli18n-tmp.h:717 +#: src/main/xmli18n-tmp.h:769 msgid "HP LaserJet 5Si" msgstr "" -#: src/main/xmli18n-tmp.h:718 +#: src/main/xmli18n-tmp.h:770 msgid "HP LaserJet 6" msgstr "" -#: src/main/xmli18n-tmp.h:719 +#: src/main/xmli18n-tmp.h:771 msgid "HP LaserJet 6L" msgstr "" -#: src/main/xmli18n-tmp.h:720 +#: src/main/xmli18n-tmp.h:772 msgid "HP LaserJet 6MP" msgstr "" -#: src/main/xmli18n-tmp.h:721 +#: src/main/xmli18n-tmp.h:773 msgid "HP LaserJet 6P" msgstr "" -#: src/main/xmli18n-tmp.h:722 +#: src/main/xmli18n-tmp.h:774 msgid "HP LaserJet 1010" msgstr "" -#: src/main/xmli18n-tmp.h:723 +#: src/main/xmli18n-tmp.h:775 msgid "HP LaserJet 1012" msgstr "" -#: src/main/xmli18n-tmp.h:724 +#: src/main/xmli18n-tmp.h:776 msgid "HP LaserJet 1015" msgstr "" -#: src/main/xmli18n-tmp.h:725 +#: src/main/xmli18n-tmp.h:777 msgid "HP LaserJet 1022" msgstr "" -#: src/main/xmli18n-tmp.h:726 +#: src/main/xmli18n-tmp.h:778 msgid "HP LaserJet 1100" msgstr "" -#: src/main/xmli18n-tmp.h:727 +#: src/main/xmli18n-tmp.h:779 msgid "HP LaserJet 1100A" msgstr "" -#: src/main/xmli18n-tmp.h:728 +#: src/main/xmli18n-tmp.h:780 msgid "HP LaserJet 1150" msgstr "" -#: src/main/xmli18n-tmp.h:729 +#: src/main/xmli18n-tmp.h:781 msgid "HP LaserJet 1200" msgstr "" -#: src/main/xmli18n-tmp.h:730 +#: src/main/xmli18n-tmp.h:782 msgid "HP LaserJet 1220" msgstr "" -#: src/main/xmli18n-tmp.h:731 +#: src/main/xmli18n-tmp.h:783 msgid "HP LaserJet 1300" msgstr "" -#: src/main/xmli18n-tmp.h:732 +#: src/main/xmli18n-tmp.h:784 msgid "HP LaserJet 2100" msgstr "" -#: src/main/xmli18n-tmp.h:733 +#: src/main/xmli18n-tmp.h:785 msgid "HP LaserJet 2100M" msgstr "" -#: src/main/xmli18n-tmp.h:734 +#: src/main/xmli18n-tmp.h:786 msgid "HP LaserJet 2200" msgstr "" -#: src/main/xmli18n-tmp.h:735 +#: src/main/xmli18n-tmp.h:787 msgid "HP LaserJet 2300" msgstr "" -#: src/main/xmli18n-tmp.h:736 +#: src/main/xmli18n-tmp.h:788 msgid "HP LaserJet 3200" msgstr "" -#: src/main/xmli18n-tmp.h:737 +#: src/main/xmli18n-tmp.h:789 msgid "HP LaserJet 3200m" msgstr "" -#: src/main/xmli18n-tmp.h:738 +#: src/main/xmli18n-tmp.h:790 msgid "HP LaserJet 3200se" msgstr "" -#: src/main/xmli18n-tmp.h:739 +#: src/main/xmli18n-tmp.h:791 msgid "HP LaserJet 3300 MFP" msgstr "" -#: src/main/xmli18n-tmp.h:740 +#: src/main/xmli18n-tmp.h:792 msgid "HP LaserJet 3310 MFP" msgstr "" -#: src/main/xmli18n-tmp.h:741 +#: src/main/xmli18n-tmp.h:793 msgid "HP LaserJet 3320 MFP" msgstr "" -#: src/main/xmli18n-tmp.h:742 +#: src/main/xmli18n-tmp.h:794 msgid "HP LaserJet 3320N MFP" msgstr "" -#: src/main/xmli18n-tmp.h:743 +#: src/main/xmli18n-tmp.h:795 msgid "HP LaserJet 3330 MFP" msgstr "" -#: src/main/xmli18n-tmp.h:744 +#: src/main/xmli18n-tmp.h:796 msgid "HP LaserJet 4000" msgstr "" -#: src/main/xmli18n-tmp.h:745 +#: src/main/xmli18n-tmp.h:797 msgid "HP LaserJet 4050" msgstr "" -#: src/main/xmli18n-tmp.h:746 +#: src/main/xmli18n-tmp.h:798 msgid "HP LaserJet 4100" msgstr "" -#: src/main/xmli18n-tmp.h:747 +#: src/main/xmli18n-tmp.h:799 msgid "HP LaserJet 4200" msgstr "" -#: src/main/xmli18n-tmp.h:748 +#: src/main/xmli18n-tmp.h:800 msgid "HP LaserJet 4300" msgstr "" -#: src/main/xmli18n-tmp.h:749 +#: src/main/xmli18n-tmp.h:801 msgid "HP LaserJet 5000" msgstr "" -#: src/main/xmli18n-tmp.h:750 +#: src/main/xmli18n-tmp.h:802 msgid "HP LaserJet 5100" msgstr "" -#: src/main/xmli18n-tmp.h:751 +#: src/main/xmli18n-tmp.h:803 msgid "HP LaserJet 8000" msgstr "" -#: src/main/xmli18n-tmp.h:752 +#: src/main/xmli18n-tmp.h:804 msgid "HP LaserJet 8100" msgstr "" -#: src/main/xmli18n-tmp.h:753 +#: src/main/xmli18n-tmp.h:805 msgid "HP LaserJet 8150" msgstr "" -#: src/main/xmli18n-tmp.h:754 +#: src/main/xmli18n-tmp.h:806 msgid "HP LaserJet 9000" msgstr "" -#: src/main/xmli18n-tmp.h:755 +#: src/main/xmli18n-tmp.h:807 msgid "HP Mopier 240" msgstr "" -#: src/main/xmli18n-tmp.h:756 +#: src/main/xmli18n-tmp.h:808 msgid "HP Mopier 320" msgstr "" -#: src/main/xmli18n-tmp.h:757 +#: src/main/xmli18n-tmp.h:809 msgid "HP OfficeJet 300" msgstr "" -#: src/main/xmli18n-tmp.h:758 +#: src/main/xmli18n-tmp.h:810 msgid "HP OfficeJet 330" msgstr "" -#: src/main/xmli18n-tmp.h:759 +#: src/main/xmli18n-tmp.h:811 msgid "HP OfficeJet 350" msgstr "" -#: src/main/xmli18n-tmp.h:760 +#: src/main/xmli18n-tmp.h:812 msgid "HP OfficeJet 500" msgstr "" -#: src/main/xmli18n-tmp.h:761 +#: src/main/xmli18n-tmp.h:813 msgid "HP OfficeJet 520" msgstr "" -#: src/main/xmli18n-tmp.h:762 +#: src/main/xmli18n-tmp.h:814 msgid "HP OfficeJet 570" msgstr "" -#: src/main/xmli18n-tmp.h:763 +#: src/main/xmli18n-tmp.h:815 msgid "HP OfficeJet 580" msgstr "" -#: src/main/xmli18n-tmp.h:764 +#: src/main/xmli18n-tmp.h:816 msgid "HP OfficeJet 590" msgstr "" -#: src/main/xmli18n-tmp.h:765 +#: src/main/xmli18n-tmp.h:817 msgid "HP OfficeJet 600" msgstr "" -#: src/main/xmli18n-tmp.h:766 +#: src/main/xmli18n-tmp.h:818 msgid "HP OfficeJet 610" msgstr "" -#: src/main/xmli18n-tmp.h:767 +#: src/main/xmli18n-tmp.h:819 msgid "HP OfficeJet 625" msgstr "" -#: src/main/xmli18n-tmp.h:768 +#: src/main/xmli18n-tmp.h:820 msgid "HP OfficeJet 630" msgstr "" -#: src/main/xmli18n-tmp.h:769 +#: src/main/xmli18n-tmp.h:821 msgid "HP OfficeJet 635" msgstr "" -#: src/main/xmli18n-tmp.h:770 +#: src/main/xmli18n-tmp.h:822 msgid "HP OfficeJet 700" msgstr "" -#: src/main/xmli18n-tmp.h:771 +#: src/main/xmli18n-tmp.h:823 msgid "HP OfficeJet 710" msgstr "" -#: src/main/xmli18n-tmp.h:772 +#: src/main/xmli18n-tmp.h:824 msgid "HP OfficeJet 720" msgstr "" -#: src/main/xmli18n-tmp.h:773 +#: src/main/xmli18n-tmp.h:825 msgid "HP OfficeJet 725" msgstr "" -#: src/main/xmli18n-tmp.h:774 +#: src/main/xmli18n-tmp.h:826 msgid "HP OfficeJet 5105" msgstr "" -#: src/main/xmli18n-tmp.h:775 +#: src/main/xmli18n-tmp.h:827 msgid "HP OfficeJet 5110" msgstr "" -#: src/main/xmli18n-tmp.h:776 +#: src/main/xmli18n-tmp.h:828 msgid "HP OfficeJet 5110xi" msgstr "" -#: src/main/xmli18n-tmp.h:777 +#: src/main/xmli18n-tmp.h:829 msgid "HP OfficeJet 6105" msgstr "" -#: src/main/xmli18n-tmp.h:778 +#: src/main/xmli18n-tmp.h:830 msgid "HP OfficeJet 6110" msgstr "" -#: src/main/xmli18n-tmp.h:779 +#: src/main/xmli18n-tmp.h:831 msgid "HP OfficeJet 7110" msgstr "" -#: src/main/xmli18n-tmp.h:780 +#: src/main/xmli18n-tmp.h:832 msgid "HP OfficeJet 7130" msgstr "" -#: src/main/xmli18n-tmp.h:781 +#: src/main/xmli18n-tmp.h:833 msgid "HP OfficeJet 7140" msgstr "" -#: src/main/xmli18n-tmp.h:782 +#: src/main/xmli18n-tmp.h:834 msgid "HP OfficeJet D125" msgstr "" -#: src/main/xmli18n-tmp.h:783 +#: src/main/xmli18n-tmp.h:835 msgid "HP OfficeJet D135" msgstr "" -#: src/main/xmli18n-tmp.h:784 +#: src/main/xmli18n-tmp.h:836 msgid "HP OfficeJet D145" msgstr "" -#: src/main/xmli18n-tmp.h:785 +#: src/main/xmli18n-tmp.h:837 msgid "HP OfficeJet D155" msgstr "" -#: src/main/xmli18n-tmp.h:786 +#: src/main/xmli18n-tmp.h:838 msgid "HP OfficeJet G55" msgstr "" -#: src/main/xmli18n-tmp.h:787 +#: src/main/xmli18n-tmp.h:839 msgid "HP OfficeJet G85" msgstr "" -#: src/main/xmli18n-tmp.h:788 +#: src/main/xmli18n-tmp.h:840 msgid "HP OfficeJet G95" msgstr "" -#: src/main/xmli18n-tmp.h:789 +#: src/main/xmli18n-tmp.h:841 msgid "HP OfficeJet K60" msgstr "" -#: src/main/xmli18n-tmp.h:790 +#: src/main/xmli18n-tmp.h:842 msgid "HP OfficeJet K60xi" msgstr "" -#: src/main/xmli18n-tmp.h:791 +#: src/main/xmli18n-tmp.h:843 msgid "HP OfficeJet K80" msgstr "" -#: src/main/xmli18n-tmp.h:792 +#: src/main/xmli18n-tmp.h:844 msgid "HP OfficeJet K80xi" msgstr "" -#: src/main/xmli18n-tmp.h:793 +#: src/main/xmli18n-tmp.h:845 msgid "HP OfficeJet LX" msgstr "" -#: src/main/xmli18n-tmp.h:794 +#: src/main/xmli18n-tmp.h:846 msgid "HP OfficeJet Pro 1150C" msgstr "" -#: src/main/xmli18n-tmp.h:795 +#: src/main/xmli18n-tmp.h:847 msgid "HP OfficeJet Pro 1170C" msgstr "" -#: src/main/xmli18n-tmp.h:796 +#: src/main/xmli18n-tmp.h:848 msgid "HP OfficeJet Pro 1175C" msgstr "" -#: src/main/xmli18n-tmp.h:797 +#: src/main/xmli18n-tmp.h:849 msgid "HP OfficeJet R40" msgstr "" -#: src/main/xmli18n-tmp.h:798 +#: src/main/xmli18n-tmp.h:850 msgid "HP OfficeJet R45" msgstr "" -#: src/main/xmli18n-tmp.h:799 +#: src/main/xmli18n-tmp.h:851 msgid "HP OfficeJet R60" msgstr "" -#: src/main/xmli18n-tmp.h:800 +#: src/main/xmli18n-tmp.h:852 msgid "HP OfficeJet R65" msgstr "" -#: src/main/xmli18n-tmp.h:801 +#: src/main/xmli18n-tmp.h:853 msgid "HP OfficeJet R80" msgstr "" -#: src/main/xmli18n-tmp.h:802 +#: src/main/xmli18n-tmp.h:854 msgid "HP OfficeJet T45" msgstr "" -#: src/main/xmli18n-tmp.h:803 +#: src/main/xmli18n-tmp.h:855 msgid "HP OfficeJet T65" msgstr "" -#: src/main/xmli18n-tmp.h:804 +#: src/main/xmli18n-tmp.h:856 msgid "HP OfficeJet V40" msgstr "" -#: src/main/xmli18n-tmp.h:805 +#: src/main/xmli18n-tmp.h:857 msgid "HP OfficeJet V40xi" msgstr "" -#: src/main/xmli18n-tmp.h:806 +#: src/main/xmli18n-tmp.h:858 msgid "HP OfficeJet" msgstr "" -#: src/main/xmli18n-tmp.h:807 +#: src/main/xmli18n-tmp.h:859 msgid "HP PSC 370" msgstr "" -#: src/main/xmli18n-tmp.h:808 +#: src/main/xmli18n-tmp.h:860 msgid "HP PSC 380" msgstr "" -#: src/main/xmli18n-tmp.h:809 +#: src/main/xmli18n-tmp.h:861 msgid "HP PSC 500" msgstr "" -#: src/main/xmli18n-tmp.h:810 +#: src/main/xmli18n-tmp.h:862 msgid "HP PSC 750" msgstr "" -#: src/main/xmli18n-tmp.h:811 +#: src/main/xmli18n-tmp.h:863 msgid "HP PSC 950" msgstr "" -#: src/main/xmli18n-tmp.h:812 +#: src/main/xmli18n-tmp.h:864 msgid "HP PSC 950xi" msgstr "" -#: src/main/xmli18n-tmp.h:813 +#: src/main/xmli18n-tmp.h:865 msgid "HP PSC 2110" msgstr "" -#: src/main/xmli18n-tmp.h:814 +#: src/main/xmli18n-tmp.h:866 msgid "HP PSC 2150" msgstr "" -#: src/main/xmli18n-tmp.h:815 +#: src/main/xmli18n-tmp.h:867 msgid "HP PSC 2210" msgstr "" -#: src/main/xmli18n-tmp.h:816 +#: src/main/xmli18n-tmp.h:868 msgid "HP PhotoSmart 7150" msgstr "" -#: src/main/xmli18n-tmp.h:817 +#: src/main/xmli18n-tmp.h:869 msgid "HP PhotoSmart 7345" msgstr "" -#: src/main/xmli18n-tmp.h:818 +#: src/main/xmli18n-tmp.h:870 msgid "HP PhotoSmart 7350" msgstr "" -#: src/main/xmli18n-tmp.h:819 +#: src/main/xmli18n-tmp.h:871 msgid "HP PhotoSmart 7550" msgstr "" -#: src/main/xmli18n-tmp.h:820 +#: src/main/xmli18n-tmp.h:872 msgid "HP PhotoSmart P100" msgstr "" -#: src/main/xmli18n-tmp.h:821 +#: src/main/xmli18n-tmp.h:873 msgid "HP PhotoSmart P130" msgstr "" -#: src/main/xmli18n-tmp.h:822 +#: src/main/xmli18n-tmp.h:874 msgid "HP PhotoSmart P230" msgstr "" -#: src/main/xmli18n-tmp.h:823 +#: src/main/xmli18n-tmp.h:875 msgid "HP PhotoSmart P1000" msgstr "" -#: src/main/xmli18n-tmp.h:824 +#: src/main/xmli18n-tmp.h:876 msgid "HP PhotoSmart P1100" msgstr "" -#: src/main/xmli18n-tmp.h:825 +#: src/main/xmli18n-tmp.h:877 msgid "HP PhotoSmart P1115" msgstr "" -#: src/main/xmli18n-tmp.h:826 +#: src/main/xmli18n-tmp.h:878 msgid "HP PhotoSmart P1215" msgstr "" -#: src/main/xmli18n-tmp.h:827 +#: src/main/xmli18n-tmp.h:879 msgid "HP PhotoSmart P1218" msgstr "" -#: src/main/xmli18n-tmp.h:828 +#: src/main/xmli18n-tmp.h:880 msgid "HP PhotoSmart P1315" msgstr "" -#: src/main/xmli18n-tmp.h:829 +#: src/main/xmli18n-tmp.h:881 #, fuzzy msgid "HP e-printer e20" -msgstr "プリンタå:" +msgstr "¥×¥ê¥ó¥¿Ì¾:" -#: src/main/xmli18n-tmp.h:830 +#: src/main/xmli18n-tmp.h:882 msgid "IBM 4019" msgstr "" -#: src/main/xmli18n-tmp.h:831 +#: src/main/xmli18n-tmp.h:883 msgid "IBM 4029 030 LaserPrinter 10" msgstr "" -#: src/main/xmli18n-tmp.h:832 +#: src/main/xmli18n-tmp.h:884 msgid "IBM 4312" msgstr "" -#: src/main/xmli18n-tmp.h:833 +#: src/main/xmli18n-tmp.h:885 msgid "IBM Infoprint 12" msgstr "" -#: src/main/xmli18n-tmp.h:834 +#: src/main/xmli18n-tmp.h:886 msgid "IBM Page Printer 3112" msgstr "" -#: src/main/xmli18n-tmp.h:835 +#: src/main/xmli18n-tmp.h:887 msgid "Infotec 4651 MF" msgstr "" -#: src/main/xmli18n-tmp.h:836 +#: src/main/xmli18n-tmp.h:888 msgid "Kyocera F-1010" msgstr "" -#: src/main/xmli18n-tmp.h:837 +#: src/main/xmli18n-tmp.h:889 msgid "Kyocera FS-600 - KPDL-2" msgstr "" -#: src/main/xmli18n-tmp.h:838 +#: src/main/xmli18n-tmp.h:890 msgid "Kyocera FS-600" msgstr "" -#: src/main/xmli18n-tmp.h:839 +#: src/main/xmli18n-tmp.h:891 msgid "Kyocera FS-680" msgstr "" -#: src/main/xmli18n-tmp.h:840 +#: src/main/xmli18n-tmp.h:892 msgid "Kyocera FS-800" msgstr "" -#: src/main/xmli18n-tmp.h:841 +#: src/main/xmli18n-tmp.h:893 msgid "Kyocera FS-1000" msgstr "" -#: src/main/xmli18n-tmp.h:842 +#: src/main/xmli18n-tmp.h:894 msgid "Kyocera FS-1000+" msgstr "" -#: src/main/xmli18n-tmp.h:843 +#: src/main/xmli18n-tmp.h:895 msgid "Kyocera FS-1010" msgstr "" -#: src/main/xmli18n-tmp.h:844 +#: src/main/xmli18n-tmp.h:896 msgid "Kyocera FS-1050" msgstr "" -#: src/main/xmli18n-tmp.h:845 +#: src/main/xmli18n-tmp.h:897 msgid "Kyocera FS-1200" msgstr "" -#: src/main/xmli18n-tmp.h:846 +#: src/main/xmli18n-tmp.h:898 msgid "Kyocera FS-1600" msgstr "" -#: src/main/xmli18n-tmp.h:847 +#: src/main/xmli18n-tmp.h:899 msgid "Kyocera FS-1600+" msgstr "" -#: src/main/xmli18n-tmp.h:848 +#: src/main/xmli18n-tmp.h:900 msgid "Kyocera FS-1700" msgstr "" -#: src/main/xmli18n-tmp.h:849 +#: src/main/xmli18n-tmp.h:901 msgid "Kyocera FS-1700+" msgstr "" -#: src/main/xmli18n-tmp.h:850 +#: src/main/xmli18n-tmp.h:902 msgid "Kyocera FS-1750" msgstr "" -#: src/main/xmli18n-tmp.h:851 +#: src/main/xmli18n-tmp.h:903 msgid "Kyocera FS-1800" msgstr "" -#: src/main/xmli18n-tmp.h:852 +#: src/main/xmli18n-tmp.h:904 msgid "Kyocera FS-1800+" msgstr "" -#: src/main/xmli18n-tmp.h:853 +#: src/main/xmli18n-tmp.h:905 msgid "Kyocera FS-1900" msgstr "" -#: src/main/xmli18n-tmp.h:854 +#: src/main/xmli18n-tmp.h:906 msgid "Kyocera FS-3500" msgstr "" -#: src/main/xmli18n-tmp.h:855 +#: src/main/xmli18n-tmp.h:907 msgid "Kyocera FS-3600" msgstr "" -#: src/main/xmli18n-tmp.h:856 +#: src/main/xmli18n-tmp.h:908 msgid "Kyocera FS-3600+" msgstr "" -#: src/main/xmli18n-tmp.h:857 +#: src/main/xmli18n-tmp.h:909 msgid "Kyocera FS-3700" msgstr "" -#: src/main/xmli18n-tmp.h:858 +#: src/main/xmli18n-tmp.h:910 msgid "Kyocera FS-3700+" msgstr "" -#: src/main/xmli18n-tmp.h:859 +#: src/main/xmli18n-tmp.h:911 msgid "Kyocera FS-3750" msgstr "" -#: src/main/xmli18n-tmp.h:860 +#: src/main/xmli18n-tmp.h:912 msgid "Kyocera FS-3800" msgstr "" -#: src/main/xmli18n-tmp.h:861 +#: src/main/xmli18n-tmp.h:913 msgid "Kyocera FS-5800C" msgstr "" -#: src/main/xmli18n-tmp.h:862 +#: src/main/xmli18n-tmp.h:914 msgid "Kyocera FS-5900C" msgstr "" -#: src/main/xmli18n-tmp.h:863 +#: src/main/xmli18n-tmp.h:915 msgid "Kyocera FS-6500" msgstr "" -#: src/main/xmli18n-tmp.h:864 +#: src/main/xmli18n-tmp.h:916 msgid "Kyocera FS-6500+" msgstr "" -#: src/main/xmli18n-tmp.h:865 +#: src/main/xmli18n-tmp.h:917 msgid "Kyocera FS-6700" msgstr "" -#: src/main/xmli18n-tmp.h:866 +#: src/main/xmli18n-tmp.h:918 msgid "Kyocera FS-7000" msgstr "" -#: src/main/xmli18n-tmp.h:867 +#: src/main/xmli18n-tmp.h:919 msgid "Kyocera FS-7000+" msgstr "" -#: src/main/xmli18n-tmp.h:868 +#: src/main/xmli18n-tmp.h:920 msgid "Kyocera FS-8000C" msgstr "" -#: src/main/xmli18n-tmp.h:869 +#: src/main/xmli18n-tmp.h:921 msgid "Kyocera FS-9000" msgstr "" -#: src/main/xmli18n-tmp.h:870 +#: src/main/xmli18n-tmp.h:922 msgid "Kyocera FS-9100DN" msgstr "" -#: src/main/xmli18n-tmp.h:871 +#: src/main/xmli18n-tmp.h:923 msgid "Kyocera FS-9500DN" msgstr "" -#: src/main/xmli18n-tmp.h:872 +#: src/main/xmli18n-tmp.h:924 msgid "Kyocera KM-1530" msgstr "" -#: src/main/xmli18n-tmp.h:873 +#: src/main/xmli18n-tmp.h:925 msgid "Kyocera KM-1810" msgstr "" -#: src/main/xmli18n-tmp.h:874 +#: src/main/xmli18n-tmp.h:926 msgid "Kyocera KM-2030" msgstr "" -#: src/main/xmli18n-tmp.h:875 +#: src/main/xmli18n-tmp.h:927 msgid "Kyocera KM-2530" msgstr "" -#: src/main/xmli18n-tmp.h:876 +#: src/main/xmli18n-tmp.h:928 msgid "Kyocera KM-3530" msgstr "" -#: src/main/xmli18n-tmp.h:877 +#: src/main/xmli18n-tmp.h:929 msgid "Kyocera KM-4230" msgstr "" -#: src/main/xmli18n-tmp.h:878 +#: src/main/xmli18n-tmp.h:930 msgid "Kyocera KM-4530" msgstr "" -#: src/main/xmli18n-tmp.h:879 +#: src/main/xmli18n-tmp.h:931 msgid "Kyocera KM-5230" msgstr "" -#: src/main/xmli18n-tmp.h:880 +#: src/main/xmli18n-tmp.h:932 msgid "Kyocera KM-5530" msgstr "" -#: src/main/xmli18n-tmp.h:881 +#: src/main/xmli18n-tmp.h:933 msgid "Kyocera KM-6230" msgstr "" -#: src/main/xmli18n-tmp.h:882 +#: src/main/xmli18n-tmp.h:934 msgid "Lexmark 4076" msgstr "" -#: src/main/xmli18n-tmp.h:883 +#: src/main/xmli18n-tmp.h:935 msgid "Lexmark Optra E" msgstr "" -#: src/main/xmli18n-tmp.h:884 +#: src/main/xmli18n-tmp.h:936 msgid "Lexmark Optra E+" msgstr "" -#: src/main/xmli18n-tmp.h:885 +#: src/main/xmli18n-tmp.h:937 msgid "Lexmark Optra E220" msgstr "" -#: src/main/xmli18n-tmp.h:886 +#: src/main/xmli18n-tmp.h:938 msgid "Lexmark Valuewriter 300" msgstr "" -#: src/main/xmli18n-tmp.h:887 +#: src/main/xmli18n-tmp.h:939 msgid "Minolta PagePro 6" msgstr "" -#: src/main/xmli18n-tmp.h:888 +#: src/main/xmli18n-tmp.h:940 msgid "Minolta PagePro 6e" msgstr "" -#: src/main/xmli18n-tmp.h:889 +#: src/main/xmli18n-tmp.h:941 msgid "Minolta PagePro 6ex" msgstr "" -#: src/main/xmli18n-tmp.h:890 +#: src/main/xmli18n-tmp.h:942 msgid "Minolta PagePro 8" msgstr "" -#: src/main/xmli18n-tmp.h:891 +#: src/main/xmli18n-tmp.h:943 msgid "Minolta PagePro 8L" msgstr "" -#: src/main/xmli18n-tmp.h:892 +#: src/main/xmli18n-tmp.h:944 msgid "Minolta PagePro 1100" msgstr "" -#: src/main/xmli18n-tmp.h:893 +#: src/main/xmli18n-tmp.h:945 msgid "NEC SuperScript 660i" msgstr "" -#: src/main/xmli18n-tmp.h:894 +#: src/main/xmli18n-tmp.h:946 msgid "NEC SuperScript 860" msgstr "" -#: src/main/xmli18n-tmp.h:895 +#: src/main/xmli18n-tmp.h:947 msgid "NEC SuperScript 870" msgstr "" -#: src/main/xmli18n-tmp.h:896 +#: src/main/xmli18n-tmp.h:948 msgid "NEC SuperScript 1260" msgstr "" -#: src/main/xmli18n-tmp.h:897 +#: src/main/xmli18n-tmp.h:949 msgid "NEC SuperScript 1400" msgstr "" -#: src/main/xmli18n-tmp.h:898 +#: src/main/xmli18n-tmp.h:950 msgid "NEC SuperScript 1800" msgstr "" -#: src/main/xmli18n-tmp.h:899 +#: src/main/xmli18n-tmp.h:951 msgid "Okidata OL400" msgstr "" -#: src/main/xmli18n-tmp.h:900 +#: src/main/xmli18n-tmp.h:952 msgid "Okidata OL400e" msgstr "" -#: src/main/xmli18n-tmp.h:901 +#: src/main/xmli18n-tmp.h:953 msgid "Okidata OL400ex" msgstr "" -#: src/main/xmli18n-tmp.h:902 +#: src/main/xmli18n-tmp.h:954 msgid "Okidata OL410e" msgstr "" -#: src/main/xmli18n-tmp.h:903 +#: src/main/xmli18n-tmp.h:955 msgid "Okidata OL600e" msgstr "" -#: src/main/xmli18n-tmp.h:904 +#: src/main/xmli18n-tmp.h:956 msgid "Okidata OL610e/S" msgstr "" -#: src/main/xmli18n-tmp.h:905 +#: src/main/xmli18n-tmp.h:957 msgid "Okidata OL800" msgstr "" -#: src/main/xmli18n-tmp.h:906 +#: src/main/xmli18n-tmp.h:958 msgid "Okidata OL810ex" msgstr "" -#: src/main/xmli18n-tmp.h:907 +#: src/main/xmli18n-tmp.h:959 msgid "Okidata Okipage 6e" msgstr "" -#: src/main/xmli18n-tmp.h:908 +#: src/main/xmli18n-tmp.h:960 msgid "Okidata Okipage 6ex" msgstr "" -#: src/main/xmli18n-tmp.h:909 +#: src/main/xmli18n-tmp.h:961 msgid "Okidata Okipage 8p" msgstr "" -#: src/main/xmli18n-tmp.h:910 +#: src/main/xmli18n-tmp.h:962 msgid "Okidata Okipage 10e" msgstr "" -#: src/main/xmli18n-tmp.h:911 +#: src/main/xmli18n-tmp.h:963 msgid "Okidata Okipage 10ex" msgstr "" -#: src/main/xmli18n-tmp.h:912 +#: src/main/xmli18n-tmp.h:964 msgid "Okidata Okipage 14ex" msgstr "" -#: src/main/xmli18n-tmp.h:913 +#: src/main/xmli18n-tmp.h:965 msgid "Okidata Super 6e" msgstr "" -#: src/main/xmli18n-tmp.h:914 +#: src/main/xmli18n-tmp.h:966 msgid "Olivetti JP350S" msgstr "" -#: src/main/xmli18n-tmp.h:915 +#: src/main/xmli18n-tmp.h:967 msgid "Olivetti PG 306" msgstr "" -#: src/main/xmli18n-tmp.h:916 +#: src/main/xmli18n-tmp.h:968 msgid "PCPI 1030" msgstr "" -#: src/main/xmli18n-tmp.h:917 +#: src/main/xmli18n-tmp.h:969 msgid "Panasonic KX-P4410" msgstr "" -#: src/main/xmli18n-tmp.h:918 +#: src/main/xmli18n-tmp.h:970 msgid "Panasonic KX-P4450" msgstr "" -#: src/main/xmli18n-tmp.h:919 +#: src/main/xmli18n-tmp.h:971 msgid "Panasonic KX-P6150" msgstr "" -#: src/main/xmli18n-tmp.h:920 +#: src/main/xmli18n-tmp.h:972 msgid "Panasonic KX-P6500" msgstr "" -#: src/main/xmli18n-tmp.h:921 +#: src/main/xmli18n-tmp.h:973 msgid "Raven LP-410" msgstr "" -#: src/main/xmli18n-tmp.h:922 +#: src/main/xmli18n-tmp.h:974 msgid "Ricoh Aficio 220" msgstr "" -#: src/main/xmli18n-tmp.h:923 +#: src/main/xmli18n-tmp.h:975 msgid "Ricoh Aficio 401" msgstr "" -#: src/main/xmli18n-tmp.h:924 +#: src/main/xmli18n-tmp.h:976 msgid "Ricoh Aficio 700" msgstr "" -#: src/main/xmli18n-tmp.h:925 +#: src/main/xmli18n-tmp.h:977 msgid "Samsung ML-85" msgstr "" -#: src/main/xmli18n-tmp.h:926 +#: src/main/xmli18n-tmp.h:978 msgid "Samsung ML-4600" msgstr "" -#: src/main/xmli18n-tmp.h:927 +#: src/main/xmli18n-tmp.h:979 msgid "Samsung ML-5000a" msgstr "" -#: src/main/xmli18n-tmp.h:928 +#: src/main/xmli18n-tmp.h:980 msgid "Samsung ML-6000" msgstr "" -#: src/main/xmli18n-tmp.h:929 +#: src/main/xmli18n-tmp.h:981 msgid "Samsung ML-6100" msgstr "" -#: src/main/xmli18n-tmp.h:930 +#: src/main/xmli18n-tmp.h:982 msgid "Samsung ML-7000" msgstr "" -#: src/main/xmli18n-tmp.h:931 +#: src/main/xmli18n-tmp.h:983 msgid "Samsung ML-7000N" msgstr "" -#: src/main/xmli18n-tmp.h:932 +#: src/main/xmli18n-tmp.h:984 msgid "Samsung ML-7000P" msgstr "" -#: src/main/xmli18n-tmp.h:933 +#: src/main/xmli18n-tmp.h:985 msgid "Samsung ML-7050" msgstr "" -#: src/main/xmli18n-tmp.h:934 +#: src/main/xmli18n-tmp.h:986 msgid "Samsung QL-5100A" msgstr "" -#: src/main/xmli18n-tmp.h:935 +#: src/main/xmli18n-tmp.h:987 msgid "Samsung QL-6050" msgstr "" -#: src/main/xmli18n-tmp.h:936 +#: src/main/xmli18n-tmp.h:988 msgid "Seiko SpeedJET 200" msgstr "" -#: src/main/xmli18n-tmp.h:937 +#: src/main/xmli18n-tmp.h:989 msgid "Sharp AR-161" msgstr "" -#: src/main/xmli18n-tmp.h:938 +#: src/main/xmli18n-tmp.h:990 msgid "Sharp AR-M257" msgstr "" -#: src/main/xmli18n-tmp.h:939 +#: src/main/xmli18n-tmp.h:991 msgid "Sony IJP-V100" msgstr "" -#: src/main/xmli18n-tmp.h:940 +#: src/main/xmli18n-tmp.h:992 msgid "Star LS-04" msgstr "" -#: src/main/xmli18n-tmp.h:941 +#: src/main/xmli18n-tmp.h:993 #, fuzzy msgid "Star LaserPrinter 8" -msgstr "プリンタã®é¸æŠž" +msgstr "¥×¥ê¥ó¥¿¤ÎÁªÂò" -#: src/main/xmli18n-tmp.h:942 +#: src/main/xmli18n-tmp.h:994 msgid "Tally MT908" msgstr "" -#: src/main/xmli18n-tmp.h:943 +#: src/main/xmli18n-tmp.h:995 msgid "Xerox Able 1406" msgstr "" -#: src/main/xmli18n-tmp.h:944 +#: src/main/xmli18n-tmp.h:996 msgid "Xerox DocuPrint 4508" msgstr "" -#: src/main/xmli18n-tmp.h:945 +#: src/main/xmli18n-tmp.h:997 msgid "Xerox DocuPrint C20" msgstr "" -#: src/main/xmli18n-tmp.h:946 +#: src/main/xmli18n-tmp.h:998 msgid "Xerox DocuPrint N4512" msgstr "" -#: src/main/xmli18n-tmp.h:947 +#: src/main/xmli18n-tmp.h:999 msgid "Xerox DocuPrint N4512PS" msgstr "" -#: src/main/xmli18n-tmp.h:948 +#: src/main/xmli18n-tmp.h:1000 msgid "Xerox DocuPrint P12" msgstr "" -#: src/main/xmli18n-tmp.h:949 +#: src/main/xmli18n-tmp.h:1001 msgid "Xerox DocuPrint P1202" msgstr "" -#: src/main/xmli18n-tmp.h:950 +#: src/main/xmli18n-tmp.h:1002 msgid "Xerox DocuPrint P8e" msgstr "" -#: src/main/xmli18n-tmp.h:951 +#: src/main/xmli18n-tmp.h:1003 msgid "Xerox Document Centre 400" msgstr "" -#: src/main/xmli18n-tmp.h:952 +#: src/main/xmli18n-tmp.h:1004 msgid "Xerox WorkCentre M118" msgstr "" -#: src/main/xmli18n-tmp.h:953 +#: src/main/xmli18n-tmp.h:1005 msgid "Compaq IJ1200" msgstr "" -#: src/main/xmli18n-tmp.h:954 +#: src/main/xmli18n-tmp.h:1006 msgid "Lexmark X73" msgstr "" -#: src/main/xmli18n-tmp.h:955 +#: src/main/xmli18n-tmp.h:1007 msgid "Lexmark Z42" msgstr "" -#: src/main/xmli18n-tmp.h:956 +#: src/main/xmli18n-tmp.h:1008 msgid "Lexmark Z43" msgstr "" -#: src/main/xmli18n-tmp.h:957 +#: src/main/xmli18n-tmp.h:1009 msgid "Lexmark Z52" msgstr "" -#: src/main/xmli18n-tmp.h:958 +#: src/main/xmli18n-tmp.h:1010 msgid "Lexmark Z53" msgstr "" -#: src/main/xmli18n-tmp.h:959 +#: src/main/xmli18n-tmp.h:1011 msgid "Olympus P-10" msgstr "" -#: src/main/xmli18n-tmp.h:960 +#: src/main/xmli18n-tmp.h:1012 msgid "Olympus P-11" msgstr "" -#: src/main/xmli18n-tmp.h:961 +#: src/main/xmli18n-tmp.h:1013 msgid "Olympus P-200" msgstr "" -#: src/main/xmli18n-tmp.h:962 +#: src/main/xmli18n-tmp.h:1014 msgid "Olympus P-300" msgstr "" -#: src/main/xmli18n-tmp.h:963 +#: src/main/xmli18n-tmp.h:1015 msgid "Olympus P-300E" msgstr "" -#: src/main/xmli18n-tmp.h:964 +#: src/main/xmli18n-tmp.h:1016 msgid "Olympus P-300U" msgstr "" -#: src/main/xmli18n-tmp.h:965 +#: src/main/xmli18n-tmp.h:1017 msgid "Olympus P-330E" msgstr "" -#: src/main/xmli18n-tmp.h:966 +#: src/main/xmli18n-tmp.h:1018 msgid "Olympus P-330NE" msgstr "" -#: src/main/xmli18n-tmp.h:967 +#: src/main/xmli18n-tmp.h:1019 msgid "Olympus P-400" msgstr "" -#: src/main/xmli18n-tmp.h:968 +#: src/main/xmli18n-tmp.h:1020 msgid "Olympus P-440" msgstr "" -#: src/main/xmli18n-tmp.h:969 +#: src/main/xmli18n-tmp.h:1021 msgid "Olympus P-S100" msgstr "" -#: src/main/xmli18n-tmp.h:970 +#: src/main/xmli18n-tmp.h:1022 msgid "Canon CP-10" msgstr "" -#: src/main/xmli18n-tmp.h:971 +#: src/main/xmli18n-tmp.h:1023 msgid "Canon CP-100" msgstr "" -#: src/main/xmli18n-tmp.h:972 +#: src/main/xmli18n-tmp.h:1024 msgid "Canon CP-200" msgstr "" -#: src/main/xmli18n-tmp.h:973 +#: src/main/xmli18n-tmp.h:1025 msgid "Canon CP-220" msgstr "" -#: src/main/xmli18n-tmp.h:974 +#: src/main/xmli18n-tmp.h:1026 msgid "Canon CP-300" msgstr "" -#: src/main/xmli18n-tmp.h:975 +#: src/main/xmli18n-tmp.h:1027 msgid "Canon CP-330" msgstr "" -#: src/main/xmli18n-tmp.h:976 +#: src/main/xmli18n-tmp.h:1028 msgid "Canon SELPHY-CP-400" msgstr "" -#: src/main/xmli18n-tmp.h:977 +#: src/main/xmli18n-tmp.h:1029 msgid "Canon SELPHY-CP-500" msgstr "" -#: src/main/xmli18n-tmp.h:978 +#: src/main/xmli18n-tmp.h:1030 msgid "Canon SELPHY-CP-510" msgstr "" -#: src/main/xmli18n-tmp.h:979 +#: src/main/xmli18n-tmp.h:1031 msgid "Canon SELPHY-CP-600" msgstr "" -#: src/main/xmli18n-tmp.h:980 +#: src/main/xmli18n-tmp.h:1032 msgid "Canon SELPHY-CP-710" msgstr "" -#: src/main/xmli18n-tmp.h:981 +#: src/main/xmli18n-tmp.h:1033 msgid "Canon SELPHY-CP-720" msgstr "" -#: src/main/xmli18n-tmp.h:982 -#, fuzzy +#: src/main/xmli18n-tmp.h:1034 msgid "Canon SELPHY-CP-730" -msgstr "Stylus C60" +msgstr "" -#: src/main/xmli18n-tmp.h:983 +#: src/main/xmli18n-tmp.h:1035 msgid "Canon SELPHY-CP-740" msgstr "" -#: src/main/xmli18n-tmp.h:984 -#, fuzzy +#: src/main/xmli18n-tmp.h:1036 msgid "Canon SELPHY-CP-750" -msgstr "Stylus C60" +msgstr "" -#: src/main/xmli18n-tmp.h:985 +#: src/main/xmli18n-tmp.h:1037 msgid "Canon SELPHY ES1" msgstr "" -#: src/main/xmli18n-tmp.h:986 +#: src/main/xmli18n-tmp.h:1038 msgid "Canon SELPHY ES2" msgstr "" -#: src/main/xmli18n-tmp.h:987 +#: src/main/xmli18n-tmp.h:1039 msgid "Canon SELPHY ES20" msgstr "" -#: src/main/xmli18n-tmp.h:988 +#: src/main/xmli18n-tmp.h:1040 msgid "Sony DPP-EX5" msgstr "" -#: src/main/xmli18n-tmp.h:989 +#: src/main/xmli18n-tmp.h:1041 msgid "Sony DPP-EX7" msgstr "" -#: src/main/xmli18n-tmp.h:990 +#: src/main/xmli18n-tmp.h:1042 msgid "Sony UP-DP10" msgstr "" -#: src/main/xmli18n-tmp.h:991 +#: src/main/xmli18n-tmp.h:1043 msgid "Sony UP-DR100" msgstr "" -#: src/main/xmli18n-tmp.h:992 -msgid "Sony UP-DR150" +#: src/main/xmli18n-tmp.h:1044 +msgid "Sony UP-DR150" +msgstr "" + +#: src/main/xmli18n-tmp.h:1045 +msgid "Fujifilm Printpix-CX-400" +msgstr "" + +#: src/main/xmli18n-tmp.h:1046 +msgid "Fujifilm Printpix-CX-550" +msgstr "" + +#: src/main/xmli18n-tmp.h:1047 +msgid "Fujifilm FinePix-NX-500" +msgstr "" + +#: src/main/xmli18n-tmp.h:1048 +msgid "Kodak Easyshare-Printer-Dock" +msgstr "" + +#: src/main/xmli18n-tmp.h:1049 +msgid "Shinko CHC-S9045" +msgstr "" + +#: src/main/xmli18n-tmp.h:1050 +msgid "RAW DATA 16 bit" +msgstr "" + +#: src/main/xmli18n-tmp.h:1051 +msgid "RAW DATA 8 bit" +msgstr "" + +#: src/gutenprintui2/curve.c:130 +#, fuzzy +msgid "Curve type" +msgstr "¹õ¿§" + +#: src/gutenprintui2/curve.c:131 +msgid "Is this curve linear, spline interpolated, or free-form" +msgstr "" + +#: src/gutenprintui2/curve.c:139 +msgid "Minimum X" +msgstr "" + +#: src/gutenprintui2/curve.c:140 +msgid "Minimum possible value for X" msgstr "" -#: src/main/xmli18n-tmp.h:993 -msgid "Fujifilm Printpix-CX-400" +#: src/gutenprintui2/curve.c:149 +msgid "Maximum X" msgstr "" -#: src/main/xmli18n-tmp.h:994 -msgid "Fujifilm Printpix-CX-550" +#: src/gutenprintui2/curve.c:150 +msgid "Maximum possible X value" msgstr "" -#: src/main/xmli18n-tmp.h:995 -msgid "Fujifilm FinePix-NX-500" +#: src/gutenprintui2/curve.c:159 +msgid "Minimum Y" msgstr "" -#: src/main/xmli18n-tmp.h:996 -msgid "Kodak Easyshare-Printer-Dock" +#: src/gutenprintui2/curve.c:160 +msgid "Minimum possible value for Y" msgstr "" -#: src/main/xmli18n-tmp.h:997 -msgid "Shinko CHC-S9045" +#: src/gutenprintui2/curve.c:169 +msgid "Maximum Y" msgstr "" -#: src/main/xmli18n-tmp.h:998 -msgid "RAW DATA 16 bit" +#: src/gutenprintui2/curve.c:170 +msgid "Maximum possible value for Y" msgstr "" -#: src/main/xmli18n-tmp.h:999 -msgid "RAW DATA 8 bit" +#: src/gutenprintui2/gammacurve.c:418 +msgid "_Gamma value" msgstr "" -#: src/gutenprintui/panel.c:274 src/gutenprintui2/panel.c:274 +#: src/gutenprintui2/panel.c:275 msgid "Inch" -msgstr "インãƒ" +msgstr "¥¤¥ó¥Á" -#: src/gutenprintui/panel.c:274 src/gutenprintui2/panel.c:274 +#: src/gutenprintui2/panel.c:275 msgid "Set the base unit of measurement to inches" -msgstr "基本å˜ä½ã‚’インãƒã«ã—ã¾ã™ã€‚" +msgstr "´ðËÜñ°Ì¤ò¥¤¥ó¥Á¤Ë¤·¤Þ¤¹¡£" -#: src/gutenprintui/panel.c:276 src/gutenprintui2/panel.c:276 +#: src/gutenprintui2/panel.c:277 msgid "cm" -msgstr "センãƒãƒ¡ãƒ¼ãƒˆãƒ«" +msgstr "¥»¥ó¥Á¥á¡¼¥È¥ë" -#: src/gutenprintui/panel.c:276 src/gutenprintui2/panel.c:276 +#: src/gutenprintui2/panel.c:277 msgid "Set the base unit of measurement to centimetres" -msgstr "基本å˜ä½ã‚’センãƒãƒ¡ãƒ¼ãƒˆãƒ«ã«ã—ã¾ã™ã€‚" +msgstr "´ðËÜñ°Ì¤ò¥»¥ó¥Á¥á¡¼¥È¥ë¤Ë¤·¤Þ¤¹¡£" -#: src/gutenprintui/panel.c:278 src/gutenprintui2/panel.c:278 +#: src/gutenprintui2/panel.c:279 #, fuzzy msgid "Points" -msgstr "å°åˆ·" +msgstr "°õºþ" -#: src/gutenprintui/panel.c:278 src/gutenprintui2/panel.c:278 +#: src/gutenprintui2/panel.c:279 #, fuzzy msgid "Set the base unit of measurement to points (1/72\")" -msgstr "基本å˜ä½ã‚’インãƒã«ã—ã¾ã™ã€‚" +msgstr "´ðËÜñ°Ì¤ò¥¤¥ó¥Á¤Ë¤·¤Þ¤¹¡£" -#: src/gutenprintui/panel.c:280 src/gutenprintui2/panel.c:280 +#: src/gutenprintui2/panel.c:281 msgid "mm" msgstr "" -#: src/gutenprintui/panel.c:280 src/gutenprintui2/panel.c:280 +#: src/gutenprintui2/panel.c:281 #, fuzzy msgid "Set the base unit of measurement to millimetres" -msgstr "基本å˜ä½ã‚’センãƒãƒ¡ãƒ¼ãƒˆãƒ«ã«ã—ã¾ã™ã€‚" +msgstr "´ðËÜñ°Ì¤ò¥»¥ó¥Á¥á¡¼¥È¥ë¤Ë¤·¤Þ¤¹¡£" -#: src/gutenprintui/panel.c:282 src/gutenprintui2/panel.c:282 +#: src/gutenprintui2/panel.c:283 msgid "Pica" msgstr "" -#: src/gutenprintui/panel.c:282 src/gutenprintui2/panel.c:282 +#: src/gutenprintui2/panel.c:283 #, fuzzy msgid "Set the base unit of measurement to picas (1/12\")" -msgstr "基本å˜ä½ã‚’インãƒã«ã—ã¾ã™ã€‚" +msgstr "´ðËÜñ°Ì¤ò¥¤¥ó¥Á¤Ë¤·¤Þ¤¹¡£" -#: src/gutenprintui/panel.c:289 src/gutenprintui2/panel.c:289 +#: src/gutenprintui2/panel.c:290 msgid "Color output" -msgstr "カラーã§å°åˆ·ã—ã¾ã™ã€‚" +msgstr "¥«¥é¡¼¤Ç°õºþ¤·¤Þ¤¹¡£" -#: src/gutenprintui/panel.c:291 src/gutenprintui2/panel.c:291 +#: src/gutenprintui2/panel.c:292 msgid "Print in shades of gray using black ink" -msgstr "黒インクを使ã£ã¦ã‚°ãƒ¬ãƒ¼ã®å½±ã‚’付ã‘ã¦å°åˆ·ã—ã¾ã™ã€‚" +msgstr "¹õ¥¤¥ó¥¯¤ò»È¤Ã¤Æ¥°¥ì¡¼¤Î±Æ¤òÉÕ¤±¤Æ°õºþ¤·¤Þ¤¹¡£" -#: src/gutenprintui/panel.c:303 src/gutenprintui2/panel.c:303 +#: src/gutenprintui2/panel.c:304 #, fuzzy msgid "Standard Command" -msgstr "標準" +msgstr "ɸ½à" -#: src/gutenprintui/panel.c:303 src/gutenprintui2/panel.c:303 +#: src/gutenprintui2/panel.c:304 msgid "Use standard print command" msgstr "" -#: src/gutenprintui/panel.c:304 src/gutenprintui2/panel.c:304 +#: src/gutenprintui2/panel.c:305 #, fuzzy msgid "Custom Command" -msgstr "コマンド:" +msgstr "¥³¥Þ¥ó¥É:" -#: src/gutenprintui/panel.c:304 src/gutenprintui2/panel.c:304 +#: src/gutenprintui2/panel.c:305 msgid "Use custom print command" msgstr "" -#: src/gutenprintui/panel.c:305 src/gutenprintui/plist.c:704 -#: src/gutenprintui/plist.c:787 src/gutenprintui2/panel.c:305 -#: src/gutenprintui2/plist.c:707 src/gutenprintui2/plist.c:790 +#: src/gutenprintui2/panel.c:306 src/gutenprintui2/plist.c:710 +#: src/gutenprintui2/plist.c:793 msgid "File" -msgstr "ファイル" +msgstr "¥Õ¥¡¥¤¥ë" -#: src/gutenprintui/panel.c:305 src/gutenprintui2/panel.c:305 +#: src/gutenprintui2/panel.c:306 #, fuzzy msgid "Print to a file" -msgstr "ファイルã«å°åˆ·ã—ã¾ã™ã‹ï¼Ÿ" +msgstr "¥Õ¥¡¥¤¥ë¤Ë°õºþ¤·¤Þ¤¹¤«¡©" -#: src/gutenprintui/panel.c:521 src/gutenprintui2/panel.c:521 +#: src/gutenprintui2/panel.c:522 msgid "Edit Curve..." msgstr "" -#: src/gutenprintui/panel.c:532 src/gutenprintui2/panel.c:532 +#: src/gutenprintui2/panel.c:533 #, fuzzy msgid "Set Default" -msgstr "åˆæœŸå€¤ã«æˆ»ã™" +msgstr "½é´üÃͤËÌ᤹" -#: src/gutenprintui/panel.c:534 src/gutenprintui2/panel.c:534 +#: src/gutenprintui2/panel.c:535 msgid "Restore Previous" msgstr "" -#: src/gutenprintui/panel.c:536 src/gutenprintui/panel.c:1532 -#: src/gutenprintui/panel.c:1787 src/gutenprintui/panel.c:1819 -#: src/gutenprintui2/panel.c:536 src/gutenprintui2/panel.c:1533 -#: src/gutenprintui2/panel.c:1787 src/gutenprintui2/panel.c:1819 +#: src/gutenprintui2/panel.c:537 src/gutenprintui2/panel.c:1708 +#: src/gutenprintui2/panel.c:1962 src/gutenprintui2/panel.c:1994 msgid "OK" msgstr "OK" -#: src/gutenprintui/panel.c:538 src/gutenprintui/panel.c:1197 -#: src/gutenprintui/panel.c:1534 src/gutenprintui/panel.c:1789 -#: src/gutenprintui2/panel.c:538 src/gutenprintui2/panel.c:1198 -#: src/gutenprintui2/panel.c:1535 src/gutenprintui2/panel.c:1789 +#: src/gutenprintui2/panel.c:539 src/gutenprintui2/panel.c:1373 +#: src/gutenprintui2/panel.c:1710 src/gutenprintui2/panel.c:1964 msgid "Cancel" -msgstr "å–り消ã—" +msgstr "¼è¤ê¾Ã¤·" + +#: src/gutenprintui2/panel.c:641 +#, fuzzy +msgid "Select File..." +msgstr "¥×¥ê¥ó¥¿¤ÎÁªÂò..." + +#: src/gutenprintui2/panel.c:1018 +msgid "Reset" +msgstr "" -#: src/gutenprintui/panel.c:1180 src/gutenprintui2/panel.c:1181 +#: src/gutenprintui2/panel.c:1356 #, c-format msgid "%s -- Print v%s" -msgstr "%s -- å°åˆ· v%s" +msgstr "%s -- °õºþ v%s" -#: src/gutenprintui/panel.c:1189 src/gutenprintui2/panel.c:1190 +#: src/gutenprintui2/panel.c:1365 msgid "About" -msgstr "情報" +msgstr "¾ðÊó" -#: src/gutenprintui/panel.c:1191 src/gutenprintui2/panel.c:1192 +#: src/gutenprintui2/panel.c:1367 msgid "" "Print and\n" "Save Settings" msgstr "" -"å°åˆ·ã¨\n" -"設定ã®ä¿å­˜" +"°õºþ¤È\n" +"ÀßÄê¤ÎÊݸ" -#: src/gutenprintui/panel.c:1193 src/gutenprintui2/panel.c:1194 +#: src/gutenprintui2/panel.c:1369 msgid "" "Save\n" "Settings" msgstr "" -"設定ã®\n" -"ä¿å­˜" +"ÀßÄê¤Î\n" +"Êݸ" -#: src/gutenprintui/panel.c:1195 src/gutenprintui2/panel.c:1196 +#: src/gutenprintui2/panel.c:1371 msgid "Print" -msgstr "å°åˆ·" +msgstr "°õºþ" -#: src/gutenprintui/panel.c:1247 src/gutenprintui2/panel.c:1248 +#: src/gutenprintui2/panel.c:1423 msgid "Preview" -msgstr "プレビュー" +msgstr "¥×¥ì¥Ó¥å¡¼" -#: src/gutenprintui/panel.c:1272 src/gutenprintui2/panel.c:1273 +#: src/gutenprintui2/panel.c:1448 msgid "" "Position the image on the page.\n" "Click and drag with the primary button to position the image.\n" @@ -6700,545 +7128,492 @@ msgid "" "If you click another button while dragging the mouse, the image will return " "to its original position." msgstr "" -"å°åˆ·æ™‚ã®ç”»åƒã®ä½ç½®ã‚’設定ã—ã¾ã™ã€‚\n" -"マウスã®å·¦ãƒœã‚¿ãƒ³ã§ãƒ‰ãƒ©ãƒƒã‚°ã—ãŸå ´æ‰€ã«ç”»åƒãŒé…ç½®ã•ã‚Œã¾ã™ã€‚\n" -"マウスã®å³ãƒœã‚¿ãƒ³ã§ãƒ‰ãƒ©ãƒƒã‚°ã™ã‚‹ã¨ã€ç´°ã‹ã„レベルã§ç”»åƒã‚’移動ã—ã¾ã™; ç´„ 1/72 イ" -"ンãƒå˜ä½ã§ç§»å‹•ã™ã‚‹ã“ã¨ãŒå¯èƒ½ã§ã™ã€‚\n" -"マウスã®ä¸­ãƒœã‚¿ãƒ³ã§ãƒ‰ãƒ©ãƒƒã‚°ã™ã‚‹ã¨ã€ç”»åƒã®å¤§ãã•ã®å˜ä½ã§ç§»å‹•ã™ã‚‹ã“ã¨ãŒå¯èƒ½ã§" -"ã™ã€‚\n" -"[SHIFT] キーを押ã—ãªãŒã‚‰ãƒžã‚¦ã‚¹ã‚’ドラッグã™ã‚‹ã¨ã€æ°´å¹³ã¾ãŸã¯åž‚ç›´æ–¹å‘ã«ã®ã¿ç”»åƒ" -"を移動ã™ã‚‹ã“ã¨ãŒå¯èƒ½ã§ã™ã€‚\n" -"ドラッグ中ã«åˆ¥ã®ãƒœã‚¿ãƒ³ã‚’クリックã™ã‚‹ã¨ã€ç”»åƒã¯å…ƒã®å ´æ‰€ã«æˆ»ã‚Šã¾ã™ã€‚" +"°õºþ»þ¤Î²èÁü¤Î°ÌÃÖ¤òÀßÄꤷ¤Þ¤¹¡£\n" +"¥Þ¥¦¥¹¤Îº¸¥Ü¥¿¥ó¤Ç¥É¥é¥Ã¥°¤·¤¿¾ì½ê¤Ë²èÁü¤¬ÇÛÃÖ¤µ¤ì¤Þ¤¹¡£\n" +"¥Þ¥¦¥¹¤Î±¦¥Ü¥¿¥ó¤Ç¥É¥é¥Ã¥°¤¹¤ë¤È¡¢ºÙ¤«¤¤¥ì¥Ù¥ë¤Ç²èÁü¤ò°ÜÆ°¤·¤Þ¤¹; Ìó 1/72 ¥¤" +"¥ó¥Áñ°Ì¤Ç°ÜÆ°¤¹¤ë¤³¤È¤¬²Äǽ¤Ç¤¹¡£\n" +"¥Þ¥¦¥¹¤ÎÃæ¥Ü¥¿¥ó¤Ç¥É¥é¥Ã¥°¤¹¤ë¤È¡¢²èÁü¤ÎÂ礭¤µ¤Îñ°Ì¤Ç°ÜÆ°¤¹¤ë¤³¤È¤¬²Äǽ¤Ç" +"¤¹¡£\n" +"[SHIFT] ¥­¡¼¤ò²¡¤·¤Ê¤¬¤é¥Þ¥¦¥¹¤ò¥É¥é¥Ã¥°¤¹¤ë¤È¡¢¿åÊ¿¤Þ¤¿¤Ï¿âľÊý¸þ¤Ë¤Î¤ß²èÁü" +"¤ò°ÜÆ°¤¹¤ë¤³¤È¤¬²Äǽ¤Ç¤¹¡£\n" +"¥É¥é¥Ã¥°Ãæ¤ËÊ̤Υܥ¿¥ó¤ò¥¯¥ê¥Ã¥¯¤¹¤ë¤È¡¢²èÁü¤Ï¸µ¤Î¾ì½ê¤ËÌá¤ê¤Þ¤¹¡£" -#: src/gutenprintui/panel.c:1319 src/gutenprintui2/panel.c:1320 +#: src/gutenprintui2/panel.c:1495 #, fuzzy msgid "Paper Size" -msgstr "ç”»åƒã®ã‚µã‚¤ã‚º" +msgstr "²èÁü¤Î¥µ¥¤¥º" -#: src/gutenprintui/panel.c:1342 src/gutenprintui2/panel.c:1343 +#: src/gutenprintui2/panel.c:1518 msgid "Show All Paper Sizes" msgstr "" -#: src/gutenprintui/panel.c:1358 src/gutenprintui2/panel.c:1359 +#: src/gutenprintui2/panel.c:1534 msgid "Dimensions:" -msgstr "寸法:" +msgstr "À£Ë¡:" -#: src/gutenprintui/panel.c:1363 src/gutenprintui/panel.c:2063 -#: src/gutenprintui2/panel.c:1364 src/gutenprintui2/panel.c:2063 +#: src/gutenprintui2/panel.c:1539 src/gutenprintui2/panel.c:2238 msgid "Width:" -msgstr "å¹…:" +msgstr "Éý:" -#: src/gutenprintui/panel.c:1364 src/gutenprintui2/panel.c:1365 +#: src/gutenprintui2/panel.c:1540 msgid "Width of the paper that you wish to print to" -msgstr "å°åˆ·ã™ã‚‹ç”¨ç´™ã®å¹…ã§ã™ã€‚" +msgstr "°õºþ¤¹¤ëÍÑ»æ¤ÎÉý¤Ç¤¹¡£" -#: src/gutenprintui/panel.c:1368 src/gutenprintui/panel.c:2065 -#: src/gutenprintui2/panel.c:1369 src/gutenprintui2/panel.c:2065 +#: src/gutenprintui2/panel.c:1544 src/gutenprintui2/panel.c:2240 msgid "Height:" -msgstr "高ã•:" +msgstr "¹â¤µ:" -#: src/gutenprintui/panel.c:1369 src/gutenprintui2/panel.c:1370 +#: src/gutenprintui2/panel.c:1545 msgid "Height of the paper that you wish to print to" -msgstr "å°åˆ·ã™ã‚‹ç”¨ç´™ã®é«˜ã•ã§ã™ã€‚" +msgstr "°õºþ¤¹¤ëÍÑ»æ¤Î¹â¤µ¤Ç¤¹¡£" -#: src/gutenprintui/panel.c:1374 src/gutenprintui2/panel.c:1375 +#: src/gutenprintui2/panel.c:1550 #, fuzzy msgid "Automatic Paper Size" -msgstr "ç”»åƒã®ã‚µã‚¤ã‚º" +msgstr "²èÁü¤Î¥µ¥¤¥º" -#: src/gutenprintui/panel.c:1391 src/gutenprintui2/panel.c:1392 +#: src/gutenprintui2/panel.c:1567 msgid "Number of Copies" msgstr "" -#: src/gutenprintui/panel.c:1403 src/gutenprintui2/panel.c:1404 +#: src/gutenprintui2/panel.c:1579 msgid "Select the number of copies to print; a value between 1 and 100" msgstr "" -#: src/gutenprintui/panel.c:1435 src/gutenprintui2/panel.c:1436 +#: src/gutenprintui2/panel.c:1611 #, fuzzy msgid "Image Position" -msgstr "ä½ç½®" +msgstr "°ÌÃÖ" -#: src/gutenprintui/panel.c:1452 src/gutenprintui2/panel.c:1453 +#: src/gutenprintui2/panel.c:1628 msgid "Auto" -msgstr "自動" +msgstr "¼«Æ°" -#: src/gutenprintui/panel.c:1454 src/gutenprintui2/panel.c:1455 +#: src/gutenprintui2/panel.c:1630 msgid "Portrait" -msgstr "縦置ã" +msgstr "½ÄÃÖ¤­" -#: src/gutenprintui/panel.c:1456 src/gutenprintui2/panel.c:1457 +#: src/gutenprintui2/panel.c:1632 msgid "Landscape" -msgstr "横置ã" +msgstr "²£ÃÖ¤­" -#: src/gutenprintui/panel.c:1458 src/gutenprintui2/panel.c:1459 +#: src/gutenprintui2/panel.c:1634 msgid "Upside down" -msgstr "上下" +msgstr "¾å²¼" -#: src/gutenprintui/panel.c:1460 src/gutenprintui2/panel.c:1461 +#: src/gutenprintui2/panel.c:1636 msgid "Seascape" -msgstr "横長" +msgstr "²£Ä¹" -#: src/gutenprintui/panel.c:1464 src/gutenprintui2/panel.c:1465 +#: src/gutenprintui2/panel.c:1640 msgid "" "Select the orientation: portrait, landscape, upside down, or seascape " "(upside down landscape)" msgstr "" -"用紙ã®æ–¹å‘ã‚’é¸æŠžã—ã¾ã™: 縦置ãã€æ¨ªç½®ãã€ä¸Šä¸‹ã€ã¾ãŸã¯æ¨ªé•· (上下ã¤ãã®æ¨ªç½®ã)" +"ÍÑ»æ¤ÎÊý¸þ¤òÁªÂò¤·¤Þ¤¹: ½ÄÃÖ¤­¡¢²£ÃÖ¤­¡¢¾å²¼¡¢¤Þ¤¿¤Ï²£Ä¹ (¾å²¼¤Ä¤­¤Î²£ÃÖ¤­)" -#: src/gutenprintui/panel.c:1466 src/gutenprintui2/panel.c:1467 +#: src/gutenprintui2/panel.c:1642 msgid "Orientation:" -msgstr "用紙ã®å‘ã:" +msgstr "ÍÑ»æ¤Î¸þ¤­:" -#: src/gutenprintui/panel.c:1477 src/gutenprintui2/panel.c:1478 +#: src/gutenprintui2/panel.c:1653 msgid "Left:" -msgstr "å·¦å´:" +msgstr "º¸Â¦:" -#: src/gutenprintui/panel.c:1478 src/gutenprintui2/panel.c:1479 +#: src/gutenprintui2/panel.c:1654 msgid "Distance from the left of the paper to the image" -msgstr "用紙ã®å·¦ç«¯ã‹ã‚‰ç”»åƒã¾ã§ã®è·é›¢ã§ã™ã€‚" +msgstr "ÍÑ»æ¤Îº¸Ã¼¤«¤é²èÁü¤Þ¤Ç¤Îµ÷Î¥¤Ç¤¹¡£" -#: src/gutenprintui/panel.c:1481 src/gutenprintui/panel.c:1485 -#: src/gutenprintui2/panel.c:1482 src/gutenprintui2/panel.c:1486 +#: src/gutenprintui2/panel.c:1657 src/gutenprintui2/panel.c:1661 msgid "Right:" -msgstr "å³å´:" +msgstr "±¦Â¦:" -#: src/gutenprintui/panel.c:1482 src/gutenprintui2/panel.c:1483 +#: src/gutenprintui2/panel.c:1658 msgid "Distance from the left of the paper to the right of the image" -msgstr "用紙ã®å·¦ç«¯ã‹ã‚‰ç”»åƒã®å³ç«¯ã¾ã§ã®è·é›¢ã§ã™ã€‚" +msgstr "ÍÑ»æ¤Îº¸Ã¼¤«¤é²èÁü¤Î±¦Ã¼¤Þ¤Ç¤Îµ÷Î¥¤Ç¤¹¡£" -#: src/gutenprintui/panel.c:1486 src/gutenprintui2/panel.c:1487 +#: src/gutenprintui2/panel.c:1662 msgid "Distance from the right of the paper to the image" -msgstr "用紙ã®å³ç«¯ã‹ã‚‰ç”»åƒã¾ã§ã®è·é›¢ã§ã™ã€‚" +msgstr "ÍÑ»æ¤Î±¦Ã¼¤«¤é²èÁü¤Þ¤Ç¤Îµ÷Î¥¤Ç¤¹¡£" -#: src/gutenprintui/panel.c:1488 src/gutenprintui2/panel.c:1489 +#: src/gutenprintui2/panel.c:1664 msgid "Top:" -msgstr "上å´:" +msgstr "¾å¦:" -#: src/gutenprintui/panel.c:1489 src/gutenprintui2/panel.c:1490 +#: src/gutenprintui2/panel.c:1665 msgid "Distance from the top of the paper to the image" -msgstr "用紙ã®ä¸Šç«¯ã‹ã‚‰ç”»åƒã¾ã§ã®è·é›¢ã§ã™ã€‚" +msgstr "ÍÑ»æ¤Î¾åü¤«¤é²èÁü¤Þ¤Ç¤Îµ÷Î¥¤Ç¤¹¡£" -#: src/gutenprintui/panel.c:1492 src/gutenprintui/panel.c:1496 -#: src/gutenprintui2/panel.c:1493 src/gutenprintui2/panel.c:1497 +#: src/gutenprintui2/panel.c:1668 src/gutenprintui2/panel.c:1672 msgid "Bottom:" -msgstr "下å´:" +msgstr "²¼Â¦:" -#: src/gutenprintui/panel.c:1493 src/gutenprintui2/panel.c:1494 +#: src/gutenprintui2/panel.c:1669 #, fuzzy msgid "Distance from the top of the paper to bottom of the image" -msgstr "用紙ã®ä¸Šç«¯ã‹ã‚‰ç”»åƒã®ä¸‹ç«¯ã¾ã§ã®è·é›¢ã§ã™ã€‚" +msgstr "ÍÑ»æ¤Î¾åü¤«¤é²èÁü¤Î²¼Ã¼¤Þ¤Ç¤Îµ÷Î¥¤Ç¤¹¡£" -#: src/gutenprintui/panel.c:1497 src/gutenprintui2/panel.c:1498 +#: src/gutenprintui2/panel.c:1673 msgid "Distance from the bottom of the paper to the image" -msgstr "用紙ã®ä¸‹ç«¯ã‹ã‚‰ç”»åƒã¾ã§ã®è·é›¢ã§ã™ã€‚" +msgstr "ÍÑ»æ¤Î²¼Ã¼¤«¤é²èÁü¤Þ¤Ç¤Îµ÷Î¥¤Ç¤¹¡£" -#: src/gutenprintui/panel.c:1507 src/gutenprintui2/panel.c:1508 +#: src/gutenprintui2/panel.c:1683 msgid "Center:" -msgstr "中心:" +msgstr "Ãæ¿´:" -#: src/gutenprintui/panel.c:1510 src/gutenprintui2/panel.c:1511 +#: src/gutenprintui2/panel.c:1686 #, fuzzy msgid "Horizontal" -msgstr "æ°´å¹³" +msgstr "¿åÊ¿" -#: src/gutenprintui/panel.c:1511 src/gutenprintui2/panel.c:1512 +#: src/gutenprintui2/panel.c:1687 msgid "Center the image horizontally on the paper" -msgstr "用紙ã®æ°´å¹³æ–¹å‘ã®ä¸­å¿ƒã«ã—ã¾ã™ã€‚" +msgstr "ÍÑ»æ¤Î¿åÊ¿Êý¸þ¤ÎÃæ¿´¤Ë¤·¤Þ¤¹¡£" -#: src/gutenprintui/panel.c:1513 src/gutenprintui2/panel.c:1514 +#: src/gutenprintui2/panel.c:1689 msgid "Both" -msgstr "両端" +msgstr "ξü" -#: src/gutenprintui/panel.c:1514 src/gutenprintui2/panel.c:1515 +#: src/gutenprintui2/panel.c:1690 msgid "Center the image on the paper" -msgstr "用紙ã®ä¸­å¿ƒã«ã—ã¾ã™ã€‚" +msgstr "ÍÑ»æ¤ÎÃæ¿´¤Ë¤·¤Þ¤¹¡£" -#: src/gutenprintui/panel.c:1516 src/gutenprintui2/panel.c:1517 +#: src/gutenprintui2/panel.c:1692 #, fuzzy msgid "Vertical" -msgstr "åž‚ç›´" +msgstr "¿âľ" -#: src/gutenprintui/panel.c:1517 src/gutenprintui2/panel.c:1518 +#: src/gutenprintui2/panel.c:1693 msgid "Center the image vertically on the paper" -msgstr "用紙ã®åž‚ç›´æ–¹å‘ã®ä¸­å¿ƒã«ã—ã¾ã™ã€‚" +msgstr "ÍÑ»æ¤Î¿âľÊý¸þ¤ÎÃæ¿´¤Ë¤·¤Þ¤¹¡£" -#: src/gutenprintui/panel.c:1530 src/gutenprintui2/panel.c:1531 +#: src/gutenprintui2/panel.c:1706 msgid "Setup Printer" -msgstr "プリンタã®é¸æŠž" +msgstr "¥×¥ê¥ó¥¿¤ÎÁªÂò" -#: src/gutenprintui/panel.c:1555 src/gutenprintui2/panel.c:1555 +#: src/gutenprintui2/panel.c:1730 #, fuzzy msgid "Printer Make:" -msgstr "プリンタå:" +msgstr "¥×¥ê¥ó¥¿Ì¾:" -#: src/gutenprintui/panel.c:1566 src/gutenprintui2/panel.c:1566 +#: src/gutenprintui2/panel.c:1741 #, fuzzy msgid "Select the make of your printer" -msgstr "ãŠä½¿ã„ã®ãƒ—リンタをé¸æŠžã—ã¾ã™ã€‚" +msgstr "¤ª»È¤¤¤Î¥×¥ê¥ó¥¿¤òÁªÂò¤·¤Þ¤¹¡£" -#: src/gutenprintui/panel.c:1584 src/gutenprintui/panel.c:1672 -#: src/gutenprintui/panel.c:1890 src/gutenprintui2/panel.c:1584 -#: src/gutenprintui2/panel.c:1672 src/gutenprintui2/panel.c:1890 +#: src/gutenprintui2/panel.c:1759 src/gutenprintui2/panel.c:1847 +#: src/gutenprintui2/panel.c:2065 msgid "Printer Model:" -msgstr "プリンタã®åž‹å¼:" +msgstr "¥×¥ê¥ó¥¿¤Î·¿¼°:" -#: src/gutenprintui/panel.c:1595 src/gutenprintui2/panel.c:1595 +#: src/gutenprintui2/panel.c:1770 msgid "Select your printer model" -msgstr "ãŠä½¿ã„ã®ãƒ—リンタをé¸æŠžã—ã¾ã™ã€‚" +msgstr "¤ª»È¤¤¤Î¥×¥ê¥ó¥¿¤òÁªÂò¤·¤Þ¤¹¡£" -#: src/gutenprintui/panel.c:1643 src/gutenprintui2/panel.c:1643 +#: src/gutenprintui2/panel.c:1818 msgid "PPD File:" -msgstr "PPD ファイル:" +msgstr "PPD ¥Õ¥¡¥¤¥ë:" -#: src/gutenprintui/panel.c:1659 src/gutenprintui2/panel.c:1659 +#: src/gutenprintui2/panel.c:1834 msgid "Enter the correct PPD filename for your printer" -msgstr "ãŠä½¿ã„ã®ãƒ—リンタ用㮠PPD ファイルåを入力ã—ã¾ã™ã€‚" +msgstr "¤ª»È¤¤¤Î¥×¥ê¥ó¥¿ÍѤΠPPD ¥Õ¥¡¥¤¥ë̾¤òÆþÎϤ·¤Þ¤¹¡£" -#: src/gutenprintui/panel.c:1661 src/gutenprintui/panel.c:1741 -#: src/gutenprintui2/panel.c:1661 src/gutenprintui2/panel.c:1741 +#: src/gutenprintui2/panel.c:1836 src/gutenprintui2/panel.c:1916 msgid "Browse" -msgstr "å‚ç…§" +msgstr "»²¾È" -#: src/gutenprintui/panel.c:1668 src/gutenprintui2/panel.c:1668 +#: src/gutenprintui2/panel.c:1843 msgid "Choose the correct PPD filename for your printer" -msgstr "ãŠä½¿ã„ã®ãƒ—リンタ用㮠PPD ファイルをé¸æŠžã—ã¾ã™ã€‚" +msgstr "¤ª»È¤¤¤Î¥×¥ê¥ó¥¿ÍѤΠPPD ¥Õ¥¡¥¤¥ë¤òÁªÂò¤·¤Þ¤¹¡£" -#: src/gutenprintui/panel.c:1710 src/gutenprintui2/panel.c:1710 +#: src/gutenprintui2/panel.c:1885 #, fuzzy msgid "" "Select the name of the output queue (not the type, or model, of printer) " "that you wish to print to" -msgstr "ãŠä½¿ã„ã®ãƒ—リンタ (プリンタã®åž‹å¼ã§ã¯ã‚ã‚Šã¾ã›ã‚“) åã‚’é¸æŠžã—ã¾ã™ã€‚" +msgstr "¤ª»È¤¤¤Î¥×¥ê¥ó¥¿ (¥×¥ê¥ó¥¿¤Î·¿¼°¤Ç¤Ï¤¢¤ê¤Þ¤»¤ó) ̾¤òÁªÂò¤·¤Þ¤¹¡£" -#: src/gutenprintui/panel.c:1712 src/gutenprintui2/panel.c:1712 +#: src/gutenprintui2/panel.c:1887 #, fuzzy msgid "Printer Queue:" -msgstr "プリンタå:" +msgstr "¥×¥ê¥ó¥¿Ì¾:" -#: src/gutenprintui/panel.c:1728 src/gutenprintui2/panel.c:1728 +#: src/gutenprintui2/panel.c:1903 #, fuzzy msgid "Enter the correct command to print to your printer. " -msgstr "ãŠä½¿ã„ã®ãƒ—リンタ用㮠PPD ファイルåを入力ã—ã¾ã™ã€‚" +msgstr "¤ª»È¤¤¤Î¥×¥ê¥ó¥¿ÍѤΠPPD ¥Õ¥¡¥¤¥ë̾¤òÆþÎϤ·¤Þ¤¹¡£" -#: src/gutenprintui/panel.c:1739 src/gutenprintui2/panel.c:1739 +#: src/gutenprintui2/panel.c:1914 msgid "Enter the file to print to. " msgstr "" -#: src/gutenprintui/panel.c:1747 src/gutenprintui2/panel.c:1747 +#: src/gutenprintui2/panel.c:1922 #, fuzzy msgid "File to print to" -msgstr "テストå°åˆ·" +msgstr "¥Æ¥¹¥È°õºþ" -#: src/gutenprintui/panel.c:1755 src/gutenprintui2/panel.c:1755 +#: src/gutenprintui2/panel.c:1930 #, fuzzy msgid "Print To File" -msgstr "ファイルã«å°åˆ·ã—ã¾ã™ã‹ï¼Ÿ" +msgstr "¥Õ¥¡¥¤¥ë¤Ë°õºþ¤·¤Þ¤¹¤«¡©" -#: src/gutenprintui/panel.c:1785 src/gutenprintui2/panel.c:1785 +#: src/gutenprintui2/panel.c:1960 msgid "Define New Printer" -msgstr "æ–°ã—ã„プリンタã®å®šç¾©" +msgstr "¿·¤·¤¤¥×¥ê¥ó¥¿¤ÎÄêµÁ" -#: src/gutenprintui/panel.c:1803 src/gutenprintui/panel.c:1887 -#: src/gutenprintui2/panel.c:1803 src/gutenprintui2/panel.c:1887 +#: src/gutenprintui2/panel.c:1978 src/gutenprintui2/panel.c:2062 msgid "Printer Name:" -msgstr "プリンタå:" +msgstr "¥×¥ê¥ó¥¿Ì¾:" -#: src/gutenprintui/panel.c:1807 src/gutenprintui2/panel.c:1807 +#: src/gutenprintui2/panel.c:1982 msgid "Enter the name you wish to give this logical printer" -msgstr "利用ã™ã‚‹è«–ç†ãƒ—リンタåを指定ã—ã¾ã™ã€‚" +msgstr "ÍøÍѤ¹¤ëÏÀÍý¥×¥ê¥ó¥¿Ì¾¤ò»ØÄꤷ¤Þ¤¹¡£" -#: src/gutenprintui/panel.c:1817 src/gutenprintui2/panel.c:1817 +#: src/gutenprintui2/panel.c:1992 #, fuzzy msgid "About Gutenprint " msgstr "Gimp-Print" -#: src/gutenprintui/panel.c:1824 src/gutenprintui2/panel.c:1824 +#: src/gutenprintui2/panel.c:1999 #, fuzzy msgid "Gutenprint Version " -msgstr "Gimp-Print ãƒãƒ¼ã‚¸ãƒ§ãƒ³ " +msgstr "Gimp-Print ¥Ð¡¼¥¸¥ç¥ó " -#: src/gutenprintui/panel.c:1872 src/gutenprintui2/panel.c:1872 +#: src/gutenprintui2/panel.c:2047 msgid "Printer Settings" -msgstr "プリンタã®è¨­å®š" +msgstr "¥×¥ê¥ó¥¿¤ÎÀßÄê" -#: src/gutenprintui/panel.c:1885 src/gutenprintui2/panel.c:1885 +#: src/gutenprintui2/panel.c:2060 msgid "" "Select the name of the printer (not the type, or model, of printer) that you " "wish to print to" -msgstr "ãŠä½¿ã„ã®ãƒ—リンタ (プリンタã®åž‹å¼ã§ã¯ã‚ã‚Šã¾ã›ã‚“) åã‚’é¸æŠžã—ã¾ã™ã€‚" +msgstr "¤ª»È¤¤¤Î¥×¥ê¥ó¥¿ (¥×¥ê¥ó¥¿¤Î·¿¼°¤Ç¤Ï¤¢¤ê¤Þ¤»¤ó) ̾¤òÁªÂò¤·¤Þ¤¹¡£" -#: src/gutenprintui/panel.c:1902 src/gutenprintui2/panel.c:1902 +#: src/gutenprintui2/panel.c:2077 msgid "Setup Printer..." -msgstr "プリンタã®é¸æŠž..." +msgstr "¥×¥ê¥ó¥¿¤ÎÁªÂò..." -#: src/gutenprintui/panel.c:1904 src/gutenprintui2/panel.c:1904 +#: src/gutenprintui2/panel.c:2079 msgid "" "Choose the printer model, PPD file, and command that is used to print to " "this printer" -msgstr "プリンタã®åž‹å¼ã¨ PPD ファイルã€å°åˆ·ã‚³ãƒžãƒ³ãƒ‰ã‚’é¸æŠžã—ã¾ã™ã€‚" +msgstr "¥×¥ê¥ó¥¿¤Î·¿¼°¤È PPD ¥Õ¥¡¥¤¥ë¡¢°õºþ¥³¥Þ¥ó¥É¤òÁªÂò¤·¤Þ¤¹¡£" -#: src/gutenprintui/panel.c:1917 src/gutenprintui2/panel.c:1917 +#: src/gutenprintui2/panel.c:2092 msgid "New Printer..." -msgstr "æ–°ã—ã„プリンタ..." +msgstr "¿·¤·¤¤¥×¥ê¥ó¥¿..." -#: src/gutenprintui/panel.c:1918 src/gutenprintui2/panel.c:1918 +#: src/gutenprintui2/panel.c:2093 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:1948 src/gutenprintui2/panel.c:1948 +#: src/gutenprintui2/panel.c:2123 #, fuzzy msgid "Set Printer Option Defaults" -msgstr "åˆæœŸå€¤ã«æˆ»ã™" +msgstr "½é´üÃͤËÌ᤹" -#: src/gutenprintui/panel.c:1949 src/gutenprintui2/panel.c:1949 +#: src/gutenprintui2/panel.c:2124 msgid "Set all printer options to their defaults" msgstr "" -#: src/gutenprintui/panel.c:1972 src/gutenprintui2/panel.c:1972 +#: src/gutenprintui2/panel.c:2147 #, fuzzy msgid "Image Size" -msgstr "ç”»åƒã®ã‚µã‚¤ã‚º" +msgstr "²èÁü¤Î¥µ¥¤¥º" -#: src/gutenprintui/panel.c:1997 src/gutenprintui2/panel.c:1997 +#: src/gutenprintui2/panel.c:2172 msgid "Scaling:" -msgstr "拡大縮å°:" +msgstr "³ÈÂç½Ì¾®:" -#: src/gutenprintui/panel.c:2001 src/gutenprintui2/panel.c:2001 +#: src/gutenprintui2/panel.c:2176 msgid "Set the scale (size) of the image" -msgstr "ç”»åƒã‚µã‚¤ã‚ºã®æ‹¡å¤§ç¸®å°ã‚’è¡Œã„ã¾ã™ã€‚" +msgstr "²èÁü¥µ¥¤¥º¤Î³ÈÂç½Ì¾®¤ò¹Ô¤¤¤Þ¤¹¡£" -#: src/gutenprintui/panel.c:2023 src/gutenprintui2/panel.c:2023 +#: src/gutenprintui2/panel.c:2198 msgid "Scale by:" msgstr "" -#: src/gutenprintui/panel.c:2028 src/gutenprintui2/panel.c:2028 +#: src/gutenprintui2/panel.c:2203 msgid "" "Select whether scaling is measured as percent of available page size or " "number of output dots per inch" msgstr "" -"拡大縮å°ã®å˜ä½ã¨ã—ã¦ã€ç”¨ç´™ã‚µã‚¤ã‚ºã«å¯¾ã™ã‚‹ç™¾åˆ†çŽ‡ (比率) ã‹ã€ãƒ‰ãƒƒãƒˆæ•°/インãƒã‚’é¸" -"択ã—ã¾ã™ã€‚" +"³ÈÂç½Ì¾®¤Îñ°Ì¤È¤·¤Æ¡¢Íѻ極¥¤¥º¤ËÂФ¹¤ëɴʬΨ (ÈæΨ) ¤«¡¢¥É¥Ã¥È¿ô/¥¤¥ó¥Á¤òÁª" +"Âò¤·¤Þ¤¹¡£" -#: src/gutenprintui/panel.c:2031 src/gutenprintui2/panel.c:2031 +#: src/gutenprintui2/panel.c:2206 msgid "Percent" -msgstr "比率" +msgstr "ÈæΨ" -#: src/gutenprintui/panel.c:2036 src/gutenprintui2/panel.c:2036 +#: src/gutenprintui2/panel.c:2211 msgid "Scale the print to the size of the page" -msgstr "用紙サイズを 100 ã¨ã—ãŸå ´åˆã®æ¯”率ã§ã™ã€‚" +msgstr "Íѻ極¥¤¥º¤ò 100 ¤È¤·¤¿¾ì¹ç¤ÎÈæΨ¤Ç¤¹¡£" -#: src/gutenprintui/panel.c:2040 src/gutenprintui2/panel.c:2040 +#: src/gutenprintui2/panel.c:2215 msgid "PPI" msgstr "PPI" -#: src/gutenprintui/panel.c:2045 src/gutenprintui2/panel.c:2045 +#: src/gutenprintui2/panel.c:2220 msgid "Scale the print to the number of dots per inch" -msgstr "ç”»åƒã®ãƒ‰ãƒƒãƒˆæ•°/インãƒã§ã™ã€‚" +msgstr "²èÁü¤Î¥É¥Ã¥È¿ô/¥¤¥ó¥Á¤Ç¤¹¡£" -#: src/gutenprintui/panel.c:2063 src/gutenprintui2/panel.c:2063 +#: src/gutenprintui2/panel.c:2238 msgid "Set the width of the print" -msgstr "å°åˆ·æ™‚ã®å¹…をセットã—ã¾ã™ã€‚" +msgstr "°õºþ»þ¤ÎÉý¤ò¥»¥Ã¥È¤·¤Þ¤¹¡£" -#: src/gutenprintui/panel.c:2065 src/gutenprintui2/panel.c:2065 +#: src/gutenprintui2/panel.c:2240 msgid "Set the height of the print" -msgstr "å°åˆ·æ™‚ã®é«˜ã•ã‚’セットã—ã¾ã™ã€‚" +msgstr "°õºþ»þ¤Î¹â¤µ¤ò¥»¥Ã¥È¤·¤Þ¤¹¡£" -#: src/gutenprintui/panel.c:2071 src/gutenprintui2/panel.c:2071 +#: src/gutenprintui2/panel.c:2246 msgid "" "Use Original\n" "Image Size" msgstr "" -"オリジナルã®\n" -"サイズã®åˆ©ç”¨" +"¥ª¥ê¥¸¥Ê¥ë¤Î\n" +"¥µ¥¤¥º¤ÎÍøÍÑ" -#: src/gutenprintui/panel.c:2077 src/gutenprintui2/panel.c:2077 +#: src/gutenprintui2/panel.c:2252 msgid "Set the print size to the size of the image" -msgstr "ç”»åƒã®ã‚ªãƒªã‚¸ãƒŠãƒ«ãƒ»ã‚µã‚¤ã‚ºã‚’å°åˆ·ã‚µã‚¤ã‚ºã«ã—ã¾ã™ã€‚" +msgstr "²èÁü¤Î¥ª¥ê¥¸¥Ê¥ë¡¦¥µ¥¤¥º¤ò°õºþ¥µ¥¤¥º¤Ë¤·¤Þ¤¹¡£" -#: src/gutenprintui/panel.c:2100 src/gutenprintui2/panel.c:2101 +#: src/gutenprintui2/panel.c:2276 msgid "Print Color Adjust" -msgstr "å°åˆ·ã‚«ãƒ©ãƒ¼èª¿æ•´" +msgstr "°õºþ¥«¥é¡¼Ä´À°" -#: src/gutenprintui/panel.c:2103 src/gutenprintui2/panel.c:2104 +#: src/gutenprintui2/panel.c:2279 msgid "Set Defaults" -msgstr "åˆæœŸå€¤ã«æˆ»ã™" +msgstr "½é´üÃͤËÌ᤹" -#: src/gutenprintui/panel.c:2105 src/gutenprintui2/panel.c:2106 +#: src/gutenprintui2/panel.c:2281 msgid "Close" -msgstr "é–‰ã˜ã‚‹" +msgstr "ÊĤ¸¤ë" -#: src/gutenprintui/panel.c:2134 src/gutenprintui2/panel.c:2135 +#: src/gutenprintui2/panel.c:2310 msgid "Image preview" -msgstr "ç”»åƒã®ãƒ—レビュー" +msgstr "²èÁü¤Î¥×¥ì¥Ó¥å¡¼" -#: src/gutenprintui/panel.c:2148 src/gutenprintui2/panel.c:2149 +#: src/gutenprintui2/panel.c:2324 msgid "View Output Channels:" msgstr "" -#: src/gutenprintui/panel.c:2234 src/gutenprintui2/panel.c:2240 +#: src/gutenprintui2/panel.c:2415 #, fuzzy msgid "Output" -msgstr "出力ã®ç¨®é¡ž:" +msgstr "½ÐÎϤμïÎà:" -#: src/gutenprintui/panel.c:2262 src/gutenprintui2/panel.c:2268 +#: src/gutenprintui2/panel.c:2443 msgid "Output Type:" -msgstr "出力ã®ç¨®é¡ž:" +msgstr "½ÐÎϤμïÎà:" -#: src/gutenprintui/panel.c:2266 src/gutenprintui2/panel.c:2272 +#: src/gutenprintui2/panel.c:2447 msgid "Select the desired output type" -msgstr "出力ã™ã‚‹å½¢æ…‹ã‚’é¸æŠžã—ã¾ã™ã€‚" +msgstr "½ÐÎϤ¹¤ë·ÁÂÖ¤òÁªÂò¤·¤Þ¤¹¡£" -#: src/gutenprintui/panel.c:2287 src/gutenprintui2/panel.c:2293 +#: src/gutenprintui2/panel.c:2468 msgid "Adjust Output..." -msgstr "出力ã®èª¿æ•´..." +msgstr "½ÐÎϤÎÄ´À°..." -#: src/gutenprintui/panel.c:2296 src/gutenprintui2/panel.c:2302 +#: src/gutenprintui2/panel.c:2477 msgid "" "Adjust color balance, brightness, contrast, saturation, and dither algorithm" msgstr "" -"カラーãƒãƒ©ãƒ³ã‚¹ã€æ˜Žã‚‹ã•ã€ã‚³ãƒ³ãƒˆãƒ©ã‚¹ãƒˆã€å½©åº¦ã¨ãƒ‡ã‚£ã‚¶ãƒªãƒ³ã‚°æ–¹å¼ã‚’調整ã—ã¾ã™ã€‚" +"¥«¥é¡¼¥Ð¥é¥ó¥¹¡¢ÌÀ¤ë¤µ¡¢¥³¥ó¥È¥é¥¹¥È¡¢ºÌÅ٤ȥǥ£¥¶¥ê¥ó¥°Êý¼°¤òÄ´À°¤·¤Þ¤¹¡£" -#: src/gutenprintui/panel.c:2314 src/gutenprintui2/panel.c:2321 +#: src/gutenprintui2/panel.c:2496 #, fuzzy msgid "Size Units:" -msgstr "å˜ä½:" +msgstr "ñ°Ì:" -#: src/gutenprintui/panel.c:2317 src/gutenprintui2/panel.c:2324 +#: src/gutenprintui2/panel.c:2499 #, fuzzy msgid " " msgstr "> " -#: src/gutenprintui/panel.c:2341 src/gutenprintui2/panel.c:2348 +#: src/gutenprintui2/panel.c:2523 msgid "Units:" -msgstr "å˜ä½:" +msgstr "ñ°Ì:" -#: src/gutenprintui/panel.c:2346 src/gutenprintui2/panel.c:2353 +#: src/gutenprintui2/panel.c:2528 msgid "Select the base unit of measurement for printing" -msgstr "å°åˆ·æ™‚ã®åŸºæœ¬å˜ä½ã‚’é¸æŠžã—ã¾ã™ã€‚" +msgstr "°õºþ»þ¤Î´ðËÜñ°Ì¤òÁªÂò¤·¤Þ¤¹¡£" -#: src/gutenprintui/plist.c:90 src/gutenprintui/plist.c:99 -#: src/gutenprintui2/plist.c:89 src/gutenprintui2/plist.c:98 +#: src/gutenprintui2/plist.c:92 src/gutenprintui2/plist.c:101 msgid "System V lp" msgstr "" -#: src/gutenprintui/plist.c:96 src/gutenprintui2/plist.c:95 +#: src/gutenprintui2/plist.c:98 msgid "CUPS" msgstr "" -#: src/gutenprintui/plist.c:102 src/gutenprintui2/plist.c:101 +#: src/gutenprintui2/plist.c:104 msgid "Berkeley lpd (/etc/lpc)" msgstr "" -#: src/gutenprintui/plist.c:105 src/gutenprintui2/plist.c:104 +#: src/gutenprintui2/plist.c:107 msgid "Berkeley lpd (/usr/bsd/lpc)" msgstr "" -#: src/gutenprintui/plist.c:108 src/gutenprintui2/plist.c:107 +#: src/gutenprintui2/plist.c:110 msgid "Berkeley lpd (/usr/etc/lpc" msgstr "" -#: src/gutenprintui/plist.c:111 src/gutenprintui2/plist.c:110 +#: src/gutenprintui2/plist.c:113 msgid "Berkeley lpd (/usr/libexec/lpc)" msgstr "" -#: src/gutenprintui/plist.c:114 src/gutenprintui2/plist.c:113 +#: src/gutenprintui2/plist.c:116 msgid "Berkeley lpd (/usr/sbin/lpc)" msgstr "" -#: src/gutenprintui/plist.c:1043 src/gutenprintui2/plist.c:1057 +#: src/gutenprintui2/plist.c:1060 #, fuzzy msgid "Printer" -msgstr "å°åˆ·" +msgstr "°õºþ" -#: src/gutenprintui/plist.c:1230 src/gutenprintui2/plist.c:1250 +#: src/gutenprintui2/plist.c:1253 #, fuzzy msgid "(Default Printer)" -msgstr "プリンタã®é¸æŠž" - -#: src/gutenprintui2/curve.c:130 -#, fuzzy -msgid "Curve type" -msgstr "黒色" - -#: src/gutenprintui2/curve.c:131 -msgid "Is this curve linear, spline interpolated, or free-form" -msgstr "" - -#: src/gutenprintui2/curve.c:139 -msgid "Minimum X" -msgstr "" - -#: src/gutenprintui2/curve.c:140 -msgid "Minimum possible value for X" -msgstr "" - -#: src/gutenprintui2/curve.c:149 -msgid "Maximum X" -msgstr "" - -#: src/gutenprintui2/curve.c:150 -msgid "Maximum possible X value" -msgstr "" - -#: src/gutenprintui2/curve.c:159 -msgid "Minimum Y" -msgstr "" - -#: src/gutenprintui2/curve.c:160 -msgid "Minimum possible value for Y" -msgstr "" - -#: src/gutenprintui2/curve.c:169 -msgid "Maximum Y" -msgstr "" - -#: src/gutenprintui2/curve.c:170 -msgid "Maximum possible value for Y" -msgstr "" - -#: src/gutenprintui2/gammacurve.c:418 -msgid "_Gamma value" -msgstr "" +msgstr "¥×¥ê¥ó¥¿¤ÎÁªÂò" #: src/cups/genppd.c:145 #, fuzzy msgid "Printer Features" -msgstr "プリンタã®è¨­å®š" +msgstr "¥×¥ê¥ó¥¿¤ÎÀßÄê" #: src/cups/genppd.c:146 #, fuzzy msgid "Output Control" -msgstr "出力ã®ç¨®é¡ž:" +msgstr "½ÐÎϤμïÎà:" #: src/cups/genppd.c:151 #, fuzzy msgid "Common" -msgstr "コマンド:" +msgstr "¥³¥Þ¥ó¥É:" #: src/cups/genppd.c:152 #, fuzzy msgid "Extra 1" -msgstr "トレイ１" +msgstr "¥È¥ì¥¤£±" #: src/cups/genppd.c:153 #, fuzzy msgid "Extra 2" -msgstr "トレイ２" +msgstr "¥È¥ì¥¤£²" #: src/cups/genppd.c:154 #, fuzzy msgid "Extra 3" -msgstr "トレイ３" +msgstr "¥È¥ì¥¤£³" #: src/cups/genppd.c:155 #, fuzzy msgid "Extra 4" -msgstr "トレイ４" +msgstr "¥È¥ì¥¤£´" #: src/cups/genppd.c:156 msgid "Extra 5" @@ -7247,54 +7622,54 @@ msgstr "" #. 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:1058 +#: src/cups/genppd.c:1064 msgid "English" msgstr "Japanese" #. TRANSLATORS: Specify PPD translation encoding e.g. ISOLatin1 -#: src/cups/genppd.c:1060 +#: src/cups/genppd.c:1066 msgid "ISOLatin1" -msgstr "ISO ラテン１" +msgstr "ISO ¥é¥Æ¥ó£±" -#: src/cups/genppd.c:1641 +#: src/cups/genppd.c:1647 msgid "2-Sided Printing" msgstr "" -#: src/cups/genppd.c:1665 +#: src/cups/genppd.c:1671 msgid "Shrink Page If Necessary to Fit Borders" msgstr "" -#: src/cups/genppd.c:1669 +#: src/cups/genppd.c:1675 msgid "Shrink (print the whole page)" msgstr "" -#: src/cups/genppd.c:1670 +#: src/cups/genppd.c:1676 msgid "Crop (preserve dimensions)" msgstr "" -#: src/cups/genppd.c:1671 +#: src/cups/genppd.c:1677 msgid "Expand (use maximum page area)" msgstr "" -#: src/cups/genppd.c:1756 +#: src/cups/genppd.c:1762 msgid "No" msgstr "" -#: src/cups/genppd.c:1758 +#: src/cups/genppd.c:1764 msgid "Yes" msgstr "" -#: src/cups/genppd.c:1795 src/cups/genppd.c:1857 +#: src/cups/genppd.c:1801 src/cups/genppd.c:1863 msgid "Value" msgstr "" -#: src/cups/genppd.c:1800 +#: src/cups/genppd.c:1806 msgid "Fine Adjustment" msgstr "" #: src/escputil/escputil.c:70 msgid "Escputil version " -msgstr "Escputil ãƒãƒ¼ã‚¸ãƒ§ãƒ³ " +msgstr "Escputil ¥Ð¡¼¥¸¥ç¥ó " #: src/escputil/escputil.c:76 #, fuzzy @@ -7317,18 +7692,18 @@ msgid "" msgstr "" "Copyright 2000 Robert Krawitz (rlk@alum.mit.edu)\n" "\n" -"ã“ã®ãƒ—ログラムã¯ãƒ•ãƒªãƒ¼ã‚½ãƒ•ãƒˆã‚¦ã‚§ã‚¢ã§ã™; フリーソフトウェア財団ãŒç™ºè¡Œã™ã‚‹\n" -"GNU 公有使用許諾契約書ã®ç¬¬äºŒç‰ˆã¾ãŸã¯ãれ以é™ã®ç‰ˆã®ä¸‹ã§æ”¹å¤‰ãƒ»ä¿®æ­£ãƒ»å†é…布ãŒ\n" -"èªã‚られã¦ã„ã¾ã™ã€‚\n" +"¤³¤Î¥×¥í¥°¥é¥à¤Ï¥Õ¥ê¡¼¥½¥Õ¥È¥¦¥§¥¢¤Ç¤¹; ¥Õ¥ê¡¼¥½¥Õ¥È¥¦¥§¥¢ºâÃĤ¬È¯¹Ô¤¹¤ë\n" +"GNU ¸øÍ­»ÈÍѵöÂú·ÀÌó½ñ¤ÎÂèÆóÈǤޤ¿¤Ï¤½¤ì°Ê¹ß¤ÎÈǤβ¼¤Ç²þÊÑ¡¦½¤Àµ¡¦ºÆÇÛÉÛ¤¬\n" +"ǧ¤á¤é¤ì¤Æ¤¤¤Þ¤¹¡£\n" "\n" -"ã“ã®ãƒ—ログラムã¯ä¾¿åˆ©ã«ä½¿ã£ã¦ã‚‚らãˆã‚‹ã‚ˆã†ã«é…布ã•ã‚Œã¦ã„ã¾ã™ãŒã€\n" -"完全ã«ç„¡ä¿è¨¼ã§ã™; 商用利用ã¾ãŸã¯ã‚る特定ã®ç›®çš„ã«ãŠã‘ã‚‹é©åˆæ€§ã®ä¿è¨¼ã‚‚\n" -"ã‚ã‚Šã¾ã›ã‚“。詳細㯠GNU 公有使用許諾契約書をã”覧下ã•ã„。\n" +"¤³¤Î¥×¥í¥°¥é¥à¤ÏÊØÍø¤Ë»È¤Ã¤Æ¤â¤é¤¨¤ë¤è¤¦¤ËÇÛÉÛ¤µ¤ì¤Æ¤¤¤Þ¤¹¤¬¡¢\n" +"´°Á´¤Ë̵ÊݾڤǤ¹; ¾¦ÍÑÍøÍѤޤ¿¤Ï¤¢¤ëÆÃÄê¤ÎÌÜŪ¤Ë¤ª¤±¤ëŬ¹çÀ­¤ÎÊݾڤâ\n" +"¤¢¤ê¤Þ¤»¤ó¡£¾ÜºÙ¤Ï GNU ¸øÍ­»ÈÍѵöÂú·ÀÌó½ñ¤ò¤´Í÷²¼¤µ¤¤¡£\n" "\n" -"è²´æ–¹ã¯ã€ã“ã®ãƒ—ログラムã«é©å¿œã—㟠GNU 公有使用許諾契約書ã®ã‚³ãƒ”ーを\n" -"å—ã‘å–ã‚‹å¿…è¦ãŒã‚ã‚Šã¾ã™; ã‚‚ã—å—ã‘å–ã£ã¦ã„ãªã„å ´åˆã¯ã€\n" +"µ®Êý¤Ï¡¢¤³¤Î¥×¥í¥°¥é¥à¤ËŬ±þ¤·¤¿ GNU ¸øÍ­»ÈÍѵöÂú·ÀÌó½ñ¤Î¥³¥Ô¡¼¤ò\n" +"¼õ¤±¼è¤ëɬÍפ¬¤¢¤ê¤Þ¤¹; ¤â¤·¼õ¤±¼è¤Ã¤Æ¤¤¤Ê¤¤¾ì¹ç¤Ï¡¢\n" "Free Software Foundation, Inc., 56 Temple Place - \n" -"Suite 330, Boston, MA 02111-1307, USA ã¾ã§é€£çµ¡ã—ã¦ä¸‹ã•ã„。\n" +"Suite 330, Boston, MA 02111-1307, USA ¤Þ¤ÇÏ¢Íí¤·¤Æ²¼¤µ¤¤¡£\n" #: src/escputil/escputil.c:119 #, fuzzy @@ -7376,48 +7751,48 @@ 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 "" -"用法: escputil [-c | -n | -a | -i | -o | -s | -d | -l | -M]\n" -" [-P プリンタ | -r デãƒã‚¤ã‚¹å] [-u] [-q] [-m åž‹å¼]\n" -"EPSON Stylus (R) プリンタã®ç®¡ç†ã‚’è¡Œã†ãƒ„ールã§ã™ã€‚\n" -"用例: escputil --clean-head --printer stpex-on-third-floor\n" +"ÍÑË¡: escputil [-c | -n | -a | -i | -o | -s | -d | -l | -M]\n" +" [-P ¥×¥ê¥ó¥¿ | -r ¥Ç¥Ð¥¤¥¹Ì¾] [-u] [-q] [-m ·¿¼°]\n" +"EPSON Stylus (R) ¥×¥ê¥ó¥¿¤Î´ÉÍý¤ò¹Ô¤¦¥Ä¡¼¥ë¤Ç¤¹¡£\n" +"ÍÑÎã: escputil --clean-head --printer stpex-on-third-floor\n" " escputil --ink-level --new --raw-device /dev/lp0\n" "\n" -" コマンド:\n" -" -c|--clean-head プリンタã®ãƒ˜ãƒƒãƒ‰ã‚’清掃ã™ã‚‹ã€‚\n" -" -n|--nozzle-check ノズルã®ãƒ†ã‚¹ãƒˆãƒ‘ターンをå°åˆ·ã™ã‚‹ã€‚\n" -" ノズルãŒæ±šã‹ã£ãŸã‚Šã€è©°ã¾ã£ã¦ã„ã‚‹ã¨ãƒ‘ターンã«æºãŒè¡¨ç¤ºã•" -"ã‚Œã¾ã™ã€‚\n" -" æºãŒå°åˆ·ã•ã‚ŒãŸã‚‰ã€ãƒ—リンタã®ãƒ˜ãƒƒãƒ‰ã‚’清掃ã—ã¦ä¸‹ã•ã„。\n" -" -a|--align-head プリンタã®ãƒ˜ãƒƒãƒ‰ã‚’一列ã«ä¸¦ã¹ã‚‹ã€‚\n" -" ã€è­¦å‘Šã€‘: ã“ã®ã‚³ãƒžãƒ³ãƒ‰ã‚’乱用ã™ã‚‹ã¨ã€\n" -" å°åˆ·ã®å“質ãŒä½Žä¸‹ã™ã‚‹ã‹ã€ã‚ã‚‹ã„ã¯ãƒ—リンタ故障ã®åŽŸå› ã«ãª" -"ã‚Šã¾ã™ã€‚\n" -" -o|--align-color カラーå°åˆ·ã®ãƒ˜ãƒƒãƒ‰ã‚’一列ã«ä¸¦ã¹ã‚‹ (Stylus Color 480 㨠" -"580 ã®ã¿)。\n" -" ã€è­¦å‘Šã€‘: ã“ã®ã‚³ãƒžãƒ³ãƒ‰ã‚’乱用ã™ã‚‹ã¨ã€\n" -" å°åˆ·ã®å“質ãŒä½Žä¸‹ã™ã‚‹ã‹ã€ã‚ã‚‹ã„ã¯ãƒ—リンタ故障ã®åŽŸå› ã«ãª" -"ã‚Šã¾ã™ã€‚\n" -" -s|--status プリンタã®çŠ¶æ…‹ã‚’å–å¾—ã™ã‚‹ã€‚\n" -" -i|--ink-level インクã®ãƒ¬ãƒ™ãƒ«ã‚’プリンタã‹ã‚‰å–å¾—ã™ã‚‹ã€‚\n" -" ã“ã‚Œã¯ãƒ—リンタã®ä½Žãƒ¬ãƒ™ãƒ«ãƒ»ãƒ‡ãƒã‚¤ã‚¹ã¸ã®\n" -" アクセス権 (読ã¿æ›¸ã) ãŒå¿…è¦ã§ã™ã€‚\n" -" -d|--identify プリンタ情報 (åž‹å¼ãªã©) ã‚’å•ã„åˆã‚ã›ã‚‹ã€‚\n" -" ã“ã‚Œã¯ãƒ—リンタã®ä½Žãƒ¬ãƒ™ãƒ«ãƒ»ãƒ‡ãƒã‚¤ã‚¹ã¸ã®\n" -" アクセス権 (読ã¿æ›¸ã) ãŒå¿…è¦ã§ã™ã€‚\n" -" -l|--license ã“ã®ãƒ—ログラムã®ãƒ©ã‚¤ã‚»ãƒ³ã‚¹/注æ„書ãを表示ã™ã‚‹ã€‚\n" -" -M|--list-models 利用å¯èƒ½ãªãƒ—リンタã®åž‹å¼ã‚’一覧表示ã™ã‚‹ã€‚\n" -" -h|--help ã“ã®ãƒ¡ãƒƒã‚»ãƒ¼ã‚¸ã‚’表示ã™ã‚‹ã€‚\n" -" オプション:\n" -" -P|--printer-name プリンタをæ“作ã™ã‚‹ãŸã‚ã«ã€ãƒ—リンタ・キューã®åå‰ã‚’指定" -"ã™ã‚‹ã€‚\n" -" åˆæœŸå€¤ã¯ã€ãƒ‡ãƒ•ã‚©ãƒ«ãƒˆã®ã‚·ã‚¹ãƒ†ãƒ ãƒ»ãƒ—リンタåã§ã™ã€‚\n" -" -r|--raw-device プリンタ・キュー経由ã§ã¯ãªãã€ç›´æŽ¥æ›¸ã込むデãƒã‚¤ã‚¹åã‚’" -"指定ã™ã‚‹ã€‚\n" -" -u|--new æ–°ã—ã„プリンタã®å ´åˆã«æŒ‡å®šã™ã‚‹ (Stylus Color 740 ã¾ãŸ" -"ã¯ãれ以é™)。\n" -" -q|--quiet ãƒãƒŠãƒ¼ã‚’表示ã—ãªã„。\n" -" -m|--model ヘッドを一列ã«ä¸¦ã¹ã‚‹ãŸã‚ã«ã€æ­£ç¢ºãªãƒ—リンタã®åž‹å¼ã‚’指定" -"ã™ã‚‹ã€‚\n" +" ¥³¥Þ¥ó¥É:\n" +" -c|--clean-head ¥×¥ê¥ó¥¿¤Î¥Ø¥Ã¥É¤òÀ¶Áݤ¹¤ë¡£\n" +" -n|--nozzle-check ¥Î¥º¥ë¤Î¥Æ¥¹¥È¥Ñ¥¿¡¼¥ó¤ò°õºþ¤¹¤ë¡£\n" +" ¥Î¥º¥ë¤¬±ø¤«¤Ã¤¿¤ê¡¢µÍ¤Þ¤Ã¤Æ¤¤¤ë¤È¥Ñ¥¿¡¼¥ó¤Ë¹Â¤¬É½¼¨¤µ" +"¤ì¤Þ¤¹¡£\n" +" ¹Â¤¬°õºþ¤µ¤ì¤¿¤é¡¢¥×¥ê¥ó¥¿¤Î¥Ø¥Ã¥É¤òÀ¶Áݤ·¤Æ²¼¤µ¤¤¡£\n" +" -a|--align-head ¥×¥ê¥ó¥¿¤Î¥Ø¥Ã¥É¤ò°ìÎó¤Ëʤ٤롣\n" +" ¡Ú·Ù¹ð¡Û: ¤³¤Î¥³¥Þ¥ó¥É¤òÍðÍѤ¹¤ë¤È¡¢\n" +" °õºþ¤ÎÉʼÁ¤¬Äã²¼¤¹¤ë¤«¡¢¤¢¤ë¤¤¤Ï¥×¥ê¥ó¥¿¸Î¾ã¤Î¸¶°ø¤Ë¤Ê" +"¤ê¤Þ¤¹¡£\n" +" -o|--align-color ¥«¥é¡¼°õºþ¤Î¥Ø¥Ã¥É¤ò°ìÎó¤Ëʤ٤ë (Stylus Color 480 ¤È " +"580 ¤Î¤ß)¡£\n" +" ¡Ú·Ù¹ð¡Û: ¤³¤Î¥³¥Þ¥ó¥É¤òÍðÍѤ¹¤ë¤È¡¢\n" +" °õºþ¤ÎÉʼÁ¤¬Äã²¼¤¹¤ë¤«¡¢¤¢¤ë¤¤¤Ï¥×¥ê¥ó¥¿¸Î¾ã¤Î¸¶°ø¤Ë¤Ê" +"¤ê¤Þ¤¹¡£\n" +" -s|--status ¥×¥ê¥ó¥¿¤Î¾õÂÖ¤ò¼èÆÀ¤¹¤ë¡£\n" +" -i|--ink-level ¥¤¥ó¥¯¤Î¥ì¥Ù¥ë¤ò¥×¥ê¥ó¥¿¤«¤é¼èÆÀ¤¹¤ë¡£\n" +" ¤³¤ì¤Ï¥×¥ê¥ó¥¿¤ÎÄã¥ì¥Ù¥ë¡¦¥Ç¥Ð¥¤¥¹¤Ø¤Î\n" +" ¥¢¥¯¥»¥¹¸¢ (Æɤ߽ñ¤­) ¤¬É¬ÍפǤ¹¡£\n" +" -d|--identify ¥×¥ê¥ó¥¿¾ðÊó (·¿¼°¤Ê¤É) ¤òÌ䤤¹ç¤ï¤»¤ë¡£\n" +" ¤³¤ì¤Ï¥×¥ê¥ó¥¿¤ÎÄã¥ì¥Ù¥ë¡¦¥Ç¥Ð¥¤¥¹¤Ø¤Î\n" +" ¥¢¥¯¥»¥¹¸¢ (Æɤ߽ñ¤­) ¤¬É¬ÍפǤ¹¡£\n" +" -l|--license ¤³¤Î¥×¥í¥°¥é¥à¤Î¥é¥¤¥»¥ó¥¹/Ãí°Õ½ñ¤­¤òɽ¼¨¤¹¤ë¡£\n" +" -M|--list-models ÍøÍѲÄǽ¤Ê¥×¥ê¥ó¥¿¤Î·¿¼°¤ò°ìÍ÷ɽ¼¨¤¹¤ë¡£\n" +" -h|--help ¤³¤Î¥á¥Ã¥»¡¼¥¸¤òɽ¼¨¤¹¤ë¡£\n" +" ¥ª¥×¥·¥ç¥ó:\n" +" -P|--printer-name ¥×¥ê¥ó¥¿¤òÁàºî¤¹¤ë¤¿¤á¤Ë¡¢¥×¥ê¥ó¥¿¡¦¥­¥å¡¼¤Î̾Á°¤ò»ØÄê" +"¤¹¤ë¡£\n" +" ½é´üÃͤϡ¢¥Ç¥Õ¥©¥ë¥È¤Î¥·¥¹¥Æ¥à¡¦¥×¥ê¥ó¥¿Ì¾¤Ç¤¹¡£\n" +" -r|--raw-device ¥×¥ê¥ó¥¿¡¦¥­¥å¡¼·Ðͳ¤Ç¤Ï¤Ê¤¯¡¢Ä¾Àܽñ¤­¹þ¤à¥Ç¥Ð¥¤¥¹Ì¾¤ò" +"»ØÄꤹ¤ë¡£\n" +" -u|--new ¿·¤·¤¤¥×¥ê¥ó¥¿¤Î¾ì¹ç¤Ë»ØÄꤹ¤ë (Stylus Color 740 ¤Þ¤¿" +"¤Ï¤½¤ì°Ê¹ß)¡£\n" +" -q|--quiet ¥Ð¥Ê¡¼¤òɽ¼¨¤·¤Ê¤¤¡£\n" +" -m|--model ¥Ø¥Ã¥É¤ò°ìÎó¤Ëʤ٤뤿¤á¤Ë¡¢Àµ³Î¤Ê¥×¥ê¥ó¥¿¤Î·¿¼°¤ò»ØÄê" +"¤¹¤ë¡£\n" #: src/escputil/escputil.c:162 #, fuzzy @@ -7463,51 +7838,51 @@ msgid "" " -C Specify the number of pattern choices for alignment\n" " -p Specify the number of sets of patterns for alignment\n" msgstr "" -"用法: escputil [オプション] [コマンド]\n" -"用法: escputil [-c | -n | -a | -i | -o | -s | -d | -l | -M]\n" -" [-P プリンタ | -r デãƒã‚¤ã‚¹å] [-u] [-q] [-m åž‹å¼]\n" -"EPSON Stylus (R) プリンタã®ç®¡ç†ã‚’è¡Œã†ãƒ„ールã§ã™ã€‚\n" -"用例: escputil -c -P stpex-on-third-floor\n" +"ÍÑË¡: escputil [¥ª¥×¥·¥ç¥ó] [¥³¥Þ¥ó¥É]\n" +"ÍÑË¡: escputil [-c | -n | -a | -i | -o | -s | -d | -l | -M]\n" +" [-P ¥×¥ê¥ó¥¿ | -r ¥Ç¥Ð¥¤¥¹Ì¾] [-u] [-q] [-m ·¿¼°]\n" +"EPSON Stylus (R) ¥×¥ê¥ó¥¿¤Î´ÉÍý¤ò¹Ô¤¦¥Ä¡¼¥ë¤Ç¤¹¡£\n" +"ÍÑÎã: escputil -c -P stpex-on-third-floor\n" " escputil -i -u -r /dev/lp0\n" "\n" -" コマンド:\n" -" -c プリンタã®ãƒ˜ãƒƒãƒ‰ã‚’清掃ã™ã‚‹ã€‚\n" -" -n ノズルã®ãƒ†ã‚¹ãƒˆãƒ‘ターンをå°åˆ·ã™ã‚‹ã€‚\n" -" ノズルãŒæ±šã‹ã£ãŸã‚Šã€è©°ã¾ã£ã¦ã„ã‚‹ã¨ãƒ‘ターンã«æºãŒè¡¨ç¤ºã•ã‚Œã¾ã™ã€‚\n" -" æºãŒå°åˆ·ã•ã‚ŒãŸã‚‰ã€ãƒ—リンタã®ãƒ˜ãƒƒãƒ‰ã‚’清掃ã—ã¦ä¸‹ã•ã„。\n" -" -a プリンタã®ãƒ˜ãƒƒãƒ‰ã‚’一列ã«ä¸¦ã¹ã‚‹ã€‚\n" -" ã€è­¦å‘Šã€‘: ã“ã®ã‚³ãƒžãƒ³ãƒ‰ã‚’乱用ã™ã‚‹ã¨ã€\n" -" å°åˆ·ã®å“質ãŒä½Žä¸‹ã™ã‚‹ã‹ã€ã‚ã‚‹ã„ã¯ãƒ—リンタ故障ã®åŽŸå› ã«ãªã‚Šã¾ã™\n" -" -o カラーå°åˆ·ã®ãƒ˜ãƒƒãƒ‰ã‚’一列ã«ä¸¦ã¹ã‚‹ (Stylus Color 480 㨠580 ã®ã¿)。\n" -" ã€è­¦å‘Šã€‘: ã“ã®ã‚³ãƒžãƒ³ãƒ‰ã‚’乱用ã™ã‚‹ã¨ã€\n" -" å°åˆ·ã®å“質ãŒä½Žä¸‹ã™ã‚‹ã‹ã€ã‚ã‚‹ã„ã¯ãƒ—リンタ故障ã®åŽŸå› ã«ãªã‚Šã¾ã™ã€‚\n" -" -s プリンタã®çŠ¶æ…‹ã‚’å–å¾—ã™ã‚‹ã€‚\n" -" -i インクã®ãƒ¬ãƒ™ãƒ«ã‚’プリンタã‹ã‚‰å–å¾—ã™ã‚‹ã€‚\n" -" ã“ã‚Œã¯ãƒ—リンタã®ä½Žãƒ¬ãƒ™ãƒ«ãƒ»ãƒ‡ãƒã‚¤ã‚¹ã¸ã®ã‚¢ã‚¯ã‚»ã‚¹æ¨© (読ã¿æ›¸ã) ãŒå¿…è¦ã§" -"ã™ã€‚\n" -" -d プリンタ情報 (åž‹å¼ãªã©) ã‚’å•ã„åˆã‚ã›ã‚‹ã€‚\n" -" ã“ã‚Œã¯ãƒ—リンタã®ä½Žãƒ¬ãƒ™ãƒ«ãƒ»ãƒ‡ãƒã‚¤ã‚¹ã¸ã®\n" -" アクセス権 (読ã¿æ›¸ã) ãŒå¿…è¦ã§ã™ã€‚\n" -" -l ã“ã®ãƒ—ログラムã®ãƒ©ã‚¤ã‚»ãƒ³ã‚¹/注æ„書ãを表示ã™ã‚‹ã€‚\n" -" -M 利用å¯èƒ½ãªãƒ—リンタã®åž‹å¼ã‚’一覧表示ã™ã‚‹ã€‚\n" -" -h ã“ã®ãƒ¡ãƒƒã‚»ãƒ¼ã‚¸ã‚’表示ã™ã‚‹ã€‚\n" -" オプション:\n" -" -P プリンタをæ“作ã™ã‚‹ãŸã‚ã«ã€ãƒ—リンタ・キューã®åå‰ã‚’指定ã™ã‚‹ã€‚\n" -" åˆæœŸå€¤ã¯ã€ãƒ‡ãƒ•ã‚©ãƒ«ãƒˆã®ã‚·ã‚¹ãƒ†ãƒ ãƒ»ãƒ—リンタåã§ã™ã€‚\n" -" -r プリンタ・キュー経由ã§ã¯ãªãã€ç›´æŽ¥æ›¸ã込むデãƒã‚¤ã‚¹åを指定ã™ã‚‹ã€‚\n" -" -u æ–°ã—ã„プリンタã®å ´åˆã«æŒ‡å®šã™ã‚‹ (Stylus Color 740 ã¾ãŸã¯ãれ以é™)。\n" -" -q ãƒãƒŠãƒ¼ã‚’表示ã—ãªã„。\n" -" -m ヘッドを一列ã«ä¸¦ã¹ã‚‹ãŸã‚ã«ã€æ­£ç¢ºãªãƒ—リンタã®åž‹å¼ã‚’指定ã™ã‚‹ã€‚\n" +" ¥³¥Þ¥ó¥É:\n" +" -c ¥×¥ê¥ó¥¿¤Î¥Ø¥Ã¥É¤òÀ¶Áݤ¹¤ë¡£\n" +" -n ¥Î¥º¥ë¤Î¥Æ¥¹¥È¥Ñ¥¿¡¼¥ó¤ò°õºþ¤¹¤ë¡£\n" +" ¥Î¥º¥ë¤¬±ø¤«¤Ã¤¿¤ê¡¢µÍ¤Þ¤Ã¤Æ¤¤¤ë¤È¥Ñ¥¿¡¼¥ó¤Ë¹Â¤¬É½¼¨¤µ¤ì¤Þ¤¹¡£\n" +" ¹Â¤¬°õºþ¤µ¤ì¤¿¤é¡¢¥×¥ê¥ó¥¿¤Î¥Ø¥Ã¥É¤òÀ¶Áݤ·¤Æ²¼¤µ¤¤¡£\n" +" -a ¥×¥ê¥ó¥¿¤Î¥Ø¥Ã¥É¤ò°ìÎó¤Ëʤ٤롣\n" +" ¡Ú·Ù¹ð¡Û: ¤³¤Î¥³¥Þ¥ó¥É¤òÍðÍѤ¹¤ë¤È¡¢\n" +" °õºþ¤ÎÉʼÁ¤¬Äã²¼¤¹¤ë¤«¡¢¤¢¤ë¤¤¤Ï¥×¥ê¥ó¥¿¸Î¾ã¤Î¸¶°ø¤Ë¤Ê¤ê¤Þ¤¹\n" +" -o ¥«¥é¡¼°õºþ¤Î¥Ø¥Ã¥É¤ò°ìÎó¤Ëʤ٤ë (Stylus Color 480 ¤È 580 ¤Î¤ß)¡£\n" +" ¡Ú·Ù¹ð¡Û: ¤³¤Î¥³¥Þ¥ó¥É¤òÍðÍѤ¹¤ë¤È¡¢\n" +" °õºþ¤ÎÉʼÁ¤¬Äã²¼¤¹¤ë¤«¡¢¤¢¤ë¤¤¤Ï¥×¥ê¥ó¥¿¸Î¾ã¤Î¸¶°ø¤Ë¤Ê¤ê¤Þ¤¹¡£\n" +" -s ¥×¥ê¥ó¥¿¤Î¾õÂÖ¤ò¼èÆÀ¤¹¤ë¡£\n" +" -i ¥¤¥ó¥¯¤Î¥ì¥Ù¥ë¤ò¥×¥ê¥ó¥¿¤«¤é¼èÆÀ¤¹¤ë¡£\n" +" ¤³¤ì¤Ï¥×¥ê¥ó¥¿¤ÎÄã¥ì¥Ù¥ë¡¦¥Ç¥Ð¥¤¥¹¤Ø¤Î¥¢¥¯¥»¥¹¸¢ (Æɤ߽ñ¤­) ¤¬É¬ÍפÇ" +"¤¹¡£\n" +" -d ¥×¥ê¥ó¥¿¾ðÊó (·¿¼°¤Ê¤É) ¤òÌ䤤¹ç¤ï¤»¤ë¡£\n" +" ¤³¤ì¤Ï¥×¥ê¥ó¥¿¤ÎÄã¥ì¥Ù¥ë¡¦¥Ç¥Ð¥¤¥¹¤Ø¤Î\n" +" ¥¢¥¯¥»¥¹¸¢ (Æɤ߽ñ¤­) ¤¬É¬ÍפǤ¹¡£\n" +" -l ¤³¤Î¥×¥í¥°¥é¥à¤Î¥é¥¤¥»¥ó¥¹/Ãí°Õ½ñ¤­¤òɽ¼¨¤¹¤ë¡£\n" +" -M ÍøÍѲÄǽ¤Ê¥×¥ê¥ó¥¿¤Î·¿¼°¤ò°ìÍ÷ɽ¼¨¤¹¤ë¡£\n" +" -h ¤³¤Î¥á¥Ã¥»¡¼¥¸¤òɽ¼¨¤¹¤ë¡£\n" +" ¥ª¥×¥·¥ç¥ó:\n" +" -P ¥×¥ê¥ó¥¿¤òÁàºî¤¹¤ë¤¿¤á¤Ë¡¢¥×¥ê¥ó¥¿¡¦¥­¥å¡¼¤Î̾Á°¤ò»ØÄꤹ¤ë¡£\n" +" ½é´üÃͤϡ¢¥Ç¥Õ¥©¥ë¥È¤Î¥·¥¹¥Æ¥à¡¦¥×¥ê¥ó¥¿Ì¾¤Ç¤¹¡£\n" +" -r ¥×¥ê¥ó¥¿¡¦¥­¥å¡¼·Ðͳ¤Ç¤Ï¤Ê¤¯¡¢Ä¾Àܽñ¤­¹þ¤à¥Ç¥Ð¥¤¥¹Ì¾¤ò»ØÄꤹ¤ë¡£\n" +" -u ¿·¤·¤¤¥×¥ê¥ó¥¿¤Î¾ì¹ç¤Ë»ØÄꤹ¤ë (Stylus Color 740 ¤Þ¤¿¤Ï¤½¤ì°Ê¹ß)¡£\n" +" -q ¥Ð¥Ê¡¼¤òɽ¼¨¤·¤Ê¤¤¡£\n" +" -m ¥Ø¥Ã¥É¤ò°ìÎó¤Ëʤ٤뤿¤á¤Ë¡¢Àµ³Î¤Ê¥×¥ê¥ó¥¿¤Î·¿¼°¤ò»ØÄꤹ¤ë¡£\n" #: src/escputil/escputil.c:333 src/escputil/escputil.c:341 #, c-format msgid "You may only specify one printer or raw device." -msgstr "プリンタã¾ãŸã¯ä½Žãƒ¬ãƒ™ãƒ«ã®ãƒ‡ãƒã‚¤ã‚¹ã‚’一ã¤æŒ‡å®šã™ã‚‹ã“ã¨ãŒå¯èƒ½ã§ã™ã€‚" +msgstr "¥×¥ê¥ó¥¿¤Þ¤¿¤ÏÄã¥ì¥Ù¥ë¤Î¥Ç¥Ð¥¤¥¹¤ò°ì¤Ä»ØÄꤹ¤ë¤³¤È¤¬²Äǽ¤Ç¤¹¡£" #: src/escputil/escputil.c:349 #, c-format msgid "You may only specify one printer model." -msgstr "プリンタã®åž‹å¼ã‚’一ã¤æŒ‡å®šã™ã‚‹ã“ã¨ãŒå¯èƒ½ã§ã™ã€‚" +msgstr "¥×¥ê¥ó¥¿¤Î·¿¼°¤ò°ì¤Ä»ØÄꤹ¤ë¤³¤È¤¬²Äǽ¤Ç¤¹¡£" #: src/escputil/escputil.c:373 #, c-format @@ -7522,7 +7897,7 @@ msgstr "" #: src/escputil/escputil.c:385 #, c-format msgid "Unknown option %c\n" -msgstr "ä¸æ˜Žãªã‚ªãƒ—ション %c\n" +msgstr "ÉÔÌÀ¤Ê¥ª¥×¥·¥ç¥ó %c\n" #: src/escputil/escputil.c:393 #, c-format @@ -7542,17 +7917,17 @@ msgstr "" #: src/escputil/escputil.c:463 #, c-format msgid "Cannot open device %s: %s\n" -msgstr "デãƒã‚¤ã‚¹ %s ã‚’é–‹ã‘ã¾ã›ã‚“: %s\n" +msgstr "¥Ç¥Ð¥¤¥¹ %s ¤ò³«¤±¤Þ¤»¤ó: %s\n" #: src/escputil/escputil.c:486 #, c-format msgid "Cannot print to printer %s with %s\n" -msgstr "プリンタ %s ã« %s を使ã£ã¦å°åˆ·ã™ã‚‹ã“ã¨ãŒã§ãã¾ã›ã‚“\n" +msgstr "¥×¥ê¥ó¥¿ %s ¤Ë %s ¤ò»È¤Ã¤Æ°õºþ¤¹¤ë¤³¤È¤¬¤Ç¤­¤Þ¤»¤ó\n" #: src/escputil/escputil.c:502 src/escputil/escputil.c:512 #, c-format msgid "Unable to send command to printer\n" -msgstr "プリンタã«ã‚³ãƒžãƒ³ãƒ‰ã‚’é€ä¿¡ã§ãã¾ã›ã‚“\n" +msgstr "¥×¥ê¥ó¥¿¤Ë¥³¥Þ¥ó¥É¤òÁ÷¿®¤Ç¤­¤Þ¤»¤ó\n" #: src/escputil/escputil.c:572 #, c-format @@ -7562,27 +7937,27 @@ msgstr "" #: src/escputil/escputil.c:577 #, c-format msgid "Cannot read from %s: %s\n" -msgstr "%s ã‹ã‚‰èª­ã¿è¾¼ã‚ã¾ã›ã‚“: %s\n" +msgstr "%s ¤«¤éÆɤ߹þ¤á¤Þ¤»¤ó: %s\n" #: src/escputil/escputil.c:729 #, fuzzy, c-format msgid "Please specify a raw device\n" -msgstr "低レベル・デãƒã‚¤ã‚¹ã‚’利用ã™ã‚‹ãŸã‚ã«ãƒ—リンタã®çŠ¶æ…‹ãŒå¿…è¦ã§ã™ã€‚\n" +msgstr "Äã¥ì¥Ù¥ë¡¦¥Ç¥Ð¥¤¥¹¤òÍøÍѤ¹¤ë¤¿¤á¤Ë¥×¥ê¥ó¥¿¤Î¾õÂÖ¤¬É¬ÍפǤ¹¡£\n" #: src/escputil/escputil.c:736 #, c-format msgid "Cannot open %s read/write: %s\n" -msgstr "%s を読ã¿æ›¸ãモードã§é–‹ã‘ã¾ã›ã‚“: %s\n" +msgstr "%s ¤òÆɤ߽ñ¤­¥â¡¼¥É¤Ç³«¤±¤Þ¤»¤ó: %s\n" #: src/escputil/escputil.c:783 #, fuzzy, c-format msgid "Unknown printer %s!\n" -msgstr "ä¸æ˜Žãªã‚ªãƒ—ション %s ã§ã™\n" +msgstr "ÉÔÌÀ¤Ê¥ª¥×¥·¥ç¥ó %s ¤Ç¤¹\n" #: src/escputil/escputil.c:819 src/escputil/escputil.c:1414 #, c-format msgid "Cannot write to %s: %s\n" -msgstr "%s ã«æ›¸ãè¾¼ã‚ã¾ã›ã‚“; %s\n" +msgstr "%s ¤Ë½ñ¤­¹þ¤á¤Þ¤»¤ó; %s\n" #: src/escputil/escputil.c:865 src/escputil/escputil.c:1379 #: src/escputil/escputil.c:1507 @@ -7592,7 +7967,7 @@ msgid "" "Cannot write to %s: %s\n" msgstr "" "\n" -"%s ã«æ›¸ãè¾¼ã‚ã¾ã›ã‚“: %s\n" +"%s ¤Ë½ñ¤­¹þ¤á¤Þ¤»¤ó: %s\n" #: src/escputil/escputil.c:908 #, c-format @@ -7602,8 +7977,8 @@ msgid "" "Please use -m to specify your printer model.\n" msgstr "" "\n" -"プリンタã®åž‹å¼ã‚’検出ã§ãã¾ã›ã‚“ã§ã—ãŸã€‚\n" -"ãŠä½¿ã„ã®ãƒ—リンタを特定ã™ã‚‹ãŸã‚ã« '-m' オプションを使用ã—ã¦ä¸‹ã•ã„。\n" +"¥×¥ê¥ó¥¿¤Î·¿¼°¤ò¸¡½Ð¤Ç¤­¤Þ¤»¤ó¤Ç¤·¤¿¡£\n" +"¤ª»È¤¤¤Î¥×¥ê¥ó¥¿¤òÆÃÄꤹ¤ë¤¿¤á¤Ë '-m' ¥ª¥×¥·¥ç¥ó¤ò»ÈÍѤ·¤Æ²¼¤µ¤¤¡£\n" #: src/escputil/escputil.c:977 src/escputil/escputil.c:983 #: src/escputil/escputil.c:984 src/escputil/escputil.c:1253 @@ -7628,7 +8003,7 @@ msgstr "" #: src/escputil/escputil.c:1030 #, fuzzy, c-format msgid "Status: Waiting\n" -msgstr "彩度:" +msgstr "ºÌÅÙ:" #: src/escputil/escputil.c:1033 #, c-format @@ -7683,12 +8058,12 @@ msgstr "" #: src/escputil/escputil.c:1071 #, fuzzy, c-format msgid "Error: Ink out\n" -msgstr "入力エラー\n" +msgstr "ÆþÎÏ¥¨¥é¡¼\n" #: src/escputil/escputil.c:1074 #, fuzzy, c-format msgid "Error: Paper out\n" -msgstr "入力エラー\n" +msgstr "ÆþÎÏ¥¨¥é¡¼\n" #: src/escputil/escputil.c:1077 #, c-format @@ -7742,13 +8117,13 @@ msgstr "" #: src/escputil/escputil.c:1210 src/escputil/escputil.c:1240 msgid "Ink color" -msgstr "インクã®è‰²" +msgstr "¥¤¥ó¥¯¤Î¿§" #: src/escputil/escputil.c:1210 src/escputil/escputil.c:1240 #: src/escputil/escputil.c:1598 src/escputil/escputil.c:1622 #: src/escputil/escputil.c:1642 msgid "Percent remaining" -msgstr "残りã®å‰²åˆ" +msgstr "»Ä¤ê¤Î³ä¹ç" #: src/escputil/escputil.c:1287 src/escputil/escputil.c:1290 #: src/escputil/escputil.c:1293 src/escputil/escputil.c:1296 @@ -7778,12 +8153,12 @@ msgstr "" #: src/escputil/escputil.c:1351 #, fuzzy, c-format msgid "Obtaining %s requires using a raw device.\n" -msgstr "低レベル・デãƒã‚¤ã‚¹ã‚’利用ã™ã‚‹ãŸã‚ã«å¿…è¦ãªã‚¤ãƒ³ã‚¯ãƒ»ãƒ¬ãƒ™ãƒ«ã‚’å–å¾—ã—ã¾ã™ã€‚\n" +msgstr "Äã¥ì¥Ù¥ë¡¦¥Ç¥Ð¥¤¥¹¤òÍøÍѤ¹¤ë¤¿¤á¤ËɬÍפʥ¤¥ó¥¯¡¦¥ì¥Ù¥ë¤ò¼èÆÀ¤·¤Þ¤¹¡£\n" #: src/escputil/escputil.c:1457 #, fuzzy, c-format msgid "Obtaining extended ink information requires using a raw device.\n" -msgstr "低レベル・デãƒã‚¤ã‚¹ã‚’利用ã™ã‚‹ãŸã‚ã«å¿…è¦ãªã‚¤ãƒ³ã‚¯ãƒ»ãƒ¬ãƒ™ãƒ«ã‚’å–å¾—ã—ã¾ã™ã€‚\n" +msgstr "Äã¥ì¥Ù¥ë¡¦¥Ç¥Ð¥¤¥¹¤òÍøÍѤ¹¤ë¤¿¤á¤ËɬÍפʥ¤¥ó¥¯¡¦¥ì¥Ù¥ë¤ò¼èÆÀ¤·¤Þ¤¹¡£\n" #: src/escputil/escputil.c:1598 src/escputil/escputil.c:1622 #: src/escputil/escputil.c:1642 @@ -7803,24 +8178,24 @@ msgstr "" #: src/escputil/escputil.c:1671 #, c-format msgid "Printer identification requires using a raw device.\n" -msgstr "低レベル・デãƒã‚¤ã‚¹ã‚’利用ã™ã‚‹ãŸã‚ã«ãƒ—リンタ識別å­ãŒå¿…è¦ã§ã™ã€‚\n" +msgstr "Äã¥ì¥Ù¥ë¡¦¥Ç¥Ð¥¤¥¹¤òÍøÍѤ¹¤ë¤¿¤á¤Ë¥×¥ê¥ó¥¿¼±Ê̻Ҥ¬É¬ÍפǤ¹¡£\n" #: src/escputil/escputil.c:1689 #, fuzzy, c-format msgid "Cannot identify printer model.\n" -msgstr "プリンタã®åž‹å¼ã‚’一ã¤æŒ‡å®šã™ã‚‹ã“ã¨ãŒå¯èƒ½ã§ã™ã€‚" +msgstr "¥×¥ê¥ó¥¿¤Î·¿¼°¤ò°ì¤Ä»ØÄꤹ¤ë¤³¤È¤¬²Äǽ¤Ç¤¹¡£" #: src/escputil/escputil.c:1711 #, c-format msgid "Cleaning heads...\n" -msgstr "ヘッドã®æ¸…掃中...\n" +msgstr "¥Ø¥Ã¥É¤ÎÀ¶ÁÝÃæ...\n" #: src/escputil/escputil.c:1728 #, c-format msgid "Running nozzle check, please ensure paper is in the printer.\n" msgstr "" -"ノズルをãƒã‚§ãƒƒã‚¯ã—ã¾ã™ã€‚プリンタã®ä¸­ã«ç”¨ç´™ãŒç¢ºå®Ÿã«å­˜åœ¨ã—ã¦ã„ã‚‹ã“ã¨ã‚’確èªã—ã¦" -"下ã•ã„。\n" +"¥Î¥º¥ë¤ò¥Á¥§¥Ã¥¯¤·¤Þ¤¹¡£¥×¥ê¥ó¥¿¤ÎÃæ¤ËÍѻ椬³Î¼Â¤Ë¸ºß¤·¤Æ¤¤¤ë¤³¤È¤ò³Îǧ¤·¤Æ" +"²¼¤µ¤¤¡£\n" #: src/escputil/escputil.c:1732 #, c-format @@ -7860,43 +8235,43 @@ msgid "" "It is essential that you not turn your printer off during this procedure.\n" "\n" msgstr "" -"ã”利用å‰ã«æ¬¡ã®èª¬æ˜Žã‚’注æ„æ·±ããŠèª­ã¿ä¸‹ã•ã„。\n" +"¤´ÍøÍÑÁ°¤Ë¼¡¤ÎÀâÌÀ¤òÃí°Õ¿¼¤¯¤ªÆɤ߲¼¤µ¤¤¡£\n" "\n" -"ã“ã®ãƒ„ール㯠EPSON 製㮠Stylus インクジェットå¼ãƒ—リンタã®\n" -"å°åˆ·ãƒ˜ãƒƒãƒ‰ã‚’一列ã«ä¸¦ã¹ã¦ãã‚Œã¾ã™ã€‚ã“ã®ãƒ„ールを使ã„ã™ãŽã‚‹ã¨ã€\n" -"å°åˆ·ã®å“質を低下ã•ã›ãƒ—リンタã®æ•…éšœã®åŽŸå› ã‚’引ãèµ·ã“ã™å¯èƒ½æ€§ãŒã‚ã‚Šã¾ã™ã€‚\n" -"ã“ã®ãƒ„ール㯠SEIKO EPSON 社ã§ãƒ†ã‚¹ãƒˆã—ãŸã‚ã‘ã§ã¯ãªã„ã®ã§ã€å…¨ãç„¡ä¿è¨¼ã§ã™ã€‚\n" -"ã“ã®ãƒ„ールã®ã”使用ã«ã¯ã”自身ã®è²¬ä»»ä¸‹ã§è¡Œã£ã¦ä¸‹ã•ã„。\n" +"¤³¤Î¥Ä¡¼¥ë¤Ï EPSON À½¤Î Stylus ¥¤¥ó¥¯¥¸¥§¥Ã¥È¼°¥×¥ê¥ó¥¿¤Î\n" +"°õºþ¥Ø¥Ã¥É¤ò°ìÎó¤Ëʤ٤Ƥ¯¤ì¤Þ¤¹¡£¤³¤Î¥Ä¡¼¥ë¤ò»È¤¤¤¹¤®¤ë¤È¡¢\n" +"°õºþ¤ÎÉʼÁ¤òÄã²¼¤µ¤»¥×¥ê¥ó¥¿¤Î¸Î¾ã¤Î¸¶°ø¤ò°ú¤­µ¯¤³¤¹²ÄǽÀ­¤¬¤¢¤ê¤Þ¤¹¡£\n" +"¤³¤Î¥Ä¡¼¥ë¤Ï SEIKO EPSON ¼Ò¤Ç¥Æ¥¹¥È¤·¤¿¤ï¤±¤Ç¤Ï¤Ê¤¤¤Î¤Ç¡¢Á´¤¯ÌµÊݾڤǤ¹¡£\n" +"¤³¤Î¥Ä¡¼¥ë¤Î¤´»ÈÍѤˤϤ´¼«¿È¤ÎÀÕǤ²¼¤Ç¹Ô¤Ã¤Æ²¼¤µ¤¤¡£\n" "\n" -"ã“ã®ãƒ„ール㯠%d 個ã®ãƒ†ã‚¹ãƒˆãƒ‘ターンをå°åˆ·ã—ã¾ã™ã€‚å„パターンã¯ã¨ã¦ã‚‚\n" -"シンプルã§ã™ã€‚ã“ã®ãƒ„ールã¯åž‚直ラインをé‡ã­ãªãŒã‚‰å°åˆ·ã—ãŸ\n" -"ペアã‹ã‚‰æ§‹æˆã•ã‚Œã‚‹ãƒ†ã‚¹ãƒˆãƒ‘ターンをå°åˆ·ã—ã¾ã™ã€‚\n" -"å„ペア・ラインã®ä¸‹ã«ã¯ %d 㨠%d ã®é–“を示㙠\"ペア番å·\" ãŒã‚ã‚Šã¾ã™ã€‚\n" +"¤³¤Î¥Ä¡¼¥ë¤Ï %d ¸Ä¤Î¥Æ¥¹¥È¥Ñ¥¿¡¼¥ó¤ò°õºþ¤·¤Þ¤¹¡£³Æ¥Ñ¥¿¡¼¥ó¤Ï¤È¤Æ¤â\n" +"¥·¥ó¥×¥ë¤Ç¤¹¡£¤³¤Î¥Ä¡¼¥ë¤Ï¿âľ¥é¥¤¥ó¤ò½Å¤Í¤Ê¤¬¤é°õºþ¤·¤¿\n" +"¥Ú¥¢¤«¤é¹½À®¤µ¤ì¤ë¥Æ¥¹¥È¥Ñ¥¿¡¼¥ó¤ò°õºþ¤·¤Þ¤¹¡£\n" +"³Æ¥Ú¥¢¡¦¥é¥¤¥ó¤Î²¼¤Ë¤Ï %d ¤È %d ¤Î´Ö¤ò¼¨¤¹ \"¥Ú¥¢ÈÖ¹æ\" ¤¬¤¢¤ê¤Þ¤¹¡£\n" "\n" -"二本ã®ãƒ©ã‚¤ãƒ³ã‚’観察ã™ã‚‹å ´åˆã¯ã€ãã®ãƒ©ã‚¤ãƒ³ã®ãƒšã‚¢ãŒç­‰ã—ã„é–“éš”ã«ãªã£ã¦ã„ã‚‹ã‹ã‚’\n" -"確èªã—ã¦ä¸‹ã•ã„。ã¤ã¾ã‚Šã€ä¸€æœ¬ã®ãƒ©ã‚¤ãƒ³ãŒæœ€é©ãªå½¢çŠ¶ã«ãªã£ã¦ã„ã‚‹ã‹ç¢ºèªã—ã¦ä¸‹ã•" -"ã„。\n" -"ãã—ã¦ã€ãã‚Œã¨ãƒšã‚¢ã«ãªã‚‹ãƒ©ã‚¤ãƒ³ãŒå¹³è¡¡ã«ãªã£ã¦ã„ã‚‹ã‹ã‚’注æ„æ·±ã確èªã—ã¦ä¸‹ã•" -"ã„。\n" -"虫メガãƒã‚„拡大é¡ã‚’使ã£ã¦ç´°ã‹ã„部分ã®ç¢ºèªã‚’ãŠå¥¨ã‚ã—ã¾ã™ã€‚\n" +"ÆóËܤΥ饤¥ó¤ò´Ñ»¡¤¹¤ë¾ì¹ç¤Ï¡¢¤½¤Î¥é¥¤¥ó¤Î¥Ú¥¢¤¬Åù¤·¤¤´Ö³Ö¤Ë¤Ê¤Ã¤Æ¤¤¤ë¤«¤ò\n" +"³Îǧ¤·¤Æ²¼¤µ¤¤¡£¤Ä¤Þ¤ê¡¢°ìËܤΥ饤¥ó¤¬ºÇŬ¤Ê·Á¾õ¤Ë¤Ê¤Ã¤Æ¤¤¤ë¤«³Îǧ¤·¤Æ²¼¤µ" +"¤¤¡£\n" +"¤½¤·¤Æ¡¢¤½¤ì¤È¥Ú¥¢¤Ë¤Ê¤ë¥é¥¤¥ó¤¬Ê¿¹Õ¤Ë¤Ê¤Ã¤Æ¤¤¤ë¤«¤òÃí°Õ¿¼¤¯³Îǧ¤·¤Æ²¼¤µ" +"¤¤¡£\n" +"Ãî¥á¥¬¥Í¤ä³ÈÂç¶À¤ò»È¤Ã¤ÆºÙ¤«¤¤Éôʬ¤Î³Îǧ¤ò¤ª¾©¤á¤·¤Þ¤¹¡£\n" "\n" -"ã¾ãŸãƒ†ã‚¹ãƒˆç”¨ã«é«˜å“質ãªç”¨ç´™ã‚’ãŠä½¿ã„ã™ã‚‹ã“ã¨ã‚‚ãŠå¥¨ã‚ã—ã¾ã™ã€‚高å“質ãªç”¨ç´™ã‚’\n" -"利用ã™ã‚‹ã¨ã€è¤‡æ•°ã®ãƒ©ã‚¤ãƒ³ãŒãã£ã¡ã‚Šã¨å°åˆ·ã•ã‚Œã¦ã«ã˜ã¿ãŒãªããªã‚Šã¾ã™ã€‚\n" -"最é©ãªãƒ©ã‚¤ãƒ³ã®ãƒšã‚¢ã®ç•ªå·ã‚’控ãˆãŸå¾Œã§ã€ãã®ç”¨ç´™ã‚’給紙トレイã«æˆ»ã—ã¦ä¸‹ã•ã„。\n" +"¤Þ¤¿¥Æ¥¹¥ÈÍѤ˹âÉʼÁ¤ÊÍÑ»æ¤ò¤ª»È¤¤¤¹¤ë¤³¤È¤â¤ª¾©¤á¤·¤Þ¤¹¡£¹âÉʼÁ¤ÊÍÑ»æ¤ò\n" +"ÍøÍѤ¹¤ë¤È¡¢Ê£¿ô¤Î¥é¥¤¥ó¤¬¤­¤Ã¤Á¤ê¤È°õºþ¤µ¤ì¤Æ¤Ë¤¸¤ß¤¬¤Ê¤¯¤Ê¤ê¤Þ¤¹¡£\n" +"ºÇŬ¤Ê¥é¥¤¥ó¤Î¥Ú¥¢¤ÎÈÖ¹æ¤ò¹µ¤¨¤¿¸å¤Ç¡¢¤½¤ÎÍÑ»æ¤òµë»æ¥È¥ì¥¤¤ËÌᤷ¤Æ²¼¤µ¤¤¡£\n" "\n" -"å„パターンã¯ä¼¼é€šã£ã¦ã„ã¾ã™ãŒã€æ‰‹ç´™ã®ãƒ‘ターンã¯ã‚ˆã‚Šå¾®ç´°ãªé…置を行ã†ãŸã‚ã«\n" -"ç´°ã‹ã„ドットを利用ã—ã¦ã„ã¾ã™ã€‚\n" -"æ­£ã—ã„並ã³ãŒå°åˆ·ã•ã‚Œã‚‹ã‚ˆã†ã€å…¨ã¦ã®ãƒ©ã‚¤ãƒ³ã‚’テストã—ã¦ä¸‹ã•ã„。\n" -"å…¨ã¦ã®ãƒ©ã‚¤ãƒ³ã‚’å°åˆ·ã™ã‚‹ã¨ã€ãƒ©ã‚¤ãƒ³ãƒ»ãƒ‘ターンをもã†ä¸€åº¦å°åˆ·ã—ã¾ã™ã€‚\n" -"中間ã«ã‚るラインã®ãƒšã‚¢ (#%d / %d 番目) ãŒå…¨ã¦ã®é–“éš”ã«å¯¾ã—ã¦\n" -"最é©ã§ã‚ã‚‹ã“ã¨ã‚’確èªã—ã¦ä¸‹ã•ã„。\n" +"³Æ¥Ñ¥¿¡¼¥ó¤Ï»÷Ä̤äƤ¤¤Þ¤¹¤¬¡¢¼ê»æ¤Î¥Ñ¥¿¡¼¥ó¤Ï¤è¤êÈùºÙ¤ÊÇÛÃÖ¤ò¹Ô¤¦¤¿¤á¤Ë\n" +"ºÙ¤«¤¤¥É¥Ã¥È¤òÍøÍѤ·¤Æ¤¤¤Þ¤¹¡£\n" +"Àµ¤·¤¤Ê¤Ӥ¬°õºþ¤µ¤ì¤ë¤è¤¦¡¢Á´¤Æ¤Î¥é¥¤¥ó¤ò¥Æ¥¹¥È¤·¤Æ²¼¤µ¤¤¡£\n" +"Á´¤Æ¤Î¥é¥¤¥ó¤ò°õºþ¤¹¤ë¤È¡¢¥é¥¤¥ó¡¦¥Ñ¥¿¡¼¥ó¤ò¤â¤¦°ìÅÙ°õºþ¤·¤Þ¤¹¡£\n" +"Ãæ´Ö¤Ë¤¢¤ë¥é¥¤¥ó¤Î¥Ú¥¢ (#%d / %d ÈÖÌÜ) ¤¬Á´¤Æ¤Î´Ö³Ö¤ËÂФ·¤Æ\n" +"ºÇŬ¤Ç¤¢¤ë¤³¤È¤ò³Îǧ¤·¤Æ²¼¤µ¤¤¡£\n" "\n" -"パターンã®å°åˆ·ãŒå®Œäº†ã—ãŸã‚‰ã€ãã®ãƒ—リンタ用ã«ãã®è¨­å®šã‚’ä¿å­˜ (s) ã™ã‚‹ã‹ã€\n" -"テストパターンをå†ã³å®Ÿè¡Œã™ã‚‹ (r) ã‹ã€ä¿å­˜ã—ãªã„ã§çµ‚了 (q) ã™ã‚‹ã‹\n" -"é¸æŠžã—ã¦ä¸‹ã•ã„。終了ã—ã¦ã‚‚以å‰ã®è¨­å®šã«æˆ»ã‚Šã¾ã›ã‚“ãŒã€\n" -"プリンタã®é›»æºã‚’ OFF ã«ã—ãªã„é™ã‚Šæˆ»ã™ã“ã¨ã¯å¯èƒ½ã§ã™ã€‚終了ã—ãŸå ´åˆã«ã€\n" -"ã‚ã¨ã§ãã®è¨­å®šã‚’ä¿å­˜ã—ãŸã„å ´åˆã¯ã€ã‚‚ã†ä¸€åº¦åŒã˜æ‰‹é †ã‚’è¡Œã£ã¦ä¸‹ã•ã„。\n" -"ã“ã®ä½œæ¥­ã‚’è¡Œã£ã¦ã„る最中ã«é›»æºã‚’ OFF ã«ã—ãªã„ã§ä¸‹ã•ã„。\n" +"¥Ñ¥¿¡¼¥ó¤Î°õºþ¤¬´°Î»¤·¤¿¤é¡¢¤½¤Î¥×¥ê¥ó¥¿ÍѤˤ½¤ÎÀßÄê¤òÊݸ (s) ¤¹¤ë¤«¡¢\n" +"¥Æ¥¹¥È¥Ñ¥¿¡¼¥ó¤òºÆ¤Ó¼Â¹Ô¤¹¤ë (r) ¤«¡¢Êݸ¤·¤Ê¤¤¤Ç½ªÎ» (q) ¤¹¤ë¤«\n" +"ÁªÂò¤·¤Æ²¼¤µ¤¤¡£½ªÎ»¤·¤Æ¤â°ÊÁ°¤ÎÀßÄê¤ËÌá¤ê¤Þ¤»¤ó¤¬¡¢\n" +"¥×¥ê¥ó¥¿¤ÎÅŸ»¤ò OFF ¤Ë¤·¤Ê¤¤¸Â¤êÌ᤹¤³¤È¤Ï²Äǽ¤Ç¤¹¡£½ªÎ»¤·¤¿¾ì¹ç¤Ë¡¢\n" +"¤¢¤È¤Ç¤½¤ÎÀßÄê¤òÊݸ¤·¤¿¤¤¾ì¹ç¤Ï¡¢¤â¤¦°ìÅÙƱ¤¸¼ê½ç¤ò¹Ô¤Ã¤Æ²¼¤µ¤¤¡£\n" +"¤³¤Îºî¶È¤ò¹Ô¤Ã¤Æ¤¤¤ëºÇÃæ¤ËÅŸ»¤ò OFF ¤Ë¤·¤Ê¤¤¤Ç²¼¤µ¤¤¡£\n" #: src/escputil/escputil.c:1767 #, c-format @@ -7933,41 +8308,41 @@ msgid "" "this procedure.\n" "\n" msgstr "" -"ã”利用å‰ã«æ¬¡ã®èª¬æ˜Žã‚’注æ„æ·±ããŠèª­ã¿ä¸‹ã•ã„。\n" +"¤´ÍøÍÑÁ°¤Ë¼¡¤ÎÀâÌÀ¤òÃí°Õ¿¼¤¯¤ªÆɤ߲¼¤µ¤¤¡£\n" "\n" -"ã“ã®ãƒ„ール㯠EPSON 製㮠Stylus インクジェットå¼ãƒ—リンタã®\n" -"å°åˆ·ãƒ˜ãƒƒãƒ‰ã‚’一列ã«ä¸¦ã¹ã¦ãã‚Œã¾ã™ã€‚ã“ã®ãƒ„ールを使ã„ã™ãŽã‚‹ã¨ã€\n" -"å°åˆ·ã®å“質を低下ã•ã›ãƒ—リンタã®æ•…éšœã®åŽŸå› ã‚’引ãèµ·ã“ã™å¯èƒ½æ€§ãŒã‚ã‚Šã¾ã™ã€‚\n" -"ã“ã®ãƒ„ール㯠SEIKO EPSON 社ã§ãƒ†ã‚¹ãƒˆã—ãŸã‚ã‘ã§ã¯ãªã„ã®ã§ã€å…¨ãç„¡ä¿è¨¼ã§ã™ã€‚\n" -"ã“ã®ãƒ„ールã®ã”使用ã«ã¯ã”自身ã®è²¬ä»»ä¸‹ã§è¡Œã£ã¦ä¸‹ã•ã„。\n" +"¤³¤Î¥Ä¡¼¥ë¤Ï EPSON À½¤Î Stylus ¥¤¥ó¥¯¥¸¥§¥Ã¥È¼°¥×¥ê¥ó¥¿¤Î\n" +"°õºþ¥Ø¥Ã¥É¤ò°ìÎó¤Ëʤ٤Ƥ¯¤ì¤Þ¤¹¡£¤³¤Î¥Ä¡¼¥ë¤ò»È¤¤¤¹¤®¤ë¤È¡¢\n" +"°õºþ¤ÎÉʼÁ¤òÄã²¼¤µ¤»¥×¥ê¥ó¥¿¤Î¸Î¾ã¤Î¸¶°ø¤ò°ú¤­µ¯¤³¤¹²ÄǽÀ­¤¬¤¢¤ê¤Þ¤¹¡£\n" +"¤³¤Î¥Ä¡¼¥ë¤Ï SEIKO EPSON ¼Ò¤Ç¥Æ¥¹¥È¤·¤¿¤ï¤±¤Ç¤Ï¤Ê¤¤¤Î¤Ç¡¢Á´¤¯ÌµÊݾڤǤ¹¡£\n" +"¤³¤Î¥Ä¡¼¥ë¤Î¤´»ÈÍѤˤϤ´¼«¿È¤ÎÀÕǤ²¼¤Ç¹Ô¤Ã¤Æ²¼¤µ¤¤¡£\n" "\n" -"ã“ã®ãƒ„ールã¯åž‚直ラインをé‡ã­ãªãŒã‚‰å°åˆ·ã—ãŸãƒšã‚¢ã‹ã‚‰æ§‹æˆã•ã‚Œã‚‹ãƒ†ã‚¹ãƒˆãƒ‘ターン" -"ã‚’\n" -"å°åˆ·ã—ã¾ã™ã€‚å„ペア・ラインã®ä¸‹ã«ã¯ %d 㨠%d ã®é–“を示㙠\"ペア番å·\" ãŒã‚ã‚Šã¾" -"ã™ã€‚\n" +"¤³¤Î¥Ä¡¼¥ë¤Ï¿âľ¥é¥¤¥ó¤ò½Å¤Í¤Ê¤¬¤é°õºþ¤·¤¿¥Ú¥¢¤«¤é¹½À®¤µ¤ì¤ë¥Æ¥¹¥È¥Ñ¥¿¡¼¥ó" +"¤ò\n" +"°õºþ¤·¤Þ¤¹¡£³Æ¥Ú¥¢¡¦¥é¥¤¥ó¤Î²¼¤Ë¤Ï %d ¤È %d ¤Î´Ö¤ò¼¨¤¹ \"¥Ú¥¢ÈÖ¹æ\" ¤¬¤¢¤ê¤Þ" +"¤¹¡£\n" "\n" -"二本ã®ãƒ©ã‚¤ãƒ³ã‚’観察ã™ã‚‹å ´åˆã¯ã€ãã®ãƒ©ã‚¤ãƒ³ã®ãƒšã‚¢ãŒç­‰ã—ã„é–“éš”ã«ãªã£ã¦ã„ã‚‹ã‹ã‚’\n" -"確èªã—ã¦ä¸‹ã•ã„。ã¤ã¾ã‚Šã€ä¸€æœ¬ã®ãƒ©ã‚¤ãƒ³ãŒæœ€é©ãªå½¢çŠ¶ã«ãªã£ã¦ã„ã‚‹ã‹ç¢ºèªã—ã¦ä¸‹ã•" -"ã„。\n" -"ãã—ã¦ã€ãã‚Œã¨ãƒšã‚¢ã«ãªã‚‹ãƒ©ã‚¤ãƒ³ãŒå¹³è¡¡ã«ãªã£ã¦ã„ã‚‹ã‹ã‚’注æ„æ·±ã確èªã—ã¦ä¸‹ã•" -"ã„。\n" -"虫メガãƒã‚„拡大é¡ã‚’使ã£ã¦ç´°ã‹ã„部分ã®ç¢ºèªã‚’ãŠå¥¨ã‚ã—ã¾ã™ã€‚\n" +"ÆóËܤΥ饤¥ó¤ò´Ñ»¡¤¹¤ë¾ì¹ç¤Ï¡¢¤½¤Î¥é¥¤¥ó¤Î¥Ú¥¢¤¬Åù¤·¤¤´Ö³Ö¤Ë¤Ê¤Ã¤Æ¤¤¤ë¤«¤ò\n" +"³Îǧ¤·¤Æ²¼¤µ¤¤¡£¤Ä¤Þ¤ê¡¢°ìËܤΥ饤¥ó¤¬ºÇŬ¤Ê·Á¾õ¤Ë¤Ê¤Ã¤Æ¤¤¤ë¤«³Îǧ¤·¤Æ²¼¤µ" +"¤¤¡£\n" +"¤½¤·¤Æ¡¢¤½¤ì¤È¥Ú¥¢¤Ë¤Ê¤ë¥é¥¤¥ó¤¬Ê¿¹Õ¤Ë¤Ê¤Ã¤Æ¤¤¤ë¤«¤òÃí°Õ¿¼¤¯³Îǧ¤·¤Æ²¼¤µ" +"¤¤¡£\n" +"Ãî¥á¥¬¥Í¤ä³ÈÂç¶À¤ò»È¤Ã¤ÆºÙ¤«¤¤Éôʬ¤Î³Îǧ¤ò¤ª¾©¤á¤·¤Þ¤¹¡£\n" "\n" -"å…¨ã¦ã®ãƒ©ã‚¤ãƒ³ã‚’å°åˆ·ã—ãŸã‚‰ã€ãƒ©ã‚¤ãƒ³ãƒ»ãƒ‘ターンをもã†ä¸€åº¦å°åˆ·ã—ã¾ã™ã€‚\n" -"中間ã«ã‚るラインã®ãƒšã‚¢ (#%d / %d 番目) ãŒå…¨ã¦ã®é–“éš”ã«å¯¾ã—ã¦\n" -"最é©ã§ã‚ã‚‹ã“ã¨ã‚’確èªã—ã¦ä¸‹ã•ã„。\n" -"ãã‚Œã‹ã‚‰ã€ãã®ãƒ—リンタ用ã«ãã®è¨­å®šã‚’ä¿å­˜ (s) ã™ã‚‹ã‹ã€\n" -"テストパターンをå†ã³å®Ÿè¡Œã™ã‚‹ (r) ã‹ã€ä¿å­˜ã—ãªã„ã§çµ‚了 (q) ã™ã‚‹ã‹\n" -"é¸æŠžã—ã¦ä¸‹ã•ã„。終了ã—ã¦ã‚‚以å‰ã®è¨­å®šã«æˆ»ã‚Šã¾ã›ã‚“ãŒã€\n" -"プリンタã®é›»æºã‚’ OFF ã«ã—ãªã„é™ã‚Šæˆ»ã™ã“ã¨ã¯å¯èƒ½ã§ã™ã€‚\n" -"終了ã—ãŸå ´åˆã«ã€ã‚ã¨ã§ãã®è¨­å®šã‚’ä¿å­˜ã—ãŸã„å ´åˆã¯ã€ã‚‚ã†ä¸€åº¦åŒã˜æ‰‹é †ã‚’è¡Œã£ã¦ä¸‹" -"ã•ã„。\n" -"ã“ã®ä½œæ¥­ã‚’è¡Œã£ã¦ã„る最中ã«é›»æºã‚’ OFF ã«ã—ãªã„ã§ä¸‹ã•ã„。\n" +"Á´¤Æ¤Î¥é¥¤¥ó¤ò°õºþ¤·¤¿¤é¡¢¥é¥¤¥ó¡¦¥Ñ¥¿¡¼¥ó¤ò¤â¤¦°ìÅÙ°õºþ¤·¤Þ¤¹¡£\n" +"Ãæ´Ö¤Ë¤¢¤ë¥é¥¤¥ó¤Î¥Ú¥¢ (#%d / %d ÈÖÌÜ) ¤¬Á´¤Æ¤Î´Ö³Ö¤ËÂФ·¤Æ\n" +"ºÇŬ¤Ç¤¢¤ë¤³¤È¤ò³Îǧ¤·¤Æ²¼¤µ¤¤¡£\n" +"¤½¤ì¤«¤é¡¢¤½¤Î¥×¥ê¥ó¥¿ÍѤˤ½¤ÎÀßÄê¤òÊݸ (s) ¤¹¤ë¤«¡¢\n" +"¥Æ¥¹¥È¥Ñ¥¿¡¼¥ó¤òºÆ¤Ó¼Â¹Ô¤¹¤ë (r) ¤«¡¢Êݸ¤·¤Ê¤¤¤Ç½ªÎ» (q) ¤¹¤ë¤«\n" +"ÁªÂò¤·¤Æ²¼¤µ¤¤¡£½ªÎ»¤·¤Æ¤â°ÊÁ°¤ÎÀßÄê¤ËÌá¤ê¤Þ¤»¤ó¤¬¡¢\n" +"¥×¥ê¥ó¥¿¤ÎÅŸ»¤ò OFF ¤Ë¤·¤Ê¤¤¸Â¤êÌ᤹¤³¤È¤Ï²Äǽ¤Ç¤¹¡£\n" +"½ªÎ»¤·¤¿¾ì¹ç¤Ë¡¢¤¢¤È¤Ç¤½¤ÎÀßÄê¤òÊݸ¤·¤¿¤¤¾ì¹ç¤Ï¡¢¤â¤¦°ìÅÙƱ¤¸¼ê½ç¤ò¹Ô¤Ã¤Æ²¼" +"¤µ¤¤¡£\n" +"¤³¤Îºî¶È¤ò¹Ô¤Ã¤Æ¤¤¤ëºÇÃæ¤ËÅŸ»¤ò OFF ¤Ë¤·¤Ê¤¤¤Ç²¼¤µ¤¤¡£\n" #: src/escputil/escputil.c:1811 #, c-format msgid "Unable to send command to the printer, exiting.\n" -msgstr "プリンタã«ã‚³ãƒžãƒ³ãƒ‰ã‚’é€ä¿¡ã§ãã¾ã›ã‚“。終了ã—ã¾ã™ã€‚\n" +msgstr "¥×¥ê¥ó¥¿¤Ë¥³¥Þ¥ó¥É¤òÁ÷¿®¤Ç¤­¤Þ¤»¤ó¡£½ªÎ»¤·¤Þ¤¹¡£\n" #: src/escputil/escputil.c:1825 src/escputil/escputil.c:1994 #, c-format @@ -7985,13 +8360,13 @@ msgid "" "You will then be asked to confirm your choice.\n" "What do you want to do (s, q, r)?\n" msgstr "" -"最終出力ã§ãƒ—リンタãŒæ­£ã—ã„é–“éš”ã§å°åˆ·ã—ã¦ã„ã‚‹ã‹ã‚’注æ„æ·±ã確èªã—ã¦ä¸‹ã•ã„。\n" -"確èªå¾Œã€æ¬¡ã®ä¸­ã‹ã‚‰é¸æŠžã—ã¦ä¸‹ã•ã„:\n" -" (s) プリンタã®ä¸­ã«ã“ã®è¨­å®šã‚’ä¿å­˜ã™ã‚‹\n" -" (q) ã“ã®è¨­å®šã‚’ä¿å­˜ã—ãªã„ã§çµ‚了ã™ã‚‹\n" -" (r) 最åˆã«æˆ»ã£ã¦å†ã³è¨­å®šã™ã‚‹\n" -"é¸æŠžå¾Œã«æœ€å¾Œã®ç¢ºèªãŒã‚ã‚Šã¾ã™ã€‚\n" -"é¸æŠžã—ã¦ä¸‹ã•ã„ (s, q, r)。\n" +"ºÇ½ª½ÐÎϤǥץê¥ó¥¿¤¬Àµ¤·¤¤´Ö³Ö¤Ç°õºþ¤·¤Æ¤¤¤ë¤«¤òÃí°Õ¿¼¤¯³Îǧ¤·¤Æ²¼¤µ¤¤¡£\n" +"³Îǧ¸å¡¢¼¡¤ÎÃ椫¤éÁªÂò¤·¤Æ²¼¤µ¤¤:\n" +" (s) ¥×¥ê¥ó¥¿¤ÎÃæ¤Ë¤³¤ÎÀßÄê¤òÊݸ¤¹¤ë\n" +" (q) ¤³¤ÎÀßÄê¤òÊݸ¤·¤Ê¤¤¤Ç½ªÎ»¤¹¤ë\n" +" (r) ºÇ½é¤ËÌá¤Ã¤ÆºÆ¤ÓÀßÄꤹ¤ë\n" +"ÁªÂò¸å¤ËºÇ¸å¤Î³Îǧ¤¬¤¢¤ê¤Þ¤¹¡£\n" +"ÁªÂò¤·¤Æ²¼¤µ¤¤ (s, q, r)¡£\n" #: src/escputil/escputil.c:1836 src/escputil/escputil.c:1845 #: src/escputil/escputil.c:1860 src/escputil/escputil.c:1878 @@ -8003,7 +8378,7 @@ msgstr "> " #, c-format msgid "" "Please confirm by typing 'q' again that you wish to quit without saving:\n" -msgstr "本当ã«è¨­å®šã‚’破棄ã—ã¦çµ‚了ã™ã‚‹å ´åˆã¯ã€å†åº¦ 'q' を入力ã—ã¦ä¸‹ã•ã„:\n" +msgstr "ËÜÅö¤ËÀßÄê¤òÇË´þ¤·¤Æ½ªÎ»¤¹¤ë¾ì¹ç¤Ï¡¢ºÆÅÙ 'q' ¤òÆþÎϤ·¤Æ²¼¤µ¤¤:\n" #: src/escputil/escputil.c:1850 #, c-format @@ -8011,20 +8386,20 @@ 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 "" -"ãŠä½¿ã„ã®ãƒ—リンタãŒè£œæ­£ã•ã‚Œã¾ã—ãŸã€‚但ã—ãã®é–“éš”ã¯ã¾ã ä¿å­˜ã•ã‚Œã¦ã„ã¾ã›ã‚“。\n" -"ãã®é–“隔をä¿å­˜ã™ã‚‹å ´åˆã¯ã€ã“ã®æ‰‹é †ã‚’ç¹°ã‚Šè¿”ã—ã¦ä¸‹ã•ã„。\n" +"¤ª»È¤¤¤Î¥×¥ê¥ó¥¿¤¬ÊäÀµ¤µ¤ì¤Þ¤·¤¿¡£Ã¢¤·¤½¤Î´Ö³Ö¤Ï¤Þ¤ÀÊݸ¤µ¤ì¤Æ¤¤¤Þ¤»¤ó¡£\n" +"¤½¤Î´Ö³Ö¤òÊݸ¤¹¤ë¾ì¹ç¤Ï¡¢¤³¤Î¼ê½ç¤ò·«¤êÊÖ¤·¤Æ²¼¤µ¤¤¡£\n" #: 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" +msgstr "ËÜÅö¤Ë´Ö³ÖÊäÀµ¤ÎÀßÄê¤ò¤ä¤êľ¤¹¾ì¹ç¤Ï¡¢ºÆÅÙ 'r' ¤òÆþÎϤ·¤Æ²¼¤µ¤¤:\n" #: src/escputil/escputil.c:1865 #, c-format msgid "Repeating the alignment process.\n" -msgstr "間隔補正ã®è¨­å®šã‚’ç¹°ã‚Šè¿”ã—ã¾ã™ã€‚\n" +msgstr "´Ö³ÖÊäÀµ¤ÎÀßÄê¤ò·«¤êÊÖ¤·¤Þ¤¹¡£\n" #: src/escputil/escputil.c:1871 #, c-format @@ -8035,22 +8410,22 @@ msgid "" "Please confirm by typing 's' again that you wish to save the settings\n" "to your printer:\n" msgstr "" -"ã“ã®æ“作ã¯ã€ãŠä½¿ã„ã®ãƒ—リンタã®è¨­å®šã‚’変更ã™ã‚‹ã“ã¨ã«ãªã‚Šã¾ã™ã€‚\n" -"ã€è­¦å‘Šã€‘: ã“ã®æ“作㯠SEIKO EPSON ã®æ‰¿èªã‚’å¾—ãŸã‚‚ã®ã§ã¯ã‚ã‚Šã¾ã›ã‚“。\n" -" ã¾ãŸã€ãŠä½¿ã„ã®ãƒ—リンタã«æ害を与ãˆã‚‹ã‹ã‚‚ã—ã‚Œã¾ã›ã‚“。\n" -"本当ã«å®œã—ã„ã§ã™ã‹ï¼Ÿ\n" -"ã“ã®è¨­å®šã‚’ãŠä½¿ã„ã®ãƒ—リンタã«ä¿å­˜ã™ã‚‹å ´åˆã¯ã€å†åº¦ 's' を入力ã—ã¦ä¸‹ã•ã„:\n" +"¤³¤ÎÁàºî¤Ï¡¢¤ª»È¤¤¤Î¥×¥ê¥ó¥¿¤ÎÀßÄê¤òÊѹ¹¤¹¤ë¤³¤È¤Ë¤Ê¤ê¤Þ¤¹¡£\n" +"¡Ú·Ù¹ð¡Û: ¤³¤ÎÁàºî¤Ï SEIKO EPSON ¤Î¾µÇ§¤òÆÀ¤¿¤â¤Î¤Ç¤Ï¤¢¤ê¤Þ¤»¤ó¡£\n" +" ¤Þ¤¿¡¢¤ª»È¤¤¤Î¥×¥ê¥ó¥¿¤Ë»³²¤òÍ¿¤¨¤ë¤«¤â¤·¤ì¤Þ¤»¤ó¡£\n" +"ËÜÅö¤Ëµ¹¤·¤¤¤Ç¤¹¤«¡©\n" +"¤³¤ÎÀßÄê¤ò¤ª»È¤¤¤Î¥×¥ê¥ó¥¿¤ËÊݸ¤¹¤ë¾ì¹ç¤Ï¡¢ºÆÅÙ 's' ¤òÆþÎϤ·¤Æ²¼¤µ¤¤:\n" "\n" #: src/escputil/escputil.c:1883 #, c-format msgid "About to save settings..." -msgstr "設定ã®ä¿å­˜ã™ã‚‹ã“ã¨ã«ã¤ã„ã¦..." +msgstr "ÀßÄê¤ÎÊݸ¤¹¤ë¤³¤È¤Ë¤Ä¤¤¤Æ..." #: src/escputil/escputil.c:1889 #, c-format msgid "failed!\n" -msgstr "失敗ã§ã™ï¼\n" +msgstr "¼ºÇԤǤ¹¡ª\n" #: src/escputil/escputil.c:1890 #, c-format @@ -8058,28 +8433,28 @@ msgid "" "Your settings were not saved successfully. You must repeat the\n" "alignment procedure.\n" msgstr "" -"ã‚ãªãŸã®è¨­å®šã®ä¿å­˜ã«å¤±æ•—ã—ã¾ã—ãŸã€‚\n" -"å†åº¦ã€é–“隔補正ã®è¨­å®šã‚’è¡Œã£ã¦ä¸‹ã•ã„。\n" +"¤¢¤Ê¤¿¤ÎÀßÄê¤ÎÊݸ¤Ë¼ºÇÔ¤·¤Þ¤·¤¿¡£\n" +"ºÆÅÙ¡¢´Ö³ÖÊäÀµ¤ÎÀßÄê¤ò¹Ô¤Ã¤Æ²¼¤µ¤¤¡£\n" #: src/escputil/escputil.c:1894 #, c-format msgid "succeeded!\n" -msgstr "完了ã—ã¾ã—ãŸï¼\n" +msgstr "´°Î»¤·¤Þ¤·¤¿¡ª\n" #: src/escputil/escputil.c:1895 #, c-format msgid "Your alignment settings have been saved to the printer.\n" -msgstr "間隔補正ã®è¨­å®šãŒãƒ—リンタã«ä¿å­˜ã•ã‚Œã¾ã—ãŸã€‚\n" +msgstr "´Ö³ÖÊäÀµ¤ÎÀßÄ꤬¥×¥ê¥ó¥¿¤ËÊݸ¤µ¤ì¤Þ¤·¤¿¡£\n" #: src/escputil/escputil.c:1900 #, c-format msgid "Unrecognized command.\n" -msgstr "èªè­˜ã§ããªã„コマンドã§ã™ã€‚\n" +msgstr "ǧ¼±¤Ç¤­¤Ê¤¤¥³¥Þ¥ó¥É¤Ç¤¹¡£\n" #: src/escputil/escputil.c:1903 #, c-format msgid "Final command was not confirmed.\n" -msgstr "最後ã®ã‚³ãƒžãƒ³ãƒ‰ãŒç¢ºèªã•ã‚Œã¦ã„ã¾ã›ã‚“。\n" +msgstr "ºÇ¸å¤Î¥³¥Þ¥ó¥É¤¬³Îǧ¤µ¤ì¤Æ¤¤¤Þ¤»¤ó¡£\n" #: src/escputil/escputil.c:1908 #, fuzzy, c-format @@ -8091,17 +8466,17 @@ msgid "" "Please place a sheet of paper in your printer to begin the head\n" "alignment procedure.\n" msgstr "" -"ã“ã®æ“作ã¯ã€ãŠä½¿ã„ã®ãƒ—リンタ㌠EPSON %s ã§ã‚ã‚‹ã¨æƒ³å®šã—ãŸã‚‚ã®ã§ã™ã€‚\n" -"ã‚‚ã—プリンタã®åž‹å¼ãŒç•°ãªã‚‹å ´åˆã¯ã€[CTRL]+C を入力ã—ã¦ä¸­æ–­ã—ã€\n" -"æ­£ã—ã„プリンタã®åž‹å¼ã‚’é¸æŠžã—ã¦ä¸‹ã•ã„。\n" +"¤³¤ÎÁàºî¤Ï¡¢¤ª»È¤¤¤Î¥×¥ê¥ó¥¿¤¬ EPSON %s ¤Ç¤¢¤ë¤ÈÁÛÄꤷ¤¿¤â¤Î¤Ç¤¹¡£\n" +"¤â¤·¥×¥ê¥ó¥¿¤Î·¿¼°¤¬°Û¤Ê¤ë¾ì¹ç¤Ï¡¢[CTRL]+C ¤òÆþÎϤ·¤ÆÃæÃǤ·¡¢\n" +"Àµ¤·¤¤¥×¥ê¥ó¥¿¤Î·¿¼°¤òÁªÂò¤·¤Æ²¼¤µ¤¤¡£\n" "\n" -"å°åˆ·ãƒ˜ãƒƒãƒ‰é–“隔補正を開始ã™ã‚‹å ´åˆã¯ã€ãƒ—リンタã®ãƒˆãƒ¬ã‚¤ã«\n" -"用紙を入れã¦ä¸‹ã•ã„。\n" +"°õºþ¥Ø¥Ã¥É´Ö³ÖÊäÀµ¤ò³«»Ï¤¹¤ë¾ì¹ç¤Ï¡¢¥×¥ê¥ó¥¿¤Î¥È¥ì¥¤¤Ë\n" +"ÍÑ»æ¤òÆþ¤ì¤Æ²¼¤µ¤¤¡£\n" #: src/escputil/escputil.c:1977 src/escputil/escputil.c:2008 #: src/escputil/escputil.c:2051 msgid "Press enter to continue > " -msgstr "何ã‹ã‚­ãƒ¼ã‚’入力ã™ã‚‹ã¨ç¶šè¡Œã—ã¾ã™ > " +msgstr "²¿¤«¥­¡¼¤òÆþÎϤ¹¤ë¤È³¹Ô¤·¤Þ¤¹ > " #: src/escputil/escputil.c:1984 #, c-format @@ -8110,44 +8485,44 @@ msgid "" "pattern.\n" "Type a pair number, '?' for help, or 'r' to repeat the procedure.\n" msgstr "" -"å°åˆ·çµæžœã‚’確èªã—ã¦ã€å„パターンã§æœ€é©ãªãƒ©ã‚¤ãƒ³ã®ãƒšã‚¢ã‚’é¸æŠžã—ã¦ä¸‹ã•ã„。\n" -"ãã®ãƒšã‚¢ã®ç•ªå·ã‚’入力ã‹ã€'r' ã§ã“ã®è¨­å®šã‚’ãã‚Šã‹ãˆã™ã‹ã€'?' ã§ãƒ˜ãƒ«ãƒ—を表示ã—ã¾" -"ã™ã€‚\n" +"°õºþ·ë²Ì¤ò³Îǧ¤·¤Æ¡¢³Æ¥Ñ¥¿¡¼¥ó¤ÇºÇŬ¤Ê¥é¥¤¥ó¤Î¥Ú¥¢¤òÁªÂò¤·¤Æ²¼¤µ¤¤¡£\n" +"¤½¤Î¥Ú¥¢¤ÎÈÖ¹æ¤òÆþÎϤ«¡¢'r' ¤Ç¤³¤ÎÀßÄê¤ò¤¯¤ê¤«¤¨¤¹¤«¡¢'?' ¤Ç¥Ø¥ë¥×¤òɽ¼¨¤·¤Þ" +"¤¹¡£\n" #: src/escputil/escputil.c:1997 #, c-format msgid "Pass #%d" -msgstr "パス #%d" +msgstr "¥Ñ¥¹ #%d" #: src/escputil/escputil.c:2005 src/escputil/escputil.c:2050 #, c-format msgid "Please insert a fresh sheet of paper.\n" -msgstr "æ–°ã—ã„用紙をトレイã«å…¥ã‚Œã¦ä¸‹ã•ã„。\n" +msgstr "¿·¤·¤¤ÍÑ»æ¤ò¥È¥ì¥¤¤ËÆþ¤ì¤Æ²¼¤µ¤¤¡£\n" #: src/escputil/escputil.c:2024 #, c-format msgid "Number out of range!\n" -msgstr "範囲外ã®ãƒšã‚¢ç•ªå·ã§ã™ï¼\n" +msgstr "Èϰϳ°¤Î¥Ú¥¢ÈÖ¹æ¤Ç¤¹¡ª\n" #: src/escputil/escputil.c:2029 #, c-format msgid "I cannot understand what you typed!\n" -msgstr "入力ã—ãŸã‚‚ã®ã¯ç„¡åŠ¹ã§ã™ï¼\n" +msgstr "ÆþÎϤ·¤¿¤â¤Î¤Ï̵¸ú¤Ç¤¹¡ª\n" #: src/escputil/escputil.c:2035 #, c-format msgid "The best pair of lines should be numbered between 1 and %d.\n" -msgstr "最é©ãªãƒ©ã‚¤ãƒ³ã®ãƒšã‚¢ã¯ 1 㨠%d ã®é–“ã®ç•ªå·ã«ã—ã¦ä¸‹ã•ã„。\n" +msgstr "ºÇŬ¤Ê¥é¥¤¥ó¤Î¥Ú¥¢¤Ï 1 ¤È %d ¤Î´Ö¤ÎÈÖ¹æ¤Ë¤·¤Æ²¼¤µ¤¤¡£\n" #: src/escputil/escputil.c:2042 #, c-format msgid "Attempting to set alignment..." -msgstr "間隔補正中..." +msgstr "´Ö³ÖÊäÀµÃæ..." #: src/escputil/escputil.c:2045 #, c-format msgid "succeeded.\n" -msgstr "完了ã—ã¾ã—ãŸã€‚\n" +msgstr "´°Î»¤·¤Þ¤·¤¿¡£\n" #: src/escputil/escputil.c:2046 #, c-format @@ -8157,235 +8532,100 @@ msgid "" "pattern %d. If it is not, you should repeat the process to get the best\n" "quality printing.\n" msgstr "" -"間隔補正ãŒæ­£ã—ã„ã‹ç¢ºèªã—ã¦ä¸‹ã•ã„。å†åº¦ãƒ†ã‚¹ãƒˆãƒ‘ターンã®å°åˆ·ãŒå®Œäº†ã—ãŸå¾Œã«\n" -"å„ラインã®æœ€é©ãªãƒ‘ターンãŒãƒ‘ターン %d ã«ãªã£ã¦ã„ã‚‹ã‹ç¢ºèªã—ã¦ä¸‹ã•ã„。\n" -"ã‚‚ã—最é©ãªãƒ‘ターンã§ãªã„å ´åˆã¯ã€æœ€é©ãªå°åˆ·å“質を得るãŸã‚ã«\n" -"åŒæ§˜ã®æ“作を繰り返ã—ã¦ä¸‹ã•ã„。\n" +"´Ö³ÖÊäÀµ¤¬Àµ¤·¤¤¤«³Îǧ¤·¤Æ²¼¤µ¤¤¡£ºÆÅ٥ƥ¹¥È¥Ñ¥¿¡¼¥ó¤Î°õºþ¤¬´°Î»¤·¤¿¸å¤Ë\n" +"³Æ¥é¥¤¥ó¤ÎºÇŬ¤Ê¥Ñ¥¿¡¼¥ó¤¬¥Ñ¥¿¡¼¥ó %d ¤Ë¤Ê¤Ã¤Æ¤¤¤ë¤«³Îǧ¤·¤Æ²¼¤µ¤¤¡£\n" +"¤â¤·ºÇŬ¤Ê¥Ñ¥¿¡¼¥ó¤Ç¤Ê¤¤¾ì¹ç¤Ï¡¢ºÇŬ¤Ê°õºþÉʼÁ¤òÆÀ¤ë¤¿¤á¤Ë\n" +"ƱÍͤÎÁàºî¤ò·«¤êÊÖ¤·¤Æ²¼¤µ¤¤¡£\n" #: src/escputil/escputil.c:2092 #, c-format msgid "Error in input\n" -msgstr "入力エラー\n" +msgstr "ÆþÎÏ¥¨¥é¡¼\n" -#: src/gimp/print-image-gimp.c:225 src/gimp2/print-image-gimp.c:225 +#: src/gimp2/print-image-gimp.c:225 msgid "Printing..." -msgstr "å°åˆ·ä¸­..." - -#: src/gimp/print.c:133 -msgid "/File/Print..." -msgstr "/File/å°åˆ·..." - -#: src/ghost/ijsgutenprint.c:98 -#, c-format -msgid "" -"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" -msgstr "" - -#: 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:199 -#, fuzzy, c-format -msgid "ERROR: ijsgutenprint: No row buffer\n" -msgstr "低レベルãƒãƒƒãƒ•ã‚¡ãŒã‚ã‚Šã¾ã›ã‚“\n" - -#: 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:498 -#, fuzzy, c-format -msgid "ERROR: ijsgutenprint: Printer must be specified with -sDeviceModel\n" -msgstr "プリンタを -såž‹å¼ ã‚’ä½¿ã£ã¦æŒ‡å®šã—ã¦ä¸‹ã•ã„\n" - -#: 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:656 -#, c-format -msgid "ijsgutenprint: unknown DeviceModel %s\n" -msgstr "" - -#: src/ghost/ijsgutenprint.c:700 -#, fuzzy, c-format -msgid "ERROR: ijsgutenprint: cannot parse TopLeft %s\n" -msgstr "プリンタ %s ã« %s を使ã£ã¦å°åˆ·ã™ã‚‹ã“ã¨ãŒã§ãã¾ã›ã‚“\n" - -#: src/ghost/ijsgutenprint.c:723 -#, fuzzy, c-format -msgid "ERROR: ijsgutenprint: cannot parse PaperSize %s\n" -msgstr "プリンタ %s ã« %s を使ã£ã¦å°åˆ·ã™ã‚‹ã“ã¨ãŒã§ãã¾ã›ã‚“\n" - -#: src/ghost/ijsgutenprint.c:795 -#, fuzzy, c-format -msgid "ERROR: ijsgutenprint: cannot parse curve %s\n" -msgstr "プリンタ %s ã« %s を使ã£ã¦å°åˆ·ã™ã‚‹ã“ã¨ãŒã§ãã¾ã›ã‚“\n" - -#: src/ghost/ijsgutenprint.c:802 -#, fuzzy, c-format -msgid "ERROR: ijsgutenprint: cannot parse %s float %s\n" -msgstr "プリンタ %s ã« %s を使ã£ã¦å°åˆ·ã™ã‚‹ã“ã¨ãŒã§ãã¾ã›ã‚“\n" +msgstr "°õºþÃæ..." -#: 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:816 -#, fuzzy, c-format -msgid "ERROR: ijsgutenprint: cannot parse %s dimension %s\n" -msgstr "プリンタ %s ã« %s を使ã£ã¦å°åˆ·ã™ã‚‹ã“ã¨ãŒã§ãã¾ã›ã‚“\n" - -#: src/ghost/ijsgutenprint.c:830 -#, fuzzy, c-format -msgid "ERROR: ijsgutenprint: cannot parse %s boolean %s\n" -msgstr "プリンタ %s ã« %s を使ã£ã¦å°åˆ·ã™ã‚‹ã“ã¨ãŒã§ãã¾ã›ã‚“\n" +#, fuzzy +#~ msgid "ERROR: ijsgutenprint: Bad color space: bps %d channels %d space %s\n" +#~ msgstr "¤ª¤«¤·¤Ê¥«¥é¡¼¶õ´Ö: bps %d ¥Á¥ã¥ó¥Í¥ë %d ¶õ´Ö %s\n" -#: src/ghost/ijsgutenprint.c:841 -#, fuzzy, c-format -msgid "ERROR: ijsgutenprint: Bad parameter %s %d\n" -msgstr "プリンタ %s ãŒä¸æ˜Žã§ã™\n" +#, fuzzy +#~ msgid "ERROR: ijsgutenprint: No row buffer\n" +#~ msgstr "Äã¥ì¥Ù¥ë¥Ð¥Ã¥Õ¥¡¤¬¤¢¤ê¤Þ¤»¤ó\n" -#: src/ghost/ijsgutenprint.c:867 -#, fuzzy, c-format -msgid "ERROR: ijsgutenprint: bad key code %d\n" -msgstr "%.0f ã§æ¬¡ã®ä½Žãƒ¬ãƒ™ãƒ«ãƒ•ã‚£ãƒ¼ãƒ«ãƒ‰ã‚’å–å¾—ã—ã¾ã™\n" +#, fuzzy +#~ msgid "" +#~ "ERROR: ijsgutenprint: Unable to parse parameter %s=%s (expect a number)\n" +#~ msgstr "¥Ñ¥é¥á¡¼¥¿ %s=%s (¤ª¤½¤é¤¯¿ôÃÍ) ¤ò²òÀϤǤ­¤Þ¤»¤ó\n" -#: src/ghost/ijsgutenprint.c:1308 -#, fuzzy, c-format -msgid "ERROR: ijsgutenprint: image_init failed %d\n" -msgstr "image_init ã«å¤±æ•— %d\n" +#, fuzzy +#~ msgid "ERROR: ijsgutenprint: Printer must be specified with -sDeviceModel\n" +#~ msgstr "¥×¥ê¥ó¥¿¤ò -s·¿¼° ¤ò»È¤Ã¤Æ»ØÄꤷ¤Æ²¼¤µ¤¤\n" -#: src/ghost/ijsgutenprint.c:1319 -#, fuzzy, c-format -msgid "ERROR: ijsgutenprint: Unable to open file descriptor: %s\n" -msgstr "ファイル・ディスクリプタを開ã‘ã¾ã›ã‚“: %s\n" +#, fuzzy +#~ msgid "ERROR: ijsgutenprint: Printer %s is not a known model\n" +#~ msgstr "¥×¥ê¥ó¥¿ %s ¤ÏÉÔÌÀ¤Ê·¿¼°¤Ç¤¹\n" -#: src/ghost/ijsgutenprint.c:1331 -#, fuzzy, c-format -msgid "ERROR: ijsgutenprint: Unable to open %s: %s\n" -msgstr "%s ã‚’é–‹ã‘ã¾ã›ã‚“: %s\n" +#, fuzzy +#~ msgid "ERROR: ijsgutenprint: cannot parse TopLeft %s\n" +#~ msgstr "¥×¥ê¥ó¥¿ %s ¤Ë %s ¤ò»È¤Ã¤Æ°õºþ¤¹¤ë¤³¤È¤¬¤Ç¤­¤Þ¤»¤ó\n" -#: src/ghost/ijsgutenprint.c:1344 -#, fuzzy, c-format -msgid "ERROR: ijsgutenprint: Unknown printer %s\n" -msgstr "プリンタ %s ãŒä¸æ˜Žã§ã™\n" +#, fuzzy +#~ msgid "ERROR: ijsgutenprint: cannot parse PaperSize %s\n" +#~ msgstr "¥×¥ê¥ó¥¿ %s ¤Ë %s ¤ò»È¤Ã¤Æ°õºþ¤¹¤ë¤³¤È¤¬¤Ç¤­¤Þ¤»¤ó\n" -#: src/ghost/ijsgutenprint.c:1516 -#, fuzzy, c-format -msgid "ERROR: ijsgutenprint: Bad parameters; cannot continue!\n" -msgstr "ãŠã‹ã—ãªãƒ‘ラメータ; 続行ã§ãã¾ã›ã‚“ï¼\n" +#, fuzzy +#~ msgid "ERROR: ijsgutenprint: cannot parse curve %s\n" +#~ msgstr "¥×¥ê¥ó¥¿ %s ¤Ë %s ¤ò»È¤Ã¤Æ°õºþ¤¹¤ë¤³¤È¤¬¤Ç¤­¤Þ¤»¤ó\n" -#: src/ghost/ijsgutenprint.c:1534 -#, fuzzy, c-format -msgid "ERROR: ijsgutenprint: Get next row failed at %.0f\n" -msgstr "%.0f ã§æ¬¡ã®ä½Žãƒ¬ãƒ™ãƒ«ãƒ•ã‚£ãƒ¼ãƒ«ãƒ‰ã‚’å–å¾—ã—ã¾ã™\n" +#, fuzzy +#~ msgid "ERROR: ijsgutenprint: cannot parse %s float %s\n" +#~ msgstr "¥×¥ê¥ó¥¿ %s ¤Ë %s ¤ò»È¤Ã¤Æ°õºþ¤¹¤ë¤³¤È¤¬¤Ç¤­¤Þ¤»¤ó\n" #, fuzzy -#~ msgid "Model Name" -#~ msgstr "å–り消ã—" +#~ msgid "ERROR: ijsgutenprint: cannot parse %s int %s\n" +#~ msgstr "¥×¥ê¥ó¥¿ %s ¤Ë %s ¤ò»È¤Ã¤Æ°õºþ¤¹¤ë¤³¤È¤¬¤Ç¤­¤Þ¤»¤ó\n" #, fuzzy -#~ msgid "Cassette" -#~ msgstr "マット用紙" +#~ msgid "ERROR: ijsgutenprint: cannot parse %s dimension %s\n" +#~ msgstr "¥×¥ê¥ó¥¿ %s ¤Ë %s ¤ò»È¤Ã¤Æ°õºþ¤¹¤ë¤³¤È¤¬¤Ç¤­¤Þ¤»¤ó\n" #, fuzzy -#~ msgid " Gamma" -#~ msgstr "ガンマ:" +#~ msgid "ERROR: ijsgutenprint: cannot parse %s boolean %s\n" +#~ msgstr "¥×¥ê¥ó¥¿ %s ¤Ë %s ¤ò»È¤Ã¤Æ°õºþ¤¹¤ë¤³¤È¤¬¤Ç¤­¤Þ¤»¤ó\n" #, fuzzy -#~ msgid " Curve" -#~ msgstr "黒色" +#~ msgid "ERROR: ijsgutenprint: Bad parameter %s %d\n" +#~ msgstr "¥×¥ê¥ó¥¿ %s ¤¬ÉÔÌÀ¤Ç¤¹\n" #, fuzzy -#~ msgid "1440 x 1440" -#~ msgstr "1440 x 1440 DPI" +#~ msgid "ERROR: ijsgutenprint: bad key code %d\n" +#~ msgstr "%.0f ¤Ç¼¡¤ÎÄã¥ì¥Ù¥ë¥Õ¥£¡¼¥ë¥É¤ò¼èÆÀ¤·¤Þ¤¹\n" #, fuzzy -#~ msgid "1440 x 1440 DPI High Quality" -#~ msgstr "1200 DPI 高å“質" +#~ msgid "ERROR: ijsgutenprint: image_init failed %d\n" +#~ msgstr "image_init ¤Ë¼ºÇÔ %d\n" #, fuzzy -#~ msgid "1440 x 1440 DPI Highest Quality" -#~ msgstr "1200 DPI 高å“質" +#~ msgid "ERROR: ijsgutenprint: Unable to open file descriptor: %s\n" +#~ msgstr "¥Õ¥¡¥¤¥ë¡¦¥Ç¥£¥¹¥¯¥ê¥×¥¿¤ò³«¤±¤Þ¤»¤ó: %s\n" #, fuzzy -#~ msgid "2880 x 1440 DPI High Quality" -#~ msgstr "1200 DPI 高å“質" +#~ msgid "ERROR: ijsgutenprint: Unable to open %s: %s\n" +#~ msgstr "%s ¤ò³«¤±¤Þ¤»¤ó: %s\n" #, fuzzy -#~ msgid "2880 x 1440 DPI Highest Quality" -#~ msgstr "1200 DPI 高å“質" +#~ msgid "ERROR: ijsgutenprint: Unknown printer %s\n" +#~ msgstr "¥×¥ê¥ó¥¿ %s ¤¬ÉÔÌÀ¤Ç¤¹\n" #, fuzzy -#~ msgid "" -#~ "\n" -#~ "\n" -#~ "Copyright (C) 1997-2003 Michael Sweet, Robert Krawitz,\n" -#~ "and the rest of the Gutenprint Development Team.\n" -#~ "\n" -#~ "Please visit our web site at http://gimp-print.sourceforge.net.\n" -#~ "\n" -#~ "This program is free software; you can redistribute it and/or modify\n" -#~ "it under the terms of the GNU General Public License as published by\n" -#~ "the Free Software Foundation; either version 2 of the License, or\n" -#~ "(at your option) any later version.\n" -#~ "\n" -#~ "This program is distributed in the hope that it will be useful,\n" -#~ "but WITHOUT ANY WARRANTY; without even the implied warranty of\n" -#~ "MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the\n" -#~ "GNU General Public License for more details.\n" -#~ "\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" -#~ msgstr "" -#~ "\n" -#~ "\n" -#~ "Copyright (C) 1997-2001 Michael Sweet, Robert Krawitz,\n" -#~ "ãã—㦠Gimp-Print 開発ãƒãƒ¼ãƒ ã€‚\n" -#~ "\n" -#~ "ホームページ ã«ãŠè¶Šã—下ã•ã„。\n" -#~ "\n" -#~ "ã“ã®ãƒ—ログラムã¯ãƒ•ãƒªãƒ¼ã‚½ãƒ•ãƒˆã‚¦ã‚§ã‚¢ã§ã™; フリーソフトウェア財団ãŒç™ºè¡Œã™ã‚‹\n" -#~ "GNU 公有使用許諾契約書ã®ç¬¬äºŒç‰ˆã¾ãŸã¯ãれ以é™ã®ç‰ˆã®ä¸‹ã§æ”¹å¤‰ãƒ»ä¿®æ­£ãƒ»å†é…布" -#~ "ãŒ\n" -#~ "èªã‚られã¦ã„ã¾ã™ã€‚\n" -#~ "\n" -#~ "ã“ã®ãƒ—ログラムã¯ä¾¿åˆ©ã«ä½¿ã£ã¦ã‚‚らãˆã‚‹ã‚ˆã†ã«é…布ã•ã‚Œã¦ã„ã¾ã™ãŒã€\n" -#~ "完全ã«ç„¡ä¿è¨¼ã§ã™; 商用利用ã¾ãŸã¯ã‚る特定ã®ç›®çš„ã«ãŠã‘ã‚‹é©åˆæ€§ã®ä¿è¨¼ã‚‚\n" -#~ "ã‚ã‚Šã¾ã›ã‚“。詳細㯠GNU 公有使用許諾契約書をã”覧下ã•ã„。\n" -#~ "\n" -#~ "è²´æ–¹ã¯ã€ã“ã®ãƒ—ログラムã«é©å¿œã—㟠GNU 公有使用許諾契約書ã®ã‚³ãƒ”ーを\n" -#~ "å—ã‘å–ã‚‹å¿…è¦ãŒã‚ã‚Šã¾ã™; ã‚‚ã—å—ã‘å–ã£ã¦ã„ãªã„å ´åˆã¯ã€\n" -#~ "Free Software Foundation, Inc., 56 Temple Place - \n" -#~ "Suite 330, Boston, MA 02111-1307, USA ã¾ã§é€£çµ¡ã—ã¦ä¸‹ã•ã„。\n" +#~ msgid "ERROR: ijsgutenprint: Bad parameters; cannot continue!\n" +#~ msgstr "¤ª¤«¤·¤Ê¥Ñ¥é¥á¡¼¥¿; ³¹Ô¤Ç¤­¤Þ¤»¤ó¡ª\n" #, 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-2001 Robert Krawitz\n" -#~ "Escputil ã¯å®Œå…¨ç„¡ä¿è¨¼ã§ã™; 詳細㯠`escputil -l` ã§ã”覧下ã•ã„。\n" -#~ "ã“ã‚Œã¯ãƒ•ãƒªãƒ¼ã‚½ãƒ•ãƒˆã‚¦ã‚§ã‚¢ã§ã„ãã¤ã‹ã®æ¡ä»¶ã®ä¸‹ã§å†é…布を\n" -#~ "æ­“è¿Žã—ã¾ã™; 詳細㯠`escputil -l` ã§ã”覧下ã•ã„。\n" +#~ msgid "ERROR: ijsgutenprint: Get next row failed at %.0f\n" +#~ msgstr "%.0f ¤Ç¼¡¤ÎÄã¥ì¥Ù¥ë¥Õ¥£¡¼¥ë¥É¤ò¼èÆÀ¤·¤Þ¤¹\n" #, fuzzy #~ msgid "90x90 DPI" @@ -8419,10 +8659,6 @@ msgstr "%.0f ã§æ¬¡ã®ä½Žãƒ¬ãƒ™ãƒ«ãƒ•ã‚£ãƒ¼ãƒ«ãƒ‰ã‚’å–å¾—ã—ã¾ã™\n" #~ msgid "720x360 DPI DMT" #~ msgstr "720 x 360 DPI MW2" -#, fuzzy -#~ msgid "720x720 DPI" -#~ msgstr "2880 x 720 DPI" - #, fuzzy #~ msgid "720x720 DPI DMT" #~ msgstr "2880 x 720 DPI" @@ -8487,60 +8723,56 @@ msgstr "%.0f ã§æ¬¡ã®ä½Žãƒ¬ãƒ™ãƒ«ãƒ•ã‚£ãƒ¼ãƒ«ãƒ‰ã‚’å–å¾—ã—ã¾ã™\n" #~ msgid "2400x2400 DPI DMT" #~ msgstr "2400x600 DPI" -#, fuzzy -#~ msgid "Plain Paper PIXMA" -#~ msgstr "通常ã®ç”¨ç´™" - #~ msgid "Back Print Film" -#~ msgstr "背景å°åˆ·ç”¨ãƒ•ã‚£ãƒ«ãƒ " +#~ msgstr "ÇØ·Ê°õºþÍÑ¥Õ¥£¥ë¥à" #~ msgid "Fabric Sheets" -#~ msgstr "繊維質ã®ç”¨ç´™" +#~ msgstr "Á¡°Ý¼Á¤ÎÍÑ»æ" #~ msgid "Envelope" -#~ msgstr "å°ç­’" +#~ msgstr "ÉõÅû" #~ msgid "High Resolution Paper" -#~ msgstr "高解åƒåº¦ã®ç”¨ç´™" +#~ msgstr "¹â²òÁüÅÙ¤ÎÍÑ»æ" #~ msgid "T-Shirt Transfers" -#~ msgstr "T-シャツã®æ¨¡æ§˜" +#~ msgstr "T-¥·¥ã¥Ä¤ÎÌÏÍÍ" #~ msgid "High Gloss Film" -#~ msgstr "高艶フィルム" +#~ msgstr "¹â±ð¥Õ¥£¥ë¥à" #~ msgid "Glossy Photo Paper" -#~ msgstr "光沢付ãフォト用紙" +#~ msgstr "¸÷ÂôÉÕ¤­¥Õ¥©¥ÈÍÑ»æ" #~ msgid "Glossy Photo Cards" -#~ msgstr "光沢付ãフォト・カード" +#~ msgstr "¸÷ÂôÉÕ¤­¥Õ¥©¥È¡¦¥«¡¼¥É" #~ msgid "Photo Paper Pro" -#~ msgstr "フォト用紙 Pro" - -#~ msgid "Photo CcMmYK Color" -#~ msgstr "フォト CcMmYK 色" +#~ msgstr "¥Õ¥©¥ÈÍÑ»æ Pro" -#~ msgid "Photo CcMmY Color" -#~ msgstr "フォト CcMmY 色" +#~ msgid "CMY Color" +#~ msgstr "CMY ¿§" #~ msgid "CMYK Color" -#~ msgstr "CMYK 色" +#~ msgstr "CMYK ¿§" -#~ msgid "CMY Color" -#~ msgstr "CMY 色" +#~ msgid "Photo CcMmY Color" +#~ msgstr "¥Õ¥©¥È CcMmY ¿§" + +#~ msgid "Photo CcMmYK Color" +#~ msgstr "¥Õ¥©¥È CcMmYK ¿§" #, fuzzy -#~ msgid "Gutenprint" -#~ msgstr "テストå°åˆ·" +#~ msgid " Gamma" +#~ msgstr "¥¬¥ó¥Þ:" #, fuzzy -#~ msgid "ERROR: ijsgutenprint: ijs_server_get_page_header failed %d\n" -#~ msgstr "ijs_server_get_page_header ã«å¤±æ•— %d\n" +#~ msgid " Curve" +#~ msgstr "¹õ¿§" #, fuzzy -#~ msgid "EPSON Stylus C50" -#~ msgstr "Stylus C60" +#~ msgid "Red Balance" +#~ msgstr "°õºþ»þ¤Î²«¿§¤Î¥Ð¥é¥ó¥¹¤òÄ´À°¤·¤Þ¤¹¡£" #, fuzzy #~ msgid "EPSON Stylus C60" @@ -8550,18 +8782,6 @@ msgstr "%.0f ã§æ¬¡ã®ä½Žãƒ¬ãƒ™ãƒ«ãƒ•ã‚£ãƒ¼ãƒ«ãƒ‰ã‚’å–å¾—ã—ã¾ã™\n" #~ msgid "EPSON Stylus C61" #~ msgstr "Stylus C61" -#, fuzzy -#~ msgid "EPSON Stylus C62" -#~ msgstr "Stylus C62" - -#, fuzzy -#~ msgid "EPSON Stylus C70" -#~ msgstr "Stylus C70" - -#, fuzzy -#~ msgid "EPSON Stylus C80" -#~ msgstr "Stylus C80" - #, fuzzy #~ msgid "EPSON Stylus C82" #~ msgstr "Stylus C82" @@ -8794,10 +9014,6 @@ msgstr "%.0f ã§æ¬¡ã®ä½Žãƒ¬ãƒ™ãƒ«ãƒ•ã‚£ãƒ¼ãƒ«ãƒ‰ã‚’å–å¾—ã—ã¾ã™\n" #~ msgid "EPSON Stylus Pro 5500" #~ msgstr "Stylus Pro 5500" -#, fuzzy -#~ msgid "EPSON Stylus Pro 7000" -#~ msgstr "Stylus Pro 7000" - #, fuzzy #~ msgid "EPSON Stylus Pro 7500" #~ msgstr "Stylus Pro 7500" @@ -8831,44 +9047,105 @@ msgstr "%.0f ã§æ¬¡ã®ä½Žãƒ¬ãƒ™ãƒ«ãƒ•ã‚£ãƒ¼ãƒ«ãƒ‰ã‚’å–å¾—ã—ã¾ã™\n" #~ msgstr "Stylus Scan 2500" #, fuzzy -#~ msgid "EPSON E-100" -#~ msgstr "Stylus C60" +#~ msgid "" +#~ "\n" +#~ "\n" +#~ "Copyright (C) 1997-2003 Michael Sweet, Robert Krawitz,\n" +#~ "and the rest of the Gutenprint Development Team.\n" +#~ "\n" +#~ "Please visit our web site at http://gimp-print.sourceforge.net.\n" +#~ "\n" +#~ "This program is free software; you can redistribute it and/or modify\n" +#~ "it under the terms of the GNU General Public License as published by\n" +#~ "the Free Software Foundation; either version 2 of the License, or\n" +#~ "(at your option) any later version.\n" +#~ "\n" +#~ "This program is distributed in the hope that it will be useful,\n" +#~ "but WITHOUT ANY WARRANTY; without even the implied warranty of\n" +#~ "MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the\n" +#~ "GNU General Public License for more details.\n" +#~ "\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" +#~ msgstr "" +#~ "\n" +#~ "\n" +#~ "Copyright (C) 1997-2001 Michael Sweet, Robert Krawitz,\n" +#~ "¤½¤·¤Æ Gimp-Print ³«È¯¥Á¡¼¥à¡£\n" +#~ "\n" +#~ "¥Û¡¼¥à¥Ú¡¼¥¸ ¤Ë¤ª±Û¤·²¼¤µ¤¤¡£\n" +#~ "\n" +#~ "¤³¤Î¥×¥í¥°¥é¥à¤Ï¥Õ¥ê¡¼¥½¥Õ¥È¥¦¥§¥¢¤Ç¤¹; ¥Õ¥ê¡¼¥½¥Õ¥È¥¦¥§¥¢ºâÃĤ¬È¯¹Ô¤¹¤ë\n" +#~ "GNU ¸øÍ­»ÈÍѵöÂú·ÀÌó½ñ¤ÎÂèÆóÈǤޤ¿¤Ï¤½¤ì°Ê¹ß¤ÎÈǤβ¼¤Ç²þÊÑ¡¦½¤Àµ¡¦ºÆÇÛÉÛ" +#~ "¤¬\n" +#~ "ǧ¤á¤é¤ì¤Æ¤¤¤Þ¤¹¡£\n" +#~ "\n" +#~ "¤³¤Î¥×¥í¥°¥é¥à¤ÏÊØÍø¤Ë»È¤Ã¤Æ¤â¤é¤¨¤ë¤è¤¦¤ËÇÛÉÛ¤µ¤ì¤Æ¤¤¤Þ¤¹¤¬¡¢\n" +#~ "´°Á´¤Ë̵ÊݾڤǤ¹; ¾¦ÍÑÍøÍѤޤ¿¤Ï¤¢¤ëÆÃÄê¤ÎÌÜŪ¤Ë¤ª¤±¤ëŬ¹çÀ­¤ÎÊݾڤâ\n" +#~ "¤¢¤ê¤Þ¤»¤ó¡£¾ÜºÙ¤Ï GNU ¸øÍ­»ÈÍѵöÂú·ÀÌó½ñ¤ò¤´Í÷²¼¤µ¤¤¡£\n" +#~ "\n" +#~ "µ®Êý¤Ï¡¢¤³¤Î¥×¥í¥°¥é¥à¤ËŬ±þ¤·¤¿ GNU ¸øÍ­»ÈÍѵöÂú·ÀÌó½ñ¤Î¥³¥Ô¡¼¤ò\n" +#~ "¼õ¤±¼è¤ëɬÍפ¬¤¢¤ê¤Þ¤¹; ¤â¤·¼õ¤±¼è¤Ã¤Æ¤¤¤Ê¤¤¾ì¹ç¤Ï¡¢\n" +#~ "Free Software Foundation, Inc., 56 Temple Place - \n" +#~ "Suite 330, Boston, MA 02111-1307, USA ¤Þ¤ÇÏ¢Íí¤·¤Æ²¼¤µ¤¤¡£\n" #, fuzzy -#~ msgid "Printer does not support listing ink types!\n" -#~ msgstr "プリンタã¯ã‚«ãƒ©ãƒ¼å°åˆ·ã‚’サãƒãƒ¼ãƒˆã—ã¦ã„ã¾ã›ã‚“\n" +#~ msgid "Gutenprint" +#~ msgstr "¥Æ¥¹¥È°õºþ" + +#, fuzzy +#~ msgid "" +#~ ", Copyright (C) 2000-2003 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-2001 Robert Krawitz\n" +#~ "Escputil ¤Ï´°Á´ÌµÊݾڤǤ¹; ¾ÜºÙ¤Ï `escputil -l` ¤Ç¤´Í÷²¼¤µ¤¤¡£\n" +#~ "¤³¤ì¤Ï¥Õ¥ê¡¼¥½¥Õ¥È¥¦¥§¥¢¤Ç¤¤¤¯¤Ä¤«¤Î¾ò·ï¤Î²¼¤ÇºÆÇÛÉÛ¤ò\n" +#~ "´¿·Þ¤·¤Þ¤¹; ¾ÜºÙ¤Ï `escputil -l` ¤Ç¤´Í÷²¼¤µ¤¤¡£\n" #, fuzzy #~ msgid "Cannot identify printer!\n" -#~ msgstr "プリンタã‹ã‚‰ã®å‡ºåŠ›ã‚’解æžã§ãã¾ã›ã‚“\n" +#~ msgstr "¥×¥ê¥ó¥¿¤«¤é¤Î½ÐÎϤò²òÀϤǤ­¤Þ¤»¤ó\n" #, fuzzy -#~ msgid "Red Balance" -#~ msgstr "å°åˆ·æ™‚ã®é»„色ã®ãƒãƒ©ãƒ³ã‚¹ã‚’調整ã—ã¾ã™ã€‚" +#~ msgid "Printer does not support listing ink types!\n" +#~ msgstr "¥×¥ê¥ó¥¿¤Ï¥«¥é¡¼°õºþ¤ò¥µ¥Ý¡¼¥È¤·¤Æ¤¤¤Þ¤»¤ó\n" + +#~ msgid "/File/Print..." +#~ msgstr "/File/°õºþ..." + +#, fuzzy +#~ msgid "ERROR: ijsgutenprint: ijs_server_get_page_header failed %d\n" +#~ msgstr "ijs_server_get_page_header ¤Ë¼ºÇÔ %d\n" #, fuzzy #~ msgid "Gloss Balance" -#~ msgstr "å°åˆ·æ™‚ã®é»„色ã®ãƒãƒ©ãƒ³ã‚¹ã‚’調整ã—ã¾ã™ã€‚" +#~ msgstr "°õºþ»þ¤Î²«¿§¤Î¥Ð¥é¥ó¥¹¤òÄ´À°¤·¤Þ¤¹¡£" #~ 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 "" -#~ "等間隔ã®å°åˆ·ã¯ä½Žãƒ¬ãƒ™ãƒ«ãƒ»ãƒ‡ãƒã‚¤ã‚¹ã‚’使ã†ã‹ã€ã‚ã‚‹ã„ã¯\n" -#~ "'-m' オプションã§ãƒ—リンタを特定ã—ã¦ä½¿ç”¨ã™ã‚‹ã‚ˆã†ã«ã—ã¦ä¸‹ã•ã„。\n" +#~ "Åù´Ö³Ö¤Î°õºþ¤ÏÄã¥ì¥Ù¥ë¡¦¥Ç¥Ð¥¤¥¹¤ò»È¤¦¤«¡¢¤¢¤ë¤¤¤Ï\n" +#~ "'-m' ¥ª¥×¥·¥ç¥ó¤Ç¥×¥ê¥ó¥¿¤òÆÃÄꤷ¤Æ»ÈÍѤ¹¤ë¤è¤¦¤Ë¤·¤Æ²¼¤µ¤¤¡£\n" #~ msgid "Attempting to detect printer model..." -#~ msgstr "プリンタã®åž‹å¼ã‚’検出中ã§ã™..." +#~ msgstr "¥×¥ê¥ó¥¿¤Î·¿¼°¤ò¸¡½ÐÃæ¤Ç¤¹..." #~ msgid "" #~ "\n" #~ "Cannot open %s read/write: %s\n" #~ msgstr "" #~ "\n" -#~ "%s を読ã¿æ›¸ãモードã§é–‹ã‘ã¾ã›ã‚“: %s\n" +#~ "%s ¤òÆɤ߽ñ¤­¥â¡¼¥É¤Ç³«¤±¤Þ¤»¤ó: %s\n" #~ msgid "Printer model %s is not known.\n" -#~ msgstr "プリンタã®åž‹å¼ %s ã¯ä¸æ˜Žã§ã™ã€‚\n" +#~ msgstr "¥×¥ê¥ó¥¿¤Î·¿¼° %s ¤ÏÉÔÌÀ¤Ç¤¹¡£\n" #, fuzzy #~ msgid "Gimp-Print" @@ -8877,64 +9154,64 @@ msgstr "%.0f ã§æ¬¡ã®ä½Žãƒ¬ãƒ™ãƒ«ãƒ•ã‚£ãƒ¼ãƒ«ãƒ‰ã‚’å–å¾—ã—ã¾ã™\n" #, fuzzy #~ msgid "Brightness of the print (0 is solid black, 2 is solid white)" #~ msgstr "" -#~ "å°åˆ·ã™ã‚‹æ˜Žã‚‹ã•ã‚’セットã—ã¾ã™ã€‚\n" -#~ "(0.0æ–¹å‘: æš—ã 2.0æ–¹å‘: 明るã)" +#~ "°õºþ¤¹¤ëÌÀ¤ë¤µ¤ò¥»¥Ã¥È¤·¤Þ¤¹¡£\n" +#~ "(0.0Êý¸þ: °Å¤¯ 2.0Êý¸þ: ÌÀ¤ë¤¯)" #~ 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 "" -#~ "ãŠä½¿ã„ã®ãƒ—リンタå‘ã‘ã®å°åˆ·ã‚³ãƒžãƒ³ãƒ‰ã‚’入力ã—ã¾ã™ã€‚ã€æ³¨è¨˜ã€‘: '-l' ã¾ãŸã¯ '-" -#~ "oraw' オプションを削除ã—ãªã„ã§ä¸‹ã•ã„。å°åˆ·ã«å¤±æ•—ã—ã¾ã™ï¼" +#~ "¤ª»È¤¤¤Î¥×¥ê¥ó¥¿¸þ¤±¤Î°õºþ¥³¥Þ¥ó¥É¤òÆþÎϤ·¤Þ¤¹¡£¡ÚÃíµ­¡Û: '-l' ¤Þ¤¿¤Ï '-" +#~ "oraw' ¥ª¥×¥·¥ç¥ó¤òºï½ü¤·¤Ê¤¤¤Ç²¼¤µ¤¤¡£°õºþ¤Ë¼ºÇÔ¤·¤Þ¤¹¡ª" #~ msgid "PPD File?" -#~ msgstr "PPD ファイルã§ã™ã‹ï¼Ÿ" +#~ msgstr "PPD ¥Õ¥¡¥¤¥ë¤Ç¤¹¤«¡©" #~ msgid "%s: option `%s' is ambiguous\n" -#~ msgstr "%s: オプション '%s' å˜ä½“ã§ã¯ä½¿ç”¨ã§ãã¾ã›ã‚“\n" +#~ msgstr "%s: ¥ª¥×¥·¥ç¥ó '%s' ñÂΤǤϻÈÍѤǤ­¤Þ¤»¤ó\n" #~ msgid "%s: option `--%s' doesn't allow an argument\n" -#~ msgstr "%s: オプション '--%s' ã«ã¯å¼•æ•°ã¯ä¸è¦ã§ã™\n" +#~ msgstr "%s: ¥ª¥×¥·¥ç¥ó '--%s' ¤Ë¤Ï°ú¿ô¤ÏÉÔÍפǤ¹\n" #~ msgid "%s: option `%c%s' doesn't allow an argument\n" -#~ msgstr "%s: オプション '%c%s' ã«ã¯å¼•æ•°ã¯ä¸è¦ã§ã™\n" +#~ msgstr "%s: ¥ª¥×¥·¥ç¥ó '%c%s' ¤Ë¤Ï°ú¿ô¤ÏÉÔÍפǤ¹\n" #~ msgid "%s: option `%s' requires an argument\n" -#~ msgstr "%s: オプション '%s' ã«ã¯å¼•æ•°ãŒå¿…è¦ã§ã™\n" +#~ msgstr "%s: ¥ª¥×¥·¥ç¥ó '%s' ¤Ë¤Ï°ú¿ô¤¬É¬ÍפǤ¹\n" #~ msgid "%s: unrecognized option `--%s'\n" -#~ msgstr "%s: ä¸æ˜Žãªã‚ªãƒ—ション '--%s'\n" +#~ msgstr "%s: ÉÔÌÀ¤Ê¥ª¥×¥·¥ç¥ó '--%s'\n" #~ msgid "%s: unrecognized option `%c%s'\n" -#~ msgstr "%s: ä¸æ˜Žãªã‚ªãƒ—ション '`%c%s'\n" +#~ msgstr "%s: ÉÔÌÀ¤Ê¥ª¥×¥·¥ç¥ó '`%c%s'\n" #~ msgid "%s: illegal option -- %c\n" -#~ msgstr "%s: ä¸æ­£ãªã‚ªãƒ—ション -- %c\n" +#~ msgstr "%s: ÉÔÀµ¤Ê¥ª¥×¥·¥ç¥ó -- %c\n" #~ msgid "%s: invalid option -- %c\n" -#~ msgstr "%s: ãŠã‹ã—ãªã‚ªãƒ—ション -- %c\n" +#~ msgstr "%s: ¤ª¤«¤·¤Ê¥ª¥×¥·¥ç¥ó -- %c\n" #~ msgid "%s: option requires an argument -- %c\n" -#~ msgstr "%s: オプションã«ã¯å¼•æ•°ãŒå¿…è¦ã§ã™ -- %c\n" +#~ msgstr "%s: ¥ª¥×¥·¥ç¥ó¤Ë¤Ï°ú¿ô¤¬É¬ÍפǤ¹ -- %c\n" #~ msgid "%s: option `-W %s' is ambiguous\n" -#~ msgstr "%s: オプション '-W %s' å˜ä½“ã§ã¯ä½¿ç”¨ã§ãã¾ã›ã‚“\n" +#~ msgstr "%s: ¥ª¥×¥·¥ç¥ó '-W %s' ñÂΤǤϻÈÍѤǤ­¤Þ¤»¤ó\n" #~ msgid "%s: option `-W %s' doesn't allow an argument\n" -#~ msgstr "%s: オプション '-W %s' ã«ã¯å¼•æ•°ãŒä¸è¦ã§ã™\n" +#~ msgstr "%s: ¥ª¥×¥·¥ç¥ó '-W %s' ¤Ë¤Ï°ú¿ô¤¬ÉÔÍפǤ¹\n" #, fuzzy #~ msgid "Bright" -#~ msgstr "明るã•:" +#~ msgstr "ÌÀ¤ë¤µ:" #, fuzzy #~ msgid "Image is too wide for the page\n" -#~ msgstr "用紙サイズを 100 ã¨ã—ãŸå ´åˆã®æ¯”率ã§ã™ã€‚" +#~ msgstr "Íѻ極¥¤¥º¤ò 100 ¤È¤·¤¿¾ì¹ç¤ÎÈæΨ¤Ç¤¹¡£" #, fuzzy #~ msgid "Full Bleed" -#~ msgstr "ロールå¼çµ¦ç´™" +#~ msgstr "¥í¡¼¥ë¼°µë»æ" #, fuzzy #~ msgid "traditional" @@ -8951,32 +9228,20 @@ msgstr "%.0f ã§æ¬¡ã®ä½Žãƒ¬ãƒ™ãƒ«ãƒ•ã‚£ãƒ¼ãƒ«ãƒ‰ã‚’å–å¾—ã—ã¾ã™\n" #, fuzzy #~ msgid "Optimize the settings for the type of image to be printed" -#~ msgstr "å°åˆ·ã™ã‚‹ç”»åƒã®ç¨®é¡žã‹ã‚‰å‡ºåŠ›çµæžœã‚’最é©åŒ–ã—ã¾ã™ã€‚" +#~ msgstr "°õºþ¤¹¤ë²èÁü¤Î¼ïÎफ¤é½ÐÎÏ·ë²Ì¤òºÇŬ²½¤·¤Þ¤¹¡£" #~ msgid "Solid Colors" -#~ msgstr "無地ã®è‰²" - -#~ msgid "Stylus C20sx" -#~ msgstr "Stylus C20sx" +#~ msgstr "̵ÃϤο§" #~ 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" @@ -9018,138 +9283,138 @@ msgstr "%.0f ã§æ¬¡ã®ä½Žãƒ¬ãƒ™ãƒ«ãƒ•ã‚£ãƒ¼ãƒ«ãƒ‰ã‚’å–å¾—ã—ã¾ã™\n" #~ "WARNING: THIS FUNCTION IS NOT YET TESTED! It may not work, and it may\n" #~ "damage your printer!\n" #~ msgstr "" -#~ "ã”利用å‰ã«æ¬¡ã®èª¬æ˜Žã‚’注æ„æ·±ããŠèª­ã¿ä¸‹ã•ã„。\n" +#~ "¤´ÍøÍÑÁ°¤Ë¼¡¤ÎÀâÌÀ¤òÃí°Õ¿¼¤¯¤ªÆɤ߲¼¤µ¤¤¡£\n" #~ "\n" -#~ "ã“ã®ãƒ„ール㯠EPSON 製㮠Stylus インクジェットå¼ãƒ—リンタã®\n" -#~ "カラーå°åˆ·ãƒ˜ãƒƒãƒ‰ã‚’一列ã«ä¸¦ã¹ã¦ãã‚Œã¾ã™ã€‚\n" -#~ "ã“ã®ãƒ„ールを使ã„ã™ãŽã‚‹ã¨ã€å°åˆ·ã®å“質を低下ã•ã›ãƒ—リンタã®æ•…éšœã®åŽŸå› ã‚’\n" -#~ "引ãèµ·ã“ã™å¯èƒ½æ€§ãŒã‚ã‚Šã¾ã™ã€‚ã“ã®ãƒ„ール㯠SEIKO EPSON 社ã§ãƒ†ã‚¹ãƒˆã—ãŸã‚ã‘ã§" -#~ "ã¯ãªã„ã®ã§\n" -#~ "ã€å…¨ãç„¡ä¿è¨¼ã§ã™ã€‚ã“ã®ãƒ„ールã®ã”使用ã«ã¯ã”自身ã®è²¬ä»»ä¸‹ã§è¡Œã£ã¦ä¸‹ã•ã„。\n" +#~ "¤³¤Î¥Ä¡¼¥ë¤Ï EPSON À½¤Î Stylus ¥¤¥ó¥¯¥¸¥§¥Ã¥È¼°¥×¥ê¥ó¥¿¤Î\n" +#~ "¥«¥é¡¼°õºþ¥Ø¥Ã¥É¤ò°ìÎó¤Ëʤ٤Ƥ¯¤ì¤Þ¤¹¡£\n" +#~ "¤³¤Î¥Ä¡¼¥ë¤ò»È¤¤¤¹¤®¤ë¤È¡¢°õºþ¤ÎÉʼÁ¤òÄã²¼¤µ¤»¥×¥ê¥ó¥¿¤Î¸Î¾ã¤Î¸¶°ø¤ò\n" +#~ "°ú¤­µ¯¤³¤¹²ÄǽÀ­¤¬¤¢¤ê¤Þ¤¹¡£¤³¤Î¥Ä¡¼¥ë¤Ï SEIKO EPSON ¼Ò¤Ç¥Æ¥¹¥È¤·¤¿¤ï¤±¤Ç" +#~ "¤Ï¤Ê¤¤¤Î¤Ç\n" +#~ "¡¢Á´¤¯ÌµÊݾڤǤ¹¡£¤³¤Î¥Ä¡¼¥ë¤Î¤´»ÈÍѤˤϤ´¼«¿È¤ÎÀÕǤ²¼¤Ç¹Ô¤Ã¤Æ²¼¤µ¤¤¡£\n" #~ "\n" -#~ "ã“ã®ãƒ„ールã¯ä¸€æžšã®ç”¨ç´™ã« %d 個ã®ãƒ†ã‚¹ãƒˆãƒ‘ターンをé‡ã­å°åˆ·ã—ã¾ã™ã€‚\n" -#~ "ã¤ã¾ã‚Šã€ä¸€ãƒ‘ターンå°åˆ·ã™ã‚‹ã¨æŽ’ç´™ã™ã‚‹ã®ã§ã€åŒã˜ç”¨ç´™ã‚’給紙ã—ã¦å†åº¦å°åˆ·ã—ã¾" -#~ "ã™ã€‚\n" -#~ "å„ペア・ラインã®ä¸‹ã«ã¯ %d 㨠%d ã®é–“を示㙠\"ペア番å·\" ãŒã‚ã‚Šã¾ã™ã€‚\n" +#~ "¤³¤Î¥Ä¡¼¥ë¤Ï°ìËç¤ÎÍÑ»æ¤Ë %d ¸Ä¤Î¥Æ¥¹¥È¥Ñ¥¿¡¼¥ó¤ò½Å¤Í°õºþ¤·¤Þ¤¹¡£\n" +#~ "¤Ä¤Þ¤ê¡¢°ì¥Ñ¥¿¡¼¥ó°õºþ¤¹¤ë¤ÈÇӻ椹¤ë¤Î¤Ç¡¢Æ±¤¸ÍÑ»æ¤òµë»æ¤·¤ÆºÆÅÙ°õºþ¤·¤Þ" +#~ "¤¹¡£\n" +#~ "³Æ¥Ú¥¢¡¦¥é¥¤¥ó¤Î²¼¤Ë¤Ï %d ¤È %d ¤Î´Ö¤ò¼¨¤¹ \"¥Ú¥¢ÈÖ¹æ\" ¤¬¤¢¤ê¤Þ¤¹¡£\n" #~ "\n" -#~ "パターンを観察ã™ã‚‹å ´åˆã¯ã€ä¸€ã¤ã®ãƒ‘ッãƒãŒæ»‘らã‹ãª (\"ç²’å­\" ã«è¿‘ã„) テクス" -#~ "ãƒãƒ£\n" -#~ "ã«ãªã£ã¦ã„ã‚‹ã“ã¨ã‚’確èªã—ã¦ä¸‹ã•ã„。ãã®ä¸­ã‹ã‚‰æœ€é©ãªãƒ‘ッãƒã‚’é¸æŠžã™ã‚‹ãŸã‚ã«\n" -#~ "注æ„æ·±ã観察ã—ã¦ä¸‹ã•ã„。フォト用ã®é«˜å“質インクジェット用紙ã€ã‚ã‚‹ã„ã¯\n" -#~ "ãã‚Œã«ä¼¼ãŸé«˜å“質ã®ç”¨ç´™ã‚’使ã£ã¦ãƒ†ã‚¹ãƒˆã™ã‚‹ã“ã¨ã‚’ãŠå¥¨ã‚ã—ã¾ã™ã€‚\n" -#~ "ã‚‚ã—滑らã‹ãªãƒ‘ターンãŒãªã„å ´åˆã¯ã€ã“ã®ãƒ†ã‚¹ãƒˆã‚’ç¹°ã‚Šè¿”ã—ã¦ä¸‹ã•ã„。\n" +#~ "¥Ñ¥¿¡¼¥ó¤ò´Ñ»¡¤¹¤ë¾ì¹ç¤Ï¡¢°ì¤Ä¤Î¥Ñ¥Ã¥Á¤¬³ê¤é¤«¤Ê (\"γ»Ò\" ¤Ë¶á¤¤) ¥Æ¥¯¥¹" +#~ "¥Á¥ã\n" +#~ "¤Ë¤Ê¤Ã¤Æ¤¤¤ë¤³¤È¤ò³Îǧ¤·¤Æ²¼¤µ¤¤¡£¤½¤ÎÃ椫¤éºÇŬ¤Ê¥Ñ¥Ã¥Á¤òÁªÂò¤¹¤ë¤¿¤á¤Ë\n" +#~ "Ãí°Õ¿¼¤¯´Ñ»¡¤·¤Æ²¼¤µ¤¤¡£¥Õ¥©¥ÈÍѤιâÉʼÁ¥¤¥ó¥¯¥¸¥§¥Ã¥ÈÍѻ桢¤¢¤ë¤¤¤Ï\n" +#~ "¤½¤ì¤Ë»÷¤¿¹âÉʼÁ¤ÎÍÑ»æ¤ò»È¤Ã¤Æ¥Æ¥¹¥È¤¹¤ë¤³¤È¤ò¤ª¾©¤á¤·¤Þ¤¹¡£\n" +#~ "¤â¤·³ê¤é¤«¤Ê¥Ñ¥¿¡¼¥ó¤¬¤Ê¤¤¾ì¹ç¤Ï¡¢¤³¤Î¥Æ¥¹¥È¤ò·«¤êÊÖ¤·¤Æ²¼¤µ¤¤¡£\n" #~ "\n" -#~ "テストパターンã®è¦³å¯ŸãŒå®Œäº†ã—ãŸã‚‰ãƒ‘ッãƒã‚’洗濯ã—ã€\n" -#~ "ãã®ãƒ—リンタ用ã«ãã®è¨­å®šã‚’ä¿å­˜ (s) ã™ã‚‹ã‹ã€ãƒ†ã‚¹ãƒˆãƒ‘ターンをå†ã³å®Ÿè¡Œã™ã‚‹ " -#~ "(r) ã‹ã€\n" -#~ "ä¿å­˜ã—ãªã„ã§çµ‚了 (q) ã™ã‚‹ã‹é¸æŠžã—ã¦ä¸‹ã•ã„。終了ã—ã¦ã‚‚以å‰ã®è¨­å®šã«æˆ»ã‚Šã¾ã›" -#~ "ã‚“ãŒã€\n" -#~ "プリンタã®é›»æºã‚’ OFF ã«ã—ãªã„é™ã‚Šæˆ»ã™ã“ã¨ã¯å¯èƒ½ã§ã™ã€‚終了ã—ãŸå ´åˆã«ã€\n" -#~ "ã‚ã¨ã§ãã®è¨­å®šã‚’ä¿å­˜ã—ãŸã„å ´åˆã¯ã€ã‚‚ã†ä¸€åº¦åŒã˜æ‰‹é †ã‚’è¡Œã£ã¦ä¸‹ã•ã„。\n" -#~ "ã“ã®ä½œæ¥­ã‚’è¡Œã£ã¦ã„る最中ã«é›»æºã‚’ OFF ã«ã—ãªã„ã§ä¸‹ã•ã„。\n" +#~ "¥Æ¥¹¥È¥Ñ¥¿¡¼¥ó¤Î´Ñ»¡¤¬´°Î»¤·¤¿¤é¥Ñ¥Ã¥Á¤òÀöÂõ¤·¡¢\n" +#~ "¤½¤Î¥×¥ê¥ó¥¿ÍѤˤ½¤ÎÀßÄê¤òÊݸ (s) ¤¹¤ë¤«¡¢¥Æ¥¹¥È¥Ñ¥¿¡¼¥ó¤òºÆ¤Ó¼Â¹Ô¤¹¤ë " +#~ "(r) ¤«¡¢\n" +#~ "Êݸ¤·¤Ê¤¤¤Ç½ªÎ» (q) ¤¹¤ë¤«ÁªÂò¤·¤Æ²¼¤µ¤¤¡£½ªÎ»¤·¤Æ¤â°ÊÁ°¤ÎÀßÄê¤ËÌá¤ê¤Þ¤»" +#~ "¤ó¤¬¡¢\n" +#~ "¥×¥ê¥ó¥¿¤ÎÅŸ»¤ò OFF ¤Ë¤·¤Ê¤¤¸Â¤êÌ᤹¤³¤È¤Ï²Äǽ¤Ç¤¹¡£½ªÎ»¤·¤¿¾ì¹ç¤Ë¡¢\n" +#~ "¤¢¤È¤Ç¤½¤ÎÀßÄê¤òÊݸ¤·¤¿¤¤¾ì¹ç¤Ï¡¢¤â¤¦°ìÅÙƱ¤¸¼ê½ç¤ò¹Ô¤Ã¤Æ²¼¤µ¤¤¡£\n" +#~ "¤³¤Îºî¶È¤ò¹Ô¤Ã¤Æ¤¤¤ëºÇÃæ¤ËÅŸ»¤ò OFF ¤Ë¤·¤Ê¤¤¤Ç²¼¤µ¤¤¡£\n" #~ "\n" -#~ "ã€è­¦å‘Šã€‘: ã“ã®æ©Ÿèƒ½ã¯ã¾ã ãƒ†ã‚¹ãƒˆã—ã¦ã„ãªã„ã®ã§ã€ 動作ã—ãªã„ã‹ã‚‚ã—ã‚Œã¾ã›" -#~ "ã‚“ï¼\n" -#~ " ã¾ãŸã€ãƒ—リンタ故障ã®åŽŸå› ã«ãªã‚‹ã‹ã‚‚ã—ã‚Œã¾ã›ã‚“ï¼\n" +#~ "¡Ú·Ù¹ð¡Û: ¤³¤Îµ¡Ç½¤Ï¤Þ¤À¥Æ¥¹¥È¤·¤Æ¤¤¤Ê¤¤¤Î¤Ç¡¢ Æ°ºî¤·¤Ê¤¤¤«¤â¤·¤ì¤Þ¤»" +#~ "¤ó¡ª\n" +#~ " ¤Þ¤¿¡¢¥×¥ê¥ó¥¿¸Î¾ã¤Î¸¶°ø¤Ë¤Ê¤ë¤«¤â¤·¤ì¤Þ¤»¤ó¡ª\n" #~ msgid "Printer %s does not require color head alignment.\n" -#~ msgstr "プリンタ %s ã¯ã‚«ãƒ©ãƒ¼ãƒ»ãƒ˜ãƒƒãƒ‰é–“éš”ã¯å¿…è¦ã‚ã‚Šã¾ã›ã‚“。\n" +#~ msgstr "¥×¥ê¥ó¥¿ %s ¤Ï¥«¥é¡¼¡¦¥Ø¥Ã¥É´Ö³Ö¤ÏɬÍפ¢¤ê¤Þ¤»¤ó¡£\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 "" -#~ "å°åˆ·çµæžœã‚’確èªã—ã¦ã€å„パターンã§æœ€é©ãªãƒ©ã‚¤ãƒ³ã®ãƒšã‚¢ã‚’é¸æŠžã—ã¦ä¸‹ã•ã„。\n" -#~ "ãã®ãƒšã‚¢ã®ç•ªå·ã‚’入力ã‹ã€'r' ã§ã“ã®è¨­å®šã‚’ãã‚Šã‹ãˆã™ã‹ã€'?' ã§ãƒ˜ãƒ«ãƒ—を表示ã—" -#~ "ã¾ã™ã€‚\n" +#~ "°õºþ·ë²Ì¤ò³Îǧ¤·¤Æ¡¢³Æ¥Ñ¥¿¡¼¥ó¤ÇºÇŬ¤Ê¥é¥¤¥ó¤Î¥Ú¥¢¤òÁªÂò¤·¤Æ²¼¤µ¤¤¡£\n" +#~ "¤½¤Î¥Ú¥¢¤ÎÈÖ¹æ¤òÆþÎϤ«¡¢'r' ¤Ç¤³¤ÎÀßÄê¤ò¤¯¤ê¤«¤¨¤¹¤«¡¢'?' ¤Ç¥Ø¥ë¥×¤òɽ¼¨¤·" +#~ "¤Þ¤¹¡£\n" #, fuzzy #~ msgid "Model %d out of range.\n" -#~ msgstr "範囲外ã®ãƒšã‚¢ç•ªå·ã§ã™ï¼\n" +#~ msgstr "Èϰϳ°¤Î¥Ú¥¢ÈÖ¹æ¤Ç¤¹¡ª\n" #~ msgid "Right Border:" -#~ msgstr "å³å´ã®ç¸:" +#~ msgstr "±¦Â¦¤Î±ï:" #~ msgid "Bottom Border:" -#~ msgstr "下å´ã®ç¸:" +#~ msgstr "²¼Â¦¤Î±ï:" #~ msgid "Size" -#~ msgstr "ç”»åƒã®ã‚µã‚¤ã‚º" +#~ msgstr "²èÁü¤Î¥µ¥¤¥º" #~ msgid "Image / Output Settings" -#~ msgstr "ç”»åƒ / 出力設定" +#~ msgstr "²èÁü / ½ÐÎÏÀßÄê" #, fuzzy #~ msgid "GIMP-print" -#~ msgstr "å°åˆ·" +#~ msgstr "°õºþ" #, fuzzy #~ msgid "Resolutions" -#~ msgstr "解åƒåº¦" +#~ msgstr "²òÁüÅÙ" #~ msgid "Media Type:" -#~ msgstr "用紙ã®ç¨®é¡ž:" +#~ msgstr "ÍÑ»æ¤Î¼ïÎà:" #~ msgid "Type of media you're printing to" -#~ msgstr "å°åˆ·ã™ã‚‹ç”¨ç´™ã®ç¨®é¡žã§ã™ã€‚" +#~ msgstr "°õºþ¤¹¤ëÍÑ»æ¤Î¼ïÎà¤Ç¤¹¡£" #~ msgid "Media Size:" -#~ msgstr "用紙サイズ:" +#~ msgstr "Íѻ極¥¤¥º:" #~ msgid "Size of paper that you wish to print to" -#~ msgstr "å°åˆ·ã™ã‚‹ç”¨ç´™ã®ã‚µã‚¤ã‚ºã§ã™ã€‚" +#~ msgstr "°õºþ¤¹¤ëÍÑ»æ¤Î¥µ¥¤¥º¤Ç¤¹¡£" #~ msgid "Media Source:" -#~ msgstr "給紙方法:" +#~ msgstr "µë»æÊýË¡:" #~ msgid "Source (input slot) of media you're printing to" -#~ msgstr "å°åˆ·æ™‚ã®çµ¦ç´™æ–¹å¼ã§ã™ã€‚" +#~ msgstr "°õºþ»þ¤Îµë»æÊý¼°¤Ç¤¹¡£" #~ msgid "Ink Type:" -#~ msgstr "インクã®ç¨®é¡ž:" +#~ msgstr "¥¤¥ó¥¯¤Î¼ïÎà:" #~ msgid "Resolution:" -#~ msgstr "解åƒåº¦:" +#~ msgstr "²òÁüÅÙ:" #~ msgid "Print in black and white (no color, and no shades of gray)" #~ msgstr "" -#~ "黒色ã¨ç™½è‰²ã‚’使ã£ã¦å°åˆ·ã—ã¾ã™ (カラーã§ã¯ã‚ã‚Šã¾ã›ã‚“。影も付ãã¾ã›ã‚“)。" +#~ "¹õ¿§¤ÈÇò¿§¤ò»È¤Ã¤Æ°õºþ¤·¤Þ¤¹ (¥«¥é¡¼¤Ç¤Ï¤¢¤ê¤Þ¤»¤ó¡£±Æ¤âÉÕ¤­¤Þ¤»¤ó)¡£" #~ msgid "Fastest and brightest color for text and line art" -#~ msgstr "テキストやラインアートå‘ã‘ã«ä¸€ç•ªæ˜Žã‚‹ã高速å°åˆ·ã—ã¾ã™ã€‚" +#~ msgstr "¥Æ¥­¥¹¥È¤ä¥é¥¤¥ó¥¢¡¼¥È¸þ¤±¤Ë°ìÈÖÌÀ¤ë¤¯¹â®°õºþ¤·¤Þ¤¹¡£" #~ msgid "Best for images dominated by regions of solid color" -#~ msgstr "æ ¼å­ä¸Šã®è‰²ã§æ§‹æˆã•ã‚ŒãŸç”»åƒã‚’最é©åŒ–ã—ã¾ã™ã€‚" +#~ msgstr "³Ê»Ò¾å¤Î¿§¤Ç¹½À®¤µ¤ì¤¿²èÁü¤òºÇŬ²½¤·¤Þ¤¹¡£" #~ msgid "" #~ "Slowest, but most accurate and smoothest color for continuous tone images " #~ "and photographs" #~ msgstr "" -#~ "低速ã§ã™ãŒã€é€£ç¶šã—ãŸãƒˆãƒ¼ãƒ³ç”»åƒã‚„写真å‘ã‘ã«ã‚‚ã£ã¨ã‚‚精密ã§æ»‘らã‹ã«ã—ã¾ã™ã€‚" +#~ "Ä㮤Ǥ¹¤¬¡¢Ï¢Â³¤·¤¿¥È¡¼¥ó²èÁü¤ä¼Ì¿¿¸þ¤±¤Ë¤â¤Ã¤È¤âÀºÌ©¤Ç³ê¤é¤«¤Ë¤·¤Þ¤¹¡£" #~ msgid "Dither Algorithm:" -#~ msgstr "ディザリング方å¼:" +#~ msgstr "¥Ç¥£¥¶¥ê¥ó¥°Êý¼°:" #~ msgid "" #~ "\n" #~ "Cannot read from %s: %s\n" #~ msgstr "" #~ "\n" -#~ "%s ã‹ã‚‰èª­ã¿è¾¼ã‚ã¾ã›ã‚“: %s\n" +#~ "%s ¤«¤éÆɤ߹þ¤á¤Þ¤»¤ó: %s\n" #~ msgid "%s out of range (value %f, min %f, max %f)\n" -#~ msgstr "%s ã®ç¯„囲を越ãˆã¾ã—㟠(ç¾åœ¨ã®å€¤ %f, æœ€å° %f, 最大 %f)\n" +#~ msgstr "%s ¤ÎÈϰϤò±Û¤¨¤Þ¤·¤¿ (¸½ºß¤ÎÃÍ %f, ºÇ¾® %f, ºÇÂç %f)\n" #~ msgid "%s is not a valid dither algorithm\n" -#~ msgstr "%s ã¯é©åˆ‡ãªãƒ‡ã‚£ã‚¶æ–¹å¼ã§ã¯ã‚ã‚Šã¾ã›ã‚“\n" +#~ msgstr "%s ¤ÏŬÀڤʥǥ£¥¶Êý¼°¤Ç¤Ï¤¢¤ê¤Þ¤»¤ó\n" #~ msgid "" #~ "Please re-insert the same alignment sheet in the printer when it is\n" #~ "finished printing.\n" #~ msgstr "" -#~ "å°åˆ·ãŒå®Œäº†ã—ãŸã‚‰ã€\n" -#~ "å†åº¦ã€ãƒ—リンタã«å‰ã«ä½¿ç”¨ã—ãŸé–“隔補正用紙を挿入ã—ã¦ä¸‹ã•ã„。\n" +#~ "°õºþ¤¬´°Î»¤·¤¿¤é¡¢\n" +#~ "ºÆÅÙ¡¢¥×¥ê¥ó¥¿¤ËÁ°¤Ë»ÈÍѤ·¤¿´Ö³ÖÊäÀµÍÑ»æ¤òÁÞÆþ¤·¤Æ²¼¤µ¤¤¡£\n" #~ msgid "" #~ "Inspect the alignment sheet, and determine which pattern is the " @@ -9159,31 +9424,31 @@ msgstr "%.0f ã§æ¬¡ã®ä½Žãƒ¬ãƒ™ãƒ«ãƒ•ã‚£ãƒ¼ãƒ«ãƒ‰ã‚’å–å¾—ã—ã¾ã™\n" #~ "best pattern, and repeat the procedure.\n" #~ "Type a pattern number, or '?' for help.\n" #~ msgstr "" -#~ "間隔補正用紙を確èªã—ã€ã©ã®ãƒ‘ターンãŒä¸€ç•ªãªã‚らã‹ã§ã‚ã‚‹ã‹ã‚’ãƒã‚§ãƒƒã‚¯ã—ã¦ä¸‹ã•" -#~ "ã„。\n" -#~ "ãã®ã‚ˆã†ãªãƒ‘ターンã«ã¯ä¸€ç•ªå°ã•ã„ \"grain\" ãŒè¡¨ç¤ºã•ã‚Œã¾ã™ã€‚\n" -#~ "ãã®ã‚ˆã†ãªãƒ‘ターンを確èªã§ããªã„å ´åˆã¯ã€ã‚‚ã£ã¨ã‚‚最é©ãªãƒ‘ターンã®ç•ªå·ã‚’é¸æŠž" -#~ "ã—ã€\n" -#~ "ã“ã®æ‰‹é †ã‚’ç¹°ã‚Šè¿”ã—ã¦ä¸‹ã•ã„。\n" -#~ "パターンã®ç•ªå·ã‚’入力ã—ã¦ä¸‹ã•ã„ ('?' ã§ãƒ˜ãƒ«ãƒ—を表示ã—ã¾ã™)。\n" +#~ "´Ö³ÖÊäÀµÍÑ»æ¤ò³Îǧ¤·¡¢¤É¤Î¥Ñ¥¿¡¼¥ó¤¬°ìÈ֤ʤá¤é¤«¤Ç¤¢¤ë¤«¤ò¥Á¥§¥Ã¥¯¤·¤Æ²¼¤µ" +#~ "¤¤¡£\n" +#~ "¤½¤Î¤è¤¦¤Ê¥Ñ¥¿¡¼¥ó¤Ë¤Ï°ìÈÖ¾®¤µ¤¤ \"grain\" ¤¬É½¼¨¤µ¤ì¤Þ¤¹¡£\n" +#~ "¤½¤Î¤è¤¦¤Ê¥Ñ¥¿¡¼¥ó¤ò³Îǧ¤Ç¤­¤Ê¤¤¾ì¹ç¤Ï¡¢¤â¤Ã¤È¤âºÇŬ¤Ê¥Ñ¥¿¡¼¥ó¤ÎÈÖ¹æ¤òÁªÂò" +#~ "¤·¡¢\n" +#~ "¤³¤Î¼ê½ç¤ò·«¤êÊÖ¤·¤Æ²¼¤µ¤¤¡£\n" +#~ "¥Ñ¥¿¡¼¥ó¤ÎÈÖ¹æ¤òÆþÎϤ·¤Æ²¼¤µ¤¤ ('?' ¤Ç¥Ø¥ë¥×¤òɽ¼¨¤·¤Þ¤¹)¡£\n" #~ msgid "The best pattern should be numbered between 1 and %d.\n" -#~ msgstr "最é©ãªãƒ‘ターン㯠1 㨠%d ã®é–“ã®ç•ªå·ã«ã—ã¦ä¸‹ã•ã„。\n" +#~ msgstr "ºÇŬ¤Ê¥Ñ¥¿¡¼¥ó¤Ï 1 ¤È %d ¤Î´Ö¤ÎÈÖ¹æ¤Ë¤·¤Æ²¼¤µ¤¤¡£\n" #~ msgid "Set the contrast of the print" -#~ msgstr "å°åˆ·æ™‚ã®ã‚³ãƒ³ãƒˆãƒ©ã‚¹ãƒˆã‚’セットã—ã¾ã™ã€‚" +#~ msgstr "°õºþ»þ¤Î¥³¥ó¥È¥é¥¹¥È¤ò¥»¥Ã¥È¤·¤Þ¤¹¡£" #~ msgid "Cyan:" -#~ msgstr "シアン:" +#~ msgstr "¥·¥¢¥ó:" #~ msgid "Magenta:" -#~ msgstr "マゼンタ:" +#~ msgstr "¥Þ¥¼¥ó¥¿:" #~ msgid "Yellow:" -#~ msgstr "黄色:" +#~ msgstr "²«¿§:" #~ msgid "Parameter %s out of range (value %f, min %f, max %f)\n" -#~ msgstr "パラメータ %s ã¯ç¯„囲外ã§ã™ (値 %f, 最å°å€¤ %f, 最大値 %f)\n" +#~ msgstr "¥Ñ¥é¥á¡¼¥¿ %s ¤ÏÈϰϳ°¤Ç¤¹ (ÃÍ %f, ºÇ¾®ÃÍ %f, ºÇÂçÃÍ %f)\n" #~ msgid "Parameter %s out of range (value %d, min %d, max %d)\n" -#~ msgstr "パラメータ %s ã¯ç¯„囲外ã§ã™ (値 %d, 最å°å€¤ %d, 最大値 %d)\n" +#~ msgstr "¥Ñ¥é¥á¡¼¥¿ %s ¤ÏÈϰϳ°¤Ç¤¹ (ÃÍ %d, ºÇ¾®ÃÍ %d, ºÇÂçÃÍ %d)\n" diff --git a/po/nb.gmo b/po/nb.gmo index 17bbe91..489eb60 100644 Binary files a/po/nb.gmo and b/po/nb.gmo differ diff --git a/po/nb.po b/po/nb.po index aa09cb8..2424932 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: 2008-01-01 20:47-0500\n" +"POT-Creation-Date: 2008-04-25 21:19-0400\n" "PO-Revision-Date: 2002-07-01 19:36+0200\n" "Last-Translator: Kjartan Maraas \n" "Language-Team: Norwegian/Bokmaal \n" @@ -17,7 +17,7 @@ msgstr "" #. 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:1752 +#: src/main/print-escp2.c:2116 #, fuzzy msgid "Default" msgstr "Sett til standardverdier" @@ -59,57 +59,70 @@ msgid "Ordered" msgstr "Ordnet" #: src/main/dither-main.c:65 +#, fuzzy +msgid "Ordered New" +msgstr "Ordnet" + +#: src/main/dither-main.c:66 msgid "Fast" msgstr "Rask" -#: src/main/dither-main.c:66 +#: src/main/dither-main.c:67 msgid "Very Fast" msgstr "Meget rask" -#: src/main/dither-main.c:67 +#: src/main/dither-main.c:68 msgid "Hybrid Floyd-Steinberg" msgstr "" -#: src/main/dither-main.c:68 +#: src/main/dither-main.c:69 msgid "Predithered Input" msgstr "" -#: src/main/dither-main.c:88 src/main/print-color.c:56 +#: src/main/dither-main.c:70 +msgid "Drop Size Segmented" +msgstr "" + +#: src/main/dither-main.c:71 +msgid "Drop Size Segmented New" +msgstr "" + +#: src/main/dither-main.c:91 src/main/print-color.c:56 #, fuzzy msgid "Density" msgstr "Tetthet:" -#: src/main/dither-main.c:88 src/main/print-canon.c:295 +#: src/main/dither-main.c:91 src/main/print-canon.c:295 #: src/main/print-canon.c:303 src/main/print-canon.c:311 -#: src/main/print-canon.c:319 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-escp2.c:471 -#: src/main/print-escp2.c:479 src/main/print-escp2.c:487 +#: src/main/print-canon.c:319 src/main/print-escp2.c:446 +#: src/main/print-escp2.c:454 src/main/print-escp2.c:462 +#: src/main/print-escp2.c:470 src/main/print-escp2.c:478 +#: src/main/print-escp2.c:486 src/main/print-escp2.c:494 #: 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:1764 src/main/print-olympus.c:1772 -#: src/main/print-olympus.c:1780 src/main/print-olympus.c:1788 -#: src/main/print-pcl.c:1261 src/main/print-pcl.c:1269 -#: src/main/print-pcl.c:1277 src/main/print-pcl.c:1285 +#: src/main/print-olympus.c:1762 src/main/print-olympus.c:1770 +#: src/main/print-olympus.c:1778 src/main/print-olympus.c:1786 +#: src/main/print-pcl.c:1329 src/main/print-pcl.c:1337 +#: src/main/print-pcl.c:1345 src/main/print-pcl.c:1353 msgid "Output Level Adjustment" msgstr "" -#: src/main/dither-main.c:89 +#: src/main/dither-main.c:92 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:97 +#: src/main/dither-main.c:100 msgid "Dither Algorithm" msgstr "Dither-algoritme" -#: src/main/dither-main.c:97 +#: src/main/dither-main.c:100 msgid "Screening Adjustment" msgstr "" -#: src/main/dither-main.c:98 +#: src/main/dither-main.c:101 msgid "" "Choose the dither algorithm to be used.\n" "Adaptive Hybrid usually produces the best all-around quality.\n" @@ -138,9 +151,9 @@ msgstr "" msgid "Dither algorithm" msgstr "Dither-algoritme" -#: src/main/print-canon.c:200 src/main/print-escp2.c:180 -#: src/main/print-lexmark.c:266 src/main/print-olympus.c:1699 -#: src/main/print-pcl.c:1196 src/main/print-ps.c:67 +#: src/main/print-canon.c:200 src/main/print-escp2.c:182 +#: src/main/print-lexmark.c:266 src/main/print-olympus.c:1697 +#: src/main/print-pcl.c:1264 #, fuzzy msgid "Page Size" msgstr "Størrelse" @@ -149,244 +162,253 @@ msgstr "Størrelse" #: src/main/print-canon.c:212 src/main/print-canon.c:218 #: src/main/print-canon.c:224 src/main/print-canon.c:230 #: src/main/print-canon.c:248 src/main/print-canon.c:272 -#: src/main/print-escp2.c:180 src/main/print-escp2.c:186 -#: src/main/print-escp2.c:192 src/main/print-escp2.c:198 -#: src/main/print-escp2.c:204 src/main/print-escp2.c:210 -#: src/main/print-escp2.c:228 src/main/print-escp2.c:245 -#: src/main/print-escp2.c:251 src/main/print-escp2.c:263 -#: src/main/print-escp2.c:281 src/main/print-lexmark.c:266 +#: src/main/print-escp2.c:182 src/main/print-escp2.c:188 +#: src/main/print-escp2.c:194 src/main/print-escp2.c:200 +#: src/main/print-escp2.c:206 src/main/print-escp2.c:212 +#: src/main/print-escp2.c:230 src/main/print-escp2.c:247 +#: src/main/print-escp2.c:253 src/main/print-escp2.c:265 +#: src/main/print-escp2.c:283 src/main/print-lexmark.c:266 #: src/main/print-lexmark.c:272 src/main/print-lexmark.c:278 -#: src/main/print-lexmark.c:284 src/main/print-olympus.c:1699 -#: src/main/print-olympus.c:1705 src/main/print-olympus.c:1711 -#: src/main/print-olympus.c:1717 src/main/print-pcl.c:1196 -#: src/main/print-pcl.c:1202 src/main/print-pcl.c:1208 -#: src/main/print-pcl.c:1214 src/main/print-pcl.c:1238 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 +#: src/main/print-lexmark.c:284 src/main/print-olympus.c:1697 +#: src/main/print-olympus.c:1703 src/main/print-olympus.c:1709 +#: src/main/print-olympus.c:1715 src/main/print-pcl.c:1264 +#: src/main/print-pcl.c:1270 src/main/print-pcl.c:1276 +#: src/main/print-pcl.c:1282 src/main/print-pcl.c:1306 src/main/print-ps.c:68 +#: src/main/print-ps.c:74 #, fuzzy msgid "Basic Printer Setup" msgstr "Innstillinger for parametere" -#: src/main/print-canon.c:201 src/main/print-escp2.c:181 -#: src/main/print-lexmark.c:267 src/main/print-olympus.c:1700 -#: src/main/print-pcl.c:1197 src/main/print-ps.c:68 +#: src/main/print-canon.c:201 src/main/print-escp2.c:183 +#: src/main/print-lexmark.c:267 src/main/print-olympus.c:1698 +#: src/main/print-pcl.c:1265 #, fuzzy msgid "Size of the paper being printed to" msgstr "Bredde pÃ¥ papiret du skal skrive ut pÃ¥" -#: src/main/print-canon.c:206 src/main/print-escp2.c:186 -#: src/main/print-lexmark.c:272 src/main/print-olympus.c:1705 -#: src/main/print-pcl.c:1202 src/main/print-ps.c:73 src/cups/genppd.c:1417 +#: src/main/print-canon.c:206 src/main/print-escp2.c:188 +#: src/main/print-lexmark.c:272 src/main/print-olympus.c:1703 +#: src/main/print-pcl.c:1270 src/cups/genppd.c:1422 msgid "Media Type" msgstr "Medietype" -#: src/main/print-canon.c:207 src/main/print-escp2.c:187 -#: src/main/print-lexmark.c:273 src/main/print-olympus.c:1706 -#: src/main/print-pcl.c:1203 src/main/print-ps.c:74 +#: src/main/print-canon.c:207 src/main/print-escp2.c:189 +#: src/main/print-lexmark.c:273 src/main/print-olympus.c:1704 +#: src/main/print-pcl.c:1271 msgid "Type of media (plain paper, photo paper, etc.)" msgstr "" -#: src/main/print-canon.c:212 src/main/print-escp2.c:192 -#: src/main/print-lexmark.c:278 src/main/print-olympus.c:1711 -#: src/main/print-pcl.c:1208 src/main/print-ps.c:79 src/cups/genppd.c:1445 +#: src/main/print-canon.c:212 src/main/print-escp2.c:194 +#: src/main/print-lexmark.c:278 src/main/print-olympus.c:1709 +#: src/main/print-pcl.c:1276 src/cups/genppd.c:1450 msgid "Media Source" msgstr "Mediekilde" -#: src/main/print-canon.c:213 src/main/print-escp2.c:193 -#: src/main/print-lexmark.c:279 src/main/print-olympus.c:1712 -#: src/main/print-pcl.c:1209 src/main/print-ps.c:80 +#: src/main/print-canon.c:213 src/main/print-escp2.c:195 +#: src/main/print-lexmark.c:279 src/main/print-olympus.c:1710 +#: src/main/print-pcl.c:1277 msgid "Source (input slot) of the media" msgstr "" -#: src/main/print-canon.c:218 src/main/print-escp2.c:198 +#: src/main/print-canon.c:218 src/main/print-escp2.c:200 msgid "CD Hub Size" msgstr "" -#: src/main/print-canon.c:219 src/main/print-escp2.c:199 +#: src/main/print-canon.c:219 src/main/print-escp2.c:201 msgid "Print only outside of the hub of the CD, or all the way to the hole" msgstr "" -#: src/main/print-canon.c:224 src/main/print-escp2.c:204 +#: src/main/print-canon.c:224 src/main/print-escp2.c:206 msgid "CD Size (Custom)" msgstr "" -#: src/main/print-canon.c:225 src/main/print-escp2.c:205 +#: src/main/print-canon.c:225 src/main/print-escp2.c:207 msgid "Variable adjustment for the outer diameter of CD" msgstr "" -#: src/main/print-canon.c:230 src/main/print-escp2.c:210 +#: src/main/print-canon.c:230 src/main/print-escp2.c:212 msgid "CD Hub Size (Custom)" msgstr "" -#: src/main/print-canon.c:231 src/main/print-escp2.c:211 +#: src/main/print-canon.c:231 src/main/print-escp2.c:213 #, fuzzy msgid "Variable adjustment to the inner hub of the CD" msgstr "Skaler utskriften til størrelsen pÃ¥ papiret" -#: src/main/print-canon.c:236 src/main/print-escp2.c:216 +#: src/main/print-canon.c:236 src/main/print-escp2.c:218 msgid "CD Horizontal Fine Adjustment" msgstr "" #: src/main/print-canon.c:236 src/main/print-canon.c:242 -#: src/main/print-canon.c:254 src/main/print-escp2.c:216 -#: src/main/print-escp2.c:222 src/main/print-escp2.c:239 -#: src/main/print-escp2.c:275 src/main/print-lexmark.c:290 -#: src/main/print-olympus.c:1723 src/main/print-olympus.c:1729 -#: src/main/print-olympus.c:1735 src/main/print-pcl.c:1220 -#: src/main/print-ps.c:91 src/main/print-raw.c:80 +#: src/main/print-canon.c:254 src/main/print-escp2.c:218 +#: src/main/print-escp2.c:224 src/main/print-escp2.c:241 +#: src/main/print-escp2.c:277 src/main/print-lexmark.c:290 +#: src/main/print-olympus.c:1721 src/main/print-olympus.c:1727 +#: src/main/print-olympus.c:1733 src/main/print-pcl.c:1288 +#: src/main/print-raw.c:80 msgid "Advanced Printer Setup" msgstr "" #: src/main/print-canon.c:237 src/main/print-canon.c:243 -#: src/main/print-escp2.c:217 src/main/print-escp2.c:223 +#: src/main/print-escp2.c:219 src/main/print-escp2.c:225 msgid "Fine adjustment to horizontal position for CD printing" msgstr "" -#: src/main/print-canon.c:242 src/main/print-escp2.c:222 +#: src/main/print-canon.c:242 src/main/print-escp2.c:224 msgid "CD Vertical Fine Adjustment" msgstr "" -#: src/main/print-canon.c:248 src/main/print-escp2.c:228 -#: src/main/print-lexmark.c:284 src/main/print-olympus.c:1717 -#: src/main/print-pcl.c:1214 src/main/print-ps.c:85 src/cups/genppd.c:1518 +#: src/main/print-canon.c:248 src/main/print-escp2.c:230 +#: src/main/print-lexmark.c:284 src/main/print-olympus.c:1715 +#: src/main/print-pcl.c:1282 src/cups/genppd.c:1523 msgid "Resolution" msgstr "Oppløsning" #: src/main/print-canon.c:249 src/main/print-lexmark.c:285 -#: src/main/print-olympus.c:1718 src/main/print-pcl.c:1215 -#: src/main/print-ps.c:86 +#: src/main/print-olympus.c:1716 src/main/print-pcl.c:1283 msgid "Resolution and quality of the print" msgstr "Oppløsning og kvalitet pÃ¥ utskriften" -#: src/main/print-canon.c:254 src/main/print-escp2.c:239 -#: src/main/print-lexmark.c:290 src/main/print-olympus.c:1723 -#: src/main/print-pcl.c:1220 src/main/print-ps.c:91 src/main/print-raw.c:80 +#: src/main/print-canon.c:254 src/main/print-escp2.c:241 +#: src/main/print-lexmark.c:290 src/main/print-olympus.c:1721 +#: src/main/print-pcl.c:1288 src/main/print-raw.c:80 msgid "Ink Type" msgstr "Blekktype" -#: src/main/print-canon.c:255 src/main/print-escp2.c:240 -#: src/main/print-escp2.c:252 src/main/print-lexmark.c:291 -#: src/main/print-olympus.c:1724 src/main/print-pcl.c:1221 -#: src/main/print-ps.c:92 src/main/print-raw.c:81 +#: src/main/print-canon.c:255 src/main/print-escp2.c:242 +#: src/main/print-escp2.c:254 src/main/print-lexmark.c:291 +#: src/main/print-olympus.c:1722 src/main/print-pcl.c:1289 +#: src/main/print-raw.c:81 msgid "Type of ink in the printer" msgstr "Type blekk i skriveren" #: src/main/print-canon.c:260 src/main/print-canon.c:261 -#: src/main/print-escp2.c:329 src/main/print-escp2.c:330 +#: src/main/print-escp2.c:331 src/main/print-escp2.c:332 #: src/main/print-lexmark.c:296 src/main/print-lexmark.c:297 -#: src/main/print-pcl.c:1226 src/main/print-pcl.c:1227 +#: src/main/print-pcl.c:1294 src/main/print-pcl.c:1295 msgid "Ink Channels" msgstr "" -#: src/main/print-canon.c:260 src/main/print-escp2.c:130 -#: src/main/print-escp2.c:137 src/main/print-escp2.c:144 -#: src/main/print-escp2.c:287 src/main/print-escp2.c:293 -#: src/main/print-escp2.c:299 src/main/print-escp2.c:305 -#: src/main/print-escp2.c:311 src/main/print-escp2.c:317 -#: src/main/print-escp2.c:323 src/main/print-escp2.c:329 -#: src/main/print-escp2.c:335 src/main/print-lexmark.c:296 -#: src/main/print-pcl.c:1226 +#: src/main/print-canon.c:260 src/main/print-escp2.c:132 +#: src/main/print-escp2.c:139 src/main/print-escp2.c:146 +#: src/main/print-escp2.c:289 src/main/print-escp2.c:295 +#: src/main/print-escp2.c:301 src/main/print-escp2.c:307 +#: src/main/print-escp2.c:313 src/main/print-escp2.c:319 +#: src/main/print-escp2.c:325 src/main/print-escp2.c:331 +#: src/main/print-escp2.c:337 src/main/print-lexmark.c:296 +#: src/main/print-pcl.c:1294 msgid "Advanced Printer Functionality" msgstr "" -#: src/main/print-canon.c:266 src/main/print-escp2.c:341 -#: src/main/print-lexmark.c:302 src/main/print-olympus.c:1741 -#: src/main/print-pcl.c:1232 src/main/print-ps.c:103 src/main/print-raw.c:86 +#: src/main/print-canon.c:266 src/main/print-escp2.c:343 +#: src/main/print-lexmark.c:302 src/main/print-olympus.c:1739 +#: src/main/print-pcl.c:1300 src/main/print-ps.c:80 src/main/print-raw.c:86 #, fuzzy msgid "Printing Mode" msgstr "Raskt heltall" #: src/main/print-canon.c:266 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:341 -#: src/main/print-escp2.c:347 src/main/print-lexmark.c:302 -#: src/main/print-olympus.c:1741 src/main/print-pcl.c:1232 -#: src/main/print-ps.c:103 src/main/print-raw.c:86 +#: src/main/print-color.c:208 src/main/print-escp2.c:343 +#: src/main/print-escp2.c:349 src/main/print-lexmark.c:302 +#: src/main/print-olympus.c:1739 src/main/print-pcl.c:1300 +#: src/main/print-ps.c:80 src/main/print-raw.c:86 #, fuzzy msgid "Core Parameter" msgstr "Vanlig papir" -#: src/main/print-canon.c:267 src/main/print-escp2.c:342 -#: src/main/print-lexmark.c:303 src/main/print-olympus.c:1742 -#: src/main/print-pcl.c:1233 src/main/print-ps.c:104 src/main/print-raw.c:87 +#: src/main/print-canon.c:267 src/main/print-escp2.c:344 +#: src/main/print-lexmark.c:303 src/main/print-olympus.c:1740 +#: src/main/print-pcl.c:1301 src/main/print-ps.c:81 src/main/print-raw.c:87 msgid "Printing Output Mode" msgstr "" -#: src/main/print-canon.c:272 src/main/print-pcl.c:1238 +#: src/main/print-canon.c:272 src/main/print-pcl.c:1306 msgid "Double-Sided Printing" msgstr "" -#: src/main/print-canon.c:273 src/main/print-pcl.c:1239 +#: src/main/print-canon.c:273 src/main/print-pcl.c:1307 msgid "Duplex/Tumble Setting" msgstr "" -#: src/main/print-canon.c:295 src/main/print-escp2.c:439 -#: src/main/print-lexmark.c:325 src/main/print-pcl.c:1261 +#: src/main/print-canon.c:295 src/main/print-escp2.c:446 +#: src/main/print-lexmark.c:325 src/main/print-pcl.c:1329 #, fuzzy msgid "Cyan Density" msgstr "Tetthet:" -#: src/main/print-canon.c:296 src/main/print-escp2.c:440 -#: src/main/print-lexmark.c:326 src/main/print-pcl.c:1262 +#: src/main/print-canon.c:296 src/main/print-escp2.c:447 +#: src/main/print-lexmark.c:326 src/main/print-pcl.c:1330 msgid "Adjust the cyan density" msgstr "" -#: src/main/print-canon.c:303 src/main/print-escp2.c:447 -#: src/main/print-lexmark.c:333 src/main/print-pcl.c:1269 +#: src/main/print-canon.c:303 src/main/print-escp2.c:454 +#: src/main/print-lexmark.c:333 src/main/print-pcl.c:1337 #, fuzzy msgid "Magenta Density" msgstr "Magenta" -#: src/main/print-canon.c:304 src/main/print-escp2.c:448 -#: src/main/print-lexmark.c:334 src/main/print-pcl.c:1270 +#: src/main/print-canon.c:304 src/main/print-escp2.c:455 +#: src/main/print-lexmark.c:334 src/main/print-pcl.c:1338 msgid "Adjust the magenta density" msgstr "" -#: src/main/print-canon.c:311 src/main/print-escp2.c:455 -#: src/main/print-lexmark.c:341 src/main/print-pcl.c:1277 +#: src/main/print-canon.c:311 src/main/print-escp2.c:462 +#: src/main/print-lexmark.c:341 src/main/print-pcl.c:1345 #, fuzzy msgid "Yellow Density" msgstr "Tetthet:" -#: src/main/print-canon.c:312 src/main/print-escp2.c:456 -#: src/main/print-lexmark.c:342 src/main/print-pcl.c:1278 +#: src/main/print-canon.c:312 src/main/print-escp2.c:463 +#: src/main/print-lexmark.c:342 src/main/print-pcl.c:1346 msgid "Adjust the yellow density" msgstr "" -#: src/main/print-canon.c:319 src/main/print-escp2.c:463 -#: src/main/print-lexmark.c:349 src/main/print-pcl.c:1285 +#: src/main/print-canon.c:319 src/main/print-escp2.c:470 +#: src/main/print-lexmark.c:349 src/main/print-pcl.c:1353 #, fuzzy msgid "Black Density" msgstr "Tetthet:" -#: src/main/print-canon.c:320 src/main/print-escp2.c:464 -#: src/main/print-lexmark.c:350 src/main/print-pcl.c:1286 +#: src/main/print-canon.c:320 src/main/print-escp2.c:471 +#: src/main/print-lexmark.c:350 src/main/print-pcl.c:1354 msgid "Adjust the black density" msgstr "" #: src/main/print-canon.c:327 src/main/print-canon.c:328 -#: src/main/print-escp2.c:495 src/main/print-escp2.c:496 +#: src/main/print-escp2.c:534 src/main/print-escp2.c:535 #: src/main/print-lexmark.c:357 src/main/print-lexmark.c:358 -#: src/main/print-pcl.c:1293 src/main/print-pcl.c:1294 +#: src/main/print-pcl.c:1361 src/main/print-pcl.c:1362 #, fuzzy msgid "Light Cyan Transition" msgstr "Lys cyan" #: src/main/print-canon.c:327 src/main/print-canon.c:335 -#: src/main/print-canon.c:343 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-escp2.c:543 -#: src/main/print-escp2.c:551 src/main/print-escp2.c:559 -#: src/main/print-lexmark.c:357 src/main/print-lexmark.c:365 -#: src/main/print-pcl.c:1293 src/main/print-pcl.c:1301 +#: src/main/print-canon.c:343 src/main/print-escp2.c:502 +#: src/main/print-escp2.c:510 src/main/print-escp2.c:518 +#: src/main/print-escp2.c:526 src/main/print-escp2.c:534 +#: src/main/print-escp2.c:542 src/main/print-escp2.c:550 +#: src/main/print-escp2.c:558 src/main/print-escp2.c:566 +#: src/main/print-escp2.c:574 src/main/print-escp2.c:582 +#: src/main/print-escp2.c:590 src/main/print-escp2.c:598 +#: src/main/print-escp2.c:606 src/main/print-escp2.c:614 +#: src/main/print-escp2.c:622 src/main/print-escp2.c:630 +#: src/main/print-escp2.c:638 src/main/print-escp2.c:646 +#: src/main/print-escp2.c:654 src/main/print-escp2.c:662 +#: src/main/print-escp2.c:670 src/main/print-escp2.c:678 +#: src/main/print-escp2.c:686 src/main/print-escp2.c:694 +#: src/main/print-escp2.c:702 src/main/print-escp2.c:710 +#: src/main/print-escp2.c:718 src/main/print-escp2.c:726 +#: src/main/print-escp2.c:734 src/main/print-lexmark.c:357 +#: src/main/print-lexmark.c:365 src/main/print-pcl.c:1361 +#: src/main/print-pcl.c:1369 msgid "Advanced Ink Adjustment" msgstr "" #: src/main/print-canon.c:335 src/main/print-canon.c:336 -#: src/main/print-escp2.c:503 src/main/print-escp2.c:504 +#: src/main/print-escp2.c:566 src/main/print-escp2.c:567 #: src/main/print-lexmark.c:365 src/main/print-lexmark.c:366 -#: src/main/print-pcl.c:1301 src/main/print-pcl.c:1302 +#: src/main/print-pcl.c:1369 src/main/print-pcl.c:1370 #, fuzzy msgid "Light Magenta Transition" msgstr "Lys magenta" @@ -396,55 +418,55 @@ msgstr "Lys magenta" msgid "Light Yellow Transition" msgstr "Lys cyan" -#: src/main/print-canon.c:363 src/main/print-pcl.c:1482 +#: src/main/print-canon.c:363 src/main/print-pcl.c:1550 #: src/main/escp2-resolutions.c:557 src/main/escp2-resolutions.c:565 #: src/main/escp2-resolutions.c:576 src/main/escp2-resolutions.c:588 msgid "Off" msgstr "" -#: src/main/print-canon.c:364 src/main/print-pcl.c:1483 +#: src/main/print-canon.c:364 src/main/print-pcl.c:1551 msgid "Long Edge (Standard)" msgstr "" -#: src/main/print-canon.c:365 src/main/print-pcl.c:1484 +#: src/main/print-canon.c:365 src/main/print-pcl.c:1552 msgid "Short Edge (Flip)" msgstr "" -#: src/main/print-canon.c:629 src/main/print-escp2.c:1648 +#: src/main/print-canon.c:629 src/main/print-escp2.c:2012 #: src/main/xmli18n-tmp.h:6 msgid "CD - 5 inch" msgstr "" -#: src/main/print-canon.c:631 src/main/print-escp2.c:1650 +#: src/main/print-canon.c:631 src/main/print-escp2.c:2014 #: src/main/xmli18n-tmp.h:7 msgid "CD - 3 inch" msgstr "" -#: src/main/print-canon.c:633 src/main/print-escp2.c:1652 +#: src/main/print-canon.c:633 src/main/print-escp2.c:2016 #: src/main/xmli18n-tmp.h:8 #, fuzzy msgid "CD - Custom" msgstr "Egendefinert" -#: src/main/print-canon.c:656 src/main/print-escp2.c:1677 +#: src/main/print-canon.c:656 src/main/print-escp2.c:2041 msgid "Normal" msgstr "" -#: src/main/print-canon.c:658 src/main/print-escp2.c:1679 +#: src/main/print-canon.c:658 src/main/print-escp2.c:2043 #, fuzzy msgid "Print To Hub" msgstr "Skriv ut til fil?" -#: src/main/print-canon.c:773 src/main/print-escp2.c:2011 -#: src/main/print-lexmark.c:1279 src/main/print-olympus.c:1996 -#: src/main/print-pcl.c:1776 src/main/print-ps.c:170 src/main/print-raw.c:135 -#: src/gutenprintui/panel.c:289 src/gutenprintui2/panel.c:289 +#: src/main/print-canon.c:773 src/main/print-escp2.c:2450 +#: src/main/print-lexmark.c:1279 src/main/print-olympus.c:1994 +#: src/main/print-pcl.c:1844 src/main/print-ps.c:310 src/main/print-raw.c:135 +#: src/gutenprintui2/panel.c:290 msgid "Color" msgstr "Farger" -#: src/main/print-canon.c:775 src/main/print-escp2.c:2013 -#: src/main/print-lexmark.c:1281 src/main/print-pcl.c:1778 -#: src/main/print-ps.c:172 src/main/print-raw.c:137 +#: src/main/print-canon.c:775 src/main/print-escp2.c:2452 +#: src/main/print-lexmark.c:1281 src/main/print-pcl.c:1846 +#: src/main/print-ps.c:312 src/main/print-raw.c:137 #, fuzzy msgid "Black and White" msgstr "Sort-hvitt" @@ -485,7 +507,7 @@ msgstr "Skriv ut" #: src/main/print-color.c:121 src/main/escp2-channels.c:916 #: src/main/escp2-channels.c:929 src/main/escp2-channels.c:943 -#: src/gutenprintui/panel.c:290 src/gutenprintui2/panel.c:290 +#: src/gutenprintui2/panel.c:291 msgid "Grayscale" msgstr "GrÃ¥toner" @@ -510,7 +532,7 @@ msgstr "" msgid "KCMY" msgstr "" -#: src/main/print-color.c:165 src/main/print-color.c:446 +#: src/main/print-color.c:165 src/main/print-color.c:454 #, fuzzy msgid "Channel " msgstr "Avbryt" @@ -572,7 +594,7 @@ msgid "Output image type" msgstr "Utskriftstype:" #: src/main/print-color.c:208 src/main/print-color.c:209 -#: src/main/print-escp2.c:347 +#: src/main/print-escp2.c:349 msgid "Raw Channels" msgstr "" @@ -636,14 +658,14 @@ msgstr "Gamma:" msgid "Gamma value assumed by application" msgstr "" -#: src/main/print-color.c:266 src/main/escp2-channels.c:3048 -#: src/main/escp2-channels.c:3060 src/main/escp2-channels.c:3068 -#: src/main/escp2-channels.c:3078 src/main/escp2-channels.c:3089 -#: src/main/escp2-channels.c:3101 src/main/escp2-channels.c:3117 -#: src/main/escp2-channels.c:3125 src/main/escp2-channels.c:3138 -#: src/main/escp2-channels.c:3151 src/main/escp2-channels.c:3165 -#: src/main/escp2-channels.c:3179 src/main/escp2-channels.c:3194 -#: src/gutenprintui/panel.c:2152 src/gutenprintui2/panel.c:2153 +#: src/main/print-color.c:266 src/main/escp2-channels.c:3087 +#: src/main/escp2-channels.c:3099 src/main/escp2-channels.c:3107 +#: src/main/escp2-channels.c:3117 src/main/escp2-channels.c:3128 +#: src/main/escp2-channels.c:3140 src/main/escp2-channels.c:3156 +#: src/main/escp2-channels.c:3164 src/main/escp2-channels.c:3177 +#: src/main/escp2-channels.c:3190 src/main/escp2-channels.c:3204 +#: src/main/escp2-channels.c:3218 src/main/escp2-channels.c:3230 +#: src/main/escp2-channels.c:3243 src/gutenprintui2/panel.c:2328 #: src/escputil/escputil.c:978 src/escputil/escputil.c:997 #: src/escputil/escputil.c:1201 msgid "Cyan" @@ -653,14 +675,14 @@ msgstr "Cyan" msgid "Adjust the cyan gamma" msgstr "" -#: src/main/print-color.c:274 src/main/escp2-channels.c:3049 -#: src/main/escp2-channels.c:3059 src/main/escp2-channels.c:3070 -#: src/main/escp2-channels.c:3079 src/main/escp2-channels.c:3090 -#: src/main/escp2-channels.c:3103 src/main/escp2-channels.c:3116 -#: src/main/escp2-channels.c:3126 src/main/escp2-channels.c:3139 -#: src/main/escp2-channels.c:3152 src/main/escp2-channels.c:3164 -#: src/main/escp2-channels.c:3178 src/main/escp2-channels.c:3195 -#: src/gutenprintui/panel.c:2159 src/gutenprintui2/panel.c:2160 +#: src/main/print-color.c:274 src/main/escp2-channels.c:3088 +#: src/main/escp2-channels.c:3098 src/main/escp2-channels.c:3109 +#: src/main/escp2-channels.c:3118 src/main/escp2-channels.c:3129 +#: src/main/escp2-channels.c:3142 src/main/escp2-channels.c:3155 +#: src/main/escp2-channels.c:3165 src/main/escp2-channels.c:3178 +#: src/main/escp2-channels.c:3191 src/main/escp2-channels.c:3203 +#: src/main/escp2-channels.c:3217 src/main/escp2-channels.c:3229 +#: src/main/escp2-channels.c:3244 src/gutenprintui2/panel.c:2335 #: src/escputil/escputil.c:979 src/escputil/escputil.c:998 #: src/escputil/escputil.c:1202 msgid "Magenta" @@ -670,14 +692,14 @@ msgstr "Magenta" msgid "Adjust the magenta gamma" msgstr "" -#: src/main/print-color.c:282 src/main/escp2-channels.c:3050 -#: src/main/escp2-channels.c:3061 src/main/escp2-channels.c:3069 -#: src/main/escp2-channels.c:3080 src/main/escp2-channels.c:3091 -#: src/main/escp2-channels.c:3105 src/main/escp2-channels.c:3112 -#: src/main/escp2-channels.c:3127 src/main/escp2-channels.c:3140 -#: src/main/escp2-channels.c:3153 src/main/escp2-channels.c:3163 -#: src/main/escp2-channels.c:3177 src/main/escp2-channels.c:3196 -#: src/gutenprintui/panel.c:2166 src/gutenprintui2/panel.c:2167 +#: src/main/print-color.c:282 src/main/escp2-channels.c:3089 +#: src/main/escp2-channels.c:3100 src/main/escp2-channels.c:3108 +#: src/main/escp2-channels.c:3119 src/main/escp2-channels.c:3130 +#: src/main/escp2-channels.c:3144 src/main/escp2-channels.c:3151 +#: src/main/escp2-channels.c:3166 src/main/escp2-channels.c:3179 +#: src/main/escp2-channels.c:3192 src/main/escp2-channels.c:3202 +#: src/main/escp2-channels.c:3216 src/main/escp2-channels.c:3228 +#: src/main/escp2-channels.c:3245 src/gutenprintui2/panel.c:2342 #: src/escputil/escputil.c:980 src/escputil/escputil.c:999 #: src/escputil/escputil.c:1203 msgid "Yellow" @@ -687,10 +709,9 @@ msgstr "Gul" msgid "Adjust the yellow gamma" msgstr "" -#: src/main/print-color.c:290 src/main/escp2-channels.c:3168 -#: src/main/escp2-channels.c:3181 src/gutenprintui/panel.c:2180 -#: src/gutenprintui2/panel.c:2181 src/escputil/escputil.c:987 -#: src/escputil/escputil.c:1005 +#: src/main/print-color.c:290 src/main/escp2-channels.c:3207 +#: src/main/escp2-channels.c:3220 src/gutenprintui2/panel.c:2356 +#: src/escputil/escputil.c:987 src/escputil/escputil.c:1005 msgid "Red" msgstr "" @@ -698,8 +719,7 @@ msgstr "" msgid "Adjust the red gamma" msgstr "" -#: src/main/print-color.c:298 src/gutenprintui/panel.c:2187 -#: src/gutenprintui2/panel.c:2188 +#: src/main/print-color.c:298 src/gutenprintui2/panel.c:2363 msgid "Green" msgstr "" @@ -707,10 +727,9 @@ msgstr "" msgid "Adjust the green gamma" msgstr "" -#: src/main/print-color.c:306 src/main/escp2-channels.c:3169 -#: src/main/escp2-channels.c:3182 src/gutenprintui/panel.c:2194 -#: src/gutenprintui2/panel.c:2195 src/escputil/escputil.c:988 -#: src/escputil/escputil.c:1006 +#: src/main/print-color.c:306 src/main/escp2-channels.c:3208 +#: src/main/escp2-channels.c:3221 src/gutenprintui2/panel.c:2370 +#: src/escputil/escputil.c:988 src/escputil/escputil.c:1006 msgid "Blue" msgstr "" @@ -719,14 +738,14 @@ msgid "Adjust the blue gamma" msgstr "" #: src/main/print-color.c:314 src/main/print-lexmark.c:613 -#: src/main/escp2-channels.c:3047 src/main/escp2-channels.c:3057 -#: src/main/escp2-channels.c:3058 src/main/escp2-channels.c:3071 -#: src/main/escp2-channels.c:3081 src/main/escp2-channels.c:3088 -#: src/main/escp2-channels.c:3100 src/main/escp2-channels.c:3113 -#: src/main/escp2-channels.c:3124 src/main/escp2-channels.c:3137 -#: src/main/escp2-channels.c:3150 src/main/escp2-channels.c:3156 -#: src/main/escp2-channels.c:3180 src/main/escp2-channels.c:3193 -#: src/gutenprintui/panel.c:2173 src/gutenprintui2/panel.c:2174 +#: src/main/escp2-channels.c:3086 src/main/escp2-channels.c:3096 +#: src/main/escp2-channels.c:3097 src/main/escp2-channels.c:3110 +#: src/main/escp2-channels.c:3120 src/main/escp2-channels.c:3127 +#: src/main/escp2-channels.c:3139 src/main/escp2-channels.c:3152 +#: src/main/escp2-channels.c:3163 src/main/escp2-channels.c:3176 +#: src/main/escp2-channels.c:3189 src/main/escp2-channels.c:3195 +#: src/main/escp2-channels.c:3219 src/main/escp2-channels.c:3231 +#: src/main/escp2-channels.c:3242 src/gutenprintui2/panel.c:2349 #: src/escputil/escputil.c:975 src/escputil/escputil.c:996 #: src/escputil/escputil.c:1200 msgid "Black" @@ -736,7 +755,7 @@ msgstr "Sort" msgid "Adjust the black gamma" msgstr "" -#: src/main/print-color.c:322 src/main/print-olympus.c:1764 +#: src/main/print-color.c:322 src/main/print-olympus.c:1762 msgid "Cyan Balance" msgstr "" @@ -750,7 +769,7 @@ msgstr "GrÃ¥toner" msgid "Adjust the cyan gray balance" msgstr "" -#: src/main/print-color.c:330 src/main/print-olympus.c:1772 +#: src/main/print-color.c:330 src/main/print-olympus.c:1770 #, fuzzy msgid "Magenta Balance" msgstr "Magenta" @@ -759,7 +778,7 @@ msgstr "Magenta" msgid "Adjust the magenta gray balance" msgstr "" -#: src/main/print-color.c:338 src/main/print-olympus.c:1780 +#: src/main/print-color.c:338 src/main/print-olympus.c:1778 #, fuzzy msgid "Yellow Balance" msgstr "Gul" @@ -786,9 +805,11 @@ msgstr "Blekktype" #: 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:353 -#: src/main/print-escp2.c:359 src/main/print-escp2.c:365 -#: src/main/print-escp2.c:371 src/main/print-escp2.c:377 +#: src/main/print-color.c:421 src/main/print-color.c:553 +#: src/main/print-escp2.c:355 src/main/print-escp2.c:361 +#: src/main/print-escp2.c:367 src/main/print-escp2.c:373 +#: src/main/print-escp2.c:379 src/main/print-escp2.c:742 +#: src/main/print-escp2.c:750 src/main/print-escp2.c:758 #, fuzzy msgid "Advanced Output Control" msgstr "Utskriftstype:" @@ -797,542 +818,659 @@ msgstr "Utskriftstype:" msgid "Limit the total ink printed to the page" msgstr "" -#: src/main/print-color.c:365 +#: src/main/print-color.c:365 src/main/print-escp2.c:742 msgid "GCR Transition" msgstr "" -#: src/main/print-color.c:366 +#: src/main/print-color.c:366 src/main/print-escp2.c:743 msgid "Adjust the gray component transition rate" msgstr "" -#: src/main/print-color.c:373 +#: src/main/print-color.c:373 src/main/print-escp2.c:750 msgid "GCR Lower Bound" msgstr "" -#: src/main/print-color.c:374 +#: src/main/print-color.c:374 src/main/print-escp2.c:751 msgid "Lower bound of gray component reduction" msgstr "" -#: src/main/print-color.c:381 +#: src/main/print-color.c:381 src/main/print-escp2.c:758 msgid "GCR Upper Bound" msgstr "" -#: src/main/print-color.c:382 +#: src/main/print-color.c:382 src/main/print-escp2.c:759 msgid "Upper bound of gray component reduction" msgstr "" -#: src/main/print-color.c:447 src/main/print-color.c:457 -#: src/main/print-color.c:465 src/main/print-color.c:473 -#: src/main/print-color.c:481 src/main/print-color.c:489 -#: src/main/print-color.c:497 src/main/print-color.c:505 -#: src/main/print-color.c:513 +#: src/main/print-color.c:421 +msgid "LUT dump file" +msgstr "" + +#: src/main/print-color.c:422 +msgid "Dump file for LUT for external color adjustment" +msgstr "" + +#: src/main/print-color.c:455 src/main/print-color.c:465 +#: src/main/print-color.c:473 src/main/print-color.c:481 +#: src/main/print-color.c:489 src/main/print-color.c:497 +#: src/main/print-color.c:505 src/main/print-color.c:513 +#: src/main/print-color.c:521 #, fuzzy msgid "Output Curves" msgstr "Utskriftstype:" -#: src/main/print-color.c:447 +#: src/main/print-color.c:455 msgid "Curve for raw channel " msgstr "" -#: src/main/print-color.c:457 +#: src/main/print-color.c:465 msgid "Cyan Curve" msgstr "" -#: src/main/print-color.c:458 +#: src/main/print-color.c:466 #, fuzzy msgid "Cyan curve" msgstr "Avbryt" -#: src/main/print-color.c:465 +#: src/main/print-color.c:473 #, fuzzy msgid "Magenta Curve" msgstr "Magenta" -#: src/main/print-color.c:466 +#: src/main/print-color.c:474 #, fuzzy msgid "Magenta curve" msgstr "Magenta" -#: src/main/print-color.c:473 +#: src/main/print-color.c:481 #, fuzzy msgid "Yellow Curve" msgstr "Gul" -#: src/main/print-color.c:474 +#: src/main/print-color.c:482 #, fuzzy msgid "Yellow curve" msgstr "Gul" -#: src/main/print-color.c:481 +#: src/main/print-color.c:489 #, fuzzy msgid "Black Curve" msgstr "Sort" -#: src/main/print-color.c:482 +#: src/main/print-color.c:490 #, fuzzy msgid "Black curve" msgstr "Sort" -#: src/main/print-color.c:489 +#: src/main/print-color.c:497 #, fuzzy msgid "Red Curve" msgstr "Gul" -#: src/main/print-color.c:490 +#: src/main/print-color.c:498 #, fuzzy msgid "Red curve" msgstr "Gul" -#: src/main/print-color.c:497 +#: src/main/print-color.c:505 #, fuzzy msgid "Green Curve" msgstr "Magenta" -#: src/main/print-color.c:498 +#: src/main/print-color.c:506 #, fuzzy msgid "Green curve" msgstr "Magenta" -#: src/main/print-color.c:505 +#: src/main/print-color.c:513 #, fuzzy msgid "Blue Curve" msgstr "Sort" -#: src/main/print-color.c:506 +#: src/main/print-color.c:514 #, fuzzy msgid "Blue curve" msgstr "Sort" -#: src/main/print-color.c:513 +#: src/main/print-color.c:521 #, fuzzy msgid "White Curve" msgstr "Gul" -#: src/main/print-color.c:514 +#: src/main/print-color.c:522 #, fuzzy msgid "White curve" msgstr "Gul" -#: src/main/print-color.c:521 +#: src/main/print-color.c:529 msgid "Hue Map" msgstr "" -#: src/main/print-color.c:521 src/main/print-color.c:529 -#: src/main/print-color.c:537 +#: src/main/print-color.c:529 src/main/print-color.c:537 +#: src/main/print-color.c:545 msgid "Advanced HSL Curves" msgstr "" -#: src/main/print-color.c:522 +#: src/main/print-color.c:530 msgid "Hue adjustment curve" msgstr "" -#: src/main/print-color.c:529 +#: src/main/print-color.c:537 #, fuzzy msgid "Saturation Map" msgstr "Metning:" -#: src/main/print-color.c:530 +#: src/main/print-color.c:538 msgid "Saturation adjustment curve" msgstr "" -#: src/main/print-color.c:537 +#: src/main/print-color.c:545 msgid "Luminosity Map" msgstr "" -#: src/main/print-color.c:538 +#: src/main/print-color.c:546 msgid "Luminosity adjustment curve" msgstr "" -#: src/main/print-color.c:545 +#: src/main/print-color.c:553 msgid "Gray Component Reduction" msgstr "" -#: src/main/print-color.c:546 +#: src/main/print-color.c:554 msgid "Gray component reduction curve" msgstr "" -#: src/main/print-color.c:1670 +#: src/main/print-color.c:1743 msgid "Traditional Gutenprint color conversion" msgstr "" -#: src/main/printers.c:517 +#: src/main/printers.c:514 #, c-format msgid "Value must be set for %s\n" msgstr "" -#: src/main/printers.c:530 src/main/printers.c:535 +#: src/main/printers.c:527 src/main/printers.c:532 #, fuzzy, c-format msgid "`%s' is not a valid %s\n" msgstr "%s er ikke en gyldig dither-algoritme\n" -#: src/main/printers.c:554 +#: src/main/printers.c:551 #, c-format msgid "%s must be between %f and %f (is %f)\n" msgstr "" -#: src/main/printers.c:576 src/main/printers.c:600 +#: src/main/printers.c:573 src/main/printers.c:597 #, c-format msgid "%s must be between %d and %d (is %d)\n" msgstr "" -#: src/main/printers.c:631 +#: src/main/printers.c:628 #, c-format msgid "%s bounds must be between %f and %f\n" msgstr "" -#: src/main/printers.c:639 +#: src/main/printers.c:636 #, c-format msgid "%s wrap mode must be %s\n" msgstr "" -#: src/main/printers.c:643 +#: src/main/printers.c:640 msgid "no wrap" msgstr "" -#: src/main/printers.c:643 +#: src/main/printers.c:640 msgid "wrap around" msgstr "" -#: src/main/printers.c:687 +#: src/main/printers.c:684 #, fuzzy, c-format msgid "Unknown type parameter %s (%d)\n" msgstr "Ukjent skriver %s\n" -#: src/main/printers.c:700 src/main/printers.c:711 +#: src/main/printers.c:697 src/main/printers.c:708 #, c-format msgid "%s out of range (value %d, min %d, max %d)\n" msgstr "%s utenfor omrÃ¥det (verdi %d, min %d, maks %d)\n" -#: src/main/printers.c:772 +#: src/main/printers.c:768 #, fuzzy msgid "Page size is not valid\n" msgstr "Bildestørrelsen er ikke gyldig\n" -#: src/main/printers.c:793 +#: src/main/printers.c:789 #, fuzzy, c-format msgid "Top margin must not be less than %d\n" msgstr "Toppmargen mÃ¥ ikke være mindre enn null\n" -#: src/main/printers.c:799 +#: src/main/printers.c:795 #, fuzzy, c-format msgid "Left margin must not be less than %d\n" msgstr "Venstre marg mÃ¥ ikke være mindre enn null\n" -#: src/main/printers.c:805 +#: src/main/printers.c:801 #, fuzzy msgid "Height must be greater than zero\n" msgstr "Venstre marg mÃ¥ ikke være mindre enn null\n" -#: src/main/printers.c:811 +#: src/main/printers.c:807 #, fuzzy msgid "Width must be greater than zero\n" msgstr "Toppmargen mÃ¥ ikke være mindre enn null\n" -#: src/main/printers.c:817 +#: src/main/printers.c:813 #, c-format msgid "" "Image is too wide for the page: left margin is %d, width %d, right edge is %" "d\n" msgstr "" -#: src/main/printers.c:824 +#: src/main/printers.c:820 #, c-format msgid "" "Image is too long for the page: top margin is %d, height %d, bottom edge is %" "d\n" msgstr "" -#: src/main/print-escp2.c:162 +#: src/main/print-escp2.c:164 msgid "Automatic Printing Mode" msgstr "" -#: src/main/print-escp2.c:162 src/main/print-escp2.c:174 +#: src/main/print-escp2.c:164 src/main/print-escp2.c:176 #: src/main/generic-options.c:62 msgid "Basic Output Adjustment" msgstr "" -#: src/main/print-escp2.c:163 +#: src/main/print-escp2.c:165 msgid "Automatic printing mode" msgstr "" -#: src/main/print-escp2.c:174 src/main/print-escp2.c:175 +#: src/main/print-escp2.c:176 src/main/print-escp2.c:177 #: src/main/generic-options.c:62 src/main/generic-options.c:63 msgid "Print Quality" msgstr "" -#: src/main/print-escp2.c:229 +#: src/main/print-escp2.c:231 #, fuzzy msgid "Resolution of the print" msgstr "Oppløsning og kvalitet pÃ¥ utskriften" -#: src/main/print-escp2.c:245 +#: src/main/print-escp2.c:247 msgid "Enhanced Gloss" msgstr "" -#: src/main/print-escp2.c:246 +#: src/main/print-escp2.c:248 msgid "Add gloss enhancement" msgstr "" -#: src/main/print-escp2.c:251 +#: src/main/print-escp2.c:253 #, fuzzy msgid "Ink Set" msgstr "Blekktype" -#: src/main/print-escp2.c:257 +#: src/main/print-escp2.c:259 msgid "Printing Direction" msgstr "" -#: src/main/print-escp2.c:257 src/main/print-escp2.c:269 +#: src/main/print-escp2.c:259 src/main/print-escp2.c:271 msgid "Advanced Output Adjustment" msgstr "" -#: src/main/print-escp2.c:258 +#: src/main/print-escp2.c:260 msgid "Printing direction (unidirectional is higher quality, but slower)" msgstr "" -#: src/main/print-escp2.c:263 src/main/print-olympus.c:1735 +#: src/main/print-escp2.c:265 src/main/print-olympus.c:1733 msgid "Borderless" msgstr "" -#: src/main/print-escp2.c:264 src/main/print-olympus.c:1736 +#: src/main/print-escp2.c:266 src/main/print-olympus.c:1734 msgid "Print without borders" msgstr "" -#: src/main/print-escp2.c:269 +#: src/main/print-escp2.c:271 msgid "Interleave Method" msgstr "" -#: src/main/print-escp2.c:270 +#: src/main/print-escp2.c:272 msgid "Interleave pattern to use" msgstr "" -#: src/main/print-escp2.c:275 +#: src/main/print-escp2.c:277 msgid "Adjust dot size as necessary" msgstr "" -#: src/main/print-escp2.c:276 +#: src/main/print-escp2.c:278 msgid "Adjust dot size as necessary to achieve desired density" msgstr "" -#: src/main/print-escp2.c:281 src/main/print-escp2.c:282 +#: src/main/print-escp2.c:283 src/main/print-escp2.c:284 #, fuzzy msgid "Output Order" msgstr "Utskriftstype:" -#: src/main/print-escp2.c:287 src/main/print-escp2.c:288 +#: src/main/print-escp2.c:289 src/main/print-escp2.c:290 msgid "Alignment Passes" msgstr "" -#: src/main/print-escp2.c:293 src/main/print-escp2.c:294 +#: src/main/print-escp2.c:295 src/main/print-escp2.c:296 msgid "Alignment Choices" msgstr "" -#: src/main/print-escp2.c:299 src/main/print-escp2.c:300 +#: src/main/print-escp2.c:301 src/main/print-escp2.c:302 #, fuzzy msgid "Ink change command" msgstr "Kommandoen ble ikke gjenkjent.\n" -#: src/main/print-escp2.c:305 src/main/print-escp2.c:306 +#: src/main/print-escp2.c:307 src/main/print-escp2.c:308 msgid "Alternate Alignment Passes" msgstr "" -#: src/main/print-escp2.c:311 src/main/print-escp2.c:312 +#: src/main/print-escp2.c:313 src/main/print-escp2.c:314 #, fuzzy msgid "Alternate Alignment Choices" msgstr "Gjentar justeringsprosessen.\n" -#: src/main/print-escp2.c:317 +#: src/main/print-escp2.c:319 msgid "Supports Packet Mode" msgstr "" -#: src/main/print-escp2.c:318 +#: src/main/print-escp2.c:320 msgid "Supports D4 Packet Mode" msgstr "" -#: src/main/print-escp2.c:323 +#: src/main/print-escp2.c:325 msgid "Has Interchangeable Ink Cartridges" msgstr "" -#: src/main/print-escp2.c:324 +#: src/main/print-escp2.c:326 msgid "Has multiple choices of ink cartridges" msgstr "" -#: src/main/print-escp2.c:335 src/main/print-escp2.c:336 +#: src/main/print-escp2.c:337 src/main/print-escp2.c:338 #, fuzzy msgid "Channel Names" msgstr "Avbryt" -#: src/main/print-escp2.c:348 +#: src/main/print-escp2.c:350 msgid "Raw Channel Count" msgstr "" -#: src/main/print-escp2.c:353 +#: src/main/print-escp2.c:355 #, fuzzy msgid "Cyan Map" msgstr "Cyan" -#: src/main/print-escp2.c:354 +#: src/main/print-escp2.c:356 msgid "Adjust the cyan map" msgstr "" -#: src/main/print-escp2.c:359 +#: src/main/print-escp2.c:361 #, fuzzy msgid "Magenta Map" msgstr "Magenta" -#: src/main/print-escp2.c:360 +#: src/main/print-escp2.c:362 msgid "Adjust the magenta map" msgstr "" -#: src/main/print-escp2.c:365 +#: src/main/print-escp2.c:367 #, fuzzy msgid "Yellow Map" msgstr "Gul" -#: src/main/print-escp2.c:366 +#: src/main/print-escp2.c:368 msgid "Adjust the yellow map" msgstr "" -#: src/main/print-escp2.c:371 +#: src/main/print-escp2.c:373 #, fuzzy msgid "Blue Map" msgstr "Sort-hvitt" -#: src/main/print-escp2.c:372 +#: src/main/print-escp2.c:374 msgid "Adjust the blue map" msgstr "" -#: src/main/print-escp2.c:377 +#: src/main/print-escp2.c:379 msgid "Red Map" msgstr "" -#: src/main/print-escp2.c:378 +#: src/main/print-escp2.c:380 msgid "Adjust the red map" msgstr "" -#: src/main/print-escp2.c:471 +#: src/main/print-escp2.c:478 #, fuzzy msgid "Red Density" msgstr "Tetthet:" -#: src/main/print-escp2.c:472 +#: src/main/print-escp2.c:479 msgid "Adjust the red density" msgstr "" -#: src/main/print-escp2.c:479 +#: src/main/print-escp2.c:486 #, fuzzy msgid "Blue Density" msgstr "Tetthet:" -#: src/main/print-escp2.c:480 +#: src/main/print-escp2.c:487 msgid "Adjust the blue density" msgstr "" -#: src/main/print-escp2.c:487 +#: src/main/print-escp2.c:494 #, fuzzy msgid "Gloss Level" msgstr "Glanset film" -#: src/main/print-escp2.c:488 +#: src/main/print-escp2.c:495 msgid "Adjust the gloss level" msgstr "" -#: src/main/print-escp2.c:511 src/main/print-escp2.c:512 +#: src/main/print-escp2.c:502 +msgid "Drop Size Small" +msgstr "" + +#: src/main/print-escp2.c:503 +msgid "Drop Size 1 (small)" +msgstr "" + +#: src/main/print-escp2.c:510 +msgid "Drop Size Medium" +msgstr "" + +#: src/main/print-escp2.c:511 +msgid "Drop Size 2 (medium)" +msgstr "" + +#: src/main/print-escp2.c:518 +msgid "Drop Size Large" +msgstr "" + +#: src/main/print-escp2.c:519 +msgid "Drop Size 3 (large)" +msgstr "" + +#: src/main/print-escp2.c:526 src/main/print-escp2.c:527 +#, fuzzy +msgid "Light Cyan Value" +msgstr "Lys cyan" + +#: src/main/print-escp2.c:542 src/main/print-escp2.c:543 +#, fuzzy +msgid "Light Cyan Density Scale" +msgstr "Tetthet:" + +#: src/main/print-escp2.c:550 src/main/print-escp2.c:551 +#, fuzzy +msgid "Light Magenta Value" +msgstr "Lys magenta" + +#: src/main/print-escp2.c:558 src/main/print-escp2.c:559 +#, fuzzy +msgid "Light Magenta Density Scale" +msgstr "Magenta" + +#: src/main/print-escp2.c:574 src/main/print-escp2.c:575 +#, fuzzy +msgid "Dark Yellow Value" +msgstr "Gul" + +#: src/main/print-escp2.c:582 src/main/print-escp2.c:583 msgid "Dark Yellow Transition" msgstr "" -#: src/main/print-escp2.c:519 src/main/print-escp2.c:520 -#: src/main/print-escp2.c:527 src/main/print-escp2.c:528 +#: src/main/print-escp2.c:590 src/main/print-escp2.c:591 +#, fuzzy +msgid "Dark Yellow Density Scale" +msgstr "Tetthet:" + +#: src/main/print-escp2.c:598 src/main/print-escp2.c:599 +#: src/main/print-escp2.c:622 src/main/print-escp2.c:623 +#, fuzzy +msgid "Gray Value" +msgstr "GrÃ¥toner" + +#: src/main/print-escp2.c:606 src/main/print-escp2.c:607 +#: src/main/print-escp2.c:630 src/main/print-escp2.c:631 msgid "Gray Transition" msgstr "" -#: src/main/print-escp2.c:535 src/main/print-escp2.c:536 -#: src/main/print-escp2.c:559 src/main/print-escp2.c:560 +#: src/main/print-escp2.c:614 src/main/print-escp2.c:615 +#: src/main/print-escp2.c:638 src/main/print-escp2.c:639 +#, fuzzy +msgid "Gray Density Scale" +msgstr "GrÃ¥toner" + +#: src/main/print-escp2.c:646 src/main/print-escp2.c:647 +#: src/main/print-escp2.c:718 src/main/print-escp2.c:719 +#, fuzzy +msgid "Light Gray Value" +msgstr "Lys cyan" + +#: src/main/print-escp2.c:654 src/main/print-escp2.c:655 +#: src/main/print-escp2.c:726 src/main/print-escp2.c:727 #, fuzzy msgid "Light Gray Transition" msgstr "Lys cyan" -#: src/main/print-escp2.c:543 src/main/print-escp2.c:544 +#: src/main/print-escp2.c:662 src/main/print-escp2.c:663 +#: src/main/print-escp2.c:734 src/main/print-escp2.c:735 +#, fuzzy +msgid "Light Gray Density Scale" +msgstr "Lys cyan" + +#: src/main/print-escp2.c:670 src/main/print-escp2.c:671 +#, fuzzy +msgid "Dark Gray Value" +msgstr "Lys cyan" + +#: src/main/print-escp2.c:678 src/main/print-escp2.c:679 #, fuzzy msgid "Dark Gray Transition" msgstr "Lys cyan" -#: src/main/print-escp2.c:551 +#: src/main/print-escp2.c:686 src/main/print-escp2.c:687 +#, fuzzy +msgid "Dark Gray Density Scale" +msgstr "Lys cyan" + +#: src/main/print-escp2.c:694 +#, fuzzy +msgid "Mid Gray Value" +msgstr "GrÃ¥toner" + +#: src/main/print-escp2.c:695 +#, fuzzy +msgid "Medium Gray Value" +msgstr "Lys cyan" + +#: src/main/print-escp2.c:702 #, fuzzy msgid "Mid Gray Transition" msgstr "Lys cyan" -#: src/main/print-escp2.c:552 +#: src/main/print-escp2.c:703 #, fuzzy msgid "Medium Gray Transition" msgstr "Lys cyan" -#: src/main/print-escp2.c:1635 +#: src/main/print-escp2.c:710 +#, fuzzy +msgid "Mid Gray Density Scale" +msgstr "Lys cyan" + +#: src/main/print-escp2.c:711 +#, fuzzy +msgid "Medium Gray Density Scale" +msgstr "Lys cyan" + +#: src/main/print-escp2.c:1999 #, fuzzy msgid "Full Manual Control" msgstr "Utskriftstype:" -#: src/main/print-escp2.c:1637 +#: src/main/print-escp2.c:2001 msgid "Automatic Setting Control" msgstr "" -#: src/main/print-escp2.c:1732 src/main/generic-options.c:213 +#: src/main/print-escp2.c:2096 src/main/generic-options.c:213 #: src/main/generic-options.c:230 #, fuzzy msgid "Manual Control" msgstr "Utskriftstype:" -#: src/main/print-escp2.c:1771 src/main/print-escp2.c:1863 -#: src/main/print-escp2.c:1875 src/main/print-pcl.c:230 -#: src/main/escp2-channels.c:2805 src/main/escp2-papers.c:1707 -#: src/main/escp2-papers.c:1731 src/main/escp2-papers.c:1764 -#: src/main/escp2-papers.c:1815 src/main/escp2-papers.c:1857 -#: src/main/escp2-papers.c:1899 src/main/escp2-papers.c:1992 -#: src/main/escp2-resolutions.c:640 src/main/escp2-resolutions.c:655 -#: src/main/escp2-resolutions.c:668 src/main/generic-options.c:36 -#: src/gutenprintui/panel.c:2613 src/gutenprintui2/panel.c:2639 +#: src/main/print-escp2.c:2139 src/main/print-escp2.c:2231 +#: src/main/print-escp2.c:2243 src/main/print-pcl.c:237 +#: src/main/escp2-channels.c:2827 src/main/escp2-channels.c:2836 +#: src/main/escp2-papers.c:1718 src/main/escp2-papers.c:1742 +#: src/main/escp2-papers.c:1775 src/main/escp2-papers.c:1826 +#: src/main/escp2-papers.c:1868 src/main/escp2-papers.c:1910 +#: src/main/escp2-papers.c:2003 src/main/escp2-resolutions.c:640 +#: src/main/escp2-resolutions.c:655 src/main/escp2-resolutions.c:670 +#: src/main/escp2-resolutions.c:683 src/main/generic-options.c:36 +#: src/gutenprintui2/panel.c:2814 msgid "Standard" msgstr "Standard" -#: src/main/print-escp2.c:1842 +#: src/main/print-escp2.c:2210 #, fuzzy msgid "Automatic" msgstr "Størrelse" -#: src/main/print-escp2.c:1844 +#: src/main/print-escp2.c:2212 msgid "Bidirectional" msgstr "" -#: src/main/print-escp2.c:1846 +#: src/main/print-escp2.c:2214 msgid "Unidirectional" msgstr "" -#: src/main/print-escp2.c:1877 +#: src/main/print-escp2.c:2245 msgid "Alternate Fill" msgstr "" -#: src/main/print-escp2.c:1879 +#: src/main/print-escp2.c:2247 msgid "Ascending Fill" msgstr "" -#: src/main/print-escp2.c:1881 +#: src/main/print-escp2.c:2249 msgid "Descending Fill" msgstr "" -#: src/main/print-escp2.c:1883 +#: src/main/print-escp2.c:2251 msgid "Ascending Double" msgstr "" -#: src/main/print-escp2.c:1885 +#: src/main/print-escp2.c:2253 msgid "Nearest Neighbor Avoidance" msgstr "" -#: src/main/print-escp2.c:2328 +#: src/main/print-escp2.c:2771 #, 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:3436 src/main/print-olympus.c:2451 +#: src/main/print-escp2.c:3934 src/main/print-olympus.c:2449 #: src/main/print-raw.c:217 msgid "Print options not verified; cannot print.\n" msgstr "" @@ -1406,109 +1544,109 @@ msgid "Three Color Composite" msgstr "" #: src/main/print-lexmark.c:607 src/main/print-lexmark.c:677 -#: src/main/escp2-channels.c:1540 src/main/escp2-channels.c:1554 -#: src/main/escp2-channels.c:1568 src/main/escp2-channels.c:1582 -#: src/main/escp2-channels.c:1808 src/main/escp2-channels.c:1823 -#: src/main/escp2-channels.c:1838 src/main/escp2-channels.c:1855 +#: src/main/escp2-channels.c:1554 src/main/escp2-channels.c:1568 +#: src/main/escp2-channels.c:1582 src/main/escp2-channels.c:1596 +#: src/main/escp2-channels.c:1822 src/main/escp2-channels.c:1837 +#: src/main/escp2-channels.c:1852 src/main/escp2-channels.c:1869 msgid "Six Color Photo" msgstr "" #: src/main/print-lexmark.c:610 src/main/print-lexmark.c:680 -#: src/main/escp2-channels.c:1475 src/main/escp2-channels.c:1489 -#: src/main/escp2-channels.c:1503 src/main/escp2-channels.c:1517 -#: src/main/escp2-channels.c:1752 src/main/escp2-channels.c:1767 -#: src/main/escp2-channels.c:1784 +#: src/main/escp2-channels.c:1489 src/main/escp2-channels.c:1503 +#: src/main/escp2-channels.c:1517 src/main/escp2-channels.c:1531 +#: src/main/escp2-channels.c:1766 src/main/escp2-channels.c:1781 +#: src/main/escp2-channels.c:1798 msgid "Five Color Photo Composite" msgstr "" -#: src/main/print-lexmark.c:856 src/main/escp2-papers.c:1341 -#: src/main/escp2-papers.c:1385 src/main/escp2-papers.c:1429 -#: src/main/escp2-papers.c:1477 src/main/escp2-papers.c:1525 -#: src/main/escp2-papers.c:1569 +#: src/main/print-lexmark.c:856 src/main/escp2-papers.c:1351 +#: src/main/escp2-papers.c:1395 src/main/escp2-papers.c:1439 +#: src/main/escp2-papers.c:1487 src/main/escp2-papers.c:1535 +#: src/main/escp2-papers.c:1579 msgid "Plain Paper" msgstr "Vanlig papir" -#: src/main/print-lexmark.c:860 src/main/escp2-papers.c:1347 -#: src/main/escp2-papers.c:1391 src/main/escp2-papers.c:1435 -#: src/main/escp2-papers.c:1483 src/main/escp2-papers.c:1531 -#: src/main/escp2-papers.c:1575 +#: src/main/print-lexmark.c:860 src/main/escp2-papers.c:1357 +#: src/main/escp2-papers.c:1401 src/main/escp2-papers.c:1445 +#: src/main/escp2-papers.c:1493 src/main/escp2-papers.c:1541 +#: src/main/escp2-papers.c:1585 msgid "Glossy Film" msgstr "Glanset film" -#: src/main/print-lexmark.c:864 src/main/escp2-papers.c:1349 -#: src/main/escp2-papers.c:1393 src/main/escp2-papers.c:1437 -#: src/main/escp2-papers.c:1485 src/main/escp2-papers.c:1533 -#: src/main/escp2-papers.c:1577 +#: src/main/print-lexmark.c:864 src/main/escp2-papers.c:1359 +#: src/main/escp2-papers.c:1403 src/main/escp2-papers.c:1447 +#: src/main/escp2-papers.c:1495 src/main/escp2-papers.c:1543 +#: src/main/escp2-papers.c:1587 msgid "Transparencies" msgstr "Gjennomsiktighet" -#: src/main/print-lexmark.c:868 src/main/escp2-papers.c:1351 -#: src/main/escp2-papers.c:1395 src/main/escp2-papers.c:1439 -#: src/main/escp2-papers.c:1487 src/main/escp2-papers.c:1535 -#: src/main/escp2-papers.c:1579 +#: src/main/print-lexmark.c:868 src/main/escp2-papers.c:1361 +#: src/main/escp2-papers.c:1405 src/main/escp2-papers.c:1449 +#: src/main/escp2-papers.c:1497 src/main/escp2-papers.c:1545 +#: src/main/escp2-papers.c:1589 msgid "Envelopes" msgstr "Konvolutter" -#: src/main/print-lexmark.c:872 src/main/escp2-papers.c:1355 -#: src/main/escp2-papers.c:1399 src/main/escp2-papers.c:1443 -#: src/main/escp2-papers.c:1491 src/main/escp2-papers.c:1539 -#: src/main/escp2-papers.c:1583 +#: src/main/print-lexmark.c:872 src/main/escp2-papers.c:1365 +#: src/main/escp2-papers.c:1409 src/main/escp2-papers.c:1453 +#: src/main/escp2-papers.c:1501 src/main/escp2-papers.c:1549 +#: src/main/escp2-papers.c:1593 msgid "Matte Paper" msgstr "Matt papir" -#: src/main/print-lexmark.c:876 src/main/escp2-papers.c:1359 -#: src/main/escp2-papers.c:1403 src/main/escp2-papers.c:1447 -#: src/main/escp2-papers.c:1495 src/main/escp2-papers.c:1543 -#: src/main/escp2-papers.c:1587 +#: src/main/print-lexmark.c:876 src/main/escp2-papers.c:1369 +#: src/main/escp2-papers.c:1413 src/main/escp2-papers.c:1457 +#: src/main/escp2-papers.c:1505 src/main/escp2-papers.c:1553 +#: src/main/escp2-papers.c:1597 msgid "Inkjet Paper" msgstr "Papir for blekkskriver" -#: src/main/print-lexmark.c:880 src/main/escp2-papers.c:1361 -#: src/main/escp2-papers.c:1405 src/main/escp2-papers.c:1449 -#: src/main/escp2-papers.c:1497 src/main/escp2-papers.c:1545 -#: src/main/escp2-papers.c:1589 +#: src/main/print-lexmark.c:880 src/main/escp2-papers.c:1371 +#: src/main/escp2-papers.c:1415 src/main/escp2-papers.c:1459 +#: src/main/escp2-papers.c:1507 src/main/escp2-papers.c:1555 +#: src/main/escp2-papers.c:1599 msgid "Photo Quality Inkjet Paper" msgstr "Papir med fotokvalitet for blekkskriver" -#: src/main/print-lexmark.c:884 src/main/escp2-papers.c:1363 -#: src/main/escp2-papers.c:1407 src/main/escp2-papers.c:1451 -#: src/main/escp2-papers.c:1499 src/main/escp2-papers.c:1547 -#: src/main/escp2-papers.c:1591 +#: src/main/print-lexmark.c:884 src/main/escp2-papers.c:1373 +#: src/main/escp2-papers.c:1417 src/main/escp2-papers.c:1461 +#: src/main/escp2-papers.c:1509 src/main/escp2-papers.c:1557 +#: src/main/escp2-papers.c:1601 msgid "Photo Paper" msgstr "Fotopapir" -#: src/main/print-lexmark.c:888 src/main/escp2-papers.c:1365 -#: src/main/escp2-papers.c:1409 src/main/escp2-papers.c:1453 -#: src/main/escp2-papers.c:1501 src/main/escp2-papers.c:1549 -#: src/main/escp2-papers.c:1593 src/main/escp2-papers.c:1617 +#: src/main/print-lexmark.c:888 src/main/escp2-papers.c:1375 +#: src/main/escp2-papers.c:1419 src/main/escp2-papers.c:1463 +#: src/main/escp2-papers.c:1511 src/main/escp2-papers.c:1559 +#: src/main/escp2-papers.c:1603 src/main/escp2-papers.c:1627 msgid "Premium Glossy Photo Paper" msgstr "" -#: src/main/print-lexmark.c:892 src/main/escp2-papers.c:1369 -#: src/main/escp2-papers.c:1413 src/main/escp2-papers.c:1457 -#: src/main/escp2-papers.c:1505 src/main/escp2-papers.c:1553 -#: src/main/escp2-papers.c:1597 +#: src/main/print-lexmark.c:892 src/main/escp2-papers.c:1379 +#: src/main/escp2-papers.c:1423 src/main/escp2-papers.c:1467 +#: src/main/escp2-papers.c:1515 src/main/escp2-papers.c:1563 +#: src/main/escp2-papers.c:1607 msgid "Premium Luster Photo Paper" msgstr "" -#: src/main/print-lexmark.c:896 src/main/escp2-papers.c:1371 -#: src/main/escp2-papers.c:1415 src/main/escp2-papers.c:1463 -#: src/main/escp2-papers.c:1511 src/main/escp2-papers.c:1555 -#: src/main/escp2-papers.c:1603 +#: src/main/print-lexmark.c:896 src/main/escp2-papers.c:1381 +#: src/main/escp2-papers.c:1425 src/main/escp2-papers.c:1473 +#: src/main/escp2-papers.c:1521 src/main/escp2-papers.c:1565 +#: src/main/escp2-papers.c:1613 msgid "Photo Quality Glossy Paper" msgstr "" -#: src/main/print-lexmark.c:900 src/main/escp2-papers.c:1373 -#: src/main/escp2-papers.c:1417 src/main/escp2-papers.c:1465 -#: src/main/escp2-papers.c:1513 src/main/escp2-papers.c:1557 -#: src/main/escp2-papers.c:1605 +#: src/main/print-lexmark.c:900 src/main/escp2-papers.c:1383 +#: src/main/escp2-papers.c:1427 src/main/escp2-papers.c:1475 +#: src/main/escp2-papers.c:1523 src/main/escp2-papers.c:1567 +#: src/main/escp2-papers.c:1615 msgid "Ilford Heavy Paper" msgstr "" -#: src/main/print-lexmark.c:904 src/main/escp2-papers.c:1377 -#: src/main/escp2-papers.c:1421 src/main/escp2-papers.c:1469 -#: src/main/escp2-papers.c:1517 src/main/escp2-papers.c:1561 -#: src/main/escp2-papers.c:1609 src/main/escp2-papers.c:1619 +#: src/main/print-lexmark.c:904 src/main/escp2-papers.c:1387 +#: src/main/escp2-papers.c:1431 src/main/escp2-papers.c:1479 +#: src/main/escp2-papers.c:1527 src/main/escp2-papers.c:1571 +#: src/main/escp2-papers.c:1619 src/main/escp2-papers.c:1629 msgid "Other" msgstr "Annet" @@ -1524,53 +1662,53 @@ msgstr "Manuell med pause" msgid "Manual without Pause" msgstr "Manuell uten pause" -#: src/main/print-olympus.c:277 +#: src/main/print-olympus.c:275 msgid "Coated" msgstr "" -#: src/main/print-olympus.c:278 src/cups/genppd.c:1726 src/cups/genppd.c:1753 -#: src/cups/genppd.c:1834 +#: src/main/print-olympus.c:276 src/cups/genppd.c:1732 src/cups/genppd.c:1759 +#: src/cups/genppd.c:1840 msgid "None" msgstr "" -#: src/main/print-olympus.c:963 src/main/print-olympus.c:1023 -#: src/main/print-olympus.c:1127 +#: src/main/print-olympus.c:961 src/main/print-olympus.c:1021 +#: src/main/print-olympus.c:1125 #, fuzzy msgid "Glossy" msgstr "Glanset film" -#: src/main/print-olympus.c:964 src/main/print-olympus.c:1024 -#: src/main/print-olympus.c:1128 +#: src/main/print-olympus.c:962 src/main/print-olympus.c:1022 +#: src/main/print-olympus.c:1126 msgid "Texture" msgstr "" -#: src/main/print-olympus.c:1025 src/main/print-olympus.c:1129 +#: src/main/print-olympus.c:1023 src/main/print-olympus.c:1127 #, fuzzy msgid "Matte" msgstr "Matt papir" -#: src/main/print-olympus.c:1729 src/main/print-olympus.c:1730 +#: src/main/print-olympus.c:1727 src/main/print-olympus.c:1728 msgid "Laminate Pattern" msgstr "" -#: src/main/print-olympus.c:1765 +#: src/main/print-olympus.c:1763 msgid "Adjust the cyan balance" msgstr "" -#: src/main/print-olympus.c:1773 +#: src/main/print-olympus.c:1771 msgid "Adjust the magenta balance" msgstr "" -#: src/main/print-olympus.c:1781 +#: src/main/print-olympus.c:1779 msgid "Adjust the yellow balance" msgstr "" -#: src/main/print-olympus.c:1788 +#: src/main/print-olympus.c:1786 #, fuzzy msgid "Black Balance" msgstr "Sort-hvitt" -#: src/main/print-olympus.c:1789 +#: src/main/print-olympus.c:1787 msgid "Adjust the black balance" msgstr "" @@ -1602,93 +1740,117 @@ msgstr "" msgid "Quick-dry Transparency" msgstr "" -#: src/main/print-pcl.c:231 src/main/xmli18n-tmp.h:16 +#: src/main/print-pcl.c:238 src/main/xmli18n-tmp.h:17 msgid "Manual" msgstr "Manuell" -#: src/main/print-pcl.c:233 +#: src/main/print-pcl.c:240 +msgid "Tray 1 - Movable Guides" +msgstr "" + +#: src/main/print-pcl.c:241 msgid "Tray 1" msgstr "Skuff 1" -#: src/main/print-pcl.c:234 src/main/print-pcl.c:240 +#: src/main/print-pcl.c:242 +msgid "Tray 2 - Movable Guides" +msgstr "" + +#: src/main/print-pcl.c:243 src/main/print-pcl.c:251 msgid "Tray 2" msgstr "Skuff 2" -#: src/main/print-pcl.c:235 +#: src/main/print-pcl.c:244 +msgid "Tray 3 - Movable Guides" +msgstr "" + +#: src/main/print-pcl.c:245 msgid "Tray 3" msgstr "Skuff 3" -#: src/main/print-pcl.c:236 +#: src/main/print-pcl.c:246 +msgid "Tray 4 - Movable Guides" +msgstr "" + +#: src/main/print-pcl.c:247 msgid "Tray 4" msgstr "Skuff 4" -#: src/main/print-pcl.c:237 +#: src/main/print-pcl.c:248 msgid "Portable Sheet Feeder" msgstr "Portabel arkmater" -#: src/main/print-pcl.c:238 +#: src/main/print-pcl.c:249 msgid "Desktop Sheet Feeder" msgstr "" -#: src/main/print-pcl.c:239 +#: src/main/print-pcl.c:250 msgid "Tray" msgstr "Skuff" -#: src/main/print-pcl.c:241 +#: src/main/print-pcl.c:252 msgid "Optional Source" msgstr "Alternativ kilde" -#: src/main/print-pcl.c:242 +#: src/main/print-pcl.c:253 msgid "Autoselect" msgstr "Autovelg" -#: src/main/print-pcl.c:256 +#: src/main/print-pcl.c:267 msgid "150x150 DPI" msgstr "150x150 DPI" -#: src/main/print-pcl.c:257 +#: src/main/print-pcl.c:268 msgid "300x300 DPI" msgstr "300x300 DPI" -#: src/main/print-pcl.c:258 +#: src/main/print-pcl.c:269 msgid "600x300 DPI" msgstr "600x300 DPI" -#: src/main/print-pcl.c:259 +#: src/main/print-pcl.c:270 msgid "600x600 DPI monochrome" msgstr "600x600 DPI monokrom" -#: src/main/print-pcl.c:260 +#: src/main/print-pcl.c:271 msgid "600x600 DPI" msgstr "600x600 DPI" -#: src/main/print-pcl.c:261 +#: src/main/print-pcl.c:272 msgid "1200x600 DPI" msgstr "1200x600 DPI" -#: src/main/print-pcl.c:262 +#: src/main/print-pcl.c:273 msgid "2400x600 DPI" msgstr "2400x600 DPI" -#: src/main/print-pcl.c:1470 +#: src/main/print-pcl.c:1538 msgid "Color + Black Cartridges" msgstr "" -#: src/main/print-pcl.c:1471 +#: src/main/print-pcl.c:1539 msgid "Color + Photo Cartridges" msgstr "" -#: src/main/print-ps.c:97 +#: src/main/print-ps.c:68 #, fuzzy msgid "PPDFile" msgstr "PPD fil:" -#: src/main/print-ps.c:98 src/gutenprintui/panel.c:1768 -#: src/gutenprintui2/panel.c:1768 +#: src/main/print-ps.c:69 src/gutenprintui2/panel.c:1943 #, fuzzy msgid "PPD File" msgstr "PPD/Fil?" +#: src/main/print-ps.c:74 +#, fuzzy +msgid "Model Name" +msgstr "Avbryt" + +#: src/main/print-ps.c:75 +msgid "PPD File Model Name" +msgstr "" + #: src/main/print-raw.c:223 msgid "Image dimensions must match paper dimensions" msgstr "" @@ -1706,295 +1868,301 @@ msgstr "GrÃ¥toner" #: src/main/escp2-channels.c:1035 src/main/escp2-channels.c:1048 #: src/main/escp2-channels.c:1061 src/main/escp2-channels.c:1074 #: src/main/escp2-channels.c:1087 src/main/escp2-channels.c:1100 -#: src/main/escp2-channels.c:2505 src/main/escp2-channels.c:2528 -#: src/main/escp2-channels.c:2548 src/main/escp2-channels.c:2568 -#: src/main/escp2-channels.c:2588 src/main/escp2-channels.c:2608 +#: src/main/escp2-channels.c:2525 src/main/escp2-channels.c:2548 +#: src/main/escp2-channels.c:2568 src/main/escp2-channels.c:2588 +#: src/main/escp2-channels.c:2608 src/main/escp2-channels.c:2628 msgid "Quadtone" msgstr "" -#: src/main/escp2-channels.c:1604 src/main/escp2-channels.c:1618 +#: src/main/escp2-channels.c:1466 +#, fuzzy +msgid "Four Color Photo" +msgstr "Farge" + +#: src/main/escp2-channels.c:1618 src/main/escp2-channels.c:1632 msgid "Six Color Enhanced Composite" msgstr "" -#: src/main/escp2-channels.c:1641 src/main/escp2-channels.c:1655 -#: src/main/escp2-channels.c:1669 src/main/escp2-channels.c:1705 +#: src/main/escp2-channels.c:1655 src/main/escp2-channels.c:1669 +#: src/main/escp2-channels.c:1683 src/main/escp2-channels.c:1719 #, fuzzy msgid "Seven Color Photo" msgstr "Stylus Color Pro" -#: src/main/escp2-channels.c:1691 +#: src/main/escp2-channels.c:1705 #, fuzzy msgid "Seven Color Enhanced" msgstr "Stylus Color Pro" -#: src/main/escp2-channels.c:1728 +#: src/main/escp2-channels.c:1742 #, fuzzy msgid "Eight Color Photo" msgstr "Stylus Color Pro" -#: src/main/escp2-channels.c:1876 src/main/escp2-channels.c:1888 -#: src/main/escp2-channels.c:1894 +#: src/main/escp2-channels.c:1890 src/main/escp2-channels.c:1902 +#: src/main/escp2-channels.c:1908 #, fuzzy msgid "One Color Raw" msgstr "Stylus Color Pro" -#: src/main/escp2-channels.c:1900 +#: src/main/escp2-channels.c:1914 msgid "One Color Raw Enhanced Gloss" msgstr "" -#: src/main/escp2-channels.c:1913 src/main/escp2-channels.c:1925 +#: src/main/escp2-channels.c:1927 src/main/escp2-channels.c:1939 #, fuzzy msgid "Two Color Raw" msgstr "Farge" -#: src/main/escp2-channels.c:1939 src/main/escp2-channels.c:1953 -#: src/main/escp2-channels.c:1980 src/main/escp2-channels.c:1993 -#: src/main/escp2-channels.c:2006 src/main/escp2-channels.c:2019 -#: src/main/escp2-channels.c:2033 src/main/escp2-channels.c:2047 -#: src/main/escp2-channels.c:2060 +#: src/main/escp2-channels.c:1953 src/main/escp2-channels.c:1967 +#: src/main/escp2-channels.c:1994 src/main/escp2-channels.c:2007 +#: src/main/escp2-channels.c:2020 src/main/escp2-channels.c:2033 +#: src/main/escp2-channels.c:2047 src/main/escp2-channels.c:2061 +#: src/main/escp2-channels.c:2074 #, fuzzy msgid "Three Color Raw" msgstr "Stylus Color Pro" -#: src/main/escp2-channels.c:1967 +#: src/main/escp2-channels.c:1981 #, fuzzy msgid "Three Color Raw Gloss" msgstr "Stylus Color Pro" -#: src/main/escp2-channels.c:2067 src/main/escp2-channels.c:2073 -#: src/main/escp2-channels.c:2079 src/main/escp2-channels.c:2085 -#: src/main/escp2-channels.c:2091 src/main/escp2-channels.c:2097 -#: src/main/escp2-channels.c:2103 src/main/escp2-channels.c:2109 -#: src/main/escp2-channels.c:2115 src/main/escp2-channels.c:2121 +#: src/main/escp2-channels.c:2081 src/main/escp2-channels.c:2087 +#: src/main/escp2-channels.c:2093 src/main/escp2-channels.c:2099 +#: src/main/escp2-channels.c:2105 src/main/escp2-channels.c:2111 +#: src/main/escp2-channels.c:2117 src/main/escp2-channels.c:2123 +#: src/main/escp2-channels.c:2129 src/main/escp2-channels.c:2135 +#: src/main/escp2-channels.c:2141 #, fuzzy msgid "Four Color Raw" msgstr "Farge" -#: src/main/escp2-channels.c:2127 +#: src/main/escp2-channels.c:2147 #, fuzzy msgid "Four Color Raw Gloss" msgstr "Farge" -#: src/main/escp2-channels.c:2142 src/main/escp2-channels.c:2156 +#: src/main/escp2-channels.c:2162 src/main/escp2-channels.c:2176 #, fuzzy msgid "Five Color Raw" msgstr "Stylus Color Pro" -#: src/main/escp2-channels.c:2170 src/main/escp2-channels.c:2186 -#: src/main/escp2-channels.c:2192 src/main/escp2-channels.c:2198 -#: src/main/escp2-channels.c:2213 src/main/escp2-channels.c:2234 +#: src/main/escp2-channels.c:2190 src/main/escp2-channels.c:2206 +#: src/main/escp2-channels.c:2212 src/main/escp2-channels.c:2218 +#: src/main/escp2-channels.c:2233 src/main/escp2-channels.c:2254 #, fuzzy msgid "Six Color Raw" msgstr "Farge" -#: src/main/escp2-channels.c:2219 +#: src/main/escp2-channels.c:2239 #, fuzzy msgid "Six Color Enhanced Gloss Raw" msgstr "Farge" -#: src/main/escp2-channels.c:2250 src/main/escp2-channels.c:2265 -#: src/main/escp2-channels.c:2280 +#: src/main/escp2-channels.c:2270 src/main/escp2-channels.c:2285 +#: src/main/escp2-channels.c:2300 #, fuzzy msgid "Seven Color Raw" msgstr "Stylus Color Pro" -#: src/main/escp2-channels.c:2297 +#: src/main/escp2-channels.c:2317 #, fuzzy msgid "Seven Color Enhanced Gloss Raw" msgstr "Stylus Color Pro" -#: src/main/escp2-channels.c:2315 +#: src/main/escp2-channels.c:2335 #, fuzzy msgid "Eight Color Raw" msgstr "Farge" -#: src/main/escp2-channels.c:2482 src/main/escp2-channels.c:2495 -#: src/main/escp2-channels.c:2497 src/main/escp2-channels.c:2517 -#: src/main/escp2-channels.c:2520 src/main/escp2-channels.c:2540 -#: src/main/escp2-channels.c:2560 src/main/escp2-channels.c:2580 -#: src/main/escp2-channels.c:2600 src/main/escp2-channels.c:2620 -#: src/main/escp2-channels.c:2636 src/main/escp2-channels.c:2638 -#: src/main/escp2-channels.c:2640 src/main/escp2-channels.c:2642 -#: src/main/escp2-channels.c:2658 src/main/escp2-channels.c:2674 -#: src/main/escp2-channels.c:2694 +#: src/main/escp2-channels.c:2502 src/main/escp2-channels.c:2515 +#: src/main/escp2-channels.c:2517 src/main/escp2-channels.c:2537 +#: src/main/escp2-channels.c:2540 src/main/escp2-channels.c:2560 +#: src/main/escp2-channels.c:2580 src/main/escp2-channels.c:2600 +#: src/main/escp2-channels.c:2620 src/main/escp2-channels.c:2640 +#: src/main/escp2-channels.c:2656 src/main/escp2-channels.c:2658 +#: src/main/escp2-channels.c:2660 src/main/escp2-channels.c:2662 +#: src/main/escp2-channels.c:2678 src/main/escp2-channels.c:2694 +#: src/main/escp2-channels.c:2714 msgid "EPSON Standard Inks" msgstr "" -#: src/main/escp2-channels.c:2714 src/main/escp2-channels.c:2739 +#: src/main/escp2-channels.c:2734 src/main/escp2-channels.c:2759 #, fuzzy msgid "UltraChrome Photo Black" msgstr "Stylus Photo" -#: src/main/escp2-channels.c:2718 src/main/escp2-channels.c:2743 +#: src/main/escp2-channels.c:2738 src/main/escp2-channels.c:2763 msgid "UltraChrome Matte Black" msgstr "" -#: src/main/escp2-channels.c:2758 src/main/escp2-channels.c:2796 -#: src/main/escp2-channels.c:3167 src/escputil/escputil.c:976 +#: src/main/escp2-channels.c:2778 src/main/escp2-channels.c:2816 +#: src/main/escp2-channels.c:3206 src/escputil/escputil.c:976 #, fuzzy msgid "Photo Black" msgstr "Fotopapir" -#: src/main/escp2-channels.c:2762 src/main/escp2-channels.c:2778 -#: src/main/escp2-channels.c:3166 src/escputil/escputil.c:986 +#: src/main/escp2-channels.c:2782 src/main/escp2-channels.c:2798 +#: src/main/escp2-channels.c:3205 src/escputil/escputil.c:986 #, fuzzy msgid "Matte Black" msgstr "Matt papir" -#: src/main/escp2-channels.c:3092 src/main/escp2-channels.c:3102 -#: src/main/escp2-channels.c:3114 src/main/escp2-channels.c:3128 -#: src/main/escp2-channels.c:3141 src/main/escp2-channels.c:3154 -#: src/main/escp2-channels.c:3191 src/escputil/escputil.c:981 +#: src/main/escp2-channels.c:3131 src/main/escp2-channels.c:3141 +#: src/main/escp2-channels.c:3153 src/main/escp2-channels.c:3167 +#: src/main/escp2-channels.c:3180 src/main/escp2-channels.c:3193 +#: src/main/escp2-channels.c:3240 src/escputil/escputil.c:981 #: src/escputil/escputil.c:1204 #, fuzzy msgid "Light Cyan" msgstr "Lys cyan" -#: src/main/escp2-channels.c:3093 src/main/escp2-channels.c:3104 -#: src/main/escp2-channels.c:3115 src/main/escp2-channels.c:3129 -#: src/main/escp2-channels.c:3142 src/main/escp2-channels.c:3155 -#: src/main/escp2-channels.c:3190 src/escputil/escputil.c:982 +#: src/main/escp2-channels.c:3132 src/main/escp2-channels.c:3143 +#: src/main/escp2-channels.c:3154 src/main/escp2-channels.c:3168 +#: src/main/escp2-channels.c:3181 src/main/escp2-channels.c:3194 +#: src/main/escp2-channels.c:3239 src/escputil/escputil.c:982 #: src/escputil/escputil.c:1205 #, fuzzy msgid "Light Magenta" msgstr "Lys magenta" -#: src/main/escp2-channels.c:3130 src/main/escp2-channels.c:3192 +#: src/main/escp2-channels.c:3169 src/main/escp2-channels.c:3241 #: src/escputil/escputil.c:985 #, fuzzy msgid "Light Black" msgstr "Sort" -#: src/main/escp2-channels.c:3143 +#: src/main/escp2-channels.c:3182 #, fuzzy msgid "Dark Yellow" msgstr "Gul" -#: src/main/escp2-channels.c:3170 src/escputil/escputil.c:989 +#: src/main/escp2-channels.c:3209 src/escputil/escputil.c:989 #, fuzzy msgid "Gloss Optimizer" msgstr "Glanset film" -#: src/main/escp2-channels.c:3189 src/escputil/escputil.c:990 +#: src/main/escp2-channels.c:3238 src/escputil/escputil.c:990 #, fuzzy msgid "Light Light Black" msgstr "Sort" -#: src/main/escp2-papers.c:1343 src/main/escp2-papers.c:1387 -#: src/main/escp2-papers.c:1431 src/main/escp2-papers.c:1479 -#: src/main/escp2-papers.c:1527 src/main/escp2-papers.c:1571 +#: src/main/escp2-papers.c:1353 src/main/escp2-papers.c:1397 +#: src/main/escp2-papers.c:1441 src/main/escp2-papers.c:1489 +#: src/main/escp2-papers.c:1537 src/main/escp2-papers.c:1581 #, fuzzy msgid "Plain Paper Fast Load" msgstr "Vanlig papir" -#: src/main/escp2-papers.c:1345 src/main/escp2-papers.c:1389 -#: src/main/escp2-papers.c:1433 src/main/escp2-papers.c:1481 -#: src/main/escp2-papers.c:1529 src/main/escp2-papers.c:1573 +#: src/main/escp2-papers.c:1355 src/main/escp2-papers.c:1399 +#: src/main/escp2-papers.c:1443 src/main/escp2-papers.c:1491 +#: src/main/escp2-papers.c:1539 src/main/escp2-papers.c:1583 #: src/main/xmli18n-tmp.h:5 msgid "Postcard" msgstr "Postkort" -#: src/main/escp2-papers.c:1353 src/main/escp2-papers.c:1397 -#: src/main/escp2-papers.c:1441 src/main/escp2-papers.c:1489 -#: src/main/escp2-papers.c:1537 src/main/escp2-papers.c:1581 +#: src/main/escp2-papers.c:1363 src/main/escp2-papers.c:1407 +#: src/main/escp2-papers.c:1451 src/main/escp2-papers.c:1499 +#: src/main/escp2-papers.c:1547 src/main/escp2-papers.c:1591 msgid "Back Light Film" msgstr "" -#: src/main/escp2-papers.c:1357 src/main/escp2-papers.c:1401 -#: src/main/escp2-papers.c:1445 src/main/escp2-papers.c:1493 -#: src/main/escp2-papers.c:1541 src/main/escp2-papers.c:1585 +#: src/main/escp2-papers.c:1367 src/main/escp2-papers.c:1411 +#: src/main/escp2-papers.c:1455 src/main/escp2-papers.c:1503 +#: src/main/escp2-papers.c:1551 src/main/escp2-papers.c:1595 #, fuzzy msgid "Matte Paper Heavyweight" msgstr "Matt papir" -#: src/main/escp2-papers.c:1367 src/main/escp2-papers.c:1411 -#: src/main/escp2-papers.c:1455 src/main/escp2-papers.c:1503 -#: src/main/escp2-papers.c:1551 src/main/escp2-papers.c:1595 +#: src/main/escp2-papers.c:1377 src/main/escp2-papers.c:1421 +#: src/main/escp2-papers.c:1465 src/main/escp2-papers.c:1513 +#: src/main/escp2-papers.c:1561 src/main/escp2-papers.c:1605 #, fuzzy msgid "Premium Semigloss Photo Paper" msgstr "Glanset fotopapir" -#: src/main/escp2-papers.c:1375 src/main/escp2-papers.c:1419 -#: src/main/escp2-papers.c:1467 src/main/escp2-papers.c:1515 -#: src/main/escp2-papers.c:1559 src/main/escp2-papers.c:1607 +#: src/main/escp2-papers.c:1385 src/main/escp2-papers.c:1429 +#: src/main/escp2-papers.c:1477 src/main/escp2-papers.c:1525 +#: src/main/escp2-papers.c:1569 src/main/escp2-papers.c:1617 #, fuzzy msgid "ColorLife Paper" msgstr "Vanlig papir" -#: src/main/escp2-papers.c:1459 src/main/escp2-papers.c:1507 -#: src/main/escp2-papers.c:1599 +#: src/main/escp2-papers.c:1469 src/main/escp2-papers.c:1517 +#: src/main/escp2-papers.c:1609 #, fuzzy msgid "Archival Matte Paper" msgstr "Matt papir" -#: src/main/escp2-papers.c:1461 src/main/escp2-papers.c:1509 -#: src/main/escp2-papers.c:1601 +#: src/main/escp2-papers.c:1471 src/main/escp2-papers.c:1519 +#: src/main/escp2-papers.c:1611 msgid "Watercolor Paper - Radiant White" msgstr "" -#: src/main/escp2-papers.c:1716 src/main/escp2-papers.c:1842 -#: src/main/escp2-papers.c:1884 src/main/escp2-papers.c:1926 -#: src/main/escp2-papers.c:2001 +#: src/main/escp2-papers.c:1727 src/main/escp2-papers.c:1853 +#: src/main/escp2-papers.c:1895 src/main/escp2-papers.c:1937 +#: src/main/escp2-papers.c:2012 msgid "Roll Feed" msgstr "" -#: src/main/escp2-papers.c:1740 src/main/escp2-papers.c:1791 +#: src/main/escp2-papers.c:1751 src/main/escp2-papers.c:1802 msgid "Roll Feed (cut each page)" msgstr "" -#: src/main/escp2-papers.c:1749 src/main/escp2-papers.c:1800 +#: src/main/escp2-papers.c:1760 src/main/escp2-papers.c:1811 msgid "Roll Feed (do not cut)" msgstr "" -#: src/main/escp2-papers.c:1773 src/main/escp2-papers.c:1824 +#: src/main/escp2-papers.c:1784 src/main/escp2-papers.c:1835 #, fuzzy msgid "Manual Feed" msgstr "Manuell" -#: src/main/escp2-papers.c:1782 src/main/escp2-papers.c:1833 -#: src/main/escp2-papers.c:1935 src/main/escp2-papers.c:1968 +#: src/main/escp2-papers.c:1793 src/main/escp2-papers.c:1844 +#: src/main/escp2-papers.c:1946 src/main/escp2-papers.c:1979 #, fuzzy msgid "Print to CD" msgstr "Skriv ut til fil?" -#: src/main/escp2-papers.c:1866 src/main/escp2-papers.c:1908 +#: src/main/escp2-papers.c:1877 src/main/escp2-papers.c:1919 #, fuzzy msgid "Manual Sheet Guide" msgstr "Manuell" -#: src/main/escp2-papers.c:1875 src/main/escp2-papers.c:1917 +#: src/main/escp2-papers.c:1886 src/main/escp2-papers.c:1928 #, fuzzy msgid "Manual Feed (Front)" msgstr "Manuell" -#: src/main/escp2-papers.c:1950 +#: src/main/escp2-papers.c:1961 #, fuzzy msgid "Rear Tray" msgstr "Skuff" -#: src/main/escp2-papers.c:1959 +#: src/main/escp2-papers.c:1970 msgid "Front Tray" msgstr "" -#: src/main/escp2-papers.c:1977 +#: src/main/escp2-papers.c:1988 #, fuzzy msgid "Photo Board" msgstr "Fotopapir" -#: src/main/escp2-papers.c:2016 +#: src/main/escp2-papers.c:2027 msgid "Cut Sheet Bin 1" msgstr "" -#: src/main/escp2-papers.c:2025 +#: src/main/escp2-papers.c:2036 msgid "Cut Sheet Bin 2" msgstr "" -#: src/main/escp2-papers.c:2034 +#: src/main/escp2-papers.c:2045 #, fuzzy msgid "Cut Sheet Autoselect" msgstr "Autovelg" -#: src/main/escp2-papers.c:2043 +#: src/main/escp2-papers.c:2054 msgid "Manual Selection" msgstr "" @@ -2151,46 +2319,52 @@ msgid "Eight Pass" msgstr "Lysstyrke:" #: src/main/escp2-resolutions.c:637 src/main/escp2-resolutions.c:652 -#: src/main/generic-options.c:33 +#: src/main/escp2-resolutions.c:667 src/main/generic-options.c:33 msgid "Fast Economy" msgstr "" #: src/main/escp2-resolutions.c:638 src/main/escp2-resolutions.c:653 -#: src/main/generic-options.c:34 +#: src/main/escp2-resolutions.c:668 src/main/generic-options.c:34 msgid "Economy" msgstr "" #: src/main/escp2-resolutions.c:639 src/main/escp2-resolutions.c:654 -#: src/main/escp2-resolutions.c:667 src/main/generic-options.c:35 +#: src/main/escp2-resolutions.c:669 src/main/escp2-resolutions.c:682 +#: src/main/generic-options.c:35 msgid "Draft" msgstr "" #: src/main/escp2-resolutions.c:641 src/main/escp2-resolutions.c:656 -#: src/main/escp2-resolutions.c:670 src/main/generic-options.c:37 +#: src/main/escp2-resolutions.c:671 src/main/escp2-resolutions.c:685 +#: src/main/generic-options.c:37 #, fuzzy msgid "High" msgstr "Høyde:" #: src/main/escp2-resolutions.c:642 src/main/escp2-resolutions.c:657 -#: src/main/escp2-resolutions.c:669 src/main/generic-options.c:38 +#: src/main/escp2-resolutions.c:672 src/main/escp2-resolutions.c:684 +#: src/main/generic-options.c:38 #, fuzzy msgid "Photo" msgstr "Fotografi" #: src/main/escp2-resolutions.c:643 src/main/escp2-resolutions.c:658 -#: src/main/escp2-resolutions.c:671 src/main/generic-options.c:39 +#: src/main/escp2-resolutions.c:673 src/main/escp2-resolutions.c:686 +#: src/main/generic-options.c:39 #, fuzzy msgid "Super Photo" msgstr "Stylus Photo" #: src/main/escp2-resolutions.c:644 src/main/escp2-resolutions.c:659 -#: src/main/escp2-resolutions.c:672 src/main/generic-options.c:40 +#: src/main/escp2-resolutions.c:674 src/main/escp2-resolutions.c:687 +#: src/main/generic-options.c:40 #, fuzzy msgid "Ultra Photo" msgstr "Stylus Photo" #: src/main/escp2-resolutions.c:645 src/main/escp2-resolutions.c:660 -#: src/main/escp2-resolutions.c:673 src/main/generic-options.c:41 +#: src/main/escp2-resolutions.c:675 src/main/escp2-resolutions.c:688 +#: src/main/generic-options.c:41 msgid "Best" msgstr "" @@ -2273,4346 +2447,4650 @@ msgid "3x5" msgstr "3x5" #: src/main/xmli18n-tmp.h:10 +msgid "3 1/2 x5" +msgstr "" + +#: src/main/xmli18n-tmp.h:11 msgid "4x6" msgstr "4x6" -#: src/main/xmli18n-tmp.h:11 +#: src/main/xmli18n-tmp.h:12 #, fuzzy msgid "Epson 4x6 Photo Paper (tear-off borders)" msgstr "Fotopapir" -#: src/main/xmli18n-tmp.h:12 +#: src/main/xmli18n-tmp.h:13 msgid "5x7" msgstr "5x7" -#: src/main/xmli18n-tmp.h:13 +#: src/main/xmli18n-tmp.h:14 msgid "5x8" msgstr "5x8" -#: src/main/xmli18n-tmp.h:14 +#: src/main/xmli18n-tmp.h:15 msgid "6x8" msgstr "6x8" -#: src/main/xmli18n-tmp.h:15 +#: src/main/xmli18n-tmp.h:16 msgid "8x10" msgstr "8x10" -#: src/main/xmli18n-tmp.h:17 +#: src/main/xmli18n-tmp.h:18 msgid "12x18" msgstr "12x18" -#: src/main/xmli18n-tmp.h:18 +#: src/main/xmli18n-tmp.h:19 msgid "Super B 13x19" msgstr "" -#: src/main/xmli18n-tmp.h:19 +#: src/main/xmli18n-tmp.h:20 msgid "Engineering C 17x22" msgstr "" -#: src/main/xmli18n-tmp.h:20 +#: src/main/xmli18n-tmp.h:21 msgid "8x12" msgstr "8x12" -#: src/main/xmli18n-tmp.h:21 +#: src/main/xmli18n-tmp.h:22 msgid "11x14" msgstr "11x14" -#: src/main/xmli18n-tmp.h:22 +#: src/main/xmli18n-tmp.h:23 msgid "16x20" msgstr "16x20" -#: src/main/xmli18n-tmp.h:23 +#: src/main/xmli18n-tmp.h:24 msgid "16x24" msgstr "16x24" -#: src/main/xmli18n-tmp.h:24 +#: src/main/xmli18n-tmp.h:25 msgid "20x24" msgstr "20x24" -#: src/main/xmli18n-tmp.h:25 +#: src/main/xmli18n-tmp.h:26 msgid "20x30" msgstr "20x30" -#: src/main/xmli18n-tmp.h:26 +#: src/main/xmli18n-tmp.h:27 #, fuzzy msgid "22x30" msgstr "20x30" -#: src/main/xmli18n-tmp.h:27 +#: src/main/xmli18n-tmp.h:28 msgid "24x30" msgstr "24x30" -#: src/main/xmli18n-tmp.h:28 +#: src/main/xmli18n-tmp.h:29 msgid "Super A1 24x36" msgstr "" -#: src/main/xmli18n-tmp.h:29 +#: src/main/xmli18n-tmp.h:30 msgid "30x40" msgstr "30x40" -#: src/main/xmli18n-tmp.h:30 +#: src/main/xmli18n-tmp.h:31 msgid "4A" msgstr "4A" -#: src/main/xmli18n-tmp.h:31 +#: src/main/xmli18n-tmp.h:32 msgid "2A" msgstr "2A" -#: src/main/xmli18n-tmp.h:32 +#: src/main/xmli18n-tmp.h:33 #, fuzzy msgid "Super A0" msgstr "Stylus Photo" -#: src/main/xmli18n-tmp.h:33 +#: src/main/xmli18n-tmp.h:34 msgid "A0" msgstr "A0" -#: src/main/xmli18n-tmp.h:34 +#: src/main/xmli18n-tmp.h:35 msgid "A1" msgstr "A1" -#: src/main/xmli18n-tmp.h:35 +#: src/main/xmli18n-tmp.h:36 msgid "A2" msgstr "A2" -#: src/main/xmli18n-tmp.h:36 +#: src/main/xmli18n-tmp.h:37 msgid "A3" msgstr "A3" -#: src/main/xmli18n-tmp.h:37 +#: src/main/xmli18n-tmp.h:38 msgid "A4" msgstr "A4" -#: src/main/xmli18n-tmp.h:38 +#: src/main/xmli18n-tmp.h:39 msgid "A5" msgstr "A5" -#: src/main/xmli18n-tmp.h:39 +#: src/main/xmli18n-tmp.h:40 msgid "A6" msgstr "A6" -#: src/main/xmli18n-tmp.h:40 +#: src/main/xmli18n-tmp.h:41 msgid "A7" msgstr "A7" -#: src/main/xmli18n-tmp.h:41 +#: src/main/xmli18n-tmp.h:42 msgid "A8" msgstr "A8" -#: src/main/xmli18n-tmp.h:42 +#: src/main/xmli18n-tmp.h:43 msgid "A9" msgstr "A9" -#: src/main/xmli18n-tmp.h:43 +#: src/main/xmli18n-tmp.h:44 msgid "A10" msgstr "A10" -#: src/main/xmli18n-tmp.h:44 +#: src/main/xmli18n-tmp.h:45 msgid "RA0" msgstr "RA0" -#: src/main/xmli18n-tmp.h:45 +#: src/main/xmli18n-tmp.h:46 msgid "RA1" msgstr "RA1" -#: src/main/xmli18n-tmp.h:46 +#: src/main/xmli18n-tmp.h:47 msgid "RA2" msgstr "RA2" -#: src/main/xmli18n-tmp.h:47 +#: src/main/xmli18n-tmp.h:48 msgid "RA3" msgstr "RA3" -#: src/main/xmli18n-tmp.h:48 +#: src/main/xmli18n-tmp.h:49 msgid "RA4" msgstr "RA4" -#: src/main/xmli18n-tmp.h:49 +#: src/main/xmli18n-tmp.h:50 msgid "SRA0" msgstr "SRA0" -#: src/main/xmli18n-tmp.h:50 +#: src/main/xmli18n-tmp.h:51 msgid "SRA1" msgstr "SRA1" -#: src/main/xmli18n-tmp.h:51 +#: src/main/xmli18n-tmp.h:52 msgid "SRA2" msgstr "SRA2" -#: src/main/xmli18n-tmp.h:52 +#: src/main/xmli18n-tmp.h:53 msgid "SRA3" msgstr "SRA3" -#: src/main/xmli18n-tmp.h:53 +#: src/main/xmli18n-tmp.h:54 msgid "SRA4" msgstr "SRA4" -#: src/main/xmli18n-tmp.h:54 +#: src/main/xmli18n-tmp.h:55 msgid "4B ISO" msgstr "4B ISO" -#: src/main/xmli18n-tmp.h:55 +#: src/main/xmli18n-tmp.h:56 msgid "2B ISO" msgstr "2B ISO" -#: src/main/xmli18n-tmp.h:56 +#: src/main/xmli18n-tmp.h:57 msgid "B0 ISO" msgstr "B0 ISO" -#: src/main/xmli18n-tmp.h:57 +#: src/main/xmli18n-tmp.h:58 msgid "B1 ISO" msgstr "B1 ISO" -#: src/main/xmli18n-tmp.h:58 +#: src/main/xmli18n-tmp.h:59 msgid "B2 ISO" msgstr "B2 ISO" -#: src/main/xmli18n-tmp.h:59 +#: src/main/xmli18n-tmp.h:60 msgid "B3 ISO" msgstr "B3 ISO" -#: src/main/xmli18n-tmp.h:60 +#: src/main/xmli18n-tmp.h:61 msgid "B4 ISO" msgstr "B4 ISO" -#: src/main/xmli18n-tmp.h:61 +#: src/main/xmli18n-tmp.h:62 msgid "B5 ISO" msgstr "B5 ISO" -#: src/main/xmli18n-tmp.h:62 +#: src/main/xmli18n-tmp.h:63 msgid "B6 ISO" msgstr "B6 ISO" -#: src/main/xmli18n-tmp.h:63 +#: src/main/xmli18n-tmp.h:64 msgid "B7 ISO" msgstr "B7 ISO" -#: src/main/xmli18n-tmp.h:64 +#: src/main/xmli18n-tmp.h:65 msgid "B8 ISO" msgstr "B8 ISO" -#: src/main/xmli18n-tmp.h:65 +#: src/main/xmli18n-tmp.h:66 msgid "B9 ISO" msgstr "B9 ISO" -#: src/main/xmli18n-tmp.h:66 +#: src/main/xmli18n-tmp.h:67 msgid "B10 ISO" msgstr "B10 ISO" -#: src/main/xmli18n-tmp.h:67 +#: src/main/xmli18n-tmp.h:68 #, fuzzy msgid "Super B0 JIS" msgstr "B0 JIS" -#: src/main/xmli18n-tmp.h:68 +#: src/main/xmli18n-tmp.h:69 msgid "B0 JIS" msgstr "B0 JIS" -#: src/main/xmli18n-tmp.h:69 +#: src/main/xmli18n-tmp.h:70 msgid "B1 JIS" msgstr "B1 JIS" -#: src/main/xmli18n-tmp.h:70 +#: src/main/xmli18n-tmp.h:71 msgid "B2 JIS" msgstr "B2 JIS" -#: src/main/xmli18n-tmp.h:71 +#: src/main/xmli18n-tmp.h:72 msgid "B3 JIS" msgstr "B3 JIS" -#: src/main/xmli18n-tmp.h:72 +#: src/main/xmli18n-tmp.h:73 msgid "B4 JIS" msgstr "B4 JIS" -#: src/main/xmli18n-tmp.h:73 +#: src/main/xmli18n-tmp.h:74 msgid "B5 JIS" msgstr "B5 JIS" -#: src/main/xmli18n-tmp.h:74 +#: src/main/xmli18n-tmp.h:75 msgid "B6 JIS" msgstr "B6 JIS" -#: src/main/xmli18n-tmp.h:75 +#: src/main/xmli18n-tmp.h:76 msgid "B7 JIS" msgstr "B7 JIS" -#: src/main/xmli18n-tmp.h:76 +#: src/main/xmli18n-tmp.h:77 msgid "B8 JIS" msgstr "B8 JIS" -#: src/main/xmli18n-tmp.h:77 +#: src/main/xmli18n-tmp.h:78 msgid "B9 JIS" msgstr "B9 JIS" -#: src/main/xmli18n-tmp.h:78 +#: src/main/xmli18n-tmp.h:79 msgid "B10 JIS" msgstr "B10 JIS" -#: src/main/xmli18n-tmp.h:79 +#: src/main/xmli18n-tmp.h:80 msgid "C0" msgstr "C0" -#: src/main/xmli18n-tmp.h:80 +#: src/main/xmli18n-tmp.h:81 +#, fuzzy +msgid "C0 landscape" +msgstr "Landskap" + +#: src/main/xmli18n-tmp.h:82 msgid "C1" msgstr "C1" -#: src/main/xmli18n-tmp.h:81 +#: src/main/xmli18n-tmp.h:83 +#, fuzzy +msgid "C1 landscape" +msgstr "Landskap" + +#: src/main/xmli18n-tmp.h:84 msgid "C2" msgstr "C2" -#: src/main/xmli18n-tmp.h:82 +#: src/main/xmli18n-tmp.h:85 +#, fuzzy +msgid "C2 landscape" +msgstr "Landskap" + +#: src/main/xmli18n-tmp.h:86 msgid "C3" msgstr "C3" -#: src/main/xmli18n-tmp.h:83 +#: src/main/xmli18n-tmp.h:87 +#, fuzzy +msgid "C3 landscape" +msgstr "Landskap" + +#: src/main/xmli18n-tmp.h:88 msgid "C4" msgstr "C4" -#: src/main/xmli18n-tmp.h:84 +#: src/main/xmli18n-tmp.h:89 +#, fuzzy +msgid "C4 landscape" +msgstr "Landskap" + +#: src/main/xmli18n-tmp.h:90 msgid "C5" msgstr "C5" -#: src/main/xmli18n-tmp.h:85 +#: src/main/xmli18n-tmp.h:91 +#, fuzzy +msgid "C5 landscape" +msgstr "Landskap" + +#: src/main/xmli18n-tmp.h:92 msgid "B6-C4" msgstr "B6-C4" -#: src/main/xmli18n-tmp.h:86 +#: src/main/xmli18n-tmp.h:93 +#, fuzzy +msgid "B6-C4 landscape" +msgstr "Landskap" + +#: src/main/xmli18n-tmp.h:94 msgid "C6" msgstr "C6" -#: src/main/xmli18n-tmp.h:87 +#: src/main/xmli18n-tmp.h:95 +#, fuzzy +msgid "C6 landscape" +msgstr "Landskap" + +#: src/main/xmli18n-tmp.h:96 msgid "DL" msgstr "DL" -#: src/main/xmli18n-tmp.h:88 +#: src/main/xmli18n-tmp.h:97 +#, fuzzy +msgid "DL landscape" +msgstr "Landskap" + +#: src/main/xmli18n-tmp.h:98 msgid "C7-6" msgstr "C7-6" -#: src/main/xmli18n-tmp.h:89 +#: src/main/xmli18n-tmp.h:99 +#, fuzzy +msgid "C7-6 landscape" +msgstr "Landskap" + +#: src/main/xmli18n-tmp.h:100 msgid "C7" msgstr "C7" -#: src/main/xmli18n-tmp.h:90 +#: src/main/xmli18n-tmp.h:101 +#, fuzzy +msgid "C7 landscape" +msgstr "Landskap" + +#: src/main/xmli18n-tmp.h:102 msgid "C8" msgstr "C8" -#: src/main/xmli18n-tmp.h:91 +#: src/main/xmli18n-tmp.h:103 +#, fuzzy +msgid "C8 landscape" +msgstr "Landskap" + +#: src/main/xmli18n-tmp.h:104 msgid "C9" msgstr "C9" -#: src/main/xmli18n-tmp.h:92 +#: src/main/xmli18n-tmp.h:105 +#, fuzzy +msgid "C9 landscape" +msgstr "Landskap" + +#: src/main/xmli18n-tmp.h:106 msgid "C10" msgstr "C10" -#: src/main/xmli18n-tmp.h:93 +#: src/main/xmli18n-tmp.h:107 +#, fuzzy +msgid "C10 landscape" +msgstr "Landskap" + +#: src/main/xmli18n-tmp.h:108 msgid "ArchA" msgstr "" -#: src/main/xmli18n-tmp.h:94 +#: src/main/xmli18n-tmp.h:109 msgid "ArchA transposed" msgstr "" -#: src/main/xmli18n-tmp.h:95 +#: src/main/xmli18n-tmp.h:110 msgid "ArchB" msgstr "" -#: src/main/xmli18n-tmp.h:96 +#: src/main/xmli18n-tmp.h:111 msgid "ArchB transposed" msgstr "" -#: src/main/xmli18n-tmp.h:97 +#: src/main/xmli18n-tmp.h:112 msgid "ArchC" msgstr "" -#: src/main/xmli18n-tmp.h:98 +#: src/main/xmli18n-tmp.h:113 msgid "ArchC transposed" msgstr "" -#: src/main/xmli18n-tmp.h:99 +#: src/main/xmli18n-tmp.h:114 msgid "ArchD" msgstr "" -#: src/main/xmli18n-tmp.h:100 +#: src/main/xmli18n-tmp.h:115 msgid "ArchD transposed" msgstr "" -#: src/main/xmli18n-tmp.h:101 +#: src/main/xmli18n-tmp.h:116 msgid "ArchE" msgstr "" -#: src/main/xmli18n-tmp.h:102 +#: src/main/xmli18n-tmp.h:117 msgid "ArchE transposed" msgstr "" -#: src/main/xmli18n-tmp.h:103 +#: src/main/xmli18n-tmp.h:118 msgid "American foolscap" msgstr "" -#: src/main/xmli18n-tmp.h:104 +#: src/main/xmli18n-tmp.h:119 msgid "European foolscap" msgstr "" -#: src/main/xmli18n-tmp.h:105 +#: src/main/xmli18n-tmp.h:120 msgid "Crown Quarto" msgstr "" -#: src/main/xmli18n-tmp.h:106 +#: src/main/xmli18n-tmp.h:121 msgid "Large Crown Quarto" msgstr "" -#: src/main/xmli18n-tmp.h:107 +#: src/main/xmli18n-tmp.h:122 msgid "Demy Quarto" msgstr "" -#: src/main/xmli18n-tmp.h:108 +#: src/main/xmli18n-tmp.h:123 msgid "Royal Quarto" msgstr "" -#: src/main/xmli18n-tmp.h:109 +#: src/main/xmli18n-tmp.h:124 #, fuzzy msgid "ISO A4" msgstr "SRA4" -#: src/main/xmli18n-tmp.h:110 +#: src/main/xmli18n-tmp.h:125 msgid "Crown Octavo" msgstr "" -#: src/main/xmli18n-tmp.h:111 +#: src/main/xmli18n-tmp.h:126 msgid "Large Crown Octavo" msgstr "" -#: src/main/xmli18n-tmp.h:112 +#: src/main/xmli18n-tmp.h:127 msgid "Demy Octavo" msgstr "" -#: src/main/xmli18n-tmp.h:113 +#: src/main/xmli18n-tmp.h:128 msgid "Royal Octavo" msgstr "" -#: src/main/xmli18n-tmp.h:114 +#: src/main/xmli18n-tmp.h:129 msgid "ISO A5" msgstr "" -#: src/main/xmli18n-tmp.h:115 +#: src/main/xmli18n-tmp.h:130 msgid "Small paperback" msgstr "" -#: src/main/xmli18n-tmp.h:116 +#: src/main/xmli18n-tmp.h:131 msgid "Penguin small paperback" msgstr "" -#: src/main/xmli18n-tmp.h:117 +#: src/main/xmli18n-tmp.h:132 msgid "Penguin large paperback" msgstr "" -#: src/main/xmli18n-tmp.h:118 +#: src/main/xmli18n-tmp.h:133 msgid "10cm x 15cm" msgstr "" -#: src/main/xmli18n-tmp.h:119 +#: src/main/xmli18n-tmp.h:134 msgid "Hagaki Card" msgstr "" -#: src/main/xmli18n-tmp.h:120 +#: src/main/xmli18n-tmp.h:135 msgid "Oufuku Card" msgstr "" -#: src/main/xmli18n-tmp.h:121 +#: src/main/xmli18n-tmp.h:136 msgid "Japanese long envelope #3" msgstr "" -#: src/main/xmli18n-tmp.h:122 +#: src/main/xmli18n-tmp.h:137 +msgid "Japanese long envelope #3 landscape" +msgstr "" + +#: src/main/xmli18n-tmp.h:138 msgid "Japanese long envelope #4" msgstr "" -#: src/main/xmli18n-tmp.h:123 +#: src/main/xmli18n-tmp.h:139 +msgid "Japanese long envelope #4 landscape" +msgstr "" + +#: src/main/xmli18n-tmp.h:140 msgid "Japanese Kaku envelope #4" msgstr "" -#: src/main/xmli18n-tmp.h:124 +#: src/main/xmli18n-tmp.h:141 +msgid "Japanese Kaku envelope #4 landscape" +msgstr "" + +#: src/main/xmli18n-tmp.h:142 msgid "Commercial 10" msgstr "" -#: src/main/xmli18n-tmp.h:125 +#: src/main/xmli18n-tmp.h:143 +msgid "Commercial 10 landscape" +msgstr "" + +#: src/main/xmli18n-tmp.h:144 msgid "A2 Invitation" msgstr "A2 invitasjon" -#: src/main/xmli18n-tmp.h:126 +#: src/main/xmli18n-tmp.h:145 #, fuzzy msgid "Monarch Envelope" msgstr "Konvolutt" -#: src/main/xmli18n-tmp.h:127 +#: src/main/xmli18n-tmp.h:146 +#, fuzzy +msgid "Monarch Envelope landscape" +msgstr "Konvolutt" + +#: src/main/xmli18n-tmp.h:147 msgid "4x5 3/8" msgstr "" -#: src/main/xmli18n-tmp.h:128 +#: src/main/xmli18n-tmp.h:148 #, fuzzy msgid "4x7" msgstr "5x7" -#: src/main/xmli18n-tmp.h:129 +#: src/main/xmli18n-tmp.h:149 msgid "CP_L" msgstr "" -#: src/main/xmli18n-tmp.h:130 +#: src/main/xmli18n-tmp.h:150 msgid "Card" msgstr "" -#: src/main/xmli18n-tmp.h:131 +#: src/main/xmli18n-tmp.h:151 #, fuzzy msgid "Wide Postcard" msgstr "Postkort" -#: src/main/xmli18n-tmp.h:132 +#: src/main/xmli18n-tmp.h:152 msgid "Chilean Office" msgstr "" -#: src/main/xmli18n-tmp.h:133 +#: src/main/xmli18n-tmp.h:153 msgid "Chilean Double Letter" msgstr "" -#: src/main/xmli18n-tmp.h:134 +#: src/main/xmli18n-tmp.h:154 msgid "Chilean Double Office" msgstr "" -#: src/main/xmli18n-tmp.h:135 +#: src/main/xmli18n-tmp.h:155 msgid "Custom" msgstr "Egendefinert" -#: src/main/xmli18n-tmp.h:136 +#: src/main/xmli18n-tmp.h:156 msgid "89 mm Roll Paper" msgstr "" -#: src/main/xmli18n-tmp.h:137 +#: src/main/xmli18n-tmp.h:157 msgid "4 Inch Roll Paper" msgstr "" -#: src/main/xmli18n-tmp.h:138 +#: src/main/xmli18n-tmp.h:158 msgid "5 Inch Roll Paper" msgstr "" -#: src/main/xmli18n-tmp.h:139 +#: src/main/xmli18n-tmp.h:159 msgid "210 mm Roll Paper" msgstr "" -#: src/main/xmli18n-tmp.h:140 +#: src/main/xmli18n-tmp.h:160 msgid "13 Inch Roll Paper" msgstr "" -#: src/main/xmli18n-tmp.h:141 +#: src/main/xmli18n-tmp.h:161 msgid "22 Inch Roll Paper" msgstr "" -#: src/main/xmli18n-tmp.h:142 +#: src/main/xmli18n-tmp.h:162 msgid "24 Inch Roll Paper" msgstr "" -#: src/main/xmli18n-tmp.h:143 +#: src/main/xmli18n-tmp.h:163 msgid "36 Inch Roll Paper" msgstr "" -#: src/main/xmli18n-tmp.h:144 +#: src/main/xmli18n-tmp.h:164 msgid "44 Inch Roll Paper" msgstr "" -#: src/main/xmli18n-tmp.h:145 +#: src/main/xmli18n-tmp.h:165 msgid "PostScript Level 1" msgstr "" -#: src/main/xmli18n-tmp.h:146 +#: src/main/xmli18n-tmp.h:166 msgid "PostScript Level 2" msgstr "" -#: src/main/xmli18n-tmp.h:147 +#: src/main/xmli18n-tmp.h:167 msgid "Canon BJ-30" msgstr "" -#: src/main/xmli18n-tmp.h:148 +#: src/main/xmli18n-tmp.h:168 msgid "Canon BJC-50" msgstr "" -#: src/main/xmli18n-tmp.h:149 +#: src/main/xmli18n-tmp.h:169 msgid "Canon BJC-55" msgstr "" -#: src/main/xmli18n-tmp.h:150 +#: src/main/xmli18n-tmp.h:170 msgid "Canon BJC-80" msgstr "" -#: src/main/xmli18n-tmp.h:151 +#: src/main/xmli18n-tmp.h:171 msgid "Canon BJC-85" msgstr "" -#: src/main/xmli18n-tmp.h:152 +#: src/main/xmli18n-tmp.h:172 msgid "Canon BJC-210" msgstr "" -#: src/main/xmli18n-tmp.h:153 +#: src/main/xmli18n-tmp.h:173 msgid "Canon BJC-240" msgstr "" -#: src/main/xmli18n-tmp.h:154 +#: src/main/xmli18n-tmp.h:174 msgid "Canon BJC-250" msgstr "" -#: src/main/xmli18n-tmp.h:155 +#: src/main/xmli18n-tmp.h:175 msgid "Canon BJC-1000" msgstr "" -#: src/main/xmli18n-tmp.h:156 +#: src/main/xmli18n-tmp.h:176 msgid "Canon BJC-2000" msgstr "" -#: src/main/xmli18n-tmp.h:157 +#: src/main/xmli18n-tmp.h:177 msgid "Canon BJC-2010" msgstr "" -#: src/main/xmli18n-tmp.h:158 +#: src/main/xmli18n-tmp.h:178 msgid "Canon BJC-2100" msgstr "" -#: src/main/xmli18n-tmp.h:159 +#: src/main/xmli18n-tmp.h:179 msgid "Canon BJC-2110" msgstr "" -#: src/main/xmli18n-tmp.h:160 +#: src/main/xmli18n-tmp.h:180 msgid "Canon BJC-3000" msgstr "" -#: src/main/xmli18n-tmp.h:161 +#: src/main/xmli18n-tmp.h:181 msgid "Canon BJC-4000" msgstr "" -#: src/main/xmli18n-tmp.h:162 +#: src/main/xmli18n-tmp.h:182 msgid "Canon BJC-4300" msgstr "" -#: src/main/xmli18n-tmp.h:163 +#: src/main/xmli18n-tmp.h:183 msgid "Canon BJC-4400" msgstr "" -#: src/main/xmli18n-tmp.h:164 +#: src/main/xmli18n-tmp.h:184 msgid "Canon BJC-5100" msgstr "" -#: src/main/xmli18n-tmp.h:165 +#: src/main/xmli18n-tmp.h:185 msgid "Canon BJC-5500" msgstr "" -#: src/main/xmli18n-tmp.h:166 +#: src/main/xmli18n-tmp.h:186 msgid "Canon BJC-6000" msgstr "" -#: src/main/xmli18n-tmp.h:167 +#: src/main/xmli18n-tmp.h:187 msgid "Canon BJC-6100" msgstr "" -#: src/main/xmli18n-tmp.h:168 +#: src/main/xmli18n-tmp.h:188 msgid "Canon BJC-6200" msgstr "" -#: src/main/xmli18n-tmp.h:169 +#: src/main/xmli18n-tmp.h:189 msgid "Canon BJC-6500" msgstr "" -#: src/main/xmli18n-tmp.h:170 +#: src/main/xmli18n-tmp.h:190 msgid "Canon BJC-7000" msgstr "" -#: src/main/xmli18n-tmp.h:171 +#: src/main/xmli18n-tmp.h:191 msgid "Canon BJC-7100" msgstr "" -#: src/main/xmli18n-tmp.h:172 +#: src/main/xmli18n-tmp.h:192 msgid "Canon BJC-8200" msgstr "" -#: src/main/xmli18n-tmp.h:173 +#: src/main/xmli18n-tmp.h:193 msgid "Canon BJC-8500" msgstr "" -#: src/main/xmli18n-tmp.h:174 +#: src/main/xmli18n-tmp.h:194 msgid "Canon S100" msgstr "" -#: src/main/xmli18n-tmp.h:175 +#: src/main/xmli18n-tmp.h:195 msgid "Canon S200" msgstr "" -#: src/main/xmli18n-tmp.h:176 +#: src/main/xmli18n-tmp.h:196 msgid "Canon S300" msgstr "" -#: src/main/xmli18n-tmp.h:177 +#: src/main/xmli18n-tmp.h:197 msgid "Canon S400" msgstr "" -#: src/main/xmli18n-tmp.h:178 +#: src/main/xmli18n-tmp.h:198 msgid "Canon S450" msgstr "" -#: src/main/xmli18n-tmp.h:179 +#: src/main/xmli18n-tmp.h:199 msgid "Canon S500" msgstr "" -#: src/main/xmli18n-tmp.h:180 +#: src/main/xmli18n-tmp.h:200 msgid "Canon S600" msgstr "" -#: src/main/xmli18n-tmp.h:181 +#: src/main/xmli18n-tmp.h:201 msgid "Canon S630" msgstr "" -#: src/main/xmli18n-tmp.h:182 +#: src/main/xmli18n-tmp.h:202 msgid "Canon S800" msgstr "" -#: src/main/xmli18n-tmp.h:183 +#: src/main/xmli18n-tmp.h:203 msgid "Canon S4500" msgstr "" -#: src/main/xmli18n-tmp.h:184 +#: src/main/xmli18n-tmp.h:204 msgid "Canon PIXMA iP2000" msgstr "" -#: src/main/xmli18n-tmp.h:185 +#: src/main/xmli18n-tmp.h:205 msgid "Canon PIXMA iP3000" msgstr "" -#: src/main/xmli18n-tmp.h:186 +#: src/main/xmli18n-tmp.h:206 msgid "Canon PIXMA iP3100" msgstr "" -#: src/main/xmli18n-tmp.h:187 +#: src/main/xmli18n-tmp.h:207 msgid "Canon PIXMA iP4000" msgstr "" -#: src/main/xmli18n-tmp.h:188 +#: src/main/xmli18n-tmp.h:208 msgid "Canon PIXMA iP4100" msgstr "" -#: src/main/xmli18n-tmp.h:189 +#: src/main/xmli18n-tmp.h:209 msgid "Canon PIXMA iP4200" msgstr "" -#: src/main/xmli18n-tmp.h:190 +#: src/main/xmli18n-tmp.h:210 #, fuzzy msgid "Canon PIXMA iP4300" msgstr "Stylus C60" -#: src/main/xmli18n-tmp.h:191 +#: src/main/xmli18n-tmp.h:211 #, fuzzy msgid "Canon PIXMA iP4500" msgstr "Stylus C60" -#: src/main/xmli18n-tmp.h:192 +#: src/main/xmli18n-tmp.h:212 #, fuzzy msgid "Canon PIXMA iP5000" msgstr "Stylus C60" -#: src/main/xmli18n-tmp.h:193 +#: src/main/xmli18n-tmp.h:213 msgid "Canon PIXMA iP5200" msgstr "" -#: src/main/xmli18n-tmp.h:194 +#: src/main/xmli18n-tmp.h:214 #, fuzzy msgid "Canon PIXMA iP5300" msgstr "Stylus C60" -#: src/main/xmli18n-tmp.h:195 +#: src/main/xmli18n-tmp.h:215 +#, fuzzy +msgid "Canon PIXMA iP6000D" +msgstr "Stylus C60" + +#: src/main/xmli18n-tmp.h:216 #, fuzzy msgid "Canon PIXMA iP6700" msgstr "Stylus C60" -#: src/main/xmli18n-tmp.h:196 +#: src/main/xmli18n-tmp.h:217 #, fuzzy msgid "Canon PIXMA iP8500" msgstr "Stylus C60" -#: src/main/xmli18n-tmp.h:197 +#: src/main/xmli18n-tmp.h:218 #, fuzzy msgid "Canon PIXMA iX5000" msgstr "Stylus C60" -#: src/main/xmli18n-tmp.h:198 +#: src/main/xmli18n-tmp.h:219 #, fuzzy msgid "Canon PIXMA Pro9500" msgstr "Stylus C60" -#: src/main/xmli18n-tmp.h:199 +#: src/main/xmli18n-tmp.h:220 #, fuzzy msgid "Canon PIXMA MP150" msgstr "Stylus C60" -#: src/main/xmli18n-tmp.h:200 +#: src/main/xmli18n-tmp.h:221 #, fuzzy msgid "Canon PIXMA MP170" msgstr "Stylus C60" -#: src/main/xmli18n-tmp.h:201 +#: src/main/xmli18n-tmp.h:222 #, fuzzy msgid "Canon PIXMA MP180" msgstr "Stylus C60" -#: src/main/xmli18n-tmp.h:202 +#: src/main/xmli18n-tmp.h:223 #, fuzzy msgid "Canon PIXMA MP500" msgstr "Stylus C60" -#: src/main/xmli18n-tmp.h:203 +#: src/main/xmli18n-tmp.h:224 +#, fuzzy +msgid "Canon PIXMA MP520" +msgstr "Stylus C60" + +#: src/main/xmli18n-tmp.h:225 #, fuzzy msgid "Canon PIXMA MP610" msgstr "Stylus C60" -#: src/main/xmli18n-tmp.h:204 +#: src/main/xmli18n-tmp.h:226 #, fuzzy msgid "Canon PIXMA MP700" msgstr "Stylus C60" -#: src/main/xmli18n-tmp.h:205 +#: src/main/xmli18n-tmp.h:227 #, fuzzy msgid "Canon PIXMA MP710" msgstr "Stylus C60" -#: src/main/xmli18n-tmp.h:206 +#: src/main/xmli18n-tmp.h:228 #, fuzzy msgid "Canon PIXMA MP730" msgstr "Stylus C60" -#: src/main/xmli18n-tmp.h:207 +#: src/main/xmli18n-tmp.h:229 #, fuzzy msgid "Canon PIXMA MP740" msgstr "Stylus C60" -#: src/main/xmli18n-tmp.h:208 +#: src/main/xmli18n-tmp.h:230 #, fuzzy msgid "Canon PIXMA MP750" msgstr "Stylus C60" -#: src/main/xmli18n-tmp.h:209 +#: src/main/xmli18n-tmp.h:231 #, fuzzy msgid "Canon PIXMA MP760" msgstr "Stylus C60" -#: src/main/xmli18n-tmp.h:210 +#: src/main/xmli18n-tmp.h:232 #, fuzzy msgid "Canon PIXMA MP770" msgstr "Stylus C60" -#: src/main/xmli18n-tmp.h:211 +#: src/main/xmli18n-tmp.h:233 #, fuzzy msgid "Canon PIXMA MP780" msgstr "Stylus C60" -#: src/main/xmli18n-tmp.h:212 +#: src/main/xmli18n-tmp.h:234 #, fuzzy msgid "Canon PIXMA MP790" msgstr "Stylus C60" -#: src/main/xmli18n-tmp.h:213 +#: src/main/xmli18n-tmp.h:235 #, fuzzy msgid "Canon PIXMA MP830" msgstr "Stylus C60" -#: src/main/xmli18n-tmp.h:214 +#: src/main/xmli18n-tmp.h:236 msgid "Canon PIXUS iP3100" msgstr "" -#: src/main/xmli18n-tmp.h:215 +#: src/main/xmli18n-tmp.h:237 msgid "Canon PIXUS iP4100" msgstr "" -#: src/main/xmli18n-tmp.h:216 +#: src/main/xmli18n-tmp.h:238 #, fuzzy msgid "Canon i80" msgstr "Stylus C60" -#: src/main/xmli18n-tmp.h:217 +#: src/main/xmli18n-tmp.h:239 msgid "Canon i560" msgstr "" -#: src/main/xmli18n-tmp.h:218 +#: src/main/xmli18n-tmp.h:240 msgid "Canon i850" msgstr "" -#: src/main/xmli18n-tmp.h:219 +#: src/main/xmli18n-tmp.h:241 msgid "Canon i860" msgstr "" -#: src/main/xmli18n-tmp.h:220 +#: src/main/xmli18n-tmp.h:242 msgid "Canon i865" msgstr "" -#: src/main/xmli18n-tmp.h:221 +#: src/main/xmli18n-tmp.h:243 #, fuzzy msgid "Epson Stylus C20" msgstr "Stylus C20ux" -#: src/main/xmli18n-tmp.h:222 +#: src/main/xmli18n-tmp.h:244 #, fuzzy msgid "Epson Stylus C20SX" msgstr "Stylus C20ux" -#: src/main/xmli18n-tmp.h:223 +#: src/main/xmli18n-tmp.h:245 #, fuzzy msgid "Epson Stylus C20UX" msgstr "Stylus C20ux" -#: src/main/xmli18n-tmp.h:224 +#: src/main/xmli18n-tmp.h:246 #, fuzzy msgid "Epson Stylus C40" msgstr "Stylus C40ux" -#: src/main/xmli18n-tmp.h:225 +#: src/main/xmli18n-tmp.h:247 #, fuzzy msgid "Epson Stylus C40SX" msgstr "Stylus C40ux" -#: src/main/xmli18n-tmp.h:226 +#: src/main/xmli18n-tmp.h:248 #, fuzzy msgid "Epson Stylus C40UX" msgstr "Stylus C40ux" -#: src/main/xmli18n-tmp.h:227 +#: src/main/xmli18n-tmp.h:249 #, fuzzy msgid "Epson Stylus C41" msgstr "Stylus C40ux" -#: src/main/xmli18n-tmp.h:228 +#: src/main/xmli18n-tmp.h:250 #, fuzzy msgid "Epson Stylus C41SX" msgstr "Stylus C40ux" -#: src/main/xmli18n-tmp.h:229 +#: src/main/xmli18n-tmp.h:251 #, fuzzy msgid "Epson Stylus C41UX" msgstr "Stylus C40ux" -#: src/main/xmli18n-tmp.h:230 +#: src/main/xmli18n-tmp.h:252 #, fuzzy msgid "Epson Stylus C42" msgstr "Stylus C40ux" -#: src/main/xmli18n-tmp.h:231 +#: src/main/xmli18n-tmp.h:253 #, fuzzy msgid "Epson Stylus C42SX" msgstr "Stylus C40ux" -#: src/main/xmli18n-tmp.h:232 +#: src/main/xmli18n-tmp.h:254 #, fuzzy msgid "Epson Stylus C42UX" msgstr "Stylus C40ux" -#: src/main/xmli18n-tmp.h:233 +#: src/main/xmli18n-tmp.h:255 #, fuzzy msgid "Epson Stylus C43" msgstr "Stylus C40ux" -#: src/main/xmli18n-tmp.h:234 +#: src/main/xmli18n-tmp.h:256 #, fuzzy msgid "Epson Stylus C43SX" msgstr "Stylus C40ux" -#: src/main/xmli18n-tmp.h:235 +#: src/main/xmli18n-tmp.h:257 #, fuzzy msgid "Epson Stylus C43UX" msgstr "Stylus C40ux" -#: src/main/xmli18n-tmp.h:236 +#: src/main/xmli18n-tmp.h:258 #, fuzzy msgid "Epson Stylus C44" msgstr "Stylus C40ux" -#: src/main/xmli18n-tmp.h:237 +#: src/main/xmli18n-tmp.h:259 #, fuzzy msgid "Epson Stylus C44SX" msgstr "Stylus C40ux" -#: src/main/xmli18n-tmp.h:238 +#: src/main/xmli18n-tmp.h:260 #, fuzzy msgid "Epson Stylus C44UX" msgstr "Stylus C40ux" -#: src/main/xmli18n-tmp.h:239 +#: src/main/xmli18n-tmp.h:261 #, fuzzy msgid "Epson Stylus C45" msgstr "Stylus C60" -#: src/main/xmli18n-tmp.h:240 +#: src/main/xmli18n-tmp.h:262 #, fuzzy msgid "Epson Stylus C46" msgstr "Stylus C60" -#: src/main/xmli18n-tmp.h:241 +#: src/main/xmli18n-tmp.h:263 #, fuzzy msgid "Epson Stylus C48" msgstr "Stylus C60" -#: src/main/xmli18n-tmp.h:242 +#: src/main/xmli18n-tmp.h:264 #, fuzzy msgid "Epson Stylus C50" msgstr "Stylus C60" -#: src/main/xmli18n-tmp.h:243 +#: src/main/xmli18n-tmp.h:265 #, fuzzy msgid "Epson Stylus C60" msgstr "Stylus C60" -#: src/main/xmli18n-tmp.h:244 +#: src/main/xmli18n-tmp.h:266 #, fuzzy msgid "Epson Stylus C61" msgstr "Stylus C60" -#: src/main/xmli18n-tmp.h:245 +#: src/main/xmli18n-tmp.h:267 #, fuzzy msgid "Epson Stylus C62" msgstr "Stylus C60" -#: src/main/xmli18n-tmp.h:246 +#: src/main/xmli18n-tmp.h:268 #, fuzzy msgid "Epson Stylus C63" msgstr "Stylus C60" -#: src/main/xmli18n-tmp.h:247 +#: src/main/xmli18n-tmp.h:269 #, fuzzy msgid "Epson Stylus C64" msgstr "Stylus C60" -#: src/main/xmli18n-tmp.h:248 +#: src/main/xmli18n-tmp.h:270 #, fuzzy msgid "Epson Stylus C65" msgstr "Stylus C60" -#: src/main/xmli18n-tmp.h:249 +#: src/main/xmli18n-tmp.h:271 #, fuzzy msgid "Epson Stylus C66" msgstr "Stylus C60" -#: src/main/xmli18n-tmp.h:250 +#: src/main/xmli18n-tmp.h:272 #, fuzzy msgid "Epson Stylus C68" msgstr "Stylus C60" -#: src/main/xmli18n-tmp.h:251 +#: src/main/xmli18n-tmp.h:273 #, fuzzy msgid "Epson Stylus C70" msgstr "Stylus C70" -#: src/main/xmli18n-tmp.h:252 +#: src/main/xmli18n-tmp.h:274 #, fuzzy msgid "Epson Stylus C79" msgstr "Stylus C70" -#: src/main/xmli18n-tmp.h:253 +#: src/main/xmli18n-tmp.h:275 #, fuzzy msgid "Epson Stylus C80" msgstr "Stylus C80" -#: src/main/xmli18n-tmp.h:254 +#: src/main/xmli18n-tmp.h:276 #, fuzzy msgid "Epson Stylus C82" msgstr "Stylus C80" -#: src/main/xmli18n-tmp.h:255 +#: src/main/xmli18n-tmp.h:277 #, fuzzy msgid "Epson Stylus C83" msgstr "Stylus C80" -#: src/main/xmli18n-tmp.h:256 +#: src/main/xmli18n-tmp.h:278 #, fuzzy msgid "Epson Stylus C84" msgstr "Stylus C80" -#: src/main/xmli18n-tmp.h:257 +#: src/main/xmli18n-tmp.h:279 #, fuzzy msgid "Epson Stylus C85" msgstr "Stylus C60" -#: src/main/xmli18n-tmp.h:258 +#: src/main/xmli18n-tmp.h:280 #, fuzzy msgid "Epson Stylus C86" msgstr "Stylus C60" -#: src/main/xmli18n-tmp.h:259 +#: src/main/xmli18n-tmp.h:281 #, fuzzy msgid "Epson Stylus C87" msgstr "Stylus C60" -#: src/main/xmli18n-tmp.h:260 +#: src/main/xmli18n-tmp.h:282 #, fuzzy msgid "Epson Stylus C88" msgstr "Stylus C80" -#: src/main/xmli18n-tmp.h:261 +#: src/main/xmli18n-tmp.h:283 #, fuzzy msgid "Epson Stylus C110" msgstr "Stylus C20ux" -#: src/main/xmli18n-tmp.h:262 +#: src/main/xmli18n-tmp.h:284 #, fuzzy msgid "Epson Stylus C120" msgstr "Stylus C20ux" -#: src/main/xmli18n-tmp.h:263 +#: src/main/xmli18n-tmp.h:285 #, fuzzy msgid "Epson Stylus Color" msgstr "Stylus Color" -#: src/main/xmli18n-tmp.h:264 +#: src/main/xmli18n-tmp.h:286 #, fuzzy msgid "Epson Stylus Color I" msgstr "Stylus Color" -#: src/main/xmli18n-tmp.h:265 +#: src/main/xmli18n-tmp.h:287 #, fuzzy msgid "Epson Stylus Color II" msgstr "Stylus Color" -#: src/main/xmli18n-tmp.h:266 +#: src/main/xmli18n-tmp.h:288 #, fuzzy msgid "Epson Stylus Color IIs" msgstr "Stylus Color" -#: src/main/xmli18n-tmp.h:267 +#: src/main/xmli18n-tmp.h:289 #, fuzzy msgid "Epson Stylus Color PRO" msgstr "Stylus Color Pro" -#: src/main/xmli18n-tmp.h:268 +#: src/main/xmli18n-tmp.h:290 #, fuzzy msgid "Epson Stylus Pro XL" msgstr "Stylus Color Pro XL" -#: src/main/xmli18n-tmp.h:269 +#: src/main/xmli18n-tmp.h:291 #, fuzzy msgid "Epson Stylus Color 400" msgstr "Stylus Color 400" -#: src/main/xmli18n-tmp.h:270 +#: src/main/xmli18n-tmp.h:292 #, fuzzy msgid "Epson Stylus Color 440" msgstr "Stylus Color 440" -#: src/main/xmli18n-tmp.h:271 +#: src/main/xmli18n-tmp.h:293 #, fuzzy msgid "Epson Stylus Color 460" msgstr "Stylus Color 460" -#: src/main/xmli18n-tmp.h:272 +#: src/main/xmli18n-tmp.h:294 #, fuzzy msgid "Epson Stylus Color 480" msgstr "Stylus Color 480" -#: src/main/xmli18n-tmp.h:273 +#: src/main/xmli18n-tmp.h:295 #, fuzzy msgid "Epson Stylus Color 500" msgstr "Stylus Color 500" -#: src/main/xmli18n-tmp.h:274 +#: src/main/xmli18n-tmp.h:296 #, fuzzy msgid "Epson Stylus Color 580" msgstr "Stylus Color 580" -#: src/main/xmli18n-tmp.h:275 +#: src/main/xmli18n-tmp.h:297 #, fuzzy msgid "Epson Stylus Color 600" msgstr "Stylus Color 600" -#: src/main/xmli18n-tmp.h:276 +#: src/main/xmli18n-tmp.h:298 #, fuzzy msgid "Epson Stylus Color 640" msgstr "Stylus Color 640" -#: src/main/xmli18n-tmp.h:277 +#: src/main/xmli18n-tmp.h:299 #, fuzzy msgid "Epson Stylus Color 660" msgstr "Stylus Color 660" -#: src/main/xmli18n-tmp.h:278 +#: src/main/xmli18n-tmp.h:300 #, fuzzy msgid "Epson Stylus Color 670" msgstr "Stylus Color 670" -#: src/main/xmli18n-tmp.h:279 +#: src/main/xmli18n-tmp.h:301 #, fuzzy msgid "Epson Stylus Color 680" msgstr "Stylus Color 680" -#: src/main/xmli18n-tmp.h:280 +#: src/main/xmli18n-tmp.h:302 #, fuzzy msgid "Epson Stylus Color 740" msgstr "Stylus Color 740" -#: src/main/xmli18n-tmp.h:281 +#: src/main/xmli18n-tmp.h:303 #, fuzzy msgid "Epson Stylus Color 760" msgstr "Stylus Color 760" -#: src/main/xmli18n-tmp.h:282 +#: src/main/xmli18n-tmp.h:304 #, fuzzy msgid "Epson Stylus Color 777" msgstr "Stylus Color 770" -#: src/main/xmli18n-tmp.h:283 +#: src/main/xmli18n-tmp.h:305 #, fuzzy msgid "Epson Stylus Color 800" msgstr "Stylus Color 800" -#: src/main/xmli18n-tmp.h:284 +#: src/main/xmli18n-tmp.h:306 #, fuzzy msgid "Epson Stylus Color 850" msgstr "Stylus Color 850" -#: src/main/xmli18n-tmp.h:285 +#: src/main/xmli18n-tmp.h:307 #, fuzzy msgid "Epson Stylus Color 860" msgstr "Stylus Color 860" -#: src/main/xmli18n-tmp.h:286 +#: src/main/xmli18n-tmp.h:308 #, fuzzy msgid "Epson Stylus Color 880" msgstr "Stylus Color 880" -#: src/main/xmli18n-tmp.h:287 +#: src/main/xmli18n-tmp.h:309 #, fuzzy msgid "Epson Stylus Color 8 3" msgstr "Stylus Color 83" -#: src/main/xmli18n-tmp.h:288 +#: src/main/xmli18n-tmp.h:310 #, fuzzy msgid "Epson Stylus Color 900" msgstr "Stylus Color 900" -#: src/main/xmli18n-tmp.h:289 +#: src/main/xmli18n-tmp.h:311 #, fuzzy msgid "Epson Stylus Color 980" msgstr "Stylus Color 980" -#: src/main/xmli18n-tmp.h:290 +#: src/main/xmli18n-tmp.h:312 #, fuzzy msgid "Epson Stylus Color 1160" msgstr "Stylus Color 1160" -#: src/main/xmli18n-tmp.h:291 +#: src/main/xmli18n-tmp.h:313 #, fuzzy msgid "Epson Stylus Color 1500" msgstr "Stylus Color 1500" -#: src/main/xmli18n-tmp.h:292 +#: src/main/xmli18n-tmp.h:314 #, fuzzy msgid "Epson Stylus Color 1520" msgstr "Stylus Color 1520" -#: src/main/xmli18n-tmp.h:293 +#: src/main/xmli18n-tmp.h:315 #, fuzzy msgid "Epson Stylus Color 3000" msgstr "Stylus Color 3000" -#: src/main/xmli18n-tmp.h:294 +#: src/main/xmli18n-tmp.h:316 #, fuzzy msgid "Epson Stylus Photo" msgstr "Stylus Photo" -#: src/main/xmli18n-tmp.h:295 +#: src/main/xmli18n-tmp.h:317 #, fuzzy msgid "Epson Stylus Photo 700" msgstr "Stylus Photo 700" -#: src/main/xmli18n-tmp.h:296 +#: src/main/xmli18n-tmp.h:318 #, fuzzy msgid "Epson Stylus Photo EX" msgstr "Stylus Photo EX" -#: src/main/xmli18n-tmp.h:297 +#: src/main/xmli18n-tmp.h:319 #, fuzzy msgid "Epson Stylus Photo EX3" msgstr "Stylus Photo EX" -#: src/main/xmli18n-tmp.h:298 +#: src/main/xmli18n-tmp.h:320 #, fuzzy msgid "Epson Stylus Photo 720" msgstr "Stylus Photo 720" -#: src/main/xmli18n-tmp.h:299 +#: src/main/xmli18n-tmp.h:321 #, fuzzy msgid "Epson Stylus Photo 750" msgstr "Stylus Photo 750" -#: src/main/xmli18n-tmp.h:300 +#: src/main/xmli18n-tmp.h:322 #, fuzzy msgid "Epson Stylus Photo 780" msgstr "Stylus Photo 780" -#: src/main/xmli18n-tmp.h:301 +#: src/main/xmli18n-tmp.h:323 #, fuzzy msgid "Epson Stylus Photo 785" msgstr "Stylus Photo 785" -#: src/main/xmli18n-tmp.h:302 +#: src/main/xmli18n-tmp.h:324 #, fuzzy msgid "Epson Stylus Photo 790" msgstr "Stylus Photo 790" -#: src/main/xmli18n-tmp.h:303 +#: src/main/xmli18n-tmp.h:325 #, fuzzy msgid "Epson Stylus Photo 810" msgstr "Stylus Photo 810" -#: src/main/xmli18n-tmp.h:304 +#: src/main/xmli18n-tmp.h:326 #, fuzzy msgid "Epson Stylus Photo 820" msgstr "Stylus Photo 820" -#: src/main/xmli18n-tmp.h:305 +#: src/main/xmli18n-tmp.h:327 #, fuzzy msgid "Epson Stylus Photo 825" msgstr "Stylus Photo 785" -#: src/main/xmli18n-tmp.h:306 +#: src/main/xmli18n-tmp.h:328 #, fuzzy msgid "Epson Stylus Photo 830" msgstr "Stylus Photo 780" -#: src/main/xmli18n-tmp.h:307 +#: src/main/xmli18n-tmp.h:329 #, fuzzy msgid "Epson Stylus Photo 830U" msgstr "Stylus Photo 780" -#: src/main/xmli18n-tmp.h:308 +#: src/main/xmli18n-tmp.h:330 #, fuzzy msgid "Epson Stylus Photo 870" msgstr "Stylus Photo 870" -#: src/main/xmli18n-tmp.h:309 +#: src/main/xmli18n-tmp.h:331 #, fuzzy msgid "Epson Stylus Photo 875" msgstr "Stylus Photo 875" -#: src/main/xmli18n-tmp.h:310 +#: src/main/xmli18n-tmp.h:332 #, fuzzy msgid "Epson Stylus Photo 890" msgstr "Stylus Photo 890" -#: src/main/xmli18n-tmp.h:311 +#: src/main/xmli18n-tmp.h:333 #, fuzzy msgid "Epson Stylus Photo 895" msgstr "Stylus Photo 895" -#: src/main/xmli18n-tmp.h:312 +#: src/main/xmli18n-tmp.h:334 #, fuzzy msgid "Epson Stylus Photo 900" msgstr "Stylus Photo 700" -#: src/main/xmli18n-tmp.h:313 +#: src/main/xmli18n-tmp.h:335 #, fuzzy msgid "Epson Stylus Photo 915" msgstr "Stylus Photo 895" -#: src/main/xmli18n-tmp.h:314 +#: src/main/xmli18n-tmp.h:336 #, fuzzy msgid "Epson Stylus Photo 925" msgstr "Stylus Photo 895" -#: src/main/xmli18n-tmp.h:315 +#: src/main/xmli18n-tmp.h:337 #, fuzzy msgid "Epson Stylus Photo 935" msgstr "Stylus Photo 895" -#: src/main/xmli18n-tmp.h:316 +#: src/main/xmli18n-tmp.h:338 #, fuzzy msgid "Epson Stylus Photo 950" msgstr "Stylus Photo 750" -#: src/main/xmli18n-tmp.h:317 +#: src/main/xmli18n-tmp.h:339 #, fuzzy msgid "Epson Stylus Photo 960" msgstr "Stylus Photo 790" -#: src/main/xmli18n-tmp.h:318 +#: src/main/xmli18n-tmp.h:340 #, fuzzy msgid "Epson Stylus Photo 1200" msgstr "Stylus Photo 1200" -#: src/main/xmli18n-tmp.h:319 +#: src/main/xmli18n-tmp.h:341 #, fuzzy msgid "Epson Stylus Photo 1270" msgstr "Stylus Photo 1270" -#: src/main/xmli18n-tmp.h:320 +#: src/main/xmli18n-tmp.h:342 #, fuzzy msgid "Epson Stylus Photo 1280" msgstr "Stylus Photo 1280" -#: src/main/xmli18n-tmp.h:321 +#: src/main/xmli18n-tmp.h:343 #, fuzzy msgid "Epson Stylus Photo 1290" msgstr "Stylus Photo 1290" -#: src/main/xmli18n-tmp.h:322 +#: src/main/xmli18n-tmp.h:344 #, fuzzy msgid "Epson Stylus Photo 1400" msgstr "Stylus Photo 1200" -#: src/main/xmli18n-tmp.h:323 +#: src/main/xmli18n-tmp.h:345 #, fuzzy msgid "Epson Stylus Photo 1410" msgstr "Stylus Photo 810" -#: src/main/xmli18n-tmp.h:324 +#: src/main/xmli18n-tmp.h:346 #, fuzzy msgid "Epson Stylus Photo 2000P" msgstr "Stylus Photo 2000P" -#: src/main/xmli18n-tmp.h:325 +#: src/main/xmli18n-tmp.h:347 #, fuzzy msgid "Epson Stylus Photo 2100" msgstr "Stylus Photo 1200" -#: src/main/xmli18n-tmp.h:326 +#: src/main/xmli18n-tmp.h:348 #, fuzzy msgid "Epson Stylus Photo 2200" msgstr "Stylus Photo 1200" -#: src/main/xmli18n-tmp.h:327 +#: src/main/xmli18n-tmp.h:349 #, fuzzy msgid "Epson Stylus Photo R200" msgstr "Stylus Photo 1200" -#: src/main/xmli18n-tmp.h:328 +#: src/main/xmli18n-tmp.h:350 #, fuzzy msgid "Epson Stylus Photo R210" msgstr "Stylus Photo 1200" -#: src/main/xmli18n-tmp.h:329 +#: src/main/xmli18n-tmp.h:351 #, fuzzy msgid "Epson Stylus Photo R220" msgstr "Stylus Photo 1200" -#: src/main/xmli18n-tmp.h:330 +#: src/main/xmli18n-tmp.h:352 #, fuzzy msgid "Epson Stylus Photo R230" msgstr "Stylus Photo 1200" -#: src/main/xmli18n-tmp.h:331 +#: src/main/xmli18n-tmp.h:353 #, fuzzy msgid "Epson Stylus Photo R240" msgstr "Stylus Photo 1200" -#: src/main/xmli18n-tmp.h:332 +#: src/main/xmli18n-tmp.h:354 #, fuzzy msgid "Epson Stylus Photo R245" msgstr "Stylus Photo 1200" -#: src/main/xmli18n-tmp.h:333 +#: src/main/xmli18n-tmp.h:355 #, fuzzy msgid "Epson Stylus Photo R260" msgstr "Stylus Photo 1200" -#: src/main/xmli18n-tmp.h:334 +#: src/main/xmli18n-tmp.h:356 #, fuzzy msgid "Epson Stylus Photo R265" msgstr "Stylus Photo 1200" -#: src/main/xmli18n-tmp.h:335 +#: src/main/xmli18n-tmp.h:357 #, fuzzy msgid "Epson Stylus Photo R270" msgstr "Stylus Photo 1270" -#: src/main/xmli18n-tmp.h:336 +#: src/main/xmli18n-tmp.h:358 +#, fuzzy +msgid "Epson Stylus Photo R280" +msgstr "Stylus Photo 1280" + +#: src/main/xmli18n-tmp.h:359 +#, fuzzy +msgid "Epson Stylus Photo R285" +msgstr "Stylus Photo 1200" + +#: src/main/xmli18n-tmp.h:360 #, fuzzy msgid "Epson Stylus Photo R300" msgstr "Stylus Photo 700" -#: src/main/xmli18n-tmp.h:337 +#: src/main/xmli18n-tmp.h:361 #, fuzzy msgid "Epson Stylus Photo R310" msgstr "Stylus Photo 700" -#: src/main/xmli18n-tmp.h:338 +#: src/main/xmli18n-tmp.h:362 #, fuzzy msgid "Epson Stylus Photo R320" msgstr "Stylus Photo 1200" -#: src/main/xmli18n-tmp.h:339 +#: src/main/xmli18n-tmp.h:363 #, fuzzy msgid "Epson Stylus Photo R340" msgstr "Stylus Photo 700" -#: src/main/xmli18n-tmp.h:340 +#: src/main/xmli18n-tmp.h:364 #, fuzzy msgid "Epson Stylus Photo R350" msgstr "Stylus Photo 700" -#: src/main/xmli18n-tmp.h:341 +#: src/main/xmli18n-tmp.h:365 #, fuzzy msgid "Epson Stylus Photo R360" msgstr "Stylus Photo 700" -#: src/main/xmli18n-tmp.h:342 +#: src/main/xmli18n-tmp.h:366 #, fuzzy msgid "Epson Stylus Photo R380" msgstr "Stylus Photo 700" -#: src/main/xmli18n-tmp.h:343 +#: src/main/xmli18n-tmp.h:367 #, fuzzy msgid "Epson Stylus Photo R390" msgstr "Stylus Photo 700" -#: src/main/xmli18n-tmp.h:344 +#: src/main/xmli18n-tmp.h:368 #, fuzzy msgid "Epson Stylus Photo RX400" msgstr "Stylus Photo 700" -#: src/main/xmli18n-tmp.h:345 +#: src/main/xmli18n-tmp.h:369 #, fuzzy msgid "Epson Stylus Photo RX420" msgstr "Stylus Photo 1200" -#: src/main/xmli18n-tmp.h:346 +#: src/main/xmli18n-tmp.h:370 #, fuzzy msgid "Epson Stylus Photo RX425" msgstr "Stylus Photo 1200" -#: src/main/xmli18n-tmp.h:347 +#: src/main/xmli18n-tmp.h:371 #, fuzzy msgid "Epson Stylus Photo RX430" msgstr "Stylus Photo 700" -#: src/main/xmli18n-tmp.h:348 +#: src/main/xmli18n-tmp.h:372 #, fuzzy msgid "Epson Stylus Photo RX500" msgstr "Stylus Photo 700" -#: src/main/xmli18n-tmp.h:349 +#: src/main/xmli18n-tmp.h:373 #, fuzzy msgid "Epson Stylus Photo RX510" msgstr "Stylus Photo 700" -#: src/main/xmli18n-tmp.h:350 +#: src/main/xmli18n-tmp.h:374 #, fuzzy msgid "Epson Stylus Photo RX560" msgstr "Stylus Photo 700" -#: src/main/xmli18n-tmp.h:351 +#: src/main/xmli18n-tmp.h:375 #, fuzzy msgid "Epson Stylus Photo RX580" msgstr "Stylus Photo 700" -#: src/main/xmli18n-tmp.h:352 +#: src/main/xmli18n-tmp.h:376 +#, fuzzy +msgid "Epson Stylus Photo RX585" +msgstr "Stylus Photo 700" + +#: src/main/xmli18n-tmp.h:377 #, fuzzy msgid "Epson Stylus Photo RX590" msgstr "Stylus Photo 700" -#: src/main/xmli18n-tmp.h:353 +#: src/main/xmli18n-tmp.h:378 #, fuzzy msgid "Epson Stylus Photo RX595" msgstr "Stylus Photo 700" -#: src/main/xmli18n-tmp.h:354 +#: src/main/xmli18n-tmp.h:379 #, fuzzy msgid "Epson Stylus Photo RX600" msgstr "Stylus Photo 700" -#: src/main/xmli18n-tmp.h:355 +#: src/main/xmli18n-tmp.h:380 #, fuzzy msgid "Epson Stylus Photo RX620" msgstr "Stylus Photo 700" -#: src/main/xmli18n-tmp.h:356 +#: src/main/xmli18n-tmp.h:381 #, fuzzy msgid "Epson Stylus Photo RX630" msgstr "Stylus Photo 700" -#: src/main/xmli18n-tmp.h:357 +#: src/main/xmli18n-tmp.h:382 #, fuzzy msgid "Epson Stylus Photo RX640" msgstr "Stylus Photo 700" -#: src/main/xmli18n-tmp.h:358 +#: src/main/xmli18n-tmp.h:383 +#, fuzzy +msgid "Epson Stylus Photo RX680" +msgstr "Stylus Photo 700" + +#: src/main/xmli18n-tmp.h:384 +#, fuzzy +msgid "Epson Stylus Photo RX685" +msgstr "Stylus Photo 1200" + +#: src/main/xmli18n-tmp.h:385 #, fuzzy msgid "Epson Stylus Photo RX700" msgstr "Stylus Photo 700" -#: src/main/xmli18n-tmp.h:359 +#: src/main/xmli18n-tmp.h:386 #, fuzzy msgid "Epson Stylus Photo R800" msgstr "Stylus Photo 700" -#: src/main/xmli18n-tmp.h:360 +#: src/main/xmli18n-tmp.h:387 #, fuzzy msgid "Epson Stylus Photo R1800" msgstr "Stylus Photo 700" -#: src/main/xmli18n-tmp.h:361 +#: src/main/xmli18n-tmp.h:388 #, fuzzy msgid "Epson Stylus Photo R2400" msgstr "Stylus Photo 1200" -#: src/main/xmli18n-tmp.h:362 +#: src/main/xmli18n-tmp.h:389 #, fuzzy msgid "Epson Stylus Pro 5000" msgstr "Stylus Pro 5000" -#: src/main/xmli18n-tmp.h:363 +#: src/main/xmli18n-tmp.h:390 #, fuzzy msgid "Epson Stylus Pro 5500" msgstr "Stylus Pro 5500" -#: src/main/xmli18n-tmp.h:364 +#: src/main/xmli18n-tmp.h:391 #, fuzzy msgid "Epson Stylus Pro 7000" msgstr "Stylus Pro 7000" -#: src/main/xmli18n-tmp.h:365 +#: src/main/xmli18n-tmp.h:392 #, fuzzy msgid "Epson Stylus Pro 7500" msgstr "Stylus Pro 7500" -#: src/main/xmli18n-tmp.h:366 +#: src/main/xmli18n-tmp.h:393 #, fuzzy msgid "Epson Stylus Pro 7600" msgstr "Stylus Pro 7000" -#: src/main/xmli18n-tmp.h:367 +#: src/main/xmli18n-tmp.h:394 #, fuzzy msgid "Epson Stylus Pro 9000" msgstr "Stylus Pro 9000" -#: src/main/xmli18n-tmp.h:368 +#: src/main/xmli18n-tmp.h:395 #, fuzzy msgid "Epson Stylus Pro 9500" msgstr "Stylus Pro 9500" -#: src/main/xmli18n-tmp.h:369 +#: src/main/xmli18n-tmp.h:396 #, fuzzy msgid "Epson Stylus Pro 9600" msgstr "Stylus Pro 9000" -#: src/main/xmli18n-tmp.h:370 +#: src/main/xmli18n-tmp.h:397 #, fuzzy msgid "Epson Stylus Pro 10000" msgstr "Stylus Pro 10000" -#: src/main/xmli18n-tmp.h:371 +#: src/main/xmli18n-tmp.h:398 #, fuzzy msgid "Epson Stylus Scan 2000" msgstr "Stylus Scan 2000" -#: src/main/xmli18n-tmp.h:372 +#: src/main/xmli18n-tmp.h:399 #, fuzzy msgid "Epson Stylus Scan 2500" msgstr "Stylus Scan 2500" -#: src/main/xmli18n-tmp.h:373 +#: src/main/xmli18n-tmp.h:400 #, fuzzy msgid "Epson Stylus CX1500" msgstr "Stylus C20sx" -#: src/main/xmli18n-tmp.h:374 +#: src/main/xmli18n-tmp.h:401 #, fuzzy msgid "Epson Stylus CX3100" msgstr "Stylus C20sx" -#: src/main/xmli18n-tmp.h:375 +#: src/main/xmli18n-tmp.h:402 #, fuzzy msgid "Epson Stylus CX3200" msgstr "Stylus C20sx" -#: src/main/xmli18n-tmp.h:376 +#: src/main/xmli18n-tmp.h:403 #, fuzzy msgid "Epson Stylus CX3500" msgstr "Stylus C20sx" -#: src/main/xmli18n-tmp.h:377 +#: src/main/xmli18n-tmp.h:404 #, fuzzy msgid "Epson Stylus CX3600" msgstr "Stylus C20sx" -#: src/main/xmli18n-tmp.h:378 +#: src/main/xmli18n-tmp.h:405 #, fuzzy msgid "Epson Stylus CX3650" msgstr "Stylus C20sx" -#: src/main/xmli18n-tmp.h:379 +#: src/main/xmli18n-tmp.h:406 #, fuzzy msgid "Epson Stylus CX3700" msgstr "Stylus C20sx" -#: src/main/xmli18n-tmp.h:380 +#: src/main/xmli18n-tmp.h:407 #, fuzzy msgid "Epson Stylus CX3800" msgstr "Stylus C20sx" -#: src/main/xmli18n-tmp.h:381 +#: src/main/xmli18n-tmp.h:408 #, fuzzy msgid "Epson Stylus CX3805" msgstr "Stylus C60" -#: src/main/xmli18n-tmp.h:382 +#: src/main/xmli18n-tmp.h:409 #, fuzzy msgid "Epson Stylus CX3810" msgstr "Stylus C20sx" -#: src/main/xmli18n-tmp.h:383 +#: src/main/xmli18n-tmp.h:410 #, fuzzy msgid "Epson Stylus CX4100" msgstr "Stylus C20sx" -#: src/main/xmli18n-tmp.h:384 +#: src/main/xmli18n-tmp.h:411 #, fuzzy msgid "Epson Stylus CX4200" msgstr "Stylus C20sx" -#: src/main/xmli18n-tmp.h:385 +#: src/main/xmli18n-tmp.h:412 #, fuzzy msgid "Epson Stylus CX4400" msgstr "Stylus C20sx" -#: src/main/xmli18n-tmp.h:386 +#: src/main/xmli18n-tmp.h:413 #, fuzzy msgid "Epson Stylus CX4500" msgstr "Stylus C20sx" -#: src/main/xmli18n-tmp.h:387 +#: src/main/xmli18n-tmp.h:414 #, fuzzy msgid "Epson Stylus CX4600" msgstr "Stylus C20sx" -#: src/main/xmli18n-tmp.h:388 +#: src/main/xmli18n-tmp.h:415 #, fuzzy msgid "Epson Stylus CX4700" msgstr "Stylus C20sx" -#: src/main/xmli18n-tmp.h:389 +#: src/main/xmli18n-tmp.h:416 #, fuzzy msgid "Epson Stylus CX4800" msgstr "Stylus C20sx" -#: src/main/xmli18n-tmp.h:390 +#: src/main/xmli18n-tmp.h:417 #, fuzzy msgid "Epson Stylus CX4900" msgstr "Stylus C20sx" -#: src/main/xmli18n-tmp.h:391 +#: src/main/xmli18n-tmp.h:418 #, fuzzy msgid "Epson Stylus CX5000" msgstr "Stylus C20sx" -#: src/main/xmli18n-tmp.h:392 +#: src/main/xmli18n-tmp.h:419 #, fuzzy msgid "Epson Stylus CX5000F" msgstr "Stylus C20sx" -#: src/main/xmli18n-tmp.h:393 +#: src/main/xmli18n-tmp.h:420 #, fuzzy msgid "Epson Stylus CX5100" msgstr "Stylus C60" -#: src/main/xmli18n-tmp.h:394 +#: src/main/xmli18n-tmp.h:421 #, fuzzy msgid "Epson Stylus CX5200" msgstr "Stylus C60" -#: src/main/xmli18n-tmp.h:395 +#: src/main/xmli18n-tmp.h:422 #, fuzzy msgid "Epson Stylus CX5300" msgstr "Stylus C20sx" -#: src/main/xmli18n-tmp.h:396 +#: src/main/xmli18n-tmp.h:423 #, fuzzy msgid "Epson Stylus CX5400" msgstr "Stylus C20sx" -#: src/main/xmli18n-tmp.h:397 +#: src/main/xmli18n-tmp.h:424 #, fuzzy msgid "Epson Stylus CX5600" msgstr "Stylus C20sx" -#: src/main/xmli18n-tmp.h:398 +#: src/main/xmli18n-tmp.h:425 #, fuzzy msgid "Epson Stylus CX5700" msgstr "Stylus C20sx" -#: src/main/xmli18n-tmp.h:399 +#: src/main/xmli18n-tmp.h:426 #, fuzzy msgid "Epson Stylus CX5800" msgstr "Stylus C20sx" -#: src/main/xmli18n-tmp.h:400 +#: src/main/xmli18n-tmp.h:427 #, fuzzy msgid "Epson Stylus CX6000" msgstr "Stylus C20sx" -#: src/main/xmli18n-tmp.h:401 +#: src/main/xmli18n-tmp.h:428 #, fuzzy msgid "Epson Stylus CX6300" msgstr "Stylus C20sx" -#: src/main/xmli18n-tmp.h:402 +#: src/main/xmli18n-tmp.h:429 #, fuzzy msgid "Epson Stylus CX6400" msgstr "Stylus C20sx" -#: src/main/xmli18n-tmp.h:403 +#: src/main/xmli18n-tmp.h:430 #, fuzzy msgid "Epson Stylus CX6500" msgstr "Stylus C20sx" -#: src/main/xmli18n-tmp.h:404 +#: src/main/xmli18n-tmp.h:431 #, fuzzy msgid "Epson Stylus CX6600" msgstr "Stylus C20sx" -#: src/main/xmli18n-tmp.h:405 +#: src/main/xmli18n-tmp.h:432 #, fuzzy msgid "Epson Stylus CX7000F" msgstr "Stylus C20sx" -#: src/main/xmli18n-tmp.h:406 +#: src/main/xmli18n-tmp.h:433 #, fuzzy msgid "Epson Stylus CX7400" msgstr "Stylus C20sx" -#: src/main/xmli18n-tmp.h:407 +#: src/main/xmli18n-tmp.h:434 #, fuzzy msgid "Epson Stylus CX7700" msgstr "Stylus C70" -#: src/main/xmli18n-tmp.h:408 +#: src/main/xmli18n-tmp.h:435 #, fuzzy msgid "Epson Stylus CX7800" msgstr "Stylus C20sx" -#: src/main/xmli18n-tmp.h:409 +#: src/main/xmli18n-tmp.h:436 #, fuzzy msgid "Epson Stylus CX8300" msgstr "Stylus C20sx" -#: src/main/xmli18n-tmp.h:410 +#: src/main/xmli18n-tmp.h:437 #, fuzzy msgid "Epson Stylus CX8400" msgstr "Stylus C20sx" -#: src/main/xmli18n-tmp.h:411 +#: src/main/xmli18n-tmp.h:438 #, fuzzy msgid "Epson Stylus CX9400" msgstr "Stylus C20sx" -#: src/main/xmli18n-tmp.h:412 +#: src/main/xmli18n-tmp.h:439 #, fuzzy msgid "Epson Stylus D68" msgstr "Stylus C60" -#: src/main/xmli18n-tmp.h:413 +#: src/main/xmli18n-tmp.h:440 #, fuzzy msgid "Epson Stylus D88" msgstr "Stylus C80" -#: src/main/xmli18n-tmp.h:414 +#: src/main/xmli18n-tmp.h:441 +#, fuzzy +msgid "Epson Stylus D92" +msgstr "Stylus C20ux" + +#: src/main/xmli18n-tmp.h:442 #, fuzzy msgid "Epson Stylus D120" msgstr "Stylus C20ux" -#: src/main/xmli18n-tmp.h:415 +#: src/main/xmli18n-tmp.h:443 #, fuzzy msgid "Epson Stylus DX3800" msgstr "Stylus C20sx" -#: src/main/xmli18n-tmp.h:416 +#: src/main/xmli18n-tmp.h:444 #, fuzzy msgid "Epson Stylus DX3850" msgstr "Stylus C20sx" -#: src/main/xmli18n-tmp.h:417 +#: src/main/xmli18n-tmp.h:445 #, fuzzy msgid "Epson Stylus DX4050" msgstr "Stylus C20sx" -#: src/main/xmli18n-tmp.h:418 +#: src/main/xmli18n-tmp.h:446 #, fuzzy msgid "Epson Stylus DX4200" msgstr "Stylus C20sx" -#: src/main/xmli18n-tmp.h:419 +#: src/main/xmli18n-tmp.h:447 #, fuzzy msgid "Epson Stylus DX4250" msgstr "Stylus C60" -#: src/main/xmli18n-tmp.h:420 +#: src/main/xmli18n-tmp.h:448 +#, fuzzy +msgid "Epson Stylus DX4400" +msgstr "Stylus C20sx" + +#: src/main/xmli18n-tmp.h:449 +#, fuzzy +msgid "Epson Stylus DX4450" +msgstr "Stylus C20sx" + +#: src/main/xmli18n-tmp.h:450 #, fuzzy msgid "Epson Stylus DX4800" msgstr "Stylus C20sx" -#: src/main/xmli18n-tmp.h:421 +#: src/main/xmli18n-tmp.h:451 +#, fuzzy +msgid "Epson Stylus DX7000F" +msgstr "Stylus C20sx" + +#: src/main/xmli18n-tmp.h:452 +#, fuzzy +msgid "Epson Stylus DX7400" +msgstr "Stylus C20sx" + +#: src/main/xmli18n-tmp.h:453 +#, fuzzy +msgid "Epson Stylus DX7450" +msgstr "Stylus C20sx" + +#: src/main/xmli18n-tmp.h:454 +#, fuzzy +msgid "Epson Stylus DX8400" +msgstr "Stylus C20sx" + +#: src/main/xmli18n-tmp.h:455 +#, fuzzy +msgid "Epson Stylus DX8450" +msgstr "Stylus C20sx" + +#: src/main/xmli18n-tmp.h:456 msgid "Epson PictureMate" msgstr "" -#: src/main/xmli18n-tmp.h:422 +#: src/main/xmli18n-tmp.h:457 +#, fuzzy +msgid "Epson PictureMate Dash" +msgstr "Stylus C60" + +#: src/main/xmli18n-tmp.h:458 msgid "Epson PictureMate Deluxe" msgstr "" -#: src/main/xmli18n-tmp.h:423 +#: src/main/xmli18n-tmp.h:459 msgid "Epson PictureMate Flash" msgstr "" -#: src/main/xmli18n-tmp.h:424 +#: src/main/xmli18n-tmp.h:460 msgid "Epson PictureMate Pal" msgstr "" -#: src/main/xmli18n-tmp.h:425 +#: src/main/xmli18n-tmp.h:461 msgid "Epson PictureMate Snap" msgstr "" -#: src/main/xmli18n-tmp.h:426 +#: src/main/xmli18n-tmp.h:462 +#, fuzzy +msgid "Epson PictureMate 100" +msgstr "Stylus C60" + +#: src/main/xmli18n-tmp.h:463 #, fuzzy msgid "Epson PictureMate 200" msgstr "Stylus C60" -#: src/main/xmli18n-tmp.h:427 +#: src/main/xmli18n-tmp.h:464 #, fuzzy msgid "Epson PictureMate 210" msgstr "Stylus C60" -#: src/main/xmli18n-tmp.h:428 +#: src/main/xmli18n-tmp.h:465 #, fuzzy msgid "Epson PictureMate 240" msgstr "Stylus C60" -#: src/main/xmli18n-tmp.h:429 +#: src/main/xmli18n-tmp.h:466 #, fuzzy msgid "Epson PictureMate 250" msgstr "Stylus C60" -#: src/main/xmli18n-tmp.h:430 +#: src/main/xmli18n-tmp.h:467 +#, fuzzy +msgid "Epson PictureMate 260" +msgstr "Stylus C60" + +#: src/main/xmli18n-tmp.h:468 +#, fuzzy +msgid "Epson PictureMate 270" +msgstr "Stylus C60" + +#: src/main/xmli18n-tmp.h:469 #, fuzzy msgid "Epson PictureMate 280" msgstr "Stylus C60" -#: src/main/xmli18n-tmp.h:431 +#: src/main/xmli18n-tmp.h:470 +#, fuzzy +msgid "Epson PictureMate 290" +msgstr "Stylus C60" + +#: src/main/xmli18n-tmp.h:471 +#, fuzzy +msgid "Epson PictureMate 500" +msgstr "Stylus C60" + +#: src/main/xmli18n-tmp.h:472 +#, fuzzy +msgid "Epson PictureMate 2005" +msgstr "Stylus C60" + +#: src/main/xmli18n-tmp.h:473 msgid "Epson CL 700" msgstr "" -#: src/main/xmli18n-tmp.h:432 +#: src/main/xmli18n-tmp.h:474 msgid "Epson CL 750" msgstr "" -#: src/main/xmli18n-tmp.h:433 +#: src/main/xmli18n-tmp.h:475 msgid "Epson CL 760" msgstr "" -#: src/main/xmli18n-tmp.h:434 +#: src/main/xmli18n-tmp.h:476 msgid "Epson E 100" msgstr "" -#: src/main/xmli18n-tmp.h:435 +#: src/main/xmli18n-tmp.h:477 msgid "Epson E 150" msgstr "" -#: src/main/xmli18n-tmp.h:436 +#: src/main/xmli18n-tmp.h:478 msgid "Epson E 200" msgstr "" -#: src/main/xmli18n-tmp.h:437 +#: src/main/xmli18n-tmp.h:479 +#, fuzzy +msgid "Epson E 300" +msgstr "Stylus C60" + +#: src/main/xmli18n-tmp.h:480 +#, fuzzy +msgid "Epson E 500" +msgstr "Stylus C60" + +#: src/main/xmli18n-tmp.h:481 +#, fuzzy +msgid "Epson E 520" +msgstr "Stylus C60" + +#: src/main/xmli18n-tmp.h:482 +#, fuzzy +msgid "Epson E 700" +msgstr "Stylus C60" + +#: src/main/xmli18n-tmp.h:483 +#, fuzzy +msgid "Epson E 720" +msgstr "Stylus C60" + +#: src/main/xmli18n-tmp.h:484 msgid "Epson EM 900C" msgstr "" -#: src/main/xmli18n-tmp.h:438 +#: src/main/xmli18n-tmp.h:485 msgid "Epson EM 930C" msgstr "" -#: src/main/xmli18n-tmp.h:439 +#: src/main/xmli18n-tmp.h:486 msgid "Epson MC 2000" msgstr "" -#: src/main/xmli18n-tmp.h:440 +#: src/main/xmli18n-tmp.h:487 msgid "Epson MC 5000" msgstr "" -#: src/main/xmli18n-tmp.h:441 +#: src/main/xmli18n-tmp.h:488 msgid "Epson MC 7000" msgstr "" -#: src/main/xmli18n-tmp.h:442 +#: src/main/xmli18n-tmp.h:489 msgid "Epson MC 9000" msgstr "" -#: src/main/xmli18n-tmp.h:443 +#: src/main/xmli18n-tmp.h:490 msgid "Epson MC 10000" msgstr "" -#: src/main/xmli18n-tmp.h:444 +#: src/main/xmli18n-tmp.h:491 msgid "Epson MJ 930C" msgstr "" -#: src/main/xmli18n-tmp.h:445 +#: src/main/xmli18n-tmp.h:492 msgid "Epson MJ 5100C" msgstr "" -#: src/main/xmli18n-tmp.h:446 +#: src/main/xmli18n-tmp.h:493 msgid "Epson MJ 6000C" msgstr "" -#: src/main/xmli18n-tmp.h:447 +#: src/main/xmli18n-tmp.h:494 msgid "Epson MJ 8000C" msgstr "" -#: src/main/xmli18n-tmp.h:448 +#: src/main/xmli18n-tmp.h:495 #, fuzzy msgid "Epson PM 670C" msgstr "Stylus C60" -#: src/main/xmli18n-tmp.h:449 +#: src/main/xmli18n-tmp.h:496 msgid "Epson PM 700C" msgstr "" -#: src/main/xmli18n-tmp.h:450 +#: src/main/xmli18n-tmp.h:497 msgid "Epson PM 730C" msgstr "" -#: src/main/xmli18n-tmp.h:451 +#: src/main/xmli18n-tmp.h:498 msgid "Epson PM 740C" msgstr "" -#: src/main/xmli18n-tmp.h:452 +#: src/main/xmli18n-tmp.h:499 msgid "Epson PM 750C" msgstr "" -#: src/main/xmli18n-tmp.h:453 +#: src/main/xmli18n-tmp.h:500 msgid "Epson PM 760C" msgstr "" -#: src/main/xmli18n-tmp.h:454 +#: src/main/xmli18n-tmp.h:501 msgid "Epson PM 770C" msgstr "" -#: src/main/xmli18n-tmp.h:455 +#: src/main/xmli18n-tmp.h:502 msgid "Epson PM 780C" msgstr "" -#: src/main/xmli18n-tmp.h:456 +#: src/main/xmli18n-tmp.h:503 msgid "Epson PM 790PT" msgstr "" -#: src/main/xmli18n-tmp.h:457 +#: src/main/xmli18n-tmp.h:504 msgid "Epson PM 800C" msgstr "" -#: src/main/xmli18n-tmp.h:458 +#: src/main/xmli18n-tmp.h:505 msgid "Epson PM 850PT" msgstr "" -#: src/main/xmli18n-tmp.h:459 +#: src/main/xmli18n-tmp.h:506 msgid "Epson PM 870C" msgstr "" -#: src/main/xmli18n-tmp.h:460 +#: src/main/xmli18n-tmp.h:507 msgid "Epson PM 880C" msgstr "" -#: src/main/xmli18n-tmp.h:461 +#: src/main/xmli18n-tmp.h:508 msgid "Epson PM 930C" msgstr "" -#: src/main/xmli18n-tmp.h:462 +#: src/main/xmli18n-tmp.h:509 msgid "Epson PM 940C" msgstr "" -#: src/main/xmli18n-tmp.h:463 +#: src/main/xmli18n-tmp.h:510 msgid "Epson PM 950C" msgstr "" -#: src/main/xmli18n-tmp.h:464 +#: src/main/xmli18n-tmp.h:511 msgid "Epson PM 970C" msgstr "" -#: src/main/xmli18n-tmp.h:465 +#: src/main/xmli18n-tmp.h:512 msgid "Epson PM 980C" msgstr "" -#: src/main/xmli18n-tmp.h:466 +#: src/main/xmli18n-tmp.h:513 msgid "Epson PM 2000C" msgstr "" -#: src/main/xmli18n-tmp.h:467 +#: src/main/xmli18n-tmp.h:514 msgid "Epson PM 2200C" msgstr "" -#: src/main/xmli18n-tmp.h:468 +#: src/main/xmli18n-tmp.h:515 msgid "Epson PM 3000C" msgstr "" -#: src/main/xmli18n-tmp.h:469 +#: src/main/xmli18n-tmp.h:516 msgid "Epson PM 3300C" msgstr "" -#: src/main/xmli18n-tmp.h:470 +#: src/main/xmli18n-tmp.h:517 msgid "Epson PM 3500C" msgstr "" -#: src/main/xmli18n-tmp.h:471 +#: src/main/xmli18n-tmp.h:518 msgid "Epson PM 3700C" msgstr "" -#: src/main/xmli18n-tmp.h:472 +#: src/main/xmli18n-tmp.h:519 msgid "Epson PM 4000PX" msgstr "" -#: src/main/xmli18n-tmp.h:473 +#: src/main/xmli18n-tmp.h:520 msgid "Epson PM 5000C" msgstr "" -#: src/main/xmli18n-tmp.h:474 +#: src/main/xmli18n-tmp.h:521 msgid "Epson PM 7000C" msgstr "" -#: src/main/xmli18n-tmp.h:475 +#: src/main/xmli18n-tmp.h:522 msgid "Epson PM 9000C" msgstr "" -#: src/main/xmli18n-tmp.h:476 +#: src/main/xmli18n-tmp.h:523 #, fuzzy msgid "Epson PM 10000" msgstr "Stylus Pro 10000" -#: src/main/xmli18n-tmp.h:477 +#: src/main/xmli18n-tmp.h:524 msgid "Epson PM A650" msgstr "" -#: src/main/xmli18n-tmp.h:478 +#: src/main/xmli18n-tmp.h:525 msgid "Epson PM A750" msgstr "" -#: src/main/xmli18n-tmp.h:479 +#: src/main/xmli18n-tmp.h:526 #, fuzzy msgid "Epson PM A820" msgstr "Stylus C60" -#: src/main/xmli18n-tmp.h:480 +#: src/main/xmli18n-tmp.h:527 msgid "Epson PM A890" msgstr "" -#: src/main/xmli18n-tmp.h:481 +#: src/main/xmli18n-tmp.h:528 #, fuzzy msgid "Epson PM A900" msgstr "Stylus C60" -#: src/main/xmli18n-tmp.h:482 +#: src/main/xmli18n-tmp.h:529 msgid "Epson PM A950" msgstr "" -#: src/main/xmli18n-tmp.h:483 +#: src/main/xmli18n-tmp.h:530 msgid "Epson PM D600" msgstr "" -#: src/main/xmli18n-tmp.h:484 +#: src/main/xmli18n-tmp.h:531 #, fuzzy msgid "Epson PM D750" msgstr "Stylus C60" -#: src/main/xmli18n-tmp.h:485 +#: src/main/xmli18n-tmp.h:532 #, fuzzy msgid "Epson PM D770" msgstr "Stylus C60" -#: src/main/xmli18n-tmp.h:486 +#: src/main/xmli18n-tmp.h:533 msgid "Epson PM D800" msgstr "" -#: src/main/xmli18n-tmp.h:487 +#: src/main/xmli18n-tmp.h:534 #, fuzzy msgid "Epson PM D870" msgstr "Stylus C60" -#: src/main/xmli18n-tmp.h:488 +#: src/main/xmli18n-tmp.h:535 #, fuzzy msgid "Epson PM D1000" msgstr "Stylus C60" -#: src/main/xmli18n-tmp.h:489 +#: src/main/xmli18n-tmp.h:536 #, fuzzy msgid "Epson PM G700" msgstr "Stylus C60" -#: src/main/xmli18n-tmp.h:490 +#: src/main/xmli18n-tmp.h:537 #, fuzzy msgid "Epson PM G720" msgstr "Stylus C60" -#: src/main/xmli18n-tmp.h:491 +#: src/main/xmli18n-tmp.h:538 msgid "Epson PM G730" msgstr "" -#: src/main/xmli18n-tmp.h:492 +#: src/main/xmli18n-tmp.h:539 #, fuzzy msgid "Epson PM G800" msgstr "Stylus C60" -#: src/main/xmli18n-tmp.h:493 +#: src/main/xmli18n-tmp.h:540 #, fuzzy msgid "Epson PM G820" msgstr "Stylus C60" -#: src/main/xmli18n-tmp.h:494 +#: src/main/xmli18n-tmp.h:541 #, fuzzy msgid "Epson PM G850" msgstr "Stylus C60" -#: src/main/xmli18n-tmp.h:495 +#: src/main/xmli18n-tmp.h:542 #, fuzzy msgid "Epson PM G4500" msgstr "Stylus C60" -#: src/main/xmli18n-tmp.h:496 +#: src/main/xmli18n-tmp.h:543 #, fuzzy msgid "Epson PX A650" msgstr "Stylus C60" -#: src/main/xmli18n-tmp.h:497 +#: src/main/xmli18n-tmp.h:544 #, fuzzy msgid "Epson PX G900" msgstr "Stylus C60" -#: src/main/xmli18n-tmp.h:498 +#: src/main/xmli18n-tmp.h:545 #, fuzzy msgid "Epson PX G920" msgstr "Stylus C60" -#: src/main/xmli18n-tmp.h:499 +#: src/main/xmli18n-tmp.h:546 #, fuzzy msgid "Epson PX G5000" msgstr "Stylus C60" -#: src/main/xmli18n-tmp.h:500 +#: src/main/xmli18n-tmp.h:547 #, fuzzy msgid "Epson PX V500" msgstr "Stylus C60" -#: src/main/xmli18n-tmp.h:501 +#: src/main/xmli18n-tmp.h:548 #, fuzzy msgid "Epson PX V600" msgstr "Stylus C60" -#: src/main/xmli18n-tmp.h:502 +#: src/main/xmli18n-tmp.h:549 msgid "Epson PX V630" msgstr "" -#: src/main/xmli18n-tmp.h:503 +#: src/main/xmli18n-tmp.h:550 #, fuzzy msgid "Epson PX V780" msgstr "Stylus C60" -#: src/main/xmli18n-tmp.h:504 +#: src/main/xmli18n-tmp.h:551 #, fuzzy msgid "Epson PX 5500" msgstr "Stylus C60" -#: src/main/xmli18n-tmp.h:505 +#: src/main/xmli18n-tmp.h:552 msgid "Epson PX 7000" msgstr "" -#: src/main/xmli18n-tmp.h:506 +#: src/main/xmli18n-tmp.h:553 msgid "Epson PX 9000" msgstr "" -#: src/main/xmli18n-tmp.h:507 +#: src/main/xmli18n-tmp.h:554 msgid "Apollo P-2100" msgstr "" -#: src/main/xmli18n-tmp.h:508 +#: src/main/xmli18n-tmp.h:555 msgid "Apollo P-2150" msgstr "" -#: src/main/xmli18n-tmp.h:509 +#: src/main/xmli18n-tmp.h:556 msgid "Apollo P-2200" msgstr "" -#: src/main/xmli18n-tmp.h:510 +#: src/main/xmli18n-tmp.h:557 msgid "Apollo P-2250" msgstr "" -#: src/main/xmli18n-tmp.h:511 +#: src/main/xmli18n-tmp.h:558 msgid "Apollo P-2500" msgstr "" -#: src/main/xmli18n-tmp.h:512 +#: src/main/xmli18n-tmp.h:559 msgid "Apollo P-2550" msgstr "" -#: src/main/xmli18n-tmp.h:513 +#: src/main/xmli18n-tmp.h:560 msgid "Apollo P-2600" msgstr "" -#: src/main/xmli18n-tmp.h:514 +#: src/main/xmli18n-tmp.h:561 msgid "Apollo P-2650" msgstr "" -#: src/main/xmli18n-tmp.h:515 +#: src/main/xmli18n-tmp.h:562 msgid "Apple Color StyleWriter 4100" msgstr "" -#: src/main/xmli18n-tmp.h:516 +#: src/main/xmli18n-tmp.h:563 msgid "Apple Color StyleWriter 4500" msgstr "" -#: src/main/xmli18n-tmp.h:517 +#: src/main/xmli18n-tmp.h:564 msgid "Apple Color StyleWriter 6500" msgstr "" -#: src/main/xmli18n-tmp.h:518 +#: src/main/xmli18n-tmp.h:565 msgid "Apple LaserWriter Select 360" msgstr "" -#: src/main/xmli18n-tmp.h:519 +#: src/main/xmli18n-tmp.h:566 msgid "Brother DCP-1200" msgstr "" -#: src/main/xmli18n-tmp.h:520 +#: src/main/xmli18n-tmp.h:567 msgid "Brother HL-4Ve" msgstr "" -#: src/main/xmli18n-tmp.h:521 +#: src/main/xmli18n-tmp.h:568 msgid "Brother HL-10V" msgstr "" -#: src/main/xmli18n-tmp.h:522 +#: src/main/xmli18n-tmp.h:569 msgid "Brother HL-10h" msgstr "" -#: src/main/xmli18n-tmp.h:523 +#: src/main/xmli18n-tmp.h:570 msgid "Brother HL-630" msgstr "" -#: src/main/xmli18n-tmp.h:524 +#: src/main/xmli18n-tmp.h:571 msgid "Brother HL-660" msgstr "" -#: src/main/xmli18n-tmp.h:525 +#: src/main/xmli18n-tmp.h:572 msgid "Brother HL-760" msgstr "" -#: src/main/xmli18n-tmp.h:526 +#: src/main/xmli18n-tmp.h:573 msgid "Brother HL-960" msgstr "" -#: src/main/xmli18n-tmp.h:527 +#: src/main/xmli18n-tmp.h:574 msgid "Brother HL-1040" msgstr "" -#: src/main/xmli18n-tmp.h:528 +#: src/main/xmli18n-tmp.h:575 msgid "Brother HL-1050" msgstr "" -#: src/main/xmli18n-tmp.h:529 +#: src/main/xmli18n-tmp.h:576 msgid "Brother HL-1060" msgstr "" -#: src/main/xmli18n-tmp.h:530 +#: src/main/xmli18n-tmp.h:577 msgid "Brother HL-1070" msgstr "" -#: src/main/xmli18n-tmp.h:531 +#: src/main/xmli18n-tmp.h:578 msgid "Brother HL-1240" msgstr "" -#: src/main/xmli18n-tmp.h:532 +#: src/main/xmli18n-tmp.h:579 msgid "Brother HL-1250" msgstr "" -#: src/main/xmli18n-tmp.h:533 +#: src/main/xmli18n-tmp.h:580 msgid "Brother HL-1260" msgstr "" -#: src/main/xmli18n-tmp.h:534 +#: src/main/xmli18n-tmp.h:581 msgid "Brother HL-1270N" msgstr "" -#: src/main/xmli18n-tmp.h:535 +#: src/main/xmli18n-tmp.h:582 msgid "Brother HL-1440" msgstr "" -#: src/main/xmli18n-tmp.h:536 +#: src/main/xmli18n-tmp.h:583 msgid "Brother HL-1660e" msgstr "" -#: src/main/xmli18n-tmp.h:537 +#: src/main/xmli18n-tmp.h:584 msgid "Brother HL-2060" msgstr "" -#: src/main/xmli18n-tmp.h:538 +#: src/main/xmli18n-tmp.h:585 msgid "Brother MFC-6550MC" msgstr "" -#: src/main/xmli18n-tmp.h:539 +#: src/main/xmli18n-tmp.h:586 msgid "Brother MFC-8300" msgstr "" -#: src/main/xmli18n-tmp.h:540 +#: src/main/xmli18n-tmp.h:587 msgid "Brother MFC-9500" msgstr "" -#: src/main/xmli18n-tmp.h:541 +#: src/main/xmli18n-tmp.h:588 msgid "Brother MFC-9600" msgstr "" -#: src/main/xmli18n-tmp.h:542 +#: src/main/xmli18n-tmp.h:589 msgid "Canon GP 335" msgstr "" -#: src/main/xmli18n-tmp.h:543 +#: src/main/xmli18n-tmp.h:590 msgid "Canon LBP-4sx" msgstr "" -#: src/main/xmli18n-tmp.h:544 +#: src/main/xmli18n-tmp.h:591 msgid "Canon LBP-430" msgstr "" -#: src/main/xmli18n-tmp.h:545 +#: src/main/xmli18n-tmp.h:592 msgid "Canon LBP-1000" msgstr "" -#: src/main/xmli18n-tmp.h:546 +#: src/main/xmli18n-tmp.h:593 msgid "Canon LBP-1260" msgstr "" -#: src/main/xmli18n-tmp.h:547 +#: src/main/xmli18n-tmp.h:594 msgid "Canon LBP-1760" msgstr "" -#: src/main/xmli18n-tmp.h:548 +#: src/main/xmli18n-tmp.h:595 msgid "Canon imageRunner 330s" msgstr "" -#: src/main/xmli18n-tmp.h:549 +#: src/main/xmli18n-tmp.h:596 msgid "Citizen ProJet II" msgstr "" -#: src/main/xmli18n-tmp.h:550 +#: src/main/xmli18n-tmp.h:597 msgid "DEC 1800" msgstr "" -#: src/main/xmli18n-tmp.h:551 +#: src/main/xmli18n-tmp.h:598 msgid "DEC LN17" msgstr "" -#: src/main/xmli18n-tmp.h:552 +#: src/main/xmli18n-tmp.h:599 msgid "Epson ActionLaser 1100" msgstr "" -#: src/main/xmli18n-tmp.h:553 +#: src/main/xmli18n-tmp.h:600 msgid "Epson ActionLaser II" msgstr "" -#: src/main/xmli18n-tmp.h:554 +#: src/main/xmli18n-tmp.h:601 msgid "Epson AcuLaser C2000" msgstr "" -#: src/main/xmli18n-tmp.h:555 +#: src/main/xmli18n-tmp.h:602 msgid "Epson AcuLaser C2000PS" msgstr "" -#: src/main/xmli18n-tmp.h:556 +#: src/main/xmli18n-tmp.h:603 msgid "Epson AcuLaser C8500" msgstr "" -#: src/main/xmli18n-tmp.h:557 +#: src/main/xmli18n-tmp.h:604 msgid "Epson AcuLaser C8500PS" msgstr "" -#: src/main/xmli18n-tmp.h:558 +#: src/main/xmli18n-tmp.h:605 msgid "Epson AcuLaser C8600" msgstr "" -#: src/main/xmli18n-tmp.h:559 +#: src/main/xmli18n-tmp.h:606 msgid "Epson AcuLaser C8600PS" msgstr "" -#: src/main/xmli18n-tmp.h:560 +#: src/main/xmli18n-tmp.h:607 msgid "Epson EPL-5200" msgstr "" -#: src/main/xmli18n-tmp.h:561 +#: src/main/xmli18n-tmp.h:608 msgid "Epson EPL-5200+" msgstr "" -#: src/main/xmli18n-tmp.h:562 +#: src/main/xmli18n-tmp.h:609 msgid "Epson EPL-5700" msgstr "" -#: src/main/xmli18n-tmp.h:563 +#: src/main/xmli18n-tmp.h:610 msgid "Epson EPL-5700PS" msgstr "" -#: src/main/xmli18n-tmp.h:564 +#: src/main/xmli18n-tmp.h:611 msgid "Epson EPL-5800" msgstr "" -#: src/main/xmli18n-tmp.h:565 +#: src/main/xmli18n-tmp.h:612 msgid "Epson EPL-5800PS" msgstr "" -#: src/main/xmli18n-tmp.h:566 +#: src/main/xmli18n-tmp.h:613 msgid "Epson EPL-5900" msgstr "" -#: src/main/xmli18n-tmp.h:567 +#: src/main/xmli18n-tmp.h:614 msgid "Epson EPL-5900PS" msgstr "" -#: src/main/xmli18n-tmp.h:568 +#: src/main/xmli18n-tmp.h:615 msgid "Epson EPL-6100" msgstr "" -#: src/main/xmli18n-tmp.h:569 +#: src/main/xmli18n-tmp.h:616 msgid "Epson EPL-6100PS" msgstr "" -#: src/main/xmli18n-tmp.h:570 +#: src/main/xmli18n-tmp.h:617 msgid "Epson EPL-7100" msgstr "" -#: src/main/xmli18n-tmp.h:571 +#: src/main/xmli18n-tmp.h:618 msgid "Fujitsu PrintPartner 10V" msgstr "" -#: src/main/xmli18n-tmp.h:572 +#: src/main/xmli18n-tmp.h:619 msgid "Fujitsu PrintPartner 16DV" msgstr "" -#: src/main/xmli18n-tmp.h:573 +#: src/main/xmli18n-tmp.h:620 msgid "Fujitsu PrintPartner 20W" msgstr "" -#: src/main/xmli18n-tmp.h:574 +#: src/main/xmli18n-tmp.h:621 msgid "Fujitsu PrintPartner 8000" msgstr "" -#: src/main/xmli18n-tmp.h:575 +#: src/main/xmli18n-tmp.h:622 #, fuzzy msgid "Generic PCL 4 Printer" msgstr "Definer ny skriver" -#: src/main/xmli18n-tmp.h:576 +#: src/main/xmli18n-tmp.h:623 +#, fuzzy +msgid "Generic PCL 4 LF Printer" +msgstr "Definer ny skriver" + +#: src/main/xmli18n-tmp.h:624 #, fuzzy msgid "Generic PCL 5 Printer" msgstr "Definer ny skriver" -#: src/main/xmli18n-tmp.h:577 +#: src/main/xmli18n-tmp.h:625 +#, fuzzy +msgid "Generic PCL 5 LF Printer" +msgstr "Definer ny skriver" + +#: src/main/xmli18n-tmp.h:626 #, fuzzy msgid "Generic PCL 5c Printer" msgstr "Definer ny skriver" -#: src/main/xmli18n-tmp.h:578 +#: src/main/xmli18n-tmp.h:627 +#, fuzzy +msgid "Generic PCL 5c LF Printer" +msgstr "Definer ny skriver" + +#: src/main/xmli18n-tmp.h:628 #, fuzzy msgid "Generic PCL 5e Printer" msgstr "Definer ny skriver" -#: src/main/xmli18n-tmp.h:579 +#: src/main/xmli18n-tmp.h:629 +#, fuzzy +msgid "Generic PCL 5e LF Printer" +msgstr "Definer ny skriver" + +#: src/main/xmli18n-tmp.h:630 msgid "Generic PCL 6/PCL XL Printer" msgstr "" -#: src/main/xmli18n-tmp.h:580 +#: src/main/xmli18n-tmp.h:631 +#, fuzzy +msgid "Generic PCL 6/PCL XL LF Printer" +msgstr "Definer ny skriver" + +#: src/main/xmli18n-tmp.h:632 msgid "HP Business Inkjet 2200" msgstr "" -#: src/main/xmli18n-tmp.h:581 +#: src/main/xmli18n-tmp.h:633 msgid "HP Business Inkjet 2230" msgstr "" -#: src/main/xmli18n-tmp.h:582 +#: src/main/xmli18n-tmp.h:634 msgid "HP Business Inkjet 2250" msgstr "" -#: src/main/xmli18n-tmp.h:583 +#: src/main/xmli18n-tmp.h:635 msgid "HP Business Inkjet 2250TN" msgstr "" -#: src/main/xmli18n-tmp.h:584 +#: src/main/xmli18n-tmp.h:636 msgid "HP Business Inkjet 2280" msgstr "" -#: src/main/xmli18n-tmp.h:585 +#: src/main/xmli18n-tmp.h:637 msgid "HP Color Inkjet Printer CP1160" msgstr "" -#: src/main/xmli18n-tmp.h:586 +#: src/main/xmli18n-tmp.h:638 msgid "HP Color Inkjet Printer CP1700" msgstr "" -#: src/main/xmli18n-tmp.h:587 +#: src/main/xmli18n-tmp.h:639 msgid "HP Color LaserJet 2500" msgstr "" -#: src/main/xmli18n-tmp.h:588 +#: src/main/xmli18n-tmp.h:640 msgid "HP Color LaserJet 4500" msgstr "" -#: src/main/xmli18n-tmp.h:589 +#: src/main/xmli18n-tmp.h:641 msgid "HP Color LaserJet 4550" msgstr "" -#: src/main/xmli18n-tmp.h:590 +#: src/main/xmli18n-tmp.h:642 msgid "HP Color LaserJet 4600" msgstr "" -#: src/main/xmli18n-tmp.h:591 +#: src/main/xmli18n-tmp.h:643 msgid "HP Color LaserJet 5" msgstr "" -#: src/main/xmli18n-tmp.h:592 +#: src/main/xmli18n-tmp.h:644 msgid "HP Color LaserJet 5000" msgstr "" -#: src/main/xmli18n-tmp.h:593 +#: src/main/xmli18n-tmp.h:645 msgid "HP Color LaserJet 5500" msgstr "" -#: src/main/xmli18n-tmp.h:594 +#: src/main/xmli18n-tmp.h:646 msgid "HP Color LaserJet 8550GN" msgstr "" -#: src/main/xmli18n-tmp.h:595 +#: src/main/xmli18n-tmp.h:647 msgid "HP DesignJet 230" msgstr "" -#: src/main/xmli18n-tmp.h:596 +#: src/main/xmli18n-tmp.h:648 msgid "HP DesignJet 250C" msgstr "" -#: src/main/xmli18n-tmp.h:597 +#: src/main/xmli18n-tmp.h:649 msgid "HP DesignJet 430" msgstr "" -#: src/main/xmli18n-tmp.h:598 +#: src/main/xmli18n-tmp.h:650 msgid "HP DesignJet 450C" msgstr "" -#: src/main/xmli18n-tmp.h:599 +#: src/main/xmli18n-tmp.h:651 msgid "HP DesignJet 455CA" msgstr "" -#: src/main/xmli18n-tmp.h:600 +#: src/main/xmli18n-tmp.h:652 msgid "HP DesignJet 488CA" msgstr "" -#: src/main/xmli18n-tmp.h:601 +#: src/main/xmli18n-tmp.h:653 msgid "HP DesignJet 700" msgstr "" -#: src/main/xmli18n-tmp.h:602 +#: src/main/xmli18n-tmp.h:654 msgid "HP DesignJet 750C Plus" msgstr "" -#: src/main/xmli18n-tmp.h:603 +#: src/main/xmli18n-tmp.h:655 msgid "HP DesignJet 750C" msgstr "" -#: src/main/xmli18n-tmp.h:604 +#: src/main/xmli18n-tmp.h:656 msgid "HP DesignJet 2500CP" msgstr "" -#: src/main/xmli18n-tmp.h:605 +#: src/main/xmli18n-tmp.h:657 msgid "HP DesignJet 3500CP" msgstr "" -#: src/main/xmli18n-tmp.h:606 +#: src/main/xmli18n-tmp.h:658 msgid "HP DesignJet ColorPro CAD" msgstr "" -#: src/main/xmli18n-tmp.h:607 +#: src/main/xmli18n-tmp.h:659 msgid "HP DeskJet 400" msgstr "" -#: src/main/xmli18n-tmp.h:608 +#: src/main/xmli18n-tmp.h:660 msgid "HP DeskJet 420C" msgstr "" -#: src/main/xmli18n-tmp.h:609 +#: src/main/xmli18n-tmp.h:661 msgid "HP DeskJet 450" msgstr "" -#: src/main/xmli18n-tmp.h:610 +#: src/main/xmli18n-tmp.h:662 msgid "HP DeskJet 500" msgstr "" -#: src/main/xmli18n-tmp.h:611 +#: src/main/xmli18n-tmp.h:663 msgid "HP DeskJet 500C" msgstr "" -#: src/main/xmli18n-tmp.h:612 +#: src/main/xmli18n-tmp.h:664 msgid "HP DeskJet 505J Plus" msgstr "" -#: src/main/xmli18n-tmp.h:613 +#: src/main/xmli18n-tmp.h:665 msgid "HP DeskJet 510" msgstr "" -#: src/main/xmli18n-tmp.h:614 +#: src/main/xmli18n-tmp.h:666 msgid "HP DeskJet 520" msgstr "" -#: src/main/xmli18n-tmp.h:615 +#: src/main/xmli18n-tmp.h:667 msgid "HP DeskJet 540C" msgstr "" -#: src/main/xmli18n-tmp.h:616 +#: src/main/xmli18n-tmp.h:668 msgid "HP DeskJet 550C" msgstr "" -#: src/main/xmli18n-tmp.h:617 +#: src/main/xmli18n-tmp.h:669 msgid "HP DeskJet 5550" msgstr "" -#: src/main/xmli18n-tmp.h:618 +#: src/main/xmli18n-tmp.h:670 msgid "HP DeskJet 5551" msgstr "" -#: src/main/xmli18n-tmp.h:619 +#: src/main/xmli18n-tmp.h:671 msgid "HP DeskJet 560C" msgstr "" -#: src/main/xmli18n-tmp.h:620 +#: src/main/xmli18n-tmp.h:672 msgid "HP DeskJet 600" msgstr "" -#: src/main/xmli18n-tmp.h:621 +#: src/main/xmli18n-tmp.h:673 msgid "HP DeskJet 600C" msgstr "" -#: src/main/xmli18n-tmp.h:622 +#: src/main/xmli18n-tmp.h:674 msgid "HP DeskJet 610C" msgstr "" -#: src/main/xmli18n-tmp.h:623 +#: src/main/xmli18n-tmp.h:675 msgid "HP DeskJet 610CL" msgstr "" -#: src/main/xmli18n-tmp.h:624 +#: src/main/xmli18n-tmp.h:676 msgid "HP DeskJet 6122" msgstr "" -#: src/main/xmli18n-tmp.h:625 +#: src/main/xmli18n-tmp.h:677 msgid "HP DeskJet 6127" msgstr "" -#: src/main/xmli18n-tmp.h:626 +#: src/main/xmli18n-tmp.h:678 msgid "HP DeskJet 612C" msgstr "" -#: src/main/xmli18n-tmp.h:627 +#: src/main/xmli18n-tmp.h:679 msgid "HP DeskJet 640C" msgstr "" -#: src/main/xmli18n-tmp.h:628 +#: src/main/xmli18n-tmp.h:680 msgid "HP DeskJet 648C" msgstr "" -#: src/main/xmli18n-tmp.h:629 +#: src/main/xmli18n-tmp.h:681 msgid "HP DeskJet 660C" msgstr "" -#: src/main/xmli18n-tmp.h:630 +#: src/main/xmli18n-tmp.h:682 msgid "HP DeskJet 670C" msgstr "" -#: src/main/xmli18n-tmp.h:631 +#: src/main/xmli18n-tmp.h:683 msgid "HP DeskJet 670TV" msgstr "" -#: src/main/xmli18n-tmp.h:632 +#: src/main/xmli18n-tmp.h:684 msgid "HP DeskJet 672C" msgstr "" -#: src/main/xmli18n-tmp.h:633 +#: src/main/xmli18n-tmp.h:685 msgid "HP DeskJet 680C" msgstr "" -#: src/main/xmli18n-tmp.h:634 +#: src/main/xmli18n-tmp.h:686 msgid "HP DeskJet 682C" msgstr "" -#: src/main/xmli18n-tmp.h:635 +#: src/main/xmli18n-tmp.h:687 msgid "HP DeskJet 690C" msgstr "" -#: src/main/xmli18n-tmp.h:636 +#: src/main/xmli18n-tmp.h:688 msgid "HP DeskJet 692C" msgstr "" -#: src/main/xmli18n-tmp.h:637 +#: src/main/xmli18n-tmp.h:689 msgid "HP DeskJet 693C" msgstr "" -#: src/main/xmli18n-tmp.h:638 +#: src/main/xmli18n-tmp.h:690 msgid "HP DeskJet 694C" msgstr "" -#: src/main/xmli18n-tmp.h:639 +#: src/main/xmli18n-tmp.h:691 msgid "HP DeskJet 695C" msgstr "" -#: src/main/xmli18n-tmp.h:640 +#: src/main/xmli18n-tmp.h:692 msgid "HP DeskJet 697C" msgstr "" -#: src/main/xmli18n-tmp.h:641 +#: src/main/xmli18n-tmp.h:693 msgid "HP DeskJet 810C" msgstr "" -#: src/main/xmli18n-tmp.h:642 +#: src/main/xmli18n-tmp.h:694 msgid "HP DeskJet 812C" msgstr "" -#: src/main/xmli18n-tmp.h:643 +#: src/main/xmli18n-tmp.h:695 msgid "HP DeskJet 815C" msgstr "" -#: src/main/xmli18n-tmp.h:644 +#: src/main/xmli18n-tmp.h:696 msgid "HP DeskJet 816C" msgstr "" -#: src/main/xmli18n-tmp.h:645 +#: src/main/xmli18n-tmp.h:697 msgid "HP DeskJet 825C" msgstr "" -#: src/main/xmli18n-tmp.h:646 +#: src/main/xmli18n-tmp.h:698 msgid "HP DeskJet 830C" msgstr "" -#: src/main/xmli18n-tmp.h:647 +#: src/main/xmli18n-tmp.h:699 msgid "HP DeskJet 832C" msgstr "" -#: src/main/xmli18n-tmp.h:648 +#: src/main/xmli18n-tmp.h:700 msgid "HP DeskJet 840C" msgstr "" -#: src/main/xmli18n-tmp.h:649 +#: src/main/xmli18n-tmp.h:701 msgid "HP DeskJet 841C" msgstr "" -#: src/main/xmli18n-tmp.h:650 +#: src/main/xmli18n-tmp.h:702 msgid "HP DeskJet 842C" msgstr "" -#: src/main/xmli18n-tmp.h:651 +#: src/main/xmli18n-tmp.h:703 msgid "HP DeskJet 843C" msgstr "" -#: src/main/xmli18n-tmp.h:652 +#: src/main/xmli18n-tmp.h:704 msgid "HP DeskJet 845C" msgstr "" -#: src/main/xmli18n-tmp.h:653 +#: src/main/xmli18n-tmp.h:705 msgid "HP DeskJet 850C" msgstr "" -#: src/main/xmli18n-tmp.h:654 +#: src/main/xmli18n-tmp.h:706 msgid "HP DeskJet 855C" msgstr "" -#: src/main/xmli18n-tmp.h:655 +#: src/main/xmli18n-tmp.h:707 msgid "HP DeskJet 870C" msgstr "" -#: src/main/xmli18n-tmp.h:656 +#: src/main/xmli18n-tmp.h:708 msgid "HP DeskJet 880C" msgstr "" -#: src/main/xmli18n-tmp.h:657 +#: src/main/xmli18n-tmp.h:709 msgid "HP DeskJet 882C" msgstr "" -#: src/main/xmli18n-tmp.h:658 +#: src/main/xmli18n-tmp.h:710 msgid "HP DeskJet 890C" msgstr "" -#: src/main/xmli18n-tmp.h:659 +#: src/main/xmli18n-tmp.h:711 msgid "HP DeskJet 895C" msgstr "" -#: src/main/xmli18n-tmp.h:660 +#: src/main/xmli18n-tmp.h:712 msgid "HP DeskJet 916C" msgstr "" -#: src/main/xmli18n-tmp.h:661 +#: src/main/xmli18n-tmp.h:713 msgid "HP DeskJet 920C" msgstr "" -#: src/main/xmli18n-tmp.h:662 +#: src/main/xmli18n-tmp.h:714 msgid "HP DeskJet 9300" msgstr "" -#: src/main/xmli18n-tmp.h:663 +#: src/main/xmli18n-tmp.h:715 msgid "HP DeskJet 930C" msgstr "" -#: src/main/xmli18n-tmp.h:664 +#: src/main/xmli18n-tmp.h:716 msgid "HP DeskJet 932C" msgstr "" -#: src/main/xmli18n-tmp.h:665 +#: src/main/xmli18n-tmp.h:717 msgid "HP DeskJet 933C" msgstr "" -#: src/main/xmli18n-tmp.h:666 +#: src/main/xmli18n-tmp.h:718 msgid "HP DeskJet 934C" msgstr "" -#: src/main/xmli18n-tmp.h:667 +#: src/main/xmli18n-tmp.h:719 msgid "HP DeskJet 935C" msgstr "" -#: src/main/xmli18n-tmp.h:668 +#: src/main/xmli18n-tmp.h:720 msgid "HP DeskJet 940C" msgstr "" -#: src/main/xmli18n-tmp.h:669 +#: src/main/xmli18n-tmp.h:721 msgid "HP DeskJet 948C" msgstr "" -#: src/main/xmli18n-tmp.h:670 +#: src/main/xmli18n-tmp.h:722 msgid "HP DeskJet 950C" msgstr "" -#: src/main/xmli18n-tmp.h:671 +#: src/main/xmli18n-tmp.h:723 msgid "HP DeskJet 952C" msgstr "" -#: src/main/xmli18n-tmp.h:672 +#: src/main/xmli18n-tmp.h:724 msgid "HP DeskJet 955C" msgstr "" -#: src/main/xmli18n-tmp.h:673 +#: src/main/xmli18n-tmp.h:725 msgid "HP DeskJet 957C" msgstr "" -#: src/main/xmli18n-tmp.h:674 +#: src/main/xmli18n-tmp.h:726 msgid "HP DeskJet 959C" msgstr "" -#: src/main/xmli18n-tmp.h:675 +#: src/main/xmli18n-tmp.h:727 msgid "HP DeskJet 960C" msgstr "" -#: src/main/xmli18n-tmp.h:676 +#: src/main/xmli18n-tmp.h:728 msgid "HP DeskJet 970C" msgstr "" -#: src/main/xmli18n-tmp.h:677 +#: src/main/xmli18n-tmp.h:729 msgid "HP DeskJet 975C" msgstr "" -#: src/main/xmli18n-tmp.h:678 +#: src/main/xmli18n-tmp.h:730 msgid "HP DeskJet 980C" msgstr "" -#: src/main/xmli18n-tmp.h:679 +#: src/main/xmli18n-tmp.h:731 msgid "HP DeskJet 990C" msgstr "" -#: src/main/xmli18n-tmp.h:680 +#: src/main/xmli18n-tmp.h:732 msgid "HP DeskJet 995C" msgstr "" -#: src/main/xmli18n-tmp.h:681 +#: src/main/xmli18n-tmp.h:733 msgid "HP DeskJet 1100C" msgstr "" -#: src/main/xmli18n-tmp.h:682 +#: src/main/xmli18n-tmp.h:734 msgid "HP DeskJet 1120C" msgstr "" -#: src/main/xmli18n-tmp.h:683 +#: src/main/xmli18n-tmp.h:735 msgid "HP DeskJet 1125C" msgstr "" -#: src/main/xmli18n-tmp.h:684 +#: src/main/xmli18n-tmp.h:736 msgid "HP DeskJet 1200C" msgstr "" -#: src/main/xmli18n-tmp.h:685 +#: src/main/xmli18n-tmp.h:737 msgid "HP DeskJet 1220C" msgstr "" -#: src/main/xmli18n-tmp.h:686 +#: src/main/xmli18n-tmp.h:738 msgid "HP DeskJet 1600C" msgstr "" -#: src/main/xmli18n-tmp.h:687 +#: src/main/xmli18n-tmp.h:739 msgid "HP DeskJet 1600CM" msgstr "" -#: src/main/xmli18n-tmp.h:688 +#: src/main/xmli18n-tmp.h:740 msgid "HP DeskJet 2000" msgstr "" -#: src/main/xmli18n-tmp.h:689 +#: src/main/xmli18n-tmp.h:741 msgid "HP DeskJet 2500" msgstr "" -#: src/main/xmli18n-tmp.h:690 +#: src/main/xmli18n-tmp.h:742 msgid "HP DeskJet 2500CM" msgstr "" -#: src/main/xmli18n-tmp.h:691 +#: src/main/xmli18n-tmp.h:743 msgid "HP DeskJet 340C" msgstr "" -#: src/main/xmli18n-tmp.h:692 +#: src/main/xmli18n-tmp.h:744 msgid "HP DeskJet 3810" msgstr "" -#: src/main/xmli18n-tmp.h:693 +#: src/main/xmli18n-tmp.h:745 msgid "HP DeskJet 3816" msgstr "" -#: src/main/xmli18n-tmp.h:694 +#: src/main/xmli18n-tmp.h:746 msgid "HP DeskJet 3820" msgstr "" -#: src/main/xmli18n-tmp.h:695 +#: src/main/xmli18n-tmp.h:747 msgid "HP DeskJet 3822" msgstr "" -#: src/main/xmli18n-tmp.h:696 +#: src/main/xmli18n-tmp.h:748 msgid "HP LaserJet 2" msgstr "" -#: src/main/xmli18n-tmp.h:697 +#: src/main/xmli18n-tmp.h:749 msgid "HP LaserJet 2D" msgstr "" -#: src/main/xmli18n-tmp.h:698 +#: src/main/xmli18n-tmp.h:750 msgid "HP LaserJet 2P Plus" msgstr "" -#: src/main/xmli18n-tmp.h:699 +#: src/main/xmli18n-tmp.h:751 msgid "HP LaserJet 2P" msgstr "" -#: src/main/xmli18n-tmp.h:700 +#: src/main/xmli18n-tmp.h:752 msgid "HP LaserJet 3" msgstr "" -#: src/main/xmli18n-tmp.h:701 +#: src/main/xmli18n-tmp.h:753 msgid "HP LaserJet 3D" msgstr "" -#: src/main/xmli18n-tmp.h:702 +#: src/main/xmli18n-tmp.h:754 msgid "HP LaserJet 3P w/ PCL5" msgstr "" -#: src/main/xmli18n-tmp.h:703 +#: src/main/xmli18n-tmp.h:755 msgid "HP LaserJet 3P w/PS" msgstr "" -#: src/main/xmli18n-tmp.h:704 +#: src/main/xmli18n-tmp.h:756 msgid "HP LaserJet 4 Plus" msgstr "" -#: src/main/xmli18n-tmp.h:705 +#: src/main/xmli18n-tmp.h:757 msgid "HP LaserJet 4" msgstr "" -#: src/main/xmli18n-tmp.h:706 +#: src/main/xmli18n-tmp.h:758 msgid "HP LaserJet 4L" msgstr "" -#: src/main/xmli18n-tmp.h:707 +#: src/main/xmli18n-tmp.h:759 msgid "HP LaserJet 4M" msgstr "" -#: src/main/xmli18n-tmp.h:708 +#: src/main/xmli18n-tmp.h:760 msgid "HP LaserJet 4ML" msgstr "" -#: src/main/xmli18n-tmp.h:709 +#: src/main/xmli18n-tmp.h:761 msgid "HP LaserJet 4P" msgstr "" -#: src/main/xmli18n-tmp.h:710 +#: src/main/xmli18n-tmp.h:762 msgid "HP LaserJet 4Si" msgstr "" -#: src/main/xmli18n-tmp.h:711 +#: src/main/xmli18n-tmp.h:763 msgid "HP LaserJet 4V" msgstr "" -#: src/main/xmli18n-tmp.h:712 +#: src/main/xmli18n-tmp.h:764 msgid "HP LaserJet 5" msgstr "" -#: src/main/xmli18n-tmp.h:713 +#: src/main/xmli18n-tmp.h:765 msgid "HP LaserJet 5L" msgstr "" -#: src/main/xmli18n-tmp.h:714 +#: src/main/xmli18n-tmp.h:766 msgid "HP LaserJet 5M" msgstr "" -#: src/main/xmli18n-tmp.h:715 +#: src/main/xmli18n-tmp.h:767 msgid "HP LaserJet 5MP" msgstr "" -#: src/main/xmli18n-tmp.h:716 +#: src/main/xmli18n-tmp.h:768 msgid "HP LaserJet 5P" msgstr "" -#: src/main/xmli18n-tmp.h:717 +#: src/main/xmli18n-tmp.h:769 msgid "HP LaserJet 5Si" msgstr "" -#: src/main/xmli18n-tmp.h:718 +#: src/main/xmli18n-tmp.h:770 msgid "HP LaserJet 6" msgstr "" -#: src/main/xmli18n-tmp.h:719 +#: src/main/xmli18n-tmp.h:771 msgid "HP LaserJet 6L" msgstr "" -#: src/main/xmli18n-tmp.h:720 +#: src/main/xmli18n-tmp.h:772 msgid "HP LaserJet 6MP" msgstr "" -#: src/main/xmli18n-tmp.h:721 +#: src/main/xmli18n-tmp.h:773 msgid "HP LaserJet 6P" msgstr "" -#: src/main/xmli18n-tmp.h:722 +#: src/main/xmli18n-tmp.h:774 msgid "HP LaserJet 1010" msgstr "" -#: src/main/xmli18n-tmp.h:723 +#: src/main/xmli18n-tmp.h:775 msgid "HP LaserJet 1012" msgstr "" -#: src/main/xmli18n-tmp.h:724 +#: src/main/xmli18n-tmp.h:776 msgid "HP LaserJet 1015" msgstr "" -#: src/main/xmli18n-tmp.h:725 +#: src/main/xmli18n-tmp.h:777 msgid "HP LaserJet 1022" msgstr "" -#: src/main/xmli18n-tmp.h:726 +#: src/main/xmli18n-tmp.h:778 msgid "HP LaserJet 1100" msgstr "" -#: src/main/xmli18n-tmp.h:727 +#: src/main/xmli18n-tmp.h:779 msgid "HP LaserJet 1100A" msgstr "" -#: src/main/xmli18n-tmp.h:728 +#: src/main/xmli18n-tmp.h:780 msgid "HP LaserJet 1150" msgstr "" -#: src/main/xmli18n-tmp.h:729 +#: src/main/xmli18n-tmp.h:781 msgid "HP LaserJet 1200" msgstr "" -#: src/main/xmli18n-tmp.h:730 +#: src/main/xmli18n-tmp.h:782 msgid "HP LaserJet 1220" msgstr "" -#: src/main/xmli18n-tmp.h:731 +#: src/main/xmli18n-tmp.h:783 msgid "HP LaserJet 1300" msgstr "" -#: src/main/xmli18n-tmp.h:732 +#: src/main/xmli18n-tmp.h:784 msgid "HP LaserJet 2100" msgstr "" -#: src/main/xmli18n-tmp.h:733 +#: src/main/xmli18n-tmp.h:785 msgid "HP LaserJet 2100M" msgstr "" -#: src/main/xmli18n-tmp.h:734 +#: src/main/xmli18n-tmp.h:786 msgid "HP LaserJet 2200" msgstr "" -#: src/main/xmli18n-tmp.h:735 +#: src/main/xmli18n-tmp.h:787 msgid "HP LaserJet 2300" msgstr "" -#: src/main/xmli18n-tmp.h:736 +#: src/main/xmli18n-tmp.h:788 msgid "HP LaserJet 3200" msgstr "" -#: src/main/xmli18n-tmp.h:737 +#: src/main/xmli18n-tmp.h:789 msgid "HP LaserJet 3200m" msgstr "" -#: src/main/xmli18n-tmp.h:738 +#: src/main/xmli18n-tmp.h:790 msgid "HP LaserJet 3200se" msgstr "" -#: src/main/xmli18n-tmp.h:739 +#: src/main/xmli18n-tmp.h:791 msgid "HP LaserJet 3300 MFP" msgstr "" -#: src/main/xmli18n-tmp.h:740 +#: src/main/xmli18n-tmp.h:792 msgid "HP LaserJet 3310 MFP" msgstr "" -#: src/main/xmli18n-tmp.h:741 +#: src/main/xmli18n-tmp.h:793 msgid "HP LaserJet 3320 MFP" msgstr "" -#: src/main/xmli18n-tmp.h:742 +#: src/main/xmli18n-tmp.h:794 msgid "HP LaserJet 3320N MFP" msgstr "" -#: src/main/xmli18n-tmp.h:743 +#: src/main/xmli18n-tmp.h:795 msgid "HP LaserJet 3330 MFP" msgstr "" -#: src/main/xmli18n-tmp.h:744 +#: src/main/xmli18n-tmp.h:796 msgid "HP LaserJet 4000" msgstr "" -#: src/main/xmli18n-tmp.h:745 +#: src/main/xmli18n-tmp.h:797 msgid "HP LaserJet 4050" msgstr "" -#: src/main/xmli18n-tmp.h:746 +#: src/main/xmli18n-tmp.h:798 msgid "HP LaserJet 4100" msgstr "" -#: src/main/xmli18n-tmp.h:747 +#: src/main/xmli18n-tmp.h:799 msgid "HP LaserJet 4200" msgstr "" -#: src/main/xmli18n-tmp.h:748 +#: src/main/xmli18n-tmp.h:800 msgid "HP LaserJet 4300" msgstr "" -#: src/main/xmli18n-tmp.h:749 +#: src/main/xmli18n-tmp.h:801 msgid "HP LaserJet 5000" msgstr "" -#: src/main/xmli18n-tmp.h:750 +#: src/main/xmli18n-tmp.h:802 msgid "HP LaserJet 5100" msgstr "" -#: src/main/xmli18n-tmp.h:751 +#: src/main/xmli18n-tmp.h:803 msgid "HP LaserJet 8000" msgstr "" -#: src/main/xmli18n-tmp.h:752 +#: src/main/xmli18n-tmp.h:804 msgid "HP LaserJet 8100" msgstr "" -#: src/main/xmli18n-tmp.h:753 +#: src/main/xmli18n-tmp.h:805 msgid "HP LaserJet 8150" msgstr "" -#: src/main/xmli18n-tmp.h:754 +#: src/main/xmli18n-tmp.h:806 msgid "HP LaserJet 9000" msgstr "" -#: src/main/xmli18n-tmp.h:755 +#: src/main/xmli18n-tmp.h:807 msgid "HP Mopier 240" msgstr "" -#: src/main/xmli18n-tmp.h:756 +#: src/main/xmli18n-tmp.h:808 msgid "HP Mopier 320" msgstr "" -#: src/main/xmli18n-tmp.h:757 +#: src/main/xmli18n-tmp.h:809 msgid "HP OfficeJet 300" msgstr "" -#: src/main/xmli18n-tmp.h:758 +#: src/main/xmli18n-tmp.h:810 msgid "HP OfficeJet 330" msgstr "" -#: src/main/xmli18n-tmp.h:759 +#: src/main/xmli18n-tmp.h:811 msgid "HP OfficeJet 350" msgstr "" -#: src/main/xmli18n-tmp.h:760 +#: src/main/xmli18n-tmp.h:812 msgid "HP OfficeJet 500" msgstr "" -#: src/main/xmli18n-tmp.h:761 +#: src/main/xmli18n-tmp.h:813 msgid "HP OfficeJet 520" msgstr "" -#: src/main/xmli18n-tmp.h:762 +#: src/main/xmli18n-tmp.h:814 msgid "HP OfficeJet 570" msgstr "" -#: src/main/xmli18n-tmp.h:763 +#: src/main/xmli18n-tmp.h:815 msgid "HP OfficeJet 580" msgstr "" -#: src/main/xmli18n-tmp.h:764 +#: src/main/xmli18n-tmp.h:816 msgid "HP OfficeJet 590" msgstr "" -#: src/main/xmli18n-tmp.h:765 +#: src/main/xmli18n-tmp.h:817 msgid "HP OfficeJet 600" msgstr "" -#: src/main/xmli18n-tmp.h:766 +#: src/main/xmli18n-tmp.h:818 msgid "HP OfficeJet 610" msgstr "" -#: src/main/xmli18n-tmp.h:767 +#: src/main/xmli18n-tmp.h:819 msgid "HP OfficeJet 625" msgstr "" -#: src/main/xmli18n-tmp.h:768 +#: src/main/xmli18n-tmp.h:820 msgid "HP OfficeJet 630" msgstr "" -#: src/main/xmli18n-tmp.h:769 +#: src/main/xmli18n-tmp.h:821 msgid "HP OfficeJet 635" msgstr "" -#: src/main/xmli18n-tmp.h:770 +#: src/main/xmli18n-tmp.h:822 msgid "HP OfficeJet 700" msgstr "" -#: src/main/xmli18n-tmp.h:771 +#: src/main/xmli18n-tmp.h:823 msgid "HP OfficeJet 710" msgstr "" -#: src/main/xmli18n-tmp.h:772 +#: src/main/xmli18n-tmp.h:824 msgid "HP OfficeJet 720" msgstr "" -#: src/main/xmli18n-tmp.h:773 +#: src/main/xmli18n-tmp.h:825 msgid "HP OfficeJet 725" msgstr "" -#: src/main/xmli18n-tmp.h:774 +#: src/main/xmli18n-tmp.h:826 msgid "HP OfficeJet 5105" msgstr "" -#: src/main/xmli18n-tmp.h:775 +#: src/main/xmli18n-tmp.h:827 msgid "HP OfficeJet 5110" msgstr "" -#: src/main/xmli18n-tmp.h:776 +#: src/main/xmli18n-tmp.h:828 msgid "HP OfficeJet 5110xi" msgstr "" -#: src/main/xmli18n-tmp.h:777 +#: src/main/xmli18n-tmp.h:829 msgid "HP OfficeJet 6105" msgstr "" -#: src/main/xmli18n-tmp.h:778 +#: src/main/xmli18n-tmp.h:830 msgid "HP OfficeJet 6110" msgstr "" -#: src/main/xmli18n-tmp.h:779 +#: src/main/xmli18n-tmp.h:831 msgid "HP OfficeJet 7110" msgstr "" -#: src/main/xmli18n-tmp.h:780 +#: src/main/xmli18n-tmp.h:832 msgid "HP OfficeJet 7130" msgstr "" -#: src/main/xmli18n-tmp.h:781 +#: src/main/xmli18n-tmp.h:833 msgid "HP OfficeJet 7140" msgstr "" -#: src/main/xmli18n-tmp.h:782 +#: src/main/xmli18n-tmp.h:834 msgid "HP OfficeJet D125" msgstr "" -#: src/main/xmli18n-tmp.h:783 +#: src/main/xmli18n-tmp.h:835 msgid "HP OfficeJet D135" msgstr "" -#: src/main/xmli18n-tmp.h:784 +#: src/main/xmli18n-tmp.h:836 msgid "HP OfficeJet D145" msgstr "" -#: src/main/xmli18n-tmp.h:785 +#: src/main/xmli18n-tmp.h:837 msgid "HP OfficeJet D155" msgstr "" -#: src/main/xmli18n-tmp.h:786 +#: src/main/xmli18n-tmp.h:838 msgid "HP OfficeJet G55" msgstr "" -#: src/main/xmli18n-tmp.h:787 +#: src/main/xmli18n-tmp.h:839 msgid "HP OfficeJet G85" msgstr "" -#: src/main/xmli18n-tmp.h:788 +#: src/main/xmli18n-tmp.h:840 msgid "HP OfficeJet G95" msgstr "" -#: src/main/xmli18n-tmp.h:789 +#: src/main/xmli18n-tmp.h:841 msgid "HP OfficeJet K60" msgstr "" -#: src/main/xmli18n-tmp.h:790 +#: src/main/xmli18n-tmp.h:842 msgid "HP OfficeJet K60xi" msgstr "" -#: src/main/xmli18n-tmp.h:791 +#: src/main/xmli18n-tmp.h:843 msgid "HP OfficeJet K80" msgstr "" -#: src/main/xmli18n-tmp.h:792 +#: src/main/xmli18n-tmp.h:844 msgid "HP OfficeJet K80xi" msgstr "" -#: src/main/xmli18n-tmp.h:793 +#: src/main/xmli18n-tmp.h:845 msgid "HP OfficeJet LX" msgstr "" -#: src/main/xmli18n-tmp.h:794 +#: src/main/xmli18n-tmp.h:846 msgid "HP OfficeJet Pro 1150C" msgstr "" -#: src/main/xmli18n-tmp.h:795 +#: src/main/xmli18n-tmp.h:847 msgid "HP OfficeJet Pro 1170C" msgstr "" -#: src/main/xmli18n-tmp.h:796 +#: src/main/xmli18n-tmp.h:848 msgid "HP OfficeJet Pro 1175C" msgstr "" -#: src/main/xmli18n-tmp.h:797 +#: src/main/xmli18n-tmp.h:849 msgid "HP OfficeJet R40" msgstr "" -#: src/main/xmli18n-tmp.h:798 +#: src/main/xmli18n-tmp.h:850 msgid "HP OfficeJet R45" msgstr "" -#: src/main/xmli18n-tmp.h:799 +#: src/main/xmli18n-tmp.h:851 msgid "HP OfficeJet R60" msgstr "" -#: src/main/xmli18n-tmp.h:800 +#: src/main/xmli18n-tmp.h:852 msgid "HP OfficeJet R65" msgstr "" -#: src/main/xmli18n-tmp.h:801 +#: src/main/xmli18n-tmp.h:853 msgid "HP OfficeJet R80" msgstr "" -#: src/main/xmli18n-tmp.h:802 +#: src/main/xmli18n-tmp.h:854 msgid "HP OfficeJet T45" msgstr "" -#: src/main/xmli18n-tmp.h:803 +#: src/main/xmli18n-tmp.h:855 msgid "HP OfficeJet T65" msgstr "" -#: src/main/xmli18n-tmp.h:804 +#: src/main/xmli18n-tmp.h:856 msgid "HP OfficeJet V40" msgstr "" -#: src/main/xmli18n-tmp.h:805 +#: src/main/xmli18n-tmp.h:857 msgid "HP OfficeJet V40xi" msgstr "" -#: src/main/xmli18n-tmp.h:806 +#: src/main/xmli18n-tmp.h:858 msgid "HP OfficeJet" msgstr "" -#: src/main/xmli18n-tmp.h:807 +#: src/main/xmli18n-tmp.h:859 msgid "HP PSC 370" msgstr "" -#: src/main/xmli18n-tmp.h:808 +#: src/main/xmli18n-tmp.h:860 msgid "HP PSC 380" msgstr "" -#: src/main/xmli18n-tmp.h:809 +#: src/main/xmli18n-tmp.h:861 msgid "HP PSC 500" msgstr "" -#: src/main/xmli18n-tmp.h:810 +#: src/main/xmli18n-tmp.h:862 msgid "HP PSC 750" msgstr "" -#: src/main/xmli18n-tmp.h:811 +#: src/main/xmli18n-tmp.h:863 msgid "HP PSC 950" msgstr "" -#: src/main/xmli18n-tmp.h:812 +#: src/main/xmli18n-tmp.h:864 msgid "HP PSC 950xi" msgstr "" -#: src/main/xmli18n-tmp.h:813 +#: src/main/xmli18n-tmp.h:865 msgid "HP PSC 2110" msgstr "" -#: src/main/xmli18n-tmp.h:814 +#: src/main/xmli18n-tmp.h:866 msgid "HP PSC 2150" msgstr "" -#: src/main/xmli18n-tmp.h:815 +#: src/main/xmli18n-tmp.h:867 msgid "HP PSC 2210" msgstr "" -#: src/main/xmli18n-tmp.h:816 +#: src/main/xmli18n-tmp.h:868 msgid "HP PhotoSmart 7150" msgstr "" -#: src/main/xmli18n-tmp.h:817 +#: src/main/xmli18n-tmp.h:869 msgid "HP PhotoSmart 7345" msgstr "" -#: src/main/xmli18n-tmp.h:818 +#: src/main/xmli18n-tmp.h:870 msgid "HP PhotoSmart 7350" msgstr "" -#: src/main/xmli18n-tmp.h:819 +#: src/main/xmli18n-tmp.h:871 msgid "HP PhotoSmart 7550" msgstr "" -#: src/main/xmli18n-tmp.h:820 +#: src/main/xmli18n-tmp.h:872 msgid "HP PhotoSmart P100" msgstr "" -#: src/main/xmli18n-tmp.h:821 +#: src/main/xmli18n-tmp.h:873 msgid "HP PhotoSmart P130" msgstr "" -#: src/main/xmli18n-tmp.h:822 +#: src/main/xmli18n-tmp.h:874 msgid "HP PhotoSmart P230" msgstr "" -#: src/main/xmli18n-tmp.h:823 +#: src/main/xmli18n-tmp.h:875 msgid "HP PhotoSmart P1000" msgstr "" -#: src/main/xmli18n-tmp.h:824 +#: src/main/xmli18n-tmp.h:876 msgid "HP PhotoSmart P1100" msgstr "" -#: src/main/xmli18n-tmp.h:825 +#: src/main/xmli18n-tmp.h:877 msgid "HP PhotoSmart P1115" msgstr "" -#: src/main/xmli18n-tmp.h:826 +#: src/main/xmli18n-tmp.h:878 msgid "HP PhotoSmart P1215" msgstr "" -#: src/main/xmli18n-tmp.h:827 +#: src/main/xmli18n-tmp.h:879 msgid "HP PhotoSmart P1218" msgstr "" -#: src/main/xmli18n-tmp.h:828 +#: src/main/xmli18n-tmp.h:880 msgid "HP PhotoSmart P1315" msgstr "" -#: src/main/xmli18n-tmp.h:829 +#: src/main/xmli18n-tmp.h:881 #, fuzzy msgid "HP e-printer e20" msgstr "Skrivernavn:" -#: src/main/xmli18n-tmp.h:830 +#: src/main/xmli18n-tmp.h:882 msgid "IBM 4019" msgstr "" -#: src/main/xmli18n-tmp.h:831 +#: src/main/xmli18n-tmp.h:883 msgid "IBM 4029 030 LaserPrinter 10" msgstr "" -#: src/main/xmli18n-tmp.h:832 +#: src/main/xmli18n-tmp.h:884 msgid "IBM 4312" msgstr "" -#: src/main/xmli18n-tmp.h:833 +#: src/main/xmli18n-tmp.h:885 msgid "IBM Infoprint 12" msgstr "" -#: src/main/xmli18n-tmp.h:834 +#: src/main/xmli18n-tmp.h:886 msgid "IBM Page Printer 3112" msgstr "" -#: src/main/xmli18n-tmp.h:835 +#: src/main/xmli18n-tmp.h:887 msgid "Infotec 4651 MF" msgstr "" -#: src/main/xmli18n-tmp.h:836 +#: src/main/xmli18n-tmp.h:888 msgid "Kyocera F-1010" msgstr "" -#: src/main/xmli18n-tmp.h:837 +#: src/main/xmli18n-tmp.h:889 msgid "Kyocera FS-600 - KPDL-2" msgstr "" -#: src/main/xmli18n-tmp.h:838 +#: src/main/xmli18n-tmp.h:890 msgid "Kyocera FS-600" msgstr "" -#: src/main/xmli18n-tmp.h:839 +#: src/main/xmli18n-tmp.h:891 msgid "Kyocera FS-680" msgstr "" -#: src/main/xmli18n-tmp.h:840 +#: src/main/xmli18n-tmp.h:892 msgid "Kyocera FS-800" msgstr "" -#: src/main/xmli18n-tmp.h:841 +#: src/main/xmli18n-tmp.h:893 msgid "Kyocera FS-1000" msgstr "" -#: src/main/xmli18n-tmp.h:842 +#: src/main/xmli18n-tmp.h:894 msgid "Kyocera FS-1000+" msgstr "" -#: src/main/xmli18n-tmp.h:843 +#: src/main/xmli18n-tmp.h:895 msgid "Kyocera FS-1010" msgstr "" -#: src/main/xmli18n-tmp.h:844 +#: src/main/xmli18n-tmp.h:896 msgid "Kyocera FS-1050" msgstr "" -#: src/main/xmli18n-tmp.h:845 +#: src/main/xmli18n-tmp.h:897 msgid "Kyocera FS-1200" msgstr "" -#: src/main/xmli18n-tmp.h:846 +#: src/main/xmli18n-tmp.h:898 msgid "Kyocera FS-1600" msgstr "" -#: src/main/xmli18n-tmp.h:847 +#: src/main/xmli18n-tmp.h:899 msgid "Kyocera FS-1600+" msgstr "" -#: src/main/xmli18n-tmp.h:848 +#: src/main/xmli18n-tmp.h:900 msgid "Kyocera FS-1700" msgstr "" -#: src/main/xmli18n-tmp.h:849 +#: src/main/xmli18n-tmp.h:901 msgid "Kyocera FS-1700+" msgstr "" -#: src/main/xmli18n-tmp.h:850 +#: src/main/xmli18n-tmp.h:902 msgid "Kyocera FS-1750" msgstr "" -#: src/main/xmli18n-tmp.h:851 +#: src/main/xmli18n-tmp.h:903 msgid "Kyocera FS-1800" msgstr "" -#: src/main/xmli18n-tmp.h:852 +#: src/main/xmli18n-tmp.h:904 msgid "Kyocera FS-1800+" msgstr "" -#: src/main/xmli18n-tmp.h:853 +#: src/main/xmli18n-tmp.h:905 msgid "Kyocera FS-1900" msgstr "" -#: src/main/xmli18n-tmp.h:854 +#: src/main/xmli18n-tmp.h:906 msgid "Kyocera FS-3500" msgstr "" -#: src/main/xmli18n-tmp.h:855 +#: src/main/xmli18n-tmp.h:907 msgid "Kyocera FS-3600" msgstr "" -#: src/main/xmli18n-tmp.h:856 +#: src/main/xmli18n-tmp.h:908 msgid "Kyocera FS-3600+" msgstr "" -#: src/main/xmli18n-tmp.h:857 +#: src/main/xmli18n-tmp.h:909 msgid "Kyocera FS-3700" msgstr "" -#: src/main/xmli18n-tmp.h:858 +#: src/main/xmli18n-tmp.h:910 msgid "Kyocera FS-3700+" msgstr "" -#: src/main/xmli18n-tmp.h:859 +#: src/main/xmli18n-tmp.h:911 msgid "Kyocera FS-3750" msgstr "" -#: src/main/xmli18n-tmp.h:860 +#: src/main/xmli18n-tmp.h:912 msgid "Kyocera FS-3800" msgstr "" -#: src/main/xmli18n-tmp.h:861 +#: src/main/xmli18n-tmp.h:913 msgid "Kyocera FS-5800C" msgstr "" -#: src/main/xmli18n-tmp.h:862 +#: src/main/xmli18n-tmp.h:914 msgid "Kyocera FS-5900C" msgstr "" -#: src/main/xmli18n-tmp.h:863 +#: src/main/xmli18n-tmp.h:915 msgid "Kyocera FS-6500" msgstr "" -#: src/main/xmli18n-tmp.h:864 +#: src/main/xmli18n-tmp.h:916 msgid "Kyocera FS-6500+" msgstr "" -#: src/main/xmli18n-tmp.h:865 +#: src/main/xmli18n-tmp.h:917 msgid "Kyocera FS-6700" msgstr "" -#: src/main/xmli18n-tmp.h:866 +#: src/main/xmli18n-tmp.h:918 msgid "Kyocera FS-7000" msgstr "" -#: src/main/xmli18n-tmp.h:867 +#: src/main/xmli18n-tmp.h:919 msgid "Kyocera FS-7000+" msgstr "" -#: src/main/xmli18n-tmp.h:868 +#: src/main/xmli18n-tmp.h:920 msgid "Kyocera FS-8000C" msgstr "" -#: src/main/xmli18n-tmp.h:869 +#: src/main/xmli18n-tmp.h:921 msgid "Kyocera FS-9000" msgstr "" -#: src/main/xmli18n-tmp.h:870 +#: src/main/xmli18n-tmp.h:922 msgid "Kyocera FS-9100DN" msgstr "" -#: src/main/xmli18n-tmp.h:871 +#: src/main/xmli18n-tmp.h:923 msgid "Kyocera FS-9500DN" msgstr "" -#: src/main/xmli18n-tmp.h:872 +#: src/main/xmli18n-tmp.h:924 msgid "Kyocera KM-1530" msgstr "" -#: src/main/xmli18n-tmp.h:873 +#: src/main/xmli18n-tmp.h:925 msgid "Kyocera KM-1810" msgstr "" -#: src/main/xmli18n-tmp.h:874 +#: src/main/xmli18n-tmp.h:926 msgid "Kyocera KM-2030" msgstr "" -#: src/main/xmli18n-tmp.h:875 +#: src/main/xmli18n-tmp.h:927 msgid "Kyocera KM-2530" msgstr "" -#: src/main/xmli18n-tmp.h:876 +#: src/main/xmli18n-tmp.h:928 msgid "Kyocera KM-3530" msgstr "" -#: src/main/xmli18n-tmp.h:877 +#: src/main/xmli18n-tmp.h:929 msgid "Kyocera KM-4230" msgstr "" -#: src/main/xmli18n-tmp.h:878 +#: src/main/xmli18n-tmp.h:930 msgid "Kyocera KM-4530" msgstr "" -#: src/main/xmli18n-tmp.h:879 +#: src/main/xmli18n-tmp.h:931 msgid "Kyocera KM-5230" msgstr "" -#: src/main/xmli18n-tmp.h:880 +#: src/main/xmli18n-tmp.h:932 msgid "Kyocera KM-5530" msgstr "" -#: src/main/xmli18n-tmp.h:881 +#: src/main/xmli18n-tmp.h:933 msgid "Kyocera KM-6230" msgstr "" -#: src/main/xmli18n-tmp.h:882 +#: src/main/xmli18n-tmp.h:934 msgid "Lexmark 4076" msgstr "" -#: src/main/xmli18n-tmp.h:883 +#: src/main/xmli18n-tmp.h:935 msgid "Lexmark Optra E" msgstr "" -#: src/main/xmli18n-tmp.h:884 +#: src/main/xmli18n-tmp.h:936 msgid "Lexmark Optra E+" msgstr "" -#: src/main/xmli18n-tmp.h:885 +#: src/main/xmli18n-tmp.h:937 msgid "Lexmark Optra E220" msgstr "" -#: src/main/xmli18n-tmp.h:886 +#: src/main/xmli18n-tmp.h:938 msgid "Lexmark Valuewriter 300" msgstr "" -#: src/main/xmli18n-tmp.h:887 +#: src/main/xmli18n-tmp.h:939 msgid "Minolta PagePro 6" msgstr "" -#: src/main/xmli18n-tmp.h:888 +#: src/main/xmli18n-tmp.h:940 msgid "Minolta PagePro 6e" msgstr "" -#: src/main/xmli18n-tmp.h:889 +#: src/main/xmli18n-tmp.h:941 msgid "Minolta PagePro 6ex" msgstr "" -#: src/main/xmli18n-tmp.h:890 +#: src/main/xmli18n-tmp.h:942 msgid "Minolta PagePro 8" msgstr "" -#: src/main/xmli18n-tmp.h:891 +#: src/main/xmli18n-tmp.h:943 msgid "Minolta PagePro 8L" msgstr "" -#: src/main/xmli18n-tmp.h:892 +#: src/main/xmli18n-tmp.h:944 msgid "Minolta PagePro 1100" msgstr "" -#: src/main/xmli18n-tmp.h:893 +#: src/main/xmli18n-tmp.h:945 msgid "NEC SuperScript 660i" msgstr "" -#: src/main/xmli18n-tmp.h:894 +#: src/main/xmli18n-tmp.h:946 msgid "NEC SuperScript 860" msgstr "" -#: src/main/xmli18n-tmp.h:895 +#: src/main/xmli18n-tmp.h:947 msgid "NEC SuperScript 870" msgstr "" -#: src/main/xmli18n-tmp.h:896 +#: src/main/xmli18n-tmp.h:948 msgid "NEC SuperScript 1260" msgstr "" -#: src/main/xmli18n-tmp.h:897 +#: src/main/xmli18n-tmp.h:949 msgid "NEC SuperScript 1400" msgstr "" -#: src/main/xmli18n-tmp.h:898 +#: src/main/xmli18n-tmp.h:950 msgid "NEC SuperScript 1800" msgstr "" -#: src/main/xmli18n-tmp.h:899 +#: src/main/xmli18n-tmp.h:951 msgid "Okidata OL400" msgstr "" -#: src/main/xmli18n-tmp.h:900 +#: src/main/xmli18n-tmp.h:952 msgid "Okidata OL400e" msgstr "" -#: src/main/xmli18n-tmp.h:901 +#: src/main/xmli18n-tmp.h:953 msgid "Okidata OL400ex" msgstr "" -#: src/main/xmli18n-tmp.h:902 +#: src/main/xmli18n-tmp.h:954 msgid "Okidata OL410e" msgstr "" -#: src/main/xmli18n-tmp.h:903 +#: src/main/xmli18n-tmp.h:955 msgid "Okidata OL600e" msgstr "" -#: src/main/xmli18n-tmp.h:904 +#: src/main/xmli18n-tmp.h:956 msgid "Okidata OL610e/S" msgstr "" -#: src/main/xmli18n-tmp.h:905 +#: src/main/xmli18n-tmp.h:957 msgid "Okidata OL800" msgstr "" -#: src/main/xmli18n-tmp.h:906 +#: src/main/xmli18n-tmp.h:958 msgid "Okidata OL810ex" msgstr "" -#: src/main/xmli18n-tmp.h:907 +#: src/main/xmli18n-tmp.h:959 msgid "Okidata Okipage 6e" msgstr "" -#: src/main/xmli18n-tmp.h:908 +#: src/main/xmli18n-tmp.h:960 msgid "Okidata Okipage 6ex" msgstr "" -#: src/main/xmli18n-tmp.h:909 +#: src/main/xmli18n-tmp.h:961 msgid "Okidata Okipage 8p" msgstr "" -#: src/main/xmli18n-tmp.h:910 +#: src/main/xmli18n-tmp.h:962 msgid "Okidata Okipage 10e" msgstr "" -#: src/main/xmli18n-tmp.h:911 +#: src/main/xmli18n-tmp.h:963 msgid "Okidata Okipage 10ex" msgstr "" -#: src/main/xmli18n-tmp.h:912 +#: src/main/xmli18n-tmp.h:964 msgid "Okidata Okipage 14ex" msgstr "" -#: src/main/xmli18n-tmp.h:913 +#: src/main/xmli18n-tmp.h:965 msgid "Okidata Super 6e" msgstr "" -#: src/main/xmli18n-tmp.h:914 +#: src/main/xmli18n-tmp.h:966 msgid "Olivetti JP350S" msgstr "" -#: src/main/xmli18n-tmp.h:915 +#: src/main/xmli18n-tmp.h:967 msgid "Olivetti PG 306" msgstr "" -#: src/main/xmli18n-tmp.h:916 +#: src/main/xmli18n-tmp.h:968 msgid "PCPI 1030" msgstr "" -#: src/main/xmli18n-tmp.h:917 +#: src/main/xmli18n-tmp.h:969 msgid "Panasonic KX-P4410" msgstr "" -#: src/main/xmli18n-tmp.h:918 +#: src/main/xmli18n-tmp.h:970 msgid "Panasonic KX-P4450" msgstr "" -#: src/main/xmli18n-tmp.h:919 +#: src/main/xmli18n-tmp.h:971 msgid "Panasonic KX-P6150" msgstr "" -#: src/main/xmli18n-tmp.h:920 +#: src/main/xmli18n-tmp.h:972 msgid "Panasonic KX-P6500" msgstr "" -#: src/main/xmli18n-tmp.h:921 +#: src/main/xmli18n-tmp.h:973 msgid "Raven LP-410" msgstr "" -#: src/main/xmli18n-tmp.h:922 +#: src/main/xmli18n-tmp.h:974 msgid "Ricoh Aficio 220" msgstr "" -#: src/main/xmli18n-tmp.h:923 +#: src/main/xmli18n-tmp.h:975 msgid "Ricoh Aficio 401" msgstr "" -#: src/main/xmli18n-tmp.h:924 +#: src/main/xmli18n-tmp.h:976 msgid "Ricoh Aficio 700" msgstr "" -#: src/main/xmli18n-tmp.h:925 +#: src/main/xmli18n-tmp.h:977 msgid "Samsung ML-85" msgstr "" -#: src/main/xmli18n-tmp.h:926 +#: src/main/xmli18n-tmp.h:978 msgid "Samsung ML-4600" msgstr "" -#: src/main/xmli18n-tmp.h:927 +#: src/main/xmli18n-tmp.h:979 msgid "Samsung ML-5000a" msgstr "" -#: src/main/xmli18n-tmp.h:928 +#: src/main/xmli18n-tmp.h:980 msgid "Samsung ML-6000" msgstr "" -#: src/main/xmli18n-tmp.h:929 +#: src/main/xmli18n-tmp.h:981 msgid "Samsung ML-6100" msgstr "" -#: src/main/xmli18n-tmp.h:930 +#: src/main/xmli18n-tmp.h:982 msgid "Samsung ML-7000" msgstr "" -#: src/main/xmli18n-tmp.h:931 +#: src/main/xmli18n-tmp.h:983 msgid "Samsung ML-7000N" msgstr "" -#: src/main/xmli18n-tmp.h:932 +#: src/main/xmli18n-tmp.h:984 msgid "Samsung ML-7000P" msgstr "" -#: src/main/xmli18n-tmp.h:933 +#: src/main/xmli18n-tmp.h:985 msgid "Samsung ML-7050" msgstr "" -#: src/main/xmli18n-tmp.h:934 +#: src/main/xmli18n-tmp.h:986 msgid "Samsung QL-5100A" msgstr "" -#: src/main/xmli18n-tmp.h:935 +#: src/main/xmli18n-tmp.h:987 msgid "Samsung QL-6050" msgstr "" -#: src/main/xmli18n-tmp.h:936 +#: src/main/xmli18n-tmp.h:988 msgid "Seiko SpeedJET 200" msgstr "" -#: src/main/xmli18n-tmp.h:937 +#: src/main/xmli18n-tmp.h:989 msgid "Sharp AR-161" msgstr "" -#: src/main/xmli18n-tmp.h:938 +#: src/main/xmli18n-tmp.h:990 msgid "Sharp AR-M257" msgstr "" -#: src/main/xmli18n-tmp.h:939 +#: src/main/xmli18n-tmp.h:991 msgid "Sony IJP-V100" msgstr "" -#: src/main/xmli18n-tmp.h:940 +#: src/main/xmli18n-tmp.h:992 msgid "Star LS-04" msgstr "" -#: src/main/xmli18n-tmp.h:941 +#: src/main/xmli18n-tmp.h:993 #, fuzzy msgid "Star LaserPrinter 8" msgstr "Sett opp skriver" -#: src/main/xmli18n-tmp.h:942 +#: src/main/xmli18n-tmp.h:994 msgid "Tally MT908" msgstr "" -#: src/main/xmli18n-tmp.h:943 +#: src/main/xmli18n-tmp.h:995 msgid "Xerox Able 1406" msgstr "" -#: src/main/xmli18n-tmp.h:944 +#: src/main/xmli18n-tmp.h:996 msgid "Xerox DocuPrint 4508" msgstr "" -#: src/main/xmli18n-tmp.h:945 +#: src/main/xmli18n-tmp.h:997 msgid "Xerox DocuPrint C20" msgstr "" -#: src/main/xmli18n-tmp.h:946 +#: src/main/xmli18n-tmp.h:998 msgid "Xerox DocuPrint N4512" msgstr "" -#: src/main/xmli18n-tmp.h:947 +#: src/main/xmli18n-tmp.h:999 msgid "Xerox DocuPrint N4512PS" msgstr "" -#: src/main/xmli18n-tmp.h:948 +#: src/main/xmli18n-tmp.h:1000 msgid "Xerox DocuPrint P12" msgstr "" -#: src/main/xmli18n-tmp.h:949 +#: src/main/xmli18n-tmp.h:1001 msgid "Xerox DocuPrint P1202" msgstr "" -#: src/main/xmli18n-tmp.h:950 +#: src/main/xmli18n-tmp.h:1002 msgid "Xerox DocuPrint P8e" msgstr "" -#: src/main/xmli18n-tmp.h:951 +#: src/main/xmli18n-tmp.h:1003 msgid "Xerox Document Centre 400" msgstr "" -#: src/main/xmli18n-tmp.h:952 +#: src/main/xmli18n-tmp.h:1004 msgid "Xerox WorkCentre M118" msgstr "" -#: src/main/xmli18n-tmp.h:953 +#: src/main/xmli18n-tmp.h:1005 msgid "Compaq IJ1200" msgstr "" -#: src/main/xmli18n-tmp.h:954 +#: src/main/xmli18n-tmp.h:1006 msgid "Lexmark X73" msgstr "" -#: src/main/xmli18n-tmp.h:955 +#: src/main/xmli18n-tmp.h:1007 msgid "Lexmark Z42" msgstr "" -#: src/main/xmli18n-tmp.h:956 +#: src/main/xmli18n-tmp.h:1008 msgid "Lexmark Z43" msgstr "" -#: src/main/xmli18n-tmp.h:957 +#: src/main/xmli18n-tmp.h:1009 msgid "Lexmark Z52" msgstr "" -#: src/main/xmli18n-tmp.h:958 +#: src/main/xmli18n-tmp.h:1010 msgid "Lexmark Z53" msgstr "" -#: src/main/xmli18n-tmp.h:959 +#: src/main/xmli18n-tmp.h:1011 msgid "Olympus P-10" msgstr "" -#: src/main/xmli18n-tmp.h:960 +#: src/main/xmli18n-tmp.h:1012 msgid "Olympus P-11" msgstr "" -#: src/main/xmli18n-tmp.h:961 +#: src/main/xmli18n-tmp.h:1013 msgid "Olympus P-200" msgstr "" -#: src/main/xmli18n-tmp.h:962 +#: src/main/xmli18n-tmp.h:1014 msgid "Olympus P-300" msgstr "" -#: src/main/xmli18n-tmp.h:963 +#: src/main/xmli18n-tmp.h:1015 msgid "Olympus P-300E" msgstr "" -#: src/main/xmli18n-tmp.h:964 +#: src/main/xmli18n-tmp.h:1016 msgid "Olympus P-300U" msgstr "" -#: src/main/xmli18n-tmp.h:965 +#: src/main/xmli18n-tmp.h:1017 msgid "Olympus P-330E" msgstr "" -#: src/main/xmli18n-tmp.h:966 +#: src/main/xmli18n-tmp.h:1018 msgid "Olympus P-330NE" msgstr "" -#: src/main/xmli18n-tmp.h:967 +#: src/main/xmli18n-tmp.h:1019 msgid "Olympus P-400" msgstr "" -#: src/main/xmli18n-tmp.h:968 +#: src/main/xmli18n-tmp.h:1020 msgid "Olympus P-440" msgstr "" -#: src/main/xmli18n-tmp.h:969 +#: src/main/xmli18n-tmp.h:1021 msgid "Olympus P-S100" msgstr "" -#: src/main/xmli18n-tmp.h:970 +#: src/main/xmli18n-tmp.h:1022 msgid "Canon CP-10" msgstr "" -#: src/main/xmli18n-tmp.h:971 +#: src/main/xmli18n-tmp.h:1023 msgid "Canon CP-100" msgstr "" -#: src/main/xmli18n-tmp.h:972 +#: src/main/xmli18n-tmp.h:1024 msgid "Canon CP-200" msgstr "" -#: src/main/xmli18n-tmp.h:973 +#: src/main/xmli18n-tmp.h:1025 msgid "Canon CP-220" msgstr "" -#: src/main/xmli18n-tmp.h:974 +#: src/main/xmli18n-tmp.h:1026 msgid "Canon CP-300" msgstr "" -#: src/main/xmli18n-tmp.h:975 +#: src/main/xmli18n-tmp.h:1027 msgid "Canon CP-330" msgstr "" -#: src/main/xmli18n-tmp.h:976 +#: src/main/xmli18n-tmp.h:1028 msgid "Canon SELPHY-CP-400" msgstr "" -#: src/main/xmli18n-tmp.h:977 +#: src/main/xmli18n-tmp.h:1029 msgid "Canon SELPHY-CP-500" msgstr "" -#: src/main/xmli18n-tmp.h:978 +#: src/main/xmli18n-tmp.h:1030 msgid "Canon SELPHY-CP-510" msgstr "" -#: src/main/xmli18n-tmp.h:979 +#: src/main/xmli18n-tmp.h:1031 msgid "Canon SELPHY-CP-600" msgstr "" -#: src/main/xmli18n-tmp.h:980 +#: src/main/xmli18n-tmp.h:1032 msgid "Canon SELPHY-CP-710" msgstr "" -#: src/main/xmli18n-tmp.h:981 +#: src/main/xmli18n-tmp.h:1033 msgid "Canon SELPHY-CP-720" msgstr "" -#: src/main/xmli18n-tmp.h:982 +#: src/main/xmli18n-tmp.h:1034 #, fuzzy msgid "Canon SELPHY-CP-730" msgstr "Stylus C60" -#: src/main/xmli18n-tmp.h:983 +#: src/main/xmli18n-tmp.h:1035 msgid "Canon SELPHY-CP-740" msgstr "" -#: src/main/xmli18n-tmp.h:984 +#: src/main/xmli18n-tmp.h:1036 #, fuzzy msgid "Canon SELPHY-CP-750" msgstr "Stylus C60" -#: src/main/xmli18n-tmp.h:985 +#: src/main/xmli18n-tmp.h:1037 msgid "Canon SELPHY ES1" msgstr "" -#: src/main/xmli18n-tmp.h:986 +#: src/main/xmli18n-tmp.h:1038 msgid "Canon SELPHY ES2" msgstr "" -#: src/main/xmli18n-tmp.h:987 +#: src/main/xmli18n-tmp.h:1039 msgid "Canon SELPHY ES20" msgstr "" -#: src/main/xmli18n-tmp.h:988 +#: src/main/xmli18n-tmp.h:1040 msgid "Sony DPP-EX5" msgstr "" -#: src/main/xmli18n-tmp.h:989 +#: src/main/xmli18n-tmp.h:1041 msgid "Sony DPP-EX7" msgstr "" -#: src/main/xmli18n-tmp.h:990 +#: src/main/xmli18n-tmp.h:1042 msgid "Sony UP-DP10" msgstr "" -#: src/main/xmli18n-tmp.h:991 +#: src/main/xmli18n-tmp.h:1043 msgid "Sony UP-DR100" msgstr "" -#: src/main/xmli18n-tmp.h:992 +#: src/main/xmli18n-tmp.h:1044 msgid "Sony UP-DR150" msgstr "" -#: src/main/xmli18n-tmp.h:993 +#: src/main/xmli18n-tmp.h:1045 msgid "Fujifilm Printpix-CX-400" msgstr "" -#: src/main/xmli18n-tmp.h:994 +#: src/main/xmli18n-tmp.h:1046 msgid "Fujifilm Printpix-CX-550" msgstr "" -#: src/main/xmli18n-tmp.h:995 +#: src/main/xmli18n-tmp.h:1047 msgid "Fujifilm FinePix-NX-500" msgstr "" -#: src/main/xmli18n-tmp.h:996 +#: src/main/xmli18n-tmp.h:1048 msgid "Kodak Easyshare-Printer-Dock" msgstr "" -#: src/main/xmli18n-tmp.h:997 +#: src/main/xmli18n-tmp.h:1049 msgid "Shinko CHC-S9045" msgstr "" -#: src/main/xmli18n-tmp.h:998 +#: src/main/xmli18n-tmp.h:1050 msgid "RAW DATA 16 bit" msgstr "" -#: src/main/xmli18n-tmp.h:999 +#: src/main/xmli18n-tmp.h:1051 msgid "RAW DATA 8 bit" msgstr "" -#: src/gutenprintui/panel.c:274 src/gutenprintui2/panel.c:274 +#: src/gutenprintui2/curve.c:130 +#, fuzzy +msgid "Curve type" +msgstr "Sort" + +#: src/gutenprintui2/curve.c:131 +msgid "Is this curve linear, spline interpolated, or free-form" +msgstr "" + +#: src/gutenprintui2/curve.c:139 +msgid "Minimum X" +msgstr "" + +#: src/gutenprintui2/curve.c:140 +msgid "Minimum possible value for X" +msgstr "" + +#: src/gutenprintui2/curve.c:149 +msgid "Maximum X" +msgstr "" + +#: src/gutenprintui2/curve.c:150 +msgid "Maximum possible X value" +msgstr "" + +#: src/gutenprintui2/curve.c:159 +msgid "Minimum Y" +msgstr "" + +#: src/gutenprintui2/curve.c:160 +msgid "Minimum possible value for Y" +msgstr "" + +#: src/gutenprintui2/curve.c:169 +msgid "Maximum Y" +msgstr "" + +#: src/gutenprintui2/curve.c:170 +msgid "Maximum possible value for Y" +msgstr "" + +#: src/gutenprintui2/gammacurve.c:418 +msgid "_Gamma value" +msgstr "" + +#: src/gutenprintui2/panel.c:275 msgid "Inch" msgstr "Tomme" -#: src/gutenprintui/panel.c:274 src/gutenprintui2/panel.c:274 +#: src/gutenprintui2/panel.c:275 msgid "Set the base unit of measurement to inches" msgstr "Sett basis mÃ¥leenhet til tommer" -#: src/gutenprintui/panel.c:276 src/gutenprintui2/panel.c:276 +#: src/gutenprintui2/panel.c:277 msgid "cm" msgstr "cm" -#: src/gutenprintui/panel.c:276 src/gutenprintui2/panel.c:276 +#: src/gutenprintui2/panel.c:277 msgid "Set the base unit of measurement to centimetres" msgstr "Sett basis mÃ¥leenhet til centimeter" -#: src/gutenprintui/panel.c:278 src/gutenprintui2/panel.c:278 +#: src/gutenprintui2/panel.c:279 #, fuzzy msgid "Points" msgstr "Skriv ut" -#: src/gutenprintui/panel.c:278 src/gutenprintui2/panel.c:278 +#: src/gutenprintui2/panel.c:279 #, fuzzy msgid "Set the base unit of measurement to points (1/72\")" msgstr "Sett basis mÃ¥leenhet til tommer" -#: src/gutenprintui/panel.c:280 src/gutenprintui2/panel.c:280 +#: src/gutenprintui2/panel.c:281 msgid "mm" msgstr "" -#: src/gutenprintui/panel.c:280 src/gutenprintui2/panel.c:280 +#: src/gutenprintui2/panel.c:281 #, fuzzy msgid "Set the base unit of measurement to millimetres" msgstr "Sett basis mÃ¥leenhet til centimeter" -#: src/gutenprintui/panel.c:282 src/gutenprintui2/panel.c:282 +#: src/gutenprintui2/panel.c:283 msgid "Pica" msgstr "" -#: src/gutenprintui/panel.c:282 src/gutenprintui2/panel.c:282 +#: src/gutenprintui2/panel.c:283 #, fuzzy msgid "Set the base unit of measurement to picas (1/12\")" msgstr "Sett basis mÃ¥leenhet til tommer" -#: src/gutenprintui/panel.c:289 src/gutenprintui2/panel.c:289 +#: src/gutenprintui2/panel.c:290 msgid "Color output" msgstr "Fargeutskrift" -#: src/gutenprintui/panel.c:291 src/gutenprintui2/panel.c:291 +#: src/gutenprintui2/panel.c:292 msgid "Print in shades of gray using black ink" msgstr "" -#: src/gutenprintui/panel.c:303 src/gutenprintui2/panel.c:303 +#: src/gutenprintui2/panel.c:304 #, fuzzy msgid "Standard Command" msgstr "Standard" -#: src/gutenprintui/panel.c:303 src/gutenprintui2/panel.c:303 +#: src/gutenprintui2/panel.c:304 msgid "Use standard print command" msgstr "" -#: src/gutenprintui/panel.c:304 src/gutenprintui2/panel.c:304 +#: src/gutenprintui2/panel.c:305 #, fuzzy msgid "Custom Command" msgstr "Kommando:" -#: src/gutenprintui/panel.c:304 src/gutenprintui2/panel.c:304 +#: src/gutenprintui2/panel.c:305 msgid "Use custom print command" msgstr "" -#: src/gutenprintui/panel.c:305 src/gutenprintui/plist.c:704 -#: src/gutenprintui/plist.c:787 src/gutenprintui2/panel.c:305 -#: src/gutenprintui2/plist.c:707 src/gutenprintui2/plist.c:790 +#: src/gutenprintui2/panel.c:306 src/gutenprintui2/plist.c:710 +#: src/gutenprintui2/plist.c:793 msgid "File" msgstr "Fil" -#: src/gutenprintui/panel.c:305 src/gutenprintui2/panel.c:305 +#: src/gutenprintui2/panel.c:306 #, fuzzy msgid "Print to a file" msgstr "Skriv ut til fil?" -#: src/gutenprintui/panel.c:521 src/gutenprintui2/panel.c:521 +#: src/gutenprintui2/panel.c:522 msgid "Edit Curve..." msgstr "" -#: src/gutenprintui/panel.c:532 src/gutenprintui2/panel.c:532 +#: src/gutenprintui2/panel.c:533 #, fuzzy msgid "Set Default" msgstr "Sett til standardverdier" -#: src/gutenprintui/panel.c:534 src/gutenprintui2/panel.c:534 +#: src/gutenprintui2/panel.c:535 msgid "Restore Previous" msgstr "" -#: src/gutenprintui/panel.c:536 src/gutenprintui/panel.c:1532 -#: src/gutenprintui/panel.c:1787 src/gutenprintui/panel.c:1819 -#: src/gutenprintui2/panel.c:536 src/gutenprintui2/panel.c:1533 -#: src/gutenprintui2/panel.c:1787 src/gutenprintui2/panel.c:1819 +#: src/gutenprintui2/panel.c:537 src/gutenprintui2/panel.c:1708 +#: src/gutenprintui2/panel.c:1962 src/gutenprintui2/panel.c:1994 msgid "OK" msgstr "OK" -#: src/gutenprintui/panel.c:538 src/gutenprintui/panel.c:1197 -#: src/gutenprintui/panel.c:1534 src/gutenprintui/panel.c:1789 -#: src/gutenprintui2/panel.c:538 src/gutenprintui2/panel.c:1198 -#: src/gutenprintui2/panel.c:1535 src/gutenprintui2/panel.c:1789 +#: src/gutenprintui2/panel.c:539 src/gutenprintui2/panel.c:1373 +#: src/gutenprintui2/panel.c:1710 src/gutenprintui2/panel.c:1964 msgid "Cancel" msgstr "Avbryt" -#: src/gutenprintui/panel.c:1180 src/gutenprintui2/panel.c:1181 +#: src/gutenprintui2/panel.c:641 +#, fuzzy +msgid "Select File..." +msgstr "Sett opp skriver..." + +#: src/gutenprintui2/panel.c:1018 +msgid "Reset" +msgstr "" + +#: src/gutenprintui2/panel.c:1356 #, c-format msgid "%s -- Print v%s" msgstr "%s -- Skriv ut v%s" -#: src/gutenprintui/panel.c:1189 src/gutenprintui2/panel.c:1190 +#: src/gutenprintui2/panel.c:1365 msgid "About" msgstr "Om" -#: src/gutenprintui/panel.c:1191 src/gutenprintui2/panel.c:1192 +#: src/gutenprintui2/panel.c:1367 msgid "" "Print and\n" "Save Settings" @@ -6620,7 +7098,7 @@ msgstr "" "Skriv ut og\n" "lagre innstillinger" -#: src/gutenprintui/panel.c:1193 src/gutenprintui2/panel.c:1194 +#: src/gutenprintui2/panel.c:1369 msgid "" "Save\n" "Settings" @@ -6628,15 +7106,15 @@ msgstr "" "Lagre\n" "innstillinger" -#: src/gutenprintui/panel.c:1195 src/gutenprintui2/panel.c:1196 +#: src/gutenprintui2/panel.c:1371 msgid "Print" msgstr "Skriv ut" -#: src/gutenprintui/panel.c:1247 src/gutenprintui2/panel.c:1248 +#: src/gutenprintui2/panel.c:1423 msgid "Preview" msgstr "ForhÃ¥ndsvisning" -#: src/gutenprintui/panel.c:1272 src/gutenprintui2/panel.c:1273 +#: src/gutenprintui2/panel.c:1448 msgid "" "Position the image on the page.\n" "Click and drag with the primary button to position the image.\n" @@ -6650,339 +7128,332 @@ msgid "" "to its original position." msgstr "" -#: src/gutenprintui/panel.c:1319 src/gutenprintui2/panel.c:1320 +#: src/gutenprintui2/panel.c:1495 #, fuzzy msgid "Paper Size" msgstr "Størrelse" -#: src/gutenprintui/panel.c:1342 src/gutenprintui2/panel.c:1343 +#: src/gutenprintui2/panel.c:1518 msgid "Show All Paper Sizes" msgstr "" -#: src/gutenprintui/panel.c:1358 src/gutenprintui2/panel.c:1359 +#: src/gutenprintui2/panel.c:1534 msgid "Dimensions:" msgstr "Størrelse:" -#: src/gutenprintui/panel.c:1363 src/gutenprintui/panel.c:2063 -#: src/gutenprintui2/panel.c:1364 src/gutenprintui2/panel.c:2063 +#: src/gutenprintui2/panel.c:1539 src/gutenprintui2/panel.c:2238 msgid "Width:" msgstr "Bredde:" -#: src/gutenprintui/panel.c:1364 src/gutenprintui2/panel.c:1365 +#: src/gutenprintui2/panel.c:1540 msgid "Width of the paper that you wish to print to" msgstr "Bredde pÃ¥ papiret du skal skrive ut pÃ¥" -#: src/gutenprintui/panel.c:1368 src/gutenprintui/panel.c:2065 -#: src/gutenprintui2/panel.c:1369 src/gutenprintui2/panel.c:2065 +#: src/gutenprintui2/panel.c:1544 src/gutenprintui2/panel.c:2240 msgid "Height:" msgstr "Høyde:" -#: src/gutenprintui/panel.c:1369 src/gutenprintui2/panel.c:1370 +#: src/gutenprintui2/panel.c:1545 msgid "Height of the paper that you wish to print to" msgstr "Høyde pÃ¥ papiret du skal skrive ut pÃ¥" -#: src/gutenprintui/panel.c:1374 src/gutenprintui2/panel.c:1375 +#: src/gutenprintui2/panel.c:1550 #, fuzzy msgid "Automatic Paper Size" msgstr "Størrelse" -#: src/gutenprintui/panel.c:1391 src/gutenprintui2/panel.c:1392 +#: src/gutenprintui2/panel.c:1567 msgid "Number of Copies" msgstr "" -#: src/gutenprintui/panel.c:1403 src/gutenprintui2/panel.c:1404 +#: src/gutenprintui2/panel.c:1579 msgid "Select the number of copies to print; a value between 1 and 100" msgstr "" -#: src/gutenprintui/panel.c:1435 src/gutenprintui2/panel.c:1436 +#: src/gutenprintui2/panel.c:1611 #, fuzzy msgid "Image Position" msgstr "Posisjon" -#: src/gutenprintui/panel.c:1452 src/gutenprintui2/panel.c:1453 +#: src/gutenprintui2/panel.c:1628 msgid "Auto" msgstr "Auto" -#: src/gutenprintui/panel.c:1454 src/gutenprintui2/panel.c:1455 +#: src/gutenprintui2/panel.c:1630 msgid "Portrait" msgstr "Portrett" -#: src/gutenprintui/panel.c:1456 src/gutenprintui2/panel.c:1457 +#: src/gutenprintui2/panel.c:1632 msgid "Landscape" msgstr "Landskap" -#: src/gutenprintui/panel.c:1458 src/gutenprintui2/panel.c:1459 +#: src/gutenprintui2/panel.c:1634 msgid "Upside down" msgstr "Opp-ned" -#: src/gutenprintui/panel.c:1460 src/gutenprintui2/panel.c:1461 +#: src/gutenprintui2/panel.c:1636 msgid "Seascape" msgstr "Landskap" -#: src/gutenprintui/panel.c:1464 src/gutenprintui2/panel.c:1465 +#: src/gutenprintui2/panel.c:1640 msgid "" "Select the orientation: portrait, landscape, upside down, or seascape " "(upside down landscape)" msgstr "" -#: src/gutenprintui/panel.c:1466 src/gutenprintui2/panel.c:1467 +#: src/gutenprintui2/panel.c:1642 msgid "Orientation:" msgstr "Orientering:" -#: src/gutenprintui/panel.c:1477 src/gutenprintui2/panel.c:1478 +#: src/gutenprintui2/panel.c:1653 msgid "Left:" msgstr "Venstre:" -#: src/gutenprintui/panel.c:1478 src/gutenprintui2/panel.c:1479 +#: src/gutenprintui2/panel.c:1654 msgid "Distance from the left of the paper to the image" msgstr "Avstand fra venstre kant av arket til bildet" -#: src/gutenprintui/panel.c:1481 src/gutenprintui/panel.c:1485 -#: src/gutenprintui2/panel.c:1482 src/gutenprintui2/panel.c:1486 +#: src/gutenprintui2/panel.c:1657 src/gutenprintui2/panel.c:1661 msgid "Right:" msgstr "Høyre:" -#: src/gutenprintui/panel.c:1482 src/gutenprintui2/panel.c:1483 +#: src/gutenprintui2/panel.c:1658 msgid "Distance from the left of the paper to the right of the image" msgstr "Avstand fra venstre kant av arket til høyre kant av bildet" -#: src/gutenprintui/panel.c:1486 src/gutenprintui2/panel.c:1487 +#: src/gutenprintui2/panel.c:1662 msgid "Distance from the right of the paper to the image" msgstr "Avstand fra høyre kant av arket til bildet" -#: src/gutenprintui/panel.c:1488 src/gutenprintui2/panel.c:1489 +#: src/gutenprintui2/panel.c:1664 msgid "Top:" msgstr "Øverst:" -#: src/gutenprintui/panel.c:1489 src/gutenprintui2/panel.c:1490 +#: src/gutenprintui2/panel.c:1665 msgid "Distance from the top of the paper to the image" msgstr "Avstand fra toppen av arket til bildet" -#: src/gutenprintui/panel.c:1492 src/gutenprintui/panel.c:1496 -#: src/gutenprintui2/panel.c:1493 src/gutenprintui2/panel.c:1497 +#: src/gutenprintui2/panel.c:1668 src/gutenprintui2/panel.c:1672 msgid "Bottom:" msgstr "Nederst:" -#: src/gutenprintui/panel.c:1493 src/gutenprintui2/panel.c:1494 +#: src/gutenprintui2/panel.c:1669 #, fuzzy msgid "Distance from the top of the paper to bottom of the image" msgstr "Avstand fra toppen av arket til nedre kant av bildet" -#: src/gutenprintui/panel.c:1497 src/gutenprintui2/panel.c:1498 +#: src/gutenprintui2/panel.c:1673 msgid "Distance from the bottom of the paper to the image" msgstr "Avstand fra nedre kant av arket til bildet" -#: src/gutenprintui/panel.c:1507 src/gutenprintui2/panel.c:1508 +#: src/gutenprintui2/panel.c:1683 msgid "Center:" msgstr "Sentrer:" -#: src/gutenprintui/panel.c:1510 src/gutenprintui2/panel.c:1511 +#: src/gutenprintui2/panel.c:1686 #, fuzzy msgid "Horizontal" msgstr "Horisontalt" -#: src/gutenprintui/panel.c:1511 src/gutenprintui2/panel.c:1512 +#: src/gutenprintui2/panel.c:1687 msgid "Center the image horizontally on the paper" msgstr "Sentrer bildet horisontalt pÃ¥ arket" -#: src/gutenprintui/panel.c:1513 src/gutenprintui2/panel.c:1514 +#: src/gutenprintui2/panel.c:1689 msgid "Both" msgstr "Begge" -#: src/gutenprintui/panel.c:1514 src/gutenprintui2/panel.c:1515 +#: src/gutenprintui2/panel.c:1690 msgid "Center the image on the paper" msgstr "Sentrer bildet pÃ¥ arket" -#: src/gutenprintui/panel.c:1516 src/gutenprintui2/panel.c:1517 +#: src/gutenprintui2/panel.c:1692 #, fuzzy msgid "Vertical" msgstr "Vertikalt" -#: src/gutenprintui/panel.c:1517 src/gutenprintui2/panel.c:1518 +#: src/gutenprintui2/panel.c:1693 msgid "Center the image vertically on the paper" msgstr "Sentrer bildet vertikalt pÃ¥ arket" -#: src/gutenprintui/panel.c:1530 src/gutenprintui2/panel.c:1531 +#: src/gutenprintui2/panel.c:1706 msgid "Setup Printer" msgstr "Sett opp skriver" -#: src/gutenprintui/panel.c:1555 src/gutenprintui2/panel.c:1555 +#: src/gutenprintui2/panel.c:1730 #, fuzzy msgid "Printer Make:" msgstr "Skrivernavn:" -#: src/gutenprintui/panel.c:1566 src/gutenprintui2/panel.c:1566 +#: src/gutenprintui2/panel.c:1741 #, fuzzy msgid "Select the make of your printer" msgstr "Velg din skrivermodell" -#: src/gutenprintui/panel.c:1584 src/gutenprintui/panel.c:1672 -#: src/gutenprintui/panel.c:1890 src/gutenprintui2/panel.c:1584 -#: src/gutenprintui2/panel.c:1672 src/gutenprintui2/panel.c:1890 +#: src/gutenprintui2/panel.c:1759 src/gutenprintui2/panel.c:1847 +#: src/gutenprintui2/panel.c:2065 msgid "Printer Model:" msgstr "Raskt heltall" -#: src/gutenprintui/panel.c:1595 src/gutenprintui2/panel.c:1595 +#: src/gutenprintui2/panel.c:1770 msgid "Select your printer model" msgstr "Velg din skrivermodell" -#: src/gutenprintui/panel.c:1643 src/gutenprintui2/panel.c:1643 +#: src/gutenprintui2/panel.c:1818 msgid "PPD File:" msgstr "PPD fil:" -#: src/gutenprintui/panel.c:1659 src/gutenprintui2/panel.c:1659 +#: src/gutenprintui2/panel.c:1834 msgid "Enter the correct PPD filename for your printer" msgstr "Skriv inn korrekt PPD-filnavn for din skriver" -#: src/gutenprintui/panel.c:1661 src/gutenprintui/panel.c:1741 -#: src/gutenprintui2/panel.c:1661 src/gutenprintui2/panel.c:1741 +#: src/gutenprintui2/panel.c:1836 src/gutenprintui2/panel.c:1916 msgid "Browse" msgstr "Bla gjennom" -#: src/gutenprintui/panel.c:1668 src/gutenprintui2/panel.c:1668 +#: src/gutenprintui2/panel.c:1843 msgid "Choose the correct PPD filename for your printer" msgstr "Velg korrekt PPD-filnavn for din skriver" -#: src/gutenprintui/panel.c:1710 src/gutenprintui2/panel.c:1710 +#: src/gutenprintui2/panel.c:1885 msgid "" "Select the name of the output queue (not the type, or model, of printer) " "that you wish to print to" msgstr "" -#: src/gutenprintui/panel.c:1712 src/gutenprintui2/panel.c:1712 +#: src/gutenprintui2/panel.c:1887 #, fuzzy msgid "Printer Queue:" msgstr "Skrivernavn:" -#: src/gutenprintui/panel.c:1728 src/gutenprintui2/panel.c:1728 +#: src/gutenprintui2/panel.c:1903 #, fuzzy msgid "Enter the correct command to print to your printer. " msgstr "Skriv inn korrekt PPD-filnavn for din skriver" -#: src/gutenprintui/panel.c:1739 src/gutenprintui2/panel.c:1739 +#: src/gutenprintui2/panel.c:1914 msgid "Enter the file to print to. " msgstr "" -#: src/gutenprintui/panel.c:1747 src/gutenprintui2/panel.c:1747 +#: src/gutenprintui2/panel.c:1922 #, fuzzy msgid "File to print to" msgstr "testutskrift" -#: src/gutenprintui/panel.c:1755 src/gutenprintui2/panel.c:1755 +#: src/gutenprintui2/panel.c:1930 #, fuzzy msgid "Print To File" msgstr "Skriv ut til fil?" -#: src/gutenprintui/panel.c:1785 src/gutenprintui2/panel.c:1785 +#: src/gutenprintui2/panel.c:1960 msgid "Define New Printer" msgstr "Definer ny skriver" -#: src/gutenprintui/panel.c:1803 src/gutenprintui/panel.c:1887 -#: src/gutenprintui2/panel.c:1803 src/gutenprintui2/panel.c:1887 +#: src/gutenprintui2/panel.c:1978 src/gutenprintui2/panel.c:2062 msgid "Printer Name:" msgstr "Skrivernavn:" -#: src/gutenprintui/panel.c:1807 src/gutenprintui2/panel.c:1807 +#: src/gutenprintui2/panel.c:1982 msgid "Enter the name you wish to give this logical printer" msgstr "Skriv inn navnet du ønsker Ã¥ gi til denne logiske skriveren" -#: src/gutenprintui/panel.c:1817 src/gutenprintui2/panel.c:1817 +#: src/gutenprintui2/panel.c:1992 #, fuzzy msgid "About Gutenprint " msgstr "Om Gimp-Print" -#: src/gutenprintui/panel.c:1824 src/gutenprintui2/panel.c:1824 +#: src/gutenprintui2/panel.c:1999 #, fuzzy msgid "Gutenprint Version " msgstr "Gimp-Print versjon " -#: src/gutenprintui/panel.c:1872 src/gutenprintui2/panel.c:1872 +#: src/gutenprintui2/panel.c:2047 msgid "Printer Settings" msgstr "Innstillinger for parametere" -#: src/gutenprintui/panel.c:1885 src/gutenprintui2/panel.c:1885 +#: src/gutenprintui2/panel.c:2060 msgid "" "Select the name of the printer (not the type, or model, of printer) that you " "wish to print to" msgstr "" -#: src/gutenprintui/panel.c:1902 src/gutenprintui2/panel.c:1902 +#: src/gutenprintui2/panel.c:2077 msgid "Setup Printer..." msgstr "Sett opp skriver..." -#: src/gutenprintui/panel.c:1904 src/gutenprintui2/panel.c:1904 +#: src/gutenprintui2/panel.c:2079 msgid "" "Choose the printer model, PPD file, and command that is used to print to " "this printer" msgstr "" -#: src/gutenprintui/panel.c:1917 src/gutenprintui2/panel.c:1917 +#: src/gutenprintui2/panel.c:2092 msgid "New Printer..." msgstr "Ny skriver..." -#: src/gutenprintui/panel.c:1918 src/gutenprintui2/panel.c:1918 +#: src/gutenprintui2/panel.c:2093 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:1948 src/gutenprintui2/panel.c:1948 +#: src/gutenprintui2/panel.c:2123 #, fuzzy msgid "Set Printer Option Defaults" msgstr "Sett til standardverdier" -#: src/gutenprintui/panel.c:1949 src/gutenprintui2/panel.c:1949 +#: src/gutenprintui2/panel.c:2124 msgid "Set all printer options to their defaults" msgstr "" -#: src/gutenprintui/panel.c:1972 src/gutenprintui2/panel.c:1972 +#: src/gutenprintui2/panel.c:2147 #, fuzzy msgid "Image Size" msgstr "Størrelse" -#: src/gutenprintui/panel.c:1997 src/gutenprintui2/panel.c:1997 +#: src/gutenprintui2/panel.c:2172 msgid "Scaling:" msgstr "Skalering" -#: src/gutenprintui/panel.c:2001 src/gutenprintui2/panel.c:2001 +#: src/gutenprintui2/panel.c:2176 msgid "Set the scale (size) of the image" msgstr "Sett skalering (størrelse) pÃ¥ bildet" -#: src/gutenprintui/panel.c:2023 src/gutenprintui2/panel.c:2023 +#: src/gutenprintui2/panel.c:2198 msgid "Scale by:" msgstr "" -#: src/gutenprintui/panel.c:2028 src/gutenprintui2/panel.c:2028 +#: src/gutenprintui2/panel.c:2203 msgid "" "Select whether scaling is measured as percent of available page size or " "number of output dots per inch" msgstr "" -#: src/gutenprintui/panel.c:2031 src/gutenprintui2/panel.c:2031 +#: src/gutenprintui2/panel.c:2206 msgid "Percent" msgstr "Prosent" -#: src/gutenprintui/panel.c:2036 src/gutenprintui2/panel.c:2036 +#: src/gutenprintui2/panel.c:2211 msgid "Scale the print to the size of the page" msgstr "Skaler utskriften til størrelsen pÃ¥ papiret" -#: src/gutenprintui/panel.c:2040 src/gutenprintui2/panel.c:2040 +#: src/gutenprintui2/panel.c:2215 msgid "PPI" msgstr "PPI" -#: src/gutenprintui/panel.c:2045 src/gutenprintui2/panel.c:2045 +#: src/gutenprintui2/panel.c:2220 msgid "Scale the print to the number of dots per inch" msgstr "Skaler utskriften til antall punkter per tomme" -#: src/gutenprintui/panel.c:2063 src/gutenprintui2/panel.c:2063 +#: src/gutenprintui2/panel.c:2238 msgid "Set the width of the print" msgstr "Sett bredde pÃ¥ utskriften" -#: src/gutenprintui/panel.c:2065 src/gutenprintui2/panel.c:2065 +#: src/gutenprintui2/panel.c:2240 msgid "Set the height of the print" msgstr "Sett høyde for utskriften" -#: src/gutenprintui/panel.c:2071 src/gutenprintui2/panel.c:2071 +#: src/gutenprintui2/panel.c:2246 msgid "" "Use Original\n" "Image Size" @@ -6990,154 +7461,108 @@ msgstr "" "Bruk opprinnelig\n" "bildestørrelse" -#: src/gutenprintui/panel.c:2077 src/gutenprintui2/panel.c:2077 +#: src/gutenprintui2/panel.c:2252 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:2100 src/gutenprintui2/panel.c:2101 +#: src/gutenprintui2/panel.c:2276 msgid "Print Color Adjust" msgstr "" -#: src/gutenprintui/panel.c:2103 src/gutenprintui2/panel.c:2104 +#: src/gutenprintui2/panel.c:2279 msgid "Set Defaults" msgstr "Sett til standardverdier" -#: src/gutenprintui/panel.c:2105 src/gutenprintui2/panel.c:2106 +#: src/gutenprintui2/panel.c:2281 msgid "Close" msgstr "Lukk" -#: src/gutenprintui/panel.c:2134 src/gutenprintui2/panel.c:2135 +#: src/gutenprintui2/panel.c:2310 msgid "Image preview" msgstr "ForhÃ¥ndsvisning av bilde" -#: src/gutenprintui/panel.c:2148 src/gutenprintui2/panel.c:2149 +#: src/gutenprintui2/panel.c:2324 msgid "View Output Channels:" msgstr "" -#: src/gutenprintui/panel.c:2234 src/gutenprintui2/panel.c:2240 +#: src/gutenprintui2/panel.c:2415 #, fuzzy msgid "Output" msgstr "Utskriftstype:" -#: src/gutenprintui/panel.c:2262 src/gutenprintui2/panel.c:2268 +#: src/gutenprintui2/panel.c:2443 msgid "Output Type:" msgstr "Utskriftstype:" -#: src/gutenprintui/panel.c:2266 src/gutenprintui2/panel.c:2272 +#: src/gutenprintui2/panel.c:2447 msgid "Select the desired output type" msgstr "Velg ønsket type for utdata" -#: src/gutenprintui/panel.c:2287 src/gutenprintui2/panel.c:2293 +#: src/gutenprintui2/panel.c:2468 msgid "Adjust Output..." msgstr "Juster utskrift..." -#: src/gutenprintui/panel.c:2296 src/gutenprintui2/panel.c:2302 +#: src/gutenprintui2/panel.c:2477 msgid "" "Adjust color balance, brightness, contrast, saturation, and dither algorithm" msgstr "" -#: src/gutenprintui/panel.c:2314 src/gutenprintui2/panel.c:2321 +#: src/gutenprintui2/panel.c:2496 #, fuzzy msgid "Size Units:" msgstr "Enheter:" -#: src/gutenprintui/panel.c:2317 src/gutenprintui2/panel.c:2324 +#: src/gutenprintui2/panel.c:2499 #, fuzzy msgid " " msgstr ">" -#: src/gutenprintui/panel.c:2341 src/gutenprintui2/panel.c:2348 +#: src/gutenprintui2/panel.c:2523 msgid "Units:" msgstr "Enheter:" -#: src/gutenprintui/panel.c:2346 src/gutenprintui2/panel.c:2353 +#: src/gutenprintui2/panel.c:2528 msgid "Select the base unit of measurement for printing" msgstr "Velg basis mÃ¥leenhet for utskrift" -#: src/gutenprintui/plist.c:90 src/gutenprintui/plist.c:99 -#: src/gutenprintui2/plist.c:89 src/gutenprintui2/plist.c:98 +#: src/gutenprintui2/plist.c:92 src/gutenprintui2/plist.c:101 msgid "System V lp" msgstr "" -#: src/gutenprintui/plist.c:96 src/gutenprintui2/plist.c:95 +#: src/gutenprintui2/plist.c:98 msgid "CUPS" msgstr "" -#: src/gutenprintui/plist.c:102 src/gutenprintui2/plist.c:101 +#: src/gutenprintui2/plist.c:104 msgid "Berkeley lpd (/etc/lpc)" msgstr "" -#: src/gutenprintui/plist.c:105 src/gutenprintui2/plist.c:104 +#: src/gutenprintui2/plist.c:107 msgid "Berkeley lpd (/usr/bsd/lpc)" msgstr "" -#: src/gutenprintui/plist.c:108 src/gutenprintui2/plist.c:107 +#: src/gutenprintui2/plist.c:110 msgid "Berkeley lpd (/usr/etc/lpc" msgstr "" -#: src/gutenprintui/plist.c:111 src/gutenprintui2/plist.c:110 +#: src/gutenprintui2/plist.c:113 msgid "Berkeley lpd (/usr/libexec/lpc)" msgstr "" -#: src/gutenprintui/plist.c:114 src/gutenprintui2/plist.c:113 +#: src/gutenprintui2/plist.c:116 msgid "Berkeley lpd (/usr/sbin/lpc)" msgstr "" -#: src/gutenprintui/plist.c:1043 src/gutenprintui2/plist.c:1057 +#: src/gutenprintui2/plist.c:1060 #, fuzzy msgid "Printer" msgstr "Skriv ut" -#: src/gutenprintui/plist.c:1230 src/gutenprintui2/plist.c:1250 +#: src/gutenprintui2/plist.c:1253 #, fuzzy msgid "(Default Printer)" msgstr "Sett opp skriver" -#: src/gutenprintui2/curve.c:130 -#, fuzzy -msgid "Curve type" -msgstr "Sort" - -#: src/gutenprintui2/curve.c:131 -msgid "Is this curve linear, spline interpolated, or free-form" -msgstr "" - -#: src/gutenprintui2/curve.c:139 -msgid "Minimum X" -msgstr "" - -#: src/gutenprintui2/curve.c:140 -msgid "Minimum possible value for X" -msgstr "" - -#: src/gutenprintui2/curve.c:149 -msgid "Maximum X" -msgstr "" - -#: src/gutenprintui2/curve.c:150 -msgid "Maximum possible X value" -msgstr "" - -#: src/gutenprintui2/curve.c:159 -msgid "Minimum Y" -msgstr "" - -#: src/gutenprintui2/curve.c:160 -msgid "Minimum possible value for Y" -msgstr "" - -#: src/gutenprintui2/curve.c:169 -msgid "Maximum Y" -msgstr "" - -#: src/gutenprintui2/curve.c:170 -msgid "Maximum possible value for Y" -msgstr "" - -#: src/gutenprintui2/gammacurve.c:418 -msgid "_Gamma value" -msgstr "" - #: src/cups/genppd.c:145 #, fuzzy msgid "Printer Features" @@ -7180,48 +7605,48 @@ msgstr "" #. 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:1058 +#: src/cups/genppd.c:1064 msgid "English" msgstr "Norwegian" #. TRANSLATORS: Specify PPD translation encoding e.g. ISOLatin1 -#: src/cups/genppd.c:1060 +#: src/cups/genppd.c:1066 msgid "ISOLatin1" msgstr "ISOLatin1" -#: src/cups/genppd.c:1641 +#: src/cups/genppd.c:1647 msgid "2-Sided Printing" msgstr "" -#: src/cups/genppd.c:1665 +#: src/cups/genppd.c:1671 msgid "Shrink Page If Necessary to Fit Borders" msgstr "" -#: src/cups/genppd.c:1669 +#: src/cups/genppd.c:1675 msgid "Shrink (print the whole page)" msgstr "" -#: src/cups/genppd.c:1670 +#: src/cups/genppd.c:1676 msgid "Crop (preserve dimensions)" msgstr "" -#: src/cups/genppd.c:1671 +#: src/cups/genppd.c:1677 msgid "Expand (use maximum page area)" msgstr "" -#: src/cups/genppd.c:1756 +#: src/cups/genppd.c:1762 msgid "No" msgstr "" -#: src/cups/genppd.c:1758 +#: src/cups/genppd.c:1764 msgid "Yes" msgstr "" -#: src/cups/genppd.c:1795 src/cups/genppd.c:1857 +#: src/cups/genppd.c:1801 src/cups/genppd.c:1863 msgid "Value" msgstr "" -#: src/cups/genppd.c:1800 +#: src/cups/genppd.c:1806 msgid "Fine Adjustment" msgstr "" @@ -7912,135 +8337,86 @@ msgstr "" msgid "Error in input\n" msgstr "Feil i inndata\n" -#: src/gimp/print-image-gimp.c:225 src/gimp2/print-image-gimp.c:225 +#: src/gimp2/print-image-gimp.c:225 msgid "Printing..." msgstr "Skriver ut..." -#: src/gimp/print.c:133 -msgid "/File/Print..." -msgstr "/Fil/Skriv ut..." - -#: src/ghost/ijsgutenprint.c:98 -#, c-format -msgid "" -"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" -msgstr "" - -#: 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:199 -#, fuzzy, c-format -msgid "ERROR: ijsgutenprint: No row buffer\n" -msgstr "Ingen rad for buffer\n" - -#: 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:498 -#, c-format -msgid "ERROR: ijsgutenprint: Printer must be specified with -sDeviceModel\n" -msgstr "" +#, fuzzy +#~ msgid "ERROR: ijsgutenprint: Bad color space: bps %d channels %d space %s\n" +#~ msgstr "Ugyldige parametere; kan ikke fortsette!\n" -#: 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" +#, fuzzy +#~ msgid "ERROR: ijsgutenprint: No row buffer\n" +#~ msgstr "Ingen rad for buffer\n" -#: src/ghost/ijsgutenprint.c:656 -#, c-format -msgid "ijsgutenprint: unknown DeviceModel %s\n" -msgstr "" +#, fuzzy +#~ msgid "" +#~ "ERROR: ijsgutenprint: Unable to parse parameter %s=%s (expect a number)\n" +#~ msgstr "Ugyldige parametere; kan ikke fortsette!\n" -#: 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" +#, fuzzy +#~ msgid "ERROR: ijsgutenprint: Printer %s is not a known model\n" +#~ msgstr "Skriver %s er ikke en kjent modell\n" -#: 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" +#, fuzzy +#~ msgid "ERROR: ijsgutenprint: cannot parse TopLeft %s\n" +#~ msgstr "Kan ikke skrive til skriver %s med %s\n" -#: 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" +#, fuzzy +#~ msgid "ERROR: ijsgutenprint: cannot parse PaperSize %s\n" +#~ msgstr "Kan ikke skrive til skriver %s med %s\n" -#: 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" +#, fuzzy +#~ msgid "ERROR: ijsgutenprint: cannot parse curve %s\n" +#~ msgstr "Kan ikke skrive til skriver %s med %s\n" -#: 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" +#, fuzzy +#~ msgid "ERROR: ijsgutenprint: cannot parse %s float %s\n" +#~ msgstr "Kan ikke skrive til skriver %s med %s\n" -#: 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" +#, fuzzy +#~ msgid "ERROR: ijsgutenprint: cannot parse %s int %s\n" +#~ msgstr "Kan ikke skrive til skriver %s med %s\n" -#: 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" +#, fuzzy +#~ msgid "ERROR: ijsgutenprint: cannot parse %s dimension %s\n" +#~ msgstr "Kan ikke skrive til skriver %s med %s\n" -#: src/ghost/ijsgutenprint.c:841 -#, fuzzy, c-format -msgid "ERROR: ijsgutenprint: Bad parameter %s %d\n" -msgstr "Ukjent skriver %s\n" +#, fuzzy +#~ msgid "ERROR: ijsgutenprint: cannot parse %s boolean %s\n" +#~ msgstr "Kan ikke skrive til skriver %s med %s\n" -#: 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" +#, fuzzy +#~ msgid "ERROR: ijsgutenprint: Bad parameter %s %d\n" +#~ msgstr "Ukjent skriver %s\n" -#: src/ghost/ijsgutenprint.c:1308 -#, fuzzy, c-format -msgid "ERROR: ijsgutenprint: image_init failed %d\n" -msgstr "image_init feilet %d\n" +#, fuzzy +#~ msgid "ERROR: ijsgutenprint: bad key code %d\n" +#~ msgstr "Henting av neste rad feilet ved %.0f\n" -#: 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" +#, fuzzy +#~ msgid "ERROR: ijsgutenprint: image_init failed %d\n" +#~ msgstr "image_init feilet %d\n" -#: src/ghost/ijsgutenprint.c:1331 -#, fuzzy, c-format -msgid "ERROR: ijsgutenprint: Unable to open %s: %s\n" -msgstr "Kan ikke Ã¥pne %s: %s\n" +#, fuzzy +#~ msgid "ERROR: ijsgutenprint: Unable to open file descriptor: %s\n" +#~ msgstr "Kan ikke Ã¥pne fildeskriptor: %s\n" -#: src/ghost/ijsgutenprint.c:1344 -#, fuzzy, c-format -msgid "ERROR: ijsgutenprint: Unknown printer %s\n" -msgstr "Ukjent skriver %s\n" +#, fuzzy +#~ msgid "ERROR: ijsgutenprint: Unable to open %s: %s\n" +#~ msgstr "Kan ikke Ã¥pne %s: %s\n" -#: src/ghost/ijsgutenprint.c:1516 -#, fuzzy, c-format -msgid "ERROR: ijsgutenprint: Bad parameters; cannot continue!\n" -msgstr "Ugyldige parametere; kan ikke fortsette!\n" +#, fuzzy +#~ msgid "ERROR: ijsgutenprint: Unknown printer %s\n" +#~ msgstr "Ukjent skriver %s\n" -#: 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 "ERROR: ijsgutenprint: Bad parameters; cannot continue!\n" +#~ msgstr "Ugyldige parametere; kan ikke fortsette!\n" #, fuzzy -#~ msgid "Model Name" -#~ msgstr "Avbryt" +#~ msgid "ERROR: ijsgutenprint: Get next row failed at %.0f\n" +#~ msgstr "Henting av neste rad feilet ved %.0f\n" #, fuzzy #~ msgid "Cassette" @@ -8208,6 +8584,9 @@ msgstr "Henting av neste rad feilet ved %.0f\n" #~ msgid "CMY Color" #~ msgstr "CMY-farge" +#~ msgid "/File/Print..." +#~ msgstr "/Fil/Skriv ut..." + #, fuzzy #~ msgid "Gutenprint" #~ msgstr "testutskrift" diff --git a/po/nl.gmo b/po/nl.gmo index d4cfcc0..c2e29e3 100644 Binary files a/po/nl.gmo and b/po/nl.gmo differ diff --git a/po/nl.po b/po/nl.po index f63d30c..c5167cf 100644 --- a/po/nl.po +++ b/po/nl.po @@ -1,27 +1,28 @@ -# translation of gutenprint-5.0.0.po to Dutch -# Dutch translation of Gutenprint. -# Copyright (C) 2002, 2006, 2007 Free Software Foundation, Inc. +# Dutch translations for gutenprint. +# Copyright (C) 2008 Free Software Foundation, Inc. +# This file is distributed under the same license as the gutenprint package. # # Vincent van Adrighem , 2002. # Freek de Kruijf , 2006, 2007. +# Benno Schulenberg , 2008. msgid "" msgstr "" -"Project-Id-Version: gutenprint 5.0.0\n" +"Project-Id-Version: gutenprint-5.1.98.1\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2008-01-01 20:47-0500\n" -"PO-Revision-Date: 2007-12-01 21:53-0500\n" -"Last-Translator: Freek de Kruijf \n" +"POT-Creation-Date: 2008-04-25 21:19-0400\n" +"PO-Revision-Date: 2008-04-22 22:01+0200\n" +"Last-Translator: Benno Schulenberg \n" "Language-Team: Dutch \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Generator: KBabel 1.11.2\n" -"Plural-Forms: nplurals=2; plural=(n != 1);\n" +"X-Generator: KBabel 1.11.4\n" +"Plural-Forms: nplurals=2; plural=(n != 1);\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:1752 +#: src/main/print-escp2.c:2116 msgid "Default" msgstr "Standaard" @@ -61,59 +62,71 @@ msgid "Ordered" msgstr "Geordend" #: src/main/dither-main.c:65 +msgid "Ordered New" +msgstr "Geordend (nieuw)" + +#: src/main/dither-main.c:66 msgid "Fast" msgstr "Snel" -#: src/main/dither-main.c:66 +#: src/main/dither-main.c:67 msgid "Very Fast" msgstr "Zeer snel" -#: src/main/dither-main.c:67 +#: src/main/dither-main.c:68 msgid "Hybrid Floyd-Steinberg" msgstr "Hybride Floyd-Steinberg" -#: src/main/dither-main.c:68 +#: src/main/dither-main.c:69 msgid "Predithered Input" msgstr "Invoer met toegepast ruis-algoritme" -#: src/main/dither-main.c:88 src/main/print-color.c:56 +#: src/main/dither-main.c:70 +msgid "Drop Size Segmented" +msgstr "" + +#: src/main/dither-main.c:71 +msgid "Drop Size Segmented New" +msgstr "" + +#: src/main/dither-main.c:91 src/main/print-color.c:56 msgid "Density" -msgstr "Hoeveelheid" +msgstr "Dichtheid" -#: src/main/dither-main.c:88 src/main/print-canon.c:295 +#: src/main/dither-main.c:91 src/main/print-canon.c:295 #: src/main/print-canon.c:303 src/main/print-canon.c:311 -#: src/main/print-canon.c:319 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-escp2.c:471 -#: src/main/print-escp2.c:479 src/main/print-escp2.c:487 +#: src/main/print-canon.c:319 src/main/print-escp2.c:446 +#: src/main/print-escp2.c:454 src/main/print-escp2.c:462 +#: src/main/print-escp2.c:470 src/main/print-escp2.c:478 +#: src/main/print-escp2.c:486 src/main/print-escp2.c:494 #: 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:1764 src/main/print-olympus.c:1772 -#: src/main/print-olympus.c:1780 src/main/print-olympus.c:1788 -#: src/main/print-pcl.c:1261 src/main/print-pcl.c:1269 -#: src/main/print-pcl.c:1277 src/main/print-pcl.c:1285 +#: src/main/print-olympus.c:1762 src/main/print-olympus.c:1770 +#: src/main/print-olympus.c:1778 src/main/print-olympus.c:1786 +#: src/main/print-pcl.c:1329 src/main/print-pcl.c:1337 +#: src/main/print-pcl.c:1345 src/main/print-pcl.c:1353 msgid "Output Level Adjustment" -msgstr "Aanpassing uitvoerniveau" +msgstr "Aanpassing van uitvoerniveau" -#: src/main/dither-main.c:89 +#: src/main/dither-main.c:92 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 "" -"Pas de hoeveelheid inkt van de afdruk aan. Verminder de hoeveelheid als de " -"inkt door het papier heen komt of vlekt; verhoog de hoeveelheid als zwarte " -"stukken niet goed dicht zijn." +"De dichtheid (hoeveelheid inkt) van de afdruk aanpassen. Verminder de " +"dichtheid als de inkt vlekt of door het papier heen komt; verhoog de " +"dichtheid als zwarte stukken niet goed dicht zijn." -#: src/main/dither-main.c:97 +#: src/main/dither-main.c:100 msgid "Dither Algorithm" msgstr "Ruis-algoritme" -#: src/main/dither-main.c:97 +#: src/main/dither-main.c:100 msgid "Screening Adjustment" -msgstr "Aanpassing aftasting" +msgstr "Aanpassing van aftasting" -#: src/main/dither-main.c:98 +#: src/main/dither-main.c:101 msgid "" "Choose the dither algorithm to be used.\n" "Adaptive Hybrid usually produces the best all-around quality.\n" @@ -125,13 +138,13 @@ msgid "" "Hybrid Floyd-Steinberg generally produces inferior output." msgstr "" "Kies het ruis-algoritme.\n" -"Aangepast hybride produceert meestal de beste algemene kwaliteit.\n" -"EvenTone is een nieuw, experimenteel algoritme dat vaak een uitstekend " +"'Aangepast hybride' produceert meestal de beste algemene kwaliteit.\n" +"'EvenTone' is een nieuw, experimenteel algoritme dat vaak een uitstekend " "resultaat geeft.\n" -"Geordend is sneller en geeft bijna dezelfde kwaliteit bij foto's.\n" -"Snel en Zeer snel zijn aanzienlijk sneller, en doen het goed bij tekst en " -"lijntekeningen.\n" -"Hybride Floyd-Steinberg produceert meestal een slecht resultaat." +"'Geordend' is sneller en geeft bijna dezelfde kwaliteit bij foto's.\n" +"'Snel' en 'Zeer snel' zijn aanzienlijk sneller, en doen het goed bij tekst " +"en lijntekeningen.\n" +"'Hybride Floyd-Steinberg' produceert meestal een slecht resultaat." #: src/main/module.c:52 msgid "Miscellaneous (unclassified)" @@ -149,9 +162,9 @@ msgstr "Kleurconversie-module" msgid "Dither algorithm" msgstr "Ruis-algoritme" -#: src/main/print-canon.c:200 src/main/print-escp2.c:180 -#: src/main/print-lexmark.c:266 src/main/print-olympus.c:1699 -#: src/main/print-pcl.c:1196 src/main/print-ps.c:67 +#: src/main/print-canon.c:200 src/main/print-escp2.c:182 +#: src/main/print-lexmark.c:266 src/main/print-olympus.c:1697 +#: src/main/print-pcl.c:1264 msgid "Page Size" msgstr "Paginagrootte" @@ -159,291 +172,298 @@ msgstr "Paginagrootte" #: src/main/print-canon.c:212 src/main/print-canon.c:218 #: src/main/print-canon.c:224 src/main/print-canon.c:230 #: src/main/print-canon.c:248 src/main/print-canon.c:272 -#: src/main/print-escp2.c:180 src/main/print-escp2.c:186 -#: src/main/print-escp2.c:192 src/main/print-escp2.c:198 -#: src/main/print-escp2.c:204 src/main/print-escp2.c:210 -#: src/main/print-escp2.c:228 src/main/print-escp2.c:245 -#: src/main/print-escp2.c:251 src/main/print-escp2.c:263 -#: src/main/print-escp2.c:281 src/main/print-lexmark.c:266 +#: src/main/print-escp2.c:182 src/main/print-escp2.c:188 +#: src/main/print-escp2.c:194 src/main/print-escp2.c:200 +#: src/main/print-escp2.c:206 src/main/print-escp2.c:212 +#: src/main/print-escp2.c:230 src/main/print-escp2.c:247 +#: src/main/print-escp2.c:253 src/main/print-escp2.c:265 +#: src/main/print-escp2.c:283 src/main/print-lexmark.c:266 #: src/main/print-lexmark.c:272 src/main/print-lexmark.c:278 -#: src/main/print-lexmark.c:284 src/main/print-olympus.c:1699 -#: src/main/print-olympus.c:1705 src/main/print-olympus.c:1711 -#: src/main/print-olympus.c:1717 src/main/print-pcl.c:1196 -#: src/main/print-pcl.c:1202 src/main/print-pcl.c:1208 -#: src/main/print-pcl.c:1214 src/main/print-pcl.c:1238 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 +#: src/main/print-lexmark.c:284 src/main/print-olympus.c:1697 +#: src/main/print-olympus.c:1703 src/main/print-olympus.c:1709 +#: src/main/print-olympus.c:1715 src/main/print-pcl.c:1264 +#: src/main/print-pcl.c:1270 src/main/print-pcl.c:1276 +#: src/main/print-pcl.c:1282 src/main/print-pcl.c:1306 src/main/print-ps.c:68 +#: src/main/print-ps.c:74 msgid "Basic Printer Setup" msgstr "Printerinstellingen" -#: src/main/print-canon.c:201 src/main/print-escp2.c:181 -#: src/main/print-lexmark.c:267 src/main/print-olympus.c:1700 -#: src/main/print-pcl.c:1197 src/main/print-ps.c:68 +#: src/main/print-canon.c:201 src/main/print-escp2.c:183 +#: src/main/print-lexmark.c:267 src/main/print-olympus.c:1698 +#: src/main/print-pcl.c:1265 msgid "Size of the paper being printed to" msgstr "Grootte van het papier waarop geprint wordt" -#: src/main/print-canon.c:206 src/main/print-escp2.c:186 -#: src/main/print-lexmark.c:272 src/main/print-olympus.c:1705 -#: src/main/print-pcl.c:1202 src/main/print-ps.c:73 src/cups/genppd.c:1417 +#: src/main/print-canon.c:206 src/main/print-escp2.c:188 +#: src/main/print-lexmark.c:272 src/main/print-olympus.c:1703 +#: src/main/print-pcl.c:1270 src/cups/genppd.c:1422 msgid "Media Type" msgstr "Type medium" -#: src/main/print-canon.c:207 src/main/print-escp2.c:187 -#: src/main/print-lexmark.c:273 src/main/print-olympus.c:1706 -#: src/main/print-pcl.c:1203 src/main/print-ps.c:74 +#: src/main/print-canon.c:207 src/main/print-escp2.c:189 +#: src/main/print-lexmark.c:273 src/main/print-olympus.c:1704 +#: src/main/print-pcl.c:1271 msgid "Type of media (plain paper, photo paper, etc.)" msgstr "Type medium (blanco papier, fotopapier, etc.)" -#: src/main/print-canon.c:212 src/main/print-escp2.c:192 -#: src/main/print-lexmark.c:278 src/main/print-olympus.c:1711 -#: src/main/print-pcl.c:1208 src/main/print-ps.c:79 src/cups/genppd.c:1445 +#: src/main/print-canon.c:212 src/main/print-escp2.c:194 +#: src/main/print-lexmark.c:278 src/main/print-olympus.c:1709 +#: src/main/print-pcl.c:1276 src/cups/genppd.c:1450 msgid "Media Source" msgstr "Bronmedium" -#: src/main/print-canon.c:213 src/main/print-escp2.c:193 -#: src/main/print-lexmark.c:279 src/main/print-olympus.c:1712 -#: src/main/print-pcl.c:1209 src/main/print-ps.c:80 +#: src/main/print-canon.c:213 src/main/print-escp2.c:195 +#: src/main/print-lexmark.c:279 src/main/print-olympus.c:1710 +#: src/main/print-pcl.c:1277 msgid "Source (input slot) of the media" -msgstr "Bronmedium (invoer poort)" +msgstr "Bronmedium (invoerpoort)" -#: src/main/print-canon.c:218 src/main/print-escp2.c:198 +#: src/main/print-canon.c:218 src/main/print-escp2.c:200 +#, fuzzy msgid "CD Hub Size" msgstr "Afmeting CD-printdeel" -#: src/main/print-canon.c:219 src/main/print-escp2.c:199 +#: src/main/print-canon.c:219 src/main/print-escp2.c:201 msgid "Print only outside of the hub of the CD, or all the way to the hole" msgstr "Druk af op het printdeel van de CD of helemaal tot het gat" -#: src/main/print-canon.c:224 src/main/print-escp2.c:204 +#: src/main/print-canon.c:224 src/main/print-escp2.c:206 msgid "CD Size (Custom)" -msgstr "" +msgstr "CD-grootte (handmatig)" -#: src/main/print-canon.c:225 src/main/print-escp2.c:205 +#: src/main/print-canon.c:225 src/main/print-escp2.c:207 msgid "Variable adjustment for the outer diameter of CD" -msgstr "" +msgstr "Variabele aanpassing van de buitendiameter van de CD" -#: src/main/print-canon.c:230 src/main/print-escp2.c:210 -#, fuzzy +#: src/main/print-canon.c:230 src/main/print-escp2.c:212 msgid "CD Hub Size (Custom)" -msgstr "Afmeting CD-printdeel" +msgstr "Afmeting van CD-printdeel (handmatig)" -#: src/main/print-canon.c:231 src/main/print-escp2.c:211 -#, fuzzy +#: src/main/print-canon.c:231 src/main/print-escp2.c:213 msgid "Variable adjustment to the inner hub of the CD" -msgstr "Schaal de afdruk tot de afmeting van de pagina" +msgstr "Schaal de afdruk tot de afmeting van de binnenrand van de CD" -#: src/main/print-canon.c:236 src/main/print-escp2.c:216 +#: src/main/print-canon.c:236 src/main/print-escp2.c:218 msgid "CD Horizontal Fine Adjustment" msgstr "Horizontale fijnafstelling van CD" #: src/main/print-canon.c:236 src/main/print-canon.c:242 -#: src/main/print-canon.c:254 src/main/print-escp2.c:216 -#: src/main/print-escp2.c:222 src/main/print-escp2.c:239 -#: src/main/print-escp2.c:275 src/main/print-lexmark.c:290 -#: src/main/print-olympus.c:1723 src/main/print-olympus.c:1729 -#: src/main/print-olympus.c:1735 src/main/print-pcl.c:1220 -#: src/main/print-ps.c:91 src/main/print-raw.c:80 +#: src/main/print-canon.c:254 src/main/print-escp2.c:218 +#: src/main/print-escp2.c:224 src/main/print-escp2.c:241 +#: src/main/print-escp2.c:277 src/main/print-lexmark.c:290 +#: src/main/print-olympus.c:1721 src/main/print-olympus.c:1727 +#: src/main/print-olympus.c:1733 src/main/print-pcl.c:1288 +#: src/main/print-raw.c:80 msgid "Advanced Printer Setup" msgstr "Geavanceerde instelling van de printer" #: src/main/print-canon.c:237 src/main/print-canon.c:243 -#: src/main/print-escp2.c:217 src/main/print-escp2.c:223 +#: src/main/print-escp2.c:219 src/main/print-escp2.c:225 msgid "Fine adjustment to horizontal position for CD printing" msgstr "Fijnafstelling van de horizontale positie voor het printen op een CD" -#: src/main/print-canon.c:242 src/main/print-escp2.c:222 +#: src/main/print-canon.c:242 src/main/print-escp2.c:224 msgid "CD Vertical Fine Adjustment" -msgstr "Vertikale fijnafstelling van CD" +msgstr "Verticale fijnafstelling van CD" -#: src/main/print-canon.c:248 src/main/print-escp2.c:228 -#: src/main/print-lexmark.c:284 src/main/print-olympus.c:1717 -#: src/main/print-pcl.c:1214 src/main/print-ps.c:85 src/cups/genppd.c:1518 +#: src/main/print-canon.c:248 src/main/print-escp2.c:230 +#: src/main/print-lexmark.c:284 src/main/print-olympus.c:1715 +#: src/main/print-pcl.c:1282 src/cups/genppd.c:1523 msgid "Resolution" msgstr "Resolutie" #: src/main/print-canon.c:249 src/main/print-lexmark.c:285 -#: src/main/print-olympus.c:1718 src/main/print-pcl.c:1215 -#: src/main/print-ps.c:86 +#: src/main/print-olympus.c:1716 src/main/print-pcl.c:1283 msgid "Resolution and quality of the print" msgstr "Resolutie en kwaliteit van de afdruk" -#: src/main/print-canon.c:254 src/main/print-escp2.c:239 -#: src/main/print-lexmark.c:290 src/main/print-olympus.c:1723 -#: src/main/print-pcl.c:1220 src/main/print-ps.c:91 src/main/print-raw.c:80 +#: src/main/print-canon.c:254 src/main/print-escp2.c:241 +#: src/main/print-lexmark.c:290 src/main/print-olympus.c:1721 +#: src/main/print-pcl.c:1288 src/main/print-raw.c:80 msgid "Ink Type" msgstr "Type inkt" -#: src/main/print-canon.c:255 src/main/print-escp2.c:240 -#: src/main/print-escp2.c:252 src/main/print-lexmark.c:291 -#: src/main/print-olympus.c:1724 src/main/print-pcl.c:1221 -#: src/main/print-ps.c:92 src/main/print-raw.c:81 +#: src/main/print-canon.c:255 src/main/print-escp2.c:242 +#: src/main/print-escp2.c:254 src/main/print-lexmark.c:291 +#: src/main/print-olympus.c:1722 src/main/print-pcl.c:1289 +#: src/main/print-raw.c:81 msgid "Type of ink in the printer" msgstr "Type inkt van de printer" #: src/main/print-canon.c:260 src/main/print-canon.c:261 -#: src/main/print-escp2.c:329 src/main/print-escp2.c:330 +#: src/main/print-escp2.c:331 src/main/print-escp2.c:332 #: src/main/print-lexmark.c:296 src/main/print-lexmark.c:297 -#: src/main/print-pcl.c:1226 src/main/print-pcl.c:1227 +#: src/main/print-pcl.c:1294 src/main/print-pcl.c:1295 msgid "Ink Channels" msgstr "Inktkanalen" -#: src/main/print-canon.c:260 src/main/print-escp2.c:130 -#: src/main/print-escp2.c:137 src/main/print-escp2.c:144 -#: src/main/print-escp2.c:287 src/main/print-escp2.c:293 -#: src/main/print-escp2.c:299 src/main/print-escp2.c:305 -#: src/main/print-escp2.c:311 src/main/print-escp2.c:317 -#: src/main/print-escp2.c:323 src/main/print-escp2.c:329 -#: src/main/print-escp2.c:335 src/main/print-lexmark.c:296 -#: src/main/print-pcl.c:1226 +#: src/main/print-canon.c:260 src/main/print-escp2.c:132 +#: src/main/print-escp2.c:139 src/main/print-escp2.c:146 +#: src/main/print-escp2.c:289 src/main/print-escp2.c:295 +#: src/main/print-escp2.c:301 src/main/print-escp2.c:307 +#: src/main/print-escp2.c:313 src/main/print-escp2.c:319 +#: src/main/print-escp2.c:325 src/main/print-escp2.c:331 +#: src/main/print-escp2.c:337 src/main/print-lexmark.c:296 +#: src/main/print-pcl.c:1294 msgid "Advanced Printer Functionality" msgstr "Geavanceerde functionaliteit van de printer" -#: src/main/print-canon.c:266 src/main/print-escp2.c:341 -#: src/main/print-lexmark.c:302 src/main/print-olympus.c:1741 -#: src/main/print-pcl.c:1232 src/main/print-ps.c:103 src/main/print-raw.c:86 +#: src/main/print-canon.c:266 src/main/print-escp2.c:343 +#: src/main/print-lexmark.c:302 src/main/print-olympus.c:1739 +#: src/main/print-pcl.c:1300 src/main/print-ps.c:80 src/main/print-raw.c:86 msgid "Printing Mode" msgstr "Wijze van printen" #: src/main/print-canon.c:266 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:341 -#: src/main/print-escp2.c:347 src/main/print-lexmark.c:302 -#: src/main/print-olympus.c:1741 src/main/print-pcl.c:1232 -#: src/main/print-ps.c:103 src/main/print-raw.c:86 +#: src/main/print-color.c:208 src/main/print-escp2.c:343 +#: src/main/print-escp2.c:349 src/main/print-lexmark.c:302 +#: src/main/print-olympus.c:1739 src/main/print-pcl.c:1300 +#: src/main/print-ps.c:80 src/main/print-raw.c:86 msgid "Core Parameter" msgstr "Hoofdparameters" -#: src/main/print-canon.c:267 src/main/print-escp2.c:342 -#: src/main/print-lexmark.c:303 src/main/print-olympus.c:1742 -#: src/main/print-pcl.c:1233 src/main/print-ps.c:104 src/main/print-raw.c:87 +#: src/main/print-canon.c:267 src/main/print-escp2.c:344 +#: src/main/print-lexmark.c:303 src/main/print-olympus.c:1740 +#: src/main/print-pcl.c:1301 src/main/print-ps.c:81 src/main/print-raw.c:87 msgid "Printing Output Mode" msgstr "Manier van printen" -#: src/main/print-canon.c:272 src/main/print-pcl.c:1238 +#: src/main/print-canon.c:272 src/main/print-pcl.c:1306 msgid "Double-Sided Printing" msgstr "Dubbelzijdig printen" -#: src/main/print-canon.c:273 src/main/print-pcl.c:1239 +#: src/main/print-canon.c:273 src/main/print-pcl.c:1307 msgid "Duplex/Tumble Setting" msgstr "Duplex/Omkeer stand" -#: src/main/print-canon.c:295 src/main/print-escp2.c:439 -#: src/main/print-lexmark.c:325 src/main/print-pcl.c:1261 +#: src/main/print-canon.c:295 src/main/print-escp2.c:446 +#: src/main/print-lexmark.c:325 src/main/print-pcl.c:1329 msgid "Cyan Density" msgstr "Hoeveelheid cyaan" -#: src/main/print-canon.c:296 src/main/print-escp2.c:440 -#: src/main/print-lexmark.c:326 src/main/print-pcl.c:1262 +#: src/main/print-canon.c:296 src/main/print-escp2.c:447 +#: src/main/print-lexmark.c:326 src/main/print-pcl.c:1330 msgid "Adjust the cyan density" msgstr "Pas de hoeveelheid cyaan aan" -#: src/main/print-canon.c:303 src/main/print-escp2.c:447 -#: src/main/print-lexmark.c:333 src/main/print-pcl.c:1269 +#: src/main/print-canon.c:303 src/main/print-escp2.c:454 +#: src/main/print-lexmark.c:333 src/main/print-pcl.c:1337 msgid "Magenta Density" msgstr "Hoeveelheid magenta" -#: src/main/print-canon.c:304 src/main/print-escp2.c:448 -#: src/main/print-lexmark.c:334 src/main/print-pcl.c:1270 +#: src/main/print-canon.c:304 src/main/print-escp2.c:455 +#: src/main/print-lexmark.c:334 src/main/print-pcl.c:1338 msgid "Adjust the magenta density" msgstr "Pas de hoeveelheid magenta aan" -#: src/main/print-canon.c:311 src/main/print-escp2.c:455 -#: src/main/print-lexmark.c:341 src/main/print-pcl.c:1277 +#: src/main/print-canon.c:311 src/main/print-escp2.c:462 +#: src/main/print-lexmark.c:341 src/main/print-pcl.c:1345 msgid "Yellow Density" -msgstr "Heoveelheid geel" +msgstr "Hoeveelheid geel" -#: src/main/print-canon.c:312 src/main/print-escp2.c:456 -#: src/main/print-lexmark.c:342 src/main/print-pcl.c:1278 +#: src/main/print-canon.c:312 src/main/print-escp2.c:463 +#: src/main/print-lexmark.c:342 src/main/print-pcl.c:1346 msgid "Adjust the yellow density" msgstr "Pas de hoeveelheid geel aan" -#: src/main/print-canon.c:319 src/main/print-escp2.c:463 -#: src/main/print-lexmark.c:349 src/main/print-pcl.c:1285 +#: src/main/print-canon.c:319 src/main/print-escp2.c:470 +#: src/main/print-lexmark.c:349 src/main/print-pcl.c:1353 msgid "Black Density" msgstr "Hoeveelheid zwart" -#: src/main/print-canon.c:320 src/main/print-escp2.c:464 -#: src/main/print-lexmark.c:350 src/main/print-pcl.c:1286 +#: src/main/print-canon.c:320 src/main/print-escp2.c:471 +#: src/main/print-lexmark.c:350 src/main/print-pcl.c:1354 msgid "Adjust the black density" msgstr "Pas de hoeveelheid zwart aan" #: src/main/print-canon.c:327 src/main/print-canon.c:328 -#: src/main/print-escp2.c:495 src/main/print-escp2.c:496 +#: src/main/print-escp2.c:534 src/main/print-escp2.c:535 #: src/main/print-lexmark.c:357 src/main/print-lexmark.c:358 -#: src/main/print-pcl.c:1293 src/main/print-pcl.c:1294 +#: src/main/print-pcl.c:1361 src/main/print-pcl.c:1362 msgid "Light Cyan Transition" -msgstr "Lichtcyaan overgang" +msgstr "Lichtcyaan-overgang" #: src/main/print-canon.c:327 src/main/print-canon.c:335 -#: src/main/print-canon.c:343 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-escp2.c:543 -#: src/main/print-escp2.c:551 src/main/print-escp2.c:559 -#: src/main/print-lexmark.c:357 src/main/print-lexmark.c:365 -#: src/main/print-pcl.c:1293 src/main/print-pcl.c:1301 +#: src/main/print-canon.c:343 src/main/print-escp2.c:502 +#: src/main/print-escp2.c:510 src/main/print-escp2.c:518 +#: src/main/print-escp2.c:526 src/main/print-escp2.c:534 +#: src/main/print-escp2.c:542 src/main/print-escp2.c:550 +#: src/main/print-escp2.c:558 src/main/print-escp2.c:566 +#: src/main/print-escp2.c:574 src/main/print-escp2.c:582 +#: src/main/print-escp2.c:590 src/main/print-escp2.c:598 +#: src/main/print-escp2.c:606 src/main/print-escp2.c:614 +#: src/main/print-escp2.c:622 src/main/print-escp2.c:630 +#: src/main/print-escp2.c:638 src/main/print-escp2.c:646 +#: src/main/print-escp2.c:654 src/main/print-escp2.c:662 +#: src/main/print-escp2.c:670 src/main/print-escp2.c:678 +#: src/main/print-escp2.c:686 src/main/print-escp2.c:694 +#: src/main/print-escp2.c:702 src/main/print-escp2.c:710 +#: src/main/print-escp2.c:718 src/main/print-escp2.c:726 +#: src/main/print-escp2.c:734 src/main/print-lexmark.c:357 +#: src/main/print-lexmark.c:365 src/main/print-pcl.c:1361 +#: src/main/print-pcl.c:1369 msgid "Advanced Ink Adjustment" msgstr "Geavanceerde aanpassing van de inkt" #: src/main/print-canon.c:335 src/main/print-canon.c:336 -#: src/main/print-escp2.c:503 src/main/print-escp2.c:504 +#: src/main/print-escp2.c:566 src/main/print-escp2.c:567 #: src/main/print-lexmark.c:365 src/main/print-lexmark.c:366 -#: src/main/print-pcl.c:1301 src/main/print-pcl.c:1302 +#: src/main/print-pcl.c:1369 src/main/print-pcl.c:1370 msgid "Light Magenta Transition" -msgstr "Lichtmagenta overgang" +msgstr "Lichtmagenta-overgang" #: src/main/print-canon.c:343 src/main/print-canon.c:344 msgid "Light Yellow Transition" -msgstr "Lichtgeel overgang" +msgstr "Lichtgeel-overgang" -#: src/main/print-canon.c:363 src/main/print-pcl.c:1482 +#: src/main/print-canon.c:363 src/main/print-pcl.c:1550 #: src/main/escp2-resolutions.c:557 src/main/escp2-resolutions.c:565 #: src/main/escp2-resolutions.c:576 src/main/escp2-resolutions.c:588 msgid "Off" msgstr "Uit" -#: src/main/print-canon.c:364 src/main/print-pcl.c:1483 +#: src/main/print-canon.c:364 src/main/print-pcl.c:1551 msgid "Long Edge (Standard)" msgstr "Lange zijde (standaard)" -#: src/main/print-canon.c:365 src/main/print-pcl.c:1484 +#: src/main/print-canon.c:365 src/main/print-pcl.c:1552 msgid "Short Edge (Flip)" msgstr "Korte zijde (omslaan)" -#: src/main/print-canon.c:629 src/main/print-escp2.c:1648 +#: src/main/print-canon.c:629 src/main/print-escp2.c:2012 #: src/main/xmli18n-tmp.h:6 msgid "CD - 5 inch" msgstr "CD - 5 inch" -#: src/main/print-canon.c:631 src/main/print-escp2.c:1650 +#: src/main/print-canon.c:631 src/main/print-escp2.c:2014 #: src/main/xmli18n-tmp.h:7 msgid "CD - 3 inch" msgstr "CD - 3 inch" -#: src/main/print-canon.c:633 src/main/print-escp2.c:1652 +#: src/main/print-canon.c:633 src/main/print-escp2.c:2016 #: src/main/xmli18n-tmp.h:8 -#, fuzzy msgid "CD - Custom" -msgstr "Gebruiker" +msgstr "CD - handmatig" -#: src/main/print-canon.c:656 src/main/print-escp2.c:1677 +#: src/main/print-canon.c:656 src/main/print-escp2.c:2041 msgid "Normal" msgstr "Normaal" -#: src/main/print-canon.c:658 src/main/print-escp2.c:1679 +#: src/main/print-canon.c:658 src/main/print-escp2.c:2043 msgid "Print To Hub" msgstr "Afdrukken naar tussenstation" -#: src/main/print-canon.c:773 src/main/print-escp2.c:2011 -#: src/main/print-lexmark.c:1279 src/main/print-olympus.c:1996 -#: src/main/print-pcl.c:1776 src/main/print-ps.c:170 src/main/print-raw.c:135 -#: src/gutenprintui/panel.c:289 src/gutenprintui2/panel.c:289 +#: src/main/print-canon.c:773 src/main/print-escp2.c:2450 +#: src/main/print-lexmark.c:1279 src/main/print-olympus.c:1994 +#: src/main/print-pcl.c:1844 src/main/print-ps.c:310 src/main/print-raw.c:135 +#: src/gutenprintui2/panel.c:290 msgid "Color" msgstr "Kleur" -#: src/main/print-canon.c:775 src/main/print-escp2.c:2013 -#: src/main/print-lexmark.c:1281 src/main/print-pcl.c:1778 -#: src/main/print-ps.c:172 src/main/print-raw.c:137 +#: src/main/print-canon.c:775 src/main/print-escp2.c:2452 +#: src/main/print-lexmark.c:1281 src/main/print-pcl.c:1846 +#: src/main/print-ps.c:312 src/main/print-raw.c:137 msgid "Black and White" msgstr "Zwart en wit" @@ -457,7 +477,7 @@ msgstr "Heldere kleuren" #: src/main/print-color.c:52 msgid "Correct Hue Only" -msgstr "Alleen juiste hue" +msgstr "Alleen juiste tint" #: src/main/print-color.c:53 msgid "Uncorrected" @@ -481,7 +501,7 @@ msgstr "Voorbehandeld met ruis-algoritme" #: src/main/print-color.c:121 src/main/escp2-channels.c:916 #: src/main/escp2-channels.c:929 src/main/escp2-channels.c:943 -#: src/gutenprintui/panel.c:290 src/gutenprintui2/panel.c:290 +#: src/gutenprintui2/panel.c:291 msgid "Grayscale" msgstr "Grijsschaal" @@ -505,7 +525,7 @@ msgstr "CMYK" msgid "KCMY" msgstr "KCMY" -#: src/main/print-color.c:165 src/main/print-color.c:446 +#: src/main/print-color.c:165 src/main/print-color.c:454 msgid "Channel " msgstr "Kanaal" @@ -520,7 +540,7 @@ msgstr "Gamma" #: src/main/print-color.c:166 msgid "Gamma for raw channel " -msgstr "Gamma voor het raw-kannaal " +msgstr "Gamma voor het raw-kanaal " #: src/main/print-color.c:176 msgid "Color Correction" @@ -561,17 +581,17 @@ msgid "Output image type" msgstr "Beeldtype van de uitvoer" #: src/main/print-color.c:208 src/main/print-color.c:209 -#: src/main/print-escp2.c:347 +#: src/main/print-escp2.c:349 msgid "Raw Channels" msgstr "Raw-kanalen" #: src/main/print-color.c:216 msgid "SimpleGamma" -msgstr "Envoudige gamma" +msgstr "Eenvoudige gamma" #: src/main/print-color.c:217 msgid "Do not correct for screen gamma" -msgstr "Niet corrigeren voor het gamma van het scherm" +msgstr "Niet corrigeren voor de gamma van het scherm" #: src/main/print-color.c:224 msgid "Brightness" @@ -610,25 +630,25 @@ 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 "" -"Pas de gamma van de afdruk aan. Grotere waarden produceren een helderder " +"De gamma van de afdruk aanpassen. Grotere waarden produceren een helderder " "afdruk, terwijl lagere waarden een over het geheel donkerder afdruk maken. " #: src/main/print-color.c:258 msgid "AppGamma" -msgstr "AppGamma" +msgstr "Toepassingsgamma" #: src/main/print-color.c:259 msgid "Gamma value assumed by application" -msgstr "Gamma-waarde verondersteld door de applicatie" - -#: src/main/print-color.c:266 src/main/escp2-channels.c:3048 -#: src/main/escp2-channels.c:3060 src/main/escp2-channels.c:3068 -#: src/main/escp2-channels.c:3078 src/main/escp2-channels.c:3089 -#: src/main/escp2-channels.c:3101 src/main/escp2-channels.c:3117 -#: src/main/escp2-channels.c:3125 src/main/escp2-channels.c:3138 -#: src/main/escp2-channels.c:3151 src/main/escp2-channels.c:3165 -#: src/main/escp2-channels.c:3179 src/main/escp2-channels.c:3194 -#: src/gutenprintui/panel.c:2152 src/gutenprintui2/panel.c:2153 +msgstr "De gammawaarde die verondersteld wordt door de applicatie" + +#: src/main/print-color.c:266 src/main/escp2-channels.c:3087 +#: src/main/escp2-channels.c:3099 src/main/escp2-channels.c:3107 +#: src/main/escp2-channels.c:3117 src/main/escp2-channels.c:3128 +#: src/main/escp2-channels.c:3140 src/main/escp2-channels.c:3156 +#: src/main/escp2-channels.c:3164 src/main/escp2-channels.c:3177 +#: src/main/escp2-channels.c:3190 src/main/escp2-channels.c:3204 +#: src/main/escp2-channels.c:3218 src/main/escp2-channels.c:3230 +#: src/main/escp2-channels.c:3243 src/gutenprintui2/panel.c:2328 #: src/escputil/escputil.c:978 src/escputil/escputil.c:997 #: src/escputil/escputil.c:1201 msgid "Cyan" @@ -638,14 +658,14 @@ msgstr "Cyaan" msgid "Adjust the cyan gamma" msgstr "Pas de hoeveelheid cyaan aan" -#: src/main/print-color.c:274 src/main/escp2-channels.c:3049 -#: src/main/escp2-channels.c:3059 src/main/escp2-channels.c:3070 -#: src/main/escp2-channels.c:3079 src/main/escp2-channels.c:3090 -#: src/main/escp2-channels.c:3103 src/main/escp2-channels.c:3116 -#: src/main/escp2-channels.c:3126 src/main/escp2-channels.c:3139 -#: src/main/escp2-channels.c:3152 src/main/escp2-channels.c:3164 -#: src/main/escp2-channels.c:3178 src/main/escp2-channels.c:3195 -#: src/gutenprintui/panel.c:2159 src/gutenprintui2/panel.c:2160 +#: src/main/print-color.c:274 src/main/escp2-channels.c:3088 +#: src/main/escp2-channels.c:3098 src/main/escp2-channels.c:3109 +#: src/main/escp2-channels.c:3118 src/main/escp2-channels.c:3129 +#: src/main/escp2-channels.c:3142 src/main/escp2-channels.c:3155 +#: src/main/escp2-channels.c:3165 src/main/escp2-channels.c:3178 +#: src/main/escp2-channels.c:3191 src/main/escp2-channels.c:3203 +#: src/main/escp2-channels.c:3217 src/main/escp2-channels.c:3229 +#: src/main/escp2-channels.c:3244 src/gutenprintui2/panel.c:2335 #: src/escputil/escputil.c:979 src/escputil/escputil.c:998 #: src/escputil/escputil.c:1202 msgid "Magenta" @@ -655,14 +675,14 @@ msgstr "Magenta" msgid "Adjust the magenta gamma" msgstr "Pas de hoeveelheid magenta aan" -#: src/main/print-color.c:282 src/main/escp2-channels.c:3050 -#: src/main/escp2-channels.c:3061 src/main/escp2-channels.c:3069 -#: src/main/escp2-channels.c:3080 src/main/escp2-channels.c:3091 -#: src/main/escp2-channels.c:3105 src/main/escp2-channels.c:3112 -#: src/main/escp2-channels.c:3127 src/main/escp2-channels.c:3140 -#: src/main/escp2-channels.c:3153 src/main/escp2-channels.c:3163 -#: src/main/escp2-channels.c:3177 src/main/escp2-channels.c:3196 -#: src/gutenprintui/panel.c:2166 src/gutenprintui2/panel.c:2167 +#: src/main/print-color.c:282 src/main/escp2-channels.c:3089 +#: src/main/escp2-channels.c:3100 src/main/escp2-channels.c:3108 +#: src/main/escp2-channels.c:3119 src/main/escp2-channels.c:3130 +#: src/main/escp2-channels.c:3144 src/main/escp2-channels.c:3151 +#: src/main/escp2-channels.c:3166 src/main/escp2-channels.c:3179 +#: src/main/escp2-channels.c:3192 src/main/escp2-channels.c:3202 +#: src/main/escp2-channels.c:3216 src/main/escp2-channels.c:3228 +#: src/main/escp2-channels.c:3245 src/gutenprintui2/panel.c:2342 #: src/escputil/escputil.c:980 src/escputil/escputil.c:999 #: src/escputil/escputil.c:1203 msgid "Yellow" @@ -672,10 +692,9 @@ msgstr "Geel" msgid "Adjust the yellow gamma" msgstr "Pas de hoeveelheid geel aan" -#: src/main/print-color.c:290 src/main/escp2-channels.c:3168 -#: src/main/escp2-channels.c:3181 src/gutenprintui/panel.c:2180 -#: src/gutenprintui2/panel.c:2181 src/escputil/escputil.c:987 -#: src/escputil/escputil.c:1005 +#: src/main/print-color.c:290 src/main/escp2-channels.c:3207 +#: src/main/escp2-channels.c:3220 src/gutenprintui2/panel.c:2356 +#: src/escputil/escputil.c:987 src/escputil/escputil.c:1005 msgid "Red" msgstr "Rood" @@ -683,8 +702,7 @@ msgstr "Rood" msgid "Adjust the red gamma" msgstr "Pas de hoeveelheid rood aan" -#: src/main/print-color.c:298 src/gutenprintui/panel.c:2187 -#: src/gutenprintui2/panel.c:2188 +#: src/main/print-color.c:298 src/gutenprintui2/panel.c:2363 msgid "Green" msgstr "Groen" @@ -692,10 +710,9 @@ msgstr "Groen" msgid "Adjust the green gamma" msgstr "Pas de hoeveelheid groen aan" -#: src/main/print-color.c:306 src/main/escp2-channels.c:3169 -#: src/main/escp2-channels.c:3182 src/gutenprintui/panel.c:2194 -#: src/gutenprintui2/panel.c:2195 src/escputil/escputil.c:988 -#: src/escputil/escputil.c:1006 +#: src/main/print-color.c:306 src/main/escp2-channels.c:3208 +#: src/main/escp2-channels.c:3221 src/gutenprintui2/panel.c:2370 +#: src/escputil/escputil.c:988 src/escputil/escputil.c:1006 msgid "Blue" msgstr "Blauw" @@ -704,14 +721,14 @@ msgid "Adjust the blue gamma" msgstr "Pas de hoeveelheid blauw aan" #: src/main/print-color.c:314 src/main/print-lexmark.c:613 -#: src/main/escp2-channels.c:3047 src/main/escp2-channels.c:3057 -#: src/main/escp2-channels.c:3058 src/main/escp2-channels.c:3071 -#: src/main/escp2-channels.c:3081 src/main/escp2-channels.c:3088 -#: src/main/escp2-channels.c:3100 src/main/escp2-channels.c:3113 -#: src/main/escp2-channels.c:3124 src/main/escp2-channels.c:3137 -#: src/main/escp2-channels.c:3150 src/main/escp2-channels.c:3156 -#: src/main/escp2-channels.c:3180 src/main/escp2-channels.c:3193 -#: src/gutenprintui/panel.c:2173 src/gutenprintui2/panel.c:2174 +#: src/main/escp2-channels.c:3086 src/main/escp2-channels.c:3096 +#: src/main/escp2-channels.c:3097 src/main/escp2-channels.c:3110 +#: src/main/escp2-channels.c:3120 src/main/escp2-channels.c:3127 +#: src/main/escp2-channels.c:3139 src/main/escp2-channels.c:3152 +#: src/main/escp2-channels.c:3163 src/main/escp2-channels.c:3176 +#: src/main/escp2-channels.c:3189 src/main/escp2-channels.c:3195 +#: src/main/escp2-channels.c:3219 src/main/escp2-channels.c:3231 +#: src/main/escp2-channels.c:3242 src/gutenprintui2/panel.c:2349 #: src/escputil/escputil.c:975 src/escputil/escputil.c:996 #: src/escputil/escputil.c:1200 msgid "Black" @@ -721,7 +738,7 @@ msgstr "Zwart" msgid "Adjust the black gamma" msgstr "Pas de hoeveelheid zwart aan" -#: src/main/print-color.c:322 src/main/print-olympus.c:1764 +#: src/main/print-color.c:322 src/main/print-olympus.c:1762 msgid "Cyan Balance" msgstr "Cyaanwaarde" @@ -732,23 +749,23 @@ msgstr "Grijswaarde" #: src/main/print-color.c:323 msgid "Adjust the cyan gray balance" -msgstr "Pas de cyaan-grijs balans aan" +msgstr "Pas de cyaan-grijsbalans aan" -#: src/main/print-color.c:330 src/main/print-olympus.c:1772 +#: src/main/print-color.c:330 src/main/print-olympus.c:1770 msgid "Magenta Balance" msgstr "Magentawaarde" #: src/main/print-color.c:331 msgid "Adjust the magenta gray balance" -msgstr "Pas de hoeveelheid magenta-grijs aan" +msgstr "Pas de magenta-grijsbalans aan" -#: src/main/print-color.c:338 src/main/print-olympus.c:1780 +#: src/main/print-color.c:338 src/main/print-olympus.c:1778 msgid "Yellow Balance" msgstr "Geelwaarde" #: src/main/print-color.c:339 msgid "Adjust the yellow gray balance" -msgstr "Pas de hoeveelheid geel-grijs aan" +msgstr "Pas de geel-grijsbalans aan" #: src/main/print-color.c:346 msgid "Saturation" @@ -759,9 +776,9 @@ msgid "" "Adjust the saturation (color balance) of the print\n" "Use zero saturation to produce grayscale output using color and black inks" msgstr "" -"Pas de verzadiging van (kleurbalans) van de afdruk aan\n" -"Gebruik nul-verzadiging voor een grijswaarde uitvoer door gekleurde en " -"zwarte inkt te gebruiken" +"De verzadiging (kleurbalans) van de afdruk aanpassen\n" +"Gebruik verzadiging nul voor een grijswaardenuitvoer met behulp van " +"gekleurde en zwarte inkt" #: src/main/print-color.c:357 msgid "Ink Limit" @@ -769,9 +786,11 @@ msgstr "Inktgrenswaarde" #: 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:353 -#: src/main/print-escp2.c:359 src/main/print-escp2.c:365 -#: src/main/print-escp2.c:371 src/main/print-escp2.c:377 +#: src/main/print-color.c:421 src/main/print-color.c:553 +#: src/main/print-escp2.c:355 src/main/print-escp2.c:361 +#: src/main/print-escp2.c:367 src/main/print-escp2.c:373 +#: src/main/print-escp2.c:379 src/main/print-escp2.c:742 +#: src/main/print-escp2.c:750 src/main/print-escp2.c:758 msgid "Advanced Output Control" msgstr "Geavanceerde controle van uitvoer" @@ -779,218 +798,226 @@ msgstr "Geavanceerde controle van uitvoer" msgid "Limit the total ink printed to the page" msgstr "Beperk de totale hoeveelheid inkt naar de pagina" -#: src/main/print-color.c:365 +#: src/main/print-color.c:365 src/main/print-escp2.c:742 msgid "GCR Transition" -msgstr "GCR-transitie" +msgstr "GCR-overgang" -#: src/main/print-color.c:366 +#: src/main/print-color.c:366 src/main/print-escp2.c:743 msgid "Adjust the gray component transition rate" -msgstr "Pas de grijscomponent transitiesnelheid aan" +msgstr "De grijscomponent-overgangssnelheid aanpassen" -#: src/main/print-color.c:373 +#: src/main/print-color.c:373 src/main/print-escp2.c:750 msgid "GCR Lower Bound" msgstr "GCR-ondergrens" -#: src/main/print-color.c:374 +#: src/main/print-color.c:374 src/main/print-escp2.c:751 msgid "Lower bound of gray component reduction" -msgstr "Ondergrens van grijscomponent vermindering" +msgstr "Ondergrens van grijscomponent-vermindering" -#: src/main/print-color.c:381 +#: src/main/print-color.c:381 src/main/print-escp2.c:758 msgid "GCR Upper Bound" msgstr "GCR-bovengrens" -#: src/main/print-color.c:382 +#: src/main/print-color.c:382 src/main/print-escp2.c:759 msgid "Upper bound of gray component reduction" -msgstr "Bovengrens van grijscomponent vermindering" +msgstr "Bovengrens van grijscomponent-vermindering" -#: src/main/print-color.c:447 src/main/print-color.c:457 -#: src/main/print-color.c:465 src/main/print-color.c:473 -#: src/main/print-color.c:481 src/main/print-color.c:489 -#: src/main/print-color.c:497 src/main/print-color.c:505 -#: src/main/print-color.c:513 +#: src/main/print-color.c:421 +msgid "LUT dump file" +msgstr "" + +#: src/main/print-color.c:422 +msgid "Dump file for LUT for external color adjustment" +msgstr "" + +#: src/main/print-color.c:455 src/main/print-color.c:465 +#: src/main/print-color.c:473 src/main/print-color.c:481 +#: src/main/print-color.c:489 src/main/print-color.c:497 +#: src/main/print-color.c:505 src/main/print-color.c:513 +#: src/main/print-color.c:521 msgid "Output Curves" msgstr "Kromme van uitvoer" -#: src/main/print-color.c:447 +#: src/main/print-color.c:455 msgid "Curve for raw channel " msgstr "Kromme van 'raw'-kanaal " -#: src/main/print-color.c:457 +#: src/main/print-color.c:465 msgid "Cyan Curve" msgstr "Cyaan-kromme" -#: src/main/print-color.c:458 +#: src/main/print-color.c:466 msgid "Cyan curve" msgstr "Cyaan-kromme" -#: src/main/print-color.c:465 +#: src/main/print-color.c:473 msgid "Magenta Curve" msgstr "Magenta-kromme" -#: src/main/print-color.c:466 +#: src/main/print-color.c:474 msgid "Magenta curve" msgstr "Magenta-kromme" -#: src/main/print-color.c:473 +#: src/main/print-color.c:481 msgid "Yellow Curve" msgstr "Geel-kromme" -#: src/main/print-color.c:474 +#: src/main/print-color.c:482 msgid "Yellow curve" msgstr "Geel-kromme" -#: src/main/print-color.c:481 +#: src/main/print-color.c:489 msgid "Black Curve" msgstr "Zwart-kromme" -#: src/main/print-color.c:482 +#: src/main/print-color.c:490 msgid "Black curve" msgstr "Zwart-kromme" -#: src/main/print-color.c:489 +#: src/main/print-color.c:497 msgid "Red Curve" msgstr "Rood-kromme" -#: src/main/print-color.c:490 +#: src/main/print-color.c:498 msgid "Red curve" msgstr "Rood-kromme" -#: src/main/print-color.c:497 +#: src/main/print-color.c:505 msgid "Green Curve" msgstr "Groen-kromme" -#: src/main/print-color.c:498 +#: src/main/print-color.c:506 msgid "Green curve" msgstr "Groen-kromme" -#: src/main/print-color.c:505 +#: src/main/print-color.c:513 msgid "Blue Curve" msgstr "Blauw-kromme" -#: src/main/print-color.c:506 +#: src/main/print-color.c:514 msgid "Blue curve" msgstr "Blauw-kromme" -#: src/main/print-color.c:513 +#: src/main/print-color.c:521 msgid "White Curve" msgstr "Wit-kromme" -#: src/main/print-color.c:514 +#: src/main/print-color.c:522 msgid "White curve" msgstr "Wit-kromme" -#: src/main/print-color.c:521 +#: src/main/print-color.c:529 msgid "Hue Map" -msgstr "Hue-kaart" +msgstr "Tintenkaart" -#: src/main/print-color.c:521 src/main/print-color.c:529 -#: src/main/print-color.c:537 +#: src/main/print-color.c:529 src/main/print-color.c:537 +#: src/main/print-color.c:545 msgid "Advanced HSL Curves" msgstr "Geavanceerde HSL-krommen" -#: src/main/print-color.c:522 +#: src/main/print-color.c:530 msgid "Hue adjustment curve" -msgstr "Hue-aanpassingskromme" +msgstr "Tintaanpassingskromme" -#: src/main/print-color.c:529 +#: src/main/print-color.c:537 msgid "Saturation Map" msgstr "Verzadigingskaart" -#: src/main/print-color.c:530 +#: src/main/print-color.c:538 msgid "Saturation adjustment curve" msgstr "Verzadiging-aanpassingskromme" -#: src/main/print-color.c:537 +#: src/main/print-color.c:545 msgid "Luminosity Map" msgstr "Helderheidskaart" -#: src/main/print-color.c:538 +#: src/main/print-color.c:546 msgid "Luminosity adjustment curve" msgstr "Helderheid-aanpassingskromme" -#: src/main/print-color.c:545 +#: src/main/print-color.c:553 msgid "Gray Component Reduction" msgstr "Grijscomponent-vermindering" -#: src/main/print-color.c:546 +#: src/main/print-color.c:554 msgid "Gray component reduction curve" msgstr "Grijscomponent-verminderingskromme" -#: src/main/print-color.c:1670 +#: src/main/print-color.c:1743 msgid "Traditional Gutenprint color conversion" -msgstr "Traditionele Gutenprint kleurconversie" +msgstr "Traditionele Gutenprint-kleurconversie" -#: src/main/printers.c:517 +#: src/main/printers.c:514 #, c-format msgid "Value must be set for %s\n" msgstr "Waarde moet ingesteld worden voor %s\n" -#: src/main/printers.c:530 src/main/printers.c:535 +#: src/main/printers.c:527 src/main/printers.c:532 #, c-format msgid "`%s' is not a valid %s\n" msgstr "`%s' is geen juiste %s\n" -#: src/main/printers.c:554 +#: src/main/printers.c:551 #, c-format msgid "%s must be between %f and %f (is %f)\n" msgstr "%s moet liggen tussen %f en %f (is %f)\n" -#: src/main/printers.c:576 src/main/printers.c:600 +#: src/main/printers.c:573 src/main/printers.c:597 #, c-format msgid "%s must be between %d and %d (is %d)\n" msgstr "%s moet liggen tussen %d en %d (is %d)\n" -#: src/main/printers.c:631 +#: src/main/printers.c:628 #, c-format msgid "%s bounds must be between %f and %f\n" msgstr "grenzen van %s moeten liggen tussen %f en %f\n" -#: src/main/printers.c:639 +#: src/main/printers.c:636 #, c-format msgid "%s wrap mode must be %s\n" msgstr "%s doorloop-modus moet zijn %s\n" -#: src/main/printers.c:643 +#: src/main/printers.c:640 msgid "no wrap" msgstr "niet doorlopen (op de volgende regel)" -#: src/main/printers.c:643 +#: src/main/printers.c:640 msgid "wrap around" msgstr "doorlopen (op de volgende regel)" -#: src/main/printers.c:687 +#: src/main/printers.c:684 #, c-format msgid "Unknown type parameter %s (%d)\n" -msgstr "Onbekende type parameter %s (%d)\n" +msgstr "Onbekend type parameter %s (%d)\n" -#: src/main/printers.c:700 src/main/printers.c:711 +#: src/main/printers.c:697 src/main/printers.c:708 #, c-format msgid "%s out of range (value %d, min %d, max %d)\n" msgstr "%s buiten bereik (waarde %d, min %d, max %d)\n" -#: src/main/printers.c:772 +#: src/main/printers.c:768 msgid "Page size is not valid\n" -msgstr "Paginagrootte is niet geldig\n" +msgstr "Paginagrootte is ongeldig\n" -#: src/main/printers.c:793 +#: src/main/printers.c:789 #, c-format msgid "Top margin must not be less than %d\n" msgstr "Bovenmarge mag niet minder dan %d zijn\n" -#: src/main/printers.c:799 +#: src/main/printers.c:795 #, c-format msgid "Left margin must not be less than %d\n" msgstr "Linkermarge mag niet minder dan %d zijn\n" -#: src/main/printers.c:805 +#: src/main/printers.c:801 msgid "Height must be greater than zero\n" msgstr "Hoogte moet groter dan nul zijn\n" -#: src/main/printers.c:811 +#: src/main/printers.c:807 msgid "Width must be greater than zero\n" msgstr "Breedte moet groter dan nul zijn\n" -#: src/main/printers.c:817 +#: src/main/printers.c:813 #, c-format msgid "" "Image is too wide for the page: left margin is %d, width %d, right edge is %" @@ -999,7 +1026,7 @@ msgstr "" "Afbeelding is te breed voor de pagina: linkermarge is %d, breedte %d, " "rechterrand is %d\n" -#: src/main/printers.c:824 +#: src/main/printers.c:820 #, c-format msgid "" "Image is too long for the page: top margin is %d, height %d, bottom edge is %" @@ -1008,280 +1035,390 @@ msgstr "" "Afbeelding is te lang voor de pagina: bovenmarge is %d, hoogte %d, onderrand " "is %d\n" -#: src/main/print-escp2.c:162 +#: src/main/print-escp2.c:164 msgid "Automatic Printing Mode" msgstr "Automatische printmodus" -#: src/main/print-escp2.c:162 src/main/print-escp2.c:174 +#: src/main/print-escp2.c:164 src/main/print-escp2.c:176 #: src/main/generic-options.c:62 msgid "Basic Output Adjustment" msgstr "Basis uitvoeraanpassing" -#: src/main/print-escp2.c:163 +#: src/main/print-escp2.c:165 msgid "Automatic printing mode" msgstr "Automatische printmodus" -#: src/main/print-escp2.c:174 src/main/print-escp2.c:175 +#: src/main/print-escp2.c:176 src/main/print-escp2.c:177 #: src/main/generic-options.c:62 src/main/generic-options.c:63 msgid "Print Quality" msgstr "Printkwaliteit" -#: src/main/print-escp2.c:229 +#: src/main/print-escp2.c:231 msgid "Resolution of the print" msgstr "Resolutie van de afdruk" -#: src/main/print-escp2.c:245 +#: src/main/print-escp2.c:247 msgid "Enhanced Gloss" msgstr "Verhoogde glans" -#: src/main/print-escp2.c:246 +#: src/main/print-escp2.c:248 msgid "Add gloss enhancement" msgstr "Voeg glansverhoging toe" -#: src/main/print-escp2.c:251 +#: src/main/print-escp2.c:253 msgid "Ink Set" msgstr "Inktsetje" -#: src/main/print-escp2.c:257 +#: src/main/print-escp2.c:259 msgid "Printing Direction" msgstr "Richting van het afdrukken" -#: src/main/print-escp2.c:257 src/main/print-escp2.c:269 +#: src/main/print-escp2.c:259 src/main/print-escp2.c:271 msgid "Advanced Output Adjustment" msgstr "Geavanceerde aanpassing van uitvoer" -#: src/main/print-escp2.c:258 +#: src/main/print-escp2.c:260 msgid "Printing direction (unidirectional is higher quality, but slower)" msgstr "" "Richting van het afdrukken (unidirectioneel geeft hogere kwaliteit, echter " "langzamer)" -#: src/main/print-escp2.c:263 src/main/print-olympus.c:1735 +#: src/main/print-escp2.c:265 src/main/print-olympus.c:1733 msgid "Borderless" msgstr "Zonder randen" -#: src/main/print-escp2.c:264 src/main/print-olympus.c:1736 +#: src/main/print-escp2.c:266 src/main/print-olympus.c:1734 msgid "Print without borders" msgstr "Afdrukken zonder randen" -#: src/main/print-escp2.c:269 +#: src/main/print-escp2.c:271 msgid "Interleave Method" msgstr "Interleave methode" -#: src/main/print-escp2.c:270 +#: src/main/print-escp2.c:272 msgid "Interleave pattern to use" msgstr "Te gebruiken interleave patroon" -#: src/main/print-escp2.c:275 +#: src/main/print-escp2.c:277 msgid "Adjust dot size as necessary" msgstr "Pas de puntgrootte aan" -#: src/main/print-escp2.c:276 +#: src/main/print-escp2.c:278 msgid "Adjust dot size as necessary to achieve desired density" msgstr "Pas de puntgrootte aan om de gewenste dichtheid te verkrijgen" -#: src/main/print-escp2.c:281 src/main/print-escp2.c:282 +#: src/main/print-escp2.c:283 src/main/print-escp2.c:284 msgid "Output Order" msgstr "Volgorde van uitvoer" -#: src/main/print-escp2.c:287 src/main/print-escp2.c:288 +#: src/main/print-escp2.c:289 src/main/print-escp2.c:290 msgid "Alignment Passes" msgstr "Uitlijnstappen" -#: src/main/print-escp2.c:293 src/main/print-escp2.c:294 +#: src/main/print-escp2.c:295 src/main/print-escp2.c:296 msgid "Alignment Choices" msgstr "Uitlijnkeuzes" -#: src/main/print-escp2.c:299 src/main/print-escp2.c:300 +#: src/main/print-escp2.c:301 src/main/print-escp2.c:302 msgid "Ink change command" msgstr "Inkt verandercommando" -#: src/main/print-escp2.c:305 src/main/print-escp2.c:306 +#: src/main/print-escp2.c:307 src/main/print-escp2.c:308 msgid "Alternate Alignment Passes" msgstr "Wissel uitlijnstappen af" -#: src/main/print-escp2.c:311 src/main/print-escp2.c:312 +#: src/main/print-escp2.c:313 src/main/print-escp2.c:314 msgid "Alternate Alignment Choices" msgstr "Wissel de uitlijnkeuzes" -#: src/main/print-escp2.c:317 +#: src/main/print-escp2.c:319 msgid "Supports Packet Mode" msgstr "Ondersteunt pakketmodus" -#: src/main/print-escp2.c:318 -#, fuzzy +#: src/main/print-escp2.c:320 msgid "Supports D4 Packet Mode" -msgstr "Ondersteunt pakketmodus" +msgstr "Ondersteunt D4-pakketmodus" -#: src/main/print-escp2.c:323 +#: src/main/print-escp2.c:325 msgid "Has Interchangeable Ink Cartridges" msgstr "" -#: src/main/print-escp2.c:324 +#: src/main/print-escp2.c:326 msgid "Has multiple choices of ink cartridges" msgstr "" -#: src/main/print-escp2.c:335 src/main/print-escp2.c:336 +#: src/main/print-escp2.c:337 src/main/print-escp2.c:338 msgid "Channel Names" msgstr "Kanaalnamen" -#: src/main/print-escp2.c:348 +#: src/main/print-escp2.c:350 msgid "Raw Channel Count" msgstr "Aantal raw-kanalen" -#: src/main/print-escp2.c:353 +#: src/main/print-escp2.c:355 msgid "Cyan Map" msgstr "Cyaankaart" -#: src/main/print-escp2.c:354 +#: src/main/print-escp2.c:356 msgid "Adjust the cyan map" msgstr "Pas de cyaankaart aan" -#: src/main/print-escp2.c:359 +#: src/main/print-escp2.c:361 msgid "Magenta Map" msgstr "Magentakaart" -#: src/main/print-escp2.c:360 +#: src/main/print-escp2.c:362 msgid "Adjust the magenta map" msgstr "Pas de magentakaart aan" -#: src/main/print-escp2.c:365 +#: src/main/print-escp2.c:367 msgid "Yellow Map" msgstr "Geelkaart" -#: src/main/print-escp2.c:366 +#: src/main/print-escp2.c:368 msgid "Adjust the yellow map" msgstr "Pas de geelkaart aan" -#: src/main/print-escp2.c:371 +#: src/main/print-escp2.c:373 msgid "Blue Map" msgstr "Blauwkaart" -#: src/main/print-escp2.c:372 +#: src/main/print-escp2.c:374 msgid "Adjust the blue map" msgstr "Pas de blauwkaart aan" -#: src/main/print-escp2.c:377 +#: src/main/print-escp2.c:379 msgid "Red Map" msgstr "Roodkaart" -#: src/main/print-escp2.c:378 +#: src/main/print-escp2.c:380 msgid "Adjust the red map" msgstr "Pas de roodkaart aan" -#: src/main/print-escp2.c:471 +#: src/main/print-escp2.c:478 msgid "Red Density" msgstr "Hoeveelheid rood" -#: src/main/print-escp2.c:472 +#: src/main/print-escp2.c:479 msgid "Adjust the red density" msgstr "Pas de hoeveelheid rood aan" -#: src/main/print-escp2.c:479 +#: src/main/print-escp2.c:486 msgid "Blue Density" msgstr "Hoeveelheid blauw" -#: src/main/print-escp2.c:480 +#: src/main/print-escp2.c:487 msgid "Adjust the blue density" msgstr "Pas de hoeveelheid blauw aan" -#: src/main/print-escp2.c:487 +#: src/main/print-escp2.c:494 msgid "Gloss Level" msgstr "Glansniveau" -#: src/main/print-escp2.c:488 +#: src/main/print-escp2.c:495 msgid "Adjust the gloss level" msgstr "Pas het glansniveau aan" -#: src/main/print-escp2.c:511 src/main/print-escp2.c:512 +#: src/main/print-escp2.c:502 +msgid "Drop Size Small" +msgstr "" + +#: src/main/print-escp2.c:503 +#, fuzzy +msgid "Drop Size 1 (small)" +msgstr "CD-grootte (handmatig)" + +#: src/main/print-escp2.c:510 +msgid "Drop Size Medium" +msgstr "" + +#: src/main/print-escp2.c:511 +#, fuzzy +msgid "Drop Size 2 (medium)" +msgstr "CD-grootte (handmatig)" + +#: src/main/print-escp2.c:518 +msgid "Drop Size Large" +msgstr "" + +#: src/main/print-escp2.c:519 +msgid "Drop Size 3 (large)" +msgstr "" + +#: src/main/print-escp2.c:526 src/main/print-escp2.c:527 +#, fuzzy +msgid "Light Cyan Value" +msgstr "Lichtcyaan" + +#: src/main/print-escp2.c:542 src/main/print-escp2.c:543 +#, fuzzy +msgid "Light Cyan Density Scale" +msgstr "Hoeveelheid cyaan" + +#: src/main/print-escp2.c:550 src/main/print-escp2.c:551 +#, fuzzy +msgid "Light Magenta Value" +msgstr "Lichtmagenta" + +#: src/main/print-escp2.c:558 src/main/print-escp2.c:559 +#, fuzzy +msgid "Light Magenta Density Scale" +msgstr "Hoeveelheid magenta" + +#: src/main/print-escp2.c:574 src/main/print-escp2.c:575 +#, fuzzy +msgid "Dark Yellow Value" +msgstr "Donkergeel" + +#: src/main/print-escp2.c:582 src/main/print-escp2.c:583 msgid "Dark Yellow Transition" msgstr "Donkergeel overgang" -#: src/main/print-escp2.c:519 src/main/print-escp2.c:520 -#: src/main/print-escp2.c:527 src/main/print-escp2.c:528 +#: src/main/print-escp2.c:590 src/main/print-escp2.c:591 +#, fuzzy +msgid "Dark Yellow Density Scale" +msgstr "Heoveelheid geel" + +#: src/main/print-escp2.c:598 src/main/print-escp2.c:599 +#: src/main/print-escp2.c:622 src/main/print-escp2.c:623 +#, fuzzy +msgid "Gray Value" +msgstr "Grijsschaal" + +#: src/main/print-escp2.c:606 src/main/print-escp2.c:607 +#: src/main/print-escp2.c:630 src/main/print-escp2.c:631 msgid "Gray Transition" msgstr "Grijs overgang" -#: src/main/print-escp2.c:535 src/main/print-escp2.c:536 -#: src/main/print-escp2.c:559 src/main/print-escp2.c:560 +#: src/main/print-escp2.c:614 src/main/print-escp2.c:615 +#: src/main/print-escp2.c:638 src/main/print-escp2.c:639 +#, fuzzy +msgid "Gray Density Scale" +msgstr "Grijsschaal" + +#: src/main/print-escp2.c:646 src/main/print-escp2.c:647 +#: src/main/print-escp2.c:718 src/main/print-escp2.c:719 +#, fuzzy +msgid "Light Gray Value" +msgstr "Lichtgrijs overgang" + +#: src/main/print-escp2.c:654 src/main/print-escp2.c:655 +#: src/main/print-escp2.c:726 src/main/print-escp2.c:727 msgid "Light Gray Transition" msgstr "Lichtgrijs overgang" -#: src/main/print-escp2.c:543 src/main/print-escp2.c:544 +#: src/main/print-escp2.c:662 src/main/print-escp2.c:663 +#: src/main/print-escp2.c:734 src/main/print-escp2.c:735 +#, fuzzy +msgid "Light Gray Density Scale" +msgstr "Lichtgrijs overgang" + +#: src/main/print-escp2.c:670 src/main/print-escp2.c:671 +#, fuzzy +msgid "Dark Gray Value" +msgstr "Donkergrijs overgang" + +#: src/main/print-escp2.c:678 src/main/print-escp2.c:679 msgid "Dark Gray Transition" msgstr "Donkergrijs overgang" -#: src/main/print-escp2.c:551 +#: src/main/print-escp2.c:686 src/main/print-escp2.c:687 +#, fuzzy +msgid "Dark Gray Density Scale" +msgstr "Donkergrijs overgang" + +#: src/main/print-escp2.c:694 +#, fuzzy +msgid "Mid Gray Value" +msgstr "Grijsschaal" + +#: src/main/print-escp2.c:695 +#, fuzzy +msgid "Medium Gray Value" +msgstr "Middelgrijs overgang" + +#: src/main/print-escp2.c:702 msgid "Mid Gray Transition" msgstr "Middelgrijs overgang" -#: src/main/print-escp2.c:552 +#: src/main/print-escp2.c:703 msgid "Medium Gray Transition" msgstr "Middelgrijs overgang" -#: src/main/print-escp2.c:1635 +#: src/main/print-escp2.c:710 +#, fuzzy +msgid "Mid Gray Density Scale" +msgstr "Middelgrijs overgang" + +#: src/main/print-escp2.c:711 +#, fuzzy +msgid "Medium Gray Density Scale" +msgstr "Middelgrijs overgang" + +#: src/main/print-escp2.c:1999 msgid "Full Manual Control" msgstr "Volledig handmatige controle" -#: src/main/print-escp2.c:1637 +#: src/main/print-escp2.c:2001 msgid "Automatic Setting Control" msgstr "Automatische controle op instellingen" -#: src/main/print-escp2.c:1732 src/main/generic-options.c:213 +#: src/main/print-escp2.c:2096 src/main/generic-options.c:213 #: src/main/generic-options.c:230 msgid "Manual Control" msgstr "Handmatige controle" -#: src/main/print-escp2.c:1771 src/main/print-escp2.c:1863 -#: src/main/print-escp2.c:1875 src/main/print-pcl.c:230 -#: src/main/escp2-channels.c:2805 src/main/escp2-papers.c:1707 -#: src/main/escp2-papers.c:1731 src/main/escp2-papers.c:1764 -#: src/main/escp2-papers.c:1815 src/main/escp2-papers.c:1857 -#: src/main/escp2-papers.c:1899 src/main/escp2-papers.c:1992 -#: src/main/escp2-resolutions.c:640 src/main/escp2-resolutions.c:655 -#: src/main/escp2-resolutions.c:668 src/main/generic-options.c:36 -#: src/gutenprintui/panel.c:2613 src/gutenprintui2/panel.c:2639 +#: src/main/print-escp2.c:2139 src/main/print-escp2.c:2231 +#: src/main/print-escp2.c:2243 src/main/print-pcl.c:237 +#: src/main/escp2-channels.c:2827 src/main/escp2-channels.c:2836 +#: src/main/escp2-papers.c:1718 src/main/escp2-papers.c:1742 +#: src/main/escp2-papers.c:1775 src/main/escp2-papers.c:1826 +#: src/main/escp2-papers.c:1868 src/main/escp2-papers.c:1910 +#: src/main/escp2-papers.c:2003 src/main/escp2-resolutions.c:640 +#: src/main/escp2-resolutions.c:655 src/main/escp2-resolutions.c:670 +#: src/main/escp2-resolutions.c:683 src/main/generic-options.c:36 +#: src/gutenprintui2/panel.c:2814 msgid "Standard" msgstr "Standaard" -#: src/main/print-escp2.c:1842 +#: src/main/print-escp2.c:2210 msgid "Automatic" msgstr "Automatisch" -#: src/main/print-escp2.c:1844 +#: src/main/print-escp2.c:2212 msgid "Bidirectional" msgstr "Bidirectioneel" -#: src/main/print-escp2.c:1846 +#: src/main/print-escp2.c:2214 msgid "Unidirectional" msgstr "Unidirectioneel" -#: src/main/print-escp2.c:1877 +#: src/main/print-escp2.c:2245 msgid "Alternate Fill" msgstr "Afwisselend opvullen" -#: src/main/print-escp2.c:1879 +#: src/main/print-escp2.c:2247 msgid "Ascending Fill" msgstr "Oplopend vullen" -#: src/main/print-escp2.c:1881 +#: src/main/print-escp2.c:2249 msgid "Descending Fill" msgstr "Aflopend vullen" -#: src/main/print-escp2.c:1883 +#: src/main/print-escp2.c:2251 msgid "Ascending Double" msgstr "Dubbel oplopend" -#: src/main/print-escp2.c:1885 +#: src/main/print-escp2.c:2253 msgid "Nearest Neighbor Avoidance" msgstr "Vermijden van naaste buur" -#: src/main/print-escp2.c:2328 +#: src/main/print-escp2.c:2771 #, c-format msgid "This printer does not support raw printer output at depth %d\n" msgstr "Deze printer ondersteunt geen 'raw' printuitvoer op de diepte %d\n" -#: src/main/print-escp2.c:3436 src/main/print-olympus.c:2451 +#: src/main/print-escp2.c:3934 src/main/print-olympus.c:2449 #: src/main/print-raw.c:217 msgid "Print options not verified; cannot print.\n" msgstr "Print opties niet geverifiëerd; kan niet printen.\n" @@ -1355,109 +1492,109 @@ msgid "Three Color Composite" msgstr "Drie kleuren composiet" #: src/main/print-lexmark.c:607 src/main/print-lexmark.c:677 -#: src/main/escp2-channels.c:1540 src/main/escp2-channels.c:1554 -#: src/main/escp2-channels.c:1568 src/main/escp2-channels.c:1582 -#: src/main/escp2-channels.c:1808 src/main/escp2-channels.c:1823 -#: src/main/escp2-channels.c:1838 src/main/escp2-channels.c:1855 +#: src/main/escp2-channels.c:1554 src/main/escp2-channels.c:1568 +#: src/main/escp2-channels.c:1582 src/main/escp2-channels.c:1596 +#: src/main/escp2-channels.c:1822 src/main/escp2-channels.c:1837 +#: src/main/escp2-channels.c:1852 src/main/escp2-channels.c:1869 msgid "Six Color Photo" msgstr "Zes kleuren foto" #: src/main/print-lexmark.c:610 src/main/print-lexmark.c:680 -#: src/main/escp2-channels.c:1475 src/main/escp2-channels.c:1489 -#: src/main/escp2-channels.c:1503 src/main/escp2-channels.c:1517 -#: src/main/escp2-channels.c:1752 src/main/escp2-channels.c:1767 -#: src/main/escp2-channels.c:1784 +#: src/main/escp2-channels.c:1489 src/main/escp2-channels.c:1503 +#: src/main/escp2-channels.c:1517 src/main/escp2-channels.c:1531 +#: src/main/escp2-channels.c:1766 src/main/escp2-channels.c:1781 +#: src/main/escp2-channels.c:1798 msgid "Five Color Photo Composite" msgstr "Vijf kleuren foto composiet" -#: src/main/print-lexmark.c:856 src/main/escp2-papers.c:1341 -#: src/main/escp2-papers.c:1385 src/main/escp2-papers.c:1429 -#: src/main/escp2-papers.c:1477 src/main/escp2-papers.c:1525 -#: src/main/escp2-papers.c:1569 +#: src/main/print-lexmark.c:856 src/main/escp2-papers.c:1351 +#: src/main/escp2-papers.c:1395 src/main/escp2-papers.c:1439 +#: src/main/escp2-papers.c:1487 src/main/escp2-papers.c:1535 +#: src/main/escp2-papers.c:1579 msgid "Plain Paper" msgstr "Blanco papier" -#: src/main/print-lexmark.c:860 src/main/escp2-papers.c:1347 -#: src/main/escp2-papers.c:1391 src/main/escp2-papers.c:1435 -#: src/main/escp2-papers.c:1483 src/main/escp2-papers.c:1531 -#: src/main/escp2-papers.c:1575 +#: src/main/print-lexmark.c:860 src/main/escp2-papers.c:1357 +#: src/main/escp2-papers.c:1401 src/main/escp2-papers.c:1445 +#: src/main/escp2-papers.c:1493 src/main/escp2-papers.c:1541 +#: src/main/escp2-papers.c:1585 msgid "Glossy Film" msgstr "Glanzende laag" -#: src/main/print-lexmark.c:864 src/main/escp2-papers.c:1349 -#: src/main/escp2-papers.c:1393 src/main/escp2-papers.c:1437 -#: src/main/escp2-papers.c:1485 src/main/escp2-papers.c:1533 -#: src/main/escp2-papers.c:1577 +#: src/main/print-lexmark.c:864 src/main/escp2-papers.c:1359 +#: src/main/escp2-papers.c:1403 src/main/escp2-papers.c:1447 +#: src/main/escp2-papers.c:1495 src/main/escp2-papers.c:1543 +#: src/main/escp2-papers.c:1587 msgid "Transparencies" msgstr "Transparanten" -#: src/main/print-lexmark.c:868 src/main/escp2-papers.c:1351 -#: src/main/escp2-papers.c:1395 src/main/escp2-papers.c:1439 -#: src/main/escp2-papers.c:1487 src/main/escp2-papers.c:1535 -#: src/main/escp2-papers.c:1579 +#: src/main/print-lexmark.c:868 src/main/escp2-papers.c:1361 +#: src/main/escp2-papers.c:1405 src/main/escp2-papers.c:1449 +#: src/main/escp2-papers.c:1497 src/main/escp2-papers.c:1545 +#: src/main/escp2-papers.c:1589 msgid "Envelopes" msgstr "Enveloppen" -#: src/main/print-lexmark.c:872 src/main/escp2-papers.c:1355 -#: src/main/escp2-papers.c:1399 src/main/escp2-papers.c:1443 -#: src/main/escp2-papers.c:1491 src/main/escp2-papers.c:1539 -#: src/main/escp2-papers.c:1583 +#: src/main/print-lexmark.c:872 src/main/escp2-papers.c:1365 +#: src/main/escp2-papers.c:1409 src/main/escp2-papers.c:1453 +#: src/main/escp2-papers.c:1501 src/main/escp2-papers.c:1549 +#: src/main/escp2-papers.c:1593 msgid "Matte Paper" msgstr "Mat papier" -#: src/main/print-lexmark.c:876 src/main/escp2-papers.c:1359 -#: src/main/escp2-papers.c:1403 src/main/escp2-papers.c:1447 -#: src/main/escp2-papers.c:1495 src/main/escp2-papers.c:1543 -#: src/main/escp2-papers.c:1587 +#: src/main/print-lexmark.c:876 src/main/escp2-papers.c:1369 +#: src/main/escp2-papers.c:1413 src/main/escp2-papers.c:1457 +#: src/main/escp2-papers.c:1505 src/main/escp2-papers.c:1553 +#: src/main/escp2-papers.c:1597 msgid "Inkjet Paper" msgstr "Inkjet-papier" -#: src/main/print-lexmark.c:880 src/main/escp2-papers.c:1361 -#: src/main/escp2-papers.c:1405 src/main/escp2-papers.c:1449 -#: src/main/escp2-papers.c:1497 src/main/escp2-papers.c:1545 -#: src/main/escp2-papers.c:1589 +#: src/main/print-lexmark.c:880 src/main/escp2-papers.c:1371 +#: src/main/escp2-papers.c:1415 src/main/escp2-papers.c:1459 +#: src/main/escp2-papers.c:1507 src/main/escp2-papers.c:1555 +#: src/main/escp2-papers.c:1599 msgid "Photo Quality Inkjet Paper" msgstr "Fotokwaliteit Inkjet-papier" -#: src/main/print-lexmark.c:884 src/main/escp2-papers.c:1363 -#: src/main/escp2-papers.c:1407 src/main/escp2-papers.c:1451 -#: src/main/escp2-papers.c:1499 src/main/escp2-papers.c:1547 -#: src/main/escp2-papers.c:1591 +#: src/main/print-lexmark.c:884 src/main/escp2-papers.c:1373 +#: src/main/escp2-papers.c:1417 src/main/escp2-papers.c:1461 +#: src/main/escp2-papers.c:1509 src/main/escp2-papers.c:1557 +#: src/main/escp2-papers.c:1601 msgid "Photo Paper" msgstr "Fotopapier" -#: src/main/print-lexmark.c:888 src/main/escp2-papers.c:1365 -#: src/main/escp2-papers.c:1409 src/main/escp2-papers.c:1453 -#: src/main/escp2-papers.c:1501 src/main/escp2-papers.c:1549 -#: src/main/escp2-papers.c:1593 src/main/escp2-papers.c:1617 +#: src/main/print-lexmark.c:888 src/main/escp2-papers.c:1375 +#: src/main/escp2-papers.c:1419 src/main/escp2-papers.c:1463 +#: src/main/escp2-papers.c:1511 src/main/escp2-papers.c:1559 +#: src/main/escp2-papers.c:1603 src/main/escp2-papers.c:1627 msgid "Premium Glossy Photo Paper" msgstr "Premium glanzend fotopapier" -#: src/main/print-lexmark.c:892 src/main/escp2-papers.c:1369 -#: src/main/escp2-papers.c:1413 src/main/escp2-papers.c:1457 -#: src/main/escp2-papers.c:1505 src/main/escp2-papers.c:1553 -#: src/main/escp2-papers.c:1597 +#: src/main/print-lexmark.c:892 src/main/escp2-papers.c:1379 +#: src/main/escp2-papers.c:1423 src/main/escp2-papers.c:1467 +#: src/main/escp2-papers.c:1515 src/main/escp2-papers.c:1563 +#: src/main/escp2-papers.c:1607 msgid "Premium Luster Photo Paper" msgstr "Premium Luster Photo Papier" -#: src/main/print-lexmark.c:896 src/main/escp2-papers.c:1371 -#: src/main/escp2-papers.c:1415 src/main/escp2-papers.c:1463 -#: src/main/escp2-papers.c:1511 src/main/escp2-papers.c:1555 -#: src/main/escp2-papers.c:1603 +#: src/main/print-lexmark.c:896 src/main/escp2-papers.c:1381 +#: src/main/escp2-papers.c:1425 src/main/escp2-papers.c:1473 +#: src/main/escp2-papers.c:1521 src/main/escp2-papers.c:1565 +#: src/main/escp2-papers.c:1613 msgid "Photo Quality Glossy Paper" msgstr "Fotokwaliteit glanzend papier" -#: src/main/print-lexmark.c:900 src/main/escp2-papers.c:1373 -#: src/main/escp2-papers.c:1417 src/main/escp2-papers.c:1465 -#: src/main/escp2-papers.c:1513 src/main/escp2-papers.c:1557 -#: src/main/escp2-papers.c:1605 +#: src/main/print-lexmark.c:900 src/main/escp2-papers.c:1383 +#: src/main/escp2-papers.c:1427 src/main/escp2-papers.c:1475 +#: src/main/escp2-papers.c:1523 src/main/escp2-papers.c:1567 +#: src/main/escp2-papers.c:1615 msgid "Ilford Heavy Paper" msgstr "Ilford Heavy Paper" -#: src/main/print-lexmark.c:904 src/main/escp2-papers.c:1377 -#: src/main/escp2-papers.c:1421 src/main/escp2-papers.c:1469 -#: src/main/escp2-papers.c:1517 src/main/escp2-papers.c:1561 -#: src/main/escp2-papers.c:1609 src/main/escp2-papers.c:1619 +#: src/main/print-lexmark.c:904 src/main/escp2-papers.c:1387 +#: src/main/escp2-papers.c:1431 src/main/escp2-papers.c:1479 +#: src/main/escp2-papers.c:1527 src/main/escp2-papers.c:1571 +#: src/main/escp2-papers.c:1619 src/main/escp2-papers.c:1629 msgid "Other" msgstr "Overige" @@ -1473,50 +1610,50 @@ msgstr "Handmatig met pauze" msgid "Manual without Pause" msgstr "Handmatig zonder pauze" -#: src/main/print-olympus.c:277 +#: src/main/print-olympus.c:275 msgid "Coated" msgstr "Gecoat" -#: src/main/print-olympus.c:278 src/cups/genppd.c:1726 src/cups/genppd.c:1753 -#: src/cups/genppd.c:1834 +#: src/main/print-olympus.c:276 src/cups/genppd.c:1732 src/cups/genppd.c:1759 +#: src/cups/genppd.c:1840 msgid "None" msgstr "Geen" -#: src/main/print-olympus.c:963 src/main/print-olympus.c:1023 -#: src/main/print-olympus.c:1127 +#: src/main/print-olympus.c:961 src/main/print-olympus.c:1021 +#: src/main/print-olympus.c:1125 msgid "Glossy" msgstr "Glanzend" -#: src/main/print-olympus.c:964 src/main/print-olympus.c:1024 -#: src/main/print-olympus.c:1128 +#: src/main/print-olympus.c:962 src/main/print-olympus.c:1022 +#: src/main/print-olympus.c:1126 msgid "Texture" msgstr "Oppervlaktestructuur" -#: src/main/print-olympus.c:1025 src/main/print-olympus.c:1129 +#: src/main/print-olympus.c:1023 src/main/print-olympus.c:1127 msgid "Matte" msgstr "Mat" -#: src/main/print-olympus.c:1729 src/main/print-olympus.c:1730 +#: src/main/print-olympus.c:1727 src/main/print-olympus.c:1728 msgid "Laminate Pattern" msgstr "Laagjespatroon" -#: src/main/print-olympus.c:1765 +#: src/main/print-olympus.c:1763 msgid "Adjust the cyan balance" msgstr "Pas de cyaanbalans aan" -#: src/main/print-olympus.c:1773 +#: src/main/print-olympus.c:1771 msgid "Adjust the magenta balance" msgstr "Pas de magentabalans aan" -#: src/main/print-olympus.c:1781 +#: src/main/print-olympus.c:1779 msgid "Adjust the yellow balance" msgstr "Pas de geelbalans aan" -#: src/main/print-olympus.c:1788 +#: src/main/print-olympus.c:1786 msgid "Black Balance" msgstr "Zwartbalans" -#: src/main/print-olympus.c:1789 +#: src/main/print-olympus.c:1787 msgid "Adjust the black balance" msgstr "Pas de zwartbalans aan" @@ -1548,91 +1685,115 @@ msgstr "Sneldrogend foto" msgid "Quick-dry Transparency" msgstr "Sneldrogend transparant" -#: src/main/print-pcl.c:231 src/main/xmli18n-tmp.h:16 +#: src/main/print-pcl.c:238 src/main/xmli18n-tmp.h:17 msgid "Manual" msgstr "Handmatig" -#: src/main/print-pcl.c:233 +#: src/main/print-pcl.c:240 +msgid "Tray 1 - Movable Guides" +msgstr "" + +#: src/main/print-pcl.c:241 msgid "Tray 1" msgstr "Lade 1" -#: src/main/print-pcl.c:234 src/main/print-pcl.c:240 +#: src/main/print-pcl.c:242 +msgid "Tray 2 - Movable Guides" +msgstr "" + +#: src/main/print-pcl.c:243 src/main/print-pcl.c:251 msgid "Tray 2" msgstr "Lade 2" -#: src/main/print-pcl.c:235 +#: src/main/print-pcl.c:244 +msgid "Tray 3 - Movable Guides" +msgstr "" + +#: src/main/print-pcl.c:245 msgid "Tray 3" msgstr "Lade 3" -#: src/main/print-pcl.c:236 +#: src/main/print-pcl.c:246 +msgid "Tray 4 - Movable Guides" +msgstr "" + +#: src/main/print-pcl.c:247 msgid "Tray 4" msgstr "Lade 4" -#: src/main/print-pcl.c:237 +#: src/main/print-pcl.c:248 msgid "Portable Sheet Feeder" msgstr "Draagbare Sheet Feeder" -#: src/main/print-pcl.c:238 +#: src/main/print-pcl.c:249 msgid "Desktop Sheet Feeder" msgstr "Desktop Sheet Feeder" -#: src/main/print-pcl.c:239 +#: src/main/print-pcl.c:250 msgid "Tray" msgstr "Lade" -#: src/main/print-pcl.c:241 +#: src/main/print-pcl.c:252 msgid "Optional Source" msgstr "Optionele Bron" -#: src/main/print-pcl.c:242 +#: src/main/print-pcl.c:253 msgid "Autoselect" msgstr "Automatisch Selecteren" -#: src/main/print-pcl.c:256 +#: src/main/print-pcl.c:267 msgid "150x150 DPI" msgstr "150x150 DPI" -#: src/main/print-pcl.c:257 +#: src/main/print-pcl.c:268 msgid "300x300 DPI" msgstr "300x300 DPI" -#: src/main/print-pcl.c:258 +#: src/main/print-pcl.c:269 msgid "600x300 DPI" msgstr "600x300 DPI" -#: src/main/print-pcl.c:259 +#: src/main/print-pcl.c:270 msgid "600x600 DPI monochrome" msgstr "600x600 DPI monochrome" -#: src/main/print-pcl.c:260 +#: src/main/print-pcl.c:271 msgid "600x600 DPI" msgstr "600x600 DPI" -#: src/main/print-pcl.c:261 +#: src/main/print-pcl.c:272 msgid "1200x600 DPI" msgstr "1200x600 DPI" -#: src/main/print-pcl.c:262 +#: src/main/print-pcl.c:273 msgid "2400x600 DPI" msgstr "2400x600 DPI" -#: src/main/print-pcl.c:1470 +#: src/main/print-pcl.c:1538 msgid "Color + Black Cartridges" msgstr "Kleur + Zwarte patronen" -#: src/main/print-pcl.c:1471 +#: src/main/print-pcl.c:1539 msgid "Color + Photo Cartridges" msgstr "Kleur + Foto patronen" -#: src/main/print-ps.c:97 +#: src/main/print-ps.c:68 msgid "PPDFile" msgstr "PPD-bestand" -#: src/main/print-ps.c:98 src/gutenprintui/panel.c:1768 -#: src/gutenprintui2/panel.c:1768 +#: src/main/print-ps.c:69 src/gutenprintui2/panel.c:1943 msgid "PPD File" msgstr "PPD-bestand" +#: src/main/print-ps.c:74 +#, fuzzy +msgid "Model Name" +msgstr "Kanaalnamen" + +#: src/main/print-ps.c:75 +msgid "PPD File Model Name" +msgstr "" + #: src/main/print-raw.c:223 msgid "Image dimensions must match paper dimensions" msgstr "" @@ -1649,259 +1810,265 @@ msgstr "Grijsschaal met drie waarden" #: src/main/escp2-channels.c:1035 src/main/escp2-channels.c:1048 #: src/main/escp2-channels.c:1061 src/main/escp2-channels.c:1074 #: src/main/escp2-channels.c:1087 src/main/escp2-channels.c:1100 -#: src/main/escp2-channels.c:2505 src/main/escp2-channels.c:2528 -#: src/main/escp2-channels.c:2548 src/main/escp2-channels.c:2568 -#: src/main/escp2-channels.c:2588 src/main/escp2-channels.c:2608 +#: src/main/escp2-channels.c:2525 src/main/escp2-channels.c:2548 +#: src/main/escp2-channels.c:2568 src/main/escp2-channels.c:2588 +#: src/main/escp2-channels.c:2608 src/main/escp2-channels.c:2628 msgid "Quadtone" msgstr "Viertonig" -#: src/main/escp2-channels.c:1604 src/main/escp2-channels.c:1618 +#: src/main/escp2-channels.c:1466 +#, fuzzy +msgid "Four Color Photo" +msgstr "Zes kleuren foto" + +#: src/main/escp2-channels.c:1618 src/main/escp2-channels.c:1632 msgid "Six Color Enhanced Composite" msgstr "Zes kleuren verbeterde samenstelling" -#: src/main/escp2-channels.c:1641 src/main/escp2-channels.c:1655 -#: src/main/escp2-channels.c:1669 src/main/escp2-channels.c:1705 +#: src/main/escp2-channels.c:1655 src/main/escp2-channels.c:1669 +#: src/main/escp2-channels.c:1683 src/main/escp2-channels.c:1719 msgid "Seven Color Photo" msgstr "Zevenkleuren foto" -#: src/main/escp2-channels.c:1691 +#: src/main/escp2-channels.c:1705 msgid "Seven Color Enhanced" msgstr "Zeven kleuren verbeterd" -#: src/main/escp2-channels.c:1728 +#: src/main/escp2-channels.c:1742 msgid "Eight Color Photo" msgstr "Achtkleuren foto" -#: src/main/escp2-channels.c:1876 src/main/escp2-channels.c:1888 -#: src/main/escp2-channels.c:1894 +#: src/main/escp2-channels.c:1890 src/main/escp2-channels.c:1902 +#: src/main/escp2-channels.c:1908 msgid "One Color Raw" msgstr "Enkelkleur 'raw'" -#: src/main/escp2-channels.c:1900 +#: src/main/escp2-channels.c:1914 msgid "One Color Raw Enhanced Gloss" msgstr "Enkelkleur 'raw' verbeterde glans" -#: src/main/escp2-channels.c:1913 src/main/escp2-channels.c:1925 +#: src/main/escp2-channels.c:1927 src/main/escp2-channels.c:1939 msgid "Two Color Raw" msgstr "Tweekleuren 'raw'" -#: src/main/escp2-channels.c:1939 src/main/escp2-channels.c:1953 -#: src/main/escp2-channels.c:1980 src/main/escp2-channels.c:1993 -#: src/main/escp2-channels.c:2006 src/main/escp2-channels.c:2019 -#: src/main/escp2-channels.c:2033 src/main/escp2-channels.c:2047 -#: src/main/escp2-channels.c:2060 +#: src/main/escp2-channels.c:1953 src/main/escp2-channels.c:1967 +#: src/main/escp2-channels.c:1994 src/main/escp2-channels.c:2007 +#: src/main/escp2-channels.c:2020 src/main/escp2-channels.c:2033 +#: src/main/escp2-channels.c:2047 src/main/escp2-channels.c:2061 +#: src/main/escp2-channels.c:2074 msgid "Three Color Raw" msgstr "Driekleuren 'raw'" -#: src/main/escp2-channels.c:1967 +#: src/main/escp2-channels.c:1981 msgid "Three Color Raw Gloss" msgstr "Driekleuren 'raw' glanzend" -#: src/main/escp2-channels.c:2067 src/main/escp2-channels.c:2073 -#: src/main/escp2-channels.c:2079 src/main/escp2-channels.c:2085 -#: src/main/escp2-channels.c:2091 src/main/escp2-channels.c:2097 -#: src/main/escp2-channels.c:2103 src/main/escp2-channels.c:2109 -#: src/main/escp2-channels.c:2115 src/main/escp2-channels.c:2121 +#: src/main/escp2-channels.c:2081 src/main/escp2-channels.c:2087 +#: src/main/escp2-channels.c:2093 src/main/escp2-channels.c:2099 +#: src/main/escp2-channels.c:2105 src/main/escp2-channels.c:2111 +#: src/main/escp2-channels.c:2117 src/main/escp2-channels.c:2123 +#: src/main/escp2-channels.c:2129 src/main/escp2-channels.c:2135 +#: src/main/escp2-channels.c:2141 msgid "Four Color Raw" msgstr "Vierkleuren 'raw'" -#: src/main/escp2-channels.c:2127 +#: src/main/escp2-channels.c:2147 msgid "Four Color Raw Gloss" msgstr "Vierkleuren 'raw' glanzend" -#: src/main/escp2-channels.c:2142 src/main/escp2-channels.c:2156 +#: src/main/escp2-channels.c:2162 src/main/escp2-channels.c:2176 msgid "Five Color Raw" msgstr "Vijfkleuren 'raw'" -#: src/main/escp2-channels.c:2170 src/main/escp2-channels.c:2186 -#: src/main/escp2-channels.c:2192 src/main/escp2-channels.c:2198 -#: src/main/escp2-channels.c:2213 src/main/escp2-channels.c:2234 +#: src/main/escp2-channels.c:2190 src/main/escp2-channels.c:2206 +#: src/main/escp2-channels.c:2212 src/main/escp2-channels.c:2218 +#: src/main/escp2-channels.c:2233 src/main/escp2-channels.c:2254 msgid "Six Color Raw" msgstr "Zeskleuren 'raw'" -#: src/main/escp2-channels.c:2219 +#: src/main/escp2-channels.c:2239 msgid "Six Color Enhanced Gloss Raw" msgstr "Zeskleuren verbeterde glans 'raw'" -#: src/main/escp2-channels.c:2250 src/main/escp2-channels.c:2265 -#: src/main/escp2-channels.c:2280 +#: src/main/escp2-channels.c:2270 src/main/escp2-channels.c:2285 +#: src/main/escp2-channels.c:2300 msgid "Seven Color Raw" msgstr "Zevenkleuren 'raw'" -#: src/main/escp2-channels.c:2297 +#: src/main/escp2-channels.c:2317 msgid "Seven Color Enhanced Gloss Raw" msgstr "Zevenkleuren verbeterde glans 'raw'" -#: src/main/escp2-channels.c:2315 +#: src/main/escp2-channels.c:2335 msgid "Eight Color Raw" msgstr "Achtkleuren 'raw'" -#: src/main/escp2-channels.c:2482 src/main/escp2-channels.c:2495 -#: src/main/escp2-channels.c:2497 src/main/escp2-channels.c:2517 -#: src/main/escp2-channels.c:2520 src/main/escp2-channels.c:2540 -#: src/main/escp2-channels.c:2560 src/main/escp2-channels.c:2580 -#: src/main/escp2-channels.c:2600 src/main/escp2-channels.c:2620 -#: src/main/escp2-channels.c:2636 src/main/escp2-channels.c:2638 -#: src/main/escp2-channels.c:2640 src/main/escp2-channels.c:2642 -#: src/main/escp2-channels.c:2658 src/main/escp2-channels.c:2674 -#: src/main/escp2-channels.c:2694 +#: src/main/escp2-channels.c:2502 src/main/escp2-channels.c:2515 +#: src/main/escp2-channels.c:2517 src/main/escp2-channels.c:2537 +#: src/main/escp2-channels.c:2540 src/main/escp2-channels.c:2560 +#: src/main/escp2-channels.c:2580 src/main/escp2-channels.c:2600 +#: src/main/escp2-channels.c:2620 src/main/escp2-channels.c:2640 +#: src/main/escp2-channels.c:2656 src/main/escp2-channels.c:2658 +#: src/main/escp2-channels.c:2660 src/main/escp2-channels.c:2662 +#: src/main/escp2-channels.c:2678 src/main/escp2-channels.c:2694 +#: src/main/escp2-channels.c:2714 msgid "EPSON Standard Inks" msgstr "EPSON standaard inkt" -#: src/main/escp2-channels.c:2714 src/main/escp2-channels.c:2739 +#: src/main/escp2-channels.c:2734 src/main/escp2-channels.c:2759 msgid "UltraChrome Photo Black" msgstr "UltraChrome Photo Black" -#: src/main/escp2-channels.c:2718 src/main/escp2-channels.c:2743 +#: src/main/escp2-channels.c:2738 src/main/escp2-channels.c:2763 msgid "UltraChrome Matte Black" msgstr "UltraChrome Matte Black" -#: src/main/escp2-channels.c:2758 src/main/escp2-channels.c:2796 -#: src/main/escp2-channels.c:3167 src/escputil/escputil.c:976 +#: src/main/escp2-channels.c:2778 src/main/escp2-channels.c:2816 +#: src/main/escp2-channels.c:3206 src/escputil/escputil.c:976 msgid "Photo Black" msgstr "Fotozwart" -#: src/main/escp2-channels.c:2762 src/main/escp2-channels.c:2778 -#: src/main/escp2-channels.c:3166 src/escputil/escputil.c:986 +#: src/main/escp2-channels.c:2782 src/main/escp2-channels.c:2798 +#: src/main/escp2-channels.c:3205 src/escputil/escputil.c:986 msgid "Matte Black" msgstr "Matzwart" -#: src/main/escp2-channels.c:3092 src/main/escp2-channels.c:3102 -#: src/main/escp2-channels.c:3114 src/main/escp2-channels.c:3128 -#: src/main/escp2-channels.c:3141 src/main/escp2-channels.c:3154 -#: src/main/escp2-channels.c:3191 src/escputil/escputil.c:981 +#: src/main/escp2-channels.c:3131 src/main/escp2-channels.c:3141 +#: src/main/escp2-channels.c:3153 src/main/escp2-channels.c:3167 +#: src/main/escp2-channels.c:3180 src/main/escp2-channels.c:3193 +#: src/main/escp2-channels.c:3240 src/escputil/escputil.c:981 #: src/escputil/escputil.c:1204 msgid "Light Cyan" msgstr "Lichtcyaan" -#: src/main/escp2-channels.c:3093 src/main/escp2-channels.c:3104 -#: src/main/escp2-channels.c:3115 src/main/escp2-channels.c:3129 -#: src/main/escp2-channels.c:3142 src/main/escp2-channels.c:3155 -#: src/main/escp2-channels.c:3190 src/escputil/escputil.c:982 +#: src/main/escp2-channels.c:3132 src/main/escp2-channels.c:3143 +#: src/main/escp2-channels.c:3154 src/main/escp2-channels.c:3168 +#: src/main/escp2-channels.c:3181 src/main/escp2-channels.c:3194 +#: src/main/escp2-channels.c:3239 src/escputil/escputil.c:982 #: src/escputil/escputil.c:1205 msgid "Light Magenta" msgstr "Lichtmagenta" -#: src/main/escp2-channels.c:3130 src/main/escp2-channels.c:3192 +#: src/main/escp2-channels.c:3169 src/main/escp2-channels.c:3241 #: src/escputil/escputil.c:985 msgid "Light Black" msgstr "Grijs" -#: src/main/escp2-channels.c:3143 +#: src/main/escp2-channels.c:3182 msgid "Dark Yellow" msgstr "Donkergeel" -#: src/main/escp2-channels.c:3170 src/escputil/escputil.c:989 +#: src/main/escp2-channels.c:3209 src/escputil/escputil.c:989 msgid "Gloss Optimizer" msgstr "Glansverbeteraar" -#: src/main/escp2-channels.c:3189 src/escputil/escputil.c:990 +#: src/main/escp2-channels.c:3238 src/escputil/escputil.c:990 msgid "Light Light Black" msgstr "Lichtgrijs" -#: src/main/escp2-papers.c:1343 src/main/escp2-papers.c:1387 -#: src/main/escp2-papers.c:1431 src/main/escp2-papers.c:1479 -#: src/main/escp2-papers.c:1527 src/main/escp2-papers.c:1571 +#: src/main/escp2-papers.c:1353 src/main/escp2-papers.c:1397 +#: src/main/escp2-papers.c:1441 src/main/escp2-papers.c:1489 +#: src/main/escp2-papers.c:1537 src/main/escp2-papers.c:1581 msgid "Plain Paper Fast Load" msgstr "Blanco papier snellader" -#: src/main/escp2-papers.c:1345 src/main/escp2-papers.c:1389 -#: src/main/escp2-papers.c:1433 src/main/escp2-papers.c:1481 -#: src/main/escp2-papers.c:1529 src/main/escp2-papers.c:1573 +#: src/main/escp2-papers.c:1355 src/main/escp2-papers.c:1399 +#: src/main/escp2-papers.c:1443 src/main/escp2-papers.c:1491 +#: src/main/escp2-papers.c:1539 src/main/escp2-papers.c:1583 #: src/main/xmli18n-tmp.h:5 msgid "Postcard" msgstr "Briefkaart" -#: src/main/escp2-papers.c:1353 src/main/escp2-papers.c:1397 -#: src/main/escp2-papers.c:1441 src/main/escp2-papers.c:1489 -#: src/main/escp2-papers.c:1537 src/main/escp2-papers.c:1581 +#: src/main/escp2-papers.c:1363 src/main/escp2-papers.c:1407 +#: src/main/escp2-papers.c:1451 src/main/escp2-papers.c:1499 +#: src/main/escp2-papers.c:1547 src/main/escp2-papers.c:1591 msgid "Back Light Film" msgstr "Backlight film" -#: src/main/escp2-papers.c:1357 src/main/escp2-papers.c:1401 -#: src/main/escp2-papers.c:1445 src/main/escp2-papers.c:1493 -#: src/main/escp2-papers.c:1541 src/main/escp2-papers.c:1585 -msgid "Matte Paper Heavyweight" -msgstr "Zwaar mat papier" - #: src/main/escp2-papers.c:1367 src/main/escp2-papers.c:1411 #: src/main/escp2-papers.c:1455 src/main/escp2-papers.c:1503 #: src/main/escp2-papers.c:1551 src/main/escp2-papers.c:1595 +msgid "Matte Paper Heavyweight" +msgstr "Zwaar mat papier" + +#: src/main/escp2-papers.c:1377 src/main/escp2-papers.c:1421 +#: src/main/escp2-papers.c:1465 src/main/escp2-papers.c:1513 +#: src/main/escp2-papers.c:1561 src/main/escp2-papers.c:1605 msgid "Premium Semigloss Photo Paper" msgstr "Premium halfglanzend fotopapier" -#: src/main/escp2-papers.c:1375 src/main/escp2-papers.c:1419 -#: src/main/escp2-papers.c:1467 src/main/escp2-papers.c:1515 -#: src/main/escp2-papers.c:1559 src/main/escp2-papers.c:1607 +#: src/main/escp2-papers.c:1385 src/main/escp2-papers.c:1429 +#: src/main/escp2-papers.c:1477 src/main/escp2-papers.c:1525 +#: src/main/escp2-papers.c:1569 src/main/escp2-papers.c:1617 msgid "ColorLife Paper" msgstr "ColorLife papier" -#: src/main/escp2-papers.c:1459 src/main/escp2-papers.c:1507 -#: src/main/escp2-papers.c:1599 +#: src/main/escp2-papers.c:1469 src/main/escp2-papers.c:1517 +#: src/main/escp2-papers.c:1609 msgid "Archival Matte Paper" msgstr "Archief mat papier" -#: src/main/escp2-papers.c:1461 src/main/escp2-papers.c:1509 -#: src/main/escp2-papers.c:1601 +#: src/main/escp2-papers.c:1471 src/main/escp2-papers.c:1519 +#: src/main/escp2-papers.c:1611 msgid "Watercolor Paper - Radiant White" msgstr "Waterverfpapier - stralend wit" -#: src/main/escp2-papers.c:1716 src/main/escp2-papers.c:1842 -#: src/main/escp2-papers.c:1884 src/main/escp2-papers.c:1926 -#: src/main/escp2-papers.c:2001 +#: src/main/escp2-papers.c:1727 src/main/escp2-papers.c:1853 +#: src/main/escp2-papers.c:1895 src/main/escp2-papers.c:1937 +#: src/main/escp2-papers.c:2012 msgid "Roll Feed" msgstr "Rolinvoer" -#: src/main/escp2-papers.c:1740 src/main/escp2-papers.c:1791 +#: src/main/escp2-papers.c:1751 src/main/escp2-papers.c:1802 msgid "Roll Feed (cut each page)" msgstr "Aanvoer vanaf rol (snij elke pagina af)" -#: src/main/escp2-papers.c:1749 src/main/escp2-papers.c:1800 +#: src/main/escp2-papers.c:1760 src/main/escp2-papers.c:1811 msgid "Roll Feed (do not cut)" msgstr "Aanvoer vanaf rol (niet afsnijden)" -#: src/main/escp2-papers.c:1773 src/main/escp2-papers.c:1824 +#: src/main/escp2-papers.c:1784 src/main/escp2-papers.c:1835 msgid "Manual Feed" msgstr "Handmatige toevoer" -#: src/main/escp2-papers.c:1782 src/main/escp2-papers.c:1833 -#: src/main/escp2-papers.c:1935 src/main/escp2-papers.c:1968 +#: src/main/escp2-papers.c:1793 src/main/escp2-papers.c:1844 +#: src/main/escp2-papers.c:1946 src/main/escp2-papers.c:1979 msgid "Print to CD" msgstr "Afdrukken naar CD" -#: src/main/escp2-papers.c:1866 src/main/escp2-papers.c:1908 +#: src/main/escp2-papers.c:1877 src/main/escp2-papers.c:1919 msgid "Manual Sheet Guide" msgstr "Handmatige papiergeleider" -#: src/main/escp2-papers.c:1875 src/main/escp2-papers.c:1917 +#: src/main/escp2-papers.c:1886 src/main/escp2-papers.c:1928 msgid "Manual Feed (Front)" msgstr "Handmatige toevoer (voorzijde)" -#: src/main/escp2-papers.c:1950 +#: src/main/escp2-papers.c:1961 msgid "Rear Tray" msgstr "Lade aan achterzijde" -#: src/main/escp2-papers.c:1959 +#: src/main/escp2-papers.c:1970 msgid "Front Tray" msgstr "Lade aan voorzijde" -#: src/main/escp2-papers.c:1977 +#: src/main/escp2-papers.c:1988 msgid "Photo Board" msgstr "Fotobord" -#: src/main/escp2-papers.c:2016 +#: src/main/escp2-papers.c:2027 msgid "Cut Sheet Bin 1" msgstr "Lade 1 voor vellen" -#: src/main/escp2-papers.c:2025 +#: src/main/escp2-papers.c:2036 msgid "Cut Sheet Bin 2" msgstr "Lade 2 voor vellen" -#: src/main/escp2-papers.c:2034 +#: src/main/escp2-papers.c:2045 msgid "Cut Sheet Autoselect" msgstr "Automatisch selecteren van vellen" -#: src/main/escp2-papers.c:2043 +#: src/main/escp2-papers.c:2054 msgid "Manual Selection" msgstr "Handmatig selecteren" @@ -1939,9 +2106,8 @@ msgid "720 x 360 DPI" msgstr "720 x 360 DPI" #: src/main/escp2-resolutions.c:87 -#, fuzzy msgid "720 x 360 DPI Enhanced" -msgstr "720 x 360 DPI" +msgstr "720 x 360 DPI verbeterd" #: src/main/escp2-resolutions.c:91 src/main/escp2-resolutions.c:94 msgid "720 DPI" @@ -2039,42 +2205,48 @@ msgid "Eight Pass" msgstr "Achtmaal doorgang" #: src/main/escp2-resolutions.c:637 src/main/escp2-resolutions.c:652 -#: src/main/generic-options.c:33 +#: src/main/escp2-resolutions.c:667 src/main/generic-options.c:33 msgid "Fast Economy" msgstr "Snel en zuinig" #: src/main/escp2-resolutions.c:638 src/main/escp2-resolutions.c:653 -#: src/main/generic-options.c:34 +#: src/main/escp2-resolutions.c:668 src/main/generic-options.c:34 msgid "Economy" msgstr "Zuinig" #: src/main/escp2-resolutions.c:639 src/main/escp2-resolutions.c:654 -#: src/main/escp2-resolutions.c:667 src/main/generic-options.c:35 +#: src/main/escp2-resolutions.c:669 src/main/escp2-resolutions.c:682 +#: src/main/generic-options.c:35 msgid "Draft" msgstr "Proefdruk" #: src/main/escp2-resolutions.c:641 src/main/escp2-resolutions.c:656 -#: src/main/escp2-resolutions.c:670 src/main/generic-options.c:37 +#: src/main/escp2-resolutions.c:671 src/main/escp2-resolutions.c:685 +#: src/main/generic-options.c:37 msgid "High" msgstr "Hoog" #: src/main/escp2-resolutions.c:642 src/main/escp2-resolutions.c:657 -#: src/main/escp2-resolutions.c:669 src/main/generic-options.c:38 +#: src/main/escp2-resolutions.c:672 src/main/escp2-resolutions.c:684 +#: src/main/generic-options.c:38 msgid "Photo" msgstr "Foto" #: src/main/escp2-resolutions.c:643 src/main/escp2-resolutions.c:658 -#: src/main/escp2-resolutions.c:671 src/main/generic-options.c:39 +#: src/main/escp2-resolutions.c:673 src/main/escp2-resolutions.c:686 +#: src/main/generic-options.c:39 msgid "Super Photo" msgstr "Super Photo" #: src/main/escp2-resolutions.c:644 src/main/escp2-resolutions.c:659 -#: src/main/escp2-resolutions.c:672 src/main/generic-options.c:40 +#: src/main/escp2-resolutions.c:674 src/main/escp2-resolutions.c:687 +#: src/main/generic-options.c:40 msgid "Ultra Photo" msgstr "Ultra Photo" #: src/main/escp2-resolutions.c:645 src/main/escp2-resolutions.c:660 -#: src/main/escp2-resolutions.c:673 src/main/generic-options.c:41 +#: src/main/escp2-resolutions.c:675 src/main/escp2-resolutions.c:688 +#: src/main/generic-options.c:41 msgid "Best" msgstr "Het best" @@ -2151,4174 +2323,4414 @@ msgid "3x5" msgstr "3x5" #: src/main/xmli18n-tmp.h:10 +msgid "3 1/2 x5" +msgstr "" + +#: src/main/xmli18n-tmp.h:11 msgid "4x6" msgstr "4x6" -#: src/main/xmli18n-tmp.h:11 +#: src/main/xmli18n-tmp.h:12 msgid "Epson 4x6 Photo Paper (tear-off borders)" msgstr "Epson 4x6 fotopapier (afscheurranden)" -#: src/main/xmli18n-tmp.h:12 +#: src/main/xmli18n-tmp.h:13 msgid "5x7" msgstr "5x7" -#: src/main/xmli18n-tmp.h:13 +#: src/main/xmli18n-tmp.h:14 msgid "5x8" msgstr "5x8" -#: src/main/xmli18n-tmp.h:14 +#: src/main/xmli18n-tmp.h:15 msgid "6x8" msgstr "6x8" -#: src/main/xmli18n-tmp.h:15 +#: src/main/xmli18n-tmp.h:16 msgid "8x10" msgstr "8x10" -#: src/main/xmli18n-tmp.h:17 +#: src/main/xmli18n-tmp.h:18 msgid "12x18" msgstr "12x18" -#: src/main/xmli18n-tmp.h:18 +#: src/main/xmli18n-tmp.h:19 msgid "Super B 13x19" msgstr "Super B 13x19" -#: src/main/xmli18n-tmp.h:19 +#: src/main/xmli18n-tmp.h:20 msgid "Engineering C 17x22" msgstr "Engineering C 17x22" -#: src/main/xmli18n-tmp.h:20 +#: src/main/xmli18n-tmp.h:21 msgid "8x12" msgstr "8x12" -#: src/main/xmli18n-tmp.h:21 +#: src/main/xmli18n-tmp.h:22 msgid "11x14" msgstr "11x14" -#: src/main/xmli18n-tmp.h:22 +#: src/main/xmli18n-tmp.h:23 msgid "16x20" msgstr "16x20" -#: src/main/xmli18n-tmp.h:23 +#: src/main/xmli18n-tmp.h:24 msgid "16x24" msgstr "16x24" -#: src/main/xmli18n-tmp.h:24 +#: src/main/xmli18n-tmp.h:25 msgid "20x24" msgstr "20x24" -#: src/main/xmli18n-tmp.h:25 +#: src/main/xmli18n-tmp.h:26 msgid "20x30" msgstr "20x30" -#: src/main/xmli18n-tmp.h:26 +#: src/main/xmli18n-tmp.h:27 msgid "22x30" msgstr "22x30" -#: src/main/xmli18n-tmp.h:27 +#: src/main/xmli18n-tmp.h:28 msgid "24x30" msgstr "24x30" -#: src/main/xmli18n-tmp.h:28 +#: src/main/xmli18n-tmp.h:29 msgid "Super A1 24x36" msgstr "Super A1 24x36" -#: src/main/xmli18n-tmp.h:29 +#: src/main/xmli18n-tmp.h:30 msgid "30x40" msgstr "30x40" -#: src/main/xmli18n-tmp.h:30 +#: src/main/xmli18n-tmp.h:31 msgid "4A" msgstr "4A" -#: src/main/xmli18n-tmp.h:31 +#: src/main/xmli18n-tmp.h:32 msgid "2A" msgstr "2A" -#: src/main/xmli18n-tmp.h:32 +#: src/main/xmli18n-tmp.h:33 msgid "Super A0" msgstr "Super A0" -#: src/main/xmli18n-tmp.h:33 +#: src/main/xmli18n-tmp.h:34 msgid "A0" msgstr "A0" -#: src/main/xmli18n-tmp.h:34 +#: src/main/xmli18n-tmp.h:35 msgid "A1" msgstr "A1" -#: src/main/xmli18n-tmp.h:35 +#: src/main/xmli18n-tmp.h:36 msgid "A2" msgstr "A2" -#: src/main/xmli18n-tmp.h:36 +#: src/main/xmli18n-tmp.h:37 msgid "A3" msgstr "A3" -#: src/main/xmli18n-tmp.h:37 +#: src/main/xmli18n-tmp.h:38 msgid "A4" msgstr "A4" -#: src/main/xmli18n-tmp.h:38 +#: src/main/xmli18n-tmp.h:39 msgid "A5" msgstr "A5" -#: src/main/xmli18n-tmp.h:39 +#: src/main/xmli18n-tmp.h:40 msgid "A6" msgstr "A6" -#: src/main/xmli18n-tmp.h:40 +#: src/main/xmli18n-tmp.h:41 msgid "A7" msgstr "A7" -#: src/main/xmli18n-tmp.h:41 +#: src/main/xmli18n-tmp.h:42 msgid "A8" msgstr "A8" -#: src/main/xmli18n-tmp.h:42 +#: src/main/xmli18n-tmp.h:43 msgid "A9" msgstr "A9" -#: src/main/xmli18n-tmp.h:43 +#: src/main/xmli18n-tmp.h:44 msgid "A10" msgstr "A10" -#: src/main/xmli18n-tmp.h:44 +#: src/main/xmli18n-tmp.h:45 msgid "RA0" msgstr "RA0" -#: src/main/xmli18n-tmp.h:45 +#: src/main/xmli18n-tmp.h:46 msgid "RA1" msgstr "RA1" -#: src/main/xmli18n-tmp.h:46 +#: src/main/xmli18n-tmp.h:47 msgid "RA2" msgstr "RA2" -#: src/main/xmli18n-tmp.h:47 +#: src/main/xmli18n-tmp.h:48 msgid "RA3" msgstr "RA3" -#: src/main/xmli18n-tmp.h:48 +#: src/main/xmli18n-tmp.h:49 msgid "RA4" msgstr "RA4" -#: src/main/xmli18n-tmp.h:49 +#: src/main/xmli18n-tmp.h:50 msgid "SRA0" msgstr "SRA0" -#: src/main/xmli18n-tmp.h:50 +#: src/main/xmli18n-tmp.h:51 msgid "SRA1" msgstr "SRA1" -#: src/main/xmli18n-tmp.h:51 +#: src/main/xmli18n-tmp.h:52 msgid "SRA2" msgstr "SRA2" -#: src/main/xmli18n-tmp.h:52 +#: src/main/xmli18n-tmp.h:53 msgid "SRA3" msgstr "SRA3" -#: src/main/xmli18n-tmp.h:53 +#: src/main/xmli18n-tmp.h:54 msgid "SRA4" msgstr "SRA4" -#: src/main/xmli18n-tmp.h:54 +#: src/main/xmli18n-tmp.h:55 msgid "4B ISO" msgstr "4B ISO" -#: src/main/xmli18n-tmp.h:55 +#: src/main/xmli18n-tmp.h:56 msgid "2B ISO" msgstr "2B ISO" -#: src/main/xmli18n-tmp.h:56 +#: src/main/xmli18n-tmp.h:57 msgid "B0 ISO" msgstr "B0 ISO" -#: src/main/xmli18n-tmp.h:57 +#: src/main/xmli18n-tmp.h:58 msgid "B1 ISO" msgstr "B1 ISO" -#: src/main/xmli18n-tmp.h:58 +#: src/main/xmli18n-tmp.h:59 msgid "B2 ISO" msgstr "B2 ISO" -#: src/main/xmli18n-tmp.h:59 +#: src/main/xmli18n-tmp.h:60 msgid "B3 ISO" msgstr "B3 ISO" -#: src/main/xmli18n-tmp.h:60 +#: src/main/xmli18n-tmp.h:61 msgid "B4 ISO" msgstr "B4 ISO" -#: src/main/xmli18n-tmp.h:61 +#: src/main/xmli18n-tmp.h:62 msgid "B5 ISO" msgstr "B5 ISO" -#: src/main/xmli18n-tmp.h:62 +#: src/main/xmli18n-tmp.h:63 msgid "B6 ISO" msgstr "B6 ISO" -#: src/main/xmli18n-tmp.h:63 +#: src/main/xmli18n-tmp.h:64 msgid "B7 ISO" msgstr "B7 ISO" -#: src/main/xmli18n-tmp.h:64 +#: src/main/xmli18n-tmp.h:65 msgid "B8 ISO" msgstr "B8 ISO" -#: src/main/xmli18n-tmp.h:65 +#: src/main/xmli18n-tmp.h:66 msgid "B9 ISO" msgstr "B9 ISO" -#: src/main/xmli18n-tmp.h:66 +#: src/main/xmli18n-tmp.h:67 msgid "B10 ISO" msgstr "B10 ISO" -#: src/main/xmli18n-tmp.h:67 +#: src/main/xmli18n-tmp.h:68 msgid "Super B0 JIS" msgstr "Super B0 JIS" -#: src/main/xmli18n-tmp.h:68 +#: src/main/xmli18n-tmp.h:69 msgid "B0 JIS" msgstr "B0 JIS" -#: src/main/xmli18n-tmp.h:69 +#: src/main/xmli18n-tmp.h:70 msgid "B1 JIS" msgstr "B1 JIS" -#: src/main/xmli18n-tmp.h:70 +#: src/main/xmli18n-tmp.h:71 msgid "B2 JIS" msgstr "B2 JIS" -#: src/main/xmli18n-tmp.h:71 +#: src/main/xmli18n-tmp.h:72 msgid "B3 JIS" msgstr "B3 JIS" -#: src/main/xmli18n-tmp.h:72 +#: src/main/xmli18n-tmp.h:73 msgid "B4 JIS" msgstr "B4 JIS" -#: src/main/xmli18n-tmp.h:73 +#: src/main/xmli18n-tmp.h:74 msgid "B5 JIS" msgstr "B5 JIS" -#: src/main/xmli18n-tmp.h:74 +#: src/main/xmli18n-tmp.h:75 msgid "B6 JIS" msgstr "B6 JIS" -#: src/main/xmli18n-tmp.h:75 +#: src/main/xmli18n-tmp.h:76 msgid "B7 JIS" msgstr "B7 JIS" -#: src/main/xmli18n-tmp.h:76 +#: src/main/xmli18n-tmp.h:77 msgid "B8 JIS" msgstr "B8 JIS" -#: src/main/xmli18n-tmp.h:77 +#: src/main/xmli18n-tmp.h:78 msgid "B9 JIS" msgstr "B9 JIS" -#: src/main/xmli18n-tmp.h:78 +#: src/main/xmli18n-tmp.h:79 msgid "B10 JIS" msgstr "B10 JIS" -#: src/main/xmli18n-tmp.h:79 +#: src/main/xmli18n-tmp.h:80 msgid "C0" msgstr "C0" -#: src/main/xmli18n-tmp.h:80 +#: src/main/xmli18n-tmp.h:81 +#, fuzzy +msgid "C0 landscape" +msgstr "Landschap" + +#: src/main/xmli18n-tmp.h:82 msgid "C1" msgstr "C1" -#: src/main/xmli18n-tmp.h:81 +#: src/main/xmli18n-tmp.h:83 +#, fuzzy +msgid "C1 landscape" +msgstr "Landschap" + +#: src/main/xmli18n-tmp.h:84 msgid "C2" msgstr "C2" -#: src/main/xmli18n-tmp.h:82 +#: src/main/xmli18n-tmp.h:85 +#, fuzzy +msgid "C2 landscape" +msgstr "Landschap" + +#: src/main/xmli18n-tmp.h:86 msgid "C3" msgstr "C3" -#: src/main/xmli18n-tmp.h:83 +#: src/main/xmli18n-tmp.h:87 +#, fuzzy +msgid "C3 landscape" +msgstr "Landschap" + +#: src/main/xmli18n-tmp.h:88 msgid "C4" msgstr "C4" -#: src/main/xmli18n-tmp.h:84 +#: src/main/xmli18n-tmp.h:89 +#, fuzzy +msgid "C4 landscape" +msgstr "Landschap" + +#: src/main/xmli18n-tmp.h:90 msgid "C5" msgstr "C5" -#: src/main/xmli18n-tmp.h:85 +#: src/main/xmli18n-tmp.h:91 +#, fuzzy +msgid "C5 landscape" +msgstr "Landschap" + +#: src/main/xmli18n-tmp.h:92 msgid "B6-C4" msgstr "B6-C4" -#: src/main/xmli18n-tmp.h:86 +#: src/main/xmli18n-tmp.h:93 +#, fuzzy +msgid "B6-C4 landscape" +msgstr "Landschap" + +#: src/main/xmli18n-tmp.h:94 msgid "C6" msgstr "C6" -#: src/main/xmli18n-tmp.h:87 +#: src/main/xmli18n-tmp.h:95 +#, fuzzy +msgid "C6 landscape" +msgstr "Landschap" + +#: src/main/xmli18n-tmp.h:96 msgid "DL" msgstr "DL" -#: src/main/xmli18n-tmp.h:88 +#: src/main/xmli18n-tmp.h:97 +#, fuzzy +msgid "DL landscape" +msgstr "Landschap" + +#: src/main/xmli18n-tmp.h:98 msgid "C7-6" msgstr "C7-6" -#: src/main/xmli18n-tmp.h:89 +#: src/main/xmli18n-tmp.h:99 +#, fuzzy +msgid "C7-6 landscape" +msgstr "Landschap" + +#: src/main/xmli18n-tmp.h:100 msgid "C7" msgstr "C7" -#: src/main/xmli18n-tmp.h:90 +#: src/main/xmli18n-tmp.h:101 +#, fuzzy +msgid "C7 landscape" +msgstr "Landschap" + +#: src/main/xmli18n-tmp.h:102 msgid "C8" msgstr "C8" -#: src/main/xmli18n-tmp.h:91 +#: src/main/xmli18n-tmp.h:103 +#, fuzzy +msgid "C8 landscape" +msgstr "Landschap" + +#: src/main/xmli18n-tmp.h:104 msgid "C9" msgstr "C9" -#: src/main/xmli18n-tmp.h:92 +#: src/main/xmli18n-tmp.h:105 +#, fuzzy +msgid "C9 landscape" +msgstr "Landschap" + +#: src/main/xmli18n-tmp.h:106 msgid "C10" msgstr "C10" -#: src/main/xmli18n-tmp.h:93 +#: src/main/xmli18n-tmp.h:107 +#, fuzzy +msgid "C10 landscape" +msgstr "Landschap" + +#: src/main/xmli18n-tmp.h:108 msgid "ArchA" msgstr "ArchA" -#: src/main/xmli18n-tmp.h:94 +#: src/main/xmli18n-tmp.h:109 msgid "ArchA transposed" msgstr "ArchA getransponeerd" -#: src/main/xmli18n-tmp.h:95 +#: src/main/xmli18n-tmp.h:110 msgid "ArchB" msgstr "ArchB" -#: src/main/xmli18n-tmp.h:96 +#: src/main/xmli18n-tmp.h:111 msgid "ArchB transposed" msgstr "ArchB getransponeerd" -#: src/main/xmli18n-tmp.h:97 +#: src/main/xmli18n-tmp.h:112 msgid "ArchC" msgstr "ArchC" -#: src/main/xmli18n-tmp.h:98 +#: src/main/xmli18n-tmp.h:113 msgid "ArchC transposed" msgstr "ArchC getransponeerd" -#: src/main/xmli18n-tmp.h:99 +#: src/main/xmli18n-tmp.h:114 msgid "ArchD" msgstr "ArchD" -#: src/main/xmli18n-tmp.h:100 +#: src/main/xmli18n-tmp.h:115 msgid "ArchD transposed" msgstr "ArchD getransponeerd" -#: src/main/xmli18n-tmp.h:101 +#: src/main/xmli18n-tmp.h:116 msgid "ArchE" msgstr "ArchE" -#: src/main/xmli18n-tmp.h:102 +#: src/main/xmli18n-tmp.h:117 msgid "ArchE transposed" msgstr "ArchE getransponeerd" -#: src/main/xmli18n-tmp.h:103 +#: src/main/xmli18n-tmp.h:118 msgid "American foolscap" msgstr "American foolscap" -#: src/main/xmli18n-tmp.h:104 +#: src/main/xmli18n-tmp.h:119 msgid "European foolscap" msgstr "European foolscap" -#: src/main/xmli18n-tmp.h:105 +#: src/main/xmli18n-tmp.h:120 msgid "Crown Quarto" msgstr "Crown Quarto" -#: src/main/xmli18n-tmp.h:106 +#: src/main/xmli18n-tmp.h:121 msgid "Large Crown Quarto" msgstr "Large Crown Quarto" -#: src/main/xmli18n-tmp.h:107 +#: src/main/xmli18n-tmp.h:122 msgid "Demy Quarto" msgstr "Demy Quarto" -#: src/main/xmli18n-tmp.h:108 +#: src/main/xmli18n-tmp.h:123 msgid "Royal Quarto" msgstr "Royal Quarto" -#: src/main/xmli18n-tmp.h:109 +#: src/main/xmli18n-tmp.h:124 msgid "ISO A4" msgstr "ISO A4" -#: src/main/xmli18n-tmp.h:110 +#: src/main/xmli18n-tmp.h:125 msgid "Crown Octavo" msgstr "Crown Octavo" -#: src/main/xmli18n-tmp.h:111 +#: src/main/xmli18n-tmp.h:126 msgid "Large Crown Octavo" msgstr "Large Crown Octavo" -#: src/main/xmli18n-tmp.h:112 +#: src/main/xmli18n-tmp.h:127 msgid "Demy Octavo" msgstr "Demy Octavo" -#: src/main/xmli18n-tmp.h:113 +#: src/main/xmli18n-tmp.h:128 msgid "Royal Octavo" msgstr "Royal Octavo" -#: src/main/xmli18n-tmp.h:114 +#: src/main/xmli18n-tmp.h:129 msgid "ISO A5" msgstr "ISO A5" -#: src/main/xmli18n-tmp.h:115 +#: src/main/xmli18n-tmp.h:130 msgid "Small paperback" msgstr "Smalle paperback" -#: src/main/xmli18n-tmp.h:116 +#: src/main/xmli18n-tmp.h:131 msgid "Penguin small paperback" msgstr "Penguin smalle paperback" -#: src/main/xmli18n-tmp.h:117 +#: src/main/xmli18n-tmp.h:132 msgid "Penguin large paperback" msgstr "Penguin grootte paperback" -#: src/main/xmli18n-tmp.h:118 +#: src/main/xmli18n-tmp.h:133 msgid "10cm x 15cm" msgstr "10cm x 15cm" -#: src/main/xmli18n-tmp.h:119 +#: src/main/xmli18n-tmp.h:134 msgid "Hagaki Card" msgstr "Hagaki Kaart" -#: src/main/xmli18n-tmp.h:120 +#: src/main/xmli18n-tmp.h:135 msgid "Oufuku Card" msgstr "Oufuku Kaart" -#: src/main/xmli18n-tmp.h:121 +#: src/main/xmli18n-tmp.h:136 msgid "Japanese long envelope #3" msgstr "Japanese long envelop #3" -#: src/main/xmli18n-tmp.h:122 +#: src/main/xmli18n-tmp.h:137 +#, fuzzy +msgid "Japanese long envelope #3 landscape" +msgstr "Japanese long envelop #3" + +#: src/main/xmli18n-tmp.h:138 msgid "Japanese long envelope #4" msgstr "Japanse long envelop #4" -#: src/main/xmli18n-tmp.h:123 +#: src/main/xmli18n-tmp.h:139 +#, fuzzy +msgid "Japanese long envelope #4 landscape" +msgstr "Japanse long envelop #4" + +#: src/main/xmli18n-tmp.h:140 msgid "Japanese Kaku envelope #4" msgstr "Japanse Kaku envelop #4" -#: src/main/xmli18n-tmp.h:124 +#: src/main/xmli18n-tmp.h:141 +#, fuzzy +msgid "Japanese Kaku envelope #4 landscape" +msgstr "Japanse Kaku envelop #4" + +#: src/main/xmli18n-tmp.h:142 msgid "Commercial 10" msgstr "Commercial 10" -#: src/main/xmli18n-tmp.h:125 +#: src/main/xmli18n-tmp.h:143 +#, fuzzy +msgid "Commercial 10 landscape" +msgstr "Commercial 10" + +#: src/main/xmli18n-tmp.h:144 msgid "A2 Invitation" msgstr "A2 Invitation" -#: src/main/xmli18n-tmp.h:126 +#: src/main/xmli18n-tmp.h:145 msgid "Monarch Envelope" msgstr "Monarch envelop" -#: src/main/xmli18n-tmp.h:127 +#: src/main/xmli18n-tmp.h:146 +#, fuzzy +msgid "Monarch Envelope landscape" +msgstr "Monarch envelop" + +#: src/main/xmli18n-tmp.h:147 msgid "4x5 3/8" msgstr "4x5 3/8" -#: src/main/xmli18n-tmp.h:128 +#: src/main/xmli18n-tmp.h:148 msgid "4x7" msgstr "4x7" -#: src/main/xmli18n-tmp.h:129 +#: src/main/xmli18n-tmp.h:149 msgid "CP_L" msgstr "CP_L" -#: src/main/xmli18n-tmp.h:130 +#: src/main/xmli18n-tmp.h:150 msgid "Card" msgstr "Kaart" -#: src/main/xmli18n-tmp.h:131 +#: src/main/xmli18n-tmp.h:151 msgid "Wide Postcard" msgstr "Brede briefkaart" -#: src/main/xmli18n-tmp.h:132 +#: src/main/xmli18n-tmp.h:152 msgid "Chilean Office" msgstr "Chilean Office" -#: src/main/xmli18n-tmp.h:133 +#: src/main/xmli18n-tmp.h:153 msgid "Chilean Double Letter" msgstr "Chilean Double Letter" -#: src/main/xmli18n-tmp.h:134 +#: src/main/xmli18n-tmp.h:154 msgid "Chilean Double Office" msgstr "Chilean Double Office" -#: src/main/xmli18n-tmp.h:135 +#: src/main/xmli18n-tmp.h:155 msgid "Custom" msgstr "Gebruiker" -#: src/main/xmli18n-tmp.h:136 +#: src/main/xmli18n-tmp.h:156 msgid "89 mm Roll Paper" msgstr "89 mm Roll Paper" -#: src/main/xmli18n-tmp.h:137 +#: src/main/xmli18n-tmp.h:157 msgid "4 Inch Roll Paper" msgstr "4 Inch Roll Paper" -#: src/main/xmli18n-tmp.h:138 +#: src/main/xmli18n-tmp.h:158 msgid "5 Inch Roll Paper" msgstr "5 Inch Roll Paper" -#: src/main/xmli18n-tmp.h:139 +#: src/main/xmli18n-tmp.h:159 msgid "210 mm Roll Paper" msgstr "210 mm Roll Paper" -#: src/main/xmli18n-tmp.h:140 +#: src/main/xmli18n-tmp.h:160 msgid "13 Inch Roll Paper" msgstr "13 Inch Roll Paper" -#: src/main/xmli18n-tmp.h:141 +#: src/main/xmli18n-tmp.h:161 msgid "22 Inch Roll Paper" msgstr "22 Inch Roll Paper" -#: src/main/xmli18n-tmp.h:142 +#: src/main/xmli18n-tmp.h:162 msgid "24 Inch Roll Paper" msgstr "24 Inch Roll Paper" -#: src/main/xmli18n-tmp.h:143 +#: src/main/xmli18n-tmp.h:163 msgid "36 Inch Roll Paper" msgstr "36 Inch Roll Paper" -#: src/main/xmli18n-tmp.h:144 +#: src/main/xmli18n-tmp.h:164 msgid "44 Inch Roll Paper" msgstr "44 Inch Roll Paper" -#: src/main/xmli18n-tmp.h:145 +#: src/main/xmli18n-tmp.h:165 msgid "PostScript Level 1" msgstr "PostScript Level 1" -#: src/main/xmli18n-tmp.h:146 +#: src/main/xmli18n-tmp.h:166 msgid "PostScript Level 2" msgstr "PostScript Level 2" -#: src/main/xmli18n-tmp.h:147 +#: src/main/xmli18n-tmp.h:167 msgid "Canon BJ-30" msgstr "Canon BJ-30" -#: src/main/xmli18n-tmp.h:148 +#: src/main/xmli18n-tmp.h:168 msgid "Canon BJC-50" msgstr "Canon BJC-50" -#: src/main/xmli18n-tmp.h:149 +#: src/main/xmli18n-tmp.h:169 msgid "Canon BJC-55" msgstr "Canon BJC-55" -#: src/main/xmli18n-tmp.h:150 +#: src/main/xmli18n-tmp.h:170 msgid "Canon BJC-80" msgstr "Canon BJC-80" -#: src/main/xmli18n-tmp.h:151 +#: src/main/xmli18n-tmp.h:171 msgid "Canon BJC-85" msgstr "Canon BJC-85" -#: src/main/xmli18n-tmp.h:152 +#: src/main/xmli18n-tmp.h:172 msgid "Canon BJC-210" msgstr "Canon BJC-210" -#: src/main/xmli18n-tmp.h:153 +#: src/main/xmli18n-tmp.h:173 msgid "Canon BJC-240" msgstr "Canon BJC-240" -#: src/main/xmli18n-tmp.h:154 +#: src/main/xmli18n-tmp.h:174 msgid "Canon BJC-250" msgstr "Canon BJC-250" -#: src/main/xmli18n-tmp.h:155 +#: src/main/xmli18n-tmp.h:175 msgid "Canon BJC-1000" msgstr "Canon BJC-1000" -#: src/main/xmli18n-tmp.h:156 +#: src/main/xmli18n-tmp.h:176 msgid "Canon BJC-2000" msgstr "Canon BJC-2000" -#: src/main/xmli18n-tmp.h:157 +#: src/main/xmli18n-tmp.h:177 msgid "Canon BJC-2010" msgstr "Canon BJC-2010" -#: src/main/xmli18n-tmp.h:158 +#: src/main/xmli18n-tmp.h:178 msgid "Canon BJC-2100" msgstr "Canon BJC-2100" -#: src/main/xmli18n-tmp.h:159 +#: src/main/xmli18n-tmp.h:179 msgid "Canon BJC-2110" msgstr "Canon BJC-2110" -#: src/main/xmli18n-tmp.h:160 +#: src/main/xmli18n-tmp.h:180 msgid "Canon BJC-3000" msgstr "Canon BJC-3000" -#: src/main/xmli18n-tmp.h:161 +#: src/main/xmli18n-tmp.h:181 msgid "Canon BJC-4000" msgstr "Canon BJC-4000" -#: src/main/xmli18n-tmp.h:162 +#: src/main/xmli18n-tmp.h:182 msgid "Canon BJC-4300" msgstr "Canon BJC-4300" -#: src/main/xmli18n-tmp.h:163 +#: src/main/xmli18n-tmp.h:183 msgid "Canon BJC-4400" msgstr "Canon BJC-4400" -#: src/main/xmli18n-tmp.h:164 +#: src/main/xmli18n-tmp.h:184 #, fuzzy msgid "Canon BJC-5100" msgstr "Canon BJC-1000" -#: src/main/xmli18n-tmp.h:165 +#: src/main/xmli18n-tmp.h:185 #, fuzzy msgid "Canon BJC-5500" msgstr "Canon BJC-6500" -#: src/main/xmli18n-tmp.h:166 +#: src/main/xmli18n-tmp.h:186 msgid "Canon BJC-6000" msgstr "Canon BJC-6000" -#: src/main/xmli18n-tmp.h:167 +#: src/main/xmli18n-tmp.h:187 msgid "Canon BJC-6100" msgstr "Canon BJC-6100" -#: src/main/xmli18n-tmp.h:168 +#: src/main/xmli18n-tmp.h:188 msgid "Canon BJC-6200" msgstr "Canon BJC-6200" -#: src/main/xmli18n-tmp.h:169 +#: src/main/xmli18n-tmp.h:189 msgid "Canon BJC-6500" msgstr "Canon BJC-6500" -#: src/main/xmli18n-tmp.h:170 +#: src/main/xmli18n-tmp.h:190 msgid "Canon BJC-7000" msgstr "Canon BJC-7000" -#: src/main/xmli18n-tmp.h:171 +#: src/main/xmli18n-tmp.h:191 msgid "Canon BJC-7100" msgstr "Canon BJC-7100" -#: src/main/xmli18n-tmp.h:172 +#: src/main/xmli18n-tmp.h:192 msgid "Canon BJC-8200" msgstr "Canon BJC-8200" -#: src/main/xmli18n-tmp.h:173 +#: src/main/xmli18n-tmp.h:193 #, fuzzy msgid "Canon BJC-8500" msgstr "Canon BJC-6500" -#: src/main/xmli18n-tmp.h:174 +#: src/main/xmli18n-tmp.h:194 msgid "Canon S100" msgstr "Canon S100" -#: src/main/xmli18n-tmp.h:175 +#: src/main/xmli18n-tmp.h:195 msgid "Canon S200" msgstr "Canon S200" -#: src/main/xmli18n-tmp.h:176 +#: src/main/xmli18n-tmp.h:196 msgid "Canon S300" msgstr "Canon S300" -#: src/main/xmli18n-tmp.h:177 +#: src/main/xmli18n-tmp.h:197 msgid "Canon S400" msgstr "Canon S400" -#: src/main/xmli18n-tmp.h:178 +#: src/main/xmli18n-tmp.h:198 msgid "Canon S450" msgstr "Canon S450" -#: src/main/xmli18n-tmp.h:179 +#: src/main/xmli18n-tmp.h:199 msgid "Canon S500" msgstr "Canon S500" -#: src/main/xmli18n-tmp.h:180 +#: src/main/xmli18n-tmp.h:200 msgid "Canon S600" msgstr "Canon S600" -#: src/main/xmli18n-tmp.h:181 +#: src/main/xmli18n-tmp.h:201 msgid "Canon S630" msgstr "Canon S630" -#: src/main/xmli18n-tmp.h:182 +#: src/main/xmli18n-tmp.h:202 msgid "Canon S800" msgstr "Canon S800" -#: src/main/xmli18n-tmp.h:183 +#: src/main/xmli18n-tmp.h:203 msgid "Canon S4500" msgstr "Canon S4500" -#: src/main/xmli18n-tmp.h:184 -#, fuzzy +#: src/main/xmli18n-tmp.h:204 msgid "Canon PIXMA iP2000" -msgstr "Canon iP4000" +msgstr "Canon PIXMA iP2000" -#: src/main/xmli18n-tmp.h:185 -#, fuzzy +#: src/main/xmli18n-tmp.h:205 msgid "Canon PIXMA iP3000" -msgstr "Canon iP4000" +msgstr "Canon PIXMA iP3000" -#: src/main/xmli18n-tmp.h:186 -#, fuzzy +#: src/main/xmli18n-tmp.h:206 msgid "Canon PIXMA iP3100" -msgstr "Canon iP4000" +msgstr "Canon PIXMA iP3100" -#: src/main/xmli18n-tmp.h:187 -#, fuzzy +#: src/main/xmli18n-tmp.h:207 msgid "Canon PIXMA iP4000" -msgstr "Canon iP4000" +msgstr "Canon PIXMA iP4000" -#: src/main/xmli18n-tmp.h:188 -#, fuzzy +#: src/main/xmli18n-tmp.h:208 msgid "Canon PIXMA iP4100" -msgstr "Canon iP4000" +msgstr "Canon PIXMA iP4100" -#: src/main/xmli18n-tmp.h:189 -#, fuzzy +#: src/main/xmli18n-tmp.h:209 msgid "Canon PIXMA iP4200" -msgstr "Canon iP4000" +msgstr "Canon PIXMA iP4200" -#: src/main/xmli18n-tmp.h:190 -#, fuzzy +#: src/main/xmli18n-tmp.h:210 msgid "Canon PIXMA iP4300" -msgstr "Canon iP4000" +msgstr "Canon PIXMA iP4300" -#: src/main/xmli18n-tmp.h:191 +#: src/main/xmli18n-tmp.h:211 #, fuzzy msgid "Canon PIXMA iP4500" -msgstr "Canon iP4000" +msgstr "Canon PIXMA iP4000" -#: src/main/xmli18n-tmp.h:192 -#, fuzzy +#: src/main/xmli18n-tmp.h:212 msgid "Canon PIXMA iP5000" -msgstr "Canon iP4000" +msgstr "Canon PIXMA iP5000" -#: src/main/xmli18n-tmp.h:193 -#, fuzzy +#: src/main/xmli18n-tmp.h:213 msgid "Canon PIXMA iP5200" -msgstr "Canon iP4000" +msgstr "Canon PIXMA iP5200" -#: src/main/xmli18n-tmp.h:194 +#: src/main/xmli18n-tmp.h:214 #, fuzzy msgid "Canon PIXMA iP5300" -msgstr "Canon iP4000" +msgstr "Canon PIXMA iP3000" -#: src/main/xmli18n-tmp.h:195 +#: src/main/xmli18n-tmp.h:215 #, fuzzy +msgid "Canon PIXMA iP6000D" +msgstr "Canon PIXMA iP2000" + +#: src/main/xmli18n-tmp.h:216 msgid "Canon PIXMA iP6700" -msgstr "Canon iP4000" +msgstr "Canon PIXMA iP6700" -#: src/main/xmli18n-tmp.h:196 +#: src/main/xmli18n-tmp.h:217 #, fuzzy msgid "Canon PIXMA iP8500" -msgstr "Canon iP4000" +msgstr "Canon PIXMA iP5000" -#: src/main/xmli18n-tmp.h:197 +#: src/main/xmli18n-tmp.h:218 #, fuzzy msgid "Canon PIXMA iX5000" -msgstr "Canon iP4000" +msgstr "Canon PIXMA iP5000" -#: src/main/xmli18n-tmp.h:198 +#: src/main/xmli18n-tmp.h:219 #, fuzzy msgid "Canon PIXMA Pro9500" -msgstr "Canon iP4000" +msgstr "Canon PIXMA MP500" -#: src/main/xmli18n-tmp.h:199 -#, fuzzy +#: src/main/xmli18n-tmp.h:220 msgid "Canon PIXMA MP150" -msgstr "Canon iP4000" +msgstr "Canon PIXMA MP150" -#: src/main/xmli18n-tmp.h:200 +#: src/main/xmli18n-tmp.h:221 #, fuzzy msgid "Canon PIXMA MP170" -msgstr "Canon iP4000" +msgstr "Canon PIXMA MP150" -#: src/main/xmli18n-tmp.h:201 +#: src/main/xmli18n-tmp.h:222 #, fuzzy msgid "Canon PIXMA MP180" -msgstr "Canon iP4000" +msgstr "Canon PIXMA MP150" -#: src/main/xmli18n-tmp.h:202 -#, fuzzy +#: src/main/xmli18n-tmp.h:223 msgid "Canon PIXMA MP500" -msgstr "Canon iP4000" +msgstr "Canon PIXMA MP500" -#: src/main/xmli18n-tmp.h:203 +#: src/main/xmli18n-tmp.h:224 #, fuzzy -msgid "Canon PIXMA MP610" -msgstr "Canon iP4000" +msgid "Canon PIXMA MP520" +msgstr "Canon PIXMA MP150" -#: src/main/xmli18n-tmp.h:204 +#: src/main/xmli18n-tmp.h:225 #, fuzzy +msgid "Canon PIXMA MP610" +msgstr "Canon PIXMA MP150" + +#: src/main/xmli18n-tmp.h:226 msgid "Canon PIXMA MP700" -msgstr "Canon iP4000" +msgstr "Canon PIXMA MP700" -#: src/main/xmli18n-tmp.h:205 +#: src/main/xmli18n-tmp.h:227 #, fuzzy msgid "Canon PIXMA MP710" -msgstr "Canon iP4000" +msgstr "Canon PIXMA MP150" -#: src/main/xmli18n-tmp.h:206 -#, fuzzy +#: src/main/xmli18n-tmp.h:228 msgid "Canon PIXMA MP730" -msgstr "Canon iP4000" +msgstr "Canon PIXMA MP730" -#: src/main/xmli18n-tmp.h:207 +#: src/main/xmli18n-tmp.h:229 #, fuzzy msgid "Canon PIXMA MP740" -msgstr "Canon iP4000" +msgstr "Canon PIXMA MP700" -#: src/main/xmli18n-tmp.h:208 -#, fuzzy +#: src/main/xmli18n-tmp.h:230 msgid "Canon PIXMA MP750" -msgstr "Canon iP4000" +msgstr "Canon PIXMA MP750" -#: src/main/xmli18n-tmp.h:209 -#, fuzzy +#: src/main/xmli18n-tmp.h:231 msgid "Canon PIXMA MP760" -msgstr "Canon iP4000" +msgstr "Canon PIXMA MP760" -#: src/main/xmli18n-tmp.h:210 -#, fuzzy +#: src/main/xmli18n-tmp.h:232 msgid "Canon PIXMA MP770" -msgstr "Canon iP4000" +msgstr "Canon PIXMA MP770" -#: src/main/xmli18n-tmp.h:211 -#, fuzzy +#: src/main/xmli18n-tmp.h:233 msgid "Canon PIXMA MP780" -msgstr "Canon iP4000" +msgstr "Canon PIXMA MP780" -#: src/main/xmli18n-tmp.h:212 -#, fuzzy +#: src/main/xmli18n-tmp.h:234 msgid "Canon PIXMA MP790" -msgstr "Canon iP4000" +msgstr "Canon PIXMA MP790" -#: src/main/xmli18n-tmp.h:213 -#, fuzzy +#: src/main/xmli18n-tmp.h:235 msgid "Canon PIXMA MP830" -msgstr "Canon iP4000" +msgstr "Canon PIXMA MP830" -#: src/main/xmli18n-tmp.h:214 -#, fuzzy +#: src/main/xmli18n-tmp.h:236 msgid "Canon PIXUS iP3100" -msgstr "Canon S100" +msgstr "Canon PIXUS iP3100" -#: src/main/xmli18n-tmp.h:215 -#, fuzzy +#: src/main/xmli18n-tmp.h:237 msgid "Canon PIXUS iP4100" -msgstr "Canon iP4000" +msgstr "Canon PIXUS iP4100" -#: src/main/xmli18n-tmp.h:216 +#: src/main/xmli18n-tmp.h:238 #, fuzzy msgid "Canon i80" -msgstr "Canon S450" +msgstr "Canon i850" -#: src/main/xmli18n-tmp.h:217 -#, fuzzy +#: src/main/xmli18n-tmp.h:239 msgid "Canon i560" -msgstr "Canon S450" +msgstr "Canon i560" -#: src/main/xmli18n-tmp.h:218 -#, fuzzy +#: src/main/xmli18n-tmp.h:240 msgid "Canon i850" -msgstr "Canon S450" +msgstr "Canon i850" -#: src/main/xmli18n-tmp.h:219 -#, fuzzy +#: src/main/xmli18n-tmp.h:241 msgid "Canon i860" -msgstr "Canon S600" +msgstr "Canon i860" -#: src/main/xmli18n-tmp.h:220 -#, fuzzy +#: src/main/xmli18n-tmp.h:242 msgid "Canon i865" -msgstr "Canon BJC-85" +msgstr "Canon i865" -#: src/main/xmli18n-tmp.h:221 +#: src/main/xmli18n-tmp.h:243 msgid "Epson Stylus C20" msgstr "Epson Stylus C20" -#: src/main/xmli18n-tmp.h:222 +#: src/main/xmli18n-tmp.h:244 msgid "Epson Stylus C20SX" msgstr "Epson Stylus C20SX" -#: src/main/xmli18n-tmp.h:223 +#: src/main/xmli18n-tmp.h:245 msgid "Epson Stylus C20UX" msgstr "Epson Stylus C20UX" -#: src/main/xmli18n-tmp.h:224 +#: src/main/xmli18n-tmp.h:246 msgid "Epson Stylus C40" msgstr "Epson Stylus C40" -#: src/main/xmli18n-tmp.h:225 +#: src/main/xmli18n-tmp.h:247 msgid "Epson Stylus C40SX" msgstr "Epson Stylus C40SX" -#: src/main/xmli18n-tmp.h:226 +#: src/main/xmli18n-tmp.h:248 msgid "Epson Stylus C40UX" msgstr "Epson Stylus C40UX" -#: src/main/xmli18n-tmp.h:227 +#: src/main/xmli18n-tmp.h:249 msgid "Epson Stylus C41" msgstr "Epson Stylus C41" -#: src/main/xmli18n-tmp.h:228 +#: src/main/xmli18n-tmp.h:250 msgid "Epson Stylus C41SX" msgstr "Epson Stylus C41SX" -#: src/main/xmli18n-tmp.h:229 +#: src/main/xmli18n-tmp.h:251 msgid "Epson Stylus C41UX" msgstr "Epson Stylus C41UX" -#: src/main/xmli18n-tmp.h:230 +#: src/main/xmli18n-tmp.h:252 msgid "Epson Stylus C42" msgstr "Epson Stylus C42" -#: src/main/xmli18n-tmp.h:231 +#: src/main/xmli18n-tmp.h:253 msgid "Epson Stylus C42SX" msgstr "Epson Stylus C42SX" -#: src/main/xmli18n-tmp.h:232 +#: src/main/xmli18n-tmp.h:254 msgid "Epson Stylus C42UX" msgstr "Epson Stylus C42UX" -#: src/main/xmli18n-tmp.h:233 +#: src/main/xmli18n-tmp.h:255 msgid "Epson Stylus C43" msgstr "Epson Stylus C43" -#: src/main/xmli18n-tmp.h:234 +#: src/main/xmli18n-tmp.h:256 msgid "Epson Stylus C43SX" msgstr "Epson Stylus C43SX" -#: src/main/xmli18n-tmp.h:235 +#: src/main/xmli18n-tmp.h:257 msgid "Epson Stylus C43UX" msgstr "Epson Stylus C43UX" -#: src/main/xmli18n-tmp.h:236 +#: src/main/xmli18n-tmp.h:258 msgid "Epson Stylus C44" msgstr "Epson Stylus C44" -#: src/main/xmli18n-tmp.h:237 +#: src/main/xmli18n-tmp.h:259 msgid "Epson Stylus C44SX" msgstr "Epson Stylus C44SX" -#: src/main/xmli18n-tmp.h:238 +#: src/main/xmli18n-tmp.h:260 msgid "Epson Stylus C44UX" msgstr "Epson Stylus C44UX" -#: src/main/xmli18n-tmp.h:239 +#: src/main/xmli18n-tmp.h:261 msgid "Epson Stylus C45" msgstr "Epson Stylus C45" -#: src/main/xmli18n-tmp.h:240 +#: src/main/xmli18n-tmp.h:262 msgid "Epson Stylus C46" msgstr "Epson Stylus C46" -#: src/main/xmli18n-tmp.h:241 +#: src/main/xmli18n-tmp.h:263 msgid "Epson Stylus C48" msgstr "Epson Stylus C48" -#: src/main/xmli18n-tmp.h:242 +#: src/main/xmli18n-tmp.h:264 msgid "Epson Stylus C50" msgstr "Epson Stylus C50" -#: src/main/xmli18n-tmp.h:243 +#: src/main/xmli18n-tmp.h:265 msgid "Epson Stylus C60" msgstr "Epson Stylus C60" -#: src/main/xmli18n-tmp.h:244 +#: src/main/xmli18n-tmp.h:266 msgid "Epson Stylus C61" msgstr "Epson Stylus C61" -#: src/main/xmli18n-tmp.h:245 +#: src/main/xmli18n-tmp.h:267 msgid "Epson Stylus C62" msgstr "Epson Stylus C62" -#: src/main/xmli18n-tmp.h:246 +#: src/main/xmli18n-tmp.h:268 msgid "Epson Stylus C63" msgstr "Epson Stylus C63" -#: src/main/xmli18n-tmp.h:247 +#: src/main/xmli18n-tmp.h:269 msgid "Epson Stylus C64" msgstr "Epson Stylus C64" -#: src/main/xmli18n-tmp.h:248 +#: src/main/xmli18n-tmp.h:270 msgid "Epson Stylus C65" msgstr "Epson Stylus C65" -#: src/main/xmli18n-tmp.h:249 +#: src/main/xmli18n-tmp.h:271 msgid "Epson Stylus C66" msgstr "Epson Stylus C66" -#: src/main/xmli18n-tmp.h:250 +#: src/main/xmli18n-tmp.h:272 msgid "Epson Stylus C68" msgstr "Epson Stylus C68" -#: src/main/xmli18n-tmp.h:251 +#: src/main/xmli18n-tmp.h:273 msgid "Epson Stylus C70" msgstr "Epson Stylus C70" -#: src/main/xmli18n-tmp.h:252 -#, fuzzy +#: src/main/xmli18n-tmp.h:274 msgid "Epson Stylus C79" -msgstr "Epson Stylus C70" +msgstr "Epson Stylus C79" -#: src/main/xmli18n-tmp.h:253 +#: src/main/xmli18n-tmp.h:275 msgid "Epson Stylus C80" msgstr "Epson Stylus C80" -#: src/main/xmli18n-tmp.h:254 +#: src/main/xmli18n-tmp.h:276 msgid "Epson Stylus C82" msgstr "Epson Stylus C82" -#: src/main/xmli18n-tmp.h:255 +#: src/main/xmli18n-tmp.h:277 msgid "Epson Stylus C83" msgstr "Epson Stylus C83" -#: src/main/xmli18n-tmp.h:256 +#: src/main/xmli18n-tmp.h:278 msgid "Epson Stylus C84" msgstr "Epson Stylus C84" -#: src/main/xmli18n-tmp.h:257 +#: src/main/xmli18n-tmp.h:279 msgid "Epson Stylus C85" msgstr "Epson Stylus C85" -#: src/main/xmli18n-tmp.h:258 +#: src/main/xmli18n-tmp.h:280 msgid "Epson Stylus C86" msgstr "Epson Stylus C86" -#: src/main/xmli18n-tmp.h:259 -#, fuzzy +#: src/main/xmli18n-tmp.h:281 msgid "Epson Stylus C87" -msgstr "Epson Stylus C48" +msgstr "Epson Stylus C87" -#: src/main/xmli18n-tmp.h:260 +#: src/main/xmli18n-tmp.h:282 msgid "Epson Stylus C88" msgstr "Epson Stylus C88" -#: src/main/xmli18n-tmp.h:261 +#: src/main/xmli18n-tmp.h:283 #, fuzzy msgid "Epson Stylus C110" msgstr "Epson Stylus C20" -#: src/main/xmli18n-tmp.h:262 +#: src/main/xmli18n-tmp.h:284 #, fuzzy msgid "Epson Stylus C120" msgstr "Epson Stylus C20" -#: src/main/xmli18n-tmp.h:263 +#: src/main/xmli18n-tmp.h:285 msgid "Epson Stylus Color" msgstr "Epson Stylus Color" -#: src/main/xmli18n-tmp.h:264 +#: src/main/xmli18n-tmp.h:286 msgid "Epson Stylus Color I" msgstr "Epson Stylus Color I" -#: src/main/xmli18n-tmp.h:265 +#: src/main/xmli18n-tmp.h:287 msgid "Epson Stylus Color II" msgstr "Epson Stylus Color II" -#: src/main/xmli18n-tmp.h:266 +#: src/main/xmli18n-tmp.h:288 msgid "Epson Stylus Color IIs" msgstr "Epson Stylus Color IIs" -#: src/main/xmli18n-tmp.h:267 +#: src/main/xmli18n-tmp.h:289 msgid "Epson Stylus Color PRO" msgstr "Epson Stylus Color PRO" -#: src/main/xmli18n-tmp.h:268 +#: src/main/xmli18n-tmp.h:290 msgid "Epson Stylus Pro XL" msgstr "Epson Stylus Pro XL" -#: src/main/xmli18n-tmp.h:269 +#: src/main/xmli18n-tmp.h:291 msgid "Epson Stylus Color 400" msgstr "Epson Stylus Color 400" -#: src/main/xmli18n-tmp.h:270 +#: src/main/xmli18n-tmp.h:292 msgid "Epson Stylus Color 440" msgstr "Epson Stylus Color 440" -#: src/main/xmli18n-tmp.h:271 +#: src/main/xmli18n-tmp.h:293 msgid "Epson Stylus Color 460" msgstr "Epson Stylus Color 460" -#: src/main/xmli18n-tmp.h:272 +#: src/main/xmli18n-tmp.h:294 msgid "Epson Stylus Color 480" msgstr "Epson Stylus Color 480" -#: src/main/xmli18n-tmp.h:273 +#: src/main/xmli18n-tmp.h:295 msgid "Epson Stylus Color 500" msgstr "Epson Stylus Color 500" -#: src/main/xmli18n-tmp.h:274 +#: src/main/xmli18n-tmp.h:296 msgid "Epson Stylus Color 580" msgstr "Epson Stylus Color 580" -#: src/main/xmli18n-tmp.h:275 +#: src/main/xmli18n-tmp.h:297 msgid "Epson Stylus Color 600" msgstr "Epson Stylus Color 600" -#: src/main/xmli18n-tmp.h:276 +#: src/main/xmli18n-tmp.h:298 msgid "Epson Stylus Color 640" msgstr "Epson Stylus Color 640" -#: src/main/xmli18n-tmp.h:277 +#: src/main/xmli18n-tmp.h:299 msgid "Epson Stylus Color 660" msgstr "Epson Stylus Color 660" -#: src/main/xmli18n-tmp.h:278 +#: src/main/xmli18n-tmp.h:300 msgid "Epson Stylus Color 670" msgstr "Epson Stylus Color 670" -#: src/main/xmli18n-tmp.h:279 +#: src/main/xmli18n-tmp.h:301 msgid "Epson Stylus Color 680" msgstr "Epson Stylus Color 680" -#: src/main/xmli18n-tmp.h:280 +#: src/main/xmli18n-tmp.h:302 msgid "Epson Stylus Color 740" msgstr "Epson Stylus Color 740" -#: src/main/xmli18n-tmp.h:281 +#: src/main/xmli18n-tmp.h:303 msgid "Epson Stylus Color 760" msgstr "Epson Stylus Color 760" -#: src/main/xmli18n-tmp.h:282 +#: src/main/xmli18n-tmp.h:304 msgid "Epson Stylus Color 777" msgstr "Epson Stylus Color 777" -#: src/main/xmli18n-tmp.h:283 +#: src/main/xmli18n-tmp.h:305 msgid "Epson Stylus Color 800" msgstr "Epson Stylus Color 800" -#: src/main/xmli18n-tmp.h:284 +#: src/main/xmli18n-tmp.h:306 msgid "Epson Stylus Color 850" msgstr "Epson Stylus Color 850" -#: src/main/xmli18n-tmp.h:285 +#: src/main/xmli18n-tmp.h:307 msgid "Epson Stylus Color 860" msgstr "Epson Stylus Color 860" -#: src/main/xmli18n-tmp.h:286 +#: src/main/xmli18n-tmp.h:308 msgid "Epson Stylus Color 880" msgstr "Epson Stylus Color 880" -#: src/main/xmli18n-tmp.h:287 +#: src/main/xmli18n-tmp.h:309 msgid "Epson Stylus Color 8 3" msgstr "Epson Stylus Color 8 3" -#: src/main/xmli18n-tmp.h:288 +#: src/main/xmli18n-tmp.h:310 msgid "Epson Stylus Color 900" msgstr "Epson Stylus Color 900" -#: src/main/xmli18n-tmp.h:289 +#: src/main/xmli18n-tmp.h:311 msgid "Epson Stylus Color 980" msgstr "Epson Stylus Color 980" -#: src/main/xmli18n-tmp.h:290 +#: src/main/xmli18n-tmp.h:312 msgid "Epson Stylus Color 1160" msgstr "Epson Stylus Color 1160" -#: src/main/xmli18n-tmp.h:291 +#: src/main/xmli18n-tmp.h:313 msgid "Epson Stylus Color 1500" msgstr "Epson Stylus Color 1500" -#: src/main/xmli18n-tmp.h:292 +#: src/main/xmli18n-tmp.h:314 msgid "Epson Stylus Color 1520" msgstr "Epson Stylus Color 1520" -#: src/main/xmli18n-tmp.h:293 +#: src/main/xmli18n-tmp.h:315 msgid "Epson Stylus Color 3000" msgstr "Epson Stylus Color 3000" -#: src/main/xmli18n-tmp.h:294 +#: src/main/xmli18n-tmp.h:316 msgid "Epson Stylus Photo" msgstr "Epson Stylus Photo" -#: src/main/xmli18n-tmp.h:295 +#: src/main/xmli18n-tmp.h:317 msgid "Epson Stylus Photo 700" msgstr "Epson Stylus Photo 700" -#: src/main/xmli18n-tmp.h:296 +#: src/main/xmli18n-tmp.h:318 msgid "Epson Stylus Photo EX" msgstr "Epson Stylus Photo EX" -#: src/main/xmli18n-tmp.h:297 +#: src/main/xmli18n-tmp.h:319 msgid "Epson Stylus Photo EX3" msgstr "Epson Stylus Photo EX3" -#: src/main/xmli18n-tmp.h:298 +#: src/main/xmli18n-tmp.h:320 msgid "Epson Stylus Photo 720" msgstr "Epson Stylus Photo 720" -#: src/main/xmli18n-tmp.h:299 +#: src/main/xmli18n-tmp.h:321 msgid "Epson Stylus Photo 750" msgstr "Epson Stylus Photo 750" -#: src/main/xmli18n-tmp.h:300 +#: src/main/xmli18n-tmp.h:322 msgid "Epson Stylus Photo 780" msgstr "Epson Stylus Photo 780" -#: src/main/xmli18n-tmp.h:301 +#: src/main/xmli18n-tmp.h:323 msgid "Epson Stylus Photo 785" msgstr "Epson Stylus Photo 785" -#: src/main/xmli18n-tmp.h:302 +#: src/main/xmli18n-tmp.h:324 msgid "Epson Stylus Photo 790" msgstr "Epson Stylus Photo 790" -#: src/main/xmli18n-tmp.h:303 +#: src/main/xmli18n-tmp.h:325 msgid "Epson Stylus Photo 810" msgstr "Epson Stylus Photo 810" -#: src/main/xmli18n-tmp.h:304 +#: src/main/xmli18n-tmp.h:326 msgid "Epson Stylus Photo 820" msgstr "Epson Stylus Photo 820" -#: src/main/xmli18n-tmp.h:305 +#: src/main/xmli18n-tmp.h:327 msgid "Epson Stylus Photo 825" msgstr "Epson Stylus Photo 825" -#: src/main/xmli18n-tmp.h:306 +#: src/main/xmli18n-tmp.h:328 msgid "Epson Stylus Photo 830" msgstr "Epson Stylus Photo 830" -#: src/main/xmli18n-tmp.h:307 +#: src/main/xmli18n-tmp.h:329 msgid "Epson Stylus Photo 830U" msgstr "Epson Stylus Photo 830U" -#: src/main/xmli18n-tmp.h:308 +#: src/main/xmli18n-tmp.h:330 msgid "Epson Stylus Photo 870" msgstr "Epson Stylus Photo 870" -#: src/main/xmli18n-tmp.h:309 +#: src/main/xmli18n-tmp.h:331 msgid "Epson Stylus Photo 875" msgstr "Epson Stylus Photo 875" -#: src/main/xmli18n-tmp.h:310 +#: src/main/xmli18n-tmp.h:332 msgid "Epson Stylus Photo 890" msgstr "Epson Stylus Photo 890" -#: src/main/xmli18n-tmp.h:311 +#: src/main/xmli18n-tmp.h:333 msgid "Epson Stylus Photo 895" msgstr "Epson Stylus Photo 895" -#: src/main/xmli18n-tmp.h:312 +#: src/main/xmli18n-tmp.h:334 msgid "Epson Stylus Photo 900" msgstr "Epson Stylus Photo 900" -#: src/main/xmli18n-tmp.h:313 +#: src/main/xmli18n-tmp.h:335 msgid "Epson Stylus Photo 915" msgstr "Epson Stylus Photo 915" -#: src/main/xmli18n-tmp.h:314 +#: src/main/xmli18n-tmp.h:336 msgid "Epson Stylus Photo 925" msgstr "Epson Stylus Photo 925" -#: src/main/xmli18n-tmp.h:315 +#: src/main/xmli18n-tmp.h:337 msgid "Epson Stylus Photo 935" msgstr "Epson Stylus Photo 935" -#: src/main/xmli18n-tmp.h:316 +#: src/main/xmli18n-tmp.h:338 msgid "Epson Stylus Photo 950" msgstr "Epson Stylus Photo 950" -#: src/main/xmli18n-tmp.h:317 +#: src/main/xmli18n-tmp.h:339 msgid "Epson Stylus Photo 960" msgstr "Epson Stylus Photo 960" -#: src/main/xmli18n-tmp.h:318 +#: src/main/xmli18n-tmp.h:340 msgid "Epson Stylus Photo 1200" msgstr "Epson Stylus Photo 1200" -#: src/main/xmli18n-tmp.h:319 +#: src/main/xmli18n-tmp.h:341 msgid "Epson Stylus Photo 1270" msgstr "Epson Stylus Photo 1270" -#: src/main/xmli18n-tmp.h:320 +#: src/main/xmli18n-tmp.h:342 msgid "Epson Stylus Photo 1280" msgstr "Epson Stylus Photo 1280" -#: src/main/xmli18n-tmp.h:321 +#: src/main/xmli18n-tmp.h:343 msgid "Epson Stylus Photo 1290" msgstr "Epson Stylus Photo 1290" -#: src/main/xmli18n-tmp.h:322 -#, fuzzy +#: src/main/xmli18n-tmp.h:344 msgid "Epson Stylus Photo 1400" -msgstr "Epson Stylus Photo 1200" +msgstr "Epson Stylus Photo 1400" -#: src/main/xmli18n-tmp.h:323 -#, fuzzy +#: src/main/xmli18n-tmp.h:345 msgid "Epson Stylus Photo 1410" -msgstr "Epson Stylus Photo 810" +msgstr "Epson Stylus Photo 1410" -#: src/main/xmli18n-tmp.h:324 +#: src/main/xmli18n-tmp.h:346 msgid "Epson Stylus Photo 2000P" msgstr "Epson Stylus Photo 2000P" -#: src/main/xmli18n-tmp.h:325 +#: src/main/xmli18n-tmp.h:347 msgid "Epson Stylus Photo 2100" msgstr "Epson Stylus Photo 2100" -#: src/main/xmli18n-tmp.h:326 +#: src/main/xmli18n-tmp.h:348 msgid "Epson Stylus Photo 2200" msgstr "Epson Stylus Photo 2200" -#: src/main/xmli18n-tmp.h:327 +#: src/main/xmli18n-tmp.h:349 msgid "Epson Stylus Photo R200" msgstr "Epson Stylus Photo R200" -#: src/main/xmli18n-tmp.h:328 +#: src/main/xmli18n-tmp.h:350 msgid "Epson Stylus Photo R210" msgstr "Epson Stylus Photo R210" -#: src/main/xmli18n-tmp.h:329 +#: src/main/xmli18n-tmp.h:351 msgid "Epson Stylus Photo R220" msgstr "Epson Stylus Photo R220" -#: src/main/xmli18n-tmp.h:330 -#, fuzzy +#: src/main/xmli18n-tmp.h:352 msgid "Epson Stylus Photo R230" -msgstr "Epson Stylus Photo R200" +msgstr "Epson Stylus Photo R230" -#: src/main/xmli18n-tmp.h:331 -#, fuzzy +#: src/main/xmli18n-tmp.h:353 msgid "Epson Stylus Photo R240" -msgstr "Epson Stylus Photo R2400" +msgstr "Epson Stylus Photo R240" -#: src/main/xmli18n-tmp.h:332 -#, fuzzy +#: src/main/xmli18n-tmp.h:354 msgid "Epson Stylus Photo R245" -msgstr "Epson Stylus Photo RX425" +msgstr "Epson Stylus Photo R245" -#: src/main/xmli18n-tmp.h:333 -#, fuzzy +#: src/main/xmli18n-tmp.h:355 msgid "Epson Stylus Photo R260" -msgstr "Epson Stylus Photo R200" +msgstr "Epson Stylus Photo R260" -#: src/main/xmli18n-tmp.h:334 -#, fuzzy +#: src/main/xmli18n-tmp.h:356 msgid "Epson Stylus Photo R265" -msgstr "Epson Stylus Photo RX425" +msgstr "Epson Stylus Photo R265" -#: src/main/xmli18n-tmp.h:335 -#, fuzzy +#: src/main/xmli18n-tmp.h:357 msgid "Epson Stylus Photo R270" -msgstr "Epson Stylus Photo 1270" +msgstr "Epson Stylus Photo R270" -#: src/main/xmli18n-tmp.h:336 +#: src/main/xmli18n-tmp.h:358 +#, fuzzy +msgid "Epson Stylus Photo R280" +msgstr "Epson Stylus Photo 1280" + +#: src/main/xmli18n-tmp.h:359 +#, fuzzy +msgid "Epson Stylus Photo R285" +msgstr "Epson Stylus Photo R245" + +#: src/main/xmli18n-tmp.h:360 msgid "Epson Stylus Photo R300" msgstr "Epson Stylus Photo R300" -#: src/main/xmli18n-tmp.h:337 +#: src/main/xmli18n-tmp.h:361 msgid "Epson Stylus Photo R310" msgstr "Epson Stylus Photo R310" -#: src/main/xmli18n-tmp.h:338 +#: src/main/xmli18n-tmp.h:362 msgid "Epson Stylus Photo R320" msgstr "Epson Stylus Photo R320" -#: src/main/xmli18n-tmp.h:339 +#: src/main/xmli18n-tmp.h:363 msgid "Epson Stylus Photo R340" msgstr "Epson Stylus Photo R340" -#: src/main/xmli18n-tmp.h:340 -#, fuzzy +#: src/main/xmli18n-tmp.h:364 msgid "Epson Stylus Photo R350" -msgstr "Epson Stylus Photo R300" +msgstr "Epson Stylus Photo R350" -#: src/main/xmli18n-tmp.h:341 -#, fuzzy +#: src/main/xmli18n-tmp.h:365 msgid "Epson Stylus Photo R360" -msgstr "Epson Stylus Photo R300" +msgstr "Epson Stylus Photo R360" -#: src/main/xmli18n-tmp.h:342 -#, fuzzy +#: src/main/xmli18n-tmp.h:366 msgid "Epson Stylus Photo R380" -msgstr "Epson Stylus Photo R300" +msgstr "Epson Stylus Photo R380" -#: src/main/xmli18n-tmp.h:343 -#, fuzzy +#: src/main/xmli18n-tmp.h:367 msgid "Epson Stylus Photo R390" -msgstr "Epson Stylus Photo R300" +msgstr "Epson Stylus Photo R390" -#: src/main/xmli18n-tmp.h:344 +#: src/main/xmli18n-tmp.h:368 msgid "Epson Stylus Photo RX400" msgstr "Epson Stylus Photo RX400" -#: src/main/xmli18n-tmp.h:345 +#: src/main/xmli18n-tmp.h:369 msgid "Epson Stylus Photo RX420" msgstr "Epson Stylus Photo RX420" -#: src/main/xmli18n-tmp.h:346 +#: src/main/xmli18n-tmp.h:370 msgid "Epson Stylus Photo RX425" msgstr "Epson Stylus Photo RX425" -#: src/main/xmli18n-tmp.h:347 +#: src/main/xmli18n-tmp.h:371 msgid "Epson Stylus Photo RX430" msgstr "Epson Stylus Photo RX430" -#: src/main/xmli18n-tmp.h:348 +#: src/main/xmli18n-tmp.h:372 msgid "Epson Stylus Photo RX500" msgstr "Epson Stylus Photo RX500" -#: src/main/xmli18n-tmp.h:349 +#: src/main/xmli18n-tmp.h:373 msgid "Epson Stylus Photo RX510" msgstr "Epson Stylus Photo RX510" -#: src/main/xmli18n-tmp.h:350 -#, fuzzy +#: src/main/xmli18n-tmp.h:374 msgid "Epson Stylus Photo RX560" -msgstr "Epson Stylus Photo RX500" +msgstr "Epson Stylus Photo RX560" -#: src/main/xmli18n-tmp.h:351 -#, fuzzy +#: src/main/xmli18n-tmp.h:375 msgid "Epson Stylus Photo RX580" -msgstr "Epson Stylus Photo RX500" +msgstr "Epson Stylus Photo RX580" -#: src/main/xmli18n-tmp.h:352 +#: src/main/xmli18n-tmp.h:376 #, fuzzy +msgid "Epson Stylus Photo RX585" +msgstr "Epson Stylus Photo RX580" + +#: src/main/xmli18n-tmp.h:377 msgid "Epson Stylus Photo RX590" -msgstr "Epson Stylus Photo RX500" +msgstr "Epson Stylus Photo RX590" -#: src/main/xmli18n-tmp.h:353 +#: src/main/xmli18n-tmp.h:378 #, fuzzy msgid "Epson Stylus Photo RX595" -msgstr "Epson Stylus Photo RX500" +msgstr "Epson Stylus Photo RX590" -#: src/main/xmli18n-tmp.h:354 +#: src/main/xmli18n-tmp.h:379 msgid "Epson Stylus Photo RX600" msgstr "Epson Stylus Photo RX600" -#: src/main/xmli18n-tmp.h:355 +#: src/main/xmli18n-tmp.h:380 msgid "Epson Stylus Photo RX620" msgstr "Epson Stylus Photo RX620" -#: src/main/xmli18n-tmp.h:356 +#: src/main/xmli18n-tmp.h:381 msgid "Epson Stylus Photo RX630" msgstr "Epson Stylus Photo RX630" -#: src/main/xmli18n-tmp.h:357 -#, fuzzy +#: src/main/xmli18n-tmp.h:382 msgid "Epson Stylus Photo RX640" -msgstr "Epson Stylus Photo RX400" +msgstr "Epson Stylus Photo RX640" -#: src/main/xmli18n-tmp.h:358 +#: src/main/xmli18n-tmp.h:383 +#, fuzzy +msgid "Epson Stylus Photo RX680" +msgstr "Epson Stylus Photo RX560" + +#: src/main/xmli18n-tmp.h:384 +#, fuzzy +msgid "Epson Stylus Photo RX685" +msgstr "Epson Stylus Photo R265" + +#: src/main/xmli18n-tmp.h:385 msgid "Epson Stylus Photo RX700" msgstr "Epson Stylus Photo RX700" -#: src/main/xmli18n-tmp.h:359 +#: src/main/xmli18n-tmp.h:386 msgid "Epson Stylus Photo R800" msgstr "Epson Stylus Photo R800" -#: src/main/xmli18n-tmp.h:360 +#: src/main/xmli18n-tmp.h:387 msgid "Epson Stylus Photo R1800" msgstr "Epson Stylus Photo R1800" -#: src/main/xmli18n-tmp.h:361 +#: src/main/xmli18n-tmp.h:388 msgid "Epson Stylus Photo R2400" msgstr "Epson Stylus Photo R2400" -#: src/main/xmli18n-tmp.h:362 +#: src/main/xmli18n-tmp.h:389 msgid "Epson Stylus Pro 5000" msgstr "Epson Stylus Pro 5000" -#: src/main/xmli18n-tmp.h:363 +#: src/main/xmli18n-tmp.h:390 msgid "Epson Stylus Pro 5500" msgstr "Epson Stylus Pro 5500" -#: src/main/xmli18n-tmp.h:364 +#: src/main/xmli18n-tmp.h:391 msgid "Epson Stylus Pro 7000" msgstr "Epson Stylus Pro 7000" -#: src/main/xmli18n-tmp.h:365 +#: src/main/xmli18n-tmp.h:392 msgid "Epson Stylus Pro 7500" msgstr "Epson Stylus Pro 7500" -#: src/main/xmli18n-tmp.h:366 +#: src/main/xmli18n-tmp.h:393 msgid "Epson Stylus Pro 7600" msgstr "Epson Stylus Pro 7600" -#: src/main/xmli18n-tmp.h:367 +#: src/main/xmli18n-tmp.h:394 msgid "Epson Stylus Pro 9000" msgstr "Epson Stylus Pro 9000" -#: src/main/xmli18n-tmp.h:368 +#: src/main/xmli18n-tmp.h:395 msgid "Epson Stylus Pro 9500" msgstr "Epson Stylus Pro 9500" -#: src/main/xmli18n-tmp.h:369 +#: src/main/xmli18n-tmp.h:396 msgid "Epson Stylus Pro 9600" msgstr "Epson Stylus Pro 9600" -#: src/main/xmli18n-tmp.h:370 +#: src/main/xmli18n-tmp.h:397 msgid "Epson Stylus Pro 10000" msgstr "Epson Stylus Pro 10000" -#: src/main/xmli18n-tmp.h:371 +#: src/main/xmli18n-tmp.h:398 msgid "Epson Stylus Scan 2000" msgstr "Epson Stylus Scan 2000" -#: src/main/xmli18n-tmp.h:372 +#: src/main/xmli18n-tmp.h:399 msgid "Epson Stylus Scan 2500" msgstr "Epson Stylus Scan 2500" -#: src/main/xmli18n-tmp.h:373 +#: src/main/xmli18n-tmp.h:400 msgid "Epson Stylus CX1500" msgstr "Epson Stylus CX1500" -#: src/main/xmli18n-tmp.h:374 +#: src/main/xmli18n-tmp.h:401 msgid "Epson Stylus CX3100" msgstr "Epson Stylus CX3100" -#: src/main/xmli18n-tmp.h:375 +#: src/main/xmli18n-tmp.h:402 msgid "Epson Stylus CX3200" msgstr "Epson Stylus CX3200" -#: src/main/xmli18n-tmp.h:376 +#: src/main/xmli18n-tmp.h:403 msgid "Epson Stylus CX3500" msgstr "Epson Stylus CX3500" -#: src/main/xmli18n-tmp.h:377 +#: src/main/xmli18n-tmp.h:404 msgid "Epson Stylus CX3600" msgstr "Epson Stylus CX3600" -#: src/main/xmli18n-tmp.h:378 +#: src/main/xmli18n-tmp.h:405 msgid "Epson Stylus CX3650" msgstr "Epson Stylus CX3650" -#: src/main/xmli18n-tmp.h:379 +#: src/main/xmli18n-tmp.h:406 msgid "Epson Stylus CX3700" msgstr "Epson Stylus CX3700" -#: src/main/xmli18n-tmp.h:380 +#: src/main/xmli18n-tmp.h:407 msgid "Epson Stylus CX3800" msgstr "Epson Stylus CX3800" -#: src/main/xmli18n-tmp.h:381 +#: src/main/xmli18n-tmp.h:408 msgid "Epson Stylus CX3805" msgstr "Epson Stylus CX3805" -#: src/main/xmli18n-tmp.h:382 +#: src/main/xmli18n-tmp.h:409 msgid "Epson Stylus CX3810" msgstr "Epson Stylus CX3810" -#: src/main/xmli18n-tmp.h:383 +#: src/main/xmli18n-tmp.h:410 msgid "Epson Stylus CX4100" msgstr "Epson Stylus CX4100" -#: src/main/xmli18n-tmp.h:384 +#: src/main/xmli18n-tmp.h:411 msgid "Epson Stylus CX4200" msgstr "Epson Stylus CX4200" -#: src/main/xmli18n-tmp.h:385 +#: src/main/xmli18n-tmp.h:412 #, fuzzy msgid "Epson Stylus CX4400" msgstr "Epson Stylus CX4100" -#: src/main/xmli18n-tmp.h:386 +#: src/main/xmli18n-tmp.h:413 msgid "Epson Stylus CX4500" msgstr "Epson Stylus CX4500" -#: src/main/xmli18n-tmp.h:387 +#: src/main/xmli18n-tmp.h:414 msgid "Epson Stylus CX4600" msgstr "Epson Stylus CX4600" -#: src/main/xmli18n-tmp.h:388 +#: src/main/xmli18n-tmp.h:415 msgid "Epson Stylus CX4700" msgstr "Epson Stylus CX4700" -#: src/main/xmli18n-tmp.h:389 +#: src/main/xmli18n-tmp.h:416 msgid "Epson Stylus CX4800" msgstr "Epson Stylus CX4800" -#: src/main/xmli18n-tmp.h:390 +#: src/main/xmli18n-tmp.h:417 #, fuzzy msgid "Epson Stylus CX4900" msgstr "Epson Stylus CX4100" -#: src/main/xmli18n-tmp.h:391 -#, fuzzy +#: src/main/xmli18n-tmp.h:418 msgid "Epson Stylus CX5000" -msgstr "Epson Stylus CX1500" +msgstr "Epson Stylus CX5000" -#: src/main/xmli18n-tmp.h:392 -#, fuzzy +#: src/main/xmli18n-tmp.h:419 msgid "Epson Stylus CX5000F" -msgstr "Epson Stylus CX1500" +msgstr "Epson Stylus CX5000F" -#: src/main/xmli18n-tmp.h:393 +#: src/main/xmli18n-tmp.h:420 msgid "Epson Stylus CX5100" msgstr "Epson Stylus CX5100" -#: src/main/xmli18n-tmp.h:394 +#: src/main/xmli18n-tmp.h:421 msgid "Epson Stylus CX5200" msgstr "Epson Stylus CX5200" -#: src/main/xmli18n-tmp.h:395 +#: src/main/xmli18n-tmp.h:422 msgid "Epson Stylus CX5300" msgstr "Epson Stylus CX5300" -#: src/main/xmli18n-tmp.h:396 +#: src/main/xmli18n-tmp.h:423 msgid "Epson Stylus CX5400" msgstr "Epson Stylus CX5400" -#: src/main/xmli18n-tmp.h:397 +#: src/main/xmli18n-tmp.h:424 #, fuzzy msgid "Epson Stylus CX5600" msgstr "Epson Stylus CX1500" -#: src/main/xmli18n-tmp.h:398 +#: src/main/xmli18n-tmp.h:425 msgid "Epson Stylus CX5700" msgstr "Epson Stylus CX5700" -#: src/main/xmli18n-tmp.h:399 +#: src/main/xmli18n-tmp.h:426 msgid "Epson Stylus CX5800" msgstr "Epson Stylus CX5800" -#: src/main/xmli18n-tmp.h:400 -#, fuzzy +#: src/main/xmli18n-tmp.h:427 msgid "Epson Stylus CX6000" -msgstr "Epson Stylus CX3600" +msgstr "Epson Stylus CX6000" -#: src/main/xmli18n-tmp.h:401 +#: src/main/xmli18n-tmp.h:428 msgid "Epson Stylus CX6300" msgstr "Epson Stylus CX6300" -#: src/main/xmli18n-tmp.h:402 +#: src/main/xmli18n-tmp.h:429 msgid "Epson Stylus CX6400" msgstr "Epson Stylus CX6400" -#: src/main/xmli18n-tmp.h:403 +#: src/main/xmli18n-tmp.h:430 msgid "Epson Stylus CX6500" msgstr "Epson Stylus CX6500" -#: src/main/xmli18n-tmp.h:404 +#: src/main/xmli18n-tmp.h:431 msgid "Epson Stylus CX6600" msgstr "Epson Stylus CX6600" -#: src/main/xmli18n-tmp.h:405 -#, fuzzy +#: src/main/xmli18n-tmp.h:432 msgid "Epson Stylus CX7000F" -msgstr "Epson Stylus CX3700" +msgstr "Epson Stylus CX7000F" -#: src/main/xmli18n-tmp.h:406 +#: src/main/xmli18n-tmp.h:433 #, fuzzy msgid "Epson Stylus CX7400" msgstr "Epson Stylus CX3700" -#: src/main/xmli18n-tmp.h:407 +#: src/main/xmli18n-tmp.h:434 msgid "Epson Stylus CX7700" msgstr "Epson Stylus CX7700" -#: src/main/xmli18n-tmp.h:408 +#: src/main/xmli18n-tmp.h:435 msgid "Epson Stylus CX7800" msgstr "Epson Stylus CX7800" -#: src/main/xmli18n-tmp.h:409 +#: src/main/xmli18n-tmp.h:436 msgid "Epson Stylus CX8300" msgstr "Epson Stylus CX8300" -#: src/main/xmli18n-tmp.h:410 +#: src/main/xmli18n-tmp.h:437 msgid "Epson Stylus CX8400" msgstr "Epson Stylus CX8400" -#: src/main/xmli18n-tmp.h:411 +#: src/main/xmli18n-tmp.h:438 #, fuzzy msgid "Epson Stylus CX9400" msgstr "Epson Stylus CX4100" -#: src/main/xmli18n-tmp.h:412 +#: src/main/xmli18n-tmp.h:439 msgid "Epson Stylus D68" msgstr "Epson Stylus D68" -#: src/main/xmli18n-tmp.h:413 +#: src/main/xmli18n-tmp.h:440 msgid "Epson Stylus D88" msgstr "Epson Stylus D88" -#: src/main/xmli18n-tmp.h:414 +#: src/main/xmli18n-tmp.h:441 +#, fuzzy +msgid "Epson Stylus D92" +msgstr "Epson Stylus C20" + +#: src/main/xmli18n-tmp.h:442 #, fuzzy msgid "Epson Stylus D120" msgstr "Epson Stylus C20" -#: src/main/xmli18n-tmp.h:415 +#: src/main/xmli18n-tmp.h:443 msgid "Epson Stylus DX3800" msgstr "Epson Stylus DX3800" -#: src/main/xmli18n-tmp.h:416 +#: src/main/xmli18n-tmp.h:444 msgid "Epson Stylus DX3850" msgstr "Epson Stylus DX3850" -#: src/main/xmli18n-tmp.h:417 +#: src/main/xmli18n-tmp.h:445 #, fuzzy msgid "Epson Stylus DX4050" msgstr "Epson Stylus DX4200" -#: src/main/xmli18n-tmp.h:418 +#: src/main/xmli18n-tmp.h:446 msgid "Epson Stylus DX4200" msgstr "Epson Stylus DX4200" -#: src/main/xmli18n-tmp.h:419 +#: src/main/xmli18n-tmp.h:447 msgid "Epson Stylus DX4250" msgstr "Epson Stylus DX4250" -#: src/main/xmli18n-tmp.h:420 +#: src/main/xmli18n-tmp.h:448 +#, fuzzy +msgid "Epson Stylus DX4400" +msgstr "Epson Stylus DX4200" + +#: src/main/xmli18n-tmp.h:449 +#, fuzzy +msgid "Epson Stylus DX4450" +msgstr "Epson Stylus DX4250" + +#: src/main/xmli18n-tmp.h:450 msgid "Epson Stylus DX4800" msgstr "Epson Stylus DX4800" -#: src/main/xmli18n-tmp.h:421 +#: src/main/xmli18n-tmp.h:451 +#, fuzzy +msgid "Epson Stylus DX7000F" +msgstr "Epson Stylus CX7000F" + +#: src/main/xmli18n-tmp.h:452 +#, fuzzy +msgid "Epson Stylus DX7400" +msgstr "Epson Stylus DX4200" + +#: src/main/xmli18n-tmp.h:453 +#, fuzzy +msgid "Epson Stylus DX7450" +msgstr "Epson Stylus DX4250" + +#: src/main/xmli18n-tmp.h:454 +#, fuzzy +msgid "Epson Stylus DX8400" +msgstr "Epson Stylus CX8400" + +#: src/main/xmli18n-tmp.h:455 +#, fuzzy +msgid "Epson Stylus DX8450" +msgstr "Epson Stylus DX3850" + +#: src/main/xmli18n-tmp.h:456 msgid "Epson PictureMate" msgstr "Epson PictureMate" -#: src/main/xmli18n-tmp.h:422 +#: src/main/xmli18n-tmp.h:457 +#, fuzzy +msgid "Epson PictureMate Dash" +msgstr "Epson PictureMate Flash" + +#: src/main/xmli18n-tmp.h:458 msgid "Epson PictureMate Deluxe" msgstr "Epson PictureMate Deluxe" -#: src/main/xmli18n-tmp.h:423 -#, fuzzy +#: src/main/xmli18n-tmp.h:459 msgid "Epson PictureMate Flash" -msgstr "Epson PictureMate" +msgstr "Epson PictureMate Flash" -#: src/main/xmli18n-tmp.h:424 -#, fuzzy +#: src/main/xmli18n-tmp.h:460 msgid "Epson PictureMate Pal" -msgstr "Epson PictureMate" +msgstr "Epson PictureMate Pal" -#: src/main/xmli18n-tmp.h:425 -#, fuzzy +#: src/main/xmli18n-tmp.h:461 msgid "Epson PictureMate Snap" -msgstr "Epson PictureMate" +msgstr "Epson PictureMate Snap" -#: src/main/xmli18n-tmp.h:426 +#: src/main/xmli18n-tmp.h:462 #, fuzzy +msgid "Epson PictureMate 100" +msgstr "Epson PictureMate 200" + +#: src/main/xmli18n-tmp.h:463 msgid "Epson PictureMate 200" -msgstr "Epson PictureMate" +msgstr "Epson PictureMate 200" -#: src/main/xmli18n-tmp.h:427 -#, fuzzy +#: src/main/xmli18n-tmp.h:464 msgid "Epson PictureMate 210" -msgstr "Epson PictureMate" +msgstr "Epson PictureMate 210" -#: src/main/xmli18n-tmp.h:428 -#, fuzzy +#: src/main/xmli18n-tmp.h:465 msgid "Epson PictureMate 240" -msgstr "Epson PictureMate" +msgstr "Epson PictureMate 240" -#: src/main/xmli18n-tmp.h:429 -#, fuzzy +#: src/main/xmli18n-tmp.h:466 msgid "Epson PictureMate 250" -msgstr "Epson PictureMate" +msgstr "Epson PictureMate 250" -#: src/main/xmli18n-tmp.h:430 +#: src/main/xmli18n-tmp.h:467 +#, fuzzy +msgid "Epson PictureMate 260" +msgstr "Epson PictureMate 200" + +#: src/main/xmli18n-tmp.h:468 #, fuzzy +msgid "Epson PictureMate 270" +msgstr "Epson PictureMate 200" + +#: src/main/xmli18n-tmp.h:469 msgid "Epson PictureMate 280" -msgstr "Epson PictureMate" +msgstr "Epson PictureMate 280" -#: src/main/xmli18n-tmp.h:431 +#: src/main/xmli18n-tmp.h:470 +#, fuzzy +msgid "Epson PictureMate 290" +msgstr "Epson PictureMate 200" + +#: src/main/xmli18n-tmp.h:471 +#, fuzzy +msgid "Epson PictureMate 500" +msgstr "Epson PictureMate 200" + +#: src/main/xmli18n-tmp.h:472 +#, fuzzy +msgid "Epson PictureMate 2005" +msgstr "Epson PictureMate 200" + +#: src/main/xmli18n-tmp.h:473 msgid "Epson CL 700" msgstr "Epson CL 700" -#: src/main/xmli18n-tmp.h:432 +#: src/main/xmli18n-tmp.h:474 msgid "Epson CL 750" msgstr "Epson CL 750" -#: src/main/xmli18n-tmp.h:433 +#: src/main/xmli18n-tmp.h:475 msgid "Epson CL 760" msgstr "Epson CL 760" -#: src/main/xmli18n-tmp.h:434 +#: src/main/xmli18n-tmp.h:476 msgid "Epson E 100" msgstr "Epson E 100" -#: src/main/xmli18n-tmp.h:435 +#: src/main/xmli18n-tmp.h:477 msgid "Epson E 150" msgstr "Epson E 150" -#: src/main/xmli18n-tmp.h:436 +#: src/main/xmli18n-tmp.h:478 msgid "Epson E 200" msgstr "Epson E 200" -#: src/main/xmli18n-tmp.h:437 +#: src/main/xmli18n-tmp.h:479 +#, fuzzy +msgid "Epson E 300" +msgstr "Epson E 100" + +#: src/main/xmli18n-tmp.h:480 +#, fuzzy +msgid "Epson E 500" +msgstr "Epson E 100" + +#: src/main/xmli18n-tmp.h:481 +#, fuzzy +msgid "Epson E 520" +msgstr "Epson E 150" + +#: src/main/xmli18n-tmp.h:482 +#, fuzzy +msgid "Epson E 700" +msgstr "Epson E 100" + +#: src/main/xmli18n-tmp.h:483 +#, fuzzy +msgid "Epson E 720" +msgstr "Epson E 200" + +#: src/main/xmli18n-tmp.h:484 msgid "Epson EM 900C" msgstr "Epson EM 900C" -#: src/main/xmli18n-tmp.h:438 +#: src/main/xmli18n-tmp.h:485 msgid "Epson EM 930C" msgstr "Epson EM 930C" -#: src/main/xmli18n-tmp.h:439 +#: src/main/xmli18n-tmp.h:486 msgid "Epson MC 2000" msgstr "Epson MC 2000" -#: src/main/xmli18n-tmp.h:440 +#: src/main/xmli18n-tmp.h:487 msgid "Epson MC 5000" msgstr "Epson MC 5000" -#: src/main/xmli18n-tmp.h:441 +#: src/main/xmli18n-tmp.h:488 msgid "Epson MC 7000" msgstr "Epson MC 7000" -#: src/main/xmli18n-tmp.h:442 +#: src/main/xmli18n-tmp.h:489 msgid "Epson MC 9000" msgstr "Epson MC 9000" -#: src/main/xmli18n-tmp.h:443 +#: src/main/xmli18n-tmp.h:490 msgid "Epson MC 10000" msgstr "Epson MC 10000" -#: src/main/xmli18n-tmp.h:444 +#: src/main/xmli18n-tmp.h:491 msgid "Epson MJ 930C" msgstr "Epson MJ 930C" -#: src/main/xmli18n-tmp.h:445 +#: src/main/xmli18n-tmp.h:492 msgid "Epson MJ 5100C" msgstr "Epson MJ 5100C" -#: src/main/xmli18n-tmp.h:446 +#: src/main/xmli18n-tmp.h:493 msgid "Epson MJ 6000C" msgstr "Epson MJ 6000C" -#: src/main/xmli18n-tmp.h:447 +#: src/main/xmli18n-tmp.h:494 msgid "Epson MJ 8000C" msgstr "Epson MJ 8000C" -#: src/main/xmli18n-tmp.h:448 +#: src/main/xmli18n-tmp.h:495 #, fuzzy msgid "Epson PM 670C" msgstr "Epson PM 700C" -#: src/main/xmli18n-tmp.h:449 +#: src/main/xmli18n-tmp.h:496 msgid "Epson PM 700C" msgstr "Epson PM 700C" -#: src/main/xmli18n-tmp.h:450 +#: src/main/xmli18n-tmp.h:497 msgid "Epson PM 730C" msgstr "Epson PM 730C" -#: src/main/xmli18n-tmp.h:451 +#: src/main/xmli18n-tmp.h:498 msgid "Epson PM 740C" msgstr "Epson PM 740C" -#: src/main/xmli18n-tmp.h:452 +#: src/main/xmli18n-tmp.h:499 msgid "Epson PM 750C" msgstr "Epson PM 750C" -#: src/main/xmli18n-tmp.h:453 +#: src/main/xmli18n-tmp.h:500 msgid "Epson PM 760C" msgstr "Epson PM 760C" -#: src/main/xmli18n-tmp.h:454 +#: src/main/xmli18n-tmp.h:501 msgid "Epson PM 770C" msgstr "Epson PM 770C" -#: src/main/xmli18n-tmp.h:455 +#: src/main/xmli18n-tmp.h:502 msgid "Epson PM 780C" msgstr "Epson PM 780C" -#: src/main/xmli18n-tmp.h:456 +#: src/main/xmli18n-tmp.h:503 msgid "Epson PM 790PT" msgstr "Epson PM 790PT" -#: src/main/xmli18n-tmp.h:457 +#: src/main/xmli18n-tmp.h:504 msgid "Epson PM 800C" msgstr "Epson PM 800C" -#: src/main/xmli18n-tmp.h:458 +#: src/main/xmli18n-tmp.h:505 msgid "Epson PM 850PT" msgstr "Epson PM 850PT" -#: src/main/xmli18n-tmp.h:459 +#: src/main/xmli18n-tmp.h:506 msgid "Epson PM 870C" msgstr "Epson PM 870C" -#: src/main/xmli18n-tmp.h:460 +#: src/main/xmli18n-tmp.h:507 msgid "Epson PM 880C" msgstr "Epson PM 880C" -#: src/main/xmli18n-tmp.h:461 +#: src/main/xmli18n-tmp.h:508 msgid "Epson PM 930C" msgstr "Epson PM 930C" -#: src/main/xmli18n-tmp.h:462 +#: src/main/xmli18n-tmp.h:509 msgid "Epson PM 940C" msgstr "Epson PM 940C" -#: src/main/xmli18n-tmp.h:463 +#: src/main/xmli18n-tmp.h:510 msgid "Epson PM 950C" msgstr "Epson PM 950C" -#: src/main/xmli18n-tmp.h:464 +#: src/main/xmli18n-tmp.h:511 msgid "Epson PM 970C" msgstr "Epson PM 970C" -#: src/main/xmli18n-tmp.h:465 +#: src/main/xmli18n-tmp.h:512 msgid "Epson PM 980C" msgstr "Epson PM 980C" -#: src/main/xmli18n-tmp.h:466 +#: src/main/xmli18n-tmp.h:513 msgid "Epson PM 2000C" msgstr "Epson PM 2000C" -#: src/main/xmli18n-tmp.h:467 +#: src/main/xmli18n-tmp.h:514 msgid "Epson PM 2200C" msgstr "Epson PM 2200C" -#: src/main/xmli18n-tmp.h:468 +#: src/main/xmli18n-tmp.h:515 msgid "Epson PM 3000C" msgstr "Epson PM 3000C" -#: src/main/xmli18n-tmp.h:469 +#: src/main/xmli18n-tmp.h:516 msgid "Epson PM 3300C" msgstr "Epson PM 3300C" -#: src/main/xmli18n-tmp.h:470 +#: src/main/xmli18n-tmp.h:517 msgid "Epson PM 3500C" msgstr "Epson PM 3500C" -#: src/main/xmli18n-tmp.h:471 +#: src/main/xmli18n-tmp.h:518 msgid "Epson PM 3700C" msgstr "Epson PM 3700C" -#: src/main/xmli18n-tmp.h:472 +#: src/main/xmli18n-tmp.h:519 msgid "Epson PM 4000PX" msgstr "Epson PM 4000PX" -#: src/main/xmli18n-tmp.h:473 +#: src/main/xmli18n-tmp.h:520 msgid "Epson PM 5000C" msgstr "Epson PM 5000C" -#: src/main/xmli18n-tmp.h:474 +#: src/main/xmli18n-tmp.h:521 msgid "Epson PM 7000C" msgstr "Epson PM 7000C" -#: src/main/xmli18n-tmp.h:475 +#: src/main/xmli18n-tmp.h:522 msgid "Epson PM 9000C" msgstr "Epson PM 9000C" -#: src/main/xmli18n-tmp.h:476 +#: src/main/xmli18n-tmp.h:523 msgid "Epson PM 10000" msgstr "Epson PM 10000" -#: src/main/xmli18n-tmp.h:477 +#: src/main/xmli18n-tmp.h:524 msgid "Epson PM A650" msgstr "Epson PM A650" -#: src/main/xmli18n-tmp.h:478 +#: src/main/xmli18n-tmp.h:525 msgid "Epson PM A750" msgstr "Epson PM A750" -#: src/main/xmli18n-tmp.h:479 -#, fuzzy +#: src/main/xmli18n-tmp.h:526 msgid "Epson PM A820" -msgstr "Epson PM A890" +msgstr "Epson PM A820" -#: src/main/xmli18n-tmp.h:480 +#: src/main/xmli18n-tmp.h:527 msgid "Epson PM A890" msgstr "Epson PM A890" -#: src/main/xmli18n-tmp.h:481 +#: src/main/xmli18n-tmp.h:528 msgid "Epson PM A900" msgstr "Epson PM A900" -#: src/main/xmli18n-tmp.h:482 +#: src/main/xmli18n-tmp.h:529 msgid "Epson PM A950" msgstr "Epson PM A950" -#: src/main/xmli18n-tmp.h:483 +#: src/main/xmli18n-tmp.h:530 msgid "Epson PM D600" msgstr "Epson PM D600" -#: src/main/xmli18n-tmp.h:484 +#: src/main/xmli18n-tmp.h:531 msgid "Epson PM D750" msgstr "Epson PM D750" -#: src/main/xmli18n-tmp.h:485 +#: src/main/xmli18n-tmp.h:532 msgid "Epson PM D770" msgstr "Epson PM D770" -#: src/main/xmli18n-tmp.h:486 +#: src/main/xmli18n-tmp.h:533 msgid "Epson PM D800" msgstr "Epson PM D800" -#: src/main/xmli18n-tmp.h:487 -#, fuzzy +#: src/main/xmli18n-tmp.h:534 msgid "Epson PM D870" -msgstr "Epson PM 870C" +msgstr "Epson PM D870" -#: src/main/xmli18n-tmp.h:488 +#: src/main/xmli18n-tmp.h:535 msgid "Epson PM D1000" msgstr "Epson PM D1000" -#: src/main/xmli18n-tmp.h:489 +#: src/main/xmli18n-tmp.h:536 msgid "Epson PM G700" msgstr "Epson PM G700" -#: src/main/xmli18n-tmp.h:490 +#: src/main/xmli18n-tmp.h:537 msgid "Epson PM G720" msgstr "Epson PM G720" -#: src/main/xmli18n-tmp.h:491 +#: src/main/xmli18n-tmp.h:538 msgid "Epson PM G730" msgstr "Epson PM G730" -#: src/main/xmli18n-tmp.h:492 +#: src/main/xmli18n-tmp.h:539 msgid "Epson PM G800" msgstr "Epson PM G800" -#: src/main/xmli18n-tmp.h:493 +#: src/main/xmli18n-tmp.h:540 msgid "Epson PM G820" msgstr "Epson PM G820" -#: src/main/xmli18n-tmp.h:494 -#, fuzzy +#: src/main/xmli18n-tmp.h:541 msgid "Epson PM G850" -msgstr "Epson PM G800" +msgstr "Epson PM G850" -#: src/main/xmli18n-tmp.h:495 -#, fuzzy +#: src/main/xmli18n-tmp.h:542 msgid "Epson PM G4500" -msgstr "Epson PM G700" +msgstr "Epson PM G4500" -#: src/main/xmli18n-tmp.h:496 +#: src/main/xmli18n-tmp.h:543 msgid "Epson PX A650" msgstr "Epson PX A650" -#: src/main/xmli18n-tmp.h:497 +#: src/main/xmli18n-tmp.h:544 msgid "Epson PX G900" msgstr "Epson PX G900" -#: src/main/xmli18n-tmp.h:498 +#: src/main/xmli18n-tmp.h:545 msgid "Epson PX G920" msgstr "Epson PX G920" -#: src/main/xmli18n-tmp.h:499 +#: src/main/xmli18n-tmp.h:546 msgid "Epson PX G5000" msgstr "Epson PX G5000" -#: src/main/xmli18n-tmp.h:500 +#: src/main/xmli18n-tmp.h:547 msgid "Epson PX V500" msgstr "Epson PX V500" -#: src/main/xmli18n-tmp.h:501 +#: src/main/xmli18n-tmp.h:548 msgid "Epson PX V600" msgstr "Epson PX V600" -#: src/main/xmli18n-tmp.h:502 +#: src/main/xmli18n-tmp.h:549 msgid "Epson PX V630" msgstr "Epson PX V630" -#: src/main/xmli18n-tmp.h:503 +#: src/main/xmli18n-tmp.h:550 #, fuzzy msgid "Epson PX V780" msgstr "Epson PM 780C" -#: src/main/xmli18n-tmp.h:504 +#: src/main/xmli18n-tmp.h:551 msgid "Epson PX 5500" msgstr "Epson PX 5500" -#: src/main/xmli18n-tmp.h:505 +#: src/main/xmli18n-tmp.h:552 msgid "Epson PX 7000" msgstr "Epson PX 7000" -#: src/main/xmli18n-tmp.h:506 +#: src/main/xmli18n-tmp.h:553 msgid "Epson PX 9000" msgstr "Epson PX 9000" -#: src/main/xmli18n-tmp.h:507 +#: src/main/xmli18n-tmp.h:554 msgid "Apollo P-2100" msgstr "Apollo P-2100" -#: src/main/xmli18n-tmp.h:508 +#: src/main/xmli18n-tmp.h:555 msgid "Apollo P-2150" msgstr "Apollo P-2150" -#: src/main/xmli18n-tmp.h:509 +#: src/main/xmli18n-tmp.h:556 msgid "Apollo P-2200" msgstr "Apollo P-2200" -#: src/main/xmli18n-tmp.h:510 +#: src/main/xmli18n-tmp.h:557 msgid "Apollo P-2250" msgstr "Apollo P-2250" -#: src/main/xmli18n-tmp.h:511 +#: src/main/xmli18n-tmp.h:558 msgid "Apollo P-2500" msgstr "Apollo P-2500" -#: src/main/xmli18n-tmp.h:512 +#: src/main/xmli18n-tmp.h:559 msgid "Apollo P-2550" msgstr "Apollo P-2550" -#: src/main/xmli18n-tmp.h:513 +#: src/main/xmli18n-tmp.h:560 msgid "Apollo P-2600" msgstr "Apollo P-2600" -#: src/main/xmli18n-tmp.h:514 +#: src/main/xmli18n-tmp.h:561 msgid "Apollo P-2650" msgstr "Apollo P-2650" -#: src/main/xmli18n-tmp.h:515 +#: src/main/xmli18n-tmp.h:562 msgid "Apple Color StyleWriter 4100" msgstr "Apple Color StyleWriter 4100" -#: src/main/xmli18n-tmp.h:516 +#: src/main/xmli18n-tmp.h:563 msgid "Apple Color StyleWriter 4500" msgstr "Apple Color StyleWriter 4500" -#: src/main/xmli18n-tmp.h:517 +#: src/main/xmli18n-tmp.h:564 msgid "Apple Color StyleWriter 6500" msgstr "Apple Color StyleWriter 6500" -#: src/main/xmli18n-tmp.h:518 +#: src/main/xmli18n-tmp.h:565 msgid "Apple LaserWriter Select 360" msgstr "Apple LaserWriter Select 360" -#: src/main/xmli18n-tmp.h:519 +#: src/main/xmli18n-tmp.h:566 msgid "Brother DCP-1200" msgstr "Brother DCP-1200" -#: src/main/xmli18n-tmp.h:520 +#: src/main/xmli18n-tmp.h:567 msgid "Brother HL-4Ve" msgstr "Brother HL-4Ve" -#: src/main/xmli18n-tmp.h:521 +#: src/main/xmli18n-tmp.h:568 msgid "Brother HL-10V" msgstr "Brother HL-10V" -#: src/main/xmli18n-tmp.h:522 +#: src/main/xmli18n-tmp.h:569 msgid "Brother HL-10h" msgstr "Brother HL-10h" -#: src/main/xmli18n-tmp.h:523 +#: src/main/xmli18n-tmp.h:570 msgid "Brother HL-630" msgstr "Brother HL-630" -#: src/main/xmli18n-tmp.h:524 +#: src/main/xmli18n-tmp.h:571 msgid "Brother HL-660" msgstr "Brother HL-660" -#: src/main/xmli18n-tmp.h:525 +#: src/main/xmli18n-tmp.h:572 msgid "Brother HL-760" msgstr "Brother HL-760" -#: src/main/xmli18n-tmp.h:526 +#: src/main/xmli18n-tmp.h:573 msgid "Brother HL-960" msgstr "Brother HL-960" -#: src/main/xmli18n-tmp.h:527 +#: src/main/xmli18n-tmp.h:574 msgid "Brother HL-1040" msgstr "Brother HL-1040" -#: src/main/xmli18n-tmp.h:528 +#: src/main/xmli18n-tmp.h:575 msgid "Brother HL-1050" msgstr "Brother HL-1050" -#: src/main/xmli18n-tmp.h:529 +#: src/main/xmli18n-tmp.h:576 msgid "Brother HL-1060" msgstr "Brother HL-1060" -#: src/main/xmli18n-tmp.h:530 +#: src/main/xmli18n-tmp.h:577 msgid "Brother HL-1070" msgstr "Brother HL-1070" -#: src/main/xmli18n-tmp.h:531 +#: src/main/xmli18n-tmp.h:578 msgid "Brother HL-1240" msgstr "Brother HL-1240" -#: src/main/xmli18n-tmp.h:532 +#: src/main/xmli18n-tmp.h:579 msgid "Brother HL-1250" msgstr "Brother HL-1250" -#: src/main/xmli18n-tmp.h:533 +#: src/main/xmli18n-tmp.h:580 msgid "Brother HL-1260" msgstr "Brother HL-1260" -#: src/main/xmli18n-tmp.h:534 +#: src/main/xmli18n-tmp.h:581 msgid "Brother HL-1270N" msgstr "Brother HL-1270N" -#: src/main/xmli18n-tmp.h:535 +#: src/main/xmli18n-tmp.h:582 msgid "Brother HL-1440" msgstr "Brother HL-1440" -#: src/main/xmli18n-tmp.h:536 +#: src/main/xmli18n-tmp.h:583 msgid "Brother HL-1660e" msgstr "Brother HL-1660e" -#: src/main/xmli18n-tmp.h:537 +#: src/main/xmli18n-tmp.h:584 msgid "Brother HL-2060" msgstr "Brother HL-2060" -#: src/main/xmli18n-tmp.h:538 +#: src/main/xmli18n-tmp.h:585 msgid "Brother MFC-6550MC" msgstr "Brother MFC-6550MC" -#: src/main/xmli18n-tmp.h:539 +#: src/main/xmli18n-tmp.h:586 msgid "Brother MFC-8300" msgstr "Brother MFC-8300" -#: src/main/xmli18n-tmp.h:540 +#: src/main/xmli18n-tmp.h:587 msgid "Brother MFC-9500" msgstr "Brother MFC-9500" -#: src/main/xmli18n-tmp.h:541 +#: src/main/xmli18n-tmp.h:588 msgid "Brother MFC-9600" msgstr "Brother MFC-9600" -#: src/main/xmli18n-tmp.h:542 +#: src/main/xmli18n-tmp.h:589 msgid "Canon GP 335" msgstr "Canon GP 335" -#: src/main/xmli18n-tmp.h:543 +#: src/main/xmli18n-tmp.h:590 msgid "Canon LBP-4sx" msgstr "Canon LBP-4sx" -#: src/main/xmli18n-tmp.h:544 +#: src/main/xmli18n-tmp.h:591 msgid "Canon LBP-430" msgstr "Canon LBP-430" -#: src/main/xmli18n-tmp.h:545 +#: src/main/xmli18n-tmp.h:592 msgid "Canon LBP-1000" msgstr "Canon LBP-1000" -#: src/main/xmli18n-tmp.h:546 +#: src/main/xmli18n-tmp.h:593 msgid "Canon LBP-1260" msgstr "Canon LBP-1260" -#: src/main/xmli18n-tmp.h:547 +#: src/main/xmli18n-tmp.h:594 msgid "Canon LBP-1760" msgstr "Canon LBP-1760" -#: src/main/xmli18n-tmp.h:548 +#: src/main/xmli18n-tmp.h:595 msgid "Canon imageRunner 330s" msgstr "Canon imageRunner 330s" -#: src/main/xmli18n-tmp.h:549 +#: src/main/xmli18n-tmp.h:596 msgid "Citizen ProJet II" msgstr "Citizen ProJet II" -#: src/main/xmli18n-tmp.h:550 +#: src/main/xmli18n-tmp.h:597 msgid "DEC 1800" msgstr "DEC 1800" -#: src/main/xmli18n-tmp.h:551 +#: src/main/xmli18n-tmp.h:598 msgid "DEC LN17" msgstr "DEC LN17" -#: src/main/xmli18n-tmp.h:552 +#: src/main/xmli18n-tmp.h:599 msgid "Epson ActionLaser 1100" msgstr "Epson ActionLaser 1100" -#: src/main/xmli18n-tmp.h:553 +#: src/main/xmli18n-tmp.h:600 msgid "Epson ActionLaser II" msgstr "Epson ActionLaser II" -#: src/main/xmli18n-tmp.h:554 +#: src/main/xmli18n-tmp.h:601 msgid "Epson AcuLaser C2000" msgstr "Epson AcuLaser C2000" -#: src/main/xmli18n-tmp.h:555 +#: src/main/xmli18n-tmp.h:602 msgid "Epson AcuLaser C2000PS" msgstr "Epson AcuLaser C2000PS" -#: src/main/xmli18n-tmp.h:556 +#: src/main/xmli18n-tmp.h:603 msgid "Epson AcuLaser C8500" msgstr "Epson AcuLaser C8500" -#: src/main/xmli18n-tmp.h:557 +#: src/main/xmli18n-tmp.h:604 msgid "Epson AcuLaser C8500PS" msgstr "Epson AcuLaser C8500PS" -#: src/main/xmli18n-tmp.h:558 +#: src/main/xmli18n-tmp.h:605 msgid "Epson AcuLaser C8600" msgstr "Epson AcuLaser C8600" -#: src/main/xmli18n-tmp.h:559 +#: src/main/xmli18n-tmp.h:606 msgid "Epson AcuLaser C8600PS" msgstr "Epson AcuLaser C8600PS" -#: src/main/xmli18n-tmp.h:560 +#: src/main/xmli18n-tmp.h:607 msgid "Epson EPL-5200" msgstr "Epson EPL-5200" -#: src/main/xmli18n-tmp.h:561 +#: src/main/xmli18n-tmp.h:608 msgid "Epson EPL-5200+" msgstr "Epson EPL-5200+" -#: src/main/xmli18n-tmp.h:562 +#: src/main/xmli18n-tmp.h:609 msgid "Epson EPL-5700" msgstr "Epson EPL-5700" -#: src/main/xmli18n-tmp.h:563 +#: src/main/xmli18n-tmp.h:610 msgid "Epson EPL-5700PS" msgstr "Epson EPL-5700PS" -#: src/main/xmli18n-tmp.h:564 +#: src/main/xmli18n-tmp.h:611 msgid "Epson EPL-5800" msgstr "Epson EPL-5800" -#: src/main/xmli18n-tmp.h:565 +#: src/main/xmli18n-tmp.h:612 msgid "Epson EPL-5800PS" msgstr "Epson EPL-5800PS" -#: src/main/xmli18n-tmp.h:566 +#: src/main/xmli18n-tmp.h:613 msgid "Epson EPL-5900" msgstr "Epson EPL-5900" -#: src/main/xmli18n-tmp.h:567 +#: src/main/xmli18n-tmp.h:614 msgid "Epson EPL-5900PS" msgstr "Epson EPL-5900PS" -#: src/main/xmli18n-tmp.h:568 +#: src/main/xmli18n-tmp.h:615 msgid "Epson EPL-6100" msgstr "Epson EPL-6100" -#: src/main/xmli18n-tmp.h:569 +#: src/main/xmli18n-tmp.h:616 msgid "Epson EPL-6100PS" msgstr "Epson EPL-6100PS" -#: src/main/xmli18n-tmp.h:570 +#: src/main/xmli18n-tmp.h:617 msgid "Epson EPL-7100" msgstr "Epson EPL-7100" -#: src/main/xmli18n-tmp.h:571 +#: src/main/xmli18n-tmp.h:618 msgid "Fujitsu PrintPartner 10V" msgstr "Fujitsu PrintPartner 10V" -#: src/main/xmli18n-tmp.h:572 +#: src/main/xmli18n-tmp.h:619 msgid "Fujitsu PrintPartner 16DV" msgstr "Fujitsu PrintPartner 16DV" -#: src/main/xmli18n-tmp.h:573 +#: src/main/xmli18n-tmp.h:620 msgid "Fujitsu PrintPartner 20W" msgstr "Fujitsu PrintPartner 20W" -#: src/main/xmli18n-tmp.h:574 +#: src/main/xmli18n-tmp.h:621 msgid "Fujitsu PrintPartner 8000" msgstr "Fujitsu PrintPartner 8000" -#: src/main/xmli18n-tmp.h:575 +#: src/main/xmli18n-tmp.h:622 msgid "Generic PCL 4 Printer" msgstr "Generic PCL 4 Printer" -#: src/main/xmli18n-tmp.h:576 +#: src/main/xmli18n-tmp.h:623 +#, fuzzy +msgid "Generic PCL 4 LF Printer" +msgstr "Generic PCL 4 Printer" + +#: src/main/xmli18n-tmp.h:624 msgid "Generic PCL 5 Printer" msgstr "Generic PCL 5 Printer" -#: src/main/xmli18n-tmp.h:577 +#: src/main/xmli18n-tmp.h:625 +#, fuzzy +msgid "Generic PCL 5 LF Printer" +msgstr "Generic PCL 5 Printer" + +#: src/main/xmli18n-tmp.h:626 msgid "Generic PCL 5c Printer" msgstr "Generic PCL 5c Printer" -#: src/main/xmli18n-tmp.h:578 +#: src/main/xmli18n-tmp.h:627 +#, fuzzy +msgid "Generic PCL 5c LF Printer" +msgstr "Generic PCL 5c Printer" + +#: src/main/xmli18n-tmp.h:628 msgid "Generic PCL 5e Printer" msgstr "Generic PCL 5e Printer" -#: src/main/xmli18n-tmp.h:579 +#: src/main/xmli18n-tmp.h:629 +#, fuzzy +msgid "Generic PCL 5e LF Printer" +msgstr "Generic PCL 5e Printer" + +#: src/main/xmli18n-tmp.h:630 msgid "Generic PCL 6/PCL XL Printer" msgstr "Generic PCL 6/PCL XL Printer" -#: src/main/xmli18n-tmp.h:580 +#: src/main/xmli18n-tmp.h:631 +#, fuzzy +msgid "Generic PCL 6/PCL XL LF Printer" +msgstr "Generic PCL 6/PCL XL Printer" + +#: src/main/xmli18n-tmp.h:632 msgid "HP Business Inkjet 2200" msgstr "HP Business Inkjet 2200" -#: src/main/xmli18n-tmp.h:581 +#: src/main/xmli18n-tmp.h:633 msgid "HP Business Inkjet 2230" msgstr "HP Business Inkjet 2230" -#: src/main/xmli18n-tmp.h:582 +#: src/main/xmli18n-tmp.h:634 msgid "HP Business Inkjet 2250" msgstr "HP Business Inkjet 2250" -#: src/main/xmli18n-tmp.h:583 +#: src/main/xmli18n-tmp.h:635 msgid "HP Business Inkjet 2250TN" msgstr "HP Business Inkjet 2250TN" -#: src/main/xmli18n-tmp.h:584 +#: src/main/xmli18n-tmp.h:636 msgid "HP Business Inkjet 2280" msgstr "HP Business Inkjet 2280" -#: src/main/xmli18n-tmp.h:585 +#: src/main/xmli18n-tmp.h:637 msgid "HP Color Inkjet Printer CP1160" msgstr "HP Color Inkjet Printer CP1160" -#: src/main/xmli18n-tmp.h:586 +#: src/main/xmli18n-tmp.h:638 msgid "HP Color Inkjet Printer CP1700" msgstr "HP Color Inkjet Printer CP1700" -#: src/main/xmli18n-tmp.h:587 +#: src/main/xmli18n-tmp.h:639 msgid "HP Color LaserJet 2500" msgstr "HP Color LaserJet 2500" -#: src/main/xmli18n-tmp.h:588 +#: src/main/xmli18n-tmp.h:640 msgid "HP Color LaserJet 4500" msgstr "HP Color LaserJet 4500" -#: src/main/xmli18n-tmp.h:589 +#: src/main/xmli18n-tmp.h:641 msgid "HP Color LaserJet 4550" msgstr "HP Color LaserJet 4550" -#: src/main/xmli18n-tmp.h:590 +#: src/main/xmli18n-tmp.h:642 msgid "HP Color LaserJet 4600" msgstr "HP Color LaserJet 4600" -#: src/main/xmli18n-tmp.h:591 +#: src/main/xmli18n-tmp.h:643 msgid "HP Color LaserJet 5" msgstr "HP Color LaserJet 5" -#: src/main/xmli18n-tmp.h:592 +#: src/main/xmli18n-tmp.h:644 msgid "HP Color LaserJet 5000" msgstr "HP Color LaserJet 5000" -#: src/main/xmli18n-tmp.h:593 +#: src/main/xmli18n-tmp.h:645 msgid "HP Color LaserJet 5500" msgstr "HP Color LaserJet 5500" -#: src/main/xmli18n-tmp.h:594 +#: src/main/xmli18n-tmp.h:646 msgid "HP Color LaserJet 8550GN" msgstr "HP Color LaserJet 8550GN" -#: src/main/xmli18n-tmp.h:595 +#: src/main/xmli18n-tmp.h:647 msgid "HP DesignJet 230" msgstr "HP DesignJet 230" -#: src/main/xmli18n-tmp.h:596 +#: src/main/xmli18n-tmp.h:648 msgid "HP DesignJet 250C" msgstr "HP DesignJet 250C" -#: src/main/xmli18n-tmp.h:597 +#: src/main/xmli18n-tmp.h:649 msgid "HP DesignJet 430" msgstr "HP DesignJet 430" -#: src/main/xmli18n-tmp.h:598 +#: src/main/xmli18n-tmp.h:650 msgid "HP DesignJet 450C" msgstr "HP DesignJet 450C" -#: src/main/xmli18n-tmp.h:599 +#: src/main/xmli18n-tmp.h:651 msgid "HP DesignJet 455CA" msgstr "HP DesignJet 455CA" -#: src/main/xmli18n-tmp.h:600 +#: src/main/xmli18n-tmp.h:652 msgid "HP DesignJet 488CA" msgstr "HP DesignJet 488CA" -#: src/main/xmli18n-tmp.h:601 +#: src/main/xmli18n-tmp.h:653 msgid "HP DesignJet 700" msgstr "HP DesignJet 700" -#: src/main/xmli18n-tmp.h:602 +#: src/main/xmli18n-tmp.h:654 msgid "HP DesignJet 750C Plus" msgstr "HP DesignJet 750C Plus" -#: src/main/xmli18n-tmp.h:603 +#: src/main/xmli18n-tmp.h:655 msgid "HP DesignJet 750C" msgstr "HP DesignJet 750C" -#: src/main/xmli18n-tmp.h:604 +#: src/main/xmli18n-tmp.h:656 msgid "HP DesignJet 2500CP" msgstr "HP DesignJet 2500CP" -#: src/main/xmli18n-tmp.h:605 +#: src/main/xmli18n-tmp.h:657 msgid "HP DesignJet 3500CP" msgstr "HP DesignJet 3500CP" -#: src/main/xmli18n-tmp.h:606 +#: src/main/xmli18n-tmp.h:658 msgid "HP DesignJet ColorPro CAD" msgstr "HP DesignJet ColorPro CAD" -#: src/main/xmli18n-tmp.h:607 +#: src/main/xmli18n-tmp.h:659 msgid "HP DeskJet 400" msgstr "HP DeskJet 400" -#: src/main/xmli18n-tmp.h:608 +#: src/main/xmli18n-tmp.h:660 msgid "HP DeskJet 420C" msgstr "HP DeskJet 420C" -#: src/main/xmli18n-tmp.h:609 +#: src/main/xmli18n-tmp.h:661 msgid "HP DeskJet 450" msgstr "HP DeskJet 450" -#: src/main/xmli18n-tmp.h:610 +#: src/main/xmli18n-tmp.h:662 msgid "HP DeskJet 500" msgstr "HP DeskJet 500" -#: src/main/xmli18n-tmp.h:611 +#: src/main/xmli18n-tmp.h:663 msgid "HP DeskJet 500C" msgstr "HP DeskJet 500C" -#: src/main/xmli18n-tmp.h:612 +#: src/main/xmli18n-tmp.h:664 msgid "HP DeskJet 505J Plus" msgstr "HP DeskJet 505J Plus" -#: src/main/xmli18n-tmp.h:613 +#: src/main/xmli18n-tmp.h:665 msgid "HP DeskJet 510" msgstr "HP DeskJet 510" -#: src/main/xmli18n-tmp.h:614 +#: src/main/xmli18n-tmp.h:666 msgid "HP DeskJet 520" msgstr "HP DeskJet 520" -#: src/main/xmli18n-tmp.h:615 +#: src/main/xmli18n-tmp.h:667 msgid "HP DeskJet 540C" msgstr "HP DeskJet 540C" -#: src/main/xmli18n-tmp.h:616 +#: src/main/xmli18n-tmp.h:668 msgid "HP DeskJet 550C" msgstr "HP DeskJet 550C" -#: src/main/xmli18n-tmp.h:617 +#: src/main/xmli18n-tmp.h:669 msgid "HP DeskJet 5550" msgstr "HP DeskJet 5550" -#: src/main/xmli18n-tmp.h:618 +#: src/main/xmli18n-tmp.h:670 msgid "HP DeskJet 5551" msgstr "HP DeskJet 5551" -#: src/main/xmli18n-tmp.h:619 +#: src/main/xmli18n-tmp.h:671 msgid "HP DeskJet 560C" msgstr "HP DeskJet 560C" -#: src/main/xmli18n-tmp.h:620 +#: src/main/xmli18n-tmp.h:672 msgid "HP DeskJet 600" msgstr "HP DeskJet 600" -#: src/main/xmli18n-tmp.h:621 +#: src/main/xmli18n-tmp.h:673 msgid "HP DeskJet 600C" msgstr "HP DeskJet 600C" -#: src/main/xmli18n-tmp.h:622 +#: src/main/xmli18n-tmp.h:674 msgid "HP DeskJet 610C" msgstr "HP DeskJet 610C" -#: src/main/xmli18n-tmp.h:623 +#: src/main/xmli18n-tmp.h:675 msgid "HP DeskJet 610CL" msgstr "HP DeskJet 610CL" -#: src/main/xmli18n-tmp.h:624 +#: src/main/xmli18n-tmp.h:676 msgid "HP DeskJet 6122" msgstr "HP DeskJet 6122" -#: src/main/xmli18n-tmp.h:625 +#: src/main/xmli18n-tmp.h:677 msgid "HP DeskJet 6127" msgstr "HP DeskJet 6127" -#: src/main/xmli18n-tmp.h:626 +#: src/main/xmli18n-tmp.h:678 msgid "HP DeskJet 612C" msgstr "HP DeskJet 612C" -#: src/main/xmli18n-tmp.h:627 +#: src/main/xmli18n-tmp.h:679 msgid "HP DeskJet 640C" msgstr "HP DeskJet 640C" -#: src/main/xmli18n-tmp.h:628 +#: src/main/xmli18n-tmp.h:680 msgid "HP DeskJet 648C" msgstr "HP DeskJet 648C" -#: src/main/xmli18n-tmp.h:629 +#: src/main/xmli18n-tmp.h:681 msgid "HP DeskJet 660C" msgstr "HP DeskJet 660C" -#: src/main/xmli18n-tmp.h:630 +#: src/main/xmli18n-tmp.h:682 msgid "HP DeskJet 670C" msgstr "HP DeskJet 670C" -#: src/main/xmli18n-tmp.h:631 +#: src/main/xmli18n-tmp.h:683 msgid "HP DeskJet 670TV" msgstr "HP DeskJet 670TV" -#: src/main/xmli18n-tmp.h:632 +#: src/main/xmli18n-tmp.h:684 msgid "HP DeskJet 672C" msgstr "HP DeskJet 672C" -#: src/main/xmli18n-tmp.h:633 +#: src/main/xmli18n-tmp.h:685 msgid "HP DeskJet 680C" msgstr "HP DeskJet 680C" -#: src/main/xmli18n-tmp.h:634 +#: src/main/xmli18n-tmp.h:686 msgid "HP DeskJet 682C" msgstr "HP DeskJet 682C" -#: src/main/xmli18n-tmp.h:635 +#: src/main/xmli18n-tmp.h:687 msgid "HP DeskJet 690C" msgstr "HP DeskJet 690C" -#: src/main/xmli18n-tmp.h:636 +#: src/main/xmli18n-tmp.h:688 msgid "HP DeskJet 692C" msgstr "HP DeskJet 692C" -#: src/main/xmli18n-tmp.h:637 +#: src/main/xmli18n-tmp.h:689 msgid "HP DeskJet 693C" msgstr "HP DeskJet 693C" -#: src/main/xmli18n-tmp.h:638 +#: src/main/xmli18n-tmp.h:690 msgid "HP DeskJet 694C" msgstr "HP DeskJet 694C" -#: src/main/xmli18n-tmp.h:639 +#: src/main/xmli18n-tmp.h:691 msgid "HP DeskJet 695C" msgstr "HP DeskJet 695C" -#: src/main/xmli18n-tmp.h:640 +#: src/main/xmli18n-tmp.h:692 msgid "HP DeskJet 697C" msgstr "HP DeskJet 697C" -#: src/main/xmli18n-tmp.h:641 +#: src/main/xmli18n-tmp.h:693 msgid "HP DeskJet 810C" msgstr "HP DeskJet 810C" -#: src/main/xmli18n-tmp.h:642 +#: src/main/xmli18n-tmp.h:694 msgid "HP DeskJet 812C" msgstr "HP DeskJet 812C" -#: src/main/xmli18n-tmp.h:643 +#: src/main/xmli18n-tmp.h:695 msgid "HP DeskJet 815C" msgstr "HP DeskJet 815C" -#: src/main/xmli18n-tmp.h:644 +#: src/main/xmli18n-tmp.h:696 msgid "HP DeskJet 816C" msgstr "HP DeskJet 816C" -#: src/main/xmli18n-tmp.h:645 +#: src/main/xmli18n-tmp.h:697 msgid "HP DeskJet 825C" msgstr "HP DeskJet 825C" -#: src/main/xmli18n-tmp.h:646 +#: src/main/xmli18n-tmp.h:698 msgid "HP DeskJet 830C" msgstr "HP DeskJet 830C" -#: src/main/xmli18n-tmp.h:647 +#: src/main/xmli18n-tmp.h:699 msgid "HP DeskJet 832C" msgstr "HP DeskJet 832C" -#: src/main/xmli18n-tmp.h:648 +#: src/main/xmli18n-tmp.h:700 msgid "HP DeskJet 840C" msgstr "HP DeskJet 840C" -#: src/main/xmli18n-tmp.h:649 +#: src/main/xmli18n-tmp.h:701 msgid "HP DeskJet 841C" msgstr "HP DeskJet 841C" -#: src/main/xmli18n-tmp.h:650 +#: src/main/xmli18n-tmp.h:702 msgid "HP DeskJet 842C" msgstr "HP DeskJet 842C" -#: src/main/xmli18n-tmp.h:651 +#: src/main/xmli18n-tmp.h:703 msgid "HP DeskJet 843C" msgstr "HP DeskJet 843C" -#: src/main/xmli18n-tmp.h:652 +#: src/main/xmli18n-tmp.h:704 msgid "HP DeskJet 845C" msgstr "HP DeskJet 845C" -#: src/main/xmli18n-tmp.h:653 +#: src/main/xmli18n-tmp.h:705 msgid "HP DeskJet 850C" msgstr "HP DeskJet 850C" -#: src/main/xmli18n-tmp.h:654 +#: src/main/xmli18n-tmp.h:706 msgid "HP DeskJet 855C" msgstr "HP DeskJet 855C" -#: src/main/xmli18n-tmp.h:655 +#: src/main/xmli18n-tmp.h:707 msgid "HP DeskJet 870C" msgstr "HP DeskJet 870C" -#: src/main/xmli18n-tmp.h:656 +#: src/main/xmli18n-tmp.h:708 msgid "HP DeskJet 880C" msgstr "HP DeskJet 880C" -#: src/main/xmli18n-tmp.h:657 +#: src/main/xmli18n-tmp.h:709 msgid "HP DeskJet 882C" msgstr "HP DeskJet 882C" -#: src/main/xmli18n-tmp.h:658 +#: src/main/xmli18n-tmp.h:710 msgid "HP DeskJet 890C" msgstr "HP DeskJet 890C" -#: src/main/xmli18n-tmp.h:659 +#: src/main/xmli18n-tmp.h:711 msgid "HP DeskJet 895C" msgstr "HP DeskJet 895C" -#: src/main/xmli18n-tmp.h:660 +#: src/main/xmli18n-tmp.h:712 msgid "HP DeskJet 916C" msgstr "HP DeskJet 916C" -#: src/main/xmli18n-tmp.h:661 +#: src/main/xmli18n-tmp.h:713 msgid "HP DeskJet 920C" msgstr "HP DeskJet 920C" -#: src/main/xmli18n-tmp.h:662 +#: src/main/xmli18n-tmp.h:714 msgid "HP DeskJet 9300" msgstr "HP DeskJet 9300" -#: src/main/xmli18n-tmp.h:663 +#: src/main/xmli18n-tmp.h:715 msgid "HP DeskJet 930C" msgstr "HP DeskJet 930C" -#: src/main/xmli18n-tmp.h:664 +#: src/main/xmli18n-tmp.h:716 msgid "HP DeskJet 932C" msgstr "HP DeskJet 932C" -#: src/main/xmli18n-tmp.h:665 +#: src/main/xmli18n-tmp.h:717 msgid "HP DeskJet 933C" msgstr "HP DeskJet 933C" -#: src/main/xmli18n-tmp.h:666 +#: src/main/xmli18n-tmp.h:718 msgid "HP DeskJet 934C" msgstr "HP DeskJet 934C" -#: src/main/xmli18n-tmp.h:667 +#: src/main/xmli18n-tmp.h:719 msgid "HP DeskJet 935C" msgstr "HP DeskJet 935C" -#: src/main/xmli18n-tmp.h:668 +#: src/main/xmli18n-tmp.h:720 msgid "HP DeskJet 940C" msgstr "HP DeskJet 940C" -#: src/main/xmli18n-tmp.h:669 +#: src/main/xmli18n-tmp.h:721 msgid "HP DeskJet 948C" msgstr "HP DeskJet 948C" -#: src/main/xmli18n-tmp.h:670 +#: src/main/xmli18n-tmp.h:722 msgid "HP DeskJet 950C" msgstr "HP DeskJet 950C" -#: src/main/xmli18n-tmp.h:671 +#: src/main/xmli18n-tmp.h:723 msgid "HP DeskJet 952C" msgstr "HP DeskJet 952C" -#: src/main/xmli18n-tmp.h:672 +#: src/main/xmli18n-tmp.h:724 msgid "HP DeskJet 955C" msgstr "HP DeskJet 955C" -#: src/main/xmli18n-tmp.h:673 +#: src/main/xmli18n-tmp.h:725 msgid "HP DeskJet 957C" msgstr "HP DeskJet 957C" -#: src/main/xmli18n-tmp.h:674 +#: src/main/xmli18n-tmp.h:726 msgid "HP DeskJet 959C" msgstr "HP DeskJet 959C" -#: src/main/xmli18n-tmp.h:675 +#: src/main/xmli18n-tmp.h:727 msgid "HP DeskJet 960C" msgstr "HP DeskJet 960C" -#: src/main/xmli18n-tmp.h:676 +#: src/main/xmli18n-tmp.h:728 msgid "HP DeskJet 970C" msgstr "HP DeskJet 970C" -#: src/main/xmli18n-tmp.h:677 +#: src/main/xmli18n-tmp.h:729 msgid "HP DeskJet 975C" msgstr "HP DeskJet 975C" -#: src/main/xmli18n-tmp.h:678 +#: src/main/xmli18n-tmp.h:730 msgid "HP DeskJet 980C" msgstr "HP DeskJet 980C" -#: src/main/xmli18n-tmp.h:679 +#: src/main/xmli18n-tmp.h:731 msgid "HP DeskJet 990C" msgstr "HP DeskJet 990C" -#: src/main/xmli18n-tmp.h:680 +#: src/main/xmli18n-tmp.h:732 msgid "HP DeskJet 995C" msgstr "HP DeskJet 995C" -#: src/main/xmli18n-tmp.h:681 +#: src/main/xmli18n-tmp.h:733 msgid "HP DeskJet 1100C" msgstr "HP DeskJet 1100C" -#: src/main/xmli18n-tmp.h:682 +#: src/main/xmli18n-tmp.h:734 msgid "HP DeskJet 1120C" msgstr "HP DeskJet 1120C" -#: src/main/xmli18n-tmp.h:683 +#: src/main/xmli18n-tmp.h:735 msgid "HP DeskJet 1125C" msgstr "HP DeskJet 1125C" -#: src/main/xmli18n-tmp.h:684 +#: src/main/xmli18n-tmp.h:736 msgid "HP DeskJet 1200C" msgstr "HP DeskJet 1200C" -#: src/main/xmli18n-tmp.h:685 +#: src/main/xmli18n-tmp.h:737 msgid "HP DeskJet 1220C" msgstr "HP DeskJet 1220C" -#: src/main/xmli18n-tmp.h:686 +#: src/main/xmli18n-tmp.h:738 msgid "HP DeskJet 1600C" msgstr "HP DeskJet 1600C" -#: src/main/xmli18n-tmp.h:687 +#: src/main/xmli18n-tmp.h:739 msgid "HP DeskJet 1600CM" msgstr "HP DeskJet 1600CM" -#: src/main/xmli18n-tmp.h:688 +#: src/main/xmli18n-tmp.h:740 msgid "HP DeskJet 2000" msgstr "HP DeskJet 2000" -#: src/main/xmli18n-tmp.h:689 +#: src/main/xmli18n-tmp.h:741 msgid "HP DeskJet 2500" msgstr "HP DeskJet 2500" -#: src/main/xmli18n-tmp.h:690 +#: src/main/xmli18n-tmp.h:742 msgid "HP DeskJet 2500CM" msgstr "HP DeskJet 2500CM" -#: src/main/xmli18n-tmp.h:691 +#: src/main/xmli18n-tmp.h:743 msgid "HP DeskJet 340C" msgstr "HP DeskJet 340C" -#: src/main/xmli18n-tmp.h:692 +#: src/main/xmli18n-tmp.h:744 msgid "HP DeskJet 3810" msgstr "HP DeskJet 3810" -#: src/main/xmli18n-tmp.h:693 +#: src/main/xmli18n-tmp.h:745 msgid "HP DeskJet 3816" msgstr "HP DeskJet 3816" -#: src/main/xmli18n-tmp.h:694 +#: src/main/xmli18n-tmp.h:746 msgid "HP DeskJet 3820" msgstr "HP DeskJet 3820" -#: src/main/xmli18n-tmp.h:695 +#: src/main/xmli18n-tmp.h:747 msgid "HP DeskJet 3822" msgstr "HP DeskJet 3822" -#: src/main/xmli18n-tmp.h:696 +#: src/main/xmli18n-tmp.h:748 msgid "HP LaserJet 2" msgstr "HP LaserJet 2" -#: src/main/xmli18n-tmp.h:697 +#: src/main/xmli18n-tmp.h:749 msgid "HP LaserJet 2D" msgstr "HP LaserJet 2D" -#: src/main/xmli18n-tmp.h:698 +#: src/main/xmli18n-tmp.h:750 msgid "HP LaserJet 2P Plus" msgstr "HP LaserJet 2P Plus" -#: src/main/xmli18n-tmp.h:699 +#: src/main/xmli18n-tmp.h:751 msgid "HP LaserJet 2P" msgstr "HP LaserJet 2P" -#: src/main/xmli18n-tmp.h:700 +#: src/main/xmli18n-tmp.h:752 msgid "HP LaserJet 3" msgstr "HP LaserJet 3" -#: src/main/xmli18n-tmp.h:701 +#: src/main/xmli18n-tmp.h:753 msgid "HP LaserJet 3D" msgstr "HP LaserJet 3D" -#: src/main/xmli18n-tmp.h:702 +#: src/main/xmli18n-tmp.h:754 msgid "HP LaserJet 3P w/ PCL5" msgstr "HP LaserJet 3P w/ PCL5" -#: src/main/xmli18n-tmp.h:703 +#: src/main/xmli18n-tmp.h:755 msgid "HP LaserJet 3P w/PS" msgstr "HP LaserJet 3P w/PS" -#: src/main/xmli18n-tmp.h:704 +#: src/main/xmli18n-tmp.h:756 msgid "HP LaserJet 4 Plus" msgstr "HP LaserJet 4 Plus" -#: src/main/xmli18n-tmp.h:705 +#: src/main/xmli18n-tmp.h:757 msgid "HP LaserJet 4" msgstr "HP LaserJet 4" -#: src/main/xmli18n-tmp.h:706 +#: src/main/xmli18n-tmp.h:758 msgid "HP LaserJet 4L" msgstr "HP LaserJet 4L" -#: src/main/xmli18n-tmp.h:707 +#: src/main/xmli18n-tmp.h:759 msgid "HP LaserJet 4M" msgstr "HP LaserJet 4M" -#: src/main/xmli18n-tmp.h:708 +#: src/main/xmli18n-tmp.h:760 msgid "HP LaserJet 4ML" msgstr "HP LaserJet 4ML" -#: src/main/xmli18n-tmp.h:709 +#: src/main/xmli18n-tmp.h:761 msgid "HP LaserJet 4P" msgstr "HP LaserJet 4P" -#: src/main/xmli18n-tmp.h:710 +#: src/main/xmli18n-tmp.h:762 msgid "HP LaserJet 4Si" msgstr "HP LaserJet 4Si" -#: src/main/xmli18n-tmp.h:711 +#: src/main/xmli18n-tmp.h:763 msgid "HP LaserJet 4V" msgstr "HP LaserJet 4V" -#: src/main/xmli18n-tmp.h:712 +#: src/main/xmli18n-tmp.h:764 msgid "HP LaserJet 5" msgstr "HP LaserJet 5" -#: src/main/xmli18n-tmp.h:713 +#: src/main/xmli18n-tmp.h:765 msgid "HP LaserJet 5L" msgstr "HP LaserJet 5L" -#: src/main/xmli18n-tmp.h:714 +#: src/main/xmli18n-tmp.h:766 msgid "HP LaserJet 5M" msgstr "HP LaserJet 5M" -#: src/main/xmli18n-tmp.h:715 +#: src/main/xmli18n-tmp.h:767 msgid "HP LaserJet 5MP" msgstr "HP LaserJet 5MP" -#: src/main/xmli18n-tmp.h:716 +#: src/main/xmli18n-tmp.h:768 msgid "HP LaserJet 5P" msgstr "HP LaserJet 5P" -#: src/main/xmli18n-tmp.h:717 +#: src/main/xmli18n-tmp.h:769 msgid "HP LaserJet 5Si" msgstr "HP LaserJet 5Si" -#: src/main/xmli18n-tmp.h:718 +#: src/main/xmli18n-tmp.h:770 msgid "HP LaserJet 6" msgstr "HP LaserJet 6" -#: src/main/xmli18n-tmp.h:719 +#: src/main/xmli18n-tmp.h:771 msgid "HP LaserJet 6L" msgstr "HP LaserJet 6L" -#: src/main/xmli18n-tmp.h:720 +#: src/main/xmli18n-tmp.h:772 msgid "HP LaserJet 6MP" msgstr "HP LaserJet 6MP" -#: src/main/xmli18n-tmp.h:721 +#: src/main/xmli18n-tmp.h:773 msgid "HP LaserJet 6P" msgstr "HP LaserJet 6P" -#: src/main/xmli18n-tmp.h:722 +#: src/main/xmli18n-tmp.h:774 msgid "HP LaserJet 1010" msgstr "HP LaserJet 1010" -#: src/main/xmli18n-tmp.h:723 +#: src/main/xmli18n-tmp.h:775 msgid "HP LaserJet 1012" msgstr "HP LaserJet 1012" -#: src/main/xmli18n-tmp.h:724 +#: src/main/xmli18n-tmp.h:776 msgid "HP LaserJet 1015" msgstr "HP LaserJet 1015" -#: src/main/xmli18n-tmp.h:725 +#: src/main/xmli18n-tmp.h:777 #, fuzzy msgid "HP LaserJet 1022" msgstr "HP LaserJet 1012" -#: src/main/xmli18n-tmp.h:726 +#: src/main/xmli18n-tmp.h:778 msgid "HP LaserJet 1100" msgstr "HP LaserJet 1100" -#: src/main/xmli18n-tmp.h:727 +#: src/main/xmli18n-tmp.h:779 msgid "HP LaserJet 1100A" msgstr "HP LaserJet 1100A" -#: src/main/xmli18n-tmp.h:728 +#: src/main/xmli18n-tmp.h:780 msgid "HP LaserJet 1150" msgstr "HP LaserJet 1150" -#: src/main/xmli18n-tmp.h:729 +#: src/main/xmli18n-tmp.h:781 msgid "HP LaserJet 1200" msgstr "HP LaserJet 1200" -#: src/main/xmli18n-tmp.h:730 +#: src/main/xmli18n-tmp.h:782 msgid "HP LaserJet 1220" msgstr "HP LaserJet 1220" -#: src/main/xmli18n-tmp.h:731 +#: src/main/xmli18n-tmp.h:783 msgid "HP LaserJet 1300" msgstr "HP LaserJet 1300" -#: src/main/xmli18n-tmp.h:732 +#: src/main/xmli18n-tmp.h:784 msgid "HP LaserJet 2100" msgstr "HP LaserJet 2100" -#: src/main/xmli18n-tmp.h:733 +#: src/main/xmli18n-tmp.h:785 msgid "HP LaserJet 2100M" msgstr "HP LaserJet 2100M" -#: src/main/xmli18n-tmp.h:734 +#: src/main/xmli18n-tmp.h:786 msgid "HP LaserJet 2200" msgstr "HP LaserJet 2200" -#: src/main/xmli18n-tmp.h:735 +#: src/main/xmli18n-tmp.h:787 msgid "HP LaserJet 2300" msgstr "HP LaserJet 2300" -#: src/main/xmli18n-tmp.h:736 +#: src/main/xmli18n-tmp.h:788 msgid "HP LaserJet 3200" msgstr "HP LaserJet 3200" -#: src/main/xmli18n-tmp.h:737 +#: src/main/xmli18n-tmp.h:789 msgid "HP LaserJet 3200m" msgstr "HP LaserJet 3200m" -#: src/main/xmli18n-tmp.h:738 +#: src/main/xmli18n-tmp.h:790 msgid "HP LaserJet 3200se" msgstr "HP LaserJet 3200se" -#: src/main/xmli18n-tmp.h:739 +#: src/main/xmli18n-tmp.h:791 msgid "HP LaserJet 3300 MFP" msgstr "HP LaserJet 3300 MFP" -#: src/main/xmli18n-tmp.h:740 +#: src/main/xmli18n-tmp.h:792 msgid "HP LaserJet 3310 MFP" msgstr "HP LaserJet 3310 MFP" -#: src/main/xmli18n-tmp.h:741 +#: src/main/xmli18n-tmp.h:793 msgid "HP LaserJet 3320 MFP" msgstr "HP LaserJet 3320 MFP" -#: src/main/xmli18n-tmp.h:742 +#: src/main/xmli18n-tmp.h:794 msgid "HP LaserJet 3320N MFP" msgstr "HP LaserJet 3320N MFP" -#: src/main/xmli18n-tmp.h:743 +#: src/main/xmli18n-tmp.h:795 msgid "HP LaserJet 3330 MFP" msgstr "HP LaserJet 3330 MFP" -#: src/main/xmli18n-tmp.h:744 +#: src/main/xmli18n-tmp.h:796 msgid "HP LaserJet 4000" msgstr "HP LaserJet 4000" -#: src/main/xmli18n-tmp.h:745 +#: src/main/xmli18n-tmp.h:797 msgid "HP LaserJet 4050" msgstr "HP LaserJet 4050" -#: src/main/xmli18n-tmp.h:746 +#: src/main/xmli18n-tmp.h:798 msgid "HP LaserJet 4100" msgstr "HP LaserJet 4100" -#: src/main/xmli18n-tmp.h:747 +#: src/main/xmli18n-tmp.h:799 msgid "HP LaserJet 4200" msgstr "HP LaserJet 4200" -#: src/main/xmli18n-tmp.h:748 +#: src/main/xmli18n-tmp.h:800 msgid "HP LaserJet 4300" msgstr "HP LaserJet 4300" -#: src/main/xmli18n-tmp.h:749 +#: src/main/xmli18n-tmp.h:801 msgid "HP LaserJet 5000" msgstr "HP LaserJet 5000" -#: src/main/xmli18n-tmp.h:750 +#: src/main/xmli18n-tmp.h:802 msgid "HP LaserJet 5100" msgstr "HP LaserJet 5100" -#: src/main/xmli18n-tmp.h:751 +#: src/main/xmli18n-tmp.h:803 msgid "HP LaserJet 8000" msgstr "HP LaserJet 8000" -#: src/main/xmli18n-tmp.h:752 +#: src/main/xmli18n-tmp.h:804 msgid "HP LaserJet 8100" msgstr "HP LaserJet 8100" -#: src/main/xmli18n-tmp.h:753 +#: src/main/xmli18n-tmp.h:805 msgid "HP LaserJet 8150" msgstr "HP LaserJet 8150" -#: src/main/xmli18n-tmp.h:754 +#: src/main/xmli18n-tmp.h:806 msgid "HP LaserJet 9000" msgstr "HP LaserJet 9000" -#: src/main/xmli18n-tmp.h:755 +#: src/main/xmli18n-tmp.h:807 msgid "HP Mopier 240" msgstr "HP Mopier 240" -#: src/main/xmli18n-tmp.h:756 +#: src/main/xmli18n-tmp.h:808 msgid "HP Mopier 320" msgstr "HP Mopier 320" -#: src/main/xmli18n-tmp.h:757 +#: src/main/xmli18n-tmp.h:809 msgid "HP OfficeJet 300" msgstr "HP OfficeJet 300" -#: src/main/xmli18n-tmp.h:758 +#: src/main/xmli18n-tmp.h:810 msgid "HP OfficeJet 330" msgstr "HP OfficeJet 330" -#: src/main/xmli18n-tmp.h:759 +#: src/main/xmli18n-tmp.h:811 msgid "HP OfficeJet 350" msgstr "HP OfficeJet 350" -#: src/main/xmli18n-tmp.h:760 +#: src/main/xmli18n-tmp.h:812 msgid "HP OfficeJet 500" msgstr "HP OfficeJet 500" -#: src/main/xmli18n-tmp.h:761 +#: src/main/xmli18n-tmp.h:813 msgid "HP OfficeJet 520" msgstr "HP OfficeJet 520" -#: src/main/xmli18n-tmp.h:762 +#: src/main/xmli18n-tmp.h:814 msgid "HP OfficeJet 570" msgstr "HP OfficeJet 570" -#: src/main/xmli18n-tmp.h:763 +#: src/main/xmli18n-tmp.h:815 msgid "HP OfficeJet 580" msgstr "HP OfficeJet 580" -#: src/main/xmli18n-tmp.h:764 +#: src/main/xmli18n-tmp.h:816 msgid "HP OfficeJet 590" msgstr "HP OfficeJet 590" -#: src/main/xmli18n-tmp.h:765 +#: src/main/xmli18n-tmp.h:817 msgid "HP OfficeJet 600" msgstr "HP OfficeJet 600" -#: src/main/xmli18n-tmp.h:766 +#: src/main/xmli18n-tmp.h:818 msgid "HP OfficeJet 610" msgstr "HP OfficeJet 610" -#: src/main/xmli18n-tmp.h:767 +#: src/main/xmli18n-tmp.h:819 msgid "HP OfficeJet 625" msgstr "HP OfficeJet 625" -#: src/main/xmli18n-tmp.h:768 +#: src/main/xmli18n-tmp.h:820 msgid "HP OfficeJet 630" msgstr "HP OfficeJet 630" -#: src/main/xmli18n-tmp.h:769 +#: src/main/xmli18n-tmp.h:821 msgid "HP OfficeJet 635" msgstr "HP OfficeJet 635" -#: src/main/xmli18n-tmp.h:770 +#: src/main/xmli18n-tmp.h:822 msgid "HP OfficeJet 700" msgstr "HP OfficeJet 700" -#: src/main/xmli18n-tmp.h:771 +#: src/main/xmli18n-tmp.h:823 msgid "HP OfficeJet 710" msgstr "HP OfficeJet 710" -#: src/main/xmli18n-tmp.h:772 +#: src/main/xmli18n-tmp.h:824 msgid "HP OfficeJet 720" msgstr "HP OfficeJet 720" -#: src/main/xmli18n-tmp.h:773 +#: src/main/xmli18n-tmp.h:825 msgid "HP OfficeJet 725" msgstr "HP OfficeJet 725" -#: src/main/xmli18n-tmp.h:774 +#: src/main/xmli18n-tmp.h:826 msgid "HP OfficeJet 5105" msgstr "HP OfficeJet 5105" -#: src/main/xmli18n-tmp.h:775 +#: src/main/xmli18n-tmp.h:827 msgid "HP OfficeJet 5110" msgstr "HP OfficeJet 5110" -#: src/main/xmli18n-tmp.h:776 +#: src/main/xmli18n-tmp.h:828 msgid "HP OfficeJet 5110xi" msgstr "HP OfficeJet 5110xi" -#: src/main/xmli18n-tmp.h:777 +#: src/main/xmli18n-tmp.h:829 msgid "HP OfficeJet 6105" msgstr "HP OfficeJet 6105" -#: src/main/xmli18n-tmp.h:778 +#: src/main/xmli18n-tmp.h:830 msgid "HP OfficeJet 6110" msgstr "HP OfficeJet 6110" -#: src/main/xmli18n-tmp.h:779 +#: src/main/xmli18n-tmp.h:831 msgid "HP OfficeJet 7110" msgstr "HP OfficeJet 7110" -#: src/main/xmli18n-tmp.h:780 +#: src/main/xmli18n-tmp.h:832 msgid "HP OfficeJet 7130" msgstr "HP OfficeJet 7130" -#: src/main/xmli18n-tmp.h:781 +#: src/main/xmli18n-tmp.h:833 msgid "HP OfficeJet 7140" msgstr "HP OfficeJet 7140" -#: src/main/xmli18n-tmp.h:782 +#: src/main/xmli18n-tmp.h:834 msgid "HP OfficeJet D125" msgstr "HP OfficeJet D125" -#: src/main/xmli18n-tmp.h:783 +#: src/main/xmli18n-tmp.h:835 msgid "HP OfficeJet D135" msgstr "HP OfficeJet D135" -#: src/main/xmli18n-tmp.h:784 +#: src/main/xmli18n-tmp.h:836 msgid "HP OfficeJet D145" msgstr "HP OfficeJet D145" -#: src/main/xmli18n-tmp.h:785 +#: src/main/xmli18n-tmp.h:837 msgid "HP OfficeJet D155" msgstr "HP OfficeJet D155" -#: src/main/xmli18n-tmp.h:786 +#: src/main/xmli18n-tmp.h:838 msgid "HP OfficeJet G55" msgstr "HP OfficeJet G55" -#: src/main/xmli18n-tmp.h:787 +#: src/main/xmli18n-tmp.h:839 msgid "HP OfficeJet G85" msgstr "HP OfficeJet G85" -#: src/main/xmli18n-tmp.h:788 +#: src/main/xmli18n-tmp.h:840 msgid "HP OfficeJet G95" msgstr "HP OfficeJet G95" -#: src/main/xmli18n-tmp.h:789 +#: src/main/xmli18n-tmp.h:841 msgid "HP OfficeJet K60" msgstr "HP OfficeJet K60" -#: src/main/xmli18n-tmp.h:790 +#: src/main/xmli18n-tmp.h:842 msgid "HP OfficeJet K60xi" msgstr "HP OfficeJet K60xi" -#: src/main/xmli18n-tmp.h:791 +#: src/main/xmli18n-tmp.h:843 msgid "HP OfficeJet K80" msgstr "HP OfficeJet K80" -#: src/main/xmli18n-tmp.h:792 +#: src/main/xmli18n-tmp.h:844 msgid "HP OfficeJet K80xi" msgstr "HP OfficeJet K80xi" -#: src/main/xmli18n-tmp.h:793 +#: src/main/xmli18n-tmp.h:845 msgid "HP OfficeJet LX" msgstr "HP OfficeJet LX" -#: src/main/xmli18n-tmp.h:794 +#: src/main/xmli18n-tmp.h:846 msgid "HP OfficeJet Pro 1150C" msgstr "HP OfficeJet Pro 1150C" -#: src/main/xmli18n-tmp.h:795 +#: src/main/xmli18n-tmp.h:847 msgid "HP OfficeJet Pro 1170C" msgstr "HP OfficeJet Pro 1170C" -#: src/main/xmli18n-tmp.h:796 +#: src/main/xmli18n-tmp.h:848 msgid "HP OfficeJet Pro 1175C" msgstr "HP OfficeJet Pro 1175C" -#: src/main/xmli18n-tmp.h:797 +#: src/main/xmli18n-tmp.h:849 msgid "HP OfficeJet R40" msgstr "HP OfficeJet R40" -#: src/main/xmli18n-tmp.h:798 +#: src/main/xmli18n-tmp.h:850 msgid "HP OfficeJet R45" msgstr "HP OfficeJet R45" -#: src/main/xmli18n-tmp.h:799 +#: src/main/xmli18n-tmp.h:851 msgid "HP OfficeJet R60" msgstr "HP OfficeJet R60" -#: src/main/xmli18n-tmp.h:800 +#: src/main/xmli18n-tmp.h:852 msgid "HP OfficeJet R65" msgstr "HP OfficeJet R65" -#: src/main/xmli18n-tmp.h:801 +#: src/main/xmli18n-tmp.h:853 msgid "HP OfficeJet R80" msgstr "HP OfficeJet R80" -#: src/main/xmli18n-tmp.h:802 +#: src/main/xmli18n-tmp.h:854 msgid "HP OfficeJet T45" msgstr "HP OfficeJet T45" -#: src/main/xmli18n-tmp.h:803 +#: src/main/xmli18n-tmp.h:855 msgid "HP OfficeJet T65" msgstr "HP OfficeJet T65" -#: src/main/xmli18n-tmp.h:804 +#: src/main/xmli18n-tmp.h:856 msgid "HP OfficeJet V40" msgstr "HP OfficeJet V40" -#: src/main/xmli18n-tmp.h:805 +#: src/main/xmli18n-tmp.h:857 msgid "HP OfficeJet V40xi" msgstr "HP OfficeJet V40xi" -#: src/main/xmli18n-tmp.h:806 +#: src/main/xmli18n-tmp.h:858 msgid "HP OfficeJet" msgstr "HP OfficeJet" -#: src/main/xmli18n-tmp.h:807 +#: src/main/xmli18n-tmp.h:859 msgid "HP PSC 370" msgstr "HP PSC 370" -#: src/main/xmli18n-tmp.h:808 +#: src/main/xmli18n-tmp.h:860 msgid "HP PSC 380" msgstr "HP PSC 380" -#: src/main/xmli18n-tmp.h:809 +#: src/main/xmli18n-tmp.h:861 msgid "HP PSC 500" msgstr "HP PSC 500" -#: src/main/xmli18n-tmp.h:810 +#: src/main/xmli18n-tmp.h:862 msgid "HP PSC 750" msgstr "HP PSC 750" -#: src/main/xmli18n-tmp.h:811 +#: src/main/xmli18n-tmp.h:863 msgid "HP PSC 950" msgstr "HP PSC 950" -#: src/main/xmli18n-tmp.h:812 +#: src/main/xmli18n-tmp.h:864 msgid "HP PSC 950xi" msgstr "HP PSC 950xi" -#: src/main/xmli18n-tmp.h:813 +#: src/main/xmli18n-tmp.h:865 msgid "HP PSC 2110" msgstr "HP PSC 2110" -#: src/main/xmli18n-tmp.h:814 +#: src/main/xmli18n-tmp.h:866 msgid "HP PSC 2150" msgstr "HP PSC 2150" -#: src/main/xmli18n-tmp.h:815 +#: src/main/xmli18n-tmp.h:867 msgid "HP PSC 2210" msgstr "HP PSC 2210" -#: src/main/xmli18n-tmp.h:816 +#: src/main/xmli18n-tmp.h:868 msgid "HP PhotoSmart 7150" msgstr "HP PhotoSmart 7150" -#: src/main/xmli18n-tmp.h:817 +#: src/main/xmli18n-tmp.h:869 msgid "HP PhotoSmart 7345" msgstr "HP PhotoSmart 7345" -#: src/main/xmli18n-tmp.h:818 +#: src/main/xmli18n-tmp.h:870 msgid "HP PhotoSmart 7350" msgstr "HP PhotoSmart 7350" -#: src/main/xmli18n-tmp.h:819 +#: src/main/xmli18n-tmp.h:871 msgid "HP PhotoSmart 7550" msgstr "HP PhotoSmart 7550" -#: src/main/xmli18n-tmp.h:820 +#: src/main/xmli18n-tmp.h:872 msgid "HP PhotoSmart P100" msgstr "HP PhotoSmart P100" -#: src/main/xmli18n-tmp.h:821 +#: src/main/xmli18n-tmp.h:873 msgid "HP PhotoSmart P130" msgstr "HP PhotoSmart P130" -#: src/main/xmli18n-tmp.h:822 +#: src/main/xmli18n-tmp.h:874 msgid "HP PhotoSmart P230" msgstr "HP PhotoSmart P230" -#: src/main/xmli18n-tmp.h:823 +#: src/main/xmli18n-tmp.h:875 msgid "HP PhotoSmart P1000" msgstr "HP PhotoSmart P1000" -#: src/main/xmli18n-tmp.h:824 +#: src/main/xmli18n-tmp.h:876 msgid "HP PhotoSmart P1100" msgstr "HP PhotoSmart P1100" -#: src/main/xmli18n-tmp.h:825 +#: src/main/xmli18n-tmp.h:877 msgid "HP PhotoSmart P1115" msgstr "HP PhotoSmart P1115" -#: src/main/xmli18n-tmp.h:826 +#: src/main/xmli18n-tmp.h:878 msgid "HP PhotoSmart P1215" msgstr "HP PhotoSmart P1215" -#: src/main/xmli18n-tmp.h:827 +#: src/main/xmli18n-tmp.h:879 msgid "HP PhotoSmart P1218" msgstr "HP PhotoSmart P1218" -#: src/main/xmli18n-tmp.h:828 +#: src/main/xmli18n-tmp.h:880 msgid "HP PhotoSmart P1315" msgstr "HP PhotoSmart P1315" -#: src/main/xmli18n-tmp.h:829 +#: src/main/xmli18n-tmp.h:881 msgid "HP e-printer e20" msgstr "HP e-printer e20" -#: src/main/xmli18n-tmp.h:830 +#: src/main/xmli18n-tmp.h:882 msgid "IBM 4019" msgstr "IBM 4019" -#: src/main/xmli18n-tmp.h:831 +#: src/main/xmli18n-tmp.h:883 msgid "IBM 4029 030 LaserPrinter 10" msgstr "IBM 4029 030 LaserPrinter 10" -#: src/main/xmli18n-tmp.h:832 +#: src/main/xmli18n-tmp.h:884 msgid "IBM 4312" msgstr "IBM 4312" -#: src/main/xmli18n-tmp.h:833 +#: src/main/xmli18n-tmp.h:885 msgid "IBM Infoprint 12" msgstr "IBM Infoprint 12" -#: src/main/xmli18n-tmp.h:834 +#: src/main/xmli18n-tmp.h:886 msgid "IBM Page Printer 3112" msgstr "IBM Page Printer 3112" -#: src/main/xmli18n-tmp.h:835 +#: src/main/xmli18n-tmp.h:887 msgid "Infotec 4651 MF" msgstr "Infotec 4651 MF" -#: src/main/xmli18n-tmp.h:836 +#: src/main/xmli18n-tmp.h:888 msgid "Kyocera F-1010" msgstr "Kyocera F-1010" -#: src/main/xmli18n-tmp.h:837 +#: src/main/xmli18n-tmp.h:889 msgid "Kyocera FS-600 - KPDL-2" msgstr "Kyocera FS-600 - KPDL-2" -#: src/main/xmli18n-tmp.h:838 +#: src/main/xmli18n-tmp.h:890 msgid "Kyocera FS-600" msgstr "Kyocera FS-600" -#: src/main/xmli18n-tmp.h:839 +#: src/main/xmli18n-tmp.h:891 msgid "Kyocera FS-680" msgstr "Kyocera FS-680" -#: src/main/xmli18n-tmp.h:840 +#: src/main/xmli18n-tmp.h:892 msgid "Kyocera FS-800" msgstr "Kyocera FS-800" -#: src/main/xmli18n-tmp.h:841 +#: src/main/xmli18n-tmp.h:893 msgid "Kyocera FS-1000" msgstr "Kyocera FS-1000" -#: src/main/xmli18n-tmp.h:842 +#: src/main/xmli18n-tmp.h:894 msgid "Kyocera FS-1000+" msgstr "Kyocera FS-1000+" -#: src/main/xmli18n-tmp.h:843 +#: src/main/xmli18n-tmp.h:895 msgid "Kyocera FS-1010" msgstr "Kyocera FS-1010" -#: src/main/xmli18n-tmp.h:844 +#: src/main/xmli18n-tmp.h:896 msgid "Kyocera FS-1050" msgstr "Kyocera FS-1050" -#: src/main/xmli18n-tmp.h:845 +#: src/main/xmli18n-tmp.h:897 msgid "Kyocera FS-1200" msgstr "Kyocera FS-1200" -#: src/main/xmli18n-tmp.h:846 +#: src/main/xmli18n-tmp.h:898 msgid "Kyocera FS-1600" msgstr "Kyocera FS-1600" -#: src/main/xmli18n-tmp.h:847 +#: src/main/xmli18n-tmp.h:899 msgid "Kyocera FS-1600+" msgstr "Kyocera FS-1600+" -#: src/main/xmli18n-tmp.h:848 +#: src/main/xmli18n-tmp.h:900 msgid "Kyocera FS-1700" msgstr "Kyocera FS-1700" -#: src/main/xmli18n-tmp.h:849 +#: src/main/xmli18n-tmp.h:901 msgid "Kyocera FS-1700+" msgstr "Kyocera FS-1700+" -#: src/main/xmli18n-tmp.h:850 +#: src/main/xmli18n-tmp.h:902 msgid "Kyocera FS-1750" msgstr "Kyocera FS-1750" -#: src/main/xmli18n-tmp.h:851 +#: src/main/xmli18n-tmp.h:903 msgid "Kyocera FS-1800" msgstr "Kyocera FS-1800" -#: src/main/xmli18n-tmp.h:852 +#: src/main/xmli18n-tmp.h:904 msgid "Kyocera FS-1800+" msgstr "Kyocera FS-1800+" -#: src/main/xmli18n-tmp.h:853 +#: src/main/xmli18n-tmp.h:905 msgid "Kyocera FS-1900" msgstr "Kyocera FS-1900" -#: src/main/xmli18n-tmp.h:854 +#: src/main/xmli18n-tmp.h:906 msgid "Kyocera FS-3500" msgstr "Kyocera FS-3500" -#: src/main/xmli18n-tmp.h:855 +#: src/main/xmli18n-tmp.h:907 msgid "Kyocera FS-3600" msgstr "Kyocera FS-3600" -#: src/main/xmli18n-tmp.h:856 +#: src/main/xmli18n-tmp.h:908 msgid "Kyocera FS-3600+" msgstr "Kyocera FS-3600+" -#: src/main/xmli18n-tmp.h:857 +#: src/main/xmli18n-tmp.h:909 msgid "Kyocera FS-3700" msgstr "Kyocera FS-3700" -#: src/main/xmli18n-tmp.h:858 +#: src/main/xmli18n-tmp.h:910 msgid "Kyocera FS-3700+" msgstr "Kyocera FS-3700+" -#: src/main/xmli18n-tmp.h:859 +#: src/main/xmli18n-tmp.h:911 msgid "Kyocera FS-3750" msgstr "Kyocera FS-3750" -#: src/main/xmli18n-tmp.h:860 +#: src/main/xmli18n-tmp.h:912 msgid "Kyocera FS-3800" msgstr "Kyocera FS-3800" -#: src/main/xmli18n-tmp.h:861 +#: src/main/xmli18n-tmp.h:913 msgid "Kyocera FS-5800C" msgstr "Kyocera FS-5800C" -#: src/main/xmli18n-tmp.h:862 +#: src/main/xmli18n-tmp.h:914 msgid "Kyocera FS-5900C" msgstr "Kyocera FS-5900C" -#: src/main/xmli18n-tmp.h:863 +#: src/main/xmli18n-tmp.h:915 msgid "Kyocera FS-6500" msgstr "Kyocera FS-6500" -#: src/main/xmli18n-tmp.h:864 +#: src/main/xmli18n-tmp.h:916 msgid "Kyocera FS-6500+" msgstr "Kyocera FS-6500+" -#: src/main/xmli18n-tmp.h:865 +#: src/main/xmli18n-tmp.h:917 msgid "Kyocera FS-6700" msgstr "Kyocera FS-6700" -#: src/main/xmli18n-tmp.h:866 +#: src/main/xmli18n-tmp.h:918 msgid "Kyocera FS-7000" msgstr "Kyocera FS-7000" -#: src/main/xmli18n-tmp.h:867 +#: src/main/xmli18n-tmp.h:919 msgid "Kyocera FS-7000+" msgstr "Kyocera FS-7000+" -#: src/main/xmli18n-tmp.h:868 +#: src/main/xmli18n-tmp.h:920 msgid "Kyocera FS-8000C" msgstr "Kyocera FS-8000C" -#: src/main/xmli18n-tmp.h:869 +#: src/main/xmli18n-tmp.h:921 msgid "Kyocera FS-9000" msgstr "Kyocera FS-9000" -#: src/main/xmli18n-tmp.h:870 +#: src/main/xmli18n-tmp.h:922 msgid "Kyocera FS-9100DN" msgstr "Kyocera FS-9100DN" -#: src/main/xmli18n-tmp.h:871 +#: src/main/xmli18n-tmp.h:923 msgid "Kyocera FS-9500DN" msgstr "Kyocera FS-9500DN" -#: src/main/xmli18n-tmp.h:872 +#: src/main/xmli18n-tmp.h:924 msgid "Kyocera KM-1530" msgstr "Kyocera KM-1530" -#: src/main/xmli18n-tmp.h:873 +#: src/main/xmli18n-tmp.h:925 msgid "Kyocera KM-1810" msgstr "Kyocera KM-1810" -#: src/main/xmli18n-tmp.h:874 +#: src/main/xmli18n-tmp.h:926 msgid "Kyocera KM-2030" msgstr "Kyocera KM-2030" -#: src/main/xmli18n-tmp.h:875 +#: src/main/xmli18n-tmp.h:927 msgid "Kyocera KM-2530" msgstr "Kyocera KM-2530" -#: src/main/xmli18n-tmp.h:876 +#: src/main/xmli18n-tmp.h:928 msgid "Kyocera KM-3530" msgstr "Kyocera KM-3530" -#: src/main/xmli18n-tmp.h:877 +#: src/main/xmli18n-tmp.h:929 msgid "Kyocera KM-4230" msgstr "Kyocera KM-4230" -#: src/main/xmli18n-tmp.h:878 +#: src/main/xmli18n-tmp.h:930 msgid "Kyocera KM-4530" msgstr "Kyocera KM-4530" -#: src/main/xmli18n-tmp.h:879 +#: src/main/xmli18n-tmp.h:931 msgid "Kyocera KM-5230" msgstr "Kyocera KM-5230" -#: src/main/xmli18n-tmp.h:880 +#: src/main/xmli18n-tmp.h:932 msgid "Kyocera KM-5530" msgstr "Kyocera KM-5530" -#: src/main/xmli18n-tmp.h:881 +#: src/main/xmli18n-tmp.h:933 msgid "Kyocera KM-6230" msgstr "Kyocera KM-6230" -#: src/main/xmli18n-tmp.h:882 +#: src/main/xmli18n-tmp.h:934 msgid "Lexmark 4076" msgstr "Lexmark 4076" -#: src/main/xmli18n-tmp.h:883 +#: src/main/xmli18n-tmp.h:935 msgid "Lexmark Optra E" msgstr "Lexmark Optra E" -#: src/main/xmli18n-tmp.h:884 +#: src/main/xmli18n-tmp.h:936 msgid "Lexmark Optra E+" msgstr "Lexmark Optra E+" -#: src/main/xmli18n-tmp.h:885 -#, fuzzy +#: src/main/xmli18n-tmp.h:937 msgid "Lexmark Optra E220" -msgstr "Lexmark Optra E" +msgstr "Lexmark Optra E220" -#: src/main/xmli18n-tmp.h:886 +#: src/main/xmli18n-tmp.h:938 msgid "Lexmark Valuewriter 300" msgstr "Lexmark Valuewriter 300" -#: src/main/xmli18n-tmp.h:887 +#: src/main/xmli18n-tmp.h:939 msgid "Minolta PagePro 6" msgstr "Minolta PagePro 6" -#: src/main/xmli18n-tmp.h:888 +#: src/main/xmli18n-tmp.h:940 msgid "Minolta PagePro 6e" msgstr "Minolta PagePro 6e" -#: src/main/xmli18n-tmp.h:889 +#: src/main/xmli18n-tmp.h:941 msgid "Minolta PagePro 6ex" msgstr "Minolta PagePro 6ex" -#: src/main/xmli18n-tmp.h:890 +#: src/main/xmli18n-tmp.h:942 msgid "Minolta PagePro 8" msgstr "Minolta PagePro 8" -#: src/main/xmli18n-tmp.h:891 +#: src/main/xmli18n-tmp.h:943 msgid "Minolta PagePro 8L" msgstr "Minolta PagePro 8L" -#: src/main/xmli18n-tmp.h:892 +#: src/main/xmli18n-tmp.h:944 msgid "Minolta PagePro 1100" msgstr "Minolta PagePro 1100" -#: src/main/xmli18n-tmp.h:893 +#: src/main/xmli18n-tmp.h:945 msgid "NEC SuperScript 660i" msgstr "NEC SuperScript 660i" -#: src/main/xmli18n-tmp.h:894 +#: src/main/xmli18n-tmp.h:946 msgid "NEC SuperScript 860" msgstr "NEC SuperScript 860" -#: src/main/xmli18n-tmp.h:895 +#: src/main/xmli18n-tmp.h:947 msgid "NEC SuperScript 870" msgstr "NEC SuperScript 870" -#: src/main/xmli18n-tmp.h:896 +#: src/main/xmli18n-tmp.h:948 msgid "NEC SuperScript 1260" msgstr "NEC SuperScript 1260" -#: src/main/xmli18n-tmp.h:897 +#: src/main/xmli18n-tmp.h:949 msgid "NEC SuperScript 1400" msgstr "NEC SuperScript 1400" -#: src/main/xmli18n-tmp.h:898 +#: src/main/xmli18n-tmp.h:950 msgid "NEC SuperScript 1800" msgstr "NEC SuperScript 1800" -#: src/main/xmli18n-tmp.h:899 +#: src/main/xmli18n-tmp.h:951 msgid "Okidata OL400" msgstr "Okidata OL400" -#: src/main/xmli18n-tmp.h:900 +#: src/main/xmli18n-tmp.h:952 msgid "Okidata OL400e" msgstr "Okidata OL400e" -#: src/main/xmli18n-tmp.h:901 +#: src/main/xmli18n-tmp.h:953 msgid "Okidata OL400ex" msgstr "Okidata OL400ex" -#: src/main/xmli18n-tmp.h:902 +#: src/main/xmli18n-tmp.h:954 msgid "Okidata OL410e" msgstr "Okidata OL410e" -#: src/main/xmli18n-tmp.h:903 +#: src/main/xmli18n-tmp.h:955 msgid "Okidata OL600e" msgstr "Okidata OL600e" -#: src/main/xmli18n-tmp.h:904 +#: src/main/xmli18n-tmp.h:956 msgid "Okidata OL610e/S" msgstr "Okidata OL610e/S" -#: src/main/xmli18n-tmp.h:905 +#: src/main/xmli18n-tmp.h:957 msgid "Okidata OL800" msgstr "Okidata OL800" -#: src/main/xmli18n-tmp.h:906 +#: src/main/xmli18n-tmp.h:958 msgid "Okidata OL810ex" msgstr "Okidata OL810ex" -#: src/main/xmli18n-tmp.h:907 +#: src/main/xmli18n-tmp.h:959 msgid "Okidata Okipage 6e" msgstr "Okidata Okipage 6e" -#: src/main/xmli18n-tmp.h:908 +#: src/main/xmli18n-tmp.h:960 msgid "Okidata Okipage 6ex" msgstr "Okidata Okipage 6ex" -#: src/main/xmli18n-tmp.h:909 +#: src/main/xmli18n-tmp.h:961 msgid "Okidata Okipage 8p" msgstr "Okidata Okipage 8p" -#: src/main/xmli18n-tmp.h:910 +#: src/main/xmli18n-tmp.h:962 msgid "Okidata Okipage 10e" msgstr "Okidata Okipage 10e" -#: src/main/xmli18n-tmp.h:911 +#: src/main/xmli18n-tmp.h:963 msgid "Okidata Okipage 10ex" msgstr "Okidata Okipage 10ex" -#: src/main/xmli18n-tmp.h:912 +#: src/main/xmli18n-tmp.h:964 msgid "Okidata Okipage 14ex" msgstr "Okidata Okipage 14ex" -#: src/main/xmli18n-tmp.h:913 +#: src/main/xmli18n-tmp.h:965 msgid "Okidata Super 6e" msgstr "Okidata Super 6e" -#: src/main/xmli18n-tmp.h:914 +#: src/main/xmli18n-tmp.h:966 msgid "Olivetti JP350S" msgstr "Olivetti JP350S" -#: src/main/xmli18n-tmp.h:915 +#: src/main/xmli18n-tmp.h:967 msgid "Olivetti PG 306" msgstr "Olivetti PG 306" -#: src/main/xmli18n-tmp.h:916 +#: src/main/xmli18n-tmp.h:968 msgid "PCPI 1030" msgstr "PCPI 1030" -#: src/main/xmli18n-tmp.h:917 +#: src/main/xmli18n-tmp.h:969 msgid "Panasonic KX-P4410" msgstr "Panasonic KX-P4410" -#: src/main/xmli18n-tmp.h:918 +#: src/main/xmli18n-tmp.h:970 msgid "Panasonic KX-P4450" msgstr "Panasonic KX-P4450" -#: src/main/xmli18n-tmp.h:919 +#: src/main/xmli18n-tmp.h:971 msgid "Panasonic KX-P6150" msgstr "Panasonic KX-P6150" -#: src/main/xmli18n-tmp.h:920 +#: src/main/xmli18n-tmp.h:972 msgid "Panasonic KX-P6500" msgstr "Panasonic KX-P6500" -#: src/main/xmli18n-tmp.h:921 +#: src/main/xmli18n-tmp.h:973 msgid "Raven LP-410" msgstr "Raven LP-410" -#: src/main/xmli18n-tmp.h:922 +#: src/main/xmli18n-tmp.h:974 msgid "Ricoh Aficio 220" msgstr "Ricoh Aficio 220" -#: src/main/xmli18n-tmp.h:923 +#: src/main/xmli18n-tmp.h:975 msgid "Ricoh Aficio 401" msgstr "Ricoh Aficio 401" -#: src/main/xmli18n-tmp.h:924 +#: src/main/xmli18n-tmp.h:976 msgid "Ricoh Aficio 700" msgstr "Ricoh Aficio 700" -#: src/main/xmli18n-tmp.h:925 +#: src/main/xmli18n-tmp.h:977 msgid "Samsung ML-85" msgstr "Samsung ML-85" -#: src/main/xmli18n-tmp.h:926 +#: src/main/xmli18n-tmp.h:978 msgid "Samsung ML-4600" msgstr "Samsung ML-4600" -#: src/main/xmli18n-tmp.h:927 +#: src/main/xmli18n-tmp.h:979 msgid "Samsung ML-5000a" msgstr "Samsung ML-5000a" -#: src/main/xmli18n-tmp.h:928 +#: src/main/xmli18n-tmp.h:980 msgid "Samsung ML-6000" msgstr "Samsung ML-6000" -#: src/main/xmli18n-tmp.h:929 +#: src/main/xmli18n-tmp.h:981 msgid "Samsung ML-6100" msgstr "Samsung ML-6100" -#: src/main/xmli18n-tmp.h:930 +#: src/main/xmli18n-tmp.h:982 msgid "Samsung ML-7000" msgstr "Samsung ML-7000" -#: src/main/xmli18n-tmp.h:931 +#: src/main/xmli18n-tmp.h:983 msgid "Samsung ML-7000N" msgstr "Samsung ML-7000N" -#: src/main/xmli18n-tmp.h:932 +#: src/main/xmli18n-tmp.h:984 msgid "Samsung ML-7000P" msgstr "Samsung ML-7000P" -#: src/main/xmli18n-tmp.h:933 +#: src/main/xmli18n-tmp.h:985 msgid "Samsung ML-7050" msgstr "Samsung ML-7050" -#: src/main/xmli18n-tmp.h:934 +#: src/main/xmli18n-tmp.h:986 msgid "Samsung QL-5100A" msgstr "Samsung QL-5100A" -#: src/main/xmli18n-tmp.h:935 +#: src/main/xmli18n-tmp.h:987 msgid "Samsung QL-6050" msgstr "Samsung QL-6050" -#: src/main/xmli18n-tmp.h:936 +#: src/main/xmli18n-tmp.h:988 msgid "Seiko SpeedJET 200" msgstr "Seiko SpeedJET 200" -#: src/main/xmli18n-tmp.h:937 +#: src/main/xmli18n-tmp.h:989 msgid "Sharp AR-161" msgstr "Sharp AR-161" -#: src/main/xmli18n-tmp.h:938 +#: src/main/xmli18n-tmp.h:990 #, fuzzy msgid "Sharp AR-M257" msgstr "Sharp AR-161" -#: src/main/xmli18n-tmp.h:939 +#: src/main/xmli18n-tmp.h:991 msgid "Sony IJP-V100" msgstr "Sony IJP-V100" -#: src/main/xmli18n-tmp.h:940 +#: src/main/xmli18n-tmp.h:992 msgid "Star LS-04" msgstr "Star LS-04" -#: src/main/xmli18n-tmp.h:941 +#: src/main/xmli18n-tmp.h:993 msgid "Star LaserPrinter 8" msgstr "Star LaserPrinter 8" -#: src/main/xmli18n-tmp.h:942 +#: src/main/xmli18n-tmp.h:994 msgid "Tally MT908" msgstr "Tally MT908" -#: src/main/xmli18n-tmp.h:943 +#: src/main/xmli18n-tmp.h:995 msgid "Xerox Able 1406" msgstr "Xerox Able 1406" -#: src/main/xmli18n-tmp.h:944 +#: src/main/xmli18n-tmp.h:996 msgid "Xerox DocuPrint 4508" msgstr "Xerox DocuPrint 4508" -#: src/main/xmli18n-tmp.h:945 +#: src/main/xmli18n-tmp.h:997 msgid "Xerox DocuPrint C20" msgstr "Xerox DocuPrint C20" -#: src/main/xmli18n-tmp.h:946 +#: src/main/xmli18n-tmp.h:998 msgid "Xerox DocuPrint N4512" msgstr "Xerox DocuPrint N4512" -#: src/main/xmli18n-tmp.h:947 +#: src/main/xmli18n-tmp.h:999 msgid "Xerox DocuPrint N4512PS" msgstr "Xerox DocuPrint N4512PS" -#: src/main/xmli18n-tmp.h:948 +#: src/main/xmli18n-tmp.h:1000 msgid "Xerox DocuPrint P12" msgstr "Xerox DocuPrint P12" -#: src/main/xmli18n-tmp.h:949 +#: src/main/xmli18n-tmp.h:1001 msgid "Xerox DocuPrint P1202" msgstr "Xerox DocuPrint P1202" -#: src/main/xmli18n-tmp.h:950 +#: src/main/xmli18n-tmp.h:1002 msgid "Xerox DocuPrint P8e" msgstr "Xerox DocuPrint P8e" -#: src/main/xmli18n-tmp.h:951 +#: src/main/xmli18n-tmp.h:1003 msgid "Xerox Document Centre 400" msgstr "Xerox Document Centre 400" -#: src/main/xmli18n-tmp.h:952 -#, fuzzy +#: src/main/xmli18n-tmp.h:1004 msgid "Xerox WorkCentre M118" -msgstr "Xerox Document Centre 400" +msgstr "Xerox WorkCentre M118" -#: src/main/xmli18n-tmp.h:953 +#: src/main/xmli18n-tmp.h:1005 msgid "Compaq IJ1200" -msgstr "" +msgstr "Compaq IJ1200" -#: src/main/xmli18n-tmp.h:954 -#, fuzzy +#: src/main/xmli18n-tmp.h:1006 msgid "Lexmark X73" -msgstr "Lexmark Z43" +msgstr "Lexmark X73" -#: src/main/xmli18n-tmp.h:955 +#: src/main/xmli18n-tmp.h:1007 msgid "Lexmark Z42" msgstr "Lexmark Z42" -#: src/main/xmli18n-tmp.h:956 +#: src/main/xmli18n-tmp.h:1008 msgid "Lexmark Z43" msgstr "Lexmark Z43" -#: src/main/xmli18n-tmp.h:957 +#: src/main/xmli18n-tmp.h:1009 msgid "Lexmark Z52" msgstr "Lexmark Z52" -#: src/main/xmli18n-tmp.h:958 +#: src/main/xmli18n-tmp.h:1010 msgid "Lexmark Z53" msgstr "Lexmark Z53" -#: src/main/xmli18n-tmp.h:959 +#: src/main/xmli18n-tmp.h:1011 msgid "Olympus P-10" msgstr "Olympus P-10" -#: src/main/xmli18n-tmp.h:960 +#: src/main/xmli18n-tmp.h:1012 msgid "Olympus P-11" msgstr "Olympus P-11" -#: src/main/xmli18n-tmp.h:961 +#: src/main/xmli18n-tmp.h:1013 msgid "Olympus P-200" msgstr "Olympus P-200" -#: src/main/xmli18n-tmp.h:962 +#: src/main/xmli18n-tmp.h:1014 msgid "Olympus P-300" msgstr "Olympus P-300" -#: src/main/xmli18n-tmp.h:963 +#: src/main/xmli18n-tmp.h:1015 msgid "Olympus P-300E" msgstr "Olympus P-300E" -#: src/main/xmli18n-tmp.h:964 +#: src/main/xmli18n-tmp.h:1016 msgid "Olympus P-300U" msgstr "Olympus P-300U" -#: src/main/xmli18n-tmp.h:965 +#: src/main/xmli18n-tmp.h:1017 msgid "Olympus P-330E" msgstr "Olympus P-330E" -#: src/main/xmli18n-tmp.h:966 +#: src/main/xmli18n-tmp.h:1018 msgid "Olympus P-330NE" msgstr "Olympus P-330NE" -#: src/main/xmli18n-tmp.h:967 +#: src/main/xmli18n-tmp.h:1019 msgid "Olympus P-400" msgstr "Olympus P-400" -#: src/main/xmli18n-tmp.h:968 +#: src/main/xmli18n-tmp.h:1020 msgid "Olympus P-440" msgstr "Olympus P-440" -#: src/main/xmli18n-tmp.h:969 -#, fuzzy +#: src/main/xmli18n-tmp.h:1021 msgid "Olympus P-S100" -msgstr "Olympus P-10" +msgstr "Olympus P-S100" -#: src/main/xmli18n-tmp.h:970 -#, fuzzy +#: src/main/xmli18n-tmp.h:1022 msgid "Canon CP-10" -msgstr "Canon CP-100" +msgstr "Canon CP-10" -#: src/main/xmli18n-tmp.h:971 +#: src/main/xmli18n-tmp.h:1023 msgid "Canon CP-100" msgstr "Canon CP-100" -#: src/main/xmli18n-tmp.h:972 +#: src/main/xmli18n-tmp.h:1024 msgid "Canon CP-200" msgstr "Canon CP-200" -#: src/main/xmli18n-tmp.h:973 +#: src/main/xmli18n-tmp.h:1025 msgid "Canon CP-220" msgstr "Canon CP-220" -#: src/main/xmli18n-tmp.h:974 +#: src/main/xmli18n-tmp.h:1026 msgid "Canon CP-300" msgstr "Canon CP-300" -#: src/main/xmli18n-tmp.h:975 +#: src/main/xmli18n-tmp.h:1027 msgid "Canon CP-330" msgstr "Canon CP-330" -#: src/main/xmli18n-tmp.h:976 +#: src/main/xmli18n-tmp.h:1028 msgid "Canon SELPHY-CP-400" msgstr "Canon SELPHY-CP-400" -#: src/main/xmli18n-tmp.h:977 +#: src/main/xmli18n-tmp.h:1029 msgid "Canon SELPHY-CP-500" msgstr "Canon SELPHY-CP-500" -#: src/main/xmli18n-tmp.h:978 +#: src/main/xmli18n-tmp.h:1030 msgid "Canon SELPHY-CP-510" msgstr "Canon SELPHY-CP-510" -#: src/main/xmli18n-tmp.h:979 +#: src/main/xmli18n-tmp.h:1031 msgid "Canon SELPHY-CP-600" msgstr "Canon SELPHY-CP-600" -#: src/main/xmli18n-tmp.h:980 +#: src/main/xmli18n-tmp.h:1032 msgid "Canon SELPHY-CP-710" msgstr "Canon SELPHY-CP-710" -#: src/main/xmli18n-tmp.h:981 +#: src/main/xmli18n-tmp.h:1033 #, fuzzy msgid "Canon SELPHY-CP-720" msgstr "Canon SELPHY-CP-710" -#: src/main/xmli18n-tmp.h:982 +#: src/main/xmli18n-tmp.h:1034 #, fuzzy msgid "Canon SELPHY-CP-730" msgstr "Canon SELPHY-CP-710" -#: src/main/xmli18n-tmp.h:983 +#: src/main/xmli18n-tmp.h:1035 #, fuzzy msgid "Canon SELPHY-CP-740" msgstr "Canon SELPHY-CP-400" -#: src/main/xmli18n-tmp.h:984 +#: src/main/xmli18n-tmp.h:1036 #, fuzzy msgid "Canon SELPHY-CP-750" msgstr "Canon SELPHY-CP-500" -#: src/main/xmli18n-tmp.h:985 +#: src/main/xmli18n-tmp.h:1037 #, fuzzy msgid "Canon SELPHY ES1" msgstr "Canon SELPHY-CP-510" -#: src/main/xmli18n-tmp.h:986 +#: src/main/xmli18n-tmp.h:1038 #, fuzzy msgid "Canon SELPHY ES2" msgstr "Canon SELPHY-CP-400" -#: src/main/xmli18n-tmp.h:987 +#: src/main/xmli18n-tmp.h:1039 #, fuzzy msgid "Canon SELPHY ES20" msgstr "Canon SELPHY-CP-400" -#: src/main/xmli18n-tmp.h:988 -#, fuzzy +#: src/main/xmli18n-tmp.h:1040 msgid "Sony DPP-EX5" -msgstr "Sony UP-DR150" +msgstr "Sony DPP-EX5" -#: src/main/xmli18n-tmp.h:989 +#: src/main/xmli18n-tmp.h:1041 msgid "Sony DPP-EX7" -msgstr "" +msgstr "Sony DPP-EX7" -#: src/main/xmli18n-tmp.h:990 +#: src/main/xmli18n-tmp.h:1042 msgid "Sony UP-DP10" msgstr "Sony UP-DP10" -#: src/main/xmli18n-tmp.h:991 -#, fuzzy +#: src/main/xmli18n-tmp.h:1043 msgid "Sony UP-DR100" -msgstr "Sony UP-DR150" +msgstr "Sony UP-DR100" -#: src/main/xmli18n-tmp.h:992 +#: src/main/xmli18n-tmp.h:1044 msgid "Sony UP-DR150" msgstr "Sony UP-DR150" -#: src/main/xmli18n-tmp.h:993 +#: src/main/xmli18n-tmp.h:1045 msgid "Fujifilm Printpix-CX-400" msgstr "Fujifilm Printpix-CX-400" -#: src/main/xmli18n-tmp.h:994 +#: src/main/xmli18n-tmp.h:1046 msgid "Fujifilm Printpix-CX-550" msgstr "Fujifilm Printpix-CX-550" -#: src/main/xmli18n-tmp.h:995 -#, fuzzy +#: src/main/xmli18n-tmp.h:1047 msgid "Fujifilm FinePix-NX-500" -msgstr "Fujifilm Printpix-CX-400" +msgstr "Fujifilm FinePix-NX-500" -#: src/main/xmli18n-tmp.h:996 +#: src/main/xmli18n-tmp.h:1048 msgid "Kodak Easyshare-Printer-Dock" -msgstr "" +msgstr "Kodak Easyshare-Printer-Dock" -#: src/main/xmli18n-tmp.h:997 +#: src/main/xmli18n-tmp.h:1049 msgid "Shinko CHC-S9045" msgstr "" -#: src/main/xmli18n-tmp.h:998 +#: src/main/xmli18n-tmp.h:1050 msgid "RAW DATA 16 bit" msgstr "RAW DATA 16 bit" -#: src/main/xmli18n-tmp.h:999 +#: src/main/xmli18n-tmp.h:1051 msgid "RAW DATA 8 bit" msgstr "RAW DATA 8 bit" -#: src/gutenprintui/panel.c:274 src/gutenprintui2/panel.c:274 +#: src/gutenprintui2/curve.c:130 +msgid "Curve type" +msgstr "Type kromme" + +#: src/gutenprintui2/curve.c:131 +msgid "Is this curve linear, spline interpolated, or free-form" +msgstr "Bij een lineaire kromme, spline geïnterpoleerd of vrije-vorm" + +#: src/gutenprintui2/curve.c:139 +msgid "Minimum X" +msgstr "Kleinste X" + +#: src/gutenprintui2/curve.c:140 +msgid "Minimum possible value for X" +msgstr "Kleinst mogelijke waarde voor X" + +#: src/gutenprintui2/curve.c:149 +msgid "Maximum X" +msgstr "Grootste X" + +#: src/gutenprintui2/curve.c:150 +msgid "Maximum possible X value" +msgstr "Grootst mogelijke waarde voor X" + +#: src/gutenprintui2/curve.c:159 +msgid "Minimum Y" +msgstr "Kleinste Y" + +#: src/gutenprintui2/curve.c:160 +msgid "Minimum possible value for Y" +msgstr "Kleinst mogelijke waarde van Y" + +#: src/gutenprintui2/curve.c:169 +msgid "Maximum Y" +msgstr "Grootste Y" + +#: src/gutenprintui2/curve.c:170 +msgid "Maximum possible value for Y" +msgstr "Grootst mogelijke waarde van Y" + +#: src/gutenprintui2/gammacurve.c:418 +msgid "_Gamma value" +msgstr "_Gamma-waarde" + +#: src/gutenprintui2/panel.c:275 msgid "Inch" msgstr "Inch" -#: src/gutenprintui/panel.c:274 src/gutenprintui2/panel.c:274 +#: src/gutenprintui2/panel.c:275 msgid "Set the base unit of measurement to inches" msgstr "Stel de basis-meeteenheid in op inches" -#: src/gutenprintui/panel.c:276 src/gutenprintui2/panel.c:276 +#: src/gutenprintui2/panel.c:277 msgid "cm" msgstr "cm" -#: src/gutenprintui/panel.c:276 src/gutenprintui2/panel.c:276 +#: src/gutenprintui2/panel.c:277 msgid "Set the base unit of measurement to centimetres" msgstr "Stel de basis-meeteenheid in op centimeter" -#: src/gutenprintui/panel.c:278 src/gutenprintui2/panel.c:278 +#: src/gutenprintui2/panel.c:279 msgid "Points" msgstr "Punten" -#: src/gutenprintui/panel.c:278 src/gutenprintui2/panel.c:278 +#: src/gutenprintui2/panel.c:279 msgid "Set the base unit of measurement to points (1/72\")" msgstr "Stel de basis-meeteenheid in op punten (1/72\")" -#: src/gutenprintui/panel.c:280 src/gutenprintui2/panel.c:280 +#: src/gutenprintui2/panel.c:281 msgid "mm" msgstr "mm" -#: src/gutenprintui/panel.c:280 src/gutenprintui2/panel.c:280 +#: src/gutenprintui2/panel.c:281 msgid "Set the base unit of measurement to millimetres" msgstr "Stel de basis-meeteenheid in op millimeter" -#: src/gutenprintui/panel.c:282 src/gutenprintui2/panel.c:282 +#: src/gutenprintui2/panel.c:283 msgid "Pica" msgstr "Pica" -#: src/gutenprintui/panel.c:282 src/gutenprintui2/panel.c:282 +#: src/gutenprintui2/panel.c:283 msgid "Set the base unit of measurement to picas (1/12\")" msgstr "Stel de basis-meeteenheid in op pica (1/12\")" -#: src/gutenprintui/panel.c:289 src/gutenprintui2/panel.c:289 +#: src/gutenprintui2/panel.c:290 msgid "Color output" msgstr "Kleuruitvoer" -#: src/gutenprintui/panel.c:291 src/gutenprintui2/panel.c:291 +#: src/gutenprintui2/panel.c:292 msgid "Print in shades of gray using black ink" msgstr "Print in grijstinten met zwarte inkt" -#: src/gutenprintui/panel.c:303 src/gutenprintui2/panel.c:303 +#: src/gutenprintui2/panel.c:304 msgid "Standard Command" msgstr "Standaard commando" -#: src/gutenprintui/panel.c:303 src/gutenprintui2/panel.c:303 +#: src/gutenprintui2/panel.c:304 msgid "Use standard print command" msgstr "Gebruik het standaard printcommando" -#: src/gutenprintui/panel.c:304 src/gutenprintui2/panel.c:304 +#: src/gutenprintui2/panel.c:305 msgid "Custom Command" msgstr "Fabrikaat specifiek commando" -#: src/gutenprintui/panel.c:304 src/gutenprintui2/panel.c:304 +#: src/gutenprintui2/panel.c:305 msgid "Use custom print command" msgstr "Gebruik het fabrikaat specifieke commando" -#: src/gutenprintui/panel.c:305 src/gutenprintui/plist.c:704 -#: src/gutenprintui/plist.c:787 src/gutenprintui2/panel.c:305 -#: src/gutenprintui2/plist.c:707 src/gutenprintui2/plist.c:790 +#: src/gutenprintui2/panel.c:306 src/gutenprintui2/plist.c:710 +#: src/gutenprintui2/plist.c:793 msgid "File" msgstr "Bestand" -#: src/gutenprintui/panel.c:305 src/gutenprintui2/panel.c:305 +#: src/gutenprintui2/panel.c:306 msgid "Print to a file" msgstr "Afdrukken naar een bestand" -#: src/gutenprintui/panel.c:521 src/gutenprintui2/panel.c:521 +#: src/gutenprintui2/panel.c:522 msgid "Edit Curve..." msgstr "Kromme aanpassen..." -#: src/gutenprintui/panel.c:532 src/gutenprintui2/panel.c:532 +#: src/gutenprintui2/panel.c:533 msgid "Set Default" msgstr "Stel standaard in" -#: src/gutenprintui/panel.c:534 src/gutenprintui2/panel.c:534 +#: src/gutenprintui2/panel.c:535 msgid "Restore Previous" msgstr "Herstel het vorige" -#: src/gutenprintui/panel.c:536 src/gutenprintui/panel.c:1532 -#: src/gutenprintui/panel.c:1787 src/gutenprintui/panel.c:1819 -#: src/gutenprintui2/panel.c:536 src/gutenprintui2/panel.c:1533 -#: src/gutenprintui2/panel.c:1787 src/gutenprintui2/panel.c:1819 +#: src/gutenprintui2/panel.c:537 src/gutenprintui2/panel.c:1708 +#: src/gutenprintui2/panel.c:1962 src/gutenprintui2/panel.c:1994 msgid "OK" msgstr "OK" -#: src/gutenprintui/panel.c:538 src/gutenprintui/panel.c:1197 -#: src/gutenprintui/panel.c:1534 src/gutenprintui/panel.c:1789 -#: src/gutenprintui2/panel.c:538 src/gutenprintui2/panel.c:1198 -#: src/gutenprintui2/panel.c:1535 src/gutenprintui2/panel.c:1789 +#: src/gutenprintui2/panel.c:539 src/gutenprintui2/panel.c:1373 +#: src/gutenprintui2/panel.c:1710 src/gutenprintui2/panel.c:1964 msgid "Cancel" msgstr "Annuleren" -#: src/gutenprintui/panel.c:1180 src/gutenprintui2/panel.c:1181 +#: src/gutenprintui2/panel.c:641 +#, fuzzy +msgid "Select File..." +msgstr "Instellen Printer..." + +#: src/gutenprintui2/panel.c:1018 +#, fuzzy +msgid "Reset" +msgstr "Het best" + +#: src/gutenprintui2/panel.c:1356 #, c-format msgid "%s -- Print v%s" msgstr "%s -- Print v%s" -#: src/gutenprintui/panel.c:1189 src/gutenprintui2/panel.c:1190 +#: src/gutenprintui2/panel.c:1365 msgid "About" msgstr "Info" -#: src/gutenprintui/panel.c:1191 src/gutenprintui2/panel.c:1192 +#: src/gutenprintui2/panel.c:1367 msgid "" "Print and\n" "Save Settings" @@ -6326,7 +6738,7 @@ msgstr "" "Afdrukken en\n" "instellingen opslaan" -#: src/gutenprintui/panel.c:1193 src/gutenprintui2/panel.c:1194 +#: src/gutenprintui2/panel.c:1369 msgid "" "Save\n" "Settings" @@ -6334,15 +6746,15 @@ msgstr "" "Instellingen\n" "opslaan" -#: src/gutenprintui/panel.c:1195 src/gutenprintui2/panel.c:1196 +#: src/gutenprintui2/panel.c:1371 msgid "Print" msgstr "Afdrukken" -#: src/gutenprintui/panel.c:1247 src/gutenprintui2/panel.c:1248 +#: src/gutenprintui2/panel.c:1423 msgid "Preview" msgstr "Voorbeeld" -#: src/gutenprintui/panel.c:1272 src/gutenprintui2/panel.c:1273 +#: src/gutenprintui2/panel.c:1448 msgid "" "Position the image on the page.\n" "Click and drag with the primary button to position the image.\n" @@ -6362,78 +6774,76 @@ msgstr "" "(1/72\")\n" "Klik en sleep met de derde (middelste) knop om de afbeelding in eenheden van " "zijn grootte te verplaatsen.\n" -"Bij het ingedrukt houden van de shift-toets tijdens klikken en slepen " -"beperkt de beweging tot horizontaal of vertikaal.\n" +"Bij het ingedrukt houden van de Shift-toets tijdens klikken en slepen " +"beperkt de beweging tot horizontaal of verticaal.\n" "Als u op een andere knop klikt bij het slepen, dan keert de afbeelding terug " "naar zijn oorspronkelijke plaats." -#: src/gutenprintui/panel.c:1319 src/gutenprintui2/panel.c:1320 +#: src/gutenprintui2/panel.c:1495 msgid "Paper Size" msgstr "Papierafmetingen" -#: src/gutenprintui/panel.c:1342 src/gutenprintui2/panel.c:1343 +#: src/gutenprintui2/panel.c:1518 msgid "Show All Paper Sizes" msgstr "Toon alle papierafmetingen" -#: src/gutenprintui/panel.c:1358 src/gutenprintui2/panel.c:1359 +#: src/gutenprintui2/panel.c:1534 msgid "Dimensions:" -msgstr "Afmetingen:" +msgstr "Afmetingen" -#: src/gutenprintui/panel.c:1363 src/gutenprintui/panel.c:2063 -#: src/gutenprintui2/panel.c:1364 src/gutenprintui2/panel.c:2063 +#: src/gutenprintui2/panel.c:1539 src/gutenprintui2/panel.c:2238 msgid "Width:" -msgstr "Breedte:" +msgstr "Breedte: " -#: src/gutenprintui/panel.c:1364 src/gutenprintui2/panel.c:1365 +#: src/gutenprintui2/panel.c:1540 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:1368 src/gutenprintui/panel.c:2065 -#: src/gutenprintui2/panel.c:1369 src/gutenprintui2/panel.c:2065 +#: src/gutenprintui2/panel.c:1544 src/gutenprintui2/panel.c:2240 msgid "Height:" -msgstr "Hoogte:" +msgstr "Hoogte: " -#: src/gutenprintui/panel.c:1369 src/gutenprintui2/panel.c:1370 +#: src/gutenprintui2/panel.c:1545 msgid "Height of the paper that you wish to print to" msgstr "Hoogte van het papier waarop je wenst te printen" -#: src/gutenprintui/panel.c:1374 src/gutenprintui2/panel.c:1375 +#: src/gutenprintui2/panel.c:1550 msgid "Automatic Paper Size" msgstr "Automatische papierafmetingen" -#: src/gutenprintui/panel.c:1391 src/gutenprintui2/panel.c:1392 +#: src/gutenprintui2/panel.c:1567 msgid "Number of Copies" msgstr "Aantal kopieën" -#: src/gutenprintui/panel.c:1403 src/gutenprintui2/panel.c:1404 +#: src/gutenprintui2/panel.c:1579 msgid "Select the number of copies to print; a value between 1 and 100" msgstr "Kies het aantal af te drukken kopieën; een waarde tussen 1 en 100" -#: src/gutenprintui/panel.c:1435 src/gutenprintui2/panel.c:1436 +#: src/gutenprintui2/panel.c:1611 msgid "Image Position" msgstr "Positie van afbeelding" -#: src/gutenprintui/panel.c:1452 src/gutenprintui2/panel.c:1453 +#: src/gutenprintui2/panel.c:1628 msgid "Auto" msgstr "Automatisch" -#: src/gutenprintui/panel.c:1454 src/gutenprintui2/panel.c:1455 +#: src/gutenprintui2/panel.c:1630 msgid "Portrait" msgstr "Portret" -#: src/gutenprintui/panel.c:1456 src/gutenprintui2/panel.c:1457 +#: src/gutenprintui2/panel.c:1632 msgid "Landscape" msgstr "Landschap" -#: src/gutenprintui/panel.c:1458 src/gutenprintui2/panel.c:1459 +#: src/gutenprintui2/panel.c:1634 msgid "Upside down" msgstr "Ondersteboven" -#: src/gutenprintui/panel.c:1460 src/gutenprintui2/panel.c:1461 +#: src/gutenprintui2/panel.c:1636 msgid "Seascape" msgstr "Seascape" -#: src/gutenprintui/panel.c:1464 src/gutenprintui2/panel.c:1465 +#: src/gutenprintui2/panel.c:1640 msgid "" "Select the orientation: portrait, landscape, upside down, or seascape " "(upside down landscape)" @@ -6441,122 +6851,118 @@ msgstr "" "Kies de orientatie: portret, landschap, ondersteboven of seascape " "(ondersteboven landschap)" -#: src/gutenprintui/panel.c:1466 src/gutenprintui2/panel.c:1467 +#: src/gutenprintui2/panel.c:1642 msgid "Orientation:" msgstr "Oriëntatie:" -#: src/gutenprintui/panel.c:1477 src/gutenprintui2/panel.c:1478 +#: src/gutenprintui2/panel.c:1653 msgid "Left:" msgstr "Links:" -#: src/gutenprintui/panel.c:1478 src/gutenprintui2/panel.c:1479 +#: src/gutenprintui2/panel.c:1654 msgid "Distance from the left of the paper to the image" msgstr "Afstand vanaf de linkerkant van het papier tot de afdruk" -#: src/gutenprintui/panel.c:1481 src/gutenprintui/panel.c:1485 -#: src/gutenprintui2/panel.c:1482 src/gutenprintui2/panel.c:1486 +#: src/gutenprintui2/panel.c:1657 src/gutenprintui2/panel.c:1661 msgid "Right:" msgstr "Rechts:" -#: src/gutenprintui/panel.c:1482 src/gutenprintui2/panel.c:1483 +#: src/gutenprintui2/panel.c:1658 msgid "Distance from the left of the paper to the right of the image" msgstr "" "Afstand vanaf de linkerkant van het papier tot de rechterkant van de afdruk" -#: src/gutenprintui/panel.c:1486 src/gutenprintui2/panel.c:1487 +#: src/gutenprintui2/panel.c:1662 msgid "Distance from the right of the paper to the image" msgstr "Afstand vanaf de rechterkant van het papier tot de afdruk" -#: src/gutenprintui/panel.c:1488 src/gutenprintui2/panel.c:1489 +#: src/gutenprintui2/panel.c:1664 msgid "Top:" msgstr "Boven:" -#: src/gutenprintui/panel.c:1489 src/gutenprintui2/panel.c:1490 +#: src/gutenprintui2/panel.c:1665 msgid "Distance from the top of the paper to the image" msgstr "Afstand vanaf de bovenkant van het papier tot de afdruk" -#: src/gutenprintui/panel.c:1492 src/gutenprintui/panel.c:1496 -#: src/gutenprintui2/panel.c:1493 src/gutenprintui2/panel.c:1497 +#: src/gutenprintui2/panel.c:1668 src/gutenprintui2/panel.c:1672 msgid "Bottom:" msgstr "Onder:" -#: src/gutenprintui/panel.c:1493 src/gutenprintui2/panel.c:1494 +#: src/gutenprintui2/panel.c:1669 msgid "Distance from the top of the paper to bottom of the image" msgstr "" "Afstand vanaf de bovenkant van het papier tot de onderkant van de afbeelding" -#: src/gutenprintui/panel.c:1497 src/gutenprintui2/panel.c:1498 +#: src/gutenprintui2/panel.c:1673 msgid "Distance from the bottom of the paper to the image" msgstr "Afstand vanaf de onderkant van het papier tot de afdruk" -#: src/gutenprintui/panel.c:1507 src/gutenprintui2/panel.c:1508 +#: src/gutenprintui2/panel.c:1683 msgid "Center:" msgstr "Midden X:" -#: src/gutenprintui/panel.c:1510 src/gutenprintui2/panel.c:1511 +#: src/gutenprintui2/panel.c:1686 msgid "Horizontal" msgstr "Horzontaal" -#: src/gutenprintui/panel.c:1511 src/gutenprintui2/panel.c:1512 +#: src/gutenprintui2/panel.c:1687 msgid "Center the image horizontally on the paper" msgstr "Centreer het plaatje horizontaal op het papier" -#: src/gutenprintui/panel.c:1513 src/gutenprintui2/panel.c:1514 +#: src/gutenprintui2/panel.c:1689 msgid "Both" msgstr "Beide" -#: src/gutenprintui/panel.c:1514 src/gutenprintui2/panel.c:1515 +#: src/gutenprintui2/panel.c:1690 msgid "Center the image on the paper" msgstr "Centreer het plaatje op het papier" -#: src/gutenprintui/panel.c:1516 src/gutenprintui2/panel.c:1517 +#: src/gutenprintui2/panel.c:1692 msgid "Vertical" msgstr "Verticaal" -#: src/gutenprintui/panel.c:1517 src/gutenprintui2/panel.c:1518 +#: src/gutenprintui2/panel.c:1693 msgid "Center the image vertically on the paper" msgstr "Centreer het plaatje verticaal op het papier" -#: src/gutenprintui/panel.c:1530 src/gutenprintui2/panel.c:1531 +#: src/gutenprintui2/panel.c:1706 msgid "Setup Printer" msgstr "Stel Printer in" -#: src/gutenprintui/panel.c:1555 src/gutenprintui2/panel.c:1555 +#: src/gutenprintui2/panel.c:1730 msgid "Printer Make:" msgstr "Printermerk:" -#: src/gutenprintui/panel.c:1566 src/gutenprintui2/panel.c:1566 +#: src/gutenprintui2/panel.c:1741 msgid "Select the make of your printer" msgstr "Selecteer het merk van uw printer" -#: src/gutenprintui/panel.c:1584 src/gutenprintui/panel.c:1672 -#: src/gutenprintui/panel.c:1890 src/gutenprintui2/panel.c:1584 -#: src/gutenprintui2/panel.c:1672 src/gutenprintui2/panel.c:1890 +#: src/gutenprintui2/panel.c:1759 src/gutenprintui2/panel.c:1847 +#: src/gutenprintui2/panel.c:2065 msgid "Printer Model:" msgstr "Printer model:" -#: src/gutenprintui/panel.c:1595 src/gutenprintui2/panel.c:1595 +#: src/gutenprintui2/panel.c:1770 msgid "Select your printer model" msgstr "Selecteer jouw printer model" -#: src/gutenprintui/panel.c:1643 src/gutenprintui2/panel.c:1643 +#: src/gutenprintui2/panel.c:1818 msgid "PPD File:" msgstr "PPD Bestand:" -#: src/gutenprintui/panel.c:1659 src/gutenprintui2/panel.c:1659 +#: src/gutenprintui2/panel.c:1834 msgid "Enter the correct PPD filename for your printer" msgstr "Geef de juiste PPD bestandsnaam voor jouw printer" -#: src/gutenprintui/panel.c:1661 src/gutenprintui/panel.c:1741 -#: src/gutenprintui2/panel.c:1661 src/gutenprintui2/panel.c:1741 +#: src/gutenprintui2/panel.c:1836 src/gutenprintui2/panel.c:1916 msgid "Browse" msgstr "Bladeren" -#: src/gutenprintui/panel.c:1668 src/gutenprintui2/panel.c:1668 +#: src/gutenprintui2/panel.c:1843 msgid "Choose the correct PPD filename for your printer" msgstr "Kies de juiste PPD bestandsnaam voor jouw printer" -#: src/gutenprintui/panel.c:1710 src/gutenprintui2/panel.c:1710 +#: src/gutenprintui2/panel.c:1885 msgid "" "Select the name of the output queue (not the type, or model, of printer) " "that you wish to print to" @@ -6564,52 +6970,51 @@ msgstr "" "Selecteer de naam van de uitvoerrij (niet het type, of model, of printer) " "die u wilt uitprinten" -#: src/gutenprintui/panel.c:1712 src/gutenprintui2/panel.c:1712 +#: src/gutenprintui2/panel.c:1887 msgid "Printer Queue:" msgstr "Printerrij:" -#: src/gutenprintui/panel.c:1728 src/gutenprintui2/panel.c:1728 +#: src/gutenprintui2/panel.c:1903 msgid "Enter the correct command to print to your printer. " msgstr "Geef het juiste commando om naar uw printer te printen. " -#: src/gutenprintui/panel.c:1739 src/gutenprintui2/panel.c:1739 +#: src/gutenprintui2/panel.c:1914 msgid "Enter the file to print to. " msgstr "Voer de bestandsnaam in waarnaar geprint moet worden. " -#: src/gutenprintui/panel.c:1747 src/gutenprintui2/panel.c:1747 +#: src/gutenprintui2/panel.c:1922 msgid "File to print to" msgstr "Bestand waar print naar toe moet" -#: src/gutenprintui/panel.c:1755 src/gutenprintui2/panel.c:1755 +#: src/gutenprintui2/panel.c:1930 msgid "Print To File" msgstr "Afdrukken naar bestand" -#: src/gutenprintui/panel.c:1785 src/gutenprintui2/panel.c:1785 +#: src/gutenprintui2/panel.c:1960 msgid "Define New Printer" msgstr "Stel nieuwe printer in" -#: src/gutenprintui/panel.c:1803 src/gutenprintui/panel.c:1887 -#: src/gutenprintui2/panel.c:1803 src/gutenprintui2/panel.c:1887 +#: src/gutenprintui2/panel.c:1978 src/gutenprintui2/panel.c:2062 msgid "Printer Name:" msgstr "Printernaam:" -#: src/gutenprintui/panel.c:1807 src/gutenprintui2/panel.c:1807 +#: src/gutenprintui2/panel.c:1982 msgid "Enter the name you wish to give this logical printer" msgstr "Voer de naam in van de logische printer" -#: src/gutenprintui/panel.c:1817 src/gutenprintui2/panel.c:1817 +#: src/gutenprintui2/panel.c:1992 msgid "About Gutenprint " msgstr "Info over Gutenprint " -#: src/gutenprintui/panel.c:1824 src/gutenprintui2/panel.c:1824 +#: src/gutenprintui2/panel.c:1999 msgid "Gutenprint Version " msgstr "Gutenprint versie" -#: src/gutenprintui/panel.c:1872 src/gutenprintui2/panel.c:1872 +#: src/gutenprintui2/panel.c:2047 msgid "Printer Settings" msgstr "Printerinstellingen" -#: src/gutenprintui/panel.c:1885 src/gutenprintui2/panel.c:1885 +#: src/gutenprintui2/panel.c:2060 msgid "" "Select the name of the printer (not the type, or model, of printer) that you " "wish to print to" @@ -6617,11 +7022,11 @@ msgstr "" "Selecteer de naam van de printer (Niet het type, of model, of printer) " "waarna je wenst te printen" -#: src/gutenprintui/panel.c:1902 src/gutenprintui2/panel.c:1902 +#: src/gutenprintui2/panel.c:2077 msgid "Setup Printer..." msgstr "Instellen Printer..." -#: src/gutenprintui/panel.c:1904 src/gutenprintui2/panel.c:1904 +#: src/gutenprintui2/panel.c:2079 msgid "" "Choose the printer model, PPD file, and command that is used to print to " "this printer" @@ -6629,11 +7034,11 @@ msgstr "" "Kies het printermodel, PPD bestand, en commando die gebruikt wordt om naar " "deze printer af te drukken." -#: src/gutenprintui/panel.c:1917 src/gutenprintui2/panel.c:1917 +#: src/gutenprintui2/panel.c:2092 msgid "New Printer..." msgstr "Nieuwe Printer..." -#: src/gutenprintui/panel.c:1918 src/gutenprintui2/panel.c:1918 +#: src/gutenprintui2/panel.c:2093 msgid "" "Define a new logical printer. This can be used to name a collection of " "settings that you wish to remember for future use." @@ -6641,32 +7046,32 @@ msgstr "" "Definieer een logische printer. Deze kan gebruikt worden om een verzameling " "van instellingen die u bewaren wilt voor toekomstig gebruik." -#: src/gutenprintui/panel.c:1948 src/gutenprintui2/panel.c:1948 +#: src/gutenprintui2/panel.c:2123 #, fuzzy msgid "Set Printer Option Defaults" msgstr "Stel standaardwaarden in" -#: src/gutenprintui/panel.c:1949 src/gutenprintui2/panel.c:1949 +#: src/gutenprintui2/panel.c:2124 msgid "Set all printer options to their defaults" msgstr "" -#: src/gutenprintui/panel.c:1972 src/gutenprintui2/panel.c:1972 +#: src/gutenprintui2/panel.c:2147 msgid "Image Size" msgstr "Afbeeldingsgrootte" -#: src/gutenprintui/panel.c:1997 src/gutenprintui2/panel.c:1997 +#: src/gutenprintui2/panel.c:2172 msgid "Scaling:" msgstr "Schaal:" -#: src/gutenprintui/panel.c:2001 src/gutenprintui2/panel.c:2001 +#: src/gutenprintui2/panel.c:2176 msgid "Set the scale (size) of the image" msgstr "Stel de schaal (afmeting) in van het plaatje" -#: src/gutenprintui/panel.c:2023 src/gutenprintui2/panel.c:2023 +#: src/gutenprintui2/panel.c:2198 msgid "Scale by:" msgstr "Schalen met:" -#: src/gutenprintui/panel.c:2028 src/gutenprintui2/panel.c:2028 +#: src/gutenprintui2/panel.c:2203 msgid "" "Select whether scaling is measured as percent of available page size or " "number of output dots per inch" @@ -6674,31 +7079,31 @@ msgstr "" "Moet schaling gemeten worden in het percentage van de beschikbare " "paginagrootte of het aantal punten per inch" -#: src/gutenprintui/panel.c:2031 src/gutenprintui2/panel.c:2031 +#: src/gutenprintui2/panel.c:2206 msgid "Percent" msgstr "Procent" -#: src/gutenprintui/panel.c:2036 src/gutenprintui2/panel.c:2036 +#: src/gutenprintui2/panel.c:2211 msgid "Scale the print to the size of the page" msgstr "Schaal de afdruk tot de afmeting van de pagina" -#: src/gutenprintui/panel.c:2040 src/gutenprintui2/panel.c:2040 +#: src/gutenprintui2/panel.c:2215 msgid "PPI" msgstr "PPI" -#: src/gutenprintui/panel.c:2045 src/gutenprintui2/panel.c:2045 +#: src/gutenprintui2/panel.c:2220 msgid "Scale the print to the number of dots per inch" msgstr "Schaal de afdruk tot het aantal punten per inch" -#: src/gutenprintui/panel.c:2063 src/gutenprintui2/panel.c:2063 +#: src/gutenprintui2/panel.c:2238 msgid "Set the width of the print" msgstr "Geef de breedte van de afdruk" -#: src/gutenprintui/panel.c:2065 src/gutenprintui2/panel.c:2065 +#: src/gutenprintui2/panel.c:2240 msgid "Set the height of the print" msgstr "Geef de hoogte van de afdruk" -#: src/gutenprintui/panel.c:2071 src/gutenprintui2/panel.c:2071 +#: src/gutenprintui2/panel.c:2246 msgid "" "Use Original\n" "Image Size" @@ -6706,149 +7111,104 @@ msgstr "" "Gebruik de originele\n" "grootte van de afbeelding" -#: src/gutenprintui/panel.c:2077 src/gutenprintui2/panel.c:2077 +#: src/gutenprintui2/panel.c:2252 msgid "Set the print size to the size of the image" msgstr "Stel de afdrukgrootte gelijk aan de grootte van de afbeelding" -#: src/gutenprintui/panel.c:2100 src/gutenprintui2/panel.c:2101 +#: src/gutenprintui2/panel.c:2276 msgid "Print Color Adjust" msgstr "Aanpassing van afdrukkleur" -#: src/gutenprintui/panel.c:2103 src/gutenprintui2/panel.c:2104 +#: src/gutenprintui2/panel.c:2279 msgid "Set Defaults" msgstr "Stel standaardwaarden in" -#: src/gutenprintui/panel.c:2105 src/gutenprintui2/panel.c:2106 +#: src/gutenprintui2/panel.c:2281 msgid "Close" msgstr "Sluiten" -#: src/gutenprintui/panel.c:2134 src/gutenprintui2/panel.c:2135 +#: src/gutenprintui2/panel.c:2310 msgid "Image preview" msgstr "Afdruk voorvertoning" -#: src/gutenprintui/panel.c:2148 src/gutenprintui2/panel.c:2149 +#: src/gutenprintui2/panel.c:2324 msgid "View Output Channels:" msgstr "Toon uitvoerkanalen:" -#: src/gutenprintui/panel.c:2234 src/gutenprintui2/panel.c:2240 +#: src/gutenprintui2/panel.c:2415 msgid "Output" msgstr "Uitvoer" -#: src/gutenprintui/panel.c:2262 src/gutenprintui2/panel.c:2268 +#: src/gutenprintui2/panel.c:2443 msgid "Output Type:" msgstr "Type uitvoer:" -#: src/gutenprintui/panel.c:2266 src/gutenprintui2/panel.c:2272 +#: src/gutenprintui2/panel.c:2447 msgid "Select the desired output type" msgstr "Kies het gewenste type uitvoer" -#: src/gutenprintui/panel.c:2287 src/gutenprintui2/panel.c:2293 +#: src/gutenprintui2/panel.c:2468 msgid "Adjust Output..." msgstr "Past uitvoer aan..." -#: src/gutenprintui/panel.c:2296 src/gutenprintui2/panel.c:2302 +#: src/gutenprintui2/panel.c:2477 msgid "" "Adjust color balance, brightness, contrast, saturation, and dither algorithm" msgstr "" "Pas de kleurbalans, helderheid, contrast, verzadiging en ruis-algoritme aan" -#: src/gutenprintui/panel.c:2314 src/gutenprintui2/panel.c:2321 +#: src/gutenprintui2/panel.c:2496 msgid "Size Units:" msgstr "Afmeting eenheden:" -#: src/gutenprintui/panel.c:2317 src/gutenprintui2/panel.c:2324 +#: src/gutenprintui2/panel.c:2499 msgid " " msgstr " " -#: src/gutenprintui/panel.c:2341 src/gutenprintui2/panel.c:2348 +#: src/gutenprintui2/panel.c:2523 msgid "Units:" msgstr "Eenheden:" -#: src/gutenprintui/panel.c:2346 src/gutenprintui2/panel.c:2353 +#: src/gutenprintui2/panel.c:2528 msgid "Select the base unit of measurement for printing" msgstr "Kies de basiseenheid van afmeting voor het afdrukken" -#: src/gutenprintui/plist.c:90 src/gutenprintui/plist.c:99 -#: src/gutenprintui2/plist.c:89 src/gutenprintui2/plist.c:98 +#: src/gutenprintui2/plist.c:92 src/gutenprintui2/plist.c:101 msgid "System V lp" msgstr "System V lp" -#: src/gutenprintui/plist.c:96 src/gutenprintui2/plist.c:95 +#: src/gutenprintui2/plist.c:98 msgid "CUPS" msgstr "CUPS" -#: src/gutenprintui/plist.c:102 src/gutenprintui2/plist.c:101 +#: src/gutenprintui2/plist.c:104 msgid "Berkeley lpd (/etc/lpc)" msgstr "Berkeley lpd (/etc/lpc)" -#: src/gutenprintui/plist.c:105 src/gutenprintui2/plist.c:104 +#: src/gutenprintui2/plist.c:107 msgid "Berkeley lpd (/usr/bsd/lpc)" msgstr "Berkeley lpd (/usr/bsd/lpc)" -#: src/gutenprintui/plist.c:108 src/gutenprintui2/plist.c:107 +#: src/gutenprintui2/plist.c:110 msgid "Berkeley lpd (/usr/etc/lpc" msgstr "Berkeley lpd (/usr/etc/lpc" -#: src/gutenprintui/plist.c:111 src/gutenprintui2/plist.c:110 +#: src/gutenprintui2/plist.c:113 msgid "Berkeley lpd (/usr/libexec/lpc)" msgstr "Berkeley lpd (/usr/libexec/lpc)" -#: src/gutenprintui/plist.c:114 src/gutenprintui2/plist.c:113 +#: src/gutenprintui2/plist.c:116 msgid "Berkeley lpd (/usr/sbin/lpc)" msgstr "Berkeley lpd (/usr/sbin/lpc)" -#: src/gutenprintui/plist.c:1043 src/gutenprintui2/plist.c:1057 +#: src/gutenprintui2/plist.c:1060 msgid "Printer" msgstr "Printer" -#: src/gutenprintui/plist.c:1230 src/gutenprintui2/plist.c:1250 +#: src/gutenprintui2/plist.c:1253 msgid "(Default Printer)" msgstr "(Standaard printer)" -#: src/gutenprintui2/curve.c:130 -msgid "Curve type" -msgstr "Type kromme" - -#: src/gutenprintui2/curve.c:131 -msgid "Is this curve linear, spline interpolated, or free-form" -msgstr "Bij een lineaire kromme, spline geïnterpoleerd of vrije-vorm" - -#: src/gutenprintui2/curve.c:139 -msgid "Minimum X" -msgstr "Kleinste X" - -#: src/gutenprintui2/curve.c:140 -msgid "Minimum possible value for X" -msgstr "Kleinst mogelijke waarde voor X" - -#: src/gutenprintui2/curve.c:149 -msgid "Maximum X" -msgstr "Grootste X" - -#: src/gutenprintui2/curve.c:150 -msgid "Maximum possible X value" -msgstr "Grootst mogelijke waarde voor X" - -#: src/gutenprintui2/curve.c:159 -msgid "Minimum Y" -msgstr "Kleinste Y" - -#: src/gutenprintui2/curve.c:160 -msgid "Minimum possible value for Y" -msgstr "Kleinst mogelijke waarde van Y" - -#: src/gutenprintui2/curve.c:169 -msgid "Maximum Y" -msgstr "Grootste Y" - -#: src/gutenprintui2/curve.c:170 -msgid "Maximum possible value for Y" -msgstr "Grootst mogelijke waarde van Y" - -#: src/gutenprintui2/gammacurve.c:418 -msgid "_Gamma value" -msgstr "_Gamma-waarde" - #: src/cups/genppd.c:145 msgid "Printer Features" msgstr "Printermogelijkheden" @@ -6884,50 +7244,48 @@ msgstr "Extra 5" #. 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:1058 +#: src/cups/genppd.c:1064 msgid "English" -msgstr "Dutch" +msgstr "Engels" #. TRANSLATORS: Specify PPD translation encoding e.g. ISOLatin1 -#: src/cups/genppd.c:1060 +#: src/cups/genppd.c:1066 msgid "ISOLatin1" msgstr "ISOLatin1" -#: src/cups/genppd.c:1641 -#, fuzzy +#: src/cups/genppd.c:1647 msgid "2-Sided Printing" msgstr "Dubbelzijdig printen" -#: src/cups/genppd.c:1665 +#: src/cups/genppd.c:1671 msgid "Shrink Page If Necessary to Fit Borders" -msgstr "" +msgstr "Verklein de pagina als dat nodig is om op de pagina te blijven" -#: src/cups/genppd.c:1669 +#: src/cups/genppd.c:1675 msgid "Shrink (print the whole page)" -msgstr "" +msgstr "Verkleinen (de gehele pagina afdrukken)" -#: src/cups/genppd.c:1670 +#: src/cups/genppd.c:1676 msgid "Crop (preserve dimensions)" -msgstr "" +msgstr "Afsnijden (behoud de afmetingen)" -#: src/cups/genppd.c:1671 +#: src/cups/genppd.c:1677 msgid "Expand (use maximum page area)" -msgstr "" +msgstr "Vergroot (gebruik de gehele pagina)" -#: src/cups/genppd.c:1756 +#: src/cups/genppd.c:1762 msgid "No" msgstr "Nee" -#: src/cups/genppd.c:1758 +#: src/cups/genppd.c:1764 msgid "Yes" msgstr "Ja" -#: src/cups/genppd.c:1795 src/cups/genppd.c:1857 -#, fuzzy +#: src/cups/genppd.c:1801 src/cups/genppd.c:1863 msgid "Value" -msgstr "Blauw" +msgstr "Waarde" -#: src/cups/genppd.c:1800 +#: src/cups/genppd.c:1806 msgid "Fine Adjustment" msgstr "Fijnafstelling" @@ -7207,7 +7565,7 @@ msgstr "Kan de opdracht niet versturen naar de printer\n" #: src/escputil/escputil.c:572 #, c-format msgid "Read from printer timed out\n" -msgstr "Lezen van de duurt te lang\n" +msgstr "Lezen van de printer duurt te lang\n" #: src/escputil/escputil.c:577 #, c-format @@ -7217,7 +7575,7 @@ msgstr "Kan niet lezen van %s: %s\n" #: src/escputil/escputil.c:729 #, c-format msgid "Please specify a raw device\n" -msgstr "" +msgstr "Specificeer een raw-apparaat\n" #: src/escputil/escputil.c:736 #, c-format @@ -7834,357 +8192,95 @@ msgstr "" msgid "Error in input\n" msgstr "Fout in de invoer\n" -#: src/gimp/print-image-gimp.c:225 src/gimp2/print-image-gimp.c:225 +#: src/gimp2/print-image-gimp.c:225 msgid "Printing..." msgstr "Bezig met afdrukken..." -#: src/gimp/print.c:133 -msgid "/File/Print..." -msgstr "/File/Print..." - -#: src/ghost/ijsgutenprint.c:98 -#, c-format -msgid "" -"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" -msgstr "" -"ijsgutenprint: de versie van de geïstalleerde Gutenprint-software (%s)\n" -" klopt niet met hetPPD-bestand (%s). Als u uw versie van Gutenprint\n" -" recent up-to-date hebt gebracht dan moet u alle printerqueues opnieuw\n" -" installeren.\n" -" Kijk in de documentatie van uw leverancier of het commando voor het\n" -" ``foomatic-ppdbestand'' voor nadere instructies.\n" -"FOUT: ijsgutenprint: de versie van de geïnstalleerde Gutenprint software (%" -"s) klopt niet met het PPD bestand (%s).\n" - -#: src/ghost/ijsgutenprint.c:191 -#, c-format -msgid "ERROR: ijsgutenprint: Bad color space: bps %d channels %d space %s\n" -msgstr "" -"FOUT: ijsgutenprint: Verkeerde kleurruimte: bps %d kanalen %d ruimte %s\n" - -#: src/ghost/ijsgutenprint.c:199 -#, c-format -msgid "ERROR: ijsgutenprint: No row buffer\n" -msgstr "FOUT: ijsgutenprint: No rijbuffer\n" - -#: 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 "" -"FOUT: ijsgutenprint: Kan parameter %s=%s niet onleden (verwacht een nummer)\n" - -#: src/ghost/ijsgutenprint.c:498 -#, c-format -msgid "ERROR: ijsgutenprint: Printer must be specified with -sDeviceModel\n" -msgstr "FOUT: ijsgutenprint: Printer moet gespecificeerd worden met -sMODEL\n" - -#: src/ghost/ijsgutenprint.c:500 -#, c-format -msgid "ERROR: ijsgutenprint: Printer %s is not a known model\n" -msgstr "FOUT: ijsgutenprint: Printer %s is geen bekend model\n" - -#: src/ghost/ijsgutenprint.c:656 -#, c-format -msgid "ijsgutenprint: unknown DeviceModel %s\n" -msgstr "ijsgutenprint: onbekend MODEL %s\n" - -#: src/ghost/ijsgutenprint.c:700 -#, c-format -msgid "ERROR: ijsgutenprint: cannot parse TopLeft %s\n" -msgstr "FOUT: ijsgutenprint: kan Linksboven %s niet ontleden\n" - -#: src/ghost/ijsgutenprint.c:723 -#, c-format -msgid "ERROR: ijsgutenprint: cannot parse PaperSize %s\n" -msgstr "FOUT: ijsgutenprint: kan Papierafmetingen %s niet ontleden\n" - -#: src/ghost/ijsgutenprint.c:795 -#, c-format -msgid "ERROR: ijsgutenprint: cannot parse curve %s\n" -msgstr "FOUT: ijsgutenprint: kan Kromme %s niet ontleden\n" - -#: src/ghost/ijsgutenprint.c:802 -#, c-format -msgid "ERROR: ijsgutenprint: cannot parse %s float %s\n" -msgstr "" -"FOUT: ijsgutenprint: kan %s met drijvendekomma-getal %s niet ontleden\n" - -#: src/ghost/ijsgutenprint.c:809 -#, c-format -msgid "ERROR: ijsgutenprint: cannot parse %s int %s\n" -msgstr "FOUT: ijsgutenprint: kan %s geheel getal %s niet ontleden\n" - -#: src/ghost/ijsgutenprint.c:816 -#, c-format -msgid "ERROR: ijsgutenprint: cannot parse %s dimension %s\n" -msgstr "FOUT: ijsgutenprint: kan %s dimensie %s niet ontleden\n" - -#: src/ghost/ijsgutenprint.c:830 -#, c-format -msgid "ERROR: ijsgutenprint: cannot parse %s boolean %s\n" -msgstr "FOUT: ijsgutenprint: kan %s met logische waarde %s niet ontleden\n" - -#: src/ghost/ijsgutenprint.c:841 -#, c-format -msgid "ERROR: ijsgutenprint: Bad parameter %s %d\n" -msgstr "FOUT: ijsgutenprint: Onjuiste parameter %s %d\n" - -#: src/ghost/ijsgutenprint.c:867 -#, c-format -msgid "ERROR: ijsgutenprint: bad key code %d\n" -msgstr "FOUT: ijsgutenprint: onjuiste sleutelcode %d\n" - -#: src/ghost/ijsgutenprint.c:1308 -#, c-format -msgid "ERROR: ijsgutenprint: image_init failed %d\n" -msgstr "FOUT: ijsgutenprint: image_init mislukte %d\n" - -#: src/ghost/ijsgutenprint.c:1319 -#, c-format -msgid "ERROR: ijsgutenprint: Unable to open file descriptor: %s\n" -msgstr "" -"FOUT: ijsgutenprint: Het lukt niet om bestandsdescripter: %s te openen\n" - -#: src/ghost/ijsgutenprint.c:1331 -#, c-format -msgid "ERROR: ijsgutenprint: Unable to open %s: %s\n" -msgstr "FOUT: ijsgutenprint: Lukt niet om %s: %s te openen\n" - -#: src/ghost/ijsgutenprint.c:1344 -#, c-format -msgid "ERROR: ijsgutenprint: Unknown printer %s\n" -msgstr "FOUT: ijsgutenprint: Onbekende printer %s\n" - -#: src/ghost/ijsgutenprint.c:1516 -#, c-format -msgid "ERROR: ijsgutenprint: Bad parameters; cannot continue!\n" -msgstr "FOUT: ijsgutenprint: Foute parameters; kan niet doorgaan!\n" - -#: src/ghost/ijsgutenprint.c:1534 -#, c-format -msgid "ERROR: ijsgutenprint: Get next row failed at %.0f\n" -msgstr "FOUT: ijsgutenprint: Verkrijg volgende rij faalde op %.0f\n" - -#, fuzzy -#~ msgid "Model Name" -#~ msgstr "Kanaalnamen" - -#, fuzzy -#~ msgid "Canon MULTIPASS MP500" -#~ msgstr "Canon S500" - -#, fuzzy -#~ msgid "Canon MULTIPASS MP760" -#~ msgstr "Canon LBP-1760" - -#~ msgid "90x90 DPI" -#~ msgstr "90x90 DPI" - -#~ msgid "90x90 DPI DMT" -#~ msgstr "90x90 DPI DMT" - -#~ msgid "180x180 DPI" -#~ msgstr "180x180 DPI" - -#~ msgid "180x180 DPI DMT" -#~ msgstr "180x180 DPI DMT" - -#~ msgid "360x360 DPI" -#~ msgstr "360x360 DPI" - -#~ msgid "360x360 DPI DMT" -#~ msgstr "360x360 DPI DMT" - -#~ msgid "720x360 DPI" -#~ msgstr "720x360 DPI" - -#~ msgid "720x360 DPI DMT" -#~ msgstr "720x360 DPI DMT" - -#~ msgid "720x720 DPI" -#~ msgstr "720x720 DPI" - -#~ msgid "720x720 DPI DMT" -#~ msgstr "720x720 DPI DMT" - -#~ msgid "1440x720 DPI" -#~ msgstr "1440x720 DPI" - -#~ msgid "1440x720 DPI DMT" -#~ msgstr "1440x720 DPI DMT" - -#~ msgid "1440x1440 DPI" -#~ msgstr "1440x1440 DPI" - -#~ msgid "1440x1440 DPI DMT" -#~ msgstr "1440x1440 DPI DMT" - -#~ msgid "2880x2880 DPI" -#~ msgstr "2880x2880 DPI" - -#~ msgid "2880x2880 DPI DMT" -#~ msgstr "2880x2880 DPI DMT" - -#~ msgid "150x150 DPI DMT" -#~ msgstr "150x150 DPI DMT" - -#~ msgid "300x300 DPI DMT" -#~ msgstr "300x300 DPI DMT" - -#~ msgid "600x300 DPI DMT" -#~ msgstr "600x300 DPI DMT" - -#~ msgid "600x600 DPI DMT" -#~ msgstr "600x600 DPI DMT" - -#~ msgid "1200x600 DPI DMT" -#~ msgstr "1200x600 DPI DMT" - -#~ msgid "1200x1200 DPI" -#~ msgstr "1200x1200 DPI" - -#~ msgid "1200x1200 DPI DMT" -#~ msgstr "1200x1200 DPI DMT" - -#~ msgid "2400x2400 DPI" -#~ msgstr "2400x2400 DPI" - -#~ msgid "2400x2400 DPI DMT" -#~ msgstr "2400x2400 DPI DMT" - -#~ msgid "Plain Paper PIXMA" -#~ msgstr "Blanco papier PIXMA" - -#~ msgid "Back Print Film" -#~ msgstr "Op de achterkant te printen film" - -#~ msgid "Fabric Sheets" -#~ msgstr "Stoffen vellen" - -#~ msgid "Envelope" -#~ msgstr "Envelop" - -#~ msgid "High Resolution Paper" -#~ msgstr "Hoog-resolutie papier" +#~ msgid "" +#~ "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" +#~ msgstr "" +#~ "ijsgutenprint: de versie van de geïstalleerde Gutenprint-software (%s)\n" +#~ " klopt niet met hetPPD-bestand (%s). Als u uw versie van Gutenprint\n" +#~ " recent up-to-date hebt gebracht dan moet u alle printerqueues opnieuw\n" +#~ " installeren.\n" +#~ " Kijk in de documentatie van uw leverancier of het commando voor het\n" +#~ " ``foomatic-ppdbestand'' voor nadere instructies.\n" +#~ "FOUT: ijsgutenprint: de versie van de geïnstalleerde Gutenprint software " +#~ "(%s) klopt niet met het PPD bestand (%s).\n" + +#~ msgid "ERROR: ijsgutenprint: Bad color space: bps %d channels %d space %s\n" +#~ msgstr "" +#~ "FOUT: ijsgutenprint: Verkeerde kleurruimte: bps %d kanalen %d ruimte %s\n" -#~ msgid "T-Shirt Transfers" -#~ msgstr "T-Shirt doordrukken" +#~ msgid "ERROR: ijsgutenprint: No row buffer\n" +#~ msgstr "FOUT: ijsgutenprint: No rijbuffer\n" -#~ msgid "High Gloss Film" -#~ msgstr "Hoogglans papier" +#~ msgid "" +#~ "ERROR: ijsgutenprint: Unable to parse parameter %s=%s (expect a number)\n" +#~ msgstr "" +#~ "FOUT: ijsgutenprint: Kan parameter %s=%s niet onleden (verwacht een " +#~ "nummer)\n" -#~ msgid "Glossy Photo Paper" -#~ msgstr "Glanzend fotopapier" +#~ msgid "ERROR: ijsgutenprint: Printer must be specified with -sDeviceModel\n" +#~ msgstr "" +#~ "FOUT: ijsgutenprint: Printer moet gespecificeerd worden met -sMODEL\n" -#~ msgid "Glossy Photo Cards" -#~ msgstr "Glanzende fotokaarten" +#~ msgid "ERROR: ijsgutenprint: Printer %s is not a known model\n" +#~ msgstr "FOUT: ijsgutenprint: Printer %s is geen bekend model\n" -#~ msgid "Photo Paper Pro" -#~ msgstr "Professioneel fotopapier" +#~ msgid "ijsgutenprint: unknown DeviceModel %s\n" +#~ msgstr "ijsgutenprint: onbekend MODEL %s\n" -#~ msgid "Cassette" -#~ msgstr "Cassette" +#~ msgid "ERROR: ijsgutenprint: cannot parse TopLeft %s\n" +#~ msgstr "FOUT: ijsgutenprint: kan Linksboven %s niet ontleden\n" -#~ msgid "CD tray" -#~ msgstr "CD-houder" +#~ msgid "ERROR: ijsgutenprint: cannot parse PaperSize %s\n" +#~ msgstr "FOUT: ijsgutenprint: kan Papierafmetingen %s niet ontleden\n" -#~ msgid "Photo CcMmYK Color" -#~ msgstr "Foto CcMmYK kleuren" +#~ msgid "ERROR: ijsgutenprint: cannot parse curve %s\n" +#~ msgstr "FOUT: ijsgutenprint: kan Kromme %s niet ontleden\n" -#~ msgid "Photo CcMmY Color" -#~ msgstr "Foto CcMmY kleuren" +#~ msgid "ERROR: ijsgutenprint: cannot parse %s float %s\n" +#~ msgstr "" +#~ "FOUT: ijsgutenprint: kan %s met drijvendekomma-getal %s niet ontleden\n" -#~ msgid "CMYK Color" -#~ msgstr "CMYK kleuren" +#~ msgid "ERROR: ijsgutenprint: cannot parse %s int %s\n" +#~ msgstr "FOUT: ijsgutenprint: kan %s geheel getal %s niet ontleden\n" -#~ msgid "CMY Color" -#~ msgstr "CMY kleuren" +#~ msgid "ERROR: ijsgutenprint: cannot parse %s dimension %s\n" +#~ msgstr "FOUT: ijsgutenprint: kan %s dimensie %s niet ontleden\n" -#~ msgid " Gamma" -#~ msgstr " Gamma" +#~ msgid "ERROR: ijsgutenprint: cannot parse %s boolean %s\n" +#~ msgstr "FOUT: ijsgutenprint: kan %s met logische waarde %s niet ontleden\n" -#~ msgid " Curve" -#~ msgstr " Kromme" +#~ msgid "ERROR: ijsgutenprint: Bad parameter %s %d\n" +#~ msgstr "FOUT: ijsgutenprint: Onjuiste parameter %s %d\n" -#~ msgid "1440 x 1440" -#~ msgstr "1440 x 1440" +#~ msgid "ERROR: ijsgutenprint: bad key code %d\n" +#~ msgstr "FOUT: ijsgutenprint: onjuiste sleutelcode %d\n" -#~ msgid "1440 x 1440 DPI High Quality" -#~ msgstr "1440 x 1440 DPI hoogste kwaliteit" +#~ msgid "ERROR: ijsgutenprint: image_init failed %d\n" +#~ msgstr "FOUT: ijsgutenprint: image_init mislukte %d\n" -#~ msgid "1440 x 1440 DPI Highest Quality" -#~ msgstr "1440 x 1440 DPI hoogste kwaliteit" +#~ msgid "ERROR: ijsgutenprint: Unable to open file descriptor: %s\n" +#~ msgstr "FOUT: ijsgutenprint: Kan bestandsdescriptor niet openen: %s\n" -#~ msgid "2880 x 1440 DPI High Quality" -#~ msgstr "2880 x 360 DPI hoogste kwaliteit" +#~ msgid "ERROR: ijsgutenprint: Unable to open %s: %s\n" +#~ msgstr "FOUT: ijsgutenprint: Kan %s: %s niet openen\n" -#~ msgid "2880 x 1440 DPI Highest Quality" -#~ msgstr "2880 x 1440 DPI hoogste kwaliteit" +#~ msgid "ERROR: ijsgutenprint: Unknown printer %s\n" +#~ msgstr "FOUT: ijsgutenprint: Onbekende printer %s\n" -#~ msgid "" -#~ "\n" -#~ "\n" -#~ "Copyright (C) 1997-2003 Michael Sweet, Robert Krawitz,\n" -#~ "and the rest of the Gutenprint Development Team.\n" -#~ "\n" -#~ "Please visit our web site at http://gimp-print.sourceforge.net.\n" -#~ "\n" -#~ "This program is free software; you can redistribute it and/or modify\n" -#~ "it under the terms of the GNU General Public License as published by\n" -#~ "the Free Software Foundation; either version 2 of the License, or\n" -#~ "(at your option) any later version.\n" -#~ "\n" -#~ "This program is distributed in the hope that it will be useful,\n" -#~ "but WITHOUT ANY WARRANTY; without even the implied warranty of\n" -#~ "MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the\n" -#~ "GNU General Public License for more details.\n" -#~ "\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" -#~ msgstr "" -#~ "\n" -#~ "\n" -#~ "Copyright (C) 1997-2003 Michael Sweet, Robert Krawitz,\n" -#~ "en de rest van het Gutenprint ontwikkelteam.\n" -#~ "\n" -#~ "Bezoek ook onze website op http://gimp-print.sourceforge.net.\n" -#~ "\n" -#~ "This program is free software; you can redistribute it and/or modify\n" -#~ "it under the terms of the GNU General Public License as published by\n" -#~ "the Free Software Foundation; either version 2 of the License, or\n" -#~ "(at your option) any later version.\n" -#~ "\n" -#~ "This program is distributed in the hope that it will be useful,\n" -#~ "but WITHOUT ANY WARRANTY; without even the implied warranty of\n" -#~ "MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the\n" -#~ "GNU General Public License for more details.\n" -#~ "\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" - -#~ msgid "Gutenprint" -#~ msgstr "Gutenprint" +#~ msgid "ERROR: ijsgutenprint: Bad parameters; cannot continue!\n" +#~ msgstr "FOUT: ijsgutenprint: Foute parameters; kan niet doorgaan!\n" -#~ 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" +#~ msgid "ERROR: ijsgutenprint: Get next row failed at %.0f\n" #~ msgstr "" -#~ ", Copyright (C) 2000-2006 Robert Krawitz\n" -#~ "Escputil comes with ABSOLUTELY NO WARRANTY; voor details type in " -#~ "'escputil -l'\n" -#~ "This is free software, and you are welcome to redistribute it\n" -#~ "under certain conditions; type 'escputil -l' in voor details.\n" +#~ "FOUT: ijsgutenprint: Verkrijgen van volgende rij is mislukt op %.0f\n" diff --git a/po/pl.gmo b/po/pl.gmo index 8439153..640da4f 100644 Binary files a/po/pl.gmo and b/po/pl.gmo differ diff --git a/po/pl.po b/po/pl.po index 3f6788b..6efe962 100644 --- a/po/pl.po +++ b/po/pl.po @@ -1,30 +1,30 @@ # Copyright (C) 2001 Free Software Foundation, Inc. # -=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=- -# AktualnÄ… wersjÄ™ tego pliku możesz odnaleźć w repozytorium cvs.gnome.pl -# (:pserver:anonymous@cvs.gnome.pl:/home/cvs, puste hasÅ‚o) -# JeÅ›li masz jakiekolwiek uwagi odnoszÄ…ce siÄ™ do tÅ‚umaczenia lub chcesz -# pomóc w jego rozwijaniu i pielÄ™gnowaniu, napisz do nas na adres: +# Aktualn± wersjê tego pliku mo¿esz odnale¼æ w repozytorium cvs.gnome.pl +# (:pserver:anonymous@cvs.gnome.pl:/home/cvs, puste has³o) +# Je¶li masz jakiekolwiek uwagi odnosz±ce siê do t³umaczenia lub chcesz +# pomóc w jego rozwijaniu i pielêgnowaniu, napisz do nas na adres: # translators@gnome.pl # -=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=- msgid "" msgstr "" "Project-Id-Version: gimp-print\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2008-01-01 20:47-0500\n" +"POT-Creation-Date: 2008-04-25 21:19-0400\n" "PO-Revision-Date: 2001-10-18 11:53+0100\n" "Last-Translator: GNOME PL Team \n" "Language-Team: Polish \n" "MIME-Version: 1.0\n" -"Content-Type: text/plain; charset=utf-8\n" +"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:1752 +#: src/main/print-escp2.c:2116 #, fuzzy msgid "Default" -msgstr "Ustaw domyÅ›lne" +msgstr "Ustaw domy¶lne" #: src/main/dither-main.c:47 #, fuzzy @@ -66,57 +66,69 @@ msgid "Ordered" msgstr "" #: src/main/dither-main.c:65 -msgid "Fast" +msgid "Ordered New" msgstr "" #: src/main/dither-main.c:66 -msgid "Very Fast" +msgid "Fast" msgstr "" #: src/main/dither-main.c:67 -msgid "Hybrid Floyd-Steinberg" +msgid "Very Fast" msgstr "" #: src/main/dither-main.c:68 +msgid "Hybrid Floyd-Steinberg" +msgstr "" + +#: src/main/dither-main.c:69 msgid "Predithered Input" msgstr "" -#: src/main/dither-main.c:88 src/main/print-color.c:56 +#: src/main/dither-main.c:70 +msgid "Drop Size Segmented" +msgstr "" + +#: src/main/dither-main.c:71 +msgid "Drop Size Segmented New" +msgstr "" + +#: src/main/dither-main.c:91 src/main/print-color.c:56 #, fuzzy msgid "Density" -msgstr "GÄ™stość:" +msgstr "Gêsto¶æ:" -#: src/main/dither-main.c:88 src/main/print-canon.c:295 +#: src/main/dither-main.c:91 src/main/print-canon.c:295 #: src/main/print-canon.c:303 src/main/print-canon.c:311 -#: src/main/print-canon.c:319 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-escp2.c:471 -#: src/main/print-escp2.c:479 src/main/print-escp2.c:487 +#: src/main/print-canon.c:319 src/main/print-escp2.c:446 +#: src/main/print-escp2.c:454 src/main/print-escp2.c:462 +#: src/main/print-escp2.c:470 src/main/print-escp2.c:478 +#: src/main/print-escp2.c:486 src/main/print-escp2.c:494 #: 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:1764 src/main/print-olympus.c:1772 -#: src/main/print-olympus.c:1780 src/main/print-olympus.c:1788 -#: src/main/print-pcl.c:1261 src/main/print-pcl.c:1269 -#: src/main/print-pcl.c:1277 src/main/print-pcl.c:1285 +#: src/main/print-olympus.c:1762 src/main/print-olympus.c:1770 +#: src/main/print-olympus.c:1778 src/main/print-olympus.c:1786 +#: src/main/print-pcl.c:1329 src/main/print-pcl.c:1337 +#: src/main/print-pcl.c:1345 src/main/print-pcl.c:1353 msgid "Output Level Adjustment" msgstr "" -#: src/main/dither-main.c:89 +#: src/main/dither-main.c:92 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:97 +#: src/main/dither-main.c:100 msgid "Dither Algorithm" msgstr "Algorytm ditherowania" -#: src/main/dither-main.c:97 +#: src/main/dither-main.c:100 msgid "Screening Adjustment" msgstr "" -#: src/main/dither-main.c:98 +#: src/main/dither-main.c:101 msgid "" "Choose the dither algorithm to be used.\n" "Adaptive Hybrid usually produces the best all-around quality.\n" @@ -145,9 +157,9 @@ msgstr "" msgid "Dither algorithm" msgstr "Algorytm ditherowania" -#: src/main/print-canon.c:200 src/main/print-escp2.c:180 -#: src/main/print-lexmark.c:266 src/main/print-olympus.c:1699 -#: src/main/print-pcl.c:1196 src/main/print-ps.c:67 +#: src/main/print-canon.c:200 src/main/print-escp2.c:182 +#: src/main/print-lexmark.c:266 src/main/print-olympus.c:1697 +#: src/main/print-pcl.c:1264 #, fuzzy msgid "Page Size" msgstr "Rozmiar" @@ -156,241 +168,250 @@ msgstr "Rozmiar" #: src/main/print-canon.c:212 src/main/print-canon.c:218 #: src/main/print-canon.c:224 src/main/print-canon.c:230 #: src/main/print-canon.c:248 src/main/print-canon.c:272 -#: src/main/print-escp2.c:180 src/main/print-escp2.c:186 -#: src/main/print-escp2.c:192 src/main/print-escp2.c:198 -#: src/main/print-escp2.c:204 src/main/print-escp2.c:210 -#: src/main/print-escp2.c:228 src/main/print-escp2.c:245 -#: src/main/print-escp2.c:251 src/main/print-escp2.c:263 -#: src/main/print-escp2.c:281 src/main/print-lexmark.c:266 +#: src/main/print-escp2.c:182 src/main/print-escp2.c:188 +#: src/main/print-escp2.c:194 src/main/print-escp2.c:200 +#: src/main/print-escp2.c:206 src/main/print-escp2.c:212 +#: src/main/print-escp2.c:230 src/main/print-escp2.c:247 +#: src/main/print-escp2.c:253 src/main/print-escp2.c:265 +#: src/main/print-escp2.c:283 src/main/print-lexmark.c:266 #: src/main/print-lexmark.c:272 src/main/print-lexmark.c:278 -#: src/main/print-lexmark.c:284 src/main/print-olympus.c:1699 -#: src/main/print-olympus.c:1705 src/main/print-olympus.c:1711 -#: src/main/print-olympus.c:1717 src/main/print-pcl.c:1196 -#: src/main/print-pcl.c:1202 src/main/print-pcl.c:1208 -#: src/main/print-pcl.c:1214 src/main/print-pcl.c:1238 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 +#: src/main/print-lexmark.c:284 src/main/print-olympus.c:1697 +#: src/main/print-olympus.c:1703 src/main/print-olympus.c:1709 +#: src/main/print-olympus.c:1715 src/main/print-pcl.c:1264 +#: src/main/print-pcl.c:1270 src/main/print-pcl.c:1276 +#: src/main/print-pcl.c:1282 src/main/print-pcl.c:1306 src/main/print-ps.c:68 +#: src/main/print-ps.c:74 #, fuzzy msgid "Basic Printer Setup" msgstr "Ustawienia drukarki" -#: src/main/print-canon.c:201 src/main/print-escp2.c:181 -#: src/main/print-lexmark.c:267 src/main/print-olympus.c:1700 -#: src/main/print-pcl.c:1197 src/main/print-ps.c:68 +#: src/main/print-canon.c:201 src/main/print-escp2.c:183 +#: src/main/print-lexmark.c:267 src/main/print-olympus.c:1698 +#: src/main/print-pcl.c:1265 msgid "Size of the paper being printed to" msgstr "" -#: src/main/print-canon.c:206 src/main/print-escp2.c:186 -#: src/main/print-lexmark.c:272 src/main/print-olympus.c:1705 -#: src/main/print-pcl.c:1202 src/main/print-ps.c:73 src/cups/genppd.c:1417 +#: src/main/print-canon.c:206 src/main/print-escp2.c:188 +#: src/main/print-lexmark.c:272 src/main/print-olympus.c:1703 +#: src/main/print-pcl.c:1270 src/cups/genppd.c:1422 msgid "Media Type" msgstr "" -#: src/main/print-canon.c:207 src/main/print-escp2.c:187 -#: src/main/print-lexmark.c:273 src/main/print-olympus.c:1706 -#: src/main/print-pcl.c:1203 src/main/print-ps.c:74 +#: src/main/print-canon.c:207 src/main/print-escp2.c:189 +#: src/main/print-lexmark.c:273 src/main/print-olympus.c:1704 +#: src/main/print-pcl.c:1271 msgid "Type of media (plain paper, photo paper, etc.)" msgstr "" -#: src/main/print-canon.c:212 src/main/print-escp2.c:192 -#: src/main/print-lexmark.c:278 src/main/print-olympus.c:1711 -#: src/main/print-pcl.c:1208 src/main/print-ps.c:79 src/cups/genppd.c:1445 +#: src/main/print-canon.c:212 src/main/print-escp2.c:194 +#: src/main/print-lexmark.c:278 src/main/print-olympus.c:1709 +#: src/main/print-pcl.c:1276 src/cups/genppd.c:1450 msgid "Media Source" msgstr "" -#: src/main/print-canon.c:213 src/main/print-escp2.c:193 -#: src/main/print-lexmark.c:279 src/main/print-olympus.c:1712 -#: src/main/print-pcl.c:1209 src/main/print-ps.c:80 +#: src/main/print-canon.c:213 src/main/print-escp2.c:195 +#: src/main/print-lexmark.c:279 src/main/print-olympus.c:1710 +#: src/main/print-pcl.c:1277 msgid "Source (input slot) of the media" msgstr "" -#: src/main/print-canon.c:218 src/main/print-escp2.c:198 +#: src/main/print-canon.c:218 src/main/print-escp2.c:200 msgid "CD Hub Size" msgstr "" -#: src/main/print-canon.c:219 src/main/print-escp2.c:199 +#: src/main/print-canon.c:219 src/main/print-escp2.c:201 msgid "Print only outside of the hub of the CD, or all the way to the hole" msgstr "" -#: src/main/print-canon.c:224 src/main/print-escp2.c:204 +#: src/main/print-canon.c:224 src/main/print-escp2.c:206 msgid "CD Size (Custom)" msgstr "" -#: src/main/print-canon.c:225 src/main/print-escp2.c:205 +#: src/main/print-canon.c:225 src/main/print-escp2.c:207 msgid "Variable adjustment for the outer diameter of CD" msgstr "" -#: src/main/print-canon.c:230 src/main/print-escp2.c:210 +#: src/main/print-canon.c:230 src/main/print-escp2.c:212 msgid "CD Hub Size (Custom)" msgstr "" -#: src/main/print-canon.c:231 src/main/print-escp2.c:211 +#: src/main/print-canon.c:231 src/main/print-escp2.c:213 msgid "Variable adjustment to the inner hub of the CD" msgstr "" -#: src/main/print-canon.c:236 src/main/print-escp2.c:216 +#: src/main/print-canon.c:236 src/main/print-escp2.c:218 msgid "CD Horizontal Fine Adjustment" msgstr "" #: src/main/print-canon.c:236 src/main/print-canon.c:242 -#: src/main/print-canon.c:254 src/main/print-escp2.c:216 -#: src/main/print-escp2.c:222 src/main/print-escp2.c:239 -#: src/main/print-escp2.c:275 src/main/print-lexmark.c:290 -#: src/main/print-olympus.c:1723 src/main/print-olympus.c:1729 -#: src/main/print-olympus.c:1735 src/main/print-pcl.c:1220 -#: src/main/print-ps.c:91 src/main/print-raw.c:80 +#: src/main/print-canon.c:254 src/main/print-escp2.c:218 +#: src/main/print-escp2.c:224 src/main/print-escp2.c:241 +#: src/main/print-escp2.c:277 src/main/print-lexmark.c:290 +#: src/main/print-olympus.c:1721 src/main/print-olympus.c:1727 +#: src/main/print-olympus.c:1733 src/main/print-pcl.c:1288 +#: src/main/print-raw.c:80 msgid "Advanced Printer Setup" msgstr "" #: src/main/print-canon.c:237 src/main/print-canon.c:243 -#: src/main/print-escp2.c:217 src/main/print-escp2.c:223 +#: src/main/print-escp2.c:219 src/main/print-escp2.c:225 msgid "Fine adjustment to horizontal position for CD printing" msgstr "" -#: src/main/print-canon.c:242 src/main/print-escp2.c:222 +#: src/main/print-canon.c:242 src/main/print-escp2.c:224 msgid "CD Vertical Fine Adjustment" msgstr "" -#: src/main/print-canon.c:248 src/main/print-escp2.c:228 -#: src/main/print-lexmark.c:284 src/main/print-olympus.c:1717 -#: src/main/print-pcl.c:1214 src/main/print-ps.c:85 src/cups/genppd.c:1518 +#: src/main/print-canon.c:248 src/main/print-escp2.c:230 +#: src/main/print-lexmark.c:284 src/main/print-olympus.c:1715 +#: src/main/print-pcl.c:1282 src/cups/genppd.c:1523 msgid "Resolution" -msgstr "Rozdzielczość" +msgstr "Rozdzielczo¶æ" #: src/main/print-canon.c:249 src/main/print-lexmark.c:285 -#: src/main/print-olympus.c:1718 src/main/print-pcl.c:1215 -#: src/main/print-ps.c:86 +#: src/main/print-olympus.c:1716 src/main/print-pcl.c:1283 msgid "Resolution and quality of the print" msgstr "" -#: src/main/print-canon.c:254 src/main/print-escp2.c:239 -#: src/main/print-lexmark.c:290 src/main/print-olympus.c:1723 -#: src/main/print-pcl.c:1220 src/main/print-ps.c:91 src/main/print-raw.c:80 +#: src/main/print-canon.c:254 src/main/print-escp2.c:241 +#: src/main/print-lexmark.c:290 src/main/print-olympus.c:1721 +#: src/main/print-pcl.c:1288 src/main/print-raw.c:80 msgid "Ink Type" msgstr "" -#: src/main/print-canon.c:255 src/main/print-escp2.c:240 -#: src/main/print-escp2.c:252 src/main/print-lexmark.c:291 -#: src/main/print-olympus.c:1724 src/main/print-pcl.c:1221 -#: src/main/print-ps.c:92 src/main/print-raw.c:81 +#: src/main/print-canon.c:255 src/main/print-escp2.c:242 +#: src/main/print-escp2.c:254 src/main/print-lexmark.c:291 +#: src/main/print-olympus.c:1722 src/main/print-pcl.c:1289 +#: src/main/print-raw.c:81 msgid "Type of ink in the printer" msgstr "" #: src/main/print-canon.c:260 src/main/print-canon.c:261 -#: src/main/print-escp2.c:329 src/main/print-escp2.c:330 +#: src/main/print-escp2.c:331 src/main/print-escp2.c:332 #: src/main/print-lexmark.c:296 src/main/print-lexmark.c:297 -#: src/main/print-pcl.c:1226 src/main/print-pcl.c:1227 +#: src/main/print-pcl.c:1294 src/main/print-pcl.c:1295 msgid "Ink Channels" msgstr "" -#: src/main/print-canon.c:260 src/main/print-escp2.c:130 -#: src/main/print-escp2.c:137 src/main/print-escp2.c:144 -#: src/main/print-escp2.c:287 src/main/print-escp2.c:293 -#: src/main/print-escp2.c:299 src/main/print-escp2.c:305 -#: src/main/print-escp2.c:311 src/main/print-escp2.c:317 -#: src/main/print-escp2.c:323 src/main/print-escp2.c:329 -#: src/main/print-escp2.c:335 src/main/print-lexmark.c:296 -#: src/main/print-pcl.c:1226 +#: src/main/print-canon.c:260 src/main/print-escp2.c:132 +#: src/main/print-escp2.c:139 src/main/print-escp2.c:146 +#: src/main/print-escp2.c:289 src/main/print-escp2.c:295 +#: src/main/print-escp2.c:301 src/main/print-escp2.c:307 +#: src/main/print-escp2.c:313 src/main/print-escp2.c:319 +#: src/main/print-escp2.c:325 src/main/print-escp2.c:331 +#: src/main/print-escp2.c:337 src/main/print-lexmark.c:296 +#: src/main/print-pcl.c:1294 msgid "Advanced Printer Functionality" msgstr "" -#: src/main/print-canon.c:266 src/main/print-escp2.c:341 -#: src/main/print-lexmark.c:302 src/main/print-olympus.c:1741 -#: src/main/print-pcl.c:1232 src/main/print-ps.c:103 src/main/print-raw.c:86 +#: src/main/print-canon.c:266 src/main/print-escp2.c:343 +#: src/main/print-lexmark.c:302 src/main/print-olympus.c:1739 +#: src/main/print-pcl.c:1300 src/main/print-ps.c:80 src/main/print-raw.c:86 #, fuzzy msgid "Printing Mode" msgstr "Model drukarki:" #: src/main/print-canon.c:266 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:341 -#: src/main/print-escp2.c:347 src/main/print-lexmark.c:302 -#: src/main/print-olympus.c:1741 src/main/print-pcl.c:1232 -#: src/main/print-ps.c:103 src/main/print-raw.c:86 +#: src/main/print-color.c:208 src/main/print-escp2.c:343 +#: src/main/print-escp2.c:349 src/main/print-lexmark.c:302 +#: src/main/print-olympus.c:1739 src/main/print-pcl.c:1300 +#: src/main/print-ps.c:80 src/main/print-raw.c:86 #, fuzzy msgid "Core Parameter" -msgstr "ZwykÅ‚y papier" +msgstr "Zwyk³y papier" -#: src/main/print-canon.c:267 src/main/print-escp2.c:342 -#: src/main/print-lexmark.c:303 src/main/print-olympus.c:1742 -#: src/main/print-pcl.c:1233 src/main/print-ps.c:104 src/main/print-raw.c:87 +#: src/main/print-canon.c:267 src/main/print-escp2.c:344 +#: src/main/print-lexmark.c:303 src/main/print-olympus.c:1740 +#: src/main/print-pcl.c:1301 src/main/print-ps.c:81 src/main/print-raw.c:87 msgid "Printing Output Mode" msgstr "" -#: src/main/print-canon.c:272 src/main/print-pcl.c:1238 +#: src/main/print-canon.c:272 src/main/print-pcl.c:1306 msgid "Double-Sided Printing" msgstr "" -#: src/main/print-canon.c:273 src/main/print-pcl.c:1239 +#: src/main/print-canon.c:273 src/main/print-pcl.c:1307 msgid "Duplex/Tumble Setting" msgstr "" -#: src/main/print-canon.c:295 src/main/print-escp2.c:439 -#: src/main/print-lexmark.c:325 src/main/print-pcl.c:1261 +#: src/main/print-canon.c:295 src/main/print-escp2.c:446 +#: src/main/print-lexmark.c:325 src/main/print-pcl.c:1329 #, fuzzy msgid "Cyan Density" -msgstr "GÄ™stość:" +msgstr "Gêsto¶æ:" -#: src/main/print-canon.c:296 src/main/print-escp2.c:440 -#: src/main/print-lexmark.c:326 src/main/print-pcl.c:1262 +#: src/main/print-canon.c:296 src/main/print-escp2.c:447 +#: src/main/print-lexmark.c:326 src/main/print-pcl.c:1330 msgid "Adjust the cyan density" msgstr "" -#: src/main/print-canon.c:303 src/main/print-escp2.c:447 -#: src/main/print-lexmark.c:333 src/main/print-pcl.c:1269 +#: src/main/print-canon.c:303 src/main/print-escp2.c:454 +#: src/main/print-lexmark.c:333 src/main/print-pcl.c:1337 #, fuzzy msgid "Magenta Density" msgstr "Purpurowy" -#: src/main/print-canon.c:304 src/main/print-escp2.c:448 -#: src/main/print-lexmark.c:334 src/main/print-pcl.c:1270 +#: src/main/print-canon.c:304 src/main/print-escp2.c:455 +#: src/main/print-lexmark.c:334 src/main/print-pcl.c:1338 msgid "Adjust the magenta density" msgstr "" -#: src/main/print-canon.c:311 src/main/print-escp2.c:455 -#: src/main/print-lexmark.c:341 src/main/print-pcl.c:1277 +#: src/main/print-canon.c:311 src/main/print-escp2.c:462 +#: src/main/print-lexmark.c:341 src/main/print-pcl.c:1345 #, fuzzy msgid "Yellow Density" -msgstr "GÄ™stość:" +msgstr "Gêsto¶æ:" -#: src/main/print-canon.c:312 src/main/print-escp2.c:456 -#: src/main/print-lexmark.c:342 src/main/print-pcl.c:1278 +#: src/main/print-canon.c:312 src/main/print-escp2.c:463 +#: src/main/print-lexmark.c:342 src/main/print-pcl.c:1346 msgid "Adjust the yellow density" msgstr "" -#: src/main/print-canon.c:319 src/main/print-escp2.c:463 -#: src/main/print-lexmark.c:349 src/main/print-pcl.c:1285 +#: src/main/print-canon.c:319 src/main/print-escp2.c:470 +#: src/main/print-lexmark.c:349 src/main/print-pcl.c:1353 #, fuzzy msgid "Black Density" -msgstr "GÄ™stość:" +msgstr "Gêsto¶æ:" -#: src/main/print-canon.c:320 src/main/print-escp2.c:464 -#: src/main/print-lexmark.c:350 src/main/print-pcl.c:1286 +#: src/main/print-canon.c:320 src/main/print-escp2.c:471 +#: src/main/print-lexmark.c:350 src/main/print-pcl.c:1354 msgid "Adjust the black density" msgstr "" #: src/main/print-canon.c:327 src/main/print-canon.c:328 -#: src/main/print-escp2.c:495 src/main/print-escp2.c:496 +#: src/main/print-escp2.c:534 src/main/print-escp2.c:535 #: src/main/print-lexmark.c:357 src/main/print-lexmark.c:358 -#: src/main/print-pcl.c:1293 src/main/print-pcl.c:1294 +#: src/main/print-pcl.c:1361 src/main/print-pcl.c:1362 msgid "Light Cyan Transition" msgstr "" #: src/main/print-canon.c:327 src/main/print-canon.c:335 -#: src/main/print-canon.c:343 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-escp2.c:543 -#: src/main/print-escp2.c:551 src/main/print-escp2.c:559 -#: src/main/print-lexmark.c:357 src/main/print-lexmark.c:365 -#: src/main/print-pcl.c:1293 src/main/print-pcl.c:1301 +#: src/main/print-canon.c:343 src/main/print-escp2.c:502 +#: src/main/print-escp2.c:510 src/main/print-escp2.c:518 +#: src/main/print-escp2.c:526 src/main/print-escp2.c:534 +#: src/main/print-escp2.c:542 src/main/print-escp2.c:550 +#: src/main/print-escp2.c:558 src/main/print-escp2.c:566 +#: src/main/print-escp2.c:574 src/main/print-escp2.c:582 +#: src/main/print-escp2.c:590 src/main/print-escp2.c:598 +#: src/main/print-escp2.c:606 src/main/print-escp2.c:614 +#: src/main/print-escp2.c:622 src/main/print-escp2.c:630 +#: src/main/print-escp2.c:638 src/main/print-escp2.c:646 +#: src/main/print-escp2.c:654 src/main/print-escp2.c:662 +#: src/main/print-escp2.c:670 src/main/print-escp2.c:678 +#: src/main/print-escp2.c:686 src/main/print-escp2.c:694 +#: src/main/print-escp2.c:702 src/main/print-escp2.c:710 +#: src/main/print-escp2.c:718 src/main/print-escp2.c:726 +#: src/main/print-escp2.c:734 src/main/print-lexmark.c:357 +#: src/main/print-lexmark.c:365 src/main/print-pcl.c:1361 +#: src/main/print-pcl.c:1369 msgid "Advanced Ink Adjustment" msgstr "" #: src/main/print-canon.c:335 src/main/print-canon.c:336 -#: src/main/print-escp2.c:503 src/main/print-escp2.c:504 +#: src/main/print-escp2.c:566 src/main/print-escp2.c:567 #: src/main/print-lexmark.c:365 src/main/print-lexmark.c:366 -#: src/main/print-pcl.c:1301 src/main/print-pcl.c:1302 +#: src/main/print-pcl.c:1369 src/main/print-pcl.c:1370 msgid "Light Magenta Transition" msgstr "" @@ -398,55 +419,55 @@ msgstr "" msgid "Light Yellow Transition" msgstr "" -#: src/main/print-canon.c:363 src/main/print-pcl.c:1482 +#: src/main/print-canon.c:363 src/main/print-pcl.c:1550 #: src/main/escp2-resolutions.c:557 src/main/escp2-resolutions.c:565 #: src/main/escp2-resolutions.c:576 src/main/escp2-resolutions.c:588 msgid "Off" msgstr "" -#: src/main/print-canon.c:364 src/main/print-pcl.c:1483 +#: src/main/print-canon.c:364 src/main/print-pcl.c:1551 msgid "Long Edge (Standard)" msgstr "" -#: src/main/print-canon.c:365 src/main/print-pcl.c:1484 +#: src/main/print-canon.c:365 src/main/print-pcl.c:1552 msgid "Short Edge (Flip)" msgstr "" -#: src/main/print-canon.c:629 src/main/print-escp2.c:1648 +#: src/main/print-canon.c:629 src/main/print-escp2.c:2012 #: src/main/xmli18n-tmp.h:6 msgid "CD - 5 inch" msgstr "" -#: src/main/print-canon.c:631 src/main/print-escp2.c:1650 +#: src/main/print-canon.c:631 src/main/print-escp2.c:2014 #: src/main/xmli18n-tmp.h:7 msgid "CD - 3 inch" msgstr "" -#: src/main/print-canon.c:633 src/main/print-escp2.c:1652 +#: src/main/print-canon.c:633 src/main/print-escp2.c:2016 #: src/main/xmli18n-tmp.h:8 #, fuzzy msgid "CD - Custom" msgstr "Automatycznie" -#: src/main/print-canon.c:656 src/main/print-escp2.c:1677 +#: src/main/print-canon.c:656 src/main/print-escp2.c:2041 msgid "Normal" msgstr "" -#: src/main/print-canon.c:658 src/main/print-escp2.c:1679 +#: src/main/print-canon.c:658 src/main/print-escp2.c:2043 #, fuzzy msgid "Print To Hub" -msgstr "Wydrukować do pliku?" +msgstr "Wydrukowaæ do pliku?" -#: src/main/print-canon.c:773 src/main/print-escp2.c:2011 -#: src/main/print-lexmark.c:1279 src/main/print-olympus.c:1996 -#: src/main/print-pcl.c:1776 src/main/print-ps.c:170 src/main/print-raw.c:135 -#: src/gutenprintui/panel.c:289 src/gutenprintui2/panel.c:289 +#: src/main/print-canon.c:773 src/main/print-escp2.c:2450 +#: src/main/print-lexmark.c:1279 src/main/print-olympus.c:1994 +#: src/main/print-pcl.c:1844 src/main/print-ps.c:310 src/main/print-raw.c:135 +#: src/gutenprintui2/panel.c:290 msgid "Color" msgstr "Kolor" -#: src/main/print-canon.c:775 src/main/print-escp2.c:2013 -#: src/main/print-lexmark.c:1281 src/main/print-pcl.c:1778 -#: src/main/print-ps.c:172 src/main/print-raw.c:137 +#: src/main/print-canon.c:775 src/main/print-escp2.c:2452 +#: src/main/print-lexmark.c:1281 src/main/print-pcl.c:1846 +#: src/main/print-ps.c:312 src/main/print-raw.c:137 msgid "Black and White" msgstr "" @@ -486,14 +507,14 @@ msgstr "Wydrukuj" #: src/main/print-color.c:121 src/main/escp2-channels.c:916 #: src/main/escp2-channels.c:929 src/main/escp2-channels.c:943 -#: src/gutenprintui/panel.c:290 src/gutenprintui2/panel.c:290 +#: src/gutenprintui2/panel.c:291 msgid "Grayscale" -msgstr "Odcienie szaroÅ›ci" +msgstr "Odcienie szaro¶ci" #: src/main/print-color.c:123 #, fuzzy msgid "Whitescale" -msgstr "Żółć" +msgstr "¯ó³æ" #: src/main/print-color.c:125 msgid "RGB" @@ -511,7 +532,7 @@ msgstr "" msgid "KCMY" msgstr "" -#: src/main/print-color.c:165 src/main/print-color.c:446 +#: src/main/print-color.c:165 src/main/print-color.c:454 #, fuzzy msgid "Channel " msgstr "Anuluj" @@ -565,15 +586,15 @@ msgstr "Typ obrazu" #: src/main/print-color.c:200 #, fuzzy msgid "Output Image Type" -msgstr "Typ wyjÅ›ciowy:" +msgstr "Typ wyj¶ciowy:" #: src/main/print-color.c:201 #, fuzzy msgid "Output image type" -msgstr "Typ wyjÅ›ciowy:" +msgstr "Typ wyj¶ciowy:" #: src/main/print-color.c:208 src/main/print-color.c:209 -#: src/main/print-escp2.c:347 +#: src/main/print-escp2.c:349 msgid "Raw Channels" msgstr "" @@ -589,12 +610,12 @@ msgstr "" #: src/main/print-color.c:224 #, fuzzy msgid "Brightness" -msgstr "Jasność:" +msgstr "Jasno¶æ:" #: src/main/print-color.c:225 #, fuzzy msgid "Brightness of the print" -msgstr "Rozdzielczość" +msgstr "Rozdzielczo¶æ" #: src/main/print-color.c:232 #, fuzzy @@ -612,7 +633,7 @@ msgstr "" #: src/main/print-color.c:240 #, fuzzy msgid "Advanced Image Control" -msgstr "Typ wyjÅ›ciowy:" +msgstr "Typ wyj¶ciowy:" #: src/main/print-color.c:241 msgid "Use linear vs. fixed end point contrast adjustment" @@ -637,14 +658,14 @@ msgstr "Gamma:" msgid "Gamma value assumed by application" msgstr "" -#: src/main/print-color.c:266 src/main/escp2-channels.c:3048 -#: src/main/escp2-channels.c:3060 src/main/escp2-channels.c:3068 -#: src/main/escp2-channels.c:3078 src/main/escp2-channels.c:3089 -#: src/main/escp2-channels.c:3101 src/main/escp2-channels.c:3117 -#: src/main/escp2-channels.c:3125 src/main/escp2-channels.c:3138 -#: src/main/escp2-channels.c:3151 src/main/escp2-channels.c:3165 -#: src/main/escp2-channels.c:3179 src/main/escp2-channels.c:3194 -#: src/gutenprintui/panel.c:2152 src/gutenprintui2/panel.c:2153 +#: src/main/print-color.c:266 src/main/escp2-channels.c:3087 +#: src/main/escp2-channels.c:3099 src/main/escp2-channels.c:3107 +#: src/main/escp2-channels.c:3117 src/main/escp2-channels.c:3128 +#: src/main/escp2-channels.c:3140 src/main/escp2-channels.c:3156 +#: src/main/escp2-channels.c:3164 src/main/escp2-channels.c:3177 +#: src/main/escp2-channels.c:3190 src/main/escp2-channels.c:3204 +#: src/main/escp2-channels.c:3218 src/main/escp2-channels.c:3230 +#: src/main/escp2-channels.c:3243 src/gutenprintui2/panel.c:2328 #: src/escputil/escputil.c:978 src/escputil/escputil.c:997 #: src/escputil/escputil.c:1201 msgid "Cyan" @@ -654,14 +675,14 @@ msgstr "Niebieskozielony" msgid "Adjust the cyan gamma" msgstr "" -#: src/main/print-color.c:274 src/main/escp2-channels.c:3049 -#: src/main/escp2-channels.c:3059 src/main/escp2-channels.c:3070 -#: src/main/escp2-channels.c:3079 src/main/escp2-channels.c:3090 -#: src/main/escp2-channels.c:3103 src/main/escp2-channels.c:3116 -#: src/main/escp2-channels.c:3126 src/main/escp2-channels.c:3139 -#: src/main/escp2-channels.c:3152 src/main/escp2-channels.c:3164 -#: src/main/escp2-channels.c:3178 src/main/escp2-channels.c:3195 -#: src/gutenprintui/panel.c:2159 src/gutenprintui2/panel.c:2160 +#: src/main/print-color.c:274 src/main/escp2-channels.c:3088 +#: src/main/escp2-channels.c:3098 src/main/escp2-channels.c:3109 +#: src/main/escp2-channels.c:3118 src/main/escp2-channels.c:3129 +#: src/main/escp2-channels.c:3142 src/main/escp2-channels.c:3155 +#: src/main/escp2-channels.c:3165 src/main/escp2-channels.c:3178 +#: src/main/escp2-channels.c:3191 src/main/escp2-channels.c:3203 +#: src/main/escp2-channels.c:3217 src/main/escp2-channels.c:3229 +#: src/main/escp2-channels.c:3244 src/gutenprintui2/panel.c:2335 #: src/escputil/escputil.c:979 src/escputil/escputil.c:998 #: src/escputil/escputil.c:1202 msgid "Magenta" @@ -671,27 +692,26 @@ msgstr "Purpurowy" msgid "Adjust the magenta gamma" msgstr "" -#: src/main/print-color.c:282 src/main/escp2-channels.c:3050 -#: src/main/escp2-channels.c:3061 src/main/escp2-channels.c:3069 -#: src/main/escp2-channels.c:3080 src/main/escp2-channels.c:3091 -#: src/main/escp2-channels.c:3105 src/main/escp2-channels.c:3112 -#: src/main/escp2-channels.c:3127 src/main/escp2-channels.c:3140 -#: src/main/escp2-channels.c:3153 src/main/escp2-channels.c:3163 -#: src/main/escp2-channels.c:3177 src/main/escp2-channels.c:3196 -#: src/gutenprintui/panel.c:2166 src/gutenprintui2/panel.c:2167 +#: src/main/print-color.c:282 src/main/escp2-channels.c:3089 +#: src/main/escp2-channels.c:3100 src/main/escp2-channels.c:3108 +#: src/main/escp2-channels.c:3119 src/main/escp2-channels.c:3130 +#: src/main/escp2-channels.c:3144 src/main/escp2-channels.c:3151 +#: src/main/escp2-channels.c:3166 src/main/escp2-channels.c:3179 +#: src/main/escp2-channels.c:3192 src/main/escp2-channels.c:3202 +#: src/main/escp2-channels.c:3216 src/main/escp2-channels.c:3228 +#: src/main/escp2-channels.c:3245 src/gutenprintui2/panel.c:2342 #: src/escputil/escputil.c:980 src/escputil/escputil.c:999 #: src/escputil/escputil.c:1203 msgid "Yellow" -msgstr "Żółć" +msgstr "¯ó³æ" #: src/main/print-color.c:283 msgid "Adjust the yellow gamma" msgstr "" -#: src/main/print-color.c:290 src/main/escp2-channels.c:3168 -#: src/main/escp2-channels.c:3181 src/gutenprintui/panel.c:2180 -#: src/gutenprintui2/panel.c:2181 src/escputil/escputil.c:987 -#: src/escputil/escputil.c:1005 +#: src/main/print-color.c:290 src/main/escp2-channels.c:3207 +#: src/main/escp2-channels.c:3220 src/gutenprintui2/panel.c:2356 +#: src/escputil/escputil.c:987 src/escputil/escputil.c:1005 msgid "Red" msgstr "" @@ -699,8 +719,7 @@ msgstr "" msgid "Adjust the red gamma" msgstr "" -#: src/main/print-color.c:298 src/gutenprintui/panel.c:2187 -#: src/gutenprintui2/panel.c:2188 +#: src/main/print-color.c:298 src/gutenprintui2/panel.c:2363 msgid "Green" msgstr "" @@ -708,10 +727,9 @@ msgstr "" msgid "Adjust the green gamma" msgstr "" -#: src/main/print-color.c:306 src/main/escp2-channels.c:3169 -#: src/main/escp2-channels.c:3182 src/gutenprintui/panel.c:2194 -#: src/gutenprintui2/panel.c:2195 src/escputil/escputil.c:988 -#: src/escputil/escputil.c:1006 +#: src/main/print-color.c:306 src/main/escp2-channels.c:3208 +#: src/main/escp2-channels.c:3221 src/gutenprintui2/panel.c:2370 +#: src/escputil/escputil.c:988 src/escputil/escputil.c:1006 msgid "Blue" msgstr "" @@ -720,14 +738,14 @@ msgid "Adjust the blue gamma" msgstr "" #: src/main/print-color.c:314 src/main/print-lexmark.c:613 -#: src/main/escp2-channels.c:3047 src/main/escp2-channels.c:3057 -#: src/main/escp2-channels.c:3058 src/main/escp2-channels.c:3071 -#: src/main/escp2-channels.c:3081 src/main/escp2-channels.c:3088 -#: src/main/escp2-channels.c:3100 src/main/escp2-channels.c:3113 -#: src/main/escp2-channels.c:3124 src/main/escp2-channels.c:3137 -#: src/main/escp2-channels.c:3150 src/main/escp2-channels.c:3156 -#: src/main/escp2-channels.c:3180 src/main/escp2-channels.c:3193 -#: src/gutenprintui/panel.c:2173 src/gutenprintui2/panel.c:2174 +#: src/main/escp2-channels.c:3086 src/main/escp2-channels.c:3096 +#: src/main/escp2-channels.c:3097 src/main/escp2-channels.c:3110 +#: src/main/escp2-channels.c:3120 src/main/escp2-channels.c:3127 +#: src/main/escp2-channels.c:3139 src/main/escp2-channels.c:3152 +#: src/main/escp2-channels.c:3163 src/main/escp2-channels.c:3176 +#: src/main/escp2-channels.c:3189 src/main/escp2-channels.c:3195 +#: src/main/escp2-channels.c:3219 src/main/escp2-channels.c:3231 +#: src/main/escp2-channels.c:3242 src/gutenprintui2/panel.c:2349 #: src/escputil/escputil.c:975 src/escputil/escputil.c:996 #: src/escputil/escputil.c:1200 msgid "Black" @@ -737,7 +755,7 @@ msgstr "Czarny" msgid "Adjust the black gamma" msgstr "" -#: src/main/print-color.c:322 src/main/print-olympus.c:1764 +#: src/main/print-color.c:322 src/main/print-olympus.c:1762 msgid "Cyan Balance" msgstr "" @@ -745,13 +763,13 @@ msgstr "" #: src/main/print-color.c:338 #, fuzzy msgid "GrayBalance" -msgstr "Odcienie szaroÅ›ci" +msgstr "Odcienie szaro¶ci" #: src/main/print-color.c:323 msgid "Adjust the cyan gray balance" msgstr "" -#: src/main/print-color.c:330 src/main/print-olympus.c:1772 +#: src/main/print-color.c:330 src/main/print-olympus.c:1770 #, fuzzy msgid "Magenta Balance" msgstr "Purpurowy" @@ -760,10 +778,10 @@ msgstr "Purpurowy" msgid "Adjust the magenta gray balance" msgstr "" -#: src/main/print-color.c:338 src/main/print-olympus.c:1780 +#: src/main/print-color.c:338 src/main/print-olympus.c:1778 #, fuzzy msgid "Yellow Balance" -msgstr "Żółć" +msgstr "¯ó³æ" #: src/main/print-color.c:339 msgid "Adjust the yellow gray balance" @@ -787,544 +805,655 @@ msgstr "Typ tuszu:" #: 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:353 -#: src/main/print-escp2.c:359 src/main/print-escp2.c:365 -#: src/main/print-escp2.c:371 src/main/print-escp2.c:377 +#: src/main/print-color.c:421 src/main/print-color.c:553 +#: src/main/print-escp2.c:355 src/main/print-escp2.c:361 +#: src/main/print-escp2.c:367 src/main/print-escp2.c:373 +#: src/main/print-escp2.c:379 src/main/print-escp2.c:742 +#: src/main/print-escp2.c:750 src/main/print-escp2.c:758 #, fuzzy msgid "Advanced Output Control" -msgstr "Typ wyjÅ›ciowy:" +msgstr "Typ wyj¶ciowy:" #: src/main/print-color.c:358 msgid "Limit the total ink printed to the page" msgstr "" -#: src/main/print-color.c:365 +#: src/main/print-color.c:365 src/main/print-escp2.c:742 msgid "GCR Transition" msgstr "" -#: src/main/print-color.c:366 +#: src/main/print-color.c:366 src/main/print-escp2.c:743 msgid "Adjust the gray component transition rate" msgstr "" -#: src/main/print-color.c:373 +#: src/main/print-color.c:373 src/main/print-escp2.c:750 msgid "GCR Lower Bound" msgstr "" -#: src/main/print-color.c:374 +#: src/main/print-color.c:374 src/main/print-escp2.c:751 msgid "Lower bound of gray component reduction" msgstr "" -#: src/main/print-color.c:381 +#: src/main/print-color.c:381 src/main/print-escp2.c:758 msgid "GCR Upper Bound" msgstr "" -#: src/main/print-color.c:382 +#: src/main/print-color.c:382 src/main/print-escp2.c:759 msgid "Upper bound of gray component reduction" msgstr "" -#: src/main/print-color.c:447 src/main/print-color.c:457 -#: src/main/print-color.c:465 src/main/print-color.c:473 -#: src/main/print-color.c:481 src/main/print-color.c:489 -#: src/main/print-color.c:497 src/main/print-color.c:505 -#: src/main/print-color.c:513 +#: src/main/print-color.c:421 +msgid "LUT dump file" +msgstr "" + +#: src/main/print-color.c:422 +msgid "Dump file for LUT for external color adjustment" +msgstr "" + +#: src/main/print-color.c:455 src/main/print-color.c:465 +#: src/main/print-color.c:473 src/main/print-color.c:481 +#: src/main/print-color.c:489 src/main/print-color.c:497 +#: src/main/print-color.c:505 src/main/print-color.c:513 +#: src/main/print-color.c:521 #, fuzzy msgid "Output Curves" -msgstr "Typ wyjÅ›ciowy:" +msgstr "Typ wyj¶ciowy:" -#: src/main/print-color.c:447 +#: src/main/print-color.c:455 msgid "Curve for raw channel " msgstr "" -#: src/main/print-color.c:457 +#: src/main/print-color.c:465 msgid "Cyan Curve" msgstr "" -#: src/main/print-color.c:458 +#: src/main/print-color.c:466 #, fuzzy msgid "Cyan curve" msgstr "Anuluj" -#: src/main/print-color.c:465 +#: src/main/print-color.c:473 #, fuzzy msgid "Magenta Curve" msgstr "Purpurowy" -#: src/main/print-color.c:466 +#: src/main/print-color.c:474 #, fuzzy msgid "Magenta curve" msgstr "Purpurowy" -#: src/main/print-color.c:473 +#: src/main/print-color.c:481 #, fuzzy msgid "Yellow Curve" -msgstr "Żółć" +msgstr "¯ó³æ" -#: src/main/print-color.c:474 +#: src/main/print-color.c:482 #, fuzzy msgid "Yellow curve" -msgstr "Żółć" +msgstr "¯ó³æ" -#: src/main/print-color.c:481 +#: src/main/print-color.c:489 #, fuzzy msgid "Black Curve" msgstr "Czarny" -#: src/main/print-color.c:482 +#: src/main/print-color.c:490 #, fuzzy msgid "Black curve" msgstr "Czarny" -#: src/main/print-color.c:489 +#: src/main/print-color.c:497 #, fuzzy msgid "Red Curve" -msgstr "Żółć" +msgstr "¯ó³æ" -#: src/main/print-color.c:490 +#: src/main/print-color.c:498 #, fuzzy msgid "Red curve" -msgstr "Żółć" +msgstr "¯ó³æ" -#: src/main/print-color.c:497 +#: src/main/print-color.c:505 #, fuzzy msgid "Green Curve" msgstr "Purpurowy" -#: src/main/print-color.c:498 +#: src/main/print-color.c:506 #, fuzzy msgid "Green curve" msgstr "Purpurowy" -#: src/main/print-color.c:505 +#: src/main/print-color.c:513 #, fuzzy msgid "Blue Curve" msgstr "Czarny" -#: src/main/print-color.c:506 +#: src/main/print-color.c:514 #, fuzzy msgid "Blue curve" msgstr "Czarny" -#: src/main/print-color.c:513 +#: src/main/print-color.c:521 #, fuzzy msgid "White Curve" -msgstr "Żółć" +msgstr "¯ó³æ" -#: src/main/print-color.c:514 +#: src/main/print-color.c:522 #, fuzzy msgid "White curve" -msgstr "Żółć" +msgstr "¯ó³æ" -#: src/main/print-color.c:521 +#: src/main/print-color.c:529 msgid "Hue Map" msgstr "" -#: src/main/print-color.c:521 src/main/print-color.c:529 -#: src/main/print-color.c:537 +#: src/main/print-color.c:529 src/main/print-color.c:537 +#: src/main/print-color.c:545 msgid "Advanced HSL Curves" msgstr "" -#: src/main/print-color.c:522 +#: src/main/print-color.c:530 msgid "Hue adjustment curve" msgstr "" -#: src/main/print-color.c:529 +#: src/main/print-color.c:537 #, fuzzy msgid "Saturation Map" msgstr "Nasycenie:" -#: src/main/print-color.c:530 +#: src/main/print-color.c:538 msgid "Saturation adjustment curve" msgstr "" -#: src/main/print-color.c:537 +#: src/main/print-color.c:545 msgid "Luminosity Map" msgstr "" -#: src/main/print-color.c:538 +#: src/main/print-color.c:546 msgid "Luminosity adjustment curve" msgstr "" -#: src/main/print-color.c:545 +#: src/main/print-color.c:553 msgid "Gray Component Reduction" msgstr "" -#: src/main/print-color.c:546 +#: src/main/print-color.c:554 msgid "Gray component reduction curve" msgstr "" -#: src/main/print-color.c:1670 +#: src/main/print-color.c:1743 msgid "Traditional Gutenprint color conversion" msgstr "" -#: src/main/printers.c:517 +#: src/main/printers.c:514 #, c-format msgid "Value must be set for %s\n" msgstr "" -#: src/main/printers.c:530 src/main/printers.c:535 +#: src/main/printers.c:527 src/main/printers.c:532 #, c-format msgid "`%s' is not a valid %s\n" msgstr "" -#: src/main/printers.c:554 +#: src/main/printers.c:551 #, c-format msgid "%s must be between %f and %f (is %f)\n" msgstr "" -#: src/main/printers.c:576 src/main/printers.c:600 +#: src/main/printers.c:573 src/main/printers.c:597 #, c-format msgid "%s must be between %d and %d (is %d)\n" msgstr "" -#: src/main/printers.c:631 +#: src/main/printers.c:628 #, c-format msgid "%s bounds must be between %f and %f\n" msgstr "" -#: src/main/printers.c:639 +#: src/main/printers.c:636 #, c-format msgid "%s wrap mode must be %s\n" msgstr "" -#: src/main/printers.c:643 +#: src/main/printers.c:640 msgid "no wrap" msgstr "" -#: src/main/printers.c:643 +#: src/main/printers.c:640 msgid "wrap around" msgstr "" -#: src/main/printers.c:687 +#: src/main/printers.c:684 #, fuzzy, c-format msgid "Unknown type parameter %s (%d)\n" msgstr "Nieznana opcja %c\n" -#: src/main/printers.c:700 src/main/printers.c:711 +#: src/main/printers.c:697 src/main/printers.c:708 #, c-format msgid "%s out of range (value %d, min %d, max %d)\n" msgstr "" -#: src/main/printers.c:772 +#: src/main/printers.c:768 msgid "Page size is not valid\n" msgstr "" -#: src/main/printers.c:793 +#: src/main/printers.c:789 #, c-format msgid "Top margin must not be less than %d\n" msgstr "" -#: src/main/printers.c:799 +#: src/main/printers.c:795 #, c-format msgid "Left margin must not be less than %d\n" msgstr "" -#: src/main/printers.c:805 +#: src/main/printers.c:801 msgid "Height must be greater than zero\n" msgstr "" -#: src/main/printers.c:811 +#: src/main/printers.c:807 msgid "Width must be greater than zero\n" msgstr "" -#: src/main/printers.c:817 +#: src/main/printers.c:813 #, c-format msgid "" "Image is too wide for the page: left margin is %d, width %d, right edge is %" "d\n" msgstr "" -#: src/main/printers.c:824 +#: src/main/printers.c:820 #, c-format msgid "" "Image is too long for the page: top margin is %d, height %d, bottom edge is %" "d\n" msgstr "" -#: src/main/print-escp2.c:162 +#: src/main/print-escp2.c:164 msgid "Automatic Printing Mode" msgstr "" -#: src/main/print-escp2.c:162 src/main/print-escp2.c:174 +#: src/main/print-escp2.c:164 src/main/print-escp2.c:176 #: src/main/generic-options.c:62 msgid "Basic Output Adjustment" msgstr "" -#: src/main/print-escp2.c:163 +#: src/main/print-escp2.c:165 msgid "Automatic printing mode" msgstr "" -#: src/main/print-escp2.c:174 src/main/print-escp2.c:175 +#: src/main/print-escp2.c:176 src/main/print-escp2.c:177 #: src/main/generic-options.c:62 src/main/generic-options.c:63 msgid "Print Quality" msgstr "" -#: src/main/print-escp2.c:229 +#: src/main/print-escp2.c:231 #, fuzzy msgid "Resolution of the print" -msgstr "Rozdzielczość" +msgstr "Rozdzielczo¶æ" -#: src/main/print-escp2.c:245 +#: src/main/print-escp2.c:247 msgid "Enhanced Gloss" msgstr "" -#: src/main/print-escp2.c:246 +#: src/main/print-escp2.c:248 msgid "Add gloss enhancement" msgstr "" -#: src/main/print-escp2.c:251 +#: src/main/print-escp2.c:253 #, fuzzy msgid "Ink Set" msgstr "Typ tuszu:" -#: src/main/print-escp2.c:257 +#: src/main/print-escp2.c:259 msgid "Printing Direction" msgstr "" -#: src/main/print-escp2.c:257 src/main/print-escp2.c:269 +#: src/main/print-escp2.c:259 src/main/print-escp2.c:271 msgid "Advanced Output Adjustment" msgstr "" -#: src/main/print-escp2.c:258 +#: src/main/print-escp2.c:260 msgid "Printing direction (unidirectional is higher quality, but slower)" msgstr "" -#: src/main/print-escp2.c:263 src/main/print-olympus.c:1735 +#: src/main/print-escp2.c:265 src/main/print-olympus.c:1733 msgid "Borderless" msgstr "" -#: src/main/print-escp2.c:264 src/main/print-olympus.c:1736 +#: src/main/print-escp2.c:266 src/main/print-olympus.c:1734 msgid "Print without borders" msgstr "" -#: src/main/print-escp2.c:269 +#: src/main/print-escp2.c:271 msgid "Interleave Method" msgstr "" -#: src/main/print-escp2.c:270 +#: src/main/print-escp2.c:272 msgid "Interleave pattern to use" msgstr "" -#: src/main/print-escp2.c:275 +#: src/main/print-escp2.c:277 msgid "Adjust dot size as necessary" msgstr "" -#: src/main/print-escp2.c:276 +#: src/main/print-escp2.c:278 msgid "Adjust dot size as necessary to achieve desired density" msgstr "" -#: src/main/print-escp2.c:281 src/main/print-escp2.c:282 +#: src/main/print-escp2.c:283 src/main/print-escp2.c:284 #, fuzzy msgid "Output Order" -msgstr "Typ wyjÅ›ciowy:" +msgstr "Typ wyj¶ciowy:" -#: src/main/print-escp2.c:287 src/main/print-escp2.c:288 +#: src/main/print-escp2.c:289 src/main/print-escp2.c:290 msgid "Alignment Passes" msgstr "" -#: src/main/print-escp2.c:293 src/main/print-escp2.c:294 +#: src/main/print-escp2.c:295 src/main/print-escp2.c:296 msgid "Alignment Choices" msgstr "" -#: src/main/print-escp2.c:299 src/main/print-escp2.c:300 +#: src/main/print-escp2.c:301 src/main/print-escp2.c:302 msgid "Ink change command" msgstr "" -#: src/main/print-escp2.c:305 src/main/print-escp2.c:306 +#: src/main/print-escp2.c:307 src/main/print-escp2.c:308 msgid "Alternate Alignment Passes" msgstr "" -#: src/main/print-escp2.c:311 src/main/print-escp2.c:312 +#: src/main/print-escp2.c:313 src/main/print-escp2.c:314 msgid "Alternate Alignment Choices" msgstr "" -#: src/main/print-escp2.c:317 +#: src/main/print-escp2.c:319 msgid "Supports Packet Mode" msgstr "" -#: src/main/print-escp2.c:318 +#: src/main/print-escp2.c:320 msgid "Supports D4 Packet Mode" msgstr "" -#: src/main/print-escp2.c:323 +#: src/main/print-escp2.c:325 msgid "Has Interchangeable Ink Cartridges" msgstr "" -#: src/main/print-escp2.c:324 +#: src/main/print-escp2.c:326 msgid "Has multiple choices of ink cartridges" msgstr "" -#: src/main/print-escp2.c:335 src/main/print-escp2.c:336 +#: src/main/print-escp2.c:337 src/main/print-escp2.c:338 #, fuzzy msgid "Channel Names" msgstr "Anuluj" -#: src/main/print-escp2.c:348 +#: src/main/print-escp2.c:350 msgid "Raw Channel Count" msgstr "" -#: src/main/print-escp2.c:353 +#: src/main/print-escp2.c:355 #, fuzzy msgid "Cyan Map" msgstr "Niebieskozielony" -#: src/main/print-escp2.c:354 +#: src/main/print-escp2.c:356 msgid "Adjust the cyan map" msgstr "" -#: src/main/print-escp2.c:359 +#: src/main/print-escp2.c:361 #, fuzzy msgid "Magenta Map" msgstr "Purpurowy" -#: src/main/print-escp2.c:360 +#: src/main/print-escp2.c:362 msgid "Adjust the magenta map" msgstr "" -#: src/main/print-escp2.c:365 +#: src/main/print-escp2.c:367 #, fuzzy msgid "Yellow Map" -msgstr "Żółć" +msgstr "¯ó³æ" -#: src/main/print-escp2.c:366 +#: src/main/print-escp2.c:368 msgid "Adjust the yellow map" msgstr "" -#: src/main/print-escp2.c:371 +#: src/main/print-escp2.c:373 #, fuzzy msgid "Blue Map" -msgstr "Żółć" +msgstr "¯ó³æ" -#: src/main/print-escp2.c:372 +#: src/main/print-escp2.c:374 msgid "Adjust the blue map" msgstr "" -#: src/main/print-escp2.c:377 +#: src/main/print-escp2.c:379 msgid "Red Map" msgstr "" -#: src/main/print-escp2.c:378 +#: src/main/print-escp2.c:380 msgid "Adjust the red map" msgstr "" -#: src/main/print-escp2.c:471 +#: src/main/print-escp2.c:478 #, fuzzy msgid "Red Density" -msgstr "GÄ™stość:" +msgstr "Gêsto¶æ:" -#: src/main/print-escp2.c:472 +#: src/main/print-escp2.c:479 msgid "Adjust the red density" msgstr "" -#: src/main/print-escp2.c:479 +#: src/main/print-escp2.c:486 #, fuzzy msgid "Blue Density" -msgstr "GÄ™stość:" +msgstr "Gêsto¶æ:" -#: src/main/print-escp2.c:480 +#: src/main/print-escp2.c:487 msgid "Adjust the blue density" msgstr "" -#: src/main/print-escp2.c:487 +#: src/main/print-escp2.c:494 msgid "Gloss Level" msgstr "" -#: src/main/print-escp2.c:488 +#: src/main/print-escp2.c:495 msgid "Adjust the gloss level" msgstr "" -#: src/main/print-escp2.c:511 src/main/print-escp2.c:512 +#: src/main/print-escp2.c:502 +msgid "Drop Size Small" +msgstr "" + +#: src/main/print-escp2.c:503 +msgid "Drop Size 1 (small)" +msgstr "" + +#: src/main/print-escp2.c:510 +msgid "Drop Size Medium" +msgstr "" + +#: src/main/print-escp2.c:511 +msgid "Drop Size 2 (medium)" +msgstr "" + +#: src/main/print-escp2.c:518 +msgid "Drop Size Large" +msgstr "" + +#: src/main/print-escp2.c:519 +msgid "Drop Size 3 (large)" +msgstr "" + +#: src/main/print-escp2.c:526 src/main/print-escp2.c:527 +#, fuzzy +msgid "Light Cyan Value" +msgstr "Purpurowy" + +#: src/main/print-escp2.c:542 src/main/print-escp2.c:543 +msgid "Light Cyan Density Scale" +msgstr "" + +#: src/main/print-escp2.c:550 src/main/print-escp2.c:551 +#, fuzzy +msgid "Light Magenta Value" +msgstr "Purpurowy" + +#: src/main/print-escp2.c:558 src/main/print-escp2.c:559 +#, fuzzy +msgid "Light Magenta Density Scale" +msgstr "Purpurowy" + +#: src/main/print-escp2.c:574 src/main/print-escp2.c:575 +#, fuzzy +msgid "Dark Yellow Value" +msgstr "¯ó³æ" + +#: src/main/print-escp2.c:582 src/main/print-escp2.c:583 msgid "Dark Yellow Transition" msgstr "" -#: src/main/print-escp2.c:519 src/main/print-escp2.c:520 -#: src/main/print-escp2.c:527 src/main/print-escp2.c:528 +#: src/main/print-escp2.c:590 src/main/print-escp2.c:591 +#, fuzzy +msgid "Dark Yellow Density Scale" +msgstr "¯ó³æ" + +#: src/main/print-escp2.c:598 src/main/print-escp2.c:599 +#: src/main/print-escp2.c:622 src/main/print-escp2.c:623 +#, fuzzy +msgid "Gray Value" +msgstr "Odcienie szaro¶ci" + +#: src/main/print-escp2.c:606 src/main/print-escp2.c:607 +#: src/main/print-escp2.c:630 src/main/print-escp2.c:631 msgid "Gray Transition" msgstr "" -#: src/main/print-escp2.c:535 src/main/print-escp2.c:536 -#: src/main/print-escp2.c:559 src/main/print-escp2.c:560 +#: src/main/print-escp2.c:614 src/main/print-escp2.c:615 +#: src/main/print-escp2.c:638 src/main/print-escp2.c:639 +#, fuzzy +msgid "Gray Density Scale" +msgstr "Odcienie szaro¶ci" + +#: src/main/print-escp2.c:646 src/main/print-escp2.c:647 +#: src/main/print-escp2.c:718 src/main/print-escp2.c:719 +msgid "Light Gray Value" +msgstr "" + +#: src/main/print-escp2.c:654 src/main/print-escp2.c:655 +#: src/main/print-escp2.c:726 src/main/print-escp2.c:727 msgid "Light Gray Transition" msgstr "" -#: src/main/print-escp2.c:543 src/main/print-escp2.c:544 +#: src/main/print-escp2.c:662 src/main/print-escp2.c:663 +#: src/main/print-escp2.c:734 src/main/print-escp2.c:735 +msgid "Light Gray Density Scale" +msgstr "" + +#: src/main/print-escp2.c:670 src/main/print-escp2.c:671 +msgid "Dark Gray Value" +msgstr "" + +#: src/main/print-escp2.c:678 src/main/print-escp2.c:679 msgid "Dark Gray Transition" msgstr "" -#: src/main/print-escp2.c:551 +#: src/main/print-escp2.c:686 src/main/print-escp2.c:687 +msgid "Dark Gray Density Scale" +msgstr "" + +#: src/main/print-escp2.c:694 +#, fuzzy +msgid "Mid Gray Value" +msgstr "Odcienie szaro¶ci" + +#: src/main/print-escp2.c:695 +msgid "Medium Gray Value" +msgstr "" + +#: src/main/print-escp2.c:702 msgid "Mid Gray Transition" msgstr "" -#: src/main/print-escp2.c:552 +#: src/main/print-escp2.c:703 msgid "Medium Gray Transition" msgstr "" -#: src/main/print-escp2.c:1635 +#: src/main/print-escp2.c:710 +msgid "Mid Gray Density Scale" +msgstr "" + +#: src/main/print-escp2.c:711 +msgid "Medium Gray Density Scale" +msgstr "" + +#: src/main/print-escp2.c:1999 #, fuzzy msgid "Full Manual Control" -msgstr "Typ wyjÅ›ciowy:" +msgstr "Typ wyj¶ciowy:" -#: src/main/print-escp2.c:1637 +#: src/main/print-escp2.c:2001 msgid "Automatic Setting Control" msgstr "" -#: src/main/print-escp2.c:1732 src/main/generic-options.c:213 +#: src/main/print-escp2.c:2096 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:1771 src/main/print-escp2.c:1863 -#: src/main/print-escp2.c:1875 src/main/print-pcl.c:230 -#: src/main/escp2-channels.c:2805 src/main/escp2-papers.c:1707 -#: src/main/escp2-papers.c:1731 src/main/escp2-papers.c:1764 -#: src/main/escp2-papers.c:1815 src/main/escp2-papers.c:1857 -#: src/main/escp2-papers.c:1899 src/main/escp2-papers.c:1992 -#: src/main/escp2-resolutions.c:640 src/main/escp2-resolutions.c:655 -#: src/main/escp2-resolutions.c:668 src/main/generic-options.c:36 -#: src/gutenprintui/panel.c:2613 src/gutenprintui2/panel.c:2639 +msgstr "Typ wyj¶ciowy:" + +#: src/main/print-escp2.c:2139 src/main/print-escp2.c:2231 +#: src/main/print-escp2.c:2243 src/main/print-pcl.c:237 +#: src/main/escp2-channels.c:2827 src/main/escp2-channels.c:2836 +#: src/main/escp2-papers.c:1718 src/main/escp2-papers.c:1742 +#: src/main/escp2-papers.c:1775 src/main/escp2-papers.c:1826 +#: src/main/escp2-papers.c:1868 src/main/escp2-papers.c:1910 +#: src/main/escp2-papers.c:2003 src/main/escp2-resolutions.c:640 +#: src/main/escp2-resolutions.c:655 src/main/escp2-resolutions.c:670 +#: src/main/escp2-resolutions.c:683 src/main/generic-options.c:36 +#: src/gutenprintui2/panel.c:2814 msgid "Standard" msgstr "" -#: src/main/print-escp2.c:1842 +#: src/main/print-escp2.c:2210 #, fuzzy msgid "Automatic" msgstr "Rozmiar" -#: src/main/print-escp2.c:1844 +#: src/main/print-escp2.c:2212 msgid "Bidirectional" msgstr "" -#: src/main/print-escp2.c:1846 +#: src/main/print-escp2.c:2214 #, fuzzy msgid "Unidirectional" msgstr "1440 x 720 DPI" -#: src/main/print-escp2.c:1877 +#: src/main/print-escp2.c:2245 msgid "Alternate Fill" msgstr "" -#: src/main/print-escp2.c:1879 +#: src/main/print-escp2.c:2247 msgid "Ascending Fill" msgstr "" -#: src/main/print-escp2.c:1881 +#: src/main/print-escp2.c:2249 msgid "Descending Fill" msgstr "" -#: src/main/print-escp2.c:1883 +#: src/main/print-escp2.c:2251 msgid "Ascending Double" msgstr "" -#: src/main/print-escp2.c:1885 +#: src/main/print-escp2.c:2253 msgid "Nearest Neighbor Avoidance" msgstr "" -#: src/main/print-escp2.c:2328 +#: src/main/print-escp2.c:2771 #, c-format msgid "This printer does not support raw printer output at depth %d\n" msgstr "" -#: src/main/print-escp2.c:3436 src/main/print-olympus.c:2451 +#: src/main/print-escp2.c:3934 src/main/print-olympus.c:2449 #: src/main/print-raw.c:217 msgid "Print options not verified; cannot print.\n" msgstr "" @@ -1398,109 +1527,109 @@ msgid "Three Color Composite" msgstr "" #: src/main/print-lexmark.c:607 src/main/print-lexmark.c:677 -#: src/main/escp2-channels.c:1540 src/main/escp2-channels.c:1554 -#: src/main/escp2-channels.c:1568 src/main/escp2-channels.c:1582 -#: src/main/escp2-channels.c:1808 src/main/escp2-channels.c:1823 -#: src/main/escp2-channels.c:1838 src/main/escp2-channels.c:1855 +#: src/main/escp2-channels.c:1554 src/main/escp2-channels.c:1568 +#: src/main/escp2-channels.c:1582 src/main/escp2-channels.c:1596 +#: src/main/escp2-channels.c:1822 src/main/escp2-channels.c:1837 +#: src/main/escp2-channels.c:1852 src/main/escp2-channels.c:1869 msgid "Six Color Photo" msgstr "" #: src/main/print-lexmark.c:610 src/main/print-lexmark.c:680 -#: src/main/escp2-channels.c:1475 src/main/escp2-channels.c:1489 -#: src/main/escp2-channels.c:1503 src/main/escp2-channels.c:1517 -#: src/main/escp2-channels.c:1752 src/main/escp2-channels.c:1767 -#: src/main/escp2-channels.c:1784 +#: src/main/escp2-channels.c:1489 src/main/escp2-channels.c:1503 +#: src/main/escp2-channels.c:1517 src/main/escp2-channels.c:1531 +#: src/main/escp2-channels.c:1766 src/main/escp2-channels.c:1781 +#: src/main/escp2-channels.c:1798 msgid "Five Color Photo Composite" msgstr "" -#: src/main/print-lexmark.c:856 src/main/escp2-papers.c:1341 -#: src/main/escp2-papers.c:1385 src/main/escp2-papers.c:1429 -#: src/main/escp2-papers.c:1477 src/main/escp2-papers.c:1525 -#: src/main/escp2-papers.c:1569 +#: src/main/print-lexmark.c:856 src/main/escp2-papers.c:1351 +#: src/main/escp2-papers.c:1395 src/main/escp2-papers.c:1439 +#: src/main/escp2-papers.c:1487 src/main/escp2-papers.c:1535 +#: src/main/escp2-papers.c:1579 msgid "Plain Paper" -msgstr "ZwykÅ‚y papier" +msgstr "Zwyk³y papier" -#: src/main/print-lexmark.c:860 src/main/escp2-papers.c:1347 -#: src/main/escp2-papers.c:1391 src/main/escp2-papers.c:1435 -#: src/main/escp2-papers.c:1483 src/main/escp2-papers.c:1531 -#: src/main/escp2-papers.c:1575 +#: src/main/print-lexmark.c:860 src/main/escp2-papers.c:1357 +#: src/main/escp2-papers.c:1401 src/main/escp2-papers.c:1445 +#: src/main/escp2-papers.c:1493 src/main/escp2-papers.c:1541 +#: src/main/escp2-papers.c:1585 msgid "Glossy Film" msgstr "" -#: src/main/print-lexmark.c:864 src/main/escp2-papers.c:1349 -#: src/main/escp2-papers.c:1393 src/main/escp2-papers.c:1437 -#: src/main/escp2-papers.c:1485 src/main/escp2-papers.c:1533 -#: src/main/escp2-papers.c:1577 +#: src/main/print-lexmark.c:864 src/main/escp2-papers.c:1359 +#: src/main/escp2-papers.c:1403 src/main/escp2-papers.c:1447 +#: src/main/escp2-papers.c:1495 src/main/escp2-papers.c:1543 +#: src/main/escp2-papers.c:1587 msgid "Transparencies" msgstr "Przezroczyste" -#: src/main/print-lexmark.c:868 src/main/escp2-papers.c:1351 -#: src/main/escp2-papers.c:1395 src/main/escp2-papers.c:1439 -#: src/main/escp2-papers.c:1487 src/main/escp2-papers.c:1535 -#: src/main/escp2-papers.c:1579 +#: src/main/print-lexmark.c:868 src/main/escp2-papers.c:1361 +#: src/main/escp2-papers.c:1405 src/main/escp2-papers.c:1449 +#: src/main/escp2-papers.c:1497 src/main/escp2-papers.c:1545 +#: src/main/escp2-papers.c:1589 msgid "Envelopes" msgstr "Koperty" -#: src/main/print-lexmark.c:872 src/main/escp2-papers.c:1355 -#: src/main/escp2-papers.c:1399 src/main/escp2-papers.c:1443 -#: src/main/escp2-papers.c:1491 src/main/escp2-papers.c:1539 -#: src/main/escp2-papers.c:1583 +#: src/main/print-lexmark.c:872 src/main/escp2-papers.c:1365 +#: src/main/escp2-papers.c:1409 src/main/escp2-papers.c:1453 +#: src/main/escp2-papers.c:1501 src/main/escp2-papers.c:1549 +#: src/main/escp2-papers.c:1593 msgid "Matte Paper" msgstr "" -#: src/main/print-lexmark.c:876 src/main/escp2-papers.c:1359 -#: src/main/escp2-papers.c:1403 src/main/escp2-papers.c:1447 -#: src/main/escp2-papers.c:1495 src/main/escp2-papers.c:1543 -#: src/main/escp2-papers.c:1587 +#: src/main/print-lexmark.c:876 src/main/escp2-papers.c:1369 +#: src/main/escp2-papers.c:1413 src/main/escp2-papers.c:1457 +#: src/main/escp2-papers.c:1505 src/main/escp2-papers.c:1553 +#: src/main/escp2-papers.c:1597 msgid "Inkjet Paper" msgstr "" -#: src/main/print-lexmark.c:880 src/main/escp2-papers.c:1361 -#: src/main/escp2-papers.c:1405 src/main/escp2-papers.c:1449 -#: src/main/escp2-papers.c:1497 src/main/escp2-papers.c:1545 -#: src/main/escp2-papers.c:1589 +#: src/main/print-lexmark.c:880 src/main/escp2-papers.c:1371 +#: src/main/escp2-papers.c:1415 src/main/escp2-papers.c:1459 +#: src/main/escp2-papers.c:1507 src/main/escp2-papers.c:1555 +#: src/main/escp2-papers.c:1599 msgid "Photo Quality Inkjet Paper" msgstr "" -#: src/main/print-lexmark.c:884 src/main/escp2-papers.c:1363 -#: src/main/escp2-papers.c:1407 src/main/escp2-papers.c:1451 -#: src/main/escp2-papers.c:1499 src/main/escp2-papers.c:1547 -#: src/main/escp2-papers.c:1591 +#: src/main/print-lexmark.c:884 src/main/escp2-papers.c:1373 +#: src/main/escp2-papers.c:1417 src/main/escp2-papers.c:1461 +#: src/main/escp2-papers.c:1509 src/main/escp2-papers.c:1557 +#: src/main/escp2-papers.c:1601 msgid "Photo Paper" msgstr "" -#: src/main/print-lexmark.c:888 src/main/escp2-papers.c:1365 -#: src/main/escp2-papers.c:1409 src/main/escp2-papers.c:1453 -#: src/main/escp2-papers.c:1501 src/main/escp2-papers.c:1549 -#: src/main/escp2-papers.c:1593 src/main/escp2-papers.c:1617 +#: src/main/print-lexmark.c:888 src/main/escp2-papers.c:1375 +#: src/main/escp2-papers.c:1419 src/main/escp2-papers.c:1463 +#: src/main/escp2-papers.c:1511 src/main/escp2-papers.c:1559 +#: src/main/escp2-papers.c:1603 src/main/escp2-papers.c:1627 msgid "Premium Glossy Photo Paper" msgstr "" -#: src/main/print-lexmark.c:892 src/main/escp2-papers.c:1369 -#: src/main/escp2-papers.c:1413 src/main/escp2-papers.c:1457 -#: src/main/escp2-papers.c:1505 src/main/escp2-papers.c:1553 -#: src/main/escp2-papers.c:1597 +#: src/main/print-lexmark.c:892 src/main/escp2-papers.c:1379 +#: src/main/escp2-papers.c:1423 src/main/escp2-papers.c:1467 +#: src/main/escp2-papers.c:1515 src/main/escp2-papers.c:1563 +#: src/main/escp2-papers.c:1607 msgid "Premium Luster Photo Paper" msgstr "" -#: src/main/print-lexmark.c:896 src/main/escp2-papers.c:1371 -#: src/main/escp2-papers.c:1415 src/main/escp2-papers.c:1463 -#: src/main/escp2-papers.c:1511 src/main/escp2-papers.c:1555 -#: src/main/escp2-papers.c:1603 +#: src/main/print-lexmark.c:896 src/main/escp2-papers.c:1381 +#: src/main/escp2-papers.c:1425 src/main/escp2-papers.c:1473 +#: src/main/escp2-papers.c:1521 src/main/escp2-papers.c:1565 +#: src/main/escp2-papers.c:1613 msgid "Photo Quality Glossy Paper" msgstr "" -#: src/main/print-lexmark.c:900 src/main/escp2-papers.c:1373 -#: src/main/escp2-papers.c:1417 src/main/escp2-papers.c:1465 -#: src/main/escp2-papers.c:1513 src/main/escp2-papers.c:1557 -#: src/main/escp2-papers.c:1605 +#: src/main/print-lexmark.c:900 src/main/escp2-papers.c:1383 +#: src/main/escp2-papers.c:1427 src/main/escp2-papers.c:1475 +#: src/main/escp2-papers.c:1523 src/main/escp2-papers.c:1567 +#: src/main/escp2-papers.c:1615 msgid "Ilford Heavy Paper" msgstr "" -#: src/main/print-lexmark.c:904 src/main/escp2-papers.c:1377 -#: src/main/escp2-papers.c:1421 src/main/escp2-papers.c:1469 -#: src/main/escp2-papers.c:1517 src/main/escp2-papers.c:1561 -#: src/main/escp2-papers.c:1609 src/main/escp2-papers.c:1619 +#: src/main/print-lexmark.c:904 src/main/escp2-papers.c:1387 +#: src/main/escp2-papers.c:1431 src/main/escp2-papers.c:1479 +#: src/main/escp2-papers.c:1527 src/main/escp2-papers.c:1571 +#: src/main/escp2-papers.c:1619 src/main/escp2-papers.c:1629 msgid "Other" msgstr "Inne" @@ -1516,50 +1645,50 @@ msgstr "" msgid "Manual without Pause" msgstr "" -#: src/main/print-olympus.c:277 +#: src/main/print-olympus.c:275 msgid "Coated" msgstr "" -#: src/main/print-olympus.c:278 src/cups/genppd.c:1726 src/cups/genppd.c:1753 -#: src/cups/genppd.c:1834 +#: src/main/print-olympus.c:276 src/cups/genppd.c:1732 src/cups/genppd.c:1759 +#: src/cups/genppd.c:1840 msgid "None" msgstr "" -#: src/main/print-olympus.c:963 src/main/print-olympus.c:1023 -#: src/main/print-olympus.c:1127 +#: src/main/print-olympus.c:961 src/main/print-olympus.c:1021 +#: src/main/print-olympus.c:1125 msgid "Glossy" msgstr "" -#: src/main/print-olympus.c:964 src/main/print-olympus.c:1024 -#: src/main/print-olympus.c:1128 +#: src/main/print-olympus.c:962 src/main/print-olympus.c:1022 +#: src/main/print-olympus.c:1126 msgid "Texture" msgstr "" -#: src/main/print-olympus.c:1025 src/main/print-olympus.c:1129 +#: src/main/print-olympus.c:1023 src/main/print-olympus.c:1127 msgid "Matte" msgstr "" -#: src/main/print-olympus.c:1729 src/main/print-olympus.c:1730 +#: src/main/print-olympus.c:1727 src/main/print-olympus.c:1728 msgid "Laminate Pattern" msgstr "" -#: src/main/print-olympus.c:1765 +#: src/main/print-olympus.c:1763 msgid "Adjust the cyan balance" msgstr "" -#: src/main/print-olympus.c:1773 +#: src/main/print-olympus.c:1771 msgid "Adjust the magenta balance" msgstr "" -#: src/main/print-olympus.c:1781 +#: src/main/print-olympus.c:1779 msgid "Adjust the yellow balance" msgstr "" -#: src/main/print-olympus.c:1788 +#: src/main/print-olympus.c:1786 msgid "Black Balance" msgstr "" -#: src/main/print-olympus.c:1789 +#: src/main/print-olympus.c:1787 msgid "Adjust the black balance" msgstr "" @@ -1581,7 +1710,7 @@ msgstr "" #: src/main/print-pcl.c:189 msgid "Transparency" -msgstr "Przezroczystość" +msgstr "Przezroczysto¶æ" #: src/main/print-pcl.c:190 msgid "Quick-dry Photo" @@ -1591,93 +1720,117 @@ msgstr "" msgid "Quick-dry Transparency" msgstr "" -#: src/main/print-pcl.c:231 src/main/xmli18n-tmp.h:16 +#: src/main/print-pcl.c:238 src/main/xmli18n-tmp.h:17 msgid "Manual" msgstr "" -#: src/main/print-pcl.c:233 +#: src/main/print-pcl.c:240 +msgid "Tray 1 - Movable Guides" +msgstr "" + +#: src/main/print-pcl.c:241 msgid "Tray 1" msgstr "" -#: src/main/print-pcl.c:234 src/main/print-pcl.c:240 +#: src/main/print-pcl.c:242 +msgid "Tray 2 - Movable Guides" +msgstr "" + +#: src/main/print-pcl.c:243 src/main/print-pcl.c:251 msgid "Tray 2" msgstr "" -#: src/main/print-pcl.c:235 +#: src/main/print-pcl.c:244 +msgid "Tray 3 - Movable Guides" +msgstr "" + +#: src/main/print-pcl.c:245 msgid "Tray 3" msgstr "" -#: src/main/print-pcl.c:236 +#: src/main/print-pcl.c:246 +msgid "Tray 4 - Movable Guides" +msgstr "" + +#: src/main/print-pcl.c:247 msgid "Tray 4" msgstr "" -#: src/main/print-pcl.c:237 +#: src/main/print-pcl.c:248 msgid "Portable Sheet Feeder" msgstr "" -#: src/main/print-pcl.c:238 +#: src/main/print-pcl.c:249 msgid "Desktop Sheet Feeder" msgstr "" -#: src/main/print-pcl.c:239 +#: src/main/print-pcl.c:250 msgid "Tray" msgstr "" -#: src/main/print-pcl.c:241 +#: src/main/print-pcl.c:252 msgid "Optional Source" msgstr "" -#: src/main/print-pcl.c:242 +#: src/main/print-pcl.c:253 msgid "Autoselect" msgstr "" -#: src/main/print-pcl.c:256 +#: src/main/print-pcl.c:267 msgid "150x150 DPI" msgstr "150x150 DPI" -#: src/main/print-pcl.c:257 +#: src/main/print-pcl.c:268 msgid "300x300 DPI" msgstr "300x300 DPI" -#: src/main/print-pcl.c:258 +#: src/main/print-pcl.c:269 msgid "600x300 DPI" msgstr "600x300 DPI" -#: src/main/print-pcl.c:259 +#: src/main/print-pcl.c:270 msgid "600x600 DPI monochrome" msgstr "" -#: src/main/print-pcl.c:260 +#: src/main/print-pcl.c:271 msgid "600x600 DPI" msgstr "600x600 DPI" -#: src/main/print-pcl.c:261 +#: src/main/print-pcl.c:272 msgid "1200x600 DPI" msgstr "1200x600 DPI" -#: src/main/print-pcl.c:262 +#: src/main/print-pcl.c:273 msgid "2400x600 DPI" msgstr "2400x600 DPI" -#: src/main/print-pcl.c:1470 +#: src/main/print-pcl.c:1538 msgid "Color + Black Cartridges" msgstr "" -#: src/main/print-pcl.c:1471 +#: src/main/print-pcl.c:1539 msgid "Color + Photo Cartridges" msgstr "" -#: src/main/print-ps.c:97 +#: src/main/print-ps.c:68 #, fuzzy msgid "PPDFile" msgstr "Plik PPD:" -#: src/main/print-ps.c:98 src/gutenprintui/panel.c:1768 -#: src/gutenprintui2/panel.c:1768 +#: src/main/print-ps.c:69 src/gutenprintui2/panel.c:1943 #, fuzzy msgid "PPD File" msgstr "Plik PPD?" +#: src/main/print-ps.c:74 +#, fuzzy +msgid "Model Name" +msgstr "Anuluj" + +#: src/main/print-ps.c:75 +msgid "PPD File Model Name" +msgstr "" + #: src/main/print-raw.c:223 msgid "Image dimensions must match paper dimensions" msgstr "" @@ -1685,296 +1838,302 @@ msgstr "" #: src/main/escp2-channels.c:965 src/main/escp2-channels.c:978 #, fuzzy msgid "Two Level Grayscale" -msgstr "Odcienie szaroÅ›ci" +msgstr "Odcienie szaro¶ci" #: src/main/escp2-channels.c:1000 src/main/escp2-channels.c:1013 #, fuzzy msgid "Three Level Grayscale" -msgstr "Odcienie szaroÅ›ci" +msgstr "Odcienie szaro¶ci" #: src/main/escp2-channels.c:1035 src/main/escp2-channels.c:1048 #: src/main/escp2-channels.c:1061 src/main/escp2-channels.c:1074 #: src/main/escp2-channels.c:1087 src/main/escp2-channels.c:1100 -#: src/main/escp2-channels.c:2505 src/main/escp2-channels.c:2528 -#: src/main/escp2-channels.c:2548 src/main/escp2-channels.c:2568 -#: src/main/escp2-channels.c:2588 src/main/escp2-channels.c:2608 +#: src/main/escp2-channels.c:2525 src/main/escp2-channels.c:2548 +#: src/main/escp2-channels.c:2568 src/main/escp2-channels.c:2588 +#: src/main/escp2-channels.c:2608 src/main/escp2-channels.c:2628 msgid "Quadtone" msgstr "" -#: src/main/escp2-channels.c:1604 src/main/escp2-channels.c:1618 +#: src/main/escp2-channels.c:1466 +#, fuzzy +msgid "Four Color Photo" +msgstr "Jednolite p³aszczyzny" + +#: src/main/escp2-channels.c:1618 src/main/escp2-channels.c:1632 msgid "Six Color Enhanced Composite" msgstr "" -#: src/main/escp2-channels.c:1641 src/main/escp2-channels.c:1655 -#: src/main/escp2-channels.c:1669 src/main/escp2-channels.c:1705 +#: src/main/escp2-channels.c:1655 src/main/escp2-channels.c:1669 +#: src/main/escp2-channels.c:1683 src/main/escp2-channels.c:1719 #, fuzzy msgid "Seven Color Photo" msgstr "Stylus Color Pro" -#: src/main/escp2-channels.c:1691 +#: src/main/escp2-channels.c:1705 #, fuzzy msgid "Seven Color Enhanced" msgstr "Stylus Color Pro" -#: src/main/escp2-channels.c:1728 +#: src/main/escp2-channels.c:1742 #, fuzzy msgid "Eight Color Photo" msgstr "Stylus Color Pro" -#: src/main/escp2-channels.c:1876 src/main/escp2-channels.c:1888 -#: src/main/escp2-channels.c:1894 +#: src/main/escp2-channels.c:1890 src/main/escp2-channels.c:1902 +#: src/main/escp2-channels.c:1908 #, fuzzy msgid "One Color Raw" msgstr "Stylus Color Pro" -#: src/main/escp2-channels.c:1900 +#: src/main/escp2-channels.c:1914 msgid "One Color Raw Enhanced Gloss" msgstr "" -#: src/main/escp2-channels.c:1913 src/main/escp2-channels.c:1925 +#: src/main/escp2-channels.c:1927 src/main/escp2-channels.c:1939 #, fuzzy msgid "Two Color Raw" -msgstr "Jednolite pÅ‚aszczyzny" +msgstr "Jednolite p³aszczyzny" -#: src/main/escp2-channels.c:1939 src/main/escp2-channels.c:1953 -#: src/main/escp2-channels.c:1980 src/main/escp2-channels.c:1993 -#: src/main/escp2-channels.c:2006 src/main/escp2-channels.c:2019 -#: src/main/escp2-channels.c:2033 src/main/escp2-channels.c:2047 -#: src/main/escp2-channels.c:2060 +#: src/main/escp2-channels.c:1953 src/main/escp2-channels.c:1967 +#: src/main/escp2-channels.c:1994 src/main/escp2-channels.c:2007 +#: src/main/escp2-channels.c:2020 src/main/escp2-channels.c:2033 +#: src/main/escp2-channels.c:2047 src/main/escp2-channels.c:2061 +#: src/main/escp2-channels.c:2074 #, fuzzy msgid "Three Color Raw" msgstr "Stylus Color Pro" -#: src/main/escp2-channels.c:1967 +#: src/main/escp2-channels.c:1981 #, fuzzy msgid "Three Color Raw Gloss" msgstr "Stylus Color Pro" -#: src/main/escp2-channels.c:2067 src/main/escp2-channels.c:2073 -#: src/main/escp2-channels.c:2079 src/main/escp2-channels.c:2085 -#: src/main/escp2-channels.c:2091 src/main/escp2-channels.c:2097 -#: src/main/escp2-channels.c:2103 src/main/escp2-channels.c:2109 -#: src/main/escp2-channels.c:2115 src/main/escp2-channels.c:2121 +#: src/main/escp2-channels.c:2081 src/main/escp2-channels.c:2087 +#: src/main/escp2-channels.c:2093 src/main/escp2-channels.c:2099 +#: src/main/escp2-channels.c:2105 src/main/escp2-channels.c:2111 +#: src/main/escp2-channels.c:2117 src/main/escp2-channels.c:2123 +#: src/main/escp2-channels.c:2129 src/main/escp2-channels.c:2135 +#: src/main/escp2-channels.c:2141 #, fuzzy msgid "Four Color Raw" -msgstr "Jednolite pÅ‚aszczyzny" +msgstr "Jednolite p³aszczyzny" -#: src/main/escp2-channels.c:2127 +#: src/main/escp2-channels.c:2147 #, fuzzy msgid "Four Color Raw Gloss" -msgstr "Jednolite pÅ‚aszczyzny" +msgstr "Jednolite p³aszczyzny" -#: src/main/escp2-channels.c:2142 src/main/escp2-channels.c:2156 +#: src/main/escp2-channels.c:2162 src/main/escp2-channels.c:2176 #, fuzzy msgid "Five Color Raw" msgstr "Stylus Color Pro" -#: src/main/escp2-channels.c:2170 src/main/escp2-channels.c:2186 -#: src/main/escp2-channels.c:2192 src/main/escp2-channels.c:2198 -#: src/main/escp2-channels.c:2213 src/main/escp2-channels.c:2234 +#: src/main/escp2-channels.c:2190 src/main/escp2-channels.c:2206 +#: src/main/escp2-channels.c:2212 src/main/escp2-channels.c:2218 +#: src/main/escp2-channels.c:2233 src/main/escp2-channels.c:2254 #, fuzzy msgid "Six Color Raw" -msgstr "Jednolite pÅ‚aszczyzny" +msgstr "Jednolite p³aszczyzny" -#: src/main/escp2-channels.c:2219 +#: src/main/escp2-channels.c:2239 #, fuzzy msgid "Six Color Enhanced Gloss Raw" -msgstr "Jednolite pÅ‚aszczyzny" +msgstr "Jednolite p³aszczyzny" -#: src/main/escp2-channels.c:2250 src/main/escp2-channels.c:2265 -#: src/main/escp2-channels.c:2280 +#: src/main/escp2-channels.c:2270 src/main/escp2-channels.c:2285 +#: src/main/escp2-channels.c:2300 #, fuzzy msgid "Seven Color Raw" msgstr "Stylus Color Pro" -#: src/main/escp2-channels.c:2297 +#: src/main/escp2-channels.c:2317 #, fuzzy msgid "Seven Color Enhanced Gloss Raw" msgstr "Stylus Color Pro" -#: src/main/escp2-channels.c:2315 +#: src/main/escp2-channels.c:2335 #, fuzzy msgid "Eight Color Raw" -msgstr "Jednolite pÅ‚aszczyzny" - -#: src/main/escp2-channels.c:2482 src/main/escp2-channels.c:2495 -#: src/main/escp2-channels.c:2497 src/main/escp2-channels.c:2517 -#: src/main/escp2-channels.c:2520 src/main/escp2-channels.c:2540 -#: src/main/escp2-channels.c:2560 src/main/escp2-channels.c:2580 -#: src/main/escp2-channels.c:2600 src/main/escp2-channels.c:2620 -#: src/main/escp2-channels.c:2636 src/main/escp2-channels.c:2638 -#: src/main/escp2-channels.c:2640 src/main/escp2-channels.c:2642 -#: src/main/escp2-channels.c:2658 src/main/escp2-channels.c:2674 -#: src/main/escp2-channels.c:2694 +msgstr "Jednolite p³aszczyzny" + +#: src/main/escp2-channels.c:2502 src/main/escp2-channels.c:2515 +#: src/main/escp2-channels.c:2517 src/main/escp2-channels.c:2537 +#: src/main/escp2-channels.c:2540 src/main/escp2-channels.c:2560 +#: src/main/escp2-channels.c:2580 src/main/escp2-channels.c:2600 +#: src/main/escp2-channels.c:2620 src/main/escp2-channels.c:2640 +#: src/main/escp2-channels.c:2656 src/main/escp2-channels.c:2658 +#: src/main/escp2-channels.c:2660 src/main/escp2-channels.c:2662 +#: src/main/escp2-channels.c:2678 src/main/escp2-channels.c:2694 +#: src/main/escp2-channels.c:2714 msgid "EPSON Standard Inks" msgstr "" -#: src/main/escp2-channels.c:2714 src/main/escp2-channels.c:2739 +#: src/main/escp2-channels.c:2734 src/main/escp2-channels.c:2759 #, fuzzy msgid "UltraChrome Photo Black" msgstr "Stylus Photo" -#: src/main/escp2-channels.c:2718 src/main/escp2-channels.c:2743 +#: src/main/escp2-channels.c:2738 src/main/escp2-channels.c:2763 msgid "UltraChrome Matte Black" msgstr "" -#: src/main/escp2-channels.c:2758 src/main/escp2-channels.c:2796 -#: src/main/escp2-channels.c:3167 src/escputil/escputil.c:976 +#: src/main/escp2-channels.c:2778 src/main/escp2-channels.c:2816 +#: src/main/escp2-channels.c:3206 src/escputil/escputil.c:976 #, fuzzy msgid "Photo Black" msgstr "Czarny" -#: src/main/escp2-channels.c:2762 src/main/escp2-channels.c:2778 -#: src/main/escp2-channels.c:3166 src/escputil/escputil.c:986 +#: src/main/escp2-channels.c:2782 src/main/escp2-channels.c:2798 +#: src/main/escp2-channels.c:3205 src/escputil/escputil.c:986 #, fuzzy msgid "Matte Black" msgstr "Czarny" -#: src/main/escp2-channels.c:3092 src/main/escp2-channels.c:3102 -#: src/main/escp2-channels.c:3114 src/main/escp2-channels.c:3128 -#: src/main/escp2-channels.c:3141 src/main/escp2-channels.c:3154 -#: src/main/escp2-channels.c:3191 src/escputil/escputil.c:981 +#: src/main/escp2-channels.c:3131 src/main/escp2-channels.c:3141 +#: src/main/escp2-channels.c:3153 src/main/escp2-channels.c:3167 +#: src/main/escp2-channels.c:3180 src/main/escp2-channels.c:3193 +#: src/main/escp2-channels.c:3240 src/escputil/escputil.c:981 #: src/escputil/escputil.c:1204 msgid "Light Cyan" msgstr "" -#: src/main/escp2-channels.c:3093 src/main/escp2-channels.c:3104 -#: src/main/escp2-channels.c:3115 src/main/escp2-channels.c:3129 -#: src/main/escp2-channels.c:3142 src/main/escp2-channels.c:3155 -#: src/main/escp2-channels.c:3190 src/escputil/escputil.c:982 +#: src/main/escp2-channels.c:3132 src/main/escp2-channels.c:3143 +#: src/main/escp2-channels.c:3154 src/main/escp2-channels.c:3168 +#: src/main/escp2-channels.c:3181 src/main/escp2-channels.c:3194 +#: src/main/escp2-channels.c:3239 src/escputil/escputil.c:982 #: src/escputil/escputil.c:1205 #, fuzzy msgid "Light Magenta" msgstr "Purpurowy" -#: src/main/escp2-channels.c:3130 src/main/escp2-channels.c:3192 +#: src/main/escp2-channels.c:3169 src/main/escp2-channels.c:3241 #: src/escputil/escputil.c:985 #, fuzzy msgid "Light Black" msgstr "Czarny" -#: src/main/escp2-channels.c:3143 +#: src/main/escp2-channels.c:3182 #, fuzzy msgid "Dark Yellow" -msgstr "Żółć" +msgstr "¯ó³æ" -#: src/main/escp2-channels.c:3170 src/escputil/escputil.c:989 +#: src/main/escp2-channels.c:3209 src/escputil/escputil.c:989 msgid "Gloss Optimizer" msgstr "" -#: src/main/escp2-channels.c:3189 src/escputil/escputil.c:990 +#: src/main/escp2-channels.c:3238 src/escputil/escputil.c:990 #, fuzzy msgid "Light Light Black" msgstr "Czarny" -#: src/main/escp2-papers.c:1343 src/main/escp2-papers.c:1387 -#: src/main/escp2-papers.c:1431 src/main/escp2-papers.c:1479 -#: src/main/escp2-papers.c:1527 src/main/escp2-papers.c:1571 +#: src/main/escp2-papers.c:1353 src/main/escp2-papers.c:1397 +#: src/main/escp2-papers.c:1441 src/main/escp2-papers.c:1489 +#: src/main/escp2-papers.c:1537 src/main/escp2-papers.c:1581 #, fuzzy msgid "Plain Paper Fast Load" -msgstr "ZwykÅ‚y papier" +msgstr "Zwyk³y papier" -#: src/main/escp2-papers.c:1345 src/main/escp2-papers.c:1389 -#: src/main/escp2-papers.c:1433 src/main/escp2-papers.c:1481 -#: src/main/escp2-papers.c:1529 src/main/escp2-papers.c:1573 +#: src/main/escp2-papers.c:1355 src/main/escp2-papers.c:1399 +#: src/main/escp2-papers.c:1443 src/main/escp2-papers.c:1491 +#: src/main/escp2-papers.c:1539 src/main/escp2-papers.c:1583 #: src/main/xmli18n-tmp.h:5 msgid "Postcard" msgstr "" -#: src/main/escp2-papers.c:1353 src/main/escp2-papers.c:1397 -#: src/main/escp2-papers.c:1441 src/main/escp2-papers.c:1489 -#: src/main/escp2-papers.c:1537 src/main/escp2-papers.c:1581 +#: src/main/escp2-papers.c:1363 src/main/escp2-papers.c:1407 +#: src/main/escp2-papers.c:1451 src/main/escp2-papers.c:1499 +#: src/main/escp2-papers.c:1547 src/main/escp2-papers.c:1591 msgid "Back Light Film" msgstr "" -#: src/main/escp2-papers.c:1357 src/main/escp2-papers.c:1401 -#: src/main/escp2-papers.c:1445 src/main/escp2-papers.c:1493 -#: src/main/escp2-papers.c:1541 src/main/escp2-papers.c:1585 -msgid "Matte Paper Heavyweight" -msgstr "" - #: src/main/escp2-papers.c:1367 src/main/escp2-papers.c:1411 #: src/main/escp2-papers.c:1455 src/main/escp2-papers.c:1503 #: src/main/escp2-papers.c:1551 src/main/escp2-papers.c:1595 +msgid "Matte Paper Heavyweight" +msgstr "" + +#: src/main/escp2-papers.c:1377 src/main/escp2-papers.c:1421 +#: src/main/escp2-papers.c:1465 src/main/escp2-papers.c:1513 +#: src/main/escp2-papers.c:1561 src/main/escp2-papers.c:1605 msgid "Premium Semigloss Photo Paper" msgstr "" -#: src/main/escp2-papers.c:1375 src/main/escp2-papers.c:1419 -#: src/main/escp2-papers.c:1467 src/main/escp2-papers.c:1515 -#: src/main/escp2-papers.c:1559 src/main/escp2-papers.c:1607 +#: src/main/escp2-papers.c:1385 src/main/escp2-papers.c:1429 +#: src/main/escp2-papers.c:1477 src/main/escp2-papers.c:1525 +#: src/main/escp2-papers.c:1569 src/main/escp2-papers.c:1617 #, fuzzy msgid "ColorLife Paper" -msgstr "ZwykÅ‚y papier" +msgstr "Zwyk³y papier" -#: src/main/escp2-papers.c:1459 src/main/escp2-papers.c:1507 -#: src/main/escp2-papers.c:1599 +#: src/main/escp2-papers.c:1469 src/main/escp2-papers.c:1517 +#: src/main/escp2-papers.c:1609 msgid "Archival Matte Paper" msgstr "" -#: src/main/escp2-papers.c:1461 src/main/escp2-papers.c:1509 -#: src/main/escp2-papers.c:1601 +#: src/main/escp2-papers.c:1471 src/main/escp2-papers.c:1519 +#: src/main/escp2-papers.c:1611 msgid "Watercolor Paper - Radiant White" msgstr "" -#: src/main/escp2-papers.c:1716 src/main/escp2-papers.c:1842 -#: src/main/escp2-papers.c:1884 src/main/escp2-papers.c:1926 -#: src/main/escp2-papers.c:2001 +#: src/main/escp2-papers.c:1727 src/main/escp2-papers.c:1853 +#: src/main/escp2-papers.c:1895 src/main/escp2-papers.c:1937 +#: src/main/escp2-papers.c:2012 msgid "Roll Feed" msgstr "" -#: src/main/escp2-papers.c:1740 src/main/escp2-papers.c:1791 +#: src/main/escp2-papers.c:1751 src/main/escp2-papers.c:1802 msgid "Roll Feed (cut each page)" msgstr "" -#: src/main/escp2-papers.c:1749 src/main/escp2-papers.c:1800 +#: src/main/escp2-papers.c:1760 src/main/escp2-papers.c:1811 msgid "Roll Feed (do not cut)" msgstr "" -#: src/main/escp2-papers.c:1773 src/main/escp2-papers.c:1824 +#: src/main/escp2-papers.c:1784 src/main/escp2-papers.c:1835 msgid "Manual Feed" msgstr "" -#: src/main/escp2-papers.c:1782 src/main/escp2-papers.c:1833 -#: src/main/escp2-papers.c:1935 src/main/escp2-papers.c:1968 +#: src/main/escp2-papers.c:1793 src/main/escp2-papers.c:1844 +#: src/main/escp2-papers.c:1946 src/main/escp2-papers.c:1979 #, fuzzy msgid "Print to CD" -msgstr "Wydrukować do pliku?" +msgstr "Wydrukowaæ do pliku?" -#: src/main/escp2-papers.c:1866 src/main/escp2-papers.c:1908 +#: src/main/escp2-papers.c:1877 src/main/escp2-papers.c:1919 msgid "Manual Sheet Guide" msgstr "" -#: src/main/escp2-papers.c:1875 src/main/escp2-papers.c:1917 +#: src/main/escp2-papers.c:1886 src/main/escp2-papers.c:1928 #, fuzzy msgid "Manual Feed (Front)" -msgstr "Typ wyjÅ›ciowy:" +msgstr "Typ wyj¶ciowy:" -#: src/main/escp2-papers.c:1950 +#: src/main/escp2-papers.c:1961 msgid "Rear Tray" msgstr "" -#: src/main/escp2-papers.c:1959 +#: src/main/escp2-papers.c:1970 msgid "Front Tray" msgstr "" -#: src/main/escp2-papers.c:1977 +#: src/main/escp2-papers.c:1988 #, fuzzy msgid "Photo Board" msgstr "Czarny" -#: src/main/escp2-papers.c:2016 +#: src/main/escp2-papers.c:2027 msgid "Cut Sheet Bin 1" msgstr "" -#: src/main/escp2-papers.c:2025 +#: src/main/escp2-papers.c:2036 msgid "Cut Sheet Bin 2" msgstr "" -#: src/main/escp2-papers.c:2034 +#: src/main/escp2-papers.c:2045 msgid "Cut Sheet Autoselect" msgstr "" -#: src/main/escp2-papers.c:2043 +#: src/main/escp2-papers.c:2054 msgid "Manual Selection" msgstr "" @@ -2127,49 +2286,55 @@ msgstr "Ustawienia drukarki" #: src/main/escp2-resolutions.c:594 #, fuzzy msgid "Eight Pass" -msgstr "Jasność:" +msgstr "Jasno¶æ:" #: src/main/escp2-resolutions.c:637 src/main/escp2-resolutions.c:652 -#: src/main/generic-options.c:33 +#: src/main/escp2-resolutions.c:667 src/main/generic-options.c:33 msgid "Fast Economy" msgstr "" #: src/main/escp2-resolutions.c:638 src/main/escp2-resolutions.c:653 -#: src/main/generic-options.c:34 +#: src/main/escp2-resolutions.c:668 src/main/generic-options.c:34 msgid "Economy" msgstr "" #: src/main/escp2-resolutions.c:639 src/main/escp2-resolutions.c:654 -#: src/main/escp2-resolutions.c:667 src/main/generic-options.c:35 +#: src/main/escp2-resolutions.c:669 src/main/escp2-resolutions.c:682 +#: src/main/generic-options.c:35 msgid "Draft" msgstr "" #: src/main/escp2-resolutions.c:641 src/main/escp2-resolutions.c:656 -#: src/main/escp2-resolutions.c:670 src/main/generic-options.c:37 +#: src/main/escp2-resolutions.c:671 src/main/escp2-resolutions.c:685 +#: src/main/generic-options.c:37 #, fuzzy msgid "High" -msgstr "Wysokość:" +msgstr "Wysoko¶æ:" #: src/main/escp2-resolutions.c:642 src/main/escp2-resolutions.c:657 -#: src/main/escp2-resolutions.c:669 src/main/generic-options.c:38 +#: src/main/escp2-resolutions.c:672 src/main/escp2-resolutions.c:684 +#: src/main/generic-options.c:38 #, fuzzy msgid "Photo" msgstr "Fotografia" #: src/main/escp2-resolutions.c:643 src/main/escp2-resolutions.c:658 -#: src/main/escp2-resolutions.c:671 src/main/generic-options.c:39 +#: src/main/escp2-resolutions.c:673 src/main/escp2-resolutions.c:686 +#: src/main/generic-options.c:39 #, fuzzy msgid "Super Photo" msgstr "Stylus Photo" #: src/main/escp2-resolutions.c:644 src/main/escp2-resolutions.c:659 -#: src/main/escp2-resolutions.c:672 src/main/generic-options.c:40 +#: src/main/escp2-resolutions.c:674 src/main/escp2-resolutions.c:687 +#: src/main/generic-options.c:40 #, fuzzy msgid "Ultra Photo" msgstr "Stylus Photo" #: src/main/escp2-resolutions.c:645 src/main/escp2-resolutions.c:660 -#: src/main/escp2-resolutions.c:673 src/main/generic-options.c:41 +#: src/main/escp2-resolutions.c:675 src/main/escp2-resolutions.c:688 +#: src/main/generic-options.c:41 msgid "Best" msgstr "" @@ -2192,7 +2357,7 @@ msgstr "Fotografia" #: src/main/generic-options.c:50 msgid "Line Art" -msgstr "Rysunek kreskÄ…" +msgstr "Rysunek kresk±" #: src/main/generic-options.c:55 #, fuzzy @@ -2251,4337 +2416,4581 @@ msgid "3x5" msgstr "3x5" #: src/main/xmli18n-tmp.h:10 +msgid "3 1/2 x5" +msgstr "" + +#: src/main/xmli18n-tmp.h:11 msgid "4x6" msgstr "4x6" -#: src/main/xmli18n-tmp.h:11 +#: src/main/xmli18n-tmp.h:12 msgid "Epson 4x6 Photo Paper (tear-off borders)" msgstr "" -#: src/main/xmli18n-tmp.h:12 +#: src/main/xmli18n-tmp.h:13 msgid "5x7" msgstr "5x7" -#: src/main/xmli18n-tmp.h:13 +#: src/main/xmli18n-tmp.h:14 msgid "5x8" msgstr "5x8" -#: src/main/xmli18n-tmp.h:14 +#: src/main/xmli18n-tmp.h:15 msgid "6x8" msgstr "6x8" -#: src/main/xmli18n-tmp.h:15 +#: src/main/xmli18n-tmp.h:16 msgid "8x10" msgstr "8x10" -#: src/main/xmli18n-tmp.h:17 +#: src/main/xmli18n-tmp.h:18 msgid "12x18" msgstr "12x18" -#: src/main/xmli18n-tmp.h:18 +#: src/main/xmli18n-tmp.h:19 msgid "Super B 13x19" msgstr "" -#: src/main/xmli18n-tmp.h:19 +#: src/main/xmli18n-tmp.h:20 msgid "Engineering C 17x22" msgstr "" -#: src/main/xmli18n-tmp.h:20 +#: src/main/xmli18n-tmp.h:21 msgid "8x12" msgstr "8x12" -#: src/main/xmli18n-tmp.h:21 +#: src/main/xmli18n-tmp.h:22 msgid "11x14" msgstr "11x14" -#: src/main/xmli18n-tmp.h:22 +#: src/main/xmli18n-tmp.h:23 msgid "16x20" msgstr "16x20" -#: src/main/xmli18n-tmp.h:23 +#: src/main/xmli18n-tmp.h:24 msgid "16x24" msgstr "16x24" -#: src/main/xmli18n-tmp.h:24 +#: src/main/xmli18n-tmp.h:25 msgid "20x24" msgstr "20x24" -#: src/main/xmli18n-tmp.h:25 +#: src/main/xmli18n-tmp.h:26 msgid "20x30" msgstr "20x30" -#: src/main/xmli18n-tmp.h:26 +#: src/main/xmli18n-tmp.h:27 #, fuzzy msgid "22x30" msgstr "20x30" -#: src/main/xmli18n-tmp.h:27 +#: src/main/xmli18n-tmp.h:28 msgid "24x30" msgstr "24x30" -#: src/main/xmli18n-tmp.h:28 +#: src/main/xmli18n-tmp.h:29 msgid "Super A1 24x36" msgstr "" -#: src/main/xmli18n-tmp.h:29 +#: src/main/xmli18n-tmp.h:30 msgid "30x40" msgstr "30x40" -#: src/main/xmli18n-tmp.h:30 +#: src/main/xmli18n-tmp.h:31 msgid "4A" msgstr "4A" -#: src/main/xmli18n-tmp.h:31 +#: src/main/xmli18n-tmp.h:32 msgid "2A" msgstr "2A" -#: src/main/xmli18n-tmp.h:32 +#: src/main/xmli18n-tmp.h:33 #, fuzzy msgid "Super A0" msgstr "Stylus Photo" -#: src/main/xmli18n-tmp.h:33 +#: src/main/xmli18n-tmp.h:34 msgid "A0" msgstr "A0" -#: src/main/xmli18n-tmp.h:34 +#: src/main/xmli18n-tmp.h:35 msgid "A1" msgstr "A1" -#: src/main/xmli18n-tmp.h:35 +#: src/main/xmli18n-tmp.h:36 msgid "A2" msgstr "A2" -#: src/main/xmli18n-tmp.h:36 +#: src/main/xmli18n-tmp.h:37 msgid "A3" msgstr "A3" -#: src/main/xmli18n-tmp.h:37 +#: src/main/xmli18n-tmp.h:38 msgid "A4" msgstr "A4" -#: src/main/xmli18n-tmp.h:38 +#: src/main/xmli18n-tmp.h:39 msgid "A5" msgstr "A5" -#: src/main/xmli18n-tmp.h:39 +#: src/main/xmli18n-tmp.h:40 msgid "A6" msgstr "A6" -#: src/main/xmli18n-tmp.h:40 +#: src/main/xmli18n-tmp.h:41 msgid "A7" msgstr "A7" -#: src/main/xmli18n-tmp.h:41 +#: src/main/xmli18n-tmp.h:42 msgid "A8" msgstr "A8" -#: src/main/xmli18n-tmp.h:42 +#: src/main/xmli18n-tmp.h:43 msgid "A9" msgstr "A9" -#: src/main/xmli18n-tmp.h:43 +#: src/main/xmli18n-tmp.h:44 msgid "A10" msgstr "A10" -#: src/main/xmli18n-tmp.h:44 +#: src/main/xmli18n-tmp.h:45 msgid "RA0" msgstr "RA0" -#: src/main/xmli18n-tmp.h:45 +#: src/main/xmli18n-tmp.h:46 msgid "RA1" msgstr "RA1" -#: src/main/xmli18n-tmp.h:46 +#: src/main/xmli18n-tmp.h:47 msgid "RA2" msgstr "RA2" -#: src/main/xmli18n-tmp.h:47 +#: src/main/xmli18n-tmp.h:48 msgid "RA3" msgstr "RA3" -#: src/main/xmli18n-tmp.h:48 +#: src/main/xmli18n-tmp.h:49 msgid "RA4" msgstr "RA4" -#: src/main/xmli18n-tmp.h:49 +#: src/main/xmli18n-tmp.h:50 msgid "SRA0" msgstr "SRA0" -#: src/main/xmli18n-tmp.h:50 +#: src/main/xmli18n-tmp.h:51 msgid "SRA1" msgstr "SRA1" -#: src/main/xmli18n-tmp.h:51 +#: src/main/xmli18n-tmp.h:52 msgid "SRA2" msgstr "SRA2" -#: src/main/xmli18n-tmp.h:52 +#: src/main/xmli18n-tmp.h:53 msgid "SRA3" msgstr "SRA3" -#: src/main/xmli18n-tmp.h:53 +#: src/main/xmli18n-tmp.h:54 msgid "SRA4" msgstr "SRA4" -#: src/main/xmli18n-tmp.h:54 +#: src/main/xmli18n-tmp.h:55 msgid "4B ISO" msgstr "4B ISO" -#: src/main/xmli18n-tmp.h:55 +#: src/main/xmli18n-tmp.h:56 msgid "2B ISO" msgstr "2B ISO" -#: src/main/xmli18n-tmp.h:56 +#: src/main/xmli18n-tmp.h:57 msgid "B0 ISO" msgstr "B0 ISO" -#: src/main/xmli18n-tmp.h:57 +#: src/main/xmli18n-tmp.h:58 msgid "B1 ISO" msgstr "B1 ISO" -#: src/main/xmli18n-tmp.h:58 +#: src/main/xmli18n-tmp.h:59 msgid "B2 ISO" msgstr "B2 ISO" -#: src/main/xmli18n-tmp.h:59 +#: src/main/xmli18n-tmp.h:60 msgid "B3 ISO" msgstr "B3 ISO" -#: src/main/xmli18n-tmp.h:60 +#: src/main/xmli18n-tmp.h:61 msgid "B4 ISO" msgstr "B4 ISO" -#: src/main/xmli18n-tmp.h:61 +#: src/main/xmli18n-tmp.h:62 msgid "B5 ISO" msgstr "B5 ISO" -#: src/main/xmli18n-tmp.h:62 +#: src/main/xmli18n-tmp.h:63 msgid "B6 ISO" msgstr "B6 ISO" -#: src/main/xmli18n-tmp.h:63 +#: src/main/xmli18n-tmp.h:64 msgid "B7 ISO" msgstr "B7 ISO" -#: src/main/xmli18n-tmp.h:64 +#: src/main/xmli18n-tmp.h:65 msgid "B8 ISO" msgstr "B8 ISO" -#: src/main/xmli18n-tmp.h:65 +#: src/main/xmli18n-tmp.h:66 msgid "B9 ISO" msgstr "B9 ISO" -#: src/main/xmli18n-tmp.h:66 +#: src/main/xmli18n-tmp.h:67 msgid "B10 ISO" msgstr "B10 ISO" -#: src/main/xmli18n-tmp.h:67 +#: src/main/xmli18n-tmp.h:68 #, fuzzy msgid "Super B0 JIS" msgstr "B0 JIS" -#: src/main/xmli18n-tmp.h:68 +#: src/main/xmli18n-tmp.h:69 msgid "B0 JIS" msgstr "B0 JIS" -#: src/main/xmli18n-tmp.h:69 +#: src/main/xmli18n-tmp.h:70 msgid "B1 JIS" msgstr "B1 JIS" -#: src/main/xmli18n-tmp.h:70 +#: src/main/xmli18n-tmp.h:71 msgid "B2 JIS" msgstr "B2 JIS" -#: src/main/xmli18n-tmp.h:71 +#: src/main/xmli18n-tmp.h:72 msgid "B3 JIS" msgstr "B3 JIS" -#: src/main/xmli18n-tmp.h:72 +#: src/main/xmli18n-tmp.h:73 msgid "B4 JIS" msgstr "B4 JIS" -#: src/main/xmli18n-tmp.h:73 +#: src/main/xmli18n-tmp.h:74 msgid "B5 JIS" msgstr "B5 JIS" -#: src/main/xmli18n-tmp.h:74 +#: src/main/xmli18n-tmp.h:75 msgid "B6 JIS" msgstr "B6 JIS" -#: src/main/xmli18n-tmp.h:75 +#: src/main/xmli18n-tmp.h:76 msgid "B7 JIS" msgstr "B7 JIS" -#: src/main/xmli18n-tmp.h:76 +#: src/main/xmli18n-tmp.h:77 msgid "B8 JIS" msgstr "B8 JIS" -#: src/main/xmli18n-tmp.h:77 +#: src/main/xmli18n-tmp.h:78 msgid "B9 JIS" msgstr "B9 JIS" -#: src/main/xmli18n-tmp.h:78 +#: src/main/xmli18n-tmp.h:79 msgid "B10 JIS" msgstr "B10 JIS" -#: src/main/xmli18n-tmp.h:79 +#: src/main/xmli18n-tmp.h:80 msgid "C0" msgstr "C0" -#: src/main/xmli18n-tmp.h:80 +#: src/main/xmli18n-tmp.h:81 +#, fuzzy +msgid "C0 landscape" +msgstr "Pejza¿" + +#: src/main/xmli18n-tmp.h:82 msgid "C1" msgstr "C1" -#: src/main/xmli18n-tmp.h:81 +#: src/main/xmli18n-tmp.h:83 +#, fuzzy +msgid "C1 landscape" +msgstr "Pejza¿" + +#: src/main/xmli18n-tmp.h:84 msgid "C2" msgstr "C2" -#: src/main/xmli18n-tmp.h:82 +#: src/main/xmli18n-tmp.h:85 +#, fuzzy +msgid "C2 landscape" +msgstr "Pejza¿" + +#: src/main/xmli18n-tmp.h:86 msgid "C3" msgstr "C3" -#: src/main/xmli18n-tmp.h:83 +#: src/main/xmli18n-tmp.h:87 +#, fuzzy +msgid "C3 landscape" +msgstr "Pejza¿" + +#: src/main/xmli18n-tmp.h:88 msgid "C4" msgstr "C4" -#: src/main/xmli18n-tmp.h:84 +#: src/main/xmli18n-tmp.h:89 +#, fuzzy +msgid "C4 landscape" +msgstr "Pejza¿" + +#: src/main/xmli18n-tmp.h:90 msgid "C5" msgstr "C5" -#: src/main/xmli18n-tmp.h:85 +#: src/main/xmli18n-tmp.h:91 +#, fuzzy +msgid "C5 landscape" +msgstr "Pejza¿" + +#: src/main/xmli18n-tmp.h:92 msgid "B6-C4" msgstr "B6-C4" -#: src/main/xmli18n-tmp.h:86 +#: src/main/xmli18n-tmp.h:93 +#, fuzzy +msgid "B6-C4 landscape" +msgstr "Pejza¿" + +#: src/main/xmli18n-tmp.h:94 msgid "C6" msgstr "C6" -#: src/main/xmli18n-tmp.h:87 +#: src/main/xmli18n-tmp.h:95 +#, fuzzy +msgid "C6 landscape" +msgstr "Pejza¿" + +#: src/main/xmli18n-tmp.h:96 msgid "DL" msgstr "DL" -#: src/main/xmli18n-tmp.h:88 +#: src/main/xmli18n-tmp.h:97 +#, fuzzy +msgid "DL landscape" +msgstr "Pejza¿" + +#: src/main/xmli18n-tmp.h:98 msgid "C7-6" msgstr "C7-6" -#: src/main/xmli18n-tmp.h:89 +#: src/main/xmli18n-tmp.h:99 +#, fuzzy +msgid "C7-6 landscape" +msgstr "Pejza¿" + +#: src/main/xmli18n-tmp.h:100 msgid "C7" msgstr "C7" -#: src/main/xmli18n-tmp.h:90 +#: src/main/xmli18n-tmp.h:101 +#, fuzzy +msgid "C7 landscape" +msgstr "Pejza¿" + +#: src/main/xmli18n-tmp.h:102 msgid "C8" msgstr "C8" -#: src/main/xmli18n-tmp.h:91 +#: src/main/xmli18n-tmp.h:103 +#, fuzzy +msgid "C8 landscape" +msgstr "Pejza¿" + +#: src/main/xmli18n-tmp.h:104 msgid "C9" msgstr "C9" -#: src/main/xmli18n-tmp.h:92 +#: src/main/xmli18n-tmp.h:105 +#, fuzzy +msgid "C9 landscape" +msgstr "Pejza¿" + +#: src/main/xmli18n-tmp.h:106 msgid "C10" msgstr "C10" -#: src/main/xmli18n-tmp.h:93 +#: src/main/xmli18n-tmp.h:107 +#, fuzzy +msgid "C10 landscape" +msgstr "Pejza¿" + +#: src/main/xmli18n-tmp.h:108 msgid "ArchA" msgstr "" -#: src/main/xmli18n-tmp.h:94 +#: src/main/xmli18n-tmp.h:109 msgid "ArchA transposed" msgstr "" -#: src/main/xmli18n-tmp.h:95 +#: src/main/xmli18n-tmp.h:110 msgid "ArchB" msgstr "" -#: src/main/xmli18n-tmp.h:96 +#: src/main/xmli18n-tmp.h:111 msgid "ArchB transposed" msgstr "" -#: src/main/xmli18n-tmp.h:97 +#: src/main/xmli18n-tmp.h:112 msgid "ArchC" msgstr "" -#: src/main/xmli18n-tmp.h:98 +#: src/main/xmli18n-tmp.h:113 msgid "ArchC transposed" msgstr "" -#: src/main/xmli18n-tmp.h:99 +#: src/main/xmli18n-tmp.h:114 msgid "ArchD" msgstr "" -#: src/main/xmli18n-tmp.h:100 +#: src/main/xmli18n-tmp.h:115 msgid "ArchD transposed" msgstr "" -#: src/main/xmli18n-tmp.h:101 +#: src/main/xmli18n-tmp.h:116 msgid "ArchE" msgstr "" -#: src/main/xmli18n-tmp.h:102 +#: src/main/xmli18n-tmp.h:117 msgid "ArchE transposed" msgstr "" -#: src/main/xmli18n-tmp.h:103 +#: src/main/xmli18n-tmp.h:118 msgid "American foolscap" msgstr "" -#: src/main/xmli18n-tmp.h:104 +#: src/main/xmli18n-tmp.h:119 msgid "European foolscap" msgstr "" -#: src/main/xmli18n-tmp.h:105 +#: src/main/xmli18n-tmp.h:120 msgid "Crown Quarto" msgstr "" -#: src/main/xmli18n-tmp.h:106 +#: src/main/xmli18n-tmp.h:121 msgid "Large Crown Quarto" msgstr "" -#: src/main/xmli18n-tmp.h:107 +#: src/main/xmli18n-tmp.h:122 msgid "Demy Quarto" msgstr "" -#: src/main/xmli18n-tmp.h:108 +#: src/main/xmli18n-tmp.h:123 msgid "Royal Quarto" msgstr "" -#: src/main/xmli18n-tmp.h:109 +#: src/main/xmli18n-tmp.h:124 #, fuzzy msgid "ISO A4" msgstr "SRA4" -#: src/main/xmli18n-tmp.h:110 +#: src/main/xmli18n-tmp.h:125 msgid "Crown Octavo" msgstr "" -#: src/main/xmli18n-tmp.h:111 +#: src/main/xmli18n-tmp.h:126 msgid "Large Crown Octavo" msgstr "" -#: src/main/xmli18n-tmp.h:112 +#: src/main/xmli18n-tmp.h:127 msgid "Demy Octavo" msgstr "" -#: src/main/xmli18n-tmp.h:113 +#: src/main/xmli18n-tmp.h:128 msgid "Royal Octavo" msgstr "" -#: src/main/xmli18n-tmp.h:114 +#: src/main/xmli18n-tmp.h:129 msgid "ISO A5" msgstr "" -#: src/main/xmli18n-tmp.h:115 +#: src/main/xmli18n-tmp.h:130 msgid "Small paperback" msgstr "" -#: src/main/xmli18n-tmp.h:116 +#: src/main/xmli18n-tmp.h:131 msgid "Penguin small paperback" msgstr "" -#: src/main/xmli18n-tmp.h:117 +#: src/main/xmli18n-tmp.h:132 msgid "Penguin large paperback" msgstr "" -#: src/main/xmli18n-tmp.h:118 +#: src/main/xmli18n-tmp.h:133 msgid "10cm x 15cm" msgstr "" -#: src/main/xmli18n-tmp.h:119 +#: src/main/xmli18n-tmp.h:134 msgid "Hagaki Card" msgstr "" -#: src/main/xmli18n-tmp.h:120 +#: src/main/xmli18n-tmp.h:135 msgid "Oufuku Card" msgstr "" -#: src/main/xmli18n-tmp.h:121 +#: src/main/xmli18n-tmp.h:136 msgid "Japanese long envelope #3" msgstr "" -#: src/main/xmli18n-tmp.h:122 +#: src/main/xmli18n-tmp.h:137 +msgid "Japanese long envelope #3 landscape" +msgstr "" + +#: src/main/xmli18n-tmp.h:138 msgid "Japanese long envelope #4" msgstr "" -#: src/main/xmli18n-tmp.h:123 +#: src/main/xmli18n-tmp.h:139 +msgid "Japanese long envelope #4 landscape" +msgstr "" + +#: src/main/xmli18n-tmp.h:140 msgid "Japanese Kaku envelope #4" msgstr "" -#: src/main/xmli18n-tmp.h:124 +#: src/main/xmli18n-tmp.h:141 +msgid "Japanese Kaku envelope #4 landscape" +msgstr "" + +#: src/main/xmli18n-tmp.h:142 msgid "Commercial 10" msgstr "" -#: src/main/xmli18n-tmp.h:125 +#: src/main/xmli18n-tmp.h:143 +msgid "Commercial 10 landscape" +msgstr "" + +#: src/main/xmli18n-tmp.h:144 msgid "A2 Invitation" msgstr "" -#: src/main/xmli18n-tmp.h:126 +#: src/main/xmli18n-tmp.h:145 #, fuzzy msgid "Monarch Envelope" msgstr "Koperta" -#: src/main/xmli18n-tmp.h:127 +#: src/main/xmli18n-tmp.h:146 +#, fuzzy +msgid "Monarch Envelope landscape" +msgstr "Koperta" + +#: src/main/xmli18n-tmp.h:147 msgid "4x5 3/8" msgstr "" -#: src/main/xmli18n-tmp.h:128 +#: src/main/xmli18n-tmp.h:148 #, fuzzy msgid "4x7" msgstr "5x7" -#: src/main/xmli18n-tmp.h:129 +#: src/main/xmli18n-tmp.h:149 msgid "CP_L" msgstr "" -#: src/main/xmli18n-tmp.h:130 +#: src/main/xmli18n-tmp.h:150 msgid "Card" msgstr "" -#: src/main/xmli18n-tmp.h:131 +#: src/main/xmli18n-tmp.h:151 msgid "Wide Postcard" msgstr "" -#: src/main/xmli18n-tmp.h:132 +#: src/main/xmli18n-tmp.h:152 msgid "Chilean Office" msgstr "" -#: src/main/xmli18n-tmp.h:133 +#: src/main/xmli18n-tmp.h:153 msgid "Chilean Double Letter" msgstr "" -#: src/main/xmli18n-tmp.h:134 +#: src/main/xmli18n-tmp.h:154 msgid "Chilean Double Office" msgstr "" -#: src/main/xmli18n-tmp.h:135 +#: src/main/xmli18n-tmp.h:155 #, fuzzy msgid "Custom" msgstr "Automatycznie" -#: src/main/xmli18n-tmp.h:136 +#: src/main/xmli18n-tmp.h:156 msgid "89 mm Roll Paper" msgstr "" -#: src/main/xmli18n-tmp.h:137 +#: src/main/xmli18n-tmp.h:157 msgid "4 Inch Roll Paper" msgstr "" -#: src/main/xmli18n-tmp.h:138 +#: src/main/xmli18n-tmp.h:158 msgid "5 Inch Roll Paper" msgstr "" -#: src/main/xmli18n-tmp.h:139 +#: src/main/xmli18n-tmp.h:159 msgid "210 mm Roll Paper" msgstr "" -#: src/main/xmli18n-tmp.h:140 +#: src/main/xmli18n-tmp.h:160 msgid "13 Inch Roll Paper" msgstr "" -#: src/main/xmli18n-tmp.h:141 +#: src/main/xmli18n-tmp.h:161 msgid "22 Inch Roll Paper" msgstr "" -#: src/main/xmli18n-tmp.h:142 +#: src/main/xmli18n-tmp.h:162 msgid "24 Inch Roll Paper" msgstr "" -#: src/main/xmli18n-tmp.h:143 +#: src/main/xmli18n-tmp.h:163 msgid "36 Inch Roll Paper" msgstr "" -#: src/main/xmli18n-tmp.h:144 +#: src/main/xmli18n-tmp.h:164 msgid "44 Inch Roll Paper" msgstr "" -#: src/main/xmli18n-tmp.h:145 +#: src/main/xmli18n-tmp.h:165 msgid "PostScript Level 1" msgstr "" -#: src/main/xmli18n-tmp.h:146 +#: src/main/xmli18n-tmp.h:166 msgid "PostScript Level 2" msgstr "" -#: src/main/xmli18n-tmp.h:147 +#: src/main/xmli18n-tmp.h:167 msgid "Canon BJ-30" msgstr "" -#: src/main/xmli18n-tmp.h:148 +#: src/main/xmli18n-tmp.h:168 msgid "Canon BJC-50" msgstr "" -#: src/main/xmli18n-tmp.h:149 +#: src/main/xmli18n-tmp.h:169 msgid "Canon BJC-55" msgstr "" -#: src/main/xmli18n-tmp.h:150 +#: src/main/xmli18n-tmp.h:170 msgid "Canon BJC-80" msgstr "" -#: src/main/xmli18n-tmp.h:151 +#: src/main/xmli18n-tmp.h:171 msgid "Canon BJC-85" msgstr "" -#: src/main/xmli18n-tmp.h:152 +#: src/main/xmli18n-tmp.h:172 msgid "Canon BJC-210" msgstr "" -#: src/main/xmli18n-tmp.h:153 +#: src/main/xmli18n-tmp.h:173 msgid "Canon BJC-240" msgstr "" -#: src/main/xmli18n-tmp.h:154 +#: src/main/xmli18n-tmp.h:174 msgid "Canon BJC-250" msgstr "" -#: src/main/xmli18n-tmp.h:155 +#: src/main/xmli18n-tmp.h:175 msgid "Canon BJC-1000" msgstr "" -#: src/main/xmli18n-tmp.h:156 +#: src/main/xmli18n-tmp.h:176 msgid "Canon BJC-2000" msgstr "" -#: src/main/xmli18n-tmp.h:157 +#: src/main/xmli18n-tmp.h:177 msgid "Canon BJC-2010" msgstr "" -#: src/main/xmli18n-tmp.h:158 +#: src/main/xmli18n-tmp.h:178 msgid "Canon BJC-2100" msgstr "" -#: src/main/xmli18n-tmp.h:159 +#: src/main/xmli18n-tmp.h:179 msgid "Canon BJC-2110" msgstr "" -#: src/main/xmli18n-tmp.h:160 +#: src/main/xmli18n-tmp.h:180 msgid "Canon BJC-3000" msgstr "" -#: src/main/xmli18n-tmp.h:161 +#: src/main/xmli18n-tmp.h:181 msgid "Canon BJC-4000" msgstr "" -#: src/main/xmli18n-tmp.h:162 +#: src/main/xmli18n-tmp.h:182 msgid "Canon BJC-4300" msgstr "" -#: src/main/xmli18n-tmp.h:163 +#: src/main/xmli18n-tmp.h:183 msgid "Canon BJC-4400" msgstr "" -#: src/main/xmli18n-tmp.h:164 +#: src/main/xmli18n-tmp.h:184 msgid "Canon BJC-5100" msgstr "" -#: src/main/xmli18n-tmp.h:165 +#: src/main/xmli18n-tmp.h:185 msgid "Canon BJC-5500" msgstr "" -#: src/main/xmli18n-tmp.h:166 +#: src/main/xmli18n-tmp.h:186 msgid "Canon BJC-6000" msgstr "" -#: src/main/xmli18n-tmp.h:167 +#: src/main/xmli18n-tmp.h:187 msgid "Canon BJC-6100" msgstr "" -#: src/main/xmli18n-tmp.h:168 +#: src/main/xmli18n-tmp.h:188 msgid "Canon BJC-6200" msgstr "" -#: src/main/xmli18n-tmp.h:169 +#: src/main/xmli18n-tmp.h:189 msgid "Canon BJC-6500" msgstr "" -#: src/main/xmli18n-tmp.h:170 +#: src/main/xmli18n-tmp.h:190 msgid "Canon BJC-7000" msgstr "" -#: src/main/xmli18n-tmp.h:171 +#: src/main/xmli18n-tmp.h:191 msgid "Canon BJC-7100" msgstr "" -#: src/main/xmli18n-tmp.h:172 +#: src/main/xmli18n-tmp.h:192 msgid "Canon BJC-8200" msgstr "" -#: src/main/xmli18n-tmp.h:173 +#: src/main/xmli18n-tmp.h:193 msgid "Canon BJC-8500" msgstr "" -#: src/main/xmli18n-tmp.h:174 +#: src/main/xmli18n-tmp.h:194 msgid "Canon S100" msgstr "" -#: src/main/xmli18n-tmp.h:175 +#: src/main/xmli18n-tmp.h:195 msgid "Canon S200" msgstr "" -#: src/main/xmli18n-tmp.h:176 +#: src/main/xmli18n-tmp.h:196 msgid "Canon S300" msgstr "" -#: src/main/xmli18n-tmp.h:177 +#: src/main/xmli18n-tmp.h:197 msgid "Canon S400" msgstr "" -#: src/main/xmli18n-tmp.h:178 +#: src/main/xmli18n-tmp.h:198 msgid "Canon S450" msgstr "" -#: src/main/xmli18n-tmp.h:179 +#: src/main/xmli18n-tmp.h:199 msgid "Canon S500" msgstr "" -#: src/main/xmli18n-tmp.h:180 +#: src/main/xmli18n-tmp.h:200 msgid "Canon S600" msgstr "" -#: src/main/xmli18n-tmp.h:181 +#: src/main/xmli18n-tmp.h:201 msgid "Canon S630" msgstr "" -#: src/main/xmli18n-tmp.h:182 +#: src/main/xmli18n-tmp.h:202 msgid "Canon S800" msgstr "" -#: src/main/xmli18n-tmp.h:183 +#: src/main/xmli18n-tmp.h:203 msgid "Canon S4500" msgstr "" -#: src/main/xmli18n-tmp.h:184 +#: src/main/xmli18n-tmp.h:204 msgid "Canon PIXMA iP2000" msgstr "" -#: src/main/xmli18n-tmp.h:185 +#: src/main/xmli18n-tmp.h:205 msgid "Canon PIXMA iP3000" msgstr "" -#: src/main/xmli18n-tmp.h:186 +#: src/main/xmli18n-tmp.h:206 msgid "Canon PIXMA iP3100" msgstr "" -#: src/main/xmli18n-tmp.h:187 +#: src/main/xmli18n-tmp.h:207 msgid "Canon PIXMA iP4000" msgstr "" -#: src/main/xmli18n-tmp.h:188 +#: src/main/xmli18n-tmp.h:208 msgid "Canon PIXMA iP4100" msgstr "" -#: src/main/xmli18n-tmp.h:189 +#: src/main/xmli18n-tmp.h:209 msgid "Canon PIXMA iP4200" msgstr "" -#: src/main/xmli18n-tmp.h:190 -#, fuzzy +#: src/main/xmli18n-tmp.h:210 msgid "Canon PIXMA iP4300" -msgstr "Stylus C60" +msgstr "" -#: src/main/xmli18n-tmp.h:191 -#, fuzzy +#: src/main/xmli18n-tmp.h:211 msgid "Canon PIXMA iP4500" -msgstr "Stylus C60" +msgstr "" -#: src/main/xmli18n-tmp.h:192 -#, fuzzy +#: src/main/xmli18n-tmp.h:212 msgid "Canon PIXMA iP5000" -msgstr "Stylus C60" +msgstr "" -#: src/main/xmli18n-tmp.h:193 +#: src/main/xmli18n-tmp.h:213 msgid "Canon PIXMA iP5200" msgstr "" -#: src/main/xmli18n-tmp.h:194 -#, fuzzy +#: src/main/xmli18n-tmp.h:214 msgid "Canon PIXMA iP5300" -msgstr "Stylus C60" +msgstr "" -#: src/main/xmli18n-tmp.h:195 -#, fuzzy +#: src/main/xmli18n-tmp.h:215 +msgid "Canon PIXMA iP6000D" +msgstr "" + +#: src/main/xmli18n-tmp.h:216 msgid "Canon PIXMA iP6700" -msgstr "Stylus C60" +msgstr "" -#: src/main/xmli18n-tmp.h:196 -#, fuzzy +#: src/main/xmli18n-tmp.h:217 msgid "Canon PIXMA iP8500" -msgstr "Stylus C60" +msgstr "" -#: src/main/xmli18n-tmp.h:197 -#, fuzzy +#: src/main/xmli18n-tmp.h:218 msgid "Canon PIXMA iX5000" -msgstr "Stylus C60" +msgstr "" -#: src/main/xmli18n-tmp.h:198 -#, fuzzy +#: src/main/xmli18n-tmp.h:219 msgid "Canon PIXMA Pro9500" -msgstr "Stylus C60" +msgstr "" -#: src/main/xmli18n-tmp.h:199 -#, fuzzy +#: src/main/xmli18n-tmp.h:220 msgid "Canon PIXMA MP150" -msgstr "Stylus C60" +msgstr "" -#: src/main/xmli18n-tmp.h:200 -#, fuzzy +#: src/main/xmli18n-tmp.h:221 msgid "Canon PIXMA MP170" -msgstr "Stylus C60" +msgstr "" -#: src/main/xmli18n-tmp.h:201 -#, fuzzy +#: src/main/xmli18n-tmp.h:222 msgid "Canon PIXMA MP180" -msgstr "Stylus C60" +msgstr "" -#: src/main/xmli18n-tmp.h:202 -#, fuzzy +#: src/main/xmli18n-tmp.h:223 msgid "Canon PIXMA MP500" -msgstr "Stylus C60" +msgstr "" -#: src/main/xmli18n-tmp.h:203 -#, fuzzy +#: src/main/xmli18n-tmp.h:224 +msgid "Canon PIXMA MP520" +msgstr "" + +#: src/main/xmli18n-tmp.h:225 msgid "Canon PIXMA MP610" -msgstr "Stylus C60" +msgstr "" -#: src/main/xmli18n-tmp.h:204 -#, fuzzy +#: src/main/xmli18n-tmp.h:226 msgid "Canon PIXMA MP700" -msgstr "Stylus C60" +msgstr "" -#: src/main/xmli18n-tmp.h:205 -#, fuzzy +#: src/main/xmli18n-tmp.h:227 msgid "Canon PIXMA MP710" -msgstr "Stylus C60" +msgstr "" -#: src/main/xmli18n-tmp.h:206 -#, fuzzy +#: src/main/xmli18n-tmp.h:228 msgid "Canon PIXMA MP730" -msgstr "Stylus C60" +msgstr "" -#: src/main/xmli18n-tmp.h:207 -#, fuzzy +#: src/main/xmli18n-tmp.h:229 msgid "Canon PIXMA MP740" -msgstr "Stylus C60" +msgstr "" -#: src/main/xmli18n-tmp.h:208 -#, fuzzy +#: src/main/xmli18n-tmp.h:230 msgid "Canon PIXMA MP750" -msgstr "Stylus C60" +msgstr "" -#: src/main/xmli18n-tmp.h:209 -#, fuzzy +#: src/main/xmli18n-tmp.h:231 msgid "Canon PIXMA MP760" -msgstr "Stylus C60" +msgstr "" -#: src/main/xmli18n-tmp.h:210 -#, fuzzy +#: src/main/xmli18n-tmp.h:232 msgid "Canon PIXMA MP770" -msgstr "Stylus C60" +msgstr "" -#: src/main/xmli18n-tmp.h:211 -#, fuzzy +#: src/main/xmli18n-tmp.h:233 msgid "Canon PIXMA MP780" -msgstr "Stylus C60" +msgstr "" -#: src/main/xmli18n-tmp.h:212 -#, fuzzy +#: src/main/xmli18n-tmp.h:234 msgid "Canon PIXMA MP790" -msgstr "Stylus C60" +msgstr "" -#: src/main/xmli18n-tmp.h:213 -#, fuzzy +#: src/main/xmli18n-tmp.h:235 msgid "Canon PIXMA MP830" -msgstr "Stylus C60" +msgstr "" -#: src/main/xmli18n-tmp.h:214 +#: src/main/xmli18n-tmp.h:236 msgid "Canon PIXUS iP3100" msgstr "" -#: src/main/xmli18n-tmp.h:215 +#: src/main/xmli18n-tmp.h:237 msgid "Canon PIXUS iP4100" msgstr "" -#: src/main/xmli18n-tmp.h:216 -#, fuzzy +#: src/main/xmli18n-tmp.h:238 msgid "Canon i80" -msgstr "Stylus C60" +msgstr "" -#: src/main/xmli18n-tmp.h:217 +#: src/main/xmli18n-tmp.h:239 msgid "Canon i560" msgstr "" -#: src/main/xmli18n-tmp.h:218 +#: src/main/xmli18n-tmp.h:240 msgid "Canon i850" msgstr "" -#: src/main/xmli18n-tmp.h:219 +#: src/main/xmli18n-tmp.h:241 msgid "Canon i860" msgstr "" -#: src/main/xmli18n-tmp.h:220 +#: src/main/xmli18n-tmp.h:242 msgid "Canon i865" msgstr "" -#: src/main/xmli18n-tmp.h:221 +#: src/main/xmli18n-tmp.h:243 #, fuzzy msgid "Epson Stylus C20" -msgstr "Stylus C20ux" +msgstr "Stylus C20sx" -#: src/main/xmli18n-tmp.h:222 +#: src/main/xmli18n-tmp.h:244 #, fuzzy msgid "Epson Stylus C20SX" msgstr "Stylus C20ux" -#: src/main/xmli18n-tmp.h:223 +#: src/main/xmli18n-tmp.h:245 #, fuzzy msgid "Epson Stylus C20UX" msgstr "Stylus C20ux" -#: src/main/xmli18n-tmp.h:224 +#: src/main/xmli18n-tmp.h:246 #, fuzzy msgid "Epson Stylus C40" -msgstr "Stylus C40ux" +msgstr "Stylus C40sx" -#: src/main/xmli18n-tmp.h:225 +#: src/main/xmli18n-tmp.h:247 #, fuzzy msgid "Epson Stylus C40SX" msgstr "Stylus C40ux" -#: src/main/xmli18n-tmp.h:226 +#: src/main/xmli18n-tmp.h:248 #, fuzzy msgid "Epson Stylus C40UX" msgstr "Stylus C40ux" -#: src/main/xmli18n-tmp.h:227 +#: src/main/xmli18n-tmp.h:249 #, fuzzy msgid "Epson Stylus C41" -msgstr "Stylus C40ux" +msgstr "Stylus C40sx" -#: src/main/xmli18n-tmp.h:228 +#: src/main/xmli18n-tmp.h:250 #, fuzzy msgid "Epson Stylus C41SX" msgstr "Stylus C40ux" -#: src/main/xmli18n-tmp.h:229 +#: src/main/xmli18n-tmp.h:251 #, fuzzy msgid "Epson Stylus C41UX" msgstr "Stylus C40ux" -#: src/main/xmli18n-tmp.h:230 +#: src/main/xmli18n-tmp.h:252 #, fuzzy msgid "Epson Stylus C42" -msgstr "Stylus C40ux" +msgstr "Stylus C40sx" -#: src/main/xmli18n-tmp.h:231 +#: src/main/xmli18n-tmp.h:253 #, fuzzy msgid "Epson Stylus C42SX" msgstr "Stylus C40ux" -#: src/main/xmli18n-tmp.h:232 +#: src/main/xmli18n-tmp.h:254 #, fuzzy msgid "Epson Stylus C42UX" msgstr "Stylus C40ux" -#: src/main/xmli18n-tmp.h:233 +#: src/main/xmli18n-tmp.h:255 #, fuzzy msgid "Epson Stylus C43" msgstr "Stylus C40ux" -#: src/main/xmli18n-tmp.h:234 +#: src/main/xmli18n-tmp.h:256 #, fuzzy msgid "Epson Stylus C43SX" msgstr "Stylus C40ux" -#: src/main/xmli18n-tmp.h:235 +#: src/main/xmli18n-tmp.h:257 #, fuzzy msgid "Epson Stylus C43UX" msgstr "Stylus C40ux" -#: src/main/xmli18n-tmp.h:236 +#: src/main/xmli18n-tmp.h:258 #, fuzzy msgid "Epson Stylus C44" msgstr "Stylus C40ux" -#: src/main/xmli18n-tmp.h:237 +#: src/main/xmli18n-tmp.h:259 #, fuzzy msgid "Epson Stylus C44SX" msgstr "Stylus C40ux" -#: src/main/xmli18n-tmp.h:238 +#: src/main/xmli18n-tmp.h:260 #, fuzzy msgid "Epson Stylus C44UX" msgstr "Stylus C40ux" -#: src/main/xmli18n-tmp.h:239 +#: src/main/xmli18n-tmp.h:261 #, fuzzy msgid "Epson Stylus C45" msgstr "Stylus C60" -#: src/main/xmli18n-tmp.h:240 +#: src/main/xmli18n-tmp.h:262 #, fuzzy msgid "Epson Stylus C46" msgstr "Stylus C60" -#: src/main/xmli18n-tmp.h:241 +#: src/main/xmli18n-tmp.h:263 #, fuzzy msgid "Epson Stylus C48" -msgstr "Stylus C60" +msgstr "Stylus C80" -#: src/main/xmli18n-tmp.h:242 +#: src/main/xmli18n-tmp.h:264 #, fuzzy msgid "Epson Stylus C50" msgstr "Stylus C60" -#: src/main/xmli18n-tmp.h:243 +#: src/main/xmli18n-tmp.h:265 #, fuzzy msgid "Epson Stylus C60" msgstr "Stylus C60" -#: src/main/xmli18n-tmp.h:244 +#: src/main/xmli18n-tmp.h:266 #, fuzzy msgid "Epson Stylus C61" msgstr "Stylus C60" -#: src/main/xmli18n-tmp.h:245 +#: src/main/xmli18n-tmp.h:267 #, fuzzy msgid "Epson Stylus C62" msgstr "Stylus C60" -#: src/main/xmli18n-tmp.h:246 +#: src/main/xmli18n-tmp.h:268 #, fuzzy msgid "Epson Stylus C63" msgstr "Stylus C60" -#: src/main/xmli18n-tmp.h:247 +#: src/main/xmli18n-tmp.h:269 #, fuzzy msgid "Epson Stylus C64" msgstr "Stylus C60" -#: src/main/xmli18n-tmp.h:248 +#: src/main/xmli18n-tmp.h:270 #, fuzzy msgid "Epson Stylus C65" msgstr "Stylus C60" -#: src/main/xmli18n-tmp.h:249 +#: src/main/xmli18n-tmp.h:271 #, fuzzy msgid "Epson Stylus C66" msgstr "Stylus C60" -#: src/main/xmli18n-tmp.h:250 +#: src/main/xmli18n-tmp.h:272 #, fuzzy msgid "Epson Stylus C68" msgstr "Stylus C60" -#: src/main/xmli18n-tmp.h:251 +#: src/main/xmli18n-tmp.h:273 #, fuzzy msgid "Epson Stylus C70" msgstr "Stylus C70" -#: src/main/xmli18n-tmp.h:252 +#: src/main/xmli18n-tmp.h:274 #, fuzzy msgid "Epson Stylus C79" msgstr "Stylus C70" -#: src/main/xmli18n-tmp.h:253 +#: src/main/xmli18n-tmp.h:275 #, fuzzy msgid "Epson Stylus C80" msgstr "Stylus C80" -#: src/main/xmli18n-tmp.h:254 +#: src/main/xmli18n-tmp.h:276 #, fuzzy msgid "Epson Stylus C82" msgstr "Stylus C80" -#: src/main/xmli18n-tmp.h:255 +#: src/main/xmli18n-tmp.h:277 #, fuzzy msgid "Epson Stylus C83" msgstr "Stylus C80" -#: src/main/xmli18n-tmp.h:256 +#: src/main/xmli18n-tmp.h:278 #, fuzzy msgid "Epson Stylus C84" msgstr "Stylus C80" -#: src/main/xmli18n-tmp.h:257 +#: src/main/xmli18n-tmp.h:279 #, fuzzy msgid "Epson Stylus C85" msgstr "Stylus C60" -#: src/main/xmli18n-tmp.h:258 +#: src/main/xmli18n-tmp.h:280 #, fuzzy msgid "Epson Stylus C86" msgstr "Stylus C60" -#: src/main/xmli18n-tmp.h:259 +#: src/main/xmli18n-tmp.h:281 #, fuzzy msgid "Epson Stylus C87" -msgstr "Stylus C60" +msgstr "Stylus C70" -#: src/main/xmli18n-tmp.h:260 +#: src/main/xmli18n-tmp.h:282 #, fuzzy msgid "Epson Stylus C88" msgstr "Stylus C80" -#: src/main/xmli18n-tmp.h:261 +#: src/main/xmli18n-tmp.h:283 #, fuzzy msgid "Epson Stylus C110" -msgstr "Stylus C20ux" +msgstr "Stylus C60" -#: src/main/xmli18n-tmp.h:262 +#: src/main/xmli18n-tmp.h:284 #, fuzzy msgid "Epson Stylus C120" -msgstr "Stylus C20ux" +msgstr "Stylus C20sx" -#: src/main/xmli18n-tmp.h:263 +#: src/main/xmli18n-tmp.h:285 #, fuzzy msgid "Epson Stylus Color" msgstr "Stylus Color" -#: src/main/xmli18n-tmp.h:264 +#: src/main/xmli18n-tmp.h:286 #, fuzzy msgid "Epson Stylus Color I" msgstr "Stylus Color" -#: src/main/xmli18n-tmp.h:265 +#: src/main/xmli18n-tmp.h:287 #, fuzzy msgid "Epson Stylus Color II" msgstr "Stylus Color" -#: src/main/xmli18n-tmp.h:266 +#: src/main/xmli18n-tmp.h:288 #, fuzzy msgid "Epson Stylus Color IIs" msgstr "Stylus Color" -#: src/main/xmli18n-tmp.h:267 +#: src/main/xmli18n-tmp.h:289 #, fuzzy msgid "Epson Stylus Color PRO" msgstr "Stylus Color Pro" -#: src/main/xmli18n-tmp.h:268 +#: src/main/xmli18n-tmp.h:290 #, fuzzy msgid "Epson Stylus Pro XL" msgstr "Stylus Color Pro XL" -#: src/main/xmli18n-tmp.h:269 +#: src/main/xmli18n-tmp.h:291 #, fuzzy msgid "Epson Stylus Color 400" msgstr "Stylus Color 400" -#: src/main/xmli18n-tmp.h:270 +#: src/main/xmli18n-tmp.h:292 #, fuzzy msgid "Epson Stylus Color 440" msgstr "Stylus Color 440" -#: src/main/xmli18n-tmp.h:271 +#: src/main/xmli18n-tmp.h:293 #, fuzzy msgid "Epson Stylus Color 460" msgstr "Stylus Color 460" -#: src/main/xmli18n-tmp.h:272 +#: src/main/xmli18n-tmp.h:294 #, fuzzy msgid "Epson Stylus Color 480" msgstr "Stylus Color 480" -#: src/main/xmli18n-tmp.h:273 +#: src/main/xmli18n-tmp.h:295 #, fuzzy msgid "Epson Stylus Color 500" msgstr "Stylus Color 500" -#: src/main/xmli18n-tmp.h:274 +#: src/main/xmli18n-tmp.h:296 #, fuzzy msgid "Epson Stylus Color 580" msgstr "Stylus Color 580" -#: src/main/xmli18n-tmp.h:275 +#: src/main/xmli18n-tmp.h:297 #, fuzzy msgid "Epson Stylus Color 600" msgstr "Stylus Color 600" -#: src/main/xmli18n-tmp.h:276 +#: src/main/xmli18n-tmp.h:298 #, fuzzy msgid "Epson Stylus Color 640" msgstr "Stylus Color 640" -#: src/main/xmli18n-tmp.h:277 +#: src/main/xmli18n-tmp.h:299 #, fuzzy msgid "Epson Stylus Color 660" msgstr "Stylus Color 660" -#: src/main/xmli18n-tmp.h:278 +#: src/main/xmli18n-tmp.h:300 #, fuzzy msgid "Epson Stylus Color 670" msgstr "Stylus Color 670" -#: src/main/xmli18n-tmp.h:279 +#: src/main/xmli18n-tmp.h:301 #, fuzzy msgid "Epson Stylus Color 680" msgstr "Stylus Color 680" -#: src/main/xmli18n-tmp.h:280 +#: src/main/xmli18n-tmp.h:302 #, fuzzy msgid "Epson Stylus Color 740" msgstr "Stylus Color 740" -#: src/main/xmli18n-tmp.h:281 +#: src/main/xmli18n-tmp.h:303 #, fuzzy msgid "Epson Stylus Color 760" msgstr "Stylus Color 760" -#: src/main/xmli18n-tmp.h:282 +#: src/main/xmli18n-tmp.h:304 #, fuzzy msgid "Epson Stylus Color 777" msgstr "Stylus Color 777" -#: src/main/xmli18n-tmp.h:283 +#: src/main/xmli18n-tmp.h:305 #, fuzzy msgid "Epson Stylus Color 800" msgstr "Stylus Color 800" -#: src/main/xmli18n-tmp.h:284 +#: src/main/xmli18n-tmp.h:306 #, fuzzy msgid "Epson Stylus Color 850" msgstr "Stylus Color 850" -#: src/main/xmli18n-tmp.h:285 +#: src/main/xmli18n-tmp.h:307 #, fuzzy msgid "Epson Stylus Color 860" msgstr "Stylus Color 860" -#: src/main/xmli18n-tmp.h:286 +#: src/main/xmli18n-tmp.h:308 #, fuzzy msgid "Epson Stylus Color 880" msgstr "Stylus Color 880" -#: src/main/xmli18n-tmp.h:287 +#: src/main/xmli18n-tmp.h:309 #, fuzzy msgid "Epson Stylus Color 8 3" msgstr "Stylus Color 83" -#: src/main/xmli18n-tmp.h:288 +#: src/main/xmli18n-tmp.h:310 #, fuzzy msgid "Epson Stylus Color 900" msgstr "Stylus Color 900" -#: src/main/xmli18n-tmp.h:289 +#: src/main/xmli18n-tmp.h:311 #, fuzzy msgid "Epson Stylus Color 980" msgstr "Stylus Color 980" -#: src/main/xmli18n-tmp.h:290 +#: src/main/xmli18n-tmp.h:312 #, fuzzy msgid "Epson Stylus Color 1160" msgstr "Stylus Color 1160" -#: src/main/xmli18n-tmp.h:291 +#: src/main/xmli18n-tmp.h:313 #, fuzzy msgid "Epson Stylus Color 1500" msgstr "Stylus Color 1500" -#: src/main/xmli18n-tmp.h:292 +#: src/main/xmli18n-tmp.h:314 #, fuzzy msgid "Epson Stylus Color 1520" msgstr "Stylus Color 1520" -#: src/main/xmli18n-tmp.h:293 +#: src/main/xmli18n-tmp.h:315 #, fuzzy msgid "Epson Stylus Color 3000" msgstr "Stylus Color 3000" -#: src/main/xmli18n-tmp.h:294 +#: src/main/xmli18n-tmp.h:316 #, fuzzy msgid "Epson Stylus Photo" msgstr "Stylus Photo" -#: src/main/xmli18n-tmp.h:295 +#: src/main/xmli18n-tmp.h:317 #, fuzzy msgid "Epson Stylus Photo 700" msgstr "Stylus Photo 700" -#: src/main/xmli18n-tmp.h:296 +#: src/main/xmli18n-tmp.h:318 #, fuzzy msgid "Epson Stylus Photo EX" msgstr "Stylus Photo EX" -#: src/main/xmli18n-tmp.h:297 +#: src/main/xmli18n-tmp.h:319 #, fuzzy msgid "Epson Stylus Photo EX3" msgstr "Stylus Photo EX" -#: src/main/xmli18n-tmp.h:298 +#: src/main/xmli18n-tmp.h:320 #, fuzzy msgid "Epson Stylus Photo 720" msgstr "Stylus Photo 720" -#: src/main/xmli18n-tmp.h:299 +#: src/main/xmli18n-tmp.h:321 #, fuzzy msgid "Epson Stylus Photo 750" msgstr "Stylus Photo 750" -#: src/main/xmli18n-tmp.h:300 +#: src/main/xmli18n-tmp.h:322 #, fuzzy msgid "Epson Stylus Photo 780" msgstr "Stylus Photo 780" -#: src/main/xmli18n-tmp.h:301 +#: src/main/xmli18n-tmp.h:323 #, fuzzy msgid "Epson Stylus Photo 785" msgstr "Stylus Photo 785" -#: src/main/xmli18n-tmp.h:302 +#: src/main/xmli18n-tmp.h:324 #, fuzzy msgid "Epson Stylus Photo 790" msgstr "Stylus Photo 790" -#: src/main/xmli18n-tmp.h:303 +#: src/main/xmli18n-tmp.h:325 #, fuzzy msgid "Epson Stylus Photo 810" msgstr "Stylus Photo 810" -#: src/main/xmli18n-tmp.h:304 +#: src/main/xmli18n-tmp.h:326 #, fuzzy msgid "Epson Stylus Photo 820" msgstr "Stylus Photo 820" -#: src/main/xmli18n-tmp.h:305 +#: src/main/xmli18n-tmp.h:327 #, fuzzy msgid "Epson Stylus Photo 825" msgstr "Stylus Photo 785" -#: src/main/xmli18n-tmp.h:306 +#: src/main/xmli18n-tmp.h:328 #, fuzzy msgid "Epson Stylus Photo 830" msgstr "Stylus Photo 780" -#: src/main/xmli18n-tmp.h:307 +#: src/main/xmli18n-tmp.h:329 #, fuzzy msgid "Epson Stylus Photo 830U" msgstr "Stylus Photo 780" -#: src/main/xmli18n-tmp.h:308 +#: src/main/xmli18n-tmp.h:330 #, fuzzy msgid "Epson Stylus Photo 870" msgstr "Stylus Photo 870" -#: src/main/xmli18n-tmp.h:309 +#: src/main/xmli18n-tmp.h:331 #, fuzzy msgid "Epson Stylus Photo 875" msgstr "Stylus Photo 875" -#: src/main/xmli18n-tmp.h:310 +#: src/main/xmli18n-tmp.h:332 #, fuzzy msgid "Epson Stylus Photo 890" msgstr "Stylus Photo 890" -#: src/main/xmli18n-tmp.h:311 +#: src/main/xmli18n-tmp.h:333 #, fuzzy msgid "Epson Stylus Photo 895" msgstr "Stylus Photo 895" -#: src/main/xmli18n-tmp.h:312 +#: src/main/xmli18n-tmp.h:334 #, fuzzy msgid "Epson Stylus Photo 900" msgstr "Stylus Photo 700" -#: src/main/xmli18n-tmp.h:313 +#: src/main/xmli18n-tmp.h:335 #, fuzzy msgid "Epson Stylus Photo 915" msgstr "Stylus Photo 895" -#: src/main/xmli18n-tmp.h:314 +#: src/main/xmli18n-tmp.h:336 #, fuzzy msgid "Epson Stylus Photo 925" msgstr "Stylus Photo 895" -#: src/main/xmli18n-tmp.h:315 +#: src/main/xmli18n-tmp.h:337 #, fuzzy msgid "Epson Stylus Photo 935" msgstr "Stylus Photo 895" -#: src/main/xmli18n-tmp.h:316 +#: src/main/xmli18n-tmp.h:338 #, fuzzy msgid "Epson Stylus Photo 950" msgstr "Stylus Photo 750" -#: src/main/xmli18n-tmp.h:317 +#: src/main/xmli18n-tmp.h:339 #, fuzzy msgid "Epson Stylus Photo 960" msgstr "Stylus Photo 790" -#: src/main/xmli18n-tmp.h:318 +#: src/main/xmli18n-tmp.h:340 #, fuzzy msgid "Epson Stylus Photo 1200" msgstr "Stylus Photo 1200" -#: src/main/xmli18n-tmp.h:319 +#: src/main/xmli18n-tmp.h:341 #, fuzzy msgid "Epson Stylus Photo 1270" msgstr "Stylus Photo 1270" -#: src/main/xmli18n-tmp.h:320 +#: src/main/xmli18n-tmp.h:342 #, fuzzy msgid "Epson Stylus Photo 1280" msgstr "Stylus Photo 1280" -#: src/main/xmli18n-tmp.h:321 +#: src/main/xmli18n-tmp.h:343 #, fuzzy msgid "Epson Stylus Photo 1290" msgstr "Stylus Photo 1290" -#: src/main/xmli18n-tmp.h:322 +#: src/main/xmli18n-tmp.h:344 #, fuzzy msgid "Epson Stylus Photo 1400" msgstr "Stylus Photo 1200" -#: src/main/xmli18n-tmp.h:323 +#: src/main/xmli18n-tmp.h:345 #, fuzzy msgid "Epson Stylus Photo 1410" msgstr "Stylus Photo 810" -#: src/main/xmli18n-tmp.h:324 +#: src/main/xmli18n-tmp.h:346 #, fuzzy msgid "Epson Stylus Photo 2000P" msgstr "Stylus Photo 2000P" -#: src/main/xmli18n-tmp.h:325 +#: src/main/xmli18n-tmp.h:347 #, fuzzy msgid "Epson Stylus Photo 2100" msgstr "Stylus Photo 1200" -#: src/main/xmli18n-tmp.h:326 +#: src/main/xmli18n-tmp.h:348 #, fuzzy msgid "Epson Stylus Photo 2200" msgstr "Stylus Photo 1200" -#: src/main/xmli18n-tmp.h:327 +#: src/main/xmli18n-tmp.h:349 #, fuzzy msgid "Epson Stylus Photo R200" msgstr "Stylus Photo 1200" -#: src/main/xmli18n-tmp.h:328 +#: src/main/xmli18n-tmp.h:350 #, fuzzy msgid "Epson Stylus Photo R210" msgstr "Stylus Photo 1200" -#: src/main/xmli18n-tmp.h:329 +#: src/main/xmli18n-tmp.h:351 #, fuzzy msgid "Epson Stylus Photo R220" msgstr "Stylus Photo 1200" -#: src/main/xmli18n-tmp.h:330 +#: src/main/xmli18n-tmp.h:352 #, fuzzy msgid "Epson Stylus Photo R230" msgstr "Stylus Photo 1200" -#: src/main/xmli18n-tmp.h:331 +#: src/main/xmli18n-tmp.h:353 #, fuzzy msgid "Epson Stylus Photo R240" msgstr "Stylus Photo 1200" -#: src/main/xmli18n-tmp.h:332 +#: src/main/xmli18n-tmp.h:354 #, fuzzy msgid "Epson Stylus Photo R245" -msgstr "Stylus Photo 1200" +msgstr "Stylus Photo 895" -#: src/main/xmli18n-tmp.h:333 +#: src/main/xmli18n-tmp.h:355 #, fuzzy msgid "Epson Stylus Photo R260" msgstr "Stylus Photo 1200" -#: src/main/xmli18n-tmp.h:334 +#: src/main/xmli18n-tmp.h:356 #, fuzzy msgid "Epson Stylus Photo R265" -msgstr "Stylus Photo 1200" +msgstr "Stylus Photo 895" -#: src/main/xmli18n-tmp.h:335 +#: src/main/xmli18n-tmp.h:357 #, fuzzy msgid "Epson Stylus Photo R270" msgstr "Stylus Photo 1270" -#: src/main/xmli18n-tmp.h:336 +#: src/main/xmli18n-tmp.h:358 +#, fuzzy +msgid "Epson Stylus Photo R280" +msgstr "Stylus Photo 1280" + +#: src/main/xmli18n-tmp.h:359 +#, fuzzy +msgid "Epson Stylus Photo R285" +msgstr "Stylus Photo 785" + +#: src/main/xmli18n-tmp.h:360 #, fuzzy msgid "Epson Stylus Photo R300" msgstr "Stylus Photo 700" -#: src/main/xmli18n-tmp.h:337 +#: src/main/xmli18n-tmp.h:361 #, fuzzy msgid "Epson Stylus Photo R310" msgstr "Stylus Photo 700" -#: src/main/xmli18n-tmp.h:338 +#: src/main/xmli18n-tmp.h:362 #, fuzzy msgid "Epson Stylus Photo R320" msgstr "Stylus Photo 1200" -#: src/main/xmli18n-tmp.h:339 +#: src/main/xmli18n-tmp.h:363 #, fuzzy msgid "Epson Stylus Photo R340" msgstr "Stylus Photo 700" -#: src/main/xmli18n-tmp.h:340 +#: src/main/xmli18n-tmp.h:364 #, fuzzy msgid "Epson Stylus Photo R350" msgstr "Stylus Photo 700" -#: src/main/xmli18n-tmp.h:341 +#: src/main/xmli18n-tmp.h:365 #, fuzzy msgid "Epson Stylus Photo R360" msgstr "Stylus Photo 700" -#: src/main/xmli18n-tmp.h:342 +#: src/main/xmli18n-tmp.h:366 #, fuzzy msgid "Epson Stylus Photo R380" msgstr "Stylus Photo 700" -#: src/main/xmli18n-tmp.h:343 +#: src/main/xmli18n-tmp.h:367 #, fuzzy msgid "Epson Stylus Photo R390" msgstr "Stylus Photo 700" -#: src/main/xmli18n-tmp.h:344 +#: src/main/xmli18n-tmp.h:368 #, fuzzy msgid "Epson Stylus Photo RX400" msgstr "Stylus Photo 700" -#: src/main/xmli18n-tmp.h:345 +#: src/main/xmli18n-tmp.h:369 #, fuzzy msgid "Epson Stylus Photo RX420" msgstr "Stylus Photo 1200" -#: src/main/xmli18n-tmp.h:346 +#: src/main/xmli18n-tmp.h:370 #, fuzzy msgid "Epson Stylus Photo RX425" msgstr "Stylus Photo 1200" -#: src/main/xmli18n-tmp.h:347 +#: src/main/xmli18n-tmp.h:371 #, fuzzy msgid "Epson Stylus Photo RX430" msgstr "Stylus Photo 700" -#: src/main/xmli18n-tmp.h:348 +#: src/main/xmli18n-tmp.h:372 #, fuzzy msgid "Epson Stylus Photo RX500" msgstr "Stylus Photo 700" -#: src/main/xmli18n-tmp.h:349 +#: src/main/xmli18n-tmp.h:373 #, fuzzy msgid "Epson Stylus Photo RX510" msgstr "Stylus Photo 700" -#: src/main/xmli18n-tmp.h:350 +#: src/main/xmli18n-tmp.h:374 #, fuzzy msgid "Epson Stylus Photo RX560" msgstr "Stylus Photo 700" -#: src/main/xmli18n-tmp.h:351 +#: src/main/xmli18n-tmp.h:375 #, fuzzy msgid "Epson Stylus Photo RX580" msgstr "Stylus Photo 700" -#: src/main/xmli18n-tmp.h:352 +#: src/main/xmli18n-tmp.h:376 +#, fuzzy +msgid "Epson Stylus Photo RX585" +msgstr "Stylus Photo 700" + +#: src/main/xmli18n-tmp.h:377 #, fuzzy msgid "Epson Stylus Photo RX590" msgstr "Stylus Photo 700" -#: src/main/xmli18n-tmp.h:353 +#: src/main/xmli18n-tmp.h:378 #, fuzzy msgid "Epson Stylus Photo RX595" msgstr "Stylus Photo 700" -#: src/main/xmli18n-tmp.h:354 +#: src/main/xmli18n-tmp.h:379 #, fuzzy msgid "Epson Stylus Photo RX600" msgstr "Stylus Photo 700" -#: src/main/xmli18n-tmp.h:355 +#: src/main/xmli18n-tmp.h:380 #, fuzzy msgid "Epson Stylus Photo RX620" msgstr "Stylus Photo 700" -#: src/main/xmli18n-tmp.h:356 +#: src/main/xmli18n-tmp.h:381 #, fuzzy msgid "Epson Stylus Photo RX630" msgstr "Stylus Photo 700" -#: src/main/xmli18n-tmp.h:357 +#: src/main/xmli18n-tmp.h:382 #, fuzzy msgid "Epson Stylus Photo RX640" msgstr "Stylus Photo 700" -#: src/main/xmli18n-tmp.h:358 +#: src/main/xmli18n-tmp.h:383 +#, fuzzy +msgid "Epson Stylus Photo RX680" +msgstr "Stylus Photo 700" + +#: src/main/xmli18n-tmp.h:384 +#, fuzzy +msgid "Epson Stylus Photo RX685" +msgstr "Stylus Photo 700" + +#: src/main/xmli18n-tmp.h:385 #, fuzzy msgid "Epson Stylus Photo RX700" msgstr "Stylus Photo 700" -#: src/main/xmli18n-tmp.h:359 +#: src/main/xmli18n-tmp.h:386 #, fuzzy msgid "Epson Stylus Photo R800" msgstr "Stylus Photo 700" -#: src/main/xmli18n-tmp.h:360 +#: src/main/xmli18n-tmp.h:387 #, fuzzy msgid "Epson Stylus Photo R1800" msgstr "Stylus Photo 700" -#: src/main/xmli18n-tmp.h:361 +#: src/main/xmli18n-tmp.h:388 #, fuzzy msgid "Epson Stylus Photo R2400" msgstr "Stylus Photo 1200" -#: src/main/xmli18n-tmp.h:362 +#: src/main/xmli18n-tmp.h:389 #, fuzzy msgid "Epson Stylus Pro 5000" msgstr "Stylus Pro 5000" -#: src/main/xmli18n-tmp.h:363 +#: src/main/xmli18n-tmp.h:390 #, fuzzy msgid "Epson Stylus Pro 5500" msgstr "Stylus Pro 5500" -#: src/main/xmli18n-tmp.h:364 +#: src/main/xmli18n-tmp.h:391 #, fuzzy msgid "Epson Stylus Pro 7000" msgstr "Stylus Pro 7000" -#: src/main/xmli18n-tmp.h:365 +#: src/main/xmli18n-tmp.h:392 #, fuzzy msgid "Epson Stylus Pro 7500" msgstr "Stylus Pro 7500" -#: src/main/xmli18n-tmp.h:366 +#: src/main/xmli18n-tmp.h:393 #, fuzzy msgid "Epson Stylus Pro 7600" msgstr "Stylus Pro 7000" -#: src/main/xmli18n-tmp.h:367 +#: src/main/xmli18n-tmp.h:394 #, fuzzy msgid "Epson Stylus Pro 9000" msgstr "Stylus Pro 9000" -#: src/main/xmli18n-tmp.h:368 +#: src/main/xmli18n-tmp.h:395 #, fuzzy msgid "Epson Stylus Pro 9500" msgstr "Stylus Pro 9500" -#: src/main/xmli18n-tmp.h:369 +#: src/main/xmli18n-tmp.h:396 #, fuzzy msgid "Epson Stylus Pro 9600" msgstr "Stylus Pro 9000" -#: src/main/xmli18n-tmp.h:370 +#: src/main/xmli18n-tmp.h:397 #, fuzzy msgid "Epson Stylus Pro 10000" msgstr "Stylus Pro 10000" -#: src/main/xmli18n-tmp.h:371 +#: src/main/xmli18n-tmp.h:398 #, fuzzy msgid "Epson Stylus Scan 2000" msgstr "Stylus Scan 2000" -#: src/main/xmli18n-tmp.h:372 +#: src/main/xmli18n-tmp.h:399 #, fuzzy msgid "Epson Stylus Scan 2500" msgstr "Stylus Scan 2500" -#: src/main/xmli18n-tmp.h:373 +#: src/main/xmli18n-tmp.h:400 #, fuzzy msgid "Epson Stylus CX1500" msgstr "Stylus C20sx" -#: src/main/xmli18n-tmp.h:374 +#: src/main/xmli18n-tmp.h:401 #, fuzzy msgid "Epson Stylus CX3100" msgstr "Stylus C20sx" -#: src/main/xmli18n-tmp.h:375 +#: src/main/xmli18n-tmp.h:402 #, fuzzy msgid "Epson Stylus CX3200" msgstr "Stylus C20sx" -#: src/main/xmli18n-tmp.h:376 +#: src/main/xmli18n-tmp.h:403 #, fuzzy msgid "Epson Stylus CX3500" msgstr "Stylus C20sx" -#: src/main/xmli18n-tmp.h:377 +#: src/main/xmli18n-tmp.h:404 #, fuzzy msgid "Epson Stylus CX3600" msgstr "Stylus C20sx" -#: src/main/xmli18n-tmp.h:378 +#: src/main/xmli18n-tmp.h:405 #, fuzzy msgid "Epson Stylus CX3650" msgstr "Stylus C20sx" -#: src/main/xmli18n-tmp.h:379 +#: src/main/xmli18n-tmp.h:406 #, fuzzy msgid "Epson Stylus CX3700" msgstr "Stylus C20sx" -#: src/main/xmli18n-tmp.h:380 +#: src/main/xmli18n-tmp.h:407 #, fuzzy msgid "Epson Stylus CX3800" msgstr "Stylus C20sx" -#: src/main/xmli18n-tmp.h:381 +#: src/main/xmli18n-tmp.h:408 #, fuzzy msgid "Epson Stylus CX3805" -msgstr "Stylus C60" +msgstr "Stylus C80" -#: src/main/xmli18n-tmp.h:382 +#: src/main/xmli18n-tmp.h:409 #, fuzzy msgid "Epson Stylus CX3810" msgstr "Stylus C20sx" -#: src/main/xmli18n-tmp.h:383 +#: src/main/xmli18n-tmp.h:410 #, fuzzy msgid "Epson Stylus CX4100" msgstr "Stylus C20sx" -#: src/main/xmli18n-tmp.h:384 +#: src/main/xmli18n-tmp.h:411 #, fuzzy msgid "Epson Stylus CX4200" msgstr "Stylus C20sx" -#: src/main/xmli18n-tmp.h:385 +#: src/main/xmli18n-tmp.h:412 #, fuzzy msgid "Epson Stylus CX4400" msgstr "Stylus C20sx" -#: src/main/xmli18n-tmp.h:386 +#: src/main/xmli18n-tmp.h:413 #, fuzzy msgid "Epson Stylus CX4500" msgstr "Stylus C20sx" -#: src/main/xmli18n-tmp.h:387 +#: src/main/xmli18n-tmp.h:414 #, fuzzy msgid "Epson Stylus CX4600" msgstr "Stylus C20sx" -#: src/main/xmli18n-tmp.h:388 +#: src/main/xmli18n-tmp.h:415 #, fuzzy msgid "Epson Stylus CX4700" msgstr "Stylus C20sx" -#: src/main/xmli18n-tmp.h:389 +#: src/main/xmli18n-tmp.h:416 #, fuzzy msgid "Epson Stylus CX4800" msgstr "Stylus C20sx" -#: src/main/xmli18n-tmp.h:390 +#: src/main/xmli18n-tmp.h:417 #, fuzzy msgid "Epson Stylus CX4900" msgstr "Stylus C20sx" -#: src/main/xmli18n-tmp.h:391 +#: src/main/xmli18n-tmp.h:418 #, fuzzy msgid "Epson Stylus CX5000" msgstr "Stylus C20sx" -#: src/main/xmli18n-tmp.h:392 +#: src/main/xmli18n-tmp.h:419 #, fuzzy msgid "Epson Stylus CX5000F" msgstr "Stylus C20sx" -#: src/main/xmli18n-tmp.h:393 +#: src/main/xmli18n-tmp.h:420 #, fuzzy msgid "Epson Stylus CX5100" msgstr "Stylus C60" -#: src/main/xmli18n-tmp.h:394 +#: src/main/xmli18n-tmp.h:421 #, fuzzy msgid "Epson Stylus CX5200" msgstr "Stylus C60" -#: src/main/xmli18n-tmp.h:395 +#: src/main/xmli18n-tmp.h:422 #, fuzzy msgid "Epson Stylus CX5300" msgstr "Stylus C20sx" -#: src/main/xmli18n-tmp.h:396 +#: src/main/xmli18n-tmp.h:423 #, fuzzy msgid "Epson Stylus CX5400" msgstr "Stylus C20sx" -#: src/main/xmli18n-tmp.h:397 +#: src/main/xmli18n-tmp.h:424 #, fuzzy msgid "Epson Stylus CX5600" msgstr "Stylus C20sx" -#: src/main/xmli18n-tmp.h:398 +#: src/main/xmli18n-tmp.h:425 #, fuzzy msgid "Epson Stylus CX5700" msgstr "Stylus C20sx" -#: src/main/xmli18n-tmp.h:399 +#: src/main/xmli18n-tmp.h:426 #, fuzzy msgid "Epson Stylus CX5800" msgstr "Stylus C20sx" -#: src/main/xmli18n-tmp.h:400 +#: src/main/xmli18n-tmp.h:427 #, fuzzy msgid "Epson Stylus CX6000" msgstr "Stylus C20sx" -#: src/main/xmli18n-tmp.h:401 +#: src/main/xmli18n-tmp.h:428 #, fuzzy msgid "Epson Stylus CX6300" msgstr "Stylus C20sx" -#: src/main/xmli18n-tmp.h:402 +#: src/main/xmli18n-tmp.h:429 #, fuzzy msgid "Epson Stylus CX6400" msgstr "Stylus C20sx" -#: src/main/xmli18n-tmp.h:403 +#: src/main/xmli18n-tmp.h:430 #, fuzzy msgid "Epson Stylus CX6500" msgstr "Stylus C20sx" -#: src/main/xmli18n-tmp.h:404 +#: src/main/xmli18n-tmp.h:431 #, fuzzy msgid "Epson Stylus CX6600" msgstr "Stylus C20sx" -#: src/main/xmli18n-tmp.h:405 +#: src/main/xmli18n-tmp.h:432 #, fuzzy msgid "Epson Stylus CX7000F" -msgstr "Stylus C20sx" +msgstr "Stylus C70" -#: src/main/xmli18n-tmp.h:406 +#: src/main/xmli18n-tmp.h:433 #, fuzzy msgid "Epson Stylus CX7400" msgstr "Stylus C20sx" -#: src/main/xmli18n-tmp.h:407 +#: src/main/xmli18n-tmp.h:434 #, fuzzy msgid "Epson Stylus CX7700" msgstr "Stylus C70" -#: src/main/xmli18n-tmp.h:408 +#: src/main/xmli18n-tmp.h:435 #, fuzzy msgid "Epson Stylus CX7800" msgstr "Stylus C20sx" -#: src/main/xmli18n-tmp.h:409 +#: src/main/xmli18n-tmp.h:436 #, fuzzy msgid "Epson Stylus CX8300" msgstr "Stylus C20sx" -#: src/main/xmli18n-tmp.h:410 +#: src/main/xmli18n-tmp.h:437 #, fuzzy msgid "Epson Stylus CX8400" msgstr "Stylus C20sx" -#: src/main/xmli18n-tmp.h:411 +#: src/main/xmli18n-tmp.h:438 #, fuzzy msgid "Epson Stylus CX9400" msgstr "Stylus C20sx" -#: src/main/xmli18n-tmp.h:412 +#: src/main/xmli18n-tmp.h:439 #, fuzzy msgid "Epson Stylus D68" msgstr "Stylus C60" -#: src/main/xmli18n-tmp.h:413 +#: src/main/xmli18n-tmp.h:440 #, fuzzy msgid "Epson Stylus D88" msgstr "Stylus C80" -#: src/main/xmli18n-tmp.h:414 +#: src/main/xmli18n-tmp.h:441 +#, fuzzy +msgid "Epson Stylus D92" +msgstr "Stylus C60" + +#: src/main/xmli18n-tmp.h:442 #, fuzzy msgid "Epson Stylus D120" msgstr "Stylus C20ux" -#: src/main/xmli18n-tmp.h:415 +#: src/main/xmli18n-tmp.h:443 #, fuzzy msgid "Epson Stylus DX3800" msgstr "Stylus C20sx" -#: src/main/xmli18n-tmp.h:416 +#: src/main/xmli18n-tmp.h:444 #, fuzzy msgid "Epson Stylus DX3850" msgstr "Stylus C20sx" -#: src/main/xmli18n-tmp.h:417 +#: src/main/xmli18n-tmp.h:445 #, fuzzy msgid "Epson Stylus DX4050" msgstr "Stylus C20sx" -#: src/main/xmli18n-tmp.h:418 +#: src/main/xmli18n-tmp.h:446 #, fuzzy msgid "Epson Stylus DX4200" msgstr "Stylus C20sx" -#: src/main/xmli18n-tmp.h:419 +#: src/main/xmli18n-tmp.h:447 #, fuzzy msgid "Epson Stylus DX4250" -msgstr "Stylus C60" +msgstr "Stylus C20sx" -#: src/main/xmli18n-tmp.h:420 +#: src/main/xmli18n-tmp.h:448 +#, fuzzy +msgid "Epson Stylus DX4400" +msgstr "Stylus C20sx" + +#: src/main/xmli18n-tmp.h:449 +#, fuzzy +msgid "Epson Stylus DX4450" +msgstr "Stylus C20sx" + +#: src/main/xmli18n-tmp.h:450 #, fuzzy msgid "Epson Stylus DX4800" msgstr "Stylus C20sx" -#: src/main/xmli18n-tmp.h:421 +#: src/main/xmli18n-tmp.h:451 +#, fuzzy +msgid "Epson Stylus DX7000F" +msgstr "Stylus Pro 7000" + +#: src/main/xmli18n-tmp.h:452 +#, fuzzy +msgid "Epson Stylus DX7400" +msgstr "Stylus C20sx" + +#: src/main/xmli18n-tmp.h:453 +#, fuzzy +msgid "Epson Stylus DX7450" +msgstr "Stylus C20sx" + +#: src/main/xmli18n-tmp.h:454 +#, fuzzy +msgid "Epson Stylus DX8400" +msgstr "Stylus C20sx" + +#: src/main/xmli18n-tmp.h:455 +#, fuzzy +msgid "Epson Stylus DX8450" +msgstr "Stylus C20sx" + +#: src/main/xmli18n-tmp.h:456 msgid "Epson PictureMate" msgstr "" -#: src/main/xmli18n-tmp.h:422 +#: src/main/xmli18n-tmp.h:457 +msgid "Epson PictureMate Dash" +msgstr "" + +#: src/main/xmli18n-tmp.h:458 msgid "Epson PictureMate Deluxe" msgstr "" -#: src/main/xmli18n-tmp.h:423 +#: src/main/xmli18n-tmp.h:459 msgid "Epson PictureMate Flash" msgstr "" -#: src/main/xmli18n-tmp.h:424 +#: src/main/xmli18n-tmp.h:460 msgid "Epson PictureMate Pal" msgstr "" -#: src/main/xmli18n-tmp.h:425 +#: src/main/xmli18n-tmp.h:461 msgid "Epson PictureMate Snap" msgstr "" -#: src/main/xmli18n-tmp.h:426 -#, fuzzy +#: src/main/xmli18n-tmp.h:462 +msgid "Epson PictureMate 100" +msgstr "" + +#: src/main/xmli18n-tmp.h:463 msgid "Epson PictureMate 200" -msgstr "Stylus C60" +msgstr "" -#: src/main/xmli18n-tmp.h:427 -#, fuzzy +#: src/main/xmli18n-tmp.h:464 msgid "Epson PictureMate 210" -msgstr "Stylus C60" +msgstr "" -#: src/main/xmli18n-tmp.h:428 -#, fuzzy +#: src/main/xmli18n-tmp.h:465 msgid "Epson PictureMate 240" -msgstr "Stylus C60" +msgstr "" -#: src/main/xmli18n-tmp.h:429 -#, fuzzy +#: src/main/xmli18n-tmp.h:466 msgid "Epson PictureMate 250" -msgstr "Stylus C60" +msgstr "" -#: src/main/xmli18n-tmp.h:430 -#, fuzzy +#: src/main/xmli18n-tmp.h:467 +msgid "Epson PictureMate 260" +msgstr "" + +#: src/main/xmli18n-tmp.h:468 +msgid "Epson PictureMate 270" +msgstr "" + +#: src/main/xmli18n-tmp.h:469 msgid "Epson PictureMate 280" -msgstr "Stylus C60" +msgstr "" -#: src/main/xmli18n-tmp.h:431 +#: src/main/xmli18n-tmp.h:470 +msgid "Epson PictureMate 290" +msgstr "" + +#: src/main/xmli18n-tmp.h:471 +msgid "Epson PictureMate 500" +msgstr "" + +#: src/main/xmli18n-tmp.h:472 +msgid "Epson PictureMate 2005" +msgstr "" + +#: src/main/xmli18n-tmp.h:473 msgid "Epson CL 700" msgstr "" -#: src/main/xmli18n-tmp.h:432 +#: src/main/xmli18n-tmp.h:474 msgid "Epson CL 750" msgstr "" -#: src/main/xmli18n-tmp.h:433 +#: src/main/xmli18n-tmp.h:475 msgid "Epson CL 760" msgstr "" -#: src/main/xmli18n-tmp.h:434 +#: src/main/xmli18n-tmp.h:476 msgid "Epson E 100" msgstr "" -#: src/main/xmli18n-tmp.h:435 +#: src/main/xmli18n-tmp.h:477 msgid "Epson E 150" msgstr "" -#: src/main/xmli18n-tmp.h:436 +#: src/main/xmli18n-tmp.h:478 msgid "Epson E 200" msgstr "" -#: src/main/xmli18n-tmp.h:437 +#: src/main/xmli18n-tmp.h:479 +msgid "Epson E 300" +msgstr "" + +#: src/main/xmli18n-tmp.h:480 +msgid "Epson E 500" +msgstr "" + +#: src/main/xmli18n-tmp.h:481 +msgid "Epson E 520" +msgstr "" + +#: src/main/xmli18n-tmp.h:482 +msgid "Epson E 700" +msgstr "" + +#: src/main/xmli18n-tmp.h:483 +msgid "Epson E 720" +msgstr "" + +#: src/main/xmli18n-tmp.h:484 msgid "Epson EM 900C" msgstr "" -#: src/main/xmli18n-tmp.h:438 +#: src/main/xmli18n-tmp.h:485 msgid "Epson EM 930C" msgstr "" -#: src/main/xmli18n-tmp.h:439 +#: src/main/xmli18n-tmp.h:486 msgid "Epson MC 2000" msgstr "" -#: src/main/xmli18n-tmp.h:440 +#: src/main/xmli18n-tmp.h:487 msgid "Epson MC 5000" msgstr "" -#: src/main/xmli18n-tmp.h:441 +#: src/main/xmli18n-tmp.h:488 msgid "Epson MC 7000" msgstr "" -#: src/main/xmli18n-tmp.h:442 +#: src/main/xmli18n-tmp.h:489 msgid "Epson MC 9000" msgstr "" -#: src/main/xmli18n-tmp.h:443 +#: src/main/xmli18n-tmp.h:490 msgid "Epson MC 10000" msgstr "" -#: src/main/xmli18n-tmp.h:444 +#: src/main/xmli18n-tmp.h:491 msgid "Epson MJ 930C" msgstr "" -#: src/main/xmli18n-tmp.h:445 +#: src/main/xmli18n-tmp.h:492 msgid "Epson MJ 5100C" msgstr "" -#: src/main/xmli18n-tmp.h:446 +#: src/main/xmli18n-tmp.h:493 msgid "Epson MJ 6000C" msgstr "" -#: src/main/xmli18n-tmp.h:447 +#: src/main/xmli18n-tmp.h:494 msgid "Epson MJ 8000C" msgstr "" -#: src/main/xmli18n-tmp.h:448 -#, fuzzy +#: src/main/xmli18n-tmp.h:495 msgid "Epson PM 670C" -msgstr "Stylus C60" +msgstr "" -#: src/main/xmli18n-tmp.h:449 +#: src/main/xmli18n-tmp.h:496 msgid "Epson PM 700C" msgstr "" -#: src/main/xmli18n-tmp.h:450 +#: src/main/xmli18n-tmp.h:497 msgid "Epson PM 730C" msgstr "" -#: src/main/xmli18n-tmp.h:451 +#: src/main/xmli18n-tmp.h:498 msgid "Epson PM 740C" msgstr "" -#: src/main/xmli18n-tmp.h:452 +#: src/main/xmli18n-tmp.h:499 msgid "Epson PM 750C" msgstr "" -#: src/main/xmli18n-tmp.h:453 +#: src/main/xmli18n-tmp.h:500 msgid "Epson PM 760C" msgstr "" -#: src/main/xmli18n-tmp.h:454 +#: src/main/xmli18n-tmp.h:501 msgid "Epson PM 770C" msgstr "" -#: src/main/xmli18n-tmp.h:455 +#: src/main/xmli18n-tmp.h:502 msgid "Epson PM 780C" msgstr "" -#: src/main/xmli18n-tmp.h:456 +#: src/main/xmli18n-tmp.h:503 msgid "Epson PM 790PT" msgstr "" -#: src/main/xmli18n-tmp.h:457 +#: src/main/xmli18n-tmp.h:504 msgid "Epson PM 800C" msgstr "" -#: src/main/xmli18n-tmp.h:458 +#: src/main/xmli18n-tmp.h:505 msgid "Epson PM 850PT" msgstr "" -#: src/main/xmli18n-tmp.h:459 +#: src/main/xmli18n-tmp.h:506 msgid "Epson PM 870C" msgstr "" -#: src/main/xmli18n-tmp.h:460 +#: src/main/xmli18n-tmp.h:507 msgid "Epson PM 880C" msgstr "" -#: src/main/xmli18n-tmp.h:461 +#: src/main/xmli18n-tmp.h:508 msgid "Epson PM 930C" msgstr "" -#: src/main/xmli18n-tmp.h:462 +#: src/main/xmli18n-tmp.h:509 msgid "Epson PM 940C" msgstr "" -#: src/main/xmli18n-tmp.h:463 +#: src/main/xmli18n-tmp.h:510 msgid "Epson PM 950C" msgstr "" -#: src/main/xmli18n-tmp.h:464 +#: src/main/xmli18n-tmp.h:511 msgid "Epson PM 970C" msgstr "" -#: src/main/xmli18n-tmp.h:465 +#: src/main/xmli18n-tmp.h:512 msgid "Epson PM 980C" msgstr "" -#: src/main/xmli18n-tmp.h:466 +#: src/main/xmli18n-tmp.h:513 msgid "Epson PM 2000C" msgstr "" -#: src/main/xmli18n-tmp.h:467 +#: src/main/xmli18n-tmp.h:514 msgid "Epson PM 2200C" msgstr "" -#: src/main/xmli18n-tmp.h:468 +#: src/main/xmli18n-tmp.h:515 msgid "Epson PM 3000C" msgstr "" -#: src/main/xmli18n-tmp.h:469 +#: src/main/xmli18n-tmp.h:516 msgid "Epson PM 3300C" msgstr "" -#: src/main/xmli18n-tmp.h:470 +#: src/main/xmli18n-tmp.h:517 msgid "Epson PM 3500C" msgstr "" -#: src/main/xmli18n-tmp.h:471 +#: src/main/xmli18n-tmp.h:518 msgid "Epson PM 3700C" msgstr "" -#: src/main/xmli18n-tmp.h:472 +#: src/main/xmli18n-tmp.h:519 msgid "Epson PM 4000PX" msgstr "" -#: src/main/xmli18n-tmp.h:473 +#: src/main/xmli18n-tmp.h:520 msgid "Epson PM 5000C" msgstr "" -#: src/main/xmli18n-tmp.h:474 +#: src/main/xmli18n-tmp.h:521 msgid "Epson PM 7000C" msgstr "" -#: src/main/xmli18n-tmp.h:475 +#: src/main/xmli18n-tmp.h:522 msgid "Epson PM 9000C" msgstr "" -#: src/main/xmli18n-tmp.h:476 +#: src/main/xmli18n-tmp.h:523 #, fuzzy msgid "Epson PM 10000" msgstr "Stylus Pro 10000" -#: src/main/xmli18n-tmp.h:477 +#: src/main/xmli18n-tmp.h:524 msgid "Epson PM A650" msgstr "" -#: src/main/xmli18n-tmp.h:478 +#: src/main/xmli18n-tmp.h:525 msgid "Epson PM A750" msgstr "" -#: src/main/xmli18n-tmp.h:479 -#, fuzzy +#: src/main/xmli18n-tmp.h:526 msgid "Epson PM A820" -msgstr "Stylus C60" +msgstr "" -#: src/main/xmli18n-tmp.h:480 +#: src/main/xmli18n-tmp.h:527 msgid "Epson PM A890" msgstr "" -#: src/main/xmli18n-tmp.h:481 -#, fuzzy +#: src/main/xmli18n-tmp.h:528 msgid "Epson PM A900" -msgstr "Stylus C60" +msgstr "" -#: src/main/xmli18n-tmp.h:482 +#: src/main/xmli18n-tmp.h:529 msgid "Epson PM A950" msgstr "" -#: src/main/xmli18n-tmp.h:483 +#: src/main/xmli18n-tmp.h:530 msgid "Epson PM D600" msgstr "" -#: src/main/xmli18n-tmp.h:484 +#: src/main/xmli18n-tmp.h:531 #, fuzzy msgid "Epson PM D750" msgstr "Stylus C60" -#: src/main/xmli18n-tmp.h:485 +#: src/main/xmli18n-tmp.h:532 #, fuzzy msgid "Epson PM D770" msgstr "Stylus C60" -#: src/main/xmli18n-tmp.h:486 +#: src/main/xmli18n-tmp.h:533 msgid "Epson PM D800" msgstr "" -#: src/main/xmli18n-tmp.h:487 -#, fuzzy +#: src/main/xmli18n-tmp.h:534 msgid "Epson PM D870" -msgstr "Stylus C60" +msgstr "" -#: src/main/xmli18n-tmp.h:488 +#: src/main/xmli18n-tmp.h:535 #, fuzzy msgid "Epson PM D1000" msgstr "Stylus C60" -#: src/main/xmli18n-tmp.h:489 +#: src/main/xmli18n-tmp.h:536 #, fuzzy msgid "Epson PM G700" msgstr "Stylus C60" -#: src/main/xmli18n-tmp.h:490 +#: src/main/xmli18n-tmp.h:537 #, fuzzy msgid "Epson PM G720" msgstr "Stylus C60" -#: src/main/xmli18n-tmp.h:491 +#: src/main/xmli18n-tmp.h:538 msgid "Epson PM G730" msgstr "" -#: src/main/xmli18n-tmp.h:492 +#: src/main/xmli18n-tmp.h:539 #, fuzzy msgid "Epson PM G800" msgstr "Stylus C60" -#: src/main/xmli18n-tmp.h:493 +#: src/main/xmli18n-tmp.h:540 #, fuzzy msgid "Epson PM G820" msgstr "Stylus C60" -#: src/main/xmli18n-tmp.h:494 -#, fuzzy +#: src/main/xmli18n-tmp.h:541 msgid "Epson PM G850" -msgstr "Stylus C60" +msgstr "" -#: src/main/xmli18n-tmp.h:495 -#, fuzzy +#: src/main/xmli18n-tmp.h:542 msgid "Epson PM G4500" -msgstr "Stylus C60" +msgstr "" -#: src/main/xmli18n-tmp.h:496 -#, fuzzy +#: src/main/xmli18n-tmp.h:543 msgid "Epson PX A650" -msgstr "Stylus C60" +msgstr "" -#: src/main/xmli18n-tmp.h:497 +#: src/main/xmli18n-tmp.h:544 #, fuzzy msgid "Epson PX G900" msgstr "Stylus C60" -#: src/main/xmli18n-tmp.h:498 +#: src/main/xmli18n-tmp.h:545 #, fuzzy msgid "Epson PX G920" msgstr "Stylus C60" -#: src/main/xmli18n-tmp.h:499 +#: src/main/xmli18n-tmp.h:546 #, fuzzy msgid "Epson PX G5000" msgstr "Stylus C60" -#: src/main/xmli18n-tmp.h:500 +#: src/main/xmli18n-tmp.h:547 #, fuzzy msgid "Epson PX V500" msgstr "Stylus C60" -#: src/main/xmli18n-tmp.h:501 +#: src/main/xmli18n-tmp.h:548 #, fuzzy msgid "Epson PX V600" msgstr "Stylus C60" -#: src/main/xmli18n-tmp.h:502 +#: src/main/xmli18n-tmp.h:549 msgid "Epson PX V630" msgstr "" -#: src/main/xmli18n-tmp.h:503 -#, fuzzy +#: src/main/xmli18n-tmp.h:550 msgid "Epson PX V780" -msgstr "Stylus C60" +msgstr "" -#: src/main/xmli18n-tmp.h:504 -#, fuzzy +#: src/main/xmli18n-tmp.h:551 msgid "Epson PX 5500" -msgstr "Stylus C60" +msgstr "" -#: src/main/xmli18n-tmp.h:505 +#: src/main/xmli18n-tmp.h:552 msgid "Epson PX 7000" msgstr "" -#: src/main/xmli18n-tmp.h:506 +#: src/main/xmli18n-tmp.h:553 msgid "Epson PX 9000" msgstr "" -#: src/main/xmli18n-tmp.h:507 +#: src/main/xmli18n-tmp.h:554 msgid "Apollo P-2100" msgstr "" -#: src/main/xmli18n-tmp.h:508 +#: src/main/xmli18n-tmp.h:555 msgid "Apollo P-2150" msgstr "" -#: src/main/xmli18n-tmp.h:509 +#: src/main/xmli18n-tmp.h:556 msgid "Apollo P-2200" msgstr "" -#: src/main/xmli18n-tmp.h:510 +#: src/main/xmli18n-tmp.h:557 msgid "Apollo P-2250" msgstr "" -#: src/main/xmli18n-tmp.h:511 +#: src/main/xmli18n-tmp.h:558 msgid "Apollo P-2500" msgstr "" -#: src/main/xmli18n-tmp.h:512 +#: src/main/xmli18n-tmp.h:559 msgid "Apollo P-2550" msgstr "" -#: src/main/xmli18n-tmp.h:513 +#: src/main/xmli18n-tmp.h:560 msgid "Apollo P-2600" msgstr "" -#: src/main/xmli18n-tmp.h:514 +#: src/main/xmli18n-tmp.h:561 msgid "Apollo P-2650" msgstr "" -#: src/main/xmli18n-tmp.h:515 +#: src/main/xmli18n-tmp.h:562 msgid "Apple Color StyleWriter 4100" msgstr "" -#: src/main/xmli18n-tmp.h:516 +#: src/main/xmli18n-tmp.h:563 msgid "Apple Color StyleWriter 4500" msgstr "" -#: src/main/xmli18n-tmp.h:517 +#: src/main/xmli18n-tmp.h:564 msgid "Apple Color StyleWriter 6500" msgstr "" -#: src/main/xmli18n-tmp.h:518 +#: src/main/xmli18n-tmp.h:565 msgid "Apple LaserWriter Select 360" msgstr "" -#: src/main/xmli18n-tmp.h:519 +#: src/main/xmli18n-tmp.h:566 msgid "Brother DCP-1200" msgstr "" -#: src/main/xmli18n-tmp.h:520 +#: src/main/xmli18n-tmp.h:567 msgid "Brother HL-4Ve" msgstr "" -#: src/main/xmli18n-tmp.h:521 +#: src/main/xmli18n-tmp.h:568 msgid "Brother HL-10V" msgstr "" -#: src/main/xmli18n-tmp.h:522 +#: src/main/xmli18n-tmp.h:569 msgid "Brother HL-10h" msgstr "" -#: src/main/xmli18n-tmp.h:523 +#: src/main/xmli18n-tmp.h:570 msgid "Brother HL-630" msgstr "" -#: src/main/xmli18n-tmp.h:524 +#: src/main/xmli18n-tmp.h:571 msgid "Brother HL-660" msgstr "" -#: src/main/xmli18n-tmp.h:525 +#: src/main/xmli18n-tmp.h:572 msgid "Brother HL-760" msgstr "" -#: src/main/xmli18n-tmp.h:526 +#: src/main/xmli18n-tmp.h:573 msgid "Brother HL-960" msgstr "" -#: src/main/xmli18n-tmp.h:527 +#: src/main/xmli18n-tmp.h:574 msgid "Brother HL-1040" msgstr "" -#: src/main/xmli18n-tmp.h:528 +#: src/main/xmli18n-tmp.h:575 msgid "Brother HL-1050" msgstr "" -#: src/main/xmli18n-tmp.h:529 +#: src/main/xmli18n-tmp.h:576 msgid "Brother HL-1060" msgstr "" -#: src/main/xmli18n-tmp.h:530 +#: src/main/xmli18n-tmp.h:577 msgid "Brother HL-1070" msgstr "" -#: src/main/xmli18n-tmp.h:531 +#: src/main/xmli18n-tmp.h:578 msgid "Brother HL-1240" msgstr "" -#: src/main/xmli18n-tmp.h:532 +#: src/main/xmli18n-tmp.h:579 msgid "Brother HL-1250" msgstr "" -#: src/main/xmli18n-tmp.h:533 +#: src/main/xmli18n-tmp.h:580 msgid "Brother HL-1260" msgstr "" -#: src/main/xmli18n-tmp.h:534 +#: src/main/xmli18n-tmp.h:581 msgid "Brother HL-1270N" msgstr "" -#: src/main/xmli18n-tmp.h:535 +#: src/main/xmli18n-tmp.h:582 msgid "Brother HL-1440" msgstr "" -#: src/main/xmli18n-tmp.h:536 +#: src/main/xmli18n-tmp.h:583 msgid "Brother HL-1660e" msgstr "" -#: src/main/xmli18n-tmp.h:537 +#: src/main/xmli18n-tmp.h:584 msgid "Brother HL-2060" msgstr "" -#: src/main/xmli18n-tmp.h:538 +#: src/main/xmli18n-tmp.h:585 msgid "Brother MFC-6550MC" msgstr "" -#: src/main/xmli18n-tmp.h:539 +#: src/main/xmli18n-tmp.h:586 msgid "Brother MFC-8300" msgstr "" -#: src/main/xmli18n-tmp.h:540 +#: src/main/xmli18n-tmp.h:587 msgid "Brother MFC-9500" msgstr "" -#: src/main/xmli18n-tmp.h:541 +#: src/main/xmli18n-tmp.h:588 msgid "Brother MFC-9600" msgstr "" -#: src/main/xmli18n-tmp.h:542 +#: src/main/xmli18n-tmp.h:589 msgid "Canon GP 335" msgstr "" -#: src/main/xmli18n-tmp.h:543 +#: src/main/xmli18n-tmp.h:590 msgid "Canon LBP-4sx" msgstr "" -#: src/main/xmli18n-tmp.h:544 +#: src/main/xmli18n-tmp.h:591 msgid "Canon LBP-430" msgstr "" -#: src/main/xmli18n-tmp.h:545 +#: src/main/xmli18n-tmp.h:592 msgid "Canon LBP-1000" msgstr "" -#: src/main/xmli18n-tmp.h:546 +#: src/main/xmli18n-tmp.h:593 msgid "Canon LBP-1260" msgstr "" -#: src/main/xmli18n-tmp.h:547 +#: src/main/xmli18n-tmp.h:594 msgid "Canon LBP-1760" msgstr "" -#: src/main/xmli18n-tmp.h:548 +#: src/main/xmli18n-tmp.h:595 msgid "Canon imageRunner 330s" msgstr "" -#: src/main/xmli18n-tmp.h:549 +#: src/main/xmli18n-tmp.h:596 msgid "Citizen ProJet II" msgstr "" -#: src/main/xmli18n-tmp.h:550 +#: src/main/xmli18n-tmp.h:597 msgid "DEC 1800" msgstr "" -#: src/main/xmli18n-tmp.h:551 +#: src/main/xmli18n-tmp.h:598 msgid "DEC LN17" msgstr "" -#: src/main/xmli18n-tmp.h:552 +#: src/main/xmli18n-tmp.h:599 msgid "Epson ActionLaser 1100" msgstr "" -#: src/main/xmli18n-tmp.h:553 +#: src/main/xmli18n-tmp.h:600 msgid "Epson ActionLaser II" msgstr "" -#: src/main/xmli18n-tmp.h:554 +#: src/main/xmli18n-tmp.h:601 msgid "Epson AcuLaser C2000" msgstr "" -#: src/main/xmli18n-tmp.h:555 +#: src/main/xmli18n-tmp.h:602 msgid "Epson AcuLaser C2000PS" msgstr "" -#: src/main/xmli18n-tmp.h:556 +#: src/main/xmli18n-tmp.h:603 msgid "Epson AcuLaser C8500" msgstr "" -#: src/main/xmli18n-tmp.h:557 +#: src/main/xmli18n-tmp.h:604 msgid "Epson AcuLaser C8500PS" msgstr "" -#: src/main/xmli18n-tmp.h:558 +#: src/main/xmli18n-tmp.h:605 msgid "Epson AcuLaser C8600" msgstr "" -#: src/main/xmli18n-tmp.h:559 +#: src/main/xmli18n-tmp.h:606 msgid "Epson AcuLaser C8600PS" msgstr "" -#: src/main/xmli18n-tmp.h:560 +#: src/main/xmli18n-tmp.h:607 msgid "Epson EPL-5200" msgstr "" -#: src/main/xmli18n-tmp.h:561 +#: src/main/xmli18n-tmp.h:608 msgid "Epson EPL-5200+" msgstr "" -#: src/main/xmli18n-tmp.h:562 +#: src/main/xmli18n-tmp.h:609 msgid "Epson EPL-5700" msgstr "" -#: src/main/xmli18n-tmp.h:563 +#: src/main/xmli18n-tmp.h:610 msgid "Epson EPL-5700PS" msgstr "" -#: src/main/xmli18n-tmp.h:564 +#: src/main/xmli18n-tmp.h:611 msgid "Epson EPL-5800" msgstr "" -#: src/main/xmli18n-tmp.h:565 +#: src/main/xmli18n-tmp.h:612 msgid "Epson EPL-5800PS" msgstr "" -#: src/main/xmli18n-tmp.h:566 +#: src/main/xmli18n-tmp.h:613 msgid "Epson EPL-5900" msgstr "" -#: src/main/xmli18n-tmp.h:567 +#: src/main/xmli18n-tmp.h:614 msgid "Epson EPL-5900PS" msgstr "" -#: src/main/xmli18n-tmp.h:568 +#: src/main/xmli18n-tmp.h:615 msgid "Epson EPL-6100" msgstr "" -#: src/main/xmli18n-tmp.h:569 +#: src/main/xmli18n-tmp.h:616 msgid "Epson EPL-6100PS" msgstr "" -#: src/main/xmli18n-tmp.h:570 +#: src/main/xmli18n-tmp.h:617 msgid "Epson EPL-7100" msgstr "" -#: src/main/xmli18n-tmp.h:571 +#: src/main/xmli18n-tmp.h:618 msgid "Fujitsu PrintPartner 10V" msgstr "" -#: src/main/xmli18n-tmp.h:572 +#: src/main/xmli18n-tmp.h:619 msgid "Fujitsu PrintPartner 16DV" msgstr "" -#: src/main/xmli18n-tmp.h:573 +#: src/main/xmli18n-tmp.h:620 msgid "Fujitsu PrintPartner 20W" msgstr "" -#: src/main/xmli18n-tmp.h:574 +#: src/main/xmli18n-tmp.h:621 msgid "Fujitsu PrintPartner 8000" msgstr "" -#: src/main/xmli18n-tmp.h:575 +#: src/main/xmli18n-tmp.h:622 msgid "Generic PCL 4 Printer" msgstr "" -#: src/main/xmli18n-tmp.h:576 +#: src/main/xmli18n-tmp.h:623 +msgid "Generic PCL 4 LF Printer" +msgstr "" + +#: src/main/xmli18n-tmp.h:624 msgid "Generic PCL 5 Printer" msgstr "" -#: src/main/xmli18n-tmp.h:577 +#: src/main/xmli18n-tmp.h:625 +msgid "Generic PCL 5 LF Printer" +msgstr "" + +#: src/main/xmli18n-tmp.h:626 msgid "Generic PCL 5c Printer" msgstr "" -#: src/main/xmli18n-tmp.h:578 +#: src/main/xmli18n-tmp.h:627 +msgid "Generic PCL 5c LF Printer" +msgstr "" + +#: src/main/xmli18n-tmp.h:628 msgid "Generic PCL 5e Printer" msgstr "" -#: src/main/xmli18n-tmp.h:579 +#: src/main/xmli18n-tmp.h:629 +msgid "Generic PCL 5e LF Printer" +msgstr "" + +#: src/main/xmli18n-tmp.h:630 msgid "Generic PCL 6/PCL XL Printer" msgstr "" -#: src/main/xmli18n-tmp.h:580 +#: src/main/xmli18n-tmp.h:631 +msgid "Generic PCL 6/PCL XL LF Printer" +msgstr "" + +#: src/main/xmli18n-tmp.h:632 msgid "HP Business Inkjet 2200" msgstr "" -#: src/main/xmli18n-tmp.h:581 +#: src/main/xmli18n-tmp.h:633 msgid "HP Business Inkjet 2230" msgstr "" -#: src/main/xmli18n-tmp.h:582 +#: src/main/xmli18n-tmp.h:634 msgid "HP Business Inkjet 2250" msgstr "" -#: src/main/xmli18n-tmp.h:583 +#: src/main/xmli18n-tmp.h:635 msgid "HP Business Inkjet 2250TN" msgstr "" -#: src/main/xmli18n-tmp.h:584 +#: src/main/xmli18n-tmp.h:636 msgid "HP Business Inkjet 2280" msgstr "" -#: src/main/xmli18n-tmp.h:585 +#: src/main/xmli18n-tmp.h:637 msgid "HP Color Inkjet Printer CP1160" msgstr "" -#: src/main/xmli18n-tmp.h:586 +#: src/main/xmli18n-tmp.h:638 msgid "HP Color Inkjet Printer CP1700" msgstr "" -#: src/main/xmli18n-tmp.h:587 +#: src/main/xmli18n-tmp.h:639 msgid "HP Color LaserJet 2500" msgstr "" -#: src/main/xmli18n-tmp.h:588 +#: src/main/xmli18n-tmp.h:640 msgid "HP Color LaserJet 4500" msgstr "" -#: src/main/xmli18n-tmp.h:589 +#: src/main/xmli18n-tmp.h:641 msgid "HP Color LaserJet 4550" msgstr "" -#: src/main/xmli18n-tmp.h:590 +#: src/main/xmli18n-tmp.h:642 msgid "HP Color LaserJet 4600" msgstr "" -#: src/main/xmli18n-tmp.h:591 +#: src/main/xmli18n-tmp.h:643 msgid "HP Color LaserJet 5" msgstr "" -#: src/main/xmli18n-tmp.h:592 +#: src/main/xmli18n-tmp.h:644 msgid "HP Color LaserJet 5000" msgstr "" -#: src/main/xmli18n-tmp.h:593 +#: src/main/xmli18n-tmp.h:645 msgid "HP Color LaserJet 5500" msgstr "" -#: src/main/xmli18n-tmp.h:594 +#: src/main/xmli18n-tmp.h:646 msgid "HP Color LaserJet 8550GN" msgstr "" -#: src/main/xmli18n-tmp.h:595 +#: src/main/xmli18n-tmp.h:647 msgid "HP DesignJet 230" msgstr "" -#: src/main/xmli18n-tmp.h:596 +#: src/main/xmli18n-tmp.h:648 msgid "HP DesignJet 250C" msgstr "" -#: src/main/xmli18n-tmp.h:597 +#: src/main/xmli18n-tmp.h:649 msgid "HP DesignJet 430" msgstr "" -#: src/main/xmli18n-tmp.h:598 +#: src/main/xmli18n-tmp.h:650 msgid "HP DesignJet 450C" msgstr "" -#: src/main/xmli18n-tmp.h:599 +#: src/main/xmli18n-tmp.h:651 msgid "HP DesignJet 455CA" msgstr "" -#: src/main/xmli18n-tmp.h:600 +#: src/main/xmli18n-tmp.h:652 msgid "HP DesignJet 488CA" msgstr "" -#: src/main/xmli18n-tmp.h:601 +#: src/main/xmli18n-tmp.h:653 msgid "HP DesignJet 700" msgstr "" -#: src/main/xmli18n-tmp.h:602 +#: src/main/xmli18n-tmp.h:654 msgid "HP DesignJet 750C Plus" msgstr "" -#: src/main/xmli18n-tmp.h:603 +#: src/main/xmli18n-tmp.h:655 msgid "HP DesignJet 750C" msgstr "" -#: src/main/xmli18n-tmp.h:604 +#: src/main/xmli18n-tmp.h:656 msgid "HP DesignJet 2500CP" msgstr "" -#: src/main/xmli18n-tmp.h:605 +#: src/main/xmli18n-tmp.h:657 msgid "HP DesignJet 3500CP" msgstr "" -#: src/main/xmli18n-tmp.h:606 +#: src/main/xmli18n-tmp.h:658 msgid "HP DesignJet ColorPro CAD" msgstr "" -#: src/main/xmli18n-tmp.h:607 +#: src/main/xmli18n-tmp.h:659 msgid "HP DeskJet 400" msgstr "" -#: src/main/xmli18n-tmp.h:608 +#: src/main/xmli18n-tmp.h:660 msgid "HP DeskJet 420C" msgstr "" -#: src/main/xmli18n-tmp.h:609 +#: src/main/xmli18n-tmp.h:661 msgid "HP DeskJet 450" msgstr "" -#: src/main/xmli18n-tmp.h:610 +#: src/main/xmli18n-tmp.h:662 msgid "HP DeskJet 500" msgstr "" -#: src/main/xmli18n-tmp.h:611 +#: src/main/xmli18n-tmp.h:663 msgid "HP DeskJet 500C" msgstr "" -#: src/main/xmli18n-tmp.h:612 +#: src/main/xmli18n-tmp.h:664 msgid "HP DeskJet 505J Plus" msgstr "" -#: src/main/xmli18n-tmp.h:613 +#: src/main/xmli18n-tmp.h:665 msgid "HP DeskJet 510" msgstr "" -#: src/main/xmli18n-tmp.h:614 +#: src/main/xmli18n-tmp.h:666 msgid "HP DeskJet 520" msgstr "" -#: src/main/xmli18n-tmp.h:615 +#: src/main/xmli18n-tmp.h:667 msgid "HP DeskJet 540C" msgstr "" -#: src/main/xmli18n-tmp.h:616 +#: src/main/xmli18n-tmp.h:668 msgid "HP DeskJet 550C" msgstr "" -#: src/main/xmli18n-tmp.h:617 +#: src/main/xmli18n-tmp.h:669 msgid "HP DeskJet 5550" msgstr "" -#: src/main/xmli18n-tmp.h:618 +#: src/main/xmli18n-tmp.h:670 msgid "HP DeskJet 5551" msgstr "" -#: src/main/xmli18n-tmp.h:619 +#: src/main/xmli18n-tmp.h:671 msgid "HP DeskJet 560C" msgstr "" -#: src/main/xmli18n-tmp.h:620 +#: src/main/xmli18n-tmp.h:672 msgid "HP DeskJet 600" msgstr "" -#: src/main/xmli18n-tmp.h:621 +#: src/main/xmli18n-tmp.h:673 msgid "HP DeskJet 600C" msgstr "" -#: src/main/xmli18n-tmp.h:622 +#: src/main/xmli18n-tmp.h:674 msgid "HP DeskJet 610C" msgstr "" -#: src/main/xmli18n-tmp.h:623 +#: src/main/xmli18n-tmp.h:675 msgid "HP DeskJet 610CL" msgstr "" -#: src/main/xmli18n-tmp.h:624 +#: src/main/xmli18n-tmp.h:676 msgid "HP DeskJet 6122" msgstr "" -#: src/main/xmli18n-tmp.h:625 +#: src/main/xmli18n-tmp.h:677 msgid "HP DeskJet 6127" msgstr "" -#: src/main/xmli18n-tmp.h:626 +#: src/main/xmli18n-tmp.h:678 msgid "HP DeskJet 612C" msgstr "" -#: src/main/xmli18n-tmp.h:627 +#: src/main/xmli18n-tmp.h:679 msgid "HP DeskJet 640C" msgstr "" -#: src/main/xmli18n-tmp.h:628 +#: src/main/xmli18n-tmp.h:680 msgid "HP DeskJet 648C" msgstr "" -#: src/main/xmli18n-tmp.h:629 +#: src/main/xmli18n-tmp.h:681 msgid "HP DeskJet 660C" msgstr "" -#: src/main/xmli18n-tmp.h:630 +#: src/main/xmli18n-tmp.h:682 msgid "HP DeskJet 670C" msgstr "" -#: src/main/xmli18n-tmp.h:631 +#: src/main/xmli18n-tmp.h:683 msgid "HP DeskJet 670TV" msgstr "" -#: src/main/xmli18n-tmp.h:632 +#: src/main/xmli18n-tmp.h:684 msgid "HP DeskJet 672C" msgstr "" -#: src/main/xmli18n-tmp.h:633 +#: src/main/xmli18n-tmp.h:685 msgid "HP DeskJet 680C" msgstr "" -#: src/main/xmli18n-tmp.h:634 +#: src/main/xmli18n-tmp.h:686 msgid "HP DeskJet 682C" msgstr "" -#: src/main/xmli18n-tmp.h:635 +#: src/main/xmli18n-tmp.h:687 msgid "HP DeskJet 690C" msgstr "" -#: src/main/xmli18n-tmp.h:636 +#: src/main/xmli18n-tmp.h:688 msgid "HP DeskJet 692C" msgstr "" -#: src/main/xmli18n-tmp.h:637 +#: src/main/xmli18n-tmp.h:689 msgid "HP DeskJet 693C" msgstr "" -#: src/main/xmli18n-tmp.h:638 +#: src/main/xmli18n-tmp.h:690 msgid "HP DeskJet 694C" msgstr "" -#: src/main/xmli18n-tmp.h:639 +#: src/main/xmli18n-tmp.h:691 msgid "HP DeskJet 695C" msgstr "" -#: src/main/xmli18n-tmp.h:640 +#: src/main/xmli18n-tmp.h:692 msgid "HP DeskJet 697C" msgstr "" -#: src/main/xmli18n-tmp.h:641 +#: src/main/xmli18n-tmp.h:693 msgid "HP DeskJet 810C" msgstr "" -#: src/main/xmli18n-tmp.h:642 +#: src/main/xmli18n-tmp.h:694 msgid "HP DeskJet 812C" msgstr "" -#: src/main/xmli18n-tmp.h:643 +#: src/main/xmli18n-tmp.h:695 msgid "HP DeskJet 815C" msgstr "" -#: src/main/xmli18n-tmp.h:644 +#: src/main/xmli18n-tmp.h:696 msgid "HP DeskJet 816C" msgstr "" -#: src/main/xmli18n-tmp.h:645 +#: src/main/xmli18n-tmp.h:697 msgid "HP DeskJet 825C" msgstr "" -#: src/main/xmli18n-tmp.h:646 +#: src/main/xmli18n-tmp.h:698 msgid "HP DeskJet 830C" msgstr "" -#: src/main/xmli18n-tmp.h:647 +#: src/main/xmli18n-tmp.h:699 msgid "HP DeskJet 832C" msgstr "" -#: src/main/xmli18n-tmp.h:648 +#: src/main/xmli18n-tmp.h:700 msgid "HP DeskJet 840C" msgstr "" -#: src/main/xmli18n-tmp.h:649 +#: src/main/xmli18n-tmp.h:701 msgid "HP DeskJet 841C" msgstr "" -#: src/main/xmli18n-tmp.h:650 +#: src/main/xmli18n-tmp.h:702 msgid "HP DeskJet 842C" msgstr "" -#: src/main/xmli18n-tmp.h:651 +#: src/main/xmli18n-tmp.h:703 msgid "HP DeskJet 843C" msgstr "" -#: src/main/xmli18n-tmp.h:652 +#: src/main/xmli18n-tmp.h:704 msgid "HP DeskJet 845C" msgstr "" -#: src/main/xmli18n-tmp.h:653 +#: src/main/xmli18n-tmp.h:705 msgid "HP DeskJet 850C" msgstr "" -#: src/main/xmli18n-tmp.h:654 +#: src/main/xmli18n-tmp.h:706 msgid "HP DeskJet 855C" msgstr "" -#: src/main/xmli18n-tmp.h:655 +#: src/main/xmli18n-tmp.h:707 msgid "HP DeskJet 870C" msgstr "" -#: src/main/xmli18n-tmp.h:656 +#: src/main/xmli18n-tmp.h:708 msgid "HP DeskJet 880C" msgstr "" -#: src/main/xmli18n-tmp.h:657 +#: src/main/xmli18n-tmp.h:709 msgid "HP DeskJet 882C" msgstr "" -#: src/main/xmli18n-tmp.h:658 +#: src/main/xmli18n-tmp.h:710 msgid "HP DeskJet 890C" msgstr "" -#: src/main/xmli18n-tmp.h:659 +#: src/main/xmli18n-tmp.h:711 msgid "HP DeskJet 895C" msgstr "" -#: src/main/xmli18n-tmp.h:660 +#: src/main/xmli18n-tmp.h:712 msgid "HP DeskJet 916C" msgstr "" -#: src/main/xmli18n-tmp.h:661 +#: src/main/xmli18n-tmp.h:713 msgid "HP DeskJet 920C" msgstr "" -#: src/main/xmli18n-tmp.h:662 +#: src/main/xmli18n-tmp.h:714 msgid "HP DeskJet 9300" msgstr "" -#: src/main/xmli18n-tmp.h:663 +#: src/main/xmli18n-tmp.h:715 msgid "HP DeskJet 930C" msgstr "" -#: src/main/xmli18n-tmp.h:664 +#: src/main/xmli18n-tmp.h:716 msgid "HP DeskJet 932C" msgstr "" -#: src/main/xmli18n-tmp.h:665 +#: src/main/xmli18n-tmp.h:717 msgid "HP DeskJet 933C" msgstr "" -#: src/main/xmli18n-tmp.h:666 +#: src/main/xmli18n-tmp.h:718 msgid "HP DeskJet 934C" msgstr "" -#: src/main/xmli18n-tmp.h:667 +#: src/main/xmli18n-tmp.h:719 msgid "HP DeskJet 935C" msgstr "" -#: src/main/xmli18n-tmp.h:668 +#: src/main/xmli18n-tmp.h:720 msgid "HP DeskJet 940C" msgstr "" -#: src/main/xmli18n-tmp.h:669 +#: src/main/xmli18n-tmp.h:721 msgid "HP DeskJet 948C" msgstr "" -#: src/main/xmli18n-tmp.h:670 +#: src/main/xmli18n-tmp.h:722 msgid "HP DeskJet 950C" msgstr "" -#: src/main/xmli18n-tmp.h:671 +#: src/main/xmli18n-tmp.h:723 msgid "HP DeskJet 952C" msgstr "" -#: src/main/xmli18n-tmp.h:672 +#: src/main/xmli18n-tmp.h:724 msgid "HP DeskJet 955C" msgstr "" -#: src/main/xmli18n-tmp.h:673 +#: src/main/xmli18n-tmp.h:725 msgid "HP DeskJet 957C" msgstr "" -#: src/main/xmli18n-tmp.h:674 +#: src/main/xmli18n-tmp.h:726 msgid "HP DeskJet 959C" msgstr "" -#: src/main/xmli18n-tmp.h:675 +#: src/main/xmli18n-tmp.h:727 msgid "HP DeskJet 960C" msgstr "" -#: src/main/xmli18n-tmp.h:676 +#: src/main/xmli18n-tmp.h:728 msgid "HP DeskJet 970C" msgstr "" -#: src/main/xmli18n-tmp.h:677 +#: src/main/xmli18n-tmp.h:729 msgid "HP DeskJet 975C" msgstr "" -#: src/main/xmli18n-tmp.h:678 +#: src/main/xmli18n-tmp.h:730 msgid "HP DeskJet 980C" msgstr "" -#: src/main/xmli18n-tmp.h:679 +#: src/main/xmli18n-tmp.h:731 msgid "HP DeskJet 990C" msgstr "" -#: src/main/xmli18n-tmp.h:680 +#: src/main/xmli18n-tmp.h:732 msgid "HP DeskJet 995C" msgstr "" -#: src/main/xmli18n-tmp.h:681 +#: src/main/xmli18n-tmp.h:733 msgid "HP DeskJet 1100C" msgstr "" -#: src/main/xmli18n-tmp.h:682 +#: src/main/xmli18n-tmp.h:734 msgid "HP DeskJet 1120C" msgstr "" -#: src/main/xmli18n-tmp.h:683 +#: src/main/xmli18n-tmp.h:735 msgid "HP DeskJet 1125C" msgstr "" -#: src/main/xmli18n-tmp.h:684 +#: src/main/xmli18n-tmp.h:736 msgid "HP DeskJet 1200C" msgstr "" -#: src/main/xmli18n-tmp.h:685 +#: src/main/xmli18n-tmp.h:737 msgid "HP DeskJet 1220C" msgstr "" -#: src/main/xmli18n-tmp.h:686 +#: src/main/xmli18n-tmp.h:738 msgid "HP DeskJet 1600C" msgstr "" -#: src/main/xmli18n-tmp.h:687 +#: src/main/xmli18n-tmp.h:739 msgid "HP DeskJet 1600CM" msgstr "" -#: src/main/xmli18n-tmp.h:688 +#: src/main/xmli18n-tmp.h:740 msgid "HP DeskJet 2000" msgstr "" -#: src/main/xmli18n-tmp.h:689 +#: src/main/xmli18n-tmp.h:741 msgid "HP DeskJet 2500" msgstr "" -#: src/main/xmli18n-tmp.h:690 +#: src/main/xmli18n-tmp.h:742 msgid "HP DeskJet 2500CM" msgstr "" -#: src/main/xmli18n-tmp.h:691 +#: src/main/xmli18n-tmp.h:743 msgid "HP DeskJet 340C" msgstr "" -#: src/main/xmli18n-tmp.h:692 +#: src/main/xmli18n-tmp.h:744 msgid "HP DeskJet 3810" msgstr "" -#: src/main/xmli18n-tmp.h:693 +#: src/main/xmli18n-tmp.h:745 msgid "HP DeskJet 3816" msgstr "" -#: src/main/xmli18n-tmp.h:694 +#: src/main/xmli18n-tmp.h:746 msgid "HP DeskJet 3820" msgstr "" -#: src/main/xmli18n-tmp.h:695 +#: src/main/xmli18n-tmp.h:747 msgid "HP DeskJet 3822" msgstr "" -#: src/main/xmli18n-tmp.h:696 +#: src/main/xmli18n-tmp.h:748 msgid "HP LaserJet 2" msgstr "" -#: src/main/xmli18n-tmp.h:697 +#: src/main/xmli18n-tmp.h:749 msgid "HP LaserJet 2D" msgstr "" -#: src/main/xmli18n-tmp.h:698 +#: src/main/xmli18n-tmp.h:750 msgid "HP LaserJet 2P Plus" msgstr "" -#: src/main/xmli18n-tmp.h:699 +#: src/main/xmli18n-tmp.h:751 msgid "HP LaserJet 2P" msgstr "" -#: src/main/xmli18n-tmp.h:700 +#: src/main/xmli18n-tmp.h:752 msgid "HP LaserJet 3" msgstr "" -#: src/main/xmli18n-tmp.h:701 +#: src/main/xmli18n-tmp.h:753 msgid "HP LaserJet 3D" msgstr "" -#: src/main/xmli18n-tmp.h:702 +#: src/main/xmli18n-tmp.h:754 msgid "HP LaserJet 3P w/ PCL5" msgstr "" -#: src/main/xmli18n-tmp.h:703 +#: src/main/xmli18n-tmp.h:755 msgid "HP LaserJet 3P w/PS" msgstr "" -#: src/main/xmli18n-tmp.h:704 +#: src/main/xmli18n-tmp.h:756 msgid "HP LaserJet 4 Plus" msgstr "" -#: src/main/xmli18n-tmp.h:705 +#: src/main/xmli18n-tmp.h:757 msgid "HP LaserJet 4" msgstr "" -#: src/main/xmli18n-tmp.h:706 +#: src/main/xmli18n-tmp.h:758 msgid "HP LaserJet 4L" msgstr "" -#: src/main/xmli18n-tmp.h:707 +#: src/main/xmli18n-tmp.h:759 msgid "HP LaserJet 4M" msgstr "" -#: src/main/xmli18n-tmp.h:708 +#: src/main/xmli18n-tmp.h:760 msgid "HP LaserJet 4ML" msgstr "" -#: src/main/xmli18n-tmp.h:709 +#: src/main/xmli18n-tmp.h:761 msgid "HP LaserJet 4P" msgstr "" -#: src/main/xmli18n-tmp.h:710 +#: src/main/xmli18n-tmp.h:762 msgid "HP LaserJet 4Si" msgstr "" -#: src/main/xmli18n-tmp.h:711 +#: src/main/xmli18n-tmp.h:763 msgid "HP LaserJet 4V" msgstr "" -#: src/main/xmli18n-tmp.h:712 +#: src/main/xmli18n-tmp.h:764 msgid "HP LaserJet 5" msgstr "" -#: src/main/xmli18n-tmp.h:713 +#: src/main/xmli18n-tmp.h:765 msgid "HP LaserJet 5L" msgstr "" -#: src/main/xmli18n-tmp.h:714 +#: src/main/xmli18n-tmp.h:766 msgid "HP LaserJet 5M" msgstr "" -#: src/main/xmli18n-tmp.h:715 +#: src/main/xmli18n-tmp.h:767 msgid "HP LaserJet 5MP" msgstr "" -#: src/main/xmli18n-tmp.h:716 +#: src/main/xmli18n-tmp.h:768 msgid "HP LaserJet 5P" msgstr "" -#: src/main/xmli18n-tmp.h:717 +#: src/main/xmli18n-tmp.h:769 msgid "HP LaserJet 5Si" msgstr "" -#: src/main/xmli18n-tmp.h:718 +#: src/main/xmli18n-tmp.h:770 msgid "HP LaserJet 6" msgstr "" -#: src/main/xmli18n-tmp.h:719 +#: src/main/xmli18n-tmp.h:771 msgid "HP LaserJet 6L" msgstr "" -#: src/main/xmli18n-tmp.h:720 +#: src/main/xmli18n-tmp.h:772 msgid "HP LaserJet 6MP" msgstr "" -#: src/main/xmli18n-tmp.h:721 +#: src/main/xmli18n-tmp.h:773 msgid "HP LaserJet 6P" msgstr "" -#: src/main/xmli18n-tmp.h:722 +#: src/main/xmli18n-tmp.h:774 msgid "HP LaserJet 1010" msgstr "" -#: src/main/xmli18n-tmp.h:723 +#: src/main/xmli18n-tmp.h:775 msgid "HP LaserJet 1012" msgstr "" -#: src/main/xmli18n-tmp.h:724 +#: src/main/xmli18n-tmp.h:776 msgid "HP LaserJet 1015" msgstr "" -#: src/main/xmli18n-tmp.h:725 +#: src/main/xmli18n-tmp.h:777 msgid "HP LaserJet 1022" msgstr "" -#: src/main/xmli18n-tmp.h:726 +#: src/main/xmli18n-tmp.h:778 msgid "HP LaserJet 1100" msgstr "" -#: src/main/xmli18n-tmp.h:727 +#: src/main/xmli18n-tmp.h:779 msgid "HP LaserJet 1100A" msgstr "" -#: src/main/xmli18n-tmp.h:728 +#: src/main/xmli18n-tmp.h:780 msgid "HP LaserJet 1150" msgstr "" -#: src/main/xmli18n-tmp.h:729 +#: src/main/xmli18n-tmp.h:781 msgid "HP LaserJet 1200" msgstr "" -#: src/main/xmli18n-tmp.h:730 +#: src/main/xmli18n-tmp.h:782 msgid "HP LaserJet 1220" msgstr "" -#: src/main/xmli18n-tmp.h:731 +#: src/main/xmli18n-tmp.h:783 msgid "HP LaserJet 1300" msgstr "" -#: src/main/xmli18n-tmp.h:732 +#: src/main/xmli18n-tmp.h:784 msgid "HP LaserJet 2100" msgstr "" -#: src/main/xmli18n-tmp.h:733 +#: src/main/xmli18n-tmp.h:785 msgid "HP LaserJet 2100M" msgstr "" -#: src/main/xmli18n-tmp.h:734 +#: src/main/xmli18n-tmp.h:786 msgid "HP LaserJet 2200" msgstr "" -#: src/main/xmli18n-tmp.h:735 +#: src/main/xmli18n-tmp.h:787 msgid "HP LaserJet 2300" msgstr "" -#: src/main/xmli18n-tmp.h:736 +#: src/main/xmli18n-tmp.h:788 msgid "HP LaserJet 3200" msgstr "" -#: src/main/xmli18n-tmp.h:737 +#: src/main/xmli18n-tmp.h:789 msgid "HP LaserJet 3200m" msgstr "" -#: src/main/xmli18n-tmp.h:738 +#: src/main/xmli18n-tmp.h:790 msgid "HP LaserJet 3200se" msgstr "" -#: src/main/xmli18n-tmp.h:739 +#: src/main/xmli18n-tmp.h:791 msgid "HP LaserJet 3300 MFP" msgstr "" -#: src/main/xmli18n-tmp.h:740 +#: src/main/xmli18n-tmp.h:792 msgid "HP LaserJet 3310 MFP" msgstr "" -#: src/main/xmli18n-tmp.h:741 +#: src/main/xmli18n-tmp.h:793 msgid "HP LaserJet 3320 MFP" msgstr "" -#: src/main/xmli18n-tmp.h:742 +#: src/main/xmli18n-tmp.h:794 msgid "HP LaserJet 3320N MFP" msgstr "" -#: src/main/xmli18n-tmp.h:743 +#: src/main/xmli18n-tmp.h:795 msgid "HP LaserJet 3330 MFP" msgstr "" -#: src/main/xmli18n-tmp.h:744 +#: src/main/xmli18n-tmp.h:796 msgid "HP LaserJet 4000" msgstr "" -#: src/main/xmli18n-tmp.h:745 +#: src/main/xmli18n-tmp.h:797 msgid "HP LaserJet 4050" msgstr "" -#: src/main/xmli18n-tmp.h:746 +#: src/main/xmli18n-tmp.h:798 msgid "HP LaserJet 4100" msgstr "" -#: src/main/xmli18n-tmp.h:747 +#: src/main/xmli18n-tmp.h:799 msgid "HP LaserJet 4200" msgstr "" -#: src/main/xmli18n-tmp.h:748 +#: src/main/xmli18n-tmp.h:800 msgid "HP LaserJet 4300" msgstr "" -#: src/main/xmli18n-tmp.h:749 +#: src/main/xmli18n-tmp.h:801 msgid "HP LaserJet 5000" msgstr "" -#: src/main/xmli18n-tmp.h:750 +#: src/main/xmli18n-tmp.h:802 msgid "HP LaserJet 5100" msgstr "" -#: src/main/xmli18n-tmp.h:751 +#: src/main/xmli18n-tmp.h:803 msgid "HP LaserJet 8000" msgstr "" -#: src/main/xmli18n-tmp.h:752 +#: src/main/xmli18n-tmp.h:804 msgid "HP LaserJet 8100" msgstr "" -#: src/main/xmli18n-tmp.h:753 +#: src/main/xmli18n-tmp.h:805 msgid "HP LaserJet 8150" msgstr "" -#: src/main/xmli18n-tmp.h:754 +#: src/main/xmli18n-tmp.h:806 msgid "HP LaserJet 9000" msgstr "" -#: src/main/xmli18n-tmp.h:755 +#: src/main/xmli18n-tmp.h:807 msgid "HP Mopier 240" msgstr "" -#: src/main/xmli18n-tmp.h:756 +#: src/main/xmli18n-tmp.h:808 msgid "HP Mopier 320" msgstr "" -#: src/main/xmli18n-tmp.h:757 +#: src/main/xmli18n-tmp.h:809 msgid "HP OfficeJet 300" msgstr "" -#: src/main/xmli18n-tmp.h:758 +#: src/main/xmli18n-tmp.h:810 msgid "HP OfficeJet 330" msgstr "" -#: src/main/xmli18n-tmp.h:759 +#: src/main/xmli18n-tmp.h:811 msgid "HP OfficeJet 350" msgstr "" -#: src/main/xmli18n-tmp.h:760 +#: src/main/xmli18n-tmp.h:812 msgid "HP OfficeJet 500" msgstr "" -#: src/main/xmli18n-tmp.h:761 +#: src/main/xmli18n-tmp.h:813 msgid "HP OfficeJet 520" msgstr "" -#: src/main/xmli18n-tmp.h:762 +#: src/main/xmli18n-tmp.h:814 msgid "HP OfficeJet 570" msgstr "" -#: src/main/xmli18n-tmp.h:763 +#: src/main/xmli18n-tmp.h:815 msgid "HP OfficeJet 580" msgstr "" -#: src/main/xmli18n-tmp.h:764 +#: src/main/xmli18n-tmp.h:816 msgid "HP OfficeJet 590" msgstr "" -#: src/main/xmli18n-tmp.h:765 +#: src/main/xmli18n-tmp.h:817 msgid "HP OfficeJet 600" msgstr "" -#: src/main/xmli18n-tmp.h:766 +#: src/main/xmli18n-tmp.h:818 msgid "HP OfficeJet 610" msgstr "" -#: src/main/xmli18n-tmp.h:767 +#: src/main/xmli18n-tmp.h:819 msgid "HP OfficeJet 625" msgstr "" -#: src/main/xmli18n-tmp.h:768 +#: src/main/xmli18n-tmp.h:820 msgid "HP OfficeJet 630" msgstr "" -#: src/main/xmli18n-tmp.h:769 +#: src/main/xmli18n-tmp.h:821 msgid "HP OfficeJet 635" msgstr "" -#: src/main/xmli18n-tmp.h:770 +#: src/main/xmli18n-tmp.h:822 msgid "HP OfficeJet 700" msgstr "" -#: src/main/xmli18n-tmp.h:771 +#: src/main/xmli18n-tmp.h:823 msgid "HP OfficeJet 710" msgstr "" -#: src/main/xmli18n-tmp.h:772 +#: src/main/xmli18n-tmp.h:824 msgid "HP OfficeJet 720" msgstr "" -#: src/main/xmli18n-tmp.h:773 +#: src/main/xmli18n-tmp.h:825 msgid "HP OfficeJet 725" msgstr "" -#: src/main/xmli18n-tmp.h:774 +#: src/main/xmli18n-tmp.h:826 msgid "HP OfficeJet 5105" msgstr "" -#: src/main/xmli18n-tmp.h:775 +#: src/main/xmli18n-tmp.h:827 msgid "HP OfficeJet 5110" msgstr "" -#: src/main/xmli18n-tmp.h:776 +#: src/main/xmli18n-tmp.h:828 msgid "HP OfficeJet 5110xi" msgstr "" -#: src/main/xmli18n-tmp.h:777 +#: src/main/xmli18n-tmp.h:829 msgid "HP OfficeJet 6105" msgstr "" -#: src/main/xmli18n-tmp.h:778 +#: src/main/xmli18n-tmp.h:830 msgid "HP OfficeJet 6110" msgstr "" -#: src/main/xmli18n-tmp.h:779 +#: src/main/xmli18n-tmp.h:831 msgid "HP OfficeJet 7110" msgstr "" -#: src/main/xmli18n-tmp.h:780 +#: src/main/xmli18n-tmp.h:832 msgid "HP OfficeJet 7130" msgstr "" -#: src/main/xmli18n-tmp.h:781 +#: src/main/xmli18n-tmp.h:833 msgid "HP OfficeJet 7140" msgstr "" -#: src/main/xmli18n-tmp.h:782 +#: src/main/xmli18n-tmp.h:834 msgid "HP OfficeJet D125" msgstr "" -#: src/main/xmli18n-tmp.h:783 +#: src/main/xmli18n-tmp.h:835 msgid "HP OfficeJet D135" msgstr "" -#: src/main/xmli18n-tmp.h:784 +#: src/main/xmli18n-tmp.h:836 msgid "HP OfficeJet D145" msgstr "" -#: src/main/xmli18n-tmp.h:785 +#: src/main/xmli18n-tmp.h:837 msgid "HP OfficeJet D155" msgstr "" -#: src/main/xmli18n-tmp.h:786 +#: src/main/xmli18n-tmp.h:838 msgid "HP OfficeJet G55" msgstr "" -#: src/main/xmli18n-tmp.h:787 +#: src/main/xmli18n-tmp.h:839 msgid "HP OfficeJet G85" msgstr "" -#: src/main/xmli18n-tmp.h:788 +#: src/main/xmli18n-tmp.h:840 msgid "HP OfficeJet G95" msgstr "" -#: src/main/xmli18n-tmp.h:789 +#: src/main/xmli18n-tmp.h:841 msgid "HP OfficeJet K60" msgstr "" -#: src/main/xmli18n-tmp.h:790 +#: src/main/xmli18n-tmp.h:842 msgid "HP OfficeJet K60xi" msgstr "" -#: src/main/xmli18n-tmp.h:791 +#: src/main/xmli18n-tmp.h:843 msgid "HP OfficeJet K80" msgstr "" -#: src/main/xmli18n-tmp.h:792 +#: src/main/xmli18n-tmp.h:844 msgid "HP OfficeJet K80xi" msgstr "" -#: src/main/xmli18n-tmp.h:793 +#: src/main/xmli18n-tmp.h:845 msgid "HP OfficeJet LX" msgstr "" -#: src/main/xmli18n-tmp.h:794 +#: src/main/xmli18n-tmp.h:846 msgid "HP OfficeJet Pro 1150C" msgstr "" -#: src/main/xmli18n-tmp.h:795 +#: src/main/xmli18n-tmp.h:847 msgid "HP OfficeJet Pro 1170C" msgstr "" -#: src/main/xmli18n-tmp.h:796 +#: src/main/xmli18n-tmp.h:848 msgid "HP OfficeJet Pro 1175C" msgstr "" -#: src/main/xmli18n-tmp.h:797 +#: src/main/xmli18n-tmp.h:849 msgid "HP OfficeJet R40" msgstr "" -#: src/main/xmli18n-tmp.h:798 +#: src/main/xmli18n-tmp.h:850 msgid "HP OfficeJet R45" msgstr "" -#: src/main/xmli18n-tmp.h:799 +#: src/main/xmli18n-tmp.h:851 msgid "HP OfficeJet R60" msgstr "" -#: src/main/xmli18n-tmp.h:800 +#: src/main/xmli18n-tmp.h:852 msgid "HP OfficeJet R65" msgstr "" -#: src/main/xmli18n-tmp.h:801 +#: src/main/xmli18n-tmp.h:853 msgid "HP OfficeJet R80" msgstr "" -#: src/main/xmli18n-tmp.h:802 +#: src/main/xmli18n-tmp.h:854 msgid "HP OfficeJet T45" msgstr "" -#: src/main/xmli18n-tmp.h:803 +#: src/main/xmli18n-tmp.h:855 msgid "HP OfficeJet T65" msgstr "" -#: src/main/xmli18n-tmp.h:804 +#: src/main/xmli18n-tmp.h:856 msgid "HP OfficeJet V40" msgstr "" -#: src/main/xmli18n-tmp.h:805 +#: src/main/xmli18n-tmp.h:857 msgid "HP OfficeJet V40xi" msgstr "" -#: src/main/xmli18n-tmp.h:806 +#: src/main/xmli18n-tmp.h:858 msgid "HP OfficeJet" msgstr "" -#: src/main/xmli18n-tmp.h:807 +#: src/main/xmli18n-tmp.h:859 msgid "HP PSC 370" msgstr "" -#: src/main/xmli18n-tmp.h:808 +#: src/main/xmli18n-tmp.h:860 msgid "HP PSC 380" msgstr "" -#: src/main/xmli18n-tmp.h:809 +#: src/main/xmli18n-tmp.h:861 msgid "HP PSC 500" msgstr "" -#: src/main/xmli18n-tmp.h:810 +#: src/main/xmli18n-tmp.h:862 msgid "HP PSC 750" msgstr "" -#: src/main/xmli18n-tmp.h:811 +#: src/main/xmli18n-tmp.h:863 msgid "HP PSC 950" msgstr "" -#: src/main/xmli18n-tmp.h:812 +#: src/main/xmli18n-tmp.h:864 msgid "HP PSC 950xi" msgstr "" -#: src/main/xmli18n-tmp.h:813 +#: src/main/xmli18n-tmp.h:865 msgid "HP PSC 2110" msgstr "" -#: src/main/xmli18n-tmp.h:814 +#: src/main/xmli18n-tmp.h:866 msgid "HP PSC 2150" msgstr "" -#: src/main/xmli18n-tmp.h:815 +#: src/main/xmli18n-tmp.h:867 msgid "HP PSC 2210" msgstr "" -#: src/main/xmli18n-tmp.h:816 +#: src/main/xmli18n-tmp.h:868 msgid "HP PhotoSmart 7150" msgstr "" -#: src/main/xmli18n-tmp.h:817 +#: src/main/xmli18n-tmp.h:869 msgid "HP PhotoSmart 7345" msgstr "" -#: src/main/xmli18n-tmp.h:818 +#: src/main/xmli18n-tmp.h:870 msgid "HP PhotoSmart 7350" msgstr "" -#: src/main/xmli18n-tmp.h:819 +#: src/main/xmli18n-tmp.h:871 msgid "HP PhotoSmart 7550" msgstr "" -#: src/main/xmli18n-tmp.h:820 +#: src/main/xmli18n-tmp.h:872 msgid "HP PhotoSmart P100" msgstr "" -#: src/main/xmli18n-tmp.h:821 +#: src/main/xmli18n-tmp.h:873 msgid "HP PhotoSmart P130" msgstr "" -#: src/main/xmli18n-tmp.h:822 +#: src/main/xmli18n-tmp.h:874 msgid "HP PhotoSmart P230" msgstr "" -#: src/main/xmli18n-tmp.h:823 +#: src/main/xmli18n-tmp.h:875 msgid "HP PhotoSmart P1000" msgstr "" -#: src/main/xmli18n-tmp.h:824 +#: src/main/xmli18n-tmp.h:876 msgid "HP PhotoSmart P1100" msgstr "" -#: src/main/xmli18n-tmp.h:825 +#: src/main/xmli18n-tmp.h:877 msgid "HP PhotoSmart P1115" msgstr "" -#: src/main/xmli18n-tmp.h:826 +#: src/main/xmli18n-tmp.h:878 msgid "HP PhotoSmart P1215" msgstr "" -#: src/main/xmli18n-tmp.h:827 +#: src/main/xmli18n-tmp.h:879 msgid "HP PhotoSmart P1218" msgstr "" -#: src/main/xmli18n-tmp.h:828 +#: src/main/xmli18n-tmp.h:880 msgid "HP PhotoSmart P1315" msgstr "" -#: src/main/xmli18n-tmp.h:829 +#: src/main/xmli18n-tmp.h:881 #, fuzzy msgid "HP e-printer e20" msgstr "Model drukarki:" -#: src/main/xmli18n-tmp.h:830 +#: src/main/xmli18n-tmp.h:882 msgid "IBM 4019" msgstr "" -#: src/main/xmli18n-tmp.h:831 +#: src/main/xmli18n-tmp.h:883 msgid "IBM 4029 030 LaserPrinter 10" msgstr "" -#: src/main/xmli18n-tmp.h:832 +#: src/main/xmli18n-tmp.h:884 msgid "IBM 4312" msgstr "" -#: src/main/xmli18n-tmp.h:833 +#: src/main/xmli18n-tmp.h:885 msgid "IBM Infoprint 12" msgstr "" -#: src/main/xmli18n-tmp.h:834 +#: src/main/xmli18n-tmp.h:886 msgid "IBM Page Printer 3112" msgstr "" -#: src/main/xmli18n-tmp.h:835 +#: src/main/xmli18n-tmp.h:887 msgid "Infotec 4651 MF" msgstr "" -#: src/main/xmli18n-tmp.h:836 +#: src/main/xmli18n-tmp.h:888 msgid "Kyocera F-1010" msgstr "" -#: src/main/xmli18n-tmp.h:837 +#: src/main/xmli18n-tmp.h:889 msgid "Kyocera FS-600 - KPDL-2" msgstr "" -#: src/main/xmli18n-tmp.h:838 +#: src/main/xmli18n-tmp.h:890 msgid "Kyocera FS-600" msgstr "" -#: src/main/xmli18n-tmp.h:839 +#: src/main/xmli18n-tmp.h:891 msgid "Kyocera FS-680" msgstr "" -#: src/main/xmli18n-tmp.h:840 +#: src/main/xmli18n-tmp.h:892 msgid "Kyocera FS-800" msgstr "" -#: src/main/xmli18n-tmp.h:841 +#: src/main/xmli18n-tmp.h:893 msgid "Kyocera FS-1000" msgstr "" -#: src/main/xmli18n-tmp.h:842 +#: src/main/xmli18n-tmp.h:894 msgid "Kyocera FS-1000+" msgstr "" -#: src/main/xmli18n-tmp.h:843 +#: src/main/xmli18n-tmp.h:895 msgid "Kyocera FS-1010" msgstr "" -#: src/main/xmli18n-tmp.h:844 +#: src/main/xmli18n-tmp.h:896 msgid "Kyocera FS-1050" msgstr "" -#: src/main/xmli18n-tmp.h:845 +#: src/main/xmli18n-tmp.h:897 msgid "Kyocera FS-1200" msgstr "" -#: src/main/xmli18n-tmp.h:846 +#: src/main/xmli18n-tmp.h:898 msgid "Kyocera FS-1600" msgstr "" -#: src/main/xmli18n-tmp.h:847 +#: src/main/xmli18n-tmp.h:899 msgid "Kyocera FS-1600+" msgstr "" -#: src/main/xmli18n-tmp.h:848 +#: src/main/xmli18n-tmp.h:900 msgid "Kyocera FS-1700" msgstr "" -#: src/main/xmli18n-tmp.h:849 +#: src/main/xmli18n-tmp.h:901 msgid "Kyocera FS-1700+" msgstr "" -#: src/main/xmli18n-tmp.h:850 +#: src/main/xmli18n-tmp.h:902 msgid "Kyocera FS-1750" msgstr "" -#: src/main/xmli18n-tmp.h:851 +#: src/main/xmli18n-tmp.h:903 msgid "Kyocera FS-1800" msgstr "" -#: src/main/xmli18n-tmp.h:852 +#: src/main/xmli18n-tmp.h:904 msgid "Kyocera FS-1800+" msgstr "" -#: src/main/xmli18n-tmp.h:853 +#: src/main/xmli18n-tmp.h:905 msgid "Kyocera FS-1900" msgstr "" -#: src/main/xmli18n-tmp.h:854 +#: src/main/xmli18n-tmp.h:906 msgid "Kyocera FS-3500" msgstr "" -#: src/main/xmli18n-tmp.h:855 +#: src/main/xmli18n-tmp.h:907 msgid "Kyocera FS-3600" msgstr "" -#: src/main/xmli18n-tmp.h:856 +#: src/main/xmli18n-tmp.h:908 msgid "Kyocera FS-3600+" msgstr "" -#: src/main/xmli18n-tmp.h:857 +#: src/main/xmli18n-tmp.h:909 msgid "Kyocera FS-3700" msgstr "" -#: src/main/xmli18n-tmp.h:858 +#: src/main/xmli18n-tmp.h:910 msgid "Kyocera FS-3700+" msgstr "" -#: src/main/xmli18n-tmp.h:859 +#: src/main/xmli18n-tmp.h:911 msgid "Kyocera FS-3750" msgstr "" -#: src/main/xmli18n-tmp.h:860 +#: src/main/xmli18n-tmp.h:912 msgid "Kyocera FS-3800" msgstr "" -#: src/main/xmli18n-tmp.h:861 +#: src/main/xmli18n-tmp.h:913 msgid "Kyocera FS-5800C" msgstr "" -#: src/main/xmli18n-tmp.h:862 +#: src/main/xmli18n-tmp.h:914 msgid "Kyocera FS-5900C" msgstr "" -#: src/main/xmli18n-tmp.h:863 +#: src/main/xmli18n-tmp.h:915 msgid "Kyocera FS-6500" msgstr "" -#: src/main/xmli18n-tmp.h:864 +#: src/main/xmli18n-tmp.h:916 msgid "Kyocera FS-6500+" msgstr "" -#: src/main/xmli18n-tmp.h:865 +#: src/main/xmli18n-tmp.h:917 msgid "Kyocera FS-6700" msgstr "" -#: src/main/xmli18n-tmp.h:866 +#: src/main/xmli18n-tmp.h:918 msgid "Kyocera FS-7000" msgstr "" -#: src/main/xmli18n-tmp.h:867 +#: src/main/xmli18n-tmp.h:919 msgid "Kyocera FS-7000+" msgstr "" -#: src/main/xmli18n-tmp.h:868 +#: src/main/xmli18n-tmp.h:920 msgid "Kyocera FS-8000C" msgstr "" -#: src/main/xmli18n-tmp.h:869 +#: src/main/xmli18n-tmp.h:921 msgid "Kyocera FS-9000" msgstr "" -#: src/main/xmli18n-tmp.h:870 +#: src/main/xmli18n-tmp.h:922 msgid "Kyocera FS-9100DN" msgstr "" -#: src/main/xmli18n-tmp.h:871 +#: src/main/xmli18n-tmp.h:923 msgid "Kyocera FS-9500DN" msgstr "" -#: src/main/xmli18n-tmp.h:872 +#: src/main/xmli18n-tmp.h:924 msgid "Kyocera KM-1530" msgstr "" -#: src/main/xmli18n-tmp.h:873 +#: src/main/xmli18n-tmp.h:925 msgid "Kyocera KM-1810" msgstr "" -#: src/main/xmli18n-tmp.h:874 +#: src/main/xmli18n-tmp.h:926 msgid "Kyocera KM-2030" msgstr "" -#: src/main/xmli18n-tmp.h:875 +#: src/main/xmli18n-tmp.h:927 msgid "Kyocera KM-2530" msgstr "" -#: src/main/xmli18n-tmp.h:876 +#: src/main/xmli18n-tmp.h:928 msgid "Kyocera KM-3530" msgstr "" -#: src/main/xmli18n-tmp.h:877 +#: src/main/xmli18n-tmp.h:929 msgid "Kyocera KM-4230" msgstr "" -#: src/main/xmli18n-tmp.h:878 +#: src/main/xmli18n-tmp.h:930 msgid "Kyocera KM-4530" msgstr "" -#: src/main/xmli18n-tmp.h:879 +#: src/main/xmli18n-tmp.h:931 msgid "Kyocera KM-5230" msgstr "" -#: src/main/xmli18n-tmp.h:880 +#: src/main/xmli18n-tmp.h:932 msgid "Kyocera KM-5530" msgstr "" -#: src/main/xmli18n-tmp.h:881 +#: src/main/xmli18n-tmp.h:933 msgid "Kyocera KM-6230" msgstr "" -#: src/main/xmli18n-tmp.h:882 +#: src/main/xmli18n-tmp.h:934 msgid "Lexmark 4076" msgstr "" -#: src/main/xmli18n-tmp.h:883 +#: src/main/xmli18n-tmp.h:935 msgid "Lexmark Optra E" msgstr "" -#: src/main/xmli18n-tmp.h:884 +#: src/main/xmli18n-tmp.h:936 msgid "Lexmark Optra E+" msgstr "" -#: src/main/xmli18n-tmp.h:885 +#: src/main/xmli18n-tmp.h:937 msgid "Lexmark Optra E220" msgstr "" -#: src/main/xmli18n-tmp.h:886 +#: src/main/xmli18n-tmp.h:938 msgid "Lexmark Valuewriter 300" msgstr "" -#: src/main/xmli18n-tmp.h:887 +#: src/main/xmli18n-tmp.h:939 msgid "Minolta PagePro 6" msgstr "" -#: src/main/xmli18n-tmp.h:888 +#: src/main/xmli18n-tmp.h:940 msgid "Minolta PagePro 6e" msgstr "" -#: src/main/xmli18n-tmp.h:889 +#: src/main/xmli18n-tmp.h:941 msgid "Minolta PagePro 6ex" msgstr "" -#: src/main/xmli18n-tmp.h:890 +#: src/main/xmli18n-tmp.h:942 msgid "Minolta PagePro 8" msgstr "" -#: src/main/xmli18n-tmp.h:891 +#: src/main/xmli18n-tmp.h:943 msgid "Minolta PagePro 8L" msgstr "" -#: src/main/xmli18n-tmp.h:892 +#: src/main/xmli18n-tmp.h:944 msgid "Minolta PagePro 1100" msgstr "" -#: src/main/xmli18n-tmp.h:893 +#: src/main/xmli18n-tmp.h:945 msgid "NEC SuperScript 660i" msgstr "" -#: src/main/xmli18n-tmp.h:894 +#: src/main/xmli18n-tmp.h:946 msgid "NEC SuperScript 860" msgstr "" -#: src/main/xmli18n-tmp.h:895 +#: src/main/xmli18n-tmp.h:947 msgid "NEC SuperScript 870" msgstr "" -#: src/main/xmli18n-tmp.h:896 +#: src/main/xmli18n-tmp.h:948 msgid "NEC SuperScript 1260" msgstr "" -#: src/main/xmli18n-tmp.h:897 +#: src/main/xmli18n-tmp.h:949 msgid "NEC SuperScript 1400" msgstr "" -#: src/main/xmli18n-tmp.h:898 +#: src/main/xmli18n-tmp.h:950 msgid "NEC SuperScript 1800" msgstr "" -#: src/main/xmli18n-tmp.h:899 +#: src/main/xmli18n-tmp.h:951 msgid "Okidata OL400" msgstr "" -#: src/main/xmli18n-tmp.h:900 +#: src/main/xmli18n-tmp.h:952 msgid "Okidata OL400e" msgstr "" -#: src/main/xmli18n-tmp.h:901 +#: src/main/xmli18n-tmp.h:953 msgid "Okidata OL400ex" msgstr "" -#: src/main/xmli18n-tmp.h:902 +#: src/main/xmli18n-tmp.h:954 msgid "Okidata OL410e" msgstr "" -#: src/main/xmli18n-tmp.h:903 +#: src/main/xmli18n-tmp.h:955 msgid "Okidata OL600e" msgstr "" -#: src/main/xmli18n-tmp.h:904 +#: src/main/xmli18n-tmp.h:956 msgid "Okidata OL610e/S" msgstr "" -#: src/main/xmli18n-tmp.h:905 +#: src/main/xmli18n-tmp.h:957 msgid "Okidata OL800" msgstr "" -#: src/main/xmli18n-tmp.h:906 +#: src/main/xmli18n-tmp.h:958 msgid "Okidata OL810ex" msgstr "" -#: src/main/xmli18n-tmp.h:907 +#: src/main/xmli18n-tmp.h:959 msgid "Okidata Okipage 6e" msgstr "" -#: src/main/xmli18n-tmp.h:908 +#: src/main/xmli18n-tmp.h:960 msgid "Okidata Okipage 6ex" msgstr "" -#: src/main/xmli18n-tmp.h:909 +#: src/main/xmli18n-tmp.h:961 msgid "Okidata Okipage 8p" msgstr "" -#: src/main/xmli18n-tmp.h:910 +#: src/main/xmli18n-tmp.h:962 msgid "Okidata Okipage 10e" msgstr "" -#: src/main/xmli18n-tmp.h:911 +#: src/main/xmli18n-tmp.h:963 msgid "Okidata Okipage 10ex" msgstr "" -#: src/main/xmli18n-tmp.h:912 +#: src/main/xmli18n-tmp.h:964 msgid "Okidata Okipage 14ex" msgstr "" -#: src/main/xmli18n-tmp.h:913 +#: src/main/xmli18n-tmp.h:965 msgid "Okidata Super 6e" msgstr "" -#: src/main/xmli18n-tmp.h:914 +#: src/main/xmli18n-tmp.h:966 msgid "Olivetti JP350S" msgstr "" -#: src/main/xmli18n-tmp.h:915 +#: src/main/xmli18n-tmp.h:967 msgid "Olivetti PG 306" msgstr "" -#: src/main/xmli18n-tmp.h:916 +#: src/main/xmli18n-tmp.h:968 msgid "PCPI 1030" msgstr "" -#: src/main/xmli18n-tmp.h:917 +#: src/main/xmli18n-tmp.h:969 msgid "Panasonic KX-P4410" msgstr "" -#: src/main/xmli18n-tmp.h:918 +#: src/main/xmli18n-tmp.h:970 msgid "Panasonic KX-P4450" msgstr "" -#: src/main/xmli18n-tmp.h:919 +#: src/main/xmli18n-tmp.h:971 msgid "Panasonic KX-P6150" msgstr "" -#: src/main/xmli18n-tmp.h:920 +#: src/main/xmli18n-tmp.h:972 msgid "Panasonic KX-P6500" msgstr "" -#: src/main/xmli18n-tmp.h:921 +#: src/main/xmli18n-tmp.h:973 msgid "Raven LP-410" msgstr "" -#: src/main/xmli18n-tmp.h:922 +#: src/main/xmli18n-tmp.h:974 msgid "Ricoh Aficio 220" msgstr "" -#: src/main/xmli18n-tmp.h:923 +#: src/main/xmli18n-tmp.h:975 msgid "Ricoh Aficio 401" msgstr "" -#: src/main/xmli18n-tmp.h:924 +#: src/main/xmli18n-tmp.h:976 msgid "Ricoh Aficio 700" msgstr "" -#: src/main/xmli18n-tmp.h:925 +#: src/main/xmli18n-tmp.h:977 msgid "Samsung ML-85" msgstr "" -#: src/main/xmli18n-tmp.h:926 +#: src/main/xmli18n-tmp.h:978 msgid "Samsung ML-4600" msgstr "" -#: src/main/xmli18n-tmp.h:927 +#: src/main/xmli18n-tmp.h:979 msgid "Samsung ML-5000a" msgstr "" -#: src/main/xmli18n-tmp.h:928 +#: src/main/xmli18n-tmp.h:980 msgid "Samsung ML-6000" msgstr "" -#: src/main/xmli18n-tmp.h:929 +#: src/main/xmli18n-tmp.h:981 msgid "Samsung ML-6100" msgstr "" -#: src/main/xmli18n-tmp.h:930 +#: src/main/xmli18n-tmp.h:982 msgid "Samsung ML-7000" msgstr "" -#: src/main/xmli18n-tmp.h:931 +#: src/main/xmli18n-tmp.h:983 msgid "Samsung ML-7000N" msgstr "" -#: src/main/xmli18n-tmp.h:932 +#: src/main/xmli18n-tmp.h:984 msgid "Samsung ML-7000P" msgstr "" -#: src/main/xmli18n-tmp.h:933 +#: src/main/xmli18n-tmp.h:985 msgid "Samsung ML-7050" msgstr "" -#: src/main/xmli18n-tmp.h:934 +#: src/main/xmli18n-tmp.h:986 msgid "Samsung QL-5100A" msgstr "" -#: src/main/xmli18n-tmp.h:935 +#: src/main/xmli18n-tmp.h:987 msgid "Samsung QL-6050" msgstr "" -#: src/main/xmli18n-tmp.h:936 +#: src/main/xmli18n-tmp.h:988 msgid "Seiko SpeedJET 200" msgstr "" -#: src/main/xmli18n-tmp.h:937 +#: src/main/xmli18n-tmp.h:989 msgid "Sharp AR-161" msgstr "" -#: src/main/xmli18n-tmp.h:938 +#: src/main/xmli18n-tmp.h:990 msgid "Sharp AR-M257" msgstr "" -#: src/main/xmli18n-tmp.h:939 +#: src/main/xmli18n-tmp.h:991 msgid "Sony IJP-V100" msgstr "" -#: src/main/xmli18n-tmp.h:940 +#: src/main/xmli18n-tmp.h:992 msgid "Star LS-04" msgstr "" -#: src/main/xmli18n-tmp.h:941 +#: src/main/xmli18n-tmp.h:993 #, fuzzy msgid "Star LaserPrinter 8" msgstr "Ustawienia drukarki" -#: src/main/xmli18n-tmp.h:942 +#: src/main/xmli18n-tmp.h:994 msgid "Tally MT908" msgstr "" -#: src/main/xmli18n-tmp.h:943 +#: src/main/xmli18n-tmp.h:995 msgid "Xerox Able 1406" msgstr "" -#: src/main/xmli18n-tmp.h:944 +#: src/main/xmli18n-tmp.h:996 msgid "Xerox DocuPrint 4508" msgstr "" -#: src/main/xmli18n-tmp.h:945 +#: src/main/xmli18n-tmp.h:997 msgid "Xerox DocuPrint C20" msgstr "" -#: src/main/xmli18n-tmp.h:946 +#: src/main/xmli18n-tmp.h:998 msgid "Xerox DocuPrint N4512" msgstr "" -#: src/main/xmli18n-tmp.h:947 +#: src/main/xmli18n-tmp.h:999 msgid "Xerox DocuPrint N4512PS" msgstr "" -#: src/main/xmli18n-tmp.h:948 +#: src/main/xmli18n-tmp.h:1000 msgid "Xerox DocuPrint P12" msgstr "" -#: src/main/xmli18n-tmp.h:949 +#: src/main/xmli18n-tmp.h:1001 msgid "Xerox DocuPrint P1202" msgstr "" -#: src/main/xmli18n-tmp.h:950 +#: src/main/xmli18n-tmp.h:1002 msgid "Xerox DocuPrint P8e" msgstr "" -#: src/main/xmli18n-tmp.h:951 +#: src/main/xmli18n-tmp.h:1003 msgid "Xerox Document Centre 400" msgstr "" -#: src/main/xmli18n-tmp.h:952 +#: src/main/xmli18n-tmp.h:1004 msgid "Xerox WorkCentre M118" msgstr "" -#: src/main/xmli18n-tmp.h:953 +#: src/main/xmli18n-tmp.h:1005 msgid "Compaq IJ1200" msgstr "" -#: src/main/xmli18n-tmp.h:954 +#: src/main/xmli18n-tmp.h:1006 msgid "Lexmark X73" msgstr "" -#: src/main/xmli18n-tmp.h:955 +#: src/main/xmli18n-tmp.h:1007 msgid "Lexmark Z42" msgstr "" -#: src/main/xmli18n-tmp.h:956 +#: src/main/xmli18n-tmp.h:1008 msgid "Lexmark Z43" msgstr "" -#: src/main/xmli18n-tmp.h:957 +#: src/main/xmli18n-tmp.h:1009 msgid "Lexmark Z52" msgstr "" -#: src/main/xmli18n-tmp.h:958 +#: src/main/xmli18n-tmp.h:1010 msgid "Lexmark Z53" msgstr "" -#: src/main/xmli18n-tmp.h:959 +#: src/main/xmli18n-tmp.h:1011 msgid "Olympus P-10" msgstr "" -#: src/main/xmli18n-tmp.h:960 +#: src/main/xmli18n-tmp.h:1012 msgid "Olympus P-11" msgstr "" -#: src/main/xmli18n-tmp.h:961 +#: src/main/xmli18n-tmp.h:1013 msgid "Olympus P-200" msgstr "" -#: src/main/xmli18n-tmp.h:962 +#: src/main/xmli18n-tmp.h:1014 msgid "Olympus P-300" msgstr "" -#: src/main/xmli18n-tmp.h:963 +#: src/main/xmli18n-tmp.h:1015 msgid "Olympus P-300E" msgstr "" -#: src/main/xmli18n-tmp.h:964 +#: src/main/xmli18n-tmp.h:1016 msgid "Olympus P-300U" msgstr "" -#: src/main/xmli18n-tmp.h:965 +#: src/main/xmli18n-tmp.h:1017 msgid "Olympus P-330E" msgstr "" -#: src/main/xmli18n-tmp.h:966 +#: src/main/xmli18n-tmp.h:1018 msgid "Olympus P-330NE" msgstr "" -#: src/main/xmli18n-tmp.h:967 +#: src/main/xmli18n-tmp.h:1019 msgid "Olympus P-400" msgstr "" -#: src/main/xmli18n-tmp.h:968 +#: src/main/xmli18n-tmp.h:1020 msgid "Olympus P-440" msgstr "" -#: src/main/xmli18n-tmp.h:969 +#: src/main/xmli18n-tmp.h:1021 msgid "Olympus P-S100" msgstr "" -#: src/main/xmli18n-tmp.h:970 +#: src/main/xmli18n-tmp.h:1022 msgid "Canon CP-10" msgstr "" -#: src/main/xmli18n-tmp.h:971 +#: src/main/xmli18n-tmp.h:1023 msgid "Canon CP-100" msgstr "" -#: src/main/xmli18n-tmp.h:972 +#: src/main/xmli18n-tmp.h:1024 msgid "Canon CP-200" msgstr "" -#: src/main/xmli18n-tmp.h:973 +#: src/main/xmli18n-tmp.h:1025 msgid "Canon CP-220" msgstr "" -#: src/main/xmli18n-tmp.h:974 +#: src/main/xmli18n-tmp.h:1026 msgid "Canon CP-300" msgstr "" -#: src/main/xmli18n-tmp.h:975 +#: src/main/xmli18n-tmp.h:1027 msgid "Canon CP-330" msgstr "" -#: src/main/xmli18n-tmp.h:976 +#: src/main/xmli18n-tmp.h:1028 msgid "Canon SELPHY-CP-400" msgstr "" -#: src/main/xmli18n-tmp.h:977 +#: src/main/xmli18n-tmp.h:1029 msgid "Canon SELPHY-CP-500" msgstr "" -#: src/main/xmli18n-tmp.h:978 +#: src/main/xmli18n-tmp.h:1030 msgid "Canon SELPHY-CP-510" msgstr "" -#: src/main/xmli18n-tmp.h:979 +#: src/main/xmli18n-tmp.h:1031 msgid "Canon SELPHY-CP-600" msgstr "" -#: src/main/xmli18n-tmp.h:980 +#: src/main/xmli18n-tmp.h:1032 msgid "Canon SELPHY-CP-710" msgstr "" -#: src/main/xmli18n-tmp.h:981 +#: src/main/xmli18n-tmp.h:1033 msgid "Canon SELPHY-CP-720" msgstr "" -#: src/main/xmli18n-tmp.h:982 -#, fuzzy +#: src/main/xmli18n-tmp.h:1034 msgid "Canon SELPHY-CP-730" -msgstr "Stylus C60" +msgstr "" -#: src/main/xmli18n-tmp.h:983 +#: src/main/xmli18n-tmp.h:1035 msgid "Canon SELPHY-CP-740" msgstr "" -#: src/main/xmli18n-tmp.h:984 -#, fuzzy +#: src/main/xmli18n-tmp.h:1036 msgid "Canon SELPHY-CP-750" -msgstr "Stylus C60" +msgstr "" -#: src/main/xmli18n-tmp.h:985 +#: src/main/xmli18n-tmp.h:1037 msgid "Canon SELPHY ES1" msgstr "" -#: src/main/xmli18n-tmp.h:986 +#: src/main/xmli18n-tmp.h:1038 msgid "Canon SELPHY ES2" msgstr "" -#: src/main/xmli18n-tmp.h:987 +#: src/main/xmli18n-tmp.h:1039 msgid "Canon SELPHY ES20" msgstr "" -#: src/main/xmli18n-tmp.h:988 +#: src/main/xmli18n-tmp.h:1040 msgid "Sony DPP-EX5" msgstr "" -#: src/main/xmli18n-tmp.h:989 +#: src/main/xmli18n-tmp.h:1041 msgid "Sony DPP-EX7" msgstr "" -#: src/main/xmli18n-tmp.h:990 +#: src/main/xmli18n-tmp.h:1042 msgid "Sony UP-DP10" msgstr "" -#: src/main/xmli18n-tmp.h:991 +#: src/main/xmli18n-tmp.h:1043 msgid "Sony UP-DR100" msgstr "" -#: src/main/xmli18n-tmp.h:992 +#: src/main/xmli18n-tmp.h:1044 msgid "Sony UP-DR150" msgstr "" -#: src/main/xmli18n-tmp.h:993 +#: src/main/xmli18n-tmp.h:1045 msgid "Fujifilm Printpix-CX-400" msgstr "" -#: src/main/xmli18n-tmp.h:994 +#: src/main/xmli18n-tmp.h:1046 msgid "Fujifilm Printpix-CX-550" msgstr "" -#: src/main/xmli18n-tmp.h:995 +#: src/main/xmli18n-tmp.h:1047 msgid "Fujifilm FinePix-NX-500" msgstr "" -#: src/main/xmli18n-tmp.h:996 +#: src/main/xmli18n-tmp.h:1048 msgid "Kodak Easyshare-Printer-Dock" msgstr "" -#: src/main/xmli18n-tmp.h:997 +#: src/main/xmli18n-tmp.h:1049 msgid "Shinko CHC-S9045" msgstr "" -#: src/main/xmli18n-tmp.h:998 +#: src/main/xmli18n-tmp.h:1050 msgid "RAW DATA 16 bit" msgstr "" -#: src/main/xmli18n-tmp.h:999 +#: src/main/xmli18n-tmp.h:1051 msgid "RAW DATA 8 bit" msgstr "" -#: src/gutenprintui/panel.c:274 src/gutenprintui2/panel.c:274 +#: src/gutenprintui2/curve.c:130 +#, fuzzy +msgid "Curve type" +msgstr "Czarny" + +#: src/gutenprintui2/curve.c:131 +msgid "Is this curve linear, spline interpolated, or free-form" +msgstr "" + +#: src/gutenprintui2/curve.c:139 +msgid "Minimum X" +msgstr "" + +#: src/gutenprintui2/curve.c:140 +msgid "Minimum possible value for X" +msgstr "" + +#: src/gutenprintui2/curve.c:149 +msgid "Maximum X" +msgstr "" + +#: src/gutenprintui2/curve.c:150 +msgid "Maximum possible X value" +msgstr "" + +#: src/gutenprintui2/curve.c:159 +msgid "Minimum Y" +msgstr "" + +#: src/gutenprintui2/curve.c:160 +msgid "Minimum possible value for Y" +msgstr "" + +#: src/gutenprintui2/curve.c:169 +msgid "Maximum Y" +msgstr "" + +#: src/gutenprintui2/curve.c:170 +msgid "Maximum possible value for Y" +msgstr "" + +#: src/gutenprintui2/gammacurve.c:418 +msgid "_Gamma value" +msgstr "" + +#: src/gutenprintui2/panel.c:275 msgid "Inch" msgstr "Cal" -#: src/gutenprintui/panel.c:274 src/gutenprintui2/panel.c:274 +#: src/gutenprintui2/panel.c:275 msgid "Set the base unit of measurement to inches" msgstr "" -#: src/gutenprintui/panel.c:276 src/gutenprintui2/panel.c:276 +#: src/gutenprintui2/panel.c:277 msgid "cm" msgstr "cm" -#: src/gutenprintui/panel.c:276 src/gutenprintui2/panel.c:276 +#: src/gutenprintui2/panel.c:277 msgid "Set the base unit of measurement to centimetres" msgstr "" -#: src/gutenprintui/panel.c:278 src/gutenprintui2/panel.c:278 +#: src/gutenprintui2/panel.c:279 #, fuzzy msgid "Points" msgstr "Wydrukuj" -#: src/gutenprintui/panel.c:278 src/gutenprintui2/panel.c:278 +#: src/gutenprintui2/panel.c:279 msgid "Set the base unit of measurement to points (1/72\")" msgstr "" -#: src/gutenprintui/panel.c:280 src/gutenprintui2/panel.c:280 +#: src/gutenprintui2/panel.c:281 msgid "mm" msgstr "" -#: src/gutenprintui/panel.c:280 src/gutenprintui2/panel.c:280 +#: src/gutenprintui2/panel.c:281 msgid "Set the base unit of measurement to millimetres" msgstr "" -#: src/gutenprintui/panel.c:282 src/gutenprintui2/panel.c:282 +#: src/gutenprintui2/panel.c:283 msgid "Pica" msgstr "" -#: src/gutenprintui/panel.c:282 src/gutenprintui2/panel.c:282 +#: src/gutenprintui2/panel.c:283 msgid "Set the base unit of measurement to picas (1/12\")" msgstr "" -#: src/gutenprintui/panel.c:289 src/gutenprintui2/panel.c:289 +#: src/gutenprintui2/panel.c:290 msgid "Color output" msgstr "" -#: src/gutenprintui/panel.c:291 src/gutenprintui2/panel.c:291 +#: src/gutenprintui2/panel.c:292 msgid "Print in shades of gray using black ink" msgstr "" -#: src/gutenprintui/panel.c:303 src/gutenprintui2/panel.c:303 +#: src/gutenprintui2/panel.c:304 msgid "Standard Command" msgstr "" -#: src/gutenprintui/panel.c:303 src/gutenprintui2/panel.c:303 +#: src/gutenprintui2/panel.c:304 msgid "Use standard print command" msgstr "" -#: src/gutenprintui/panel.c:304 src/gutenprintui2/panel.c:304 +#: src/gutenprintui2/panel.c:305 #, fuzzy msgid "Custom Command" msgstr "Polecenie:" -#: src/gutenprintui/panel.c:304 src/gutenprintui2/panel.c:304 +#: src/gutenprintui2/panel.c:305 msgid "Use custom print command" msgstr "" -#: src/gutenprintui/panel.c:305 src/gutenprintui/plist.c:704 -#: src/gutenprintui/plist.c:787 src/gutenprintui2/panel.c:305 -#: src/gutenprintui2/plist.c:707 src/gutenprintui2/plist.c:790 +#: src/gutenprintui2/panel.c:306 src/gutenprintui2/plist.c:710 +#: src/gutenprintui2/plist.c:793 msgid "File" msgstr "Plik" -#: src/gutenprintui/panel.c:305 src/gutenprintui2/panel.c:305 +#: src/gutenprintui2/panel.c:306 #, fuzzy msgid "Print to a file" -msgstr "Wydrukować do pliku?" +msgstr "Wydrukowaæ do pliku?" -#: src/gutenprintui/panel.c:521 src/gutenprintui2/panel.c:521 +#: src/gutenprintui2/panel.c:522 msgid "Edit Curve..." msgstr "" -#: src/gutenprintui/panel.c:532 src/gutenprintui2/panel.c:532 +#: src/gutenprintui2/panel.c:533 #, fuzzy msgid "Set Default" -msgstr "Ustaw domyÅ›lne" +msgstr "Ustaw domy¶lne" -#: src/gutenprintui/panel.c:534 src/gutenprintui2/panel.c:534 +#: src/gutenprintui2/panel.c:535 msgid "Restore Previous" msgstr "" -#: src/gutenprintui/panel.c:536 src/gutenprintui/panel.c:1532 -#: src/gutenprintui/panel.c:1787 src/gutenprintui/panel.c:1819 -#: src/gutenprintui2/panel.c:536 src/gutenprintui2/panel.c:1533 -#: src/gutenprintui2/panel.c:1787 src/gutenprintui2/panel.c:1819 +#: src/gutenprintui2/panel.c:537 src/gutenprintui2/panel.c:1708 +#: src/gutenprintui2/panel.c:1962 src/gutenprintui2/panel.c:1994 msgid "OK" msgstr "OK" -#: src/gutenprintui/panel.c:538 src/gutenprintui/panel.c:1197 -#: src/gutenprintui/panel.c:1534 src/gutenprintui/panel.c:1789 -#: src/gutenprintui2/panel.c:538 src/gutenprintui2/panel.c:1198 -#: src/gutenprintui2/panel.c:1535 src/gutenprintui2/panel.c:1789 +#: src/gutenprintui2/panel.c:539 src/gutenprintui2/panel.c:1373 +#: src/gutenprintui2/panel.c:1710 src/gutenprintui2/panel.c:1964 msgid "Cancel" msgstr "Anuluj" -#: src/gutenprintui/panel.c:1180 src/gutenprintui2/panel.c:1181 +#: src/gutenprintui2/panel.c:641 +msgid "Select File..." +msgstr "" + +#: src/gutenprintui2/panel.c:1018 +msgid "Reset" +msgstr "" + +#: src/gutenprintui2/panel.c:1356 #, c-format msgid "%s -- Print v%s" msgstr "%s -- Drukowanie v%s" -#: src/gutenprintui/panel.c:1189 src/gutenprintui2/panel.c:1190 +#: src/gutenprintui2/panel.c:1365 msgid "About" msgstr "Informacje o" -#: src/gutenprintui/panel.c:1191 src/gutenprintui2/panel.c:1192 +#: src/gutenprintui2/panel.c:1367 msgid "" "Print and\n" "Save Settings" @@ -6589,7 +6998,7 @@ msgstr "" "Ustawienia drukowania\n" "i zapisu" -#: src/gutenprintui/panel.c:1193 src/gutenprintui2/panel.c:1194 +#: src/gutenprintui2/panel.c:1369 msgid "" "Save\n" "Settings" @@ -6597,15 +7006,15 @@ msgstr "" "Zapisz\n" "ustawienia" -#: src/gutenprintui/panel.c:1195 src/gutenprintui2/panel.c:1196 +#: src/gutenprintui2/panel.c:1371 msgid "Print" msgstr "Wydrukuj" -#: src/gutenprintui/panel.c:1247 src/gutenprintui2/panel.c:1248 +#: src/gutenprintui2/panel.c:1423 msgid "Preview" -msgstr "PodglÄ…d" +msgstr "Podgl±d" -#: src/gutenprintui/panel.c:1272 src/gutenprintui2/panel.c:1273 +#: src/gutenprintui2/panel.c:1448 msgid "" "Position the image on the page.\n" "Click and drag with the primary button to position the image.\n" @@ -6619,488 +7028,435 @@ msgid "" "to its original position." msgstr "" -#: src/gutenprintui/panel.c:1319 src/gutenprintui2/panel.c:1320 +#: src/gutenprintui2/panel.c:1495 #, fuzzy msgid "Paper Size" msgstr "Rozmiar" -#: src/gutenprintui/panel.c:1342 src/gutenprintui2/panel.c:1343 +#: src/gutenprintui2/panel.c:1518 msgid "Show All Paper Sizes" msgstr "" -#: src/gutenprintui/panel.c:1358 src/gutenprintui2/panel.c:1359 +#: src/gutenprintui2/panel.c:1534 msgid "Dimensions:" msgstr "Wymiary:" -#: src/gutenprintui/panel.c:1363 src/gutenprintui/panel.c:2063 -#: src/gutenprintui2/panel.c:1364 src/gutenprintui2/panel.c:2063 +#: src/gutenprintui2/panel.c:1539 src/gutenprintui2/panel.c:2238 msgid "Width:" -msgstr "Szerokość:" +msgstr "Szeroko¶æ:" -#: src/gutenprintui/panel.c:1364 src/gutenprintui2/panel.c:1365 +#: src/gutenprintui2/panel.c:1540 msgid "Width of the paper that you wish to print to" msgstr "" -#: src/gutenprintui/panel.c:1368 src/gutenprintui/panel.c:2065 -#: src/gutenprintui2/panel.c:1369 src/gutenprintui2/panel.c:2065 +#: src/gutenprintui2/panel.c:1544 src/gutenprintui2/panel.c:2240 msgid "Height:" -msgstr "Wysokość:" +msgstr "Wysoko¶æ:" -#: src/gutenprintui/panel.c:1369 src/gutenprintui2/panel.c:1370 +#: src/gutenprintui2/panel.c:1545 msgid "Height of the paper that you wish to print to" msgstr "" -#: src/gutenprintui/panel.c:1374 src/gutenprintui2/panel.c:1375 +#: src/gutenprintui2/panel.c:1550 #, fuzzy msgid "Automatic Paper Size" msgstr "Rozmiar" -#: src/gutenprintui/panel.c:1391 src/gutenprintui2/panel.c:1392 +#: src/gutenprintui2/panel.c:1567 msgid "Number of Copies" msgstr "" -#: src/gutenprintui/panel.c:1403 src/gutenprintui2/panel.c:1404 +#: src/gutenprintui2/panel.c:1579 msgid "Select the number of copies to print; a value between 1 and 100" msgstr "" -#: src/gutenprintui/panel.c:1435 src/gutenprintui2/panel.c:1436 +#: src/gutenprintui2/panel.c:1611 #, fuzzy msgid "Image Position" -msgstr "PoÅ‚ożenie" +msgstr "Po³o¿enie" -#: src/gutenprintui/panel.c:1452 src/gutenprintui2/panel.c:1453 +#: src/gutenprintui2/panel.c:1628 msgid "Auto" msgstr "Automatycznie" -#: src/gutenprintui/panel.c:1454 src/gutenprintui2/panel.c:1455 +#: src/gutenprintui2/panel.c:1630 msgid "Portrait" msgstr "Portret" -#: src/gutenprintui/panel.c:1456 src/gutenprintui2/panel.c:1457 +#: src/gutenprintui2/panel.c:1632 msgid "Landscape" -msgstr "Pejzaż" +msgstr "Pejza¿" -#: src/gutenprintui/panel.c:1458 src/gutenprintui2/panel.c:1459 +#: src/gutenprintui2/panel.c:1634 msgid "Upside down" -msgstr "Z góry na dół" +msgstr "Z góry na dó³" -#: src/gutenprintui/panel.c:1460 src/gutenprintui2/panel.c:1461 +#: src/gutenprintui2/panel.c:1636 msgid "Seascape" -msgstr "Pejzaż" +msgstr "Pejza¿" -#: src/gutenprintui/panel.c:1464 src/gutenprintui2/panel.c:1465 +#: src/gutenprintui2/panel.c:1640 msgid "" "Select the orientation: portrait, landscape, upside down, or seascape " "(upside down landscape)" msgstr "" -#: src/gutenprintui/panel.c:1466 src/gutenprintui2/panel.c:1467 +#: src/gutenprintui2/panel.c:1642 msgid "Orientation:" -msgstr "UÅ‚ożenie:" +msgstr "U³o¿enie:" -#: src/gutenprintui/panel.c:1477 src/gutenprintui2/panel.c:1478 +#: src/gutenprintui2/panel.c:1653 msgid "Left:" msgstr "Lewa:" -#: src/gutenprintui/panel.c:1478 src/gutenprintui2/panel.c:1479 +#: src/gutenprintui2/panel.c:1654 msgid "Distance from the left of the paper to the image" -msgstr "OdlegÅ‚ość od lewej krawÄ™dzi papieru do obrazu" +msgstr "Odleg³o¶æ od lewej krawêdzi papieru do obrazu" -#: src/gutenprintui/panel.c:1481 src/gutenprintui/panel.c:1485 -#: src/gutenprintui2/panel.c:1482 src/gutenprintui2/panel.c:1486 +#: src/gutenprintui2/panel.c:1657 src/gutenprintui2/panel.c:1661 msgid "Right:" msgstr "Prawa:" -#: src/gutenprintui/panel.c:1482 src/gutenprintui2/panel.c:1483 +#: src/gutenprintui2/panel.c:1658 msgid "Distance from the left of the paper to the right of the image" -msgstr "OdlegÅ‚ość od lewej krawÄ™dzi papieru do prawej krawÄ™dzi obrazu" +msgstr "Odleg³o¶æ od lewej krawêdzi papieru do prawej krawêdzi obrazu" -#: src/gutenprintui/panel.c:1486 src/gutenprintui2/panel.c:1487 +#: src/gutenprintui2/panel.c:1662 msgid "Distance from the right of the paper to the image" -msgstr "OdlegÅ‚ość od prawej krawÄ™dzi papieru do obrazu" +msgstr "Odleg³o¶æ od prawej krawêdzi papieru do obrazu" -#: src/gutenprintui/panel.c:1488 src/gutenprintui2/panel.c:1489 +#: src/gutenprintui2/panel.c:1664 msgid "Top:" -msgstr "Góra:" +msgstr "Góra:" -#: src/gutenprintui/panel.c:1489 src/gutenprintui2/panel.c:1490 +#: src/gutenprintui2/panel.c:1665 msgid "Distance from the top of the paper to the image" -msgstr "OdlegÅ‚ość od górnej krawÄ™dzi papieru do obrazu" +msgstr "Odleg³o¶æ od górnej krawêdzi papieru do obrazu" -#: src/gutenprintui/panel.c:1492 src/gutenprintui/panel.c:1496 -#: src/gutenprintui2/panel.c:1493 src/gutenprintui2/panel.c:1497 +#: src/gutenprintui2/panel.c:1668 src/gutenprintui2/panel.c:1672 msgid "Bottom:" -msgstr "Dół:" +msgstr "Dó³:" -#: src/gutenprintui/panel.c:1493 src/gutenprintui2/panel.c:1494 +#: src/gutenprintui2/panel.c:1669 #, fuzzy msgid "Distance from the top of the paper to bottom of the image" -msgstr "OdlegÅ‚ość od górnej krawÄ™dzi papieru do dolnej krawÄ™dzi obrazu" +msgstr "Odleg³o¶æ od górnej krawêdzi papieru do dolnej krawêdzi obrazu" -#: src/gutenprintui/panel.c:1497 src/gutenprintui2/panel.c:1498 +#: src/gutenprintui2/panel.c:1673 msgid "Distance from the bottom of the paper to the image" -msgstr "OdlegÅ‚ość od dolnej krawÄ™dzi papieru do obrazu" +msgstr "Odleg³o¶æ od dolnej krawêdzi papieru do obrazu" -#: src/gutenprintui/panel.c:1507 src/gutenprintui2/panel.c:1508 +#: src/gutenprintui2/panel.c:1683 msgid "Center:" msgstr "" -#: src/gutenprintui/panel.c:1510 src/gutenprintui2/panel.c:1511 +#: src/gutenprintui2/panel.c:1686 #, fuzzy msgid "Horizontal" msgstr "Poziomo" -#: src/gutenprintui/panel.c:1511 src/gutenprintui2/panel.c:1512 +#: src/gutenprintui2/panel.c:1687 msgid "Center the image horizontally on the paper" msgstr "" -#: src/gutenprintui/panel.c:1513 src/gutenprintui2/panel.c:1514 +#: src/gutenprintui2/panel.c:1689 msgid "Both" msgstr "Oba" -#: src/gutenprintui/panel.c:1514 src/gutenprintui2/panel.c:1515 +#: src/gutenprintui2/panel.c:1690 msgid "Center the image on the paper" msgstr "" -#: src/gutenprintui/panel.c:1516 src/gutenprintui2/panel.c:1517 +#: src/gutenprintui2/panel.c:1692 #, fuzzy msgid "Vertical" msgstr "Pionowo" -#: src/gutenprintui/panel.c:1517 src/gutenprintui2/panel.c:1518 +#: src/gutenprintui2/panel.c:1693 msgid "Center the image vertically on the paper" msgstr "" -#: src/gutenprintui/panel.c:1530 src/gutenprintui2/panel.c:1531 +#: src/gutenprintui2/panel.c:1706 msgid "Setup Printer" msgstr "Ustawienia drukarki" -#: src/gutenprintui/panel.c:1555 src/gutenprintui2/panel.c:1555 +#: src/gutenprintui2/panel.c:1730 #, fuzzy msgid "Printer Make:" msgstr "Model drukarki:" -#: src/gutenprintui/panel.c:1566 src/gutenprintui2/panel.c:1566 +#: src/gutenprintui2/panel.c:1741 msgid "Select the make of your printer" msgstr "" -#: src/gutenprintui/panel.c:1584 src/gutenprintui/panel.c:1672 -#: src/gutenprintui/panel.c:1890 src/gutenprintui2/panel.c:1584 -#: src/gutenprintui2/panel.c:1672 src/gutenprintui2/panel.c:1890 +#: src/gutenprintui2/panel.c:1759 src/gutenprintui2/panel.c:1847 +#: src/gutenprintui2/panel.c:2065 msgid "Printer Model:" msgstr "Model drukarki:" -#: src/gutenprintui/panel.c:1595 src/gutenprintui2/panel.c:1595 +#: src/gutenprintui2/panel.c:1770 msgid "Select your printer model" msgstr "" -#: src/gutenprintui/panel.c:1643 src/gutenprintui2/panel.c:1643 +#: src/gutenprintui2/panel.c:1818 msgid "PPD File:" msgstr "Plik PPD:" -#: src/gutenprintui/panel.c:1659 src/gutenprintui2/panel.c:1659 +#: src/gutenprintui2/panel.c:1834 msgid "Enter the correct PPD filename for your printer" msgstr "" -#: src/gutenprintui/panel.c:1661 src/gutenprintui/panel.c:1741 -#: src/gutenprintui2/panel.c:1661 src/gutenprintui2/panel.c:1741 +#: src/gutenprintui2/panel.c:1836 src/gutenprintui2/panel.c:1916 msgid "Browse" -msgstr "PrzeglÄ…daj" +msgstr "Przegl±daj" -#: src/gutenprintui/panel.c:1668 src/gutenprintui2/panel.c:1668 +#: src/gutenprintui2/panel.c:1843 msgid "Choose the correct PPD filename for your printer" msgstr "" -#: src/gutenprintui/panel.c:1710 src/gutenprintui2/panel.c:1710 +#: src/gutenprintui2/panel.c:1885 msgid "" "Select the name of the output queue (not the type, or model, of printer) " "that you wish to print to" msgstr "" -#: src/gutenprintui/panel.c:1712 src/gutenprintui2/panel.c:1712 +#: src/gutenprintui2/panel.c:1887 #, fuzzy msgid "Printer Queue:" msgstr "Model drukarki:" -#: src/gutenprintui/panel.c:1728 src/gutenprintui2/panel.c:1728 +#: src/gutenprintui2/panel.c:1903 msgid "Enter the correct command to print to your printer. " msgstr "" -#: src/gutenprintui/panel.c:1739 src/gutenprintui2/panel.c:1739 +#: src/gutenprintui2/panel.c:1914 msgid "Enter the file to print to. " msgstr "" -#: src/gutenprintui/panel.c:1747 src/gutenprintui2/panel.c:1747 +#: src/gutenprintui2/panel.c:1922 msgid "File to print to" msgstr "" -#: src/gutenprintui/panel.c:1755 src/gutenprintui2/panel.c:1755 +#: src/gutenprintui2/panel.c:1930 #, fuzzy msgid "Print To File" -msgstr "Wydrukować do pliku?" +msgstr "Wydrukowaæ do pliku?" -#: src/gutenprintui/panel.c:1785 src/gutenprintui2/panel.c:1785 +#: src/gutenprintui2/panel.c:1960 msgid "Define New Printer" msgstr "" -#: src/gutenprintui/panel.c:1803 src/gutenprintui/panel.c:1887 -#: src/gutenprintui2/panel.c:1803 src/gutenprintui2/panel.c:1887 +#: src/gutenprintui2/panel.c:1978 src/gutenprintui2/panel.c:2062 msgid "Printer Name:" msgstr "" -#: src/gutenprintui/panel.c:1807 src/gutenprintui2/panel.c:1807 +#: src/gutenprintui2/panel.c:1982 msgid "Enter the name you wish to give this logical printer" msgstr "" -#: src/gutenprintui/panel.c:1817 src/gutenprintui2/panel.c:1817 +#: src/gutenprintui2/panel.c:1992 #, fuzzy msgid "About Gutenprint " msgstr "Wydrukuj" -#: src/gutenprintui/panel.c:1824 src/gutenprintui2/panel.c:1824 +#: src/gutenprintui2/panel.c:1999 #, fuzzy msgid "Gutenprint Version " msgstr "Wydrukuj" -#: src/gutenprintui/panel.c:1872 src/gutenprintui2/panel.c:1872 +#: src/gutenprintui2/panel.c:2047 msgid "Printer Settings" msgstr "Ustawienia drukarki" -#: src/gutenprintui/panel.c:1885 src/gutenprintui2/panel.c:1885 +#: src/gutenprintui2/panel.c:2060 msgid "" "Select the name of the printer (not the type, or model, of printer) that you " "wish to print to" msgstr "" -#: src/gutenprintui/panel.c:1902 src/gutenprintui2/panel.c:1902 +#: src/gutenprintui2/panel.c:2077 msgid "Setup Printer..." msgstr "" -#: src/gutenprintui/panel.c:1904 src/gutenprintui2/panel.c:1904 +#: src/gutenprintui2/panel.c:2079 msgid "" "Choose the printer model, PPD file, and command that is used to print to " "this printer" msgstr "" -#: src/gutenprintui/panel.c:1917 src/gutenprintui2/panel.c:1917 +#: src/gutenprintui2/panel.c:2092 msgid "New Printer..." msgstr "" -#: src/gutenprintui/panel.c:1918 src/gutenprintui2/panel.c:1918 +#: src/gutenprintui2/panel.c:2093 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:1948 src/gutenprintui2/panel.c:1948 +#: src/gutenprintui2/panel.c:2123 #, fuzzy msgid "Set Printer Option Defaults" -msgstr "Ustaw domyÅ›lne" +msgstr "Ustaw domy¶lne" -#: src/gutenprintui/panel.c:1949 src/gutenprintui2/panel.c:1949 +#: src/gutenprintui2/panel.c:2124 msgid "Set all printer options to their defaults" msgstr "" -#: src/gutenprintui/panel.c:1972 src/gutenprintui2/panel.c:1972 +#: src/gutenprintui2/panel.c:2147 #, fuzzy msgid "Image Size" msgstr "Rozmiar" -#: src/gutenprintui/panel.c:1997 src/gutenprintui2/panel.c:1997 +#: src/gutenprintui2/panel.c:2172 msgid "Scaling:" msgstr "Skalowanie:" -#: src/gutenprintui/panel.c:2001 src/gutenprintui2/panel.c:2001 +#: src/gutenprintui2/panel.c:2176 msgid "Set the scale (size) of the image" msgstr "" -#: src/gutenprintui/panel.c:2023 src/gutenprintui2/panel.c:2023 +#: src/gutenprintui2/panel.c:2198 msgid "Scale by:" msgstr "" -#: src/gutenprintui/panel.c:2028 src/gutenprintui2/panel.c:2028 +#: src/gutenprintui2/panel.c:2203 msgid "" "Select whether scaling is measured as percent of available page size or " "number of output dots per inch" msgstr "" -#: src/gutenprintui/panel.c:2031 src/gutenprintui2/panel.c:2031 +#: src/gutenprintui2/panel.c:2206 msgid "Percent" msgstr "Procent" -#: src/gutenprintui/panel.c:2036 src/gutenprintui2/panel.c:2036 +#: src/gutenprintui2/panel.c:2211 msgid "Scale the print to the size of the page" msgstr "" -#: src/gutenprintui/panel.c:2040 src/gutenprintui2/panel.c:2040 +#: src/gutenprintui2/panel.c:2215 msgid "PPI" msgstr "PPI" -#: src/gutenprintui/panel.c:2045 src/gutenprintui2/panel.c:2045 +#: src/gutenprintui2/panel.c:2220 msgid "Scale the print to the number of dots per inch" msgstr "" -#: src/gutenprintui/panel.c:2063 src/gutenprintui2/panel.c:2063 +#: src/gutenprintui2/panel.c:2238 msgid "Set the width of the print" msgstr "" -#: src/gutenprintui/panel.c:2065 src/gutenprintui2/panel.c:2065 +#: src/gutenprintui2/panel.c:2240 msgid "Set the height of the print" msgstr "" -#: src/gutenprintui/panel.c:2071 src/gutenprintui2/panel.c:2071 +#: src/gutenprintui2/panel.c:2246 msgid "" "Use Original\n" "Image Size" msgstr "" -#: src/gutenprintui/panel.c:2077 src/gutenprintui2/panel.c:2077 +#: src/gutenprintui2/panel.c:2252 msgid "Set the print size to the size of the image" msgstr "" -#: src/gutenprintui/panel.c:2100 src/gutenprintui2/panel.c:2101 +#: src/gutenprintui2/panel.c:2276 msgid "Print Color Adjust" msgstr "Regulacja koloru wydruku" -#: src/gutenprintui/panel.c:2103 src/gutenprintui2/panel.c:2104 +#: src/gutenprintui2/panel.c:2279 msgid "Set Defaults" -msgstr "Ustaw domyÅ›lne" +msgstr "Ustaw domy¶lne" -#: src/gutenprintui/panel.c:2105 src/gutenprintui2/panel.c:2106 +#: src/gutenprintui2/panel.c:2281 msgid "Close" msgstr "Zamknij" -#: src/gutenprintui/panel.c:2134 src/gutenprintui2/panel.c:2135 +#: src/gutenprintui2/panel.c:2310 msgid "Image preview" -msgstr "PodglÄ…d obrazu" +msgstr "Podgl±d obrazu" -#: src/gutenprintui/panel.c:2148 src/gutenprintui2/panel.c:2149 +#: src/gutenprintui2/panel.c:2324 msgid "View Output Channels:" msgstr "" -#: src/gutenprintui/panel.c:2234 src/gutenprintui2/panel.c:2240 +#: src/gutenprintui2/panel.c:2415 #, fuzzy msgid "Output" -msgstr "Typ wyjÅ›ciowy:" +msgstr "Typ wyj¶ciowy:" -#: src/gutenprintui/panel.c:2262 src/gutenprintui2/panel.c:2268 +#: src/gutenprintui2/panel.c:2443 msgid "Output Type:" -msgstr "Typ wyjÅ›ciowy:" +msgstr "Typ wyj¶ciowy:" -#: src/gutenprintui/panel.c:2266 src/gutenprintui2/panel.c:2272 +#: src/gutenprintui2/panel.c:2447 msgid "Select the desired output type" msgstr "" -#: src/gutenprintui/panel.c:2287 src/gutenprintui2/panel.c:2293 +#: src/gutenprintui2/panel.c:2468 msgid "Adjust Output..." msgstr "" -#: src/gutenprintui/panel.c:2296 src/gutenprintui2/panel.c:2302 +#: src/gutenprintui2/panel.c:2477 msgid "" "Adjust color balance, brightness, contrast, saturation, and dither algorithm" msgstr "" -#: src/gutenprintui/panel.c:2314 src/gutenprintui2/panel.c:2321 +#: src/gutenprintui2/panel.c:2496 #, fuzzy msgid "Size Units:" msgstr "Jednostki:" -#: src/gutenprintui/panel.c:2317 src/gutenprintui2/panel.c:2324 +#: src/gutenprintui2/panel.c:2499 msgid " " msgstr "" -#: src/gutenprintui/panel.c:2341 src/gutenprintui2/panel.c:2348 +#: src/gutenprintui2/panel.c:2523 msgid "Units:" msgstr "Jednostki:" -#: src/gutenprintui/panel.c:2346 src/gutenprintui2/panel.c:2353 +#: src/gutenprintui2/panel.c:2528 msgid "Select the base unit of measurement for printing" msgstr "" -#: src/gutenprintui/plist.c:90 src/gutenprintui/plist.c:99 -#: src/gutenprintui2/plist.c:89 src/gutenprintui2/plist.c:98 +#: src/gutenprintui2/plist.c:92 src/gutenprintui2/plist.c:101 msgid "System V lp" msgstr "" -#: src/gutenprintui/plist.c:96 src/gutenprintui2/plist.c:95 +#: src/gutenprintui2/plist.c:98 msgid "CUPS" msgstr "" -#: src/gutenprintui/plist.c:102 src/gutenprintui2/plist.c:101 +#: src/gutenprintui2/plist.c:104 msgid "Berkeley lpd (/etc/lpc)" msgstr "" -#: src/gutenprintui/plist.c:105 src/gutenprintui2/plist.c:104 +#: src/gutenprintui2/plist.c:107 msgid "Berkeley lpd (/usr/bsd/lpc)" msgstr "" -#: src/gutenprintui/plist.c:108 src/gutenprintui2/plist.c:107 +#: src/gutenprintui2/plist.c:110 msgid "Berkeley lpd (/usr/etc/lpc" msgstr "" -#: src/gutenprintui/plist.c:111 src/gutenprintui2/plist.c:110 +#: src/gutenprintui2/plist.c:113 msgid "Berkeley lpd (/usr/libexec/lpc)" msgstr "" -#: src/gutenprintui/plist.c:114 src/gutenprintui2/plist.c:113 +#: src/gutenprintui2/plist.c:116 msgid "Berkeley lpd (/usr/sbin/lpc)" msgstr "" -#: src/gutenprintui/plist.c:1043 src/gutenprintui2/plist.c:1057 +#: src/gutenprintui2/plist.c:1060 #, fuzzy msgid "Printer" msgstr "Wydrukuj" -#: src/gutenprintui/plist.c:1230 src/gutenprintui2/plist.c:1250 +#: src/gutenprintui2/plist.c:1253 #, fuzzy msgid "(Default Printer)" msgstr "Ustawienia drukarki" -#: src/gutenprintui2/curve.c:130 -#, fuzzy -msgid "Curve type" -msgstr "Czarny" - -#: src/gutenprintui2/curve.c:131 -msgid "Is this curve linear, spline interpolated, or free-form" -msgstr "" - -#: src/gutenprintui2/curve.c:139 -msgid "Minimum X" -msgstr "" - -#: src/gutenprintui2/curve.c:140 -msgid "Minimum possible value for X" -msgstr "" - -#: src/gutenprintui2/curve.c:149 -msgid "Maximum X" -msgstr "" - -#: src/gutenprintui2/curve.c:150 -msgid "Maximum possible X value" -msgstr "" - -#: src/gutenprintui2/curve.c:159 -msgid "Minimum Y" -msgstr "" - -#: src/gutenprintui2/curve.c:160 -msgid "Minimum possible value for Y" -msgstr "" - -#: src/gutenprintui2/curve.c:169 -msgid "Maximum Y" -msgstr "" - -#: src/gutenprintui2/curve.c:170 -msgid "Maximum possible value for Y" -msgstr "" - -#: src/gutenprintui2/gammacurve.c:418 -msgid "_Gamma value" -msgstr "" - #: src/cups/genppd.c:145 #, fuzzy msgid "Printer Features" @@ -7109,7 +7465,7 @@ msgstr "Ustawienia drukarki" #: src/cups/genppd.c:146 #, fuzzy msgid "Output Control" -msgstr "Typ wyjÅ›ciowy:" +msgstr "Typ wyj¶ciowy:" #: src/cups/genppd.c:151 #, fuzzy @@ -7139,48 +7495,48 @@ msgstr "" #. 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:1058 +#: src/cups/genppd.c:1064 msgid "English" msgstr "Polish" #. TRANSLATORS: Specify PPD translation encoding e.g. ISOLatin1 -#: src/cups/genppd.c:1060 +#: src/cups/genppd.c:1066 msgid "ISOLatin1" msgstr "ISOLatin2" -#: src/cups/genppd.c:1641 +#: src/cups/genppd.c:1647 msgid "2-Sided Printing" msgstr "" -#: src/cups/genppd.c:1665 +#: src/cups/genppd.c:1671 msgid "Shrink Page If Necessary to Fit Borders" msgstr "" -#: src/cups/genppd.c:1669 +#: src/cups/genppd.c:1675 msgid "Shrink (print the whole page)" msgstr "" -#: src/cups/genppd.c:1670 +#: src/cups/genppd.c:1676 msgid "Crop (preserve dimensions)" msgstr "" -#: src/cups/genppd.c:1671 +#: src/cups/genppd.c:1677 msgid "Expand (use maximum page area)" msgstr "" -#: src/cups/genppd.c:1756 +#: src/cups/genppd.c:1762 msgid "No" msgstr "" -#: src/cups/genppd.c:1758 +#: src/cups/genppd.c:1764 msgid "Yes" msgstr "" -#: src/cups/genppd.c:1795 src/cups/genppd.c:1857 +#: src/cups/genppd.c:1801 src/cups/genppd.c:1863 msgid "Value" msgstr "" -#: src/cups/genppd.c:1800 +#: src/cups/genppd.c:1806 msgid "Fine Adjustment" msgstr "" @@ -7300,12 +7656,12 @@ msgstr "" #: src/escputil/escputil.c:333 src/escputil/escputil.c:341 #, c-format msgid "You may only specify one printer or raw device." -msgstr "Można podać tylko jednÄ… drukarkÄ™ lub surowe urzÄ…dzenie." +msgstr "Mo¿na podaæ tylko jedn± drukarkê lub surowe urz±dzenie." #: src/escputil/escputil.c:349 #, c-format msgid "You may only specify one printer model." -msgstr "Można podać tylko jeden model drukarki." +msgstr "Mo¿na podaæ tylko jeden model drukarki." #: src/escputil/escputil.c:373 #, c-format @@ -7340,17 +7696,17 @@ msgstr "" #: src/escputil/escputil.c:463 #, c-format msgid "Cannot open device %s: %s\n" -msgstr "Nie można otworzyć urzÄ…dzenia %s: %s\n" +msgstr "Nie mo¿na otworzyæ urz±dzenia %s: %s\n" #: src/escputil/escputil.c:486 #, c-format msgid "Cannot print to printer %s with %s\n" -msgstr "Nie można wydrukować na drukarce %s przy użyciu %s\n" +msgstr "Nie mo¿na wydrukowaæ na drukarce %s przy u¿yciu %s\n" #: src/escputil/escputil.c:502 src/escputil/escputil.c:512 #, c-format msgid "Unable to send command to printer\n" -msgstr "Nie można wysÅ‚ać polecenia do drukarki\n" +msgstr "Nie mo¿na wys³aæ polecenia do drukarki\n" #: src/escputil/escputil.c:572 #, c-format @@ -7360,7 +7716,7 @@ msgstr "" #: src/escputil/escputil.c:577 #, c-format msgid "Cannot read from %s: %s\n" -msgstr "Nie można odczytać z %s: %s\n" +msgstr "Nie mo¿na odczytaæ z %s: %s\n" #: src/escputil/escputil.c:729 #, c-format @@ -7380,7 +7736,7 @@ msgstr "Nieznana opcja %c\n" #: src/escputil/escputil.c:819 src/escputil/escputil.c:1414 #, c-format msgid "Cannot write to %s: %s\n" -msgstr "Nie można zapisać do %s: %s\n" +msgstr "Nie mo¿na zapisaæ do %s: %s\n" #: src/escputil/escputil.c:865 src/escputil/escputil.c:1379 #: src/escputil/escputil.c:1507 @@ -7390,7 +7746,7 @@ msgid "" "Cannot write to %s: %s\n" msgstr "" "\n" -"Nie można zapisać do %s: %s\n" +"Nie mo¿na zapisaæ do %s: %s\n" #: src/escputil/escputil.c:908 #, c-format @@ -7573,12 +7929,12 @@ msgstr "" #: src/escputil/escputil.c:1351 #, 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" +msgstr "Do uzyskania stanu drukarki nale¿y u¿yæ surowego urz±dzenia.\n" #: src/escputil/escputil.c:1457 #, 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" +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 @@ -7598,17 +7954,17 @@ msgstr "" #: src/escputil/escputil.c:1671 #, c-format msgid "Printer identification requires using a raw device.\n" -msgstr "Do zidentyfikowania drukarki należy użyć surowego urzÄ…dzenia.\n" +msgstr "Do zidentyfikowania drukarki nale¿y u¿yæ surowego urz±dzenia.\n" #: src/escputil/escputil.c:1689 #, fuzzy, c-format msgid "Cannot identify printer model.\n" -msgstr "Można podać tylko jeden model drukarki." +msgstr "Mo¿na podaæ tylko jeden model drukarki." #: src/escputil/escputil.c:1711 #, c-format msgid "Cleaning heads...\n" -msgstr "Czyszczenie gÅ‚owic...\n" +msgstr "Czyszczenie g³owic...\n" #: src/escputil/escputil.c:1728 #, c-format @@ -7863,163 +8219,66 @@ msgstr "" msgid "Error in input\n" msgstr "" -#: src/gimp/print-image-gimp.c:225 src/gimp2/print-image-gimp.c:225 +#: src/gimp2/print-image-gimp.c:225 msgid "Printing..." msgstr "Drukowanie..." -#: src/gimp/print.c:133 -msgid "/File/Print..." -msgstr "/Plik/Wydrukuj..." - -#: src/ghost/ijsgutenprint.c:98 -#, c-format -msgid "" -"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" -msgstr "" - -#: 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:199 -#, fuzzy, c-format -msgid "ERROR: ijsgutenprint: No row buffer\n" -msgstr "Nieznana opcja %c\n" - -#: 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:498 -#, c-format -msgid "ERROR: ijsgutenprint: Printer must be specified with -sDeviceModel\n" -msgstr "" - -#: src/ghost/ijsgutenprint.c:500 -#, c-format -msgid "ERROR: ijsgutenprint: Printer %s is not a known model\n" -msgstr "" - -#: src/ghost/ijsgutenprint.c:656 -#, c-format -msgid "ijsgutenprint: unknown DeviceModel %s\n" -msgstr "" - -#: 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: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: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: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: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: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: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:841 -#, fuzzy, c-format -msgid "ERROR: ijsgutenprint: Bad parameter %s %d\n" -msgstr "Nieznana opcja %c\n" - -#: 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:1308 -#, c-format -msgid "ERROR: ijsgutenprint: image_init failed %d\n" -msgstr "" +#, fuzzy +#~ msgid "ERROR: ijsgutenprint: No row buffer\n" +#~ msgstr "Nieznana opcja %c\n" -#: 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" +#, fuzzy +#~ 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:1331 -#, fuzzy, c-format -msgid "ERROR: ijsgutenprint: Unable to open %s: %s\n" -msgstr "Nie można otworzyć urzÄ…dzenia %s: %s\n" +#, fuzzy +#~ 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:1344 -#, fuzzy, c-format -msgid "ERROR: ijsgutenprint: Unknown printer %s\n" -msgstr "Nieznana opcja %c\n" +#, fuzzy +#~ 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:1516 -#, c-format -msgid "ERROR: ijsgutenprint: Bad parameters; cannot continue!\n" -msgstr "" +#, fuzzy +#~ 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:1534 -#, c-format -msgid "ERROR: ijsgutenprint: Get next row failed at %.0f\n" -msgstr "" +#, fuzzy +#~ msgid "ERROR: ijsgutenprint: cannot parse %s float %s\n" +#~ msgstr "Nie mo¿na wydrukowaæ na drukarce %s przy u¿yciu %s\n" #, fuzzy -#~ msgid "Model Name" -#~ msgstr "Anuluj" +#~ msgid "ERROR: ijsgutenprint: cannot parse %s int %s\n" +#~ msgstr "Nie mo¿na wydrukowaæ na drukarce %s przy u¿yciu %s\n" #, fuzzy -#~ msgid " Gamma" -#~ msgstr "Gamma:" +#~ msgid "ERROR: ijsgutenprint: cannot parse %s dimension %s\n" +#~ msgstr "Nie mo¿na wydrukowaæ na drukarce %s przy u¿yciu %s\n" #, fuzzy -#~ msgid " Curve" -#~ msgstr "Czarny" +#~ msgid "ERROR: ijsgutenprint: cannot parse %s boolean %s\n" +#~ msgstr "Nie mo¿na wydrukowaæ na drukarce %s przy u¿yciu %s\n" #, fuzzy -#~ msgid "1440 x 1440" -#~ msgstr "1440 x 1440 DPI" +#~ msgid "ERROR: ijsgutenprint: Bad parameter %s %d\n" +#~ msgstr "Nieznana opcja %c\n" #, fuzzy -#~ msgid "1440 x 1440 DPI High Quality" -#~ msgstr "1440 x 1440 DPI" +#~ msgid "ERROR: ijsgutenprint: bad key code %d\n" +#~ msgstr "Nieznana opcja %c\n" #, fuzzy -#~ msgid "1440 x 1440 DPI Highest Quality" -#~ msgstr "1440 x 1440 DPI" +#~ msgid "ERROR: ijsgutenprint: Unable to open file descriptor: %s\n" +#~ msgstr "Nie mo¿na otworzyæ urz±dzenia %s: %s\n" #, fuzzy -#~ msgid "2880 x 1440 DPI High Quality" -#~ msgstr "1440 x 1440 DPI" +#~ msgid "ERROR: ijsgutenprint: Unable to open %s: %s\n" +#~ msgstr "Nie mo¿na otworzyæ urz±dzenia %s: %s\n" #, fuzzy -#~ msgid "2880 x 1440 DPI Highest Quality" -#~ msgstr "1440 x 1440 DPI" +#~ msgid "ERROR: ijsgutenprint: Unknown printer %s\n" +#~ msgstr "Nieznana opcja %c\n" #, fuzzy #~ msgid "90x90 DPI" @@ -8053,10 +8312,6 @@ msgstr "" #~ msgid "720x360 DPI DMT" #~ msgstr "1440 x 360 DPI" -#, fuzzy -#~ msgid "720x720 DPI" -#~ msgstr "2880 x 720 DPI" - #, fuzzy #~ msgid "720x720 DPI DMT" #~ msgstr "2880 x 720 DPI" @@ -8121,41 +8376,29 @@ msgstr "" #~ msgid "2400x2400 DPI DMT" #~ msgstr "2400x600 DPI" -#, fuzzy -#~ msgid "Plain Paper PIXMA" -#~ msgstr "ZwykÅ‚y papier" - #~ msgid "Envelope" #~ msgstr "Koperta" #, fuzzy -#~ msgid "Gutenprint" -#~ msgstr "Wydrukuj" +#~ msgid " Gamma" +#~ msgstr "Gamma:" #, fuzzy -#~ msgid "EPSON Stylus C50" -#~ msgstr "Stylus C60" +#~ msgid " Curve" +#~ msgstr "Czarny" #, fuzzy -#~ msgid "EPSON Stylus C60" -#~ msgstr "Stylus C60" +#~ msgid "Red Balance" +#~ msgstr "¯ó³æ" #, fuzzy -#~ msgid "EPSON Stylus C61" +#~ msgid "EPSON Stylus C60" #~ msgstr "Stylus C60" #, fuzzy -#~ msgid "EPSON Stylus C62" +#~ msgid "EPSON Stylus C61" #~ msgstr "Stylus C60" -#, fuzzy -#~ msgid "EPSON Stylus C70" -#~ msgstr "Stylus C70" - -#, fuzzy -#~ msgid "EPSON Stylus C80" -#~ msgstr "Stylus C80" - #, fuzzy #~ msgid "EPSON Stylus C82" #~ msgstr "Stylus C80" @@ -8388,10 +8631,6 @@ msgstr "" #~ msgid "EPSON Stylus Pro 5500" #~ msgstr "Stylus Pro 5500" -#, fuzzy -#~ msgid "EPSON Stylus Pro 7000" -#~ msgstr "Stylus Pro 7000" - #, fuzzy #~ msgid "EPSON Stylus Pro 7500" #~ msgstr "Stylus Pro 7500" @@ -8425,20 +8664,19 @@ msgstr "" #~ msgstr "Stylus Scan 2500" #, fuzzy -#~ msgid "EPSON E-100" -#~ msgstr "Stylus C60" +#~ msgid "Gutenprint" +#~ msgstr "Wydrukuj" #, fuzzy #~ msgid "Cannot identify printer!\n" -#~ msgstr "Nie można wydrukować na drukarce %s przy użyciu %s\n" +#~ msgstr "Nie mo¿na wydrukowaæ na drukarce %s przy u¿yciu %s\n" -#, fuzzy -#~ msgid "Red Balance" -#~ msgstr "Żółć" +#~ msgid "/File/Print..." +#~ msgstr "/Plik/Wydrukuj..." #, fuzzy #~ msgid "Gloss Balance" -#~ msgstr "Żółć" +#~ msgstr "¯ó³æ" #, fuzzy #~ msgid "Gimp-Print" @@ -8451,10 +8689,10 @@ msgstr "" #~ msgstr "%s: opcja \"%s\" jest niejednoznaczna\n" #~ msgid "%s: option `--%s' doesn't allow an argument\n" -#~ msgstr "%s: opcja \"--%s\" nie pozwala na użycie argumentu\n" +#~ msgstr "%s: opcja \"--%s\" nie pozwala na u¿ycie argumentu\n" #~ msgid "%s: option `%c%s' doesn't allow an argument\n" -#~ msgstr "%s: opcja \"%c%s\" nie pozwala na użycie argumentu\n" +#~ msgstr "%s: opcja \"%c%s\" nie pozwala na u¿ycie argumentu\n" #~ msgid "%s: option `%s' requires an argument\n" #~ msgstr "%s: opcja \"%s\" wymaga argumentu\n" @@ -8478,11 +8716,11 @@ msgstr "" #~ msgstr "%s: opcja \"-W %s\" jest niejednoznaczna\n" #~ msgid "%s: option `-W %s' doesn't allow an argument\n" -#~ msgstr "%s: opcja \"-W %s\" nie pozwala na użycie argumentu\n" +#~ msgstr "%s: opcja \"-W %s\" nie pozwala na u¿ycie argumentu\n" #, fuzzy #~ msgid "Bright" -#~ msgstr "Jasność:" +#~ msgstr "Jasno¶æ:" #, fuzzy #~ msgid "traditional" @@ -8492,48 +8730,34 @@ msgstr "" #~ msgstr "24x36" #~ msgid "Solid Colors" -#~ msgstr "Jednolite pÅ‚aszczyzny" - -#~ msgid "Stylus C20sx" -#~ msgstr "Stylus C20sx" +#~ msgstr "Jednolite p³aszczyzny" #~ 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 "Right Border:" -#~ msgstr "Prawa krawÄ™dź:" +#~ msgstr "Prawa krawêd¼:" #~ msgid "Bottom Border:" -#~ msgstr "Dolna krawÄ™dź" +#~ msgstr "Dolna krawêd¼" #~ msgid "Size" #~ msgstr "Rozmiar" #, fuzzy #~ msgid "Resolutions" -#~ msgstr "Rozdzielczość" +#~ msgstr "Rozdzielczo¶æ" #~ msgid "Media Type:" #~ msgstr "Typ papieru:" @@ -8542,10 +8766,10 @@ msgstr "" #~ msgstr "Rozmiar papieru:" #~ msgid "Media Source:" -#~ msgstr "ŹródÅ‚o papieru:" +#~ msgstr "¬ród³o papieru:" #~ msgid "Resolution:" -#~ msgstr "Rozdzielczość:" +#~ msgstr "Rozdzielczo¶æ:" #~ msgid "Dither Algorithm:" #~ msgstr "Algorytm ditherowania:" @@ -8555,7 +8779,7 @@ msgstr "" #~ "Cannot read from %s: %s\n" #~ msgstr "" #~ "\n" -#~ "Nie można odczytać z %s: %s\n" +#~ "Nie mo¿na odczytaæ z %s: %s\n" #~ msgid "Cyan:" #~ msgstr "Niebieskozielony:" @@ -8564,7 +8788,7 @@ msgstr "" #~ msgstr "Purpurowy:" #~ msgid "Yellow:" -#~ msgstr "Żółty:" +#~ msgstr "¯ó³ty:" #~ msgid "13x19" #~ msgstr "13x19" diff --git a/po/pt.gmo b/po/pt.gmo index eefef02..659b6c3 100644 Binary files a/po/pt.gmo and b/po/pt.gmo differ diff --git a/po/pt.po b/po/pt.po index 077d0ad..ea0d1c2 100644 --- a/po/pt.po +++ b/po/pt.po @@ -6,21 +6,21 @@ msgid "" msgstr "" "Project-Id-Version: gimpprint 4.3.4\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2008-01-01 20:47-0500\n" -"PO-Revision-Date: 2006-05-04 07:20-0400\n" +"POT-Creation-Date: 2008-04-25 21:19-0400\n" +"PO-Revision-Date: 2002-10-16 19:24+0100\n" "Last-Translator: Filipe Maia \n" "Language-Team: Portuguese \n" "MIME-Version: 1.0\n" -"Content-Type: text/plain; charset=utf-8\n" +"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:1752 +#: src/main/print-escp2.c:2116 #, fuzzy msgid "Default" -msgstr "Definir Valores Padrão" +msgstr "Definir Valores Padrão" #: src/main/dither-main.c:47 msgid "EvenTone" @@ -55,68 +55,81 @@ msgstr "" #: src/main/dither-main.c:63 msgid "Adaptive Hybrid" -msgstr "Híbrido Adaptativo" +msgstr "Híbrido Adaptativo" #: src/main/dither-main.c:64 msgid "Ordered" msgstr "Ordenado" #: src/main/dither-main.c:65 -msgid "Fast" -msgstr "Rápido" +#, fuzzy +msgid "Ordered New" +msgstr "Ordenado" #: src/main/dither-main.c:66 -msgid "Very Fast" -msgstr "Muito Rápido" +msgid "Fast" +msgstr "Rápido" #: src/main/dither-main.c:67 -msgid "Hybrid Floyd-Steinberg" -msgstr "Híbrido Floyd-Steinberg" +msgid "Very Fast" +msgstr "Muito Rápido" #: src/main/dither-main.c:68 +msgid "Hybrid Floyd-Steinberg" +msgstr "Híbrido Floyd-Steinberg" + +#: src/main/dither-main.c:69 msgid "Predithered Input" msgstr "" -#: src/main/dither-main.c:88 src/main/print-color.c:56 +#: src/main/dither-main.c:70 +msgid "Drop Size Segmented" +msgstr "" + +#: src/main/dither-main.c:71 +msgid "Drop Size Segmented New" +msgstr "" + +#: src/main/dither-main.c:91 src/main/print-color.c:56 #, fuzzy msgid "Density" msgstr "Densidade:" -#: src/main/dither-main.c:88 src/main/print-canon.c:295 +#: src/main/dither-main.c:91 src/main/print-canon.c:295 #: src/main/print-canon.c:303 src/main/print-canon.c:311 -#: src/main/print-canon.c:319 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-escp2.c:471 -#: src/main/print-escp2.c:479 src/main/print-escp2.c:487 +#: src/main/print-canon.c:319 src/main/print-escp2.c:446 +#: src/main/print-escp2.c:454 src/main/print-escp2.c:462 +#: src/main/print-escp2.c:470 src/main/print-escp2.c:478 +#: src/main/print-escp2.c:486 src/main/print-escp2.c:494 #: 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:1764 src/main/print-olympus.c:1772 -#: src/main/print-olympus.c:1780 src/main/print-olympus.c:1788 -#: src/main/print-pcl.c:1261 src/main/print-pcl.c:1269 -#: src/main/print-pcl.c:1277 src/main/print-pcl.c:1285 +#: src/main/print-olympus.c:1762 src/main/print-olympus.c:1770 +#: src/main/print-olympus.c:1778 src/main/print-olympus.c:1786 +#: src/main/print-pcl.c:1329 src/main/print-pcl.c:1337 +#: src/main/print-pcl.c:1345 src/main/print-pcl.c:1353 msgid "Output Level Adjustment" msgstr "" -#: src/main/dither-main.c:89 +#: src/main/dither-main.c:92 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 "" -"Ajuste a densidade (quantidade de tinta) da impressão. Reduza a densidade " +"Ajuste a densidade (quantidade de tinta) da impressão. Reduza a densidade " "se\n" "a tinta pinga ou borrata o papel, aumente a densidade se as zonas pretas\n" -"não aparecem sólidas." +"não aparecem sólidas." -#: src/main/dither-main.c:97 +#: src/main/dither-main.c:100 msgid "Dither Algorithm" msgstr "Algoritmos de \"Dither\"\"" -#: src/main/dither-main.c:97 +#: src/main/dither-main.c:100 msgid "Screening Adjustment" msgstr "" -#: src/main/dither-main.c:98 +#: src/main/dither-main.c:101 #, fuzzy msgid "" "Choose the dither algorithm to be used.\n" @@ -129,11 +142,11 @@ msgid "" "Hybrid Floyd-Steinberg generally produces inferior output." msgstr "" "Escolha o algoritmo de \"dither\" a ser usado.\n" -"Híbrido Adaptativo normalmente produz a melhor qualidade.\n" -"Ordenado é mais rápido e produz uma qualidade semelhante em fotografias.\n" -"Rápido e Muito Rápido são consideravelmente mais rápidos, e funcionam para\n" +"Híbrido Adaptativo normalmente produz a melhor qualidade.\n" +"Ordenado é mais rápido e produz uma qualidade semelhante em fotografias.\n" +"Rápido e Muito Rápido são consideravelmente mais rápidos, e funcionam para\n" "texto e para \"line art\".\n" -"Híbrido Floyd-Steinber normalmente produz resultados inferiores." +"Híbrido Floyd-Steinber normalmente produz resultados inferiores." #: src/main/module.c:52 msgid "Miscellaneous (unclassified)" @@ -152,9 +165,9 @@ msgstr "" msgid "Dither algorithm" msgstr "Algoritmos de \"Dither\"\"" -#: src/main/print-canon.c:200 src/main/print-escp2.c:180 -#: src/main/print-lexmark.c:266 src/main/print-olympus.c:1699 -#: src/main/print-pcl.c:1196 src/main/print-ps.c:67 +#: src/main/print-canon.c:200 src/main/print-escp2.c:182 +#: src/main/print-lexmark.c:266 src/main/print-olympus.c:1697 +#: src/main/print-pcl.c:1264 #, fuzzy msgid "Page Size" msgstr "Tamanho" @@ -163,249 +176,258 @@ msgstr "Tamanho" #: src/main/print-canon.c:212 src/main/print-canon.c:218 #: src/main/print-canon.c:224 src/main/print-canon.c:230 #: src/main/print-canon.c:248 src/main/print-canon.c:272 -#: src/main/print-escp2.c:180 src/main/print-escp2.c:186 -#: src/main/print-escp2.c:192 src/main/print-escp2.c:198 -#: src/main/print-escp2.c:204 src/main/print-escp2.c:210 -#: src/main/print-escp2.c:228 src/main/print-escp2.c:245 -#: src/main/print-escp2.c:251 src/main/print-escp2.c:263 -#: src/main/print-escp2.c:281 src/main/print-lexmark.c:266 +#: src/main/print-escp2.c:182 src/main/print-escp2.c:188 +#: src/main/print-escp2.c:194 src/main/print-escp2.c:200 +#: src/main/print-escp2.c:206 src/main/print-escp2.c:212 +#: src/main/print-escp2.c:230 src/main/print-escp2.c:247 +#: src/main/print-escp2.c:253 src/main/print-escp2.c:265 +#: src/main/print-escp2.c:283 src/main/print-lexmark.c:266 #: src/main/print-lexmark.c:272 src/main/print-lexmark.c:278 -#: src/main/print-lexmark.c:284 src/main/print-olympus.c:1699 -#: src/main/print-olympus.c:1705 src/main/print-olympus.c:1711 -#: src/main/print-olympus.c:1717 src/main/print-pcl.c:1196 -#: src/main/print-pcl.c:1202 src/main/print-pcl.c:1208 -#: src/main/print-pcl.c:1214 src/main/print-pcl.c:1238 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 +#: src/main/print-lexmark.c:284 src/main/print-olympus.c:1697 +#: src/main/print-olympus.c:1703 src/main/print-olympus.c:1709 +#: src/main/print-olympus.c:1715 src/main/print-pcl.c:1264 +#: src/main/print-pcl.c:1270 src/main/print-pcl.c:1276 +#: src/main/print-pcl.c:1282 src/main/print-pcl.c:1306 src/main/print-ps.c:68 +#: src/main/print-ps.c:74 #, fuzzy msgid "Basic Printer Setup" -msgstr "Definições da Impressora" +msgstr "Definições da Impressora" -#: src/main/print-canon.c:201 src/main/print-escp2.c:181 -#: src/main/print-lexmark.c:267 src/main/print-olympus.c:1700 -#: src/main/print-pcl.c:1197 src/main/print-ps.c:68 +#: src/main/print-canon.c:201 src/main/print-escp2.c:183 +#: src/main/print-lexmark.c:267 src/main/print-olympus.c:1698 +#: src/main/print-pcl.c:1265 #, fuzzy msgid "Size of the paper being printed to" msgstr "Tamanho do papel para o qual deseja imprimir" -#: src/main/print-canon.c:206 src/main/print-escp2.c:186 -#: src/main/print-lexmark.c:272 src/main/print-olympus.c:1705 -#: src/main/print-pcl.c:1202 src/main/print-ps.c:73 src/cups/genppd.c:1417 +#: src/main/print-canon.c:206 src/main/print-escp2.c:188 +#: src/main/print-lexmark.c:272 src/main/print-olympus.c:1703 +#: src/main/print-pcl.c:1270 src/cups/genppd.c:1422 msgid "Media Type" -msgstr "Tipo de Média" +msgstr "Tipo de Média" -#: src/main/print-canon.c:207 src/main/print-escp2.c:187 -#: src/main/print-lexmark.c:273 src/main/print-olympus.c:1706 -#: src/main/print-pcl.c:1203 src/main/print-ps.c:74 +#: src/main/print-canon.c:207 src/main/print-escp2.c:189 +#: src/main/print-lexmark.c:273 src/main/print-olympus.c:1704 +#: src/main/print-pcl.c:1271 msgid "Type of media (plain paper, photo paper, etc.)" msgstr "" -#: src/main/print-canon.c:212 src/main/print-escp2.c:192 -#: src/main/print-lexmark.c:278 src/main/print-olympus.c:1711 -#: src/main/print-pcl.c:1208 src/main/print-ps.c:79 src/cups/genppd.c:1445 +#: src/main/print-canon.c:212 src/main/print-escp2.c:194 +#: src/main/print-lexmark.c:278 src/main/print-olympus.c:1709 +#: src/main/print-pcl.c:1276 src/cups/genppd.c:1450 msgid "Media Source" -msgstr "Fonte de Média" +msgstr "Fonte de Média" -#: src/main/print-canon.c:213 src/main/print-escp2.c:193 -#: src/main/print-lexmark.c:279 src/main/print-olympus.c:1712 -#: src/main/print-pcl.c:1209 src/main/print-ps.c:80 +#: src/main/print-canon.c:213 src/main/print-escp2.c:195 +#: src/main/print-lexmark.c:279 src/main/print-olympus.c:1710 +#: src/main/print-pcl.c:1277 #, fuzzy msgid "Source (input slot) of the media" -msgstr "Fonte do \"media\" para o qual está a imprimir" +msgstr "Fonte do \"media\" para o qual está a imprimir" -#: src/main/print-canon.c:218 src/main/print-escp2.c:198 +#: src/main/print-canon.c:218 src/main/print-escp2.c:200 msgid "CD Hub Size" msgstr "" -#: src/main/print-canon.c:219 src/main/print-escp2.c:199 +#: src/main/print-canon.c:219 src/main/print-escp2.c:201 msgid "Print only outside of the hub of the CD, or all the way to the hole" msgstr "" -#: src/main/print-canon.c:224 src/main/print-escp2.c:204 +#: src/main/print-canon.c:224 src/main/print-escp2.c:206 msgid "CD Size (Custom)" msgstr "" -#: src/main/print-canon.c:225 src/main/print-escp2.c:205 +#: src/main/print-canon.c:225 src/main/print-escp2.c:207 msgid "Variable adjustment for the outer diameter of CD" msgstr "" -#: src/main/print-canon.c:230 src/main/print-escp2.c:210 +#: src/main/print-canon.c:230 src/main/print-escp2.c:212 msgid "CD Hub Size (Custom)" msgstr "" -#: src/main/print-canon.c:231 src/main/print-escp2.c:211 +#: src/main/print-canon.c:231 src/main/print-escp2.c:213 #, fuzzy msgid "Variable adjustment to the inner hub of the CD" -msgstr "Redimensionar a impressão para o tamanho da página" +msgstr "Redimensionar a impressão para o tamanho da página" -#: src/main/print-canon.c:236 src/main/print-escp2.c:216 +#: src/main/print-canon.c:236 src/main/print-escp2.c:218 msgid "CD Horizontal Fine Adjustment" msgstr "" #: src/main/print-canon.c:236 src/main/print-canon.c:242 -#: src/main/print-canon.c:254 src/main/print-escp2.c:216 -#: src/main/print-escp2.c:222 src/main/print-escp2.c:239 -#: src/main/print-escp2.c:275 src/main/print-lexmark.c:290 -#: src/main/print-olympus.c:1723 src/main/print-olympus.c:1729 -#: src/main/print-olympus.c:1735 src/main/print-pcl.c:1220 -#: src/main/print-ps.c:91 src/main/print-raw.c:80 +#: src/main/print-canon.c:254 src/main/print-escp2.c:218 +#: src/main/print-escp2.c:224 src/main/print-escp2.c:241 +#: src/main/print-escp2.c:277 src/main/print-lexmark.c:290 +#: src/main/print-olympus.c:1721 src/main/print-olympus.c:1727 +#: src/main/print-olympus.c:1733 src/main/print-pcl.c:1288 +#: src/main/print-raw.c:80 msgid "Advanced Printer Setup" msgstr "" #: src/main/print-canon.c:237 src/main/print-canon.c:243 -#: src/main/print-escp2.c:217 src/main/print-escp2.c:223 +#: src/main/print-escp2.c:219 src/main/print-escp2.c:225 msgid "Fine adjustment to horizontal position for CD printing" msgstr "" -#: src/main/print-canon.c:242 src/main/print-escp2.c:222 +#: src/main/print-canon.c:242 src/main/print-escp2.c:224 msgid "CD Vertical Fine Adjustment" msgstr "" -#: src/main/print-canon.c:248 src/main/print-escp2.c:228 -#: src/main/print-lexmark.c:284 src/main/print-olympus.c:1717 -#: src/main/print-pcl.c:1214 src/main/print-ps.c:85 src/cups/genppd.c:1518 +#: src/main/print-canon.c:248 src/main/print-escp2.c:230 +#: src/main/print-lexmark.c:284 src/main/print-olympus.c:1715 +#: src/main/print-pcl.c:1282 src/cups/genppd.c:1523 msgid "Resolution" -msgstr "Resolução" +msgstr "Resolução" #: src/main/print-canon.c:249 src/main/print-lexmark.c:285 -#: src/main/print-olympus.c:1718 src/main/print-pcl.c:1215 -#: src/main/print-ps.c:86 +#: src/main/print-olympus.c:1716 src/main/print-pcl.c:1283 msgid "Resolution and quality of the print" -msgstr "Resolução e qualidade da impressão" +msgstr "Resolução e qualidade da impressão" -#: src/main/print-canon.c:254 src/main/print-escp2.c:239 -#: src/main/print-lexmark.c:290 src/main/print-olympus.c:1723 -#: src/main/print-pcl.c:1220 src/main/print-ps.c:91 src/main/print-raw.c:80 +#: src/main/print-canon.c:254 src/main/print-escp2.c:241 +#: src/main/print-lexmark.c:290 src/main/print-olympus.c:1721 +#: src/main/print-pcl.c:1288 src/main/print-raw.c:80 msgid "Ink Type" msgstr "Tipo de tinta" -#: src/main/print-canon.c:255 src/main/print-escp2.c:240 -#: src/main/print-escp2.c:252 src/main/print-lexmark.c:291 -#: src/main/print-olympus.c:1724 src/main/print-pcl.c:1221 -#: src/main/print-ps.c:92 src/main/print-raw.c:81 +#: src/main/print-canon.c:255 src/main/print-escp2.c:242 +#: src/main/print-escp2.c:254 src/main/print-lexmark.c:291 +#: src/main/print-olympus.c:1722 src/main/print-pcl.c:1289 +#: src/main/print-raw.c:81 msgid "Type of ink in the printer" msgstr "Tipo de tinta na impressora" #: src/main/print-canon.c:260 src/main/print-canon.c:261 -#: src/main/print-escp2.c:329 src/main/print-escp2.c:330 +#: src/main/print-escp2.c:331 src/main/print-escp2.c:332 #: src/main/print-lexmark.c:296 src/main/print-lexmark.c:297 -#: src/main/print-pcl.c:1226 src/main/print-pcl.c:1227 +#: src/main/print-pcl.c:1294 src/main/print-pcl.c:1295 msgid "Ink Channels" msgstr "" -#: src/main/print-canon.c:260 src/main/print-escp2.c:130 -#: src/main/print-escp2.c:137 src/main/print-escp2.c:144 -#: src/main/print-escp2.c:287 src/main/print-escp2.c:293 -#: src/main/print-escp2.c:299 src/main/print-escp2.c:305 -#: src/main/print-escp2.c:311 src/main/print-escp2.c:317 -#: src/main/print-escp2.c:323 src/main/print-escp2.c:329 -#: src/main/print-escp2.c:335 src/main/print-lexmark.c:296 -#: src/main/print-pcl.c:1226 +#: src/main/print-canon.c:260 src/main/print-escp2.c:132 +#: src/main/print-escp2.c:139 src/main/print-escp2.c:146 +#: src/main/print-escp2.c:289 src/main/print-escp2.c:295 +#: src/main/print-escp2.c:301 src/main/print-escp2.c:307 +#: src/main/print-escp2.c:313 src/main/print-escp2.c:319 +#: src/main/print-escp2.c:325 src/main/print-escp2.c:331 +#: src/main/print-escp2.c:337 src/main/print-lexmark.c:296 +#: src/main/print-pcl.c:1294 msgid "Advanced Printer Functionality" msgstr "" -#: src/main/print-canon.c:266 src/main/print-escp2.c:341 -#: src/main/print-lexmark.c:302 src/main/print-olympus.c:1741 -#: src/main/print-pcl.c:1232 src/main/print-ps.c:103 src/main/print-raw.c:86 +#: src/main/print-canon.c:266 src/main/print-escp2.c:343 +#: src/main/print-lexmark.c:302 src/main/print-olympus.c:1739 +#: src/main/print-pcl.c:1300 src/main/print-ps.c:80 src/main/print-raw.c:86 #, fuzzy msgid "Printing Mode" msgstr "Modelo da Impressora:" #: src/main/print-canon.c:266 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:341 -#: src/main/print-escp2.c:347 src/main/print-lexmark.c:302 -#: src/main/print-olympus.c:1741 src/main/print-pcl.c:1232 -#: src/main/print-ps.c:103 src/main/print-raw.c:86 +#: src/main/print-color.c:208 src/main/print-escp2.c:343 +#: src/main/print-escp2.c:349 src/main/print-lexmark.c:302 +#: src/main/print-olympus.c:1739 src/main/print-pcl.c:1300 +#: src/main/print-ps.c:80 src/main/print-raw.c:86 #, fuzzy msgid "Core Parameter" msgstr "Papel ColorLife" -#: src/main/print-canon.c:267 src/main/print-escp2.c:342 -#: src/main/print-lexmark.c:303 src/main/print-olympus.c:1742 -#: src/main/print-pcl.c:1233 src/main/print-ps.c:104 src/main/print-raw.c:87 +#: src/main/print-canon.c:267 src/main/print-escp2.c:344 +#: src/main/print-lexmark.c:303 src/main/print-olympus.c:1740 +#: src/main/print-pcl.c:1301 src/main/print-ps.c:81 src/main/print-raw.c:87 msgid "Printing Output Mode" msgstr "" -#: src/main/print-canon.c:272 src/main/print-pcl.c:1238 +#: src/main/print-canon.c:272 src/main/print-pcl.c:1306 msgid "Double-Sided Printing" msgstr "" -#: src/main/print-canon.c:273 src/main/print-pcl.c:1239 +#: src/main/print-canon.c:273 src/main/print-pcl.c:1307 msgid "Duplex/Tumble Setting" msgstr "" -#: src/main/print-canon.c:295 src/main/print-escp2.c:439 -#: src/main/print-lexmark.c:325 src/main/print-pcl.c:1261 +#: src/main/print-canon.c:295 src/main/print-escp2.c:446 +#: src/main/print-lexmark.c:325 src/main/print-pcl.c:1329 #, fuzzy msgid "Cyan Density" msgstr "Densidade:" -#: src/main/print-canon.c:296 src/main/print-escp2.c:440 -#: src/main/print-lexmark.c:326 src/main/print-pcl.c:1262 +#: src/main/print-canon.c:296 src/main/print-escp2.c:447 +#: src/main/print-lexmark.c:326 src/main/print-pcl.c:1330 #, fuzzy msgid "Adjust the cyan density" -msgstr "Ajustar o equilíbrio de ciano na impressão" +msgstr "Ajustar o equilíbrio de ciano na impressão" -#: src/main/print-canon.c:303 src/main/print-escp2.c:447 -#: src/main/print-lexmark.c:333 src/main/print-pcl.c:1269 +#: src/main/print-canon.c:303 src/main/print-escp2.c:454 +#: src/main/print-lexmark.c:333 src/main/print-pcl.c:1337 #, fuzzy msgid "Magenta Density" msgstr "Magenta" -#: src/main/print-canon.c:304 src/main/print-escp2.c:448 -#: src/main/print-lexmark.c:334 src/main/print-pcl.c:1270 +#: src/main/print-canon.c:304 src/main/print-escp2.c:455 +#: src/main/print-lexmark.c:334 src/main/print-pcl.c:1338 #, fuzzy msgid "Adjust the magenta density" -msgstr "Ajustar o equilíbrio de magenta da impressão" +msgstr "Ajustar o equilíbrio de magenta da impressão" -#: src/main/print-canon.c:311 src/main/print-escp2.c:455 -#: src/main/print-lexmark.c:341 src/main/print-pcl.c:1277 +#: src/main/print-canon.c:311 src/main/print-escp2.c:462 +#: src/main/print-lexmark.c:341 src/main/print-pcl.c:1345 #, fuzzy msgid "Yellow Density" msgstr "Densidade:" -#: src/main/print-canon.c:312 src/main/print-escp2.c:456 -#: src/main/print-lexmark.c:342 src/main/print-pcl.c:1278 +#: src/main/print-canon.c:312 src/main/print-escp2.c:463 +#: src/main/print-lexmark.c:342 src/main/print-pcl.c:1346 #, fuzzy msgid "Adjust the yellow density" -msgstr "Ajustar o equilíbrio de amarelo na impressão" +msgstr "Ajustar o equilíbrio de amarelo na impressão" -#: src/main/print-canon.c:319 src/main/print-escp2.c:463 -#: src/main/print-lexmark.c:349 src/main/print-pcl.c:1285 +#: src/main/print-canon.c:319 src/main/print-escp2.c:470 +#: src/main/print-lexmark.c:349 src/main/print-pcl.c:1353 #, fuzzy msgid "Black Density" msgstr "Densidade:" -#: src/main/print-canon.c:320 src/main/print-escp2.c:464 -#: src/main/print-lexmark.c:350 src/main/print-pcl.c:1286 +#: src/main/print-canon.c:320 src/main/print-escp2.c:471 +#: src/main/print-lexmark.c:350 src/main/print-pcl.c:1354 #, fuzzy msgid "Adjust the black density" -msgstr "Ajustar o equilíbrio de ciano na impressão" +msgstr "Ajustar o equilíbrio de ciano na impressão" #: src/main/print-canon.c:327 src/main/print-canon.c:328 -#: src/main/print-escp2.c:495 src/main/print-escp2.c:496 +#: src/main/print-escp2.c:534 src/main/print-escp2.c:535 #: src/main/print-lexmark.c:357 src/main/print-lexmark.c:358 -#: src/main/print-pcl.c:1293 src/main/print-pcl.c:1294 +#: src/main/print-pcl.c:1361 src/main/print-pcl.c:1362 #, fuzzy msgid "Light Cyan Transition" msgstr "Ciano Claro" #: src/main/print-canon.c:327 src/main/print-canon.c:335 -#: src/main/print-canon.c:343 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-escp2.c:543 -#: src/main/print-escp2.c:551 src/main/print-escp2.c:559 -#: src/main/print-lexmark.c:357 src/main/print-lexmark.c:365 -#: src/main/print-pcl.c:1293 src/main/print-pcl.c:1301 +#: src/main/print-canon.c:343 src/main/print-escp2.c:502 +#: src/main/print-escp2.c:510 src/main/print-escp2.c:518 +#: src/main/print-escp2.c:526 src/main/print-escp2.c:534 +#: src/main/print-escp2.c:542 src/main/print-escp2.c:550 +#: src/main/print-escp2.c:558 src/main/print-escp2.c:566 +#: src/main/print-escp2.c:574 src/main/print-escp2.c:582 +#: src/main/print-escp2.c:590 src/main/print-escp2.c:598 +#: src/main/print-escp2.c:606 src/main/print-escp2.c:614 +#: src/main/print-escp2.c:622 src/main/print-escp2.c:630 +#: src/main/print-escp2.c:638 src/main/print-escp2.c:646 +#: src/main/print-escp2.c:654 src/main/print-escp2.c:662 +#: src/main/print-escp2.c:670 src/main/print-escp2.c:678 +#: src/main/print-escp2.c:686 src/main/print-escp2.c:694 +#: src/main/print-escp2.c:702 src/main/print-escp2.c:710 +#: src/main/print-escp2.c:718 src/main/print-escp2.c:726 +#: src/main/print-escp2.c:734 src/main/print-lexmark.c:357 +#: src/main/print-lexmark.c:365 src/main/print-pcl.c:1361 +#: src/main/print-pcl.c:1369 msgid "Advanced Ink Adjustment" msgstr "" #: src/main/print-canon.c:335 src/main/print-canon.c:336 -#: src/main/print-escp2.c:503 src/main/print-escp2.c:504 +#: src/main/print-escp2.c:566 src/main/print-escp2.c:567 #: src/main/print-lexmark.c:365 src/main/print-lexmark.c:366 -#: src/main/print-pcl.c:1301 src/main/print-pcl.c:1302 +#: src/main/print-pcl.c:1369 src/main/print-pcl.c:1370 #, fuzzy msgid "Light Magenta Transition" msgstr "Magenta Claro" @@ -415,55 +437,55 @@ msgstr "Magenta Claro" msgid "Light Yellow Transition" msgstr "Ciano Claro" -#: src/main/print-canon.c:363 src/main/print-pcl.c:1482 +#: src/main/print-canon.c:363 src/main/print-pcl.c:1550 #: src/main/escp2-resolutions.c:557 src/main/escp2-resolutions.c:565 #: src/main/escp2-resolutions.c:576 src/main/escp2-resolutions.c:588 msgid "Off" msgstr "" -#: src/main/print-canon.c:364 src/main/print-pcl.c:1483 +#: src/main/print-canon.c:364 src/main/print-pcl.c:1551 msgid "Long Edge (Standard)" msgstr "" -#: src/main/print-canon.c:365 src/main/print-pcl.c:1484 +#: src/main/print-canon.c:365 src/main/print-pcl.c:1552 msgid "Short Edge (Flip)" msgstr "" -#: src/main/print-canon.c:629 src/main/print-escp2.c:1648 +#: src/main/print-canon.c:629 src/main/print-escp2.c:2012 #: src/main/xmli18n-tmp.h:6 msgid "CD - 5 inch" msgstr "" -#: src/main/print-canon.c:631 src/main/print-escp2.c:1650 +#: src/main/print-canon.c:631 src/main/print-escp2.c:2014 #: src/main/xmli18n-tmp.h:7 msgid "CD - 3 inch" msgstr "" -#: src/main/print-canon.c:633 src/main/print-escp2.c:1652 +#: src/main/print-canon.c:633 src/main/print-escp2.c:2016 #: src/main/xmli18n-tmp.h:8 #, fuzzy msgid "CD - Custom" msgstr "Personalizado" -#: src/main/print-canon.c:656 src/main/print-escp2.c:1677 +#: src/main/print-canon.c:656 src/main/print-escp2.c:2041 msgid "Normal" msgstr "" -#: src/main/print-canon.c:658 src/main/print-escp2.c:1679 +#: src/main/print-canon.c:658 src/main/print-escp2.c:2043 #, fuzzy msgid "Print To Hub" msgstr "Imprimir para o Ficheiro?" -#: src/main/print-canon.c:773 src/main/print-escp2.c:2011 -#: src/main/print-lexmark.c:1279 src/main/print-olympus.c:1996 -#: src/main/print-pcl.c:1776 src/main/print-ps.c:170 src/main/print-raw.c:135 -#: src/gutenprintui/panel.c:289 src/gutenprintui2/panel.c:289 +#: src/main/print-canon.c:773 src/main/print-escp2.c:2450 +#: src/main/print-lexmark.c:1279 src/main/print-olympus.c:1994 +#: src/main/print-pcl.c:1844 src/main/print-ps.c:310 src/main/print-raw.c:135 +#: src/gutenprintui2/panel.c:290 msgid "Color" msgstr "Cor" -#: src/main/print-canon.c:775 src/main/print-escp2.c:2013 -#: src/main/print-lexmark.c:1281 src/main/print-pcl.c:1778 -#: src/main/print-ps.c:172 src/main/print-raw.c:137 +#: src/main/print-canon.c:775 src/main/print-escp2.c:2452 +#: src/main/print-lexmark.c:1281 src/main/print-pcl.c:1846 +#: src/main/print-ps.c:312 src/main/print-raw.c:137 #, fuzzy msgid "Black and White" msgstr "Preto e Branco" @@ -475,7 +497,7 @@ msgstr "" #: src/main/print-color.c:51 #, fuzzy msgid "Bright Colors" -msgstr "Ajustamento da Cor de Impressão" +msgstr "Ajustamento da Cor de Impressão" #: src/main/print-color.c:52 msgid "Correct Hue Only" @@ -504,7 +526,7 @@ msgstr "Imprimir" #: src/main/print-color.c:121 src/main/escp2-channels.c:916 #: src/main/escp2-channels.c:929 src/main/escp2-channels.c:943 -#: src/gutenprintui/panel.c:290 src/gutenprintui2/panel.c:290 +#: src/gutenprintui2/panel.c:291 msgid "Grayscale" msgstr "Escala de Cinzento" @@ -529,7 +551,7 @@ msgstr "" msgid "KCMY" msgstr "" -#: src/main/print-color.c:165 src/main/print-color.c:446 +#: src/main/print-color.c:165 src/main/print-color.c:454 #, fuzzy msgid "Channel " msgstr "Cancelar" @@ -591,7 +613,7 @@ msgid "Output image type" msgstr "Tipo de Output:" #: src/main/print-color.c:208 src/main/print-color.c:209 -#: src/main/print-escp2.c:347 +#: src/main/print-escp2.c:349 msgid "Raw Channels" msgstr "" @@ -612,7 +634,7 @@ msgstr "Brilho:" #: src/main/print-color.c:225 #, fuzzy msgid "Brightness of the print" -msgstr "Definir a altura da impressão" +msgstr "Definir a altura da impressão" #: src/main/print-color.c:232 #, fuzzy @@ -646,9 +668,9 @@ 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 "" -"Ajuste a gama da impressão. Valores altos produzem geralmente impressões " -"mais brilhantes, enquanto que valores baixos produzem impressões mais " -"escuras. Preto e branco mantêm-se inalterados, ou contrário do caso do " +"Ajuste a gama da impressão. Valores altos produzem geralmente impressões " +"mais brilhantes, enquanto que valores baixos produzem impressões mais " +"escuras. Preto e branco mantêm-se inalterados, ou contrário do caso do " "ajustamento do brilho." #: src/main/print-color.c:258 @@ -660,14 +682,14 @@ msgstr "Gama:" msgid "Gamma value assumed by application" msgstr "" -#: src/main/print-color.c:266 src/main/escp2-channels.c:3048 -#: src/main/escp2-channels.c:3060 src/main/escp2-channels.c:3068 -#: src/main/escp2-channels.c:3078 src/main/escp2-channels.c:3089 -#: src/main/escp2-channels.c:3101 src/main/escp2-channels.c:3117 -#: src/main/escp2-channels.c:3125 src/main/escp2-channels.c:3138 -#: src/main/escp2-channels.c:3151 src/main/escp2-channels.c:3165 -#: src/main/escp2-channels.c:3179 src/main/escp2-channels.c:3194 -#: src/gutenprintui/panel.c:2152 src/gutenprintui2/panel.c:2153 +#: src/main/print-color.c:266 src/main/escp2-channels.c:3087 +#: src/main/escp2-channels.c:3099 src/main/escp2-channels.c:3107 +#: src/main/escp2-channels.c:3117 src/main/escp2-channels.c:3128 +#: src/main/escp2-channels.c:3140 src/main/escp2-channels.c:3156 +#: src/main/escp2-channels.c:3164 src/main/escp2-channels.c:3177 +#: src/main/escp2-channels.c:3190 src/main/escp2-channels.c:3204 +#: src/main/escp2-channels.c:3218 src/main/escp2-channels.c:3230 +#: src/main/escp2-channels.c:3243 src/gutenprintui2/panel.c:2328 #: src/escputil/escputil.c:978 src/escputil/escputil.c:997 #: src/escputil/escputil.c:1201 msgid "Cyan" @@ -676,16 +698,16 @@ msgstr "Ciano" #: src/main/print-color.c:267 #, fuzzy msgid "Adjust the cyan gamma" -msgstr "Ajustar o equilíbrio de ciano na impressão" - -#: src/main/print-color.c:274 src/main/escp2-channels.c:3049 -#: src/main/escp2-channels.c:3059 src/main/escp2-channels.c:3070 -#: src/main/escp2-channels.c:3079 src/main/escp2-channels.c:3090 -#: src/main/escp2-channels.c:3103 src/main/escp2-channels.c:3116 -#: src/main/escp2-channels.c:3126 src/main/escp2-channels.c:3139 -#: src/main/escp2-channels.c:3152 src/main/escp2-channels.c:3164 -#: src/main/escp2-channels.c:3178 src/main/escp2-channels.c:3195 -#: src/gutenprintui/panel.c:2159 src/gutenprintui2/panel.c:2160 +msgstr "Ajustar o equilíbrio de ciano na impressão" + +#: src/main/print-color.c:274 src/main/escp2-channels.c:3088 +#: src/main/escp2-channels.c:3098 src/main/escp2-channels.c:3109 +#: src/main/escp2-channels.c:3118 src/main/escp2-channels.c:3129 +#: src/main/escp2-channels.c:3142 src/main/escp2-channels.c:3155 +#: src/main/escp2-channels.c:3165 src/main/escp2-channels.c:3178 +#: src/main/escp2-channels.c:3191 src/main/escp2-channels.c:3203 +#: src/main/escp2-channels.c:3217 src/main/escp2-channels.c:3229 +#: src/main/escp2-channels.c:3244 src/gutenprintui2/panel.c:2335 #: src/escputil/escputil.c:979 src/escputil/escputil.c:998 #: src/escputil/escputil.c:1202 msgid "Magenta" @@ -694,16 +716,16 @@ msgstr "Magenta" #: src/main/print-color.c:275 #, fuzzy msgid "Adjust the magenta gamma" -msgstr "Ajustar o equilíbrio de magenta da impressão" - -#: src/main/print-color.c:282 src/main/escp2-channels.c:3050 -#: src/main/escp2-channels.c:3061 src/main/escp2-channels.c:3069 -#: src/main/escp2-channels.c:3080 src/main/escp2-channels.c:3091 -#: src/main/escp2-channels.c:3105 src/main/escp2-channels.c:3112 -#: src/main/escp2-channels.c:3127 src/main/escp2-channels.c:3140 -#: src/main/escp2-channels.c:3153 src/main/escp2-channels.c:3163 -#: src/main/escp2-channels.c:3177 src/main/escp2-channels.c:3196 -#: src/gutenprintui/panel.c:2166 src/gutenprintui2/panel.c:2167 +msgstr "Ajustar o equilíbrio de magenta da impressão" + +#: src/main/print-color.c:282 src/main/escp2-channels.c:3089 +#: src/main/escp2-channels.c:3100 src/main/escp2-channels.c:3108 +#: src/main/escp2-channels.c:3119 src/main/escp2-channels.c:3130 +#: src/main/escp2-channels.c:3144 src/main/escp2-channels.c:3151 +#: src/main/escp2-channels.c:3166 src/main/escp2-channels.c:3179 +#: src/main/escp2-channels.c:3192 src/main/escp2-channels.c:3202 +#: src/main/escp2-channels.c:3216 src/main/escp2-channels.c:3228 +#: src/main/escp2-channels.c:3245 src/gutenprintui2/panel.c:2342 #: src/escputil/escputil.c:980 src/escputil/escputil.c:999 #: src/escputil/escputil.c:1203 msgid "Yellow" @@ -712,51 +734,48 @@ msgstr "Amarelo" #: src/main/print-color.c:283 #, fuzzy msgid "Adjust the yellow gamma" -msgstr "Ajustar o equilíbrio de amarelo na impressão" +msgstr "Ajustar o equilíbrio de amarelo na impressão" -#: src/main/print-color.c:290 src/main/escp2-channels.c:3168 -#: src/main/escp2-channels.c:3181 src/gutenprintui/panel.c:2180 -#: src/gutenprintui2/panel.c:2181 src/escputil/escputil.c:987 -#: src/escputil/escputil.c:1005 +#: src/main/print-color.c:290 src/main/escp2-channels.c:3207 +#: src/main/escp2-channels.c:3220 src/gutenprintui2/panel.c:2356 +#: src/escputil/escputil.c:987 src/escputil/escputil.c:1005 msgid "Red" msgstr "" #: src/main/print-color.c:291 #, fuzzy msgid "Adjust the red gamma" -msgstr "Ajustar o equilíbrio de amarelo na impressão" +msgstr "Ajustar o equilíbrio de amarelo na impressão" -#: src/main/print-color.c:298 src/gutenprintui/panel.c:2187 -#: src/gutenprintui2/panel.c:2188 +#: src/main/print-color.c:298 src/gutenprintui2/panel.c:2363 msgid "Green" msgstr "" #: src/main/print-color.c:299 #, fuzzy msgid "Adjust the green gamma" -msgstr "Ajustar o equilíbrio de magenta da impressão" +msgstr "Ajustar o equilíbrio de magenta da impressão" -#: src/main/print-color.c:306 src/main/escp2-channels.c:3169 -#: src/main/escp2-channels.c:3182 src/gutenprintui/panel.c:2194 -#: src/gutenprintui2/panel.c:2195 src/escputil/escputil.c:988 -#: src/escputil/escputil.c:1006 +#: src/main/print-color.c:306 src/main/escp2-channels.c:3208 +#: src/main/escp2-channels.c:3221 src/gutenprintui2/panel.c:2370 +#: src/escputil/escputil.c:988 src/escputil/escputil.c:1006 msgid "Blue" msgstr "" #: src/main/print-color.c:307 #, fuzzy msgid "Adjust the blue gamma" -msgstr "Ajustar o equilíbrio de ciano na impressão" +msgstr "Ajustar o equilíbrio de ciano na impressão" #: src/main/print-color.c:314 src/main/print-lexmark.c:613 -#: src/main/escp2-channels.c:3047 src/main/escp2-channels.c:3057 -#: src/main/escp2-channels.c:3058 src/main/escp2-channels.c:3071 -#: src/main/escp2-channels.c:3081 src/main/escp2-channels.c:3088 -#: src/main/escp2-channels.c:3100 src/main/escp2-channels.c:3113 -#: src/main/escp2-channels.c:3124 src/main/escp2-channels.c:3137 -#: src/main/escp2-channels.c:3150 src/main/escp2-channels.c:3156 -#: src/main/escp2-channels.c:3180 src/main/escp2-channels.c:3193 -#: src/gutenprintui/panel.c:2173 src/gutenprintui2/panel.c:2174 +#: src/main/escp2-channels.c:3086 src/main/escp2-channels.c:3096 +#: src/main/escp2-channels.c:3097 src/main/escp2-channels.c:3110 +#: src/main/escp2-channels.c:3120 src/main/escp2-channels.c:3127 +#: src/main/escp2-channels.c:3139 src/main/escp2-channels.c:3152 +#: src/main/escp2-channels.c:3163 src/main/escp2-channels.c:3176 +#: src/main/escp2-channels.c:3189 src/main/escp2-channels.c:3195 +#: src/main/escp2-channels.c:3219 src/main/escp2-channels.c:3231 +#: src/main/escp2-channels.c:3242 src/gutenprintui2/panel.c:2349 #: src/escputil/escputil.c:975 src/escputil/escputil.c:996 #: src/escputil/escputil.c:1200 msgid "Black" @@ -765,9 +784,9 @@ msgstr "Preto" #: src/main/print-color.c:315 #, fuzzy msgid "Adjust the black gamma" -msgstr "Ajustar o equilíbrio de ciano na impressão" +msgstr "Ajustar o equilíbrio de ciano na impressão" -#: src/main/print-color.c:322 src/main/print-olympus.c:1764 +#: src/main/print-color.c:322 src/main/print-olympus.c:1762 msgid "Cyan Balance" msgstr "" @@ -780,9 +799,9 @@ msgstr "Escala de Cinzento" #: src/main/print-color.c:323 #, fuzzy msgid "Adjust the cyan gray balance" -msgstr "Ajustar o equilíbrio de ciano na impressão" +msgstr "Ajustar o equilíbrio de ciano na impressão" -#: src/main/print-color.c:330 src/main/print-olympus.c:1772 +#: src/main/print-color.c:330 src/main/print-olympus.c:1770 #, fuzzy msgid "Magenta Balance" msgstr "Magenta" @@ -790,30 +809,30 @@ msgstr "Magenta" #: src/main/print-color.c:331 #, fuzzy msgid "Adjust the magenta gray balance" -msgstr "Ajustar o equilíbrio de magenta da impressão" +msgstr "Ajustar o equilíbrio de magenta da impressão" -#: src/main/print-color.c:338 src/main/print-olympus.c:1780 +#: src/main/print-color.c:338 src/main/print-olympus.c:1778 #, fuzzy msgid "Yellow Balance" -msgstr "Ajustar o equilíbrio de amarelo na impressão" +msgstr "Ajustar o equilíbrio de amarelo na impressão" #: src/main/print-color.c:339 #, fuzzy msgid "Adjust the yellow gray balance" -msgstr "Ajustar o equilíbrio de amarelo na impressão" +msgstr "Ajustar o equilíbrio de amarelo na impressão" #: src/main/print-color.c:346 #, fuzzy msgid "Saturation" -msgstr "Saturação:" +msgstr "Saturação:" #: 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 "" -"Ajustar a saturação (equilíbrio de cor) da impressão\n" -"Use saturação zero para produzir output em escala de cinzento usando tintas " +"Ajustar a saturação (equilíbrio de cor) da impressão\n" +"Use saturação zero para produzir output em escala de cinzento usando tintas " "de cor e pretas" #: src/main/print-color.c:357 @@ -823,9 +842,11 @@ msgstr "Tipo de tinta" #: 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:353 -#: src/main/print-escp2.c:359 src/main/print-escp2.c:365 -#: src/main/print-escp2.c:371 src/main/print-escp2.c:377 +#: src/main/print-color.c:421 src/main/print-color.c:553 +#: src/main/print-escp2.c:355 src/main/print-escp2.c:361 +#: src/main/print-escp2.c:367 src/main/print-escp2.c:373 +#: src/main/print-escp2.c:379 src/main/print-escp2.c:742 +#: src/main/print-escp2.c:750 src/main/print-escp2.c:758 #, fuzzy msgid "Advanced Output Control" msgstr "Tipo de Output:" @@ -834,553 +855,670 @@ msgstr "Tipo de Output:" msgid "Limit the total ink printed to the page" msgstr "" -#: src/main/print-color.c:365 +#: src/main/print-color.c:365 src/main/print-escp2.c:742 msgid "GCR Transition" msgstr "" -#: src/main/print-color.c:366 +#: src/main/print-color.c:366 src/main/print-escp2.c:743 msgid "Adjust the gray component transition rate" msgstr "" -#: src/main/print-color.c:373 +#: src/main/print-color.c:373 src/main/print-escp2.c:750 msgid "GCR Lower Bound" msgstr "" -#: src/main/print-color.c:374 +#: src/main/print-color.c:374 src/main/print-escp2.c:751 msgid "Lower bound of gray component reduction" msgstr "" -#: src/main/print-color.c:381 +#: src/main/print-color.c:381 src/main/print-escp2.c:758 msgid "GCR Upper Bound" msgstr "" -#: src/main/print-color.c:382 +#: src/main/print-color.c:382 src/main/print-escp2.c:759 msgid "Upper bound of gray component reduction" msgstr "" -#: src/main/print-color.c:447 src/main/print-color.c:457 -#: src/main/print-color.c:465 src/main/print-color.c:473 -#: src/main/print-color.c:481 src/main/print-color.c:489 -#: src/main/print-color.c:497 src/main/print-color.c:505 -#: src/main/print-color.c:513 +#: src/main/print-color.c:421 +msgid "LUT dump file" +msgstr "" + +#: src/main/print-color.c:422 +msgid "Dump file for LUT for external color adjustment" +msgstr "" + +#: src/main/print-color.c:455 src/main/print-color.c:465 +#: src/main/print-color.c:473 src/main/print-color.c:481 +#: src/main/print-color.c:489 src/main/print-color.c:497 +#: src/main/print-color.c:505 src/main/print-color.c:513 +#: src/main/print-color.c:521 #, fuzzy msgid "Output Curves" msgstr "Tipo de Output:" -#: src/main/print-color.c:447 +#: src/main/print-color.c:455 msgid "Curve for raw channel " msgstr "" -#: src/main/print-color.c:457 +#: src/main/print-color.c:465 msgid "Cyan Curve" msgstr "" -#: src/main/print-color.c:458 +#: src/main/print-color.c:466 #, fuzzy msgid "Cyan curve" msgstr "Cancelar" -#: src/main/print-color.c:465 +#: src/main/print-color.c:473 #, fuzzy msgid "Magenta Curve" msgstr "Magenta" -#: src/main/print-color.c:466 +#: src/main/print-color.c:474 #, fuzzy msgid "Magenta curve" msgstr "Magenta" -#: src/main/print-color.c:473 +#: src/main/print-color.c:481 #, fuzzy msgid "Yellow Curve" msgstr "Amarelo" -#: src/main/print-color.c:474 +#: src/main/print-color.c:482 #, fuzzy msgid "Yellow curve" msgstr "Amarelo" -#: src/main/print-color.c:481 +#: src/main/print-color.c:489 #, fuzzy msgid "Black Curve" msgstr "Preto" -#: src/main/print-color.c:482 +#: src/main/print-color.c:490 #, fuzzy msgid "Black curve" msgstr "Preto" -#: src/main/print-color.c:489 +#: src/main/print-color.c:497 #, fuzzy msgid "Red Curve" msgstr "Amarelo" -#: src/main/print-color.c:490 +#: src/main/print-color.c:498 #, fuzzy msgid "Red curve" msgstr "Amarelo" -#: src/main/print-color.c:497 +#: src/main/print-color.c:505 #, fuzzy msgid "Green Curve" msgstr "Magenta" -#: src/main/print-color.c:498 +#: src/main/print-color.c:506 #, fuzzy msgid "Green curve" msgstr "Magenta" -#: src/main/print-color.c:505 +#: src/main/print-color.c:513 #, fuzzy msgid "Blue Curve" msgstr "Preto" -#: src/main/print-color.c:506 +#: src/main/print-color.c:514 #, fuzzy msgid "Blue curve" msgstr "Preto" -#: src/main/print-color.c:513 +#: src/main/print-color.c:521 #, fuzzy msgid "White Curve" msgstr "Amarelo" -#: src/main/print-color.c:514 +#: src/main/print-color.c:522 #, fuzzy msgid "White curve" msgstr "Amarelo" -#: src/main/print-color.c:521 +#: src/main/print-color.c:529 msgid "Hue Map" msgstr "" -#: src/main/print-color.c:521 src/main/print-color.c:529 -#: src/main/print-color.c:537 +#: src/main/print-color.c:529 src/main/print-color.c:537 +#: src/main/print-color.c:545 msgid "Advanced HSL Curves" msgstr "" -#: src/main/print-color.c:522 +#: src/main/print-color.c:530 msgid "Hue adjustment curve" msgstr "" -#: src/main/print-color.c:529 +#: src/main/print-color.c:537 #, fuzzy msgid "Saturation Map" -msgstr "Saturação:" +msgstr "Saturação:" -#: src/main/print-color.c:530 +#: src/main/print-color.c:538 msgid "Saturation adjustment curve" msgstr "" -#: src/main/print-color.c:537 +#: src/main/print-color.c:545 msgid "Luminosity Map" msgstr "" -#: src/main/print-color.c:538 +#: src/main/print-color.c:546 msgid "Luminosity adjustment curve" msgstr "" -#: src/main/print-color.c:545 +#: src/main/print-color.c:553 msgid "Gray Component Reduction" msgstr "" -#: src/main/print-color.c:546 +#: src/main/print-color.c:554 msgid "Gray component reduction curve" msgstr "" -#: src/main/print-color.c:1670 +#: src/main/print-color.c:1743 msgid "Traditional Gutenprint color conversion" msgstr "" -#: src/main/printers.c:517 +#: src/main/printers.c:514 #, c-format msgid "Value must be set for %s\n" msgstr "" -#: src/main/printers.c:530 src/main/printers.c:535 +#: src/main/printers.c:527 src/main/printers.c:532 #, fuzzy, c-format msgid "`%s' is not a valid %s\n" -msgstr "%s não é um paràmetro válido do tipo %s\n" +msgstr "%s não é um paràmetro válido do tipo %s\n" -#: src/main/printers.c:554 +#: src/main/printers.c:551 #, c-format msgid "%s must be between %f and %f (is %f)\n" msgstr "" -#: src/main/printers.c:576 src/main/printers.c:600 +#: src/main/printers.c:573 src/main/printers.c:597 #, c-format msgid "%s must be between %d and %d (is %d)\n" msgstr "" -#: src/main/printers.c:631 +#: src/main/printers.c:628 #, c-format msgid "%s bounds must be between %f and %f\n" msgstr "" -#: src/main/printers.c:639 +#: src/main/printers.c:636 #, c-format msgid "%s wrap mode must be %s\n" msgstr "" -#: src/main/printers.c:643 +#: src/main/printers.c:640 msgid "no wrap" msgstr "" -#: src/main/printers.c:643 +#: src/main/printers.c:640 msgid "wrap around" msgstr "" -#: src/main/printers.c:687 +#: src/main/printers.c:684 #, fuzzy, c-format msgid "Unknown type parameter %s (%d)\n" msgstr "Impressora desconhecida %s\n" -#: src/main/printers.c:700 src/main/printers.c:711 +#: src/main/printers.c:697 src/main/printers.c:708 #, c-format msgid "%s out of range (value %d, min %d, max %d)\n" msgstr "%s fora do intervalo (valor %d, min %d, max %d)\n" -#: src/main/printers.c:772 +#: src/main/printers.c:768 #, fuzzy msgid "Page size is not valid\n" -msgstr "Tamanho da imagem não é válido\n" +msgstr "Tamanho da imagem não é válido\n" -#: src/main/printers.c:793 +#: src/main/printers.c:789 #, fuzzy, c-format msgid "Top margin must not be less than %d\n" -msgstr "Margem de topo não pode ser menor que zero\n" +msgstr "Margem de topo não pode ser menor que zero\n" -#: src/main/printers.c:799 +#: src/main/printers.c:795 #, fuzzy, c-format msgid "Left margin must not be less than %d\n" -msgstr "Mergem esquerda não pode ser menor que zero\n" +msgstr "Mergem esquerda não pode ser menor que zero\n" -#: src/main/printers.c:805 +#: src/main/printers.c:801 #, fuzzy msgid "Height must be greater than zero\n" -msgstr "Mergem esquerda não pode ser menor que zero\n" +msgstr "Mergem esquerda não pode ser menor que zero\n" -#: src/main/printers.c:811 +#: src/main/printers.c:807 #, fuzzy msgid "Width must be greater than zero\n" -msgstr "Margem de topo não pode ser menor que zero\n" +msgstr "Margem de topo não pode ser menor que zero\n" -#: src/main/printers.c:817 +#: src/main/printers.c:813 #, c-format msgid "" "Image is too wide for the page: left margin is %d, width %d, right edge is %" "d\n" msgstr "" -#: src/main/printers.c:824 +#: src/main/printers.c:820 #, c-format msgid "" "Image is too long for the page: top margin is %d, height %d, bottom edge is %" "d\n" msgstr "" -#: src/main/print-escp2.c:162 +#: src/main/print-escp2.c:164 msgid "Automatic Printing Mode" msgstr "" -#: src/main/print-escp2.c:162 src/main/print-escp2.c:174 +#: src/main/print-escp2.c:164 src/main/print-escp2.c:176 #: src/main/generic-options.c:62 msgid "Basic Output Adjustment" msgstr "" -#: src/main/print-escp2.c:163 +#: src/main/print-escp2.c:165 msgid "Automatic printing mode" msgstr "" -#: src/main/print-escp2.c:174 src/main/print-escp2.c:175 +#: src/main/print-escp2.c:176 src/main/print-escp2.c:177 #: src/main/generic-options.c:62 src/main/generic-options.c:63 #, fuzzy msgid "Print Quality" -msgstr "720 DPI Qualidade Máxima" +msgstr "720 DPI Qualidade Máxima" -#: src/main/print-escp2.c:229 +#: src/main/print-escp2.c:231 #, fuzzy msgid "Resolution of the print" -msgstr "Resolução e qualidade da impressão" +msgstr "Resolução e qualidade da impressão" -#: src/main/print-escp2.c:245 +#: src/main/print-escp2.c:247 msgid "Enhanced Gloss" msgstr "" -#: src/main/print-escp2.c:246 +#: src/main/print-escp2.c:248 msgid "Add gloss enhancement" msgstr "" -#: src/main/print-escp2.c:251 +#: src/main/print-escp2.c:253 #, fuzzy msgid "Ink Set" msgstr "Tipo de tinta" -#: src/main/print-escp2.c:257 +#: src/main/print-escp2.c:259 msgid "Printing Direction" msgstr "" -#: src/main/print-escp2.c:257 src/main/print-escp2.c:269 +#: src/main/print-escp2.c:259 src/main/print-escp2.c:271 msgid "Advanced Output Adjustment" msgstr "" -#: src/main/print-escp2.c:258 +#: src/main/print-escp2.c:260 msgid "Printing direction (unidirectional is higher quality, but slower)" msgstr "" -#: src/main/print-escp2.c:263 src/main/print-olympus.c:1735 +#: src/main/print-escp2.c:265 src/main/print-olympus.c:1733 msgid "Borderless" msgstr "" -#: src/main/print-escp2.c:264 src/main/print-olympus.c:1736 +#: src/main/print-escp2.c:266 src/main/print-olympus.c:1734 msgid "Print without borders" msgstr "" -#: src/main/print-escp2.c:269 +#: src/main/print-escp2.c:271 msgid "Interleave Method" msgstr "" -#: src/main/print-escp2.c:270 +#: src/main/print-escp2.c:272 msgid "Interleave pattern to use" msgstr "" -#: src/main/print-escp2.c:275 +#: src/main/print-escp2.c:277 msgid "Adjust dot size as necessary" msgstr "" -#: src/main/print-escp2.c:276 +#: src/main/print-escp2.c:278 msgid "Adjust dot size as necessary to achieve desired density" msgstr "" -#: src/main/print-escp2.c:281 src/main/print-escp2.c:282 +#: src/main/print-escp2.c:283 src/main/print-escp2.c:284 #, fuzzy msgid "Output Order" msgstr "Tipo de Output:" -#: src/main/print-escp2.c:287 src/main/print-escp2.c:288 +#: src/main/print-escp2.c:289 src/main/print-escp2.c:290 msgid "Alignment Passes" msgstr "" -#: src/main/print-escp2.c:293 src/main/print-escp2.c:294 +#: src/main/print-escp2.c:295 src/main/print-escp2.c:296 msgid "Alignment Choices" msgstr "" -#: src/main/print-escp2.c:299 src/main/print-escp2.c:300 +#: src/main/print-escp2.c:301 src/main/print-escp2.c:302 #, fuzzy msgid "Ink change command" msgstr "Comando desconhecido.\n" -#: src/main/print-escp2.c:305 src/main/print-escp2.c:306 +#: src/main/print-escp2.c:307 src/main/print-escp2.c:308 msgid "Alternate Alignment Passes" msgstr "" -#: src/main/print-escp2.c:311 src/main/print-escp2.c:312 +#: src/main/print-escp2.c:313 src/main/print-escp2.c:314 #, fuzzy msgid "Alternate Alignment Choices" msgstr "Repetindo o processo de alinhamento.\n" -#: src/main/print-escp2.c:317 +#: src/main/print-escp2.c:319 msgid "Supports Packet Mode" msgstr "" -#: src/main/print-escp2.c:318 +#: src/main/print-escp2.c:320 msgid "Supports D4 Packet Mode" msgstr "" -#: src/main/print-escp2.c:323 +#: src/main/print-escp2.c:325 msgid "Has Interchangeable Ink Cartridges" msgstr "" -#: src/main/print-escp2.c:324 +#: src/main/print-escp2.c:326 msgid "Has multiple choices of ink cartridges" msgstr "" -#: src/main/print-escp2.c:335 src/main/print-escp2.c:336 +#: src/main/print-escp2.c:337 src/main/print-escp2.c:338 #, fuzzy msgid "Channel Names" msgstr "Cancelar" -#: src/main/print-escp2.c:348 +#: src/main/print-escp2.c:350 msgid "Raw Channel Count" msgstr "" -#: src/main/print-escp2.c:353 +#: src/main/print-escp2.c:355 #, fuzzy msgid "Cyan Map" msgstr "Ciano" -#: src/main/print-escp2.c:354 +#: src/main/print-escp2.c:356 #, fuzzy msgid "Adjust the cyan map" -msgstr "Ajustar o equilíbrio de ciano na impressão" +msgstr "Ajustar o equilíbrio de ciano na impressão" -#: src/main/print-escp2.c:359 +#: src/main/print-escp2.c:361 #, fuzzy msgid "Magenta Map" msgstr "Magenta" -#: src/main/print-escp2.c:360 +#: src/main/print-escp2.c:362 #, fuzzy msgid "Adjust the magenta map" -msgstr "Ajustar o equilíbrio de magenta da impressão" +msgstr "Ajustar o equilíbrio de magenta da impressão" -#: src/main/print-escp2.c:365 +#: src/main/print-escp2.c:367 #, fuzzy msgid "Yellow Map" msgstr "Amarelo" -#: src/main/print-escp2.c:366 +#: src/main/print-escp2.c:368 #, fuzzy msgid "Adjust the yellow map" -msgstr "Ajustar o equilíbrio de amarelo na impressão" +msgstr "Ajustar o equilíbrio de amarelo na impressão" -#: src/main/print-escp2.c:371 +#: src/main/print-escp2.c:373 #, fuzzy msgid "Blue Map" msgstr "Preto e Branco" -#: src/main/print-escp2.c:372 +#: src/main/print-escp2.c:374 #, fuzzy msgid "Adjust the blue map" -msgstr "Ajustar o equilíbrio de ciano na impressão" +msgstr "Ajustar o equilíbrio de ciano na impressão" -#: src/main/print-escp2.c:377 +#: src/main/print-escp2.c:379 msgid "Red Map" msgstr "" -#: src/main/print-escp2.c:378 +#: src/main/print-escp2.c:380 #, fuzzy msgid "Adjust the red map" -msgstr "Ajustar o equilíbrio de amarelo na impressão" +msgstr "Ajustar o equilíbrio de amarelo na impressão" -#: src/main/print-escp2.c:471 +#: src/main/print-escp2.c:478 #, fuzzy msgid "Red Density" msgstr "Densidade:" -#: src/main/print-escp2.c:472 +#: src/main/print-escp2.c:479 #, fuzzy msgid "Adjust the red density" -msgstr "Ajustar o equilíbrio de amarelo na impressão" +msgstr "Ajustar o equilíbrio de amarelo na impressão" -#: src/main/print-escp2.c:479 +#: src/main/print-escp2.c:486 #, fuzzy msgid "Blue Density" msgstr "Densidade:" -#: src/main/print-escp2.c:480 +#: src/main/print-escp2.c:487 #, fuzzy msgid "Adjust the blue density" -msgstr "Ajustar o equilíbrio de ciano na impressão" +msgstr "Ajustar o equilíbrio de ciano na impressão" -#: src/main/print-escp2.c:487 +#: src/main/print-escp2.c:494 #, fuzzy msgid "Gloss Level" msgstr "Filme Lustroso" -#: src/main/print-escp2.c:488 +#: src/main/print-escp2.c:495 #, fuzzy msgid "Adjust the gloss level" -msgstr "Ajustar o equilíbrio de amarelo na impressão" +msgstr "Ajustar o equilíbrio de amarelo na impressão" + +#: src/main/print-escp2.c:502 +msgid "Drop Size Small" +msgstr "" + +#: src/main/print-escp2.c:503 +msgid "Drop Size 1 (small)" +msgstr "" + +#: src/main/print-escp2.c:510 +msgid "Drop Size Medium" +msgstr "" + +#: src/main/print-escp2.c:511 +msgid "Drop Size 2 (medium)" +msgstr "" + +#: src/main/print-escp2.c:518 +msgid "Drop Size Large" +msgstr "" + +#: src/main/print-escp2.c:519 +msgid "Drop Size 3 (large)" +msgstr "" + +#: src/main/print-escp2.c:526 src/main/print-escp2.c:527 +#, fuzzy +msgid "Light Cyan Value" +msgstr "Ciano Claro" + +#: src/main/print-escp2.c:542 src/main/print-escp2.c:543 +#, fuzzy +msgid "Light Cyan Density Scale" +msgstr "Ciano Claro" + +#: src/main/print-escp2.c:550 src/main/print-escp2.c:551 +#, fuzzy +msgid "Light Magenta Value" +msgstr "Magenta Claro" + +#: src/main/print-escp2.c:558 src/main/print-escp2.c:559 +#, fuzzy +msgid "Light Magenta Density Scale" +msgstr "Magenta Claro" -#: src/main/print-escp2.c:511 src/main/print-escp2.c:512 +#: src/main/print-escp2.c:574 src/main/print-escp2.c:575 +#, fuzzy +msgid "Dark Yellow Value" +msgstr "Amarelo" + +#: src/main/print-escp2.c:582 src/main/print-escp2.c:583 msgid "Dark Yellow Transition" msgstr "" -#: src/main/print-escp2.c:519 src/main/print-escp2.c:520 -#: src/main/print-escp2.c:527 src/main/print-escp2.c:528 +#: src/main/print-escp2.c:590 src/main/print-escp2.c:591 +#, fuzzy +msgid "Dark Yellow Density Scale" +msgstr "Amarelo" + +#: src/main/print-escp2.c:598 src/main/print-escp2.c:599 +#: src/main/print-escp2.c:622 src/main/print-escp2.c:623 +#, fuzzy +msgid "Gray Value" +msgstr "Escala de Cinzento" + +#: src/main/print-escp2.c:606 src/main/print-escp2.c:607 +#: src/main/print-escp2.c:630 src/main/print-escp2.c:631 msgid "Gray Transition" msgstr "" -#: src/main/print-escp2.c:535 src/main/print-escp2.c:536 -#: src/main/print-escp2.c:559 src/main/print-escp2.c:560 +#: src/main/print-escp2.c:614 src/main/print-escp2.c:615 +#: src/main/print-escp2.c:638 src/main/print-escp2.c:639 +#, fuzzy +msgid "Gray Density Scale" +msgstr "Escala de Cinzento" + +#: src/main/print-escp2.c:646 src/main/print-escp2.c:647 +#: src/main/print-escp2.c:718 src/main/print-escp2.c:719 +#, fuzzy +msgid "Light Gray Value" +msgstr "Ciano Claro" + +#: src/main/print-escp2.c:654 src/main/print-escp2.c:655 +#: src/main/print-escp2.c:726 src/main/print-escp2.c:727 #, fuzzy msgid "Light Gray Transition" msgstr "Ciano Claro" -#: src/main/print-escp2.c:543 src/main/print-escp2.c:544 +#: src/main/print-escp2.c:662 src/main/print-escp2.c:663 +#: src/main/print-escp2.c:734 src/main/print-escp2.c:735 +#, fuzzy +msgid "Light Gray Density Scale" +msgstr "Ciano Claro" + +#: src/main/print-escp2.c:670 src/main/print-escp2.c:671 +#, fuzzy +msgid "Dark Gray Value" +msgstr "Ciano Claro" + +#: src/main/print-escp2.c:678 src/main/print-escp2.c:679 #, fuzzy msgid "Dark Gray Transition" msgstr "Ciano Claro" -#: src/main/print-escp2.c:551 +#: src/main/print-escp2.c:686 src/main/print-escp2.c:687 +#, fuzzy +msgid "Dark Gray Density Scale" +msgstr "Ciano Claro" + +#: src/main/print-escp2.c:694 +#, fuzzy +msgid "Mid Gray Value" +msgstr "Escala de Cinzento" + +#: src/main/print-escp2.c:695 +#, fuzzy +msgid "Medium Gray Value" +msgstr "Ciano Claro" + +#: src/main/print-escp2.c:702 #, fuzzy msgid "Mid Gray Transition" msgstr "Ciano Claro" -#: src/main/print-escp2.c:552 +#: src/main/print-escp2.c:703 #, fuzzy msgid "Medium Gray Transition" msgstr "Ciano Claro" -#: src/main/print-escp2.c:1635 +#: src/main/print-escp2.c:710 +#, fuzzy +msgid "Mid Gray Density Scale" +msgstr "Ciano Claro" + +#: src/main/print-escp2.c:711 +#, fuzzy +msgid "Medium Gray Density Scale" +msgstr "Ciano Claro" + +#: src/main/print-escp2.c:1999 #, fuzzy msgid "Full Manual Control" msgstr "Tipo de Output:" -#: src/main/print-escp2.c:1637 +#: src/main/print-escp2.c:2001 msgid "Automatic Setting Control" msgstr "" -#: src/main/print-escp2.c:1732 src/main/generic-options.c:213 +#: src/main/print-escp2.c:2096 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:1771 src/main/print-escp2.c:1863 -#: src/main/print-escp2.c:1875 src/main/print-pcl.c:230 -#: src/main/escp2-channels.c:2805 src/main/escp2-papers.c:1707 -#: src/main/escp2-papers.c:1731 src/main/escp2-papers.c:1764 -#: src/main/escp2-papers.c:1815 src/main/escp2-papers.c:1857 -#: src/main/escp2-papers.c:1899 src/main/escp2-papers.c:1992 -#: src/main/escp2-resolutions.c:640 src/main/escp2-resolutions.c:655 -#: src/main/escp2-resolutions.c:668 src/main/generic-options.c:36 -#: src/gutenprintui/panel.c:2613 src/gutenprintui2/panel.c:2639 +#: src/main/print-escp2.c:2139 src/main/print-escp2.c:2231 +#: src/main/print-escp2.c:2243 src/main/print-pcl.c:237 +#: src/main/escp2-channels.c:2827 src/main/escp2-channels.c:2836 +#: src/main/escp2-papers.c:1718 src/main/escp2-papers.c:1742 +#: src/main/escp2-papers.c:1775 src/main/escp2-papers.c:1826 +#: src/main/escp2-papers.c:1868 src/main/escp2-papers.c:1910 +#: src/main/escp2-papers.c:2003 src/main/escp2-resolutions.c:640 +#: src/main/escp2-resolutions.c:655 src/main/escp2-resolutions.c:670 +#: src/main/escp2-resolutions.c:683 src/main/generic-options.c:36 +#: src/gutenprintui2/panel.c:2814 msgid "Standard" msgstr "Standard" -#: src/main/print-escp2.c:1842 +#: src/main/print-escp2.c:2210 #, fuzzy msgid "Automatic" msgstr "Tamanho" -#: src/main/print-escp2.c:1844 +#: src/main/print-escp2.c:2212 #, fuzzy msgid "Bidirectional" msgstr "600 DPI Unidireccional" -#: src/main/print-escp2.c:1846 +#: src/main/print-escp2.c:2214 #, fuzzy msgid "Unidirectional" msgstr "600 DPI Unidireccional" -#: src/main/print-escp2.c:1877 +#: src/main/print-escp2.c:2245 msgid "Alternate Fill" msgstr "" -#: src/main/print-escp2.c:1879 +#: src/main/print-escp2.c:2247 msgid "Ascending Fill" msgstr "" -#: src/main/print-escp2.c:1881 +#: src/main/print-escp2.c:2249 msgid "Descending Fill" msgstr "" -#: src/main/print-escp2.c:1883 +#: src/main/print-escp2.c:2251 msgid "Ascending Double" msgstr "" -#: src/main/print-escp2.c:1885 +#: src/main/print-escp2.c:2253 msgid "Nearest Neighbor Avoidance" msgstr "" -#: src/main/print-escp2.c:2328 +#: src/main/print-escp2.c:2771 #, 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" +msgstr "A impressora não suporta a cor de impressão\n" -#: src/main/print-escp2.c:3436 src/main/print-olympus.c:2451 +#: src/main/print-escp2.c:3934 src/main/print-olympus.c:2449 #: src/main/print-raw.c:217 msgid "Print options not verified; cannot print.\n" msgstr "" @@ -1411,7 +1549,7 @@ msgstr "1200 DPI alta qualidade" #: src/main/print-lexmark.c:583 src/main/print-lexmark.c:659 msgid "1200 DPI highest quality" -msgstr "1200 DPI qualidade máxima" +msgstr "1200 DPI qualidade máxima" #: src/main/print-lexmark.c:584 src/main/print-lexmark.c:660 msgid "1200 DPI Unidirectional" @@ -1427,11 +1565,11 @@ msgstr "2400 DPI x 1200 DPI alta qualidade" #: src/main/print-lexmark.c:587 msgid "2400 DPI x 1200 DPI highest quality" -msgstr "2400 DPI x 1200 DPI qualidade máxima" +msgstr "2400 DPI x 1200 DPI qualidade máxima" #: src/main/print-lexmark.c:589 msgid "test print" -msgstr "impressão de teste" +msgstr "impressão de teste" #: src/main/print-lexmark.c:601 src/main/print-lexmark.c:671 #: src/main/escp2-channels.c:1288 src/main/escp2-channels.c:1302 @@ -1451,118 +1589,118 @@ msgstr "Quatro Cores Standard" #: src/main/escp2-channels.c:1238 src/main/escp2-channels.c:1252 #: src/main/escp2-channels.c:1266 msgid "Three Color Composite" -msgstr "Três Cores Compósito" +msgstr "Três Cores Compósito" #: src/main/print-lexmark.c:607 src/main/print-lexmark.c:677 -#: src/main/escp2-channels.c:1540 src/main/escp2-channels.c:1554 -#: src/main/escp2-channels.c:1568 src/main/escp2-channels.c:1582 -#: src/main/escp2-channels.c:1808 src/main/escp2-channels.c:1823 -#: src/main/escp2-channels.c:1838 src/main/escp2-channels.c:1855 +#: src/main/escp2-channels.c:1554 src/main/escp2-channels.c:1568 +#: src/main/escp2-channels.c:1582 src/main/escp2-channels.c:1596 +#: src/main/escp2-channels.c:1822 src/main/escp2-channels.c:1837 +#: src/main/escp2-channels.c:1852 src/main/escp2-channels.c:1869 msgid "Six Color Photo" msgstr "Seis Cores Foto" #: src/main/print-lexmark.c:610 src/main/print-lexmark.c:680 -#: src/main/escp2-channels.c:1475 src/main/escp2-channels.c:1489 -#: src/main/escp2-channels.c:1503 src/main/escp2-channels.c:1517 -#: src/main/escp2-channels.c:1752 src/main/escp2-channels.c:1767 -#: src/main/escp2-channels.c:1784 +#: src/main/escp2-channels.c:1489 src/main/escp2-channels.c:1503 +#: src/main/escp2-channels.c:1517 src/main/escp2-channels.c:1531 +#: src/main/escp2-channels.c:1766 src/main/escp2-channels.c:1781 +#: src/main/escp2-channels.c:1798 msgid "Five Color Photo Composite" -msgstr "Cinco Cores Foto Compósito" +msgstr "Cinco Cores Foto Compósito" -#: src/main/print-lexmark.c:856 src/main/escp2-papers.c:1341 -#: src/main/escp2-papers.c:1385 src/main/escp2-papers.c:1429 -#: src/main/escp2-papers.c:1477 src/main/escp2-papers.c:1525 -#: src/main/escp2-papers.c:1569 +#: src/main/print-lexmark.c:856 src/main/escp2-papers.c:1351 +#: src/main/escp2-papers.c:1395 src/main/escp2-papers.c:1439 +#: src/main/escp2-papers.c:1487 src/main/escp2-papers.c:1535 +#: src/main/escp2-papers.c:1579 msgid "Plain Paper" msgstr "Papel Normal" -#: src/main/print-lexmark.c:860 src/main/escp2-papers.c:1347 -#: src/main/escp2-papers.c:1391 src/main/escp2-papers.c:1435 -#: src/main/escp2-papers.c:1483 src/main/escp2-papers.c:1531 -#: src/main/escp2-papers.c:1575 +#: src/main/print-lexmark.c:860 src/main/escp2-papers.c:1357 +#: src/main/escp2-papers.c:1401 src/main/escp2-papers.c:1445 +#: src/main/escp2-papers.c:1493 src/main/escp2-papers.c:1541 +#: src/main/escp2-papers.c:1585 msgid "Glossy Film" msgstr "Filme Lustroso" -#: src/main/print-lexmark.c:864 src/main/escp2-papers.c:1349 -#: src/main/escp2-papers.c:1393 src/main/escp2-papers.c:1437 -#: src/main/escp2-papers.c:1485 src/main/escp2-papers.c:1533 -#: src/main/escp2-papers.c:1577 +#: src/main/print-lexmark.c:864 src/main/escp2-papers.c:1359 +#: src/main/escp2-papers.c:1403 src/main/escp2-papers.c:1447 +#: src/main/escp2-papers.c:1495 src/main/escp2-papers.c:1543 +#: src/main/escp2-papers.c:1587 msgid "Transparencies" -msgstr "Transparências" +msgstr "Transparências" -#: src/main/print-lexmark.c:868 src/main/escp2-papers.c:1351 -#: src/main/escp2-papers.c:1395 src/main/escp2-papers.c:1439 -#: src/main/escp2-papers.c:1487 src/main/escp2-papers.c:1535 -#: src/main/escp2-papers.c:1579 +#: src/main/print-lexmark.c:868 src/main/escp2-papers.c:1361 +#: src/main/escp2-papers.c:1405 src/main/escp2-papers.c:1449 +#: src/main/escp2-papers.c:1497 src/main/escp2-papers.c:1545 +#: src/main/escp2-papers.c:1589 msgid "Envelopes" msgstr "Envelopes" -#: src/main/print-lexmark.c:872 src/main/escp2-papers.c:1355 -#: src/main/escp2-papers.c:1399 src/main/escp2-papers.c:1443 -#: src/main/escp2-papers.c:1491 src/main/escp2-papers.c:1539 -#: src/main/escp2-papers.c:1583 +#: src/main/print-lexmark.c:872 src/main/escp2-papers.c:1365 +#: src/main/escp2-papers.c:1409 src/main/escp2-papers.c:1453 +#: src/main/escp2-papers.c:1501 src/main/escp2-papers.c:1549 +#: src/main/escp2-papers.c:1593 msgid "Matte Paper" msgstr "Papel Mate" -#: src/main/print-lexmark.c:876 src/main/escp2-papers.c:1359 -#: src/main/escp2-papers.c:1403 src/main/escp2-papers.c:1447 -#: src/main/escp2-papers.c:1495 src/main/escp2-papers.c:1543 -#: src/main/escp2-papers.c:1587 +#: src/main/print-lexmark.c:876 src/main/escp2-papers.c:1369 +#: src/main/escp2-papers.c:1413 src/main/escp2-papers.c:1457 +#: src/main/escp2-papers.c:1505 src/main/escp2-papers.c:1553 +#: src/main/escp2-papers.c:1597 msgid "Inkjet Paper" msgstr "Papel para Impressora Jacto de Tinta" -#: src/main/print-lexmark.c:880 src/main/escp2-papers.c:1361 -#: src/main/escp2-papers.c:1405 src/main/escp2-papers.c:1449 -#: src/main/escp2-papers.c:1497 src/main/escp2-papers.c:1545 -#: src/main/escp2-papers.c:1589 +#: src/main/print-lexmark.c:880 src/main/escp2-papers.c:1371 +#: src/main/escp2-papers.c:1415 src/main/escp2-papers.c:1459 +#: src/main/escp2-papers.c:1507 src/main/escp2-papers.c:1555 +#: src/main/escp2-papers.c:1599 msgid "Photo Quality Inkjet Paper" msgstr "Papel de Qualidade Fotografica para Impressora Jacto de Tinta" -#: src/main/print-lexmark.c:884 src/main/escp2-papers.c:1363 -#: src/main/escp2-papers.c:1407 src/main/escp2-papers.c:1451 -#: src/main/escp2-papers.c:1499 src/main/escp2-papers.c:1547 -#: src/main/escp2-papers.c:1591 +#: src/main/print-lexmark.c:884 src/main/escp2-papers.c:1373 +#: src/main/escp2-papers.c:1417 src/main/escp2-papers.c:1461 +#: src/main/escp2-papers.c:1509 src/main/escp2-papers.c:1557 +#: src/main/escp2-papers.c:1601 msgid "Photo Paper" msgstr "Papel de Fotografia" -#: src/main/print-lexmark.c:888 src/main/escp2-papers.c:1365 -#: src/main/escp2-papers.c:1409 src/main/escp2-papers.c:1453 -#: src/main/escp2-papers.c:1501 src/main/escp2-papers.c:1549 -#: src/main/escp2-papers.c:1593 src/main/escp2-papers.c:1617 +#: src/main/print-lexmark.c:888 src/main/escp2-papers.c:1375 +#: src/main/escp2-papers.c:1419 src/main/escp2-papers.c:1463 +#: src/main/escp2-papers.c:1511 src/main/escp2-papers.c:1559 +#: src/main/escp2-papers.c:1603 src/main/escp2-papers.c:1627 msgid "Premium Glossy Photo Paper" msgstr "Papel de Fotografia Lustroso Premium" -#: src/main/print-lexmark.c:892 src/main/escp2-papers.c:1369 -#: src/main/escp2-papers.c:1413 src/main/escp2-papers.c:1457 -#: src/main/escp2-papers.c:1505 src/main/escp2-papers.c:1553 -#: src/main/escp2-papers.c:1597 +#: src/main/print-lexmark.c:892 src/main/escp2-papers.c:1379 +#: src/main/escp2-papers.c:1423 src/main/escp2-papers.c:1467 +#: src/main/escp2-papers.c:1515 src/main/escp2-papers.c:1563 +#: src/main/escp2-papers.c:1607 msgid "Premium Luster Photo Paper" msgstr "Papel de Fotografia Brilhante Premium" -#: src/main/print-lexmark.c:896 src/main/escp2-papers.c:1371 -#: src/main/escp2-papers.c:1415 src/main/escp2-papers.c:1463 -#: src/main/escp2-papers.c:1511 src/main/escp2-papers.c:1555 -#: src/main/escp2-papers.c:1603 +#: src/main/print-lexmark.c:896 src/main/escp2-papers.c:1381 +#: src/main/escp2-papers.c:1425 src/main/escp2-papers.c:1473 +#: src/main/escp2-papers.c:1521 src/main/escp2-papers.c:1565 +#: src/main/escp2-papers.c:1613 msgid "Photo Quality Glossy Paper" msgstr "Papel de Qualidade Fotografica Lustroso" -#: src/main/print-lexmark.c:900 src/main/escp2-papers.c:1373 -#: src/main/escp2-papers.c:1417 src/main/escp2-papers.c:1465 -#: src/main/escp2-papers.c:1513 src/main/escp2-papers.c:1557 -#: src/main/escp2-papers.c:1605 +#: src/main/print-lexmark.c:900 src/main/escp2-papers.c:1383 +#: src/main/escp2-papers.c:1427 src/main/escp2-papers.c:1475 +#: src/main/escp2-papers.c:1523 src/main/escp2-papers.c:1567 +#: src/main/escp2-papers.c:1615 msgid "Ilford Heavy Paper" msgstr "Papel Pesado Ilford" -#: src/main/print-lexmark.c:904 src/main/escp2-papers.c:1377 -#: src/main/escp2-papers.c:1421 src/main/escp2-papers.c:1469 -#: src/main/escp2-papers.c:1517 src/main/escp2-papers.c:1561 -#: src/main/escp2-papers.c:1609 src/main/escp2-papers.c:1619 +#: src/main/print-lexmark.c:904 src/main/escp2-papers.c:1387 +#: src/main/escp2-papers.c:1431 src/main/escp2-papers.c:1479 +#: src/main/escp2-papers.c:1527 src/main/escp2-papers.c:1571 +#: src/main/escp2-papers.c:1619 src/main/escp2-papers.c:1629 msgid "Other" msgstr "Outro" #: src/main/print-lexmark.c:1113 msgid "Auto Sheet Feeder" -msgstr "Alimentador de Folhas Automático" +msgstr "Alimentador de Folhas Automático" #: src/main/print-lexmark.c:1114 msgid "Manual with Pause" @@ -1572,59 +1710,59 @@ msgstr "Manual com Pausa" msgid "Manual without Pause" msgstr "Manual sem Pausa" -#: src/main/print-olympus.c:277 +#: src/main/print-olympus.c:275 msgid "Coated" msgstr "" -#: src/main/print-olympus.c:278 src/cups/genppd.c:1726 src/cups/genppd.c:1753 -#: src/cups/genppd.c:1834 +#: src/main/print-olympus.c:276 src/cups/genppd.c:1732 src/cups/genppd.c:1759 +#: src/cups/genppd.c:1840 msgid "None" msgstr "" -#: src/main/print-olympus.c:963 src/main/print-olympus.c:1023 -#: src/main/print-olympus.c:1127 +#: src/main/print-olympus.c:961 src/main/print-olympus.c:1021 +#: src/main/print-olympus.c:1125 #, fuzzy msgid "Glossy" msgstr "Filme Lustroso" -#: src/main/print-olympus.c:964 src/main/print-olympus.c:1024 -#: src/main/print-olympus.c:1128 +#: src/main/print-olympus.c:962 src/main/print-olympus.c:1022 +#: src/main/print-olympus.c:1126 msgid "Texture" msgstr "" -#: src/main/print-olympus.c:1025 src/main/print-olympus.c:1129 +#: src/main/print-olympus.c:1023 src/main/print-olympus.c:1127 #, fuzzy msgid "Matte" msgstr "Papel Mate" -#: src/main/print-olympus.c:1729 src/main/print-olympus.c:1730 +#: src/main/print-olympus.c:1727 src/main/print-olympus.c:1728 msgid "Laminate Pattern" msgstr "" -#: src/main/print-olympus.c:1765 +#: src/main/print-olympus.c:1763 #, fuzzy msgid "Adjust the cyan balance" -msgstr "Ajustar o equilíbrio de ciano na impressão" +msgstr "Ajustar o equilíbrio de ciano na impressão" -#: src/main/print-olympus.c:1773 +#: src/main/print-olympus.c:1771 #, fuzzy msgid "Adjust the magenta balance" -msgstr "Ajustar o equilíbrio de magenta da impressão" +msgstr "Ajustar o equilíbrio de magenta da impressão" -#: src/main/print-olympus.c:1781 +#: src/main/print-olympus.c:1779 #, fuzzy msgid "Adjust the yellow balance" -msgstr "Ajustar o equilíbrio de amarelo na impressão" +msgstr "Ajustar o equilíbrio de amarelo na impressão" -#: src/main/print-olympus.c:1788 +#: src/main/print-olympus.c:1786 #, fuzzy msgid "Black Balance" msgstr "Preto e Branco" -#: src/main/print-olympus.c:1789 +#: src/main/print-olympus.c:1787 #, fuzzy msgid "Adjust the black balance" -msgstr "Ajustar o equilíbrio de ciano na impressão" +msgstr "Ajustar o equilíbrio de ciano na impressão" #: src/main/print-pcl.c:185 msgid "Plain" @@ -1644,406 +1782,436 @@ msgstr "Foto Lustrosa" #: src/main/print-pcl.c:189 msgid "Transparency" -msgstr "Transparência" +msgstr "Transparência" #: src/main/print-pcl.c:190 msgid "Quick-dry Photo" -msgstr "Foto Secagem Rápida" +msgstr "Foto Secagem Rápida" #: src/main/print-pcl.c:191 msgid "Quick-dry Transparency" -msgstr "Transparência Secagem Rápida" +msgstr "Transparência Secagem Rápida" -#: src/main/print-pcl.c:231 src/main/xmli18n-tmp.h:16 +#: src/main/print-pcl.c:238 src/main/xmli18n-tmp.h:17 msgid "Manual" msgstr "Manual" -#: src/main/print-pcl.c:233 +#: src/main/print-pcl.c:240 +msgid "Tray 1 - Movable Guides" +msgstr "" + +#: src/main/print-pcl.c:241 msgid "Tray 1" msgstr "Tabuleiro 1" -#: src/main/print-pcl.c:234 src/main/print-pcl.c:240 +#: src/main/print-pcl.c:242 +msgid "Tray 2 - Movable Guides" +msgstr "" + +#: src/main/print-pcl.c:243 src/main/print-pcl.c:251 msgid "Tray 2" msgstr "Tabuleiro 2" -#: src/main/print-pcl.c:235 +#: src/main/print-pcl.c:244 +msgid "Tray 3 - Movable Guides" +msgstr "" + +#: src/main/print-pcl.c:245 msgid "Tray 3" msgstr "Tabuleiro 3" -#: src/main/print-pcl.c:236 +#: src/main/print-pcl.c:246 +msgid "Tray 4 - Movable Guides" +msgstr "" + +#: src/main/print-pcl.c:247 msgid "Tray 4" msgstr "Tabuleiro 4" -#: src/main/print-pcl.c:237 +#: src/main/print-pcl.c:248 msgid "Portable Sheet Feeder" -msgstr "Alimentador de Folhas Portátil" +msgstr "Alimentador de Folhas Portátil" -#: src/main/print-pcl.c:238 +#: src/main/print-pcl.c:249 msgid "Desktop Sheet Feeder" -msgstr "Alimentador de Folhas de Secretária" +msgstr "Alimentador de Folhas de Secretária" -#: src/main/print-pcl.c:239 +#: src/main/print-pcl.c:250 msgid "Tray" msgstr "Tabuleiro" -#: src/main/print-pcl.c:241 +#: src/main/print-pcl.c:252 msgid "Optional Source" msgstr "Fonte Alternativa" -#: src/main/print-pcl.c:242 +#: src/main/print-pcl.c:253 msgid "Autoselect" msgstr "Auto Seleccionar" -#: src/main/print-pcl.c:256 +#: src/main/print-pcl.c:267 msgid "150x150 DPI" msgstr "150x150 DPI" -#: src/main/print-pcl.c:257 +#: src/main/print-pcl.c:268 msgid "300x300 DPI" msgstr "300x300 DPI" -#: src/main/print-pcl.c:258 +#: src/main/print-pcl.c:269 msgid "600x300 DPI" msgstr "600x300 DPI" -#: src/main/print-pcl.c:259 +#: src/main/print-pcl.c:270 msgid "600x600 DPI monochrome" -msgstr "600x600 DPI monocromático" +msgstr "600x600 DPI monocromático" -#: src/main/print-pcl.c:260 +#: src/main/print-pcl.c:271 msgid "600x600 DPI" msgstr "600x600 DPI" -#: src/main/print-pcl.c:261 +#: src/main/print-pcl.c:272 msgid "1200x600 DPI" msgstr "1200x600 DPI" -#: src/main/print-pcl.c:262 +#: src/main/print-pcl.c:273 msgid "2400x600 DPI" msgstr "2400x600 DPI" -#: src/main/print-pcl.c:1470 +#: src/main/print-pcl.c:1538 msgid "Color + Black Cartridges" msgstr "Cartuchos Cor + Preto" -#: src/main/print-pcl.c:1471 +#: src/main/print-pcl.c:1539 msgid "Color + Photo Cartridges" msgstr "Cartuchos Cor + Fotografia" -#: src/main/print-ps.c:97 +#: src/main/print-ps.c:68 #, fuzzy msgid "PPDFile" msgstr "Ficheiro PPD:" -#: src/main/print-ps.c:98 src/gutenprintui/panel.c:1768 -#: src/gutenprintui2/panel.c:1768 +#: src/main/print-ps.c:69 src/gutenprintui2/panel.c:1943 #, fuzzy msgid "PPD File" msgstr "Ficheiro PPD?" +#: src/main/print-ps.c:74 +#, fuzzy +msgid "Model Name" +msgstr "Cancelar" + +#: src/main/print-ps.c:75 +msgid "PPD File Model Name" +msgstr "" + #: src/main/print-raw.c:223 msgid "Image dimensions must match paper dimensions" msgstr "" #: src/main/escp2-channels.c:965 src/main/escp2-channels.c:978 msgid "Two Level Grayscale" -msgstr "Escala de Cinzento de 2 Níveis" +msgstr "Escala de Cinzento de 2 Níveis" #: src/main/escp2-channels.c:1000 src/main/escp2-channels.c:1013 #, fuzzy msgid "Three Level Grayscale" -msgstr "Escala de Cinzento de 2 Níveis" +msgstr "Escala de Cinzento de 2 Níveis" #: src/main/escp2-channels.c:1035 src/main/escp2-channels.c:1048 #: src/main/escp2-channels.c:1061 src/main/escp2-channels.c:1074 #: src/main/escp2-channels.c:1087 src/main/escp2-channels.c:1100 -#: src/main/escp2-channels.c:2505 src/main/escp2-channels.c:2528 -#: src/main/escp2-channels.c:2548 src/main/escp2-channels.c:2568 -#: src/main/escp2-channels.c:2588 src/main/escp2-channels.c:2608 +#: src/main/escp2-channels.c:2525 src/main/escp2-channels.c:2548 +#: src/main/escp2-channels.c:2568 src/main/escp2-channels.c:2588 +#: src/main/escp2-channels.c:2608 src/main/escp2-channels.c:2628 msgid "Quadtone" msgstr "Quato Tons" -#: src/main/escp2-channels.c:1604 src/main/escp2-channels.c:1618 +#: src/main/escp2-channels.c:1466 +#, fuzzy +msgid "Four Color Photo" +msgstr "Seis Cores Foto" + +#: src/main/escp2-channels.c:1618 src/main/escp2-channels.c:1632 msgid "Six Color Enhanced Composite" -msgstr "Seis Cores Compósito Realçado" +msgstr "Seis Cores Compósito Realçado" -#: src/main/escp2-channels.c:1641 src/main/escp2-channels.c:1655 -#: src/main/escp2-channels.c:1669 src/main/escp2-channels.c:1705 +#: src/main/escp2-channels.c:1655 src/main/escp2-channels.c:1669 +#: src/main/escp2-channels.c:1683 src/main/escp2-channels.c:1719 msgid "Seven Color Photo" msgstr "Foto de Sete Cores" -#: src/main/escp2-channels.c:1691 +#: src/main/escp2-channels.c:1705 msgid "Seven Color Enhanced" -msgstr "Sete Cores Realçado" +msgstr "Sete Cores Realçado" -#: src/main/escp2-channels.c:1728 +#: src/main/escp2-channels.c:1742 #, fuzzy msgid "Eight Color Photo" msgstr "Seis Cores Foto" -#: src/main/escp2-channels.c:1876 src/main/escp2-channels.c:1888 -#: src/main/escp2-channels.c:1894 +#: src/main/escp2-channels.c:1890 src/main/escp2-channels.c:1902 +#: src/main/escp2-channels.c:1908 #, fuzzy msgid "One Color Raw" msgstr "Foto de Sete Cores" -#: src/main/escp2-channels.c:1900 +#: src/main/escp2-channels.c:1914 #, fuzzy msgid "One Color Raw Enhanced Gloss" -msgstr "Sete Cores Realçado" +msgstr "Sete Cores Realçado" -#: src/main/escp2-channels.c:1913 src/main/escp2-channels.c:1925 +#: src/main/escp2-channels.c:1927 src/main/escp2-channels.c:1939 #, fuzzy msgid "Two Color Raw" msgstr "Quatro Cores Standard" -#: src/main/escp2-channels.c:1939 src/main/escp2-channels.c:1953 -#: src/main/escp2-channels.c:1980 src/main/escp2-channels.c:1993 -#: src/main/escp2-channels.c:2006 src/main/escp2-channels.c:2019 -#: src/main/escp2-channels.c:2033 src/main/escp2-channels.c:2047 -#: src/main/escp2-channels.c:2060 +#: src/main/escp2-channels.c:1953 src/main/escp2-channels.c:1967 +#: src/main/escp2-channels.c:1994 src/main/escp2-channels.c:2007 +#: src/main/escp2-channels.c:2020 src/main/escp2-channels.c:2033 +#: src/main/escp2-channels.c:2047 src/main/escp2-channels.c:2061 +#: src/main/escp2-channels.c:2074 #, fuzzy msgid "Three Color Raw" -msgstr "Três Cores Compósito" +msgstr "Três Cores Compósito" -#: src/main/escp2-channels.c:1967 +#: src/main/escp2-channels.c:1981 #, fuzzy msgid "Three Color Raw Gloss" -msgstr "Três Cores Compósito" +msgstr "Três Cores Compósito" -#: src/main/escp2-channels.c:2067 src/main/escp2-channels.c:2073 -#: src/main/escp2-channels.c:2079 src/main/escp2-channels.c:2085 -#: src/main/escp2-channels.c:2091 src/main/escp2-channels.c:2097 -#: src/main/escp2-channels.c:2103 src/main/escp2-channels.c:2109 -#: src/main/escp2-channels.c:2115 src/main/escp2-channels.c:2121 +#: src/main/escp2-channels.c:2081 src/main/escp2-channels.c:2087 +#: src/main/escp2-channels.c:2093 src/main/escp2-channels.c:2099 +#: src/main/escp2-channels.c:2105 src/main/escp2-channels.c:2111 +#: src/main/escp2-channels.c:2117 src/main/escp2-channels.c:2123 +#: src/main/escp2-channels.c:2129 src/main/escp2-channels.c:2135 +#: src/main/escp2-channels.c:2141 #, fuzzy msgid "Four Color Raw" msgstr "Quatro Cores Standard" -#: src/main/escp2-channels.c:2127 +#: src/main/escp2-channels.c:2147 #, fuzzy msgid "Four Color Raw Gloss" msgstr "Quatro Cores Standard" -#: src/main/escp2-channels.c:2142 src/main/escp2-channels.c:2156 +#: src/main/escp2-channels.c:2162 src/main/escp2-channels.c:2176 #, fuzzy msgid "Five Color Raw" msgstr "Foto de Sete Cores" -#: src/main/escp2-channels.c:2170 src/main/escp2-channels.c:2186 -#: src/main/escp2-channels.c:2192 src/main/escp2-channels.c:2198 -#: src/main/escp2-channels.c:2213 src/main/escp2-channels.c:2234 +#: src/main/escp2-channels.c:2190 src/main/escp2-channels.c:2206 +#: src/main/escp2-channels.c:2212 src/main/escp2-channels.c:2218 +#: src/main/escp2-channels.c:2233 src/main/escp2-channels.c:2254 #, fuzzy msgid "Six Color Raw" msgstr "Seis Cores Foto" -#: src/main/escp2-channels.c:2219 +#: src/main/escp2-channels.c:2239 #, fuzzy msgid "Six Color Enhanced Gloss Raw" -msgstr "Seis Cores Compósito Realçado" +msgstr "Seis Cores Compósito Realçado" -#: src/main/escp2-channels.c:2250 src/main/escp2-channels.c:2265 -#: src/main/escp2-channels.c:2280 +#: src/main/escp2-channels.c:2270 src/main/escp2-channels.c:2285 +#: src/main/escp2-channels.c:2300 #, fuzzy msgid "Seven Color Raw" msgstr "Foto de Sete Cores" -#: src/main/escp2-channels.c:2297 +#: src/main/escp2-channels.c:2317 #, fuzzy msgid "Seven Color Enhanced Gloss Raw" -msgstr "Sete Cores Realçado" +msgstr "Sete Cores Realçado" -#: src/main/escp2-channels.c:2315 +#: src/main/escp2-channels.c:2335 #, fuzzy msgid "Eight Color Raw" msgstr "Seis Cores Foto" -#: src/main/escp2-channels.c:2482 src/main/escp2-channels.c:2495 -#: src/main/escp2-channels.c:2497 src/main/escp2-channels.c:2517 -#: src/main/escp2-channels.c:2520 src/main/escp2-channels.c:2540 -#: src/main/escp2-channels.c:2560 src/main/escp2-channels.c:2580 -#: src/main/escp2-channels.c:2600 src/main/escp2-channels.c:2620 -#: src/main/escp2-channels.c:2636 src/main/escp2-channels.c:2638 -#: src/main/escp2-channels.c:2640 src/main/escp2-channels.c:2642 -#: src/main/escp2-channels.c:2658 src/main/escp2-channels.c:2674 -#: src/main/escp2-channels.c:2694 +#: src/main/escp2-channels.c:2502 src/main/escp2-channels.c:2515 +#: src/main/escp2-channels.c:2517 src/main/escp2-channels.c:2537 +#: src/main/escp2-channels.c:2540 src/main/escp2-channels.c:2560 +#: src/main/escp2-channels.c:2580 src/main/escp2-channels.c:2600 +#: src/main/escp2-channels.c:2620 src/main/escp2-channels.c:2640 +#: src/main/escp2-channels.c:2656 src/main/escp2-channels.c:2658 +#: src/main/escp2-channels.c:2660 src/main/escp2-channels.c:2662 +#: src/main/escp2-channels.c:2678 src/main/escp2-channels.c:2694 +#: src/main/escp2-channels.c:2714 msgid "EPSON Standard Inks" msgstr "" -#: src/main/escp2-channels.c:2714 src/main/escp2-channels.c:2739 +#: src/main/escp2-channels.c:2734 src/main/escp2-channels.c:2759 #, fuzzy msgid "UltraChrome Photo Black" msgstr "Seis Cores Foto" -#: src/main/escp2-channels.c:2718 src/main/escp2-channels.c:2743 +#: src/main/escp2-channels.c:2738 src/main/escp2-channels.c:2763 msgid "UltraChrome Matte Black" msgstr "" -#: src/main/escp2-channels.c:2758 src/main/escp2-channels.c:2796 -#: src/main/escp2-channels.c:3167 src/escputil/escputil.c:976 +#: src/main/escp2-channels.c:2778 src/main/escp2-channels.c:2816 +#: src/main/escp2-channels.c:3206 src/escputil/escputil.c:976 #, fuzzy msgid "Photo Black" msgstr "Papel de Fotografia" -#: src/main/escp2-channels.c:2762 src/main/escp2-channels.c:2778 -#: src/main/escp2-channels.c:3166 src/escputil/escputil.c:986 +#: src/main/escp2-channels.c:2782 src/main/escp2-channels.c:2798 +#: src/main/escp2-channels.c:3205 src/escputil/escputil.c:986 #, fuzzy msgid "Matte Black" msgstr "Papel Mate" -#: src/main/escp2-channels.c:3092 src/main/escp2-channels.c:3102 -#: src/main/escp2-channels.c:3114 src/main/escp2-channels.c:3128 -#: src/main/escp2-channels.c:3141 src/main/escp2-channels.c:3154 -#: src/main/escp2-channels.c:3191 src/escputil/escputil.c:981 +#: src/main/escp2-channels.c:3131 src/main/escp2-channels.c:3141 +#: src/main/escp2-channels.c:3153 src/main/escp2-channels.c:3167 +#: src/main/escp2-channels.c:3180 src/main/escp2-channels.c:3193 +#: src/main/escp2-channels.c:3240 src/escputil/escputil.c:981 #: src/escputil/escputil.c:1204 #, fuzzy msgid "Light Cyan" msgstr "Ciano Claro" -#: src/main/escp2-channels.c:3093 src/main/escp2-channels.c:3104 -#: src/main/escp2-channels.c:3115 src/main/escp2-channels.c:3129 -#: src/main/escp2-channels.c:3142 src/main/escp2-channels.c:3155 -#: src/main/escp2-channels.c:3190 src/escputil/escputil.c:982 +#: src/main/escp2-channels.c:3132 src/main/escp2-channels.c:3143 +#: src/main/escp2-channels.c:3154 src/main/escp2-channels.c:3168 +#: src/main/escp2-channels.c:3181 src/main/escp2-channels.c:3194 +#: src/main/escp2-channels.c:3239 src/escputil/escputil.c:982 #: src/escputil/escputil.c:1205 #, fuzzy msgid "Light Magenta" msgstr "Magenta Claro" -#: src/main/escp2-channels.c:3130 src/main/escp2-channels.c:3192 +#: src/main/escp2-channels.c:3169 src/main/escp2-channels.c:3241 #: src/escputil/escputil.c:985 #, fuzzy msgid "Light Black" msgstr "Preto" -#: src/main/escp2-channels.c:3143 +#: src/main/escp2-channels.c:3182 #, fuzzy msgid "Dark Yellow" msgstr "Amarelo" -#: src/main/escp2-channels.c:3170 src/escputil/escputil.c:989 +#: src/main/escp2-channels.c:3209 src/escputil/escputil.c:989 #, fuzzy msgid "Gloss Optimizer" msgstr "Filme Lustroso" -#: src/main/escp2-channels.c:3189 src/escputil/escputil.c:990 +#: src/main/escp2-channels.c:3238 src/escputil/escputil.c:990 #, fuzzy msgid "Light Light Black" msgstr "Preto" -#: src/main/escp2-papers.c:1343 src/main/escp2-papers.c:1387 -#: src/main/escp2-papers.c:1431 src/main/escp2-papers.c:1479 -#: src/main/escp2-papers.c:1527 src/main/escp2-papers.c:1571 +#: src/main/escp2-papers.c:1353 src/main/escp2-papers.c:1397 +#: src/main/escp2-papers.c:1441 src/main/escp2-papers.c:1489 +#: src/main/escp2-papers.c:1537 src/main/escp2-papers.c:1581 msgid "Plain Paper Fast Load" -msgstr "Papel Normal Carregação Rápida" +msgstr "Papel Normal Carregação Rápida" -#: src/main/escp2-papers.c:1345 src/main/escp2-papers.c:1389 -#: src/main/escp2-papers.c:1433 src/main/escp2-papers.c:1481 -#: src/main/escp2-papers.c:1529 src/main/escp2-papers.c:1573 +#: src/main/escp2-papers.c:1355 src/main/escp2-papers.c:1399 +#: src/main/escp2-papers.c:1443 src/main/escp2-papers.c:1491 +#: src/main/escp2-papers.c:1539 src/main/escp2-papers.c:1583 #: src/main/xmli18n-tmp.h:5 msgid "Postcard" -msgstr "Cartão" +msgstr "Cartão" -#: src/main/escp2-papers.c:1353 src/main/escp2-papers.c:1397 -#: src/main/escp2-papers.c:1441 src/main/escp2-papers.c:1489 -#: src/main/escp2-papers.c:1537 src/main/escp2-papers.c:1581 +#: src/main/escp2-papers.c:1363 src/main/escp2-papers.c:1407 +#: src/main/escp2-papers.c:1451 src/main/escp2-papers.c:1499 +#: src/main/escp2-papers.c:1547 src/main/escp2-papers.c:1591 msgid "Back Light Film" -msgstr "Película" +msgstr "Película" -#: src/main/escp2-papers.c:1357 src/main/escp2-papers.c:1401 -#: src/main/escp2-papers.c:1445 src/main/escp2-papers.c:1493 -#: src/main/escp2-papers.c:1541 src/main/escp2-papers.c:1585 +#: src/main/escp2-papers.c:1367 src/main/escp2-papers.c:1411 +#: src/main/escp2-papers.c:1455 src/main/escp2-papers.c:1503 +#: src/main/escp2-papers.c:1551 src/main/escp2-papers.c:1595 #, fuzzy msgid "Matte Paper Heavyweight" msgstr "Papel Mate" -#: src/main/escp2-papers.c:1367 src/main/escp2-papers.c:1411 -#: src/main/escp2-papers.c:1455 src/main/escp2-papers.c:1503 -#: src/main/escp2-papers.c:1551 src/main/escp2-papers.c:1595 +#: src/main/escp2-papers.c:1377 src/main/escp2-papers.c:1421 +#: src/main/escp2-papers.c:1465 src/main/escp2-papers.c:1513 +#: src/main/escp2-papers.c:1561 src/main/escp2-papers.c:1605 #, fuzzy msgid "Premium Semigloss Photo Paper" msgstr "Papel de Fotografia Lustroso Premium" -#: src/main/escp2-papers.c:1375 src/main/escp2-papers.c:1419 -#: src/main/escp2-papers.c:1467 src/main/escp2-papers.c:1515 -#: src/main/escp2-papers.c:1559 src/main/escp2-papers.c:1607 +#: src/main/escp2-papers.c:1385 src/main/escp2-papers.c:1429 +#: src/main/escp2-papers.c:1477 src/main/escp2-papers.c:1525 +#: src/main/escp2-papers.c:1569 src/main/escp2-papers.c:1617 #, fuzzy msgid "ColorLife Paper" msgstr "Papel ColorLife" -#: src/main/escp2-papers.c:1459 src/main/escp2-papers.c:1507 -#: src/main/escp2-papers.c:1599 +#: src/main/escp2-papers.c:1469 src/main/escp2-papers.c:1517 +#: src/main/escp2-papers.c:1609 #, fuzzy msgid "Archival Matte Paper" msgstr "Papel Mate" -#: src/main/escp2-papers.c:1461 src/main/escp2-papers.c:1509 -#: src/main/escp2-papers.c:1601 +#: src/main/escp2-papers.c:1471 src/main/escp2-papers.c:1519 +#: src/main/escp2-papers.c:1611 msgid "Watercolor Paper - Radiant White" msgstr "" -#: src/main/escp2-papers.c:1716 src/main/escp2-papers.c:1842 -#: src/main/escp2-papers.c:1884 src/main/escp2-papers.c:1926 -#: src/main/escp2-papers.c:2001 +#: src/main/escp2-papers.c:1727 src/main/escp2-papers.c:1853 +#: src/main/escp2-papers.c:1895 src/main/escp2-papers.c:1937 +#: src/main/escp2-papers.c:2012 msgid "Roll Feed" -msgstr "Rolo de Alimentação" +msgstr "Rolo de Alimentação" -#: src/main/escp2-papers.c:1740 src/main/escp2-papers.c:1791 +#: src/main/escp2-papers.c:1751 src/main/escp2-papers.c:1802 msgid "Roll Feed (cut each page)" msgstr "" -#: src/main/escp2-papers.c:1749 src/main/escp2-papers.c:1800 +#: src/main/escp2-papers.c:1760 src/main/escp2-papers.c:1811 msgid "Roll Feed (do not cut)" msgstr "" -#: src/main/escp2-papers.c:1773 src/main/escp2-papers.c:1824 +#: src/main/escp2-papers.c:1784 src/main/escp2-papers.c:1835 #, fuzzy msgid "Manual Feed" msgstr "Manual" -#: src/main/escp2-papers.c:1782 src/main/escp2-papers.c:1833 -#: src/main/escp2-papers.c:1935 src/main/escp2-papers.c:1968 +#: src/main/escp2-papers.c:1793 src/main/escp2-papers.c:1844 +#: src/main/escp2-papers.c:1946 src/main/escp2-papers.c:1979 #, fuzzy msgid "Print to CD" msgstr "Imprimir para o Ficheiro?" -#: src/main/escp2-papers.c:1866 src/main/escp2-papers.c:1908 +#: src/main/escp2-papers.c:1877 src/main/escp2-papers.c:1919 #, fuzzy msgid "Manual Sheet Guide" msgstr "Manual" -#: src/main/escp2-papers.c:1875 src/main/escp2-papers.c:1917 +#: src/main/escp2-papers.c:1886 src/main/escp2-papers.c:1928 #, fuzzy msgid "Manual Feed (Front)" msgstr "Manual" -#: src/main/escp2-papers.c:1950 +#: src/main/escp2-papers.c:1961 #, fuzzy msgid "Rear Tray" msgstr "Tabuleiro" -#: src/main/escp2-papers.c:1959 +#: src/main/escp2-papers.c:1970 msgid "Front Tray" msgstr "" -#: src/main/escp2-papers.c:1977 +#: src/main/escp2-papers.c:1988 #, fuzzy msgid "Photo Board" msgstr "Papel de Fotografia" -#: src/main/escp2-papers.c:2016 +#: src/main/escp2-papers.c:2027 msgid "Cut Sheet Bin 1" msgstr "" -#: src/main/escp2-papers.c:2025 +#: src/main/escp2-papers.c:2036 msgid "Cut Sheet Bin 2" msgstr "" -#: src/main/escp2-papers.c:2034 +#: src/main/escp2-papers.c:2045 #, fuzzy msgid "Cut Sheet Autoselect" msgstr "Auto Seleccionar" -#: src/main/escp2-papers.c:2043 +#: src/main/escp2-papers.c:2054 msgid "Manual Selection" msgstr "" @@ -2054,7 +2222,7 @@ msgstr "" #: src/main/escp2-resolutions.c:40 src/main/escp2-resolutions.c:43 #, fuzzy msgid "360 x 120 DPI Economy" -msgstr "600x600 DPI monocromático" +msgstr "600x600 DPI monocromático" #: src/main/escp2-resolutions.c:47 src/main/escp2-resolutions.c:50 msgid "180 DPI Economy" @@ -2104,7 +2272,7 @@ msgstr "1200 DPI alta qualidade" #: src/main/escp2-resolutions.c:103 #, fuzzy msgid "720 DPI Highest Quality" -msgstr "1200 DPI qualidade máxima" +msgstr "1200 DPI qualidade máxima" #: src/main/escp2-resolutions.c:106 #, fuzzy @@ -2120,7 +2288,7 @@ msgstr "1440 x 720 DPI" #: src/main/escp2-resolutions.c:116 #, fuzzy msgid "1440 x 720 DPI Highest Quality" -msgstr "1440 x 360 DPI Máxima Qualidade" +msgstr "1440 x 360 DPI Máxima Qualidade" #: src/main/escp2-resolutions.c:119 src/main/escp2-resolutions.c:122 #, fuzzy @@ -2135,7 +2303,7 @@ msgstr "2880 x 720 DPI" #: src/main/escp2-resolutions.c:135 #, fuzzy msgid "2880 x 720 DPI Highest Quality" -msgstr "1440 x 360 DPI Máxima Qualidade" +msgstr "1440 x 360 DPI Máxima Qualidade" #: src/main/escp2-resolutions.c:139 src/main/escp2-resolutions.c:142 #: src/main/escp2-resolutions.c:145 @@ -2205,46 +2373,52 @@ msgid "Eight Pass" msgstr "Brilho:" #: src/main/escp2-resolutions.c:637 src/main/escp2-resolutions.c:652 -#: src/main/generic-options.c:33 +#: src/main/escp2-resolutions.c:667 src/main/generic-options.c:33 msgid "Fast Economy" msgstr "" #: src/main/escp2-resolutions.c:638 src/main/escp2-resolutions.c:653 -#: src/main/generic-options.c:34 +#: src/main/escp2-resolutions.c:668 src/main/generic-options.c:34 msgid "Economy" msgstr "" #: src/main/escp2-resolutions.c:639 src/main/escp2-resolutions.c:654 -#: src/main/escp2-resolutions.c:667 src/main/generic-options.c:35 +#: src/main/escp2-resolutions.c:669 src/main/escp2-resolutions.c:682 +#: src/main/generic-options.c:35 msgid "Draft" msgstr "" #: src/main/escp2-resolutions.c:641 src/main/escp2-resolutions.c:656 -#: src/main/escp2-resolutions.c:670 src/main/generic-options.c:37 +#: src/main/escp2-resolutions.c:671 src/main/escp2-resolutions.c:685 +#: src/main/generic-options.c:37 #, fuzzy msgid "High" msgstr "Altura" #: src/main/escp2-resolutions.c:642 src/main/escp2-resolutions.c:657 -#: src/main/escp2-resolutions.c:669 src/main/generic-options.c:38 +#: src/main/escp2-resolutions.c:672 src/main/escp2-resolutions.c:684 +#: src/main/generic-options.c:38 #, fuzzy msgid "Photo" msgstr "Fotografia" #: src/main/escp2-resolutions.c:643 src/main/escp2-resolutions.c:658 -#: src/main/escp2-resolutions.c:671 src/main/generic-options.c:39 +#: src/main/escp2-resolutions.c:673 src/main/escp2-resolutions.c:686 +#: src/main/generic-options.c:39 #, fuzzy msgid "Super Photo" msgstr "Stylus Photo" #: src/main/escp2-resolutions.c:644 src/main/escp2-resolutions.c:659 -#: src/main/escp2-resolutions.c:672 src/main/generic-options.c:40 +#: src/main/escp2-resolutions.c:674 src/main/escp2-resolutions.c:687 +#: src/main/generic-options.c:40 #, fuzzy msgid "Ultra Photo" msgstr "Seis Cores Foto" #: src/main/escp2-resolutions.c:645 src/main/escp2-resolutions.c:660 -#: src/main/escp2-resolutions.c:673 src/main/generic-options.c:41 +#: src/main/escp2-resolutions.c:675 src/main/escp2-resolutions.c:688 +#: src/main/generic-options.c:41 msgid "Best" msgstr "" @@ -2327,4367 +2501,4621 @@ msgid "3x5" msgstr "3x5" #: src/main/xmli18n-tmp.h:10 +msgid "3 1/2 x5" +msgstr "" + +#: src/main/xmli18n-tmp.h:11 msgid "4x6" msgstr "4x6" -#: src/main/xmli18n-tmp.h:11 +#: src/main/xmli18n-tmp.h:12 #, fuzzy msgid "Epson 4x6 Photo Paper (tear-off borders)" msgstr "Papel de Fotografia Epson 4x6" -#: src/main/xmli18n-tmp.h:12 +#: src/main/xmli18n-tmp.h:13 msgid "5x7" msgstr "5x7" -#: src/main/xmli18n-tmp.h:13 +#: src/main/xmli18n-tmp.h:14 msgid "5x8" msgstr "5x8" -#: src/main/xmli18n-tmp.h:14 +#: src/main/xmli18n-tmp.h:15 msgid "6x8" msgstr "6x8" -#: src/main/xmli18n-tmp.h:15 +#: src/main/xmli18n-tmp.h:16 msgid "8x10" msgstr "8x10" -#: src/main/xmli18n-tmp.h:17 +#: src/main/xmli18n-tmp.h:18 msgid "12x18" msgstr "12x8" -#: src/main/xmli18n-tmp.h:18 +#: src/main/xmli18n-tmp.h:19 msgid "Super B 13x19" msgstr "Super B 13x19" -#: src/main/xmli18n-tmp.h:19 +#: src/main/xmli18n-tmp.h:20 msgid "Engineering C 17x22" msgstr "" -#: src/main/xmli18n-tmp.h:20 +#: src/main/xmli18n-tmp.h:21 msgid "8x12" msgstr "8x12" -#: src/main/xmli18n-tmp.h:21 +#: src/main/xmli18n-tmp.h:22 msgid "11x14" msgstr "11x14" -#: src/main/xmli18n-tmp.h:22 +#: src/main/xmli18n-tmp.h:23 msgid "16x20" msgstr "16x20" -#: src/main/xmli18n-tmp.h:23 +#: src/main/xmli18n-tmp.h:24 msgid "16x24" msgstr "16x24" -#: src/main/xmli18n-tmp.h:24 +#: src/main/xmli18n-tmp.h:25 msgid "20x24" msgstr "20x24" -#: src/main/xmli18n-tmp.h:25 +#: src/main/xmli18n-tmp.h:26 msgid "20x30" msgstr "20x30" -#: src/main/xmli18n-tmp.h:26 +#: src/main/xmli18n-tmp.h:27 #, fuzzy msgid "22x30" msgstr "20x30" -#: src/main/xmli18n-tmp.h:27 +#: src/main/xmli18n-tmp.h:28 msgid "24x30" msgstr "24x30" -#: src/main/xmli18n-tmp.h:28 +#: src/main/xmli18n-tmp.h:29 msgid "Super A1 24x36" msgstr "" -#: src/main/xmli18n-tmp.h:29 +#: src/main/xmli18n-tmp.h:30 msgid "30x40" msgstr "30x40" -#: src/main/xmli18n-tmp.h:30 +#: src/main/xmli18n-tmp.h:31 msgid "4A" msgstr "4A" -#: src/main/xmli18n-tmp.h:31 +#: src/main/xmli18n-tmp.h:32 msgid "2A" msgstr "2A" -#: src/main/xmli18n-tmp.h:32 +#: src/main/xmli18n-tmp.h:33 #, fuzzy msgid "Super A0" msgstr "Stylus Photo" -#: src/main/xmli18n-tmp.h:33 +#: src/main/xmli18n-tmp.h:34 msgid "A0" msgstr "A0" -#: src/main/xmli18n-tmp.h:34 +#: src/main/xmli18n-tmp.h:35 msgid "A1" msgstr "A1" -#: src/main/xmli18n-tmp.h:35 +#: src/main/xmli18n-tmp.h:36 msgid "A2" msgstr "A2" -#: src/main/xmli18n-tmp.h:36 +#: src/main/xmli18n-tmp.h:37 msgid "A3" msgstr "A3" -#: src/main/xmli18n-tmp.h:37 +#: src/main/xmli18n-tmp.h:38 msgid "A4" msgstr "A4" -#: src/main/xmli18n-tmp.h:38 +#: src/main/xmli18n-tmp.h:39 msgid "A5" msgstr "A5" -#: src/main/xmli18n-tmp.h:39 +#: src/main/xmli18n-tmp.h:40 msgid "A6" msgstr "A6" -#: src/main/xmli18n-tmp.h:40 +#: src/main/xmli18n-tmp.h:41 msgid "A7" msgstr "A7" -#: src/main/xmli18n-tmp.h:41 +#: src/main/xmli18n-tmp.h:42 msgid "A8" msgstr "A8" -#: src/main/xmli18n-tmp.h:42 +#: src/main/xmli18n-tmp.h:43 msgid "A9" msgstr "A9" -#: src/main/xmli18n-tmp.h:43 +#: src/main/xmli18n-tmp.h:44 msgid "A10" msgstr "A10" -#: src/main/xmli18n-tmp.h:44 +#: src/main/xmli18n-tmp.h:45 msgid "RA0" msgstr "RA0" -#: src/main/xmli18n-tmp.h:45 +#: src/main/xmli18n-tmp.h:46 msgid "RA1" msgstr "RA1" -#: src/main/xmli18n-tmp.h:46 +#: src/main/xmli18n-tmp.h:47 msgid "RA2" msgstr "RA2" -#: src/main/xmli18n-tmp.h:47 +#: src/main/xmli18n-tmp.h:48 msgid "RA3" msgstr "RA3" -#: src/main/xmli18n-tmp.h:48 +#: src/main/xmli18n-tmp.h:49 msgid "RA4" msgstr "RA4" -#: src/main/xmli18n-tmp.h:49 +#: src/main/xmli18n-tmp.h:50 msgid "SRA0" msgstr "SRA0" -#: src/main/xmli18n-tmp.h:50 +#: src/main/xmli18n-tmp.h:51 msgid "SRA1" msgstr "SRA1" -#: src/main/xmli18n-tmp.h:51 +#: src/main/xmli18n-tmp.h:52 msgid "SRA2" msgstr "SRA2" -#: src/main/xmli18n-tmp.h:52 +#: src/main/xmli18n-tmp.h:53 msgid "SRA3" msgstr "SRA3" -#: src/main/xmli18n-tmp.h:53 +#: src/main/xmli18n-tmp.h:54 msgid "SRA4" msgstr "SRA4" -#: src/main/xmli18n-tmp.h:54 +#: src/main/xmli18n-tmp.h:55 msgid "4B ISO" msgstr "4B ISO" -#: src/main/xmli18n-tmp.h:55 +#: src/main/xmli18n-tmp.h:56 msgid "2B ISO" msgstr "2B ISO" -#: src/main/xmli18n-tmp.h:56 +#: src/main/xmli18n-tmp.h:57 msgid "B0 ISO" msgstr "B0 ISO" -#: src/main/xmli18n-tmp.h:57 +#: src/main/xmli18n-tmp.h:58 msgid "B1 ISO" msgstr "B1 ISO" -#: src/main/xmli18n-tmp.h:58 +#: src/main/xmli18n-tmp.h:59 msgid "B2 ISO" msgstr "B2 ISO" -#: src/main/xmli18n-tmp.h:59 +#: src/main/xmli18n-tmp.h:60 msgid "B3 ISO" msgstr "B3 ISO" -#: src/main/xmli18n-tmp.h:60 +#: src/main/xmli18n-tmp.h:61 msgid "B4 ISO" msgstr "B4 ISO" -#: src/main/xmli18n-tmp.h:61 +#: src/main/xmli18n-tmp.h:62 msgid "B5 ISO" msgstr "B5 ISO" -#: src/main/xmli18n-tmp.h:62 +#: src/main/xmli18n-tmp.h:63 msgid "B6 ISO" msgstr "B6 ISO" -#: src/main/xmli18n-tmp.h:63 +#: src/main/xmli18n-tmp.h:64 msgid "B7 ISO" msgstr "B7 ISO" -#: src/main/xmli18n-tmp.h:64 +#: src/main/xmli18n-tmp.h:65 msgid "B8 ISO" msgstr "B8 ISO" -#: src/main/xmli18n-tmp.h:65 +#: src/main/xmli18n-tmp.h:66 msgid "B9 ISO" msgstr "B9 ISO" -#: src/main/xmli18n-tmp.h:66 +#: src/main/xmli18n-tmp.h:67 msgid "B10 ISO" msgstr "B10 ISO" -#: src/main/xmli18n-tmp.h:67 +#: src/main/xmli18n-tmp.h:68 #, fuzzy msgid "Super B0 JIS" msgstr "B0 JIS" -#: src/main/xmli18n-tmp.h:68 +#: src/main/xmli18n-tmp.h:69 msgid "B0 JIS" msgstr "B0 JIS" -#: src/main/xmli18n-tmp.h:69 +#: src/main/xmli18n-tmp.h:70 msgid "B1 JIS" msgstr "B1 JIS" -#: src/main/xmli18n-tmp.h:70 +#: src/main/xmli18n-tmp.h:71 msgid "B2 JIS" msgstr "B2 JIS" -#: src/main/xmli18n-tmp.h:71 +#: src/main/xmli18n-tmp.h:72 msgid "B3 JIS" msgstr "B3 JIS" -#: src/main/xmli18n-tmp.h:72 +#: src/main/xmli18n-tmp.h:73 msgid "B4 JIS" msgstr "B4 JIS" -#: src/main/xmli18n-tmp.h:73 +#: src/main/xmli18n-tmp.h:74 msgid "B5 JIS" msgstr "B5 JIS" -#: src/main/xmli18n-tmp.h:74 +#: src/main/xmli18n-tmp.h:75 msgid "B6 JIS" msgstr "B6 JIs" -#: src/main/xmli18n-tmp.h:75 +#: src/main/xmli18n-tmp.h:76 msgid "B7 JIS" msgstr "B7 JIS" -#: src/main/xmli18n-tmp.h:76 +#: src/main/xmli18n-tmp.h:77 msgid "B8 JIS" msgstr "B8 JIS" -#: src/main/xmli18n-tmp.h:77 +#: src/main/xmli18n-tmp.h:78 msgid "B9 JIS" msgstr "B9 JIS" -#: src/main/xmli18n-tmp.h:78 +#: src/main/xmli18n-tmp.h:79 msgid "B10 JIS" msgstr "B10 JIS" -#: src/main/xmli18n-tmp.h:79 +#: src/main/xmli18n-tmp.h:80 msgid "C0" msgstr "C0" -#: src/main/xmli18n-tmp.h:80 +#: src/main/xmli18n-tmp.h:81 +#, fuzzy +msgid "C0 landscape" +msgstr "Paisagem" + +#: src/main/xmli18n-tmp.h:82 msgid "C1" msgstr "C1" -#: src/main/xmli18n-tmp.h:81 +#: src/main/xmli18n-tmp.h:83 +#, fuzzy +msgid "C1 landscape" +msgstr "Paisagem" + +#: src/main/xmli18n-tmp.h:84 msgid "C2" msgstr "C2" -#: src/main/xmli18n-tmp.h:82 +#: src/main/xmli18n-tmp.h:85 +#, fuzzy +msgid "C2 landscape" +msgstr "Paisagem" + +#: src/main/xmli18n-tmp.h:86 msgid "C3" msgstr "C3" -#: src/main/xmli18n-tmp.h:83 +#: src/main/xmli18n-tmp.h:87 +#, fuzzy +msgid "C3 landscape" +msgstr "Paisagem" + +#: src/main/xmli18n-tmp.h:88 msgid "C4" msgstr "C4" -#: src/main/xmli18n-tmp.h:84 +#: src/main/xmli18n-tmp.h:89 +#, fuzzy +msgid "C4 landscape" +msgstr "Paisagem" + +#: src/main/xmli18n-tmp.h:90 msgid "C5" msgstr "C5" -#: src/main/xmli18n-tmp.h:85 +#: src/main/xmli18n-tmp.h:91 +#, fuzzy +msgid "C5 landscape" +msgstr "Paisagem" + +#: src/main/xmli18n-tmp.h:92 msgid "B6-C4" msgstr "B6-C4" -#: src/main/xmli18n-tmp.h:86 +#: src/main/xmli18n-tmp.h:93 +#, fuzzy +msgid "B6-C4 landscape" +msgstr "Paisagem" + +#: src/main/xmli18n-tmp.h:94 msgid "C6" msgstr "C6" -#: src/main/xmli18n-tmp.h:87 +#: src/main/xmli18n-tmp.h:95 +#, fuzzy +msgid "C6 landscape" +msgstr "Paisagem" + +#: src/main/xmli18n-tmp.h:96 msgid "DL" msgstr "DL" -#: src/main/xmli18n-tmp.h:88 +#: src/main/xmli18n-tmp.h:97 +#, fuzzy +msgid "DL landscape" +msgstr "Paisagem" + +#: src/main/xmli18n-tmp.h:98 msgid "C7-6" msgstr "C7-6" -#: src/main/xmli18n-tmp.h:89 +#: src/main/xmli18n-tmp.h:99 +#, fuzzy +msgid "C7-6 landscape" +msgstr "Paisagem" + +#: src/main/xmli18n-tmp.h:100 msgid "C7" msgstr "C7" -#: src/main/xmli18n-tmp.h:90 +#: src/main/xmli18n-tmp.h:101 +#, fuzzy +msgid "C7 landscape" +msgstr "Paisagem" + +#: src/main/xmli18n-tmp.h:102 msgid "C8" msgstr "C8" -#: src/main/xmli18n-tmp.h:91 +#: src/main/xmli18n-tmp.h:103 +#, fuzzy +msgid "C8 landscape" +msgstr "Paisagem" + +#: src/main/xmli18n-tmp.h:104 msgid "C9" msgstr "C9" -#: src/main/xmli18n-tmp.h:92 +#: src/main/xmli18n-tmp.h:105 +#, fuzzy +msgid "C9 landscape" +msgstr "Paisagem" + +#: src/main/xmli18n-tmp.h:106 msgid "C10" msgstr "C10" -#: src/main/xmli18n-tmp.h:93 +#: src/main/xmli18n-tmp.h:107 +#, fuzzy +msgid "C10 landscape" +msgstr "Paisagem" + +#: src/main/xmli18n-tmp.h:108 msgid "ArchA" msgstr "ArchA" -#: src/main/xmli18n-tmp.h:94 +#: src/main/xmli18n-tmp.h:109 msgid "ArchA transposed" msgstr "" -#: src/main/xmli18n-tmp.h:95 +#: src/main/xmli18n-tmp.h:110 msgid "ArchB" msgstr "ArchB" -#: src/main/xmli18n-tmp.h:96 +#: src/main/xmli18n-tmp.h:111 msgid "ArchB transposed" msgstr "" -#: src/main/xmli18n-tmp.h:97 +#: src/main/xmli18n-tmp.h:112 msgid "ArchC" msgstr "ArchC" -#: src/main/xmli18n-tmp.h:98 +#: src/main/xmli18n-tmp.h:113 msgid "ArchC transposed" msgstr "" -#: src/main/xmli18n-tmp.h:99 +#: src/main/xmli18n-tmp.h:114 msgid "ArchD" msgstr "ArchD" -#: src/main/xmli18n-tmp.h:100 +#: src/main/xmli18n-tmp.h:115 msgid "ArchD transposed" msgstr "" -#: src/main/xmli18n-tmp.h:101 +#: src/main/xmli18n-tmp.h:116 msgid "ArchE" msgstr "ArchE" -#: src/main/xmli18n-tmp.h:102 +#: src/main/xmli18n-tmp.h:117 msgid "ArchE transposed" msgstr "" -#: src/main/xmli18n-tmp.h:103 +#: src/main/xmli18n-tmp.h:118 msgid "American foolscap" msgstr "Papel Ministro Americano" -#: src/main/xmli18n-tmp.h:104 +#: src/main/xmli18n-tmp.h:119 msgid "European foolscap" msgstr "Papel Ministro Europeu" -#: src/main/xmli18n-tmp.h:105 +#: src/main/xmli18n-tmp.h:120 msgid "Crown Quarto" msgstr "Crown Quarto" -#: src/main/xmli18n-tmp.h:106 +#: src/main/xmli18n-tmp.h:121 msgid "Large Crown Quarto" msgstr "Crown Quarto Grande" -#: src/main/xmli18n-tmp.h:107 +#: src/main/xmli18n-tmp.h:122 msgid "Demy Quarto" msgstr "Demy Quarto" -#: src/main/xmli18n-tmp.h:108 +#: src/main/xmli18n-tmp.h:123 msgid "Royal Quarto" msgstr "Royal Quarto" -#: src/main/xmli18n-tmp.h:109 +#: src/main/xmli18n-tmp.h:124 #, fuzzy msgid "ISO A4" msgstr "SRA4" -#: src/main/xmli18n-tmp.h:110 +#: src/main/xmli18n-tmp.h:125 msgid "Crown Octavo" msgstr "Crown Octavo" -#: src/main/xmli18n-tmp.h:111 +#: src/main/xmli18n-tmp.h:126 msgid "Large Crown Octavo" msgstr "Crown Octavo Grande" -#: src/main/xmli18n-tmp.h:112 +#: src/main/xmli18n-tmp.h:127 msgid "Demy Octavo" msgstr "Demy Octavo" -#: src/main/xmli18n-tmp.h:113 +#: src/main/xmli18n-tmp.h:128 msgid "Royal Octavo" msgstr "Royal Octavo" -#: src/main/xmli18n-tmp.h:114 +#: src/main/xmli18n-tmp.h:129 msgid "ISO A5" msgstr "" -#: src/main/xmli18n-tmp.h:115 +#: src/main/xmli18n-tmp.h:130 msgid "Small paperback" msgstr "Pequena Brochura" -#: src/main/xmli18n-tmp.h:116 +#: src/main/xmli18n-tmp.h:131 msgid "Penguin small paperback" msgstr "Pequena Brochura Pinguim" -#: src/main/xmli18n-tmp.h:117 +#: src/main/xmli18n-tmp.h:132 msgid "Penguin large paperback" msgstr "Grande Brochura Pinguim" -#: src/main/xmli18n-tmp.h:118 +#: src/main/xmli18n-tmp.h:133 msgid "10cm x 15cm" msgstr "" -#: src/main/xmli18n-tmp.h:119 +#: src/main/xmli18n-tmp.h:134 msgid "Hagaki Card" -msgstr "Cartão Hagaki" +msgstr "Cartão Hagaki" -#: src/main/xmli18n-tmp.h:120 +#: src/main/xmli18n-tmp.h:135 msgid "Oufuku Card" -msgstr "Cartão Oufuku" +msgstr "Cartão Oufuku" -#: src/main/xmli18n-tmp.h:121 +#: src/main/xmli18n-tmp.h:136 msgid "Japanese long envelope #3" -msgstr "Envelope longo Japonês #3" +msgstr "Envelope longo Japonês #3" -#: src/main/xmli18n-tmp.h:122 +#: src/main/xmli18n-tmp.h:137 +#, fuzzy +msgid "Japanese long envelope #3 landscape" +msgstr "Envelope longo Japonês #3" + +#: src/main/xmli18n-tmp.h:138 msgid "Japanese long envelope #4" -msgstr "Envelope longo Japonês #4" +msgstr "Envelope longo Japonês #4" -#: src/main/xmli18n-tmp.h:123 +#: src/main/xmli18n-tmp.h:139 +#, fuzzy +msgid "Japanese long envelope #4 landscape" +msgstr "Envelope longo Japonês #4" + +#: src/main/xmli18n-tmp.h:140 msgid "Japanese Kaku envelope #4" -msgstr "Evelope Kaku Japonês #4" +msgstr "Evelope Kaku Japonês #4" -#: src/main/xmli18n-tmp.h:124 +#: src/main/xmli18n-tmp.h:141 +#, fuzzy +msgid "Japanese Kaku envelope #4 landscape" +msgstr "Evelope Kaku Japonês #4" + +#: src/main/xmli18n-tmp.h:142 msgid "Commercial 10" msgstr "Comercial 10" -#: src/main/xmli18n-tmp.h:125 +#: src/main/xmli18n-tmp.h:143 +#, fuzzy +msgid "Commercial 10 landscape" +msgstr "Comercial 10" + +#: src/main/xmli18n-tmp.h:144 msgid "A2 Invitation" msgstr "Convite A2" -#: src/main/xmli18n-tmp.h:126 +#: src/main/xmli18n-tmp.h:145 msgid "Monarch Envelope" msgstr "Envelope Monarca" -#: src/main/xmli18n-tmp.h:127 +#: src/main/xmli18n-tmp.h:146 +#, fuzzy +msgid "Monarch Envelope landscape" +msgstr "Envelope Monarca" + +#: src/main/xmli18n-tmp.h:147 msgid "4x5 3/8" msgstr "" -#: src/main/xmli18n-tmp.h:128 +#: src/main/xmli18n-tmp.h:148 #, fuzzy msgid "4x7" msgstr "5x7" -#: src/main/xmli18n-tmp.h:129 +#: src/main/xmli18n-tmp.h:149 msgid "CP_L" msgstr "" -#: src/main/xmli18n-tmp.h:130 +#: src/main/xmli18n-tmp.h:150 msgid "Card" msgstr "" -#: src/main/xmli18n-tmp.h:131 +#: src/main/xmli18n-tmp.h:151 #, fuzzy msgid "Wide Postcard" -msgstr "Cartão" +msgstr "Cartão" -#: src/main/xmli18n-tmp.h:132 +#: src/main/xmli18n-tmp.h:152 msgid "Chilean Office" msgstr "" -#: src/main/xmli18n-tmp.h:133 +#: src/main/xmli18n-tmp.h:153 msgid "Chilean Double Letter" msgstr "" -#: src/main/xmli18n-tmp.h:134 +#: src/main/xmli18n-tmp.h:154 msgid "Chilean Double Office" msgstr "" -#: src/main/xmli18n-tmp.h:135 +#: src/main/xmli18n-tmp.h:155 msgid "Custom" msgstr "Personalizado" -#: src/main/xmli18n-tmp.h:136 +#: src/main/xmli18n-tmp.h:156 msgid "89 mm Roll Paper" -msgstr "Papel Contínuo 89 mm" +msgstr "Papel Contínuo 89 mm" -#: src/main/xmli18n-tmp.h:137 +#: src/main/xmli18n-tmp.h:157 msgid "4 Inch Roll Paper" -msgstr "Papel Contínuo 4 Polegadas" +msgstr "Papel Contínuo 4 Polegadas" -#: src/main/xmli18n-tmp.h:138 +#: src/main/xmli18n-tmp.h:158 msgid "5 Inch Roll Paper" -msgstr "Papel Contínuo 5 Polegadas" +msgstr "Papel Contínuo 5 Polegadas" -#: src/main/xmli18n-tmp.h:139 +#: src/main/xmli18n-tmp.h:159 msgid "210 mm Roll Paper" -msgstr "Papel Contínuo 210 mm" +msgstr "Papel Contínuo 210 mm" -#: src/main/xmli18n-tmp.h:140 +#: src/main/xmli18n-tmp.h:160 msgid "13 Inch Roll Paper" -msgstr "Papel Contínuo 13 Polegadas" +msgstr "Papel Contínuo 13 Polegadas" -#: src/main/xmli18n-tmp.h:141 +#: src/main/xmli18n-tmp.h:161 msgid "22 Inch Roll Paper" -msgstr "Papel Contínuo 22 Polegadas" +msgstr "Papel Contínuo 22 Polegadas" -#: src/main/xmli18n-tmp.h:142 +#: src/main/xmli18n-tmp.h:162 msgid "24 Inch Roll Paper" -msgstr "Papel Contínuo 24 Polegadas" +msgstr "Papel Contínuo 24 Polegadas" -#: src/main/xmli18n-tmp.h:143 +#: src/main/xmli18n-tmp.h:163 msgid "36 Inch Roll Paper" -msgstr "Papel Contínuo 36 Polegadas" +msgstr "Papel Contínuo 36 Polegadas" -#: src/main/xmli18n-tmp.h:144 +#: src/main/xmli18n-tmp.h:164 msgid "44 Inch Roll Paper" -msgstr "Papel Contínuo 44 Polegadas" +msgstr "Papel Contínuo 44 Polegadas" -#: src/main/xmli18n-tmp.h:145 +#: src/main/xmli18n-tmp.h:165 msgid "PostScript Level 1" msgstr "" -#: src/main/xmli18n-tmp.h:146 +#: src/main/xmli18n-tmp.h:166 msgid "PostScript Level 2" msgstr "" -#: src/main/xmli18n-tmp.h:147 +#: src/main/xmli18n-tmp.h:167 msgid "Canon BJ-30" msgstr "" -#: src/main/xmli18n-tmp.h:148 +#: src/main/xmli18n-tmp.h:168 msgid "Canon BJC-50" msgstr "" -#: src/main/xmli18n-tmp.h:149 +#: src/main/xmli18n-tmp.h:169 msgid "Canon BJC-55" msgstr "" -#: src/main/xmli18n-tmp.h:150 +#: src/main/xmli18n-tmp.h:170 msgid "Canon BJC-80" msgstr "" -#: src/main/xmli18n-tmp.h:151 +#: src/main/xmli18n-tmp.h:171 msgid "Canon BJC-85" msgstr "" -#: src/main/xmli18n-tmp.h:152 +#: src/main/xmli18n-tmp.h:172 msgid "Canon BJC-210" msgstr "" -#: src/main/xmli18n-tmp.h:153 +#: src/main/xmli18n-tmp.h:173 msgid "Canon BJC-240" msgstr "" -#: src/main/xmli18n-tmp.h:154 +#: src/main/xmli18n-tmp.h:174 msgid "Canon BJC-250" msgstr "" -#: src/main/xmli18n-tmp.h:155 +#: src/main/xmli18n-tmp.h:175 msgid "Canon BJC-1000" msgstr "" -#: src/main/xmli18n-tmp.h:156 +#: src/main/xmli18n-tmp.h:176 msgid "Canon BJC-2000" msgstr "" -#: src/main/xmli18n-tmp.h:157 +#: src/main/xmli18n-tmp.h:177 msgid "Canon BJC-2010" msgstr "" -#: src/main/xmli18n-tmp.h:158 +#: src/main/xmli18n-tmp.h:178 msgid "Canon BJC-2100" msgstr "" -#: src/main/xmli18n-tmp.h:159 +#: src/main/xmli18n-tmp.h:179 msgid "Canon BJC-2110" msgstr "" -#: src/main/xmli18n-tmp.h:160 +#: src/main/xmli18n-tmp.h:180 msgid "Canon BJC-3000" msgstr "" -#: src/main/xmli18n-tmp.h:161 +#: src/main/xmli18n-tmp.h:181 msgid "Canon BJC-4000" msgstr "" -#: src/main/xmli18n-tmp.h:162 +#: src/main/xmli18n-tmp.h:182 msgid "Canon BJC-4300" msgstr "" -#: src/main/xmli18n-tmp.h:163 +#: src/main/xmli18n-tmp.h:183 msgid "Canon BJC-4400" msgstr "" -#: src/main/xmli18n-tmp.h:164 +#: src/main/xmli18n-tmp.h:184 msgid "Canon BJC-5100" msgstr "" -#: src/main/xmli18n-tmp.h:165 +#: src/main/xmli18n-tmp.h:185 msgid "Canon BJC-5500" msgstr "" -#: src/main/xmli18n-tmp.h:166 +#: src/main/xmli18n-tmp.h:186 msgid "Canon BJC-6000" msgstr "" -#: src/main/xmli18n-tmp.h:167 +#: src/main/xmli18n-tmp.h:187 msgid "Canon BJC-6100" msgstr "" -#: src/main/xmli18n-tmp.h:168 +#: src/main/xmli18n-tmp.h:188 msgid "Canon BJC-6200" msgstr "" -#: src/main/xmli18n-tmp.h:169 +#: src/main/xmli18n-tmp.h:189 msgid "Canon BJC-6500" msgstr "" -#: src/main/xmli18n-tmp.h:170 +#: src/main/xmli18n-tmp.h:190 msgid "Canon BJC-7000" msgstr "" -#: src/main/xmli18n-tmp.h:171 +#: src/main/xmli18n-tmp.h:191 msgid "Canon BJC-7100" msgstr "" -#: src/main/xmli18n-tmp.h:172 +#: src/main/xmli18n-tmp.h:192 msgid "Canon BJC-8200" msgstr "" -#: src/main/xmli18n-tmp.h:173 +#: src/main/xmli18n-tmp.h:193 msgid "Canon BJC-8500" msgstr "" -#: src/main/xmli18n-tmp.h:174 +#: src/main/xmli18n-tmp.h:194 msgid "Canon S100" msgstr "" -#: src/main/xmli18n-tmp.h:175 +#: src/main/xmli18n-tmp.h:195 msgid "Canon S200" msgstr "" -#: src/main/xmli18n-tmp.h:176 +#: src/main/xmli18n-tmp.h:196 msgid "Canon S300" msgstr "" -#: src/main/xmli18n-tmp.h:177 +#: src/main/xmli18n-tmp.h:197 msgid "Canon S400" msgstr "" -#: src/main/xmli18n-tmp.h:178 +#: src/main/xmli18n-tmp.h:198 msgid "Canon S450" msgstr "" -#: src/main/xmli18n-tmp.h:179 +#: src/main/xmli18n-tmp.h:199 msgid "Canon S500" msgstr "" -#: src/main/xmli18n-tmp.h:180 +#: src/main/xmli18n-tmp.h:200 msgid "Canon S600" msgstr "" -#: src/main/xmli18n-tmp.h:181 +#: src/main/xmli18n-tmp.h:201 msgid "Canon S630" msgstr "" -#: src/main/xmli18n-tmp.h:182 +#: src/main/xmli18n-tmp.h:202 msgid "Canon S800" msgstr "" -#: src/main/xmli18n-tmp.h:183 +#: src/main/xmli18n-tmp.h:203 msgid "Canon S4500" msgstr "" -#: src/main/xmli18n-tmp.h:184 +#: src/main/xmli18n-tmp.h:204 msgid "Canon PIXMA iP2000" msgstr "" -#: src/main/xmli18n-tmp.h:185 +#: src/main/xmli18n-tmp.h:205 msgid "Canon PIXMA iP3000" msgstr "" -#: src/main/xmli18n-tmp.h:186 +#: src/main/xmli18n-tmp.h:206 msgid "Canon PIXMA iP3100" msgstr "" -#: src/main/xmli18n-tmp.h:187 +#: src/main/xmli18n-tmp.h:207 msgid "Canon PIXMA iP4000" msgstr "" -#: src/main/xmli18n-tmp.h:188 +#: src/main/xmli18n-tmp.h:208 msgid "Canon PIXMA iP4100" msgstr "" -#: src/main/xmli18n-tmp.h:189 +#: src/main/xmli18n-tmp.h:209 msgid "Canon PIXMA iP4200" msgstr "" -#: src/main/xmli18n-tmp.h:190 -#, fuzzy +#: src/main/xmli18n-tmp.h:210 msgid "Canon PIXMA iP4300" -msgstr "Stylus C60" +msgstr "" -#: src/main/xmli18n-tmp.h:191 -#, fuzzy +#: src/main/xmli18n-tmp.h:211 msgid "Canon PIXMA iP4500" -msgstr "Stylus C60" +msgstr "" -#: src/main/xmli18n-tmp.h:192 -#, fuzzy +#: src/main/xmli18n-tmp.h:212 msgid "Canon PIXMA iP5000" -msgstr "Stylus C60" +msgstr "" -#: src/main/xmli18n-tmp.h:193 +#: src/main/xmli18n-tmp.h:213 msgid "Canon PIXMA iP5200" msgstr "" -#: src/main/xmli18n-tmp.h:194 -#, fuzzy +#: src/main/xmli18n-tmp.h:214 msgid "Canon PIXMA iP5300" -msgstr "Stylus C60" +msgstr "" -#: src/main/xmli18n-tmp.h:195 -#, fuzzy +#: src/main/xmli18n-tmp.h:215 +msgid "Canon PIXMA iP6000D" +msgstr "" + +#: src/main/xmli18n-tmp.h:216 msgid "Canon PIXMA iP6700" -msgstr "Stylus C60" +msgstr "" -#: src/main/xmli18n-tmp.h:196 -#, fuzzy +#: src/main/xmli18n-tmp.h:217 msgid "Canon PIXMA iP8500" -msgstr "Stylus C60" +msgstr "" -#: src/main/xmli18n-tmp.h:197 -#, fuzzy +#: src/main/xmli18n-tmp.h:218 msgid "Canon PIXMA iX5000" -msgstr "Stylus C60" +msgstr "" -#: src/main/xmli18n-tmp.h:198 -#, fuzzy +#: src/main/xmli18n-tmp.h:219 msgid "Canon PIXMA Pro9500" -msgstr "Stylus C60" +msgstr "" -#: src/main/xmli18n-tmp.h:199 -#, fuzzy +#: src/main/xmli18n-tmp.h:220 msgid "Canon PIXMA MP150" -msgstr "Stylus C60" +msgstr "" -#: src/main/xmli18n-tmp.h:200 -#, fuzzy +#: src/main/xmli18n-tmp.h:221 msgid "Canon PIXMA MP170" -msgstr "Stylus C60" +msgstr "" -#: src/main/xmli18n-tmp.h:201 -#, fuzzy +#: src/main/xmli18n-tmp.h:222 msgid "Canon PIXMA MP180" -msgstr "Stylus C60" +msgstr "" -#: src/main/xmli18n-tmp.h:202 -#, fuzzy +#: src/main/xmli18n-tmp.h:223 msgid "Canon PIXMA MP500" -msgstr "Stylus C60" +msgstr "" -#: src/main/xmli18n-tmp.h:203 -#, fuzzy +#: src/main/xmli18n-tmp.h:224 +msgid "Canon PIXMA MP520" +msgstr "" + +#: src/main/xmli18n-tmp.h:225 msgid "Canon PIXMA MP610" -msgstr "Stylus C60" +msgstr "" -#: src/main/xmli18n-tmp.h:204 -#, fuzzy +#: src/main/xmli18n-tmp.h:226 msgid "Canon PIXMA MP700" -msgstr "Stylus C60" +msgstr "" -#: src/main/xmli18n-tmp.h:205 -#, fuzzy +#: src/main/xmli18n-tmp.h:227 msgid "Canon PIXMA MP710" -msgstr "Stylus C60" +msgstr "" -#: src/main/xmli18n-tmp.h:206 -#, fuzzy +#: src/main/xmli18n-tmp.h:228 msgid "Canon PIXMA MP730" -msgstr "Stylus C60" +msgstr "" -#: src/main/xmli18n-tmp.h:207 -#, fuzzy +#: src/main/xmli18n-tmp.h:229 msgid "Canon PIXMA MP740" -msgstr "Stylus C60" +msgstr "" -#: src/main/xmli18n-tmp.h:208 -#, fuzzy +#: src/main/xmli18n-tmp.h:230 msgid "Canon PIXMA MP750" -msgstr "Stylus C60" +msgstr "" -#: src/main/xmli18n-tmp.h:209 -#, fuzzy +#: src/main/xmli18n-tmp.h:231 msgid "Canon PIXMA MP760" -msgstr "Stylus C60" +msgstr "" -#: src/main/xmli18n-tmp.h:210 -#, fuzzy +#: src/main/xmli18n-tmp.h:232 msgid "Canon PIXMA MP770" -msgstr "Stylus C60" +msgstr "" -#: src/main/xmli18n-tmp.h:211 -#, fuzzy +#: src/main/xmli18n-tmp.h:233 msgid "Canon PIXMA MP780" -msgstr "Stylus C60" +msgstr "" -#: src/main/xmli18n-tmp.h:212 -#, fuzzy +#: src/main/xmli18n-tmp.h:234 msgid "Canon PIXMA MP790" -msgstr "Stylus C60" +msgstr "" -#: src/main/xmli18n-tmp.h:213 -#, fuzzy +#: src/main/xmli18n-tmp.h:235 msgid "Canon PIXMA MP830" -msgstr "Stylus C60" +msgstr "" -#: src/main/xmli18n-tmp.h:214 +#: src/main/xmli18n-tmp.h:236 msgid "Canon PIXUS iP3100" msgstr "" -#: src/main/xmli18n-tmp.h:215 +#: src/main/xmli18n-tmp.h:237 msgid "Canon PIXUS iP4100" msgstr "" -#: src/main/xmli18n-tmp.h:216 -#, fuzzy +#: src/main/xmli18n-tmp.h:238 msgid "Canon i80" -msgstr "Stylus C60" +msgstr "" -#: src/main/xmli18n-tmp.h:217 +#: src/main/xmli18n-tmp.h:239 msgid "Canon i560" msgstr "" -#: src/main/xmli18n-tmp.h:218 +#: src/main/xmli18n-tmp.h:240 msgid "Canon i850" msgstr "" -#: src/main/xmli18n-tmp.h:219 +#: src/main/xmli18n-tmp.h:241 msgid "Canon i860" msgstr "" -#: src/main/xmli18n-tmp.h:220 +#: src/main/xmli18n-tmp.h:242 msgid "Canon i865" msgstr "" -#: src/main/xmli18n-tmp.h:221 +#: src/main/xmli18n-tmp.h:243 #, fuzzy msgid "Epson Stylus C20" -msgstr "Stylus C20ux" +msgstr "Stylus c20sx" -#: src/main/xmli18n-tmp.h:222 +#: src/main/xmli18n-tmp.h:244 #, fuzzy msgid "Epson Stylus C20SX" msgstr "Stylus C20ux" -#: src/main/xmli18n-tmp.h:223 +#: src/main/xmli18n-tmp.h:245 #, fuzzy msgid "Epson Stylus C20UX" msgstr "Stylus C20ux" -#: src/main/xmli18n-tmp.h:224 +#: src/main/xmli18n-tmp.h:246 #, fuzzy msgid "Epson Stylus C40" -msgstr "Stylus C40ux" +msgstr "Stylus C40sx" -#: src/main/xmli18n-tmp.h:225 +#: src/main/xmli18n-tmp.h:247 #, fuzzy msgid "Epson Stylus C40SX" msgstr "Stylus C40ux" -#: src/main/xmli18n-tmp.h:226 +#: src/main/xmli18n-tmp.h:248 #, fuzzy msgid "Epson Stylus C40UX" msgstr "Stylus C40ux" -#: src/main/xmli18n-tmp.h:227 +#: src/main/xmli18n-tmp.h:249 #, fuzzy msgid "Epson Stylus C41" -msgstr "Stylus C41ux" +msgstr "Stylus C41sx" -#: src/main/xmli18n-tmp.h:228 +#: src/main/xmli18n-tmp.h:250 #, fuzzy msgid "Epson Stylus C41SX" msgstr "Stylus C41ux" -#: src/main/xmli18n-tmp.h:229 +#: src/main/xmli18n-tmp.h:251 #, fuzzy msgid "Epson Stylus C41UX" msgstr "Stylus C41ux" -#: src/main/xmli18n-tmp.h:230 +#: src/main/xmli18n-tmp.h:252 #, fuzzy msgid "Epson Stylus C42" -msgstr "Stylus C42ux" +msgstr "Stylus C42sx" -#: src/main/xmli18n-tmp.h:231 +#: src/main/xmli18n-tmp.h:253 #, fuzzy msgid "Epson Stylus C42SX" msgstr "Stylus C42ux" -#: src/main/xmli18n-tmp.h:232 +#: src/main/xmli18n-tmp.h:254 #, fuzzy msgid "Epson Stylus C42UX" msgstr "Stylus C42ux" -#: src/main/xmli18n-tmp.h:233 +#: src/main/xmli18n-tmp.h:255 #, fuzzy msgid "Epson Stylus C43" msgstr "Stylus C42ux" -#: src/main/xmli18n-tmp.h:234 +#: src/main/xmli18n-tmp.h:256 #, fuzzy msgid "Epson Stylus C43SX" msgstr "Stylus C42ux" -#: src/main/xmli18n-tmp.h:235 +#: src/main/xmli18n-tmp.h:257 #, fuzzy msgid "Epson Stylus C43UX" msgstr "Stylus C42ux" -#: src/main/xmli18n-tmp.h:236 +#: src/main/xmli18n-tmp.h:258 #, fuzzy msgid "Epson Stylus C44" msgstr "Stylus C42ux" -#: src/main/xmli18n-tmp.h:237 +#: src/main/xmli18n-tmp.h:259 #, fuzzy msgid "Epson Stylus C44SX" msgstr "Stylus C42ux" -#: src/main/xmli18n-tmp.h:238 +#: src/main/xmli18n-tmp.h:260 #, fuzzy msgid "Epson Stylus C44UX" msgstr "Stylus C42ux" -#: src/main/xmli18n-tmp.h:239 +#: src/main/xmli18n-tmp.h:261 #, fuzzy msgid "Epson Stylus C45" msgstr "Stylus C60" -#: src/main/xmli18n-tmp.h:240 +#: src/main/xmli18n-tmp.h:262 #, fuzzy msgid "Epson Stylus C46" msgstr "Stylus C60" -#: src/main/xmli18n-tmp.h:241 +#: src/main/xmli18n-tmp.h:263 #, fuzzy msgid "Epson Stylus C48" -msgstr "Stylus C60" +msgstr "Stylus C80" -#: src/main/xmli18n-tmp.h:242 +#: src/main/xmli18n-tmp.h:264 #, fuzzy msgid "Epson Stylus C50" msgstr "Stylus C60" -#: src/main/xmli18n-tmp.h:243 +#: src/main/xmli18n-tmp.h:265 #, fuzzy msgid "Epson Stylus C60" msgstr "Stylus C60" -#: src/main/xmli18n-tmp.h:244 +#: src/main/xmli18n-tmp.h:266 #, fuzzy msgid "Epson Stylus C61" msgstr "Stylus C61" -#: src/main/xmli18n-tmp.h:245 +#: src/main/xmli18n-tmp.h:267 #, fuzzy msgid "Epson Stylus C62" msgstr "Stylus C62" -#: src/main/xmli18n-tmp.h:246 +#: src/main/xmli18n-tmp.h:268 #, fuzzy msgid "Epson Stylus C63" msgstr "Stylus C60" -#: src/main/xmli18n-tmp.h:247 +#: src/main/xmli18n-tmp.h:269 #, fuzzy msgid "Epson Stylus C64" msgstr "Stylus C60" -#: src/main/xmli18n-tmp.h:248 +#: src/main/xmli18n-tmp.h:270 #, fuzzy msgid "Epson Stylus C65" msgstr "Stylus C60" -#: src/main/xmli18n-tmp.h:249 +#: src/main/xmli18n-tmp.h:271 #, fuzzy msgid "Epson Stylus C66" msgstr "Stylus C60" -#: src/main/xmli18n-tmp.h:250 +#: src/main/xmli18n-tmp.h:272 #, fuzzy msgid "Epson Stylus C68" msgstr "Stylus C60" -#: src/main/xmli18n-tmp.h:251 +#: src/main/xmli18n-tmp.h:273 #, fuzzy msgid "Epson Stylus C70" msgstr "Stylus C70" -#: src/main/xmli18n-tmp.h:252 +#: src/main/xmli18n-tmp.h:274 #, fuzzy msgid "Epson Stylus C79" msgstr "Stylus C70" -#: src/main/xmli18n-tmp.h:253 +#: src/main/xmli18n-tmp.h:275 #, fuzzy msgid "Epson Stylus C80" msgstr "Stylus C80" -#: src/main/xmli18n-tmp.h:254 +#: src/main/xmli18n-tmp.h:276 #, fuzzy msgid "Epson Stylus C82" msgstr "Stylus C82" -#: src/main/xmli18n-tmp.h:255 +#: src/main/xmli18n-tmp.h:277 #, fuzzy msgid "Epson Stylus C83" msgstr "Stylus C80" -#: src/main/xmli18n-tmp.h:256 +#: src/main/xmli18n-tmp.h:278 #, fuzzy msgid "Epson Stylus C84" msgstr "Stylus C80" -#: src/main/xmli18n-tmp.h:257 +#: src/main/xmli18n-tmp.h:279 #, fuzzy msgid "Epson Stylus C85" msgstr "Stylus C60" -#: src/main/xmli18n-tmp.h:258 +#: src/main/xmli18n-tmp.h:280 #, fuzzy msgid "Epson Stylus C86" msgstr "Stylus C60" -#: src/main/xmli18n-tmp.h:259 +#: src/main/xmli18n-tmp.h:281 #, fuzzy msgid "Epson Stylus C87" -msgstr "Stylus C60" +msgstr "Stylus C70" -#: src/main/xmli18n-tmp.h:260 +#: src/main/xmli18n-tmp.h:282 #, fuzzy msgid "Epson Stylus C88" msgstr "Stylus C80" -#: src/main/xmli18n-tmp.h:261 +#: src/main/xmli18n-tmp.h:283 #, fuzzy msgid "Epson Stylus C110" -msgstr "Stylus C20ux" +msgstr "Stylus C60" -#: src/main/xmli18n-tmp.h:262 +#: src/main/xmli18n-tmp.h:284 #, fuzzy msgid "Epson Stylus C120" -msgstr "Stylus C20ux" +msgstr "Stylus c20sx" -#: src/main/xmli18n-tmp.h:263 +#: src/main/xmli18n-tmp.h:285 #, fuzzy msgid "Epson Stylus Color" msgstr "Stylus Color 400" -#: src/main/xmli18n-tmp.h:264 +#: src/main/xmli18n-tmp.h:286 #, fuzzy msgid "Epson Stylus Color I" msgstr "Stylus Color 400" -#: src/main/xmli18n-tmp.h:265 +#: src/main/xmli18n-tmp.h:287 #, fuzzy msgid "Epson Stylus Color II" msgstr "Stylus Color 400" -#: src/main/xmli18n-tmp.h:266 +#: src/main/xmli18n-tmp.h:288 #, fuzzy msgid "Epson Stylus Color IIs" msgstr "Stylus Color 400" -#: src/main/xmli18n-tmp.h:267 +#: src/main/xmli18n-tmp.h:289 #, fuzzy msgid "Epson Stylus Color PRO" msgstr "Stylus Color Pro" -#: src/main/xmli18n-tmp.h:268 +#: src/main/xmli18n-tmp.h:290 #, fuzzy msgid "Epson Stylus Pro XL" msgstr "Stylus Color Pro XL" -#: src/main/xmli18n-tmp.h:269 +#: src/main/xmli18n-tmp.h:291 #, fuzzy msgid "Epson Stylus Color 400" msgstr "Stylus Color 400" -#: src/main/xmli18n-tmp.h:270 +#: src/main/xmli18n-tmp.h:292 #, fuzzy msgid "Epson Stylus Color 440" msgstr "Stylus Color 440" -#: src/main/xmli18n-tmp.h:271 +#: src/main/xmli18n-tmp.h:293 #, fuzzy msgid "Epson Stylus Color 460" msgstr "Stylus Color 460" -#: src/main/xmli18n-tmp.h:272 +#: src/main/xmli18n-tmp.h:294 #, fuzzy msgid "Epson Stylus Color 480" msgstr "Stylus Color 480" -#: src/main/xmli18n-tmp.h:273 +#: src/main/xmli18n-tmp.h:295 #, fuzzy msgid "Epson Stylus Color 500" msgstr "Stylus Color 500" -#: src/main/xmli18n-tmp.h:274 +#: src/main/xmli18n-tmp.h:296 #, fuzzy msgid "Epson Stylus Color 580" msgstr "Stylus Color 580" -#: src/main/xmli18n-tmp.h:275 +#: src/main/xmli18n-tmp.h:297 #, fuzzy msgid "Epson Stylus Color 600" msgstr "Stylus Color 600" -#: src/main/xmli18n-tmp.h:276 +#: src/main/xmli18n-tmp.h:298 #, fuzzy msgid "Epson Stylus Color 640" msgstr "Stylus Color 640" -#: src/main/xmli18n-tmp.h:277 +#: src/main/xmli18n-tmp.h:299 #, fuzzy msgid "Epson Stylus Color 660" msgstr "Stylus Color 660" -#: src/main/xmli18n-tmp.h:278 +#: src/main/xmli18n-tmp.h:300 #, fuzzy msgid "Epson Stylus Color 670" msgstr "Stylus Color 670" -#: src/main/xmli18n-tmp.h:279 +#: src/main/xmli18n-tmp.h:301 #, fuzzy msgid "Epson Stylus Color 680" msgstr "Stylus Color 680" -#: src/main/xmli18n-tmp.h:280 +#: src/main/xmli18n-tmp.h:302 #, fuzzy msgid "Epson Stylus Color 740" msgstr "Stylus Color 740" -#: src/main/xmli18n-tmp.h:281 +#: src/main/xmli18n-tmp.h:303 #, fuzzy msgid "Epson Stylus Color 760" msgstr "Stylus Color 760" -#: src/main/xmli18n-tmp.h:282 +#: src/main/xmli18n-tmp.h:304 #, fuzzy msgid "Epson Stylus Color 777" msgstr "Stylus Color 777" -#: src/main/xmli18n-tmp.h:283 +#: src/main/xmli18n-tmp.h:305 #, fuzzy msgid "Epson Stylus Color 800" msgstr "Stylus Color 800" -#: src/main/xmli18n-tmp.h:284 +#: src/main/xmli18n-tmp.h:306 #, fuzzy msgid "Epson Stylus Color 850" msgstr "Stylus Color 850" -#: src/main/xmli18n-tmp.h:285 +#: src/main/xmli18n-tmp.h:307 #, fuzzy msgid "Epson Stylus Color 860" msgstr "Stylus Color 860" -#: src/main/xmli18n-tmp.h:286 +#: src/main/xmli18n-tmp.h:308 #, fuzzy msgid "Epson Stylus Color 880" msgstr "Stylus Color 880" -#: src/main/xmli18n-tmp.h:287 +#: src/main/xmli18n-tmp.h:309 #, fuzzy msgid "Epson Stylus Color 8 3" msgstr "Stylus Color 83" -#: src/main/xmli18n-tmp.h:288 +#: src/main/xmli18n-tmp.h:310 #, fuzzy msgid "Epson Stylus Color 900" msgstr "Stylus Color 900" -#: src/main/xmli18n-tmp.h:289 +#: src/main/xmli18n-tmp.h:311 #, fuzzy msgid "Epson Stylus Color 980" msgstr "Stylus Color 980" -#: src/main/xmli18n-tmp.h:290 +#: src/main/xmli18n-tmp.h:312 #, fuzzy msgid "Epson Stylus Color 1160" msgstr "Stylus Color 1160" -#: src/main/xmli18n-tmp.h:291 +#: src/main/xmli18n-tmp.h:313 #, fuzzy msgid "Epson Stylus Color 1500" msgstr "Stylus Color 1500" -#: src/main/xmli18n-tmp.h:292 +#: src/main/xmli18n-tmp.h:314 #, fuzzy msgid "Epson Stylus Color 1520" msgstr "Stylus Color 1520" -#: src/main/xmli18n-tmp.h:293 +#: src/main/xmli18n-tmp.h:315 #, fuzzy msgid "Epson Stylus Color 3000" msgstr "Stylus Color 3000" -#: src/main/xmli18n-tmp.h:294 +#: src/main/xmli18n-tmp.h:316 #, fuzzy msgid "Epson Stylus Photo" msgstr "Stylus Photo" -#: src/main/xmli18n-tmp.h:295 +#: src/main/xmli18n-tmp.h:317 #, fuzzy msgid "Epson Stylus Photo 700" msgstr "Stylus Photo 700" -#: src/main/xmli18n-tmp.h:296 +#: src/main/xmli18n-tmp.h:318 #, fuzzy msgid "Epson Stylus Photo EX" msgstr "Stylus Photo EX" -#: src/main/xmli18n-tmp.h:297 +#: src/main/xmli18n-tmp.h:319 #, fuzzy msgid "Epson Stylus Photo EX3" msgstr "Stylus Photo EX" -#: src/main/xmli18n-tmp.h:298 +#: src/main/xmli18n-tmp.h:320 #, fuzzy msgid "Epson Stylus Photo 720" msgstr "Stylus Photo 720" -#: src/main/xmli18n-tmp.h:299 +#: src/main/xmli18n-tmp.h:321 #, fuzzy msgid "Epson Stylus Photo 750" msgstr "Stylus Photo 750" -#: src/main/xmli18n-tmp.h:300 +#: src/main/xmli18n-tmp.h:322 #, fuzzy msgid "Epson Stylus Photo 780" msgstr "Stylus Photo 780" -#: src/main/xmli18n-tmp.h:301 +#: src/main/xmli18n-tmp.h:323 #, fuzzy msgid "Epson Stylus Photo 785" msgstr "Stylus Photo 785" -#: src/main/xmli18n-tmp.h:302 +#: src/main/xmli18n-tmp.h:324 #, fuzzy msgid "Epson Stylus Photo 790" msgstr "Stylus Photo 790" -#: src/main/xmli18n-tmp.h:303 +#: src/main/xmli18n-tmp.h:325 #, fuzzy msgid "Epson Stylus Photo 810" msgstr "Stylus Photo 810" -#: src/main/xmli18n-tmp.h:304 +#: src/main/xmli18n-tmp.h:326 #, fuzzy msgid "Epson Stylus Photo 820" msgstr "Stylus Photo 820" -#: src/main/xmli18n-tmp.h:305 +#: src/main/xmli18n-tmp.h:327 #, fuzzy msgid "Epson Stylus Photo 825" msgstr "Stylus Photo 785" -#: src/main/xmli18n-tmp.h:306 +#: src/main/xmli18n-tmp.h:328 #, fuzzy msgid "Epson Stylus Photo 830" msgstr "Stylus Photo 830" -#: src/main/xmli18n-tmp.h:307 +#: src/main/xmli18n-tmp.h:329 #, fuzzy msgid "Epson Stylus Photo 830U" msgstr "Stylus Photo 830" -#: src/main/xmli18n-tmp.h:308 +#: src/main/xmli18n-tmp.h:330 #, fuzzy msgid "Epson Stylus Photo 870" msgstr "Stylus Photo 870" -#: src/main/xmli18n-tmp.h:309 +#: src/main/xmli18n-tmp.h:331 #, fuzzy msgid "Epson Stylus Photo 875" msgstr "Stylus Photo 875" -#: src/main/xmli18n-tmp.h:310 +#: src/main/xmli18n-tmp.h:332 #, fuzzy msgid "Epson Stylus Photo 890" msgstr "Stylus Photo 890" -#: src/main/xmli18n-tmp.h:311 +#: src/main/xmli18n-tmp.h:333 #, fuzzy msgid "Epson Stylus Photo 895" msgstr "Stylus Photo 895" -#: src/main/xmli18n-tmp.h:312 +#: src/main/xmli18n-tmp.h:334 #, fuzzy msgid "Epson Stylus Photo 900" msgstr "Stylus Photo 700" -#: src/main/xmli18n-tmp.h:313 +#: src/main/xmli18n-tmp.h:335 #, fuzzy msgid "Epson Stylus Photo 915" msgstr "Stylus Photo 915" -#: src/main/xmli18n-tmp.h:314 +#: src/main/xmli18n-tmp.h:336 #, fuzzy msgid "Epson Stylus Photo 925" msgstr "Stylus Photo 925" -#: src/main/xmli18n-tmp.h:315 +#: src/main/xmli18n-tmp.h:337 #, fuzzy msgid "Epson Stylus Photo 935" msgstr "Stylus Photo 895" -#: src/main/xmli18n-tmp.h:316 +#: src/main/xmli18n-tmp.h:338 #, fuzzy msgid "Epson Stylus Photo 950" msgstr "Stylus Photo 950" -#: src/main/xmli18n-tmp.h:317 +#: src/main/xmli18n-tmp.h:339 #, fuzzy msgid "Epson Stylus Photo 960" msgstr "Stylus Photo 960" -#: src/main/xmli18n-tmp.h:318 +#: src/main/xmli18n-tmp.h:340 #, fuzzy msgid "Epson Stylus Photo 1200" msgstr "Stylus Photo 1200" -#: src/main/xmli18n-tmp.h:319 +#: src/main/xmli18n-tmp.h:341 #, fuzzy msgid "Epson Stylus Photo 1270" msgstr "Stylus Photo 1270" -#: src/main/xmli18n-tmp.h:320 +#: src/main/xmli18n-tmp.h:342 #, fuzzy msgid "Epson Stylus Photo 1280" msgstr "Stylus Photo 1280" -#: src/main/xmli18n-tmp.h:321 +#: src/main/xmli18n-tmp.h:343 #, fuzzy msgid "Epson Stylus Photo 1290" msgstr "Stylus Photo 1290" -#: src/main/xmli18n-tmp.h:322 +#: src/main/xmli18n-tmp.h:344 #, fuzzy msgid "Epson Stylus Photo 1400" msgstr "Stylus Photo 1200" -#: src/main/xmli18n-tmp.h:323 +#: src/main/xmli18n-tmp.h:345 #, fuzzy msgid "Epson Stylus Photo 1410" msgstr "Stylus Photo 810" -#: src/main/xmli18n-tmp.h:324 +#: src/main/xmli18n-tmp.h:346 #, fuzzy msgid "Epson Stylus Photo 2000P" msgstr "Stylus Photo 2000P" -#: src/main/xmli18n-tmp.h:325 +#: src/main/xmli18n-tmp.h:347 #, fuzzy msgid "Epson Stylus Photo 2100" msgstr "Stylus Photo 2100" -#: src/main/xmli18n-tmp.h:326 +#: src/main/xmli18n-tmp.h:348 #, fuzzy msgid "Epson Stylus Photo 2200" msgstr "Stylus Photo 2200" -#: src/main/xmli18n-tmp.h:327 +#: src/main/xmli18n-tmp.h:349 #, fuzzy msgid "Epson Stylus Photo R200" msgstr "Stylus Photo 1200" -#: src/main/xmli18n-tmp.h:328 +#: src/main/xmli18n-tmp.h:350 #, fuzzy msgid "Epson Stylus Photo R210" msgstr "Stylus Photo 2100" -#: src/main/xmli18n-tmp.h:329 +#: src/main/xmli18n-tmp.h:351 #, fuzzy msgid "Epson Stylus Photo R220" msgstr "Stylus Photo 2200" -#: src/main/xmli18n-tmp.h:330 +#: src/main/xmli18n-tmp.h:352 #, fuzzy msgid "Epson Stylus Photo R230" msgstr "Stylus Photo 1200" -#: src/main/xmli18n-tmp.h:331 +#: src/main/xmli18n-tmp.h:353 #, fuzzy msgid "Epson Stylus Photo R240" msgstr "Stylus Photo 1200" -#: src/main/xmli18n-tmp.h:332 +#: src/main/xmli18n-tmp.h:354 #, fuzzy msgid "Epson Stylus Photo R245" -msgstr "Stylus Photo 1200" +msgstr "Stylus Photo 925" -#: src/main/xmli18n-tmp.h:333 +#: src/main/xmli18n-tmp.h:355 #, fuzzy msgid "Epson Stylus Photo R260" msgstr "Stylus Photo 1200" -#: src/main/xmli18n-tmp.h:334 +#: src/main/xmli18n-tmp.h:356 #, fuzzy msgid "Epson Stylus Photo R265" -msgstr "Stylus Photo 1200" +msgstr "Stylus Photo 925" -#: src/main/xmli18n-tmp.h:335 +#: src/main/xmli18n-tmp.h:357 #, fuzzy msgid "Epson Stylus Photo R270" msgstr "Stylus Photo 1270" -#: src/main/xmli18n-tmp.h:336 +#: src/main/xmli18n-tmp.h:358 +#, fuzzy +msgid "Epson Stylus Photo R280" +msgstr "Stylus Photo 1280" + +#: src/main/xmli18n-tmp.h:359 +#, fuzzy +msgid "Epson Stylus Photo R285" +msgstr "Stylus Photo 785" + +#: src/main/xmli18n-tmp.h:360 #, fuzzy msgid "Epson Stylus Photo R300" msgstr "Stylus Photo 700" -#: src/main/xmli18n-tmp.h:337 +#: src/main/xmli18n-tmp.h:361 #, fuzzy msgid "Epson Stylus Photo R310" msgstr "Stylus Photo 700" -#: src/main/xmli18n-tmp.h:338 +#: src/main/xmli18n-tmp.h:362 #, fuzzy msgid "Epson Stylus Photo R320" msgstr "Stylus Photo 1200" -#: src/main/xmli18n-tmp.h:339 +#: src/main/xmli18n-tmp.h:363 #, fuzzy msgid "Epson Stylus Photo R340" msgstr "Stylus Photo 700" -#: src/main/xmli18n-tmp.h:340 +#: src/main/xmli18n-tmp.h:364 #, fuzzy msgid "Epson Stylus Photo R350" msgstr "Stylus Photo 700" -#: src/main/xmli18n-tmp.h:341 +#: src/main/xmli18n-tmp.h:365 #, fuzzy msgid "Epson Stylus Photo R360" msgstr "Stylus Photo 700" -#: src/main/xmli18n-tmp.h:342 +#: src/main/xmli18n-tmp.h:366 #, fuzzy msgid "Epson Stylus Photo R380" msgstr "Stylus Photo 700" -#: src/main/xmli18n-tmp.h:343 +#: src/main/xmli18n-tmp.h:367 #, fuzzy msgid "Epson Stylus Photo R390" msgstr "Stylus Photo 700" -#: src/main/xmli18n-tmp.h:344 +#: src/main/xmli18n-tmp.h:368 #, fuzzy msgid "Epson Stylus Photo RX400" msgstr "Stylus Photo 700" -#: src/main/xmli18n-tmp.h:345 +#: src/main/xmli18n-tmp.h:369 #, fuzzy msgid "Epson Stylus Photo RX420" msgstr "Stylus Photo 1200" -#: src/main/xmli18n-tmp.h:346 +#: src/main/xmli18n-tmp.h:370 #, fuzzy msgid "Epson Stylus Photo RX425" msgstr "Stylus Photo 1200" -#: src/main/xmli18n-tmp.h:347 +#: src/main/xmli18n-tmp.h:371 #, fuzzy msgid "Epson Stylus Photo RX430" msgstr "Stylus Photo 700" -#: src/main/xmli18n-tmp.h:348 +#: src/main/xmli18n-tmp.h:372 #, fuzzy msgid "Epson Stylus Photo RX500" msgstr "Stylus Photo 700" -#: src/main/xmli18n-tmp.h:349 +#: src/main/xmli18n-tmp.h:373 #, fuzzy msgid "Epson Stylus Photo RX510" msgstr "Stylus Photo 700" -#: src/main/xmli18n-tmp.h:350 +#: src/main/xmli18n-tmp.h:374 #, fuzzy msgid "Epson Stylus Photo RX560" msgstr "Stylus Photo 700" -#: src/main/xmli18n-tmp.h:351 +#: src/main/xmli18n-tmp.h:375 #, fuzzy msgid "Epson Stylus Photo RX580" msgstr "Stylus Photo 700" -#: src/main/xmli18n-tmp.h:352 +#: src/main/xmli18n-tmp.h:376 +#, fuzzy +msgid "Epson Stylus Photo RX585" +msgstr "Stylus Photo 700" + +#: src/main/xmli18n-tmp.h:377 #, fuzzy msgid "Epson Stylus Photo RX590" msgstr "Stylus Photo 700" -#: src/main/xmli18n-tmp.h:353 +#: src/main/xmli18n-tmp.h:378 #, fuzzy msgid "Epson Stylus Photo RX595" msgstr "Stylus Photo 700" -#: src/main/xmli18n-tmp.h:354 +#: src/main/xmli18n-tmp.h:379 #, fuzzy msgid "Epson Stylus Photo RX600" msgstr "Stylus Photo 700" -#: src/main/xmli18n-tmp.h:355 +#: src/main/xmli18n-tmp.h:380 #, fuzzy msgid "Epson Stylus Photo RX620" msgstr "Stylus Photo 700" -#: src/main/xmli18n-tmp.h:356 +#: src/main/xmli18n-tmp.h:381 #, fuzzy msgid "Epson Stylus Photo RX630" msgstr "Stylus Photo 700" -#: src/main/xmli18n-tmp.h:357 +#: src/main/xmli18n-tmp.h:382 #, fuzzy msgid "Epson Stylus Photo RX640" msgstr "Stylus Photo 700" -#: src/main/xmli18n-tmp.h:358 +#: src/main/xmli18n-tmp.h:383 +#, fuzzy +msgid "Epson Stylus Photo RX680" +msgstr "Stylus Photo 700" + +#: src/main/xmli18n-tmp.h:384 +#, fuzzy +msgid "Epson Stylus Photo RX685" +msgstr "Stylus Photo 700" + +#: src/main/xmli18n-tmp.h:385 #, fuzzy msgid "Epson Stylus Photo RX700" msgstr "Stylus Photo 700" -#: src/main/xmli18n-tmp.h:359 +#: src/main/xmli18n-tmp.h:386 #, fuzzy msgid "Epson Stylus Photo R800" msgstr "Stylus Photo 700" -#: src/main/xmli18n-tmp.h:360 +#: src/main/xmli18n-tmp.h:387 #, fuzzy msgid "Epson Stylus Photo R1800" msgstr "Stylus Photo 700" -#: src/main/xmli18n-tmp.h:361 +#: src/main/xmli18n-tmp.h:388 #, fuzzy msgid "Epson Stylus Photo R2400" msgstr "Stylus Photo 1200" -#: src/main/xmli18n-tmp.h:362 +#: src/main/xmli18n-tmp.h:389 #, fuzzy msgid "Epson Stylus Pro 5000" msgstr "Stylus Pro 5000" -#: src/main/xmli18n-tmp.h:363 +#: src/main/xmli18n-tmp.h:390 #, fuzzy msgid "Epson Stylus Pro 5500" msgstr "Stylus Pro 5500" -#: src/main/xmli18n-tmp.h:364 +#: src/main/xmli18n-tmp.h:391 #, fuzzy msgid "Epson Stylus Pro 7000" msgstr "Stylus Pro 7000" -#: src/main/xmli18n-tmp.h:365 +#: src/main/xmli18n-tmp.h:392 #, fuzzy msgid "Epson Stylus Pro 7500" msgstr "Stylus Pro 7500" -#: src/main/xmli18n-tmp.h:366 +#: src/main/xmli18n-tmp.h:393 #, fuzzy msgid "Epson Stylus Pro 7600" msgstr "Stylus Pro 7600" -#: src/main/xmli18n-tmp.h:367 +#: src/main/xmli18n-tmp.h:394 #, fuzzy msgid "Epson Stylus Pro 9000" msgstr "Stylus Pro 9000" -#: src/main/xmli18n-tmp.h:368 +#: src/main/xmli18n-tmp.h:395 #, fuzzy msgid "Epson Stylus Pro 9500" msgstr "Stylus Pro 9500" -#: src/main/xmli18n-tmp.h:369 +#: src/main/xmli18n-tmp.h:396 #, fuzzy msgid "Epson Stylus Pro 9600" msgstr "Stylus Pro 9600" -#: src/main/xmli18n-tmp.h:370 +#: src/main/xmli18n-tmp.h:397 #, fuzzy msgid "Epson Stylus Pro 10000" msgstr "Stylus Pro 10000" -#: src/main/xmli18n-tmp.h:371 +#: src/main/xmli18n-tmp.h:398 #, fuzzy msgid "Epson Stylus Scan 2000" msgstr "Stylus Scan 2000" -#: src/main/xmli18n-tmp.h:372 +#: src/main/xmli18n-tmp.h:399 #, fuzzy msgid "Epson Stylus Scan 2500" msgstr "Stylus Scan 2500" -#: src/main/xmli18n-tmp.h:373 +#: src/main/xmli18n-tmp.h:400 #, fuzzy msgid "Epson Stylus CX1500" msgstr "Stylus c20sx" -#: src/main/xmli18n-tmp.h:374 +#: src/main/xmli18n-tmp.h:401 #, fuzzy msgid "Epson Stylus CX3100" msgstr "Stylus c20sx" -#: src/main/xmli18n-tmp.h:375 +#: src/main/xmli18n-tmp.h:402 #, fuzzy msgid "Epson Stylus CX3200" msgstr "Stylus c20sx" -#: src/main/xmli18n-tmp.h:376 +#: src/main/xmli18n-tmp.h:403 #, fuzzy msgid "Epson Stylus CX3500" msgstr "Stylus c20sx" -#: src/main/xmli18n-tmp.h:377 +#: src/main/xmli18n-tmp.h:404 #, fuzzy msgid "Epson Stylus CX3600" msgstr "Stylus c20sx" -#: src/main/xmli18n-tmp.h:378 +#: src/main/xmli18n-tmp.h:405 #, fuzzy msgid "Epson Stylus CX3650" msgstr "Stylus c20sx" -#: src/main/xmli18n-tmp.h:379 +#: src/main/xmli18n-tmp.h:406 #, fuzzy msgid "Epson Stylus CX3700" msgstr "Stylus c20sx" -#: src/main/xmli18n-tmp.h:380 +#: src/main/xmli18n-tmp.h:407 #, fuzzy msgid "Epson Stylus CX3800" msgstr "Stylus c20sx" -#: src/main/xmli18n-tmp.h:381 +#: src/main/xmli18n-tmp.h:408 #, fuzzy msgid "Epson Stylus CX3805" -msgstr "Stylus C60" +msgstr "Stylus C80" -#: src/main/xmli18n-tmp.h:382 +#: src/main/xmli18n-tmp.h:409 #, fuzzy msgid "Epson Stylus CX3810" msgstr "Stylus c20sx" -#: src/main/xmli18n-tmp.h:383 +#: src/main/xmli18n-tmp.h:410 #, fuzzy msgid "Epson Stylus CX4100" msgstr "Stylus c20sx" -#: src/main/xmli18n-tmp.h:384 +#: src/main/xmli18n-tmp.h:411 #, fuzzy msgid "Epson Stylus CX4200" msgstr "Stylus c20sx" -#: src/main/xmli18n-tmp.h:385 +#: src/main/xmli18n-tmp.h:412 #, fuzzy msgid "Epson Stylus CX4400" msgstr "Stylus c20sx" -#: src/main/xmli18n-tmp.h:386 +#: src/main/xmli18n-tmp.h:413 #, fuzzy msgid "Epson Stylus CX4500" msgstr "Stylus c20sx" -#: src/main/xmli18n-tmp.h:387 +#: src/main/xmli18n-tmp.h:414 #, fuzzy msgid "Epson Stylus CX4600" msgstr "Stylus c20sx" -#: src/main/xmli18n-tmp.h:388 +#: src/main/xmli18n-tmp.h:415 #, fuzzy msgid "Epson Stylus CX4700" msgstr "Stylus c20sx" -#: src/main/xmli18n-tmp.h:389 +#: src/main/xmli18n-tmp.h:416 #, fuzzy msgid "Epson Stylus CX4800" msgstr "Stylus c20sx" -#: src/main/xmli18n-tmp.h:390 +#: src/main/xmli18n-tmp.h:417 #, fuzzy msgid "Epson Stylus CX4900" msgstr "Stylus c20sx" -#: src/main/xmli18n-tmp.h:391 +#: src/main/xmli18n-tmp.h:418 #, fuzzy msgid "Epson Stylus CX5000" msgstr "Stylus c20sx" -#: src/main/xmli18n-tmp.h:392 +#: src/main/xmli18n-tmp.h:419 #, fuzzy msgid "Epson Stylus CX5000F" msgstr "Stylus c20sx" -#: src/main/xmli18n-tmp.h:393 +#: src/main/xmli18n-tmp.h:420 #, fuzzy msgid "Epson Stylus CX5100" msgstr "Stylus C60" -#: src/main/xmli18n-tmp.h:394 +#: src/main/xmli18n-tmp.h:421 #, fuzzy msgid "Epson Stylus CX5200" msgstr "Stylus C60" -#: src/main/xmli18n-tmp.h:395 +#: src/main/xmli18n-tmp.h:422 #, fuzzy msgid "Epson Stylus CX5300" msgstr "Stylus c20sx" -#: src/main/xmli18n-tmp.h:396 +#: src/main/xmli18n-tmp.h:423 #, fuzzy msgid "Epson Stylus CX5400" msgstr "Stylus c20sx" -#: src/main/xmli18n-tmp.h:397 +#: src/main/xmli18n-tmp.h:424 #, fuzzy msgid "Epson Stylus CX5600" msgstr "Stylus c20sx" -#: src/main/xmli18n-tmp.h:398 +#: src/main/xmli18n-tmp.h:425 #, fuzzy msgid "Epson Stylus CX5700" msgstr "Stylus c20sx" -#: src/main/xmli18n-tmp.h:399 +#: src/main/xmli18n-tmp.h:426 #, fuzzy msgid "Epson Stylus CX5800" msgstr "Stylus c20sx" -#: src/main/xmli18n-tmp.h:400 +#: src/main/xmli18n-tmp.h:427 #, fuzzy msgid "Epson Stylus CX6000" msgstr "Stylus c20sx" -#: src/main/xmli18n-tmp.h:401 +#: src/main/xmli18n-tmp.h:428 #, fuzzy msgid "Epson Stylus CX6300" msgstr "Stylus c20sx" -#: src/main/xmli18n-tmp.h:402 +#: src/main/xmli18n-tmp.h:429 #, fuzzy msgid "Epson Stylus CX6400" msgstr "Stylus c20sx" -#: src/main/xmli18n-tmp.h:403 +#: src/main/xmli18n-tmp.h:430 #, fuzzy msgid "Epson Stylus CX6500" msgstr "Stylus c20sx" -#: src/main/xmli18n-tmp.h:404 +#: src/main/xmli18n-tmp.h:431 #, fuzzy msgid "Epson Stylus CX6600" msgstr "Stylus c20sx" -#: src/main/xmli18n-tmp.h:405 +#: src/main/xmli18n-tmp.h:432 #, fuzzy msgid "Epson Stylus CX7000F" -msgstr "Stylus c20sx" +msgstr "Stylus C70" -#: src/main/xmli18n-tmp.h:406 +#: src/main/xmli18n-tmp.h:433 #, fuzzy msgid "Epson Stylus CX7400" msgstr "Stylus c20sx" -#: src/main/xmli18n-tmp.h:407 +#: src/main/xmli18n-tmp.h:434 #, fuzzy msgid "Epson Stylus CX7700" msgstr "Stylus C70" -#: src/main/xmli18n-tmp.h:408 +#: src/main/xmli18n-tmp.h:435 #, fuzzy msgid "Epson Stylus CX7800" msgstr "Stylus c20sx" -#: src/main/xmli18n-tmp.h:409 +#: src/main/xmli18n-tmp.h:436 #, fuzzy msgid "Epson Stylus CX8300" msgstr "Stylus c20sx" -#: src/main/xmli18n-tmp.h:410 +#: src/main/xmli18n-tmp.h:437 #, fuzzy msgid "Epson Stylus CX8400" msgstr "Stylus c20sx" -#: src/main/xmli18n-tmp.h:411 +#: src/main/xmli18n-tmp.h:438 #, fuzzy msgid "Epson Stylus CX9400" msgstr "Stylus c20sx" -#: src/main/xmli18n-tmp.h:412 +#: src/main/xmli18n-tmp.h:439 #, fuzzy msgid "Epson Stylus D68" msgstr "Stylus C60" -#: src/main/xmli18n-tmp.h:413 +#: src/main/xmli18n-tmp.h:440 #, fuzzy msgid "Epson Stylus D88" msgstr "Stylus C80" -#: src/main/xmli18n-tmp.h:414 +#: src/main/xmli18n-tmp.h:441 +#, fuzzy +msgid "Epson Stylus D92" +msgstr "Stylus C62" + +#: src/main/xmli18n-tmp.h:442 #, fuzzy msgid "Epson Stylus D120" msgstr "Stylus C20ux" -#: src/main/xmli18n-tmp.h:415 +#: src/main/xmli18n-tmp.h:443 #, fuzzy msgid "Epson Stylus DX3800" msgstr "Stylus c20sx" -#: src/main/xmli18n-tmp.h:416 +#: src/main/xmli18n-tmp.h:444 #, fuzzy msgid "Epson Stylus DX3850" msgstr "Stylus c20sx" -#: src/main/xmli18n-tmp.h:417 +#: src/main/xmli18n-tmp.h:445 #, fuzzy msgid "Epson Stylus DX4050" msgstr "Stylus c20sx" -#: src/main/xmli18n-tmp.h:418 +#: src/main/xmli18n-tmp.h:446 #, fuzzy msgid "Epson Stylus DX4200" msgstr "Stylus c20sx" -#: src/main/xmli18n-tmp.h:419 +#: src/main/xmli18n-tmp.h:447 #, fuzzy msgid "Epson Stylus DX4250" -msgstr "Stylus C60" +msgstr "Stylus c20sx" -#: src/main/xmli18n-tmp.h:420 +#: src/main/xmli18n-tmp.h:448 +#, fuzzy +msgid "Epson Stylus DX4400" +msgstr "Stylus c20sx" + +#: src/main/xmli18n-tmp.h:449 +#, fuzzy +msgid "Epson Stylus DX4450" +msgstr "Stylus c20sx" + +#: src/main/xmli18n-tmp.h:450 #, fuzzy msgid "Epson Stylus DX4800" msgstr "Stylus c20sx" -#: src/main/xmli18n-tmp.h:421 +#: src/main/xmli18n-tmp.h:451 +#, fuzzy +msgid "Epson Stylus DX7000F" +msgstr "Stylus Pro 7000" + +#: src/main/xmli18n-tmp.h:452 +#, fuzzy +msgid "Epson Stylus DX7400" +msgstr "Stylus c20sx" + +#: src/main/xmli18n-tmp.h:453 +#, fuzzy +msgid "Epson Stylus DX7450" +msgstr "Stylus c20sx" + +#: src/main/xmli18n-tmp.h:454 +#, fuzzy +msgid "Epson Stylus DX8400" +msgstr "Stylus c20sx" + +#: src/main/xmli18n-tmp.h:455 +#, fuzzy +msgid "Epson Stylus DX8450" +msgstr "Stylus c20sx" + +#: src/main/xmli18n-tmp.h:456 msgid "Epson PictureMate" msgstr "" -#: src/main/xmli18n-tmp.h:422 +#: src/main/xmli18n-tmp.h:457 +msgid "Epson PictureMate Dash" +msgstr "" + +#: src/main/xmli18n-tmp.h:458 msgid "Epson PictureMate Deluxe" msgstr "" -#: src/main/xmli18n-tmp.h:423 +#: src/main/xmli18n-tmp.h:459 msgid "Epson PictureMate Flash" msgstr "" -#: src/main/xmli18n-tmp.h:424 -msgid "Epson PictureMate Pal" +#: src/main/xmli18n-tmp.h:460 +msgid "Epson PictureMate Pal" +msgstr "" + +#: src/main/xmli18n-tmp.h:461 +msgid "Epson PictureMate Snap" +msgstr "" + +#: src/main/xmli18n-tmp.h:462 +msgid "Epson PictureMate 100" +msgstr "" + +#: src/main/xmli18n-tmp.h:463 +msgid "Epson PictureMate 200" +msgstr "" + +#: src/main/xmli18n-tmp.h:464 +msgid "Epson PictureMate 210" +msgstr "" + +#: src/main/xmli18n-tmp.h:465 +msgid "Epson PictureMate 240" +msgstr "" + +#: src/main/xmli18n-tmp.h:466 +msgid "Epson PictureMate 250" +msgstr "" + +#: src/main/xmli18n-tmp.h:467 +msgid "Epson PictureMate 260" msgstr "" -#: src/main/xmli18n-tmp.h:425 -msgid "Epson PictureMate Snap" +#: src/main/xmli18n-tmp.h:468 +msgid "Epson PictureMate 270" msgstr "" -#: src/main/xmli18n-tmp.h:426 -#, fuzzy -msgid "Epson PictureMate 200" -msgstr "Stylus C60" - -#: src/main/xmli18n-tmp.h:427 -#, fuzzy -msgid "Epson PictureMate 210" -msgstr "Stylus C60" +#: src/main/xmli18n-tmp.h:469 +msgid "Epson PictureMate 280" +msgstr "" -#: src/main/xmli18n-tmp.h:428 -#, fuzzy -msgid "Epson PictureMate 240" -msgstr "Stylus C60" +#: src/main/xmli18n-tmp.h:470 +msgid "Epson PictureMate 290" +msgstr "" -#: src/main/xmli18n-tmp.h:429 -#, fuzzy -msgid "Epson PictureMate 250" -msgstr "Stylus C60" +#: src/main/xmli18n-tmp.h:471 +msgid "Epson PictureMate 500" +msgstr "" -#: src/main/xmli18n-tmp.h:430 -#, fuzzy -msgid "Epson PictureMate 280" -msgstr "Stylus C60" +#: src/main/xmli18n-tmp.h:472 +msgid "Epson PictureMate 2005" +msgstr "" -#: src/main/xmli18n-tmp.h:431 +#: src/main/xmli18n-tmp.h:473 msgid "Epson CL 700" msgstr "" -#: src/main/xmli18n-tmp.h:432 +#: src/main/xmli18n-tmp.h:474 msgid "Epson CL 750" msgstr "" -#: src/main/xmli18n-tmp.h:433 +#: src/main/xmli18n-tmp.h:475 msgid "Epson CL 760" msgstr "" -#: src/main/xmli18n-tmp.h:434 +#: src/main/xmli18n-tmp.h:476 msgid "Epson E 100" msgstr "" -#: src/main/xmli18n-tmp.h:435 +#: src/main/xmli18n-tmp.h:477 msgid "Epson E 150" msgstr "" -#: src/main/xmli18n-tmp.h:436 +#: src/main/xmli18n-tmp.h:478 msgid "Epson E 200" msgstr "" -#: src/main/xmli18n-tmp.h:437 +#: src/main/xmli18n-tmp.h:479 +msgid "Epson E 300" +msgstr "" + +#: src/main/xmli18n-tmp.h:480 +msgid "Epson E 500" +msgstr "" + +#: src/main/xmli18n-tmp.h:481 +msgid "Epson E 520" +msgstr "" + +#: src/main/xmli18n-tmp.h:482 +msgid "Epson E 700" +msgstr "" + +#: src/main/xmli18n-tmp.h:483 +msgid "Epson E 720" +msgstr "" + +#: src/main/xmli18n-tmp.h:484 msgid "Epson EM 900C" msgstr "" -#: src/main/xmli18n-tmp.h:438 +#: src/main/xmli18n-tmp.h:485 msgid "Epson EM 930C" msgstr "" -#: src/main/xmli18n-tmp.h:439 +#: src/main/xmli18n-tmp.h:486 msgid "Epson MC 2000" msgstr "" -#: src/main/xmli18n-tmp.h:440 +#: src/main/xmli18n-tmp.h:487 msgid "Epson MC 5000" msgstr "" -#: src/main/xmli18n-tmp.h:441 +#: src/main/xmli18n-tmp.h:488 msgid "Epson MC 7000" msgstr "" -#: src/main/xmli18n-tmp.h:442 +#: src/main/xmli18n-tmp.h:489 msgid "Epson MC 9000" msgstr "" -#: src/main/xmli18n-tmp.h:443 +#: src/main/xmli18n-tmp.h:490 msgid "Epson MC 10000" msgstr "" -#: src/main/xmli18n-tmp.h:444 +#: src/main/xmli18n-tmp.h:491 msgid "Epson MJ 930C" msgstr "" -#: src/main/xmli18n-tmp.h:445 +#: src/main/xmli18n-tmp.h:492 msgid "Epson MJ 5100C" msgstr "" -#: src/main/xmli18n-tmp.h:446 +#: src/main/xmli18n-tmp.h:493 msgid "Epson MJ 6000C" msgstr "" -#: src/main/xmli18n-tmp.h:447 +#: src/main/xmli18n-tmp.h:494 msgid "Epson MJ 8000C" msgstr "" -#: src/main/xmli18n-tmp.h:448 -#, fuzzy +#: src/main/xmli18n-tmp.h:495 msgid "Epson PM 670C" -msgstr "Stylus C60" +msgstr "" -#: src/main/xmli18n-tmp.h:449 +#: src/main/xmli18n-tmp.h:496 msgid "Epson PM 700C" msgstr "" -#: src/main/xmli18n-tmp.h:450 +#: src/main/xmli18n-tmp.h:497 msgid "Epson PM 730C" msgstr "" -#: src/main/xmli18n-tmp.h:451 +#: src/main/xmli18n-tmp.h:498 msgid "Epson PM 740C" msgstr "" -#: src/main/xmli18n-tmp.h:452 +#: src/main/xmli18n-tmp.h:499 msgid "Epson PM 750C" msgstr "" -#: src/main/xmli18n-tmp.h:453 +#: src/main/xmli18n-tmp.h:500 msgid "Epson PM 760C" msgstr "" -#: src/main/xmli18n-tmp.h:454 +#: src/main/xmli18n-tmp.h:501 msgid "Epson PM 770C" msgstr "" -#: src/main/xmli18n-tmp.h:455 +#: src/main/xmli18n-tmp.h:502 msgid "Epson PM 780C" msgstr "" -#: src/main/xmli18n-tmp.h:456 +#: src/main/xmli18n-tmp.h:503 msgid "Epson PM 790PT" msgstr "" -#: src/main/xmli18n-tmp.h:457 +#: src/main/xmli18n-tmp.h:504 msgid "Epson PM 800C" msgstr "" -#: src/main/xmli18n-tmp.h:458 +#: src/main/xmli18n-tmp.h:505 msgid "Epson PM 850PT" msgstr "" -#: src/main/xmli18n-tmp.h:459 +#: src/main/xmli18n-tmp.h:506 msgid "Epson PM 870C" msgstr "" -#: src/main/xmli18n-tmp.h:460 +#: src/main/xmli18n-tmp.h:507 msgid "Epson PM 880C" msgstr "" -#: src/main/xmli18n-tmp.h:461 +#: src/main/xmli18n-tmp.h:508 msgid "Epson PM 930C" msgstr "" -#: src/main/xmli18n-tmp.h:462 +#: src/main/xmli18n-tmp.h:509 msgid "Epson PM 940C" msgstr "" -#: src/main/xmli18n-tmp.h:463 +#: src/main/xmli18n-tmp.h:510 msgid "Epson PM 950C" msgstr "" -#: src/main/xmli18n-tmp.h:464 +#: src/main/xmli18n-tmp.h:511 msgid "Epson PM 970C" msgstr "" -#: src/main/xmli18n-tmp.h:465 +#: src/main/xmli18n-tmp.h:512 msgid "Epson PM 980C" msgstr "" -#: src/main/xmli18n-tmp.h:466 +#: src/main/xmli18n-tmp.h:513 msgid "Epson PM 2000C" msgstr "" -#: src/main/xmli18n-tmp.h:467 +#: src/main/xmli18n-tmp.h:514 msgid "Epson PM 2200C" msgstr "" -#: src/main/xmli18n-tmp.h:468 +#: src/main/xmli18n-tmp.h:515 msgid "Epson PM 3000C" msgstr "" -#: src/main/xmli18n-tmp.h:469 +#: src/main/xmli18n-tmp.h:516 msgid "Epson PM 3300C" msgstr "" -#: src/main/xmli18n-tmp.h:470 +#: src/main/xmli18n-tmp.h:517 msgid "Epson PM 3500C" msgstr "" -#: src/main/xmli18n-tmp.h:471 +#: src/main/xmli18n-tmp.h:518 msgid "Epson PM 3700C" msgstr "" -#: src/main/xmli18n-tmp.h:472 +#: src/main/xmli18n-tmp.h:519 msgid "Epson PM 4000PX" msgstr "" -#: src/main/xmli18n-tmp.h:473 +#: src/main/xmli18n-tmp.h:520 msgid "Epson PM 5000C" msgstr "" -#: src/main/xmli18n-tmp.h:474 +#: src/main/xmli18n-tmp.h:521 msgid "Epson PM 7000C" msgstr "" -#: src/main/xmli18n-tmp.h:475 +#: src/main/xmli18n-tmp.h:522 msgid "Epson PM 9000C" msgstr "" -#: src/main/xmli18n-tmp.h:476 +#: src/main/xmli18n-tmp.h:523 #, fuzzy msgid "Epson PM 10000" msgstr "Stylus Pro 10000" -#: src/main/xmli18n-tmp.h:477 +#: src/main/xmli18n-tmp.h:524 msgid "Epson PM A650" msgstr "" -#: src/main/xmli18n-tmp.h:478 +#: src/main/xmli18n-tmp.h:525 msgid "Epson PM A750" msgstr "" -#: src/main/xmli18n-tmp.h:479 -#, fuzzy +#: src/main/xmli18n-tmp.h:526 msgid "Epson PM A820" -msgstr "Stylus C60" +msgstr "" -#: src/main/xmli18n-tmp.h:480 +#: src/main/xmli18n-tmp.h:527 msgid "Epson PM A890" msgstr "" -#: src/main/xmli18n-tmp.h:481 -#, fuzzy +#: src/main/xmli18n-tmp.h:528 msgid "Epson PM A900" -msgstr "Stylus C60" +msgstr "" -#: src/main/xmli18n-tmp.h:482 +#: src/main/xmli18n-tmp.h:529 msgid "Epson PM A950" msgstr "" -#: src/main/xmli18n-tmp.h:483 +#: src/main/xmli18n-tmp.h:530 msgid "Epson PM D600" msgstr "" -#: src/main/xmli18n-tmp.h:484 +#: src/main/xmli18n-tmp.h:531 #, fuzzy msgid "Epson PM D750" msgstr "Stylus C60" -#: src/main/xmli18n-tmp.h:485 +#: src/main/xmli18n-tmp.h:532 #, fuzzy msgid "Epson PM D770" msgstr "Stylus C60" -#: src/main/xmli18n-tmp.h:486 +#: src/main/xmli18n-tmp.h:533 msgid "Epson PM D800" msgstr "" -#: src/main/xmli18n-tmp.h:487 -#, fuzzy +#: src/main/xmli18n-tmp.h:534 msgid "Epson PM D870" -msgstr "Stylus C60" +msgstr "" -#: src/main/xmli18n-tmp.h:488 +#: src/main/xmli18n-tmp.h:535 #, fuzzy msgid "Epson PM D1000" msgstr "Stylus C60" -#: src/main/xmli18n-tmp.h:489 +#: src/main/xmli18n-tmp.h:536 #, fuzzy msgid "Epson PM G700" msgstr "Stylus C60" -#: src/main/xmli18n-tmp.h:490 +#: src/main/xmli18n-tmp.h:537 #, fuzzy msgid "Epson PM G720" msgstr "Stylus C60" -#: src/main/xmli18n-tmp.h:491 +#: src/main/xmli18n-tmp.h:538 msgid "Epson PM G730" msgstr "" -#: src/main/xmli18n-tmp.h:492 +#: src/main/xmli18n-tmp.h:539 #, fuzzy msgid "Epson PM G800" msgstr "Stylus C60" -#: src/main/xmli18n-tmp.h:493 +#: src/main/xmli18n-tmp.h:540 #, fuzzy msgid "Epson PM G820" msgstr "Stylus C60" -#: src/main/xmli18n-tmp.h:494 -#, fuzzy +#: src/main/xmli18n-tmp.h:541 msgid "Epson PM G850" -msgstr "Stylus C60" +msgstr "" -#: src/main/xmli18n-tmp.h:495 -#, fuzzy +#: src/main/xmli18n-tmp.h:542 msgid "Epson PM G4500" -msgstr "Stylus C60" +msgstr "" -#: src/main/xmli18n-tmp.h:496 -#, fuzzy +#: src/main/xmli18n-tmp.h:543 msgid "Epson PX A650" -msgstr "Stylus C60" +msgstr "" -#: src/main/xmli18n-tmp.h:497 +#: src/main/xmli18n-tmp.h:544 #, fuzzy msgid "Epson PX G900" msgstr "Stylus C60" -#: src/main/xmli18n-tmp.h:498 +#: src/main/xmli18n-tmp.h:545 #, fuzzy msgid "Epson PX G920" msgstr "Stylus C60" -#: src/main/xmli18n-tmp.h:499 +#: src/main/xmli18n-tmp.h:546 #, fuzzy msgid "Epson PX G5000" msgstr "Stylus C60" -#: src/main/xmli18n-tmp.h:500 +#: src/main/xmli18n-tmp.h:547 #, fuzzy msgid "Epson PX V500" msgstr "Stylus C60" -#: src/main/xmli18n-tmp.h:501 +#: src/main/xmli18n-tmp.h:548 #, fuzzy msgid "Epson PX V600" msgstr "Stylus C60" -#: src/main/xmli18n-tmp.h:502 +#: src/main/xmli18n-tmp.h:549 msgid "Epson PX V630" msgstr "" -#: src/main/xmli18n-tmp.h:503 -#, fuzzy +#: src/main/xmli18n-tmp.h:550 msgid "Epson PX V780" -msgstr "Stylus C60" +msgstr "" -#: src/main/xmli18n-tmp.h:504 -#, fuzzy +#: src/main/xmli18n-tmp.h:551 msgid "Epson PX 5500" -msgstr "Stylus C60" +msgstr "" -#: src/main/xmli18n-tmp.h:505 +#: src/main/xmli18n-tmp.h:552 msgid "Epson PX 7000" msgstr "" -#: src/main/xmli18n-tmp.h:506 +#: src/main/xmli18n-tmp.h:553 msgid "Epson PX 9000" msgstr "" -#: src/main/xmli18n-tmp.h:507 +#: src/main/xmli18n-tmp.h:554 msgid "Apollo P-2100" msgstr "" -#: src/main/xmli18n-tmp.h:508 +#: src/main/xmli18n-tmp.h:555 msgid "Apollo P-2150" msgstr "" -#: src/main/xmli18n-tmp.h:509 +#: src/main/xmli18n-tmp.h:556 msgid "Apollo P-2200" msgstr "" -#: src/main/xmli18n-tmp.h:510 +#: src/main/xmli18n-tmp.h:557 msgid "Apollo P-2250" msgstr "" -#: src/main/xmli18n-tmp.h:511 +#: src/main/xmli18n-tmp.h:558 msgid "Apollo P-2500" msgstr "" -#: src/main/xmli18n-tmp.h:512 +#: src/main/xmli18n-tmp.h:559 msgid "Apollo P-2550" msgstr "" -#: src/main/xmli18n-tmp.h:513 +#: src/main/xmli18n-tmp.h:560 msgid "Apollo P-2600" msgstr "" -#: src/main/xmli18n-tmp.h:514 +#: src/main/xmli18n-tmp.h:561 msgid "Apollo P-2650" msgstr "" -#: src/main/xmli18n-tmp.h:515 +#: src/main/xmli18n-tmp.h:562 msgid "Apple Color StyleWriter 4100" msgstr "" -#: src/main/xmli18n-tmp.h:516 +#: src/main/xmli18n-tmp.h:563 msgid "Apple Color StyleWriter 4500" msgstr "" -#: src/main/xmli18n-tmp.h:517 +#: src/main/xmli18n-tmp.h:564 msgid "Apple Color StyleWriter 6500" msgstr "" -#: src/main/xmli18n-tmp.h:518 +#: src/main/xmli18n-tmp.h:565 msgid "Apple LaserWriter Select 360" msgstr "" -#: src/main/xmli18n-tmp.h:519 +#: src/main/xmli18n-tmp.h:566 msgid "Brother DCP-1200" msgstr "" -#: src/main/xmli18n-tmp.h:520 +#: src/main/xmli18n-tmp.h:567 msgid "Brother HL-4Ve" msgstr "" -#: src/main/xmli18n-tmp.h:521 +#: src/main/xmli18n-tmp.h:568 msgid "Brother HL-10V" msgstr "" -#: src/main/xmli18n-tmp.h:522 +#: src/main/xmli18n-tmp.h:569 msgid "Brother HL-10h" msgstr "" -#: src/main/xmli18n-tmp.h:523 +#: src/main/xmli18n-tmp.h:570 msgid "Brother HL-630" msgstr "" -#: src/main/xmli18n-tmp.h:524 +#: src/main/xmli18n-tmp.h:571 msgid "Brother HL-660" msgstr "" -#: src/main/xmli18n-tmp.h:525 +#: src/main/xmli18n-tmp.h:572 msgid "Brother HL-760" msgstr "" -#: src/main/xmli18n-tmp.h:526 +#: src/main/xmli18n-tmp.h:573 msgid "Brother HL-960" msgstr "" -#: src/main/xmli18n-tmp.h:527 +#: src/main/xmli18n-tmp.h:574 msgid "Brother HL-1040" msgstr "" -#: src/main/xmli18n-tmp.h:528 +#: src/main/xmli18n-tmp.h:575 msgid "Brother HL-1050" msgstr "" -#: src/main/xmli18n-tmp.h:529 +#: src/main/xmli18n-tmp.h:576 msgid "Brother HL-1060" msgstr "" -#: src/main/xmli18n-tmp.h:530 +#: src/main/xmli18n-tmp.h:577 msgid "Brother HL-1070" msgstr "" -#: src/main/xmli18n-tmp.h:531 +#: src/main/xmli18n-tmp.h:578 msgid "Brother HL-1240" msgstr "" -#: src/main/xmli18n-tmp.h:532 +#: src/main/xmli18n-tmp.h:579 msgid "Brother HL-1250" msgstr "" -#: src/main/xmli18n-tmp.h:533 +#: src/main/xmli18n-tmp.h:580 msgid "Brother HL-1260" msgstr "" -#: src/main/xmli18n-tmp.h:534 +#: src/main/xmli18n-tmp.h:581 msgid "Brother HL-1270N" msgstr "" -#: src/main/xmli18n-tmp.h:535 +#: src/main/xmli18n-tmp.h:582 msgid "Brother HL-1440" msgstr "" -#: src/main/xmli18n-tmp.h:536 +#: src/main/xmli18n-tmp.h:583 msgid "Brother HL-1660e" msgstr "" -#: src/main/xmli18n-tmp.h:537 +#: src/main/xmli18n-tmp.h:584 msgid "Brother HL-2060" msgstr "" -#: src/main/xmli18n-tmp.h:538 +#: src/main/xmli18n-tmp.h:585 msgid "Brother MFC-6550MC" msgstr "" -#: src/main/xmli18n-tmp.h:539 +#: src/main/xmli18n-tmp.h:586 msgid "Brother MFC-8300" msgstr "" -#: src/main/xmli18n-tmp.h:540 +#: src/main/xmli18n-tmp.h:587 msgid "Brother MFC-9500" msgstr "" -#: src/main/xmli18n-tmp.h:541 +#: src/main/xmli18n-tmp.h:588 msgid "Brother MFC-9600" msgstr "" -#: src/main/xmli18n-tmp.h:542 +#: src/main/xmli18n-tmp.h:589 msgid "Canon GP 335" msgstr "" -#: src/main/xmli18n-tmp.h:543 +#: src/main/xmli18n-tmp.h:590 msgid "Canon LBP-4sx" msgstr "" -#: src/main/xmli18n-tmp.h:544 +#: src/main/xmli18n-tmp.h:591 msgid "Canon LBP-430" msgstr "" -#: src/main/xmli18n-tmp.h:545 +#: src/main/xmli18n-tmp.h:592 msgid "Canon LBP-1000" msgstr "" -#: src/main/xmli18n-tmp.h:546 +#: src/main/xmli18n-tmp.h:593 msgid "Canon LBP-1260" msgstr "" -#: src/main/xmli18n-tmp.h:547 +#: src/main/xmli18n-tmp.h:594 msgid "Canon LBP-1760" msgstr "" -#: src/main/xmli18n-tmp.h:548 +#: src/main/xmli18n-tmp.h:595 msgid "Canon imageRunner 330s" msgstr "" -#: src/main/xmli18n-tmp.h:549 +#: src/main/xmli18n-tmp.h:596 msgid "Citizen ProJet II" msgstr "" -#: src/main/xmli18n-tmp.h:550 +#: src/main/xmli18n-tmp.h:597 msgid "DEC 1800" msgstr "" -#: src/main/xmli18n-tmp.h:551 +#: src/main/xmli18n-tmp.h:598 msgid "DEC LN17" msgstr "" -#: src/main/xmli18n-tmp.h:552 +#: src/main/xmli18n-tmp.h:599 msgid "Epson ActionLaser 1100" msgstr "" -#: src/main/xmli18n-tmp.h:553 +#: src/main/xmli18n-tmp.h:600 msgid "Epson ActionLaser II" msgstr "" -#: src/main/xmli18n-tmp.h:554 +#: src/main/xmli18n-tmp.h:601 msgid "Epson AcuLaser C2000" msgstr "" -#: src/main/xmli18n-tmp.h:555 +#: src/main/xmli18n-tmp.h:602 msgid "Epson AcuLaser C2000PS" msgstr "" -#: src/main/xmli18n-tmp.h:556 +#: src/main/xmli18n-tmp.h:603 msgid "Epson AcuLaser C8500" msgstr "" -#: src/main/xmli18n-tmp.h:557 +#: src/main/xmli18n-tmp.h:604 msgid "Epson AcuLaser C8500PS" msgstr "" -#: src/main/xmli18n-tmp.h:558 +#: src/main/xmli18n-tmp.h:605 msgid "Epson AcuLaser C8600" msgstr "" -#: src/main/xmli18n-tmp.h:559 +#: src/main/xmli18n-tmp.h:606 msgid "Epson AcuLaser C8600PS" msgstr "" -#: src/main/xmli18n-tmp.h:560 +#: src/main/xmli18n-tmp.h:607 msgid "Epson EPL-5200" msgstr "" -#: src/main/xmli18n-tmp.h:561 +#: src/main/xmli18n-tmp.h:608 msgid "Epson EPL-5200+" msgstr "" -#: src/main/xmli18n-tmp.h:562 +#: src/main/xmli18n-tmp.h:609 msgid "Epson EPL-5700" msgstr "" -#: src/main/xmli18n-tmp.h:563 +#: src/main/xmli18n-tmp.h:610 msgid "Epson EPL-5700PS" msgstr "" -#: src/main/xmli18n-tmp.h:564 +#: src/main/xmli18n-tmp.h:611 msgid "Epson EPL-5800" msgstr "" -#: src/main/xmli18n-tmp.h:565 +#: src/main/xmli18n-tmp.h:612 msgid "Epson EPL-5800PS" msgstr "" -#: src/main/xmli18n-tmp.h:566 +#: src/main/xmli18n-tmp.h:613 msgid "Epson EPL-5900" msgstr "" -#: src/main/xmli18n-tmp.h:567 +#: src/main/xmli18n-tmp.h:614 msgid "Epson EPL-5900PS" msgstr "" -#: src/main/xmli18n-tmp.h:568 +#: src/main/xmli18n-tmp.h:615 msgid "Epson EPL-6100" msgstr "" -#: src/main/xmli18n-tmp.h:569 +#: src/main/xmli18n-tmp.h:616 msgid "Epson EPL-6100PS" msgstr "" -#: src/main/xmli18n-tmp.h:570 +#: src/main/xmli18n-tmp.h:617 msgid "Epson EPL-7100" msgstr "" -#: src/main/xmli18n-tmp.h:571 +#: src/main/xmli18n-tmp.h:618 msgid "Fujitsu PrintPartner 10V" msgstr "" -#: src/main/xmli18n-tmp.h:572 +#: src/main/xmli18n-tmp.h:619 msgid "Fujitsu PrintPartner 16DV" msgstr "" -#: src/main/xmli18n-tmp.h:573 +#: src/main/xmli18n-tmp.h:620 msgid "Fujitsu PrintPartner 20W" msgstr "" -#: src/main/xmli18n-tmp.h:574 +#: src/main/xmli18n-tmp.h:621 msgid "Fujitsu PrintPartner 8000" msgstr "" -#: src/main/xmli18n-tmp.h:575 +#: src/main/xmli18n-tmp.h:622 #, fuzzy msgid "Generic PCL 4 Printer" msgstr "Definir nova Impressora" -#: src/main/xmli18n-tmp.h:576 +#: src/main/xmli18n-tmp.h:623 +#, fuzzy +msgid "Generic PCL 4 LF Printer" +msgstr "Definir nova Impressora" + +#: src/main/xmli18n-tmp.h:624 #, fuzzy msgid "Generic PCL 5 Printer" msgstr "Definir nova Impressora" -#: src/main/xmli18n-tmp.h:577 +#: src/main/xmli18n-tmp.h:625 +#, fuzzy +msgid "Generic PCL 5 LF Printer" +msgstr "Definir nova Impressora" + +#: src/main/xmli18n-tmp.h:626 #, fuzzy msgid "Generic PCL 5c Printer" msgstr "Definir nova Impressora" -#: src/main/xmli18n-tmp.h:578 +#: src/main/xmli18n-tmp.h:627 +#, fuzzy +msgid "Generic PCL 5c LF Printer" +msgstr "Definir nova Impressora" + +#: src/main/xmli18n-tmp.h:628 #, fuzzy msgid "Generic PCL 5e Printer" msgstr "Definir nova Impressora" -#: src/main/xmli18n-tmp.h:579 +#: src/main/xmli18n-tmp.h:629 +#, fuzzy +msgid "Generic PCL 5e LF Printer" +msgstr "Definir nova Impressora" + +#: src/main/xmli18n-tmp.h:630 msgid "Generic PCL 6/PCL XL Printer" msgstr "" -#: src/main/xmli18n-tmp.h:580 +#: src/main/xmli18n-tmp.h:631 +#, fuzzy +msgid "Generic PCL 6/PCL XL LF Printer" +msgstr "Definir nova Impressora" + +#: src/main/xmli18n-tmp.h:632 msgid "HP Business Inkjet 2200" msgstr "" -#: src/main/xmli18n-tmp.h:581 +#: src/main/xmli18n-tmp.h:633 msgid "HP Business Inkjet 2230" msgstr "" -#: src/main/xmli18n-tmp.h:582 +#: src/main/xmli18n-tmp.h:634 msgid "HP Business Inkjet 2250" msgstr "" -#: src/main/xmli18n-tmp.h:583 +#: src/main/xmli18n-tmp.h:635 msgid "HP Business Inkjet 2250TN" msgstr "" -#: src/main/xmli18n-tmp.h:584 +#: src/main/xmli18n-tmp.h:636 msgid "HP Business Inkjet 2280" msgstr "" -#: src/main/xmli18n-tmp.h:585 +#: src/main/xmli18n-tmp.h:637 msgid "HP Color Inkjet Printer CP1160" msgstr "" -#: src/main/xmli18n-tmp.h:586 +#: src/main/xmli18n-tmp.h:638 msgid "HP Color Inkjet Printer CP1700" msgstr "" -#: src/main/xmli18n-tmp.h:587 +#: src/main/xmli18n-tmp.h:639 msgid "HP Color LaserJet 2500" msgstr "" -#: src/main/xmli18n-tmp.h:588 +#: src/main/xmli18n-tmp.h:640 msgid "HP Color LaserJet 4500" msgstr "" -#: src/main/xmli18n-tmp.h:589 +#: src/main/xmli18n-tmp.h:641 msgid "HP Color LaserJet 4550" msgstr "" -#: src/main/xmli18n-tmp.h:590 +#: src/main/xmli18n-tmp.h:642 msgid "HP Color LaserJet 4600" msgstr "" -#: src/main/xmli18n-tmp.h:591 +#: src/main/xmli18n-tmp.h:643 msgid "HP Color LaserJet 5" msgstr "" -#: src/main/xmli18n-tmp.h:592 +#: src/main/xmli18n-tmp.h:644 msgid "HP Color LaserJet 5000" msgstr "" -#: src/main/xmli18n-tmp.h:593 +#: src/main/xmli18n-tmp.h:645 msgid "HP Color LaserJet 5500" msgstr "" -#: src/main/xmli18n-tmp.h:594 +#: src/main/xmli18n-tmp.h:646 msgid "HP Color LaserJet 8550GN" msgstr "" -#: src/main/xmli18n-tmp.h:595 +#: src/main/xmli18n-tmp.h:647 msgid "HP DesignJet 230" msgstr "" -#: src/main/xmli18n-tmp.h:596 +#: src/main/xmli18n-tmp.h:648 msgid "HP DesignJet 250C" msgstr "" -#: src/main/xmli18n-tmp.h:597 +#: src/main/xmli18n-tmp.h:649 msgid "HP DesignJet 430" msgstr "" -#: src/main/xmli18n-tmp.h:598 +#: src/main/xmli18n-tmp.h:650 msgid "HP DesignJet 450C" msgstr "" -#: src/main/xmli18n-tmp.h:599 +#: src/main/xmli18n-tmp.h:651 msgid "HP DesignJet 455CA" msgstr "" -#: src/main/xmli18n-tmp.h:600 +#: src/main/xmli18n-tmp.h:652 msgid "HP DesignJet 488CA" msgstr "" -#: src/main/xmli18n-tmp.h:601 +#: src/main/xmli18n-tmp.h:653 msgid "HP DesignJet 700" msgstr "" -#: src/main/xmli18n-tmp.h:602 +#: src/main/xmli18n-tmp.h:654 msgid "HP DesignJet 750C Plus" msgstr "" -#: src/main/xmli18n-tmp.h:603 +#: src/main/xmli18n-tmp.h:655 msgid "HP DesignJet 750C" msgstr "" -#: src/main/xmli18n-tmp.h:604 +#: src/main/xmli18n-tmp.h:656 msgid "HP DesignJet 2500CP" msgstr "" -#: src/main/xmli18n-tmp.h:605 +#: src/main/xmli18n-tmp.h:657 msgid "HP DesignJet 3500CP" msgstr "" -#: src/main/xmli18n-tmp.h:606 +#: src/main/xmli18n-tmp.h:658 msgid "HP DesignJet ColorPro CAD" msgstr "" -#: src/main/xmli18n-tmp.h:607 +#: src/main/xmli18n-tmp.h:659 msgid "HP DeskJet 400" msgstr "" -#: src/main/xmli18n-tmp.h:608 +#: src/main/xmli18n-tmp.h:660 msgid "HP DeskJet 420C" msgstr "" -#: src/main/xmli18n-tmp.h:609 +#: src/main/xmli18n-tmp.h:661 msgid "HP DeskJet 450" msgstr "" -#: src/main/xmli18n-tmp.h:610 +#: src/main/xmli18n-tmp.h:662 msgid "HP DeskJet 500" msgstr "" -#: src/main/xmli18n-tmp.h:611 +#: src/main/xmli18n-tmp.h:663 msgid "HP DeskJet 500C" msgstr "" -#: src/main/xmli18n-tmp.h:612 +#: src/main/xmli18n-tmp.h:664 msgid "HP DeskJet 505J Plus" msgstr "" -#: src/main/xmli18n-tmp.h:613 +#: src/main/xmli18n-tmp.h:665 msgid "HP DeskJet 510" msgstr "" -#: src/main/xmli18n-tmp.h:614 +#: src/main/xmli18n-tmp.h:666 msgid "HP DeskJet 520" msgstr "" -#: src/main/xmli18n-tmp.h:615 +#: src/main/xmli18n-tmp.h:667 msgid "HP DeskJet 540C" msgstr "" -#: src/main/xmli18n-tmp.h:616 +#: src/main/xmli18n-tmp.h:668 msgid "HP DeskJet 550C" msgstr "" -#: src/main/xmli18n-tmp.h:617 +#: src/main/xmli18n-tmp.h:669 msgid "HP DeskJet 5550" msgstr "" -#: src/main/xmli18n-tmp.h:618 +#: src/main/xmli18n-tmp.h:670 msgid "HP DeskJet 5551" msgstr "" -#: src/main/xmli18n-tmp.h:619 +#: src/main/xmli18n-tmp.h:671 msgid "HP DeskJet 560C" msgstr "" -#: src/main/xmli18n-tmp.h:620 +#: src/main/xmli18n-tmp.h:672 msgid "HP DeskJet 600" msgstr "" -#: src/main/xmli18n-tmp.h:621 +#: src/main/xmli18n-tmp.h:673 msgid "HP DeskJet 600C" msgstr "" -#: src/main/xmli18n-tmp.h:622 +#: src/main/xmli18n-tmp.h:674 msgid "HP DeskJet 610C" msgstr "" -#: src/main/xmli18n-tmp.h:623 +#: src/main/xmli18n-tmp.h:675 msgid "HP DeskJet 610CL" msgstr "" -#: src/main/xmli18n-tmp.h:624 +#: src/main/xmli18n-tmp.h:676 msgid "HP DeskJet 6122" msgstr "" -#: src/main/xmli18n-tmp.h:625 +#: src/main/xmli18n-tmp.h:677 msgid "HP DeskJet 6127" msgstr "" -#: src/main/xmli18n-tmp.h:626 +#: src/main/xmli18n-tmp.h:678 msgid "HP DeskJet 612C" msgstr "" -#: src/main/xmli18n-tmp.h:627 +#: src/main/xmli18n-tmp.h:679 msgid "HP DeskJet 640C" msgstr "" -#: src/main/xmli18n-tmp.h:628 +#: src/main/xmli18n-tmp.h:680 msgid "HP DeskJet 648C" msgstr "" -#: src/main/xmli18n-tmp.h:629 +#: src/main/xmli18n-tmp.h:681 msgid "HP DeskJet 660C" msgstr "" -#: src/main/xmli18n-tmp.h:630 +#: src/main/xmli18n-tmp.h:682 msgid "HP DeskJet 670C" msgstr "" -#: src/main/xmli18n-tmp.h:631 +#: src/main/xmli18n-tmp.h:683 msgid "HP DeskJet 670TV" msgstr "" -#: src/main/xmli18n-tmp.h:632 +#: src/main/xmli18n-tmp.h:684 msgid "HP DeskJet 672C" msgstr "" -#: src/main/xmli18n-tmp.h:633 +#: src/main/xmli18n-tmp.h:685 msgid "HP DeskJet 680C" msgstr "" -#: src/main/xmli18n-tmp.h:634 +#: src/main/xmli18n-tmp.h:686 msgid "HP DeskJet 682C" msgstr "" -#: src/main/xmli18n-tmp.h:635 +#: src/main/xmli18n-tmp.h:687 msgid "HP DeskJet 690C" msgstr "" -#: src/main/xmli18n-tmp.h:636 +#: src/main/xmli18n-tmp.h:688 msgid "HP DeskJet 692C" msgstr "" -#: src/main/xmli18n-tmp.h:637 +#: src/main/xmli18n-tmp.h:689 msgid "HP DeskJet 693C" msgstr "" -#: src/main/xmli18n-tmp.h:638 +#: src/main/xmli18n-tmp.h:690 msgid "HP DeskJet 694C" msgstr "" -#: src/main/xmli18n-tmp.h:639 +#: src/main/xmli18n-tmp.h:691 msgid "HP DeskJet 695C" msgstr "" -#: src/main/xmli18n-tmp.h:640 +#: src/main/xmli18n-tmp.h:692 msgid "HP DeskJet 697C" msgstr "" -#: src/main/xmli18n-tmp.h:641 +#: src/main/xmli18n-tmp.h:693 msgid "HP DeskJet 810C" msgstr "" -#: src/main/xmli18n-tmp.h:642 +#: src/main/xmli18n-tmp.h:694 msgid "HP DeskJet 812C" msgstr "" -#: src/main/xmli18n-tmp.h:643 +#: src/main/xmli18n-tmp.h:695 msgid "HP DeskJet 815C" msgstr "" -#: src/main/xmli18n-tmp.h:644 +#: src/main/xmli18n-tmp.h:696 msgid "HP DeskJet 816C" msgstr "" -#: src/main/xmli18n-tmp.h:645 +#: src/main/xmli18n-tmp.h:697 msgid "HP DeskJet 825C" msgstr "" -#: src/main/xmli18n-tmp.h:646 +#: src/main/xmli18n-tmp.h:698 msgid "HP DeskJet 830C" msgstr "" -#: src/main/xmli18n-tmp.h:647 +#: src/main/xmli18n-tmp.h:699 msgid "HP DeskJet 832C" msgstr "" -#: src/main/xmli18n-tmp.h:648 +#: src/main/xmli18n-tmp.h:700 msgid "HP DeskJet 840C" msgstr "" -#: src/main/xmli18n-tmp.h:649 +#: src/main/xmli18n-tmp.h:701 msgid "HP DeskJet 841C" msgstr "" -#: src/main/xmli18n-tmp.h:650 +#: src/main/xmli18n-tmp.h:702 msgid "HP DeskJet 842C" msgstr "" -#: src/main/xmli18n-tmp.h:651 +#: src/main/xmli18n-tmp.h:703 msgid "HP DeskJet 843C" msgstr "" -#: src/main/xmli18n-tmp.h:652 +#: src/main/xmli18n-tmp.h:704 msgid "HP DeskJet 845C" msgstr "" -#: src/main/xmli18n-tmp.h:653 +#: src/main/xmli18n-tmp.h:705 msgid "HP DeskJet 850C" msgstr "" -#: src/main/xmli18n-tmp.h:654 +#: src/main/xmli18n-tmp.h:706 msgid "HP DeskJet 855C" msgstr "" -#: src/main/xmli18n-tmp.h:655 +#: src/main/xmli18n-tmp.h:707 msgid "HP DeskJet 870C" msgstr "" -#: src/main/xmli18n-tmp.h:656 +#: src/main/xmli18n-tmp.h:708 msgid "HP DeskJet 880C" msgstr "" -#: src/main/xmli18n-tmp.h:657 +#: src/main/xmli18n-tmp.h:709 msgid "HP DeskJet 882C" msgstr "" -#: src/main/xmli18n-tmp.h:658 +#: src/main/xmli18n-tmp.h:710 msgid "HP DeskJet 890C" msgstr "" -#: src/main/xmli18n-tmp.h:659 +#: src/main/xmli18n-tmp.h:711 msgid "HP DeskJet 895C" msgstr "" -#: src/main/xmli18n-tmp.h:660 +#: src/main/xmli18n-tmp.h:712 msgid "HP DeskJet 916C" msgstr "" -#: src/main/xmli18n-tmp.h:661 +#: src/main/xmli18n-tmp.h:713 msgid "HP DeskJet 920C" msgstr "" -#: src/main/xmli18n-tmp.h:662 +#: src/main/xmli18n-tmp.h:714 msgid "HP DeskJet 9300" msgstr "" -#: src/main/xmli18n-tmp.h:663 +#: src/main/xmli18n-tmp.h:715 msgid "HP DeskJet 930C" msgstr "" -#: src/main/xmli18n-tmp.h:664 +#: src/main/xmli18n-tmp.h:716 msgid "HP DeskJet 932C" msgstr "" -#: src/main/xmli18n-tmp.h:665 +#: src/main/xmli18n-tmp.h:717 msgid "HP DeskJet 933C" msgstr "" -#: src/main/xmli18n-tmp.h:666 +#: src/main/xmli18n-tmp.h:718 msgid "HP DeskJet 934C" msgstr "" -#: src/main/xmli18n-tmp.h:667 +#: src/main/xmli18n-tmp.h:719 msgid "HP DeskJet 935C" msgstr "" -#: src/main/xmli18n-tmp.h:668 +#: src/main/xmli18n-tmp.h:720 msgid "HP DeskJet 940C" msgstr "" -#: src/main/xmli18n-tmp.h:669 +#: src/main/xmli18n-tmp.h:721 msgid "HP DeskJet 948C" msgstr "" -#: src/main/xmli18n-tmp.h:670 +#: src/main/xmli18n-tmp.h:722 msgid "HP DeskJet 950C" msgstr "" -#: src/main/xmli18n-tmp.h:671 +#: src/main/xmli18n-tmp.h:723 msgid "HP DeskJet 952C" msgstr "" -#: src/main/xmli18n-tmp.h:672 +#: src/main/xmli18n-tmp.h:724 msgid "HP DeskJet 955C" msgstr "" -#: src/main/xmli18n-tmp.h:673 +#: src/main/xmli18n-tmp.h:725 msgid "HP DeskJet 957C" msgstr "" -#: src/main/xmli18n-tmp.h:674 +#: src/main/xmli18n-tmp.h:726 msgid "HP DeskJet 959C" msgstr "" -#: src/main/xmli18n-tmp.h:675 +#: src/main/xmli18n-tmp.h:727 msgid "HP DeskJet 960C" msgstr "" -#: src/main/xmli18n-tmp.h:676 +#: src/main/xmli18n-tmp.h:728 msgid "HP DeskJet 970C" msgstr "" -#: src/main/xmli18n-tmp.h:677 +#: src/main/xmli18n-tmp.h:729 msgid "HP DeskJet 975C" msgstr "" -#: src/main/xmli18n-tmp.h:678 +#: src/main/xmli18n-tmp.h:730 msgid "HP DeskJet 980C" msgstr "" -#: src/main/xmli18n-tmp.h:679 +#: src/main/xmli18n-tmp.h:731 msgid "HP DeskJet 990C" msgstr "" -#: src/main/xmli18n-tmp.h:680 +#: src/main/xmli18n-tmp.h:732 msgid "HP DeskJet 995C" msgstr "" -#: src/main/xmli18n-tmp.h:681 +#: src/main/xmli18n-tmp.h:733 msgid "HP DeskJet 1100C" msgstr "" -#: src/main/xmli18n-tmp.h:682 +#: src/main/xmli18n-tmp.h:734 msgid "HP DeskJet 1120C" msgstr "" -#: src/main/xmli18n-tmp.h:683 +#: src/main/xmli18n-tmp.h:735 msgid "HP DeskJet 1125C" msgstr "" -#: src/main/xmli18n-tmp.h:684 +#: src/main/xmli18n-tmp.h:736 msgid "HP DeskJet 1200C" msgstr "" -#: src/main/xmli18n-tmp.h:685 +#: src/main/xmli18n-tmp.h:737 msgid "HP DeskJet 1220C" msgstr "" -#: src/main/xmli18n-tmp.h:686 +#: src/main/xmli18n-tmp.h:738 msgid "HP DeskJet 1600C" msgstr "" -#: src/main/xmli18n-tmp.h:687 +#: src/main/xmli18n-tmp.h:739 msgid "HP DeskJet 1600CM" msgstr "" -#: src/main/xmli18n-tmp.h:688 +#: src/main/xmli18n-tmp.h:740 msgid "HP DeskJet 2000" msgstr "" -#: src/main/xmli18n-tmp.h:689 +#: src/main/xmli18n-tmp.h:741 msgid "HP DeskJet 2500" msgstr "" -#: src/main/xmli18n-tmp.h:690 +#: src/main/xmli18n-tmp.h:742 msgid "HP DeskJet 2500CM" msgstr "" -#: src/main/xmli18n-tmp.h:691 +#: src/main/xmli18n-tmp.h:743 msgid "HP DeskJet 340C" msgstr "" -#: src/main/xmli18n-tmp.h:692 +#: src/main/xmli18n-tmp.h:744 msgid "HP DeskJet 3810" msgstr "" -#: src/main/xmli18n-tmp.h:693 +#: src/main/xmli18n-tmp.h:745 msgid "HP DeskJet 3816" msgstr "" -#: src/main/xmli18n-tmp.h:694 +#: src/main/xmli18n-tmp.h:746 msgid "HP DeskJet 3820" msgstr "" -#: src/main/xmli18n-tmp.h:695 +#: src/main/xmli18n-tmp.h:747 msgid "HP DeskJet 3822" msgstr "" -#: src/main/xmli18n-tmp.h:696 +#: src/main/xmli18n-tmp.h:748 msgid "HP LaserJet 2" msgstr "" -#: src/main/xmli18n-tmp.h:697 +#: src/main/xmli18n-tmp.h:749 msgid "HP LaserJet 2D" msgstr "" -#: src/main/xmli18n-tmp.h:698 +#: src/main/xmli18n-tmp.h:750 msgid "HP LaserJet 2P Plus" msgstr "" -#: src/main/xmli18n-tmp.h:699 +#: src/main/xmli18n-tmp.h:751 msgid "HP LaserJet 2P" msgstr "" -#: src/main/xmli18n-tmp.h:700 +#: src/main/xmli18n-tmp.h:752 msgid "HP LaserJet 3" msgstr "" -#: src/main/xmli18n-tmp.h:701 +#: src/main/xmli18n-tmp.h:753 msgid "HP LaserJet 3D" msgstr "" -#: src/main/xmli18n-tmp.h:702 +#: src/main/xmli18n-tmp.h:754 msgid "HP LaserJet 3P w/ PCL5" msgstr "" -#: src/main/xmli18n-tmp.h:703 +#: src/main/xmli18n-tmp.h:755 msgid "HP LaserJet 3P w/PS" msgstr "" -#: src/main/xmli18n-tmp.h:704 +#: src/main/xmli18n-tmp.h:756 msgid "HP LaserJet 4 Plus" msgstr "" -#: src/main/xmli18n-tmp.h:705 +#: src/main/xmli18n-tmp.h:757 msgid "HP LaserJet 4" msgstr "" -#: src/main/xmli18n-tmp.h:706 +#: src/main/xmli18n-tmp.h:758 msgid "HP LaserJet 4L" msgstr "" -#: src/main/xmli18n-tmp.h:707 +#: src/main/xmli18n-tmp.h:759 msgid "HP LaserJet 4M" msgstr "" -#: src/main/xmli18n-tmp.h:708 +#: src/main/xmli18n-tmp.h:760 msgid "HP LaserJet 4ML" msgstr "" -#: src/main/xmli18n-tmp.h:709 +#: src/main/xmli18n-tmp.h:761 msgid "HP LaserJet 4P" msgstr "" -#: src/main/xmli18n-tmp.h:710 +#: src/main/xmli18n-tmp.h:762 msgid "HP LaserJet 4Si" msgstr "" -#: src/main/xmli18n-tmp.h:711 +#: src/main/xmli18n-tmp.h:763 msgid "HP LaserJet 4V" msgstr "" -#: src/main/xmli18n-tmp.h:712 +#: src/main/xmli18n-tmp.h:764 msgid "HP LaserJet 5" msgstr "" -#: src/main/xmli18n-tmp.h:713 +#: src/main/xmli18n-tmp.h:765 msgid "HP LaserJet 5L" msgstr "" -#: src/main/xmli18n-tmp.h:714 +#: src/main/xmli18n-tmp.h:766 msgid "HP LaserJet 5M" msgstr "" -#: src/main/xmli18n-tmp.h:715 +#: src/main/xmli18n-tmp.h:767 msgid "HP LaserJet 5MP" msgstr "" -#: src/main/xmli18n-tmp.h:716 +#: src/main/xmli18n-tmp.h:768 msgid "HP LaserJet 5P" msgstr "" -#: src/main/xmli18n-tmp.h:717 +#: src/main/xmli18n-tmp.h:769 msgid "HP LaserJet 5Si" msgstr "" -#: src/main/xmli18n-tmp.h:718 +#: src/main/xmli18n-tmp.h:770 msgid "HP LaserJet 6" msgstr "" -#: src/main/xmli18n-tmp.h:719 +#: src/main/xmli18n-tmp.h:771 msgid "HP LaserJet 6L" msgstr "" -#: src/main/xmli18n-tmp.h:720 +#: src/main/xmli18n-tmp.h:772 msgid "HP LaserJet 6MP" msgstr "" -#: src/main/xmli18n-tmp.h:721 +#: src/main/xmli18n-tmp.h:773 msgid "HP LaserJet 6P" msgstr "" -#: src/main/xmli18n-tmp.h:722 +#: src/main/xmli18n-tmp.h:774 msgid "HP LaserJet 1010" msgstr "" -#: src/main/xmli18n-tmp.h:723 +#: src/main/xmli18n-tmp.h:775 msgid "HP LaserJet 1012" msgstr "" -#: src/main/xmli18n-tmp.h:724 +#: src/main/xmli18n-tmp.h:776 msgid "HP LaserJet 1015" msgstr "" -#: src/main/xmli18n-tmp.h:725 +#: src/main/xmli18n-tmp.h:777 msgid "HP LaserJet 1022" msgstr "" -#: src/main/xmli18n-tmp.h:726 +#: src/main/xmli18n-tmp.h:778 msgid "HP LaserJet 1100" msgstr "" -#: src/main/xmli18n-tmp.h:727 +#: src/main/xmli18n-tmp.h:779 msgid "HP LaserJet 1100A" msgstr "" -#: src/main/xmli18n-tmp.h:728 +#: src/main/xmli18n-tmp.h:780 msgid "HP LaserJet 1150" msgstr "" -#: src/main/xmli18n-tmp.h:729 +#: src/main/xmli18n-tmp.h:781 msgid "HP LaserJet 1200" msgstr "" -#: src/main/xmli18n-tmp.h:730 +#: src/main/xmli18n-tmp.h:782 msgid "HP LaserJet 1220" msgstr "" -#: src/main/xmli18n-tmp.h:731 +#: src/main/xmli18n-tmp.h:783 msgid "HP LaserJet 1300" msgstr "" -#: src/main/xmli18n-tmp.h:732 +#: src/main/xmli18n-tmp.h:784 msgid "HP LaserJet 2100" msgstr "" -#: src/main/xmli18n-tmp.h:733 +#: src/main/xmli18n-tmp.h:785 msgid "HP LaserJet 2100M" msgstr "" -#: src/main/xmli18n-tmp.h:734 +#: src/main/xmli18n-tmp.h:786 msgid "HP LaserJet 2200" msgstr "" -#: src/main/xmli18n-tmp.h:735 +#: src/main/xmli18n-tmp.h:787 msgid "HP LaserJet 2300" msgstr "" -#: src/main/xmli18n-tmp.h:736 +#: src/main/xmli18n-tmp.h:788 msgid "HP LaserJet 3200" msgstr "" -#: src/main/xmli18n-tmp.h:737 +#: src/main/xmli18n-tmp.h:789 msgid "HP LaserJet 3200m" msgstr "" -#: src/main/xmli18n-tmp.h:738 +#: src/main/xmli18n-tmp.h:790 msgid "HP LaserJet 3200se" msgstr "" -#: src/main/xmli18n-tmp.h:739 +#: src/main/xmli18n-tmp.h:791 msgid "HP LaserJet 3300 MFP" msgstr "" -#: src/main/xmli18n-tmp.h:740 +#: src/main/xmli18n-tmp.h:792 msgid "HP LaserJet 3310 MFP" msgstr "" -#: src/main/xmli18n-tmp.h:741 +#: src/main/xmli18n-tmp.h:793 msgid "HP LaserJet 3320 MFP" msgstr "" -#: src/main/xmli18n-tmp.h:742 +#: src/main/xmli18n-tmp.h:794 msgid "HP LaserJet 3320N MFP" msgstr "" -#: src/main/xmli18n-tmp.h:743 +#: src/main/xmli18n-tmp.h:795 msgid "HP LaserJet 3330 MFP" msgstr "" -#: src/main/xmli18n-tmp.h:744 +#: src/main/xmli18n-tmp.h:796 msgid "HP LaserJet 4000" msgstr "" -#: src/main/xmli18n-tmp.h:745 +#: src/main/xmli18n-tmp.h:797 msgid "HP LaserJet 4050" msgstr "" -#: src/main/xmli18n-tmp.h:746 +#: src/main/xmli18n-tmp.h:798 msgid "HP LaserJet 4100" msgstr "" -#: src/main/xmli18n-tmp.h:747 +#: src/main/xmli18n-tmp.h:799 msgid "HP LaserJet 4200" msgstr "" -#: src/main/xmli18n-tmp.h:748 +#: src/main/xmli18n-tmp.h:800 msgid "HP LaserJet 4300" msgstr "" -#: src/main/xmli18n-tmp.h:749 +#: src/main/xmli18n-tmp.h:801 msgid "HP LaserJet 5000" msgstr "" -#: src/main/xmli18n-tmp.h:750 +#: src/main/xmli18n-tmp.h:802 msgid "HP LaserJet 5100" msgstr "" -#: src/main/xmli18n-tmp.h:751 +#: src/main/xmli18n-tmp.h:803 msgid "HP LaserJet 8000" msgstr "" -#: src/main/xmli18n-tmp.h:752 +#: src/main/xmli18n-tmp.h:804 msgid "HP LaserJet 8100" msgstr "" -#: src/main/xmli18n-tmp.h:753 +#: src/main/xmli18n-tmp.h:805 msgid "HP LaserJet 8150" msgstr "" -#: src/main/xmli18n-tmp.h:754 +#: src/main/xmli18n-tmp.h:806 msgid "HP LaserJet 9000" msgstr "" -#: src/main/xmli18n-tmp.h:755 +#: src/main/xmli18n-tmp.h:807 msgid "HP Mopier 240" msgstr "" -#: src/main/xmli18n-tmp.h:756 +#: src/main/xmli18n-tmp.h:808 msgid "HP Mopier 320" msgstr "" -#: src/main/xmli18n-tmp.h:757 +#: src/main/xmli18n-tmp.h:809 msgid "HP OfficeJet 300" msgstr "" -#: src/main/xmli18n-tmp.h:758 +#: src/main/xmli18n-tmp.h:810 msgid "HP OfficeJet 330" msgstr "" -#: src/main/xmli18n-tmp.h:759 +#: src/main/xmli18n-tmp.h:811 msgid "HP OfficeJet 350" msgstr "" -#: src/main/xmli18n-tmp.h:760 +#: src/main/xmli18n-tmp.h:812 msgid "HP OfficeJet 500" msgstr "" -#: src/main/xmli18n-tmp.h:761 +#: src/main/xmli18n-tmp.h:813 msgid "HP OfficeJet 520" msgstr "" -#: src/main/xmli18n-tmp.h:762 +#: src/main/xmli18n-tmp.h:814 msgid "HP OfficeJet 570" msgstr "" -#: src/main/xmli18n-tmp.h:763 +#: src/main/xmli18n-tmp.h:815 msgid "HP OfficeJet 580" msgstr "" -#: src/main/xmli18n-tmp.h:764 +#: src/main/xmli18n-tmp.h:816 msgid "HP OfficeJet 590" msgstr "" -#: src/main/xmli18n-tmp.h:765 +#: src/main/xmli18n-tmp.h:817 msgid "HP OfficeJet 600" msgstr "" -#: src/main/xmli18n-tmp.h:766 +#: src/main/xmli18n-tmp.h:818 msgid "HP OfficeJet 610" msgstr "" -#: src/main/xmli18n-tmp.h:767 +#: src/main/xmli18n-tmp.h:819 msgid "HP OfficeJet 625" msgstr "" -#: src/main/xmli18n-tmp.h:768 +#: src/main/xmli18n-tmp.h:820 msgid "HP OfficeJet 630" msgstr "" -#: src/main/xmli18n-tmp.h:769 +#: src/main/xmli18n-tmp.h:821 msgid "HP OfficeJet 635" msgstr "" -#: src/main/xmli18n-tmp.h:770 +#: src/main/xmli18n-tmp.h:822 msgid "HP OfficeJet 700" msgstr "" -#: src/main/xmli18n-tmp.h:771 +#: src/main/xmli18n-tmp.h:823 msgid "HP OfficeJet 710" msgstr "" -#: src/main/xmli18n-tmp.h:772 +#: src/main/xmli18n-tmp.h:824 msgid "HP OfficeJet 720" msgstr "" -#: src/main/xmli18n-tmp.h:773 +#: src/main/xmli18n-tmp.h:825 msgid "HP OfficeJet 725" msgstr "" -#: src/main/xmli18n-tmp.h:774 +#: src/main/xmli18n-tmp.h:826 msgid "HP OfficeJet 5105" msgstr "" -#: src/main/xmli18n-tmp.h:775 +#: src/main/xmli18n-tmp.h:827 msgid "HP OfficeJet 5110" msgstr "" -#: src/main/xmli18n-tmp.h:776 +#: src/main/xmli18n-tmp.h:828 msgid "HP OfficeJet 5110xi" msgstr "" -#: src/main/xmli18n-tmp.h:777 +#: src/main/xmli18n-tmp.h:829 msgid "HP OfficeJet 6105" msgstr "" -#: src/main/xmli18n-tmp.h:778 +#: src/main/xmli18n-tmp.h:830 msgid "HP OfficeJet 6110" msgstr "" -#: src/main/xmli18n-tmp.h:779 +#: src/main/xmli18n-tmp.h:831 msgid "HP OfficeJet 7110" msgstr "" -#: src/main/xmli18n-tmp.h:780 +#: src/main/xmli18n-tmp.h:832 msgid "HP OfficeJet 7130" msgstr "" -#: src/main/xmli18n-tmp.h:781 +#: src/main/xmli18n-tmp.h:833 msgid "HP OfficeJet 7140" msgstr "" -#: src/main/xmli18n-tmp.h:782 +#: src/main/xmli18n-tmp.h:834 msgid "HP OfficeJet D125" msgstr "" -#: src/main/xmli18n-tmp.h:783 +#: src/main/xmli18n-tmp.h:835 msgid "HP OfficeJet D135" msgstr "" -#: src/main/xmli18n-tmp.h:784 +#: src/main/xmli18n-tmp.h:836 msgid "HP OfficeJet D145" msgstr "" -#: src/main/xmli18n-tmp.h:785 +#: src/main/xmli18n-tmp.h:837 msgid "HP OfficeJet D155" msgstr "" -#: src/main/xmli18n-tmp.h:786 +#: src/main/xmli18n-tmp.h:838 msgid "HP OfficeJet G55" msgstr "" -#: src/main/xmli18n-tmp.h:787 +#: src/main/xmli18n-tmp.h:839 msgid "HP OfficeJet G85" msgstr "" -#: src/main/xmli18n-tmp.h:788 +#: src/main/xmli18n-tmp.h:840 msgid "HP OfficeJet G95" msgstr "" -#: src/main/xmli18n-tmp.h:789 +#: src/main/xmli18n-tmp.h:841 msgid "HP OfficeJet K60" msgstr "" -#: src/main/xmli18n-tmp.h:790 +#: src/main/xmli18n-tmp.h:842 msgid "HP OfficeJet K60xi" msgstr "" -#: src/main/xmli18n-tmp.h:791 +#: src/main/xmli18n-tmp.h:843 msgid "HP OfficeJet K80" msgstr "" -#: src/main/xmli18n-tmp.h:792 +#: src/main/xmli18n-tmp.h:844 msgid "HP OfficeJet K80xi" msgstr "" -#: src/main/xmli18n-tmp.h:793 +#: src/main/xmli18n-tmp.h:845 msgid "HP OfficeJet LX" msgstr "" -#: src/main/xmli18n-tmp.h:794 +#: src/main/xmli18n-tmp.h:846 msgid "HP OfficeJet Pro 1150C" msgstr "" -#: src/main/xmli18n-tmp.h:795 +#: src/main/xmli18n-tmp.h:847 msgid "HP OfficeJet Pro 1170C" msgstr "" -#: src/main/xmli18n-tmp.h:796 +#: src/main/xmli18n-tmp.h:848 msgid "HP OfficeJet Pro 1175C" msgstr "" -#: src/main/xmli18n-tmp.h:797 +#: src/main/xmli18n-tmp.h:849 msgid "HP OfficeJet R40" msgstr "" -#: src/main/xmli18n-tmp.h:798 +#: src/main/xmli18n-tmp.h:850 msgid "HP OfficeJet R45" msgstr "" -#: src/main/xmli18n-tmp.h:799 +#: src/main/xmli18n-tmp.h:851 msgid "HP OfficeJet R60" msgstr "" -#: src/main/xmli18n-tmp.h:800 +#: src/main/xmli18n-tmp.h:852 msgid "HP OfficeJet R65" msgstr "" -#: src/main/xmli18n-tmp.h:801 +#: src/main/xmli18n-tmp.h:853 msgid "HP OfficeJet R80" msgstr "" -#: src/main/xmli18n-tmp.h:802 +#: src/main/xmli18n-tmp.h:854 msgid "HP OfficeJet T45" msgstr "" -#: src/main/xmli18n-tmp.h:803 +#: src/main/xmli18n-tmp.h:855 msgid "HP OfficeJet T65" msgstr "" -#: src/main/xmli18n-tmp.h:804 +#: src/main/xmli18n-tmp.h:856 msgid "HP OfficeJet V40" msgstr "" -#: src/main/xmli18n-tmp.h:805 +#: src/main/xmli18n-tmp.h:857 msgid "HP OfficeJet V40xi" msgstr "" -#: src/main/xmli18n-tmp.h:806 +#: src/main/xmli18n-tmp.h:858 msgid "HP OfficeJet" msgstr "" -#: src/main/xmli18n-tmp.h:807 +#: src/main/xmli18n-tmp.h:859 msgid "HP PSC 370" msgstr "" -#: src/main/xmli18n-tmp.h:808 +#: src/main/xmli18n-tmp.h:860 msgid "HP PSC 380" msgstr "" -#: src/main/xmli18n-tmp.h:809 +#: src/main/xmli18n-tmp.h:861 msgid "HP PSC 500" msgstr "" -#: src/main/xmli18n-tmp.h:810 +#: src/main/xmli18n-tmp.h:862 msgid "HP PSC 750" msgstr "" -#: src/main/xmli18n-tmp.h:811 +#: src/main/xmli18n-tmp.h:863 msgid "HP PSC 950" msgstr "" -#: src/main/xmli18n-tmp.h:812 +#: src/main/xmli18n-tmp.h:864 msgid "HP PSC 950xi" msgstr "" -#: src/main/xmli18n-tmp.h:813 +#: src/main/xmli18n-tmp.h:865 msgid "HP PSC 2110" msgstr "" -#: src/main/xmli18n-tmp.h:814 +#: src/main/xmli18n-tmp.h:866 msgid "HP PSC 2150" msgstr "" -#: src/main/xmli18n-tmp.h:815 +#: src/main/xmli18n-tmp.h:867 msgid "HP PSC 2210" msgstr "" -#: src/main/xmli18n-tmp.h:816 +#: src/main/xmli18n-tmp.h:868 msgid "HP PhotoSmart 7150" msgstr "" -#: src/main/xmli18n-tmp.h:817 +#: src/main/xmli18n-tmp.h:869 msgid "HP PhotoSmart 7345" msgstr "" -#: src/main/xmli18n-tmp.h:818 +#: src/main/xmli18n-tmp.h:870 msgid "HP PhotoSmart 7350" msgstr "" -#: src/main/xmli18n-tmp.h:819 +#: src/main/xmli18n-tmp.h:871 msgid "HP PhotoSmart 7550" msgstr "" -#: src/main/xmli18n-tmp.h:820 +#: src/main/xmli18n-tmp.h:872 msgid "HP PhotoSmart P100" msgstr "" -#: src/main/xmli18n-tmp.h:821 +#: src/main/xmli18n-tmp.h:873 msgid "HP PhotoSmart P130" msgstr "" -#: src/main/xmli18n-tmp.h:822 +#: src/main/xmli18n-tmp.h:874 msgid "HP PhotoSmart P230" msgstr "" -#: src/main/xmli18n-tmp.h:823 +#: src/main/xmli18n-tmp.h:875 msgid "HP PhotoSmart P1000" msgstr "" -#: src/main/xmli18n-tmp.h:824 +#: src/main/xmli18n-tmp.h:876 msgid "HP PhotoSmart P1100" msgstr "" -#: src/main/xmli18n-tmp.h:825 +#: src/main/xmli18n-tmp.h:877 msgid "HP PhotoSmart P1115" msgstr "" -#: src/main/xmli18n-tmp.h:826 +#: src/main/xmli18n-tmp.h:878 msgid "HP PhotoSmart P1215" msgstr "" -#: src/main/xmli18n-tmp.h:827 +#: src/main/xmli18n-tmp.h:879 msgid "HP PhotoSmart P1218" msgstr "" -#: src/main/xmli18n-tmp.h:828 +#: src/main/xmli18n-tmp.h:880 msgid "HP PhotoSmart P1315" msgstr "" -#: src/main/xmli18n-tmp.h:829 +#: src/main/xmli18n-tmp.h:881 #, fuzzy msgid "HP e-printer e20" msgstr "Nome da Impressora:" -#: src/main/xmli18n-tmp.h:830 +#: src/main/xmli18n-tmp.h:882 msgid "IBM 4019" msgstr "" -#: src/main/xmli18n-tmp.h:831 +#: src/main/xmli18n-tmp.h:883 msgid "IBM 4029 030 LaserPrinter 10" msgstr "" -#: src/main/xmli18n-tmp.h:832 +#: src/main/xmli18n-tmp.h:884 msgid "IBM 4312" msgstr "" -#: src/main/xmli18n-tmp.h:833 +#: src/main/xmli18n-tmp.h:885 msgid "IBM Infoprint 12" msgstr "" -#: src/main/xmli18n-tmp.h:834 +#: src/main/xmli18n-tmp.h:886 msgid "IBM Page Printer 3112" msgstr "" -#: src/main/xmli18n-tmp.h:835 +#: src/main/xmli18n-tmp.h:887 msgid "Infotec 4651 MF" msgstr "" -#: src/main/xmli18n-tmp.h:836 +#: src/main/xmli18n-tmp.h:888 msgid "Kyocera F-1010" msgstr "" -#: src/main/xmli18n-tmp.h:837 +#: src/main/xmli18n-tmp.h:889 msgid "Kyocera FS-600 - KPDL-2" msgstr "" -#: src/main/xmli18n-tmp.h:838 +#: src/main/xmli18n-tmp.h:890 msgid "Kyocera FS-600" msgstr "" -#: src/main/xmli18n-tmp.h:839 +#: src/main/xmli18n-tmp.h:891 msgid "Kyocera FS-680" msgstr "" -#: src/main/xmli18n-tmp.h:840 +#: src/main/xmli18n-tmp.h:892 msgid "Kyocera FS-800" msgstr "" -#: src/main/xmli18n-tmp.h:841 +#: src/main/xmli18n-tmp.h:893 msgid "Kyocera FS-1000" msgstr "" -#: src/main/xmli18n-tmp.h:842 +#: src/main/xmli18n-tmp.h:894 msgid "Kyocera FS-1000+" msgstr "" -#: src/main/xmli18n-tmp.h:843 +#: src/main/xmli18n-tmp.h:895 msgid "Kyocera FS-1010" msgstr "" -#: src/main/xmli18n-tmp.h:844 +#: src/main/xmli18n-tmp.h:896 msgid "Kyocera FS-1050" msgstr "" -#: src/main/xmli18n-tmp.h:845 +#: src/main/xmli18n-tmp.h:897 msgid "Kyocera FS-1200" msgstr "" -#: src/main/xmli18n-tmp.h:846 +#: src/main/xmli18n-tmp.h:898 msgid "Kyocera FS-1600" msgstr "" -#: src/main/xmli18n-tmp.h:847 +#: src/main/xmli18n-tmp.h:899 msgid "Kyocera FS-1600+" msgstr "" -#: src/main/xmli18n-tmp.h:848 +#: src/main/xmli18n-tmp.h:900 msgid "Kyocera FS-1700" msgstr "" -#: src/main/xmli18n-tmp.h:849 +#: src/main/xmli18n-tmp.h:901 msgid "Kyocera FS-1700+" msgstr "" -#: src/main/xmli18n-tmp.h:850 +#: src/main/xmli18n-tmp.h:902 msgid "Kyocera FS-1750" msgstr "" -#: src/main/xmli18n-tmp.h:851 +#: src/main/xmli18n-tmp.h:903 msgid "Kyocera FS-1800" msgstr "" -#: src/main/xmli18n-tmp.h:852 +#: src/main/xmli18n-tmp.h:904 msgid "Kyocera FS-1800+" msgstr "" -#: src/main/xmli18n-tmp.h:853 +#: src/main/xmli18n-tmp.h:905 msgid "Kyocera FS-1900" msgstr "" -#: src/main/xmli18n-tmp.h:854 +#: src/main/xmli18n-tmp.h:906 msgid "Kyocera FS-3500" msgstr "" -#: src/main/xmli18n-tmp.h:855 +#: src/main/xmli18n-tmp.h:907 msgid "Kyocera FS-3600" msgstr "" -#: src/main/xmli18n-tmp.h:856 +#: src/main/xmli18n-tmp.h:908 msgid "Kyocera FS-3600+" msgstr "" -#: src/main/xmli18n-tmp.h:857 +#: src/main/xmli18n-tmp.h:909 msgid "Kyocera FS-3700" msgstr "" -#: src/main/xmli18n-tmp.h:858 +#: src/main/xmli18n-tmp.h:910 msgid "Kyocera FS-3700+" msgstr "" -#: src/main/xmli18n-tmp.h:859 +#: src/main/xmli18n-tmp.h:911 msgid "Kyocera FS-3750" msgstr "" -#: src/main/xmli18n-tmp.h:860 +#: src/main/xmli18n-tmp.h:912 msgid "Kyocera FS-3800" msgstr "" -#: src/main/xmli18n-tmp.h:861 +#: src/main/xmli18n-tmp.h:913 msgid "Kyocera FS-5800C" msgstr "" -#: src/main/xmli18n-tmp.h:862 +#: src/main/xmli18n-tmp.h:914 msgid "Kyocera FS-5900C" msgstr "" -#: src/main/xmli18n-tmp.h:863 +#: src/main/xmli18n-tmp.h:915 msgid "Kyocera FS-6500" msgstr "" -#: src/main/xmli18n-tmp.h:864 +#: src/main/xmli18n-tmp.h:916 msgid "Kyocera FS-6500+" msgstr "" -#: src/main/xmli18n-tmp.h:865 +#: src/main/xmli18n-tmp.h:917 msgid "Kyocera FS-6700" msgstr "" -#: src/main/xmli18n-tmp.h:866 +#: src/main/xmli18n-tmp.h:918 msgid "Kyocera FS-7000" msgstr "" -#: src/main/xmli18n-tmp.h:867 +#: src/main/xmli18n-tmp.h:919 msgid "Kyocera FS-7000+" msgstr "" -#: src/main/xmli18n-tmp.h:868 +#: src/main/xmli18n-tmp.h:920 msgid "Kyocera FS-8000C" msgstr "" -#: src/main/xmli18n-tmp.h:869 +#: src/main/xmli18n-tmp.h:921 msgid "Kyocera FS-9000" msgstr "" -#: src/main/xmli18n-tmp.h:870 +#: src/main/xmli18n-tmp.h:922 msgid "Kyocera FS-9100DN" msgstr "" -#: src/main/xmli18n-tmp.h:871 +#: src/main/xmli18n-tmp.h:923 msgid "Kyocera FS-9500DN" msgstr "" -#: src/main/xmli18n-tmp.h:872 +#: src/main/xmli18n-tmp.h:924 msgid "Kyocera KM-1530" msgstr "" -#: src/main/xmli18n-tmp.h:873 +#: src/main/xmli18n-tmp.h:925 msgid "Kyocera KM-1810" msgstr "" -#: src/main/xmli18n-tmp.h:874 +#: src/main/xmli18n-tmp.h:926 msgid "Kyocera KM-2030" msgstr "" -#: src/main/xmli18n-tmp.h:875 +#: src/main/xmli18n-tmp.h:927 msgid "Kyocera KM-2530" msgstr "" -#: src/main/xmli18n-tmp.h:876 +#: src/main/xmli18n-tmp.h:928 msgid "Kyocera KM-3530" msgstr "" -#: src/main/xmli18n-tmp.h:877 +#: src/main/xmli18n-tmp.h:929 msgid "Kyocera KM-4230" msgstr "" -#: src/main/xmli18n-tmp.h:878 +#: src/main/xmli18n-tmp.h:930 msgid "Kyocera KM-4530" msgstr "" -#: src/main/xmli18n-tmp.h:879 +#: src/main/xmli18n-tmp.h:931 msgid "Kyocera KM-5230" msgstr "" -#: src/main/xmli18n-tmp.h:880 +#: src/main/xmli18n-tmp.h:932 msgid "Kyocera KM-5530" msgstr "" -#: src/main/xmli18n-tmp.h:881 +#: src/main/xmli18n-tmp.h:933 msgid "Kyocera KM-6230" msgstr "" -#: src/main/xmli18n-tmp.h:882 +#: src/main/xmli18n-tmp.h:934 msgid "Lexmark 4076" msgstr "" -#: src/main/xmli18n-tmp.h:883 +#: src/main/xmli18n-tmp.h:935 msgid "Lexmark Optra E" msgstr "" -#: src/main/xmli18n-tmp.h:884 +#: src/main/xmli18n-tmp.h:936 msgid "Lexmark Optra E+" msgstr "" -#: src/main/xmli18n-tmp.h:885 +#: src/main/xmli18n-tmp.h:937 msgid "Lexmark Optra E220" msgstr "" -#: src/main/xmli18n-tmp.h:886 +#: src/main/xmli18n-tmp.h:938 msgid "Lexmark Valuewriter 300" msgstr "" -#: src/main/xmli18n-tmp.h:887 +#: src/main/xmli18n-tmp.h:939 msgid "Minolta PagePro 6" msgstr "" -#: src/main/xmli18n-tmp.h:888 +#: src/main/xmli18n-tmp.h:940 msgid "Minolta PagePro 6e" msgstr "" -#: src/main/xmli18n-tmp.h:889 +#: src/main/xmli18n-tmp.h:941 msgid "Minolta PagePro 6ex" msgstr "" -#: src/main/xmli18n-tmp.h:890 +#: src/main/xmli18n-tmp.h:942 msgid "Minolta PagePro 8" msgstr "" -#: src/main/xmli18n-tmp.h:891 +#: src/main/xmli18n-tmp.h:943 msgid "Minolta PagePro 8L" msgstr "" -#: src/main/xmli18n-tmp.h:892 +#: src/main/xmli18n-tmp.h:944 msgid "Minolta PagePro 1100" msgstr "" -#: src/main/xmli18n-tmp.h:893 +#: src/main/xmli18n-tmp.h:945 msgid "NEC SuperScript 660i" msgstr "" -#: src/main/xmli18n-tmp.h:894 +#: src/main/xmli18n-tmp.h:946 msgid "NEC SuperScript 860" msgstr "" -#: src/main/xmli18n-tmp.h:895 +#: src/main/xmli18n-tmp.h:947 msgid "NEC SuperScript 870" msgstr "" -#: src/main/xmli18n-tmp.h:896 +#: src/main/xmli18n-tmp.h:948 msgid "NEC SuperScript 1260" msgstr "" -#: src/main/xmli18n-tmp.h:897 +#: src/main/xmli18n-tmp.h:949 msgid "NEC SuperScript 1400" msgstr "" -#: src/main/xmli18n-tmp.h:898 +#: src/main/xmli18n-tmp.h:950 msgid "NEC SuperScript 1800" msgstr "" -#: src/main/xmli18n-tmp.h:899 +#: src/main/xmli18n-tmp.h:951 msgid "Okidata OL400" msgstr "" -#: src/main/xmli18n-tmp.h:900 +#: src/main/xmli18n-tmp.h:952 msgid "Okidata OL400e" msgstr "" -#: src/main/xmli18n-tmp.h:901 +#: src/main/xmli18n-tmp.h:953 msgid "Okidata OL400ex" msgstr "" -#: src/main/xmli18n-tmp.h:902 +#: src/main/xmli18n-tmp.h:954 msgid "Okidata OL410e" msgstr "" -#: src/main/xmli18n-tmp.h:903 +#: src/main/xmli18n-tmp.h:955 msgid "Okidata OL600e" msgstr "" -#: src/main/xmli18n-tmp.h:904 +#: src/main/xmli18n-tmp.h:956 msgid "Okidata OL610e/S" msgstr "" -#: src/main/xmli18n-tmp.h:905 +#: src/main/xmli18n-tmp.h:957 msgid "Okidata OL800" msgstr "" -#: src/main/xmli18n-tmp.h:906 +#: src/main/xmli18n-tmp.h:958 msgid "Okidata OL810ex" msgstr "" -#: src/main/xmli18n-tmp.h:907 +#: src/main/xmli18n-tmp.h:959 msgid "Okidata Okipage 6e" msgstr "" -#: src/main/xmli18n-tmp.h:908 +#: src/main/xmli18n-tmp.h:960 msgid "Okidata Okipage 6ex" msgstr "" -#: src/main/xmli18n-tmp.h:909 +#: src/main/xmli18n-tmp.h:961 msgid "Okidata Okipage 8p" msgstr "" -#: src/main/xmli18n-tmp.h:910 +#: src/main/xmli18n-tmp.h:962 msgid "Okidata Okipage 10e" msgstr "" -#: src/main/xmli18n-tmp.h:911 +#: src/main/xmli18n-tmp.h:963 msgid "Okidata Okipage 10ex" msgstr "" -#: src/main/xmli18n-tmp.h:912 +#: src/main/xmli18n-tmp.h:964 msgid "Okidata Okipage 14ex" msgstr "" -#: src/main/xmli18n-tmp.h:913 +#: src/main/xmli18n-tmp.h:965 msgid "Okidata Super 6e" msgstr "" -#: src/main/xmli18n-tmp.h:914 +#: src/main/xmli18n-tmp.h:966 msgid "Olivetti JP350S" msgstr "" -#: src/main/xmli18n-tmp.h:915 +#: src/main/xmli18n-tmp.h:967 msgid "Olivetti PG 306" msgstr "" -#: src/main/xmli18n-tmp.h:916 +#: src/main/xmli18n-tmp.h:968 msgid "PCPI 1030" msgstr "" -#: src/main/xmli18n-tmp.h:917 +#: src/main/xmli18n-tmp.h:969 msgid "Panasonic KX-P4410" msgstr "" -#: src/main/xmli18n-tmp.h:918 +#: src/main/xmli18n-tmp.h:970 msgid "Panasonic KX-P4450" msgstr "" -#: src/main/xmli18n-tmp.h:919 +#: src/main/xmli18n-tmp.h:971 msgid "Panasonic KX-P6150" msgstr "" -#: src/main/xmli18n-tmp.h:920 +#: src/main/xmli18n-tmp.h:972 msgid "Panasonic KX-P6500" msgstr "" -#: src/main/xmli18n-tmp.h:921 +#: src/main/xmli18n-tmp.h:973 msgid "Raven LP-410" msgstr "" -#: src/main/xmli18n-tmp.h:922 +#: src/main/xmli18n-tmp.h:974 msgid "Ricoh Aficio 220" msgstr "" -#: src/main/xmli18n-tmp.h:923 +#: src/main/xmli18n-tmp.h:975 msgid "Ricoh Aficio 401" msgstr "" -#: src/main/xmli18n-tmp.h:924 +#: src/main/xmli18n-tmp.h:976 msgid "Ricoh Aficio 700" msgstr "" -#: src/main/xmli18n-tmp.h:925 +#: src/main/xmli18n-tmp.h:977 msgid "Samsung ML-85" msgstr "" -#: src/main/xmli18n-tmp.h:926 +#: src/main/xmli18n-tmp.h:978 msgid "Samsung ML-4600" msgstr "" -#: src/main/xmli18n-tmp.h:927 +#: src/main/xmli18n-tmp.h:979 msgid "Samsung ML-5000a" msgstr "" -#: src/main/xmli18n-tmp.h:928 +#: src/main/xmli18n-tmp.h:980 msgid "Samsung ML-6000" msgstr "" -#: src/main/xmli18n-tmp.h:929 +#: src/main/xmli18n-tmp.h:981 msgid "Samsung ML-6100" msgstr "" -#: src/main/xmli18n-tmp.h:930 +#: src/main/xmli18n-tmp.h:982 msgid "Samsung ML-7000" msgstr "" -#: src/main/xmli18n-tmp.h:931 +#: src/main/xmli18n-tmp.h:983 msgid "Samsung ML-7000N" msgstr "" -#: src/main/xmli18n-tmp.h:932 +#: src/main/xmli18n-tmp.h:984 msgid "Samsung ML-7000P" msgstr "" -#: src/main/xmli18n-tmp.h:933 +#: src/main/xmli18n-tmp.h:985 msgid "Samsung ML-7050" msgstr "" -#: src/main/xmli18n-tmp.h:934 +#: src/main/xmli18n-tmp.h:986 msgid "Samsung QL-5100A" msgstr "" -#: src/main/xmli18n-tmp.h:935 +#: src/main/xmli18n-tmp.h:987 msgid "Samsung QL-6050" msgstr "" -#: src/main/xmli18n-tmp.h:936 +#: src/main/xmli18n-tmp.h:988 msgid "Seiko SpeedJET 200" msgstr "" -#: src/main/xmli18n-tmp.h:937 +#: src/main/xmli18n-tmp.h:989 msgid "Sharp AR-161" msgstr "" -#: src/main/xmli18n-tmp.h:938 +#: src/main/xmli18n-tmp.h:990 msgid "Sharp AR-M257" msgstr "" -#: src/main/xmli18n-tmp.h:939 +#: src/main/xmli18n-tmp.h:991 msgid "Sony IJP-V100" msgstr "" -#: src/main/xmli18n-tmp.h:940 +#: src/main/xmli18n-tmp.h:992 msgid "Star LS-04" msgstr "" -#: src/main/xmli18n-tmp.h:941 +#: src/main/xmli18n-tmp.h:993 #, fuzzy msgid "Star LaserPrinter 8" msgstr "Configurar a Impressora" -#: src/main/xmli18n-tmp.h:942 +#: src/main/xmli18n-tmp.h:994 msgid "Tally MT908" msgstr "" -#: src/main/xmli18n-tmp.h:943 +#: src/main/xmli18n-tmp.h:995 msgid "Xerox Able 1406" msgstr "" -#: src/main/xmli18n-tmp.h:944 +#: src/main/xmli18n-tmp.h:996 msgid "Xerox DocuPrint 4508" msgstr "" -#: src/main/xmli18n-tmp.h:945 +#: src/main/xmli18n-tmp.h:997 msgid "Xerox DocuPrint C20" msgstr "" -#: src/main/xmli18n-tmp.h:946 +#: src/main/xmli18n-tmp.h:998 msgid "Xerox DocuPrint N4512" msgstr "" -#: src/main/xmli18n-tmp.h:947 +#: src/main/xmli18n-tmp.h:999 msgid "Xerox DocuPrint N4512PS" msgstr "" -#: src/main/xmli18n-tmp.h:948 +#: src/main/xmli18n-tmp.h:1000 msgid "Xerox DocuPrint P12" msgstr "" -#: src/main/xmli18n-tmp.h:949 +#: src/main/xmli18n-tmp.h:1001 msgid "Xerox DocuPrint P1202" msgstr "" -#: src/main/xmli18n-tmp.h:950 +#: src/main/xmli18n-tmp.h:1002 msgid "Xerox DocuPrint P8e" msgstr "" -#: src/main/xmli18n-tmp.h:951 +#: src/main/xmli18n-tmp.h:1003 msgid "Xerox Document Centre 400" msgstr "" -#: src/main/xmli18n-tmp.h:952 +#: src/main/xmli18n-tmp.h:1004 msgid "Xerox WorkCentre M118" msgstr "" -#: src/main/xmli18n-tmp.h:953 +#: src/main/xmli18n-tmp.h:1005 msgid "Compaq IJ1200" msgstr "" -#: src/main/xmli18n-tmp.h:954 +#: src/main/xmli18n-tmp.h:1006 msgid "Lexmark X73" msgstr "" -#: src/main/xmli18n-tmp.h:955 +#: src/main/xmli18n-tmp.h:1007 msgid "Lexmark Z42" msgstr "" -#: src/main/xmli18n-tmp.h:956 +#: src/main/xmli18n-tmp.h:1008 msgid "Lexmark Z43" msgstr "" -#: src/main/xmli18n-tmp.h:957 +#: src/main/xmli18n-tmp.h:1009 msgid "Lexmark Z52" msgstr "" -#: src/main/xmli18n-tmp.h:958 +#: src/main/xmli18n-tmp.h:1010 msgid "Lexmark Z53" msgstr "" -#: src/main/xmli18n-tmp.h:959 +#: src/main/xmli18n-tmp.h:1011 msgid "Olympus P-10" msgstr "" -#: src/main/xmli18n-tmp.h:960 +#: src/main/xmli18n-tmp.h:1012 msgid "Olympus P-11" msgstr "" -#: src/main/xmli18n-tmp.h:961 +#: src/main/xmli18n-tmp.h:1013 msgid "Olympus P-200" msgstr "" -#: src/main/xmli18n-tmp.h:962 +#: src/main/xmli18n-tmp.h:1014 msgid "Olympus P-300" msgstr "" -#: src/main/xmli18n-tmp.h:963 +#: src/main/xmli18n-tmp.h:1015 msgid "Olympus P-300E" msgstr "" -#: src/main/xmli18n-tmp.h:964 +#: src/main/xmli18n-tmp.h:1016 msgid "Olympus P-300U" msgstr "" -#: src/main/xmli18n-tmp.h:965 +#: src/main/xmli18n-tmp.h:1017 msgid "Olympus P-330E" msgstr "" -#: src/main/xmli18n-tmp.h:966 +#: src/main/xmli18n-tmp.h:1018 msgid "Olympus P-330NE" msgstr "" -#: src/main/xmli18n-tmp.h:967 +#: src/main/xmli18n-tmp.h:1019 msgid "Olympus P-400" msgstr "" -#: src/main/xmli18n-tmp.h:968 +#: src/main/xmli18n-tmp.h:1020 msgid "Olympus P-440" msgstr "" -#: src/main/xmli18n-tmp.h:969 +#: src/main/xmli18n-tmp.h:1021 msgid "Olympus P-S100" msgstr "" -#: src/main/xmli18n-tmp.h:970 +#: src/main/xmli18n-tmp.h:1022 msgid "Canon CP-10" msgstr "" -#: src/main/xmli18n-tmp.h:971 +#: src/main/xmli18n-tmp.h:1023 msgid "Canon CP-100" msgstr "" -#: src/main/xmli18n-tmp.h:972 +#: src/main/xmli18n-tmp.h:1024 msgid "Canon CP-200" msgstr "" -#: src/main/xmli18n-tmp.h:973 +#: src/main/xmli18n-tmp.h:1025 msgid "Canon CP-220" msgstr "" -#: src/main/xmli18n-tmp.h:974 +#: src/main/xmli18n-tmp.h:1026 msgid "Canon CP-300" msgstr "" -#: src/main/xmli18n-tmp.h:975 +#: src/main/xmli18n-tmp.h:1027 msgid "Canon CP-330" msgstr "" -#: src/main/xmli18n-tmp.h:976 +#: src/main/xmli18n-tmp.h:1028 msgid "Canon SELPHY-CP-400" msgstr "" -#: src/main/xmli18n-tmp.h:977 +#: src/main/xmli18n-tmp.h:1029 msgid "Canon SELPHY-CP-500" msgstr "" -#: src/main/xmli18n-tmp.h:978 +#: src/main/xmli18n-tmp.h:1030 msgid "Canon SELPHY-CP-510" msgstr "" -#: src/main/xmli18n-tmp.h:979 +#: src/main/xmli18n-tmp.h:1031 msgid "Canon SELPHY-CP-600" msgstr "" -#: src/main/xmli18n-tmp.h:980 +#: src/main/xmli18n-tmp.h:1032 msgid "Canon SELPHY-CP-710" msgstr "" -#: src/main/xmli18n-tmp.h:981 +#: src/main/xmli18n-tmp.h:1033 msgid "Canon SELPHY-CP-720" msgstr "" -#: src/main/xmli18n-tmp.h:982 -#, fuzzy +#: src/main/xmli18n-tmp.h:1034 msgid "Canon SELPHY-CP-730" -msgstr "Stylus C60" +msgstr "" -#: src/main/xmli18n-tmp.h:983 +#: src/main/xmli18n-tmp.h:1035 msgid "Canon SELPHY-CP-740" msgstr "" -#: src/main/xmli18n-tmp.h:984 -#, fuzzy +#: src/main/xmli18n-tmp.h:1036 msgid "Canon SELPHY-CP-750" -msgstr "Stylus C60" +msgstr "" -#: src/main/xmli18n-tmp.h:985 +#: src/main/xmli18n-tmp.h:1037 msgid "Canon SELPHY ES1" msgstr "" -#: src/main/xmli18n-tmp.h:986 +#: src/main/xmli18n-tmp.h:1038 msgid "Canon SELPHY ES2" msgstr "" -#: src/main/xmli18n-tmp.h:987 +#: src/main/xmli18n-tmp.h:1039 msgid "Canon SELPHY ES20" msgstr "" -#: src/main/xmli18n-tmp.h:988 +#: src/main/xmli18n-tmp.h:1040 msgid "Sony DPP-EX5" msgstr "" -#: src/main/xmli18n-tmp.h:989 +#: src/main/xmli18n-tmp.h:1041 msgid "Sony DPP-EX7" msgstr "" -#: src/main/xmli18n-tmp.h:990 +#: src/main/xmli18n-tmp.h:1042 msgid "Sony UP-DP10" msgstr "" -#: src/main/xmli18n-tmp.h:991 +#: src/main/xmli18n-tmp.h:1043 msgid "Sony UP-DR100" msgstr "" -#: src/main/xmli18n-tmp.h:992 +#: src/main/xmli18n-tmp.h:1044 msgid "Sony UP-DR150" msgstr "" -#: src/main/xmli18n-tmp.h:993 +#: src/main/xmli18n-tmp.h:1045 msgid "Fujifilm Printpix-CX-400" msgstr "" -#: src/main/xmli18n-tmp.h:994 +#: src/main/xmli18n-tmp.h:1046 msgid "Fujifilm Printpix-CX-550" msgstr "" -#: src/main/xmli18n-tmp.h:995 +#: src/main/xmli18n-tmp.h:1047 msgid "Fujifilm FinePix-NX-500" msgstr "" -#: src/main/xmli18n-tmp.h:996 +#: src/main/xmli18n-tmp.h:1048 msgid "Kodak Easyshare-Printer-Dock" msgstr "" -#: src/main/xmli18n-tmp.h:997 +#: src/main/xmli18n-tmp.h:1049 msgid "Shinko CHC-S9045" msgstr "" -#: src/main/xmli18n-tmp.h:998 +#: src/main/xmli18n-tmp.h:1050 msgid "RAW DATA 16 bit" msgstr "" -#: src/main/xmli18n-tmp.h:999 +#: src/main/xmli18n-tmp.h:1051 msgid "RAW DATA 8 bit" msgstr "" -#: src/gutenprintui/panel.c:274 src/gutenprintui2/panel.c:274 +#: src/gutenprintui2/curve.c:130 +#, fuzzy +msgid "Curve type" +msgstr "Preto" + +#: src/gutenprintui2/curve.c:131 +msgid "Is this curve linear, spline interpolated, or free-form" +msgstr "" + +#: src/gutenprintui2/curve.c:139 +msgid "Minimum X" +msgstr "" + +#: src/gutenprintui2/curve.c:140 +msgid "Minimum possible value for X" +msgstr "" + +#: src/gutenprintui2/curve.c:149 +msgid "Maximum X" +msgstr "" + +#: src/gutenprintui2/curve.c:150 +msgid "Maximum possible X value" +msgstr "" + +#: src/gutenprintui2/curve.c:159 +msgid "Minimum Y" +msgstr "" + +#: src/gutenprintui2/curve.c:160 +msgid "Minimum possible value for Y" +msgstr "" + +#: src/gutenprintui2/curve.c:169 +msgid "Maximum Y" +msgstr "" + +#: src/gutenprintui2/curve.c:170 +msgid "Maximum possible value for Y" +msgstr "" + +#: src/gutenprintui2/gammacurve.c:418 +msgid "_Gamma value" +msgstr "" + +#: src/gutenprintui2/panel.c:275 msgid "Inch" msgstr "Polegada" -#: src/gutenprintui/panel.c:274 src/gutenprintui2/panel.c:274 +#: src/gutenprintui2/panel.c:275 msgid "Set the base unit of measurement to inches" msgstr "Definir como base das unidades de medida a polegada" -#: src/gutenprintui/panel.c:276 src/gutenprintui2/panel.c:276 +#: src/gutenprintui2/panel.c:277 msgid "cm" msgstr "cm" -#: src/gutenprintui/panel.c:276 src/gutenprintui2/panel.c:276 +#: src/gutenprintui2/panel.c:277 msgid "Set the base unit of measurement to centimetres" -msgstr "Definir como base das unidades de medida o centímetro" +msgstr "Definir como base das unidades de medida o centímetro" -#: src/gutenprintui/panel.c:278 src/gutenprintui2/panel.c:278 +#: src/gutenprintui2/panel.c:279 #, fuzzy msgid "Points" msgstr "Imprimir" -#: src/gutenprintui/panel.c:278 src/gutenprintui2/panel.c:278 +#: src/gutenprintui2/panel.c:279 #, fuzzy msgid "Set the base unit of measurement to points (1/72\")" msgstr "Definir como base das unidades de medida a polegada" -#: src/gutenprintui/panel.c:280 src/gutenprintui2/panel.c:280 +#: src/gutenprintui2/panel.c:281 msgid "mm" msgstr "" -#: src/gutenprintui/panel.c:280 src/gutenprintui2/panel.c:280 +#: src/gutenprintui2/panel.c:281 #, fuzzy msgid "Set the base unit of measurement to millimetres" -msgstr "Definir como base das unidades de medida o centímetro" +msgstr "Definir como base das unidades de medida o centímetro" -#: src/gutenprintui/panel.c:282 src/gutenprintui2/panel.c:282 +#: src/gutenprintui2/panel.c:283 msgid "Pica" msgstr "" -#: src/gutenprintui/panel.c:282 src/gutenprintui2/panel.c:282 +#: src/gutenprintui2/panel.c:283 #, fuzzy msgid "Set the base unit of measurement to picas (1/12\")" msgstr "Definir como base das unidades de medida a polegada" -#: src/gutenprintui/panel.c:289 src/gutenprintui2/panel.c:289 +#: src/gutenprintui2/panel.c:290 msgid "Color output" msgstr "Ouput de cor" -#: src/gutenprintui/panel.c:291 src/gutenprintui2/panel.c:291 +#: src/gutenprintui2/panel.c:292 msgid "Print in shades of gray using black ink" msgstr "Imprimir em sombras de cinzento usando tinta preta" -#: src/gutenprintui/panel.c:303 src/gutenprintui2/panel.c:303 +#: src/gutenprintui2/panel.c:304 #, fuzzy msgid "Standard Command" msgstr "Standard" -#: src/gutenprintui/panel.c:303 src/gutenprintui2/panel.c:303 +#: src/gutenprintui2/panel.c:304 msgid "Use standard print command" msgstr "" -#: src/gutenprintui/panel.c:304 src/gutenprintui2/panel.c:304 +#: src/gutenprintui2/panel.c:305 #, fuzzy msgid "Custom Command" msgstr "Comando:" -#: src/gutenprintui/panel.c:304 src/gutenprintui2/panel.c:304 +#: src/gutenprintui2/panel.c:305 msgid "Use custom print command" msgstr "" -#: src/gutenprintui/panel.c:305 src/gutenprintui/plist.c:704 -#: src/gutenprintui/plist.c:787 src/gutenprintui2/panel.c:305 -#: src/gutenprintui2/plist.c:707 src/gutenprintui2/plist.c:790 +#: src/gutenprintui2/panel.c:306 src/gutenprintui2/plist.c:710 +#: src/gutenprintui2/plist.c:793 msgid "File" msgstr "Ficheiro" -#: src/gutenprintui/panel.c:305 src/gutenprintui2/panel.c:305 +#: src/gutenprintui2/panel.c:306 #, fuzzy msgid "Print to a file" msgstr "Imprimir para o Ficheiro?" -#: src/gutenprintui/panel.c:521 src/gutenprintui2/panel.c:521 +#: src/gutenprintui2/panel.c:522 msgid "Edit Curve..." msgstr "" -#: src/gutenprintui/panel.c:532 src/gutenprintui2/panel.c:532 +#: src/gutenprintui2/panel.c:533 #, fuzzy msgid "Set Default" -msgstr "Definir Valores Padrão" +msgstr "Definir Valores Padrão" -#: src/gutenprintui/panel.c:534 src/gutenprintui2/panel.c:534 +#: src/gutenprintui2/panel.c:535 msgid "Restore Previous" msgstr "" -#: src/gutenprintui/panel.c:536 src/gutenprintui/panel.c:1532 -#: src/gutenprintui/panel.c:1787 src/gutenprintui/panel.c:1819 -#: src/gutenprintui2/panel.c:536 src/gutenprintui2/panel.c:1533 -#: src/gutenprintui2/panel.c:1787 src/gutenprintui2/panel.c:1819 +#: src/gutenprintui2/panel.c:537 src/gutenprintui2/panel.c:1708 +#: src/gutenprintui2/panel.c:1962 src/gutenprintui2/panel.c:1994 msgid "OK" msgstr "OK" -#: src/gutenprintui/panel.c:538 src/gutenprintui/panel.c:1197 -#: src/gutenprintui/panel.c:1534 src/gutenprintui/panel.c:1789 -#: src/gutenprintui2/panel.c:538 src/gutenprintui2/panel.c:1198 -#: src/gutenprintui2/panel.c:1535 src/gutenprintui2/panel.c:1789 +#: src/gutenprintui2/panel.c:539 src/gutenprintui2/panel.c:1373 +#: src/gutenprintui2/panel.c:1710 src/gutenprintui2/panel.c:1964 msgid "Cancel" msgstr "Cancelar" -#: src/gutenprintui/panel.c:1180 src/gutenprintui2/panel.c:1181 +#: src/gutenprintui2/panel.c:641 +#, fuzzy +msgid "Select File..." +msgstr "Configurar Impressora..." + +#: src/gutenprintui2/panel.c:1018 +msgid "Reset" +msgstr "" + +#: src/gutenprintui2/panel.c:1356 #, c-format msgid "%s -- Print v%s" msgstr "%s -- Imprimir v%s" -#: src/gutenprintui/panel.c:1189 src/gutenprintui2/panel.c:1190 +#: src/gutenprintui2/panel.c:1365 msgid "About" msgstr "Acerca" -#: src/gutenprintui/panel.c:1191 src/gutenprintui2/panel.c:1192 +#: src/gutenprintui2/panel.c:1367 msgid "" "Print and\n" "Save Settings" msgstr "" "Imprimir e\n" -"Gravar Definições" +"Gravar Definições" -#: src/gutenprintui/panel.c:1193 src/gutenprintui2/panel.c:1194 +#: src/gutenprintui2/panel.c:1369 msgid "" "Save\n" "Settings" -msgstr "Gravar Definições" +msgstr "Gravar Definições" -#: src/gutenprintui/panel.c:1195 src/gutenprintui2/panel.c:1196 +#: src/gutenprintui2/panel.c:1371 msgid "Print" msgstr "Imprimir" -#: src/gutenprintui/panel.c:1247 src/gutenprintui2/panel.c:1248 +#: src/gutenprintui2/panel.c:1423 msgid "Preview" msgstr "Previsualizar" -#: src/gutenprintui/panel.c:1272 src/gutenprintui2/panel.c:1273 +#: src/gutenprintui2/panel.c:1448 msgid "" "Position the image on the page.\n" "Click and drag with the primary button to position the image.\n" @@ -6700,368 +7128,361 @@ msgid "" "If you click another button while dragging the mouse, the image will return " "to its original position." msgstr "" -"Posição a imagem na página.\n" -"Clique e arraste com o botão primário para a posição da imagem.\n" -"Clique e arraste com o segundo botão para mover a imagem com maior " -"precisão;\n" +"Posição a imagem na página.\n" +"Clique e arraste com o botão primário para a posição da imagem.\n" +"Clique e arraste com o segundo botão para mover a imagem com maior " +"precisão;\n" "cada unidade de movimento move a imagem um ponto (1/72\")\n" -"Clique e arraste com o terceiro botão (o do meio) para mover a imagem em " +"Clique e arraste com o terceiro botão (o do meio) para mover a imagem em " "unidades\n" "de tamanho da imagem.\n" "Mantendo pressionado a tecla shift enquanto se clica e arrasta, restringe o " "movimento\n" "ao eixo horizontal e vertical.\n" -"Se clicar noutro botão enquanto arrasta com o rato, a imagem vai voltar à " +"Se clicar noutro botão enquanto arrasta com o rato, a imagem vai voltar à " "sua\n" -"posição original." +"posição original." -#: src/gutenprintui/panel.c:1319 src/gutenprintui2/panel.c:1320 +#: src/gutenprintui2/panel.c:1495 #, fuzzy msgid "Paper Size" msgstr "Tamanho" -#: src/gutenprintui/panel.c:1342 src/gutenprintui2/panel.c:1343 +#: src/gutenprintui2/panel.c:1518 msgid "Show All Paper Sizes" msgstr "" -#: src/gutenprintui/panel.c:1358 src/gutenprintui2/panel.c:1359 +#: src/gutenprintui2/panel.c:1534 msgid "Dimensions:" -msgstr "Dimensões:" +msgstr "Dimensões:" -#: src/gutenprintui/panel.c:1363 src/gutenprintui/panel.c:2063 -#: src/gutenprintui2/panel.c:1364 src/gutenprintui2/panel.c:2063 +#: src/gutenprintui2/panel.c:1539 src/gutenprintui2/panel.c:2238 msgid "Width:" msgstr "Largura:" -#: src/gutenprintui/panel.c:1364 src/gutenprintui2/panel.c:1365 +#: src/gutenprintui2/panel.c:1540 msgid "Width of the paper that you wish to print to" msgstr "Largura do papel para o qual deseja imprimir" -#: src/gutenprintui/panel.c:1368 src/gutenprintui/panel.c:2065 -#: src/gutenprintui2/panel.c:1369 src/gutenprintui2/panel.c:2065 +#: src/gutenprintui2/panel.c:1544 src/gutenprintui2/panel.c:2240 msgid "Height:" msgstr "Altura" -#: src/gutenprintui/panel.c:1369 src/gutenprintui2/panel.c:1370 +#: src/gutenprintui2/panel.c:1545 msgid "Height of the paper that you wish to print to" msgstr "Altura do papel para o qual deseja imprimir" -#: src/gutenprintui/panel.c:1374 src/gutenprintui2/panel.c:1375 +#: src/gutenprintui2/panel.c:1550 #, fuzzy msgid "Automatic Paper Size" msgstr "Tamanho" -#: src/gutenprintui/panel.c:1391 src/gutenprintui2/panel.c:1392 +#: src/gutenprintui2/panel.c:1567 msgid "Number of Copies" msgstr "" -#: src/gutenprintui/panel.c:1403 src/gutenprintui2/panel.c:1404 +#: src/gutenprintui2/panel.c:1579 msgid "Select the number of copies to print; a value between 1 and 100" msgstr "" -#: src/gutenprintui/panel.c:1435 src/gutenprintui2/panel.c:1436 +#: src/gutenprintui2/panel.c:1611 #, fuzzy msgid "Image Position" -msgstr "Posição" +msgstr "Posição" -#: src/gutenprintui/panel.c:1452 src/gutenprintui2/panel.c:1453 +#: src/gutenprintui2/panel.c:1628 msgid "Auto" msgstr "Auto" -#: src/gutenprintui/panel.c:1454 src/gutenprintui2/panel.c:1455 +#: src/gutenprintui2/panel.c:1630 msgid "Portrait" msgstr "Retrato" -#: src/gutenprintui/panel.c:1456 src/gutenprintui2/panel.c:1457 +#: src/gutenprintui2/panel.c:1632 msgid "Landscape" msgstr "Paisagem" -#: src/gutenprintui/panel.c:1458 src/gutenprintui2/panel.c:1459 +#: src/gutenprintui2/panel.c:1634 msgid "Upside down" -msgstr "De cabeça para baixo" +msgstr "De cabeça para baixo" -#: src/gutenprintui/panel.c:1460 src/gutenprintui2/panel.c:1461 +#: src/gutenprintui2/panel.c:1636 msgid "Seascape" -msgstr "Paisagem de cabeça para baixo" +msgstr "Paisagem de cabeça para baixo" -#: src/gutenprintui/panel.c:1464 src/gutenprintui2/panel.c:1465 +#: src/gutenprintui2/panel.c:1640 msgid "" "Select the orientation: portrait, landscape, upside down, or seascape " "(upside down landscape)" msgstr "" -"Seleccione a orientação: retrato, paisagem, cabeça para baixo, ou paisagem " -"de cabeça para baixo" +"Seleccione a orientação: retrato, paisagem, cabeça para baixo, ou paisagem " +"de cabeça para baixo" -#: src/gutenprintui/panel.c:1466 src/gutenprintui2/panel.c:1467 +#: src/gutenprintui2/panel.c:1642 msgid "Orientation:" -msgstr "Orientação:" +msgstr "Orientação:" -#: src/gutenprintui/panel.c:1477 src/gutenprintui2/panel.c:1478 +#: src/gutenprintui2/panel.c:1653 msgid "Left:" msgstr "Esquerda:" -#: src/gutenprintui/panel.c:1478 src/gutenprintui2/panel.c:1479 +#: src/gutenprintui2/panel.c:1654 msgid "Distance from the left of the paper to the image" -msgstr "Distância da esquerda do papel até à imagem" +msgstr "Distância da esquerda do papel até à imagem" -#: src/gutenprintui/panel.c:1481 src/gutenprintui/panel.c:1485 -#: src/gutenprintui2/panel.c:1482 src/gutenprintui2/panel.c:1486 +#: src/gutenprintui2/panel.c:1657 src/gutenprintui2/panel.c:1661 msgid "Right:" msgstr "Direita:" -#: src/gutenprintui/panel.c:1482 src/gutenprintui2/panel.c:1483 +#: src/gutenprintui2/panel.c:1658 msgid "Distance from the left of the paper to the right of the image" -msgstr "Distência da esquerda do papel até à direita da imagem" +msgstr "Distência da esquerda do papel até à direita da imagem" -#: src/gutenprintui/panel.c:1486 src/gutenprintui2/panel.c:1487 +#: src/gutenprintui2/panel.c:1662 msgid "Distance from the right of the paper to the image" -msgstr "Distância da direita do papel até à imagem" +msgstr "Distância da direita do papel até à imagem" -#: src/gutenprintui/panel.c:1488 src/gutenprintui2/panel.c:1489 +#: src/gutenprintui2/panel.c:1664 msgid "Top:" msgstr "Topo:" -#: src/gutenprintui/panel.c:1489 src/gutenprintui2/panel.c:1490 +#: src/gutenprintui2/panel.c:1665 msgid "Distance from the top of the paper to the image" -msgstr "Distência do topo do papel até à imagem" +msgstr "Distência do topo do papel até à imagem" -#: src/gutenprintui/panel.c:1492 src/gutenprintui/panel.c:1496 -#: src/gutenprintui2/panel.c:1493 src/gutenprintui2/panel.c:1497 +#: src/gutenprintui2/panel.c:1668 src/gutenprintui2/panel.c:1672 msgid "Bottom:" msgstr "Fundo:" -#: src/gutenprintui/panel.c:1493 src/gutenprintui2/panel.c:1494 +#: src/gutenprintui2/panel.c:1669 #, fuzzy msgid "Distance from the top of the paper to bottom of the image" -msgstr "Distância do topo do papel até ao fundo da imagem" +msgstr "Distância do topo do papel até ao fundo da imagem" -#: src/gutenprintui/panel.c:1497 src/gutenprintui2/panel.c:1498 +#: src/gutenprintui2/panel.c:1673 msgid "Distance from the bottom of the paper to the image" -msgstr "Distância do fundo do papel até à imagem" +msgstr "Distância do fundo do papel até à imagem" -#: src/gutenprintui/panel.c:1507 src/gutenprintui2/panel.c:1508 +#: src/gutenprintui2/panel.c:1683 msgid "Center:" msgstr "Centro:" -#: src/gutenprintui/panel.c:1510 src/gutenprintui2/panel.c:1511 +#: src/gutenprintui2/panel.c:1686 #, fuzzy msgid "Horizontal" msgstr "Horizontalmente" -#: src/gutenprintui/panel.c:1511 src/gutenprintui2/panel.c:1512 +#: src/gutenprintui2/panel.c:1687 msgid "Center the image horizontally on the paper" msgstr "Centrar a imagem horizontalmente no papel" -#: src/gutenprintui/panel.c:1513 src/gutenprintui2/panel.c:1514 +#: src/gutenprintui2/panel.c:1689 msgid "Both" msgstr "Ambos" -#: src/gutenprintui/panel.c:1514 src/gutenprintui2/panel.c:1515 +#: src/gutenprintui2/panel.c:1690 msgid "Center the image on the paper" msgstr "Centrar a imagem no papel" -#: src/gutenprintui/panel.c:1516 src/gutenprintui2/panel.c:1517 +#: src/gutenprintui2/panel.c:1692 #, fuzzy msgid "Vertical" msgstr "Verticalmente" -#: src/gutenprintui/panel.c:1517 src/gutenprintui2/panel.c:1518 +#: src/gutenprintui2/panel.c:1693 msgid "Center the image vertically on the paper" msgstr "Centrar a imagem verticalmente no papel" -#: src/gutenprintui/panel.c:1530 src/gutenprintui2/panel.c:1531 +#: src/gutenprintui2/panel.c:1706 msgid "Setup Printer" msgstr "Configurar a Impressora" -#: src/gutenprintui/panel.c:1555 src/gutenprintui2/panel.c:1555 +#: src/gutenprintui2/panel.c:1730 #, fuzzy msgid "Printer Make:" msgstr "Nome da Impressora:" -#: src/gutenprintui/panel.c:1566 src/gutenprintui2/panel.c:1566 +#: src/gutenprintui2/panel.c:1741 #, fuzzy msgid "Select the make of your printer" msgstr "Seleccione o seu modelo de impressora" -#: src/gutenprintui/panel.c:1584 src/gutenprintui/panel.c:1672 -#: src/gutenprintui/panel.c:1890 src/gutenprintui2/panel.c:1584 -#: src/gutenprintui2/panel.c:1672 src/gutenprintui2/panel.c:1890 +#: src/gutenprintui2/panel.c:1759 src/gutenprintui2/panel.c:1847 +#: src/gutenprintui2/panel.c:2065 msgid "Printer Model:" msgstr "Modelo da Impressora:" -#: src/gutenprintui/panel.c:1595 src/gutenprintui2/panel.c:1595 +#: src/gutenprintui2/panel.c:1770 msgid "Select your printer model" msgstr "Seleccione o seu modelo de impressora" -#: src/gutenprintui/panel.c:1643 src/gutenprintui2/panel.c:1643 +#: src/gutenprintui2/panel.c:1818 msgid "PPD File:" msgstr "Ficheiro PPD:" -#: src/gutenprintui/panel.c:1659 src/gutenprintui2/panel.c:1659 +#: src/gutenprintui2/panel.c:1834 msgid "Enter the correct PPD filename for your printer" msgstr "Insira o ficheiro PPD correct para a sua impressora" -#: src/gutenprintui/panel.c:1661 src/gutenprintui/panel.c:1741 -#: src/gutenprintui2/panel.c:1661 src/gutenprintui2/panel.c:1741 +#: src/gutenprintui2/panel.c:1836 src/gutenprintui2/panel.c:1916 msgid "Browse" msgstr "Navegar" -#: src/gutenprintui/panel.c:1668 src/gutenprintui2/panel.c:1668 +#: src/gutenprintui2/panel.c:1843 msgid "Choose the correct PPD filename for your printer" msgstr "Seleccione o ficheiro PPD correcto para a sua impressora" -#: src/gutenprintui/panel.c:1710 src/gutenprintui2/panel.c:1710 +#: src/gutenprintui2/panel.c:1885 #, fuzzy msgid "" "Select the name of the output queue (not the type, or model, of printer) " "that you wish to print to" msgstr "" -"Seleccione o nome da impressora (não o tipo ou modelo da impressora) para\n" +"Seleccione o nome da impressora (não o tipo ou modelo da impressora) para\n" "a qual deseja imprimir" -#: src/gutenprintui/panel.c:1712 src/gutenprintui2/panel.c:1712 +#: src/gutenprintui2/panel.c:1887 #, fuzzy msgid "Printer Queue:" msgstr "Nome da Impressora:" -#: src/gutenprintui/panel.c:1728 src/gutenprintui2/panel.c:1728 +#: src/gutenprintui2/panel.c:1903 #, fuzzy msgid "Enter the correct command to print to your printer. " msgstr "Insira o ficheiro PPD correct para a sua impressora" -#: src/gutenprintui/panel.c:1739 src/gutenprintui2/panel.c:1739 +#: src/gutenprintui2/panel.c:1914 msgid "Enter the file to print to. " msgstr "" -#: src/gutenprintui/panel.c:1747 src/gutenprintui2/panel.c:1747 +#: src/gutenprintui2/panel.c:1922 #, fuzzy msgid "File to print to" -msgstr "impressão de teste" +msgstr "impressão de teste" -#: src/gutenprintui/panel.c:1755 src/gutenprintui2/panel.c:1755 +#: src/gutenprintui2/panel.c:1930 #, fuzzy msgid "Print To File" msgstr "Imprimir para o Ficheiro?" -#: src/gutenprintui/panel.c:1785 src/gutenprintui2/panel.c:1785 +#: src/gutenprintui2/panel.c:1960 msgid "Define New Printer" msgstr "Definir nova Impressora" -#: src/gutenprintui/panel.c:1803 src/gutenprintui/panel.c:1887 -#: src/gutenprintui2/panel.c:1803 src/gutenprintui2/panel.c:1887 +#: src/gutenprintui2/panel.c:1978 src/gutenprintui2/panel.c:2062 msgid "Printer Name:" msgstr "Nome da Impressora:" -#: src/gutenprintui/panel.c:1807 src/gutenprintui2/panel.c:1807 +#: src/gutenprintui2/panel.c:1982 msgid "Enter the name you wish to give this logical printer" -msgstr "Insira o noma que deseja dar a esta impressora lógica" +msgstr "Insira o noma que deseja dar a esta impressora lógica" -#: src/gutenprintui/panel.c:1817 src/gutenprintui2/panel.c:1817 +#: src/gutenprintui2/panel.c:1992 #, fuzzy msgid "About Gutenprint " msgstr "Acerca do Gimp-Print " -#: src/gutenprintui/panel.c:1824 src/gutenprintui2/panel.c:1824 +#: src/gutenprintui2/panel.c:1999 #, fuzzy msgid "Gutenprint Version " -msgstr "Versão do Gimp-Print " +msgstr "Versão do Gimp-Print " -#: src/gutenprintui/panel.c:1872 src/gutenprintui2/panel.c:1872 +#: src/gutenprintui2/panel.c:2047 msgid "Printer Settings" -msgstr "Definições da Impressora" +msgstr "Definições da Impressora" -#: src/gutenprintui/panel.c:1885 src/gutenprintui2/panel.c:1885 +#: src/gutenprintui2/panel.c:2060 msgid "" "Select the name of the printer (not the type, or model, of printer) that you " "wish to print to" msgstr "" -"Seleccione o nome da impressora (não o tipo ou modelo da impressora) para\n" +"Seleccione o nome da impressora (não o tipo ou modelo da impressora) para\n" "a qual deseja imprimir" -#: src/gutenprintui/panel.c:1902 src/gutenprintui2/panel.c:1902 +#: src/gutenprintui2/panel.c:2077 msgid "Setup Printer..." msgstr "Configurar Impressora..." -#: src/gutenprintui/panel.c:1904 src/gutenprintui2/panel.c:1904 +#: src/gutenprintui2/panel.c:2079 msgid "" "Choose the printer model, PPD file, and command that is used to print to " "this printer" msgstr "" -"Escolha o modelo da impressora, ficheiro PPD, e comando que é usado para " +"Escolha o modelo da impressora, ficheiro PPD, e comando que é usado para " "imprimir\n" "para esta impressora" -#: src/gutenprintui/panel.c:1917 src/gutenprintui2/panel.c:1917 +#: src/gutenprintui2/panel.c:2092 msgid "New Printer..." msgstr "Nova Impressora..." -#: src/gutenprintui/panel.c:1918 src/gutenprintui2/panel.c:1918 +#: src/gutenprintui2/panel.c:2093 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 "" -"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" +"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:1948 src/gutenprintui2/panel.c:1948 +#: src/gutenprintui2/panel.c:2123 #, fuzzy msgid "Set Printer Option Defaults" -msgstr "Definir Valores Padrão" +msgstr "Definir Valores Padrão" -#: src/gutenprintui/panel.c:1949 src/gutenprintui2/panel.c:1949 +#: src/gutenprintui2/panel.c:2124 msgid "Set all printer options to their defaults" msgstr "" -#: src/gutenprintui/panel.c:1972 src/gutenprintui2/panel.c:1972 +#: src/gutenprintui2/panel.c:2147 #, fuzzy msgid "Image Size" msgstr "Tamanho" -#: src/gutenprintui/panel.c:1997 src/gutenprintui2/panel.c:1997 +#: src/gutenprintui2/panel.c:2172 msgid "Scaling:" msgstr "Redimesionamento:" -#: src/gutenprintui/panel.c:2001 src/gutenprintui2/panel.c:2001 +#: src/gutenprintui2/panel.c:2176 msgid "Set the scale (size) of the image" msgstr "Definir a escala (tamanho) da imagem" -#: src/gutenprintui/panel.c:2023 src/gutenprintui2/panel.c:2023 +#: src/gutenprintui2/panel.c:2198 msgid "Scale by:" msgstr "" -#: src/gutenprintui/panel.c:2028 src/gutenprintui2/panel.c:2028 +#: src/gutenprintui2/panel.c:2203 msgid "" "Select whether scaling is measured as percent of available page size or " "number of output dots per inch" 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" +"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:2031 src/gutenprintui2/panel.c:2031 +#: src/gutenprintui2/panel.c:2206 msgid "Percent" msgstr "Precentagem" -#: src/gutenprintui/panel.c:2036 src/gutenprintui2/panel.c:2036 +#: src/gutenprintui2/panel.c:2211 msgid "Scale the print to the size of the page" -msgstr "Redimensionar a impressão para o tamanho da página" +msgstr "Redimensionar a impressão para o tamanho da página" -#: src/gutenprintui/panel.c:2040 src/gutenprintui2/panel.c:2040 +#: src/gutenprintui2/panel.c:2215 msgid "PPI" msgstr "PPI" -#: src/gutenprintui/panel.c:2045 src/gutenprintui2/panel.c:2045 +#: src/gutenprintui2/panel.c:2220 msgid "Scale the print to the number of dots per inch" -msgstr "Redimensionar a impressão para o número de pontos por polegada" +msgstr "Redimensionar a impressão para o número de pontos por polegada" -#: src/gutenprintui/panel.c:2063 src/gutenprintui2/panel.c:2063 +#: src/gutenprintui2/panel.c:2238 msgid "Set the width of the print" -msgstr "Definir a largura da impressão" +msgstr "Definir a largura da impressão" -#: src/gutenprintui/panel.c:2065 src/gutenprintui2/panel.c:2065 +#: src/gutenprintui2/panel.c:2240 msgid "Set the height of the print" -msgstr "Definir a altura da impressão" +msgstr "Definir a altura da impressão" -#: src/gutenprintui/panel.c:2071 src/gutenprintui2/panel.c:2071 +#: src/gutenprintui2/panel.c:2246 msgid "" "Use Original\n" "Image Size" @@ -7069,160 +7490,114 @@ msgstr "" "Usar Original\n" "Tamanho de Imagem" -#: src/gutenprintui/panel.c:2077 src/gutenprintui2/panel.c:2077 +#: src/gutenprintui2/panel.c:2252 msgid "Set the print size to the size of the image" -msgstr "Definir como tamanho de impressão o tamanho da imagem" +msgstr "Definir como tamanho de impressão o tamanho da imagem" -#: src/gutenprintui/panel.c:2100 src/gutenprintui2/panel.c:2101 +#: src/gutenprintui2/panel.c:2276 msgid "Print Color Adjust" -msgstr "Ajustamento da Cor de Impressão" +msgstr "Ajustamento da Cor de Impressão" -#: src/gutenprintui/panel.c:2103 src/gutenprintui2/panel.c:2104 +#: src/gutenprintui2/panel.c:2279 msgid "Set Defaults" -msgstr "Definir Valores Padrão" +msgstr "Definir Valores Padrão" -#: src/gutenprintui/panel.c:2105 src/gutenprintui2/panel.c:2106 +#: src/gutenprintui2/panel.c:2281 msgid "Close" msgstr "Fechar" -#: src/gutenprintui/panel.c:2134 src/gutenprintui2/panel.c:2135 +#: src/gutenprintui2/panel.c:2310 msgid "Image preview" -msgstr "Previsualização da Imagem" +msgstr "Previsualização da Imagem" -#: src/gutenprintui/panel.c:2148 src/gutenprintui2/panel.c:2149 +#: src/gutenprintui2/panel.c:2324 msgid "View Output Channels:" msgstr "" -#: src/gutenprintui/panel.c:2234 src/gutenprintui2/panel.c:2240 +#: src/gutenprintui2/panel.c:2415 #, fuzzy msgid "Output" msgstr "Tipo de Output:" -#: src/gutenprintui/panel.c:2262 src/gutenprintui2/panel.c:2268 +#: src/gutenprintui2/panel.c:2443 msgid "Output Type:" msgstr "Tipo de Output:" -#: src/gutenprintui/panel.c:2266 src/gutenprintui2/panel.c:2272 +#: src/gutenprintui2/panel.c:2447 msgid "Select the desired output type" msgstr "Seleccione o tipo de output desejado" -#: src/gutenprintui/panel.c:2287 src/gutenprintui2/panel.c:2293 +#: src/gutenprintui2/panel.c:2468 msgid "Adjust Output..." msgstr "Ajustar o Output..." -#: src/gutenprintui/panel.c:2296 src/gutenprintui2/panel.c:2302 +#: src/gutenprintui2/panel.c:2477 msgid "" "Adjust color balance, brightness, contrast, saturation, and dither algorithm" msgstr "" -"Ajustar equilíbrio de cor, brilho, contraste, saturação e algoritmo de " +"Ajustar equilíbrio de cor, brilho, contraste, saturação e algoritmo de " "\"dither\"" -#: src/gutenprintui/panel.c:2314 src/gutenprintui2/panel.c:2321 +#: src/gutenprintui2/panel.c:2496 #, fuzzy msgid "Size Units:" msgstr "Unidades:" -#: src/gutenprintui/panel.c:2317 src/gutenprintui2/panel.c:2324 +#: src/gutenprintui2/panel.c:2499 #, fuzzy msgid " " msgstr "> " -#: src/gutenprintui/panel.c:2341 src/gutenprintui2/panel.c:2348 +#: src/gutenprintui2/panel.c:2523 msgid "Units:" msgstr "Unidades:" -#: src/gutenprintui/panel.c:2346 src/gutenprintui2/panel.c:2353 -msgid "Select the base unit of measurement for printing" -msgstr "Seleccione a base das unidades de medida para impressão" - -#: src/gutenprintui/plist.c:90 src/gutenprintui/plist.c:99 -#: src/gutenprintui2/plist.c:89 src/gutenprintui2/plist.c:98 -msgid "System V lp" -msgstr "" - -#: src/gutenprintui/plist.c:96 src/gutenprintui2/plist.c:95 -msgid "CUPS" -msgstr "" - -#: src/gutenprintui/plist.c:102 src/gutenprintui2/plist.c:101 -msgid "Berkeley lpd (/etc/lpc)" -msgstr "" - -#: src/gutenprintui/plist.c:105 src/gutenprintui2/plist.c:104 -msgid "Berkeley lpd (/usr/bsd/lpc)" -msgstr "" - -#: src/gutenprintui/plist.c:108 src/gutenprintui2/plist.c:107 -msgid "Berkeley lpd (/usr/etc/lpc" -msgstr "" - -#: src/gutenprintui/plist.c:111 src/gutenprintui2/plist.c:110 -msgid "Berkeley lpd (/usr/libexec/lpc)" -msgstr "" - -#: src/gutenprintui/plist.c:114 src/gutenprintui2/plist.c:113 -msgid "Berkeley lpd (/usr/sbin/lpc)" -msgstr "" - -#: src/gutenprintui/plist.c:1043 src/gutenprintui2/plist.c:1057 -#, fuzzy -msgid "Printer" -msgstr "Imprimir" - -#: src/gutenprintui/plist.c:1230 src/gutenprintui2/plist.c:1250 -#, fuzzy -msgid "(Default Printer)" -msgstr "Configurar a Impressora" - -#: src/gutenprintui2/curve.c:130 -#, fuzzy -msgid "Curve type" -msgstr "Preto" - -#: src/gutenprintui2/curve.c:131 -msgid "Is this curve linear, spline interpolated, or free-form" -msgstr "" - -#: src/gutenprintui2/curve.c:139 -msgid "Minimum X" -msgstr "" +#: src/gutenprintui2/panel.c:2528 +msgid "Select the base unit of measurement for printing" +msgstr "Seleccione a base das unidades de medida para impressão" -#: src/gutenprintui2/curve.c:140 -msgid "Minimum possible value for X" +#: src/gutenprintui2/plist.c:92 src/gutenprintui2/plist.c:101 +msgid "System V lp" msgstr "" -#: src/gutenprintui2/curve.c:149 -msgid "Maximum X" +#: src/gutenprintui2/plist.c:98 +msgid "CUPS" msgstr "" -#: src/gutenprintui2/curve.c:150 -msgid "Maximum possible X value" +#: src/gutenprintui2/plist.c:104 +msgid "Berkeley lpd (/etc/lpc)" msgstr "" -#: src/gutenprintui2/curve.c:159 -msgid "Minimum Y" +#: src/gutenprintui2/plist.c:107 +msgid "Berkeley lpd (/usr/bsd/lpc)" msgstr "" -#: src/gutenprintui2/curve.c:160 -msgid "Minimum possible value for Y" +#: src/gutenprintui2/plist.c:110 +msgid "Berkeley lpd (/usr/etc/lpc" msgstr "" -#: src/gutenprintui2/curve.c:169 -msgid "Maximum Y" +#: src/gutenprintui2/plist.c:113 +msgid "Berkeley lpd (/usr/libexec/lpc)" msgstr "" -#: src/gutenprintui2/curve.c:170 -msgid "Maximum possible value for Y" +#: src/gutenprintui2/plist.c:116 +msgid "Berkeley lpd (/usr/sbin/lpc)" msgstr "" -#: src/gutenprintui2/gammacurve.c:418 -msgid "_Gamma value" -msgstr "" +#: src/gutenprintui2/plist.c:1060 +#, fuzzy +msgid "Printer" +msgstr "Imprimir" + +#: src/gutenprintui2/plist.c:1253 +#, fuzzy +msgid "(Default Printer)" +msgstr "Configurar a Impressora" #: src/cups/genppd.c:145 #, fuzzy msgid "Printer Features" -msgstr "Definições da Impressora" +msgstr "Definições da Impressora" #: src/cups/genppd.c:146 #, fuzzy @@ -7261,54 +7636,54 @@ msgstr "" #. 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:1058 +#: src/cups/genppd.c:1064 msgid "English" msgstr "Portuguese" #. TRANSLATORS: Specify PPD translation encoding e.g. ISOLatin1 -#: src/cups/genppd.c:1060 +#: src/cups/genppd.c:1066 msgid "ISOLatin1" msgstr "ISOLatin1" -#: src/cups/genppd.c:1641 +#: src/cups/genppd.c:1647 msgid "2-Sided Printing" msgstr "" -#: src/cups/genppd.c:1665 +#: src/cups/genppd.c:1671 msgid "Shrink Page If Necessary to Fit Borders" msgstr "" -#: src/cups/genppd.c:1669 +#: src/cups/genppd.c:1675 msgid "Shrink (print the whole page)" msgstr "" -#: src/cups/genppd.c:1670 +#: src/cups/genppd.c:1676 msgid "Crop (preserve dimensions)" msgstr "" -#: src/cups/genppd.c:1671 +#: src/cups/genppd.c:1677 msgid "Expand (use maximum page area)" msgstr "" -#: src/cups/genppd.c:1756 +#: src/cups/genppd.c:1762 msgid "No" msgstr "" -#: src/cups/genppd.c:1758 +#: src/cups/genppd.c:1764 msgid "Yes" msgstr "" -#: src/cups/genppd.c:1795 src/cups/genppd.c:1857 +#: src/cups/genppd.c:1801 src/cups/genppd.c:1863 msgid "Value" msgstr "" -#: src/cups/genppd.c:1800 +#: src/cups/genppd.c:1806 msgid "Fine Adjustment" msgstr "" #: src/escputil/escputil.c:70 msgid "Escputil version " -msgstr "Versão de Escputil" +msgstr "Versão de Escputil" #: src/escputil/escputil.c:76 #, fuzzy @@ -7391,9 +7766,9 @@ 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 "" -"Utilização: escputil [-c | -n | -a | -i | -o | -s | -d | -l | -M]\n" +"Utilização: escputil [-c | -n | -a | -i | -o | -s | -d | -l | -M]\n" " [-P printer | -r device] [-u] [-q] [-m model]\n" -"Realiza manutenção em impressoras EPSON Styles (R).\n" +"Realiza manutenção em impressoras EPSON Styles (R).\n" "Exemplos: escputil --clean-head --printer stpex-on-third-floor\n" " escputil --ink-level --new --raw-device /dev/lp0\n" "\n" @@ -7419,7 +7794,7 @@ msgstr "" " -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" -" Opções:\n" +" Opções:\n" " -P|--printer-name Specify the name of the printer queue to operate on.\n" " Default is the default system printer.\n" " -r|--raw-device Specify the name of the device to write to directly\n" @@ -7474,10 +7849,10 @@ msgid "" " -C Specify the number of pattern choices for alignment\n" " -p Specify the number of sets of patterns for alignment\n" msgstr "" -"Utilização: escputil [OPTIONS] [COMMAND]\n" -"Utilização: escputil [-c | -n | -a | -i | -o | -s | -d | -l | -M]\n" +"Utilização: escputil [OPTIONS] [COMMAND]\n" +"Utilização: escputil [-c | -n | -a | -i | -o | -s | -d | -l | -M]\n" " [-P printer | -r device] [-u] [-q] [-m model]\n" -"Realiza manutenção em impressoras EPSON Stylus (R).\n" +"Realiza manutenção em impressoras EPSON Stylus (R).\n" "Exemplos: escputil -c -P stpex-on-third-floor\n" " escputil -i -u -r /dev/lp0\n" "\n" @@ -7513,12 +7888,12 @@ msgstr "" #: src/escputil/escputil.c:333 src/escputil/escputil.c:341 #, c-format msgid "You may only specify one printer or raw device." -msgstr "Você só pode especificar uma impresoora ou dispositivo" +msgstr "Você só pode especificar uma impresoora ou dispositivo" #: src/escputil/escputil.c:349 #, c-format msgid "You may only specify one printer model." -msgstr "Você só pode especificar um modelo de impressora" +msgstr "Você só pode especificar um modelo de impressora" #: src/escputil/escputil.c:373 #, c-format @@ -7533,7 +7908,7 @@ msgstr "" #: src/escputil/escputil.c:385 #, c-format msgid "Unknown option %c\n" -msgstr "Opção desconhecida %c\n" +msgstr "Opção desconhecida %c\n" #: src/escputil/escputil.c:393 #, c-format @@ -7553,17 +7928,17 @@ msgstr "" #: src/escputil/escputil.c:463 #, c-format msgid "Cannot open device %s: %s\n" -msgstr "Não foi possível abrir o dispositivo %s: %s\n" +msgstr "Não foi possível abrir o dispositivo %s: %s\n" #: src/escputil/escputil.c:486 #, c-format msgid "Cannot print to printer %s with %s\n" -msgstr "Não é possível imprimir para impressora %s com %s\n" +msgstr "Não é possível imprimir para impressora %s com %s\n" #: src/escputil/escputil.c:502 src/escputil/escputil.c:512 #, c-format msgid "Unable to send command to printer\n" -msgstr "Não foi possível enviar comando para a impressora\n" +msgstr "Não foi possível enviar comando para a impressora\n" #: src/escputil/escputil.c:572 #, c-format @@ -7573,27 +7948,27 @@ msgstr "" #: src/escputil/escputil.c:577 #, c-format msgid "Cannot read from %s: %s\n" -msgstr "Não é possível ler a partir de %s: %s\n" +msgstr "Não é possível ler a partir de %s: %s\n" #: src/escputil/escputil.c:729 #, fuzzy, c-format msgid "Please specify a raw device\n" -msgstr "Status da impressora requere a utilização de um dipositivo.\n" +msgstr "Status da impressora requere a utilização de um dipositivo.\n" #: src/escputil/escputil.c:736 #, c-format msgid "Cannot open %s read/write: %s\n" -msgstr "Não foi possível abrir %s escrita/leitura: %s\n" +msgstr "Não foi possível abrir %s escrita/leitura: %s\n" #: src/escputil/escputil.c:783 #, fuzzy, c-format msgid "Unknown printer %s!\n" -msgstr "Opção desconhecida %s\n" +msgstr "Opção desconhecida %s\n" #: src/escputil/escputil.c:819 src/escputil/escputil.c:1414 #, c-format msgid "Cannot write to %s: %s\n" -msgstr "Não foi possível escrever para %s: %s\n" +msgstr "Não foi possível escrever para %s: %s\n" #: src/escputil/escputil.c:865 src/escputil/escputil.c:1379 #: src/escputil/escputil.c:1507 @@ -7603,7 +7978,7 @@ msgid "" "Cannot write to %s: %s\n" msgstr "" "\n" -"Não foi possível escrever para %s: %s\n" +"Não foi possível escrever para %s: %s\n" #: src/escputil/escputil.c:908 #, c-format @@ -7613,8 +7988,8 @@ msgid "" "Please use -m to specify your printer model.\n" msgstr "" "\n" -"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" +"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:977 src/escputil/escputil.c:983 #: src/escputil/escputil.c:984 src/escputil/escputil.c:1253 @@ -7639,7 +8014,7 @@ msgstr "" #: src/escputil/escputil.c:1030 #, fuzzy, c-format msgid "Status: Waiting\n" -msgstr "Saturação:" +msgstr "Saturação:" #: src/escputil/escputil.c:1033 #, c-format @@ -7789,12 +8164,12 @@ msgstr "" #: src/escputil/escputil.c:1351 #, 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" +msgstr "Obter níveis de tinta requere a utilização de um dipositivo.\n" #: src/escputil/escputil.c:1457 #, 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" +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 @@ -7814,17 +8189,17 @@ msgstr "" #: src/escputil/escputil.c:1671 #, c-format msgid "Printer identification requires using a raw device.\n" -msgstr "Identificação da impressora requere a utilização de um dispositivo.\n" +msgstr "Identificação da impressora requere a utilização de um dispositivo.\n" #: src/escputil/escputil.c:1689 #, fuzzy, c-format msgid "Cannot identify printer model.\n" -msgstr "Você só pode especificar um modelo de impressora" +msgstr "Você só pode especificar um modelo de impressora" #: src/escputil/escputil.c:1711 #, c-format msgid "Cleaning heads...\n" -msgstr "Limpando as cabeças...\n" +msgstr "Limpando as cabeças...\n" #: src/escputil/escputil.c:1728 #, c-format @@ -7870,50 +8245,50 @@ msgid "" "It is essential that you not turn your printer off during this procedure.\n" "\n" msgstr "" -"Por favor leia estas intruções muito cuidadosamente antes de prosseguir.\n" +"Por favor leia estas intruções muito cuidadosamente antes de prosseguir.\n" "\n" -"Este programa permite alinhas a cabeça de impressão da sua impressora a " +"Este programa permite alinhas a cabeça de impressão da sua impressora a " "jacto\n" -"de tinta Epson Stylus. A má utilização do programa pode provocar degradação " +"de tinta Epson Stylus. A má utilização do programa pode provocar degradação " "da\n" -"qualidade de impressão, ou mesmo danificar a sua impressora. Este programa " -"não foi revisto\n" -"pela Seiko Epson para verificação, e não oferece qualquer tipo de garantia. " +"qualidade de impressão, ou mesmo danificar a sua impressora. Este programa " +"não foi revisto\n" +"pela Seiko Epson para verificação, e não oferece qualquer tipo de garantia. " "O risco\n" -"involvido na sua utilização recai totalmente sobre si.\n" +"involvido na sua utilização recai totalmente sobre si.\n" "\n" -"Este programa imprime %d padrões de teste. Cada parão parece muito " +"Este programa imprime %d padrões de teste. Cada parão parece muito " "semelhante.\n" -"O padrão consiste num série de pares de linhas verticais que sobrepõem.\n" -"Debaixo de cada par de linhas está um número entre %d e %d.\n" +"O padrão consiste num série de pares de linhas verticais que sobrepõem.\n" +"Debaixo de cada par de linhas está um número entre %d e %d.\n" "\n" -"Quando você inpeccionar o par de linhas, deve procurar o par de linhas\n" -"qye está melhor alinhado, isto é, que melhor forma uma única linha vertcal.\n" +"Quando você inpeccionar o par de linhas, deve procurar o par de linhas\n" +"qye está melhor alinhado, isto é, que melhor forma uma única linha vertcal.\n" "Inpeccione os pares cuidadosamente para procurar o melhor resultado. O uso\n" -"de uma lupa é recomendado para as inspecções mais críticas.\n" -"Tamebém é recomendado que utilize papel de boa qualidade para o teste, para\n" -"que as linhas fiquem bem formadas e não se espalhem pelo papel.\n" -"Após descobrir o número que corresponde ao melhor par, coloque o papel de " +"de uma lupa é recomendado para as inspecções mais críticas.\n" +"Tamebém é recomendado que utilize papel de boa qualidade para o teste, para\n" +"que as linhas fiquem bem formadas e não se espalhem pelo papel.\n" +"Após descobrir o número que corresponde ao melhor par, coloque o papel de " "volta\n" "no alimentador de papel antes de o teclar.\n" "\n" -"Cada padrão é similar, mas os últimos padrões usam pontos mais finos para " +"Cada padrão é similar, mas os últimos padrões usam pontos mais finos para " "alinhamentos\n" -"mais críticos. Deve correr todas as passagens para alinhar correctamente a " +"mais críticos. Deve correr todas as passagens para alinhar correctamente a " "sua\n" -"impressora. Após correr todas as passagens de alinhamento, os padrões de " +"impressora. Após correr todas as passagens de alinhamento, os padrões de " "alinhamento\n" -"serão imprimidos mais uma vez. Você deve verificar que o par do meio (#%d em " -"%d) é\n" -"o melhor de todos os padrões.\n" +"serão imprimidos mais uma vez. Você deve verificar que o par do meio (#%d em " +"%d) é\n" +"o melhor de todos os padrões.\n" "\n" -"Após as passagens serem imprimidas mais ima vez, vão dar-lhe a opção\n" +"Após as passagens serem imprimidas mais ima vez, vão dar-lhe a opção\n" "de gravar as escolhas na impressora, repetir o processo, ou sair sem " "gravar.\n" -"Sair não vai restaurar as definições anteriores, mas desligar aimpressora e\n" +"Sair não vai restaurar as definições anteriores, mas desligar aimpressora e\n" "voltar a ligar vai. Se sair deve repetir o processo inteiro se desejar " "gravar\n" -"os resultados. É essencial que você não desligue a impressora durante este " +"os resultados. É essencial que você não desligue a impressora durante este " "procedimento.\n" "\n" @@ -7952,50 +8327,50 @@ msgid "" "this procedure.\n" "\n" msgstr "" -"Por favor leia estas intrucções muito cuidadosamente antes de prosseguir.\n" +"Por favor leia estas intrucções muito cuidadosamente antes de prosseguir.\n" "\n" -"Este programa permite alinhas a cabeça de impressão da sua impressora a " +"Este programa permite alinhas a cabeça de impressão da sua impressora a " "jacto\n" -"de tinta Epson Stylus. A má utilização do programa pode provocar degradação " +"de tinta Epson Stylus. A má utilização do programa pode provocar degradação " "da\n" -"qualidade de impressão, ou mesmo danificar a sua impressora. Este programa " -"não foi revisto\n" -"pela Seiko Epson para verificação, e não oferece qualquer tipo de garantia. " +"qualidade de impressão, ou mesmo danificar a sua impressora. Este programa " +"não foi revisto\n" +"pela Seiko Epson para verificação, e não oferece qualquer tipo de garantia. " "O risco\n" -"involvido na sua utilização recai totalmente sobre si.\n" +"involvido na sua utilização recai totalmente sobre si.\n" "\n" -"Este programa imprime um padrao que consiste num série de pares de linhas " -"verticais que sobrepõem.\n" -"Debaixo de cada par de linhas está um número entre %d e %d.\n" +"Este programa imprime um padrao que consiste num série de pares de linhas " +"verticais que sobrepõem.\n" +"Debaixo de cada par de linhas está um número entre %d e %d.\n" "\n" -"Quando você inpeccionar o par de linhas, deve procurar o par de linhas\n" -"qye está melhor alinhado, isto é, que melhor forma uma única linha vertcal.\n" +"Quando você inpeccionar o par de linhas, deve procurar o par de linhas\n" +"qye está melhor alinhado, isto é, que melhor forma uma única linha vertcal.\n" "Inpeccione os pares cuidadosamente para procurar o melhor resultado. O uso\n" -"de uma lupa é recomendado para as inspecções mais críticas.\n" -"Tamebém é recomendado que utilize papel de boa qualidade para o teste, para\n" -"que as linhas fiquem bem formadas e não se espalhem pelo papel.\n" -"Após descobrir o número que corresponde ao melhor par, coloque o papel de " +"de uma lupa é recomendado para as inspecções mais críticas.\n" +"Tamebém é recomendado que utilize papel de boa qualidade para o teste, para\n" +"que as linhas fiquem bem formadas e não se espalhem pelo papel.\n" +"Após descobrir o número que corresponde ao melhor par, coloque o papel de " "volta\n" "no alimentador de papel antes de o teclar.\n" "\n" -"Após correr todas as passagens de alinhamento, os padrões de alinhamento\n" -"serão imprimidos mais uma vez. Você deve verificar que o par do meio (#%d em " -"%d) é\n" -"o melhor de todos os padrões.\n" +"Após correr todas as passagens de alinhamento, os padrões de alinhamento\n" +"serão imprimidos mais uma vez. Você deve verificar que o par do meio (#%d em " +"%d) é\n" +"o melhor de todos os padrões.\n" "\n" -"Agora ser-lhe-á dada a opção de gravar as escolhas na impressora, repetir o " +"Agora ser-lhe-á dada a opção de gravar as escolhas na impressora, repetir o " "processo,\n" -"ou sair sem gravar. Sair não vai restaurar as definições anteriores, mas " +"ou sair sem gravar. Sair não vai restaurar as definições anteriores, mas " "desligar a\n" "impressora e voltar a ligar vai. Se sair deve repetir o processo inteiro se " "desejar gravar\n" -"os resultados. É essencial que você não desligue a impressora durante este " +"os resultados. É essencial que você não desligue a impressora durante este " "procedimento.\n" #: 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" +msgstr "Não foi possível enviar o comando para a impressora, saindo.\n" #: src/escputil/escputil.c:1825 src/escputil/escputil.c:1994 #, c-format @@ -8014,12 +8389,12 @@ msgid "" "What do you want to do (s, q, r)?\n" msgstr "" "Por favor inspeccione o output final muito cuidadosamente para se assegurar\n" -"que a sua impressora tem um alinhamento correcto. Você pode agora:\n" +"que a sua impressora tem um alinhamento correcto. Você pode agora:\n" " (s) gravar os resultados na impressora,\n" " (q) sair sem gravar os resultados, ou\n" -" (r) repetir o processo inteiro desde o início.\n" +" (r) repetir o processo inteiro desde o início.\n" "Vai-lhe ser pedido para confirmar a sua escolha.\n" -"O que é que pretende fazer (s, q, r)?\n" +"O que é que pretende fazer (s, q, r)?\n" #: src/escputil/escputil.c:1836 src/escputil/escputil.c:1845 #: src/escputil/escputil.c:1860 src/escputil/escputil.c:1878 @@ -8040,8 +8415,8 @@ 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 "" -"A sua impressora está alinhada, mas o alinhamento não foi gravado.\n" -"Se deseja gravar o alinhamento, terá de repetir o processo.\n" +"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:1857 #, c-format @@ -8066,16 +8441,16 @@ msgid "" "Please confirm by typing 's' again that you wish to save the settings\n" "to your printer:\n" msgstr "" -"Isto vai alterar permanentemente a configuração da sua impressora.\n" -"AVISO: este procedimento não foi aprovado pela Seiko Epson, e pode\n" +"Isto vai alterar permanentemente a configuração da sua impressora.\n" +"AVISO: este procedimento não foi aprovado pela Seiko Epson, e pode\n" "danificar a sua impressora. Prosseguir?\n" -"Por favor confirme, carregando em 's' outra vez, que você deseja gravar\n" -"as configurações para a sua impressora:\n" +"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:1883 #, c-format msgid "About to save settings..." -msgstr "Prestes a gravar as configurações..." +msgstr "Prestes a gravar as configurações..." #: src/escputil/escputil.c:1889 #, c-format @@ -8088,7 +8463,7 @@ msgid "" "Your settings were not saved successfully. You must repeat the\n" "alignment procedure.\n" msgstr "" -"A suas configurações não foram gravados com sucesso.\n" +"A suas configurações não foram gravados com sucesso.\n" "Vai ter de repetir o processo de alinhamento.\n" #: src/escputil/escputil.c:1894 @@ -8100,7 +8475,7 @@ msgstr "sucesso!\n" #, 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" +"As suas configurações do alinhamento foram gravadas para a impressora.\n" #: src/escputil/escputil.c:1900 #, c-format @@ -8110,7 +8485,7 @@ msgstr "Comando desconhecido.\n" #: src/escputil/escputil.c:1903 #, c-format msgid "Final command was not confirmed.\n" -msgstr "O comando final não foi confirmado.\n" +msgstr "O comando final não foi confirmado.\n" #: src/escputil/escputil.c:1908 #, fuzzy, c-format @@ -8122,12 +8497,12 @@ msgid "" "Please place a sheet of paper in your printer to begin the head\n" "alignment procedure.\n" msgstr "" -"Este procedimento assume que a sua impressora é uma Epson %s.\n" -"Se este não é o seu modelo de impressora, por favor carregue em control-C\n" +"Este procedimento assume que a sua impressora é uma Epson %s.\n" +"Se este não é o seu modelo de impressora, por favor carregue em control-C\n" "agora e escolha o seu modelo de impressora.\n" "\n" "Por favor coloque uma folha de papel na impressora para iniciar\n" -"o processo de alinhamento da cabeça.\n" +"o processo de alinhamento da cabeça.\n" #: src/escputil/escputil.c:1977 src/escputil/escputil.c:2008 #: src/escputil/escputil.c:2051 @@ -8141,8 +8516,8 @@ msgid "" "pattern.\n" "Type a pair number, '?' for help, or 'r' to repeat the procedure.\n" msgstr "" -"Por favor inspeccione a impressão, e escolha o melhor par de linhas em cada " -"padrão.\n" +"Por favor inspeccione a impressão, e escolha o melhor par de linhas em cada " +"padrão.\n" "Insira um par, '?' para ajuda, ou 'r' para repetir o procedimento.\n" #: src/escputil/escputil.c:1997 @@ -8158,12 +8533,12 @@ msgstr "Por favor insira uma nova folha de papel.\n" #: src/escputil/escputil.c:2024 #, c-format msgid "Number out of range!\n" -msgstr "Número fora do intervalo|\n" +msgstr "Número fora do intervalo|\n" #: src/escputil/escputil.c:2029 #, c-format msgid "I cannot understand what you typed!\n" -msgstr "Eu não consigo intender o que escreveu!\n" +msgstr "Eu não consigo intender o que escreveu!\n" #: src/escputil/escputil.c:2035 #, c-format @@ -8188,239 +8563,102 @@ msgid "" "pattern %d. If it is not, you should repeat the process to get the best\n" "quality printing.\n" msgstr "" -"Por favor verifique que o alinhamento é correcto. Após padrão de " +"Por favor verifique que o alinhamento é correcto. Após padrão de " "alinhamento\n" -"ser impresso outra vez, por favor certifique-se qye o melhor padrão para " +"ser impresso outra vez, por favor certifique-se qye o melhor padrão para " "cada linha\n" -"é o padrão %d. Se não é, você deve repetir o processo para obter a melhor\n" -"qualidade de impressão.\n" +"é 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:2092 #, c-format msgid "Error in input\n" msgstr "Erro no input\n" -#: src/gimp/print-image-gimp.c:225 src/gimp2/print-image-gimp.c:225 +#: src/gimp2/print-image-gimp.c:225 msgid "Printing..." msgstr "Imprimindo..." -#: src/gimp/print.c:133 -msgid "/File/Print..." -msgstr "/Ficheiro/Imprimir..." - -#: src/ghost/ijsgutenprint.c:98 -#, c-format -msgid "" -"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" -msgstr "" - -#: 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:199 -#, fuzzy, c-format -msgid "ERROR: ijsgutenprint: No row buffer\n" -msgstr "Sem buffer de linha\n" - -#: 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: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: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:656 -#, c-format -msgid "ijsgutenprint: unknown DeviceModel %s\n" -msgstr "" - -#: 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: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: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: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: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: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: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" +#, fuzzy +#~ 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:841 -#, fuzzy, c-format -msgid "ERROR: ijsgutenprint: Bad parameter %s %d\n" -msgstr "Impressora desconhecida %s\n" +#, fuzzy +#~ msgid "ERROR: ijsgutenprint: No row buffer\n" +#~ msgstr "Sem buffer de linha\n" -#: 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" +#, fuzzy +#~ 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:1308 -#, fuzzy, c-format -msgid "ERROR: ijsgutenprint: image_init failed %d\n" -msgstr "image_init falhou %d\n" +#, fuzzy +#~ msgid "ERROR: ijsgutenprint: Printer must be specified with -sDeviceModel\n" +#~ msgstr "Impressora deve ser especificada com -sModelo\n" -#: 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" +#, fuzzy +#~ msgid "ERROR: ijsgutenprint: Printer %s is not a known model\n" +#~ msgstr "Impressora %s não é um modelo conhecido\n" -#: 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" +#, fuzzy +#~ msgid "ERROR: ijsgutenprint: cannot parse TopLeft %s\n" +#~ msgstr "Não é possível imprimir para impressora %s com %s\n" -#: src/ghost/ijsgutenprint.c:1344 -#, fuzzy, c-format -msgid "ERROR: ijsgutenprint: Unknown printer %s\n" -msgstr "Impressora desconhecida %s\n" +#, fuzzy +#~ msgid "ERROR: ijsgutenprint: cannot parse PaperSize %s\n" +#~ msgstr "Não é possível imprimir para impressora %s com %s\n" -#: 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" +#, fuzzy +#~ msgid "ERROR: ijsgutenprint: cannot parse curve %s\n" +#~ msgstr "Não é possível imprimir para impressora %s com %s\n" -#: 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 "ERROR: ijsgutenprint: cannot parse %s float %s\n" +#~ msgstr "Não é possível imprimir para impressora %s com %s\n" #, fuzzy -#~ msgid "Model Name" -#~ msgstr "Cancelar" +#~ msgid "ERROR: ijsgutenprint: cannot parse %s int %s\n" +#~ msgstr "Não é possível imprimir para impressora %s com %s\n" #, fuzzy -#~ msgid "Cassette" -#~ msgstr "Papel Mate" +#~ msgid "ERROR: ijsgutenprint: cannot parse %s dimension %s\n" +#~ msgstr "Não é possível imprimir para impressora %s com %s\n" #, fuzzy -#~ msgid " Gamma" -#~ msgstr "Gama:" +#~ msgid "ERROR: ijsgutenprint: cannot parse %s boolean %s\n" +#~ msgstr "Não é possível imprimir para impressora %s com %s\n" #, fuzzy -#~ msgid " Curve" -#~ msgstr "Preto" +#~ msgid "ERROR: ijsgutenprint: Bad parameter %s %d\n" +#~ msgstr "Impressora desconhecida %s\n" #, fuzzy -#~ msgid "1440 x 1440" -#~ msgstr "1440 x 1440 DPI" +#~ msgid "ERROR: ijsgutenprint: bad key code %d\n" +#~ msgstr "Obtenção da próxima linha falhou em %.0f\n" #, fuzzy -#~ msgid "1440 x 1440 DPI High Quality" -#~ msgstr "1440 x 360 DPI Máxima Qualidade" +#~ msgid "ERROR: ijsgutenprint: image_init failed %d\n" +#~ msgstr "image_init falhou %d\n" #, fuzzy -#~ msgid "1440 x 1440 DPI Highest Quality" -#~ msgstr "1440 x 360 DPI Máxima Qualidade" +#~ msgid "ERROR: ijsgutenprint: Unable to open file descriptor: %s\n" +#~ msgstr "Não foi possível abrir \"file descriptor\": %s\n" #, fuzzy -#~ msgid "2880 x 1440 DPI High Quality" -#~ msgstr "1440 x 360 DPI Máxima Qualidade" +#~ msgid "ERROR: ijsgutenprint: Unable to open %s: %s\n" +#~ msgstr "Não foi possível abrir %s: %s\n" #, fuzzy -#~ msgid "2880 x 1440 DPI Highest Quality" -#~ msgstr "1440 x 360 DPI Máxima Qualidade" +#~ msgid "ERROR: ijsgutenprint: Unknown printer %s\n" +#~ msgstr "Impressora desconhecida %s\n" #, fuzzy -#~ msgid "" -#~ "\n" -#~ "\n" -#~ "Copyright (C) 1997-2003 Michael Sweet, Robert Krawitz,\n" -#~ "and the rest of the Gutenprint Development Team.\n" -#~ "\n" -#~ "Please visit our web site at http://gimp-print.sourceforge.net.\n" -#~ "\n" -#~ "This program is free software; you can redistribute it and/or modify\n" -#~ "it under the terms of the GNU General Public License as published by\n" -#~ "the Free Software Foundation; either version 2 of the License, or\n" -#~ "(at your option) any later version.\n" -#~ "\n" -#~ "This program is distributed in the hope that it will be useful,\n" -#~ "but WITHOUT ANY WARRANTY; without even the implied warranty of\n" -#~ "MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the\n" -#~ "GNU General Public License for more details.\n" -#~ "\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" -#~ msgstr "" -#~ "\n" -#~ "\n" -#~ "Copyright (C) 1997-2001 Michael Sweet, Robert Krawitz,\n" -#~ "and the rest of the Gimp-Print Development Team.\n" -#~ "\n" -#~ "Please visit our web site at http://gimp-print.sourceforge.net.\n" -#~ "\n" -#~ "This program is free software; you can redistribute it and/or modify\n" -#~ "it under the terms of the GNU General Public License as published by\n" -#~ "the Free Software Foundation; either version 2 of the License, or\n" -#~ "(at your option) any later version.\n" -#~ "\n" -#~ "This program is distributed in the hope that it will be useful,\n" -#~ "but WITHOUT ANY WARRANTY; without even the implied warranty of\n" -#~ "MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the\n" -#~ "GNU General Public License for more details.\n" -#~ "\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" +#~ msgid "ERROR: ijsgutenprint: Bad parameters; cannot continue!\n" +#~ msgstr "Parâmetros inválidos; não é possível continuar|\n" #, 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-2001 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" +#~ msgid "ERROR: ijsgutenprint: Get next row failed at %.0f\n" +#~ msgstr "Obtenção da próxima linha falhou em %.0f\n" #, fuzzy #~ msgid "90x90 DPI" @@ -8454,10 +8692,6 @@ msgstr "Obtenção da próxima linha falhou em %.0f\n" #~ msgid "720x360 DPI DMT" #~ msgstr "720 x 360 DPI MW2" -#, fuzzy -#~ msgid "720x720 DPI" -#~ msgstr "2880 x 720 DPI" - #, fuzzy #~ msgid "720x720 DPI DMT" #~ msgstr "2880 x 720 DPI" @@ -8522,24 +8756,20 @@ msgstr "Obtenção da próxima linha falhou em %.0f\n" #~ msgid "2400x2400 DPI DMT" #~ msgstr "2400x600 DPI" -#, fuzzy -#~ msgid "Plain Paper PIXMA" -#~ msgstr "Papel Normal" - #~ msgid "Back Print Film" -#~ msgstr "Filme de impressão por trás" +#~ msgstr "Filme de impressão por trás" #~ msgid "Fabric Sheets" -#~ msgstr "Folhas de Fábrica" +#~ msgstr "Folhas de Fábrica" #~ msgid "Envelope" #~ msgstr "Envelope" #~ msgid "High Resolution Paper" -#~ msgstr "Papel de Alta Resolução" +#~ msgstr "Papel de Alta Resolução" #~ msgid "T-Shirt Transfers" -#~ msgstr "Transferências para T-Shirt" +#~ msgstr "Transferências para T-Shirt" #~ msgid "High Gloss Film" #~ msgstr "Filme Muito Lustroso" @@ -8548,34 +8778,34 @@ msgstr "Obtenção da próxima linha falhou em %.0f\n" #~ msgstr "Papel de Fotografia Lustroso" #~ msgid "Glossy Photo Cards" -#~ msgstr "Cartões de Fotografia Lustrosos" +#~ msgstr "Cartões de Fotografia Lustrosos" #~ msgid "Photo Paper Pro" #~ msgstr "Papel de Fotografia Profissional" -#~ msgid "Photo CcMmYK Color" -#~ msgstr "Cor CcMmYK de Fotografia<" - -#~ msgid "Photo CcMmY Color" -#~ msgstr "Cor CcMmY de Fotografia" +#~ msgid "CMY Color" +#~ msgstr "Cor CMY" #~ msgid "CMYK Color" #~ msgstr "Cor CMYK" -#~ msgid "CMY Color" -#~ msgstr "Cor CMY" +#~ msgid "Photo CcMmY Color" +#~ msgstr "Cor CcMmY de Fotografia" + +#~ msgid "Photo CcMmYK Color" +#~ msgstr "Cor CcMmYK de Fotografia<" #, fuzzy -#~ msgid "Gutenprint" -#~ msgstr "impressão de teste" +#~ msgid " Gamma" +#~ msgstr "Gama:" #, fuzzy -#~ msgid "ERROR: ijsgutenprint: ijs_server_get_page_header failed %d\n" -#~ msgstr "ijs_server_get_page_header falhou %d\n" +#~ msgid " Curve" +#~ msgstr "Preto" #, fuzzy -#~ msgid "EPSON Stylus C50" -#~ msgstr "Stylus C60" +#~ msgid "Red Balance" +#~ msgstr "Ajustar o equilíbrio de amarelo na impressão" #, fuzzy #~ msgid "EPSON Stylus C60" @@ -8585,18 +8815,6 @@ msgstr "Obtenção da próxima linha falhou em %.0f\n" #~ msgid "EPSON Stylus C61" #~ msgstr "Stylus C61" -#, fuzzy -#~ msgid "EPSON Stylus C62" -#~ msgstr "Stylus C62" - -#, fuzzy -#~ msgid "EPSON Stylus C70" -#~ msgstr "Stylus C70" - -#, fuzzy -#~ msgid "EPSON Stylus C80" -#~ msgstr "Stylus C80" - #, fuzzy #~ msgid "EPSON Stylus C82" #~ msgstr "Stylus C82" @@ -8829,10 +9047,6 @@ msgstr "Obtenção da próxima linha falhou em %.0f\n" #~ msgid "EPSON Stylus Pro 5500" #~ msgstr "Stylus Pro 5500" -#, fuzzy -#~ msgid "EPSON Stylus Pro 7000" -#~ msgstr "Stylus Pro 7000" - #, fuzzy #~ msgid "EPSON Stylus Pro 7500" #~ msgstr "Stylus Pro 7500" @@ -8866,31 +9080,94 @@ msgstr "Obtenção da próxima linha falhou em %.0f\n" #~ msgstr "Stylus Scan 2500" #, fuzzy -#~ msgid "EPSON E-100" -#~ msgstr "Stylus C60" +#~ msgid "" +#~ "\n" +#~ "\n" +#~ "Copyright (C) 1997-2003 Michael Sweet, Robert Krawitz,\n" +#~ "and the rest of the Gutenprint Development Team.\n" +#~ "\n" +#~ "Please visit our web site at http://gimp-print.sourceforge.net.\n" +#~ "\n" +#~ "This program is free software; you can redistribute it and/or modify\n" +#~ "it under the terms of the GNU General Public License as published by\n" +#~ "the Free Software Foundation; either version 2 of the License, or\n" +#~ "(at your option) any later version.\n" +#~ "\n" +#~ "This program is distributed in the hope that it will be useful,\n" +#~ "but WITHOUT ANY WARRANTY; without even the implied warranty of\n" +#~ "MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the\n" +#~ "GNU General Public License for more details.\n" +#~ "\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" +#~ msgstr "" +#~ "\n" +#~ "\n" +#~ "Copyright (C) 1997-2001 Michael Sweet, Robert Krawitz,\n" +#~ "and the rest of the Gimp-Print Development Team.\n" +#~ "\n" +#~ "Please visit our web site at http://gimp-print.sourceforge.net.\n" +#~ "\n" +#~ "This program is free software; you can redistribute it and/or modify\n" +#~ "it under the terms of the GNU General Public License as published by\n" +#~ "the Free Software Foundation; either version 2 of the License, or\n" +#~ "(at your option) any later version.\n" +#~ "\n" +#~ "This program is distributed in the hope that it will be useful,\n" +#~ "but WITHOUT ANY WARRANTY; without even the implied warranty of\n" +#~ "MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the\n" +#~ "GNU General Public License for more details.\n" +#~ "\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" #, fuzzy -#~ msgid "Printer does not support listing ink types!\n" -#~ msgstr "A impressora não suporta a cor de impressão\n" +#~ msgid "Gutenprint" +#~ msgstr "impressão de teste" + +#, fuzzy +#~ msgid "" +#~ ", Copyright (C) 2000-2003 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-2001 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" #, fuzzy #~ msgid "Cannot identify printer!\n" -#~ msgstr "Não é possivel processar o output da impressora\n" +#~ msgstr "Não é possivel processar o output da impressora\n" #, fuzzy -#~ msgid "Red Balance" -#~ msgstr "Ajustar o equilíbrio de amarelo na impressão" +#~ msgid "Printer does not support listing ink types!\n" +#~ msgstr "A impressora não suporta a cor de impressão\n" + +#~ msgid "/File/Print..." +#~ msgstr "/Ficheiro/Imprimir..." + +#, fuzzy +#~ msgid "ERROR: ijsgutenprint: ijs_server_get_page_header failed %d\n" +#~ msgstr "ijs_server_get_page_header falhou %d\n" #, fuzzy #~ msgid "Gloss Balance" -#~ msgstr "Ajustar o equilíbrio de amarelo na impressão" +#~ msgstr "Ajustar o equilíbrio de amarelo na impressão" #~ 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 "" #~ "O alinhamento da impressora deve ser feiro com um dipositovo\n" -#~ "ou então a opção -m deve ser usada para especificar a impressora.\n" +#~ "ou então a opção -m deve ser usada para especificar a impressora.\n" #~ msgid "Attempting to detect printer model..." #~ msgstr "Tentado detectar o modelo da impressora..." @@ -8900,10 +9177,10 @@ msgstr "Obtenção da próxima linha falhou em %.0f\n" #~ "Cannot open %s read/write: %s\n" #~ msgstr "" #~ "\n" -#~ "Não foi possível abir %s leitura/escrita %s\n" +#~ "Não foi possível abir %s leitura/escrita %s\n" #~ msgid "Printer model %s is not known.\n" -#~ msgstr "O modelo de impressora %s é desconhecido.\n" +#~ msgstr "O modelo de impressora %s é desconhecido.\n" #, fuzzy #~ msgid "Gimp-Print" @@ -8912,8 +9189,8 @@ msgstr "Obtenção da próxima linha falhou em %.0f\n" #, fuzzy #~ msgid "Brightness of the print (0 is solid black, 2 is solid white)" #~ msgstr "" -#~ "Defina o brilho da impressão.\n" -#~ "0 é preto sólido, 2 é branco sólido" +#~ "Defina o brilho da impressão.\n" +#~ "0 é preto sólido, 2 é branco sólido" #~ msgid "" #~ "Enter the correct command to print to your printer. Note: Please do not " @@ -8922,7 +9199,7 @@ msgstr "Obtenção da próxima linha falhou em %.0f\n" #~ msgstr "" #~ "Insira o comando correcto para imprimir para a sua impressora. Nota: Por " #~ "favor\n" -#~ "não remova o `-l' ou `-oraw' da linha de comando, ou a impressão " +#~ "não remova o `-l' ou `-oraw' da linha de comando, ou a impressão " #~ "provavelmente \n" #~ "vai falhar!" @@ -8930,37 +9207,37 @@ msgstr "Obtenção da próxima linha falhou em %.0f\n" #~ msgstr "Ficheiro PPD?" #~ msgid "%s: option `%s' is ambiguous\n" -#~ msgstr "%s: a opção `%s' é ambígua\n" +#~ msgstr "%s: a opção `%s' é ambígua\n" #~ msgid "%s: option `--%s' doesn't allow an argument\n" -#~ msgstr "'%s': a opção `--%s' não admite um argumento\n" +#~ msgstr "'%s': a opção `--%s' não admite um argumento\n" #~ msgid "%s: option `%c%s' doesn't allow an argument\n" -#~ msgstr "%s: a opção `%c%s' não admite um argumento\n" +#~ msgstr "%s: a opção `%c%s' não admite um argumento\n" #~ msgid "%s: option `%s' requires an argument\n" -#~ msgstr "%s: a opção `%s' requere um argumento\n" +#~ msgstr "%s: a opção `%s' requere um argumento\n" #~ msgid "%s: unrecognized option `--%s'\n" -#~ msgstr "%s: opção não reconhecida `--%s'\n" +#~ msgstr "%s: opção não reconhecida `--%s'\n" #~ msgid "%s: unrecognized option `%c%s'\n" -#~ msgstr "%s: opcção não reconhecida `%c%s'\n" +#~ msgstr "%s: opcção não reconhecida `%c%s'\n" #~ msgid "%s: illegal option -- %c\n" -#~ msgstr "%s: opção ilegal -- %c\n" +#~ msgstr "%s: opção ilegal -- %c\n" #~ msgid "%s: invalid option -- %c\n" -#~ msgstr "%s: opção inválida -- %c\n" +#~ msgstr "%s: opção inválida -- %c\n" #~ msgid "%s: option requires an argument -- %c\n" -#~ msgstr "%s: opção requere um argumento -- %c\n" +#~ msgstr "%s: opção requere um argumento -- %c\n" #~ msgid "%s: option `-W %s' is ambiguous\n" -#~ msgstr "%s: opção `-W %s' é ambígua\n" +#~ msgstr "%s: opção `-W %s' é ambígua\n" #~ msgid "%s: option `-W %s' doesn't allow an argument\n" -#~ msgstr "%s: opção `-W %s' não permite um argumento\n" +#~ msgstr "%s: opção `-W %s' não permite um argumento\n" #, fuzzy #~ msgid "Bright" @@ -8968,11 +9245,11 @@ msgstr "Obtenção da próxima linha falhou em %.0f\n" #, fuzzy #~ msgid "Image is too wide for the page\n" -#~ msgstr "Redimensionar a impressão para o tamanho da página" +#~ msgstr "Redimensionar a impressão para o tamanho da página" #, fuzzy #~ msgid "Full Bleed" -#~ msgstr "Rolo de Alimentação" +#~ msgstr "Rolo de Alimentação" #, fuzzy #~ msgid "traditional" @@ -8992,29 +9269,17 @@ msgstr "Obtenção da próxima linha falhou em %.0f\n" #~ msgstr "Optimizar o output para o tipo de imagem a ser imprimida" #~ msgid "Solid Colors" -#~ msgstr "Cores Sólidas" - -#~ msgid "Stylus C20sx" -#~ msgstr "Stylus c20sx" +#~ msgstr "Cores Sólidas" #~ 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" @@ -9056,66 +9321,66 @@ msgstr "Obtenção da próxima linha falhou em %.0f\n" #~ "WARNING: THIS FUNCTION IS NOT YET TESTED! It may not work, and it may\n" #~ "damage your printer!\n" #~ msgstr "" -#~ "Por favor leia estas intrucções muito cuidadosamente antes de " +#~ "Por favor leia estas intrucções muito cuidadosamente antes de " #~ "prosseguir.\n" #~ "\n" -#~ "Este programa permite alinhas a cabeça de impressão da sua impressora a " +#~ "Este programa permite alinhas a cabeça de impressão da sua impressora a " #~ "jacto\n" -#~ "de tinta Epson Stylus. A má utilização do programa pode provocar " -#~ "degradação da\n" -#~ "qualidade de impressão, ou mesmo danificar a sua impressora. Este " -#~ "programa não foi revisto\n" -#~ "pela Seiko Epson para verificação, e não oferece qualquer tipo de " +#~ "de tinta Epson Stylus. A má utilização do programa pode provocar " +#~ "degradação da\n" +#~ "qualidade de impressão, ou mesmo danificar a sua impressora. Este " +#~ "programa não foi revisto\n" +#~ "pela Seiko Epson para verificação, e não oferece qualquer tipo de " #~ "garantia. O risco\n" -#~ "involvido na sua utilização recai totalmente sobre si.\n" +#~ "involvido na sua utilização recai totalmente sobre si.\n" #~ "\n" -#~ "Este programa imprime %d padrões de teste que se sobrepõem en cada folha " +#~ "Este programa imprime %d padrões de teste que se sobrepõem en cada folha " #~ "de papel.\n" -#~ "Isto é, ele imprime um padrão e depois ejecta o papel. Você deve " +#~ "Isto é, ele imprime um padrão e depois ejecta o papel. Você deve " #~ "reinserir a mesma\n" -#~ "página, e ele vai imprimir outro padrão. Cada padrão consiste num " +#~ "página, e ele vai imprimir outro padrão. Cada padrão consiste num " #~ "conjunto de \n" #~ "escolhas numeradas entre %d e %d.\n" #~ "\n" -#~ "Quando você inpeccionar os padrões, deve encontrar uma mancha com a " +#~ "Quando você inpeccionar os padrões, deve encontrar uma mancha com a " #~ "textura mais suave\n" -#~ "(menos granulada). Você deve inspeccionar as manchas muito cuidadosamente " +#~ "(menos granulada). Você deve inspeccionar as manchas muito cuidadosamente " #~ "para escolher\n" -#~ "a melhor. Nós sugerimos usar papel de qualidade fotográfica ou um papel " +#~ "a melhor. Nós sugerimos usar papel de qualidade fotográfica ou um papel " #~ "similar de alta\n" -#~ "qualidade para este teste. Se não encontrar um padrão suave, deve repetir " +#~ "qualidade para este teste. Se não encontrar um padrão suave, deve repetir " #~ "o teste.\n" #~ "\n" -#~ "Após inpeccionar as escolhas e escolher uma mancha, vai-lhe ser dada a " -#~ "hipótese\n" +#~ "Após inpeccionar as escolhas e escolher uma mancha, vai-lhe ser dada a " +#~ "hipótese\n" #~ "de gravar os resultados na impressora, repetir o processo, ou sair sem " -#~ "gravar. Sair não\n" -#~ "vai restaurar as definições anteriores, mas desligar e voltar a ligar a " +#~ "gravar. Sair não\n" +#~ "vai restaurar as definições anteriores, mas desligar e voltar a ligar a " #~ "impressora vai.\n" -#~ "Se você sair, deve repetir o processo inteiro se desejar gravar mais " +#~ "Se você sair, deve repetir o processo inteiro se desejar gravar mais " #~ "tarde os resultados.\n" -#~ "É essencial que você não desligue a impressora durante este " +#~ "É essencial que você não desligue a impressora durante este " #~ "procedimento.\n" #~ "\n" -#~ "AVISO: ESTA FUNÇÃO AINDA NÃO FOI TESTADA! Pode não funcionar, e pode " +#~ "AVISO: ESTA FUNÇÃO AINDA NÃO FOI TESTADA! Pode não funcionar, e pode " #~ "danificar a\n" #~ "sua impressora!\n" #~ msgid "Printer %s does not require color head alignment.\n" -#~ msgstr "A impressora %s não necessita de alinhamento das cabeças de cor.\n" +#~ msgstr "A impressora %s não necessita de alinhamento das cabeças de cor.\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 "" -#~ "Por favor inspeccione a impressão, e escolha o melhor par de linhas em " -#~ "cada padrão.\n" +#~ "Por favor inspeccione a impressão, e escolha o melhor par de linhas em " +#~ "cada padrão.\n" #~ "Insira um par, '?' para ajuda, ou 'r' para repetir o procedimento.\n" #, fuzzy #~ msgid "Model %d out of range.\n" -#~ msgstr "Número fora do intervalo|\n" +#~ msgstr "Número fora do intervalo|\n" #~ msgid "Right Border:" #~ msgstr "Borda Direita:" @@ -9127,7 +9392,7 @@ msgstr "Obtenção da próxima linha falhou em %.0f\n" #~ msgstr "Tamanho" #~ msgid "Image / Output Settings" -#~ msgstr "Imagem / Definições de Output" +#~ msgstr "Imagem / Definições de Output" #, fuzzy #~ msgid "GIMP-print" @@ -9135,13 +9400,13 @@ msgstr "Obtenção da próxima linha falhou em %.0f\n" #, fuzzy #~ msgid "Resolutions" -#~ msgstr "Resolução" +#~ msgstr "Resolução" #~ msgid "Media Type:" #~ msgstr "Tipo de \"Media\":" #~ msgid "Type of media you're printing to" -#~ msgstr "Tipo de \"meida\" para o qual está a imprimir" +#~ msgstr "Tipo de \"meida\" para o qual está a imprimir" #~ msgid "Media Size:" #~ msgstr "Tamanho do \"Media\":" @@ -9153,22 +9418,22 @@ msgstr "Obtenção da próxima linha falhou em %.0f\n" #~ msgstr "Fonte do \"Media\":" #~ msgid "Source (input slot) of media you're printing to" -#~ msgstr "Fonte do \"media\" para o qual está a imprimir" +#~ msgstr "Fonte do \"media\" para o qual está a imprimir" #~ msgid "Ink Type:" #~ msgstr "Tipo de Tinta:" #~ msgid "Resolution:" -#~ msgstr "Resolução" +#~ msgstr "Resolução" #~ msgid "Print in black and white (no color, and no shades of gray)" #~ msgstr "Imprimir em preto e branco (sem cores, nem sombras de cinzento)" #~ msgid "Fastest and brightest color for text and line art" -#~ msgstr "Mais rápido e cor mais brilhange para texto e \"line art\"" +#~ msgstr "Mais rápido e cor mais brilhange para texto e \"line art\"" #~ msgid "Best for images dominated by regions of solid color" -#~ msgstr "Ideal para imagens onde predominam regiões com cores sólidas" +#~ msgstr "Ideal para imagens onde predominam regiões com cores sólidas" #~ msgid "" #~ "Slowest, but most accurate and smoothest color for continuous tone images " @@ -9185,13 +9450,13 @@ msgstr "Obtenção da próxima linha falhou em %.0f\n" #~ "Cannot read from %s: %s\n" #~ msgstr "" #~ "\n" -#~ "Não foi possível ler a partir de %s: %s\n" +#~ "Não foi possível ler a partir de %s: %s\n" #~ msgid "%s out of range (value %f, min %f, max %f)\n" #~ msgstr "%s fora do intervalo (valor %f, min %f, max %f)\n" #~ msgid "%s is not a valid dither algorithm\n" -#~ msgstr "%s não é um algoritmo de \"dither\" válido\n" +#~ msgstr "%s não é um algoritmo de \"dither\" válido\n" #~ msgid "" #~ "Please re-insert the same alignment sheet in the printer when it is\n" @@ -9208,17 +9473,17 @@ msgstr "Obtenção da próxima linha falhou em %.0f\n" #~ "best pattern, and repeat the procedure.\n" #~ "Type a pattern number, or '?' for help.\n" #~ msgstr "" -#~ "Inspeccione a folha de alinhamentos, e determine qual é o padrão mais\n" -#~ "suave. Este é padrão menos granulado.\n" -#~ "Se não conseguir encontrar uma padrão suave, por favor seleccione outro\n" -#~ "número para melhor padrão, e repita o procedimento.\n" -#~ "Insira um número de padrão, ou '?' para ajuda.\n" +#~ "Inspeccione a folha de alinhamentos, e determine qual é o padrão mais\n" +#~ "suave. Este é padrão menos granulado.\n" +#~ "Se não conseguir encontrar uma padrão suave, por favor seleccione outro\n" +#~ "número para melhor padrão, e repita o procedimento.\n" +#~ "Insira um número de padrão, ou '?' para ajuda.\n" #~ msgid "The best pattern should be numbered between 1 and %d.\n" -#~ msgstr "O melhor padrão deve estar numerado entre 1 e %d.\n" +#~ msgstr "O melhor padrão deve estar numerado entre 1 e %d.\n" #~ msgid "Set the contrast of the print" -#~ msgstr "Defina o contraste da impressão" +#~ msgstr "Defina o contraste da impressão" #~ msgid "Cyan:" #~ msgstr "Ciano:" @@ -9230,10 +9495,10 @@ msgstr "Obtenção da próxima linha falhou em %.0f\n" #~ msgstr "Amarelo:" #~ msgid "Parameter %s out of range (value %f, min %f, max %f)\n" -#~ msgstr "Parâmetro %s fora do intervalo (valor %f, min %f, max %f)\n" +#~ msgstr "Parâmetro %s fora do intervalo (valor %f, min %f, max %f)\n" #~ msgid "Parameter %s out of range (value %d, min %d, max %d)\n" -#~ msgstr "Parâmetro %s foram do intervalo (valor %d, min %dm max %d)\n" +#~ msgstr "Parâmetro %s foram do intervalo (valor %d, min %dm max %d)\n" #~ msgid "1440 x 360 DPI" #~ msgstr "1440 x 360 DPI" @@ -9248,7 +9513,7 @@ msgstr "Obtenção da próxima linha falhou em %.0f\n" #~ msgstr "13x19" #~ msgid "Monarch" -#~ msgstr "Monáquico" +#~ msgstr "Monáquico" #~ msgid "Long 3" #~ msgstr "Longo 3" @@ -9260,4 +9525,4 @@ msgstr "Obtenção da próxima linha falhou em %.0f\n" #~ msgstr "Kaku" #~ msgid "HP Greeting Card" -#~ msgstr "Cartão Saudações HP" +#~ msgstr "Cartão Saudações HP" diff --git a/po/sk.gmo b/po/sk.gmo index 0f8a327..90c771e 100644 Binary files a/po/sk.gmo and b/po/sk.gmo differ diff --git a/po/sk.po b/po/sk.po index 7fd193f..6ef48c2 100644 --- a/po/sk.po +++ b/po/sk.po @@ -1,38 +1,38 @@ # Slovak translation of GIMP Print -# Slovenský preklad GIMP Print +# Slovenský preklad GIMP Print # Copyright (C) 2002 Free Software Foundation, Inc. -# Zdenko Podobný , 2002. +# Zdenko Podobný , 2002. # msgid "" msgstr "" "Project-Id-Version: GIMP Print\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2008-01-01 20:47-0500\n" +"POT-Creation-Date: 2008-04-25 21:19-0400\n" "PO-Revision-Date: 2002-05-20 18:08+0100\n" -"Last-Translator: Zdenko Podobný \n" +"Last-Translator: Zdenko Podobný \n" "Language-Team: Slovak \n" "MIME-Version: 1.0\n" -"Content-Type: text/plain; charset=utf-8\n" +"Content-Type: text/plain; charset=ISO-8859-2\n" "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:1752 +#: src/main/print-escp2.c:2116 #, fuzzy msgid "Default" -msgstr "NastaviÅ¥ Å¡tandardné" +msgstr "Nastavi» ¹tandardné" #: src/main/dither-main.c:47 #, fuzzy msgid "EvenTone" -msgstr "Obálka" +msgstr "Obálka" #: src/main/dither-main.c:48 #, fuzzy msgid "Hybrid EvenTone" -msgstr "Obálka" +msgstr "Obálka" #. TRANSLATORS: EvenTone, EvenBetter, and UniTone are proper #. * names, not descriptive. @@ -45,12 +45,12 @@ msgstr "Letter" #: src/main/dither-main.c:54 #, fuzzy msgid "Hybrid EvenBetter" -msgstr "Obálka" +msgstr "Obálka" #: src/main/dither-main.c:60 #, fuzzy msgid "UniTone" -msgstr "Obálka" +msgstr "Obálka" #: src/main/dither-main.c:61 msgid "Hybrid UniTone" @@ -58,67 +58,80 @@ msgstr "" #: src/main/dither-main.c:63 msgid "Adaptive Hybrid" -msgstr "Adaptívne hybridný" +msgstr "Adaptívne hybridný" #: src/main/dither-main.c:64 msgid "Ordered" -msgstr "Postupný" +msgstr "Postupný" #: src/main/dither-main.c:65 -msgid "Fast" -msgstr "Rýchly" +#, fuzzy +msgid "Ordered New" +msgstr "Postupný" #: src/main/dither-main.c:66 -msgid "Very Fast" -msgstr "Veľmi rýchly" +msgid "Fast" +msgstr "Rýchly" #: src/main/dither-main.c:67 -msgid "Hybrid Floyd-Steinberg" -msgstr "Hybridný Floyd-Steinbergov" +msgid "Very Fast" +msgstr "Veµmi rýchly" #: src/main/dither-main.c:68 +msgid "Hybrid Floyd-Steinberg" +msgstr "Hybridný Floyd-Steinbergov" + +#: src/main/dither-main.c:69 msgid "Predithered Input" msgstr "" -#: src/main/dither-main.c:88 src/main/print-color.c:56 +#: src/main/dither-main.c:70 +msgid "Drop Size Segmented" +msgstr "" + +#: src/main/dither-main.c:71 +msgid "Drop Size Segmented New" +msgstr "" + +#: src/main/dither-main.c:91 src/main/print-color.c:56 #, fuzzy msgid "Density" msgstr "Hustota:" -#: src/main/dither-main.c:88 src/main/print-canon.c:295 +#: src/main/dither-main.c:91 src/main/print-canon.c:295 #: src/main/print-canon.c:303 src/main/print-canon.c:311 -#: src/main/print-canon.c:319 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-escp2.c:471 -#: src/main/print-escp2.c:479 src/main/print-escp2.c:487 +#: src/main/print-canon.c:319 src/main/print-escp2.c:446 +#: src/main/print-escp2.c:454 src/main/print-escp2.c:462 +#: src/main/print-escp2.c:470 src/main/print-escp2.c:478 +#: src/main/print-escp2.c:486 src/main/print-escp2.c:494 #: 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:1764 src/main/print-olympus.c:1772 -#: src/main/print-olympus.c:1780 src/main/print-olympus.c:1788 -#: src/main/print-pcl.c:1261 src/main/print-pcl.c:1269 -#: src/main/print-pcl.c:1277 src/main/print-pcl.c:1285 +#: src/main/print-olympus.c:1762 src/main/print-olympus.c:1770 +#: src/main/print-olympus.c:1778 src/main/print-olympus.c:1786 +#: src/main/print-pcl.c:1329 src/main/print-pcl.c:1337 +#: src/main/print-pcl.c:1345 src/main/print-pcl.c:1353 msgid "Output Level Adjustment" msgstr "" -#: src/main/dither-main.c:89 +#: src/main/dither-main.c:92 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 "" -"Nastavte hustotu (množstvo atramentu) pre tlaÄ. Hustotu znížte, ak atrament " -"teÄie po papieri, alebo sa rozmazáva; zvýšte hustotu, ak Äierne oblasti sú " +"Nastavte hustotu (mno¾stvo atramentu) pre tlaè. Hustotu zní¾te, ak atrament " +"teèie po papieri, alebo sa rozmazáva; zvý¹te hustotu, ak èierne oblasti sú " "jednoliate." -#: src/main/dither-main.c:97 +#: src/main/dither-main.c:100 msgid "Dither Algorithm" msgstr "Algoritmus rozptylu" -#: src/main/dither-main.c:97 +#: src/main/dither-main.c:100 msgid "Screening Adjustment" msgstr "" -#: src/main/dither-main.c:98 +#: src/main/dither-main.c:101 #, fuzzy msgid "" "Choose the dither algorithm to be used.\n" @@ -130,13 +143,13 @@ msgid "" "art.\n" "Hybrid Floyd-Steinberg generally produces inferior output." msgstr "" -"Zvoľte algoritmus rozptylu, ktorý sa použije pri tlaÄi.\n" -"Prispôsobiteľné mieÅ¡anie roztylu vÅ¡obecne poskytuje najlepší výsledok.\n" -"Postupný rozptyl je rýchlejší a výsledná kvalita je podobná ako je na " -"fotografiách.\n" -"Rýchly a veľmi rýchly roztyl je podstatne rýchlejší a dobré výsledky " -"poskytuje pre text a Äiarovú grafiku.\n" -"MieÅ¡aný Floyd-Steinbergov roztyl vÅ¡eobecne poskytuje menej kvalitný výstup." +"Zvoµte algoritmus rozptylu, ktorý sa pou¾ije pri tlaèi.\n" +"Prispôsobiteµné mie¹anie roztylu v¹obecne poskytuje najlep¹í výsledok.\n" +"Postupný rozptyl je rýchlej¹í a výsledná kvalita je podobná ako je na " +"fotografiách.\n" +"Rýchly a veµmi rýchly roztyl je podstatne rýchlej¹í a dobré výsledky " +"poskytuje pre text a èiarovú grafiku.\n" +"Mie¹aný Floyd-Steinbergov roztyl v¹eobecne poskytuje menej kvalitný výstup." #: src/main/module.c:52 msgid "Miscellaneous (unclassified)" @@ -155,321 +168,330 @@ msgstr "" msgid "Dither algorithm" msgstr "Algoritmus rozptylu" -#: src/main/print-canon.c:200 src/main/print-escp2.c:180 -#: src/main/print-lexmark.c:266 src/main/print-olympus.c:1699 -#: src/main/print-pcl.c:1196 src/main/print-ps.c:67 +#: src/main/print-canon.c:200 src/main/print-escp2.c:182 +#: src/main/print-lexmark.c:266 src/main/print-olympus.c:1697 +#: src/main/print-pcl.c:1264 #, fuzzy msgid "Page Size" -msgstr "VeľkosÅ¥" +msgstr "Veµkos»" #: src/main/print-canon.c:200 src/main/print-canon.c:206 #: src/main/print-canon.c:212 src/main/print-canon.c:218 #: src/main/print-canon.c:224 src/main/print-canon.c:230 #: src/main/print-canon.c:248 src/main/print-canon.c:272 -#: src/main/print-escp2.c:180 src/main/print-escp2.c:186 -#: src/main/print-escp2.c:192 src/main/print-escp2.c:198 -#: src/main/print-escp2.c:204 src/main/print-escp2.c:210 -#: src/main/print-escp2.c:228 src/main/print-escp2.c:245 -#: src/main/print-escp2.c:251 src/main/print-escp2.c:263 -#: src/main/print-escp2.c:281 src/main/print-lexmark.c:266 +#: src/main/print-escp2.c:182 src/main/print-escp2.c:188 +#: src/main/print-escp2.c:194 src/main/print-escp2.c:200 +#: src/main/print-escp2.c:206 src/main/print-escp2.c:212 +#: src/main/print-escp2.c:230 src/main/print-escp2.c:247 +#: src/main/print-escp2.c:253 src/main/print-escp2.c:265 +#: src/main/print-escp2.c:283 src/main/print-lexmark.c:266 #: src/main/print-lexmark.c:272 src/main/print-lexmark.c:278 -#: src/main/print-lexmark.c:284 src/main/print-olympus.c:1699 -#: src/main/print-olympus.c:1705 src/main/print-olympus.c:1711 -#: src/main/print-olympus.c:1717 src/main/print-pcl.c:1196 -#: src/main/print-pcl.c:1202 src/main/print-pcl.c:1208 -#: src/main/print-pcl.c:1214 src/main/print-pcl.c:1238 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 +#: src/main/print-lexmark.c:284 src/main/print-olympus.c:1697 +#: src/main/print-olympus.c:1703 src/main/print-olympus.c:1709 +#: src/main/print-olympus.c:1715 src/main/print-pcl.c:1264 +#: src/main/print-pcl.c:1270 src/main/print-pcl.c:1276 +#: src/main/print-pcl.c:1282 src/main/print-pcl.c:1306 src/main/print-ps.c:68 +#: src/main/print-ps.c:74 #, fuzzy msgid "Basic Printer Setup" -msgstr "Nastavenie tlaÄiarne" +msgstr "Nastavenie tlaèiarne" -#: src/main/print-canon.c:201 src/main/print-escp2.c:181 -#: src/main/print-lexmark.c:267 src/main/print-olympus.c:1700 -#: src/main/print-pcl.c:1197 src/main/print-ps.c:68 +#: src/main/print-canon.c:201 src/main/print-escp2.c:183 +#: src/main/print-lexmark.c:267 src/main/print-olympus.c:1698 +#: src/main/print-pcl.c:1265 #, fuzzy msgid "Size of the paper being printed to" -msgstr "VeľkosÅ¥ papiera, na ktorý chcete tlaÄiÅ¥" +msgstr "Veµkos» papiera, na ktorý chcete tlaèi»" -#: src/main/print-canon.c:206 src/main/print-escp2.c:186 -#: src/main/print-lexmark.c:272 src/main/print-olympus.c:1705 -#: src/main/print-pcl.c:1202 src/main/print-ps.c:73 src/cups/genppd.c:1417 +#: src/main/print-canon.c:206 src/main/print-escp2.c:188 +#: src/main/print-lexmark.c:272 src/main/print-olympus.c:1703 +#: src/main/print-pcl.c:1270 src/cups/genppd.c:1422 msgid "Media Type" -msgstr "Typ média" +msgstr "Typ média" -#: src/main/print-canon.c:207 src/main/print-escp2.c:187 -#: src/main/print-lexmark.c:273 src/main/print-olympus.c:1706 -#: src/main/print-pcl.c:1203 src/main/print-ps.c:74 +#: src/main/print-canon.c:207 src/main/print-escp2.c:189 +#: src/main/print-lexmark.c:273 src/main/print-olympus.c:1704 +#: src/main/print-pcl.c:1271 msgid "Type of media (plain paper, photo paper, etc.)" msgstr "" -#: src/main/print-canon.c:212 src/main/print-escp2.c:192 -#: src/main/print-lexmark.c:278 src/main/print-olympus.c:1711 -#: src/main/print-pcl.c:1208 src/main/print-ps.c:79 src/cups/genppd.c:1445 +#: src/main/print-canon.c:212 src/main/print-escp2.c:194 +#: src/main/print-lexmark.c:278 src/main/print-olympus.c:1709 +#: src/main/print-pcl.c:1276 src/cups/genppd.c:1450 msgid "Media Source" -msgstr "Zdroj média" +msgstr "Zdroj média" -#: src/main/print-canon.c:213 src/main/print-escp2.c:193 -#: src/main/print-lexmark.c:279 src/main/print-olympus.c:1712 -#: src/main/print-pcl.c:1209 src/main/print-ps.c:80 +#: src/main/print-canon.c:213 src/main/print-escp2.c:195 +#: src/main/print-lexmark.c:279 src/main/print-olympus.c:1710 +#: src/main/print-pcl.c:1277 #, fuzzy msgid "Source (input slot) of the media" -msgstr "Zdroj (vstupné miesto) média, na ktoré tlaÄíte" +msgstr "Zdroj (vstupné miesto) média, na ktoré tlaèíte" -#: src/main/print-canon.c:218 src/main/print-escp2.c:198 +#: src/main/print-canon.c:218 src/main/print-escp2.c:200 msgid "CD Hub Size" msgstr "" -#: src/main/print-canon.c:219 src/main/print-escp2.c:199 +#: src/main/print-canon.c:219 src/main/print-escp2.c:201 msgid "Print only outside of the hub of the CD, or all the way to the hole" msgstr "" -#: src/main/print-canon.c:224 src/main/print-escp2.c:204 +#: src/main/print-canon.c:224 src/main/print-escp2.c:206 msgid "CD Size (Custom)" msgstr "" -#: src/main/print-canon.c:225 src/main/print-escp2.c:205 +#: src/main/print-canon.c:225 src/main/print-escp2.c:207 msgid "Variable adjustment for the outer diameter of CD" msgstr "" -#: src/main/print-canon.c:230 src/main/print-escp2.c:210 +#: src/main/print-canon.c:230 src/main/print-escp2.c:212 msgid "CD Hub Size (Custom)" msgstr "" -#: src/main/print-canon.c:231 src/main/print-escp2.c:211 +#: src/main/print-canon.c:231 src/main/print-escp2.c:213 #, fuzzy msgid "Variable adjustment to the inner hub of the CD" -msgstr "ZmeniÅ¥ veľkosÅ¥ tlaÄe podľa rozmerov strany" +msgstr "Zmeni» veµkos» tlaèe podµa rozmerov strany" -#: src/main/print-canon.c:236 src/main/print-escp2.c:216 +#: src/main/print-canon.c:236 src/main/print-escp2.c:218 msgid "CD Horizontal Fine Adjustment" msgstr "" #: src/main/print-canon.c:236 src/main/print-canon.c:242 -#: src/main/print-canon.c:254 src/main/print-escp2.c:216 -#: src/main/print-escp2.c:222 src/main/print-escp2.c:239 -#: src/main/print-escp2.c:275 src/main/print-lexmark.c:290 -#: src/main/print-olympus.c:1723 src/main/print-olympus.c:1729 -#: src/main/print-olympus.c:1735 src/main/print-pcl.c:1220 -#: src/main/print-ps.c:91 src/main/print-raw.c:80 +#: src/main/print-canon.c:254 src/main/print-escp2.c:218 +#: src/main/print-escp2.c:224 src/main/print-escp2.c:241 +#: src/main/print-escp2.c:277 src/main/print-lexmark.c:290 +#: src/main/print-olympus.c:1721 src/main/print-olympus.c:1727 +#: src/main/print-olympus.c:1733 src/main/print-pcl.c:1288 +#: src/main/print-raw.c:80 msgid "Advanced Printer Setup" msgstr "" #: src/main/print-canon.c:237 src/main/print-canon.c:243 -#: src/main/print-escp2.c:217 src/main/print-escp2.c:223 +#: src/main/print-escp2.c:219 src/main/print-escp2.c:225 msgid "Fine adjustment to horizontal position for CD printing" msgstr "" -#: src/main/print-canon.c:242 src/main/print-escp2.c:222 +#: src/main/print-canon.c:242 src/main/print-escp2.c:224 msgid "CD Vertical Fine Adjustment" msgstr "" -#: src/main/print-canon.c:248 src/main/print-escp2.c:228 -#: src/main/print-lexmark.c:284 src/main/print-olympus.c:1717 -#: src/main/print-pcl.c:1214 src/main/print-ps.c:85 src/cups/genppd.c:1518 +#: src/main/print-canon.c:248 src/main/print-escp2.c:230 +#: src/main/print-lexmark.c:284 src/main/print-olympus.c:1715 +#: src/main/print-pcl.c:1282 src/cups/genppd.c:1523 msgid "Resolution" -msgstr "Rozlíšenie" +msgstr "Rozlí¹enie" #: src/main/print-canon.c:249 src/main/print-lexmark.c:285 -#: src/main/print-olympus.c:1718 src/main/print-pcl.c:1215 -#: src/main/print-ps.c:86 +#: src/main/print-olympus.c:1716 src/main/print-pcl.c:1283 msgid "Resolution and quality of the print" -msgstr "Rozlíšenie a kvalita tlaÄe" +msgstr "Rozlí¹enie a kvalita tlaèe" -#: src/main/print-canon.c:254 src/main/print-escp2.c:239 -#: src/main/print-lexmark.c:290 src/main/print-olympus.c:1723 -#: src/main/print-pcl.c:1220 src/main/print-ps.c:91 src/main/print-raw.c:80 +#: src/main/print-canon.c:254 src/main/print-escp2.c:241 +#: src/main/print-lexmark.c:290 src/main/print-olympus.c:1721 +#: src/main/print-pcl.c:1288 src/main/print-raw.c:80 msgid "Ink Type" msgstr "Typ atramentu" -#: src/main/print-canon.c:255 src/main/print-escp2.c:240 -#: src/main/print-escp2.c:252 src/main/print-lexmark.c:291 -#: src/main/print-olympus.c:1724 src/main/print-pcl.c:1221 -#: src/main/print-ps.c:92 src/main/print-raw.c:81 +#: src/main/print-canon.c:255 src/main/print-escp2.c:242 +#: src/main/print-escp2.c:254 src/main/print-lexmark.c:291 +#: src/main/print-olympus.c:1722 src/main/print-pcl.c:1289 +#: src/main/print-raw.c:81 msgid "Type of ink in the printer" -msgstr "Typ atramentu tlaÄiarne" +msgstr "Typ atramentu tlaèiarne" #: src/main/print-canon.c:260 src/main/print-canon.c:261 -#: src/main/print-escp2.c:329 src/main/print-escp2.c:330 +#: src/main/print-escp2.c:331 src/main/print-escp2.c:332 #: src/main/print-lexmark.c:296 src/main/print-lexmark.c:297 -#: src/main/print-pcl.c:1226 src/main/print-pcl.c:1227 +#: src/main/print-pcl.c:1294 src/main/print-pcl.c:1295 msgid "Ink Channels" msgstr "" -#: src/main/print-canon.c:260 src/main/print-escp2.c:130 -#: src/main/print-escp2.c:137 src/main/print-escp2.c:144 -#: src/main/print-escp2.c:287 src/main/print-escp2.c:293 -#: src/main/print-escp2.c:299 src/main/print-escp2.c:305 -#: src/main/print-escp2.c:311 src/main/print-escp2.c:317 -#: src/main/print-escp2.c:323 src/main/print-escp2.c:329 -#: src/main/print-escp2.c:335 src/main/print-lexmark.c:296 -#: src/main/print-pcl.c:1226 +#: src/main/print-canon.c:260 src/main/print-escp2.c:132 +#: src/main/print-escp2.c:139 src/main/print-escp2.c:146 +#: src/main/print-escp2.c:289 src/main/print-escp2.c:295 +#: src/main/print-escp2.c:301 src/main/print-escp2.c:307 +#: src/main/print-escp2.c:313 src/main/print-escp2.c:319 +#: src/main/print-escp2.c:325 src/main/print-escp2.c:331 +#: src/main/print-escp2.c:337 src/main/print-lexmark.c:296 +#: src/main/print-pcl.c:1294 msgid "Advanced Printer Functionality" msgstr "" -#: src/main/print-canon.c:266 src/main/print-escp2.c:341 -#: src/main/print-lexmark.c:302 src/main/print-olympus.c:1741 -#: src/main/print-pcl.c:1232 src/main/print-ps.c:103 src/main/print-raw.c:86 +#: src/main/print-canon.c:266 src/main/print-escp2.c:343 +#: src/main/print-lexmark.c:302 src/main/print-olympus.c:1739 +#: src/main/print-pcl.c:1300 src/main/print-ps.c:80 src/main/print-raw.c:86 #, fuzzy msgid "Printing Mode" -msgstr "Model tlaÄiarne:" +msgstr "Model tlaèiarne:" #: src/main/print-canon.c:266 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:341 -#: src/main/print-escp2.c:347 src/main/print-lexmark.c:302 -#: src/main/print-olympus.c:1741 src/main/print-pcl.c:1232 -#: src/main/print-ps.c:103 src/main/print-raw.c:86 +#: src/main/print-color.c:208 src/main/print-escp2.c:343 +#: src/main/print-escp2.c:349 src/main/print-lexmark.c:302 +#: src/main/print-olympus.c:1739 src/main/print-pcl.c:1300 +#: src/main/print-ps.c:80 src/main/print-raw.c:86 #, fuzzy msgid "Core Parameter" -msgstr "ObyÄajný papier" +msgstr "Obyèajný papier" -#: src/main/print-canon.c:267 src/main/print-escp2.c:342 -#: src/main/print-lexmark.c:303 src/main/print-olympus.c:1742 -#: src/main/print-pcl.c:1233 src/main/print-ps.c:104 src/main/print-raw.c:87 +#: src/main/print-canon.c:267 src/main/print-escp2.c:344 +#: src/main/print-lexmark.c:303 src/main/print-olympus.c:1740 +#: src/main/print-pcl.c:1301 src/main/print-ps.c:81 src/main/print-raw.c:87 msgid "Printing Output Mode" msgstr "" -#: src/main/print-canon.c:272 src/main/print-pcl.c:1238 +#: src/main/print-canon.c:272 src/main/print-pcl.c:1306 msgid "Double-Sided Printing" msgstr "" -#: src/main/print-canon.c:273 src/main/print-pcl.c:1239 +#: src/main/print-canon.c:273 src/main/print-pcl.c:1307 msgid "Duplex/Tumble Setting" msgstr "" -#: src/main/print-canon.c:295 src/main/print-escp2.c:439 -#: src/main/print-lexmark.c:325 src/main/print-pcl.c:1261 +#: src/main/print-canon.c:295 src/main/print-escp2.c:446 +#: src/main/print-lexmark.c:325 src/main/print-pcl.c:1329 #, fuzzy msgid "Cyan Density" msgstr "Hustota:" -#: src/main/print-canon.c:296 src/main/print-escp2.c:440 -#: src/main/print-lexmark.c:326 src/main/print-pcl.c:1262 +#: src/main/print-canon.c:296 src/main/print-escp2.c:447 +#: src/main/print-lexmark.c:326 src/main/print-pcl.c:1330 #, fuzzy msgid "Adjust the cyan density" -msgstr "Prispôsobenie vyváženie azúrovej farby pre tlaÄ" +msgstr "Prispôsobenie vyvá¾enie azúrovej farby pre tlaè" -#: src/main/print-canon.c:303 src/main/print-escp2.c:447 -#: src/main/print-lexmark.c:333 src/main/print-pcl.c:1269 +#: src/main/print-canon.c:303 src/main/print-escp2.c:454 +#: src/main/print-lexmark.c:333 src/main/print-pcl.c:1337 #, fuzzy msgid "Magenta Density" -msgstr "Purpurová" +msgstr "Purpurová" -#: src/main/print-canon.c:304 src/main/print-escp2.c:448 -#: src/main/print-lexmark.c:334 src/main/print-pcl.c:1270 +#: src/main/print-canon.c:304 src/main/print-escp2.c:455 +#: src/main/print-lexmark.c:334 src/main/print-pcl.c:1338 #, fuzzy msgid "Adjust the magenta density" -msgstr "Prispôsobenie vyváženie purpurovej farby pre tlaÄ" +msgstr "Prispôsobenie vyvá¾enie purpurovej farby pre tlaè" -#: src/main/print-canon.c:311 src/main/print-escp2.c:455 -#: src/main/print-lexmark.c:341 src/main/print-pcl.c:1277 +#: src/main/print-canon.c:311 src/main/print-escp2.c:462 +#: src/main/print-lexmark.c:341 src/main/print-pcl.c:1345 #, fuzzy msgid "Yellow Density" msgstr "Hustota:" -#: src/main/print-canon.c:312 src/main/print-escp2.c:456 -#: src/main/print-lexmark.c:342 src/main/print-pcl.c:1278 +#: src/main/print-canon.c:312 src/main/print-escp2.c:463 +#: src/main/print-lexmark.c:342 src/main/print-pcl.c:1346 #, fuzzy msgid "Adjust the yellow density" -msgstr "Prispôsobenie vyváženie žltej farby pre tlaÄ" +msgstr "Prispôsobenie vyvá¾enie ¾ltej farby pre tlaè" -#: src/main/print-canon.c:319 src/main/print-escp2.c:463 -#: src/main/print-lexmark.c:349 src/main/print-pcl.c:1285 +#: src/main/print-canon.c:319 src/main/print-escp2.c:470 +#: src/main/print-lexmark.c:349 src/main/print-pcl.c:1353 #, fuzzy msgid "Black Density" msgstr "Hustota:" -#: src/main/print-canon.c:320 src/main/print-escp2.c:464 -#: src/main/print-lexmark.c:350 src/main/print-pcl.c:1286 +#: src/main/print-canon.c:320 src/main/print-escp2.c:471 +#: src/main/print-lexmark.c:350 src/main/print-pcl.c:1354 #, fuzzy msgid "Adjust the black density" -msgstr "Prispôsobenie vyváženie azúrovej farby pre tlaÄ" +msgstr "Prispôsobenie vyvá¾enie azúrovej farby pre tlaè" #: src/main/print-canon.c:327 src/main/print-canon.c:328 -#: src/main/print-escp2.c:495 src/main/print-escp2.c:496 +#: src/main/print-escp2.c:534 src/main/print-escp2.c:535 #: src/main/print-lexmark.c:357 src/main/print-lexmark.c:358 -#: src/main/print-pcl.c:1293 src/main/print-pcl.c:1294 +#: src/main/print-pcl.c:1361 src/main/print-pcl.c:1362 #, fuzzy msgid "Light Cyan Transition" -msgstr "Jasná azúrová" +msgstr "Jasná azúrová" #: src/main/print-canon.c:327 src/main/print-canon.c:335 -#: src/main/print-canon.c:343 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-escp2.c:543 -#: src/main/print-escp2.c:551 src/main/print-escp2.c:559 -#: src/main/print-lexmark.c:357 src/main/print-lexmark.c:365 -#: src/main/print-pcl.c:1293 src/main/print-pcl.c:1301 +#: src/main/print-canon.c:343 src/main/print-escp2.c:502 +#: src/main/print-escp2.c:510 src/main/print-escp2.c:518 +#: src/main/print-escp2.c:526 src/main/print-escp2.c:534 +#: src/main/print-escp2.c:542 src/main/print-escp2.c:550 +#: src/main/print-escp2.c:558 src/main/print-escp2.c:566 +#: src/main/print-escp2.c:574 src/main/print-escp2.c:582 +#: src/main/print-escp2.c:590 src/main/print-escp2.c:598 +#: src/main/print-escp2.c:606 src/main/print-escp2.c:614 +#: src/main/print-escp2.c:622 src/main/print-escp2.c:630 +#: src/main/print-escp2.c:638 src/main/print-escp2.c:646 +#: src/main/print-escp2.c:654 src/main/print-escp2.c:662 +#: src/main/print-escp2.c:670 src/main/print-escp2.c:678 +#: src/main/print-escp2.c:686 src/main/print-escp2.c:694 +#: src/main/print-escp2.c:702 src/main/print-escp2.c:710 +#: src/main/print-escp2.c:718 src/main/print-escp2.c:726 +#: src/main/print-escp2.c:734 src/main/print-lexmark.c:357 +#: src/main/print-lexmark.c:365 src/main/print-pcl.c:1361 +#: src/main/print-pcl.c:1369 msgid "Advanced Ink Adjustment" msgstr "" #: src/main/print-canon.c:335 src/main/print-canon.c:336 -#: src/main/print-escp2.c:503 src/main/print-escp2.c:504 +#: src/main/print-escp2.c:566 src/main/print-escp2.c:567 #: src/main/print-lexmark.c:365 src/main/print-lexmark.c:366 -#: src/main/print-pcl.c:1301 src/main/print-pcl.c:1302 +#: src/main/print-pcl.c:1369 src/main/print-pcl.c:1370 #, fuzzy msgid "Light Magenta Transition" -msgstr "Jasná purpurová" +msgstr "Jasná purpurová" #: src/main/print-canon.c:343 src/main/print-canon.c:344 #, fuzzy msgid "Light Yellow Transition" -msgstr "Jasná azúrová" +msgstr "Jasná azúrová" -#: src/main/print-canon.c:363 src/main/print-pcl.c:1482 +#: src/main/print-canon.c:363 src/main/print-pcl.c:1550 #: src/main/escp2-resolutions.c:557 src/main/escp2-resolutions.c:565 #: src/main/escp2-resolutions.c:576 src/main/escp2-resolutions.c:588 msgid "Off" msgstr "" -#: src/main/print-canon.c:364 src/main/print-pcl.c:1483 +#: src/main/print-canon.c:364 src/main/print-pcl.c:1551 msgid "Long Edge (Standard)" msgstr "" -#: src/main/print-canon.c:365 src/main/print-pcl.c:1484 +#: src/main/print-canon.c:365 src/main/print-pcl.c:1552 msgid "Short Edge (Flip)" msgstr "" -#: src/main/print-canon.c:629 src/main/print-escp2.c:1648 +#: src/main/print-canon.c:629 src/main/print-escp2.c:2012 #: src/main/xmli18n-tmp.h:6 msgid "CD - 5 inch" msgstr "" -#: src/main/print-canon.c:631 src/main/print-escp2.c:1650 +#: src/main/print-canon.c:631 src/main/print-escp2.c:2014 #: src/main/xmli18n-tmp.h:7 msgid "CD - 3 inch" msgstr "" -#: src/main/print-canon.c:633 src/main/print-escp2.c:1652 +#: src/main/print-canon.c:633 src/main/print-escp2.c:2016 #: src/main/xmli18n-tmp.h:8 #, fuzzy msgid "CD - Custom" -msgstr "Vlastný" +msgstr "Vlastný" -#: src/main/print-canon.c:656 src/main/print-escp2.c:1677 +#: src/main/print-canon.c:656 src/main/print-escp2.c:2041 msgid "Normal" msgstr "" -#: src/main/print-canon.c:658 src/main/print-escp2.c:1679 +#: src/main/print-canon.c:658 src/main/print-escp2.c:2043 #, fuzzy msgid "Print To Hub" -msgstr "TlaÄiÅ¥ do súboru?" +msgstr "Tlaèi» do súboru?" -#: src/main/print-canon.c:773 src/main/print-escp2.c:2011 -#: src/main/print-lexmark.c:1279 src/main/print-olympus.c:1996 -#: src/main/print-pcl.c:1776 src/main/print-ps.c:170 src/main/print-raw.c:135 -#: src/gutenprintui/panel.c:289 src/gutenprintui2/panel.c:289 +#: src/main/print-canon.c:773 src/main/print-escp2.c:2450 +#: src/main/print-lexmark.c:1279 src/main/print-olympus.c:1994 +#: src/main/print-pcl.c:1844 src/main/print-ps.c:310 src/main/print-raw.c:135 +#: src/gutenprintui2/panel.c:290 msgid "Color" msgstr "Farebne" -#: src/main/print-canon.c:775 src/main/print-escp2.c:2013 -#: src/main/print-lexmark.c:1281 src/main/print-pcl.c:1778 -#: src/main/print-ps.c:172 src/main/print-raw.c:137 +#: src/main/print-canon.c:775 src/main/print-escp2.c:2452 +#: src/main/print-lexmark.c:1281 src/main/print-pcl.c:1846 +#: src/main/print-ps.c:312 src/main/print-raw.c:137 #, fuzzy msgid "Black and White" -msgstr "ÄŒiernobielo" +msgstr "Èiernobielo" #: src/main/print-color.c:50 msgid "High Accuracy" @@ -478,7 +500,7 @@ msgstr "" #: src/main/print-color.c:51 #, fuzzy msgid "Bright Colors" -msgstr "Prispôsobenie farieb pre tlaÄ" +msgstr "Prispôsobenie farieb pre tlaè" #: src/main/print-color.c:52 msgid "Correct Hue Only" @@ -503,18 +525,18 @@ msgstr "" #: src/main/print-color.c:58 #, fuzzy msgid "Pre-Dithered" -msgstr "TlaÄiÅ¥" +msgstr "Tlaèi»" #: src/main/print-color.c:121 src/main/escp2-channels.c:916 #: src/main/escp2-channels.c:929 src/main/escp2-channels.c:943 -#: src/gutenprintui/panel.c:290 src/gutenprintui2/panel.c:290 +#: src/gutenprintui2/panel.c:291 msgid "Grayscale" -msgstr "V odtieňoch Å¡edej" +msgstr "V odtieòoch ¹edej" #: src/main/print-color.c:123 #, fuzzy msgid "Whitescale" -msgstr "Žltá" +msgstr "®ltá" #: src/main/print-color.c:125 msgid "RGB" @@ -532,7 +554,7 @@ msgstr "" msgid "KCMY" msgstr "" -#: src/main/print-color.c:165 src/main/print-color.c:446 +#: src/main/print-color.c:165 src/main/print-color.c:454 #, fuzzy msgid "Channel " msgstr "Storno" @@ -576,25 +598,25 @@ msgstr "" #: src/main/print-color.c:192 #, fuzzy msgid "Input Image Type" -msgstr "Typ obrázku" +msgstr "Typ obrázku" #: src/main/print-color.c:193 #, fuzzy msgid "Input image type" -msgstr "Typ obrázku" +msgstr "Typ obrázku" #: src/main/print-color.c:200 #, fuzzy msgid "Output Image Type" -msgstr "Typ výstupu:" +msgstr "Typ výstupu:" #: src/main/print-color.c:201 #, fuzzy msgid "Output image type" -msgstr "Typ výstupu:" +msgstr "Typ výstupu:" #: src/main/print-color.c:208 src/main/print-color.c:209 -#: src/main/print-escp2.c:347 +#: src/main/print-escp2.c:349 msgid "Raw Channels" msgstr "" @@ -615,7 +637,7 @@ msgstr "Jas:" #: src/main/print-color.c:225 #, fuzzy msgid "Brightness of the print" -msgstr "NastaviÅ¥ výšku tlaÄe" +msgstr "Nastavi» vý¹ku tlaèe" #: src/main/print-color.c:232 #, fuzzy @@ -633,7 +655,7 @@ msgstr "" #: src/main/print-color.c:240 #, fuzzy msgid "Advanced Image Control" -msgstr "Typ výstupu:" +msgstr "Typ výstupu:" #: src/main/print-color.c:241 msgid "Use linear vs. fixed end point contrast adjustment" @@ -649,9 +671,9 @@ 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 "" -"Nastavenie gamy pre tlaÄ. VyÅ¡Å¡ie hodnoty vyprodukujú vÅ¡eobecne jasnejÅ¡iu " -"tlaÄ, kým nižšie hodnoty vyprodukujú tmavÅ¡iu tlaÄ. ÄŒierna a biela zostanú " -"také isté na rozdiel od nastavovania jasu." +"Nastavenie gamy pre tlaè. Vy¹¹ie hodnoty vyprodukujú v¹eobecne jasnej¹iu " +"tlaè, kým ni¾¹ie hodnoty vyprodukujú tmav¹iu tlaè. Èierna a biela zostanú " +"také isté na rozdiel od nastavovania jasu." #: src/main/print-color.c:258 #, fuzzy @@ -662,114 +684,111 @@ msgstr "Gama:" msgid "Gamma value assumed by application" msgstr "" -#: src/main/print-color.c:266 src/main/escp2-channels.c:3048 -#: src/main/escp2-channels.c:3060 src/main/escp2-channels.c:3068 -#: src/main/escp2-channels.c:3078 src/main/escp2-channels.c:3089 -#: src/main/escp2-channels.c:3101 src/main/escp2-channels.c:3117 -#: src/main/escp2-channels.c:3125 src/main/escp2-channels.c:3138 -#: src/main/escp2-channels.c:3151 src/main/escp2-channels.c:3165 -#: src/main/escp2-channels.c:3179 src/main/escp2-channels.c:3194 -#: src/gutenprintui/panel.c:2152 src/gutenprintui2/panel.c:2153 +#: src/main/print-color.c:266 src/main/escp2-channels.c:3087 +#: src/main/escp2-channels.c:3099 src/main/escp2-channels.c:3107 +#: src/main/escp2-channels.c:3117 src/main/escp2-channels.c:3128 +#: src/main/escp2-channels.c:3140 src/main/escp2-channels.c:3156 +#: src/main/escp2-channels.c:3164 src/main/escp2-channels.c:3177 +#: src/main/escp2-channels.c:3190 src/main/escp2-channels.c:3204 +#: src/main/escp2-channels.c:3218 src/main/escp2-channels.c:3230 +#: src/main/escp2-channels.c:3243 src/gutenprintui2/panel.c:2328 #: src/escputil/escputil.c:978 src/escputil/escputil.c:997 #: src/escputil/escputil.c:1201 msgid "Cyan" -msgstr "Azúrová" +msgstr "Azúrová" #: src/main/print-color.c:267 #, fuzzy msgid "Adjust the cyan gamma" -msgstr "Prispôsobenie vyváženie azúrovej farby pre tlaÄ" - -#: src/main/print-color.c:274 src/main/escp2-channels.c:3049 -#: src/main/escp2-channels.c:3059 src/main/escp2-channels.c:3070 -#: src/main/escp2-channels.c:3079 src/main/escp2-channels.c:3090 -#: src/main/escp2-channels.c:3103 src/main/escp2-channels.c:3116 -#: src/main/escp2-channels.c:3126 src/main/escp2-channels.c:3139 -#: src/main/escp2-channels.c:3152 src/main/escp2-channels.c:3164 -#: src/main/escp2-channels.c:3178 src/main/escp2-channels.c:3195 -#: src/gutenprintui/panel.c:2159 src/gutenprintui2/panel.c:2160 +msgstr "Prispôsobenie vyvá¾enie azúrovej farby pre tlaè" + +#: src/main/print-color.c:274 src/main/escp2-channels.c:3088 +#: src/main/escp2-channels.c:3098 src/main/escp2-channels.c:3109 +#: src/main/escp2-channels.c:3118 src/main/escp2-channels.c:3129 +#: src/main/escp2-channels.c:3142 src/main/escp2-channels.c:3155 +#: src/main/escp2-channels.c:3165 src/main/escp2-channels.c:3178 +#: src/main/escp2-channels.c:3191 src/main/escp2-channels.c:3203 +#: src/main/escp2-channels.c:3217 src/main/escp2-channels.c:3229 +#: src/main/escp2-channels.c:3244 src/gutenprintui2/panel.c:2335 #: src/escputil/escputil.c:979 src/escputil/escputil.c:998 #: src/escputil/escputil.c:1202 msgid "Magenta" -msgstr "Purpurová" +msgstr "Purpurová" #: src/main/print-color.c:275 #, fuzzy msgid "Adjust the magenta gamma" -msgstr "Prispôsobenie vyváženie purpurovej farby pre tlaÄ" - -#: src/main/print-color.c:282 src/main/escp2-channels.c:3050 -#: src/main/escp2-channels.c:3061 src/main/escp2-channels.c:3069 -#: src/main/escp2-channels.c:3080 src/main/escp2-channels.c:3091 -#: src/main/escp2-channels.c:3105 src/main/escp2-channels.c:3112 -#: src/main/escp2-channels.c:3127 src/main/escp2-channels.c:3140 -#: src/main/escp2-channels.c:3153 src/main/escp2-channels.c:3163 -#: src/main/escp2-channels.c:3177 src/main/escp2-channels.c:3196 -#: src/gutenprintui/panel.c:2166 src/gutenprintui2/panel.c:2167 +msgstr "Prispôsobenie vyvá¾enie purpurovej farby pre tlaè" + +#: src/main/print-color.c:282 src/main/escp2-channels.c:3089 +#: src/main/escp2-channels.c:3100 src/main/escp2-channels.c:3108 +#: src/main/escp2-channels.c:3119 src/main/escp2-channels.c:3130 +#: src/main/escp2-channels.c:3144 src/main/escp2-channels.c:3151 +#: src/main/escp2-channels.c:3166 src/main/escp2-channels.c:3179 +#: src/main/escp2-channels.c:3192 src/main/escp2-channels.c:3202 +#: src/main/escp2-channels.c:3216 src/main/escp2-channels.c:3228 +#: src/main/escp2-channels.c:3245 src/gutenprintui2/panel.c:2342 #: src/escputil/escputil.c:980 src/escputil/escputil.c:999 #: src/escputil/escputil.c:1203 msgid "Yellow" -msgstr "Žltá" +msgstr "®ltá" #: src/main/print-color.c:283 #, fuzzy msgid "Adjust the yellow gamma" -msgstr "Prispôsobenie vyváženie žltej farby pre tlaÄ" +msgstr "Prispôsobenie vyvá¾enie ¾ltej farby pre tlaè" -#: src/main/print-color.c:290 src/main/escp2-channels.c:3168 -#: src/main/escp2-channels.c:3181 src/gutenprintui/panel.c:2180 -#: src/gutenprintui2/panel.c:2181 src/escputil/escputil.c:987 -#: src/escputil/escputil.c:1005 +#: src/main/print-color.c:290 src/main/escp2-channels.c:3207 +#: src/main/escp2-channels.c:3220 src/gutenprintui2/panel.c:2356 +#: src/escputil/escputil.c:987 src/escputil/escputil.c:1005 msgid "Red" msgstr "" #: src/main/print-color.c:291 #, fuzzy msgid "Adjust the red gamma" -msgstr "Prispôsobenie vyváženie žltej farby pre tlaÄ" +msgstr "Prispôsobenie vyvá¾enie ¾ltej farby pre tlaè" -#: src/main/print-color.c:298 src/gutenprintui/panel.c:2187 -#: src/gutenprintui2/panel.c:2188 +#: src/main/print-color.c:298 src/gutenprintui2/panel.c:2363 msgid "Green" msgstr "" #: src/main/print-color.c:299 #, fuzzy msgid "Adjust the green gamma" -msgstr "Prispôsobenie vyváženie purpurovej farby pre tlaÄ" +msgstr "Prispôsobenie vyvá¾enie purpurovej farby pre tlaè" -#: src/main/print-color.c:306 src/main/escp2-channels.c:3169 -#: src/main/escp2-channels.c:3182 src/gutenprintui/panel.c:2194 -#: src/gutenprintui2/panel.c:2195 src/escputil/escputil.c:988 -#: src/escputil/escputil.c:1006 +#: src/main/print-color.c:306 src/main/escp2-channels.c:3208 +#: src/main/escp2-channels.c:3221 src/gutenprintui2/panel.c:2370 +#: src/escputil/escputil.c:988 src/escputil/escputil.c:1006 msgid "Blue" msgstr "" #: src/main/print-color.c:307 #, fuzzy msgid "Adjust the blue gamma" -msgstr "Prispôsobenie vyváženie azúrovej farby pre tlaÄ" +msgstr "Prispôsobenie vyvá¾enie azúrovej farby pre tlaè" #: src/main/print-color.c:314 src/main/print-lexmark.c:613 -#: src/main/escp2-channels.c:3047 src/main/escp2-channels.c:3057 -#: src/main/escp2-channels.c:3058 src/main/escp2-channels.c:3071 -#: src/main/escp2-channels.c:3081 src/main/escp2-channels.c:3088 -#: src/main/escp2-channels.c:3100 src/main/escp2-channels.c:3113 -#: src/main/escp2-channels.c:3124 src/main/escp2-channels.c:3137 -#: src/main/escp2-channels.c:3150 src/main/escp2-channels.c:3156 -#: src/main/escp2-channels.c:3180 src/main/escp2-channels.c:3193 -#: src/gutenprintui/panel.c:2173 src/gutenprintui2/panel.c:2174 +#: src/main/escp2-channels.c:3086 src/main/escp2-channels.c:3096 +#: src/main/escp2-channels.c:3097 src/main/escp2-channels.c:3110 +#: src/main/escp2-channels.c:3120 src/main/escp2-channels.c:3127 +#: src/main/escp2-channels.c:3139 src/main/escp2-channels.c:3152 +#: src/main/escp2-channels.c:3163 src/main/escp2-channels.c:3176 +#: src/main/escp2-channels.c:3189 src/main/escp2-channels.c:3195 +#: src/main/escp2-channels.c:3219 src/main/escp2-channels.c:3231 +#: src/main/escp2-channels.c:3242 src/gutenprintui2/panel.c:2349 #: src/escputil/escputil.c:975 src/escputil/escputil.c:996 #: src/escputil/escputil.c:1200 msgid "Black" -msgstr "ÄŒierna" +msgstr "Èierna" #: src/main/print-color.c:315 #, fuzzy msgid "Adjust the black gamma" -msgstr "Prispôsobenie vyváženie azúrovej farby pre tlaÄ" +msgstr "Prispôsobenie vyvá¾enie azúrovej farby pre tlaè" -#: src/main/print-color.c:322 src/main/print-olympus.c:1764 +#: src/main/print-color.c:322 src/main/print-olympus.c:1762 msgid "Cyan Balance" msgstr "" @@ -777,46 +796,46 @@ msgstr "" #: src/main/print-color.c:338 #, fuzzy msgid "GrayBalance" -msgstr "V odtieňoch Å¡edej" +msgstr "V odtieòoch ¹edej" #: src/main/print-color.c:323 #, fuzzy msgid "Adjust the cyan gray balance" -msgstr "Prispôsobenie vyváženie azúrovej farby pre tlaÄ" +msgstr "Prispôsobenie vyvá¾enie azúrovej farby pre tlaè" -#: src/main/print-color.c:330 src/main/print-olympus.c:1772 +#: src/main/print-color.c:330 src/main/print-olympus.c:1770 #, fuzzy msgid "Magenta Balance" -msgstr "Purpurová" +msgstr "Purpurová" #: src/main/print-color.c:331 #, fuzzy msgid "Adjust the magenta gray balance" -msgstr "Prispôsobenie vyváženie purpurovej farby pre tlaÄ" +msgstr "Prispôsobenie vyvá¾enie purpurovej farby pre tlaè" -#: src/main/print-color.c:338 src/main/print-olympus.c:1780 +#: src/main/print-color.c:338 src/main/print-olympus.c:1778 #, fuzzy msgid "Yellow Balance" -msgstr "Prispôsobenie vyváženie žltej farby pre tlaÄ" +msgstr "Prispôsobenie vyvá¾enie ¾ltej farby pre tlaè" #: src/main/print-color.c:339 #, fuzzy msgid "Adjust the yellow gray balance" -msgstr "Prispôsobenie vyváženie žltej farby pre tlaÄ" +msgstr "Prispôsobenie vyvá¾enie ¾ltej farby pre tlaè" #: src/main/print-color.c:346 #, fuzzy msgid "Saturation" -msgstr "SýtosÅ¥:" +msgstr "Sýtos»:" #: 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 "" -"Prispôsobenie sýtosti (farebného vyváženia) tlaÄe\n" -"Použite nulu na vyprodukovanie výstupu v odtieňoch Å¡edej s použitím " -"farebného a Äierneho atramentu" +"Prispôsobenie sýtosti (farebného vyvá¾enia) tlaèe\n" +"Pou¾ite nulu na vyprodukovanie výstupu v odtieòoch ¹edej s pou¾itím " +"farebného a èierneho atramentu" #: src/main/print-color.c:357 #, fuzzy @@ -825,564 +844,683 @@ msgstr "Typ atramentu" #: 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:353 -#: src/main/print-escp2.c:359 src/main/print-escp2.c:365 -#: src/main/print-escp2.c:371 src/main/print-escp2.c:377 +#: src/main/print-color.c:421 src/main/print-color.c:553 +#: src/main/print-escp2.c:355 src/main/print-escp2.c:361 +#: src/main/print-escp2.c:367 src/main/print-escp2.c:373 +#: src/main/print-escp2.c:379 src/main/print-escp2.c:742 +#: src/main/print-escp2.c:750 src/main/print-escp2.c:758 #, fuzzy msgid "Advanced Output Control" -msgstr "Typ výstupu:" +msgstr "Typ výstupu:" #: src/main/print-color.c:358 msgid "Limit the total ink printed to the page" msgstr "" -#: src/main/print-color.c:365 +#: src/main/print-color.c:365 src/main/print-escp2.c:742 msgid "GCR Transition" msgstr "" -#: src/main/print-color.c:366 +#: src/main/print-color.c:366 src/main/print-escp2.c:743 msgid "Adjust the gray component transition rate" msgstr "" -#: src/main/print-color.c:373 +#: src/main/print-color.c:373 src/main/print-escp2.c:750 msgid "GCR Lower Bound" msgstr "" -#: src/main/print-color.c:374 +#: src/main/print-color.c:374 src/main/print-escp2.c:751 msgid "Lower bound of gray component reduction" msgstr "" -#: src/main/print-color.c:381 +#: src/main/print-color.c:381 src/main/print-escp2.c:758 msgid "GCR Upper Bound" msgstr "" -#: src/main/print-color.c:382 +#: src/main/print-color.c:382 src/main/print-escp2.c:759 msgid "Upper bound of gray component reduction" msgstr "" -#: src/main/print-color.c:447 src/main/print-color.c:457 -#: src/main/print-color.c:465 src/main/print-color.c:473 -#: src/main/print-color.c:481 src/main/print-color.c:489 -#: src/main/print-color.c:497 src/main/print-color.c:505 -#: src/main/print-color.c:513 +#: src/main/print-color.c:421 +msgid "LUT dump file" +msgstr "" + +#: src/main/print-color.c:422 +msgid "Dump file for LUT for external color adjustment" +msgstr "" + +#: src/main/print-color.c:455 src/main/print-color.c:465 +#: src/main/print-color.c:473 src/main/print-color.c:481 +#: src/main/print-color.c:489 src/main/print-color.c:497 +#: src/main/print-color.c:505 src/main/print-color.c:513 +#: src/main/print-color.c:521 #, fuzzy msgid "Output Curves" -msgstr "Typ výstupu:" +msgstr "Typ výstupu:" -#: src/main/print-color.c:447 +#: src/main/print-color.c:455 msgid "Curve for raw channel " msgstr "" -#: src/main/print-color.c:457 +#: src/main/print-color.c:465 msgid "Cyan Curve" msgstr "" -#: src/main/print-color.c:458 +#: src/main/print-color.c:466 #, fuzzy msgid "Cyan curve" msgstr "Storno" -#: src/main/print-color.c:465 +#: src/main/print-color.c:473 #, fuzzy msgid "Magenta Curve" -msgstr "Purpurová" +msgstr "Purpurová" -#: src/main/print-color.c:466 +#: src/main/print-color.c:474 #, fuzzy msgid "Magenta curve" -msgstr "Purpurová" +msgstr "Purpurová" -#: src/main/print-color.c:473 +#: src/main/print-color.c:481 #, fuzzy msgid "Yellow Curve" -msgstr "Žltá" +msgstr "®ltá" -#: src/main/print-color.c:474 +#: src/main/print-color.c:482 #, fuzzy msgid "Yellow curve" -msgstr "Žltá" +msgstr "®ltá" -#: src/main/print-color.c:481 +#: src/main/print-color.c:489 #, fuzzy msgid "Black Curve" -msgstr "ÄŒierna" +msgstr "Èierna" -#: src/main/print-color.c:482 +#: src/main/print-color.c:490 #, fuzzy msgid "Black curve" -msgstr "ÄŒierna" +msgstr "Èierna" -#: src/main/print-color.c:489 +#: src/main/print-color.c:497 #, fuzzy msgid "Red Curve" -msgstr "Žltá" +msgstr "®ltá" -#: src/main/print-color.c:490 +#: src/main/print-color.c:498 #, fuzzy msgid "Red curve" -msgstr "Žltá" +msgstr "®ltá" -#: src/main/print-color.c:497 +#: src/main/print-color.c:505 #, fuzzy msgid "Green Curve" -msgstr "Purpurová" +msgstr "Purpurová" -#: src/main/print-color.c:498 +#: src/main/print-color.c:506 #, fuzzy msgid "Green curve" -msgstr "Purpurová" +msgstr "Purpurová" -#: src/main/print-color.c:505 +#: src/main/print-color.c:513 #, fuzzy msgid "Blue Curve" -msgstr "ÄŒierna" +msgstr "Èierna" -#: src/main/print-color.c:506 +#: src/main/print-color.c:514 #, fuzzy msgid "Blue curve" -msgstr "ÄŒierna" +msgstr "Èierna" -#: src/main/print-color.c:513 +#: src/main/print-color.c:521 #, fuzzy msgid "White Curve" -msgstr "Žltá" +msgstr "®ltá" -#: src/main/print-color.c:514 +#: src/main/print-color.c:522 #, fuzzy msgid "White curve" -msgstr "Žltá" +msgstr "®ltá" -#: src/main/print-color.c:521 +#: src/main/print-color.c:529 msgid "Hue Map" msgstr "" -#: src/main/print-color.c:521 src/main/print-color.c:529 -#: src/main/print-color.c:537 +#: src/main/print-color.c:529 src/main/print-color.c:537 +#: src/main/print-color.c:545 msgid "Advanced HSL Curves" msgstr "" -#: src/main/print-color.c:522 +#: src/main/print-color.c:530 msgid "Hue adjustment curve" msgstr "" -#: src/main/print-color.c:529 +#: src/main/print-color.c:537 #, fuzzy msgid "Saturation Map" -msgstr "SýtosÅ¥:" +msgstr "Sýtos»:" -#: src/main/print-color.c:530 +#: src/main/print-color.c:538 msgid "Saturation adjustment curve" msgstr "" -#: src/main/print-color.c:537 +#: src/main/print-color.c:545 msgid "Luminosity Map" msgstr "" -#: src/main/print-color.c:538 +#: src/main/print-color.c:546 msgid "Luminosity adjustment curve" msgstr "" -#: src/main/print-color.c:545 +#: src/main/print-color.c:553 msgid "Gray Component Reduction" msgstr "" -#: src/main/print-color.c:546 +#: src/main/print-color.c:554 msgid "Gray component reduction curve" msgstr "" -#: src/main/print-color.c:1670 +#: src/main/print-color.c:1743 msgid "Traditional Gutenprint color conversion" msgstr "" -#: src/main/printers.c:517 +#: src/main/printers.c:514 #, c-format msgid "Value must be set for %s\n" msgstr "" -#: src/main/printers.c:530 src/main/printers.c:535 +#: src/main/printers.c:527 src/main/printers.c:532 #, fuzzy, c-format msgid "`%s' is not a valid %s\n" -msgstr "%s nie je platný parameter pre typ %s\n" +msgstr "%s nie je platný parameter pre typ %s\n" -#: src/main/printers.c:554 +#: src/main/printers.c:551 #, c-format msgid "%s must be between %f and %f (is %f)\n" msgstr "" -#: src/main/printers.c:576 src/main/printers.c:600 +#: src/main/printers.c:573 src/main/printers.c:597 #, c-format msgid "%s must be between %d and %d (is %d)\n" msgstr "" -#: src/main/printers.c:631 +#: src/main/printers.c:628 #, c-format msgid "%s bounds must be between %f and %f\n" msgstr "" -#: src/main/printers.c:639 +#: src/main/printers.c:636 #, c-format msgid "%s wrap mode must be %s\n" msgstr "" -#: src/main/printers.c:643 +#: src/main/printers.c:640 msgid "no wrap" msgstr "" -#: src/main/printers.c:643 +#: src/main/printers.c:640 msgid "wrap around" msgstr "" -#: src/main/printers.c:687 +#: src/main/printers.c:684 #, fuzzy, c-format msgid "Unknown type parameter %s (%d)\n" -msgstr "Neznáma tlaÄiareň %s\n" +msgstr "Neznáma tlaèiareò %s\n" -#: src/main/printers.c:700 src/main/printers.c:711 +#: src/main/printers.c:697 src/main/printers.c:708 #, c-format msgid "%s out of range (value %d, min %d, max %d)\n" msgstr "%s mimo rozsahu (hodnota %d, min %d, max %d)\n" -#: src/main/printers.c:772 +#: src/main/printers.c:768 #, fuzzy msgid "Page size is not valid\n" -msgstr "VeľkosÅ¥ obrázka nie je platná\n" +msgstr "Veµkos» obrázka nie je platná\n" -#: src/main/printers.c:793 +#: src/main/printers.c:789 #, fuzzy, c-format msgid "Top margin must not be less than %d\n" -msgstr "Horný okraj nemôže byÅ¥ menší ako nula\n" +msgstr "Horný okraj nemô¾e by» men¹í ako nula\n" -#: src/main/printers.c:799 +#: src/main/printers.c:795 #, fuzzy, c-format msgid "Left margin must not be less than %d\n" -msgstr "Ľavý okraj nemôže byÅ¥ menší ako nula\n" +msgstr "¥avý okraj nemô¾e by» men¹í ako nula\n" -#: src/main/printers.c:805 +#: src/main/printers.c:801 #, fuzzy msgid "Height must be greater than zero\n" -msgstr "Ľavý okraj nemôže byÅ¥ menší ako nula\n" +msgstr "¥avý okraj nemô¾e by» men¹í ako nula\n" -#: src/main/printers.c:811 +#: src/main/printers.c:807 #, fuzzy msgid "Width must be greater than zero\n" -msgstr "Horný okraj nemôže byÅ¥ menší ako nula\n" +msgstr "Horný okraj nemô¾e by» men¹í ako nula\n" -#: src/main/printers.c:817 +#: src/main/printers.c:813 #, c-format msgid "" "Image is too wide for the page: left margin is %d, width %d, right edge is %" "d\n" msgstr "" -#: src/main/printers.c:824 +#: src/main/printers.c:820 #, c-format msgid "" "Image is too long for the page: top margin is %d, height %d, bottom edge is %" "d\n" msgstr "" -#: src/main/print-escp2.c:162 +#: src/main/print-escp2.c:164 msgid "Automatic Printing Mode" msgstr "" -#: src/main/print-escp2.c:162 src/main/print-escp2.c:174 +#: src/main/print-escp2.c:164 src/main/print-escp2.c:176 #: src/main/generic-options.c:62 msgid "Basic Output Adjustment" msgstr "" -#: src/main/print-escp2.c:163 +#: src/main/print-escp2.c:165 msgid "Automatic printing mode" msgstr "" -#: src/main/print-escp2.c:174 src/main/print-escp2.c:175 +#: src/main/print-escp2.c:176 src/main/print-escp2.c:177 #: src/main/generic-options.c:62 src/main/generic-options.c:63 #, fuzzy msgid "Print Quality" -msgstr "720 DPI NajvyÅ¡Å¡ia kvalita" +msgstr "720 DPI Najvy¹¹ia kvalita" -#: src/main/print-escp2.c:229 +#: src/main/print-escp2.c:231 #, fuzzy msgid "Resolution of the print" -msgstr "Rozlíšenie a kvalita tlaÄe" +msgstr "Rozlí¹enie a kvalita tlaèe" -#: src/main/print-escp2.c:245 +#: src/main/print-escp2.c:247 msgid "Enhanced Gloss" msgstr "" -#: src/main/print-escp2.c:246 +#: src/main/print-escp2.c:248 msgid "Add gloss enhancement" msgstr "" -#: src/main/print-escp2.c:251 +#: src/main/print-escp2.c:253 #, fuzzy msgid "Ink Set" msgstr "Typ atramentu" -#: src/main/print-escp2.c:257 +#: src/main/print-escp2.c:259 msgid "Printing Direction" msgstr "" -#: src/main/print-escp2.c:257 src/main/print-escp2.c:269 +#: src/main/print-escp2.c:259 src/main/print-escp2.c:271 msgid "Advanced Output Adjustment" msgstr "" -#: src/main/print-escp2.c:258 +#: src/main/print-escp2.c:260 msgid "Printing direction (unidirectional is higher quality, but slower)" msgstr "" -#: src/main/print-escp2.c:263 src/main/print-olympus.c:1735 +#: src/main/print-escp2.c:265 src/main/print-olympus.c:1733 msgid "Borderless" msgstr "" -#: src/main/print-escp2.c:264 src/main/print-olympus.c:1736 +#: src/main/print-escp2.c:266 src/main/print-olympus.c:1734 msgid "Print without borders" msgstr "" -#: src/main/print-escp2.c:269 +#: src/main/print-escp2.c:271 msgid "Interleave Method" msgstr "" -#: src/main/print-escp2.c:270 +#: src/main/print-escp2.c:272 msgid "Interleave pattern to use" msgstr "" -#: src/main/print-escp2.c:275 +#: src/main/print-escp2.c:277 msgid "Adjust dot size as necessary" msgstr "" -#: src/main/print-escp2.c:276 +#: src/main/print-escp2.c:278 msgid "Adjust dot size as necessary to achieve desired density" msgstr "" -#: src/main/print-escp2.c:281 src/main/print-escp2.c:282 +#: src/main/print-escp2.c:283 src/main/print-escp2.c:284 #, fuzzy msgid "Output Order" -msgstr "Typ výstupu:" +msgstr "Typ výstupu:" -#: src/main/print-escp2.c:287 src/main/print-escp2.c:288 +#: src/main/print-escp2.c:289 src/main/print-escp2.c:290 msgid "Alignment Passes" msgstr "" -#: src/main/print-escp2.c:293 src/main/print-escp2.c:294 +#: src/main/print-escp2.c:295 src/main/print-escp2.c:296 msgid "Alignment Choices" msgstr "" -#: src/main/print-escp2.c:299 src/main/print-escp2.c:300 +#: src/main/print-escp2.c:301 src/main/print-escp2.c:302 #, fuzzy msgid "Ink change command" -msgstr "Neznámy príkaz.\n" +msgstr "Neznámy príkaz.\n" -#: src/main/print-escp2.c:305 src/main/print-escp2.c:306 +#: src/main/print-escp2.c:307 src/main/print-escp2.c:308 msgid "Alternate Alignment Passes" msgstr "" -#: src/main/print-escp2.c:311 src/main/print-escp2.c:312 +#: src/main/print-escp2.c:313 src/main/print-escp2.c:314 #, fuzzy msgid "Alternate Alignment Choices" -msgstr "Opakujem proces zarovnávania.\n" +msgstr "Opakujem proces zarovnávania.\n" -#: src/main/print-escp2.c:317 +#: src/main/print-escp2.c:319 msgid "Supports Packet Mode" msgstr "" -#: src/main/print-escp2.c:318 +#: src/main/print-escp2.c:320 msgid "Supports D4 Packet Mode" msgstr "" -#: src/main/print-escp2.c:323 +#: src/main/print-escp2.c:325 msgid "Has Interchangeable Ink Cartridges" msgstr "" -#: src/main/print-escp2.c:324 +#: src/main/print-escp2.c:326 msgid "Has multiple choices of ink cartridges" msgstr "" -#: src/main/print-escp2.c:335 src/main/print-escp2.c:336 +#: src/main/print-escp2.c:337 src/main/print-escp2.c:338 #, fuzzy msgid "Channel Names" msgstr "Storno" -#: src/main/print-escp2.c:348 +#: src/main/print-escp2.c:350 msgid "Raw Channel Count" msgstr "" -#: src/main/print-escp2.c:353 +#: src/main/print-escp2.c:355 #, fuzzy msgid "Cyan Map" -msgstr "Azúrová" +msgstr "Azúrová" -#: src/main/print-escp2.c:354 +#: src/main/print-escp2.c:356 #, fuzzy msgid "Adjust the cyan map" -msgstr "Prispôsobenie vyváženie azúrovej farby pre tlaÄ" +msgstr "Prispôsobenie vyvá¾enie azúrovej farby pre tlaè" -#: src/main/print-escp2.c:359 +#: src/main/print-escp2.c:361 #, fuzzy msgid "Magenta Map" -msgstr "Purpurová" +msgstr "Purpurová" -#: src/main/print-escp2.c:360 +#: src/main/print-escp2.c:362 #, fuzzy msgid "Adjust the magenta map" -msgstr "Prispôsobenie vyváženie purpurovej farby pre tlaÄ" +msgstr "Prispôsobenie vyvá¾enie purpurovej farby pre tlaè" -#: src/main/print-escp2.c:365 +#: src/main/print-escp2.c:367 #, fuzzy msgid "Yellow Map" -msgstr "Žltá" +msgstr "®ltá" -#: src/main/print-escp2.c:366 +#: src/main/print-escp2.c:368 #, fuzzy msgid "Adjust the yellow map" -msgstr "Prispôsobenie vyváženie žltej farby pre tlaÄ" +msgstr "Prispôsobenie vyvá¾enie ¾ltej farby pre tlaè" -#: src/main/print-escp2.c:371 +#: src/main/print-escp2.c:373 #, fuzzy msgid "Blue Map" -msgstr "ÄŒiernobielo" +msgstr "Èiernobielo" -#: src/main/print-escp2.c:372 +#: src/main/print-escp2.c:374 #, fuzzy msgid "Adjust the blue map" -msgstr "Prispôsobenie vyváženie azúrovej farby pre tlaÄ" +msgstr "Prispôsobenie vyvá¾enie azúrovej farby pre tlaè" -#: src/main/print-escp2.c:377 +#: src/main/print-escp2.c:379 msgid "Red Map" msgstr "" -#: src/main/print-escp2.c:378 +#: src/main/print-escp2.c:380 #, fuzzy msgid "Adjust the red map" -msgstr "Prispôsobenie vyváženie žltej farby pre tlaÄ" +msgstr "Prispôsobenie vyvá¾enie ¾ltej farby pre tlaè" -#: src/main/print-escp2.c:471 +#: src/main/print-escp2.c:478 #, fuzzy msgid "Red Density" msgstr "Hustota:" -#: src/main/print-escp2.c:472 +#: src/main/print-escp2.c:479 #, fuzzy msgid "Adjust the red density" -msgstr "Prispôsobenie vyváženie žltej farby pre tlaÄ" +msgstr "Prispôsobenie vyvá¾enie ¾ltej farby pre tlaè" -#: src/main/print-escp2.c:479 +#: src/main/print-escp2.c:486 #, fuzzy msgid "Blue Density" msgstr "Hustota:" -#: src/main/print-escp2.c:480 +#: src/main/print-escp2.c:487 #, fuzzy msgid "Adjust the blue density" -msgstr "Prispôsobenie vyváženie azúrovej farby pre tlaÄ" +msgstr "Prispôsobenie vyvá¾enie azúrovej farby pre tlaè" -#: src/main/print-escp2.c:487 +#: src/main/print-escp2.c:494 #, fuzzy msgid "Gloss Level" -msgstr "Lesklý film" +msgstr "Lesklý film" -#: src/main/print-escp2.c:488 +#: src/main/print-escp2.c:495 #, fuzzy msgid "Adjust the gloss level" -msgstr "Prispôsobenie vyváženie žltej farby pre tlaÄ" +msgstr "Prispôsobenie vyvá¾enie ¾ltej farby pre tlaè" + +#: src/main/print-escp2.c:502 +msgid "Drop Size Small" +msgstr "" + +#: src/main/print-escp2.c:503 +msgid "Drop Size 1 (small)" +msgstr "" + +#: src/main/print-escp2.c:510 +msgid "Drop Size Medium" +msgstr "" + +#: src/main/print-escp2.c:511 +msgid "Drop Size 2 (medium)" +msgstr "" + +#: src/main/print-escp2.c:518 +msgid "Drop Size Large" +msgstr "" + +#: src/main/print-escp2.c:519 +msgid "Drop Size 3 (large)" +msgstr "" + +#: src/main/print-escp2.c:526 src/main/print-escp2.c:527 +#, fuzzy +msgid "Light Cyan Value" +msgstr "Jasná azúrová" + +#: src/main/print-escp2.c:542 src/main/print-escp2.c:543 +#, fuzzy +msgid "Light Cyan Density Scale" +msgstr "Jasná azúrová" + +#: src/main/print-escp2.c:550 src/main/print-escp2.c:551 +#, fuzzy +msgid "Light Magenta Value" +msgstr "Jasná purpurová" + +#: src/main/print-escp2.c:558 src/main/print-escp2.c:559 +#, fuzzy +msgid "Light Magenta Density Scale" +msgstr "Jasná purpurová" + +#: src/main/print-escp2.c:574 src/main/print-escp2.c:575 +#, fuzzy +msgid "Dark Yellow Value" +msgstr "®ltá" -#: src/main/print-escp2.c:511 src/main/print-escp2.c:512 +#: src/main/print-escp2.c:582 src/main/print-escp2.c:583 msgid "Dark Yellow Transition" msgstr "" -#: src/main/print-escp2.c:519 src/main/print-escp2.c:520 -#: src/main/print-escp2.c:527 src/main/print-escp2.c:528 +#: src/main/print-escp2.c:590 src/main/print-escp2.c:591 +#, fuzzy +msgid "Dark Yellow Density Scale" +msgstr "®ltá" + +#: src/main/print-escp2.c:598 src/main/print-escp2.c:599 +#: src/main/print-escp2.c:622 src/main/print-escp2.c:623 +#, fuzzy +msgid "Gray Value" +msgstr "V odtieòoch ¹edej" + +#: src/main/print-escp2.c:606 src/main/print-escp2.c:607 +#: src/main/print-escp2.c:630 src/main/print-escp2.c:631 msgid "Gray Transition" msgstr "" -#: src/main/print-escp2.c:535 src/main/print-escp2.c:536 -#: src/main/print-escp2.c:559 src/main/print-escp2.c:560 +#: src/main/print-escp2.c:614 src/main/print-escp2.c:615 +#: src/main/print-escp2.c:638 src/main/print-escp2.c:639 +#, fuzzy +msgid "Gray Density Scale" +msgstr "V odtieòoch ¹edej" + +#: src/main/print-escp2.c:646 src/main/print-escp2.c:647 +#: src/main/print-escp2.c:718 src/main/print-escp2.c:719 +#, fuzzy +msgid "Light Gray Value" +msgstr "Jasná azúrová" + +#: src/main/print-escp2.c:654 src/main/print-escp2.c:655 +#: src/main/print-escp2.c:726 src/main/print-escp2.c:727 #, fuzzy msgid "Light Gray Transition" -msgstr "Jasná azúrová" +msgstr "Jasná azúrová" + +#: src/main/print-escp2.c:662 src/main/print-escp2.c:663 +#: src/main/print-escp2.c:734 src/main/print-escp2.c:735 +#, fuzzy +msgid "Light Gray Density Scale" +msgstr "Jasná azúrová" + +#: src/main/print-escp2.c:670 src/main/print-escp2.c:671 +#, fuzzy +msgid "Dark Gray Value" +msgstr "Jasná azúrová" -#: src/main/print-escp2.c:543 src/main/print-escp2.c:544 +#: src/main/print-escp2.c:678 src/main/print-escp2.c:679 #, fuzzy msgid "Dark Gray Transition" -msgstr "Jasná azúrová" +msgstr "Jasná azúrová" + +#: src/main/print-escp2.c:686 src/main/print-escp2.c:687 +#, fuzzy +msgid "Dark Gray Density Scale" +msgstr "Jasná azúrová" + +#: src/main/print-escp2.c:694 +#, fuzzy +msgid "Mid Gray Value" +msgstr "V odtieòoch ¹edej" + +#: src/main/print-escp2.c:695 +#, fuzzy +msgid "Medium Gray Value" +msgstr "Jasná azúrová" -#: src/main/print-escp2.c:551 +#: src/main/print-escp2.c:702 #, fuzzy msgid "Mid Gray Transition" -msgstr "Jasná azúrová" +msgstr "Jasná azúrová" -#: src/main/print-escp2.c:552 +#: src/main/print-escp2.c:703 #, fuzzy msgid "Medium Gray Transition" -msgstr "Jasná azúrová" +msgstr "Jasná azúrová" + +#: src/main/print-escp2.c:710 +#, fuzzy +msgid "Mid Gray Density Scale" +msgstr "Jasná azúrová" + +#: src/main/print-escp2.c:711 +#, fuzzy +msgid "Medium Gray Density Scale" +msgstr "Jasná azúrová" -#: src/main/print-escp2.c:1635 +#: src/main/print-escp2.c:1999 #, fuzzy msgid "Full Manual Control" -msgstr "Typ výstupu:" +msgstr "Typ výstupu:" -#: src/main/print-escp2.c:1637 +#: src/main/print-escp2.c:2001 msgid "Automatic Setting Control" msgstr "" -#: src/main/print-escp2.c:1732 src/main/generic-options.c:213 +#: src/main/print-escp2.c:2096 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:1771 src/main/print-escp2.c:1863 -#: src/main/print-escp2.c:1875 src/main/print-pcl.c:230 -#: src/main/escp2-channels.c:2805 src/main/escp2-papers.c:1707 -#: src/main/escp2-papers.c:1731 src/main/escp2-papers.c:1764 -#: src/main/escp2-papers.c:1815 src/main/escp2-papers.c:1857 -#: src/main/escp2-papers.c:1899 src/main/escp2-papers.c:1992 -#: src/main/escp2-resolutions.c:640 src/main/escp2-resolutions.c:655 -#: src/main/escp2-resolutions.c:668 src/main/generic-options.c:36 -#: src/gutenprintui/panel.c:2613 src/gutenprintui2/panel.c:2639 +msgstr "Typ výstupu:" + +#: src/main/print-escp2.c:2139 src/main/print-escp2.c:2231 +#: src/main/print-escp2.c:2243 src/main/print-pcl.c:237 +#: src/main/escp2-channels.c:2827 src/main/escp2-channels.c:2836 +#: src/main/escp2-papers.c:1718 src/main/escp2-papers.c:1742 +#: src/main/escp2-papers.c:1775 src/main/escp2-papers.c:1826 +#: src/main/escp2-papers.c:1868 src/main/escp2-papers.c:1910 +#: src/main/escp2-papers.c:2003 src/main/escp2-resolutions.c:640 +#: src/main/escp2-resolutions.c:655 src/main/escp2-resolutions.c:670 +#: src/main/escp2-resolutions.c:683 src/main/generic-options.c:36 +#: src/gutenprintui2/panel.c:2814 msgid "Standard" -msgstr "Å tandardný" +msgstr "©tandardný" -#: src/main/print-escp2.c:1842 +#: src/main/print-escp2.c:2210 #, fuzzy msgid "Automatic" -msgstr "VeľkosÅ¥" +msgstr "Veµkos»" -#: src/main/print-escp2.c:1844 +#: src/main/print-escp2.c:2212 #, fuzzy msgid "Bidirectional" msgstr "600 DPI Jednosmerne" -#: src/main/print-escp2.c:1846 +#: src/main/print-escp2.c:2214 #, fuzzy msgid "Unidirectional" msgstr "600 DPI Jednosmerne" -#: src/main/print-escp2.c:1877 +#: src/main/print-escp2.c:2245 msgid "Alternate Fill" msgstr "" -#: src/main/print-escp2.c:1879 +#: src/main/print-escp2.c:2247 msgid "Ascending Fill" msgstr "" -#: src/main/print-escp2.c:1881 +#: src/main/print-escp2.c:2249 msgid "Descending Fill" msgstr "" -#: src/main/print-escp2.c:1883 +#: src/main/print-escp2.c:2251 msgid "Ascending Double" msgstr "" -#: src/main/print-escp2.c:1885 +#: src/main/print-escp2.c:2253 msgid "Nearest Neighbor Avoidance" msgstr "" -#: src/main/print-escp2.c:2328 +#: src/main/print-escp2.c:2771 #, fuzzy, c-format msgid "This printer does not support raw printer output at depth %d\n" -msgstr "TlaÄiareň nepodporuje farebný výstup\n" +msgstr "Tlaèiareò nepodporuje farebný výstup\n" -#: src/main/print-escp2.c:3436 src/main/print-olympus.c:2451 +#: src/main/print-escp2.c:3934 src/main/print-olympus.c:2449 #: src/main/print-raw.c:217 msgid "Print options not verified; cannot print.\n" msgstr "" @@ -1397,7 +1535,7 @@ msgstr "600 DPI" #: src/main/print-lexmark.c:579 src/main/print-lexmark.c:655 msgid "600 DPI high quality" -msgstr "600 DPI Vysoká kvalita" +msgstr "600 DPI Vysoká kvalita" #: src/main/print-lexmark.c:580 src/main/print-lexmark.c:656 msgid "600 DPI Unidirectional" @@ -1409,11 +1547,11 @@ msgstr "1200 DPI" #: src/main/print-lexmark.c:582 src/main/print-lexmark.c:658 msgid "1200 DPI high quality" -msgstr "1200 DPI Vysoká kvalita" +msgstr "1200 DPI Vysoká kvalita" #: src/main/print-lexmark.c:583 src/main/print-lexmark.c:659 msgid "1200 DPI highest quality" -msgstr "1200 DPI NajvyÅ¡Å¡ia kvalita" +msgstr "1200 DPI Najvy¹¹ia kvalita" #: src/main/print-lexmark.c:584 src/main/print-lexmark.c:660 msgid "1200 DPI Unidirectional" @@ -1425,15 +1563,15 @@ msgstr "2400 DPI x 1200 DPI" #: src/main/print-lexmark.c:586 msgid "2400 DPI x 1200 DPI high quality" -msgstr "2400 DPI x 1200 DPI Vysoká kvalita" +msgstr "2400 DPI x 1200 DPI Vysoká kvalita" #: src/main/print-lexmark.c:587 msgid "2400 DPI x 1200 DPI highest quality" -msgstr "2400 DPI x 1200 DPI NajvyÅ¡Å¡ia kvalita" +msgstr "2400 DPI x 1200 DPI Najvy¹¹ia kvalita" #: src/main/print-lexmark.c:589 msgid "test print" -msgstr "Test tlaÄe" +msgstr "Test tlaèe" #: src/main/print-lexmark.c:601 src/main/print-lexmark.c:671 #: src/main/escp2-channels.c:1288 src/main/escp2-channels.c:1302 @@ -1443,7 +1581,7 @@ msgstr "Test tlaÄe" #: src/main/escp2-channels.c:1410 src/main/escp2-channels.c:1424 #: src/main/escp2-channels.c:1438 src/main/escp2-channels.c:1452 msgid "Four Color Standard" -msgstr "Å tandardný Å¡tvorfarebný" +msgstr "©tandardný ¹tvorfarebný" #: src/main/print-lexmark.c:604 src/main/print-lexmark.c:674 #: src/main/escp2-channels.c:1124 src/main/escp2-channels.c:1138 @@ -1453,184 +1591,184 @@ msgstr "Å tandardný Å¡tvorfarebný" #: src/main/escp2-channels.c:1238 src/main/escp2-channels.c:1252 #: src/main/escp2-channels.c:1266 msgid "Three Color Composite" -msgstr "Kompozitný trojfarebný" +msgstr "Kompozitný trojfarebný" #: src/main/print-lexmark.c:607 src/main/print-lexmark.c:677 -#: src/main/escp2-channels.c:1540 src/main/escp2-channels.c:1554 -#: src/main/escp2-channels.c:1568 src/main/escp2-channels.c:1582 -#: src/main/escp2-channels.c:1808 src/main/escp2-channels.c:1823 -#: src/main/escp2-channels.c:1838 src/main/escp2-channels.c:1855 +#: src/main/escp2-channels.c:1554 src/main/escp2-channels.c:1568 +#: src/main/escp2-channels.c:1582 src/main/escp2-channels.c:1596 +#: src/main/escp2-channels.c:1822 src/main/escp2-channels.c:1837 +#: src/main/escp2-channels.c:1852 src/main/escp2-channels.c:1869 msgid "Six Color Photo" -msgstr "Fotografický Å¡esÅ¥farebný" +msgstr "Fotografický ¹es»farebný" #: src/main/print-lexmark.c:610 src/main/print-lexmark.c:680 -#: src/main/escp2-channels.c:1475 src/main/escp2-channels.c:1489 -#: src/main/escp2-channels.c:1503 src/main/escp2-channels.c:1517 -#: src/main/escp2-channels.c:1752 src/main/escp2-channels.c:1767 -#: src/main/escp2-channels.c:1784 +#: src/main/escp2-channels.c:1489 src/main/escp2-channels.c:1503 +#: src/main/escp2-channels.c:1517 src/main/escp2-channels.c:1531 +#: src/main/escp2-channels.c:1766 src/main/escp2-channels.c:1781 +#: src/main/escp2-channels.c:1798 msgid "Five Color Photo Composite" -msgstr "Kompozitný fotografický päťfarebný" - -#: src/main/print-lexmark.c:856 src/main/escp2-papers.c:1341 -#: src/main/escp2-papers.c:1385 src/main/escp2-papers.c:1429 -#: src/main/escp2-papers.c:1477 src/main/escp2-papers.c:1525 -#: src/main/escp2-papers.c:1569 -msgid "Plain Paper" -msgstr "ObyÄajný papier" - -#: src/main/print-lexmark.c:860 src/main/escp2-papers.c:1347 -#: src/main/escp2-papers.c:1391 src/main/escp2-papers.c:1435 -#: src/main/escp2-papers.c:1483 src/main/escp2-papers.c:1531 -#: src/main/escp2-papers.c:1575 -msgid "Glossy Film" -msgstr "Lesklý film" - -#: src/main/print-lexmark.c:864 src/main/escp2-papers.c:1349 -#: src/main/escp2-papers.c:1393 src/main/escp2-papers.c:1437 -#: src/main/escp2-papers.c:1485 src/main/escp2-papers.c:1533 -#: src/main/escp2-papers.c:1577 -msgid "Transparencies" -msgstr "Priesvitná fólia" +msgstr "Kompozitný fotografický pä»farebný" -#: src/main/print-lexmark.c:868 src/main/escp2-papers.c:1351 +#: src/main/print-lexmark.c:856 src/main/escp2-papers.c:1351 #: src/main/escp2-papers.c:1395 src/main/escp2-papers.c:1439 #: src/main/escp2-papers.c:1487 src/main/escp2-papers.c:1535 #: src/main/escp2-papers.c:1579 -msgid "Envelopes" -msgstr "Obálky" +msgid "Plain Paper" +msgstr "Obyèajný papier" -#: src/main/print-lexmark.c:872 src/main/escp2-papers.c:1355 -#: src/main/escp2-papers.c:1399 src/main/escp2-papers.c:1443 -#: src/main/escp2-papers.c:1491 src/main/escp2-papers.c:1539 -#: src/main/escp2-papers.c:1583 -msgid "Matte Paper" -msgstr "Matný papier" +#: src/main/print-lexmark.c:860 src/main/escp2-papers.c:1357 +#: src/main/escp2-papers.c:1401 src/main/escp2-papers.c:1445 +#: src/main/escp2-papers.c:1493 src/main/escp2-papers.c:1541 +#: src/main/escp2-papers.c:1585 +msgid "Glossy Film" +msgstr "Lesklý film" -#: src/main/print-lexmark.c:876 src/main/escp2-papers.c:1359 +#: src/main/print-lexmark.c:864 src/main/escp2-papers.c:1359 #: src/main/escp2-papers.c:1403 src/main/escp2-papers.c:1447 #: src/main/escp2-papers.c:1495 src/main/escp2-papers.c:1543 #: src/main/escp2-papers.c:1587 -msgid "Inkjet Paper" -msgstr "Papier pre atramentovú tlaÄiareň" +msgid "Transparencies" +msgstr "Priesvitná fólia" -#: src/main/print-lexmark.c:880 src/main/escp2-papers.c:1361 +#: src/main/print-lexmark.c:868 src/main/escp2-papers.c:1361 #: src/main/escp2-papers.c:1405 src/main/escp2-papers.c:1449 #: src/main/escp2-papers.c:1497 src/main/escp2-papers.c:1545 #: src/main/escp2-papers.c:1589 -msgid "Photo Quality Inkjet Paper" -msgstr "Papier s fotografickou kvalitou" - -#: src/main/print-lexmark.c:884 src/main/escp2-papers.c:1363 -#: src/main/escp2-papers.c:1407 src/main/escp2-papers.c:1451 -#: src/main/escp2-papers.c:1499 src/main/escp2-papers.c:1547 -#: src/main/escp2-papers.c:1591 -msgid "Photo Paper" -msgstr "Fotografický papier" +msgid "Envelopes" +msgstr "Obálky" -#: src/main/print-lexmark.c:888 src/main/escp2-papers.c:1365 +#: src/main/print-lexmark.c:872 src/main/escp2-papers.c:1365 #: src/main/escp2-papers.c:1409 src/main/escp2-papers.c:1453 #: src/main/escp2-papers.c:1501 src/main/escp2-papers.c:1549 -#: src/main/escp2-papers.c:1593 src/main/escp2-papers.c:1617 -msgid "Premium Glossy Photo Paper" -msgstr "Lesklý foto papier Premium" +#: src/main/escp2-papers.c:1593 +msgid "Matte Paper" +msgstr "Matný papier" -#: src/main/print-lexmark.c:892 src/main/escp2-papers.c:1369 +#: src/main/print-lexmark.c:876 src/main/escp2-papers.c:1369 #: src/main/escp2-papers.c:1413 src/main/escp2-papers.c:1457 #: src/main/escp2-papers.c:1505 src/main/escp2-papers.c:1553 #: src/main/escp2-papers.c:1597 +msgid "Inkjet Paper" +msgstr "Papier pre atramentovú tlaèiareò" + +#: src/main/print-lexmark.c:880 src/main/escp2-papers.c:1371 +#: src/main/escp2-papers.c:1415 src/main/escp2-papers.c:1459 +#: src/main/escp2-papers.c:1507 src/main/escp2-papers.c:1555 +#: src/main/escp2-papers.c:1599 +msgid "Photo Quality Inkjet Paper" +msgstr "Papier s fotografickou kvalitou" + +#: src/main/print-lexmark.c:884 src/main/escp2-papers.c:1373 +#: src/main/escp2-papers.c:1417 src/main/escp2-papers.c:1461 +#: src/main/escp2-papers.c:1509 src/main/escp2-papers.c:1557 +#: src/main/escp2-papers.c:1601 +msgid "Photo Paper" +msgstr "Fotografický papier" + +#: src/main/print-lexmark.c:888 src/main/escp2-papers.c:1375 +#: src/main/escp2-papers.c:1419 src/main/escp2-papers.c:1463 +#: src/main/escp2-papers.c:1511 src/main/escp2-papers.c:1559 +#: src/main/escp2-papers.c:1603 src/main/escp2-papers.c:1627 +msgid "Premium Glossy Photo Paper" +msgstr "Lesklý foto papier Premium" + +#: src/main/print-lexmark.c:892 src/main/escp2-papers.c:1379 +#: src/main/escp2-papers.c:1423 src/main/escp2-papers.c:1467 +#: src/main/escp2-papers.c:1515 src/main/escp2-papers.c:1563 +#: src/main/escp2-papers.c:1607 msgid "Premium Luster Photo Paper" -msgstr "Ligotavý foto papier Premium" +msgstr "Ligotavý foto papier Premium" -#: src/main/print-lexmark.c:896 src/main/escp2-papers.c:1371 -#: src/main/escp2-papers.c:1415 src/main/escp2-papers.c:1463 -#: src/main/escp2-papers.c:1511 src/main/escp2-papers.c:1555 -#: src/main/escp2-papers.c:1603 +#: src/main/print-lexmark.c:896 src/main/escp2-papers.c:1381 +#: src/main/escp2-papers.c:1425 src/main/escp2-papers.c:1473 +#: src/main/escp2-papers.c:1521 src/main/escp2-papers.c:1565 +#: src/main/escp2-papers.c:1613 msgid "Photo Quality Glossy Paper" -msgstr "Lesklý fotografický papier" +msgstr "Lesklý fotografický papier" -#: src/main/print-lexmark.c:900 src/main/escp2-papers.c:1373 -#: src/main/escp2-papers.c:1417 src/main/escp2-papers.c:1465 -#: src/main/escp2-papers.c:1513 src/main/escp2-papers.c:1557 -#: src/main/escp2-papers.c:1605 +#: src/main/print-lexmark.c:900 src/main/escp2-papers.c:1383 +#: src/main/escp2-papers.c:1427 src/main/escp2-papers.c:1475 +#: src/main/escp2-papers.c:1523 src/main/escp2-papers.c:1567 +#: src/main/escp2-papers.c:1615 msgid "Ilford Heavy Paper" -msgstr "Ilford Å¥ažký papier" +msgstr "Ilford »a¾ký papier" -#: src/main/print-lexmark.c:904 src/main/escp2-papers.c:1377 -#: src/main/escp2-papers.c:1421 src/main/escp2-papers.c:1469 -#: src/main/escp2-papers.c:1517 src/main/escp2-papers.c:1561 -#: src/main/escp2-papers.c:1609 src/main/escp2-papers.c:1619 +#: src/main/print-lexmark.c:904 src/main/escp2-papers.c:1387 +#: src/main/escp2-papers.c:1431 src/main/escp2-papers.c:1479 +#: src/main/escp2-papers.c:1527 src/main/escp2-papers.c:1571 +#: src/main/escp2-papers.c:1619 src/main/escp2-papers.c:1629 msgid "Other" -msgstr "Iné" +msgstr "Iné" #: src/main/print-lexmark.c:1113 msgid "Auto Sheet Feeder" -msgstr "Automatický podávaÄ papiera" +msgstr "Automatický podávaè papiera" #: src/main/print-lexmark.c:1114 msgid "Manual with Pause" -msgstr "Manuálne s preruÅ¡ením" +msgstr "Manuálne s preru¹ením" #: src/main/print-lexmark.c:1115 msgid "Manual without Pause" -msgstr "Manuálne bez preruÅ¡enia" +msgstr "Manuálne bez preru¹enia" -#: src/main/print-olympus.c:277 +#: src/main/print-olympus.c:275 msgid "Coated" msgstr "" -#: src/main/print-olympus.c:278 src/cups/genppd.c:1726 src/cups/genppd.c:1753 -#: src/cups/genppd.c:1834 +#: src/main/print-olympus.c:276 src/cups/genppd.c:1732 src/cups/genppd.c:1759 +#: src/cups/genppd.c:1840 msgid "None" msgstr "" -#: src/main/print-olympus.c:963 src/main/print-olympus.c:1023 -#: src/main/print-olympus.c:1127 +#: src/main/print-olympus.c:961 src/main/print-olympus.c:1021 +#: src/main/print-olympus.c:1125 #, fuzzy msgid "Glossy" -msgstr "Lesklý film" +msgstr "Lesklý film" -#: src/main/print-olympus.c:964 src/main/print-olympus.c:1024 -#: src/main/print-olympus.c:1128 +#: src/main/print-olympus.c:962 src/main/print-olympus.c:1022 +#: src/main/print-olympus.c:1126 msgid "Texture" msgstr "" -#: src/main/print-olympus.c:1025 src/main/print-olympus.c:1129 +#: src/main/print-olympus.c:1023 src/main/print-olympus.c:1127 #, fuzzy msgid "Matte" -msgstr "Matný papier" +msgstr "Matný papier" -#: src/main/print-olympus.c:1729 src/main/print-olympus.c:1730 +#: src/main/print-olympus.c:1727 src/main/print-olympus.c:1728 msgid "Laminate Pattern" msgstr "" -#: src/main/print-olympus.c:1765 +#: src/main/print-olympus.c:1763 #, fuzzy msgid "Adjust the cyan balance" -msgstr "Prispôsobenie vyváženie azúrovej farby pre tlaÄ" +msgstr "Prispôsobenie vyvá¾enie azúrovej farby pre tlaè" -#: src/main/print-olympus.c:1773 +#: src/main/print-olympus.c:1771 #, fuzzy msgid "Adjust the magenta balance" -msgstr "Prispôsobenie vyváženie purpurovej farby pre tlaÄ" +msgstr "Prispôsobenie vyvá¾enie purpurovej farby pre tlaè" -#: src/main/print-olympus.c:1781 +#: src/main/print-olympus.c:1779 #, fuzzy msgid "Adjust the yellow balance" -msgstr "Prispôsobenie vyváženie žltej farby pre tlaÄ" +msgstr "Prispôsobenie vyvá¾enie ¾ltej farby pre tlaè" -#: src/main/print-olympus.c:1788 +#: src/main/print-olympus.c:1786 #, fuzzy msgid "Black Balance" -msgstr "ÄŒiernobielo" +msgstr "Èiernobielo" -#: src/main/print-olympus.c:1789 +#: src/main/print-olympus.c:1787 #, fuzzy msgid "Adjust the black balance" -msgstr "Prispôsobenie vyváženie azúrovej farby pre tlaÄ" +msgstr "Prispôsobenie vyvá¾enie azúrovej farby pre tlaè" #: src/main/print-pcl.c:185 msgid "Plain" -msgstr "Jednoduchá" +msgstr "Jednoduchá" #: src/main/print-pcl.c:186 msgid "Bond" @@ -1642,106 +1780,130 @@ msgstr "Premium" #: src/main/print-pcl.c:188 msgid "Glossy Photo" -msgstr "Lesklé foto" +msgstr "Lesklé foto" #: src/main/print-pcl.c:189 msgid "Transparency" -msgstr "Priesvitné fólie" +msgstr "Priesvitné fólie" #: src/main/print-pcl.c:190 msgid "Quick-dry Photo" -msgstr "Rýchloschnúce foto" +msgstr "Rýchloschnúce foto" #: src/main/print-pcl.c:191 msgid "Quick-dry Transparency" -msgstr "Rýchloschnúce priesvit. fólie" +msgstr "Rýchloschnúce priesvit. fólie" -#: src/main/print-pcl.c:231 src/main/xmli18n-tmp.h:16 +#: src/main/print-pcl.c:238 src/main/xmli18n-tmp.h:17 msgid "Manual" -msgstr "Manuál" +msgstr "Manuál" + +#: src/main/print-pcl.c:240 +msgid "Tray 1 - Movable Guides" +msgstr "" -#: src/main/print-pcl.c:233 +#: src/main/print-pcl.c:241 msgid "Tray 1" -msgstr "Zásobník 1" +msgstr "Zásobník 1" -#: src/main/print-pcl.c:234 src/main/print-pcl.c:240 +#: src/main/print-pcl.c:242 +msgid "Tray 2 - Movable Guides" +msgstr "" + +#: src/main/print-pcl.c:243 src/main/print-pcl.c:251 msgid "Tray 2" -msgstr "Zásobník 2" +msgstr "Zásobník 2" + +#: src/main/print-pcl.c:244 +msgid "Tray 3 - Movable Guides" +msgstr "" -#: src/main/print-pcl.c:235 +#: src/main/print-pcl.c:245 msgid "Tray 3" -msgstr "Zásobník 3" +msgstr "Zásobník 3" + +#: src/main/print-pcl.c:246 +msgid "Tray 4 - Movable Guides" +msgstr "" -#: src/main/print-pcl.c:236 +#: src/main/print-pcl.c:247 msgid "Tray 4" -msgstr "Zásobník 4" +msgstr "Zásobník 4" -#: src/main/print-pcl.c:237 +#: src/main/print-pcl.c:248 msgid "Portable Sheet Feeder" -msgstr "Prenosný podávaÄ papiera" +msgstr "Prenosný podávaè papiera" -#: src/main/print-pcl.c:238 +#: src/main/print-pcl.c:249 msgid "Desktop Sheet Feeder" -msgstr "Stolový podávaÄ papiera" +msgstr "Stolový podávaè papiera" -#: src/main/print-pcl.c:239 +#: src/main/print-pcl.c:250 msgid "Tray" -msgstr "Zásobník" +msgstr "Zásobník" -#: src/main/print-pcl.c:241 +#: src/main/print-pcl.c:252 msgid "Optional Source" -msgstr "Voliteľný zdroj" +msgstr "Voliteµný zdroj" -#: src/main/print-pcl.c:242 +#: src/main/print-pcl.c:253 msgid "Autoselect" -msgstr "Automatický výber" +msgstr "Automatický výber" -#: src/main/print-pcl.c:256 +#: src/main/print-pcl.c:267 msgid "150x150 DPI" msgstr "150x150 DPI" -#: src/main/print-pcl.c:257 +#: src/main/print-pcl.c:268 msgid "300x300 DPI" msgstr "300x300 DPI" -#: src/main/print-pcl.c:258 +#: src/main/print-pcl.c:269 msgid "600x300 DPI" msgstr "600x300 DPI" -#: src/main/print-pcl.c:259 +#: src/main/print-pcl.c:270 msgid "600x600 DPI monochrome" msgstr "600x600 DPI monochromaticky" -#: src/main/print-pcl.c:260 +#: src/main/print-pcl.c:271 msgid "600x600 DPI" msgstr "600x600 DPI" -#: src/main/print-pcl.c:261 +#: src/main/print-pcl.c:272 msgid "1200x600 DPI" msgstr "1200x600 DPI" -#: src/main/print-pcl.c:262 +#: src/main/print-pcl.c:273 msgid "2400x600 DPI" msgstr "2400x600 DPI" -#: src/main/print-pcl.c:1470 +#: src/main/print-pcl.c:1538 msgid "Color + Black Cartridges" -msgstr "Farebná + Äierna kazeta" +msgstr "Farebná + èierna kazeta" -#: src/main/print-pcl.c:1471 +#: src/main/print-pcl.c:1539 msgid "Color + Photo Cartridges" -msgstr "Farebná + Foto kazeta" +msgstr "Farebná + Foto kazeta" -#: src/main/print-ps.c:97 +#: src/main/print-ps.c:68 #, fuzzy msgid "PPDFile" -msgstr "PPD súbor:" +msgstr "PPD súbor:" -#: src/main/print-ps.c:98 src/gutenprintui/panel.c:1768 -#: src/gutenprintui2/panel.c:1768 +#: src/main/print-ps.c:69 src/gutenprintui2/panel.c:1943 #, fuzzy msgid "PPD File" -msgstr "PPD súbor?" +msgstr "PPD súbor?" + +#: src/main/print-ps.c:74 +#, fuzzy +msgid "Model Name" +msgstr "Storno" + +#: src/main/print-ps.c:75 +msgid "PPD File Model Name" +msgstr "" #: src/main/print-raw.c:223 msgid "Image dimensions must match paper dimensions" @@ -1750,304 +1912,310 @@ msgstr "" #: src/main/escp2-channels.c:965 src/main/escp2-channels.c:978 #, fuzzy msgid "Two Level Grayscale" -msgstr "V odtieňoch Å¡edej" +msgstr "V odtieòoch ¹edej" #: src/main/escp2-channels.c:1000 src/main/escp2-channels.c:1013 #, fuzzy msgid "Three Level Grayscale" -msgstr "V odtieňoch Å¡edej" +msgstr "V odtieòoch ¹edej" #: src/main/escp2-channels.c:1035 src/main/escp2-channels.c:1048 #: src/main/escp2-channels.c:1061 src/main/escp2-channels.c:1074 #: src/main/escp2-channels.c:1087 src/main/escp2-channels.c:1100 -#: src/main/escp2-channels.c:2505 src/main/escp2-channels.c:2528 -#: src/main/escp2-channels.c:2548 src/main/escp2-channels.c:2568 -#: src/main/escp2-channels.c:2588 src/main/escp2-channels.c:2608 +#: src/main/escp2-channels.c:2525 src/main/escp2-channels.c:2548 +#: src/main/escp2-channels.c:2568 src/main/escp2-channels.c:2588 +#: src/main/escp2-channels.c:2608 src/main/escp2-channels.c:2628 msgid "Quadtone" msgstr "" -#: src/main/escp2-channels.c:1604 src/main/escp2-channels.c:1618 +#: src/main/escp2-channels.c:1466 +#, fuzzy +msgid "Four Color Photo" +msgstr "Fotografický ¹es»farebný" + +#: src/main/escp2-channels.c:1618 src/main/escp2-channels.c:1632 msgid "Six Color Enhanced Composite" -msgstr "Kompozitný rozšírený Å¡esÅ¥farebný" +msgstr "Kompozitný roz¹írený ¹es»farebný" -#: src/main/escp2-channels.c:1641 src/main/escp2-channels.c:1655 -#: src/main/escp2-channels.c:1669 src/main/escp2-channels.c:1705 +#: src/main/escp2-channels.c:1655 src/main/escp2-channels.c:1669 +#: src/main/escp2-channels.c:1683 src/main/escp2-channels.c:1719 #, fuzzy msgid "Seven Color Photo" -msgstr "Fotografický Å¡esÅ¥farebný" +msgstr "Fotografický ¹es»farebný" -#: src/main/escp2-channels.c:1691 +#: src/main/escp2-channels.c:1705 msgid "Seven Color Enhanced" -msgstr "Rozšírený sedemfarebný" +msgstr "Roz¹írený sedemfarebný" -#: src/main/escp2-channels.c:1728 +#: src/main/escp2-channels.c:1742 #, fuzzy msgid "Eight Color Photo" -msgstr "Fotografický Å¡esÅ¥farebný" +msgstr "Fotografický ¹es»farebný" -#: src/main/escp2-channels.c:1876 src/main/escp2-channels.c:1888 -#: src/main/escp2-channels.c:1894 +#: src/main/escp2-channels.c:1890 src/main/escp2-channels.c:1902 +#: src/main/escp2-channels.c:1908 #, fuzzy msgid "One Color Raw" -msgstr "Fotografický Å¡esÅ¥farebný" +msgstr "Fotografický ¹es»farebný" -#: src/main/escp2-channels.c:1900 +#: src/main/escp2-channels.c:1914 #, fuzzy msgid "One Color Raw Enhanced Gloss" -msgstr "Rozšírený sedemfarebný" +msgstr "Roz¹írený sedemfarebný" -#: src/main/escp2-channels.c:1913 src/main/escp2-channels.c:1925 +#: src/main/escp2-channels.c:1927 src/main/escp2-channels.c:1939 #, fuzzy msgid "Two Color Raw" -msgstr "Å tandardný Å¡tvorfarebný" +msgstr "©tandardný ¹tvorfarebný" -#: src/main/escp2-channels.c:1939 src/main/escp2-channels.c:1953 -#: src/main/escp2-channels.c:1980 src/main/escp2-channels.c:1993 -#: src/main/escp2-channels.c:2006 src/main/escp2-channels.c:2019 -#: src/main/escp2-channels.c:2033 src/main/escp2-channels.c:2047 -#: src/main/escp2-channels.c:2060 +#: src/main/escp2-channels.c:1953 src/main/escp2-channels.c:1967 +#: src/main/escp2-channels.c:1994 src/main/escp2-channels.c:2007 +#: src/main/escp2-channels.c:2020 src/main/escp2-channels.c:2033 +#: src/main/escp2-channels.c:2047 src/main/escp2-channels.c:2061 +#: src/main/escp2-channels.c:2074 #, fuzzy msgid "Three Color Raw" -msgstr "Kompozitný trojfarebný" +msgstr "Kompozitný trojfarebný" -#: src/main/escp2-channels.c:1967 +#: src/main/escp2-channels.c:1981 #, fuzzy msgid "Three Color Raw Gloss" -msgstr "Kompozitný trojfarebný" +msgstr "Kompozitný trojfarebný" -#: src/main/escp2-channels.c:2067 src/main/escp2-channels.c:2073 -#: src/main/escp2-channels.c:2079 src/main/escp2-channels.c:2085 -#: src/main/escp2-channels.c:2091 src/main/escp2-channels.c:2097 -#: src/main/escp2-channels.c:2103 src/main/escp2-channels.c:2109 -#: src/main/escp2-channels.c:2115 src/main/escp2-channels.c:2121 +#: src/main/escp2-channels.c:2081 src/main/escp2-channels.c:2087 +#: src/main/escp2-channels.c:2093 src/main/escp2-channels.c:2099 +#: src/main/escp2-channels.c:2105 src/main/escp2-channels.c:2111 +#: src/main/escp2-channels.c:2117 src/main/escp2-channels.c:2123 +#: src/main/escp2-channels.c:2129 src/main/escp2-channels.c:2135 +#: src/main/escp2-channels.c:2141 #, fuzzy msgid "Four Color Raw" -msgstr "Å tandardný Å¡tvorfarebný" +msgstr "©tandardný ¹tvorfarebný" -#: src/main/escp2-channels.c:2127 +#: src/main/escp2-channels.c:2147 #, fuzzy msgid "Four Color Raw Gloss" -msgstr "Å tandardný Å¡tvorfarebný" +msgstr "©tandardný ¹tvorfarebný" -#: src/main/escp2-channels.c:2142 src/main/escp2-channels.c:2156 +#: src/main/escp2-channels.c:2162 src/main/escp2-channels.c:2176 #, fuzzy msgid "Five Color Raw" -msgstr "Fotografický Å¡esÅ¥farebný" +msgstr "Fotografický ¹es»farebný" -#: src/main/escp2-channels.c:2170 src/main/escp2-channels.c:2186 -#: src/main/escp2-channels.c:2192 src/main/escp2-channels.c:2198 -#: src/main/escp2-channels.c:2213 src/main/escp2-channels.c:2234 +#: src/main/escp2-channels.c:2190 src/main/escp2-channels.c:2206 +#: src/main/escp2-channels.c:2212 src/main/escp2-channels.c:2218 +#: src/main/escp2-channels.c:2233 src/main/escp2-channels.c:2254 #, fuzzy msgid "Six Color Raw" -msgstr "Fotografický Å¡esÅ¥farebný" +msgstr "Fotografický ¹es»farebný" -#: src/main/escp2-channels.c:2219 +#: src/main/escp2-channels.c:2239 #, fuzzy msgid "Six Color Enhanced Gloss Raw" -msgstr "Kompozitný rozšírený Å¡esÅ¥farebný" +msgstr "Kompozitný roz¹írený ¹es»farebný" -#: src/main/escp2-channels.c:2250 src/main/escp2-channels.c:2265 -#: src/main/escp2-channels.c:2280 +#: src/main/escp2-channels.c:2270 src/main/escp2-channels.c:2285 +#: src/main/escp2-channels.c:2300 #, fuzzy msgid "Seven Color Raw" -msgstr "Fotografický Å¡esÅ¥farebný" +msgstr "Fotografický ¹es»farebný" -#: src/main/escp2-channels.c:2297 +#: src/main/escp2-channels.c:2317 #, fuzzy msgid "Seven Color Enhanced Gloss Raw" -msgstr "Rozšírený sedemfarebný" +msgstr "Roz¹írený sedemfarebný" -#: src/main/escp2-channels.c:2315 +#: src/main/escp2-channels.c:2335 #, fuzzy msgid "Eight Color Raw" -msgstr "Fotografický Å¡esÅ¥farebný" - -#: src/main/escp2-channels.c:2482 src/main/escp2-channels.c:2495 -#: src/main/escp2-channels.c:2497 src/main/escp2-channels.c:2517 -#: src/main/escp2-channels.c:2520 src/main/escp2-channels.c:2540 -#: src/main/escp2-channels.c:2560 src/main/escp2-channels.c:2580 -#: src/main/escp2-channels.c:2600 src/main/escp2-channels.c:2620 -#: src/main/escp2-channels.c:2636 src/main/escp2-channels.c:2638 -#: src/main/escp2-channels.c:2640 src/main/escp2-channels.c:2642 -#: src/main/escp2-channels.c:2658 src/main/escp2-channels.c:2674 -#: src/main/escp2-channels.c:2694 +msgstr "Fotografický ¹es»farebný" + +#: src/main/escp2-channels.c:2502 src/main/escp2-channels.c:2515 +#: src/main/escp2-channels.c:2517 src/main/escp2-channels.c:2537 +#: src/main/escp2-channels.c:2540 src/main/escp2-channels.c:2560 +#: src/main/escp2-channels.c:2580 src/main/escp2-channels.c:2600 +#: src/main/escp2-channels.c:2620 src/main/escp2-channels.c:2640 +#: src/main/escp2-channels.c:2656 src/main/escp2-channels.c:2658 +#: src/main/escp2-channels.c:2660 src/main/escp2-channels.c:2662 +#: src/main/escp2-channels.c:2678 src/main/escp2-channels.c:2694 +#: src/main/escp2-channels.c:2714 msgid "EPSON Standard Inks" msgstr "" -#: src/main/escp2-channels.c:2714 src/main/escp2-channels.c:2739 +#: src/main/escp2-channels.c:2734 src/main/escp2-channels.c:2759 #, fuzzy msgid "UltraChrome Photo Black" -msgstr "Fotografický Å¡esÅ¥farebný" +msgstr "Fotografický ¹es»farebný" -#: src/main/escp2-channels.c:2718 src/main/escp2-channels.c:2743 +#: src/main/escp2-channels.c:2738 src/main/escp2-channels.c:2763 msgid "UltraChrome Matte Black" msgstr "" -#: src/main/escp2-channels.c:2758 src/main/escp2-channels.c:2796 -#: src/main/escp2-channels.c:3167 src/escputil/escputil.c:976 +#: src/main/escp2-channels.c:2778 src/main/escp2-channels.c:2816 +#: src/main/escp2-channels.c:3206 src/escputil/escputil.c:976 #, fuzzy msgid "Photo Black" -msgstr "Fotografický papier" +msgstr "Fotografický papier" -#: src/main/escp2-channels.c:2762 src/main/escp2-channels.c:2778 -#: src/main/escp2-channels.c:3166 src/escputil/escputil.c:986 +#: src/main/escp2-channels.c:2782 src/main/escp2-channels.c:2798 +#: src/main/escp2-channels.c:3205 src/escputil/escputil.c:986 #, fuzzy msgid "Matte Black" -msgstr "Matný papier" +msgstr "Matný papier" -#: src/main/escp2-channels.c:3092 src/main/escp2-channels.c:3102 -#: src/main/escp2-channels.c:3114 src/main/escp2-channels.c:3128 -#: src/main/escp2-channels.c:3141 src/main/escp2-channels.c:3154 -#: src/main/escp2-channels.c:3191 src/escputil/escputil.c:981 +#: src/main/escp2-channels.c:3131 src/main/escp2-channels.c:3141 +#: src/main/escp2-channels.c:3153 src/main/escp2-channels.c:3167 +#: src/main/escp2-channels.c:3180 src/main/escp2-channels.c:3193 +#: src/main/escp2-channels.c:3240 src/escputil/escputil.c:981 #: src/escputil/escputil.c:1204 #, fuzzy msgid "Light Cyan" -msgstr "Jasná azúrová" +msgstr "Jasná azúrová" -#: src/main/escp2-channels.c:3093 src/main/escp2-channels.c:3104 -#: src/main/escp2-channels.c:3115 src/main/escp2-channels.c:3129 -#: src/main/escp2-channels.c:3142 src/main/escp2-channels.c:3155 -#: src/main/escp2-channels.c:3190 src/escputil/escputil.c:982 +#: src/main/escp2-channels.c:3132 src/main/escp2-channels.c:3143 +#: src/main/escp2-channels.c:3154 src/main/escp2-channels.c:3168 +#: src/main/escp2-channels.c:3181 src/main/escp2-channels.c:3194 +#: src/main/escp2-channels.c:3239 src/escputil/escputil.c:982 #: src/escputil/escputil.c:1205 #, fuzzy msgid "Light Magenta" -msgstr "Jasná purpurová" +msgstr "Jasná purpurová" -#: src/main/escp2-channels.c:3130 src/main/escp2-channels.c:3192 +#: src/main/escp2-channels.c:3169 src/main/escp2-channels.c:3241 #: src/escputil/escputil.c:985 #, fuzzy msgid "Light Black" -msgstr "ÄŒierna" +msgstr "Èierna" -#: src/main/escp2-channels.c:3143 +#: src/main/escp2-channels.c:3182 #, fuzzy msgid "Dark Yellow" -msgstr "Žltá" +msgstr "®ltá" -#: src/main/escp2-channels.c:3170 src/escputil/escputil.c:989 +#: src/main/escp2-channels.c:3209 src/escputil/escputil.c:989 #, fuzzy msgid "Gloss Optimizer" -msgstr "Lesklý film" +msgstr "Lesklý film" -#: src/main/escp2-channels.c:3189 src/escputil/escputil.c:990 +#: src/main/escp2-channels.c:3238 src/escputil/escputil.c:990 #, fuzzy msgid "Light Light Black" -msgstr "ÄŒierna" +msgstr "Èierna" -#: src/main/escp2-papers.c:1343 src/main/escp2-papers.c:1387 -#: src/main/escp2-papers.c:1431 src/main/escp2-papers.c:1479 -#: src/main/escp2-papers.c:1527 src/main/escp2-papers.c:1571 +#: src/main/escp2-papers.c:1353 src/main/escp2-papers.c:1397 +#: src/main/escp2-papers.c:1441 src/main/escp2-papers.c:1489 +#: src/main/escp2-papers.c:1537 src/main/escp2-papers.c:1581 msgid "Plain Paper Fast Load" -msgstr "ObyÄajný papier rýchle nasadenie" +msgstr "Obyèajný papier rýchle nasadenie" -#: src/main/escp2-papers.c:1345 src/main/escp2-papers.c:1389 -#: src/main/escp2-papers.c:1433 src/main/escp2-papers.c:1481 -#: src/main/escp2-papers.c:1529 src/main/escp2-papers.c:1573 +#: src/main/escp2-papers.c:1355 src/main/escp2-papers.c:1399 +#: src/main/escp2-papers.c:1443 src/main/escp2-papers.c:1491 +#: src/main/escp2-papers.c:1539 src/main/escp2-papers.c:1583 #: src/main/xmli18n-tmp.h:5 msgid "Postcard" -msgstr "Pohľadnica" +msgstr "Pohµadnica" -#: src/main/escp2-papers.c:1353 src/main/escp2-papers.c:1397 -#: src/main/escp2-papers.c:1441 src/main/escp2-papers.c:1489 -#: src/main/escp2-papers.c:1537 src/main/escp2-papers.c:1581 +#: src/main/escp2-papers.c:1363 src/main/escp2-papers.c:1407 +#: src/main/escp2-papers.c:1451 src/main/escp2-papers.c:1499 +#: src/main/escp2-papers.c:1547 src/main/escp2-papers.c:1591 msgid "Back Light Film" msgstr "" -#: src/main/escp2-papers.c:1357 src/main/escp2-papers.c:1401 -#: src/main/escp2-papers.c:1445 src/main/escp2-papers.c:1493 -#: src/main/escp2-papers.c:1541 src/main/escp2-papers.c:1585 -#, fuzzy -msgid "Matte Paper Heavyweight" -msgstr "Matný papier" - #: src/main/escp2-papers.c:1367 src/main/escp2-papers.c:1411 #: src/main/escp2-papers.c:1455 src/main/escp2-papers.c:1503 #: src/main/escp2-papers.c:1551 src/main/escp2-papers.c:1595 #, fuzzy +msgid "Matte Paper Heavyweight" +msgstr "Matný papier" + +#: src/main/escp2-papers.c:1377 src/main/escp2-papers.c:1421 +#: src/main/escp2-papers.c:1465 src/main/escp2-papers.c:1513 +#: src/main/escp2-papers.c:1561 src/main/escp2-papers.c:1605 +#, fuzzy msgid "Premium Semigloss Photo Paper" -msgstr "Lesklý foto papier Premium" +msgstr "Lesklý foto papier Premium" -#: src/main/escp2-papers.c:1375 src/main/escp2-papers.c:1419 -#: src/main/escp2-papers.c:1467 src/main/escp2-papers.c:1515 -#: src/main/escp2-papers.c:1559 src/main/escp2-papers.c:1607 +#: src/main/escp2-papers.c:1385 src/main/escp2-papers.c:1429 +#: src/main/escp2-papers.c:1477 src/main/escp2-papers.c:1525 +#: src/main/escp2-papers.c:1569 src/main/escp2-papers.c:1617 #, fuzzy msgid "ColorLife Paper" -msgstr "ObyÄajný papier" +msgstr "Obyèajný papier" -#: src/main/escp2-papers.c:1459 src/main/escp2-papers.c:1507 -#: src/main/escp2-papers.c:1599 +#: src/main/escp2-papers.c:1469 src/main/escp2-papers.c:1517 +#: src/main/escp2-papers.c:1609 #, fuzzy msgid "Archival Matte Paper" -msgstr "Matný papier" +msgstr "Matný papier" -#: src/main/escp2-papers.c:1461 src/main/escp2-papers.c:1509 -#: src/main/escp2-papers.c:1601 +#: src/main/escp2-papers.c:1471 src/main/escp2-papers.c:1519 +#: src/main/escp2-papers.c:1611 msgid "Watercolor Paper - Radiant White" msgstr "" -#: src/main/escp2-papers.c:1716 src/main/escp2-papers.c:1842 -#: src/main/escp2-papers.c:1884 src/main/escp2-papers.c:1926 -#: src/main/escp2-papers.c:2001 +#: src/main/escp2-papers.c:1727 src/main/escp2-papers.c:1853 +#: src/main/escp2-papers.c:1895 src/main/escp2-papers.c:1937 +#: src/main/escp2-papers.c:2012 msgid "Roll Feed" -msgstr "KotúÄový podávaÄ" +msgstr "Kotúèový podávaè" -#: src/main/escp2-papers.c:1740 src/main/escp2-papers.c:1791 +#: src/main/escp2-papers.c:1751 src/main/escp2-papers.c:1802 msgid "Roll Feed (cut each page)" msgstr "" -#: src/main/escp2-papers.c:1749 src/main/escp2-papers.c:1800 +#: src/main/escp2-papers.c:1760 src/main/escp2-papers.c:1811 msgid "Roll Feed (do not cut)" msgstr "" -#: src/main/escp2-papers.c:1773 src/main/escp2-papers.c:1824 +#: src/main/escp2-papers.c:1784 src/main/escp2-papers.c:1835 #, fuzzy msgid "Manual Feed" -msgstr "Manuál" +msgstr "Manuál" -#: src/main/escp2-papers.c:1782 src/main/escp2-papers.c:1833 -#: src/main/escp2-papers.c:1935 src/main/escp2-papers.c:1968 +#: src/main/escp2-papers.c:1793 src/main/escp2-papers.c:1844 +#: src/main/escp2-papers.c:1946 src/main/escp2-papers.c:1979 #, fuzzy msgid "Print to CD" -msgstr "TlaÄiÅ¥ do súboru?" +msgstr "Tlaèi» do súboru?" -#: src/main/escp2-papers.c:1866 src/main/escp2-papers.c:1908 +#: src/main/escp2-papers.c:1877 src/main/escp2-papers.c:1919 #, fuzzy msgid "Manual Sheet Guide" -msgstr "Manuál" +msgstr "Manuál" -#: src/main/escp2-papers.c:1875 src/main/escp2-papers.c:1917 +#: src/main/escp2-papers.c:1886 src/main/escp2-papers.c:1928 #, fuzzy msgid "Manual Feed (Front)" -msgstr "Manuál" +msgstr "Manuál" -#: src/main/escp2-papers.c:1950 +#: src/main/escp2-papers.c:1961 #, fuzzy msgid "Rear Tray" -msgstr "Zásobník" +msgstr "Zásobník" -#: src/main/escp2-papers.c:1959 +#: src/main/escp2-papers.c:1970 msgid "Front Tray" msgstr "" -#: src/main/escp2-papers.c:1977 +#: src/main/escp2-papers.c:1988 #, fuzzy msgid "Photo Board" -msgstr "Fotografický papier" +msgstr "Fotografický papier" -#: src/main/escp2-papers.c:2016 +#: src/main/escp2-papers.c:2027 msgid "Cut Sheet Bin 1" msgstr "" -#: src/main/escp2-papers.c:2025 +#: src/main/escp2-papers.c:2036 msgid "Cut Sheet Bin 2" msgstr "" -#: src/main/escp2-papers.c:2034 +#: src/main/escp2-papers.c:2045 #, fuzzy msgid "Cut Sheet Autoselect" -msgstr "Automatický výber" +msgstr "Automatický výber" -#: src/main/escp2-papers.c:2043 +#: src/main/escp2-papers.c:2054 msgid "Manual Selection" msgstr "" @@ -2077,7 +2245,7 @@ msgstr "600x600 DPI" #: src/main/escp2-resolutions.c:68 #, fuzzy msgid "360 DPI High Quality" -msgstr "1440 x 360 DPI Vysoká kvalita" +msgstr "1440 x 360 DPI Vysoká kvalita" #: src/main/escp2-resolutions.c:71 src/main/escp2-resolutions.c:74 #: src/main/escp2-resolutions.c:77 @@ -2103,12 +2271,12 @@ msgstr "1200 DPI" #: src/main/escp2-resolutions.c:97 src/main/escp2-resolutions.c:100 #, fuzzy msgid "720 DPI High Quality" -msgstr "1200 DPI Vysoká kvalita" +msgstr "1200 DPI Vysoká kvalita" #: src/main/escp2-resolutions.c:103 #, fuzzy msgid "720 DPI Highest Quality" -msgstr "1200 DPI NajvyÅ¡Å¡ia kvalita" +msgstr "1200 DPI Najvy¹¹ia kvalita" #: src/main/escp2-resolutions.c:106 #, fuzzy @@ -2124,7 +2292,7 @@ msgstr "1440 x 720 DPI" #: src/main/escp2-resolutions.c:116 #, fuzzy msgid "1440 x 720 DPI Highest Quality" -msgstr "1440 x 360 DPI NajvyÅ¡Å¡ia kvalita" +msgstr "1440 x 360 DPI Najvy¹¹ia kvalita" #: src/main/escp2-resolutions.c:119 src/main/escp2-resolutions.c:122 #, fuzzy @@ -2139,7 +2307,7 @@ msgstr "2880 x 720 DPI" #: src/main/escp2-resolutions.c:135 #, fuzzy msgid "2880 x 720 DPI Highest Quality" -msgstr "1440 x 360 DPI NajvyÅ¡Å¡ia kvalita" +msgstr "1440 x 360 DPI Najvy¹¹ia kvalita" #: src/main/escp2-resolutions.c:139 src/main/escp2-resolutions.c:142 #: src/main/escp2-resolutions.c:145 @@ -2181,7 +2349,7 @@ msgstr "" #: src/main/escp2-resolutions.c:589 #, fuzzy msgid "Interleave" -msgstr "Názov tlaÄiarne:" +msgstr "Názov tlaèiarne:" #: src/main/escp2-resolutions.c:567 src/main/escp2-resolutions.c:578 #: src/main/escp2-resolutions.c:590 @@ -2201,7 +2369,7 @@ msgstr "" #: src/main/escp2-resolutions.c:581 src/main/escp2-resolutions.c:593 #, fuzzy msgid "Interleave 2" -msgstr "Názov tlaÄiarne:" +msgstr "Názov tlaèiarne:" #: src/main/escp2-resolutions.c:594 #, fuzzy @@ -2209,46 +2377,52 @@ msgid "Eight Pass" msgstr "Jas:" #: src/main/escp2-resolutions.c:637 src/main/escp2-resolutions.c:652 -#: src/main/generic-options.c:33 +#: src/main/escp2-resolutions.c:667 src/main/generic-options.c:33 msgid "Fast Economy" msgstr "" #: src/main/escp2-resolutions.c:638 src/main/escp2-resolutions.c:653 -#: src/main/generic-options.c:34 +#: src/main/escp2-resolutions.c:668 src/main/generic-options.c:34 msgid "Economy" msgstr "" #: src/main/escp2-resolutions.c:639 src/main/escp2-resolutions.c:654 -#: src/main/escp2-resolutions.c:667 src/main/generic-options.c:35 +#: src/main/escp2-resolutions.c:669 src/main/escp2-resolutions.c:682 +#: src/main/generic-options.c:35 msgid "Draft" msgstr "" #: src/main/escp2-resolutions.c:641 src/main/escp2-resolutions.c:656 -#: src/main/escp2-resolutions.c:670 src/main/generic-options.c:37 +#: src/main/escp2-resolutions.c:671 src/main/escp2-resolutions.c:685 +#: src/main/generic-options.c:37 #, fuzzy msgid "High" -msgstr "Výška:" +msgstr "Vý¹ka:" #: src/main/escp2-resolutions.c:642 src/main/escp2-resolutions.c:657 -#: src/main/escp2-resolutions.c:669 src/main/generic-options.c:38 +#: src/main/escp2-resolutions.c:672 src/main/escp2-resolutions.c:684 +#: src/main/generic-options.c:38 #, fuzzy msgid "Photo" msgstr "Fotografia" #: src/main/escp2-resolutions.c:643 src/main/escp2-resolutions.c:658 -#: src/main/escp2-resolutions.c:671 src/main/generic-options.c:39 +#: src/main/escp2-resolutions.c:673 src/main/escp2-resolutions.c:686 +#: src/main/generic-options.c:39 #, fuzzy msgid "Super Photo" msgstr "Stylus Photo" #: src/main/escp2-resolutions.c:644 src/main/escp2-resolutions.c:659 -#: src/main/escp2-resolutions.c:672 src/main/generic-options.c:40 +#: src/main/escp2-resolutions.c:674 src/main/escp2-resolutions.c:687 +#: src/main/generic-options.c:40 #, fuzzy msgid "Ultra Photo" -msgstr "Fotografický Å¡esÅ¥farebný" +msgstr "Fotografický ¹es»farebný" #: src/main/escp2-resolutions.c:645 src/main/escp2-resolutions.c:660 -#: src/main/escp2-resolutions.c:673 src/main/generic-options.c:41 +#: src/main/escp2-resolutions.c:675 src/main/escp2-resolutions.c:688 +#: src/main/generic-options.c:41 msgid "Best" msgstr "" @@ -2271,12 +2445,12 @@ msgstr "Fotografia" #: src/main/generic-options.c:50 msgid "Line Art" -msgstr "ÄŒiarová grafika" +msgstr "Èiarová grafika" #: src/main/generic-options.c:55 #, fuzzy msgid "Page" -msgstr "VeľkosÅ¥" +msgstr "Veµkos»" #: src/main/generic-options.c:56 msgid "Job" @@ -2285,12 +2459,12 @@ msgstr "" #: src/main/generic-options.c:68 #, fuzzy msgid "Image Type" -msgstr "Typ obrázku:" +msgstr "Typ obrázku:" #: src/main/generic-options.c:69 #, fuzzy msgid "Type of image being printed" -msgstr "Typ atramentu tlaÄiarne" +msgstr "Typ atramentu tlaèiarne" #: src/main/generic-options.c:74 src/main/generic-options.c:80 msgid "Job Mode" @@ -2303,12 +2477,12 @@ msgstr "" #: src/main/generic-options.c:80 #, fuzzy msgid "Page Number" -msgstr "VeľkosÅ¥" +msgstr "Veµkos»" #: src/main/generic-options.c:81 #, fuzzy msgid "Page number" -msgstr "VeľkosÅ¥" +msgstr "Veµkos»" #: src/main/xmli18n-tmp.h:1 msgid "Letter" @@ -2331,4370 +2505,4624 @@ msgid "3x5" msgstr "3x5" #: src/main/xmli18n-tmp.h:10 +msgid "3 1/2 x5" +msgstr "" + +#: src/main/xmli18n-tmp.h:11 msgid "4x6" msgstr "4x6" -#: src/main/xmli18n-tmp.h:11 +#: src/main/xmli18n-tmp.h:12 #, fuzzy msgid "Epson 4x6 Photo Paper (tear-off borders)" msgstr "Epson 4x6 Foto papier" -#: src/main/xmli18n-tmp.h:12 +#: src/main/xmli18n-tmp.h:13 msgid "5x7" msgstr "5x7" -#: src/main/xmli18n-tmp.h:13 +#: src/main/xmli18n-tmp.h:14 msgid "5x8" msgstr "5x8" -#: src/main/xmli18n-tmp.h:14 +#: src/main/xmli18n-tmp.h:15 msgid "6x8" msgstr "6x8" -#: src/main/xmli18n-tmp.h:15 +#: src/main/xmli18n-tmp.h:16 msgid "8x10" msgstr "8x10" -#: src/main/xmli18n-tmp.h:17 +#: src/main/xmli18n-tmp.h:18 msgid "12x18" msgstr "12x18" -#: src/main/xmli18n-tmp.h:18 +#: src/main/xmli18n-tmp.h:19 msgid "Super B 13x19" msgstr "Super B 13x19" -#: src/main/xmli18n-tmp.h:19 +#: src/main/xmli18n-tmp.h:20 msgid "Engineering C 17x22" msgstr "" -#: src/main/xmli18n-tmp.h:20 +#: src/main/xmli18n-tmp.h:21 msgid "8x12" msgstr "8x12" -#: src/main/xmli18n-tmp.h:21 +#: src/main/xmli18n-tmp.h:22 msgid "11x14" msgstr "11x14" -#: src/main/xmli18n-tmp.h:22 +#: src/main/xmli18n-tmp.h:23 msgid "16x20" msgstr "16x20" -#: src/main/xmli18n-tmp.h:23 +#: src/main/xmli18n-tmp.h:24 msgid "16x24" msgstr "16x24" -#: src/main/xmli18n-tmp.h:24 +#: src/main/xmli18n-tmp.h:25 msgid "20x24" msgstr "20x24" -#: src/main/xmli18n-tmp.h:25 +#: src/main/xmli18n-tmp.h:26 msgid "20x30" msgstr "20x30" -#: src/main/xmli18n-tmp.h:26 +#: src/main/xmli18n-tmp.h:27 #, fuzzy msgid "22x30" msgstr "20x30" -#: src/main/xmli18n-tmp.h:27 +#: src/main/xmli18n-tmp.h:28 msgid "24x30" msgstr "24x30" -#: src/main/xmli18n-tmp.h:28 +#: src/main/xmli18n-tmp.h:29 msgid "Super A1 24x36" msgstr "" -#: src/main/xmli18n-tmp.h:29 +#: src/main/xmli18n-tmp.h:30 msgid "30x40" msgstr "30x40" -#: src/main/xmli18n-tmp.h:30 +#: src/main/xmli18n-tmp.h:31 msgid "4A" msgstr "4A" -#: src/main/xmli18n-tmp.h:31 +#: src/main/xmli18n-tmp.h:32 msgid "2A" msgstr "2A" -#: src/main/xmli18n-tmp.h:32 +#: src/main/xmli18n-tmp.h:33 #, fuzzy msgid "Super A0" msgstr "Stylus Photo" -#: src/main/xmli18n-tmp.h:33 +#: src/main/xmli18n-tmp.h:34 msgid "A0" msgstr "A0" -#: src/main/xmli18n-tmp.h:34 +#: src/main/xmli18n-tmp.h:35 msgid "A1" msgstr "A1" -#: src/main/xmli18n-tmp.h:35 +#: src/main/xmli18n-tmp.h:36 msgid "A2" msgstr "A2" -#: src/main/xmli18n-tmp.h:36 +#: src/main/xmli18n-tmp.h:37 msgid "A3" msgstr "A3" -#: src/main/xmli18n-tmp.h:37 +#: src/main/xmli18n-tmp.h:38 msgid "A4" msgstr "A4" -#: src/main/xmli18n-tmp.h:38 +#: src/main/xmli18n-tmp.h:39 msgid "A5" msgstr "A5" -#: src/main/xmli18n-tmp.h:39 +#: src/main/xmli18n-tmp.h:40 msgid "A6" msgstr "A6" -#: src/main/xmli18n-tmp.h:40 +#: src/main/xmli18n-tmp.h:41 msgid "A7" msgstr "A7" -#: src/main/xmli18n-tmp.h:41 +#: src/main/xmli18n-tmp.h:42 msgid "A8" msgstr "A8" -#: src/main/xmli18n-tmp.h:42 +#: src/main/xmli18n-tmp.h:43 msgid "A9" msgstr "A9" -#: src/main/xmli18n-tmp.h:43 +#: src/main/xmli18n-tmp.h:44 msgid "A10" msgstr "A10" -#: src/main/xmli18n-tmp.h:44 +#: src/main/xmli18n-tmp.h:45 msgid "RA0" msgstr "RA0" -#: src/main/xmli18n-tmp.h:45 +#: src/main/xmli18n-tmp.h:46 msgid "RA1" msgstr "RA1" -#: src/main/xmli18n-tmp.h:46 +#: src/main/xmli18n-tmp.h:47 msgid "RA2" msgstr "RA2" -#: src/main/xmli18n-tmp.h:47 +#: src/main/xmli18n-tmp.h:48 msgid "RA3" msgstr "RA3" -#: src/main/xmli18n-tmp.h:48 +#: src/main/xmli18n-tmp.h:49 msgid "RA4" msgstr "RA4" -#: src/main/xmli18n-tmp.h:49 +#: src/main/xmli18n-tmp.h:50 msgid "SRA0" msgstr "SRA0" -#: src/main/xmli18n-tmp.h:50 +#: src/main/xmli18n-tmp.h:51 msgid "SRA1" msgstr "SRA1" -#: src/main/xmli18n-tmp.h:51 +#: src/main/xmli18n-tmp.h:52 msgid "SRA2" msgstr "SRA2" -#: src/main/xmli18n-tmp.h:52 +#: src/main/xmli18n-tmp.h:53 msgid "SRA3" msgstr "SRA3" -#: src/main/xmli18n-tmp.h:53 +#: src/main/xmli18n-tmp.h:54 msgid "SRA4" msgstr "SRA4" -#: src/main/xmli18n-tmp.h:54 +#: src/main/xmli18n-tmp.h:55 msgid "4B ISO" msgstr "4B ISO" -#: src/main/xmli18n-tmp.h:55 +#: src/main/xmli18n-tmp.h:56 msgid "2B ISO" msgstr "2B ISO" -#: src/main/xmli18n-tmp.h:56 +#: src/main/xmli18n-tmp.h:57 msgid "B0 ISO" msgstr "B0 ISO" -#: src/main/xmli18n-tmp.h:57 +#: src/main/xmli18n-tmp.h:58 msgid "B1 ISO" msgstr "B1 ISO" -#: src/main/xmli18n-tmp.h:58 +#: src/main/xmli18n-tmp.h:59 msgid "B2 ISO" msgstr "B2 ISO" -#: src/main/xmli18n-tmp.h:59 +#: src/main/xmli18n-tmp.h:60 msgid "B3 ISO" msgstr "B3 ISO" -#: src/main/xmli18n-tmp.h:60 +#: src/main/xmli18n-tmp.h:61 msgid "B4 ISO" msgstr "B4 ISO" -#: src/main/xmli18n-tmp.h:61 +#: src/main/xmli18n-tmp.h:62 msgid "B5 ISO" msgstr "B5 ISO" -#: src/main/xmli18n-tmp.h:62 +#: src/main/xmli18n-tmp.h:63 msgid "B6 ISO" msgstr "B6 ISO" -#: src/main/xmli18n-tmp.h:63 +#: src/main/xmli18n-tmp.h:64 msgid "B7 ISO" msgstr "B7 ISO" -#: src/main/xmli18n-tmp.h:64 +#: src/main/xmli18n-tmp.h:65 msgid "B8 ISO" msgstr "B8 ISO" -#: src/main/xmli18n-tmp.h:65 +#: src/main/xmli18n-tmp.h:66 msgid "B9 ISO" msgstr "B9 ISO" -#: src/main/xmli18n-tmp.h:66 +#: src/main/xmli18n-tmp.h:67 msgid "B10 ISO" msgstr "B10 ISO" -#: src/main/xmli18n-tmp.h:67 +#: src/main/xmli18n-tmp.h:68 #, fuzzy msgid "Super B0 JIS" msgstr "B0 JIS" -#: src/main/xmli18n-tmp.h:68 +#: src/main/xmli18n-tmp.h:69 msgid "B0 JIS" msgstr "B0 JIS" -#: src/main/xmli18n-tmp.h:69 +#: src/main/xmli18n-tmp.h:70 msgid "B1 JIS" msgstr "B1 JIS" -#: src/main/xmli18n-tmp.h:70 +#: src/main/xmli18n-tmp.h:71 msgid "B2 JIS" msgstr "B2 JIS" -#: src/main/xmli18n-tmp.h:71 +#: src/main/xmli18n-tmp.h:72 msgid "B3 JIS" msgstr "B3 JIS" -#: src/main/xmli18n-tmp.h:72 +#: src/main/xmli18n-tmp.h:73 msgid "B4 JIS" msgstr "B4 JIS" -#: src/main/xmli18n-tmp.h:73 +#: src/main/xmli18n-tmp.h:74 msgid "B5 JIS" msgstr "B5 JIS" -#: src/main/xmli18n-tmp.h:74 +#: src/main/xmli18n-tmp.h:75 msgid "B6 JIS" msgstr "B6 JIS" -#: src/main/xmli18n-tmp.h:75 +#: src/main/xmli18n-tmp.h:76 msgid "B7 JIS" msgstr "B7 JIS" -#: src/main/xmli18n-tmp.h:76 +#: src/main/xmli18n-tmp.h:77 msgid "B8 JIS" msgstr "B8 JIS" -#: src/main/xmli18n-tmp.h:77 +#: src/main/xmli18n-tmp.h:78 msgid "B9 JIS" msgstr "B9 JIS" -#: src/main/xmli18n-tmp.h:78 +#: src/main/xmli18n-tmp.h:79 msgid "B10 JIS" msgstr "B10 JIS" -#: src/main/xmli18n-tmp.h:79 +#: src/main/xmli18n-tmp.h:80 msgid "C0" msgstr "C0" -#: src/main/xmli18n-tmp.h:80 +#: src/main/xmli18n-tmp.h:81 +#, fuzzy +msgid "C0 landscape" +msgstr "Na ¹írku" + +#: src/main/xmli18n-tmp.h:82 msgid "C1" msgstr "C1" -#: src/main/xmli18n-tmp.h:81 +#: src/main/xmli18n-tmp.h:83 +#, fuzzy +msgid "C1 landscape" +msgstr "Na ¹írku" + +#: src/main/xmli18n-tmp.h:84 msgid "C2" msgstr "C2" -#: src/main/xmli18n-tmp.h:82 +#: src/main/xmli18n-tmp.h:85 +#, fuzzy +msgid "C2 landscape" +msgstr "Na ¹írku" + +#: src/main/xmli18n-tmp.h:86 msgid "C3" msgstr "C3" -#: src/main/xmli18n-tmp.h:83 +#: src/main/xmli18n-tmp.h:87 +#, fuzzy +msgid "C3 landscape" +msgstr "Na ¹írku" + +#: src/main/xmli18n-tmp.h:88 msgid "C4" msgstr "C4" -#: src/main/xmli18n-tmp.h:84 +#: src/main/xmli18n-tmp.h:89 +#, fuzzy +msgid "C4 landscape" +msgstr "Na ¹írku" + +#: src/main/xmli18n-tmp.h:90 msgid "C5" msgstr "C5" -#: src/main/xmli18n-tmp.h:85 +#: src/main/xmli18n-tmp.h:91 +#, fuzzy +msgid "C5 landscape" +msgstr "Na ¹írku" + +#: src/main/xmli18n-tmp.h:92 msgid "B6-C4" msgstr "B6-C4" -#: src/main/xmli18n-tmp.h:86 +#: src/main/xmli18n-tmp.h:93 +#, fuzzy +msgid "B6-C4 landscape" +msgstr "Na ¹írku" + +#: src/main/xmli18n-tmp.h:94 msgid "C6" msgstr "C6" -#: src/main/xmli18n-tmp.h:87 +#: src/main/xmli18n-tmp.h:95 +#, fuzzy +msgid "C6 landscape" +msgstr "Na ¹írku" + +#: src/main/xmli18n-tmp.h:96 msgid "DL" msgstr "DL" -#: src/main/xmli18n-tmp.h:88 +#: src/main/xmli18n-tmp.h:97 +#, fuzzy +msgid "DL landscape" +msgstr "Na ¹írku" + +#: src/main/xmli18n-tmp.h:98 msgid "C7-6" msgstr "C7-6" -#: src/main/xmli18n-tmp.h:89 +#: src/main/xmli18n-tmp.h:99 +#, fuzzy +msgid "C7-6 landscape" +msgstr "Na ¹írku" + +#: src/main/xmli18n-tmp.h:100 msgid "C7" msgstr "C7" -#: src/main/xmli18n-tmp.h:90 +#: src/main/xmli18n-tmp.h:101 +#, fuzzy +msgid "C7 landscape" +msgstr "Na ¹írku" + +#: src/main/xmli18n-tmp.h:102 msgid "C8" msgstr "C8" -#: src/main/xmli18n-tmp.h:91 +#: src/main/xmli18n-tmp.h:103 +#, fuzzy +msgid "C8 landscape" +msgstr "Na ¹írku" + +#: src/main/xmli18n-tmp.h:104 msgid "C9" msgstr "C9" -#: src/main/xmli18n-tmp.h:92 +#: src/main/xmli18n-tmp.h:105 +#, fuzzy +msgid "C9 landscape" +msgstr "Na ¹írku" + +#: src/main/xmli18n-tmp.h:106 msgid "C10" msgstr "C10" -#: src/main/xmli18n-tmp.h:93 +#: src/main/xmli18n-tmp.h:107 +#, fuzzy +msgid "C10 landscape" +msgstr "Na ¹írku" + +#: src/main/xmli18n-tmp.h:108 msgid "ArchA" msgstr "ArchA" -#: src/main/xmli18n-tmp.h:94 +#: src/main/xmli18n-tmp.h:109 msgid "ArchA transposed" msgstr "" -#: src/main/xmli18n-tmp.h:95 +#: src/main/xmli18n-tmp.h:110 msgid "ArchB" msgstr "ArchB" -#: src/main/xmli18n-tmp.h:96 +#: src/main/xmli18n-tmp.h:111 msgid "ArchB transposed" msgstr "" -#: src/main/xmli18n-tmp.h:97 +#: src/main/xmli18n-tmp.h:112 msgid "ArchC" msgstr "ArchC" -#: src/main/xmli18n-tmp.h:98 +#: src/main/xmli18n-tmp.h:113 msgid "ArchC transposed" msgstr "" -#: src/main/xmli18n-tmp.h:99 +#: src/main/xmli18n-tmp.h:114 msgid "ArchD" msgstr "ArchD" -#: src/main/xmli18n-tmp.h:100 +#: src/main/xmli18n-tmp.h:115 msgid "ArchD transposed" msgstr "" -#: src/main/xmli18n-tmp.h:101 +#: src/main/xmli18n-tmp.h:116 msgid "ArchE" msgstr "ArchE" -#: src/main/xmli18n-tmp.h:102 +#: src/main/xmli18n-tmp.h:117 msgid "ArchE transposed" msgstr "" -#: src/main/xmli18n-tmp.h:103 +#: src/main/xmli18n-tmp.h:118 msgid "American foolscap" -msgstr "Americké rozmery" +msgstr "Americké rozmery" -#: src/main/xmli18n-tmp.h:104 +#: src/main/xmli18n-tmp.h:119 msgid "European foolscap" -msgstr "Európske rozmery" +msgstr "Európske rozmery" -#: src/main/xmli18n-tmp.h:105 +#: src/main/xmli18n-tmp.h:120 msgid "Crown Quarto" msgstr "Crown Quarto" -#: src/main/xmli18n-tmp.h:106 +#: src/main/xmli18n-tmp.h:121 msgid "Large Crown Quarto" msgstr "Large Crown Quarto" -#: src/main/xmli18n-tmp.h:107 +#: src/main/xmli18n-tmp.h:122 msgid "Demy Quarto" msgstr "Demy Quarto" -#: src/main/xmli18n-tmp.h:108 +#: src/main/xmli18n-tmp.h:123 msgid "Royal Quarto" msgstr "Royal Quarto" -#: src/main/xmli18n-tmp.h:109 +#: src/main/xmli18n-tmp.h:124 #, fuzzy msgid "ISO A4" msgstr "SRA4" -#: src/main/xmli18n-tmp.h:110 +#: src/main/xmli18n-tmp.h:125 msgid "Crown Octavo" msgstr "Crown Octavo" -#: src/main/xmli18n-tmp.h:111 +#: src/main/xmli18n-tmp.h:126 msgid "Large Crown Octavo" msgstr "Large Crown Octavo" -#: src/main/xmli18n-tmp.h:112 +#: src/main/xmli18n-tmp.h:127 msgid "Demy Octavo" msgstr "Demy Octavo" -#: src/main/xmli18n-tmp.h:113 +#: src/main/xmli18n-tmp.h:128 msgid "Royal Octavo" msgstr "Royal Octavo" -#: src/main/xmli18n-tmp.h:114 +#: src/main/xmli18n-tmp.h:129 msgid "ISO A5" msgstr "" -#: src/main/xmli18n-tmp.h:115 +#: src/main/xmli18n-tmp.h:130 msgid "Small paperback" msgstr "Small paperback" -#: src/main/xmli18n-tmp.h:116 +#: src/main/xmli18n-tmp.h:131 msgid "Penguin small paperback" msgstr "Penguin small paperback" -#: src/main/xmli18n-tmp.h:117 +#: src/main/xmli18n-tmp.h:132 msgid "Penguin large paperback" msgstr "Penguin large paperback" -#: src/main/xmli18n-tmp.h:118 +#: src/main/xmli18n-tmp.h:133 msgid "10cm x 15cm" msgstr "" -#: src/main/xmli18n-tmp.h:119 +#: src/main/xmli18n-tmp.h:134 msgid "Hagaki Card" msgstr "Hagaki karta" -#: src/main/xmli18n-tmp.h:120 +#: src/main/xmli18n-tmp.h:135 msgid "Oufuku Card" msgstr "Oufuku karta" -#: src/main/xmli18n-tmp.h:121 +#: src/main/xmli18n-tmp.h:136 msgid "Japanese long envelope #3" -msgstr "Japonská dlhá obálka #3" +msgstr "Japonská dlhá obálka #3" -#: src/main/xmli18n-tmp.h:122 +#: src/main/xmli18n-tmp.h:137 +#, fuzzy +msgid "Japanese long envelope #3 landscape" +msgstr "Japonská dlhá obálka #3" + +#: src/main/xmli18n-tmp.h:138 msgid "Japanese long envelope #4" -msgstr "Japonská dlhá obálka #4" +msgstr "Japonská dlhá obálka #4" -#: src/main/xmli18n-tmp.h:123 +#: src/main/xmli18n-tmp.h:139 +#, fuzzy +msgid "Japanese long envelope #4 landscape" +msgstr "Japonská dlhá obálka #4" + +#: src/main/xmli18n-tmp.h:140 msgid "Japanese Kaku envelope #4" -msgstr "Japonská Kaku obálka #4" +msgstr "Japonská Kaku obálka #4" -#: src/main/xmli18n-tmp.h:124 +#: src/main/xmli18n-tmp.h:141 +#, fuzzy +msgid "Japanese Kaku envelope #4 landscape" +msgstr "Japonská Kaku obálka #4" + +#: src/main/xmli18n-tmp.h:142 msgid "Commercial 10" msgstr "Commercial 10" -#: src/main/xmli18n-tmp.h:125 +#: src/main/xmli18n-tmp.h:143 +#, fuzzy +msgid "Commercial 10 landscape" +msgstr "Commercial 10" + +#: src/main/xmli18n-tmp.h:144 msgid "A2 Invitation" -msgstr "A2 pozvánka" +msgstr "A2 pozvánka" -#: src/main/xmli18n-tmp.h:126 +#: src/main/xmli18n-tmp.h:145 #, fuzzy msgid "Monarch Envelope" -msgstr "Obálka" +msgstr "Obálka" -#: src/main/xmli18n-tmp.h:127 +#: src/main/xmli18n-tmp.h:146 +#, fuzzy +msgid "Monarch Envelope landscape" +msgstr "Obálka" + +#: src/main/xmli18n-tmp.h:147 msgid "4x5 3/8" msgstr "" -#: src/main/xmli18n-tmp.h:128 +#: src/main/xmli18n-tmp.h:148 #, fuzzy msgid "4x7" msgstr "5x7" -#: src/main/xmli18n-tmp.h:129 +#: src/main/xmli18n-tmp.h:149 msgid "CP_L" msgstr "" -#: src/main/xmli18n-tmp.h:130 +#: src/main/xmli18n-tmp.h:150 msgid "Card" msgstr "" -#: src/main/xmli18n-tmp.h:131 +#: src/main/xmli18n-tmp.h:151 #, fuzzy msgid "Wide Postcard" -msgstr "Pohľadnica" +msgstr "Pohµadnica" -#: src/main/xmli18n-tmp.h:132 +#: src/main/xmli18n-tmp.h:152 msgid "Chilean Office" msgstr "" -#: src/main/xmli18n-tmp.h:133 +#: src/main/xmli18n-tmp.h:153 msgid "Chilean Double Letter" msgstr "" -#: src/main/xmli18n-tmp.h:134 +#: src/main/xmli18n-tmp.h:154 msgid "Chilean Double Office" msgstr "" -#: src/main/xmli18n-tmp.h:135 +#: src/main/xmli18n-tmp.h:155 msgid "Custom" -msgstr "Vlastný" +msgstr "Vlastný" -#: src/main/xmli18n-tmp.h:136 +#: src/main/xmli18n-tmp.h:156 msgid "89 mm Roll Paper" msgstr "89 mm rolka papiera" -#: src/main/xmli18n-tmp.h:137 +#: src/main/xmli18n-tmp.h:157 msgid "4 Inch Roll Paper" -msgstr "4 palcová rolka papiera" +msgstr "4 palcová rolka papiera" -#: src/main/xmli18n-tmp.h:138 +#: src/main/xmli18n-tmp.h:158 msgid "5 Inch Roll Paper" -msgstr "5 palcová rolka papiera" +msgstr "5 palcová rolka papiera" -#: src/main/xmli18n-tmp.h:139 +#: src/main/xmli18n-tmp.h:159 msgid "210 mm Roll Paper" msgstr "210 mm rolka papiera" -#: src/main/xmli18n-tmp.h:140 +#: src/main/xmli18n-tmp.h:160 msgid "13 Inch Roll Paper" -msgstr "13 palcová rolka papiera" +msgstr "13 palcová rolka papiera" -#: src/main/xmli18n-tmp.h:141 +#: src/main/xmli18n-tmp.h:161 msgid "22 Inch Roll Paper" -msgstr "22 palcová rolka papiera" +msgstr "22 palcová rolka papiera" -#: src/main/xmli18n-tmp.h:142 +#: src/main/xmli18n-tmp.h:162 msgid "24 Inch Roll Paper" -msgstr "24 palcová rolka papiera" +msgstr "24 palcová rolka papiera" -#: src/main/xmli18n-tmp.h:143 +#: src/main/xmli18n-tmp.h:163 msgid "36 Inch Roll Paper" -msgstr "36 palcová rolka papiera" +msgstr "36 palcová rolka papiera" -#: src/main/xmli18n-tmp.h:144 +#: src/main/xmli18n-tmp.h:164 msgid "44 Inch Roll Paper" -msgstr "44 palcová rolka papiera" +msgstr "44 palcová rolka papiera" -#: src/main/xmli18n-tmp.h:145 +#: src/main/xmli18n-tmp.h:165 msgid "PostScript Level 1" msgstr "" -#: src/main/xmli18n-tmp.h:146 +#: src/main/xmli18n-tmp.h:166 msgid "PostScript Level 2" msgstr "" -#: src/main/xmli18n-tmp.h:147 +#: src/main/xmli18n-tmp.h:167 msgid "Canon BJ-30" msgstr "" -#: src/main/xmli18n-tmp.h:148 +#: src/main/xmli18n-tmp.h:168 msgid "Canon BJC-50" msgstr "" -#: src/main/xmli18n-tmp.h:149 +#: src/main/xmli18n-tmp.h:169 msgid "Canon BJC-55" msgstr "" -#: src/main/xmli18n-tmp.h:150 +#: src/main/xmli18n-tmp.h:170 msgid "Canon BJC-80" msgstr "" -#: src/main/xmli18n-tmp.h:151 +#: src/main/xmli18n-tmp.h:171 msgid "Canon BJC-85" msgstr "" -#: src/main/xmli18n-tmp.h:152 +#: src/main/xmli18n-tmp.h:172 msgid "Canon BJC-210" msgstr "" -#: src/main/xmli18n-tmp.h:153 +#: src/main/xmli18n-tmp.h:173 msgid "Canon BJC-240" msgstr "" -#: src/main/xmli18n-tmp.h:154 +#: src/main/xmli18n-tmp.h:174 msgid "Canon BJC-250" msgstr "" -#: src/main/xmli18n-tmp.h:155 +#: src/main/xmli18n-tmp.h:175 msgid "Canon BJC-1000" msgstr "" -#: src/main/xmli18n-tmp.h:156 +#: src/main/xmli18n-tmp.h:176 msgid "Canon BJC-2000" msgstr "" -#: src/main/xmli18n-tmp.h:157 +#: src/main/xmli18n-tmp.h:177 msgid "Canon BJC-2010" msgstr "" -#: src/main/xmli18n-tmp.h:158 +#: src/main/xmli18n-tmp.h:178 msgid "Canon BJC-2100" msgstr "" -#: src/main/xmli18n-tmp.h:159 +#: src/main/xmli18n-tmp.h:179 msgid "Canon BJC-2110" msgstr "" -#: src/main/xmli18n-tmp.h:160 +#: src/main/xmli18n-tmp.h:180 msgid "Canon BJC-3000" msgstr "" -#: src/main/xmli18n-tmp.h:161 +#: src/main/xmli18n-tmp.h:181 msgid "Canon BJC-4000" msgstr "" -#: src/main/xmli18n-tmp.h:162 +#: src/main/xmli18n-tmp.h:182 msgid "Canon BJC-4300" msgstr "" -#: src/main/xmli18n-tmp.h:163 +#: src/main/xmli18n-tmp.h:183 msgid "Canon BJC-4400" msgstr "" -#: src/main/xmli18n-tmp.h:164 +#: src/main/xmli18n-tmp.h:184 msgid "Canon BJC-5100" msgstr "" -#: src/main/xmli18n-tmp.h:165 +#: src/main/xmli18n-tmp.h:185 msgid "Canon BJC-5500" msgstr "" -#: src/main/xmli18n-tmp.h:166 +#: src/main/xmli18n-tmp.h:186 msgid "Canon BJC-6000" msgstr "" -#: src/main/xmli18n-tmp.h:167 +#: src/main/xmli18n-tmp.h:187 msgid "Canon BJC-6100" msgstr "" -#: src/main/xmli18n-tmp.h:168 +#: src/main/xmli18n-tmp.h:188 msgid "Canon BJC-6200" msgstr "" -#: src/main/xmli18n-tmp.h:169 +#: src/main/xmli18n-tmp.h:189 msgid "Canon BJC-6500" msgstr "" -#: src/main/xmli18n-tmp.h:170 +#: src/main/xmli18n-tmp.h:190 msgid "Canon BJC-7000" msgstr "" -#: src/main/xmli18n-tmp.h:171 +#: src/main/xmli18n-tmp.h:191 msgid "Canon BJC-7100" msgstr "" -#: src/main/xmli18n-tmp.h:172 +#: src/main/xmli18n-tmp.h:192 msgid "Canon BJC-8200" msgstr "" -#: src/main/xmli18n-tmp.h:173 +#: src/main/xmli18n-tmp.h:193 msgid "Canon BJC-8500" msgstr "" -#: src/main/xmli18n-tmp.h:174 +#: src/main/xmli18n-tmp.h:194 msgid "Canon S100" msgstr "" -#: src/main/xmli18n-tmp.h:175 +#: src/main/xmli18n-tmp.h:195 msgid "Canon S200" msgstr "" -#: src/main/xmli18n-tmp.h:176 +#: src/main/xmli18n-tmp.h:196 msgid "Canon S300" msgstr "" -#: src/main/xmli18n-tmp.h:177 +#: src/main/xmli18n-tmp.h:197 msgid "Canon S400" msgstr "" -#: src/main/xmli18n-tmp.h:178 +#: src/main/xmli18n-tmp.h:198 msgid "Canon S450" msgstr "" -#: src/main/xmli18n-tmp.h:179 +#: src/main/xmli18n-tmp.h:199 msgid "Canon S500" msgstr "" -#: src/main/xmli18n-tmp.h:180 +#: src/main/xmli18n-tmp.h:200 msgid "Canon S600" msgstr "" -#: src/main/xmli18n-tmp.h:181 +#: src/main/xmli18n-tmp.h:201 msgid "Canon S630" msgstr "" -#: src/main/xmli18n-tmp.h:182 +#: src/main/xmli18n-tmp.h:202 msgid "Canon S800" msgstr "" -#: src/main/xmli18n-tmp.h:183 +#: src/main/xmli18n-tmp.h:203 msgid "Canon S4500" msgstr "" -#: src/main/xmli18n-tmp.h:184 +#: src/main/xmli18n-tmp.h:204 msgid "Canon PIXMA iP2000" msgstr "" -#: src/main/xmli18n-tmp.h:185 +#: src/main/xmli18n-tmp.h:205 msgid "Canon PIXMA iP3000" msgstr "" -#: src/main/xmli18n-tmp.h:186 +#: src/main/xmli18n-tmp.h:206 msgid "Canon PIXMA iP3100" msgstr "" -#: src/main/xmli18n-tmp.h:187 +#: src/main/xmli18n-tmp.h:207 msgid "Canon PIXMA iP4000" msgstr "" -#: src/main/xmli18n-tmp.h:188 +#: src/main/xmli18n-tmp.h:208 msgid "Canon PIXMA iP4100" msgstr "" -#: src/main/xmli18n-tmp.h:189 +#: src/main/xmli18n-tmp.h:209 msgid "Canon PIXMA iP4200" msgstr "" -#: src/main/xmli18n-tmp.h:190 -#, fuzzy +#: src/main/xmli18n-tmp.h:210 msgid "Canon PIXMA iP4300" -msgstr "Stylus C60" +msgstr "" -#: src/main/xmli18n-tmp.h:191 -#, fuzzy +#: src/main/xmli18n-tmp.h:211 msgid "Canon PIXMA iP4500" -msgstr "Stylus C60" +msgstr "" -#: src/main/xmli18n-tmp.h:192 -#, fuzzy +#: src/main/xmli18n-tmp.h:212 msgid "Canon PIXMA iP5000" -msgstr "Stylus C60" +msgstr "" -#: src/main/xmli18n-tmp.h:193 +#: src/main/xmli18n-tmp.h:213 msgid "Canon PIXMA iP5200" msgstr "" -#: src/main/xmli18n-tmp.h:194 -#, fuzzy +#: src/main/xmli18n-tmp.h:214 msgid "Canon PIXMA iP5300" -msgstr "Stylus C60" +msgstr "" -#: src/main/xmli18n-tmp.h:195 -#, fuzzy +#: src/main/xmli18n-tmp.h:215 +msgid "Canon PIXMA iP6000D" +msgstr "" + +#: src/main/xmli18n-tmp.h:216 msgid "Canon PIXMA iP6700" -msgstr "Stylus C60" +msgstr "" -#: src/main/xmli18n-tmp.h:196 -#, fuzzy +#: src/main/xmli18n-tmp.h:217 msgid "Canon PIXMA iP8500" -msgstr "Stylus C60" +msgstr "" -#: src/main/xmli18n-tmp.h:197 -#, fuzzy +#: src/main/xmli18n-tmp.h:218 msgid "Canon PIXMA iX5000" -msgstr "Stylus C60" +msgstr "" -#: src/main/xmli18n-tmp.h:198 -#, fuzzy +#: src/main/xmli18n-tmp.h:219 msgid "Canon PIXMA Pro9500" -msgstr "Stylus C60" +msgstr "" -#: src/main/xmli18n-tmp.h:199 -#, fuzzy +#: src/main/xmli18n-tmp.h:220 msgid "Canon PIXMA MP150" -msgstr "Stylus C60" +msgstr "" -#: src/main/xmli18n-tmp.h:200 -#, fuzzy +#: src/main/xmli18n-tmp.h:221 msgid "Canon PIXMA MP170" -msgstr "Stylus C60" +msgstr "" -#: src/main/xmli18n-tmp.h:201 -#, fuzzy +#: src/main/xmli18n-tmp.h:222 msgid "Canon PIXMA MP180" -msgstr "Stylus C60" +msgstr "" -#: src/main/xmli18n-tmp.h:202 -#, fuzzy +#: src/main/xmli18n-tmp.h:223 msgid "Canon PIXMA MP500" -msgstr "Stylus C60" +msgstr "" -#: src/main/xmli18n-tmp.h:203 -#, fuzzy +#: src/main/xmli18n-tmp.h:224 +msgid "Canon PIXMA MP520" +msgstr "" + +#: src/main/xmli18n-tmp.h:225 msgid "Canon PIXMA MP610" -msgstr "Stylus C60" +msgstr "" -#: src/main/xmli18n-tmp.h:204 -#, fuzzy +#: src/main/xmli18n-tmp.h:226 msgid "Canon PIXMA MP700" -msgstr "Stylus C60" +msgstr "" -#: src/main/xmli18n-tmp.h:205 -#, fuzzy +#: src/main/xmli18n-tmp.h:227 msgid "Canon PIXMA MP710" -msgstr "Stylus C60" +msgstr "" -#: src/main/xmli18n-tmp.h:206 -#, fuzzy +#: src/main/xmli18n-tmp.h:228 msgid "Canon PIXMA MP730" -msgstr "Stylus C60" +msgstr "" -#: src/main/xmli18n-tmp.h:207 -#, fuzzy +#: src/main/xmli18n-tmp.h:229 msgid "Canon PIXMA MP740" -msgstr "Stylus C60" +msgstr "" -#: src/main/xmli18n-tmp.h:208 -#, fuzzy +#: src/main/xmli18n-tmp.h:230 msgid "Canon PIXMA MP750" -msgstr "Stylus C60" +msgstr "" -#: src/main/xmli18n-tmp.h:209 -#, fuzzy +#: src/main/xmli18n-tmp.h:231 msgid "Canon PIXMA MP760" -msgstr "Stylus C60" +msgstr "" -#: src/main/xmli18n-tmp.h:210 -#, fuzzy +#: src/main/xmli18n-tmp.h:232 msgid "Canon PIXMA MP770" -msgstr "Stylus C60" +msgstr "" -#: src/main/xmli18n-tmp.h:211 -#, fuzzy +#: src/main/xmli18n-tmp.h:233 msgid "Canon PIXMA MP780" -msgstr "Stylus C60" +msgstr "" -#: src/main/xmli18n-tmp.h:212 -#, fuzzy +#: src/main/xmli18n-tmp.h:234 msgid "Canon PIXMA MP790" -msgstr "Stylus C60" +msgstr "" -#: src/main/xmli18n-tmp.h:213 -#, fuzzy +#: src/main/xmli18n-tmp.h:235 msgid "Canon PIXMA MP830" -msgstr "Stylus C60" +msgstr "" -#: src/main/xmli18n-tmp.h:214 +#: src/main/xmli18n-tmp.h:236 msgid "Canon PIXUS iP3100" msgstr "" -#: src/main/xmli18n-tmp.h:215 +#: src/main/xmli18n-tmp.h:237 msgid "Canon PIXUS iP4100" msgstr "" -#: src/main/xmli18n-tmp.h:216 -#, fuzzy +#: src/main/xmli18n-tmp.h:238 msgid "Canon i80" -msgstr "Stylus C60" +msgstr "" -#: src/main/xmli18n-tmp.h:217 +#: src/main/xmli18n-tmp.h:239 msgid "Canon i560" msgstr "" -#: src/main/xmli18n-tmp.h:218 +#: src/main/xmli18n-tmp.h:240 msgid "Canon i850" msgstr "" -#: src/main/xmli18n-tmp.h:219 +#: src/main/xmli18n-tmp.h:241 msgid "Canon i860" msgstr "" -#: src/main/xmli18n-tmp.h:220 +#: src/main/xmli18n-tmp.h:242 msgid "Canon i865" msgstr "" -#: src/main/xmli18n-tmp.h:221 +#: src/main/xmli18n-tmp.h:243 #, fuzzy msgid "Epson Stylus C20" -msgstr "Stylus C20ux" +msgstr "Stylus C20sx" -#: src/main/xmli18n-tmp.h:222 +#: src/main/xmli18n-tmp.h:244 #, fuzzy msgid "Epson Stylus C20SX" msgstr "Stylus C20ux" -#: src/main/xmli18n-tmp.h:223 +#: src/main/xmli18n-tmp.h:245 #, fuzzy msgid "Epson Stylus C20UX" msgstr "Stylus C20ux" -#: src/main/xmli18n-tmp.h:224 +#: src/main/xmli18n-tmp.h:246 #, fuzzy msgid "Epson Stylus C40" -msgstr "Stylus C40ux" +msgstr "Stylus C40sx" -#: src/main/xmli18n-tmp.h:225 +#: src/main/xmli18n-tmp.h:247 #, fuzzy msgid "Epson Stylus C40SX" msgstr "Stylus C40ux" -#: src/main/xmli18n-tmp.h:226 +#: src/main/xmli18n-tmp.h:248 #, fuzzy msgid "Epson Stylus C40UX" msgstr "Stylus C40ux" -#: src/main/xmli18n-tmp.h:227 +#: src/main/xmli18n-tmp.h:249 #, fuzzy msgid "Epson Stylus C41" -msgstr "Stylus C40ux" +msgstr "Stylus C40sx" -#: src/main/xmli18n-tmp.h:228 +#: src/main/xmli18n-tmp.h:250 #, fuzzy msgid "Epson Stylus C41SX" msgstr "Stylus C40ux" -#: src/main/xmli18n-tmp.h:229 +#: src/main/xmli18n-tmp.h:251 #, fuzzy msgid "Epson Stylus C41UX" msgstr "Stylus C40ux" -#: src/main/xmli18n-tmp.h:230 +#: src/main/xmli18n-tmp.h:252 #, fuzzy msgid "Epson Stylus C42" -msgstr "Stylus C40ux" +msgstr "Stylus C40sx" -#: src/main/xmli18n-tmp.h:231 +#: src/main/xmli18n-tmp.h:253 #, fuzzy msgid "Epson Stylus C42SX" msgstr "Stylus C40ux" -#: src/main/xmli18n-tmp.h:232 +#: src/main/xmli18n-tmp.h:254 #, fuzzy msgid "Epson Stylus C42UX" msgstr "Stylus C40ux" -#: src/main/xmli18n-tmp.h:233 +#: src/main/xmli18n-tmp.h:255 #, fuzzy msgid "Epson Stylus C43" msgstr "Stylus C40ux" -#: src/main/xmli18n-tmp.h:234 +#: src/main/xmli18n-tmp.h:256 #, fuzzy msgid "Epson Stylus C43SX" msgstr "Stylus C40ux" -#: src/main/xmli18n-tmp.h:235 +#: src/main/xmli18n-tmp.h:257 #, fuzzy msgid "Epson Stylus C43UX" msgstr "Stylus C40ux" -#: src/main/xmli18n-tmp.h:236 +#: src/main/xmli18n-tmp.h:258 #, fuzzy msgid "Epson Stylus C44" msgstr "Stylus C40ux" -#: src/main/xmli18n-tmp.h:237 +#: src/main/xmli18n-tmp.h:259 #, fuzzy msgid "Epson Stylus C44SX" msgstr "Stylus C40ux" -#: src/main/xmli18n-tmp.h:238 +#: src/main/xmli18n-tmp.h:260 #, fuzzy msgid "Epson Stylus C44UX" msgstr "Stylus C40ux" -#: src/main/xmli18n-tmp.h:239 +#: src/main/xmli18n-tmp.h:261 #, fuzzy msgid "Epson Stylus C45" msgstr "Stylus C60" -#: src/main/xmli18n-tmp.h:240 +#: src/main/xmli18n-tmp.h:262 #, fuzzy msgid "Epson Stylus C46" msgstr "Stylus C60" -#: src/main/xmli18n-tmp.h:241 +#: src/main/xmli18n-tmp.h:263 #, fuzzy msgid "Epson Stylus C48" -msgstr "Stylus C60" +msgstr "Stylus C80" -#: src/main/xmli18n-tmp.h:242 +#: src/main/xmli18n-tmp.h:264 #, fuzzy msgid "Epson Stylus C50" msgstr "Stylus C60" -#: src/main/xmli18n-tmp.h:243 +#: src/main/xmli18n-tmp.h:265 #, fuzzy msgid "Epson Stylus C60" msgstr "Stylus C60" -#: src/main/xmli18n-tmp.h:244 +#: src/main/xmli18n-tmp.h:266 #, fuzzy msgid "Epson Stylus C61" msgstr "Stylus C60" -#: src/main/xmli18n-tmp.h:245 +#: src/main/xmli18n-tmp.h:267 #, fuzzy msgid "Epson Stylus C62" msgstr "Stylus C60" -#: src/main/xmli18n-tmp.h:246 +#: src/main/xmli18n-tmp.h:268 #, fuzzy msgid "Epson Stylus C63" msgstr "Stylus C60" -#: src/main/xmli18n-tmp.h:247 +#: src/main/xmli18n-tmp.h:269 #, fuzzy msgid "Epson Stylus C64" msgstr "Stylus C60" -#: src/main/xmli18n-tmp.h:248 +#: src/main/xmli18n-tmp.h:270 #, fuzzy msgid "Epson Stylus C65" msgstr "Stylus C60" -#: src/main/xmli18n-tmp.h:249 +#: src/main/xmli18n-tmp.h:271 #, fuzzy msgid "Epson Stylus C66" msgstr "Stylus C60" -#: src/main/xmli18n-tmp.h:250 +#: src/main/xmli18n-tmp.h:272 #, fuzzy msgid "Epson Stylus C68" msgstr "Stylus C60" -#: src/main/xmli18n-tmp.h:251 +#: src/main/xmli18n-tmp.h:273 #, fuzzy msgid "Epson Stylus C70" msgstr "Stylus C70" -#: src/main/xmli18n-tmp.h:252 +#: src/main/xmli18n-tmp.h:274 #, fuzzy msgid "Epson Stylus C79" msgstr "Stylus C70" -#: src/main/xmli18n-tmp.h:253 +#: src/main/xmli18n-tmp.h:275 #, fuzzy msgid "Epson Stylus C80" msgstr "Stylus C80" -#: src/main/xmli18n-tmp.h:254 +#: src/main/xmli18n-tmp.h:276 #, fuzzy msgid "Epson Stylus C82" msgstr "Stylus C80" -#: src/main/xmli18n-tmp.h:255 +#: src/main/xmli18n-tmp.h:277 #, fuzzy msgid "Epson Stylus C83" msgstr "Stylus C80" -#: src/main/xmli18n-tmp.h:256 +#: src/main/xmli18n-tmp.h:278 #, fuzzy msgid "Epson Stylus C84" msgstr "Stylus C80" -#: src/main/xmli18n-tmp.h:257 +#: src/main/xmli18n-tmp.h:279 #, fuzzy msgid "Epson Stylus C85" msgstr "Stylus C60" -#: src/main/xmli18n-tmp.h:258 +#: src/main/xmli18n-tmp.h:280 #, fuzzy msgid "Epson Stylus C86" msgstr "Stylus C60" -#: src/main/xmli18n-tmp.h:259 +#: src/main/xmli18n-tmp.h:281 #, fuzzy msgid "Epson Stylus C87" -msgstr "Stylus C60" +msgstr "Stylus C70" -#: src/main/xmli18n-tmp.h:260 +#: src/main/xmli18n-tmp.h:282 #, fuzzy msgid "Epson Stylus C88" msgstr "Stylus C80" -#: src/main/xmli18n-tmp.h:261 +#: src/main/xmli18n-tmp.h:283 #, fuzzy msgid "Epson Stylus C110" -msgstr "Stylus C20ux" +msgstr "Stylus C60" -#: src/main/xmli18n-tmp.h:262 +#: src/main/xmli18n-tmp.h:284 #, fuzzy msgid "Epson Stylus C120" -msgstr "Stylus C20ux" +msgstr "Stylus C20sx" -#: src/main/xmli18n-tmp.h:263 +#: src/main/xmli18n-tmp.h:285 #, fuzzy msgid "Epson Stylus Color" msgstr "Stylus Color" -#: src/main/xmli18n-tmp.h:264 +#: src/main/xmli18n-tmp.h:286 #, fuzzy msgid "Epson Stylus Color I" msgstr "Stylus Color" -#: src/main/xmli18n-tmp.h:265 +#: src/main/xmli18n-tmp.h:287 #, fuzzy msgid "Epson Stylus Color II" msgstr "Stylus Color" -#: src/main/xmli18n-tmp.h:266 +#: src/main/xmli18n-tmp.h:288 #, fuzzy msgid "Epson Stylus Color IIs" msgstr "Stylus Color" -#: src/main/xmli18n-tmp.h:267 +#: src/main/xmli18n-tmp.h:289 #, fuzzy msgid "Epson Stylus Color PRO" msgstr "Stylus Color Pro" -#: src/main/xmli18n-tmp.h:268 +#: src/main/xmli18n-tmp.h:290 #, fuzzy msgid "Epson Stylus Pro XL" msgstr "Stylus Color Pro XL" -#: src/main/xmli18n-tmp.h:269 +#: src/main/xmli18n-tmp.h:291 #, fuzzy msgid "Epson Stylus Color 400" msgstr "Stylus Color 400" -#: src/main/xmli18n-tmp.h:270 +#: src/main/xmli18n-tmp.h:292 #, fuzzy msgid "Epson Stylus Color 440" msgstr "Stylus Color 440" -#: src/main/xmli18n-tmp.h:271 +#: src/main/xmli18n-tmp.h:293 #, fuzzy msgid "Epson Stylus Color 460" msgstr "Stylus Color 460" -#: src/main/xmli18n-tmp.h:272 +#: src/main/xmli18n-tmp.h:294 #, fuzzy msgid "Epson Stylus Color 480" msgstr "Stylus Color 480" -#: src/main/xmli18n-tmp.h:273 +#: src/main/xmli18n-tmp.h:295 #, fuzzy msgid "Epson Stylus Color 500" msgstr "Stylus Color 500" -#: src/main/xmli18n-tmp.h:274 +#: src/main/xmli18n-tmp.h:296 #, fuzzy msgid "Epson Stylus Color 580" msgstr "Stylus Color 580" -#: src/main/xmli18n-tmp.h:275 +#: src/main/xmli18n-tmp.h:297 #, fuzzy msgid "Epson Stylus Color 600" msgstr "Stylus Color 600" -#: src/main/xmli18n-tmp.h:276 +#: src/main/xmli18n-tmp.h:298 #, fuzzy msgid "Epson Stylus Color 640" msgstr "Stylus Color 640" -#: src/main/xmli18n-tmp.h:277 +#: src/main/xmli18n-tmp.h:299 #, fuzzy msgid "Epson Stylus Color 660" msgstr "Stylus Color 660" -#: src/main/xmli18n-tmp.h:278 +#: src/main/xmli18n-tmp.h:300 #, fuzzy msgid "Epson Stylus Color 670" msgstr "Stylus Color 670" -#: src/main/xmli18n-tmp.h:279 +#: src/main/xmli18n-tmp.h:301 #, fuzzy msgid "Epson Stylus Color 680" msgstr "Stylus Color 680" -#: src/main/xmli18n-tmp.h:280 +#: src/main/xmli18n-tmp.h:302 #, fuzzy msgid "Epson Stylus Color 740" msgstr "Stylus Color 740" -#: src/main/xmli18n-tmp.h:281 +#: src/main/xmli18n-tmp.h:303 #, fuzzy msgid "Epson Stylus Color 760" msgstr "Stylus Color 760" -#: src/main/xmli18n-tmp.h:282 +#: src/main/xmli18n-tmp.h:304 #, fuzzy msgid "Epson Stylus Color 777" msgstr "Stylus Color 777" -#: src/main/xmli18n-tmp.h:283 +#: src/main/xmli18n-tmp.h:305 #, fuzzy msgid "Epson Stylus Color 800" msgstr "Stylus Color 800" -#: src/main/xmli18n-tmp.h:284 +#: src/main/xmli18n-tmp.h:306 #, fuzzy msgid "Epson Stylus Color 850" msgstr "Stylus Color 850" -#: src/main/xmli18n-tmp.h:285 +#: src/main/xmli18n-tmp.h:307 #, fuzzy msgid "Epson Stylus Color 860" msgstr "Stylus Color 860" -#: src/main/xmli18n-tmp.h:286 +#: src/main/xmli18n-tmp.h:308 #, fuzzy msgid "Epson Stylus Color 880" msgstr "Stylus Color 880" -#: src/main/xmli18n-tmp.h:287 +#: src/main/xmli18n-tmp.h:309 #, fuzzy msgid "Epson Stylus Color 8 3" msgstr "Stylus Color 83" -#: src/main/xmli18n-tmp.h:288 +#: src/main/xmli18n-tmp.h:310 #, fuzzy msgid "Epson Stylus Color 900" msgstr "Stylus Color 900" -#: src/main/xmli18n-tmp.h:289 +#: src/main/xmli18n-tmp.h:311 #, fuzzy msgid "Epson Stylus Color 980" msgstr "Stylus Color 980" -#: src/main/xmli18n-tmp.h:290 +#: src/main/xmli18n-tmp.h:312 #, fuzzy msgid "Epson Stylus Color 1160" msgstr "Stylus Color 1160" -#: src/main/xmli18n-tmp.h:291 +#: src/main/xmli18n-tmp.h:313 #, fuzzy msgid "Epson Stylus Color 1500" msgstr "Stylus Color 1500" -#: src/main/xmli18n-tmp.h:292 +#: src/main/xmli18n-tmp.h:314 #, fuzzy msgid "Epson Stylus Color 1520" msgstr "Stylus Color 1520" -#: src/main/xmli18n-tmp.h:293 +#: src/main/xmli18n-tmp.h:315 #, fuzzy msgid "Epson Stylus Color 3000" msgstr "Stylus Color 3000" -#: src/main/xmli18n-tmp.h:294 +#: src/main/xmli18n-tmp.h:316 #, fuzzy msgid "Epson Stylus Photo" msgstr "Stylus Photo" -#: src/main/xmli18n-tmp.h:295 +#: src/main/xmli18n-tmp.h:317 #, fuzzy msgid "Epson Stylus Photo 700" msgstr "Stylus Photo 700" -#: src/main/xmli18n-tmp.h:296 +#: src/main/xmli18n-tmp.h:318 #, fuzzy msgid "Epson Stylus Photo EX" msgstr "Stylus Photo EX" -#: src/main/xmli18n-tmp.h:297 +#: src/main/xmli18n-tmp.h:319 #, fuzzy msgid "Epson Stylus Photo EX3" msgstr "Stylus Photo EX" -#: src/main/xmli18n-tmp.h:298 +#: src/main/xmli18n-tmp.h:320 #, fuzzy msgid "Epson Stylus Photo 720" msgstr "Stylus Photo 720" -#: src/main/xmli18n-tmp.h:299 +#: src/main/xmli18n-tmp.h:321 #, fuzzy msgid "Epson Stylus Photo 750" msgstr "Stylus Photo 750" -#: src/main/xmli18n-tmp.h:300 +#: src/main/xmli18n-tmp.h:322 #, fuzzy msgid "Epson Stylus Photo 780" msgstr "Stylus Photo 780" -#: src/main/xmli18n-tmp.h:301 +#: src/main/xmli18n-tmp.h:323 #, fuzzy msgid "Epson Stylus Photo 785" msgstr "Stylus Photo 785" -#: src/main/xmli18n-tmp.h:302 +#: src/main/xmli18n-tmp.h:324 #, fuzzy msgid "Epson Stylus Photo 790" msgstr "Stylus Photo 790" -#: src/main/xmli18n-tmp.h:303 +#: src/main/xmli18n-tmp.h:325 #, fuzzy msgid "Epson Stylus Photo 810" msgstr "Stylus Photo 810" -#: src/main/xmli18n-tmp.h:304 +#: src/main/xmli18n-tmp.h:326 #, fuzzy msgid "Epson Stylus Photo 820" msgstr "Stylus Photo 820" -#: src/main/xmli18n-tmp.h:305 +#: src/main/xmli18n-tmp.h:327 #, fuzzy msgid "Epson Stylus Photo 825" msgstr "Stylus Photo 785" -#: src/main/xmli18n-tmp.h:306 +#: src/main/xmli18n-tmp.h:328 #, fuzzy msgid "Epson Stylus Photo 830" msgstr "Stylus Photo 780" -#: src/main/xmli18n-tmp.h:307 +#: src/main/xmli18n-tmp.h:329 #, fuzzy msgid "Epson Stylus Photo 830U" msgstr "Stylus Photo 780" -#: src/main/xmli18n-tmp.h:308 +#: src/main/xmli18n-tmp.h:330 #, fuzzy msgid "Epson Stylus Photo 870" msgstr "Stylus Photo 870" -#: src/main/xmli18n-tmp.h:309 +#: src/main/xmli18n-tmp.h:331 #, fuzzy msgid "Epson Stylus Photo 875" msgstr "Stylus Photo 875" -#: src/main/xmli18n-tmp.h:310 +#: src/main/xmli18n-tmp.h:332 #, fuzzy msgid "Epson Stylus Photo 890" msgstr "Stylus Photo 890" -#: src/main/xmli18n-tmp.h:311 +#: src/main/xmli18n-tmp.h:333 #, fuzzy msgid "Epson Stylus Photo 895" msgstr "Stylus Photo 895" -#: src/main/xmli18n-tmp.h:312 +#: src/main/xmli18n-tmp.h:334 #, fuzzy msgid "Epson Stylus Photo 900" msgstr "Stylus Photo 700" -#: src/main/xmli18n-tmp.h:313 +#: src/main/xmli18n-tmp.h:335 #, fuzzy msgid "Epson Stylus Photo 915" msgstr "Stylus Photo 895" -#: src/main/xmli18n-tmp.h:314 +#: src/main/xmli18n-tmp.h:336 #, fuzzy msgid "Epson Stylus Photo 925" msgstr "Stylus Photo 895" -#: src/main/xmli18n-tmp.h:315 +#: src/main/xmli18n-tmp.h:337 #, fuzzy msgid "Epson Stylus Photo 935" msgstr "Stylus Photo 895" -#: src/main/xmli18n-tmp.h:316 +#: src/main/xmli18n-tmp.h:338 #, fuzzy msgid "Epson Stylus Photo 950" msgstr "Stylus Photo 750" -#: src/main/xmli18n-tmp.h:317 +#: src/main/xmli18n-tmp.h:339 #, fuzzy msgid "Epson Stylus Photo 960" msgstr "Stylus Photo 790" -#: src/main/xmli18n-tmp.h:318 +#: src/main/xmli18n-tmp.h:340 #, fuzzy msgid "Epson Stylus Photo 1200" msgstr "Stylus Photo 1200" -#: src/main/xmli18n-tmp.h:319 +#: src/main/xmli18n-tmp.h:341 #, fuzzy msgid "Epson Stylus Photo 1270" msgstr "Stylus Photo 1270" -#: src/main/xmli18n-tmp.h:320 +#: src/main/xmli18n-tmp.h:342 #, fuzzy msgid "Epson Stylus Photo 1280" msgstr "Stylus Photo 1280" -#: src/main/xmli18n-tmp.h:321 +#: src/main/xmli18n-tmp.h:343 #, fuzzy msgid "Epson Stylus Photo 1290" msgstr "Stylus Photo 1290" -#: src/main/xmli18n-tmp.h:322 +#: src/main/xmli18n-tmp.h:344 #, fuzzy msgid "Epson Stylus Photo 1400" msgstr "Stylus Photo 1200" -#: src/main/xmli18n-tmp.h:323 +#: src/main/xmli18n-tmp.h:345 #, fuzzy msgid "Epson Stylus Photo 1410" msgstr "Stylus Photo 810" -#: src/main/xmli18n-tmp.h:324 +#: src/main/xmli18n-tmp.h:346 #, fuzzy msgid "Epson Stylus Photo 2000P" msgstr "Stylus Photo 2000P" -#: src/main/xmli18n-tmp.h:325 +#: src/main/xmli18n-tmp.h:347 #, fuzzy msgid "Epson Stylus Photo 2100" msgstr "Stylus Photo 1200" -#: src/main/xmli18n-tmp.h:326 +#: src/main/xmli18n-tmp.h:348 #, fuzzy msgid "Epson Stylus Photo 2200" msgstr "Stylus Photo 1200" -#: src/main/xmli18n-tmp.h:327 +#: src/main/xmli18n-tmp.h:349 #, fuzzy msgid "Epson Stylus Photo R200" msgstr "Stylus Photo 1200" -#: src/main/xmli18n-tmp.h:328 +#: src/main/xmli18n-tmp.h:350 #, fuzzy msgid "Epson Stylus Photo R210" msgstr "Stylus Photo 1200" -#: src/main/xmli18n-tmp.h:329 +#: src/main/xmli18n-tmp.h:351 #, fuzzy msgid "Epson Stylus Photo R220" msgstr "Stylus Photo 1200" -#: src/main/xmli18n-tmp.h:330 +#: src/main/xmli18n-tmp.h:352 #, fuzzy msgid "Epson Stylus Photo R230" msgstr "Stylus Photo 1200" -#: src/main/xmli18n-tmp.h:331 +#: src/main/xmli18n-tmp.h:353 #, fuzzy msgid "Epson Stylus Photo R240" msgstr "Stylus Photo 1200" -#: src/main/xmli18n-tmp.h:332 +#: src/main/xmli18n-tmp.h:354 #, fuzzy msgid "Epson Stylus Photo R245" -msgstr "Stylus Photo 1200" +msgstr "Stylus Photo 895" -#: src/main/xmli18n-tmp.h:333 +#: src/main/xmli18n-tmp.h:355 #, fuzzy msgid "Epson Stylus Photo R260" msgstr "Stylus Photo 1200" -#: src/main/xmli18n-tmp.h:334 +#: src/main/xmli18n-tmp.h:356 #, fuzzy msgid "Epson Stylus Photo R265" -msgstr "Stylus Photo 1200" +msgstr "Stylus Photo 895" -#: src/main/xmli18n-tmp.h:335 +#: src/main/xmli18n-tmp.h:357 #, fuzzy msgid "Epson Stylus Photo R270" msgstr "Stylus Photo 1270" -#: src/main/xmli18n-tmp.h:336 +#: src/main/xmli18n-tmp.h:358 +#, fuzzy +msgid "Epson Stylus Photo R280" +msgstr "Stylus Photo 1280" + +#: src/main/xmli18n-tmp.h:359 +#, fuzzy +msgid "Epson Stylus Photo R285" +msgstr "Stylus Photo 785" + +#: src/main/xmli18n-tmp.h:360 #, fuzzy msgid "Epson Stylus Photo R300" msgstr "Stylus Photo 700" -#: src/main/xmli18n-tmp.h:337 +#: src/main/xmli18n-tmp.h:361 #, fuzzy msgid "Epson Stylus Photo R310" msgstr "Stylus Photo 700" -#: src/main/xmli18n-tmp.h:338 +#: src/main/xmli18n-tmp.h:362 #, fuzzy msgid "Epson Stylus Photo R320" msgstr "Stylus Photo 1200" -#: src/main/xmli18n-tmp.h:339 +#: src/main/xmli18n-tmp.h:363 #, fuzzy msgid "Epson Stylus Photo R340" msgstr "Stylus Photo 700" -#: src/main/xmli18n-tmp.h:340 +#: src/main/xmli18n-tmp.h:364 #, fuzzy msgid "Epson Stylus Photo R350" msgstr "Stylus Photo 700" -#: src/main/xmli18n-tmp.h:341 +#: src/main/xmli18n-tmp.h:365 #, fuzzy msgid "Epson Stylus Photo R360" msgstr "Stylus Photo 700" -#: src/main/xmli18n-tmp.h:342 +#: src/main/xmli18n-tmp.h:366 #, fuzzy msgid "Epson Stylus Photo R380" msgstr "Stylus Photo 700" -#: src/main/xmli18n-tmp.h:343 +#: src/main/xmli18n-tmp.h:367 #, fuzzy msgid "Epson Stylus Photo R390" msgstr "Stylus Photo 700" -#: src/main/xmli18n-tmp.h:344 +#: src/main/xmli18n-tmp.h:368 #, fuzzy msgid "Epson Stylus Photo RX400" msgstr "Stylus Photo 700" -#: src/main/xmli18n-tmp.h:345 +#: src/main/xmli18n-tmp.h:369 #, fuzzy msgid "Epson Stylus Photo RX420" msgstr "Stylus Photo 1200" -#: src/main/xmli18n-tmp.h:346 +#: src/main/xmli18n-tmp.h:370 #, fuzzy msgid "Epson Stylus Photo RX425" msgstr "Stylus Photo 1200" -#: src/main/xmli18n-tmp.h:347 +#: src/main/xmli18n-tmp.h:371 #, fuzzy msgid "Epson Stylus Photo RX430" msgstr "Stylus Photo 700" -#: src/main/xmli18n-tmp.h:348 +#: src/main/xmli18n-tmp.h:372 #, fuzzy msgid "Epson Stylus Photo RX500" msgstr "Stylus Photo 700" -#: src/main/xmli18n-tmp.h:349 +#: src/main/xmli18n-tmp.h:373 #, fuzzy msgid "Epson Stylus Photo RX510" msgstr "Stylus Photo 700" -#: src/main/xmli18n-tmp.h:350 +#: src/main/xmli18n-tmp.h:374 #, fuzzy msgid "Epson Stylus Photo RX560" msgstr "Stylus Photo 700" -#: src/main/xmli18n-tmp.h:351 +#: src/main/xmli18n-tmp.h:375 #, fuzzy msgid "Epson Stylus Photo RX580" msgstr "Stylus Photo 700" -#: src/main/xmli18n-tmp.h:352 +#: src/main/xmli18n-tmp.h:376 +#, fuzzy +msgid "Epson Stylus Photo RX585" +msgstr "Stylus Photo 700" + +#: src/main/xmli18n-tmp.h:377 #, fuzzy msgid "Epson Stylus Photo RX590" msgstr "Stylus Photo 700" -#: src/main/xmli18n-tmp.h:353 +#: src/main/xmli18n-tmp.h:378 #, fuzzy msgid "Epson Stylus Photo RX595" msgstr "Stylus Photo 700" -#: src/main/xmli18n-tmp.h:354 +#: src/main/xmli18n-tmp.h:379 #, fuzzy msgid "Epson Stylus Photo RX600" msgstr "Stylus Photo 700" -#: src/main/xmli18n-tmp.h:355 +#: src/main/xmli18n-tmp.h:380 #, fuzzy msgid "Epson Stylus Photo RX620" msgstr "Stylus Photo 700" -#: src/main/xmli18n-tmp.h:356 +#: src/main/xmli18n-tmp.h:381 #, fuzzy msgid "Epson Stylus Photo RX630" msgstr "Stylus Photo 700" -#: src/main/xmli18n-tmp.h:357 +#: src/main/xmli18n-tmp.h:382 #, fuzzy msgid "Epson Stylus Photo RX640" msgstr "Stylus Photo 700" -#: src/main/xmli18n-tmp.h:358 +#: src/main/xmli18n-tmp.h:383 +#, fuzzy +msgid "Epson Stylus Photo RX680" +msgstr "Stylus Photo 700" + +#: src/main/xmli18n-tmp.h:384 +#, fuzzy +msgid "Epson Stylus Photo RX685" +msgstr "Stylus Photo 700" + +#: src/main/xmli18n-tmp.h:385 #, fuzzy msgid "Epson Stylus Photo RX700" msgstr "Stylus Photo 700" -#: src/main/xmli18n-tmp.h:359 +#: src/main/xmli18n-tmp.h:386 #, fuzzy msgid "Epson Stylus Photo R800" msgstr "Stylus Photo 700" -#: src/main/xmli18n-tmp.h:360 +#: src/main/xmli18n-tmp.h:387 #, fuzzy msgid "Epson Stylus Photo R1800" msgstr "Stylus Photo 700" -#: src/main/xmli18n-tmp.h:361 +#: src/main/xmli18n-tmp.h:388 #, fuzzy msgid "Epson Stylus Photo R2400" msgstr "Stylus Photo 1200" -#: src/main/xmli18n-tmp.h:362 +#: src/main/xmli18n-tmp.h:389 #, fuzzy msgid "Epson Stylus Pro 5000" msgstr "Stylus Pro 5000" -#: src/main/xmli18n-tmp.h:363 +#: src/main/xmli18n-tmp.h:390 #, fuzzy msgid "Epson Stylus Pro 5500" msgstr "Stylus Pro 5500" -#: src/main/xmli18n-tmp.h:364 +#: src/main/xmli18n-tmp.h:391 #, fuzzy msgid "Epson Stylus Pro 7000" msgstr "Stylus Pro 7000" -#: src/main/xmli18n-tmp.h:365 +#: src/main/xmli18n-tmp.h:392 #, fuzzy msgid "Epson Stylus Pro 7500" msgstr "Stylus Pro 7500" -#: src/main/xmli18n-tmp.h:366 +#: src/main/xmli18n-tmp.h:393 #, fuzzy msgid "Epson Stylus Pro 7600" msgstr "Stylus Pro 7000" -#: src/main/xmli18n-tmp.h:367 +#: src/main/xmli18n-tmp.h:394 #, fuzzy msgid "Epson Stylus Pro 9000" msgstr "Stylus Pro 9000" -#: src/main/xmli18n-tmp.h:368 +#: src/main/xmli18n-tmp.h:395 #, fuzzy msgid "Epson Stylus Pro 9500" msgstr "Stylus Pro 9500" -#: src/main/xmli18n-tmp.h:369 +#: src/main/xmli18n-tmp.h:396 #, fuzzy msgid "Epson Stylus Pro 9600" msgstr "Stylus Pro 9000" -#: src/main/xmli18n-tmp.h:370 +#: src/main/xmli18n-tmp.h:397 #, fuzzy msgid "Epson Stylus Pro 10000" msgstr "Stylus Pro 10000" -#: src/main/xmli18n-tmp.h:371 +#: src/main/xmli18n-tmp.h:398 #, fuzzy msgid "Epson Stylus Scan 2000" msgstr "Stylus Scan 2000" -#: src/main/xmli18n-tmp.h:372 +#: src/main/xmli18n-tmp.h:399 #, fuzzy msgid "Epson Stylus Scan 2500" msgstr "Stylus Scan 2500" -#: src/main/xmli18n-tmp.h:373 +#: src/main/xmli18n-tmp.h:400 #, fuzzy msgid "Epson Stylus CX1500" msgstr "Stylus C20sx" -#: src/main/xmli18n-tmp.h:374 +#: src/main/xmli18n-tmp.h:401 #, fuzzy msgid "Epson Stylus CX3100" msgstr "Stylus C20sx" -#: src/main/xmli18n-tmp.h:375 +#: src/main/xmli18n-tmp.h:402 #, fuzzy msgid "Epson Stylus CX3200" msgstr "Stylus C20sx" -#: src/main/xmli18n-tmp.h:376 +#: src/main/xmli18n-tmp.h:403 #, fuzzy msgid "Epson Stylus CX3500" msgstr "Stylus C20sx" -#: src/main/xmli18n-tmp.h:377 +#: src/main/xmli18n-tmp.h:404 #, fuzzy msgid "Epson Stylus CX3600" msgstr "Stylus C20sx" -#: src/main/xmli18n-tmp.h:378 +#: src/main/xmli18n-tmp.h:405 #, fuzzy msgid "Epson Stylus CX3650" msgstr "Stylus C20sx" -#: src/main/xmli18n-tmp.h:379 +#: src/main/xmli18n-tmp.h:406 #, fuzzy msgid "Epson Stylus CX3700" msgstr "Stylus C20sx" -#: src/main/xmli18n-tmp.h:380 +#: src/main/xmli18n-tmp.h:407 #, fuzzy msgid "Epson Stylus CX3800" msgstr "Stylus C20sx" -#: src/main/xmli18n-tmp.h:381 +#: src/main/xmli18n-tmp.h:408 #, fuzzy msgid "Epson Stylus CX3805" -msgstr "Stylus C60" +msgstr "Stylus C80" -#: src/main/xmli18n-tmp.h:382 +#: src/main/xmli18n-tmp.h:409 #, fuzzy msgid "Epson Stylus CX3810" msgstr "Stylus C20sx" -#: src/main/xmli18n-tmp.h:383 +#: src/main/xmli18n-tmp.h:410 #, fuzzy msgid "Epson Stylus CX4100" msgstr "Stylus C20sx" -#: src/main/xmli18n-tmp.h:384 +#: src/main/xmli18n-tmp.h:411 #, fuzzy msgid "Epson Stylus CX4200" msgstr "Stylus C20sx" -#: src/main/xmli18n-tmp.h:385 +#: src/main/xmli18n-tmp.h:412 #, fuzzy msgid "Epson Stylus CX4400" msgstr "Stylus C20sx" -#: src/main/xmli18n-tmp.h:386 +#: src/main/xmli18n-tmp.h:413 #, fuzzy msgid "Epson Stylus CX4500" msgstr "Stylus C20sx" -#: src/main/xmli18n-tmp.h:387 +#: src/main/xmli18n-tmp.h:414 #, fuzzy msgid "Epson Stylus CX4600" msgstr "Stylus C20sx" -#: src/main/xmli18n-tmp.h:388 +#: src/main/xmli18n-tmp.h:415 #, fuzzy msgid "Epson Stylus CX4700" msgstr "Stylus C20sx" -#: src/main/xmli18n-tmp.h:389 +#: src/main/xmli18n-tmp.h:416 #, fuzzy msgid "Epson Stylus CX4800" msgstr "Stylus C20sx" -#: src/main/xmli18n-tmp.h:390 +#: src/main/xmli18n-tmp.h:417 #, fuzzy msgid "Epson Stylus CX4900" msgstr "Stylus C20sx" -#: src/main/xmli18n-tmp.h:391 +#: src/main/xmli18n-tmp.h:418 #, fuzzy msgid "Epson Stylus CX5000" msgstr "Stylus C20sx" -#: src/main/xmli18n-tmp.h:392 +#: src/main/xmli18n-tmp.h:419 #, fuzzy msgid "Epson Stylus CX5000F" msgstr "Stylus C20sx" -#: src/main/xmli18n-tmp.h:393 +#: src/main/xmli18n-tmp.h:420 #, fuzzy msgid "Epson Stylus CX5100" msgstr "Stylus C60" -#: src/main/xmli18n-tmp.h:394 +#: src/main/xmli18n-tmp.h:421 #, fuzzy msgid "Epson Stylus CX5200" msgstr "Stylus C60" -#: src/main/xmli18n-tmp.h:395 +#: src/main/xmli18n-tmp.h:422 #, fuzzy msgid "Epson Stylus CX5300" msgstr "Stylus C20sx" -#: src/main/xmli18n-tmp.h:396 +#: src/main/xmli18n-tmp.h:423 #, fuzzy msgid "Epson Stylus CX5400" msgstr "Stylus C20sx" -#: src/main/xmli18n-tmp.h:397 +#: src/main/xmli18n-tmp.h:424 #, fuzzy msgid "Epson Stylus CX5600" msgstr "Stylus C20sx" -#: src/main/xmli18n-tmp.h:398 +#: src/main/xmli18n-tmp.h:425 #, fuzzy msgid "Epson Stylus CX5700" msgstr "Stylus C20sx" -#: src/main/xmli18n-tmp.h:399 +#: src/main/xmli18n-tmp.h:426 #, fuzzy msgid "Epson Stylus CX5800" msgstr "Stylus C20sx" -#: src/main/xmli18n-tmp.h:400 +#: src/main/xmli18n-tmp.h:427 #, fuzzy msgid "Epson Stylus CX6000" msgstr "Stylus C20sx" -#: src/main/xmli18n-tmp.h:401 +#: src/main/xmli18n-tmp.h:428 #, fuzzy msgid "Epson Stylus CX6300" msgstr "Stylus C20sx" -#: src/main/xmli18n-tmp.h:402 +#: src/main/xmli18n-tmp.h:429 #, fuzzy msgid "Epson Stylus CX6400" msgstr "Stylus C20sx" -#: src/main/xmli18n-tmp.h:403 +#: src/main/xmli18n-tmp.h:430 #, fuzzy msgid "Epson Stylus CX6500" msgstr "Stylus C20sx" -#: src/main/xmli18n-tmp.h:404 +#: src/main/xmli18n-tmp.h:431 #, fuzzy msgid "Epson Stylus CX6600" msgstr "Stylus C20sx" -#: src/main/xmli18n-tmp.h:405 +#: src/main/xmli18n-tmp.h:432 #, fuzzy msgid "Epson Stylus CX7000F" -msgstr "Stylus C20sx" +msgstr "Stylus C70" -#: src/main/xmli18n-tmp.h:406 +#: src/main/xmli18n-tmp.h:433 #, fuzzy msgid "Epson Stylus CX7400" msgstr "Stylus C20sx" -#: src/main/xmli18n-tmp.h:407 +#: src/main/xmli18n-tmp.h:434 #, fuzzy msgid "Epson Stylus CX7700" msgstr "Stylus C70" -#: src/main/xmli18n-tmp.h:408 +#: src/main/xmli18n-tmp.h:435 #, fuzzy msgid "Epson Stylus CX7800" msgstr "Stylus C20sx" -#: src/main/xmli18n-tmp.h:409 +#: src/main/xmli18n-tmp.h:436 #, fuzzy msgid "Epson Stylus CX8300" msgstr "Stylus C20sx" -#: src/main/xmli18n-tmp.h:410 +#: src/main/xmli18n-tmp.h:437 #, fuzzy msgid "Epson Stylus CX8400" msgstr "Stylus C20sx" -#: src/main/xmli18n-tmp.h:411 +#: src/main/xmli18n-tmp.h:438 #, fuzzy msgid "Epson Stylus CX9400" msgstr "Stylus C20sx" -#: src/main/xmli18n-tmp.h:412 +#: src/main/xmli18n-tmp.h:439 #, fuzzy msgid "Epson Stylus D68" msgstr "Stylus C60" -#: src/main/xmli18n-tmp.h:413 +#: src/main/xmli18n-tmp.h:440 #, fuzzy msgid "Epson Stylus D88" msgstr "Stylus C80" -#: src/main/xmli18n-tmp.h:414 +#: src/main/xmli18n-tmp.h:441 +#, fuzzy +msgid "Epson Stylus D92" +msgstr "Stylus C60" + +#: src/main/xmli18n-tmp.h:442 #, fuzzy msgid "Epson Stylus D120" msgstr "Stylus C20ux" -#: src/main/xmli18n-tmp.h:415 +#: src/main/xmli18n-tmp.h:443 #, fuzzy msgid "Epson Stylus DX3800" msgstr "Stylus C20sx" -#: src/main/xmli18n-tmp.h:416 +#: src/main/xmli18n-tmp.h:444 #, fuzzy msgid "Epson Stylus DX3850" msgstr "Stylus C20sx" -#: src/main/xmli18n-tmp.h:417 +#: src/main/xmli18n-tmp.h:445 #, fuzzy msgid "Epson Stylus DX4050" msgstr "Stylus C20sx" -#: src/main/xmli18n-tmp.h:418 +#: src/main/xmli18n-tmp.h:446 #, fuzzy msgid "Epson Stylus DX4200" msgstr "Stylus C20sx" -#: src/main/xmli18n-tmp.h:419 +#: src/main/xmli18n-tmp.h:447 #, fuzzy msgid "Epson Stylus DX4250" -msgstr "Stylus C60" +msgstr "Stylus C20sx" -#: src/main/xmli18n-tmp.h:420 +#: src/main/xmli18n-tmp.h:448 +#, fuzzy +msgid "Epson Stylus DX4400" +msgstr "Stylus C20sx" + +#: src/main/xmli18n-tmp.h:449 +#, fuzzy +msgid "Epson Stylus DX4450" +msgstr "Stylus C20sx" + +#: src/main/xmli18n-tmp.h:450 #, fuzzy msgid "Epson Stylus DX4800" msgstr "Stylus C20sx" -#: src/main/xmli18n-tmp.h:421 +#: src/main/xmli18n-tmp.h:451 +#, fuzzy +msgid "Epson Stylus DX7000F" +msgstr "Stylus Pro 7000" + +#: src/main/xmli18n-tmp.h:452 +#, fuzzy +msgid "Epson Stylus DX7400" +msgstr "Stylus C20sx" + +#: src/main/xmli18n-tmp.h:453 +#, fuzzy +msgid "Epson Stylus DX7450" +msgstr "Stylus C20sx" + +#: src/main/xmli18n-tmp.h:454 +#, fuzzy +msgid "Epson Stylus DX8400" +msgstr "Stylus C20sx" + +#: src/main/xmli18n-tmp.h:455 +#, fuzzy +msgid "Epson Stylus DX8450" +msgstr "Stylus C20sx" + +#: src/main/xmli18n-tmp.h:456 msgid "Epson PictureMate" msgstr "" -#: src/main/xmli18n-tmp.h:422 +#: src/main/xmli18n-tmp.h:457 +msgid "Epson PictureMate Dash" +msgstr "" + +#: src/main/xmli18n-tmp.h:458 msgid "Epson PictureMate Deluxe" msgstr "" -#: src/main/xmli18n-tmp.h:423 +#: src/main/xmli18n-tmp.h:459 msgid "Epson PictureMate Flash" msgstr "" -#: src/main/xmli18n-tmp.h:424 +#: src/main/xmli18n-tmp.h:460 msgid "Epson PictureMate Pal" msgstr "" -#: src/main/xmli18n-tmp.h:425 +#: src/main/xmli18n-tmp.h:461 msgid "Epson PictureMate Snap" msgstr "" -#: src/main/xmli18n-tmp.h:426 -#, fuzzy +#: src/main/xmli18n-tmp.h:462 +msgid "Epson PictureMate 100" +msgstr "" + +#: src/main/xmli18n-tmp.h:463 msgid "Epson PictureMate 200" -msgstr "Stylus C60" +msgstr "" -#: src/main/xmli18n-tmp.h:427 -#, fuzzy +#: src/main/xmli18n-tmp.h:464 msgid "Epson PictureMate 210" -msgstr "Stylus C60" +msgstr "" -#: src/main/xmli18n-tmp.h:428 -#, fuzzy +#: src/main/xmli18n-tmp.h:465 msgid "Epson PictureMate 240" -msgstr "Stylus C60" +msgstr "" -#: src/main/xmli18n-tmp.h:429 -#, fuzzy +#: src/main/xmli18n-tmp.h:466 msgid "Epson PictureMate 250" -msgstr "Stylus C60" +msgstr "" -#: src/main/xmli18n-tmp.h:430 -#, fuzzy +#: src/main/xmli18n-tmp.h:467 +msgid "Epson PictureMate 260" +msgstr "" + +#: src/main/xmli18n-tmp.h:468 +msgid "Epson PictureMate 270" +msgstr "" + +#: src/main/xmli18n-tmp.h:469 msgid "Epson PictureMate 280" -msgstr "Stylus C60" +msgstr "" -#: src/main/xmli18n-tmp.h:431 +#: src/main/xmli18n-tmp.h:470 +msgid "Epson PictureMate 290" +msgstr "" + +#: src/main/xmli18n-tmp.h:471 +msgid "Epson PictureMate 500" +msgstr "" + +#: src/main/xmli18n-tmp.h:472 +msgid "Epson PictureMate 2005" +msgstr "" + +#: src/main/xmli18n-tmp.h:473 msgid "Epson CL 700" msgstr "" -#: src/main/xmli18n-tmp.h:432 +#: src/main/xmli18n-tmp.h:474 msgid "Epson CL 750" msgstr "" -#: src/main/xmli18n-tmp.h:433 +#: src/main/xmli18n-tmp.h:475 msgid "Epson CL 760" msgstr "" -#: src/main/xmli18n-tmp.h:434 +#: src/main/xmli18n-tmp.h:476 msgid "Epson E 100" msgstr "" -#: src/main/xmli18n-tmp.h:435 +#: src/main/xmli18n-tmp.h:477 msgid "Epson E 150" msgstr "" -#: src/main/xmli18n-tmp.h:436 +#: src/main/xmli18n-tmp.h:478 msgid "Epson E 200" msgstr "" -#: src/main/xmli18n-tmp.h:437 +#: src/main/xmli18n-tmp.h:479 +msgid "Epson E 300" +msgstr "" + +#: src/main/xmli18n-tmp.h:480 +msgid "Epson E 500" +msgstr "" + +#: src/main/xmli18n-tmp.h:481 +msgid "Epson E 520" +msgstr "" + +#: src/main/xmli18n-tmp.h:482 +msgid "Epson E 700" +msgstr "" + +#: src/main/xmli18n-tmp.h:483 +msgid "Epson E 720" +msgstr "" + +#: src/main/xmli18n-tmp.h:484 msgid "Epson EM 900C" msgstr "" -#: src/main/xmli18n-tmp.h:438 +#: src/main/xmli18n-tmp.h:485 msgid "Epson EM 930C" msgstr "" -#: src/main/xmli18n-tmp.h:439 +#: src/main/xmli18n-tmp.h:486 msgid "Epson MC 2000" msgstr "" -#: src/main/xmli18n-tmp.h:440 +#: src/main/xmli18n-tmp.h:487 msgid "Epson MC 5000" msgstr "" -#: src/main/xmli18n-tmp.h:441 +#: src/main/xmli18n-tmp.h:488 msgid "Epson MC 7000" msgstr "" -#: src/main/xmli18n-tmp.h:442 +#: src/main/xmli18n-tmp.h:489 msgid "Epson MC 9000" msgstr "" -#: src/main/xmli18n-tmp.h:443 +#: src/main/xmli18n-tmp.h:490 msgid "Epson MC 10000" msgstr "" -#: src/main/xmli18n-tmp.h:444 +#: src/main/xmli18n-tmp.h:491 msgid "Epson MJ 930C" msgstr "" -#: src/main/xmli18n-tmp.h:445 +#: src/main/xmli18n-tmp.h:492 msgid "Epson MJ 5100C" msgstr "" -#: src/main/xmli18n-tmp.h:446 +#: src/main/xmli18n-tmp.h:493 msgid "Epson MJ 6000C" msgstr "" -#: src/main/xmli18n-tmp.h:447 +#: src/main/xmli18n-tmp.h:494 msgid "Epson MJ 8000C" msgstr "" -#: src/main/xmli18n-tmp.h:448 -#, fuzzy +#: src/main/xmli18n-tmp.h:495 msgid "Epson PM 670C" -msgstr "Stylus C60" +msgstr "" -#: src/main/xmli18n-tmp.h:449 +#: src/main/xmli18n-tmp.h:496 msgid "Epson PM 700C" msgstr "" -#: src/main/xmli18n-tmp.h:450 +#: src/main/xmli18n-tmp.h:497 msgid "Epson PM 730C" msgstr "" -#: src/main/xmli18n-tmp.h:451 +#: src/main/xmli18n-tmp.h:498 msgid "Epson PM 740C" msgstr "" -#: src/main/xmli18n-tmp.h:452 +#: src/main/xmli18n-tmp.h:499 msgid "Epson PM 750C" msgstr "" -#: src/main/xmli18n-tmp.h:453 +#: src/main/xmli18n-tmp.h:500 msgid "Epson PM 760C" msgstr "" -#: src/main/xmli18n-tmp.h:454 +#: src/main/xmli18n-tmp.h:501 msgid "Epson PM 770C" msgstr "" -#: src/main/xmli18n-tmp.h:455 +#: src/main/xmli18n-tmp.h:502 msgid "Epson PM 780C" msgstr "" -#: src/main/xmli18n-tmp.h:456 +#: src/main/xmli18n-tmp.h:503 msgid "Epson PM 790PT" msgstr "" -#: src/main/xmli18n-tmp.h:457 +#: src/main/xmli18n-tmp.h:504 msgid "Epson PM 800C" msgstr "" -#: src/main/xmli18n-tmp.h:458 +#: src/main/xmli18n-tmp.h:505 msgid "Epson PM 850PT" msgstr "" -#: src/main/xmli18n-tmp.h:459 +#: src/main/xmli18n-tmp.h:506 msgid "Epson PM 870C" msgstr "" -#: src/main/xmli18n-tmp.h:460 +#: src/main/xmli18n-tmp.h:507 msgid "Epson PM 880C" msgstr "" -#: src/main/xmli18n-tmp.h:461 +#: src/main/xmli18n-tmp.h:508 msgid "Epson PM 930C" msgstr "" -#: src/main/xmli18n-tmp.h:462 +#: src/main/xmli18n-tmp.h:509 msgid "Epson PM 940C" msgstr "" -#: src/main/xmli18n-tmp.h:463 +#: src/main/xmli18n-tmp.h:510 msgid "Epson PM 950C" msgstr "" -#: src/main/xmli18n-tmp.h:464 +#: src/main/xmli18n-tmp.h:511 msgid "Epson PM 970C" msgstr "" -#: src/main/xmli18n-tmp.h:465 +#: src/main/xmli18n-tmp.h:512 msgid "Epson PM 980C" msgstr "" -#: src/main/xmli18n-tmp.h:466 +#: src/main/xmli18n-tmp.h:513 msgid "Epson PM 2000C" msgstr "" -#: src/main/xmli18n-tmp.h:467 +#: src/main/xmli18n-tmp.h:514 msgid "Epson PM 2200C" msgstr "" -#: src/main/xmli18n-tmp.h:468 +#: src/main/xmli18n-tmp.h:515 msgid "Epson PM 3000C" msgstr "" -#: src/main/xmli18n-tmp.h:469 +#: src/main/xmli18n-tmp.h:516 msgid "Epson PM 3300C" msgstr "" -#: src/main/xmli18n-tmp.h:470 +#: src/main/xmli18n-tmp.h:517 msgid "Epson PM 3500C" msgstr "" -#: src/main/xmli18n-tmp.h:471 +#: src/main/xmli18n-tmp.h:518 msgid "Epson PM 3700C" msgstr "" -#: src/main/xmli18n-tmp.h:472 +#: src/main/xmli18n-tmp.h:519 msgid "Epson PM 4000PX" msgstr "" -#: src/main/xmli18n-tmp.h:473 +#: src/main/xmli18n-tmp.h:520 msgid "Epson PM 5000C" msgstr "" -#: src/main/xmli18n-tmp.h:474 +#: src/main/xmli18n-tmp.h:521 msgid "Epson PM 7000C" msgstr "" -#: src/main/xmli18n-tmp.h:475 +#: src/main/xmli18n-tmp.h:522 msgid "Epson PM 9000C" msgstr "" -#: src/main/xmli18n-tmp.h:476 +#: src/main/xmli18n-tmp.h:523 #, fuzzy msgid "Epson PM 10000" msgstr "Stylus Pro 10000" -#: src/main/xmli18n-tmp.h:477 +#: src/main/xmli18n-tmp.h:524 msgid "Epson PM A650" msgstr "" -#: src/main/xmli18n-tmp.h:478 +#: src/main/xmli18n-tmp.h:525 msgid "Epson PM A750" msgstr "" -#: src/main/xmli18n-tmp.h:479 -#, fuzzy +#: src/main/xmli18n-tmp.h:526 msgid "Epson PM A820" -msgstr "Stylus C60" +msgstr "" -#: src/main/xmli18n-tmp.h:480 +#: src/main/xmli18n-tmp.h:527 msgid "Epson PM A890" msgstr "" -#: src/main/xmli18n-tmp.h:481 -#, fuzzy +#: src/main/xmli18n-tmp.h:528 msgid "Epson PM A900" -msgstr "Stylus C60" +msgstr "" -#: src/main/xmli18n-tmp.h:482 +#: src/main/xmli18n-tmp.h:529 msgid "Epson PM A950" msgstr "" -#: src/main/xmli18n-tmp.h:483 +#: src/main/xmli18n-tmp.h:530 msgid "Epson PM D600" msgstr "" -#: src/main/xmli18n-tmp.h:484 +#: src/main/xmli18n-tmp.h:531 #, fuzzy msgid "Epson PM D750" msgstr "Stylus C60" -#: src/main/xmli18n-tmp.h:485 +#: src/main/xmli18n-tmp.h:532 #, fuzzy msgid "Epson PM D770" msgstr "Stylus C60" -#: src/main/xmli18n-tmp.h:486 +#: src/main/xmli18n-tmp.h:533 msgid "Epson PM D800" msgstr "" -#: src/main/xmli18n-tmp.h:487 -#, fuzzy +#: src/main/xmli18n-tmp.h:534 msgid "Epson PM D870" -msgstr "Stylus C60" +msgstr "" -#: src/main/xmli18n-tmp.h:488 +#: src/main/xmli18n-tmp.h:535 #, fuzzy msgid "Epson PM D1000" msgstr "Stylus C60" -#: src/main/xmli18n-tmp.h:489 +#: src/main/xmli18n-tmp.h:536 #, fuzzy msgid "Epson PM G700" msgstr "Stylus C60" -#: src/main/xmli18n-tmp.h:490 +#: src/main/xmli18n-tmp.h:537 #, fuzzy msgid "Epson PM G720" msgstr "Stylus C60" -#: src/main/xmli18n-tmp.h:491 +#: src/main/xmli18n-tmp.h:538 msgid "Epson PM G730" msgstr "" -#: src/main/xmli18n-tmp.h:492 +#: src/main/xmli18n-tmp.h:539 #, fuzzy msgid "Epson PM G800" msgstr "Stylus C60" -#: src/main/xmli18n-tmp.h:493 +#: src/main/xmli18n-tmp.h:540 #, fuzzy msgid "Epson PM G820" msgstr "Stylus C60" -#: src/main/xmli18n-tmp.h:494 -#, fuzzy +#: src/main/xmli18n-tmp.h:541 msgid "Epson PM G850" -msgstr "Stylus C60" +msgstr "" -#: src/main/xmli18n-tmp.h:495 -#, fuzzy +#: src/main/xmli18n-tmp.h:542 msgid "Epson PM G4500" -msgstr "Stylus C60" +msgstr "" -#: src/main/xmli18n-tmp.h:496 -#, fuzzy +#: src/main/xmli18n-tmp.h:543 msgid "Epson PX A650" -msgstr "Stylus C60" +msgstr "" -#: src/main/xmli18n-tmp.h:497 +#: src/main/xmli18n-tmp.h:544 #, fuzzy msgid "Epson PX G900" msgstr "Stylus C60" -#: src/main/xmli18n-tmp.h:498 +#: src/main/xmli18n-tmp.h:545 #, fuzzy msgid "Epson PX G920" msgstr "Stylus C60" -#: src/main/xmli18n-tmp.h:499 +#: src/main/xmli18n-tmp.h:546 #, fuzzy msgid "Epson PX G5000" msgstr "Stylus C60" -#: src/main/xmli18n-tmp.h:500 +#: src/main/xmli18n-tmp.h:547 #, fuzzy msgid "Epson PX V500" msgstr "Stylus C60" -#: src/main/xmli18n-tmp.h:501 +#: src/main/xmli18n-tmp.h:548 #, fuzzy msgid "Epson PX V600" msgstr "Stylus C60" -#: src/main/xmli18n-tmp.h:502 +#: src/main/xmli18n-tmp.h:549 msgid "Epson PX V630" msgstr "" -#: src/main/xmli18n-tmp.h:503 -#, fuzzy +#: src/main/xmli18n-tmp.h:550 msgid "Epson PX V780" -msgstr "Stylus C60" +msgstr "" -#: src/main/xmli18n-tmp.h:504 -#, fuzzy +#: src/main/xmli18n-tmp.h:551 msgid "Epson PX 5500" -msgstr "Stylus C60" +msgstr "" -#: src/main/xmli18n-tmp.h:505 +#: src/main/xmli18n-tmp.h:552 msgid "Epson PX 7000" msgstr "" -#: src/main/xmli18n-tmp.h:506 +#: src/main/xmli18n-tmp.h:553 msgid "Epson PX 9000" msgstr "" -#: src/main/xmli18n-tmp.h:507 +#: src/main/xmli18n-tmp.h:554 msgid "Apollo P-2100" msgstr "" -#: src/main/xmli18n-tmp.h:508 +#: src/main/xmli18n-tmp.h:555 msgid "Apollo P-2150" msgstr "" -#: src/main/xmli18n-tmp.h:509 +#: src/main/xmli18n-tmp.h:556 msgid "Apollo P-2200" msgstr "" -#: src/main/xmli18n-tmp.h:510 +#: src/main/xmli18n-tmp.h:557 msgid "Apollo P-2250" msgstr "" -#: src/main/xmli18n-tmp.h:511 +#: src/main/xmli18n-tmp.h:558 msgid "Apollo P-2500" msgstr "" -#: src/main/xmli18n-tmp.h:512 +#: src/main/xmli18n-tmp.h:559 msgid "Apollo P-2550" msgstr "" -#: src/main/xmli18n-tmp.h:513 +#: src/main/xmli18n-tmp.h:560 msgid "Apollo P-2600" msgstr "" -#: src/main/xmli18n-tmp.h:514 +#: src/main/xmli18n-tmp.h:561 msgid "Apollo P-2650" msgstr "" -#: src/main/xmli18n-tmp.h:515 +#: src/main/xmli18n-tmp.h:562 msgid "Apple Color StyleWriter 4100" msgstr "" -#: src/main/xmli18n-tmp.h:516 +#: src/main/xmli18n-tmp.h:563 msgid "Apple Color StyleWriter 4500" msgstr "" -#: src/main/xmli18n-tmp.h:517 +#: src/main/xmli18n-tmp.h:564 msgid "Apple Color StyleWriter 6500" msgstr "" -#: src/main/xmli18n-tmp.h:518 +#: src/main/xmli18n-tmp.h:565 msgid "Apple LaserWriter Select 360" msgstr "" -#: src/main/xmli18n-tmp.h:519 +#: src/main/xmli18n-tmp.h:566 msgid "Brother DCP-1200" msgstr "" -#: src/main/xmli18n-tmp.h:520 +#: src/main/xmli18n-tmp.h:567 msgid "Brother HL-4Ve" msgstr "" -#: src/main/xmli18n-tmp.h:521 +#: src/main/xmli18n-tmp.h:568 msgid "Brother HL-10V" msgstr "" -#: src/main/xmli18n-tmp.h:522 +#: src/main/xmli18n-tmp.h:569 msgid "Brother HL-10h" msgstr "" -#: src/main/xmli18n-tmp.h:523 +#: src/main/xmli18n-tmp.h:570 msgid "Brother HL-630" msgstr "" -#: src/main/xmli18n-tmp.h:524 +#: src/main/xmli18n-tmp.h:571 msgid "Brother HL-660" msgstr "" -#: src/main/xmli18n-tmp.h:525 +#: src/main/xmli18n-tmp.h:572 msgid "Brother HL-760" msgstr "" -#: src/main/xmli18n-tmp.h:526 +#: src/main/xmli18n-tmp.h:573 msgid "Brother HL-960" msgstr "" -#: src/main/xmli18n-tmp.h:527 +#: src/main/xmli18n-tmp.h:574 msgid "Brother HL-1040" msgstr "" -#: src/main/xmli18n-tmp.h:528 +#: src/main/xmli18n-tmp.h:575 msgid "Brother HL-1050" msgstr "" -#: src/main/xmli18n-tmp.h:529 +#: src/main/xmli18n-tmp.h:576 msgid "Brother HL-1060" msgstr "" -#: src/main/xmli18n-tmp.h:530 +#: src/main/xmli18n-tmp.h:577 msgid "Brother HL-1070" msgstr "" -#: src/main/xmli18n-tmp.h:531 +#: src/main/xmli18n-tmp.h:578 msgid "Brother HL-1240" msgstr "" -#: src/main/xmli18n-tmp.h:532 +#: src/main/xmli18n-tmp.h:579 msgid "Brother HL-1250" msgstr "" -#: src/main/xmli18n-tmp.h:533 +#: src/main/xmli18n-tmp.h:580 msgid "Brother HL-1260" msgstr "" -#: src/main/xmli18n-tmp.h:534 +#: src/main/xmli18n-tmp.h:581 msgid "Brother HL-1270N" msgstr "" -#: src/main/xmli18n-tmp.h:535 +#: src/main/xmli18n-tmp.h:582 msgid "Brother HL-1440" msgstr "" -#: src/main/xmli18n-tmp.h:536 +#: src/main/xmli18n-tmp.h:583 msgid "Brother HL-1660e" msgstr "" -#: src/main/xmli18n-tmp.h:537 +#: src/main/xmli18n-tmp.h:584 msgid "Brother HL-2060" msgstr "" -#: src/main/xmli18n-tmp.h:538 +#: src/main/xmli18n-tmp.h:585 msgid "Brother MFC-6550MC" msgstr "" -#: src/main/xmli18n-tmp.h:539 +#: src/main/xmli18n-tmp.h:586 msgid "Brother MFC-8300" msgstr "" -#: src/main/xmli18n-tmp.h:540 +#: src/main/xmli18n-tmp.h:587 msgid "Brother MFC-9500" msgstr "" -#: src/main/xmli18n-tmp.h:541 +#: src/main/xmli18n-tmp.h:588 msgid "Brother MFC-9600" msgstr "" -#: src/main/xmli18n-tmp.h:542 +#: src/main/xmli18n-tmp.h:589 msgid "Canon GP 335" msgstr "" -#: src/main/xmli18n-tmp.h:543 +#: src/main/xmli18n-tmp.h:590 msgid "Canon LBP-4sx" msgstr "" -#: src/main/xmli18n-tmp.h:544 +#: src/main/xmli18n-tmp.h:591 msgid "Canon LBP-430" msgstr "" -#: src/main/xmli18n-tmp.h:545 +#: src/main/xmli18n-tmp.h:592 msgid "Canon LBP-1000" msgstr "" -#: src/main/xmli18n-tmp.h:546 +#: src/main/xmli18n-tmp.h:593 msgid "Canon LBP-1260" msgstr "" -#: src/main/xmli18n-tmp.h:547 +#: src/main/xmli18n-tmp.h:594 msgid "Canon LBP-1760" msgstr "" -#: src/main/xmli18n-tmp.h:548 +#: src/main/xmli18n-tmp.h:595 msgid "Canon imageRunner 330s" msgstr "" -#: src/main/xmli18n-tmp.h:549 +#: src/main/xmli18n-tmp.h:596 msgid "Citizen ProJet II" msgstr "" -#: src/main/xmli18n-tmp.h:550 +#: src/main/xmli18n-tmp.h:597 msgid "DEC 1800" msgstr "" -#: src/main/xmli18n-tmp.h:551 +#: src/main/xmli18n-tmp.h:598 msgid "DEC LN17" msgstr "" -#: src/main/xmli18n-tmp.h:552 +#: src/main/xmli18n-tmp.h:599 msgid "Epson ActionLaser 1100" msgstr "" -#: src/main/xmli18n-tmp.h:553 +#: src/main/xmli18n-tmp.h:600 msgid "Epson ActionLaser II" msgstr "" -#: src/main/xmli18n-tmp.h:554 +#: src/main/xmli18n-tmp.h:601 msgid "Epson AcuLaser C2000" msgstr "" -#: src/main/xmli18n-tmp.h:555 +#: src/main/xmli18n-tmp.h:602 msgid "Epson AcuLaser C2000PS" msgstr "" -#: src/main/xmli18n-tmp.h:556 +#: src/main/xmli18n-tmp.h:603 msgid "Epson AcuLaser C8500" msgstr "" -#: src/main/xmli18n-tmp.h:557 +#: src/main/xmli18n-tmp.h:604 msgid "Epson AcuLaser C8500PS" msgstr "" -#: src/main/xmli18n-tmp.h:558 +#: src/main/xmli18n-tmp.h:605 msgid "Epson AcuLaser C8600" msgstr "" -#: src/main/xmli18n-tmp.h:559 +#: src/main/xmli18n-tmp.h:606 msgid "Epson AcuLaser C8600PS" msgstr "" -#: src/main/xmli18n-tmp.h:560 +#: src/main/xmli18n-tmp.h:607 msgid "Epson EPL-5200" msgstr "" -#: src/main/xmli18n-tmp.h:561 +#: src/main/xmli18n-tmp.h:608 msgid "Epson EPL-5200+" msgstr "" -#: src/main/xmli18n-tmp.h:562 +#: src/main/xmli18n-tmp.h:609 msgid "Epson EPL-5700" msgstr "" -#: src/main/xmli18n-tmp.h:563 +#: src/main/xmli18n-tmp.h:610 msgid "Epson EPL-5700PS" msgstr "" -#: src/main/xmli18n-tmp.h:564 +#: src/main/xmli18n-tmp.h:611 msgid "Epson EPL-5800" msgstr "" -#: src/main/xmli18n-tmp.h:565 +#: src/main/xmli18n-tmp.h:612 msgid "Epson EPL-5800PS" msgstr "" -#: src/main/xmli18n-tmp.h:566 +#: src/main/xmli18n-tmp.h:613 msgid "Epson EPL-5900" msgstr "" -#: src/main/xmli18n-tmp.h:567 +#: src/main/xmli18n-tmp.h:614 msgid "Epson EPL-5900PS" msgstr "" -#: src/main/xmli18n-tmp.h:568 +#: src/main/xmli18n-tmp.h:615 msgid "Epson EPL-6100" msgstr "" -#: src/main/xmli18n-tmp.h:569 +#: src/main/xmli18n-tmp.h:616 msgid "Epson EPL-6100PS" msgstr "" -#: src/main/xmli18n-tmp.h:570 +#: src/main/xmli18n-tmp.h:617 msgid "Epson EPL-7100" msgstr "" -#: src/main/xmli18n-tmp.h:571 +#: src/main/xmli18n-tmp.h:618 msgid "Fujitsu PrintPartner 10V" msgstr "" -#: src/main/xmli18n-tmp.h:572 +#: src/main/xmli18n-tmp.h:619 msgid "Fujitsu PrintPartner 16DV" msgstr "" -#: src/main/xmli18n-tmp.h:573 +#: src/main/xmli18n-tmp.h:620 msgid "Fujitsu PrintPartner 20W" msgstr "" -#: src/main/xmli18n-tmp.h:574 +#: src/main/xmli18n-tmp.h:621 msgid "Fujitsu PrintPartner 8000" msgstr "" -#: src/main/xmli18n-tmp.h:575 +#: src/main/xmli18n-tmp.h:622 #, fuzzy msgid "Generic PCL 4 Printer" -msgstr "Definovanie novej tlaÄiarne" +msgstr "Definovanie novej tlaèiarne" -#: src/main/xmli18n-tmp.h:576 +#: src/main/xmli18n-tmp.h:623 +#, fuzzy +msgid "Generic PCL 4 LF Printer" +msgstr "Definovanie novej tlaèiarne" + +#: src/main/xmli18n-tmp.h:624 #, fuzzy msgid "Generic PCL 5 Printer" -msgstr "Definovanie novej tlaÄiarne" +msgstr "Definovanie novej tlaèiarne" -#: src/main/xmli18n-tmp.h:577 +#: src/main/xmli18n-tmp.h:625 +#, fuzzy +msgid "Generic PCL 5 LF Printer" +msgstr "Definovanie novej tlaèiarne" + +#: src/main/xmli18n-tmp.h:626 #, fuzzy msgid "Generic PCL 5c Printer" -msgstr "Definovanie novej tlaÄiarne" +msgstr "Definovanie novej tlaèiarne" -#: src/main/xmli18n-tmp.h:578 +#: src/main/xmli18n-tmp.h:627 +#, fuzzy +msgid "Generic PCL 5c LF Printer" +msgstr "Definovanie novej tlaèiarne" + +#: src/main/xmli18n-tmp.h:628 #, fuzzy msgid "Generic PCL 5e Printer" -msgstr "Definovanie novej tlaÄiarne" +msgstr "Definovanie novej tlaèiarne" -#: src/main/xmli18n-tmp.h:579 +#: src/main/xmli18n-tmp.h:629 +#, fuzzy +msgid "Generic PCL 5e LF Printer" +msgstr "Definovanie novej tlaèiarne" + +#: src/main/xmli18n-tmp.h:630 msgid "Generic PCL 6/PCL XL Printer" msgstr "" -#: src/main/xmli18n-tmp.h:580 +#: src/main/xmli18n-tmp.h:631 +#, fuzzy +msgid "Generic PCL 6/PCL XL LF Printer" +msgstr "Definovanie novej tlaèiarne" + +#: src/main/xmli18n-tmp.h:632 msgid "HP Business Inkjet 2200" msgstr "" -#: src/main/xmli18n-tmp.h:581 +#: src/main/xmli18n-tmp.h:633 msgid "HP Business Inkjet 2230" msgstr "" -#: src/main/xmli18n-tmp.h:582 +#: src/main/xmli18n-tmp.h:634 msgid "HP Business Inkjet 2250" msgstr "" -#: src/main/xmli18n-tmp.h:583 +#: src/main/xmli18n-tmp.h:635 msgid "HP Business Inkjet 2250TN" msgstr "" -#: src/main/xmli18n-tmp.h:584 +#: src/main/xmli18n-tmp.h:636 msgid "HP Business Inkjet 2280" msgstr "" -#: src/main/xmli18n-tmp.h:585 +#: src/main/xmli18n-tmp.h:637 msgid "HP Color Inkjet Printer CP1160" msgstr "" -#: src/main/xmli18n-tmp.h:586 +#: src/main/xmli18n-tmp.h:638 msgid "HP Color Inkjet Printer CP1700" msgstr "" -#: src/main/xmli18n-tmp.h:587 +#: src/main/xmli18n-tmp.h:639 msgid "HP Color LaserJet 2500" msgstr "" -#: src/main/xmli18n-tmp.h:588 +#: src/main/xmli18n-tmp.h:640 msgid "HP Color LaserJet 4500" msgstr "" -#: src/main/xmli18n-tmp.h:589 +#: src/main/xmli18n-tmp.h:641 msgid "HP Color LaserJet 4550" msgstr "" -#: src/main/xmli18n-tmp.h:590 +#: src/main/xmli18n-tmp.h:642 msgid "HP Color LaserJet 4600" msgstr "" -#: src/main/xmli18n-tmp.h:591 +#: src/main/xmli18n-tmp.h:643 msgid "HP Color LaserJet 5" msgstr "" -#: src/main/xmli18n-tmp.h:592 +#: src/main/xmli18n-tmp.h:644 msgid "HP Color LaserJet 5000" msgstr "" -#: src/main/xmli18n-tmp.h:593 +#: src/main/xmli18n-tmp.h:645 msgid "HP Color LaserJet 5500" msgstr "" -#: src/main/xmli18n-tmp.h:594 +#: src/main/xmli18n-tmp.h:646 msgid "HP Color LaserJet 8550GN" msgstr "" -#: src/main/xmli18n-tmp.h:595 +#: src/main/xmli18n-tmp.h:647 msgid "HP DesignJet 230" msgstr "" -#: src/main/xmli18n-tmp.h:596 +#: src/main/xmli18n-tmp.h:648 msgid "HP DesignJet 250C" msgstr "" -#: src/main/xmli18n-tmp.h:597 +#: src/main/xmli18n-tmp.h:649 msgid "HP DesignJet 430" msgstr "" -#: src/main/xmli18n-tmp.h:598 +#: src/main/xmli18n-tmp.h:650 msgid "HP DesignJet 450C" msgstr "" -#: src/main/xmli18n-tmp.h:599 +#: src/main/xmli18n-tmp.h:651 msgid "HP DesignJet 455CA" msgstr "" -#: src/main/xmli18n-tmp.h:600 +#: src/main/xmli18n-tmp.h:652 msgid "HP DesignJet 488CA" msgstr "" -#: src/main/xmli18n-tmp.h:601 +#: src/main/xmli18n-tmp.h:653 msgid "HP DesignJet 700" msgstr "" -#: src/main/xmli18n-tmp.h:602 +#: src/main/xmli18n-tmp.h:654 msgid "HP DesignJet 750C Plus" msgstr "" -#: src/main/xmli18n-tmp.h:603 +#: src/main/xmli18n-tmp.h:655 msgid "HP DesignJet 750C" msgstr "" -#: src/main/xmli18n-tmp.h:604 +#: src/main/xmli18n-tmp.h:656 msgid "HP DesignJet 2500CP" msgstr "" -#: src/main/xmli18n-tmp.h:605 +#: src/main/xmli18n-tmp.h:657 msgid "HP DesignJet 3500CP" msgstr "" -#: src/main/xmli18n-tmp.h:606 +#: src/main/xmli18n-tmp.h:658 msgid "HP DesignJet ColorPro CAD" msgstr "" -#: src/main/xmli18n-tmp.h:607 +#: src/main/xmli18n-tmp.h:659 msgid "HP DeskJet 400" msgstr "" -#: src/main/xmli18n-tmp.h:608 +#: src/main/xmli18n-tmp.h:660 msgid "HP DeskJet 420C" msgstr "" -#: src/main/xmli18n-tmp.h:609 +#: src/main/xmli18n-tmp.h:661 msgid "HP DeskJet 450" msgstr "" -#: src/main/xmli18n-tmp.h:610 +#: src/main/xmli18n-tmp.h:662 msgid "HP DeskJet 500" msgstr "" -#: src/main/xmli18n-tmp.h:611 +#: src/main/xmli18n-tmp.h:663 msgid "HP DeskJet 500C" msgstr "" -#: src/main/xmli18n-tmp.h:612 +#: src/main/xmli18n-tmp.h:664 msgid "HP DeskJet 505J Plus" msgstr "" -#: src/main/xmli18n-tmp.h:613 +#: src/main/xmli18n-tmp.h:665 msgid "HP DeskJet 510" msgstr "" -#: src/main/xmli18n-tmp.h:614 +#: src/main/xmli18n-tmp.h:666 msgid "HP DeskJet 520" msgstr "" -#: src/main/xmli18n-tmp.h:615 +#: src/main/xmli18n-tmp.h:667 msgid "HP DeskJet 540C" msgstr "" -#: src/main/xmli18n-tmp.h:616 +#: src/main/xmli18n-tmp.h:668 msgid "HP DeskJet 550C" msgstr "" -#: src/main/xmli18n-tmp.h:617 +#: src/main/xmli18n-tmp.h:669 msgid "HP DeskJet 5550" msgstr "" -#: src/main/xmli18n-tmp.h:618 +#: src/main/xmli18n-tmp.h:670 msgid "HP DeskJet 5551" msgstr "" -#: src/main/xmli18n-tmp.h:619 +#: src/main/xmli18n-tmp.h:671 msgid "HP DeskJet 560C" msgstr "" -#: src/main/xmli18n-tmp.h:620 +#: src/main/xmli18n-tmp.h:672 msgid "HP DeskJet 600" msgstr "" -#: src/main/xmli18n-tmp.h:621 +#: src/main/xmli18n-tmp.h:673 msgid "HP DeskJet 600C" msgstr "" -#: src/main/xmli18n-tmp.h:622 +#: src/main/xmli18n-tmp.h:674 msgid "HP DeskJet 610C" msgstr "" -#: src/main/xmli18n-tmp.h:623 +#: src/main/xmli18n-tmp.h:675 msgid "HP DeskJet 610CL" msgstr "" -#: src/main/xmli18n-tmp.h:624 +#: src/main/xmli18n-tmp.h:676 msgid "HP DeskJet 6122" msgstr "" -#: src/main/xmli18n-tmp.h:625 +#: src/main/xmli18n-tmp.h:677 msgid "HP DeskJet 6127" msgstr "" -#: src/main/xmli18n-tmp.h:626 +#: src/main/xmli18n-tmp.h:678 msgid "HP DeskJet 612C" msgstr "" -#: src/main/xmli18n-tmp.h:627 +#: src/main/xmli18n-tmp.h:679 msgid "HP DeskJet 640C" msgstr "" -#: src/main/xmli18n-tmp.h:628 +#: src/main/xmli18n-tmp.h:680 msgid "HP DeskJet 648C" msgstr "" -#: src/main/xmli18n-tmp.h:629 +#: src/main/xmli18n-tmp.h:681 msgid "HP DeskJet 660C" msgstr "" -#: src/main/xmli18n-tmp.h:630 +#: src/main/xmli18n-tmp.h:682 msgid "HP DeskJet 670C" msgstr "" -#: src/main/xmli18n-tmp.h:631 +#: src/main/xmli18n-tmp.h:683 msgid "HP DeskJet 670TV" msgstr "" -#: src/main/xmli18n-tmp.h:632 +#: src/main/xmli18n-tmp.h:684 msgid "HP DeskJet 672C" msgstr "" -#: src/main/xmli18n-tmp.h:633 +#: src/main/xmli18n-tmp.h:685 msgid "HP DeskJet 680C" msgstr "" -#: src/main/xmli18n-tmp.h:634 +#: src/main/xmli18n-tmp.h:686 msgid "HP DeskJet 682C" msgstr "" -#: src/main/xmli18n-tmp.h:635 +#: src/main/xmli18n-tmp.h:687 msgid "HP DeskJet 690C" msgstr "" -#: src/main/xmli18n-tmp.h:636 +#: src/main/xmli18n-tmp.h:688 msgid "HP DeskJet 692C" msgstr "" -#: src/main/xmli18n-tmp.h:637 +#: src/main/xmli18n-tmp.h:689 msgid "HP DeskJet 693C" msgstr "" -#: src/main/xmli18n-tmp.h:638 +#: src/main/xmli18n-tmp.h:690 msgid "HP DeskJet 694C" msgstr "" -#: src/main/xmli18n-tmp.h:639 +#: src/main/xmli18n-tmp.h:691 msgid "HP DeskJet 695C" msgstr "" -#: src/main/xmli18n-tmp.h:640 +#: src/main/xmli18n-tmp.h:692 msgid "HP DeskJet 697C" msgstr "" -#: src/main/xmli18n-tmp.h:641 +#: src/main/xmli18n-tmp.h:693 msgid "HP DeskJet 810C" msgstr "" -#: src/main/xmli18n-tmp.h:642 +#: src/main/xmli18n-tmp.h:694 msgid "HP DeskJet 812C" msgstr "" -#: src/main/xmli18n-tmp.h:643 +#: src/main/xmli18n-tmp.h:695 msgid "HP DeskJet 815C" msgstr "" -#: src/main/xmli18n-tmp.h:644 +#: src/main/xmli18n-tmp.h:696 msgid "HP DeskJet 816C" msgstr "" -#: src/main/xmli18n-tmp.h:645 +#: src/main/xmli18n-tmp.h:697 msgid "HP DeskJet 825C" msgstr "" -#: src/main/xmli18n-tmp.h:646 +#: src/main/xmli18n-tmp.h:698 msgid "HP DeskJet 830C" msgstr "" -#: src/main/xmli18n-tmp.h:647 +#: src/main/xmli18n-tmp.h:699 msgid "HP DeskJet 832C" msgstr "" -#: src/main/xmli18n-tmp.h:648 +#: src/main/xmli18n-tmp.h:700 msgid "HP DeskJet 840C" msgstr "" -#: src/main/xmli18n-tmp.h:649 +#: src/main/xmli18n-tmp.h:701 msgid "HP DeskJet 841C" msgstr "" -#: src/main/xmli18n-tmp.h:650 +#: src/main/xmli18n-tmp.h:702 msgid "HP DeskJet 842C" msgstr "" -#: src/main/xmli18n-tmp.h:651 +#: src/main/xmli18n-tmp.h:703 msgid "HP DeskJet 843C" msgstr "" -#: src/main/xmli18n-tmp.h:652 +#: src/main/xmli18n-tmp.h:704 msgid "HP DeskJet 845C" msgstr "" -#: src/main/xmli18n-tmp.h:653 +#: src/main/xmli18n-tmp.h:705 msgid "HP DeskJet 850C" msgstr "" -#: src/main/xmli18n-tmp.h:654 +#: src/main/xmli18n-tmp.h:706 msgid "HP DeskJet 855C" msgstr "" -#: src/main/xmli18n-tmp.h:655 +#: src/main/xmli18n-tmp.h:707 msgid "HP DeskJet 870C" msgstr "" -#: src/main/xmli18n-tmp.h:656 +#: src/main/xmli18n-tmp.h:708 msgid "HP DeskJet 880C" msgstr "" -#: src/main/xmli18n-tmp.h:657 +#: src/main/xmli18n-tmp.h:709 msgid "HP DeskJet 882C" msgstr "" -#: src/main/xmli18n-tmp.h:658 +#: src/main/xmli18n-tmp.h:710 msgid "HP DeskJet 890C" msgstr "" -#: src/main/xmli18n-tmp.h:659 +#: src/main/xmli18n-tmp.h:711 msgid "HP DeskJet 895C" msgstr "" -#: src/main/xmli18n-tmp.h:660 +#: src/main/xmli18n-tmp.h:712 msgid "HP DeskJet 916C" msgstr "" -#: src/main/xmli18n-tmp.h:661 +#: src/main/xmli18n-tmp.h:713 msgid "HP DeskJet 920C" msgstr "" -#: src/main/xmli18n-tmp.h:662 +#: src/main/xmli18n-tmp.h:714 msgid "HP DeskJet 9300" msgstr "" -#: src/main/xmli18n-tmp.h:663 +#: src/main/xmli18n-tmp.h:715 msgid "HP DeskJet 930C" msgstr "" -#: src/main/xmli18n-tmp.h:664 +#: src/main/xmli18n-tmp.h:716 msgid "HP DeskJet 932C" msgstr "" -#: src/main/xmli18n-tmp.h:665 +#: src/main/xmli18n-tmp.h:717 msgid "HP DeskJet 933C" msgstr "" -#: src/main/xmli18n-tmp.h:666 +#: src/main/xmli18n-tmp.h:718 msgid "HP DeskJet 934C" msgstr "" -#: src/main/xmli18n-tmp.h:667 +#: src/main/xmli18n-tmp.h:719 msgid "HP DeskJet 935C" msgstr "" -#: src/main/xmli18n-tmp.h:668 +#: src/main/xmli18n-tmp.h:720 msgid "HP DeskJet 940C" msgstr "" -#: src/main/xmli18n-tmp.h:669 +#: src/main/xmli18n-tmp.h:721 msgid "HP DeskJet 948C" msgstr "" -#: src/main/xmli18n-tmp.h:670 +#: src/main/xmli18n-tmp.h:722 msgid "HP DeskJet 950C" msgstr "" -#: src/main/xmli18n-tmp.h:671 +#: src/main/xmli18n-tmp.h:723 msgid "HP DeskJet 952C" msgstr "" -#: src/main/xmli18n-tmp.h:672 +#: src/main/xmli18n-tmp.h:724 msgid "HP DeskJet 955C" msgstr "" -#: src/main/xmli18n-tmp.h:673 +#: src/main/xmli18n-tmp.h:725 msgid "HP DeskJet 957C" msgstr "" -#: src/main/xmli18n-tmp.h:674 +#: src/main/xmli18n-tmp.h:726 msgid "HP DeskJet 959C" msgstr "" -#: src/main/xmli18n-tmp.h:675 +#: src/main/xmli18n-tmp.h:727 msgid "HP DeskJet 960C" msgstr "" -#: src/main/xmli18n-tmp.h:676 +#: src/main/xmli18n-tmp.h:728 msgid "HP DeskJet 970C" msgstr "" -#: src/main/xmli18n-tmp.h:677 +#: src/main/xmli18n-tmp.h:729 msgid "HP DeskJet 975C" msgstr "" -#: src/main/xmli18n-tmp.h:678 +#: src/main/xmli18n-tmp.h:730 msgid "HP DeskJet 980C" msgstr "" -#: src/main/xmli18n-tmp.h:679 +#: src/main/xmli18n-tmp.h:731 msgid "HP DeskJet 990C" msgstr "" -#: src/main/xmli18n-tmp.h:680 +#: src/main/xmli18n-tmp.h:732 msgid "HP DeskJet 995C" msgstr "" -#: src/main/xmli18n-tmp.h:681 +#: src/main/xmli18n-tmp.h:733 msgid "HP DeskJet 1100C" msgstr "" -#: src/main/xmli18n-tmp.h:682 +#: src/main/xmli18n-tmp.h:734 msgid "HP DeskJet 1120C" msgstr "" -#: src/main/xmli18n-tmp.h:683 +#: src/main/xmli18n-tmp.h:735 msgid "HP DeskJet 1125C" msgstr "" -#: src/main/xmli18n-tmp.h:684 +#: src/main/xmli18n-tmp.h:736 msgid "HP DeskJet 1200C" msgstr "" -#: src/main/xmli18n-tmp.h:685 +#: src/main/xmli18n-tmp.h:737 msgid "HP DeskJet 1220C" msgstr "" -#: src/main/xmli18n-tmp.h:686 +#: src/main/xmli18n-tmp.h:738 msgid "HP DeskJet 1600C" msgstr "" -#: src/main/xmli18n-tmp.h:687 +#: src/main/xmli18n-tmp.h:739 msgid "HP DeskJet 1600CM" msgstr "" -#: src/main/xmli18n-tmp.h:688 +#: src/main/xmli18n-tmp.h:740 msgid "HP DeskJet 2000" msgstr "" -#: src/main/xmli18n-tmp.h:689 +#: src/main/xmli18n-tmp.h:741 msgid "HP DeskJet 2500" msgstr "" -#: src/main/xmli18n-tmp.h:690 +#: src/main/xmli18n-tmp.h:742 msgid "HP DeskJet 2500CM" msgstr "" -#: src/main/xmli18n-tmp.h:691 +#: src/main/xmli18n-tmp.h:743 msgid "HP DeskJet 340C" msgstr "" -#: src/main/xmli18n-tmp.h:692 +#: src/main/xmli18n-tmp.h:744 msgid "HP DeskJet 3810" msgstr "" -#: src/main/xmli18n-tmp.h:693 +#: src/main/xmli18n-tmp.h:745 msgid "HP DeskJet 3816" msgstr "" -#: src/main/xmli18n-tmp.h:694 +#: src/main/xmli18n-tmp.h:746 msgid "HP DeskJet 3820" msgstr "" -#: src/main/xmli18n-tmp.h:695 +#: src/main/xmli18n-tmp.h:747 msgid "HP DeskJet 3822" msgstr "" -#: src/main/xmli18n-tmp.h:696 +#: src/main/xmli18n-tmp.h:748 msgid "HP LaserJet 2" msgstr "" -#: src/main/xmli18n-tmp.h:697 +#: src/main/xmli18n-tmp.h:749 msgid "HP LaserJet 2D" msgstr "" -#: src/main/xmli18n-tmp.h:698 +#: src/main/xmli18n-tmp.h:750 msgid "HP LaserJet 2P Plus" msgstr "" -#: src/main/xmli18n-tmp.h:699 +#: src/main/xmli18n-tmp.h:751 msgid "HP LaserJet 2P" msgstr "" -#: src/main/xmli18n-tmp.h:700 +#: src/main/xmli18n-tmp.h:752 msgid "HP LaserJet 3" msgstr "" -#: src/main/xmli18n-tmp.h:701 +#: src/main/xmli18n-tmp.h:753 msgid "HP LaserJet 3D" msgstr "" -#: src/main/xmli18n-tmp.h:702 +#: src/main/xmli18n-tmp.h:754 msgid "HP LaserJet 3P w/ PCL5" msgstr "" -#: src/main/xmli18n-tmp.h:703 +#: src/main/xmli18n-tmp.h:755 msgid "HP LaserJet 3P w/PS" msgstr "" -#: src/main/xmli18n-tmp.h:704 +#: src/main/xmli18n-tmp.h:756 msgid "HP LaserJet 4 Plus" msgstr "" -#: src/main/xmli18n-tmp.h:705 +#: src/main/xmli18n-tmp.h:757 msgid "HP LaserJet 4" msgstr "" -#: src/main/xmli18n-tmp.h:706 +#: src/main/xmli18n-tmp.h:758 msgid "HP LaserJet 4L" msgstr "" -#: src/main/xmli18n-tmp.h:707 +#: src/main/xmli18n-tmp.h:759 msgid "HP LaserJet 4M" msgstr "" -#: src/main/xmli18n-tmp.h:708 +#: src/main/xmli18n-tmp.h:760 msgid "HP LaserJet 4ML" msgstr "" -#: src/main/xmli18n-tmp.h:709 +#: src/main/xmli18n-tmp.h:761 msgid "HP LaserJet 4P" msgstr "" -#: src/main/xmli18n-tmp.h:710 +#: src/main/xmli18n-tmp.h:762 msgid "HP LaserJet 4Si" msgstr "" -#: src/main/xmli18n-tmp.h:711 +#: src/main/xmli18n-tmp.h:763 msgid "HP LaserJet 4V" msgstr "" -#: src/main/xmli18n-tmp.h:712 +#: src/main/xmli18n-tmp.h:764 msgid "HP LaserJet 5" msgstr "" -#: src/main/xmli18n-tmp.h:713 +#: src/main/xmli18n-tmp.h:765 msgid "HP LaserJet 5L" msgstr "" -#: src/main/xmli18n-tmp.h:714 +#: src/main/xmli18n-tmp.h:766 msgid "HP LaserJet 5M" msgstr "" -#: src/main/xmli18n-tmp.h:715 +#: src/main/xmli18n-tmp.h:767 msgid "HP LaserJet 5MP" msgstr "" -#: src/main/xmli18n-tmp.h:716 +#: src/main/xmli18n-tmp.h:768 msgid "HP LaserJet 5P" msgstr "" -#: src/main/xmli18n-tmp.h:717 +#: src/main/xmli18n-tmp.h:769 msgid "HP LaserJet 5Si" msgstr "" -#: src/main/xmli18n-tmp.h:718 +#: src/main/xmli18n-tmp.h:770 msgid "HP LaserJet 6" msgstr "" -#: src/main/xmli18n-tmp.h:719 +#: src/main/xmli18n-tmp.h:771 msgid "HP LaserJet 6L" msgstr "" -#: src/main/xmli18n-tmp.h:720 +#: src/main/xmli18n-tmp.h:772 msgid "HP LaserJet 6MP" msgstr "" -#: src/main/xmli18n-tmp.h:721 +#: src/main/xmli18n-tmp.h:773 msgid "HP LaserJet 6P" msgstr "" -#: src/main/xmli18n-tmp.h:722 +#: src/main/xmli18n-tmp.h:774 msgid "HP LaserJet 1010" msgstr "" -#: src/main/xmli18n-tmp.h:723 +#: src/main/xmli18n-tmp.h:775 msgid "HP LaserJet 1012" msgstr "" -#: src/main/xmli18n-tmp.h:724 +#: src/main/xmli18n-tmp.h:776 msgid "HP LaserJet 1015" msgstr "" -#: src/main/xmli18n-tmp.h:725 +#: src/main/xmli18n-tmp.h:777 msgid "HP LaserJet 1022" msgstr "" -#: src/main/xmli18n-tmp.h:726 +#: src/main/xmli18n-tmp.h:778 msgid "HP LaserJet 1100" msgstr "" -#: src/main/xmli18n-tmp.h:727 +#: src/main/xmli18n-tmp.h:779 msgid "HP LaserJet 1100A" msgstr "" -#: src/main/xmli18n-tmp.h:728 +#: src/main/xmli18n-tmp.h:780 msgid "HP LaserJet 1150" msgstr "" -#: src/main/xmli18n-tmp.h:729 +#: src/main/xmli18n-tmp.h:781 msgid "HP LaserJet 1200" msgstr "" -#: src/main/xmli18n-tmp.h:730 +#: src/main/xmli18n-tmp.h:782 msgid "HP LaserJet 1220" msgstr "" -#: src/main/xmli18n-tmp.h:731 +#: src/main/xmli18n-tmp.h:783 msgid "HP LaserJet 1300" msgstr "" -#: src/main/xmli18n-tmp.h:732 +#: src/main/xmli18n-tmp.h:784 msgid "HP LaserJet 2100" msgstr "" -#: src/main/xmli18n-tmp.h:733 +#: src/main/xmli18n-tmp.h:785 msgid "HP LaserJet 2100M" msgstr "" -#: src/main/xmli18n-tmp.h:734 +#: src/main/xmli18n-tmp.h:786 msgid "HP LaserJet 2200" msgstr "" -#: src/main/xmli18n-tmp.h:735 +#: src/main/xmli18n-tmp.h:787 msgid "HP LaserJet 2300" msgstr "" -#: src/main/xmli18n-tmp.h:736 +#: src/main/xmli18n-tmp.h:788 msgid "HP LaserJet 3200" msgstr "" -#: src/main/xmli18n-tmp.h:737 +#: src/main/xmli18n-tmp.h:789 msgid "HP LaserJet 3200m" msgstr "" -#: src/main/xmli18n-tmp.h:738 +#: src/main/xmli18n-tmp.h:790 msgid "HP LaserJet 3200se" msgstr "" -#: src/main/xmli18n-tmp.h:739 +#: src/main/xmli18n-tmp.h:791 msgid "HP LaserJet 3300 MFP" msgstr "" -#: src/main/xmli18n-tmp.h:740 +#: src/main/xmli18n-tmp.h:792 msgid "HP LaserJet 3310 MFP" msgstr "" -#: src/main/xmli18n-tmp.h:741 +#: src/main/xmli18n-tmp.h:793 msgid "HP LaserJet 3320 MFP" msgstr "" -#: src/main/xmli18n-tmp.h:742 +#: src/main/xmli18n-tmp.h:794 msgid "HP LaserJet 3320N MFP" msgstr "" -#: src/main/xmli18n-tmp.h:743 +#: src/main/xmli18n-tmp.h:795 msgid "HP LaserJet 3330 MFP" msgstr "" -#: src/main/xmli18n-tmp.h:744 +#: src/main/xmli18n-tmp.h:796 msgid "HP LaserJet 4000" msgstr "" -#: src/main/xmli18n-tmp.h:745 +#: src/main/xmli18n-tmp.h:797 msgid "HP LaserJet 4050" msgstr "" -#: src/main/xmli18n-tmp.h:746 +#: src/main/xmli18n-tmp.h:798 msgid "HP LaserJet 4100" msgstr "" -#: src/main/xmli18n-tmp.h:747 +#: src/main/xmli18n-tmp.h:799 msgid "HP LaserJet 4200" msgstr "" -#: src/main/xmli18n-tmp.h:748 +#: src/main/xmli18n-tmp.h:800 msgid "HP LaserJet 4300" msgstr "" -#: src/main/xmli18n-tmp.h:749 +#: src/main/xmli18n-tmp.h:801 msgid "HP LaserJet 5000" msgstr "" -#: src/main/xmli18n-tmp.h:750 +#: src/main/xmli18n-tmp.h:802 msgid "HP LaserJet 5100" msgstr "" -#: src/main/xmli18n-tmp.h:751 +#: src/main/xmli18n-tmp.h:803 msgid "HP LaserJet 8000" msgstr "" -#: src/main/xmli18n-tmp.h:752 +#: src/main/xmli18n-tmp.h:804 msgid "HP LaserJet 8100" msgstr "" -#: src/main/xmli18n-tmp.h:753 +#: src/main/xmli18n-tmp.h:805 msgid "HP LaserJet 8150" msgstr "" -#: src/main/xmli18n-tmp.h:754 +#: src/main/xmli18n-tmp.h:806 msgid "HP LaserJet 9000" msgstr "" -#: src/main/xmli18n-tmp.h:755 +#: src/main/xmli18n-tmp.h:807 msgid "HP Mopier 240" msgstr "" -#: src/main/xmli18n-tmp.h:756 +#: src/main/xmli18n-tmp.h:808 msgid "HP Mopier 320" msgstr "" -#: src/main/xmli18n-tmp.h:757 +#: src/main/xmli18n-tmp.h:809 msgid "HP OfficeJet 300" msgstr "" -#: src/main/xmli18n-tmp.h:758 +#: src/main/xmli18n-tmp.h:810 msgid "HP OfficeJet 330" msgstr "" -#: src/main/xmli18n-tmp.h:759 +#: src/main/xmli18n-tmp.h:811 msgid "HP OfficeJet 350" msgstr "" -#: src/main/xmli18n-tmp.h:760 +#: src/main/xmli18n-tmp.h:812 msgid "HP OfficeJet 500" msgstr "" -#: src/main/xmli18n-tmp.h:761 +#: src/main/xmli18n-tmp.h:813 msgid "HP OfficeJet 520" msgstr "" -#: src/main/xmli18n-tmp.h:762 +#: src/main/xmli18n-tmp.h:814 msgid "HP OfficeJet 570" msgstr "" -#: src/main/xmli18n-tmp.h:763 +#: src/main/xmli18n-tmp.h:815 msgid "HP OfficeJet 580" msgstr "" -#: src/main/xmli18n-tmp.h:764 +#: src/main/xmli18n-tmp.h:816 msgid "HP OfficeJet 590" msgstr "" -#: src/main/xmli18n-tmp.h:765 +#: src/main/xmli18n-tmp.h:817 msgid "HP OfficeJet 600" msgstr "" -#: src/main/xmli18n-tmp.h:766 +#: src/main/xmli18n-tmp.h:818 msgid "HP OfficeJet 610" msgstr "" -#: src/main/xmli18n-tmp.h:767 +#: src/main/xmli18n-tmp.h:819 msgid "HP OfficeJet 625" msgstr "" -#: src/main/xmli18n-tmp.h:768 +#: src/main/xmli18n-tmp.h:820 msgid "HP OfficeJet 630" msgstr "" -#: src/main/xmli18n-tmp.h:769 +#: src/main/xmli18n-tmp.h:821 msgid "HP OfficeJet 635" msgstr "" -#: src/main/xmli18n-tmp.h:770 +#: src/main/xmli18n-tmp.h:822 msgid "HP OfficeJet 700" msgstr "" -#: src/main/xmli18n-tmp.h:771 +#: src/main/xmli18n-tmp.h:823 msgid "HP OfficeJet 710" msgstr "" -#: src/main/xmli18n-tmp.h:772 +#: src/main/xmli18n-tmp.h:824 msgid "HP OfficeJet 720" msgstr "" -#: src/main/xmli18n-tmp.h:773 +#: src/main/xmli18n-tmp.h:825 msgid "HP OfficeJet 725" msgstr "" -#: src/main/xmli18n-tmp.h:774 +#: src/main/xmli18n-tmp.h:826 msgid "HP OfficeJet 5105" msgstr "" -#: src/main/xmli18n-tmp.h:775 +#: src/main/xmli18n-tmp.h:827 msgid "HP OfficeJet 5110" msgstr "" -#: src/main/xmli18n-tmp.h:776 +#: src/main/xmli18n-tmp.h:828 msgid "HP OfficeJet 5110xi" msgstr "" -#: src/main/xmli18n-tmp.h:777 +#: src/main/xmli18n-tmp.h:829 msgid "HP OfficeJet 6105" msgstr "" -#: src/main/xmli18n-tmp.h:778 +#: src/main/xmli18n-tmp.h:830 msgid "HP OfficeJet 6110" msgstr "" -#: src/main/xmli18n-tmp.h:779 +#: src/main/xmli18n-tmp.h:831 msgid "HP OfficeJet 7110" msgstr "" -#: src/main/xmli18n-tmp.h:780 +#: src/main/xmli18n-tmp.h:832 msgid "HP OfficeJet 7130" msgstr "" -#: src/main/xmli18n-tmp.h:781 +#: src/main/xmli18n-tmp.h:833 msgid "HP OfficeJet 7140" msgstr "" -#: src/main/xmli18n-tmp.h:782 +#: src/main/xmli18n-tmp.h:834 msgid "HP OfficeJet D125" msgstr "" -#: src/main/xmli18n-tmp.h:783 +#: src/main/xmli18n-tmp.h:835 msgid "HP OfficeJet D135" msgstr "" -#: src/main/xmli18n-tmp.h:784 +#: src/main/xmli18n-tmp.h:836 msgid "HP OfficeJet D145" msgstr "" -#: src/main/xmli18n-tmp.h:785 +#: src/main/xmli18n-tmp.h:837 msgid "HP OfficeJet D155" msgstr "" -#: src/main/xmli18n-tmp.h:786 +#: src/main/xmli18n-tmp.h:838 msgid "HP OfficeJet G55" msgstr "" -#: src/main/xmli18n-tmp.h:787 +#: src/main/xmli18n-tmp.h:839 msgid "HP OfficeJet G85" msgstr "" -#: src/main/xmli18n-tmp.h:788 +#: src/main/xmli18n-tmp.h:840 msgid "HP OfficeJet G95" msgstr "" -#: src/main/xmli18n-tmp.h:789 +#: src/main/xmli18n-tmp.h:841 msgid "HP OfficeJet K60" msgstr "" -#: src/main/xmli18n-tmp.h:790 +#: src/main/xmli18n-tmp.h:842 msgid "HP OfficeJet K60xi" msgstr "" -#: src/main/xmli18n-tmp.h:791 +#: src/main/xmli18n-tmp.h:843 msgid "HP OfficeJet K80" msgstr "" -#: src/main/xmli18n-tmp.h:792 +#: src/main/xmli18n-tmp.h:844 msgid "HP OfficeJet K80xi" msgstr "" -#: src/main/xmli18n-tmp.h:793 +#: src/main/xmli18n-tmp.h:845 msgid "HP OfficeJet LX" msgstr "" -#: src/main/xmli18n-tmp.h:794 +#: src/main/xmli18n-tmp.h:846 msgid "HP OfficeJet Pro 1150C" msgstr "" -#: src/main/xmli18n-tmp.h:795 +#: src/main/xmli18n-tmp.h:847 msgid "HP OfficeJet Pro 1170C" msgstr "" -#: src/main/xmli18n-tmp.h:796 +#: src/main/xmli18n-tmp.h:848 msgid "HP OfficeJet Pro 1175C" msgstr "" -#: src/main/xmli18n-tmp.h:797 +#: src/main/xmli18n-tmp.h:849 msgid "HP OfficeJet R40" msgstr "" -#: src/main/xmli18n-tmp.h:798 +#: src/main/xmli18n-tmp.h:850 msgid "HP OfficeJet R45" msgstr "" -#: src/main/xmli18n-tmp.h:799 +#: src/main/xmli18n-tmp.h:851 msgid "HP OfficeJet R60" msgstr "" -#: src/main/xmli18n-tmp.h:800 +#: src/main/xmli18n-tmp.h:852 msgid "HP OfficeJet R65" msgstr "" -#: src/main/xmli18n-tmp.h:801 +#: src/main/xmli18n-tmp.h:853 msgid "HP OfficeJet R80" msgstr "" -#: src/main/xmli18n-tmp.h:802 +#: src/main/xmli18n-tmp.h:854 msgid "HP OfficeJet T45" msgstr "" -#: src/main/xmli18n-tmp.h:803 +#: src/main/xmli18n-tmp.h:855 msgid "HP OfficeJet T65" msgstr "" -#: src/main/xmli18n-tmp.h:804 +#: src/main/xmli18n-tmp.h:856 msgid "HP OfficeJet V40" msgstr "" -#: src/main/xmli18n-tmp.h:805 +#: src/main/xmli18n-tmp.h:857 msgid "HP OfficeJet V40xi" msgstr "" -#: src/main/xmli18n-tmp.h:806 +#: src/main/xmli18n-tmp.h:858 msgid "HP OfficeJet" msgstr "" -#: src/main/xmli18n-tmp.h:807 +#: src/main/xmli18n-tmp.h:859 msgid "HP PSC 370" msgstr "" -#: src/main/xmli18n-tmp.h:808 +#: src/main/xmli18n-tmp.h:860 msgid "HP PSC 380" msgstr "" -#: src/main/xmli18n-tmp.h:809 +#: src/main/xmli18n-tmp.h:861 msgid "HP PSC 500" msgstr "" -#: src/main/xmli18n-tmp.h:810 +#: src/main/xmli18n-tmp.h:862 msgid "HP PSC 750" msgstr "" -#: src/main/xmli18n-tmp.h:811 +#: src/main/xmli18n-tmp.h:863 msgid "HP PSC 950" msgstr "" -#: src/main/xmli18n-tmp.h:812 +#: src/main/xmli18n-tmp.h:864 msgid "HP PSC 950xi" msgstr "" -#: src/main/xmli18n-tmp.h:813 +#: src/main/xmli18n-tmp.h:865 msgid "HP PSC 2110" msgstr "" -#: src/main/xmli18n-tmp.h:814 +#: src/main/xmli18n-tmp.h:866 msgid "HP PSC 2150" msgstr "" -#: src/main/xmli18n-tmp.h:815 +#: src/main/xmli18n-tmp.h:867 msgid "HP PSC 2210" msgstr "" -#: src/main/xmli18n-tmp.h:816 +#: src/main/xmli18n-tmp.h:868 msgid "HP PhotoSmart 7150" msgstr "" -#: src/main/xmli18n-tmp.h:817 +#: src/main/xmli18n-tmp.h:869 msgid "HP PhotoSmart 7345" msgstr "" -#: src/main/xmli18n-tmp.h:818 +#: src/main/xmli18n-tmp.h:870 msgid "HP PhotoSmart 7350" msgstr "" -#: src/main/xmli18n-tmp.h:819 +#: src/main/xmli18n-tmp.h:871 msgid "HP PhotoSmart 7550" msgstr "" -#: src/main/xmli18n-tmp.h:820 +#: src/main/xmli18n-tmp.h:872 msgid "HP PhotoSmart P100" msgstr "" -#: src/main/xmli18n-tmp.h:821 +#: src/main/xmli18n-tmp.h:873 msgid "HP PhotoSmart P130" msgstr "" -#: src/main/xmli18n-tmp.h:822 +#: src/main/xmli18n-tmp.h:874 msgid "HP PhotoSmart P230" msgstr "" -#: src/main/xmli18n-tmp.h:823 +#: src/main/xmli18n-tmp.h:875 msgid "HP PhotoSmart P1000" msgstr "" -#: src/main/xmli18n-tmp.h:824 +#: src/main/xmli18n-tmp.h:876 msgid "HP PhotoSmart P1100" msgstr "" -#: src/main/xmli18n-tmp.h:825 +#: src/main/xmli18n-tmp.h:877 msgid "HP PhotoSmart P1115" msgstr "" -#: src/main/xmli18n-tmp.h:826 +#: src/main/xmli18n-tmp.h:878 msgid "HP PhotoSmart P1215" msgstr "" -#: src/main/xmli18n-tmp.h:827 +#: src/main/xmli18n-tmp.h:879 msgid "HP PhotoSmart P1218" msgstr "" -#: src/main/xmli18n-tmp.h:828 +#: src/main/xmli18n-tmp.h:880 msgid "HP PhotoSmart P1315" msgstr "" -#: src/main/xmli18n-tmp.h:829 +#: src/main/xmli18n-tmp.h:881 #, fuzzy msgid "HP e-printer e20" -msgstr "Názov tlaÄiarne:" +msgstr "Názov tlaèiarne:" -#: src/main/xmli18n-tmp.h:830 +#: src/main/xmli18n-tmp.h:882 msgid "IBM 4019" msgstr "" -#: src/main/xmli18n-tmp.h:831 +#: src/main/xmli18n-tmp.h:883 msgid "IBM 4029 030 LaserPrinter 10" msgstr "" -#: src/main/xmli18n-tmp.h:832 +#: src/main/xmli18n-tmp.h:884 msgid "IBM 4312" msgstr "" -#: src/main/xmli18n-tmp.h:833 +#: src/main/xmli18n-tmp.h:885 msgid "IBM Infoprint 12" msgstr "" -#: src/main/xmli18n-tmp.h:834 +#: src/main/xmli18n-tmp.h:886 msgid "IBM Page Printer 3112" msgstr "" -#: src/main/xmli18n-tmp.h:835 +#: src/main/xmli18n-tmp.h:887 msgid "Infotec 4651 MF" msgstr "" -#: src/main/xmli18n-tmp.h:836 +#: src/main/xmli18n-tmp.h:888 msgid "Kyocera F-1010" msgstr "" -#: src/main/xmli18n-tmp.h:837 +#: src/main/xmli18n-tmp.h:889 msgid "Kyocera FS-600 - KPDL-2" msgstr "" -#: src/main/xmli18n-tmp.h:838 +#: src/main/xmli18n-tmp.h:890 msgid "Kyocera FS-600" msgstr "" -#: src/main/xmli18n-tmp.h:839 +#: src/main/xmli18n-tmp.h:891 msgid "Kyocera FS-680" msgstr "" -#: src/main/xmli18n-tmp.h:840 +#: src/main/xmli18n-tmp.h:892 msgid "Kyocera FS-800" msgstr "" -#: src/main/xmli18n-tmp.h:841 +#: src/main/xmli18n-tmp.h:893 msgid "Kyocera FS-1000" msgstr "" -#: src/main/xmli18n-tmp.h:842 +#: src/main/xmli18n-tmp.h:894 msgid "Kyocera FS-1000+" msgstr "" -#: src/main/xmli18n-tmp.h:843 +#: src/main/xmli18n-tmp.h:895 msgid "Kyocera FS-1010" msgstr "" -#: src/main/xmli18n-tmp.h:844 +#: src/main/xmli18n-tmp.h:896 msgid "Kyocera FS-1050" msgstr "" -#: src/main/xmli18n-tmp.h:845 +#: src/main/xmli18n-tmp.h:897 msgid "Kyocera FS-1200" msgstr "" -#: src/main/xmli18n-tmp.h:846 +#: src/main/xmli18n-tmp.h:898 msgid "Kyocera FS-1600" msgstr "" -#: src/main/xmli18n-tmp.h:847 +#: src/main/xmli18n-tmp.h:899 msgid "Kyocera FS-1600+" msgstr "" -#: src/main/xmli18n-tmp.h:848 +#: src/main/xmli18n-tmp.h:900 msgid "Kyocera FS-1700" msgstr "" -#: src/main/xmli18n-tmp.h:849 +#: src/main/xmli18n-tmp.h:901 msgid "Kyocera FS-1700+" msgstr "" -#: src/main/xmli18n-tmp.h:850 +#: src/main/xmli18n-tmp.h:902 msgid "Kyocera FS-1750" msgstr "" -#: src/main/xmli18n-tmp.h:851 +#: src/main/xmli18n-tmp.h:903 msgid "Kyocera FS-1800" msgstr "" -#: src/main/xmli18n-tmp.h:852 +#: src/main/xmli18n-tmp.h:904 msgid "Kyocera FS-1800+" msgstr "" -#: src/main/xmli18n-tmp.h:853 +#: src/main/xmli18n-tmp.h:905 msgid "Kyocera FS-1900" msgstr "" -#: src/main/xmli18n-tmp.h:854 +#: src/main/xmli18n-tmp.h:906 msgid "Kyocera FS-3500" msgstr "" -#: src/main/xmli18n-tmp.h:855 +#: src/main/xmli18n-tmp.h:907 msgid "Kyocera FS-3600" msgstr "" -#: src/main/xmli18n-tmp.h:856 +#: src/main/xmli18n-tmp.h:908 msgid "Kyocera FS-3600+" msgstr "" -#: src/main/xmli18n-tmp.h:857 +#: src/main/xmli18n-tmp.h:909 msgid "Kyocera FS-3700" msgstr "" -#: src/main/xmli18n-tmp.h:858 +#: src/main/xmli18n-tmp.h:910 msgid "Kyocera FS-3700+" msgstr "" -#: src/main/xmli18n-tmp.h:859 +#: src/main/xmli18n-tmp.h:911 msgid "Kyocera FS-3750" msgstr "" -#: src/main/xmli18n-tmp.h:860 +#: src/main/xmli18n-tmp.h:912 msgid "Kyocera FS-3800" msgstr "" -#: src/main/xmli18n-tmp.h:861 +#: src/main/xmli18n-tmp.h:913 msgid "Kyocera FS-5800C" msgstr "" -#: src/main/xmli18n-tmp.h:862 +#: src/main/xmli18n-tmp.h:914 msgid "Kyocera FS-5900C" msgstr "" -#: src/main/xmli18n-tmp.h:863 +#: src/main/xmli18n-tmp.h:915 msgid "Kyocera FS-6500" msgstr "" -#: src/main/xmli18n-tmp.h:864 +#: src/main/xmli18n-tmp.h:916 msgid "Kyocera FS-6500+" msgstr "" -#: src/main/xmli18n-tmp.h:865 +#: src/main/xmli18n-tmp.h:917 msgid "Kyocera FS-6700" msgstr "" -#: src/main/xmli18n-tmp.h:866 +#: src/main/xmli18n-tmp.h:918 msgid "Kyocera FS-7000" msgstr "" -#: src/main/xmli18n-tmp.h:867 +#: src/main/xmli18n-tmp.h:919 msgid "Kyocera FS-7000+" msgstr "" -#: src/main/xmli18n-tmp.h:868 +#: src/main/xmli18n-tmp.h:920 msgid "Kyocera FS-8000C" msgstr "" -#: src/main/xmli18n-tmp.h:869 +#: src/main/xmli18n-tmp.h:921 msgid "Kyocera FS-9000" msgstr "" -#: src/main/xmli18n-tmp.h:870 +#: src/main/xmli18n-tmp.h:922 msgid "Kyocera FS-9100DN" msgstr "" -#: src/main/xmli18n-tmp.h:871 +#: src/main/xmli18n-tmp.h:923 msgid "Kyocera FS-9500DN" msgstr "" -#: src/main/xmli18n-tmp.h:872 +#: src/main/xmli18n-tmp.h:924 msgid "Kyocera KM-1530" msgstr "" -#: src/main/xmli18n-tmp.h:873 +#: src/main/xmli18n-tmp.h:925 msgid "Kyocera KM-1810" msgstr "" -#: src/main/xmli18n-tmp.h:874 +#: src/main/xmli18n-tmp.h:926 msgid "Kyocera KM-2030" msgstr "" -#: src/main/xmli18n-tmp.h:875 +#: src/main/xmli18n-tmp.h:927 msgid "Kyocera KM-2530" msgstr "" -#: src/main/xmli18n-tmp.h:876 +#: src/main/xmli18n-tmp.h:928 msgid "Kyocera KM-3530" msgstr "" -#: src/main/xmli18n-tmp.h:877 +#: src/main/xmli18n-tmp.h:929 msgid "Kyocera KM-4230" msgstr "" -#: src/main/xmli18n-tmp.h:878 +#: src/main/xmli18n-tmp.h:930 msgid "Kyocera KM-4530" msgstr "" -#: src/main/xmli18n-tmp.h:879 +#: src/main/xmli18n-tmp.h:931 msgid "Kyocera KM-5230" msgstr "" -#: src/main/xmli18n-tmp.h:880 +#: src/main/xmli18n-tmp.h:932 msgid "Kyocera KM-5530" msgstr "" -#: src/main/xmli18n-tmp.h:881 +#: src/main/xmli18n-tmp.h:933 msgid "Kyocera KM-6230" msgstr "" -#: src/main/xmli18n-tmp.h:882 +#: src/main/xmli18n-tmp.h:934 msgid "Lexmark 4076" msgstr "" -#: src/main/xmli18n-tmp.h:883 +#: src/main/xmli18n-tmp.h:935 msgid "Lexmark Optra E" msgstr "" -#: src/main/xmli18n-tmp.h:884 +#: src/main/xmli18n-tmp.h:936 msgid "Lexmark Optra E+" msgstr "" -#: src/main/xmli18n-tmp.h:885 +#: src/main/xmli18n-tmp.h:937 msgid "Lexmark Optra E220" msgstr "" -#: src/main/xmli18n-tmp.h:886 +#: src/main/xmli18n-tmp.h:938 msgid "Lexmark Valuewriter 300" msgstr "" -#: src/main/xmli18n-tmp.h:887 +#: src/main/xmli18n-tmp.h:939 msgid "Minolta PagePro 6" msgstr "" -#: src/main/xmli18n-tmp.h:888 +#: src/main/xmli18n-tmp.h:940 msgid "Minolta PagePro 6e" msgstr "" -#: src/main/xmli18n-tmp.h:889 +#: src/main/xmli18n-tmp.h:941 msgid "Minolta PagePro 6ex" msgstr "" -#: src/main/xmli18n-tmp.h:890 +#: src/main/xmli18n-tmp.h:942 msgid "Minolta PagePro 8" msgstr "" -#: src/main/xmli18n-tmp.h:891 +#: src/main/xmli18n-tmp.h:943 msgid "Minolta PagePro 8L" msgstr "" -#: src/main/xmli18n-tmp.h:892 +#: src/main/xmli18n-tmp.h:944 msgid "Minolta PagePro 1100" msgstr "" -#: src/main/xmli18n-tmp.h:893 +#: src/main/xmli18n-tmp.h:945 msgid "NEC SuperScript 660i" msgstr "" -#: src/main/xmli18n-tmp.h:894 +#: src/main/xmli18n-tmp.h:946 msgid "NEC SuperScript 860" msgstr "" -#: src/main/xmli18n-tmp.h:895 +#: src/main/xmli18n-tmp.h:947 msgid "NEC SuperScript 870" msgstr "" -#: src/main/xmli18n-tmp.h:896 +#: src/main/xmli18n-tmp.h:948 msgid "NEC SuperScript 1260" msgstr "" -#: src/main/xmli18n-tmp.h:897 +#: src/main/xmli18n-tmp.h:949 msgid "NEC SuperScript 1400" msgstr "" -#: src/main/xmli18n-tmp.h:898 +#: src/main/xmli18n-tmp.h:950 msgid "NEC SuperScript 1800" msgstr "" -#: src/main/xmli18n-tmp.h:899 +#: src/main/xmli18n-tmp.h:951 msgid "Okidata OL400" msgstr "" -#: src/main/xmli18n-tmp.h:900 +#: src/main/xmli18n-tmp.h:952 msgid "Okidata OL400e" msgstr "" -#: src/main/xmli18n-tmp.h:901 +#: src/main/xmli18n-tmp.h:953 msgid "Okidata OL400ex" msgstr "" -#: src/main/xmli18n-tmp.h:902 +#: src/main/xmli18n-tmp.h:954 msgid "Okidata OL410e" msgstr "" -#: src/main/xmli18n-tmp.h:903 +#: src/main/xmli18n-tmp.h:955 msgid "Okidata OL600e" msgstr "" -#: src/main/xmli18n-tmp.h:904 +#: src/main/xmli18n-tmp.h:956 msgid "Okidata OL610e/S" msgstr "" -#: src/main/xmli18n-tmp.h:905 +#: src/main/xmli18n-tmp.h:957 msgid "Okidata OL800" msgstr "" -#: src/main/xmli18n-tmp.h:906 +#: src/main/xmli18n-tmp.h:958 msgid "Okidata OL810ex" msgstr "" -#: src/main/xmli18n-tmp.h:907 +#: src/main/xmli18n-tmp.h:959 msgid "Okidata Okipage 6e" msgstr "" -#: src/main/xmli18n-tmp.h:908 +#: src/main/xmli18n-tmp.h:960 msgid "Okidata Okipage 6ex" msgstr "" -#: src/main/xmli18n-tmp.h:909 +#: src/main/xmli18n-tmp.h:961 msgid "Okidata Okipage 8p" msgstr "" -#: src/main/xmli18n-tmp.h:910 +#: src/main/xmli18n-tmp.h:962 msgid "Okidata Okipage 10e" msgstr "" -#: src/main/xmli18n-tmp.h:911 +#: src/main/xmli18n-tmp.h:963 msgid "Okidata Okipage 10ex" msgstr "" -#: src/main/xmli18n-tmp.h:912 +#: src/main/xmli18n-tmp.h:964 msgid "Okidata Okipage 14ex" msgstr "" -#: src/main/xmli18n-tmp.h:913 +#: src/main/xmli18n-tmp.h:965 msgid "Okidata Super 6e" msgstr "" -#: src/main/xmli18n-tmp.h:914 +#: src/main/xmli18n-tmp.h:966 msgid "Olivetti JP350S" msgstr "" -#: src/main/xmli18n-tmp.h:915 +#: src/main/xmli18n-tmp.h:967 msgid "Olivetti PG 306" msgstr "" -#: src/main/xmli18n-tmp.h:916 +#: src/main/xmli18n-tmp.h:968 msgid "PCPI 1030" msgstr "" -#: src/main/xmli18n-tmp.h:917 +#: src/main/xmli18n-tmp.h:969 msgid "Panasonic KX-P4410" msgstr "" -#: src/main/xmli18n-tmp.h:918 +#: src/main/xmli18n-tmp.h:970 msgid "Panasonic KX-P4450" msgstr "" -#: src/main/xmli18n-tmp.h:919 +#: src/main/xmli18n-tmp.h:971 msgid "Panasonic KX-P6150" msgstr "" -#: src/main/xmli18n-tmp.h:920 +#: src/main/xmli18n-tmp.h:972 msgid "Panasonic KX-P6500" msgstr "" -#: src/main/xmli18n-tmp.h:921 +#: src/main/xmli18n-tmp.h:973 msgid "Raven LP-410" msgstr "" -#: src/main/xmli18n-tmp.h:922 +#: src/main/xmli18n-tmp.h:974 msgid "Ricoh Aficio 220" msgstr "" -#: src/main/xmli18n-tmp.h:923 +#: src/main/xmli18n-tmp.h:975 msgid "Ricoh Aficio 401" msgstr "" -#: src/main/xmli18n-tmp.h:924 +#: src/main/xmli18n-tmp.h:976 msgid "Ricoh Aficio 700" msgstr "" -#: src/main/xmli18n-tmp.h:925 +#: src/main/xmli18n-tmp.h:977 msgid "Samsung ML-85" msgstr "" -#: src/main/xmli18n-tmp.h:926 +#: src/main/xmli18n-tmp.h:978 msgid "Samsung ML-4600" msgstr "" -#: src/main/xmli18n-tmp.h:927 +#: src/main/xmli18n-tmp.h:979 msgid "Samsung ML-5000a" msgstr "" -#: src/main/xmli18n-tmp.h:928 +#: src/main/xmli18n-tmp.h:980 msgid "Samsung ML-6000" msgstr "" -#: src/main/xmli18n-tmp.h:929 +#: src/main/xmli18n-tmp.h:981 msgid "Samsung ML-6100" msgstr "" -#: src/main/xmli18n-tmp.h:930 +#: src/main/xmli18n-tmp.h:982 msgid "Samsung ML-7000" msgstr "" -#: src/main/xmli18n-tmp.h:931 +#: src/main/xmli18n-tmp.h:983 msgid "Samsung ML-7000N" msgstr "" -#: src/main/xmli18n-tmp.h:932 +#: src/main/xmli18n-tmp.h:984 msgid "Samsung ML-7000P" msgstr "" -#: src/main/xmli18n-tmp.h:933 +#: src/main/xmli18n-tmp.h:985 msgid "Samsung ML-7050" msgstr "" -#: src/main/xmli18n-tmp.h:934 +#: src/main/xmli18n-tmp.h:986 msgid "Samsung QL-5100A" msgstr "" -#: src/main/xmli18n-tmp.h:935 +#: src/main/xmli18n-tmp.h:987 msgid "Samsung QL-6050" msgstr "" -#: src/main/xmli18n-tmp.h:936 +#: src/main/xmli18n-tmp.h:988 msgid "Seiko SpeedJET 200" msgstr "" -#: src/main/xmli18n-tmp.h:937 +#: src/main/xmli18n-tmp.h:989 msgid "Sharp AR-161" msgstr "" -#: src/main/xmli18n-tmp.h:938 +#: src/main/xmli18n-tmp.h:990 msgid "Sharp AR-M257" msgstr "" -#: src/main/xmli18n-tmp.h:939 +#: src/main/xmli18n-tmp.h:991 msgid "Sony IJP-V100" msgstr "" -#: src/main/xmli18n-tmp.h:940 +#: src/main/xmli18n-tmp.h:992 msgid "Star LS-04" msgstr "" -#: src/main/xmli18n-tmp.h:941 +#: src/main/xmli18n-tmp.h:993 #, fuzzy msgid "Star LaserPrinter 8" -msgstr "NastaviÅ¥ tlaÄiareň" +msgstr "Nastavi» tlaèiareò" -#: src/main/xmli18n-tmp.h:942 +#: src/main/xmli18n-tmp.h:994 msgid "Tally MT908" msgstr "" -#: src/main/xmli18n-tmp.h:943 +#: src/main/xmli18n-tmp.h:995 msgid "Xerox Able 1406" msgstr "" -#: src/main/xmli18n-tmp.h:944 +#: src/main/xmli18n-tmp.h:996 msgid "Xerox DocuPrint 4508" msgstr "" -#: src/main/xmli18n-tmp.h:945 +#: src/main/xmli18n-tmp.h:997 msgid "Xerox DocuPrint C20" msgstr "" -#: src/main/xmli18n-tmp.h:946 +#: src/main/xmli18n-tmp.h:998 msgid "Xerox DocuPrint N4512" msgstr "" -#: src/main/xmli18n-tmp.h:947 +#: src/main/xmli18n-tmp.h:999 msgid "Xerox DocuPrint N4512PS" msgstr "" -#: src/main/xmli18n-tmp.h:948 +#: src/main/xmli18n-tmp.h:1000 msgid "Xerox DocuPrint P12" msgstr "" -#: src/main/xmli18n-tmp.h:949 +#: src/main/xmli18n-tmp.h:1001 msgid "Xerox DocuPrint P1202" msgstr "" -#: src/main/xmli18n-tmp.h:950 +#: src/main/xmli18n-tmp.h:1002 msgid "Xerox DocuPrint P8e" msgstr "" -#: src/main/xmli18n-tmp.h:951 +#: src/main/xmli18n-tmp.h:1003 msgid "Xerox Document Centre 400" msgstr "" -#: src/main/xmli18n-tmp.h:952 +#: src/main/xmli18n-tmp.h:1004 msgid "Xerox WorkCentre M118" msgstr "" -#: src/main/xmli18n-tmp.h:953 +#: src/main/xmli18n-tmp.h:1005 msgid "Compaq IJ1200" msgstr "" -#: src/main/xmli18n-tmp.h:954 +#: src/main/xmli18n-tmp.h:1006 msgid "Lexmark X73" msgstr "" -#: src/main/xmli18n-tmp.h:955 +#: src/main/xmli18n-tmp.h:1007 msgid "Lexmark Z42" msgstr "" -#: src/main/xmli18n-tmp.h:956 +#: src/main/xmli18n-tmp.h:1008 msgid "Lexmark Z43" msgstr "" -#: src/main/xmli18n-tmp.h:957 +#: src/main/xmli18n-tmp.h:1009 msgid "Lexmark Z52" msgstr "" -#: src/main/xmli18n-tmp.h:958 +#: src/main/xmli18n-tmp.h:1010 msgid "Lexmark Z53" msgstr "" -#: src/main/xmli18n-tmp.h:959 +#: src/main/xmli18n-tmp.h:1011 msgid "Olympus P-10" msgstr "" -#: src/main/xmli18n-tmp.h:960 +#: src/main/xmli18n-tmp.h:1012 msgid "Olympus P-11" msgstr "" -#: src/main/xmli18n-tmp.h:961 +#: src/main/xmli18n-tmp.h:1013 msgid "Olympus P-200" msgstr "" -#: src/main/xmli18n-tmp.h:962 +#: src/main/xmli18n-tmp.h:1014 msgid "Olympus P-300" msgstr "" -#: src/main/xmli18n-tmp.h:963 +#: src/main/xmli18n-tmp.h:1015 msgid "Olympus P-300E" msgstr "" -#: src/main/xmli18n-tmp.h:964 +#: src/main/xmli18n-tmp.h:1016 msgid "Olympus P-300U" msgstr "" -#: src/main/xmli18n-tmp.h:965 +#: src/main/xmli18n-tmp.h:1017 msgid "Olympus P-330E" msgstr "" -#: src/main/xmli18n-tmp.h:966 +#: src/main/xmli18n-tmp.h:1018 msgid "Olympus P-330NE" msgstr "" -#: src/main/xmli18n-tmp.h:967 +#: src/main/xmli18n-tmp.h:1019 msgid "Olympus P-400" msgstr "" -#: src/main/xmli18n-tmp.h:968 +#: src/main/xmli18n-tmp.h:1020 msgid "Olympus P-440" msgstr "" -#: src/main/xmli18n-tmp.h:969 +#: src/main/xmli18n-tmp.h:1021 msgid "Olympus P-S100" msgstr "" -#: src/main/xmli18n-tmp.h:970 +#: src/main/xmli18n-tmp.h:1022 msgid "Canon CP-10" msgstr "" -#: src/main/xmli18n-tmp.h:971 +#: src/main/xmli18n-tmp.h:1023 msgid "Canon CP-100" msgstr "" -#: src/main/xmli18n-tmp.h:972 +#: src/main/xmli18n-tmp.h:1024 msgid "Canon CP-200" msgstr "" -#: src/main/xmli18n-tmp.h:973 +#: src/main/xmli18n-tmp.h:1025 msgid "Canon CP-220" msgstr "" -#: src/main/xmli18n-tmp.h:974 +#: src/main/xmli18n-tmp.h:1026 msgid "Canon CP-300" msgstr "" -#: src/main/xmli18n-tmp.h:975 +#: src/main/xmli18n-tmp.h:1027 msgid "Canon CP-330" msgstr "" -#: src/main/xmli18n-tmp.h:976 +#: src/main/xmli18n-tmp.h:1028 msgid "Canon SELPHY-CP-400" msgstr "" -#: src/main/xmli18n-tmp.h:977 +#: src/main/xmli18n-tmp.h:1029 msgid "Canon SELPHY-CP-500" msgstr "" -#: src/main/xmli18n-tmp.h:978 +#: src/main/xmli18n-tmp.h:1030 msgid "Canon SELPHY-CP-510" msgstr "" -#: src/main/xmli18n-tmp.h:979 +#: src/main/xmli18n-tmp.h:1031 msgid "Canon SELPHY-CP-600" msgstr "" -#: src/main/xmli18n-tmp.h:980 +#: src/main/xmli18n-tmp.h:1032 msgid "Canon SELPHY-CP-710" msgstr "" -#: src/main/xmli18n-tmp.h:981 +#: src/main/xmli18n-tmp.h:1033 msgid "Canon SELPHY-CP-720" msgstr "" -#: src/main/xmli18n-tmp.h:982 -#, fuzzy +#: src/main/xmli18n-tmp.h:1034 msgid "Canon SELPHY-CP-730" -msgstr "Stylus C60" +msgstr "" -#: src/main/xmli18n-tmp.h:983 +#: src/main/xmli18n-tmp.h:1035 msgid "Canon SELPHY-CP-740" msgstr "" -#: src/main/xmli18n-tmp.h:984 -#, fuzzy +#: src/main/xmli18n-tmp.h:1036 msgid "Canon SELPHY-CP-750" -msgstr "Stylus C60" +msgstr "" -#: src/main/xmli18n-tmp.h:985 +#: src/main/xmli18n-tmp.h:1037 msgid "Canon SELPHY ES1" msgstr "" -#: src/main/xmli18n-tmp.h:986 +#: src/main/xmli18n-tmp.h:1038 msgid "Canon SELPHY ES2" msgstr "" -#: src/main/xmli18n-tmp.h:987 +#: src/main/xmli18n-tmp.h:1039 msgid "Canon SELPHY ES20" msgstr "" -#: src/main/xmli18n-tmp.h:988 +#: src/main/xmli18n-tmp.h:1040 msgid "Sony DPP-EX5" msgstr "" -#: src/main/xmli18n-tmp.h:989 +#: src/main/xmli18n-tmp.h:1041 msgid "Sony DPP-EX7" msgstr "" -#: src/main/xmli18n-tmp.h:990 +#: src/main/xmli18n-tmp.h:1042 msgid "Sony UP-DP10" msgstr "" -#: src/main/xmli18n-tmp.h:991 +#: src/main/xmli18n-tmp.h:1043 msgid "Sony UP-DR100" msgstr "" -#: src/main/xmli18n-tmp.h:992 +#: src/main/xmli18n-tmp.h:1044 msgid "Sony UP-DR150" msgstr "" -#: src/main/xmli18n-tmp.h:993 +#: src/main/xmli18n-tmp.h:1045 msgid "Fujifilm Printpix-CX-400" msgstr "" -#: src/main/xmli18n-tmp.h:994 +#: src/main/xmli18n-tmp.h:1046 msgid "Fujifilm Printpix-CX-550" msgstr "" -#: src/main/xmli18n-tmp.h:995 -msgid "Fujifilm FinePix-NX-500" +#: src/main/xmli18n-tmp.h:1047 +msgid "Fujifilm FinePix-NX-500" +msgstr "" + +#: src/main/xmli18n-tmp.h:1048 +msgid "Kodak Easyshare-Printer-Dock" +msgstr "" + +#: src/main/xmli18n-tmp.h:1049 +msgid "Shinko CHC-S9045" +msgstr "" + +#: src/main/xmli18n-tmp.h:1050 +msgid "RAW DATA 16 bit" +msgstr "" + +#: src/main/xmli18n-tmp.h:1051 +msgid "RAW DATA 8 bit" +msgstr "" + +#: src/gutenprintui2/curve.c:130 +#, fuzzy +msgid "Curve type" +msgstr "Èierna" + +#: src/gutenprintui2/curve.c:131 +msgid "Is this curve linear, spline interpolated, or free-form" +msgstr "" + +#: src/gutenprintui2/curve.c:139 +msgid "Minimum X" +msgstr "" + +#: src/gutenprintui2/curve.c:140 +msgid "Minimum possible value for X" +msgstr "" + +#: src/gutenprintui2/curve.c:149 +msgid "Maximum X" +msgstr "" + +#: src/gutenprintui2/curve.c:150 +msgid "Maximum possible X value" +msgstr "" + +#: src/gutenprintui2/curve.c:159 +msgid "Minimum Y" msgstr "" -#: src/main/xmli18n-tmp.h:996 -msgid "Kodak Easyshare-Printer-Dock" +#: src/gutenprintui2/curve.c:160 +msgid "Minimum possible value for Y" msgstr "" -#: src/main/xmli18n-tmp.h:997 -msgid "Shinko CHC-S9045" +#: src/gutenprintui2/curve.c:169 +msgid "Maximum Y" msgstr "" -#: src/main/xmli18n-tmp.h:998 -msgid "RAW DATA 16 bit" +#: src/gutenprintui2/curve.c:170 +msgid "Maximum possible value for Y" msgstr "" -#: src/main/xmli18n-tmp.h:999 -msgid "RAW DATA 8 bit" +#: src/gutenprintui2/gammacurve.c:418 +msgid "_Gamma value" msgstr "" -#: src/gutenprintui/panel.c:274 src/gutenprintui2/panel.c:274 +#: src/gutenprintui2/panel.c:275 msgid "Inch" msgstr "palce" -#: src/gutenprintui/panel.c:274 src/gutenprintui2/panel.c:274 +#: src/gutenprintui2/panel.c:275 msgid "Set the base unit of measurement to inches" -msgstr "NastaviÅ¥ palce ako základnú mernú jednotku" +msgstr "Nastavi» palce ako základnú mernú jednotku" -#: src/gutenprintui/panel.c:276 src/gutenprintui2/panel.c:276 +#: src/gutenprintui2/panel.c:277 msgid "cm" msgstr "cm" -#: src/gutenprintui/panel.c:276 src/gutenprintui2/panel.c:276 +#: src/gutenprintui2/panel.c:277 msgid "Set the base unit of measurement to centimetres" -msgstr "NastaviÅ¥ centimetre ako základnú mernú jednotku" +msgstr "Nastavi» centimetre ako základnú mernú jednotku" -#: src/gutenprintui/panel.c:278 src/gutenprintui2/panel.c:278 +#: src/gutenprintui2/panel.c:279 #, fuzzy msgid "Points" -msgstr "TlaÄiÅ¥" +msgstr "Tlaèi»" -#: src/gutenprintui/panel.c:278 src/gutenprintui2/panel.c:278 +#: src/gutenprintui2/panel.c:279 #, fuzzy msgid "Set the base unit of measurement to points (1/72\")" -msgstr "NastaviÅ¥ palce ako základnú mernú jednotku" +msgstr "Nastavi» palce ako základnú mernú jednotku" -#: src/gutenprintui/panel.c:280 src/gutenprintui2/panel.c:280 +#: src/gutenprintui2/panel.c:281 msgid "mm" msgstr "" -#: src/gutenprintui/panel.c:280 src/gutenprintui2/panel.c:280 +#: src/gutenprintui2/panel.c:281 #, fuzzy msgid "Set the base unit of measurement to millimetres" -msgstr "NastaviÅ¥ centimetre ako základnú mernú jednotku" +msgstr "Nastavi» centimetre ako základnú mernú jednotku" -#: src/gutenprintui/panel.c:282 src/gutenprintui2/panel.c:282 +#: src/gutenprintui2/panel.c:283 msgid "Pica" msgstr "" -#: src/gutenprintui/panel.c:282 src/gutenprintui2/panel.c:282 +#: src/gutenprintui2/panel.c:283 #, fuzzy msgid "Set the base unit of measurement to picas (1/12\")" -msgstr "NastaviÅ¥ palce ako základnú mernú jednotku" +msgstr "Nastavi» palce ako základnú mernú jednotku" -#: src/gutenprintui/panel.c:289 src/gutenprintui2/panel.c:289 +#: src/gutenprintui2/panel.c:290 msgid "Color output" -msgstr "Farebný výstup" +msgstr "Farebný výstup" -#: src/gutenprintui/panel.c:291 src/gutenprintui2/panel.c:291 +#: src/gutenprintui2/panel.c:292 msgid "Print in shades of gray using black ink" -msgstr "TlaÄiÅ¥ v odtieňoch Å¡edej s použitím Äiernej farby" +msgstr "Tlaèi» v odtieòoch ¹edej s pou¾itím èiernej farby" -#: src/gutenprintui/panel.c:303 src/gutenprintui2/panel.c:303 +#: src/gutenprintui2/panel.c:304 #, fuzzy msgid "Standard Command" -msgstr "Å tandardný" +msgstr "©tandardný" -#: src/gutenprintui/panel.c:303 src/gutenprintui2/panel.c:303 +#: src/gutenprintui2/panel.c:304 msgid "Use standard print command" msgstr "" -#: src/gutenprintui/panel.c:304 src/gutenprintui2/panel.c:304 +#: src/gutenprintui2/panel.c:305 #, fuzzy msgid "Custom Command" -msgstr "Príkaz:" +msgstr "Príkaz:" -#: src/gutenprintui/panel.c:304 src/gutenprintui2/panel.c:304 +#: src/gutenprintui2/panel.c:305 msgid "Use custom print command" msgstr "" -#: src/gutenprintui/panel.c:305 src/gutenprintui/plist.c:704 -#: src/gutenprintui/plist.c:787 src/gutenprintui2/panel.c:305 -#: src/gutenprintui2/plist.c:707 src/gutenprintui2/plist.c:790 +#: src/gutenprintui2/panel.c:306 src/gutenprintui2/plist.c:710 +#: src/gutenprintui2/plist.c:793 msgid "File" -msgstr "Súbor" +msgstr "Súbor" -#: src/gutenprintui/panel.c:305 src/gutenprintui2/panel.c:305 +#: src/gutenprintui2/panel.c:306 #, fuzzy msgid "Print to a file" -msgstr "TlaÄiÅ¥ do súboru?" +msgstr "Tlaèi» do súboru?" -#: src/gutenprintui/panel.c:521 src/gutenprintui2/panel.c:521 +#: src/gutenprintui2/panel.c:522 msgid "Edit Curve..." msgstr "" -#: src/gutenprintui/panel.c:532 src/gutenprintui2/panel.c:532 +#: src/gutenprintui2/panel.c:533 #, fuzzy msgid "Set Default" -msgstr "NastaviÅ¥ Å¡tandardné" +msgstr "Nastavi» ¹tandardné" -#: src/gutenprintui/panel.c:534 src/gutenprintui2/panel.c:534 +#: src/gutenprintui2/panel.c:535 msgid "Restore Previous" msgstr "" -#: src/gutenprintui/panel.c:536 src/gutenprintui/panel.c:1532 -#: src/gutenprintui/panel.c:1787 src/gutenprintui/panel.c:1819 -#: src/gutenprintui2/panel.c:536 src/gutenprintui2/panel.c:1533 -#: src/gutenprintui2/panel.c:1787 src/gutenprintui2/panel.c:1819 +#: src/gutenprintui2/panel.c:537 src/gutenprintui2/panel.c:1708 +#: src/gutenprintui2/panel.c:1962 src/gutenprintui2/panel.c:1994 msgid "OK" msgstr "OK" -#: src/gutenprintui/panel.c:538 src/gutenprintui/panel.c:1197 -#: src/gutenprintui/panel.c:1534 src/gutenprintui/panel.c:1789 -#: src/gutenprintui2/panel.c:538 src/gutenprintui2/panel.c:1198 -#: src/gutenprintui2/panel.c:1535 src/gutenprintui2/panel.c:1789 +#: src/gutenprintui2/panel.c:539 src/gutenprintui2/panel.c:1373 +#: src/gutenprintui2/panel.c:1710 src/gutenprintui2/panel.c:1964 msgid "Cancel" msgstr "Storno" -#: src/gutenprintui/panel.c:1180 src/gutenprintui2/panel.c:1181 +#: src/gutenprintui2/panel.c:641 +#, fuzzy +msgid "Select File..." +msgstr "Nastavenie tlaèiarne..." + +#: src/gutenprintui2/panel.c:1018 +msgid "Reset" +msgstr "" + +#: src/gutenprintui2/panel.c:1356 #, c-format msgid "%s -- Print v%s" -msgstr "%s -- TlaÄ v%s" +msgstr "%s -- Tlaè v%s" -#: src/gutenprintui/panel.c:1189 src/gutenprintui2/panel.c:1190 +#: src/gutenprintui2/panel.c:1365 msgid "About" msgstr "O programe" -#: src/gutenprintui/panel.c:1191 src/gutenprintui2/panel.c:1192 +#: src/gutenprintui2/panel.c:1367 msgid "" "Print and\n" "Save Settings" msgstr "" -"UložiÅ¥ nastavenia\n" -"a vytlaÄiÅ¥" +"Ulo¾i» nastavenia\n" +"a vytlaèi»" -#: src/gutenprintui/panel.c:1193 src/gutenprintui2/panel.c:1194 +#: src/gutenprintui2/panel.c:1369 msgid "" "Save\n" "Settings" msgstr "" -"UložiÅ¥\n" +"Ulo¾i»\n" "nastavenia" -#: src/gutenprintui/panel.c:1195 src/gutenprintui2/panel.c:1196 +#: src/gutenprintui2/panel.c:1371 msgid "Print" -msgstr "TlaÄiÅ¥" +msgstr "Tlaèi»" -#: src/gutenprintui/panel.c:1247 src/gutenprintui2/panel.c:1248 +#: src/gutenprintui2/panel.c:1423 msgid "Preview" -msgstr "Náhľad" +msgstr "Náhµad" -#: src/gutenprintui/panel.c:1272 src/gutenprintui2/panel.c:1273 +#: src/gutenprintui2/panel.c:1448 msgid "" "Position the image on the page.\n" "Click and drag with the primary button to position the image.\n" @@ -6707,552 +7135,499 @@ msgid "" "If you click another button while dragging the mouse, the image will return " "to its original position." msgstr "" -"Pozícia obrázku na strane.\n" -"Kliknite a potiahnite primárne tlaÄítko na pozíciu obrázku.\n" -"Kliknite a potiahnite sekundárne tlaÄítko pohybu obrázku s jemnejÅ¡ou " -"presnosÅ¥ou; každá jednotka pohybu posunie obrázok o jeden bod (1/72\")\n" -"Kliknite a potiahnite so stredným tlaÄítkom na pohyb v jednotkách veľkosti " -"obrázku.\n" -"Ak pri klikaní a Å¥ahaní podržíte klávesu Shift obmedzíte pohyb obrázku iba " -"na vodorovný a zvislý pohyb.\n" -"Ak poÄas Å¥ahania obrázku myÅ¡ou kliknete iným tlaÄítkom, obrázok sa vráti na " -"pôvodnú pozíciu." +"Pozícia obrázku na strane.\n" +"Kliknite a potiahnite primárne tlaèítko na pozíciu obrázku.\n" +"Kliknite a potiahnite sekundárne tlaèítko pohybu obrázku s jemnej¹ou " +"presnos»ou; ka¾dá jednotka pohybu posunie obrázok o jeden bod (1/72\")\n" +"Kliknite a potiahnite so stredným tlaèítkom na pohyb v jednotkách veµkosti " +"obrázku.\n" +"Ak pri klikaní a »ahaní podr¾íte klávesu Shift obmedzíte pohyb obrázku iba " +"na vodorovný a zvislý pohyb.\n" +"Ak poèas »ahania obrázku my¹ou kliknete iným tlaèítkom, obrázok sa vráti na " +"pôvodnú pozíciu." -#: src/gutenprintui/panel.c:1319 src/gutenprintui2/panel.c:1320 +#: src/gutenprintui2/panel.c:1495 #, fuzzy msgid "Paper Size" -msgstr "VeľkosÅ¥" +msgstr "Veµkos»" -#: src/gutenprintui/panel.c:1342 src/gutenprintui2/panel.c:1343 +#: src/gutenprintui2/panel.c:1518 msgid "Show All Paper Sizes" msgstr "" -#: src/gutenprintui/panel.c:1358 src/gutenprintui2/panel.c:1359 +#: src/gutenprintui2/panel.c:1534 msgid "Dimensions:" msgstr "Rozmery:" -#: src/gutenprintui/panel.c:1363 src/gutenprintui/panel.c:2063 -#: src/gutenprintui2/panel.c:1364 src/gutenprintui2/panel.c:2063 +#: src/gutenprintui2/panel.c:1539 src/gutenprintui2/panel.c:2238 msgid "Width:" -msgstr "Šírka:" +msgstr "©írka:" -#: src/gutenprintui/panel.c:1364 src/gutenprintui2/panel.c:1365 +#: src/gutenprintui2/panel.c:1540 msgid "Width of the paper that you wish to print to" -msgstr "Šírka papiera, na ktorý chcete tlaÄiÅ¥" +msgstr "©írka papiera, na ktorý chcete tlaèi»" -#: src/gutenprintui/panel.c:1368 src/gutenprintui/panel.c:2065 -#: src/gutenprintui2/panel.c:1369 src/gutenprintui2/panel.c:2065 +#: src/gutenprintui2/panel.c:1544 src/gutenprintui2/panel.c:2240 msgid "Height:" -msgstr "Výška:" +msgstr "Vý¹ka:" -#: src/gutenprintui/panel.c:1369 src/gutenprintui2/panel.c:1370 +#: src/gutenprintui2/panel.c:1545 msgid "Height of the paper that you wish to print to" -msgstr "Výška papiera, na ktorý chcete tlaÄiÅ¥" +msgstr "Vý¹ka papiera, na ktorý chcete tlaèi»" -#: src/gutenprintui/panel.c:1374 src/gutenprintui2/panel.c:1375 +#: src/gutenprintui2/panel.c:1550 #, fuzzy msgid "Automatic Paper Size" -msgstr "VeľkosÅ¥" +msgstr "Veµkos»" -#: src/gutenprintui/panel.c:1391 src/gutenprintui2/panel.c:1392 +#: src/gutenprintui2/panel.c:1567 msgid "Number of Copies" msgstr "" -#: src/gutenprintui/panel.c:1403 src/gutenprintui2/panel.c:1404 +#: src/gutenprintui2/panel.c:1579 msgid "Select the number of copies to print; a value between 1 and 100" msgstr "" -#: src/gutenprintui/panel.c:1435 src/gutenprintui2/panel.c:1436 +#: src/gutenprintui2/panel.c:1611 #, fuzzy msgid "Image Position" -msgstr "Pozícia" +msgstr "Pozícia" -#: src/gutenprintui/panel.c:1452 src/gutenprintui2/panel.c:1453 +#: src/gutenprintui2/panel.c:1628 msgid "Auto" msgstr "Automaticky" -#: src/gutenprintui/panel.c:1454 src/gutenprintui2/panel.c:1455 +#: src/gutenprintui2/panel.c:1630 msgid "Portrait" -msgstr "Na výšku" +msgstr "Na vý¹ku" -#: src/gutenprintui/panel.c:1456 src/gutenprintui2/panel.c:1457 +#: src/gutenprintui2/panel.c:1632 msgid "Landscape" -msgstr "Na šírku" +msgstr "Na ¹írku" -#: src/gutenprintui/panel.c:1458 src/gutenprintui2/panel.c:1459 +#: src/gutenprintui2/panel.c:1634 msgid "Upside down" msgstr "Hore nohami" -#: src/gutenprintui/panel.c:1460 src/gutenprintui2/panel.c:1461 +#: src/gutenprintui2/panel.c:1636 msgid "Seascape" -msgstr "Na šírku" +msgstr "Na ¹írku" -#: src/gutenprintui/panel.c:1464 src/gutenprintui2/panel.c:1465 +#: src/gutenprintui2/panel.c:1640 msgid "" "Select the orientation: portrait, landscape, upside down, or seascape " "(upside down landscape)" msgstr "" -"Zvoľte orientáciu: na výšku, na šírku, hore nohami, na šírku hore nohami " +"Zvoµte orientáciu: na vý¹ku, na ¹írku, hore nohami, na ¹írku hore nohami " -#: src/gutenprintui/panel.c:1466 src/gutenprintui2/panel.c:1467 +#: src/gutenprintui2/panel.c:1642 msgid "Orientation:" -msgstr "Orientácia:" +msgstr "Orientácia:" -#: src/gutenprintui/panel.c:1477 src/gutenprintui2/panel.c:1478 +#: src/gutenprintui2/panel.c:1653 msgid "Left:" -msgstr "Ľavý:" +msgstr "¥avý:" -#: src/gutenprintui/panel.c:1478 src/gutenprintui2/panel.c:1479 +#: src/gutenprintui2/panel.c:1654 msgid "Distance from the left of the paper to the image" -msgstr "VzdialenosÅ¥ od ľavého okraja papiera k obrázku" +msgstr "Vzdialenos» od µavého okraja papiera k obrázku" -#: src/gutenprintui/panel.c:1481 src/gutenprintui/panel.c:1485 -#: src/gutenprintui2/panel.c:1482 src/gutenprintui2/panel.c:1486 +#: src/gutenprintui2/panel.c:1657 src/gutenprintui2/panel.c:1661 msgid "Right:" -msgstr "Pravý:" +msgstr "Pravý:" -#: src/gutenprintui/panel.c:1482 src/gutenprintui2/panel.c:1483 +#: src/gutenprintui2/panel.c:1658 msgid "Distance from the left of the paper to the right of the image" -msgstr "VzdialenosÅ¥ od ľavého okraja papiera k pravému okraju obrázku" +msgstr "Vzdialenos» od µavého okraja papiera k pravému okraju obrázku" -#: src/gutenprintui/panel.c:1486 src/gutenprintui2/panel.c:1487 +#: src/gutenprintui2/panel.c:1662 msgid "Distance from the right of the paper to the image" -msgstr "VzdialenosÅ¥ od pravého okraja papiera k obrázku" +msgstr "Vzdialenos» od pravého okraja papiera k obrázku" -#: src/gutenprintui/panel.c:1488 src/gutenprintui2/panel.c:1489 +#: src/gutenprintui2/panel.c:1664 msgid "Top:" -msgstr "Horný:" +msgstr "Horný:" -#: src/gutenprintui/panel.c:1489 src/gutenprintui2/panel.c:1490 +#: src/gutenprintui2/panel.c:1665 msgid "Distance from the top of the paper to the image" -msgstr "VzdialenosÅ¥ od horného okraja papiera k obrázku" +msgstr "Vzdialenos» od horného okraja papiera k obrázku" -#: src/gutenprintui/panel.c:1492 src/gutenprintui/panel.c:1496 -#: src/gutenprintui2/panel.c:1493 src/gutenprintui2/panel.c:1497 +#: src/gutenprintui2/panel.c:1668 src/gutenprintui2/panel.c:1672 msgid "Bottom:" -msgstr "Dolný:" +msgstr "Dolný:" -#: src/gutenprintui/panel.c:1493 src/gutenprintui2/panel.c:1494 +#: src/gutenprintui2/panel.c:1669 #, fuzzy msgid "Distance from the top of the paper to bottom of the image" -msgstr "VzdialenosÅ¥ od horného okraja papiera k dolnému okraju obrázku" +msgstr "Vzdialenos» od horného okraja papiera k dolnému okraju obrázku" -#: src/gutenprintui/panel.c:1497 src/gutenprintui2/panel.c:1498 +#: src/gutenprintui2/panel.c:1673 msgid "Distance from the bottom of the paper to the image" -msgstr "VzdialenosÅ¥ od dolného okraja papiera k obrázku" +msgstr "Vzdialenos» od dolného okraja papiera k obrázku" -#: src/gutenprintui/panel.c:1507 src/gutenprintui2/panel.c:1508 +#: src/gutenprintui2/panel.c:1683 msgid "Center:" msgstr "Centrovanie:" -#: src/gutenprintui/panel.c:1510 src/gutenprintui2/panel.c:1511 +#: src/gutenprintui2/panel.c:1686 #, fuzzy msgid "Horizontal" msgstr "Vodorovne" -#: src/gutenprintui/panel.c:1511 src/gutenprintui2/panel.c:1512 +#: src/gutenprintui2/panel.c:1687 msgid "Center the image horizontally on the paper" -msgstr "VycentrovaÅ¥ vodorovne obrázok na papieri" +msgstr "Vycentrova» vodorovne obrázok na papieri" -#: src/gutenprintui/panel.c:1513 src/gutenprintui2/panel.c:1514 +#: src/gutenprintui2/panel.c:1689 msgid "Both" msgstr "Oboje" -#: src/gutenprintui/panel.c:1514 src/gutenprintui2/panel.c:1515 +#: src/gutenprintui2/panel.c:1690 msgid "Center the image on the paper" -msgstr "VycentrovaÅ¥ obrázok na papieri" +msgstr "Vycentrova» obrázok na papieri" -#: src/gutenprintui/panel.c:1516 src/gutenprintui2/panel.c:1517 +#: src/gutenprintui2/panel.c:1692 #, fuzzy msgid "Vertical" msgstr "Zvislo" -#: src/gutenprintui/panel.c:1517 src/gutenprintui2/panel.c:1518 +#: src/gutenprintui2/panel.c:1693 msgid "Center the image vertically on the paper" -msgstr "VycentrovaÅ¥ obrázok zvisle na papieri" +msgstr "Vycentrova» obrázok zvisle na papieri" -#: src/gutenprintui/panel.c:1530 src/gutenprintui2/panel.c:1531 +#: src/gutenprintui2/panel.c:1706 msgid "Setup Printer" -msgstr "NastaviÅ¥ tlaÄiareň" +msgstr "Nastavi» tlaèiareò" -#: src/gutenprintui/panel.c:1555 src/gutenprintui2/panel.c:1555 +#: src/gutenprintui2/panel.c:1730 #, fuzzy msgid "Printer Make:" -msgstr "Názov tlaÄiarne:" +msgstr "Názov tlaèiarne:" -#: src/gutenprintui/panel.c:1566 src/gutenprintui2/panel.c:1566 +#: src/gutenprintui2/panel.c:1741 #, fuzzy msgid "Select the make of your printer" -msgstr "Vyberte model vaÅ¡ej tlaÄiarne" +msgstr "Vyberte model va¹ej tlaèiarne" -#: src/gutenprintui/panel.c:1584 src/gutenprintui/panel.c:1672 -#: src/gutenprintui/panel.c:1890 src/gutenprintui2/panel.c:1584 -#: src/gutenprintui2/panel.c:1672 src/gutenprintui2/panel.c:1890 +#: src/gutenprintui2/panel.c:1759 src/gutenprintui2/panel.c:1847 +#: src/gutenprintui2/panel.c:2065 msgid "Printer Model:" -msgstr "Model tlaÄiarne:" +msgstr "Model tlaèiarne:" -#: src/gutenprintui/panel.c:1595 src/gutenprintui2/panel.c:1595 +#: src/gutenprintui2/panel.c:1770 msgid "Select your printer model" -msgstr "Vyberte model vaÅ¡ej tlaÄiarne" +msgstr "Vyberte model va¹ej tlaèiarne" -#: src/gutenprintui/panel.c:1643 src/gutenprintui2/panel.c:1643 +#: src/gutenprintui2/panel.c:1818 msgid "PPD File:" -msgstr "PPD súbor:" +msgstr "PPD súbor:" -#: src/gutenprintui/panel.c:1659 src/gutenprintui2/panel.c:1659 +#: src/gutenprintui2/panel.c:1834 msgid "Enter the correct PPD filename for your printer" -msgstr "Vložte správny PPD názov súboru pre vaÅ¡u tlaÄiareň" +msgstr "Vlo¾te správny PPD názov súboru pre va¹u tlaèiareò" -#: src/gutenprintui/panel.c:1661 src/gutenprintui/panel.c:1741 -#: src/gutenprintui2/panel.c:1661 src/gutenprintui2/panel.c:1741 +#: src/gutenprintui2/panel.c:1836 src/gutenprintui2/panel.c:1916 msgid "Browse" -msgstr "PrechádzaÅ¥" +msgstr "Prechádza»" -#: src/gutenprintui/panel.c:1668 src/gutenprintui2/panel.c:1668 +#: src/gutenprintui2/panel.c:1843 msgid "Choose the correct PPD filename for your printer" -msgstr "Zvoľte správny PPD názov súboru pre vaÅ¡u tlaÄiareň" +msgstr "Zvoµte správny PPD názov súboru pre va¹u tlaèiareò" -#: src/gutenprintui/panel.c:1710 src/gutenprintui2/panel.c:1710 +#: src/gutenprintui2/panel.c:1885 #, fuzzy msgid "" "Select the name of the output queue (not the type, or model, of printer) " "that you wish to print to" msgstr "" -"Zvoľte si názov tlaÄiarne (nie typ alebo model tlaÄiarne), na ktorej chcete " -"tlaÄiÅ¥" +"Zvoµte si názov tlaèiarne (nie typ alebo model tlaèiarne), na ktorej chcete " +"tlaèi»" -#: src/gutenprintui/panel.c:1712 src/gutenprintui2/panel.c:1712 +#: src/gutenprintui2/panel.c:1887 #, fuzzy msgid "Printer Queue:" -msgstr "Názov tlaÄiarne:" +msgstr "Názov tlaèiarne:" -#: src/gutenprintui/panel.c:1728 src/gutenprintui2/panel.c:1728 +#: src/gutenprintui2/panel.c:1903 #, fuzzy msgid "Enter the correct command to print to your printer. " -msgstr "Vložte správny PPD názov súboru pre vaÅ¡u tlaÄiareň" +msgstr "Vlo¾te správny PPD názov súboru pre va¹u tlaèiareò" -#: src/gutenprintui/panel.c:1739 src/gutenprintui2/panel.c:1739 +#: src/gutenprintui2/panel.c:1914 msgid "Enter the file to print to. " msgstr "" -#: src/gutenprintui/panel.c:1747 src/gutenprintui2/panel.c:1747 +#: src/gutenprintui2/panel.c:1922 #, fuzzy msgid "File to print to" -msgstr "Test tlaÄe" +msgstr "Test tlaèe" -#: src/gutenprintui/panel.c:1755 src/gutenprintui2/panel.c:1755 +#: src/gutenprintui2/panel.c:1930 #, fuzzy msgid "Print To File" -msgstr "TlaÄiÅ¥ do súboru?" +msgstr "Tlaèi» do súboru?" -#: src/gutenprintui/panel.c:1785 src/gutenprintui2/panel.c:1785 +#: src/gutenprintui2/panel.c:1960 msgid "Define New Printer" -msgstr "Definovanie novej tlaÄiarne" +msgstr "Definovanie novej tlaèiarne" -#: src/gutenprintui/panel.c:1803 src/gutenprintui/panel.c:1887 -#: src/gutenprintui2/panel.c:1803 src/gutenprintui2/panel.c:1887 +#: src/gutenprintui2/panel.c:1978 src/gutenprintui2/panel.c:2062 msgid "Printer Name:" -msgstr "Názov tlaÄiarne:" +msgstr "Názov tlaèiarne:" -#: src/gutenprintui/panel.c:1807 src/gutenprintui2/panel.c:1807 +#: src/gutenprintui2/panel.c:1982 msgid "Enter the name you wish to give this logical printer" -msgstr "Vložte oznaÄenie, ktoré chcete daÅ¥ tejto logickej tlaÄiarni" +msgstr "Vlo¾te oznaèenie, ktoré chcete da» tejto logickej tlaèiarni" -#: src/gutenprintui/panel.c:1817 src/gutenprintui2/panel.c:1817 +#: src/gutenprintui2/panel.c:1992 #, fuzzy msgid "About Gutenprint " msgstr "O Gimp-Print " -#: src/gutenprintui/panel.c:1824 src/gutenprintui2/panel.c:1824 +#: src/gutenprintui2/panel.c:1999 #, fuzzy msgid "Gutenprint Version " msgstr "Verzia Gimp-Print" -#: src/gutenprintui/panel.c:1872 src/gutenprintui2/panel.c:1872 +#: src/gutenprintui2/panel.c:2047 msgid "Printer Settings" -msgstr "Nastavenie tlaÄiarne" +msgstr "Nastavenie tlaèiarne" -#: src/gutenprintui/panel.c:1885 src/gutenprintui2/panel.c:1885 +#: src/gutenprintui2/panel.c:2060 msgid "" "Select the name of the printer (not the type, or model, of printer) that you " "wish to print to" msgstr "" -"Zvoľte si názov tlaÄiarne (nie typ alebo model tlaÄiarne), na ktorej chcete " -"tlaÄiÅ¥" +"Zvoµte si názov tlaèiarne (nie typ alebo model tlaèiarne), na ktorej chcete " +"tlaèi»" -#: src/gutenprintui/panel.c:1902 src/gutenprintui2/panel.c:1902 +#: src/gutenprintui2/panel.c:2077 msgid "Setup Printer..." -msgstr "Nastavenie tlaÄiarne..." +msgstr "Nastavenie tlaèiarne..." -#: src/gutenprintui/panel.c:1904 src/gutenprintui2/panel.c:1904 +#: src/gutenprintui2/panel.c:2079 msgid "" "Choose the printer model, PPD file, and command that is used to print to " "this printer" msgstr "" -"Voľba model tlaÄiarne, PPD súboru a príkaz, ktorý sa používa pre tlaÄ na " -"tejto tlaÄiarni" +"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:1917 src/gutenprintui2/panel.c:1917 +#: src/gutenprintui2/panel.c:2092 msgid "New Printer..." -msgstr "Nová tlaÄiareň..." +msgstr "Nová tlaèiareò..." -#: src/gutenprintui/panel.c:1918 src/gutenprintui2/panel.c:1918 +#: src/gutenprintui2/panel.c:2093 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 "" -"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Å¥." +"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:1948 src/gutenprintui2/panel.c:1948 +#: src/gutenprintui2/panel.c:2123 #, fuzzy msgid "Set Printer Option Defaults" -msgstr "NastaviÅ¥ Å¡tandardné" +msgstr "Nastavi» ¹tandardné" -#: src/gutenprintui/panel.c:1949 src/gutenprintui2/panel.c:1949 +#: src/gutenprintui2/panel.c:2124 msgid "Set all printer options to their defaults" msgstr "" -#: src/gutenprintui/panel.c:1972 src/gutenprintui2/panel.c:1972 +#: src/gutenprintui2/panel.c:2147 #, fuzzy msgid "Image Size" -msgstr "VeľkosÅ¥" +msgstr "Veµkos»" -#: src/gutenprintui/panel.c:1997 src/gutenprintui2/panel.c:1997 +#: src/gutenprintui2/panel.c:2172 msgid "Scaling:" msgstr "Zmena:" -#: src/gutenprintui/panel.c:2001 src/gutenprintui2/panel.c:2001 +#: src/gutenprintui2/panel.c:2176 msgid "Set the scale (size) of the image" -msgstr "NastaviÅ¥ zväÄÅ¡enie (veľkosÅ¥) obrázku" +msgstr "Nastavi» zväè¹enie (veµkos») obrázku" -#: src/gutenprintui/panel.c:2023 src/gutenprintui2/panel.c:2023 +#: src/gutenprintui2/panel.c:2198 msgid "Scale by:" msgstr "" -#: src/gutenprintui/panel.c:2028 src/gutenprintui2/panel.c:2028 +#: src/gutenprintui2/panel.c:2203 msgid "" "Select whether scaling is measured as percent of available page size or " "number of output dots per inch" msgstr "" -"Zvoľte, Äi zmena veľkosti bude vyjadrená ako percento dostupnej veľkosti " -"stránky, alebo ako Äíslo výstupného DPI" +"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:2031 src/gutenprintui2/panel.c:2031 +#: src/gutenprintui2/panel.c:2206 msgid "Percent" -msgstr "Percentá" +msgstr "Percentá" -#: src/gutenprintui/panel.c:2036 src/gutenprintui2/panel.c:2036 +#: src/gutenprintui2/panel.c:2211 msgid "Scale the print to the size of the page" -msgstr "ZmeniÅ¥ veľkosÅ¥ tlaÄe podľa rozmerov strany" +msgstr "Zmeni» veµkos» tlaèe podµa rozmerov strany" -#: src/gutenprintui/panel.c:2040 src/gutenprintui2/panel.c:2040 +#: src/gutenprintui2/panel.c:2215 msgid "PPI" msgstr "PPI" -#: src/gutenprintui/panel.c:2045 src/gutenprintui2/panel.c:2045 +#: src/gutenprintui2/panel.c:2220 msgid "Scale the print to the number of dots per inch" -msgstr "ZmeniÅ¥ veľkosÅ¥ tlaÄe podľa poÄtu bodov na palec" +msgstr "Zmeni» veµkos» tlaèe podµa poètu bodov na palec" -#: src/gutenprintui/panel.c:2063 src/gutenprintui2/panel.c:2063 +#: src/gutenprintui2/panel.c:2238 msgid "Set the width of the print" -msgstr "NastaviÅ¥ šírku tlaÄe" +msgstr "Nastavi» ¹írku tlaèe" -#: src/gutenprintui/panel.c:2065 src/gutenprintui2/panel.c:2065 +#: src/gutenprintui2/panel.c:2240 msgid "Set the height of the print" -msgstr "NastaviÅ¥ výšku tlaÄe" +msgstr "Nastavi» vý¹ku tlaèe" -#: src/gutenprintui/panel.c:2071 src/gutenprintui2/panel.c:2071 +#: src/gutenprintui2/panel.c:2246 msgid "" "Use Original\n" "Image Size" msgstr "" -"PoužiÅ¥ pôvodnú\n" -"veľkosÅ¥ obrázka" +"Pou¾i» pôvodnú\n" +"veµkos» obrázka" -#: src/gutenprintui/panel.c:2077 src/gutenprintui2/panel.c:2077 +#: src/gutenprintui2/panel.c:2252 msgid "Set the print size to the size of the image" -msgstr "Nastavenie veľkosti tlaÄe na veľkosÅ¥ obrázku" +msgstr "Nastavenie veµkosti tlaèe na veµkos» obrázku" -#: src/gutenprintui/panel.c:2100 src/gutenprintui2/panel.c:2101 +#: src/gutenprintui2/panel.c:2276 msgid "Print Color Adjust" -msgstr "Prispôsobenie farieb pre tlaÄ" +msgstr "Prispôsobenie farieb pre tlaè" -#: src/gutenprintui/panel.c:2103 src/gutenprintui2/panel.c:2104 +#: src/gutenprintui2/panel.c:2279 msgid "Set Defaults" -msgstr "NastaviÅ¥ Å¡tandardné" +msgstr "Nastavi» ¹tandardné" -#: src/gutenprintui/panel.c:2105 src/gutenprintui2/panel.c:2106 +#: src/gutenprintui2/panel.c:2281 msgid "Close" -msgstr "ZatvoriÅ¥" +msgstr "Zatvori»" -#: src/gutenprintui/panel.c:2134 src/gutenprintui2/panel.c:2135 +#: src/gutenprintui2/panel.c:2310 msgid "Image preview" -msgstr "Náhľad obrázku" +msgstr "Náhµad obrázku" -#: src/gutenprintui/panel.c:2148 src/gutenprintui2/panel.c:2149 +#: src/gutenprintui2/panel.c:2324 msgid "View Output Channels:" msgstr "" -#: src/gutenprintui/panel.c:2234 src/gutenprintui2/panel.c:2240 +#: src/gutenprintui2/panel.c:2415 #, fuzzy msgid "Output" -msgstr "Typ výstupu:" +msgstr "Typ výstupu:" -#: src/gutenprintui/panel.c:2262 src/gutenprintui2/panel.c:2268 +#: src/gutenprintui2/panel.c:2443 msgid "Output Type:" -msgstr "Typ výstupu:" +msgstr "Typ výstupu:" -#: src/gutenprintui/panel.c:2266 src/gutenprintui2/panel.c:2272 +#: src/gutenprintui2/panel.c:2447 msgid "Select the desired output type" -msgstr "Zvoľte vytúžený typ výstupu" +msgstr "Zvoµte vytú¾ený typ výstupu" -#: src/gutenprintui/panel.c:2287 src/gutenprintui2/panel.c:2293 +#: src/gutenprintui2/panel.c:2468 msgid "Adjust Output..." -msgstr "PrispôsobiÅ¥ výstup..." +msgstr "Prispôsobi» výstup..." -#: src/gutenprintui/panel.c:2296 src/gutenprintui2/panel.c:2302 +#: src/gutenprintui2/panel.c:2477 msgid "" "Adjust color balance, brightness, contrast, saturation, and dither algorithm" msgstr "" -"Nastavenie farebného vyváženia, kontrastu, sýtosti a algoritmu rozptylu" +"Nastavenie farebného vyvá¾enia, kontrastu, sýtosti a algoritmu rozptylu" -#: src/gutenprintui/panel.c:2314 src/gutenprintui2/panel.c:2321 +#: src/gutenprintui2/panel.c:2496 #, fuzzy msgid "Size Units:" msgstr "Jednotky:" -#: src/gutenprintui/panel.c:2317 src/gutenprintui2/panel.c:2324 +#: src/gutenprintui2/panel.c:2499 #, fuzzy msgid " " msgstr "> " -#: src/gutenprintui/panel.c:2341 src/gutenprintui2/panel.c:2348 +#: src/gutenprintui2/panel.c:2523 msgid "Units:" msgstr "Jednotky:" -#: src/gutenprintui/panel.c:2346 src/gutenprintui2/panel.c:2353 +#: src/gutenprintui2/panel.c:2528 msgid "Select the base unit of measurement for printing" -msgstr "ZvoliÅ¥ základnú mernú jednotku pre tlaÄ" +msgstr "Zvoli» základnú mernú jednotku pre tlaè" -#: src/gutenprintui/plist.c:90 src/gutenprintui/plist.c:99 -#: src/gutenprintui2/plist.c:89 src/gutenprintui2/plist.c:98 +#: src/gutenprintui2/plist.c:92 src/gutenprintui2/plist.c:101 msgid "System V lp" msgstr "" -#: src/gutenprintui/plist.c:96 src/gutenprintui2/plist.c:95 +#: src/gutenprintui2/plist.c:98 msgid "CUPS" msgstr "" -#: src/gutenprintui/plist.c:102 src/gutenprintui2/plist.c:101 +#: src/gutenprintui2/plist.c:104 msgid "Berkeley lpd (/etc/lpc)" msgstr "" -#: src/gutenprintui/plist.c:105 src/gutenprintui2/plist.c:104 +#: src/gutenprintui2/plist.c:107 msgid "Berkeley lpd (/usr/bsd/lpc)" msgstr "" -#: src/gutenprintui/plist.c:108 src/gutenprintui2/plist.c:107 +#: src/gutenprintui2/plist.c:110 msgid "Berkeley lpd (/usr/etc/lpc" msgstr "" -#: src/gutenprintui/plist.c:111 src/gutenprintui2/plist.c:110 +#: src/gutenprintui2/plist.c:113 msgid "Berkeley lpd (/usr/libexec/lpc)" msgstr "" -#: src/gutenprintui/plist.c:114 src/gutenprintui2/plist.c:113 +#: src/gutenprintui2/plist.c:116 msgid "Berkeley lpd (/usr/sbin/lpc)" msgstr "" -#: src/gutenprintui/plist.c:1043 src/gutenprintui2/plist.c:1057 +#: src/gutenprintui2/plist.c:1060 #, fuzzy msgid "Printer" -msgstr "TlaÄiÅ¥" +msgstr "Tlaèi»" -#: src/gutenprintui/plist.c:1230 src/gutenprintui2/plist.c:1250 +#: src/gutenprintui2/plist.c:1253 #, fuzzy msgid "(Default Printer)" -msgstr "NastaviÅ¥ tlaÄiareň" - -#: src/gutenprintui2/curve.c:130 -#, fuzzy -msgid "Curve type" -msgstr "ÄŒierna" - -#: src/gutenprintui2/curve.c:131 -msgid "Is this curve linear, spline interpolated, or free-form" -msgstr "" - -#: src/gutenprintui2/curve.c:139 -msgid "Minimum X" -msgstr "" - -#: src/gutenprintui2/curve.c:140 -msgid "Minimum possible value for X" -msgstr "" - -#: src/gutenprintui2/curve.c:149 -msgid "Maximum X" -msgstr "" - -#: src/gutenprintui2/curve.c:150 -msgid "Maximum possible X value" -msgstr "" - -#: src/gutenprintui2/curve.c:159 -msgid "Minimum Y" -msgstr "" - -#: src/gutenprintui2/curve.c:160 -msgid "Minimum possible value for Y" -msgstr "" - -#: src/gutenprintui2/curve.c:169 -msgid "Maximum Y" -msgstr "" - -#: src/gutenprintui2/curve.c:170 -msgid "Maximum possible value for Y" -msgstr "" - -#: src/gutenprintui2/gammacurve.c:418 -msgid "_Gamma value" -msgstr "" +msgstr "Nastavi» tlaèiareò" #: src/cups/genppd.c:145 #, fuzzy msgid "Printer Features" -msgstr "Nastavenie tlaÄiarne" +msgstr "Nastavenie tlaèiarne" #: src/cups/genppd.c:146 #, fuzzy msgid "Output Control" -msgstr "Typ výstupu:" +msgstr "Typ výstupu:" #: src/cups/genppd.c:151 #, fuzzy msgid "Common" -msgstr "Príkaz:" +msgstr "Príkaz:" #: src/cups/genppd.c:152 #, fuzzy msgid "Extra 1" -msgstr "Zásobník 1" +msgstr "Zásobník 1" #: src/cups/genppd.c:153 #, fuzzy msgid "Extra 2" -msgstr "Zásobník 2" +msgstr "Zásobník 2" #: src/cups/genppd.c:154 #, fuzzy msgid "Extra 3" -msgstr "Zásobník 3" +msgstr "Zásobník 3" #: src/cups/genppd.c:155 #, fuzzy msgid "Extra 4" -msgstr "Zásobník 4" +msgstr "Zásobník 4" #: src/cups/genppd.c:156 msgid "Extra 5" @@ -7261,48 +7636,48 @@ msgstr "" #. 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:1058 +#: src/cups/genppd.c:1064 msgid "English" msgstr "Slovak" #. TRANSLATORS: Specify PPD translation encoding e.g. ISOLatin1 -#: src/cups/genppd.c:1060 +#: src/cups/genppd.c:1066 msgid "ISOLatin1" msgstr "ISOLatin1" -#: src/cups/genppd.c:1641 +#: src/cups/genppd.c:1647 msgid "2-Sided Printing" msgstr "" -#: src/cups/genppd.c:1665 +#: src/cups/genppd.c:1671 msgid "Shrink Page If Necessary to Fit Borders" msgstr "" -#: src/cups/genppd.c:1669 +#: src/cups/genppd.c:1675 msgid "Shrink (print the whole page)" msgstr "" -#: src/cups/genppd.c:1670 +#: src/cups/genppd.c:1676 msgid "Crop (preserve dimensions)" msgstr "" -#: src/cups/genppd.c:1671 +#: src/cups/genppd.c:1677 msgid "Expand (use maximum page area)" msgstr "" -#: src/cups/genppd.c:1756 +#: src/cups/genppd.c:1762 msgid "No" msgstr "" -#: src/cups/genppd.c:1758 +#: src/cups/genppd.c:1764 msgid "Yes" msgstr "" -#: src/cups/genppd.c:1795 src/cups/genppd.c:1857 +#: src/cups/genppd.c:1801 src/cups/genppd.c:1863 msgid "Value" msgstr "" -#: src/cups/genppd.c:1800 +#: src/cups/genppd.c:1806 msgid "Fine Adjustment" msgstr "" @@ -7331,21 +7706,21 @@ msgid "" msgstr "" "Copyright 2000 Robert Krawitz (rlk@alum.mit.edu)\n" "\n" -"Toto je iba orientaÄný preklad licencie, ktorá platí v originálnom anglickom " -"znení.\n" +"Toto je iba orientaèný preklad licencie, ktorá platí v originálnom anglickom " +"znení.\n" "\n" -"Tento program je voľne šíriteľný; môžete ho redistribuovaÅ¥ a meniÅ¥\n" -"v súlade so VÅ¡eobecnou verejnou licenciou GNU publikovanou\n" -"vo Free Software Foundation; buÄ licenciou verzie 2 alebo\n" -"(podľa vaÅ¡ej voľby) akoukoľvek novÅ¡ou.\n" +"Tento program je voµne ¹íriteµný; mô¾ete ho redistribuova» a meni»\n" +"v súlade so V¹eobecnou verejnou licenciou GNU publikovanou\n" +"vo Free Software Foundation; buï licenciou verzie 2 alebo\n" +"(podµa va¹ej voµby) akoukoµvek nov¹ou.\n" "\n" -"Tento program je šírený v nádeji, že bude užitoÄný, avÅ¡ak\n" -"BEZ AKEJKOĽVEK ZÃRUKY; neposkytujú sa ani odvodené záruky\n" -"PREDAJNOSTI alebo VHODNOSTI PRE URÄŒITà ÚČEL.\n" -"ÄŽalÅ¡ie podrobnosti hľadajte vo VÅ¡eobecnej verejnej licencii GNU.\n" +"Tento program je ¹írený v nádeji, ¾e bude u¾itoèný, av¹ak\n" +"BEZ AKEJKO¥VEK ZÁRUKY; neposkytujú sa ani odvodené záruky\n" +"PREDAJNOSTI alebo VHODNOSTI PRE URÈITÝ ÚÈEL.\n" +"Ïal¹ie podrobnosti hµadajte vo V¹eobecnej verejnej licencii GNU.\n" "\n" -"S týmto programom by ste mali získaÅ¥ kópiu VÅ¡eobecnej verejnej\n" -"licencie GNU; ak tomu tak nie je, napíšte do Free Software\n" +"S týmto programom by ste mali získa» kópiu V¹eobecnej verejnej\n" +"licencie GNU; ak tomu tak nie je, napí¹te do Free Software\n" "Foundation, Inc., 59 Temple Place - Suite 330, Boston,\n" "MA 02111-1307, USA.\n" @@ -7395,51 +7770,51 @@ 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 "" -"Použitie: escputil [-c | -n | -a | -i | -o | -s | -d | -l | -M]\n" -" [-P tlaÄiareň | -r zariadenie] [-u] [-q] [-m model]\n" -"Vykoná údržbu tlaÄiarní EPSON Stylus (R).\n" -"Príklad: escputil --clean-head --printer stpex-na-druhom-poschodí\n" +"Pou¾itie: escputil [-c | -n | -a | -i | -o | -s | -d | -l | -M]\n" +" [-P tlaèiareò | -r zariadenie] [-u] [-q] [-m model]\n" +"Vykoná údr¾bu tlaèiarní EPSON Stylus (R).\n" +"Príklad: escputil --clean-head --printer stpex-na-druhom-poschodí\n" " escputil --ink-level --new --raw-device /dev/lp0\n" "\n" -" Príkazy:\n" -" -c|--clean-head ÄŒistí tlaÄovú hlavu.\n" -" -n|--nozzle-check VytlaÄí testovaciu vzorku na otvory.\n" -" Å pinavé alebo upchaté otvory budú zobrazené ako " +" Príkazy:\n" +" -c|--clean-head Èistí tlaèovú hlavu.\n" +" -n|--nozzle-check Vytlaèí testovaciu vzorku na otvory.\n" +" ©pinavé alebo upchaté otvory budú zobrazené ako " "medzery\n" -" vo vzorke. Ak uvidíte nejaké medzery, mali by ste\n" -" oÄistiÅ¥ tlaÄovú hlavu.\n" -" -a|--align-head Zarovnanie tlaÄovej hlavy. UPOZORNENIE: Nesprávne\n" -" použitie tohoto nástroja bude maÅ¥ za následok nízku\n" -" kvalitu tlaÄe a/alebo poÅ¡kodenie tlaÄiarne.\n" +" vo vzorke. Ak uvidíte nejaké medzery, mali by ste\n" +" oèisti» tlaèovú hlavu.\n" +" -a|--align-head Zarovnanie tlaèovej hlavy. UPOZORNENIE: Nesprávne\n" +" pou¾itie tohoto nástroja bude ma» za následok nízku\n" +" kvalitu tlaèe a/alebo po¹kodenie tlaèiarne.\n" " -o|--align-color Zarovnanie farebnej hlavy ( iba pre Stylus Color 480 " "a\n" -" 580 UPOZORNENIE: Nesprávne použitie tohoto nástroja " +" 580 UPOZORNENIE: Nesprávne pou¾itie tohoto nástroja " "bude\n" -" maÅ¥ za následok nízku kvalitu tlaÄe a/alebo " -"poÅ¡kodenie\n" -" \t\t\ttlaÄiarne.\n" -" -s|--status Informácie o stave tlaÄiarne.\n" -" -i|--ink-level Získanie o informácie o úrovni atramentu z " -"tlaÄiarne.\n" -"\t\t\tToto vyžaduje prístup Äítanie/zápis na základné\n" -" zariadenie tlaÄiarne.\n" -" -d|--identify Požiadavka na tlaÄiareň o informácie o modely.\n" -" Toto vyžaduje prístup Äítanie/zápis na základné\n" -" zariadenie tlaÄiarne.\n" -" -l|--license Zobrazenie licencie/podmienok záruky tohoto " +" ma» za následok nízku kvalitu tlaèe a/alebo " +"po¹kodenie\n" +" \t\t\ttlaèiarne.\n" +" -s|--status Informácie o stave tlaèiarne.\n" +" -i|--ink-level Získanie o informácie o úrovni atramentu z " +"tlaèiarne.\n" +"\t\t\tToto vy¾aduje prístup èítanie/zápis na základné\n" +" zariadenie tlaèiarne.\n" +" -d|--identify Po¾iadavka na tlaèiareò o informácie o modely.\n" +" Toto vy¾aduje prístup èítanie/zápis na základné\n" +" zariadenie tlaèiarne.\n" +" -l|--license Zobrazenie licencie/podmienok záruky tohoto " "programu.\n" -" -M|--list-models Zoznam dostupných modelov tlaÄiarní.\n" -" -h|--help Zobrazí tieto informácie.\n" +" -M|--list-models Zoznam dostupných modelov tlaèiarní.\n" +" -h|--help Zobrazí tieto informácie.\n" "\n" -" Voľby:\n" -" -P|--printer-name UrÄenie názvu tlaÄiarne, s ktorou sa bude pracovaÅ¥.\n" -" Å tandardne sa použije systémová tlaÄiareň.\n" -" -r|--raw-device UrÄenie názvu zariadenia pre priamy zápis, než by sa\n" -" mal použiÅ¥ tlaÄový front.\n" -" -u|--new TlaÄiareň je nová tlaÄiareň (Stylus Color 740 alebo\n" -" novÅ¡ia).\n" -" -q|--quiet zakázanie nápisu.\n" -" -m|--model UrÄenie presného modelu tlaÄiarne pre zarovnanie " +" Voµby:\n" +" -P|--printer-name Urèenie názvu tlaèiarne, s ktorou sa bude pracova».\n" +" ©tandardne sa pou¾ije systémová tlaèiareò.\n" +" -r|--raw-device Urèenie názvu zariadenia pre priamy zápis, ne¾ by sa\n" +" mal pou¾i» tlaèový front.\n" +" -u|--new Tlaèiareò je nová tlaèiareò (Stylus Color 740 alebo\n" +" nov¹ia).\n" +" -q|--quiet zakázanie nápisu.\n" +" -m|--model Urèenie presného modelu tlaèiarne pre zarovnanie " "hlavy.\n" #: src/escputil/escputil.c:162 @@ -7486,52 +7861,52 @@ msgid "" " -C Specify the number of pattern choices for alignment\n" " -p Specify the number of sets of patterns for alignment\n" msgstr "" -"Použitie: escputil [VOĽBA] [PRÃKAZ]\n" -"Použitie: escputil [-c | -n | -a | -i | -o | -s | -d | -l | -M]\n" -" [-P tlaÄiareň | -r zariadenie] [-u] [-q] [-m model]\n" -"Vykoná údržbu na tlaÄiarni EPSON Stylus (R).\n" -"Príklady: escputil -c -P stpex-na-druhom-poschodí\n" +"Pou¾itie: escputil [VO¥BA] [PRÍKAZ]\n" +"Pou¾itie: escputil [-c | -n | -a | -i | -o | -s | -d | -l | -M]\n" +" [-P tlaèiareò | -r zariadenie] [-u] [-q] [-m model]\n" +"Vykoná údr¾bu na tlaèiarni EPSON Stylus (R).\n" +"Príklady: escputil -c -P stpex-na-druhom-poschodí\n" " escputil -i -u -r /dev/lp0\n" "\n" -" Príkazy:\n" -" -c ÄŒistí tlaÄovú hlavu.\n" -" -n VytlaÄí testovaciu vzorku na otvory.\n" -" Å pinavé alebo upchaté otvory budú zobrazené ako medzery\n" -" vo vzorke. Ak uvidíte nejaké medzery, mali by ste oÄistiÅ¥\n" -" tlaÄovú hlavu.\n" -" -a Zarovnanie tlaÄovej hlavy. UPOZORNENIE: Nesprávne použitie\n" -" tohoto nástroja bude maÅ¥ za následok nízku kvalitu tlaÄe\n" -" a/alebo poÅ¡kodenie tlaÄiarne.\n" +" Príkazy:\n" +" -c Èistí tlaèovú hlavu.\n" +" -n Vytlaèí testovaciu vzorku na otvory.\n" +" ©pinavé alebo upchaté otvory budú zobrazené ako medzery\n" +" vo vzorke. Ak uvidíte nejaké medzery, mali by ste oèisti»\n" +" tlaèovú hlavu.\n" +" -a Zarovnanie tlaèovej hlavy. UPOZORNENIE: Nesprávne pou¾itie\n" +" tohoto nástroja bude ma» za následok nízku kvalitu tlaèe\n" +" a/alebo po¹kodenie tlaèiarne.\n" " -o Zarovnanie farebnej hlavy ( iba pre Stylus Color 480 a 580\n" -" UPOZORNENIE: Nesprávne použitie tohoto nástroja bude maÅ¥\n" -" za následok nízku kvalitu tlaÄe a/alebo poÅ¡kodenie tlaÄiarne.\n" -" -s Informácie o stave tlaÄiarne.\n" -" -i Získanie o informácie o úrovni atramentu z tlaÄiarne. Toto vyžaduje\n" -" prístup na Äítanie/zápis na základné zariadenie tlaÄiarne.\n" -" -d Požiadavka na tlaÄiareň o informácie o modely. Toto vyžaduje prístup\n" -" Äítanie/zápis na základné zariadenie tlaÄiarne.\n" -" -l Zobrazenie licencie/podmienok záruky tohoto programu.\n" -" -M Zoznam dostupných modelov tlaÄiarní.\n" -" -h Zobrazí tieto informácie.\n" +" UPOZORNENIE: Nesprávne pou¾itie tohoto nástroja bude ma»\n" +" za následok nízku kvalitu tlaèe a/alebo po¹kodenie tlaèiarne.\n" +" -s Informácie o stave tlaèiarne.\n" +" -i Získanie o informácie o úrovni atramentu z tlaèiarne. Toto vy¾aduje\n" +" prístup na èítanie/zápis na základné zariadenie tlaèiarne.\n" +" -d Po¾iadavka na tlaèiareò o informácie o modely. Toto vy¾aduje prístup\n" +" èítanie/zápis na základné zariadenie tlaèiarne.\n" +" -l Zobrazenie licencie/podmienok záruky tohoto programu.\n" +" -M Zoznam dostupných modelov tlaèiarní.\n" +" -h Zobrazí tieto informácie.\n" "\n" -" Voľby:\n" -" -P UrÄenie názvu tlaÄiarne, s ktorou sa bude pracovaÅ¥.\n" -" Å¡tandardne sa použije systémová tlaÄiareň.\n" -" -r UrÄenie názvu zariadenia pre priamy zápis, než by sa\n" -" mal použiÅ¥ tlaÄový front.\n" -" -u TlaÄiareň je nová tlaÄiareň (Stylus Color 740 alebo novÅ¡ia).\n" -" -q zakázanie nápisu.\n" -" -m UrÄenie presného modelu tlaÄiarne pre zarovnanie hlavy.\n" +" Voµby:\n" +" -P Urèenie názvu tlaèiarne, s ktorou sa bude pracova».\n" +" ¹tandardne sa pou¾ije systémová tlaèiareò.\n" +" -r Urèenie názvu zariadenia pre priamy zápis, ne¾ by sa\n" +" mal pou¾i» tlaèový front.\n" +" -u Tlaèiareò je nová tlaèiareò (Stylus Color 740 alebo nov¹ia).\n" +" -q zakázanie nápisu.\n" +" -m Urèenie presného modelu tlaèiarne pre zarovnanie hlavy.\n" #: src/escputil/escputil.c:333 src/escputil/escputil.c:341 #, c-format msgid "You may only specify one printer or raw device." -msgstr "Môžete Å¡pecifikovaÅ¥ len jednu tlaÄiareň alebo prvotné zariadenie." +msgstr "Mô¾ete ¹pecifikova» len jednu tlaèiareò alebo prvotné zariadenie." #: src/escputil/escputil.c:349 #, c-format msgid "You may only specify one printer model." -msgstr "Je možné zvoliÅ¥ len jeden model tlaÄiarne." +msgstr "Je mo¾né zvoli» len jeden model tlaèiarne." #: src/escputil/escputil.c:373 #, c-format @@ -7546,7 +7921,7 @@ msgstr "" #: src/escputil/escputil.c:385 #, c-format msgid "Unknown option %c\n" -msgstr "Neznáme nastavenie %c\n" +msgstr "Neznáme nastavenie %c\n" #: src/escputil/escputil.c:393 #, c-format @@ -7566,17 +7941,17 @@ msgstr "" #: src/escputil/escputil.c:463 #, c-format msgid "Cannot open device %s: %s\n" -msgstr "Nie je možné otvoriÅ¥ zariadenie %s: %s\n" +msgstr "Nie je mo¾né otvori» zariadenie %s: %s\n" #: src/escputil/escputil.c:486 #, c-format msgid "Cannot print to printer %s with %s\n" -msgstr "Na tlaÄiarni %s s %s nie je možné tlaÄiÅ¥ \n" +msgstr "Na tlaèiarni %s s %s nie je mo¾né tlaèi» \n" #: src/escputil/escputil.c:502 src/escputil/escputil.c:512 #, c-format msgid "Unable to send command to printer\n" -msgstr "Nie je možné poslaÅ¥ príkaz na tlaÄiareň\n" +msgstr "Nie je mo¾né posla» príkaz na tlaèiareò\n" #: src/escputil/escputil.c:572 #, c-format @@ -7586,27 +7961,27 @@ msgstr "" #: src/escputil/escputil.c:577 #, c-format msgid "Cannot read from %s: %s\n" -msgstr "Nie je možné ÄítaÅ¥ z %s: %s\n" +msgstr "Nie je mo¾né èíta» z %s: %s\n" #: src/escputil/escputil.c:729 #, fuzzy, c-format msgid "Please specify a raw device\n" -msgstr "Stav tlaÄiarne vyžaduje používanie základného zariadenia.\n" +msgstr "Stav tlaèiarne vy¾aduje pou¾ívanie základného zariadenia.\n" #: src/escputil/escputil.c:736 #, c-format msgid "Cannot open %s read/write: %s\n" -msgstr "Nie je možné otvoriÅ¥ %s pre Äítanie/zápis: %s\n" +msgstr "Nie je mo¾né otvori» %s pre èítanie/zápis: %s\n" #: src/escputil/escputil.c:783 #, fuzzy, c-format msgid "Unknown printer %s!\n" -msgstr "Neznáme nastavenie %s\n" +msgstr "Neznáme nastavenie %s\n" #: src/escputil/escputil.c:819 src/escputil/escputil.c:1414 #, c-format msgid "Cannot write to %s: %s\n" -msgstr "Nie je možné zapisovaÅ¥ do %s: %s\n" +msgstr "Nie je mo¾né zapisova» do %s: %s\n" #: src/escputil/escputil.c:865 src/escputil/escputil.c:1379 #: src/escputil/escputil.c:1507 @@ -7616,7 +7991,7 @@ msgid "" "Cannot write to %s: %s\n" msgstr "" "\n" -"Nie je možné zapisovaÅ¥ do %s: %s\n" +"Nie je mo¾né zapisova» do %s: %s\n" #: src/escputil/escputil.c:908 #, c-format @@ -7626,8 +8001,8 @@ msgid "" "Please use -m to specify your printer model.\n" msgstr "" "\n" -"Nie je možné zistiÅ¥ typ tlaÄiarne.\n" -"Použite prosím -m na urÄenie modelu vaÅ¡ej tlaÄiarne.\n" +"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:977 src/escputil/escputil.c:983 #: src/escputil/escputil.c:984 src/escputil/escputil.c:1253 @@ -7652,7 +8027,7 @@ msgstr "" #: src/escputil/escputil.c:1030 #, fuzzy, c-format msgid "Status: Waiting\n" -msgstr "SýtosÅ¥:" +msgstr "Sýtos»:" #: src/escputil/escputil.c:1033 #, c-format @@ -7766,13 +8141,13 @@ msgstr "" #: src/escputil/escputil.c:1210 src/escputil/escputil.c:1240 msgid "Ink color" -msgstr "Farebný atrament" +msgstr "Farebný atrament" #: src/escputil/escputil.c:1210 src/escputil/escputil.c:1240 #: src/escputil/escputil.c:1598 src/escputil/escputil.c:1622 #: src/escputil/escputil.c:1642 msgid "Percent remaining" -msgstr "Zostávajúce percentá" +msgstr "Zostávajúce percentá" #: src/escputil/escputil.c:1287 src/escputil/escputil.c:1290 #: src/escputil/escputil.c:1293 src/escputil/escputil.c:1296 @@ -7802,12 +8177,12 @@ msgstr "" #: src/escputil/escputil.c:1351 #, 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" +msgstr "Získanie úrovne atramentu vy¾aduje pou¾itie základného zariadenia.\n" #: src/escputil/escputil.c:1457 #, 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" +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 @@ -7827,22 +8202,22 @@ msgstr "" #: src/escputil/escputil.c:1671 #, 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" +msgstr "Identifikácia tlaèiarne vy¾aduje pou¾ívanie základného zariadenia.\n" #: src/escputil/escputil.c:1689 #, fuzzy, c-format msgid "Cannot identify printer model.\n" -msgstr "Je možné zvoliÅ¥ len jeden model tlaÄiarne." +msgstr "Je mo¾né zvoli» len jeden model tlaèiarne." #: src/escputil/escputil.c:1711 #, c-format msgid "Cleaning heads...\n" -msgstr "ÄŒistenie hláv...\n" +msgstr "Èistenie hláv...\n" #: 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" +msgstr "Spú¹»am kontrolu trysiek, uistite sa, ¾e v tlaèiarni je papier.\n" #: src/escputil/escputil.c:1732 #, c-format @@ -7882,41 +8257,41 @@ msgid "" "It is essential that you not turn your printer off during this procedure.\n" "\n" msgstr "" -"Prosím, veľmi pozorne si preÄítajte tieto inÅ¡trukcie skôr, ako bude " -"pokraÄovaÅ¥.\n" +"Prosím, veµmi pozorne si preèítajte tieto in¹trukcie skôr, ako bude " +"pokraèova».\n" "\n" -"Tento nástroj vám umožní zarovnaÅ¥ tlaÄovú hlavu atramentovej tlaÄiarne\n" -"Epson Stylus. Jeho nesprávne použitie môže spôsobiÅ¥ zníženie kvality tlaÄe\n" -"a môže poÅ¡kodiÅ¥ samotnú tlaÄiareň. Tento nástroj nebol otestovaný\n" -"spoloÄnosÅ¥ou Seiko Epson a je ponúknutý bez akejkoľvek záruky. Celé\n" -"riziko za použitie toho nástroja leží na vás.\n" +"Tento nástroj vám umo¾ní zarovna» tlaèovú hlavu atramentovej tlaèiarne\n" +"Epson Stylus. Jeho nesprávne pou¾itie mô¾e spôsobi» zní¾enie kvality tlaèe\n" +"a mô¾e po¹kodi» samotnú tlaèiareò. Tento nástroj nebol otestovaný\n" +"spoloènos»ou Seiko Epson a je ponúknutý bez akejkoµvek záruky. Celé\n" +"riziko za pou¾itie toho nástroja le¾í na vás.\n" "\n" -"Bude vytlaÄených %d testovacích vzoriek. VÅ¡etky vzorky sú veľmi podobné.\n" -"Vzorky obsahujú série zvislých Äiar, ktoré sa budú prekrývaÅ¥ Pod každým " -"párom je Äíslo\n" +"Bude vytlaèených %d testovacích vzoriek. V¹etky vzorky sú veµmi podobné.\n" +"Vzorky obsahujú série zvislých èiar, ktoré sa budú prekrýva» Pod ka¾dým " +"párom je èíslo\n" "od %d do %d.\n" "\n" -"KeÄ si prezriete páry Äiar, mali by ste vybraÅ¥ taký pár Äiar, ktorý je " -"najlepÅ¡ie\n" -"zarovnaný. Veľmi pozorne si ich prezrite. Pre najkritickejÅ¡ie rozhodovanie\n" -"použite lupu alebo zväÄÅ¡ovacie sklíÄko. Tiež vám odporúÄame použiÅ¥ na tento\n" -"test vysokokvalitný papier, aby sa Äiary nerozpíjali na papieri, ale mali\n" -"správny tvar. Pred napísaním Äísla najlepÅ¡ieho páru Äiar, vložte stanu späť\n" -"do tlaÄiarne.\n" +"Keï si prezriete páry èiar, mali by ste vybra» taký pár èiar, ktorý je " +"najlep¹ie\n" +"zarovnaný. Veµmi pozorne si ich prezrite. Pre najkritickej¹ie rozhodovanie\n" +"pou¾ite lupu alebo zväè¹ovacie sklíèko. Tie¾ vám odporúèame pou¾i» na tento\n" +"test vysokokvalitný papier, aby sa èiary nerozpíjali na papieri, ale mali\n" +"správny tvar. Pred napísaním èísla najlep¹ieho páru èiar, vlo¾te stanu spä»\n" +"do tlaèiarne.\n" "\n" -"Každá vzorka je podobná, ale posledné vzorky používajú jemnejÅ¡ie bodky\n" -"pre kritickejÅ¡ie zarovnanie. Musíte prejsÅ¥ vÅ¡etkými fázami zarovnávania,\n" -"aby vaÅ¡a tlaÄiareň bola správne zarovnaná. Po absolvovaní vÅ¡etkých fáz\n" -"bude zarovnávacia vzorka vytlaÄená eÅ¡te raz. Mali by ste zistiÅ¥, že vzorka\n" -"v strede (#%d z %d) je najlepÅ¡ia zo vÅ¡etkých,\n" +"Ka¾dá vzorka je podobná, ale posledné vzorky pou¾ívajú jemnej¹ie bodky\n" +"pre kritickej¹ie zarovnanie. Musíte prejs» v¹etkými fázami zarovnávania,\n" +"aby va¹a tlaèiareò bola správne zarovnaná. Po absolvovaní v¹etkých fáz\n" +"bude zarovnávacia vzorka vytlaèená e¹te raz. Mali by ste zisti», ¾e vzorka\n" +"v strede (#%d z %d) je najlep¹ia zo v¹etkých,\n" "\n" -"Po vytlaÄení ÄalÅ¡ej vzorky vám bude ponúknutá možnosÅ¥ (s) - uložiÅ¥ výsledky\n" -"do tlaÄiarne, (r) - zopakovaÅ¥ proces, alebo (q) - ukonÄiÅ¥ bez uloženia.\n" -"UkonÄenie neobnoví pôvodné nastavenie, ale vypnutie a následné zapnutie\n" -"tlaÄiarne áno. Pokiaľ ukonÄíte bez uloženia, budete musieÅ¥ zopakovaÅ¥ celý\n" -"proces opäť, ak budete chcieÅ¥ svoje výsledky uložiÅ¥. Je dôležité, aby ste " -"poÄas\n" -"toho procesu nevypli tlaÄiareň\n" +"Po vytlaèení ïal¹ej vzorky vám bude ponúknutá mo¾nos» (s) - ulo¾i» výsledky\n" +"do tlaèiarne, (r) - zopakova» proces, alebo (q) - ukonèi» bez ulo¾enia.\n" +"Ukonèenie neobnoví pôvodné nastavenie, ale vypnutie a následné zapnutie\n" +"tlaèiarne áno. Pokiaµ ukonèíte bez ulo¾enia, budete musie» zopakova» celý\n" +"proces opä», ak budete chcie» svoje výsledky ulo¾i». Je dôle¾ité, aby ste " +"poèas\n" +"toho procesu nevypli tlaèiareò\n" "\n" #: src/escputil/escputil.c:1767 @@ -7954,45 +8329,45 @@ msgid "" "this procedure.\n" "\n" msgstr "" -"Prosím, veľmi pozorne si preÄítajte tieto inÅ¡trukcie skôr, ako bude " -"pokraÄovaÅ¥.\n" +"Prosím, veµmi pozorne si preèítajte tieto in¹trukcie skôr, ako bude " +"pokraèova».\n" "\n" -"Tento nástroj vám umožní zarovnaÅ¥ tlaÄovú hlavu atramentovej tlaÄiarne Epson " +"Tento nástroj vám umo¾ní zarovna» tlaèovú hlavu atramentovej tlaèiarne Epson " "Stylus.\n" -"Jeho nesprávne použitie môže spôsobiÅ¥ zníženie kvality tlaÄe a môže " -"poÅ¡kodiÅ¥\n" -"samotnú tlaÄiareň. Tento nástroj nebol otestovaný spoloÄnosÅ¥ou Seiko Epson\n" -"a je ponúknutý bez akejkoľvek záruky. Celé riziko za použitie toho nástroja\n" -"leží na vás.\n" +"Jeho nesprávne pou¾itie mô¾e spôsobi» zní¾enie kvality tlaèe a mô¾e " +"po¹kodi»\n" +"samotnú tlaèiareò. Tento nástroj nebol otestovaný spoloènos»ou Seiko Epson\n" +"a je ponúknutý bez akejkoµvek záruky. Celé riziko za pou¾itie toho nástroja\n" +"le¾í na vás.\n" "\n" -"Bude vytlaÄená testovacia vzorka, ktorá bude obsahovaÅ¥ sériu párov zvislých\n" -"Äiar, ktoré **overlap. Pod každým párom Äiar je Äíslo od %d do %d.\n" +"Bude vytlaèená testovacia vzorka, ktorá bude obsahova» sériu párov zvislých\n" +"èiar, ktoré **overlap. Pod ka¾dým párom èiar je èíslo od %d do %d.\n" "\n" -"KeÄ si prezriete vzorky, mali by ste vybraÅ¥ taký pár Äiar, ktorý je " -"najlepÅ¡ie\n" -"zarovnaný. Veľmi pozorne si ich prezrite. Pre najkritickejÅ¡ie rozhodovanie\n" -"použite lupu alebo zväÄÅ¡ovacie sklíÄko. Tiež vám odporúÄame použiÅ¥ na tento\n" -"test vysokokvalitný papier, aby sa Äiary nerozpíjali na papieri, ale mali\n" -"správny tvar. Pred napísaním Äísla najlepÅ¡ieho páru Äiar, vložte stanu späť\n" -"do tlaÄiarne.\n" +"Keï si prezriete vzorky, mali by ste vybra» taký pár èiar, ktorý je " +"najlep¹ie\n" +"zarovnaný. Veµmi pozorne si ich prezrite. Pre najkritickej¹ie rozhodovanie\n" +"pou¾ite lupu alebo zväè¹ovacie sklíèko. Tie¾ vám odporúèame pou¾i» na tento\n" +"test vysokokvalitný papier, aby sa èiary nerozpíjali na papieri, ale mali\n" +"správny tvar. Pred napísaním èísla najlep¹ieho páru èiar, vlo¾te stanu spä»\n" +"do tlaèiarne.\n" "\n" -"Zarovnávacia vzorka bude vytlaÄená eÅ¡te raz. V tomto prípade by najlepším\n" -"párom (#%d z %d) mal byÅ¥ ten uprostred. Potom vám bude ponúknutá možnosÅ¥\n" -"(s) - uložiÅ¥ výsledky do tlaÄiarne, (r) - zopakovaÅ¥ proces, alebo (q) - " -"ukonÄiÅ¥\n" -"bez uloženia. UkonÄenie neobnoví pôvodné nastavenie, ale vypnutie a " -"následné\n" -"zapnutie tlaÄiarne áno.\n" -"Pokiaľ ukonÄíte bez uloženia, budete musieÅ¥ zopakovaÅ¥ celý proces opäť, ak\n" -"budete chcieÅ¥ svoje výsledky uložiÅ¥. Je dôležité, aby ste poÄas toho " +"Zarovnávacia vzorka bude vytlaèená e¹te raz. V tomto prípade by najlep¹ím\n" +"párom (#%d z %d) mal by» ten uprostred. Potom vám bude ponúknutá mo¾nos»\n" +"(s) - ulo¾i» výsledky do tlaèiarne, (r) - zopakova» proces, alebo (q) - " +"ukonèi»\n" +"bez ulo¾enia. Ukonèenie neobnoví pôvodné nastavenie, ale vypnutie a " +"následné\n" +"zapnutie tlaèiarne áno.\n" +"Pokiaµ ukonèíte bez ulo¾enia, budete musie» zopakova» celý proces opä», ak\n" +"budete chcie» svoje výsledky ulo¾i». Je dôle¾ité, aby ste poèas toho " "procesu \n" -"nevypli tlaÄiareň\n" +"nevypli tlaèiareò\n" "\n" #: 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" +msgstr "Nie je mo¾né odosla» príkaz pre tlaèiareò, koniec.\n" #: src/escputil/escputil.c:1825 src/escputil/escputil.c:1994 #, c-format @@ -8010,13 +8385,13 @@ msgid "" "You will then be asked to confirm your choice.\n" "What do you want to do (s, q, r)?\n" msgstr "" -"Preskúmajte výsledok tlaÄe veľmi pozorne a uistite sa,\n" -"že vaÅ¡a tlaÄiareň má správne zarovnanie. Teraz môžete:\n" -" (s) uložiÅ¥ výsledok do tlaÄiarne,\n" -" (q) ukonÄiÅ¥ bez uloženia výsledku, alebo\n" -" (r) zopakovaÅ¥ celý proces od zaÄiatku.\n" -"Potom bude požiadaný potvrdiÅ¥ vaÅ¡u voľbu.\n" -"ÄŒo chcete spraviÅ¥? (s,q,r)?\n" +"Preskúmajte výsledok tlaèe veµmi pozorne a uistite sa,\n" +"¾e va¹a tlaèiareò má správne zarovnanie. Teraz mô¾ete:\n" +" (s) ulo¾i» výsledok do tlaèiarne,\n" +" (q) ukonèi» bez ulo¾enia výsledku, alebo\n" +" (r) zopakova» celý proces od zaèiatku.\n" +"Potom bude po¾iadaný potvrdi» va¹u voµbu.\n" +"Èo chcete spravi»? (s,q,r)?\n" #: src/escputil/escputil.c:1836 src/escputil/escputil.c:1845 #: src/escputil/escputil.c:1860 src/escputil/escputil.c:1878 @@ -8029,7 +8404,7 @@ msgstr "> " 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" +"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:1850 #, c-format @@ -8037,8 +8412,8 @@ 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 "" -"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" +"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:1857 #, c-format @@ -8046,13 +8421,13 @@ msgid "" "Please confirm by typing 'r' again that you wish to repeat the\n" "alignment process:\n" msgstr "" -"Opätovným stlaÄení 'r' potvrÄte, že si prajete zopakovaÅ¥ proces " -"zarovnávania:\n" +"Opätovným stlaèení 'r' potvrïte, ¾e si prajete zopakova» proces " +"zarovnávania:\n" #: src/escputil/escputil.c:1865 #, c-format msgid "Repeating the alignment process.\n" -msgstr "Opakujem proces zarovnávania.\n" +msgstr "Opakujem proces zarovnávania.\n" #: src/escputil/escputil.c:1871 #, c-format @@ -8063,11 +8438,11 @@ msgid "" "Please confirm by typing 's' again that you wish to save the settings\n" "to your printer:\n" msgstr "" -"Toto natrvalo zmení nastavenie vaÅ¡ej tlaÄiarne.\n" -"VAROVANIE: táto procedúra nebola odsúhlasená spoloÄnosÅ¥ou Seiko Epson\n" -"a môže poÅ¡kodiÅ¥ vaÅ¡u tlaÄiareň. PokraÄovaÅ¥?\n" -"PotvrÄte opätovným stlaÄením 's', že si prajete uložiÅ¥ nastavenie\n" -"vaÅ¡ej tlaÄiarne:\n" +"Toto natrvalo zmení nastavenie va¹ej tlaèiarne.\n" +"VAROVANIE: táto procedúra nebola odsúhlasená spoloènos»ou Seiko Epson\n" +"a mô¾e po¹kodi» va¹u tlaèiareò. Pokraèova»?\n" +"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:1883 #, c-format @@ -8085,28 +8460,28 @@ msgid "" "Your settings were not saved successfully. You must repeat the\n" "alignment procedure.\n" msgstr "" -"VaÅ¡e nastavenie sa nepodarilo úspeÅ¡ne uložiÅ¥. Musíte zopakovaÅ¥\n" -"procedúru zarovnávania.\n" +"Va¹e nastavenie sa nepodarilo úspe¹ne ulo¾i». Musíte zopakova»\n" +"procedúru zarovnávania.\n" #: src/escputil/escputil.c:1894 #, c-format msgid "succeeded!\n" -msgstr "úspeÅ¡ne!\n" +msgstr "úspe¹ne!\n" #: 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" +msgstr "Va¹e nastavenia zarovnávania boli ulo¾ené do tlaèiarne.\n" #: src/escputil/escputil.c:1900 #, c-format msgid "Unrecognized command.\n" -msgstr "Neznámy príkaz.\n" +msgstr "Neznámy príkaz.\n" #: src/escputil/escputil.c:1903 #, c-format msgid "Final command was not confirmed.\n" -msgstr "ZávereÄný príkaz nebol potvrdený.\n" +msgstr "Závereèný príkaz nebol potvrdený.\n" #: src/escputil/escputil.c:1908 #, fuzzy, c-format @@ -8118,17 +8493,17 @@ msgid "" "Please place a sheet of paper in your printer to begin the head\n" "alignment procedure.\n" msgstr "" -"Táto procedúra prepokladá, že vaÅ¡a tlaÄiareň je Epson %s.\n" -"Ak toto nie je model vaÅ¡ej tlaÄiarne, stlaÄte teraz prosím control-C\n" -"a zvoľte váš súÄasný model tlaÄiarne.\n" +"Táto procedúra prepokladá, ¾e va¹a tlaèiareò je Epson %s.\n" +"Ak toto nie je model va¹ej tlaèiarne, stlaète teraz prosím control-C\n" +"a zvoµte vá¹ súèasný model tlaèiarne.\n" "\n" -"Vložte prosím hárok papiera do vaÅ¡ej tlaÄiarne, aby sa mohla zaÄaÅ¥\n" -"procedúra zarovnávania hlavy.\n" +"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:1977 src/escputil/escputil.c:2008 #: src/escputil/escputil.c:2051 msgid "Press enter to continue > " -msgstr "Pre pokraÄovanie stlaÄte enter > " +msgstr "Pre pokraèovanie stlaète enter > " #: src/escputil/escputil.c:1984 #, c-format @@ -8137,8 +8512,8 @@ msgid "" "pattern.\n" "Type a pair number, '?' for help, or 'r' to repeat the procedure.\n" 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" +"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:1997 #, c-format @@ -8148,32 +8523,32 @@ msgstr "Prechod #%d" #: src/escputil/escputil.c:2005 src/escputil/escputil.c:2050 #, c-format msgid "Please insert a fresh sheet of paper.\n" -msgstr "Vložte prosím nový hárok papiera.\n" +msgstr "Vlo¾te prosím nový hárok papiera.\n" #: src/escputil/escputil.c:2024 #, c-format msgid "Number out of range!\n" -msgstr "Číslo je mimo rozsahu!\n" +msgstr "Èíslo je mimo rozsahu!\n" #: src/escputil/escputil.c:2029 #, c-format msgid "I cannot understand what you typed!\n" -msgstr "Nedokážem pochopiÅ¥, Äo ste napísali!\n" +msgstr "Nedoká¾em pochopi», èo ste napísali!\n" #: src/escputil/escputil.c:2035 #, 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" +msgstr "Najlep¹í pár èiar by mal ma» èíslo z rozpätia 1 a %d.\n" #: src/escputil/escputil.c:2042 #, c-format msgid "Attempting to set alignment..." -msgstr "Pokúšam sa nastaviÅ¥ zarovnávanie..." +msgstr "Pokú¹am sa nastavi» zarovnávanie..." #: src/escputil/escputil.c:2045 #, c-format msgid "succeeded.\n" -msgstr "úspeÅ¡né.\n" +msgstr "úspe¹né.\n" #: src/escputil/escputil.c:2046 #, c-format @@ -8183,238 +8558,100 @@ msgid "" "pattern %d. If it is not, you should repeat the process to get the best\n" "quality printing.\n" msgstr "" -"Prekontrolujte prosím, Äi je zarovnávanie správne. Potom, Äo bude vzorka\n" -"opäť vytlaÄená, uistite sa, Äi najlepÅ¡ia vzorka pre každý riadok je vzorka %" -"d. Ak nie je, mali by ste zopakovaÅ¥ tento proces, aby ste dostali najlepÅ¡ie " -"výsledky pri tlaÄi.\n" +"Prekontrolujte prosím, èi je zarovnávanie správne. Potom, èo bude vzorka\n" +"opä» vytlaèená, uistite sa, èi najlep¹ia vzorka pre ka¾dý riadok je vzorka %" +"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:2092 #, c-format msgid "Error in input\n" msgstr "Chyba na vstupe\n" -#: src/gimp/print-image-gimp.c:225 src/gimp2/print-image-gimp.c:225 +#: src/gimp2/print-image-gimp.c:225 msgid "Printing..." -msgstr "TlaÄím..." - -#: src/gimp/print.c:133 -msgid "/File/Print..." -msgstr "/Súbor/TlaÄ..." - -#: src/ghost/ijsgutenprint.c:98 -#, c-format -msgid "" -"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" -msgstr "" - -#: 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:199 -#, fuzzy, c-format -msgid "ERROR: ijsgutenprint: No row buffer\n" -msgstr "Neexistuje riadkový bufer\n" - -#: 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: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: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:656 -#, c-format -msgid "ijsgutenprint: unknown DeviceModel %s\n" -msgstr "" - -#: 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: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: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: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: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: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" +msgstr "Tlaèím..." -#: 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" +#, fuzzy +#~ 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:841 -#, fuzzy, c-format -msgid "ERROR: ijsgutenprint: Bad parameter %s %d\n" -msgstr "Neznáma tlaÄiareň %s\n" +#, fuzzy +#~ msgid "ERROR: ijsgutenprint: No row buffer\n" +#~ msgstr "Neexistuje riadkový bufer\n" -#: 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" +#, fuzzy +#~ 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:1308 -#, fuzzy, c-format -msgid "ERROR: ijsgutenprint: image_init failed %d\n" -msgstr "image_init zlyhalo %d\n" +#, fuzzy +#~ msgid "ERROR: ijsgutenprint: Printer must be specified with -sDeviceModel\n" +#~ msgstr "Tlaèiareò musí by» urèené pomocou -sModel\n" -#: 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" +#, fuzzy +#~ 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:1331 -#, fuzzy, c-format -msgid "ERROR: ijsgutenprint: Unable to open %s: %s\n" -msgstr "Nie je možné otvoriÅ¥ %s: %s\n" +#, fuzzy +#~ 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:1344 -#, fuzzy, c-format -msgid "ERROR: ijsgutenprint: Unknown printer %s\n" -msgstr "Neznáma tlaÄiareň %s\n" +#, fuzzy +#~ 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:1516 -#, fuzzy, c-format -msgid "ERROR: ijsgutenprint: Bad parameters; cannot continue!\n" -msgstr "Zlé parametre; nie je možné pokraÄovaÅ¥!\n" +#, fuzzy +#~ 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: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 "ERROR: ijsgutenprint: cannot parse %s float %s\n" +#~ msgstr "Na tlaèiarni %s s %s nie je mo¾né tlaèi» \n" #, fuzzy -#~ msgid "Model Name" -#~ msgstr "Storno" +#~ msgid "ERROR: ijsgutenprint: cannot parse %s int %s\n" +#~ msgstr "Na tlaèiarni %s s %s nie je mo¾né tlaèi» \n" #, fuzzy -#~ msgid "Cassette" -#~ msgstr "Matný papier" +#~ msgid "ERROR: ijsgutenprint: cannot parse %s dimension %s\n" +#~ msgstr "Na tlaèiarni %s s %s nie je mo¾né tlaèi» \n" #, fuzzy -#~ msgid " Gamma" -#~ msgstr "Gama:" +#~ msgid "ERROR: ijsgutenprint: cannot parse %s boolean %s\n" +#~ msgstr "Na tlaèiarni %s s %s nie je mo¾né tlaèi» \n" #, fuzzy -#~ msgid " Curve" -#~ msgstr "ÄŒierna" +#~ msgid "ERROR: ijsgutenprint: Bad parameter %s %d\n" +#~ msgstr "Neznáma tlaèiareò %s\n" #, fuzzy -#~ msgid "1440 x 1440" -#~ msgstr "1440 x 1440 DPI" +#~ msgid "ERROR: ijsgutenprint: bad key code %d\n" +#~ msgstr "Získanie nasledujúceho riadku zlyhalo na %d\n" #, fuzzy -#~ msgid "1440 x 1440 DPI High Quality" -#~ msgstr "1440 x 360 DPI NajvyÅ¡Å¡ia kvalita" +#~ msgid "ERROR: ijsgutenprint: image_init failed %d\n" +#~ msgstr "image_init zlyhalo %d\n" #, fuzzy -#~ msgid "1440 x 1440 DPI Highest Quality" -#~ msgstr "1440 x 360 DPI NajvyÅ¡Å¡ia kvalita" +#~ msgid "ERROR: ijsgutenprint: Unable to open file descriptor: %s\n" +#~ msgstr "Nepodarilo sa otvori» popis súboru: %s\n" #, fuzzy -#~ msgid "2880 x 1440 DPI High Quality" -#~ msgstr "1440 x 360 DPI NajvyÅ¡Å¡ia kvalita" +#~ msgid "ERROR: ijsgutenprint: Unable to open %s: %s\n" +#~ msgstr "Nie je mo¾né otvori» %s: %s\n" #, fuzzy -#~ msgid "2880 x 1440 DPI Highest Quality" -#~ msgstr "1440 x 360 DPI NajvyÅ¡Å¡ia kvalita" +#~ msgid "ERROR: ijsgutenprint: Unknown printer %s\n" +#~ msgstr "Neznáma tlaèiareò %s\n" #, fuzzy -#~ msgid "" -#~ "\n" -#~ "\n" -#~ "Copyright (C) 1997-2003 Michael Sweet, Robert Krawitz,\n" -#~ "and the rest of the Gutenprint Development Team.\n" -#~ "\n" -#~ "Please visit our web site at http://gimp-print.sourceforge.net.\n" -#~ "\n" -#~ "This program is free software; you can redistribute it and/or modify\n" -#~ "it under the terms of the GNU General Public License as published by\n" -#~ "the Free Software Foundation; either version 2 of the License, or\n" -#~ "(at your option) any later version.\n" -#~ "\n" -#~ "This program is distributed in the hope that it will be useful,\n" -#~ "but WITHOUT ANY WARRANTY; without even the implied warranty of\n" -#~ "MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the\n" -#~ "GNU General Public License for more details.\n" -#~ "\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" -#~ msgstr "" -#~ "\n" -#~ "\n" -#~ "Copyright (C) 1997-2001 Michael Sweet, Robert Krawitz,\n" -#~ "a zvyÅ¡ok vývojového tímu Gimp-Print.\n" -#~ "\n" -#~ "NavÅ¡tívte prosím webovskú stánku http://gimp-print.sourceforge.net.\n" -#~ "\n" -#~ "Tento program je slobodný softvér; môžete ho nedistribuovaÅ¥ a/alebo " -#~ "meniÅ¥\n" -#~ "v súlade so VÅ¡eobecnou verejnou licenciou GNU publikovanou\n" -#~ "vo Free Software Foundation; Äi už verzie 2 alebo\n" -#~ "(podľa vaÅ¡ej voľby) akoukoľvek novÅ¡ou.\n" -#~ "\n" -#~ "Tento program je šírený v nádeji, že bude užitoÄný, avÅ¡ak\n" -#~ "BEZ AKEJKOĽVEK ZÃRUKY; neposkytujú sa ani odvodené záruky\n" -#~ "PREDAJNOSTI alebo VHODNOSTI PRE URÄŒITà ÚČEL.\n" -#~ "ÄŽalÅ¡ie podrobnosti hľadajte vo VÅ¡eobecnej verejnej licencii GNU.\n" -#~ "\n" -#~ "S týmto programom by ste mali získaÅ¥ kópiu VÅ¡eobecnej verejnej\n" -#~ "licencie GNU; ak tomu tak nie je, napíšte do Free Software\n" -#~ "Foundation, Inc., 59 Temple Place - Suite 330, Boston,\n" -#~ "MA 02111-1307, USA.\n" +#~ msgid "ERROR: ijsgutenprint: Bad parameters; cannot continue!\n" +#~ msgstr "Zlé parametre; nie je mo¾né pokraèova»!\n" #, 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-2001 Robert Krawitz\n" -#~ "Escputil prichádza bez AKÃCHKOĽVEK GARANCIÃ; detaily získate po napísaní " -#~ "'escputil -l'\n" -#~ "Toto je slobodný softvér a jeho redistribúcia je za istých podmienok\n" -#~ "vítaná; viac informácií získate po napísaní 'escputil -l'.\n" +#~ msgid "ERROR: ijsgutenprint: Get next row failed at %.0f\n" +#~ msgstr "Získanie nasledujúceho riadku zlyhalo na %d\n" #, fuzzy #~ msgid "90x90 DPI" @@ -8448,10 +8685,6 @@ msgstr "Získanie nasledujúceho riadku zlyhalo na %d\n" #~ msgid "720x360 DPI DMT" #~ msgstr "720 x 360 DPI MW2" -#, fuzzy -#~ msgid "720x720 DPI" -#~ msgstr "2880 x 720 DPI" - #, fuzzy #~ msgid "720x720 DPI DMT" #~ msgstr "2880 x 720 DPI" @@ -8516,57 +8749,53 @@ msgstr "Získanie nasledujúceho riadku zlyhalo na %d\n" #~ msgid "2400x2400 DPI DMT" #~ msgstr "2400x600 DPI" -#, fuzzy -#~ msgid "Plain Paper PIXMA" -#~ msgstr "ObyÄajný papier" - #~ msgid "Fabric Sheets" -#~ msgstr "Normálny papier" +#~ msgstr "Normálny papier" #~ msgid "Envelope" -#~ msgstr "Obálka" +#~ msgstr "Obálka" #~ msgid "High Resolution Paper" -#~ msgstr "Papier s vysokým rozlíšením" +#~ msgstr "Papier s vysokým rozlí¹ením" #~ msgid "T-Shirt Transfers" -#~ msgstr "Nažehľovacia fólia" +#~ msgstr "Na¾ehµovacia fólia" #~ msgid "High Gloss Film" -#~ msgstr "Vysokolesklý film" +#~ msgstr "Vysokolesklý film" #~ msgid "Glossy Photo Paper" -#~ msgstr "Lesklý foto papier" +#~ msgstr "Lesklý foto papier" #~ msgid "Glossy Photo Cards" -#~ msgstr "Lesklé foto karty" +#~ msgstr "Lesklé foto karty" #~ msgid "Photo Paper Pro" #~ msgstr "Foto papier pro" -#~ msgid "Photo CcMmYK Color" -#~ msgstr "Fotografická CcMmYK farba" - -#~ msgid "Photo CcMmY Color" -#~ msgstr "Fotografická CcMmY farba" +#~ msgid "CMY Color" +#~ msgstr "CMY farba" #~ msgid "CMYK Color" #~ msgstr "CMYK farba" -#~ msgid "CMY Color" -#~ msgstr "CMY farba" +#~ msgid "Photo CcMmY Color" +#~ msgstr "Fotografická CcMmY farba" + +#~ msgid "Photo CcMmYK Color" +#~ msgstr "Fotografická CcMmYK farba" #, fuzzy -#~ msgid "Gutenprint" -#~ msgstr "Test tlaÄe" +#~ msgid " Gamma" +#~ msgstr "Gama:" #, fuzzy -#~ msgid "ERROR: ijsgutenprint: ijs_server_get_page_header failed %d\n" -#~ msgstr "Získanie nasledujúceho riadku zlyhalo na %d\n" +#~ msgid " Curve" +#~ msgstr "Èierna" #, fuzzy -#~ msgid "EPSON Stylus C50" -#~ msgstr "Stylus C60" +#~ msgid "Red Balance" +#~ msgstr "Prispôsobenie vyvá¾enie ¾ltej farby pre tlaè" #, fuzzy #~ msgid "EPSON Stylus C60" @@ -8576,18 +8805,6 @@ msgstr "Získanie nasledujúceho riadku zlyhalo na %d\n" #~ msgid "EPSON Stylus C61" #~ msgstr "Stylus C60" -#, fuzzy -#~ msgid "EPSON Stylus C62" -#~ msgstr "Stylus C60" - -#, fuzzy -#~ msgid "EPSON Stylus C70" -#~ msgstr "Stylus C70" - -#, fuzzy -#~ msgid "EPSON Stylus C80" -#~ msgstr "Stylus C80" - #, fuzzy #~ msgid "EPSON Stylus C82" #~ msgstr "Stylus C80" @@ -8820,10 +9037,6 @@ msgstr "Získanie nasledujúceho riadku zlyhalo na %d\n" #~ msgid "EPSON Stylus Pro 5500" #~ msgstr "Stylus Pro 5500" -#, fuzzy -#~ msgid "EPSON Stylus Pro 7000" -#~ msgstr "Stylus Pro 7000" - #, fuzzy #~ msgid "EPSON Stylus Pro 7500" #~ msgstr "Stylus Pro 7500" @@ -8857,44 +9070,108 @@ msgstr "Získanie nasledujúceho riadku zlyhalo na %d\n" #~ msgstr "Stylus Scan 2500" #, fuzzy -#~ msgid "EPSON E-100" -#~ msgstr "Stylus C60" +#~ msgid "" +#~ "\n" +#~ "\n" +#~ "Copyright (C) 1997-2003 Michael Sweet, Robert Krawitz,\n" +#~ "and the rest of the Gutenprint Development Team.\n" +#~ "\n" +#~ "Please visit our web site at http://gimp-print.sourceforge.net.\n" +#~ "\n" +#~ "This program is free software; you can redistribute it and/or modify\n" +#~ "it under the terms of the GNU General Public License as published by\n" +#~ "the Free Software Foundation; either version 2 of the License, or\n" +#~ "(at your option) any later version.\n" +#~ "\n" +#~ "This program is distributed in the hope that it will be useful,\n" +#~ "but WITHOUT ANY WARRANTY; without even the implied warranty of\n" +#~ "MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the\n" +#~ "GNU General Public License for more details.\n" +#~ "\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" +#~ msgstr "" +#~ "\n" +#~ "\n" +#~ "Copyright (C) 1997-2001 Michael Sweet, Robert Krawitz,\n" +#~ "a zvy¹ok vývojového tímu Gimp-Print.\n" +#~ "\n" +#~ "Nav¹tívte prosím webovskú stánku http://gimp-print.sourceforge.net.\n" +#~ "\n" +#~ "Tento program je slobodný softvér; mô¾ete ho nedistribuova» a/alebo " +#~ "meni»\n" +#~ "v súlade so V¹eobecnou verejnou licenciou GNU publikovanou\n" +#~ "vo Free Software Foundation; èi u¾ verzie 2 alebo\n" +#~ "(podµa va¹ej voµby) akoukoµvek nov¹ou.\n" +#~ "\n" +#~ "Tento program je ¹írený v nádeji, ¾e bude u¾itoèný, av¹ak\n" +#~ "BEZ AKEJKO¥VEK ZÁRUKY; neposkytujú sa ani odvodené záruky\n" +#~ "PREDAJNOSTI alebo VHODNOSTI PRE URÈITÝ ÚÈEL.\n" +#~ "Ïal¹ie podrobnosti hµadajte vo V¹eobecnej verejnej licencii GNU.\n" +#~ "\n" +#~ "S týmto programom by ste mali získa» kópiu V¹eobecnej verejnej\n" +#~ "licencie GNU; ak tomu tak nie je, napí¹te do Free Software\n" +#~ "Foundation, Inc., 59 Temple Place - Suite 330, Boston,\n" +#~ "MA 02111-1307, USA.\n" #, fuzzy -#~ msgid "Printer does not support listing ink types!\n" -#~ msgstr "TlaÄiareň nepodporuje farebný výstup\n" +#~ msgid "Gutenprint" +#~ msgstr "Test tlaèe" + +#, fuzzy +#~ msgid "" +#~ ", Copyright (C) 2000-2003 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-2001 Robert Krawitz\n" +#~ "Escputil prichádza bez AKÝCHKO¥VEK GARANCIÍ; detaily získate po napísaní " +#~ "'escputil -l'\n" +#~ "Toto je slobodný softvér a jeho redistribúcia je za istých podmienok\n" +#~ "vítaná; viac informácií získate po napísaní 'escputil -l'.\n" #, fuzzy #~ msgid "Cannot identify printer!\n" -#~ msgstr "Nie je možné analyzovaÅ¥ výstup z tlaÄiarne\n" +#~ msgstr "Nie je mo¾né analyzova» výstup z tlaèiarne\n" #, fuzzy -#~ msgid "Red Balance" -#~ msgstr "Prispôsobenie vyváženie žltej farby pre tlaÄ" +#~ msgid "Printer does not support listing ink types!\n" +#~ msgstr "Tlaèiareò nepodporuje farebný výstup\n" + +#~ msgid "/File/Print..." +#~ msgstr "/Súbor/Tlaè..." + +#, fuzzy +#~ msgid "ERROR: ijsgutenprint: ijs_server_get_page_header failed %d\n" +#~ msgstr "Získanie nasledujúceho riadku zlyhalo na %d\n" #, fuzzy #~ msgid "Gloss Balance" -#~ msgstr "Prispôsobenie vyváženie žltej farby pre tlaÄ" +#~ msgstr "Prispôsobenie vyvá¾enie ¾ltej farby pre tlaè" #~ 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 "" -#~ "Zarovnanie tlaÄiarne musí byÅ¥ vykonané so základného zariadením alebo\n" -#~ "pomocou voľby -m musíte urÄiÅ¥ tlaÄiareň.\n" +#~ "Zarovnanie tlaèiarne musí by» vykonané so základného zariadením alebo\n" +#~ "pomocou voµby -m musíte urèi» tlaèiareò.\n" #~ msgid "Attempting to detect printer model..." -#~ msgstr "Pokúšam sa zistiÅ¥ model tlaÄiarne..." +#~ msgstr "Pokú¹am sa zisti» model tlaèiarne..." #~ msgid "" #~ "\n" #~ "Cannot open %s read/write: %s\n" #~ msgstr "" #~ "\n" -#~ "Nie je možné otvoriÅ¥ %s pre Äítanie/zápis: %s\n" +#~ "Nie je mo¾né otvori» %s pre èítanie/zápis: %s\n" #~ msgid "Printer model %s is not known.\n" -#~ msgstr "Neznámy typ tlaÄiarne %s.\n" +#~ msgstr "Neznámy typ tlaèiarne %s.\n" #, fuzzy #~ msgid "Gimp-Print" @@ -8903,53 +9180,53 @@ msgstr "Získanie nasledujúceho riadku zlyhalo na %d\n" #, fuzzy #~ msgid "Brightness of the print (0 is solid black, 2 is solid white)" #~ msgstr "" -#~ "Nastavenie jasu tlaÄe.\n" -#~ "0 je jednoliatu Äiernu, 2 pre jednoliatu bielu" +#~ "Nastavenie jasu tlaèe.\n" +#~ "0 je jednoliatu èiernu, 2 pre jednoliatu bielu" #~ 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 "" -#~ "Vložte správny príkaz pre tlaÄ na vaÅ¡ej tlaÄiarni. Poznámka: Neodstráňte " -#~ "prosím z reÅ¥azca pre tlaÄ prepínaÄe `-l' alebo `-oraw', lebo tlaÄ " -#~ "pravdepodobne nebude úspeÅ¡ná!" +#~ "Vlo¾te správny príkaz pre tlaè na va¹ej tlaèiarni. Poznámka: Neodstráòte " +#~ "prosím z re»azca pre tlaè prepínaèe `-l' alebo `-oraw', lebo tlaè " +#~ "pravdepodobne nebude úspe¹ná!" #~ msgid "PPD File?" -#~ msgstr "PPD súbor?" +#~ msgstr "PPD súbor?" #~ msgid "%s: option `%s' is ambiguous\n" -#~ msgstr "%s: voľba `%s' je viacznaÄná\n" +#~ msgstr "%s: voµba `%s' je viacznaèná\n" #~ msgid "%s: option `--%s' doesn't allow an argument\n" -#~ msgstr "%s: voľba `--%s' nedovoľuje použiÅ¥ argument\n" +#~ msgstr "%s: voµba `--%s' nedovoµuje pou¾i» argument\n" #~ msgid "%s: option `%c%s' doesn't allow an argument\n" -#~ msgstr "%s: voľba `%c%s' nedovoľuje použiÅ¥ argument\n" +#~ msgstr "%s: voµba `%c%s' nedovoµuje pou¾i» argument\n" #~ msgid "%s: option `%s' requires an argument\n" -#~ msgstr "%s: voľba `%s' vyžaduje argument\n" +#~ msgstr "%s: voµba `%s' vy¾aduje argument\n" #~ msgid "%s: unrecognized option `--%s'\n" -#~ msgstr "%s: neznáma voľba `--%s'\n" +#~ msgstr "%s: neznáma voµba `--%s'\n" #~ msgid "%s: unrecognized option `%c%s'\n" -#~ msgstr "%s: neznáma voľba `%c%s'\n" +#~ msgstr "%s: neznáma voµba `%c%s'\n" #~ msgid "%s: illegal option -- %c\n" -#~ msgstr "%s: neplatná voľba -- %c\n" +#~ msgstr "%s: neplatná voµba -- %c\n" #~ msgid "%s: invalid option -- %c\n" -#~ msgstr "%s: neplatná voľba -- %c\n" +#~ msgstr "%s: neplatná voµba -- %c\n" #~ msgid "%s: option requires an argument -- %c\n" -#~ msgstr "%s: voľba vyžaduje argument -- %c\n" +#~ msgstr "%s: voµba vy¾aduje argument -- %c\n" #~ msgid "%s: option `-W %s' is ambiguous\n" -#~ msgstr "%s: voľba `-W %s` je viacznaÄná\n" +#~ msgstr "%s: voµba `-W %s` je viacznaèná\n" #~ msgid "%s: option `-W %s' doesn't allow an argument\n" -#~ msgstr "%s: voľba `-W %s' nedovoľuje použiÅ¥ argument\n" +#~ msgstr "%s: voµba `-W %s' nedovoµuje pou¾i» argument\n" #, fuzzy #~ msgid "Bright" @@ -8957,11 +9234,11 @@ msgstr "Získanie nasledujúceho riadku zlyhalo na %d\n" #, fuzzy #~ msgid "Image is too wide for the page\n" -#~ msgstr "ZmeniÅ¥ veľkosÅ¥ tlaÄe podľa rozmerov strany" +#~ msgstr "Zmeni» veµkos» tlaèe podµa rozmerov strany" #, fuzzy #~ msgid "Full Bleed" -#~ msgstr "KotúÄový podávaÄ" +#~ msgstr "Kotúèový podávaè" #, fuzzy #~ msgid "traditional" @@ -8978,35 +9255,21 @@ msgstr "Získanie nasledujúceho riadku zlyhalo na %d\n" #, fuzzy #~ msgid "Optimize the settings for the type of image to be printed" -#~ msgstr "OptimalizovaÅ¥ výstup podľa typu tlaÄeného obrázku" +#~ msgstr "Optimalizova» výstup podµa typu tlaèeného obrázku" #~ msgid "Solid Colors" #~ msgstr "Jednoliate farby" -#~ 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" @@ -9049,122 +9312,122 @@ msgstr "Získanie nasledujúceho riadku zlyhalo na %d\n" #~ "WARNING: THIS FUNCTION IS NOT YET TESTED! It may not work, and it may\n" #~ "damage your printer!\n" #~ msgstr "" -#~ "Prosím, veľmi pozorne si preÄítajte tieto inÅ¡trukcie pred tým, ako bude " -#~ "pokraÄovaÅ¥.\n" +#~ "Prosím, veµmi pozorne si preèítajte tieto in¹trukcie pred tým, ako bude " +#~ "pokraèova».\n" #~ "\n" -#~ "Tento nástroj vám pomôže so zarovnávaním tlaÄovej hlavy pre farebnú tlaÄ " -#~ "atramentovej tlaÄiarne Epson Stylus.\n" -#~ "Jeho nesprávne použitie môže spôsobiÅ¥ zníženie kvality tlaÄe a môže " -#~ "poÅ¡kodiÅ¥\n" -#~ "samotnú tlaÄiareň. Tento nástroj nebol odobrený spoloÄnosÅ¥ou Seiko Epson\n" -#~ "a je ponúknutý bez akejkoľvek záruky. Celé riziko za použitie toho " -#~ "nástroja\n" -#~ "leží na vás.\n" +#~ "Tento nástroj vám pomô¾e so zarovnávaním tlaèovej hlavy pre farebnú tlaè " +#~ "atramentovej tlaèiarne Epson Stylus.\n" +#~ "Jeho nesprávne pou¾itie mô¾e spôsobi» zní¾enie kvality tlaèe a mô¾e " +#~ "po¹kodi»\n" +#~ "samotnú tlaèiareò. Tento nástroj nebol odobrený spoloènos»ou Seiko Epson\n" +#~ "a je ponúknutý bez akejkoµvek záruky. Celé riziko za pou¾itie toho " +#~ "nástroja\n" +#~ "le¾í na vás.\n" #~ "\n" -#~ "Nástroj vytlaÄí %d pretlaÄ testovacích vzoriek na jeden kúsok papiera.\n" -#~ "Najprv sa vytlaÄí jedna vzorka a papier bude vysunutý. Potom musíte ten " -#~ "istý\n" -#~ "papier vložiÅ¥ do tlaÄiarne, aby sa naň vytlaÄila ÄalÅ¡ia vzorka. Každá " +#~ "Nástroj vytlaèí %d pretlaè testovacích vzoriek na jeden kúsok papiera.\n" +#~ "Najprv sa vytlaèí jedna vzorka a papier bude vysunutý. Potom musíte ten " +#~ "istý\n" +#~ "papier vlo¾i» do tlaèiarne, aby sa naò vytlaèila ïal¹ia vzorka. Ka¾dá " #~ "vzorka\n" -#~ "obsahuje sadu možností oÄíslovaných od %d do %d.\n" +#~ "obsahuje sadu mo¾ností oèíslovaných od %d do %d.\n" #~ "\n" -#~ "KeÄ si prezriete vzorky, mali by ste nájsÅ¥ tú s najhladÅ¡ou textúrou " +#~ "Keï si prezriete vzorky, mali by ste nájs» tú s najhlad¹ou textúrou " #~ "(najmenej\n" -#~ "''zrnitou''). Mali by ste ich veľmi pozorne prezrieÅ¥ a vybraÅ¥ tú " -#~ "najlepÅ¡iu.\n" -#~ "OdporúÄame vám použiÅ¥ papier pre tlaÄ vo foto kvalite alebo podobne " -#~ "vysokokvalitný\n" -#~ "typ papiera. Pokiaľ nenájdete hladkú vzorku, mali by ste test zopakovaÅ¥.\n" +#~ "''zrnitou''). Mali by ste ich veµmi pozorne prezrie» a vybra» tú " +#~ "najlep¹iu.\n" +#~ "Odporúèame vám pou¾i» papier pre tlaè vo foto kvalite alebo podobne " +#~ "vysokokvalitný\n" +#~ "typ papiera. Pokiaµ nenájdete hladkú vzorku, mali by ste test zopakova».\n" #~ "\n" -#~ "Po preskúmaní možností a výbere pásky, vám budú ponúknuté tieto " -#~ "možnosti:\n" -#~ "(s) - uložiÅ¥ výsledky do tlaÄiarne, (r) - zopakovaÅ¥ proces, alebo (q) - " -#~ "ukonÄiÅ¥\n" -#~ "bez uloženia. UkonÄenie neobnoví pôvodné nastavenie, ale vypnutie a " -#~ "následné\n" -#~ "zapnutie tlaÄiarne áno.. Pokiaľ ukonÄíte bez uloženia, budete musieÅ¥ " -#~ "zopakovaÅ¥\n" -#~ "celý proces opäť, ak budete chcieÅ¥ svoje výsledky uložiÅ¥.\n" -#~ "Je dôležité, aby ste poÄas toho procesu nevypli tlaÄiareň\n" +#~ "Po preskúmaní mo¾ností a výbere pásky, vám budú ponúknuté tieto " +#~ "mo¾nosti:\n" +#~ "(s) - ulo¾i» výsledky do tlaèiarne, (r) - zopakova» proces, alebo (q) - " +#~ "ukonèi»\n" +#~ "bez ulo¾enia. Ukonèenie neobnoví pôvodné nastavenie, ale vypnutie a " +#~ "následné\n" +#~ "zapnutie tlaèiarne áno.. Pokiaµ ukonèíte bez ulo¾enia, budete musie» " +#~ "zopakova»\n" +#~ "celý proces opä», ak budete chcie» svoje výsledky ulo¾i».\n" +#~ "Je dôle¾ité, aby ste poèas toho procesu nevypli tlaèiareò\n" #~ "\n" -#~ "VAROVANIE: TÃTO FUNKCIA NIE JE EÅ TE OTESTOVANÃ! Možno nebude fungovaÅ¥ a " -#~ "možno\n" -#~ "vám poÅ¡kodí tlaÄiareň!\n" +#~ "VAROVANIE: TÁTO FUNKCIA NIE JE E©TE OTESTOVANÁ! Mo¾no nebude fungova» a " +#~ "mo¾no\n" +#~ "vám po¹kodí tlaèiareò!\n" #~ msgid "Printer %s does not require color head alignment.\n" -#~ msgstr "TlaÄiareň %s nevyžaduje zarovnanie farebnej hlavy.\n" +#~ msgstr "Tlaèiareò %s nevy¾aduje zarovnanie farebnej hlavy.\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 "" -#~ "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" +#~ "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" #, fuzzy #~ msgid "Model %d out of range.\n" -#~ msgstr "Číslo je mimo rozsahu!\n" +#~ msgstr "Èíslo je mimo rozsahu!\n" #~ msgid "Right Border:" -#~ msgstr "Pravý okraj:" +#~ msgstr "Pravý okraj:" #~ msgid "Bottom Border:" -#~ msgstr "Dolný okraj:" +#~ msgstr "Dolný okraj:" #~ msgid "Size" -#~ msgstr "VeľkosÅ¥" +#~ msgstr "Veµkos»" #~ msgid "Image / Output Settings" -#~ msgstr "Obrázok / Výstupné nastavenia" +#~ msgstr "Obrázok / Výstupné nastavenia" #, fuzzy #~ msgid "GIMP-print" -#~ msgstr "TlaÄiÅ¥" +#~ msgstr "Tlaèi»" #, fuzzy #~ msgid "Resolutions" -#~ msgstr "Rozlíšenie" +#~ msgstr "Rozlí¹enie" #~ msgid "Media Type:" -#~ msgstr "Typ média:" +#~ msgstr "Typ média:" #~ msgid "Type of media you're printing to" -#~ msgstr "Typ média na ktorý bude tlaÄené" +#~ msgstr "Typ média na ktorý bude tlaèené" #~ msgid "Media Size:" -#~ msgstr "VeľkosÅ¥ média:" +#~ msgstr "Veµkos» média:" #~ msgid "Size of paper that you wish to print to" -#~ msgstr "VeľkosÅ¥ papiera, na ktorý chcete tlaÄiÅ¥" +#~ msgstr "Veµkos» papiera, na ktorý chcete tlaèi»" #~ msgid "Media Source:" -#~ msgstr "Zdroj média:" +#~ msgstr "Zdroj média:" #~ msgid "Source (input slot) of media you're printing to" -#~ msgstr "Zdroj (vstupné miesto) média, na ktoré tlaÄíte" +#~ msgstr "Zdroj (vstupné miesto) média, na ktoré tlaèíte" #~ msgid "Ink Type:" #~ msgstr "Typ atramentu:" #~ msgid "Resolution:" -#~ msgstr "Rozlíšenie:" +#~ msgstr "Rozlí¹enie:" #~ msgid "Print in black and white (no color, and no shades of gray)" -#~ msgstr "TlaÄiÅ¥ Äiernou a bielou (bez farieb a bez odtieňov Å¡edej)" +#~ msgstr "Tlaèi» èiernou a bielou (bez farieb a bez odtieòov ¹edej)" #~ msgid "Fastest and brightest color for text and line art" -#~ msgstr "NajrýchlejÅ¡ie a jasnejÅ¡ie farby pre text a Äiarovú grafiku" +#~ msgstr "Najrýchlej¹ie a jasnej¹ie farby pre text a èiarovú grafiku" #~ msgid "Best for images dominated by regions of solid color" -#~ msgstr "NajlepÅ¡ie pre obrázky s dominatnými oblasÅ¥ami jednej farby" +#~ msgstr "Najlep¹ie pre obrázky s dominatnými oblas»ami jednej farby" #~ msgid "" #~ "Slowest, but most accurate and smoothest color for continuous tone images " #~ "and photographs" #~ msgstr "" -#~ "NajpomalÅ¡ie, ale najpresnejÅ¡ie a najhladÅ¡ie farby pre plynulé odtiene " -#~ "obrázkov a fotografií" +#~ "Najpomal¹ie, ale najpresnej¹ie a najhlad¹ie farby pre plynulé odtiene " +#~ "obrázkov a fotografií" #~ msgid "Dither Algorithm:" #~ msgstr "Algoritmus rozptylu:" @@ -9174,20 +9437,20 @@ msgstr "Získanie nasledujúceho riadku zlyhalo na %d\n" #~ "Cannot read from %s: %s\n" #~ msgstr "" #~ "\n" -#~ "Nie je možné ÄítaÅ¥ z %s: %s\n" +#~ "Nie je mo¾né èíta» z %s: %s\n" #~ msgid "%s out of range (value %f, min %f, max %f)\n" #~ msgstr "%s mimo rozsahu (hodnota %f, min %f, max %f)\n" #~ msgid "%s is not a valid dither algorithm\n" -#~ msgstr "%s nie je platný algoritmus rozptylu\n" +#~ msgstr "%s nie je platný algoritmus rozptylu\n" #~ msgid "" #~ "Please re-insert the same alignment sheet in the printer when it is\n" #~ "finished printing.\n" #~ msgstr "" -#~ "Opätovne vložte prosím ten istý hárok papiera na zarovnanie\n" -#~ "do tlaÄiarne po dokonÄení tlaÄenia.\n" +#~ "Opätovne vlo¾te prosím ten istý hárok papiera na zarovnanie\n" +#~ "do tlaèiarne po dokonèení tlaèenia.\n" #~ msgid "" #~ "Inspect the alignment sheet, and determine which pattern is the " @@ -9197,26 +9460,26 @@ msgstr "Získanie nasledujúceho riadku zlyhalo na %d\n" #~ "best pattern, and repeat the procedure.\n" #~ "Type a pattern number, or '?' for help.\n" #~ msgstr "" -#~ "Preskúmajte zarovnanie papiera a urÄite, ktorá vzorka je najhladÅ¡ia.\n" -#~ "Táto vzorka má najmenej ``zrniek''.\n" -#~ "Ak nemôžete nájsÅ¥ hladkú vzorku, zvoľte prosím Äíslo najlepÅ¡ej vzorky\n" -#~ "a zopakujte túto procedúru.\n" -#~ "Vložte Äíslo vzorky, alebo '?' pre pomoc.\n" +#~ "Preskúmajte zarovnanie papiera a urèite, ktorá vzorka je najhlad¹ia.\n" +#~ "Táto vzorka má najmenej ``zrniek''.\n" +#~ "Ak nemô¾ete nájs» hladkú vzorku, zvoµte prosím èíslo najlep¹ej vzorky\n" +#~ "a zopakujte túto procedúru.\n" +#~ "Vlo¾te èíslo vzorky, alebo '?' pre pomoc.\n" #~ msgid "The best pattern should be numbered between 1 and %d.\n" -#~ msgstr "NajlepÅ¡ia vzorka by mala maÅ¥ Äíslo od 1 po %d.\n" +#~ msgstr "Najlep¹ia vzorka by mala ma» èíslo od 1 po %d.\n" #~ msgid "Set the contrast of the print" -#~ msgstr "NastaviÅ¥ kontrast tlaÄe" +#~ msgstr "Nastavi» kontrast tlaèe" #~ msgid "Cyan:" -#~ msgstr "Azúrová:" +#~ msgstr "Azúrová:" #~ msgid "Magenta:" -#~ msgstr "Purpurová:" +#~ msgstr "Purpurová:" #~ msgid "Yellow:" -#~ msgstr "Žltá:" +#~ msgstr "®ltá:" #~ msgid "Parameter %s out of range (value %f, min %f, max %f)\n" #~ msgstr "Parameter %s je mimo rozsahu (hodnota %f, min %f, max %f)\n" @@ -9231,7 +9494,7 @@ msgstr "Získanie nasledujúceho riadku zlyhalo na %d\n" #~ msgstr "1440 x 360 DPI Jednosmerne" #~ msgid "1440 x 360 DPI High Quality Uni" -#~ msgstr "1440 x 360 DPI Vysoká kvalita jed." +#~ msgstr "1440 x 360 DPI Vysoká kvalita jed." #~ msgid "13x19" #~ msgstr "13x19" @@ -9249,4 +9512,4 @@ msgstr "Získanie nasledujúceho riadku zlyhalo na %d\n" #~ msgstr "Kaku" #~ msgid "HP Greeting Card" -#~ msgstr "HP pohľadnica" +#~ msgstr "HP pohµadnica" diff --git a/po/sv.gmo b/po/sv.gmo index 0b03d18..8c0fd71 100644 Binary files a/po/sv.gmo and b/po/sv.gmo differ diff --git a/po/sv.po b/po/sv.po index 4dc2d33..c509fa6 100644 --- a/po/sv.po +++ b/po/sv.po @@ -3,13 +3,13 @@ # Daniel Nylander , 2006. # Christian Rose , 2001, 2002. # -# $Id: sv.po,v 1.83.4.4 2007/12/16 22:39:52 rlk Exp $ +# $Id: sv.po,v 1.92 2008/04/26 17:30:35 rlk Exp $ # msgid "" msgstr "" "Project-Id-Version: gutenprint 5.0.0\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2008-01-01 20:47-0500\n" +"POT-Creation-Date: 2008-04-25 21:19-0400\n" "PO-Revision-Date: 2006-05-23 23:04+0100\n" "Last-Translator: Daniel Nylander \n" "Language-Team: Swedish \n" @@ -20,7 +20,7 @@ msgstr "" #. 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:1752 +#: src/main/print-escp2.c:2116 msgid "Default" msgstr "Standard" @@ -60,41 +60,54 @@ msgid "Ordered" msgstr "Sorterad" #: src/main/dither-main.c:65 +#, fuzzy +msgid "Ordered New" +msgstr "Sorterad" + +#: src/main/dither-main.c:66 msgid "Fast" msgstr "Snabb" -#: src/main/dither-main.c:66 +#: src/main/dither-main.c:67 msgid "Very Fast" msgstr "Mycket snabb" -#: src/main/dither-main.c:67 +#: src/main/dither-main.c:68 msgid "Hybrid Floyd-Steinberg" msgstr "Hybrid Floyd-Steinberg" -#: src/main/dither-main.c:68 +#: src/main/dither-main.c:69 msgid "Predithered Input" msgstr "" -#: src/main/dither-main.c:88 src/main/print-color.c:56 +#: src/main/dither-main.c:70 +msgid "Drop Size Segmented" +msgstr "" + +#: src/main/dither-main.c:71 +msgid "Drop Size Segmented New" +msgstr "" + +#: src/main/dither-main.c:91 src/main/print-color.c:56 msgid "Density" msgstr "Densitet" -#: src/main/dither-main.c:88 src/main/print-canon.c:295 +#: src/main/dither-main.c:91 src/main/print-canon.c:295 #: src/main/print-canon.c:303 src/main/print-canon.c:311 -#: src/main/print-canon.c:319 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-escp2.c:471 -#: src/main/print-escp2.c:479 src/main/print-escp2.c:487 +#: src/main/print-canon.c:319 src/main/print-escp2.c:446 +#: src/main/print-escp2.c:454 src/main/print-escp2.c:462 +#: src/main/print-escp2.c:470 src/main/print-escp2.c:478 +#: src/main/print-escp2.c:486 src/main/print-escp2.c:494 #: 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:1764 src/main/print-olympus.c:1772 -#: src/main/print-olympus.c:1780 src/main/print-olympus.c:1788 -#: src/main/print-pcl.c:1261 src/main/print-pcl.c:1269 -#: src/main/print-pcl.c:1277 src/main/print-pcl.c:1285 +#: src/main/print-olympus.c:1762 src/main/print-olympus.c:1770 +#: src/main/print-olympus.c:1778 src/main/print-olympus.c:1786 +#: src/main/print-pcl.c:1329 src/main/print-pcl.c:1337 +#: src/main/print-pcl.c:1345 src/main/print-pcl.c:1353 msgid "Output Level Adjustment" msgstr "" -#: src/main/dither-main.c:89 +#: src/main/dither-main.c:92 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 +117,15 @@ msgstr "" "bläcket tränger igenom pappret eller smetar; öka intensiteten om svarta " "omrÃ¥den inte är helt svarta." -#: src/main/dither-main.c:97 +#: src/main/dither-main.c:100 msgid "Dither Algorithm" msgstr "Färgutjämningsalgoritm" -#: src/main/dither-main.c:97 +#: src/main/dither-main.c:100 msgid "Screening Adjustment" msgstr "" -#: src/main/dither-main.c:98 +#: src/main/dither-main.c:101 #, fuzzy msgid "" "Choose the dither algorithm to be used.\n" @@ -149,9 +162,9 @@ msgstr "" msgid "Dither algorithm" msgstr "Färgutjämningsalgoritm" -#: src/main/print-canon.c:200 src/main/print-escp2.c:180 -#: src/main/print-lexmark.c:266 src/main/print-olympus.c:1699 -#: src/main/print-pcl.c:1196 src/main/print-ps.c:67 +#: src/main/print-canon.c:200 src/main/print-escp2.c:182 +#: src/main/print-lexmark.c:266 src/main/print-olympus.c:1697 +#: src/main/print-pcl.c:1264 msgid "Page Size" msgstr "Pappersstorlek" @@ -159,245 +172,254 @@ msgstr "Pappersstorlek" #: src/main/print-canon.c:212 src/main/print-canon.c:218 #: src/main/print-canon.c:224 src/main/print-canon.c:230 #: src/main/print-canon.c:248 src/main/print-canon.c:272 -#: src/main/print-escp2.c:180 src/main/print-escp2.c:186 -#: src/main/print-escp2.c:192 src/main/print-escp2.c:198 -#: src/main/print-escp2.c:204 src/main/print-escp2.c:210 -#: src/main/print-escp2.c:228 src/main/print-escp2.c:245 -#: src/main/print-escp2.c:251 src/main/print-escp2.c:263 -#: src/main/print-escp2.c:281 src/main/print-lexmark.c:266 +#: src/main/print-escp2.c:182 src/main/print-escp2.c:188 +#: src/main/print-escp2.c:194 src/main/print-escp2.c:200 +#: src/main/print-escp2.c:206 src/main/print-escp2.c:212 +#: src/main/print-escp2.c:230 src/main/print-escp2.c:247 +#: src/main/print-escp2.c:253 src/main/print-escp2.c:265 +#: src/main/print-escp2.c:283 src/main/print-lexmark.c:266 #: src/main/print-lexmark.c:272 src/main/print-lexmark.c:278 -#: src/main/print-lexmark.c:284 src/main/print-olympus.c:1699 -#: src/main/print-olympus.c:1705 src/main/print-olympus.c:1711 -#: src/main/print-olympus.c:1717 src/main/print-pcl.c:1196 -#: src/main/print-pcl.c:1202 src/main/print-pcl.c:1208 -#: src/main/print-pcl.c:1214 src/main/print-pcl.c:1238 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 +#: src/main/print-lexmark.c:284 src/main/print-olympus.c:1697 +#: src/main/print-olympus.c:1703 src/main/print-olympus.c:1709 +#: src/main/print-olympus.c:1715 src/main/print-pcl.c:1264 +#: src/main/print-pcl.c:1270 src/main/print-pcl.c:1276 +#: src/main/print-pcl.c:1282 src/main/print-pcl.c:1306 src/main/print-ps.c:68 +#: src/main/print-ps.c:74 msgid "Basic Printer Setup" msgstr "Grundläggande skrivarinställningar" -#: src/main/print-canon.c:201 src/main/print-escp2.c:181 -#: src/main/print-lexmark.c:267 src/main/print-olympus.c:1700 -#: src/main/print-pcl.c:1197 src/main/print-ps.c:68 +#: src/main/print-canon.c:201 src/main/print-escp2.c:183 +#: src/main/print-lexmark.c:267 src/main/print-olympus.c:1698 +#: src/main/print-pcl.c:1265 msgid "Size of the paper being printed to" msgstr "Storlek pÃ¥ pappret som du vill skriva ut till" -#: src/main/print-canon.c:206 src/main/print-escp2.c:186 -#: src/main/print-lexmark.c:272 src/main/print-olympus.c:1705 -#: src/main/print-pcl.c:1202 src/main/print-ps.c:73 src/cups/genppd.c:1417 +#: src/main/print-canon.c:206 src/main/print-escp2.c:188 +#: src/main/print-lexmark.c:272 src/main/print-olympus.c:1703 +#: src/main/print-pcl.c:1270 src/cups/genppd.c:1422 msgid "Media Type" msgstr "Mediatyp" -#: src/main/print-canon.c:207 src/main/print-escp2.c:187 -#: src/main/print-lexmark.c:273 src/main/print-olympus.c:1706 -#: src/main/print-pcl.c:1203 src/main/print-ps.c:74 +#: src/main/print-canon.c:207 src/main/print-escp2.c:189 +#: src/main/print-lexmark.c:273 src/main/print-olympus.c:1704 +#: src/main/print-pcl.c:1271 msgid "Type of media (plain paper, photo paper, etc.)" msgstr "Typ av media (vanligt papper, fotopapper, etc.)" -#: src/main/print-canon.c:212 src/main/print-escp2.c:192 -#: src/main/print-lexmark.c:278 src/main/print-olympus.c:1711 -#: src/main/print-pcl.c:1208 src/main/print-ps.c:79 src/cups/genppd.c:1445 +#: src/main/print-canon.c:212 src/main/print-escp2.c:194 +#: src/main/print-lexmark.c:278 src/main/print-olympus.c:1709 +#: src/main/print-pcl.c:1276 src/cups/genppd.c:1450 msgid "Media Source" msgstr "Mediakälla" -#: src/main/print-canon.c:213 src/main/print-escp2.c:193 -#: src/main/print-lexmark.c:279 src/main/print-olympus.c:1712 -#: src/main/print-pcl.c:1209 src/main/print-ps.c:80 +#: src/main/print-canon.c:213 src/main/print-escp2.c:195 +#: src/main/print-lexmark.c:279 src/main/print-olympus.c:1710 +#: src/main/print-pcl.c:1277 #, fuzzy msgid "Source (input slot) of the media" msgstr "Källa (inmatningsfack) med media som du skriver ut till" -#: src/main/print-canon.c:218 src/main/print-escp2.c:198 +#: src/main/print-canon.c:218 src/main/print-escp2.c:200 msgid "CD Hub Size" msgstr "" -#: src/main/print-canon.c:219 src/main/print-escp2.c:199 +#: src/main/print-canon.c:219 src/main/print-escp2.c:201 msgid "Print only outside of the hub of the CD, or all the way to the hole" msgstr "" -#: src/main/print-canon.c:224 src/main/print-escp2.c:204 +#: src/main/print-canon.c:224 src/main/print-escp2.c:206 msgid "CD Size (Custom)" msgstr "" -#: src/main/print-canon.c:225 src/main/print-escp2.c:205 +#: src/main/print-canon.c:225 src/main/print-escp2.c:207 msgid "Variable adjustment for the outer diameter of CD" msgstr "" -#: src/main/print-canon.c:230 src/main/print-escp2.c:210 +#: src/main/print-canon.c:230 src/main/print-escp2.c:212 msgid "CD Hub Size (Custom)" msgstr "" -#: src/main/print-canon.c:231 src/main/print-escp2.c:211 +#: src/main/print-canon.c:231 src/main/print-escp2.c:213 #, fuzzy msgid "Variable adjustment to the inner hub of the CD" msgstr "Skala utskriften till storleken pÃ¥ sidan" -#: src/main/print-canon.c:236 src/main/print-escp2.c:216 +#: src/main/print-canon.c:236 src/main/print-escp2.c:218 msgid "CD Horizontal Fine Adjustment" msgstr "" #: src/main/print-canon.c:236 src/main/print-canon.c:242 -#: src/main/print-canon.c:254 src/main/print-escp2.c:216 -#: src/main/print-escp2.c:222 src/main/print-escp2.c:239 -#: src/main/print-escp2.c:275 src/main/print-lexmark.c:290 -#: src/main/print-olympus.c:1723 src/main/print-olympus.c:1729 -#: src/main/print-olympus.c:1735 src/main/print-pcl.c:1220 -#: src/main/print-ps.c:91 src/main/print-raw.c:80 +#: src/main/print-canon.c:254 src/main/print-escp2.c:218 +#: src/main/print-escp2.c:224 src/main/print-escp2.c:241 +#: src/main/print-escp2.c:277 src/main/print-lexmark.c:290 +#: src/main/print-olympus.c:1721 src/main/print-olympus.c:1727 +#: src/main/print-olympus.c:1733 src/main/print-pcl.c:1288 +#: src/main/print-raw.c:80 msgid "Advanced Printer Setup" msgstr "Avancerad skrivarkonfiguration" #: src/main/print-canon.c:237 src/main/print-canon.c:243 -#: src/main/print-escp2.c:217 src/main/print-escp2.c:223 +#: src/main/print-escp2.c:219 src/main/print-escp2.c:225 msgid "Fine adjustment to horizontal position for CD printing" msgstr "" -#: src/main/print-canon.c:242 src/main/print-escp2.c:222 +#: src/main/print-canon.c:242 src/main/print-escp2.c:224 msgid "CD Vertical Fine Adjustment" msgstr "" -#: src/main/print-canon.c:248 src/main/print-escp2.c:228 -#: src/main/print-lexmark.c:284 src/main/print-olympus.c:1717 -#: src/main/print-pcl.c:1214 src/main/print-ps.c:85 src/cups/genppd.c:1518 +#: src/main/print-canon.c:248 src/main/print-escp2.c:230 +#: src/main/print-lexmark.c:284 src/main/print-olympus.c:1715 +#: src/main/print-pcl.c:1282 src/cups/genppd.c:1523 msgid "Resolution" msgstr "Upplösning" #: src/main/print-canon.c:249 src/main/print-lexmark.c:285 -#: src/main/print-olympus.c:1718 src/main/print-pcl.c:1215 -#: src/main/print-ps.c:86 +#: src/main/print-olympus.c:1716 src/main/print-pcl.c:1283 msgid "Resolution and quality of the print" msgstr "Upplösning och kvalitet pÃ¥ utskriften" -#: src/main/print-canon.c:254 src/main/print-escp2.c:239 -#: src/main/print-lexmark.c:290 src/main/print-olympus.c:1723 -#: src/main/print-pcl.c:1220 src/main/print-ps.c:91 src/main/print-raw.c:80 +#: src/main/print-canon.c:254 src/main/print-escp2.c:241 +#: src/main/print-lexmark.c:290 src/main/print-olympus.c:1721 +#: src/main/print-pcl.c:1288 src/main/print-raw.c:80 msgid "Ink Type" msgstr "Bläcktyp" -#: src/main/print-canon.c:255 src/main/print-escp2.c:240 -#: src/main/print-escp2.c:252 src/main/print-lexmark.c:291 -#: src/main/print-olympus.c:1724 src/main/print-pcl.c:1221 -#: src/main/print-ps.c:92 src/main/print-raw.c:81 +#: src/main/print-canon.c:255 src/main/print-escp2.c:242 +#: src/main/print-escp2.c:254 src/main/print-lexmark.c:291 +#: src/main/print-olympus.c:1722 src/main/print-pcl.c:1289 +#: src/main/print-raw.c:81 msgid "Type of ink in the printer" msgstr "Typ av bläck i skrivaren" #: src/main/print-canon.c:260 src/main/print-canon.c:261 -#: src/main/print-escp2.c:329 src/main/print-escp2.c:330 +#: src/main/print-escp2.c:331 src/main/print-escp2.c:332 #: src/main/print-lexmark.c:296 src/main/print-lexmark.c:297 -#: src/main/print-pcl.c:1226 src/main/print-pcl.c:1227 +#: src/main/print-pcl.c:1294 src/main/print-pcl.c:1295 msgid "Ink Channels" msgstr "Bläckkanaler" -#: src/main/print-canon.c:260 src/main/print-escp2.c:130 -#: src/main/print-escp2.c:137 src/main/print-escp2.c:144 -#: src/main/print-escp2.c:287 src/main/print-escp2.c:293 -#: src/main/print-escp2.c:299 src/main/print-escp2.c:305 -#: src/main/print-escp2.c:311 src/main/print-escp2.c:317 -#: src/main/print-escp2.c:323 src/main/print-escp2.c:329 -#: src/main/print-escp2.c:335 src/main/print-lexmark.c:296 -#: src/main/print-pcl.c:1226 +#: src/main/print-canon.c:260 src/main/print-escp2.c:132 +#: src/main/print-escp2.c:139 src/main/print-escp2.c:146 +#: src/main/print-escp2.c:289 src/main/print-escp2.c:295 +#: src/main/print-escp2.c:301 src/main/print-escp2.c:307 +#: src/main/print-escp2.c:313 src/main/print-escp2.c:319 +#: src/main/print-escp2.c:325 src/main/print-escp2.c:331 +#: src/main/print-escp2.c:337 src/main/print-lexmark.c:296 +#: src/main/print-pcl.c:1294 msgid "Advanced Printer Functionality" msgstr "Avancerad skrivarfunktionalitet" -#: src/main/print-canon.c:266 src/main/print-escp2.c:341 -#: src/main/print-lexmark.c:302 src/main/print-olympus.c:1741 -#: src/main/print-pcl.c:1232 src/main/print-ps.c:103 src/main/print-raw.c:86 +#: src/main/print-canon.c:266 src/main/print-escp2.c:343 +#: src/main/print-lexmark.c:302 src/main/print-olympus.c:1739 +#: src/main/print-pcl.c:1300 src/main/print-ps.c:80 src/main/print-raw.c:86 msgid "Printing Mode" msgstr "Utskriftsläge" #: src/main/print-canon.c:266 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:341 -#: src/main/print-escp2.c:347 src/main/print-lexmark.c:302 -#: src/main/print-olympus.c:1741 src/main/print-pcl.c:1232 -#: src/main/print-ps.c:103 src/main/print-raw.c:86 +#: src/main/print-color.c:208 src/main/print-escp2.c:343 +#: src/main/print-escp2.c:349 src/main/print-lexmark.c:302 +#: src/main/print-olympus.c:1739 src/main/print-pcl.c:1300 +#: src/main/print-ps.c:80 src/main/print-raw.c:86 msgid "Core Parameter" msgstr "Kärnparameter" -#: src/main/print-canon.c:267 src/main/print-escp2.c:342 -#: src/main/print-lexmark.c:303 src/main/print-olympus.c:1742 -#: src/main/print-pcl.c:1233 src/main/print-ps.c:104 src/main/print-raw.c:87 +#: src/main/print-canon.c:267 src/main/print-escp2.c:344 +#: src/main/print-lexmark.c:303 src/main/print-olympus.c:1740 +#: src/main/print-pcl.c:1301 src/main/print-ps.c:81 src/main/print-raw.c:87 msgid "Printing Output Mode" msgstr "" -#: src/main/print-canon.c:272 src/main/print-pcl.c:1238 +#: src/main/print-canon.c:272 src/main/print-pcl.c:1306 msgid "Double-Sided Printing" msgstr "Dubbelsidad utskrift" -#: src/main/print-canon.c:273 src/main/print-pcl.c:1239 +#: src/main/print-canon.c:273 src/main/print-pcl.c:1307 msgid "Duplex/Tumble Setting" msgstr "" -#: src/main/print-canon.c:295 src/main/print-escp2.c:439 -#: src/main/print-lexmark.c:325 src/main/print-pcl.c:1261 +#: src/main/print-canon.c:295 src/main/print-escp2.c:446 +#: src/main/print-lexmark.c:325 src/main/print-pcl.c:1329 #, fuzzy msgid "Cyan Density" msgstr "Intensitet:" -#: src/main/print-canon.c:296 src/main/print-escp2.c:440 -#: src/main/print-lexmark.c:326 src/main/print-pcl.c:1262 +#: src/main/print-canon.c:296 src/main/print-escp2.c:447 +#: src/main/print-lexmark.c:326 src/main/print-pcl.c:1330 #, fuzzy msgid "Adjust the cyan density" msgstr "Justera cyanbalansen pÃ¥ utskriften" -#: src/main/print-canon.c:303 src/main/print-escp2.c:447 -#: src/main/print-lexmark.c:333 src/main/print-pcl.c:1269 +#: src/main/print-canon.c:303 src/main/print-escp2.c:454 +#: src/main/print-lexmark.c:333 src/main/print-pcl.c:1337 #, fuzzy msgid "Magenta Density" msgstr "Magenta" -#: src/main/print-canon.c:304 src/main/print-escp2.c:448 -#: src/main/print-lexmark.c:334 src/main/print-pcl.c:1270 +#: src/main/print-canon.c:304 src/main/print-escp2.c:455 +#: src/main/print-lexmark.c:334 src/main/print-pcl.c:1338 #, fuzzy msgid "Adjust the magenta density" msgstr "Justera magentabalansen pÃ¥ utskriften" -#: src/main/print-canon.c:311 src/main/print-escp2.c:455 -#: src/main/print-lexmark.c:341 src/main/print-pcl.c:1277 +#: src/main/print-canon.c:311 src/main/print-escp2.c:462 +#: src/main/print-lexmark.c:341 src/main/print-pcl.c:1345 #, fuzzy msgid "Yellow Density" msgstr "Intensitet:" -#: src/main/print-canon.c:312 src/main/print-escp2.c:456 -#: src/main/print-lexmark.c:342 src/main/print-pcl.c:1278 +#: src/main/print-canon.c:312 src/main/print-escp2.c:463 +#: src/main/print-lexmark.c:342 src/main/print-pcl.c:1346 #, fuzzy msgid "Adjust the yellow density" msgstr "Justera gulbalansen pÃ¥ utskriften" -#: src/main/print-canon.c:319 src/main/print-escp2.c:463 -#: src/main/print-lexmark.c:349 src/main/print-pcl.c:1285 +#: src/main/print-canon.c:319 src/main/print-escp2.c:470 +#: src/main/print-lexmark.c:349 src/main/print-pcl.c:1353 #, fuzzy msgid "Black Density" msgstr "Intensitet:" -#: src/main/print-canon.c:320 src/main/print-escp2.c:464 -#: src/main/print-lexmark.c:350 src/main/print-pcl.c:1286 +#: src/main/print-canon.c:320 src/main/print-escp2.c:471 +#: src/main/print-lexmark.c:350 src/main/print-pcl.c:1354 #, fuzzy msgid "Adjust the black density" msgstr "Justera cyanbalansen pÃ¥ utskriften" #: src/main/print-canon.c:327 src/main/print-canon.c:328 -#: src/main/print-escp2.c:495 src/main/print-escp2.c:496 +#: src/main/print-escp2.c:534 src/main/print-escp2.c:535 #: src/main/print-lexmark.c:357 src/main/print-lexmark.c:358 -#: src/main/print-pcl.c:1293 src/main/print-pcl.c:1294 +#: src/main/print-pcl.c:1361 src/main/print-pcl.c:1362 #, fuzzy msgid "Light Cyan Transition" msgstr "Ljus cyan" #: src/main/print-canon.c:327 src/main/print-canon.c:335 -#: src/main/print-canon.c:343 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-escp2.c:543 -#: src/main/print-escp2.c:551 src/main/print-escp2.c:559 -#: src/main/print-lexmark.c:357 src/main/print-lexmark.c:365 -#: src/main/print-pcl.c:1293 src/main/print-pcl.c:1301 +#: src/main/print-canon.c:343 src/main/print-escp2.c:502 +#: src/main/print-escp2.c:510 src/main/print-escp2.c:518 +#: src/main/print-escp2.c:526 src/main/print-escp2.c:534 +#: src/main/print-escp2.c:542 src/main/print-escp2.c:550 +#: src/main/print-escp2.c:558 src/main/print-escp2.c:566 +#: src/main/print-escp2.c:574 src/main/print-escp2.c:582 +#: src/main/print-escp2.c:590 src/main/print-escp2.c:598 +#: src/main/print-escp2.c:606 src/main/print-escp2.c:614 +#: src/main/print-escp2.c:622 src/main/print-escp2.c:630 +#: src/main/print-escp2.c:638 src/main/print-escp2.c:646 +#: src/main/print-escp2.c:654 src/main/print-escp2.c:662 +#: src/main/print-escp2.c:670 src/main/print-escp2.c:678 +#: src/main/print-escp2.c:686 src/main/print-escp2.c:694 +#: src/main/print-escp2.c:702 src/main/print-escp2.c:710 +#: src/main/print-escp2.c:718 src/main/print-escp2.c:726 +#: src/main/print-escp2.c:734 src/main/print-lexmark.c:357 +#: src/main/print-lexmark.c:365 src/main/print-pcl.c:1361 +#: src/main/print-pcl.c:1369 msgid "Advanced Ink Adjustment" msgstr "Avancerad bläckjustering" #: src/main/print-canon.c:335 src/main/print-canon.c:336 -#: src/main/print-escp2.c:503 src/main/print-escp2.c:504 +#: src/main/print-escp2.c:566 src/main/print-escp2.c:567 #: src/main/print-lexmark.c:365 src/main/print-lexmark.c:366 -#: src/main/print-pcl.c:1301 src/main/print-pcl.c:1302 +#: src/main/print-pcl.c:1369 src/main/print-pcl.c:1370 #, fuzzy msgid "Light Magenta Transition" msgstr "Ljus magenta" @@ -407,55 +429,55 @@ msgstr "Ljus magenta" msgid "Light Yellow Transition" msgstr "Ljus cyan" -#: src/main/print-canon.c:363 src/main/print-pcl.c:1482 +#: src/main/print-canon.c:363 src/main/print-pcl.c:1550 #: src/main/escp2-resolutions.c:557 src/main/escp2-resolutions.c:565 #: src/main/escp2-resolutions.c:576 src/main/escp2-resolutions.c:588 msgid "Off" msgstr "Av" -#: src/main/print-canon.c:364 src/main/print-pcl.c:1483 +#: src/main/print-canon.c:364 src/main/print-pcl.c:1551 msgid "Long Edge (Standard)" msgstr "LÃ¥ng kant (Standard)" -#: src/main/print-canon.c:365 src/main/print-pcl.c:1484 +#: src/main/print-canon.c:365 src/main/print-pcl.c:1552 msgid "Short Edge (Flip)" msgstr "Kort kant (Vänd)" -#: src/main/print-canon.c:629 src/main/print-escp2.c:1648 +#: src/main/print-canon.c:629 src/main/print-escp2.c:2012 #: src/main/xmli18n-tmp.h:6 msgid "CD - 5 inch" msgstr "CD - 5 tum" -#: src/main/print-canon.c:631 src/main/print-escp2.c:1650 +#: src/main/print-canon.c:631 src/main/print-escp2.c:2014 #: src/main/xmli18n-tmp.h:7 msgid "CD - 3 inch" msgstr "CD - 3 tum" -#: src/main/print-canon.c:633 src/main/print-escp2.c:1652 +#: src/main/print-canon.c:633 src/main/print-escp2.c:2016 #: src/main/xmli18n-tmp.h:8 #, fuzzy msgid "CD - Custom" msgstr "Anpassat" -#: src/main/print-canon.c:656 src/main/print-escp2.c:1677 +#: src/main/print-canon.c:656 src/main/print-escp2.c:2041 msgid "Normal" msgstr "Normal" -#: src/main/print-canon.c:658 src/main/print-escp2.c:1679 +#: src/main/print-canon.c:658 src/main/print-escp2.c:2043 #, fuzzy msgid "Print To Hub" msgstr "Skriv ut till fil?" -#: src/main/print-canon.c:773 src/main/print-escp2.c:2011 -#: src/main/print-lexmark.c:1279 src/main/print-olympus.c:1996 -#: src/main/print-pcl.c:1776 src/main/print-ps.c:170 src/main/print-raw.c:135 -#: src/gutenprintui/panel.c:289 src/gutenprintui2/panel.c:289 +#: src/main/print-canon.c:773 src/main/print-escp2.c:2450 +#: src/main/print-lexmark.c:1279 src/main/print-olympus.c:1994 +#: src/main/print-pcl.c:1844 src/main/print-ps.c:310 src/main/print-raw.c:135 +#: src/gutenprintui2/panel.c:290 msgid "Color" msgstr "Färg" -#: src/main/print-canon.c:775 src/main/print-escp2.c:2013 -#: src/main/print-lexmark.c:1281 src/main/print-pcl.c:1778 -#: src/main/print-ps.c:172 src/main/print-raw.c:137 +#: src/main/print-canon.c:775 src/main/print-escp2.c:2452 +#: src/main/print-lexmark.c:1281 src/main/print-pcl.c:1846 +#: src/main/print-ps.c:312 src/main/print-raw.c:137 msgid "Black and White" msgstr "Svart och vitt" @@ -494,7 +516,7 @@ msgstr "Skriv ut" #: src/main/print-color.c:121 src/main/escp2-channels.c:916 #: src/main/escp2-channels.c:929 src/main/escp2-channels.c:943 -#: src/gutenprintui/panel.c:290 src/gutenprintui2/panel.c:290 +#: src/gutenprintui2/panel.c:291 msgid "Grayscale" msgstr "GrÃ¥toner" @@ -518,7 +540,7 @@ msgstr "CMYK" msgid "KCMY" msgstr "KCMY" -#: src/main/print-color.c:165 src/main/print-color.c:446 +#: src/main/print-color.c:165 src/main/print-color.c:454 msgid "Channel " msgstr "Kanal " @@ -578,7 +600,7 @@ msgid "Output image type" msgstr "Utdatatyp:" #: src/main/print-color.c:208 src/main/print-color.c:209 -#: src/main/print-escp2.c:347 +#: src/main/print-escp2.c:349 msgid "Raw Channels" msgstr "RÃ¥kanaler" @@ -643,14 +665,14 @@ msgstr "Gamma:" msgid "Gamma value assumed by application" msgstr "" -#: src/main/print-color.c:266 src/main/escp2-channels.c:3048 -#: src/main/escp2-channels.c:3060 src/main/escp2-channels.c:3068 -#: src/main/escp2-channels.c:3078 src/main/escp2-channels.c:3089 -#: src/main/escp2-channels.c:3101 src/main/escp2-channels.c:3117 -#: src/main/escp2-channels.c:3125 src/main/escp2-channels.c:3138 -#: src/main/escp2-channels.c:3151 src/main/escp2-channels.c:3165 -#: src/main/escp2-channels.c:3179 src/main/escp2-channels.c:3194 -#: src/gutenprintui/panel.c:2152 src/gutenprintui2/panel.c:2153 +#: src/main/print-color.c:266 src/main/escp2-channels.c:3087 +#: src/main/escp2-channels.c:3099 src/main/escp2-channels.c:3107 +#: src/main/escp2-channels.c:3117 src/main/escp2-channels.c:3128 +#: src/main/escp2-channels.c:3140 src/main/escp2-channels.c:3156 +#: src/main/escp2-channels.c:3164 src/main/escp2-channels.c:3177 +#: src/main/escp2-channels.c:3190 src/main/escp2-channels.c:3204 +#: src/main/escp2-channels.c:3218 src/main/escp2-channels.c:3230 +#: src/main/escp2-channels.c:3243 src/gutenprintui2/panel.c:2328 #: src/escputil/escputil.c:978 src/escputil/escputil.c:997 #: src/escputil/escputil.c:1201 msgid "Cyan" @@ -660,14 +682,14 @@ msgstr "Cyan" msgid "Adjust the cyan gamma" msgstr "Justera cyangamma" -#: src/main/print-color.c:274 src/main/escp2-channels.c:3049 -#: src/main/escp2-channels.c:3059 src/main/escp2-channels.c:3070 -#: src/main/escp2-channels.c:3079 src/main/escp2-channels.c:3090 -#: src/main/escp2-channels.c:3103 src/main/escp2-channels.c:3116 -#: src/main/escp2-channels.c:3126 src/main/escp2-channels.c:3139 -#: src/main/escp2-channels.c:3152 src/main/escp2-channels.c:3164 -#: src/main/escp2-channels.c:3178 src/main/escp2-channels.c:3195 -#: src/gutenprintui/panel.c:2159 src/gutenprintui2/panel.c:2160 +#: src/main/print-color.c:274 src/main/escp2-channels.c:3088 +#: src/main/escp2-channels.c:3098 src/main/escp2-channels.c:3109 +#: src/main/escp2-channels.c:3118 src/main/escp2-channels.c:3129 +#: src/main/escp2-channels.c:3142 src/main/escp2-channels.c:3155 +#: src/main/escp2-channels.c:3165 src/main/escp2-channels.c:3178 +#: src/main/escp2-channels.c:3191 src/main/escp2-channels.c:3203 +#: src/main/escp2-channels.c:3217 src/main/escp2-channels.c:3229 +#: src/main/escp2-channels.c:3244 src/gutenprintui2/panel.c:2335 #: src/escputil/escputil.c:979 src/escputil/escputil.c:998 #: src/escputil/escputil.c:1202 msgid "Magenta" @@ -677,14 +699,14 @@ msgstr "Magenta" msgid "Adjust the magenta gamma" msgstr "Justera magentagamma" -#: src/main/print-color.c:282 src/main/escp2-channels.c:3050 -#: src/main/escp2-channels.c:3061 src/main/escp2-channels.c:3069 -#: src/main/escp2-channels.c:3080 src/main/escp2-channels.c:3091 -#: src/main/escp2-channels.c:3105 src/main/escp2-channels.c:3112 -#: src/main/escp2-channels.c:3127 src/main/escp2-channels.c:3140 -#: src/main/escp2-channels.c:3153 src/main/escp2-channels.c:3163 -#: src/main/escp2-channels.c:3177 src/main/escp2-channels.c:3196 -#: src/gutenprintui/panel.c:2166 src/gutenprintui2/panel.c:2167 +#: src/main/print-color.c:282 src/main/escp2-channels.c:3089 +#: src/main/escp2-channels.c:3100 src/main/escp2-channels.c:3108 +#: src/main/escp2-channels.c:3119 src/main/escp2-channels.c:3130 +#: src/main/escp2-channels.c:3144 src/main/escp2-channels.c:3151 +#: src/main/escp2-channels.c:3166 src/main/escp2-channels.c:3179 +#: src/main/escp2-channels.c:3192 src/main/escp2-channels.c:3202 +#: src/main/escp2-channels.c:3216 src/main/escp2-channels.c:3228 +#: src/main/escp2-channels.c:3245 src/gutenprintui2/panel.c:2342 #: src/escputil/escputil.c:980 src/escputil/escputil.c:999 #: src/escputil/escputil.c:1203 msgid "Yellow" @@ -694,10 +716,9 @@ msgstr "Gul" msgid "Adjust the yellow gamma" msgstr "Justera gulgamma" -#: src/main/print-color.c:290 src/main/escp2-channels.c:3168 -#: src/main/escp2-channels.c:3181 src/gutenprintui/panel.c:2180 -#: src/gutenprintui2/panel.c:2181 src/escputil/escputil.c:987 -#: src/escputil/escputil.c:1005 +#: src/main/print-color.c:290 src/main/escp2-channels.c:3207 +#: src/main/escp2-channels.c:3220 src/gutenprintui2/panel.c:2356 +#: src/escputil/escputil.c:987 src/escputil/escputil.c:1005 msgid "Red" msgstr "Röd" @@ -705,8 +726,7 @@ msgstr "Röd" msgid "Adjust the red gamma" msgstr "Justera rödgamma" -#: src/main/print-color.c:298 src/gutenprintui/panel.c:2187 -#: src/gutenprintui2/panel.c:2188 +#: src/main/print-color.c:298 src/gutenprintui2/panel.c:2363 msgid "Green" msgstr "Grön" @@ -714,10 +734,9 @@ msgstr "Grön" msgid "Adjust the green gamma" msgstr "Justera gröngamma" -#: src/main/print-color.c:306 src/main/escp2-channels.c:3169 -#: src/main/escp2-channels.c:3182 src/gutenprintui/panel.c:2194 -#: src/gutenprintui2/panel.c:2195 src/escputil/escputil.c:988 -#: src/escputil/escputil.c:1006 +#: src/main/print-color.c:306 src/main/escp2-channels.c:3208 +#: src/main/escp2-channels.c:3221 src/gutenprintui2/panel.c:2370 +#: src/escputil/escputil.c:988 src/escputil/escputil.c:1006 msgid "Blue" msgstr "BlÃ¥" @@ -726,14 +745,14 @@ msgid "Adjust the blue gamma" msgstr "Justera blÃ¥gamma" #: src/main/print-color.c:314 src/main/print-lexmark.c:613 -#: src/main/escp2-channels.c:3047 src/main/escp2-channels.c:3057 -#: src/main/escp2-channels.c:3058 src/main/escp2-channels.c:3071 -#: src/main/escp2-channels.c:3081 src/main/escp2-channels.c:3088 -#: src/main/escp2-channels.c:3100 src/main/escp2-channels.c:3113 -#: src/main/escp2-channels.c:3124 src/main/escp2-channels.c:3137 -#: src/main/escp2-channels.c:3150 src/main/escp2-channels.c:3156 -#: src/main/escp2-channels.c:3180 src/main/escp2-channels.c:3193 -#: src/gutenprintui/panel.c:2173 src/gutenprintui2/panel.c:2174 +#: src/main/escp2-channels.c:3086 src/main/escp2-channels.c:3096 +#: src/main/escp2-channels.c:3097 src/main/escp2-channels.c:3110 +#: src/main/escp2-channels.c:3120 src/main/escp2-channels.c:3127 +#: src/main/escp2-channels.c:3139 src/main/escp2-channels.c:3152 +#: src/main/escp2-channels.c:3163 src/main/escp2-channels.c:3176 +#: src/main/escp2-channels.c:3189 src/main/escp2-channels.c:3195 +#: src/main/escp2-channels.c:3219 src/main/escp2-channels.c:3231 +#: src/main/escp2-channels.c:3242 src/gutenprintui2/panel.c:2349 #: src/escputil/escputil.c:975 src/escputil/escputil.c:996 #: src/escputil/escputil.c:1200 msgid "Black" @@ -743,7 +762,7 @@ msgstr "Svart" msgid "Adjust the black gamma" msgstr "Justera svartgamma" -#: src/main/print-color.c:322 src/main/print-olympus.c:1764 +#: src/main/print-color.c:322 src/main/print-olympus.c:1762 msgid "Cyan Balance" msgstr "Cyanbalans" @@ -756,7 +775,7 @@ msgstr "GrÃ¥balans" msgid "Adjust the cyan gray balance" msgstr "Justera cyan-grÃ¥balansen" -#: src/main/print-color.c:330 src/main/print-olympus.c:1772 +#: src/main/print-color.c:330 src/main/print-olympus.c:1770 msgid "Magenta Balance" msgstr "Magentabalans" @@ -764,7 +783,7 @@ msgstr "Magentabalans" msgid "Adjust the magenta gray balance" msgstr "Justera magenta-grÃ¥balansen" -#: src/main/print-color.c:338 src/main/print-olympus.c:1780 +#: src/main/print-color.c:338 src/main/print-olympus.c:1778 msgid "Yellow Balance" msgstr "Gulbalans" @@ -791,9 +810,11 @@ 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 -#: src/main/print-color.c:545 src/main/print-escp2.c:353 -#: src/main/print-escp2.c:359 src/main/print-escp2.c:365 -#: src/main/print-escp2.c:371 src/main/print-escp2.c:377 +#: src/main/print-color.c:421 src/main/print-color.c:553 +#: src/main/print-escp2.c:355 src/main/print-escp2.c:361 +#: src/main/print-escp2.c:367 src/main/print-escp2.c:373 +#: src/main/print-escp2.c:379 src/main/print-escp2.c:742 +#: src/main/print-escp2.c:750 src/main/print-escp2.c:758 #, fuzzy msgid "Advanced Output Control" msgstr "Utdatatyp:" @@ -802,221 +823,229 @@ msgstr "Utdatatyp:" msgid "Limit the total ink printed to the page" msgstr "" -#: src/main/print-color.c:365 +#: src/main/print-color.c:365 src/main/print-escp2.c:742 msgid "GCR Transition" msgstr "" -#: src/main/print-color.c:366 +#: src/main/print-color.c:366 src/main/print-escp2.c:743 msgid "Adjust the gray component transition rate" msgstr "" -#: src/main/print-color.c:373 +#: src/main/print-color.c:373 src/main/print-escp2.c:750 msgid "GCR Lower Bound" msgstr "" -#: src/main/print-color.c:374 +#: src/main/print-color.c:374 src/main/print-escp2.c:751 msgid "Lower bound of gray component reduction" msgstr "" -#: src/main/print-color.c:381 +#: src/main/print-color.c:381 src/main/print-escp2.c:758 msgid "GCR Upper Bound" msgstr "" -#: src/main/print-color.c:382 +#: src/main/print-color.c:382 src/main/print-escp2.c:759 msgid "Upper bound of gray component reduction" msgstr "" -#: src/main/print-color.c:447 src/main/print-color.c:457 -#: src/main/print-color.c:465 src/main/print-color.c:473 -#: src/main/print-color.c:481 src/main/print-color.c:489 -#: src/main/print-color.c:497 src/main/print-color.c:505 -#: src/main/print-color.c:513 +#: src/main/print-color.c:421 +msgid "LUT dump file" +msgstr "" + +#: src/main/print-color.c:422 +msgid "Dump file for LUT for external color adjustment" +msgstr "" + +#: src/main/print-color.c:455 src/main/print-color.c:465 +#: src/main/print-color.c:473 src/main/print-color.c:481 +#: src/main/print-color.c:489 src/main/print-color.c:497 +#: src/main/print-color.c:505 src/main/print-color.c:513 +#: src/main/print-color.c:521 #, fuzzy msgid "Output Curves" msgstr "Utdatatyp:" -#: src/main/print-color.c:447 +#: src/main/print-color.c:455 msgid "Curve for raw channel " msgstr "Kurva för rÃ¥kanal" -#: src/main/print-color.c:457 +#: src/main/print-color.c:465 msgid "Cyan Curve" msgstr "Cyankurva" -#: src/main/print-color.c:458 +#: src/main/print-color.c:466 msgid "Cyan curve" msgstr "Cyankurva" -#: src/main/print-color.c:465 +#: src/main/print-color.c:473 msgid "Magenta Curve" msgstr "Magentakurva" -#: src/main/print-color.c:466 +#: src/main/print-color.c:474 msgid "Magenta curve" msgstr "Magentakurva" -#: src/main/print-color.c:473 +#: src/main/print-color.c:481 msgid "Yellow Curve" msgstr "Gulkurva" -#: src/main/print-color.c:474 +#: src/main/print-color.c:482 msgid "Yellow curve" msgstr "Gulkurva" -#: src/main/print-color.c:481 +#: src/main/print-color.c:489 msgid "Black Curve" msgstr "Svartkurva" -#: src/main/print-color.c:482 +#: src/main/print-color.c:490 msgid "Black curve" msgstr "Svartkurva" -#: src/main/print-color.c:489 +#: src/main/print-color.c:497 msgid "Red Curve" msgstr "Rödkurva" -#: src/main/print-color.c:490 +#: src/main/print-color.c:498 msgid "Red curve" msgstr "Rödkurva" -#: src/main/print-color.c:497 +#: src/main/print-color.c:505 msgid "Green Curve" msgstr "Grönkurva" -#: src/main/print-color.c:498 +#: src/main/print-color.c:506 msgid "Green curve" msgstr "Grönkurva" -#: src/main/print-color.c:505 +#: src/main/print-color.c:513 msgid "Blue Curve" msgstr "BlÃ¥kurva" -#: src/main/print-color.c:506 +#: src/main/print-color.c:514 msgid "Blue curve" msgstr "BlÃ¥kurva" -#: src/main/print-color.c:513 +#: src/main/print-color.c:521 msgid "White Curve" msgstr "Vitkurva" -#: src/main/print-color.c:514 +#: src/main/print-color.c:522 msgid "White curve" msgstr "Vitkurva" -#: src/main/print-color.c:521 +#: src/main/print-color.c:529 msgid "Hue Map" msgstr "Färgtonskarta" -#: src/main/print-color.c:521 src/main/print-color.c:529 -#: src/main/print-color.c:537 +#: src/main/print-color.c:529 src/main/print-color.c:537 +#: src/main/print-color.c:545 msgid "Advanced HSL Curves" msgstr "Avancerade HSL-kurvor" -#: src/main/print-color.c:522 +#: src/main/print-color.c:530 msgid "Hue adjustment curve" msgstr "" -#: src/main/print-color.c:529 +#: src/main/print-color.c:537 msgid "Saturation Map" msgstr "Mättnadskarta" -#: src/main/print-color.c:530 +#: src/main/print-color.c:538 msgid "Saturation adjustment curve" msgstr "" -#: src/main/print-color.c:537 +#: src/main/print-color.c:545 msgid "Luminosity Map" msgstr "" -#: src/main/print-color.c:538 +#: src/main/print-color.c:546 msgid "Luminosity adjustment curve" msgstr "" -#: src/main/print-color.c:545 +#: src/main/print-color.c:553 msgid "Gray Component Reduction" msgstr "" -#: src/main/print-color.c:546 +#: src/main/print-color.c:554 msgid "Gray component reduction curve" msgstr "" -#: src/main/print-color.c:1670 +#: src/main/print-color.c:1743 msgid "Traditional Gutenprint color conversion" msgstr "" -#: src/main/printers.c:517 +#: src/main/printers.c:514 #, c-format msgid "Value must be set for %s\n" msgstr "Värde mÃ¥ste ställas in för %s\n" -#: src/main/printers.c:530 src/main/printers.c:535 +#: src/main/printers.c:527 src/main/printers.c:532 #, c-format msgid "`%s' is not a valid %s\n" msgstr "\"%s\" är inte en giltig %s\n" -#: src/main/printers.c:554 +#: src/main/printers.c:551 #, c-format msgid "%s must be between %f and %f (is %f)\n" msgstr "%s mÃ¥ste vara mellan %f och %f (är %f)\n" -#: src/main/printers.c:576 src/main/printers.c:600 +#: src/main/printers.c:573 src/main/printers.c:597 #, c-format msgid "%s must be between %d and %d (is %d)\n" msgstr "%s mÃ¥ste vara mellan %d och %d (är %d)\n" -#: src/main/printers.c:631 +#: src/main/printers.c:628 #, c-format msgid "%s bounds must be between %f and %f\n" msgstr "" -#: src/main/printers.c:639 +#: src/main/printers.c:636 #, c-format msgid "%s wrap mode must be %s\n" msgstr "" -#: src/main/printers.c:643 +#: src/main/printers.c:640 msgid "no wrap" msgstr "" -#: src/main/printers.c:643 +#: src/main/printers.c:640 msgid "wrap around" msgstr "" -#: src/main/printers.c:687 +#: src/main/printers.c:684 #, c-format msgid "Unknown type parameter %s (%d)\n" msgstr "Okänd typparameter %s (%d)\n" -#: src/main/printers.c:700 src/main/printers.c:711 +#: src/main/printers.c:697 src/main/printers.c:708 #, 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" -#: src/main/printers.c:772 +#: src/main/printers.c:768 msgid "Page size is not valid\n" msgstr "Pappersstorleken är inte giltig\n" -#: src/main/printers.c:793 +#: src/main/printers.c:789 #, fuzzy, c-format msgid "Top margin must not be less than %d\n" msgstr "Övre marginalen fÃ¥r inte vara negativ\n" -#: src/main/printers.c:799 +#: src/main/printers.c:795 #, fuzzy, c-format msgid "Left margin must not be less than %d\n" msgstr "Vänstermarginalen fÃ¥r inte vara negativ\n" -#: src/main/printers.c:805 +#: src/main/printers.c:801 #, fuzzy msgid "Height must be greater than zero\n" msgstr "Vänstermarginalen fÃ¥r inte vara negativ\n" -#: src/main/printers.c:811 +#: src/main/printers.c:807 #, fuzzy msgid "Width must be greater than zero\n" msgstr "Övre marginalen fÃ¥r inte vara negativ\n" -#: src/main/printers.c:817 +#: src/main/printers.c:813 #, c-format msgid "" "Image is too wide for the page: left margin is %d, width %d, right edge is %" @@ -1025,7 +1054,7 @@ msgstr "" "Bilden är för bred för sidan: vänstermarginalen är %d, bredd %d, högerkanten " "är %d\n" -#: src/main/printers.c:824 +#: src/main/printers.c:820 #, c-format msgid "" "Image is too long for the page: top margin is %d, height %d, bottom edge is %" @@ -1034,290 +1063,399 @@ 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.c:162 +#: src/main/print-escp2.c:164 msgid "Automatic Printing Mode" msgstr "Automatiskt utskriftsläge" -#: src/main/print-escp2.c:162 src/main/print-escp2.c:174 +#: src/main/print-escp2.c:164 src/main/print-escp2.c:176 #: src/main/generic-options.c:62 msgid "Basic Output Adjustment" msgstr "" -#: src/main/print-escp2.c:163 +#: src/main/print-escp2.c:165 msgid "Automatic printing mode" msgstr "Automatiskt utskriftsläge" -#: src/main/print-escp2.c:174 src/main/print-escp2.c:175 +#: src/main/print-escp2.c:176 src/main/print-escp2.c:177 #: src/main/generic-options.c:62 src/main/generic-options.c:63 msgid "Print Quality" msgstr "Utskriftskvalitet" -#: src/main/print-escp2.c:229 +#: src/main/print-escp2.c:231 msgid "Resolution of the print" msgstr "Upplösning pÃ¥ utskriften" -#: src/main/print-escp2.c:245 +#: src/main/print-escp2.c:247 msgid "Enhanced Gloss" msgstr "Förbättrat glansig" -#: src/main/print-escp2.c:246 +#: src/main/print-escp2.c:248 msgid "Add gloss enhancement" msgstr "Lägg till glansförbättring" -#: src/main/print-escp2.c:251 +#: src/main/print-escp2.c:253 #, fuzzy msgid "Ink Set" msgstr "Bläcktyp" -#: src/main/print-escp2.c:257 +#: src/main/print-escp2.c:259 msgid "Printing Direction" msgstr "" -#: src/main/print-escp2.c:257 src/main/print-escp2.c:269 +#: src/main/print-escp2.c:259 src/main/print-escp2.c:271 msgid "Advanced Output Adjustment" msgstr "" -#: src/main/print-escp2.c:258 +#: src/main/print-escp2.c:260 msgid "Printing direction (unidirectional is higher quality, but slower)" msgstr "" -#: src/main/print-escp2.c:263 src/main/print-olympus.c:1735 +#: src/main/print-escp2.c:265 src/main/print-olympus.c:1733 msgid "Borderless" msgstr "" -#: src/main/print-escp2.c:264 src/main/print-olympus.c:1736 +#: src/main/print-escp2.c:266 src/main/print-olympus.c:1734 msgid "Print without borders" msgstr "" -#: src/main/print-escp2.c:269 +#: src/main/print-escp2.c:271 msgid "Interleave Method" msgstr "" -#: src/main/print-escp2.c:270 +#: src/main/print-escp2.c:272 msgid "Interleave pattern to use" msgstr "" -#: src/main/print-escp2.c:275 +#: src/main/print-escp2.c:277 msgid "Adjust dot size as necessary" msgstr "" -#: src/main/print-escp2.c:276 +#: src/main/print-escp2.c:278 msgid "Adjust dot size as necessary to achieve desired density" msgstr "" -#: src/main/print-escp2.c:281 src/main/print-escp2.c:282 +#: src/main/print-escp2.c:283 src/main/print-escp2.c:284 #, fuzzy msgid "Output Order" msgstr "Utdatatyp:" -#: src/main/print-escp2.c:287 src/main/print-escp2.c:288 +#: src/main/print-escp2.c:289 src/main/print-escp2.c:290 msgid "Alignment Passes" msgstr "" -#: src/main/print-escp2.c:293 src/main/print-escp2.c:294 +#: src/main/print-escp2.c:295 src/main/print-escp2.c:296 msgid "Alignment Choices" msgstr "Justeringsval" -#: src/main/print-escp2.c:299 src/main/print-escp2.c:300 +#: src/main/print-escp2.c:301 src/main/print-escp2.c:302 #, fuzzy msgid "Ink change command" msgstr "Okänt kommando.\n" -#: src/main/print-escp2.c:305 src/main/print-escp2.c:306 +#: src/main/print-escp2.c:307 src/main/print-escp2.c:308 msgid "Alternate Alignment Passes" msgstr "" -#: src/main/print-escp2.c:311 src/main/print-escp2.c:312 +#: src/main/print-escp2.c:313 src/main/print-escp2.c:314 msgid "Alternate Alignment Choices" msgstr "Alternativa justeringsval" -#: src/main/print-escp2.c:317 +#: src/main/print-escp2.c:319 msgid "Supports Packet Mode" msgstr "" -#: src/main/print-escp2.c:318 +#: src/main/print-escp2.c:320 msgid "Supports D4 Packet Mode" msgstr "" -#: src/main/print-escp2.c:323 +#: src/main/print-escp2.c:325 msgid "Has Interchangeable Ink Cartridges" msgstr "" -#: src/main/print-escp2.c:324 +#: src/main/print-escp2.c:326 msgid "Has multiple choices of ink cartridges" msgstr "" -#: src/main/print-escp2.c:335 src/main/print-escp2.c:336 +#: src/main/print-escp2.c:337 src/main/print-escp2.c:338 msgid "Channel Names" msgstr "Kanalnamn" -#: src/main/print-escp2.c:348 +#: src/main/print-escp2.c:350 msgid "Raw Channel Count" msgstr "" -#: src/main/print-escp2.c:353 +#: src/main/print-escp2.c:355 msgid "Cyan Map" msgstr "Cyankarta" -#: src/main/print-escp2.c:354 +#: src/main/print-escp2.c:356 msgid "Adjust the cyan map" msgstr "Justera cyankartan" -#: src/main/print-escp2.c:359 +#: src/main/print-escp2.c:361 msgid "Magenta Map" msgstr "Magentakarta" -#: src/main/print-escp2.c:360 +#: src/main/print-escp2.c:362 msgid "Adjust the magenta map" msgstr "Justera magentakartan" -#: src/main/print-escp2.c:365 +#: src/main/print-escp2.c:367 msgid "Yellow Map" msgstr "Gulkarta" -#: src/main/print-escp2.c:366 +#: src/main/print-escp2.c:368 msgid "Adjust the yellow map" msgstr "Justera gulkartan" -#: src/main/print-escp2.c:371 +#: src/main/print-escp2.c:373 msgid "Blue Map" msgstr "BlÃ¥karta" -#: src/main/print-escp2.c:372 +#: src/main/print-escp2.c:374 msgid "Adjust the blue map" msgstr "Justera blÃ¥kartan" -#: src/main/print-escp2.c:377 +#: src/main/print-escp2.c:379 msgid "Red Map" msgstr "Rödkarta" -#: src/main/print-escp2.c:378 +#: src/main/print-escp2.c:380 msgid "Adjust the red map" msgstr "Justera rödkartan" -#: src/main/print-escp2.c:471 +#: src/main/print-escp2.c:478 #, fuzzy msgid "Red Density" msgstr "Intensitet:" -#: src/main/print-escp2.c:472 +#: src/main/print-escp2.c:479 #, fuzzy msgid "Adjust the red density" msgstr "Justera gulbalansen pÃ¥ utskriften" -#: src/main/print-escp2.c:479 +#: src/main/print-escp2.c:486 #, fuzzy msgid "Blue Density" msgstr "Intensitet:" -#: src/main/print-escp2.c:480 +#: src/main/print-escp2.c:487 #, fuzzy msgid "Adjust the blue density" msgstr "Justera cyanbalansen pÃ¥ utskriften" -#: src/main/print-escp2.c:487 +#: src/main/print-escp2.c:494 msgid "Gloss Level" msgstr "GlansnivÃ¥" -#: src/main/print-escp2.c:488 +#: src/main/print-escp2.c:495 msgid "Adjust the gloss level" msgstr "Justera glansnivÃ¥n" -#: src/main/print-escp2.c:511 src/main/print-escp2.c:512 +#: src/main/print-escp2.c:502 +msgid "Drop Size Small" +msgstr "" + +#: src/main/print-escp2.c:503 +msgid "Drop Size 1 (small)" +msgstr "" + +#: src/main/print-escp2.c:510 +msgid "Drop Size Medium" +msgstr "" + +#: src/main/print-escp2.c:511 +msgid "Drop Size 2 (medium)" +msgstr "" + +#: src/main/print-escp2.c:518 +msgid "Drop Size Large" +msgstr "" + +#: src/main/print-escp2.c:519 +msgid "Drop Size 3 (large)" +msgstr "" + +#: src/main/print-escp2.c:526 src/main/print-escp2.c:527 +#, fuzzy +msgid "Light Cyan Value" +msgstr "Ljus cyan" + +#: src/main/print-escp2.c:542 src/main/print-escp2.c:543 +#, fuzzy +msgid "Light Cyan Density Scale" +msgstr "Intensitet:" + +#: src/main/print-escp2.c:550 src/main/print-escp2.c:551 +#, fuzzy +msgid "Light Magenta Value" +msgstr "Ljus magenta" + +#: src/main/print-escp2.c:558 src/main/print-escp2.c:559 +#, fuzzy +msgid "Light Magenta Density Scale" +msgstr "Magenta" + +#: src/main/print-escp2.c:574 src/main/print-escp2.c:575 +#, fuzzy +msgid "Dark Yellow Value" +msgstr "Mörk gul" + +#: src/main/print-escp2.c:582 src/main/print-escp2.c:583 msgid "Dark Yellow Transition" msgstr "" -#: src/main/print-escp2.c:519 src/main/print-escp2.c:520 -#: src/main/print-escp2.c:527 src/main/print-escp2.c:528 +#: src/main/print-escp2.c:590 src/main/print-escp2.c:591 +#, fuzzy +msgid "Dark Yellow Density Scale" +msgstr "Intensitet:" + +#: src/main/print-escp2.c:598 src/main/print-escp2.c:599 +#: src/main/print-escp2.c:622 src/main/print-escp2.c:623 +#, fuzzy +msgid "Gray Value" +msgstr "GrÃ¥toner" + +#: src/main/print-escp2.c:606 src/main/print-escp2.c:607 +#: src/main/print-escp2.c:630 src/main/print-escp2.c:631 msgid "Gray Transition" msgstr "" -#: src/main/print-escp2.c:535 src/main/print-escp2.c:536 -#: src/main/print-escp2.c:559 src/main/print-escp2.c:560 +#: src/main/print-escp2.c:614 src/main/print-escp2.c:615 +#: src/main/print-escp2.c:638 src/main/print-escp2.c:639 +#, fuzzy +msgid "Gray Density Scale" +msgstr "GrÃ¥toner" + +#: src/main/print-escp2.c:646 src/main/print-escp2.c:647 +#: src/main/print-escp2.c:718 src/main/print-escp2.c:719 +#, fuzzy +msgid "Light Gray Value" +msgstr "Ljus cyan" + +#: src/main/print-escp2.c:654 src/main/print-escp2.c:655 +#: src/main/print-escp2.c:726 src/main/print-escp2.c:727 #, fuzzy msgid "Light Gray Transition" msgstr "Ljus cyan" -#: src/main/print-escp2.c:543 src/main/print-escp2.c:544 +#: src/main/print-escp2.c:662 src/main/print-escp2.c:663 +#: src/main/print-escp2.c:734 src/main/print-escp2.c:735 +#, fuzzy +msgid "Light Gray Density Scale" +msgstr "Ljus cyan" + +#: src/main/print-escp2.c:670 src/main/print-escp2.c:671 +#, fuzzy +msgid "Dark Gray Value" +msgstr "Ljus cyan" + +#: src/main/print-escp2.c:678 src/main/print-escp2.c:679 #, fuzzy msgid "Dark Gray Transition" msgstr "Ljus cyan" -#: src/main/print-escp2.c:551 +#: src/main/print-escp2.c:686 src/main/print-escp2.c:687 +#, fuzzy +msgid "Dark Gray Density Scale" +msgstr "Ljus cyan" + +#: src/main/print-escp2.c:694 +#, fuzzy +msgid "Mid Gray Value" +msgstr "GrÃ¥toner" + +#: src/main/print-escp2.c:695 +#, fuzzy +msgid "Medium Gray Value" +msgstr "Ljus cyan" + +#: src/main/print-escp2.c:702 #, fuzzy msgid "Mid Gray Transition" msgstr "Ljus cyan" -#: src/main/print-escp2.c:552 +#: src/main/print-escp2.c:703 #, fuzzy msgid "Medium Gray Transition" msgstr "Ljus cyan" -#: src/main/print-escp2.c:1635 +#: src/main/print-escp2.c:710 +#, fuzzy +msgid "Mid Gray Density Scale" +msgstr "Ljus cyan" + +#: src/main/print-escp2.c:711 +#, fuzzy +msgid "Medium Gray Density Scale" +msgstr "Ljus cyan" + +#: src/main/print-escp2.c:1999 #, fuzzy msgid "Full Manual Control" msgstr "Utdatatyp:" -#: src/main/print-escp2.c:1637 +#: src/main/print-escp2.c:2001 msgid "Automatic Setting Control" msgstr "" -#: src/main/print-escp2.c:1732 src/main/generic-options.c:213 +#: src/main/print-escp2.c:2096 src/main/generic-options.c:213 #: src/main/generic-options.c:230 #, fuzzy msgid "Manual Control" msgstr "Utdatatyp:" -#: src/main/print-escp2.c:1771 src/main/print-escp2.c:1863 -#: src/main/print-escp2.c:1875 src/main/print-pcl.c:230 -#: src/main/escp2-channels.c:2805 src/main/escp2-papers.c:1707 -#: src/main/escp2-papers.c:1731 src/main/escp2-papers.c:1764 -#: src/main/escp2-papers.c:1815 src/main/escp2-papers.c:1857 -#: src/main/escp2-papers.c:1899 src/main/escp2-papers.c:1992 -#: src/main/escp2-resolutions.c:640 src/main/escp2-resolutions.c:655 -#: src/main/escp2-resolutions.c:668 src/main/generic-options.c:36 -#: src/gutenprintui/panel.c:2613 src/gutenprintui2/panel.c:2639 +#: src/main/print-escp2.c:2139 src/main/print-escp2.c:2231 +#: src/main/print-escp2.c:2243 src/main/print-pcl.c:237 +#: src/main/escp2-channels.c:2827 src/main/escp2-channels.c:2836 +#: src/main/escp2-papers.c:1718 src/main/escp2-papers.c:1742 +#: src/main/escp2-papers.c:1775 src/main/escp2-papers.c:1826 +#: src/main/escp2-papers.c:1868 src/main/escp2-papers.c:1910 +#: src/main/escp2-papers.c:2003 src/main/escp2-resolutions.c:640 +#: src/main/escp2-resolutions.c:655 src/main/escp2-resolutions.c:670 +#: src/main/escp2-resolutions.c:683 src/main/generic-options.c:36 +#: src/gutenprintui2/panel.c:2814 msgid "Standard" msgstr "Standard" -#: src/main/print-escp2.c:1842 +#: src/main/print-escp2.c:2210 msgid "Automatic" msgstr "Automatisk" -#: src/main/print-escp2.c:1844 +#: src/main/print-escp2.c:2212 msgid "Bidirectional" msgstr "Dubbelriktad" -#: src/main/print-escp2.c:1846 +#: src/main/print-escp2.c:2214 msgid "Unidirectional" msgstr "Enkelriktad" -#: src/main/print-escp2.c:1877 +#: src/main/print-escp2.c:2245 msgid "Alternate Fill" msgstr "" -#: src/main/print-escp2.c:1879 +#: src/main/print-escp2.c:2247 msgid "Ascending Fill" msgstr "" -#: src/main/print-escp2.c:1881 +#: src/main/print-escp2.c:2249 msgid "Descending Fill" msgstr "" -#: src/main/print-escp2.c:1883 +#: src/main/print-escp2.c:2251 msgid "Ascending Double" msgstr "" -#: src/main/print-escp2.c:1885 +#: src/main/print-escp2.c:2253 msgid "Nearest Neighbor Avoidance" msgstr "Undvik närmaste granne" -#: src/main/print-escp2.c:2328 +#: src/main/print-escp2.c:2771 #, fuzzy, c-format msgid "This printer does not support raw printer output at depth %d\n" msgstr "Skrivaren stöder inte färgutskrift\n" -#: src/main/print-escp2.c:3436 src/main/print-olympus.c:2451 +#: src/main/print-escp2.c:3934 src/main/print-olympus.c:2449 #: src/main/print-raw.c:217 msgid "Print options not verified; cannot print.\n" msgstr "Utskriftsflaggor inte validerade; kan inte skriva ut.\n" @@ -1394,110 +1532,110 @@ 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 -#: src/main/escp2-channels.c:1540 src/main/escp2-channels.c:1554 -#: src/main/escp2-channels.c:1568 src/main/escp2-channels.c:1582 -#: src/main/escp2-channels.c:1808 src/main/escp2-channels.c:1823 -#: src/main/escp2-channels.c:1838 src/main/escp2-channels.c:1855 +#: src/main/escp2-channels.c:1554 src/main/escp2-channels.c:1568 +#: src/main/escp2-channels.c:1582 src/main/escp2-channels.c:1596 +#: src/main/escp2-channels.c:1822 src/main/escp2-channels.c:1837 +#: src/main/escp2-channels.c:1852 src/main/escp2-channels.c:1869 msgid "Six Color Photo" 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 -#: src/main/escp2-channels.c:1475 src/main/escp2-channels.c:1489 -#: src/main/escp2-channels.c:1503 src/main/escp2-channels.c:1517 -#: src/main/escp2-channels.c:1752 src/main/escp2-channels.c:1767 -#: src/main/escp2-channels.c:1784 +#: src/main/escp2-channels.c:1489 src/main/escp2-channels.c:1503 +#: src/main/escp2-channels.c:1517 src/main/escp2-channels.c:1531 +#: src/main/escp2-channels.c:1766 src/main/escp2-channels.c:1781 +#: src/main/escp2-channels.c:1798 msgid "Five Color Photo Composite" msgstr "Femfärgsfoto sammansatt" -#: src/main/print-lexmark.c:856 src/main/escp2-papers.c:1341 -#: src/main/escp2-papers.c:1385 src/main/escp2-papers.c:1429 -#: src/main/escp2-papers.c:1477 src/main/escp2-papers.c:1525 -#: src/main/escp2-papers.c:1569 +#: src/main/print-lexmark.c:856 src/main/escp2-papers.c:1351 +#: src/main/escp2-papers.c:1395 src/main/escp2-papers.c:1439 +#: src/main/escp2-papers.c:1487 src/main/escp2-papers.c:1535 +#: src/main/escp2-papers.c:1579 msgid "Plain Paper" msgstr "Vanligt papper" -#: src/main/print-lexmark.c:860 src/main/escp2-papers.c:1347 -#: src/main/escp2-papers.c:1391 src/main/escp2-papers.c:1435 -#: src/main/escp2-papers.c:1483 src/main/escp2-papers.c:1531 -#: src/main/escp2-papers.c:1575 +#: src/main/print-lexmark.c:860 src/main/escp2-papers.c:1357 +#: src/main/escp2-papers.c:1401 src/main/escp2-papers.c:1445 +#: src/main/escp2-papers.c:1493 src/main/escp2-papers.c:1541 +#: src/main/escp2-papers.c:1585 msgid "Glossy Film" msgstr "Glansig film" -#: src/main/print-lexmark.c:864 src/main/escp2-papers.c:1349 -#: src/main/escp2-papers.c:1393 src/main/escp2-papers.c:1437 -#: src/main/escp2-papers.c:1485 src/main/escp2-papers.c:1533 -#: src/main/escp2-papers.c:1577 +#: src/main/print-lexmark.c:864 src/main/escp2-papers.c:1359 +#: src/main/escp2-papers.c:1403 src/main/escp2-papers.c:1447 +#: src/main/escp2-papers.c:1495 src/main/escp2-papers.c:1543 +#: src/main/escp2-papers.c:1587 msgid "Transparencies" msgstr "Genomskinligheter" -#: src/main/print-lexmark.c:868 src/main/escp2-papers.c:1351 -#: src/main/escp2-papers.c:1395 src/main/escp2-papers.c:1439 -#: src/main/escp2-papers.c:1487 src/main/escp2-papers.c:1535 -#: src/main/escp2-papers.c:1579 +#: src/main/print-lexmark.c:868 src/main/escp2-papers.c:1361 +#: src/main/escp2-papers.c:1405 src/main/escp2-papers.c:1449 +#: src/main/escp2-papers.c:1497 src/main/escp2-papers.c:1545 +#: src/main/escp2-papers.c:1589 msgid "Envelopes" msgstr "Kuvert" -#: src/main/print-lexmark.c:872 src/main/escp2-papers.c:1355 -#: src/main/escp2-papers.c:1399 src/main/escp2-papers.c:1443 -#: src/main/escp2-papers.c:1491 src/main/escp2-papers.c:1539 -#: src/main/escp2-papers.c:1583 +#: src/main/print-lexmark.c:872 src/main/escp2-papers.c:1365 +#: src/main/escp2-papers.c:1409 src/main/escp2-papers.c:1453 +#: src/main/escp2-papers.c:1501 src/main/escp2-papers.c:1549 +#: src/main/escp2-papers.c:1593 msgid "Matte Paper" msgstr "Matte-papper" -#: src/main/print-lexmark.c:876 src/main/escp2-papers.c:1359 -#: src/main/escp2-papers.c:1403 src/main/escp2-papers.c:1447 -#: src/main/escp2-papers.c:1495 src/main/escp2-papers.c:1543 -#: src/main/escp2-papers.c:1587 +#: src/main/print-lexmark.c:876 src/main/escp2-papers.c:1369 +#: src/main/escp2-papers.c:1413 src/main/escp2-papers.c:1457 +#: src/main/escp2-papers.c:1505 src/main/escp2-papers.c:1553 +#: src/main/escp2-papers.c:1597 msgid "Inkjet Paper" msgstr "BläckstrÃ¥lepapper" -#: src/main/print-lexmark.c:880 src/main/escp2-papers.c:1361 -#: src/main/escp2-papers.c:1405 src/main/escp2-papers.c:1449 -#: src/main/escp2-papers.c:1497 src/main/escp2-papers.c:1545 -#: src/main/escp2-papers.c:1589 +#: src/main/print-lexmark.c:880 src/main/escp2-papers.c:1371 +#: src/main/escp2-papers.c:1415 src/main/escp2-papers.c:1459 +#: src/main/escp2-papers.c:1507 src/main/escp2-papers.c:1555 +#: src/main/escp2-papers.c:1599 msgid "Photo Quality Inkjet Paper" msgstr "BläckstrÃ¥lepapper med fotokvalitet" -#: src/main/print-lexmark.c:884 src/main/escp2-papers.c:1363 -#: src/main/escp2-papers.c:1407 src/main/escp2-papers.c:1451 -#: src/main/escp2-papers.c:1499 src/main/escp2-papers.c:1547 -#: src/main/escp2-papers.c:1591 +#: src/main/print-lexmark.c:884 src/main/escp2-papers.c:1373 +#: src/main/escp2-papers.c:1417 src/main/escp2-papers.c:1461 +#: src/main/escp2-papers.c:1509 src/main/escp2-papers.c:1557 +#: src/main/escp2-papers.c:1601 msgid "Photo Paper" msgstr "Fotopapper" -#: src/main/print-lexmark.c:888 src/main/escp2-papers.c:1365 -#: src/main/escp2-papers.c:1409 src/main/escp2-papers.c:1453 -#: src/main/escp2-papers.c:1501 src/main/escp2-papers.c:1549 -#: src/main/escp2-papers.c:1593 src/main/escp2-papers.c:1617 +#: src/main/print-lexmark.c:888 src/main/escp2-papers.c:1375 +#: src/main/escp2-papers.c:1419 src/main/escp2-papers.c:1463 +#: src/main/escp2-papers.c:1511 src/main/escp2-papers.c:1559 +#: src/main/escp2-papers.c:1603 src/main/escp2-papers.c:1627 msgid "Premium Glossy Photo Paper" msgstr "Premiumglansigt fotopapper" -#: src/main/print-lexmark.c:892 src/main/escp2-papers.c:1369 -#: src/main/escp2-papers.c:1413 src/main/escp2-papers.c:1457 -#: src/main/escp2-papers.c:1505 src/main/escp2-papers.c:1553 -#: src/main/escp2-papers.c:1597 +#: src/main/print-lexmark.c:892 src/main/escp2-papers.c:1379 +#: src/main/escp2-papers.c:1423 src/main/escp2-papers.c:1467 +#: src/main/escp2-papers.c:1515 src/main/escp2-papers.c:1563 +#: src/main/escp2-papers.c:1607 msgid "Premium Luster Photo Paper" msgstr "Fotopapper med premiumlyster" -#: src/main/print-lexmark.c:896 src/main/escp2-papers.c:1371 -#: src/main/escp2-papers.c:1415 src/main/escp2-papers.c:1463 -#: src/main/escp2-papers.c:1511 src/main/escp2-papers.c:1555 -#: src/main/escp2-papers.c:1603 +#: src/main/print-lexmark.c:896 src/main/escp2-papers.c:1381 +#: src/main/escp2-papers.c:1425 src/main/escp2-papers.c:1473 +#: src/main/escp2-papers.c:1521 src/main/escp2-papers.c:1565 +#: src/main/escp2-papers.c:1613 msgid "Photo Quality Glossy Paper" msgstr "Glansigt papper med fotokvalitet" -#: src/main/print-lexmark.c:900 src/main/escp2-papers.c:1373 -#: src/main/escp2-papers.c:1417 src/main/escp2-papers.c:1465 -#: src/main/escp2-papers.c:1513 src/main/escp2-papers.c:1557 -#: src/main/escp2-papers.c:1605 +#: src/main/print-lexmark.c:900 src/main/escp2-papers.c:1383 +#: src/main/escp2-papers.c:1427 src/main/escp2-papers.c:1475 +#: src/main/escp2-papers.c:1523 src/main/escp2-papers.c:1567 +#: src/main/escp2-papers.c:1615 msgid "Ilford Heavy Paper" msgstr "Tungt Ilford-papper" -#: src/main/print-lexmark.c:904 src/main/escp2-papers.c:1377 -#: src/main/escp2-papers.c:1421 src/main/escp2-papers.c:1469 -#: src/main/escp2-papers.c:1517 src/main/escp2-papers.c:1561 -#: src/main/escp2-papers.c:1609 src/main/escp2-papers.c:1619 +#: src/main/print-lexmark.c:904 src/main/escp2-papers.c:1387 +#: src/main/escp2-papers.c:1431 src/main/escp2-papers.c:1479 +#: src/main/escp2-papers.c:1527 src/main/escp2-papers.c:1571 +#: src/main/escp2-papers.c:1619 src/main/escp2-papers.c:1629 msgid "Other" msgstr "Annat" @@ -1513,50 +1651,50 @@ msgstr "Manuell med paus" msgid "Manual without Pause" msgstr "Manuell utan paus" -#: src/main/print-olympus.c:277 +#: src/main/print-olympus.c:275 msgid "Coated" msgstr "" -#: src/main/print-olympus.c:278 src/cups/genppd.c:1726 src/cups/genppd.c:1753 -#: src/cups/genppd.c:1834 +#: src/main/print-olympus.c:276 src/cups/genppd.c:1732 src/cups/genppd.c:1759 +#: src/cups/genppd.c:1840 msgid "None" msgstr "Inget" -#: src/main/print-olympus.c:963 src/main/print-olympus.c:1023 -#: src/main/print-olympus.c:1127 +#: src/main/print-olympus.c:961 src/main/print-olympus.c:1021 +#: src/main/print-olympus.c:1125 msgid "Glossy" msgstr "Glansig" -#: src/main/print-olympus.c:964 src/main/print-olympus.c:1024 -#: src/main/print-olympus.c:1128 +#: src/main/print-olympus.c:962 src/main/print-olympus.c:1022 +#: src/main/print-olympus.c:1126 msgid "Texture" msgstr "Textur" -#: src/main/print-olympus.c:1025 src/main/print-olympus.c:1129 +#: src/main/print-olympus.c:1023 src/main/print-olympus.c:1127 msgid "Matte" msgstr "Matt" -#: src/main/print-olympus.c:1729 src/main/print-olympus.c:1730 +#: src/main/print-olympus.c:1727 src/main/print-olympus.c:1728 msgid "Laminate Pattern" msgstr "Laminatmönster" -#: src/main/print-olympus.c:1765 +#: src/main/print-olympus.c:1763 msgid "Adjust the cyan balance" msgstr "Justera cyanbalansen" -#: src/main/print-olympus.c:1773 +#: src/main/print-olympus.c:1771 msgid "Adjust the magenta balance" msgstr "Justera magentabalansen" -#: src/main/print-olympus.c:1781 +#: src/main/print-olympus.c:1779 msgid "Adjust the yellow balance" msgstr "Justera gulbalansen" -#: src/main/print-olympus.c:1788 +#: src/main/print-olympus.c:1786 msgid "Black Balance" msgstr "Svartbalans" -#: src/main/print-olympus.c:1789 +#: src/main/print-olympus.c:1787 msgid "Adjust the black balance" msgstr "Justera svartbalansen" @@ -1588,91 +1726,115 @@ msgstr "Snabbtorkande foto" msgid "Quick-dry Transparency" msgstr "Snabbtorkande genomskinligt" -#: src/main/print-pcl.c:231 src/main/xmli18n-tmp.h:16 +#: src/main/print-pcl.c:238 src/main/xmli18n-tmp.h:17 msgid "Manual" msgstr "Manuell" -#: src/main/print-pcl.c:233 +#: src/main/print-pcl.c:240 +msgid "Tray 1 - Movable Guides" +msgstr "" + +#: src/main/print-pcl.c:241 msgid "Tray 1" msgstr "Fack 1" -#: src/main/print-pcl.c:234 src/main/print-pcl.c:240 +#: src/main/print-pcl.c:242 +msgid "Tray 2 - Movable Guides" +msgstr "" + +#: src/main/print-pcl.c:243 src/main/print-pcl.c:251 msgid "Tray 2" msgstr "Fack 2" -#: src/main/print-pcl.c:235 +#: src/main/print-pcl.c:244 +msgid "Tray 3 - Movable Guides" +msgstr "" + +#: src/main/print-pcl.c:245 msgid "Tray 3" msgstr "Fack 3" -#: src/main/print-pcl.c:236 +#: src/main/print-pcl.c:246 +msgid "Tray 4 - Movable Guides" +msgstr "" + +#: src/main/print-pcl.c:247 msgid "Tray 4" msgstr "Fack 4" -#: src/main/print-pcl.c:237 +#: src/main/print-pcl.c:248 msgid "Portable Sheet Feeder" msgstr "Portabel arkmatare" -#: src/main/print-pcl.c:238 +#: src/main/print-pcl.c:249 msgid "Desktop Sheet Feeder" msgstr "Skrivbordsarkmatare" -#: src/main/print-pcl.c:239 +#: src/main/print-pcl.c:250 msgid "Tray" msgstr "Fack" -#: src/main/print-pcl.c:241 +#: src/main/print-pcl.c:252 msgid "Optional Source" msgstr "Valfri källa" -#: src/main/print-pcl.c:242 +#: src/main/print-pcl.c:253 msgid "Autoselect" msgstr "Välj automatiskt" -#: src/main/print-pcl.c:256 +#: src/main/print-pcl.c:267 msgid "150x150 DPI" msgstr "150×150 DPI" -#: src/main/print-pcl.c:257 +#: src/main/print-pcl.c:268 msgid "300x300 DPI" msgstr "300×300 DPI" -#: src/main/print-pcl.c:258 +#: src/main/print-pcl.c:269 msgid "600x300 DPI" msgstr "600×300 DPI" -#: src/main/print-pcl.c:259 +#: src/main/print-pcl.c:270 msgid "600x600 DPI monochrome" msgstr "600×600 DPI enfärgad" -#: src/main/print-pcl.c:260 +#: src/main/print-pcl.c:271 msgid "600x600 DPI" msgstr "600×600 DPI" -#: src/main/print-pcl.c:261 +#: src/main/print-pcl.c:272 msgid "1200x600 DPI" msgstr "1200×600 DPI" -#: src/main/print-pcl.c:262 +#: src/main/print-pcl.c:273 msgid "2400x600 DPI" msgstr "2400×600 DPI" -#: src/main/print-pcl.c:1470 +#: src/main/print-pcl.c:1538 msgid "Color + Black Cartridges" msgstr "Färgpatroner + svarta patroner" -#: src/main/print-pcl.c:1471 +#: src/main/print-pcl.c:1539 msgid "Color + Photo Cartridges" msgstr "Färgpatroner + fotopatroner" -#: src/main/print-ps.c:97 +#: src/main/print-ps.c:68 msgid "PPDFile" msgstr "PPD-fil" -#: src/main/print-ps.c:98 src/gutenprintui/panel.c:1768 -#: src/gutenprintui2/panel.c:1768 +#: src/main/print-ps.c:69 src/gutenprintui2/panel.c:1943 msgid "PPD File" msgstr "PPD-fil" +#: src/main/print-ps.c:74 +#, fuzzy +msgid "Model Name" +msgstr "Kanalnamn" + +#: src/main/print-ps.c:75 +msgid "PPD File Model Name" +msgstr "" + #: src/main/print-raw.c:223 msgid "Image dimensions must match paper dimensions" msgstr "" @@ -1688,284 +1850,291 @@ msgstr "TrenivÃ¥ers grÃ¥ton" #: src/main/escp2-channels.c:1035 src/main/escp2-channels.c:1048 #: src/main/escp2-channels.c:1061 src/main/escp2-channels.c:1074 #: src/main/escp2-channels.c:1087 src/main/escp2-channels.c:1100 -#: src/main/escp2-channels.c:2505 src/main/escp2-channels.c:2528 -#: src/main/escp2-channels.c:2548 src/main/escp2-channels.c:2568 -#: src/main/escp2-channels.c:2588 src/main/escp2-channels.c:2608 +#: src/main/escp2-channels.c:2525 src/main/escp2-channels.c:2548 +#: src/main/escp2-channels.c:2568 src/main/escp2-channels.c:2588 +#: src/main/escp2-channels.c:2608 src/main/escp2-channels.c:2628 msgid "Quadtone" msgstr "Quadtone" # Jag tror inte detta ska skrivas samman, jfr snarlika meddelanden -#: src/main/escp2-channels.c:1604 src/main/escp2-channels.c:1618 +#: src/main/escp2-channels.c:1466 +#, fuzzy +msgid "Four Color Photo" +msgstr "Sexfärgs foto" + +# Jag tror inte detta ska skrivas samman, jfr snarlika meddelanden +#: src/main/escp2-channels.c:1618 src/main/escp2-channels.c:1632 msgid "Six Color Enhanced Composite" msgstr "Sexfärgs förbättrad sammansatt" # Jag tror inte detta ska skrivas samman, jfr snarlika meddelanden -#: src/main/escp2-channels.c:1641 src/main/escp2-channels.c:1655 -#: src/main/escp2-channels.c:1669 src/main/escp2-channels.c:1705 +#: src/main/escp2-channels.c:1655 src/main/escp2-channels.c:1669 +#: src/main/escp2-channels.c:1683 src/main/escp2-channels.c:1719 msgid "Seven Color Photo" msgstr "Sjufärgs foto" # Jag tror inte detta ska skrivas samman, jfr snarlika meddelanden -#: src/main/escp2-channels.c:1691 +#: src/main/escp2-channels.c:1705 msgid "Seven Color Enhanced" msgstr "Sjufärgs förbättrad" # Jag tror inte detta ska skrivas samman, jfr snarlika meddelanden -#: src/main/escp2-channels.c:1728 +#: src/main/escp2-channels.c:1742 msgid "Eight Color Photo" msgstr "Ã…ttafärgers foto" # Jag tror inte detta ska skrivas samman, jfr snarlika meddelanden -#: src/main/escp2-channels.c:1876 src/main/escp2-channels.c:1888 -#: src/main/escp2-channels.c:1894 +#: src/main/escp2-channels.c:1890 src/main/escp2-channels.c:1902 +#: src/main/escp2-channels.c:1908 msgid "One Color Raw" msgstr "Enfärgers rÃ¥" # Jag tror inte detta ska skrivas samman, jfr snarlika meddelanden -#: src/main/escp2-channels.c:1900 +#: src/main/escp2-channels.c:1914 msgid "One Color Raw Enhanced Gloss" msgstr "Enfärgers rÃ¥ förbättrad glansig" # Jag tror inte detta ska skrivas samman, jfr snarlika meddelanden -#: src/main/escp2-channels.c:1913 src/main/escp2-channels.c:1925 +#: src/main/escp2-channels.c:1927 src/main/escp2-channels.c:1939 msgid "Two Color Raw" msgstr "TvÃ¥färgers rÃ¥" # Jag tror inte detta ska skrivas samman, jfr snarlika meddelanden -#: src/main/escp2-channels.c:1939 src/main/escp2-channels.c:1953 -#: src/main/escp2-channels.c:1980 src/main/escp2-channels.c:1993 -#: src/main/escp2-channels.c:2006 src/main/escp2-channels.c:2019 -#: src/main/escp2-channels.c:2033 src/main/escp2-channels.c:2047 -#: src/main/escp2-channels.c:2060 +#: src/main/escp2-channels.c:1953 src/main/escp2-channels.c:1967 +#: src/main/escp2-channels.c:1994 src/main/escp2-channels.c:2007 +#: src/main/escp2-channels.c:2020 src/main/escp2-channels.c:2033 +#: src/main/escp2-channels.c:2047 src/main/escp2-channels.c:2061 +#: src/main/escp2-channels.c:2074 msgid "Three Color Raw" msgstr "Trefärgers rÃ¥" # Jag tror inte detta ska skrivas samman, jfr snarlika meddelanden -#: src/main/escp2-channels.c:1967 +#: src/main/escp2-channels.c:1981 msgid "Three Color Raw Gloss" msgstr "Trefärgers rÃ¥ glansig" # Jag tror inte detta ska skrivas samman, jfr snarlika meddelanden -#: src/main/escp2-channels.c:2067 src/main/escp2-channels.c:2073 -#: src/main/escp2-channels.c:2079 src/main/escp2-channels.c:2085 -#: src/main/escp2-channels.c:2091 src/main/escp2-channels.c:2097 -#: src/main/escp2-channels.c:2103 src/main/escp2-channels.c:2109 -#: src/main/escp2-channels.c:2115 src/main/escp2-channels.c:2121 +#: src/main/escp2-channels.c:2081 src/main/escp2-channels.c:2087 +#: src/main/escp2-channels.c:2093 src/main/escp2-channels.c:2099 +#: src/main/escp2-channels.c:2105 src/main/escp2-channels.c:2111 +#: src/main/escp2-channels.c:2117 src/main/escp2-channels.c:2123 +#: src/main/escp2-channels.c:2129 src/main/escp2-channels.c:2135 +#: src/main/escp2-channels.c:2141 msgid "Four Color Raw" msgstr "Fyrfärgers rÃ¥" # Jag tror inte detta ska skrivas samman, jfr snarlika meddelanden -#: src/main/escp2-channels.c:2127 +#: src/main/escp2-channels.c:2147 msgid "Four Color Raw Gloss" msgstr "Fyrfärgers rÃ¥ glansig" # Jag tror inte detta ska skrivas samman, jfr snarlika meddelanden -#: src/main/escp2-channels.c:2142 src/main/escp2-channels.c:2156 +#: src/main/escp2-channels.c:2162 src/main/escp2-channels.c:2176 msgid "Five Color Raw" msgstr "Femfärgers rÃ¥" # Jag tror inte detta ska skrivas samman, jfr snarlika meddelanden -#: src/main/escp2-channels.c:2170 src/main/escp2-channels.c:2186 -#: src/main/escp2-channels.c:2192 src/main/escp2-channels.c:2198 -#: src/main/escp2-channels.c:2213 src/main/escp2-channels.c:2234 +#: src/main/escp2-channels.c:2190 src/main/escp2-channels.c:2206 +#: src/main/escp2-channels.c:2212 src/main/escp2-channels.c:2218 +#: src/main/escp2-channels.c:2233 src/main/escp2-channels.c:2254 msgid "Six Color Raw" msgstr "Sexfärgers rÃ¥" # Jag tror inte detta ska skrivas samman, jfr snarlika meddelanden -#: src/main/escp2-channels.c:2219 +#: src/main/escp2-channels.c:2239 msgid "Six Color Enhanced Gloss Raw" msgstr "Sexfärgers förbättrad glansig rÃ¥" # Jag tror inte detta ska skrivas samman, jfr snarlika meddelanden -#: src/main/escp2-channels.c:2250 src/main/escp2-channels.c:2265 -#: src/main/escp2-channels.c:2280 +#: src/main/escp2-channels.c:2270 src/main/escp2-channels.c:2285 +#: src/main/escp2-channels.c:2300 msgid "Seven Color Raw" msgstr "Sjufärgers rÃ¥" # Jag tror inte detta ska skrivas samman, jfr snarlika meddelanden -#: src/main/escp2-channels.c:2297 +#: src/main/escp2-channels.c:2317 msgid "Seven Color Enhanced Gloss Raw" msgstr "Sjufärgers förbättrad glansig rÃ¥" # Jag tror inte detta ska skrivas samman, jfr snarlika meddelanden -#: src/main/escp2-channels.c:2315 +#: src/main/escp2-channels.c:2335 msgid "Eight Color Raw" msgstr "Ã…ttafärgers rÃ¥" -#: src/main/escp2-channels.c:2482 src/main/escp2-channels.c:2495 -#: src/main/escp2-channels.c:2497 src/main/escp2-channels.c:2517 -#: src/main/escp2-channels.c:2520 src/main/escp2-channels.c:2540 -#: src/main/escp2-channels.c:2560 src/main/escp2-channels.c:2580 -#: src/main/escp2-channels.c:2600 src/main/escp2-channels.c:2620 -#: src/main/escp2-channels.c:2636 src/main/escp2-channels.c:2638 -#: src/main/escp2-channels.c:2640 src/main/escp2-channels.c:2642 -#: src/main/escp2-channels.c:2658 src/main/escp2-channels.c:2674 -#: src/main/escp2-channels.c:2694 +#: src/main/escp2-channels.c:2502 src/main/escp2-channels.c:2515 +#: src/main/escp2-channels.c:2517 src/main/escp2-channels.c:2537 +#: src/main/escp2-channels.c:2540 src/main/escp2-channels.c:2560 +#: src/main/escp2-channels.c:2580 src/main/escp2-channels.c:2600 +#: src/main/escp2-channels.c:2620 src/main/escp2-channels.c:2640 +#: src/main/escp2-channels.c:2656 src/main/escp2-channels.c:2658 +#: src/main/escp2-channels.c:2660 src/main/escp2-channels.c:2662 +#: src/main/escp2-channels.c:2678 src/main/escp2-channels.c:2694 +#: src/main/escp2-channels.c:2714 msgid "EPSON Standard Inks" msgstr "" # Jag tror inte detta ska skrivas samman, jfr snarlika meddelanden -#: src/main/escp2-channels.c:2714 src/main/escp2-channels.c:2739 +#: src/main/escp2-channels.c:2734 src/main/escp2-channels.c:2759 #, fuzzy msgid "UltraChrome Photo Black" msgstr "Sexfärgs foto" -#: src/main/escp2-channels.c:2718 src/main/escp2-channels.c:2743 +#: src/main/escp2-channels.c:2738 src/main/escp2-channels.c:2763 msgid "UltraChrome Matte Black" msgstr "" -#: src/main/escp2-channels.c:2758 src/main/escp2-channels.c:2796 -#: src/main/escp2-channels.c:3167 src/escputil/escputil.c:976 +#: src/main/escp2-channels.c:2778 src/main/escp2-channels.c:2816 +#: src/main/escp2-channels.c:3206 src/escputil/escputil.c:976 msgid "Photo Black" msgstr "Fotosvart" -#: src/main/escp2-channels.c:2762 src/main/escp2-channels.c:2778 -#: src/main/escp2-channels.c:3166 src/escputil/escputil.c:986 +#: src/main/escp2-channels.c:2782 src/main/escp2-channels.c:2798 +#: src/main/escp2-channels.c:3205 src/escputil/escputil.c:986 msgid "Matte Black" msgstr "Matt svart" -#: src/main/escp2-channels.c:3092 src/main/escp2-channels.c:3102 -#: src/main/escp2-channels.c:3114 src/main/escp2-channels.c:3128 -#: src/main/escp2-channels.c:3141 src/main/escp2-channels.c:3154 -#: src/main/escp2-channels.c:3191 src/escputil/escputil.c:981 +#: src/main/escp2-channels.c:3131 src/main/escp2-channels.c:3141 +#: src/main/escp2-channels.c:3153 src/main/escp2-channels.c:3167 +#: src/main/escp2-channels.c:3180 src/main/escp2-channels.c:3193 +#: src/main/escp2-channels.c:3240 src/escputil/escputil.c:981 #: src/escputil/escputil.c:1204 msgid "Light Cyan" msgstr "Ljus cyan" -#: src/main/escp2-channels.c:3093 src/main/escp2-channels.c:3104 -#: src/main/escp2-channels.c:3115 src/main/escp2-channels.c:3129 -#: src/main/escp2-channels.c:3142 src/main/escp2-channels.c:3155 -#: src/main/escp2-channels.c:3190 src/escputil/escputil.c:982 +#: src/main/escp2-channels.c:3132 src/main/escp2-channels.c:3143 +#: src/main/escp2-channels.c:3154 src/main/escp2-channels.c:3168 +#: src/main/escp2-channels.c:3181 src/main/escp2-channels.c:3194 +#: src/main/escp2-channels.c:3239 src/escputil/escputil.c:982 #: src/escputil/escputil.c:1205 msgid "Light Magenta" msgstr "Ljus magenta" -#: src/main/escp2-channels.c:3130 src/main/escp2-channels.c:3192 +#: src/main/escp2-channels.c:3169 src/main/escp2-channels.c:3241 #: src/escputil/escputil.c:985 msgid "Light Black" msgstr "Ljus svart" -#: src/main/escp2-channels.c:3143 +#: src/main/escp2-channels.c:3182 msgid "Dark Yellow" msgstr "Mörk gul" -#: src/main/escp2-channels.c:3170 src/escputil/escputil.c:989 +#: src/main/escp2-channels.c:3209 src/escputil/escputil.c:989 msgid "Gloss Optimizer" msgstr "Glansoptimerare" -#: src/main/escp2-channels.c:3189 src/escputil/escputil.c:990 +#: src/main/escp2-channels.c:3238 src/escputil/escputil.c:990 msgid "Light Light Black" msgstr "Ljus-ljus svart" -#: src/main/escp2-papers.c:1343 src/main/escp2-papers.c:1387 -#: src/main/escp2-papers.c:1431 src/main/escp2-papers.c:1479 -#: src/main/escp2-papers.c:1527 src/main/escp2-papers.c:1571 +#: src/main/escp2-papers.c:1353 src/main/escp2-papers.c:1397 +#: src/main/escp2-papers.c:1441 src/main/escp2-papers.c:1489 +#: src/main/escp2-papers.c:1537 src/main/escp2-papers.c:1581 msgid "Plain Paper Fast Load" msgstr "Snabbladdning av vanligt papper" -#: src/main/escp2-papers.c:1345 src/main/escp2-papers.c:1389 -#: src/main/escp2-papers.c:1433 src/main/escp2-papers.c:1481 -#: src/main/escp2-papers.c:1529 src/main/escp2-papers.c:1573 +#: src/main/escp2-papers.c:1355 src/main/escp2-papers.c:1399 +#: src/main/escp2-papers.c:1443 src/main/escp2-papers.c:1491 +#: src/main/escp2-papers.c:1539 src/main/escp2-papers.c:1583 #: src/main/xmli18n-tmp.h:5 msgid "Postcard" msgstr "Vykort" -#: src/main/escp2-papers.c:1353 src/main/escp2-papers.c:1397 -#: src/main/escp2-papers.c:1441 src/main/escp2-papers.c:1489 -#: src/main/escp2-papers.c:1537 src/main/escp2-papers.c:1581 +#: src/main/escp2-papers.c:1363 src/main/escp2-papers.c:1407 +#: src/main/escp2-papers.c:1451 src/main/escp2-papers.c:1499 +#: src/main/escp2-papers.c:1547 src/main/escp2-papers.c:1591 msgid "Back Light Film" msgstr "Bakljusfilm" -#: src/main/escp2-papers.c:1357 src/main/escp2-papers.c:1401 -#: src/main/escp2-papers.c:1445 src/main/escp2-papers.c:1493 -#: src/main/escp2-papers.c:1541 src/main/escp2-papers.c:1585 -msgid "Matte Paper Heavyweight" -msgstr "Matt tungt papper" - #: src/main/escp2-papers.c:1367 src/main/escp2-papers.c:1411 #: src/main/escp2-papers.c:1455 src/main/escp2-papers.c:1503 #: src/main/escp2-papers.c:1551 src/main/escp2-papers.c:1595 +msgid "Matte Paper Heavyweight" +msgstr "Matt tungt papper" + +#: src/main/escp2-papers.c:1377 src/main/escp2-papers.c:1421 +#: src/main/escp2-papers.c:1465 src/main/escp2-papers.c:1513 +#: src/main/escp2-papers.c:1561 src/main/escp2-papers.c:1605 msgid "Premium Semigloss Photo Paper" msgstr "Premium halvglansigt fotopapper" -#: src/main/escp2-papers.c:1375 src/main/escp2-papers.c:1419 -#: src/main/escp2-papers.c:1467 src/main/escp2-papers.c:1515 -#: src/main/escp2-papers.c:1559 src/main/escp2-papers.c:1607 +#: src/main/escp2-papers.c:1385 src/main/escp2-papers.c:1429 +#: src/main/escp2-papers.c:1477 src/main/escp2-papers.c:1525 +#: src/main/escp2-papers.c:1569 src/main/escp2-papers.c:1617 msgid "ColorLife Paper" msgstr "ColorLife-papper" -#: src/main/escp2-papers.c:1459 src/main/escp2-papers.c:1507 -#: src/main/escp2-papers.c:1599 +#: src/main/escp2-papers.c:1469 src/main/escp2-papers.c:1517 +#: src/main/escp2-papers.c:1609 #, fuzzy msgid "Archival Matte Paper" msgstr "Matte-papper" -#: src/main/escp2-papers.c:1461 src/main/escp2-papers.c:1509 -#: src/main/escp2-papers.c:1601 +#: src/main/escp2-papers.c:1471 src/main/escp2-papers.c:1519 +#: src/main/escp2-papers.c:1611 msgid "Watercolor Paper - Radiant White" msgstr "" -#: src/main/escp2-papers.c:1716 src/main/escp2-papers.c:1842 -#: src/main/escp2-papers.c:1884 src/main/escp2-papers.c:1926 -#: src/main/escp2-papers.c:2001 +#: src/main/escp2-papers.c:1727 src/main/escp2-papers.c:1853 +#: src/main/escp2-papers.c:1895 src/main/escp2-papers.c:1937 +#: src/main/escp2-papers.c:2012 msgid "Roll Feed" msgstr "Rullmatning" -#: src/main/escp2-papers.c:1740 src/main/escp2-papers.c:1791 +#: src/main/escp2-papers.c:1751 src/main/escp2-papers.c:1802 msgid "Roll Feed (cut each page)" msgstr "" -#: src/main/escp2-papers.c:1749 src/main/escp2-papers.c:1800 +#: src/main/escp2-papers.c:1760 src/main/escp2-papers.c:1811 msgid "Roll Feed (do not cut)" msgstr "" -#: src/main/escp2-papers.c:1773 src/main/escp2-papers.c:1824 +#: src/main/escp2-papers.c:1784 src/main/escp2-papers.c:1835 msgid "Manual Feed" msgstr "Manuell matning" -#: src/main/escp2-papers.c:1782 src/main/escp2-papers.c:1833 -#: src/main/escp2-papers.c:1935 src/main/escp2-papers.c:1968 +#: src/main/escp2-papers.c:1793 src/main/escp2-papers.c:1844 +#: src/main/escp2-papers.c:1946 src/main/escp2-papers.c:1979 msgid "Print to CD" msgstr "Skriv ut till cd" -#: src/main/escp2-papers.c:1866 src/main/escp2-papers.c:1908 +#: src/main/escp2-papers.c:1877 src/main/escp2-papers.c:1919 #, fuzzy msgid "Manual Sheet Guide" msgstr "Manuell matning" -#: src/main/escp2-papers.c:1875 src/main/escp2-papers.c:1917 +#: src/main/escp2-papers.c:1886 src/main/escp2-papers.c:1928 #, fuzzy msgid "Manual Feed (Front)" msgstr "Manuell matning" -#: src/main/escp2-papers.c:1950 +#: src/main/escp2-papers.c:1961 #, fuzzy msgid "Rear Tray" msgstr "Fack" -#: src/main/escp2-papers.c:1959 +#: src/main/escp2-papers.c:1970 msgid "Front Tray" msgstr "" -#: src/main/escp2-papers.c:1977 +#: src/main/escp2-papers.c:1988 #, fuzzy msgid "Photo Board" msgstr "Fotosvart" -#: src/main/escp2-papers.c:2016 +#: src/main/escp2-papers.c:2027 msgid "Cut Sheet Bin 1" msgstr "" -#: src/main/escp2-papers.c:2025 +#: src/main/escp2-papers.c:2036 msgid "Cut Sheet Bin 2" msgstr "" -#: src/main/escp2-papers.c:2034 +#: src/main/escp2-papers.c:2045 #, fuzzy msgid "Cut Sheet Autoselect" msgstr "Välj automatiskt" -#: src/main/escp2-papers.c:2043 +#: src/main/escp2-papers.c:2054 msgid "Manual Selection" msgstr "" @@ -2106,45 +2275,51 @@ msgid "Eight Pass" msgstr "Ljusstyrka:" #: src/main/escp2-resolutions.c:637 src/main/escp2-resolutions.c:652 -#: src/main/generic-options.c:33 +#: src/main/escp2-resolutions.c:667 src/main/generic-options.c:33 msgid "Fast Economy" msgstr "Snabb ekonomi" #: src/main/escp2-resolutions.c:638 src/main/escp2-resolutions.c:653 -#: src/main/generic-options.c:34 +#: src/main/escp2-resolutions.c:668 src/main/generic-options.c:34 msgid "Economy" msgstr "Ekonomi" #: src/main/escp2-resolutions.c:639 src/main/escp2-resolutions.c:654 -#: src/main/escp2-resolutions.c:667 src/main/generic-options.c:35 +#: src/main/escp2-resolutions.c:669 src/main/escp2-resolutions.c:682 +#: src/main/generic-options.c:35 msgid "Draft" msgstr "Utdrag" #: src/main/escp2-resolutions.c:641 src/main/escp2-resolutions.c:656 -#: src/main/escp2-resolutions.c:670 src/main/generic-options.c:37 +#: src/main/escp2-resolutions.c:671 src/main/escp2-resolutions.c:685 +#: src/main/generic-options.c:37 msgid "High" msgstr "Hög" #: src/main/escp2-resolutions.c:642 src/main/escp2-resolutions.c:657 -#: src/main/escp2-resolutions.c:669 src/main/generic-options.c:38 +#: src/main/escp2-resolutions.c:672 src/main/escp2-resolutions.c:684 +#: src/main/generic-options.c:38 msgid "Photo" msgstr "Foto" #: src/main/escp2-resolutions.c:643 src/main/escp2-resolutions.c:658 -#: src/main/escp2-resolutions.c:671 src/main/generic-options.c:39 +#: src/main/escp2-resolutions.c:673 src/main/escp2-resolutions.c:686 +#: 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/escp2-resolutions.c:644 src/main/escp2-resolutions.c:659 -#: src/main/escp2-resolutions.c:672 src/main/generic-options.c:40 +#: src/main/escp2-resolutions.c:674 src/main/escp2-resolutions.c:687 +#: src/main/generic-options.c:40 #, fuzzy msgid "Ultra Photo" msgstr "Sexfärgs foto" #: src/main/escp2-resolutions.c:645 src/main/escp2-resolutions.c:660 -#: src/main/escp2-resolutions.c:673 src/main/generic-options.c:41 +#: src/main/escp2-resolutions.c:675 src/main/escp2-resolutions.c:688 +#: src/main/generic-options.c:41 msgid "Best" msgstr "Bästa" @@ -2221,4176 +2396,4483 @@ msgid "3x5" msgstr "3×5" #: src/main/xmli18n-tmp.h:10 +msgid "3 1/2 x5" +msgstr "" + +#: src/main/xmli18n-tmp.h:11 msgid "4x6" msgstr "4×6" -#: src/main/xmli18n-tmp.h:11 +#: src/main/xmli18n-tmp.h:12 #, fuzzy msgid "Epson 4x6 Photo Paper (tear-off borders)" msgstr "Epson 4×6 fotopapper" -#: src/main/xmli18n-tmp.h:12 +#: src/main/xmli18n-tmp.h:13 msgid "5x7" msgstr "5×7" -#: src/main/xmli18n-tmp.h:13 +#: src/main/xmli18n-tmp.h:14 msgid "5x8" msgstr "5×8" -#: src/main/xmli18n-tmp.h:14 +#: src/main/xmli18n-tmp.h:15 msgid "6x8" msgstr "6×8" -#: src/main/xmli18n-tmp.h:15 +#: src/main/xmli18n-tmp.h:16 msgid "8x10" msgstr "8×10" -#: src/main/xmli18n-tmp.h:17 +#: src/main/xmli18n-tmp.h:18 msgid "12x18" msgstr "12×18" -#: src/main/xmli18n-tmp.h:18 +#: src/main/xmli18n-tmp.h:19 msgid "Super B 13x19" msgstr "Super B 13×19" -#: src/main/xmli18n-tmp.h:19 +#: src/main/xmli18n-tmp.h:20 msgid "Engineering C 17x22" msgstr "" -#: src/main/xmli18n-tmp.h:20 +#: src/main/xmli18n-tmp.h:21 msgid "8x12" msgstr "8×12" -#: src/main/xmli18n-tmp.h:21 +#: src/main/xmli18n-tmp.h:22 msgid "11x14" msgstr "11×14" -#: src/main/xmli18n-tmp.h:22 +#: src/main/xmli18n-tmp.h:23 msgid "16x20" msgstr "16×20" -#: src/main/xmli18n-tmp.h:23 +#: src/main/xmli18n-tmp.h:24 msgid "16x24" msgstr "16×24" -#: src/main/xmli18n-tmp.h:24 +#: src/main/xmli18n-tmp.h:25 msgid "20x24" msgstr "20×24" -#: src/main/xmli18n-tmp.h:25 +#: src/main/xmli18n-tmp.h:26 msgid "20x30" msgstr "20×30" -#: src/main/xmli18n-tmp.h:26 +#: src/main/xmli18n-tmp.h:27 msgid "22x30" msgstr "22×30" -#: src/main/xmli18n-tmp.h:27 +#: src/main/xmli18n-tmp.h:28 msgid "24x30" msgstr "24×30" -#: src/main/xmli18n-tmp.h:28 +#: src/main/xmli18n-tmp.h:29 msgid "Super A1 24x36" msgstr "Super A1 24x36" -#: src/main/xmli18n-tmp.h:29 +#: src/main/xmli18n-tmp.h:30 msgid "30x40" msgstr "30×40" -#: src/main/xmli18n-tmp.h:30 +#: src/main/xmli18n-tmp.h:31 msgid "4A" msgstr "4A" -#: src/main/xmli18n-tmp.h:31 +#: src/main/xmli18n-tmp.h:32 msgid "2A" msgstr "2A" -#: src/main/xmli18n-tmp.h:32 +#: src/main/xmli18n-tmp.h:33 msgid "Super A0" msgstr "Super A0" -#: src/main/xmli18n-tmp.h:33 +#: src/main/xmli18n-tmp.h:34 msgid "A0" msgstr "A0" -#: src/main/xmli18n-tmp.h:34 +#: src/main/xmli18n-tmp.h:35 msgid "A1" msgstr "A1" -#: src/main/xmli18n-tmp.h:35 +#: src/main/xmli18n-tmp.h:36 msgid "A2" msgstr "A2" -#: src/main/xmli18n-tmp.h:36 +#: src/main/xmli18n-tmp.h:37 msgid "A3" msgstr "A3" -#: src/main/xmli18n-tmp.h:37 +#: src/main/xmli18n-tmp.h:38 msgid "A4" msgstr "A4" -#: src/main/xmli18n-tmp.h:38 +#: src/main/xmli18n-tmp.h:39 msgid "A5" msgstr "A5" -#: src/main/xmli18n-tmp.h:39 +#: src/main/xmli18n-tmp.h:40 msgid "A6" msgstr "A6" -#: src/main/xmli18n-tmp.h:40 +#: src/main/xmli18n-tmp.h:41 msgid "A7" msgstr "A7" -#: src/main/xmli18n-tmp.h:41 +#: src/main/xmli18n-tmp.h:42 msgid "A8" msgstr "A8" -#: src/main/xmli18n-tmp.h:42 +#: src/main/xmli18n-tmp.h:43 msgid "A9" msgstr "A9" -#: src/main/xmli18n-tmp.h:43 +#: src/main/xmli18n-tmp.h:44 msgid "A10" msgstr "A10" -#: src/main/xmli18n-tmp.h:44 +#: src/main/xmli18n-tmp.h:45 msgid "RA0" msgstr "RA0" -#: src/main/xmli18n-tmp.h:45 +#: src/main/xmli18n-tmp.h:46 msgid "RA1" msgstr "RA1" -#: src/main/xmli18n-tmp.h:46 +#: src/main/xmli18n-tmp.h:47 msgid "RA2" msgstr "RA2" -#: src/main/xmli18n-tmp.h:47 +#: src/main/xmli18n-tmp.h:48 msgid "RA3" msgstr "RA3" -#: src/main/xmli18n-tmp.h:48 +#: src/main/xmli18n-tmp.h:49 msgid "RA4" msgstr "RA4" -#: src/main/xmli18n-tmp.h:49 +#: src/main/xmli18n-tmp.h:50 msgid "SRA0" msgstr "SRA0" -#: src/main/xmli18n-tmp.h:50 +#: src/main/xmli18n-tmp.h:51 msgid "SRA1" msgstr "SRA1" -#: src/main/xmli18n-tmp.h:51 +#: src/main/xmli18n-tmp.h:52 msgid "SRA2" msgstr "SRA2" -#: src/main/xmli18n-tmp.h:52 +#: src/main/xmli18n-tmp.h:53 msgid "SRA3" msgstr "SRA3" -#: src/main/xmli18n-tmp.h:53 +#: src/main/xmli18n-tmp.h:54 msgid "SRA4" msgstr "SRA4" -#: src/main/xmli18n-tmp.h:54 +#: src/main/xmli18n-tmp.h:55 msgid "4B ISO" msgstr "4B ISO" -#: src/main/xmli18n-tmp.h:55 +#: src/main/xmli18n-tmp.h:56 msgid "2B ISO" msgstr "2B ISO" -#: src/main/xmli18n-tmp.h:56 +#: src/main/xmli18n-tmp.h:57 msgid "B0 ISO" msgstr "B0 ISO" -#: src/main/xmli18n-tmp.h:57 +#: src/main/xmli18n-tmp.h:58 msgid "B1 ISO" msgstr "B1 ISO" -#: src/main/xmli18n-tmp.h:58 +#: src/main/xmli18n-tmp.h:59 msgid "B2 ISO" msgstr "B2 ISO" -#: src/main/xmli18n-tmp.h:59 +#: src/main/xmli18n-tmp.h:60 msgid "B3 ISO" msgstr "B3 ISO" -#: src/main/xmli18n-tmp.h:60 +#: src/main/xmli18n-tmp.h:61 msgid "B4 ISO" msgstr "B4 ISO" -#: src/main/xmli18n-tmp.h:61 +#: src/main/xmli18n-tmp.h:62 msgid "B5 ISO" msgstr "B5 ISO" -#: src/main/xmli18n-tmp.h:62 +#: src/main/xmli18n-tmp.h:63 msgid "B6 ISO" msgstr "B6 ISO" -#: src/main/xmli18n-tmp.h:63 +#: src/main/xmli18n-tmp.h:64 msgid "B7 ISO" msgstr "B7 ISO" -#: src/main/xmli18n-tmp.h:64 +#: src/main/xmli18n-tmp.h:65 msgid "B8 ISO" msgstr "B8 ISO" -#: src/main/xmli18n-tmp.h:65 +#: src/main/xmli18n-tmp.h:66 msgid "B9 ISO" msgstr "B9 ISO" -#: src/main/xmli18n-tmp.h:66 +#: src/main/xmli18n-tmp.h:67 msgid "B10 ISO" msgstr "B10 ISO" -#: src/main/xmli18n-tmp.h:67 +#: src/main/xmli18n-tmp.h:68 msgid "Super B0 JIS" msgstr "Super B0 JIS" -#: src/main/xmli18n-tmp.h:68 +#: src/main/xmli18n-tmp.h:69 msgid "B0 JIS" msgstr "B0 JIS" -#: src/main/xmli18n-tmp.h:69 +#: src/main/xmli18n-tmp.h:70 msgid "B1 JIS" msgstr "B1 JIS" -#: src/main/xmli18n-tmp.h:70 +#: src/main/xmli18n-tmp.h:71 msgid "B2 JIS" msgstr "B2 JIS" -#: src/main/xmli18n-tmp.h:71 +#: src/main/xmli18n-tmp.h:72 msgid "B3 JIS" msgstr "B3 JIS" -#: src/main/xmli18n-tmp.h:72 +#: src/main/xmli18n-tmp.h:73 msgid "B4 JIS" msgstr "B4 JIS" -#: src/main/xmli18n-tmp.h:73 +#: src/main/xmli18n-tmp.h:74 msgid "B5 JIS" msgstr "B5 JIS" -#: src/main/xmli18n-tmp.h:74 +#: src/main/xmli18n-tmp.h:75 msgid "B6 JIS" msgstr "B6 JIS" -#: src/main/xmli18n-tmp.h:75 +#: src/main/xmli18n-tmp.h:76 msgid "B7 JIS" msgstr "B7 JIS" -#: src/main/xmli18n-tmp.h:76 +#: src/main/xmli18n-tmp.h:77 msgid "B8 JIS" msgstr "B8 JIS" -#: src/main/xmli18n-tmp.h:77 +#: src/main/xmli18n-tmp.h:78 msgid "B9 JIS" msgstr "B9 JIS" -#: src/main/xmli18n-tmp.h:78 +#: src/main/xmli18n-tmp.h:79 msgid "B10 JIS" msgstr "B10 JIS" -#: src/main/xmli18n-tmp.h:79 +#: src/main/xmli18n-tmp.h:80 msgid "C0" msgstr "C0" -#: src/main/xmli18n-tmp.h:80 +#: src/main/xmli18n-tmp.h:81 +#, fuzzy +msgid "C0 landscape" +msgstr "Liggande" + +#: src/main/xmli18n-tmp.h:82 msgid "C1" msgstr "C1" -#: src/main/xmli18n-tmp.h:81 +#: src/main/xmli18n-tmp.h:83 +#, fuzzy +msgid "C1 landscape" +msgstr "Liggande" + +#: src/main/xmli18n-tmp.h:84 msgid "C2" msgstr "C2" -#: src/main/xmli18n-tmp.h:82 +#: src/main/xmli18n-tmp.h:85 +#, fuzzy +msgid "C2 landscape" +msgstr "Liggande" + +#: src/main/xmli18n-tmp.h:86 msgid "C3" msgstr "C3" -#: src/main/xmli18n-tmp.h:83 +#: src/main/xmli18n-tmp.h:87 +#, fuzzy +msgid "C3 landscape" +msgstr "Liggande" + +#: src/main/xmli18n-tmp.h:88 msgid "C4" msgstr "C4" -#: src/main/xmli18n-tmp.h:84 +#: src/main/xmli18n-tmp.h:89 +#, fuzzy +msgid "C4 landscape" +msgstr "Liggande" + +#: src/main/xmli18n-tmp.h:90 msgid "C5" msgstr "C5" -#: src/main/xmli18n-tmp.h:85 +#: src/main/xmli18n-tmp.h:91 +#, fuzzy +msgid "C5 landscape" +msgstr "Liggande" + +#: src/main/xmli18n-tmp.h:92 msgid "B6-C4" msgstr "B6-C4" -#: src/main/xmli18n-tmp.h:86 +#: src/main/xmli18n-tmp.h:93 +#, fuzzy +msgid "B6-C4 landscape" +msgstr "Liggande" + +#: src/main/xmli18n-tmp.h:94 msgid "C6" msgstr "C6" -#: src/main/xmli18n-tmp.h:87 +#: src/main/xmli18n-tmp.h:95 +#, fuzzy +msgid "C6 landscape" +msgstr "Liggande" + +#: src/main/xmli18n-tmp.h:96 msgid "DL" msgstr "DL" -#: src/main/xmli18n-tmp.h:88 +#: src/main/xmli18n-tmp.h:97 +#, fuzzy +msgid "DL landscape" +msgstr "Liggande" + +#: src/main/xmli18n-tmp.h:98 msgid "C7-6" msgstr "C7-6" -#: src/main/xmli18n-tmp.h:89 +#: src/main/xmli18n-tmp.h:99 +#, fuzzy +msgid "C7-6 landscape" +msgstr "Liggande" + +#: src/main/xmli18n-tmp.h:100 msgid "C7" msgstr "C7" -#: src/main/xmli18n-tmp.h:90 +#: src/main/xmli18n-tmp.h:101 +#, fuzzy +msgid "C7 landscape" +msgstr "Liggande" + +#: src/main/xmli18n-tmp.h:102 msgid "C8" msgstr "C8" -#: src/main/xmli18n-tmp.h:91 +#: src/main/xmli18n-tmp.h:103 +#, fuzzy +msgid "C8 landscape" +msgstr "Liggande" + +#: src/main/xmli18n-tmp.h:104 msgid "C9" msgstr "C9" -#: src/main/xmli18n-tmp.h:92 +#: src/main/xmli18n-tmp.h:105 +#, fuzzy +msgid "C9 landscape" +msgstr "Liggande" + +#: src/main/xmli18n-tmp.h:106 msgid "C10" msgstr "C10" -#: src/main/xmli18n-tmp.h:93 +#: src/main/xmli18n-tmp.h:107 +#, fuzzy +msgid "C10 landscape" +msgstr "Liggande" + +#: src/main/xmli18n-tmp.h:108 msgid "ArchA" msgstr "ArchA" -#: src/main/xmli18n-tmp.h:94 +#: src/main/xmli18n-tmp.h:109 msgid "ArchA transposed" msgstr "" -#: src/main/xmli18n-tmp.h:95 +#: src/main/xmli18n-tmp.h:110 msgid "ArchB" msgstr "ArchB" -#: src/main/xmli18n-tmp.h:96 +#: src/main/xmli18n-tmp.h:111 msgid "ArchB transposed" msgstr "" -#: src/main/xmli18n-tmp.h:97 +#: src/main/xmli18n-tmp.h:112 msgid "ArchC" msgstr "ArchC" -#: src/main/xmli18n-tmp.h:98 +#: src/main/xmli18n-tmp.h:113 msgid "ArchC transposed" msgstr "" -#: src/main/xmli18n-tmp.h:99 +#: src/main/xmli18n-tmp.h:114 msgid "ArchD" msgstr "ArchD" -#: src/main/xmli18n-tmp.h:100 +#: src/main/xmli18n-tmp.h:115 msgid "ArchD transposed" msgstr "" -#: src/main/xmli18n-tmp.h:101 +#: src/main/xmli18n-tmp.h:116 msgid "ArchE" msgstr "ArchE" -#: src/main/xmli18n-tmp.h:102 +#: src/main/xmli18n-tmp.h:117 msgid "ArchE transposed" msgstr "" -#: src/main/xmli18n-tmp.h:103 +#: src/main/xmli18n-tmp.h:118 msgid "American foolscap" msgstr "Amerikansk folio" -#: src/main/xmli18n-tmp.h:104 +#: src/main/xmli18n-tmp.h:119 msgid "European foolscap" msgstr "Europeisk folio" -#: src/main/xmli18n-tmp.h:105 +#: src/main/xmli18n-tmp.h:120 msgid "Crown Quarto" msgstr "Crown Quarto" -#: src/main/xmli18n-tmp.h:106 +#: src/main/xmli18n-tmp.h:121 msgid "Large Crown Quarto" msgstr "Large crown quarto" # fÃ¥r plats -#: src/main/xmli18n-tmp.h:107 +#: src/main/xmli18n-tmp.h:122 msgid "Demy Quarto" msgstr "Demy quarto" -#: src/main/xmli18n-tmp.h:108 +#: src/main/xmli18n-tmp.h:123 msgid "Royal Quarto" msgstr "Royal quarto" -#: src/main/xmli18n-tmp.h:109 +#: src/main/xmli18n-tmp.h:124 msgid "ISO A4" msgstr "ISO A4" -#: src/main/xmli18n-tmp.h:110 +#: src/main/xmli18n-tmp.h:125 msgid "Crown Octavo" msgstr "Crown octavo" -#: src/main/xmli18n-tmp.h:111 +#: src/main/xmli18n-tmp.h:126 msgid "Large Crown Octavo" msgstr "Large crown octavo" -#: src/main/xmli18n-tmp.h:112 +#: src/main/xmli18n-tmp.h:127 msgid "Demy Octavo" msgstr "Demy octavo" -#: src/main/xmli18n-tmp.h:113 +#: src/main/xmli18n-tmp.h:128 msgid "Royal Octavo" msgstr "Royal octavo" -#: src/main/xmli18n-tmp.h:114 +#: src/main/xmli18n-tmp.h:129 msgid "ISO A5" msgstr "ISO A5" -#: src/main/xmli18n-tmp.h:115 +#: src/main/xmli18n-tmp.h:130 msgid "Small paperback" msgstr "Liten pocket" -#: src/main/xmli18n-tmp.h:116 +#: src/main/xmli18n-tmp.h:131 msgid "Penguin small paperback" msgstr "Liten pingvinpocket" -#: src/main/xmli18n-tmp.h:117 +#: src/main/xmli18n-tmp.h:132 msgid "Penguin large paperback" msgstr "Stor pingvinpocket" -#: src/main/xmli18n-tmp.h:118 +#: src/main/xmli18n-tmp.h:133 msgid "10cm x 15cm" msgstr "10cm x 15cm" -#: src/main/xmli18n-tmp.h:119 +#: src/main/xmli18n-tmp.h:134 msgid "Hagaki Card" msgstr "Hagaki-kort" -#: src/main/xmli18n-tmp.h:120 +#: src/main/xmli18n-tmp.h:135 msgid "Oufuku Card" msgstr "Oufuku-kort" -#: src/main/xmli18n-tmp.h:121 +#: src/main/xmli18n-tmp.h:136 msgid "Japanese long envelope #3" msgstr "Japanskt lÃ¥ngt kuvert 3" -#: src/main/xmli18n-tmp.h:122 +#: src/main/xmli18n-tmp.h:137 +#, fuzzy +msgid "Japanese long envelope #3 landscape" +msgstr "Japanskt lÃ¥ngt kuvert 3" + +#: src/main/xmli18n-tmp.h:138 msgid "Japanese long envelope #4" msgstr "Japanskt lÃ¥ngt kuvert 4" -#: src/main/xmli18n-tmp.h:123 +#: src/main/xmli18n-tmp.h:139 +#, fuzzy +msgid "Japanese long envelope #4 landscape" +msgstr "Japanskt lÃ¥ngt kuvert 4" + +#: src/main/xmli18n-tmp.h:140 msgid "Japanese Kaku envelope #4" msgstr "Japanskt Kaku-kuvert 4" -#: src/main/xmli18n-tmp.h:124 +#: src/main/xmli18n-tmp.h:141 +#, fuzzy +msgid "Japanese Kaku envelope #4 landscape" +msgstr "Japanskt Kaku-kuvert 4" + +#: src/main/xmli18n-tmp.h:142 msgid "Commercial 10" msgstr "Commercial 10" -#: src/main/xmli18n-tmp.h:125 +#: src/main/xmli18n-tmp.h:143 +#, fuzzy +msgid "Commercial 10 landscape" +msgstr "Commercial 10" + +#: src/main/xmli18n-tmp.h:144 msgid "A2 Invitation" msgstr "A2-inbjudan" -#: src/main/xmli18n-tmp.h:126 +#: src/main/xmli18n-tmp.h:145 msgid "Monarch Envelope" msgstr "Monarkkuvert" -#: src/main/xmli18n-tmp.h:127 +#: src/main/xmli18n-tmp.h:146 +#, fuzzy +msgid "Monarch Envelope landscape" +msgstr "Monarkkuvert" + +#: src/main/xmli18n-tmp.h:147 msgid "4x5 3/8" msgstr "4x5 3/8" -#: src/main/xmli18n-tmp.h:128 +#: src/main/xmli18n-tmp.h:148 msgid "4x7" msgstr "4x7" -#: src/main/xmli18n-tmp.h:129 +#: src/main/xmli18n-tmp.h:149 msgid "CP_L" msgstr "CP_L" -#: src/main/xmli18n-tmp.h:130 +#: src/main/xmli18n-tmp.h:150 msgid "Card" msgstr "Kort" -#: src/main/xmli18n-tmp.h:131 +#: src/main/xmli18n-tmp.h:151 msgid "Wide Postcard" msgstr "Brett vykort" -#: src/main/xmli18n-tmp.h:132 +#: src/main/xmli18n-tmp.h:152 msgid "Chilean Office" msgstr "" -#: src/main/xmli18n-tmp.h:133 +#: src/main/xmli18n-tmp.h:153 msgid "Chilean Double Letter" msgstr "" -#: src/main/xmli18n-tmp.h:134 +#: src/main/xmli18n-tmp.h:154 msgid "Chilean Double Office" msgstr "" -#: src/main/xmli18n-tmp.h:135 +#: src/main/xmli18n-tmp.h:155 msgid "Custom" msgstr "Anpassat" -#: src/main/xmli18n-tmp.h:136 +#: src/main/xmli18n-tmp.h:156 msgid "89 mm Roll Paper" msgstr "89 mm rullpapper" -#: src/main/xmli18n-tmp.h:137 +#: src/main/xmli18n-tmp.h:157 msgid "4 Inch Roll Paper" msgstr "4 tum rullpapper" -#: src/main/xmli18n-tmp.h:138 +#: src/main/xmli18n-tmp.h:158 msgid "5 Inch Roll Paper" msgstr "5 tum rullpapper" -#: src/main/xmli18n-tmp.h:139 +#: src/main/xmli18n-tmp.h:159 msgid "210 mm Roll Paper" msgstr "210 mm rullpapper" -#: src/main/xmli18n-tmp.h:140 +#: src/main/xmli18n-tmp.h:160 msgid "13 Inch Roll Paper" msgstr "13 tum rullpapper" -#: src/main/xmli18n-tmp.h:141 +#: src/main/xmli18n-tmp.h:161 msgid "22 Inch Roll Paper" msgstr "22 tum rullpapper" -#: src/main/xmli18n-tmp.h:142 +#: src/main/xmli18n-tmp.h:162 msgid "24 Inch Roll Paper" msgstr "24 tum rullpapper" -#: src/main/xmli18n-tmp.h:143 +#: src/main/xmli18n-tmp.h:163 msgid "36 Inch Roll Paper" msgstr "36 tum rullpapper" -#: src/main/xmli18n-tmp.h:144 +#: src/main/xmli18n-tmp.h:164 msgid "44 Inch Roll Paper" msgstr "44 tum rullpapper" -#: src/main/xmli18n-tmp.h:145 +#: src/main/xmli18n-tmp.h:165 msgid "PostScript Level 1" msgstr "PostScript nivÃ¥ 1" -#: src/main/xmli18n-tmp.h:146 +#: src/main/xmli18n-tmp.h:166 msgid "PostScript Level 2" msgstr "PostScript nivÃ¥ 2" -#: src/main/xmli18n-tmp.h:147 +#: src/main/xmli18n-tmp.h:167 msgid "Canon BJ-30" msgstr "Canon BJ-30" -#: src/main/xmli18n-tmp.h:148 +#: src/main/xmli18n-tmp.h:168 msgid "Canon BJC-50" msgstr "Canon BJC-50" -#: src/main/xmli18n-tmp.h:149 +#: src/main/xmli18n-tmp.h:169 msgid "Canon BJC-55" msgstr "Canon BJC-55" -#: src/main/xmli18n-tmp.h:150 +#: src/main/xmli18n-tmp.h:170 msgid "Canon BJC-80" msgstr "Canon BJC-80" -#: src/main/xmli18n-tmp.h:151 +#: src/main/xmli18n-tmp.h:171 msgid "Canon BJC-85" msgstr "Canon BJC-85" -#: src/main/xmli18n-tmp.h:152 +#: src/main/xmli18n-tmp.h:172 msgid "Canon BJC-210" msgstr "Canon BJC-210" -#: src/main/xmli18n-tmp.h:153 +#: src/main/xmli18n-tmp.h:173 msgid "Canon BJC-240" msgstr "Canon BJC-240" -#: src/main/xmli18n-tmp.h:154 +#: src/main/xmli18n-tmp.h:174 msgid "Canon BJC-250" msgstr "Canon BJC-250" -#: src/main/xmli18n-tmp.h:155 +#: src/main/xmli18n-tmp.h:175 msgid "Canon BJC-1000" msgstr "Canon BJC-1000" -#: src/main/xmli18n-tmp.h:156 +#: src/main/xmli18n-tmp.h:176 msgid "Canon BJC-2000" msgstr "Canon BJC-2000" -#: src/main/xmli18n-tmp.h:157 +#: src/main/xmli18n-tmp.h:177 msgid "Canon BJC-2010" msgstr "Canon BJC-2010" -#: src/main/xmli18n-tmp.h:158 +#: src/main/xmli18n-tmp.h:178 msgid "Canon BJC-2100" msgstr "Canon BJC-2100" -#: src/main/xmli18n-tmp.h:159 +#: src/main/xmli18n-tmp.h:179 msgid "Canon BJC-2110" msgstr "Canon BJC-2110" -#: src/main/xmli18n-tmp.h:160 +#: src/main/xmli18n-tmp.h:180 msgid "Canon BJC-3000" msgstr "Canon BJC-3000" -#: src/main/xmli18n-tmp.h:161 +#: src/main/xmli18n-tmp.h:181 msgid "Canon BJC-4000" msgstr "Canon BJC-4000" -#: src/main/xmli18n-tmp.h:162 +#: src/main/xmli18n-tmp.h:182 msgid "Canon BJC-4300" msgstr "Canon BJC-4300" -#: src/main/xmli18n-tmp.h:163 +#: src/main/xmli18n-tmp.h:183 msgid "Canon BJC-4400" msgstr "Canon BJC-4400" -#: src/main/xmli18n-tmp.h:164 +#: src/main/xmli18n-tmp.h:184 #, fuzzy msgid "Canon BJC-5100" msgstr "Canon BJC-1000" -#: src/main/xmli18n-tmp.h:165 +#: src/main/xmli18n-tmp.h:185 #, fuzzy msgid "Canon BJC-5500" msgstr "Canon BJC-6500" -#: src/main/xmli18n-tmp.h:166 +#: src/main/xmli18n-tmp.h:186 msgid "Canon BJC-6000" msgstr "Canon BJC-6000" -#: src/main/xmli18n-tmp.h:167 +#: src/main/xmli18n-tmp.h:187 msgid "Canon BJC-6100" msgstr "Canon BJC-6100" -#: src/main/xmli18n-tmp.h:168 +#: src/main/xmli18n-tmp.h:188 msgid "Canon BJC-6200" msgstr "Canon BJC-6200" -#: src/main/xmli18n-tmp.h:169 +#: src/main/xmli18n-tmp.h:189 msgid "Canon BJC-6500" msgstr "Canon BJC-6500" -#: src/main/xmli18n-tmp.h:170 +#: src/main/xmli18n-tmp.h:190 msgid "Canon BJC-7000" msgstr "Canon BJC-7000" -#: src/main/xmli18n-tmp.h:171 +#: src/main/xmli18n-tmp.h:191 msgid "Canon BJC-7100" msgstr "Canon BJC-7100" -#: src/main/xmli18n-tmp.h:172 +#: src/main/xmli18n-tmp.h:192 msgid "Canon BJC-8200" msgstr "Canon BJC-8200" -#: src/main/xmli18n-tmp.h:173 +#: src/main/xmli18n-tmp.h:193 #, fuzzy msgid "Canon BJC-8500" msgstr "Canon BJC-6500" -#: src/main/xmli18n-tmp.h:174 +#: src/main/xmli18n-tmp.h:194 msgid "Canon S100" msgstr "Canon S100" -#: src/main/xmli18n-tmp.h:175 +#: src/main/xmli18n-tmp.h:195 msgid "Canon S200" msgstr "Canon S200" -#: src/main/xmli18n-tmp.h:176 +#: src/main/xmli18n-tmp.h:196 msgid "Canon S300" msgstr "Canon S300" -#: src/main/xmli18n-tmp.h:177 +#: src/main/xmli18n-tmp.h:197 msgid "Canon S400" msgstr "Canon S400" -#: src/main/xmli18n-tmp.h:178 +#: src/main/xmli18n-tmp.h:198 msgid "Canon S450" msgstr "Canon S450" -#: src/main/xmli18n-tmp.h:179 +#: src/main/xmli18n-tmp.h:199 msgid "Canon S500" msgstr "Canon S500" -#: src/main/xmli18n-tmp.h:180 +#: src/main/xmli18n-tmp.h:200 msgid "Canon S600" msgstr "Canon S600" -#: src/main/xmli18n-tmp.h:181 +#: src/main/xmli18n-tmp.h:201 msgid "Canon S630" msgstr "Canon S630" -#: src/main/xmli18n-tmp.h:182 +#: src/main/xmli18n-tmp.h:202 msgid "Canon S800" msgstr "Canon S800" -#: src/main/xmli18n-tmp.h:183 +#: src/main/xmli18n-tmp.h:203 msgid "Canon S4500" msgstr "Canon S4500" -#: src/main/xmli18n-tmp.h:184 +#: src/main/xmli18n-tmp.h:204 #, fuzzy msgid "Canon PIXMA iP2000" msgstr "Canon iP4000" -#: src/main/xmli18n-tmp.h:185 +#: src/main/xmli18n-tmp.h:205 #, fuzzy msgid "Canon PIXMA iP3000" msgstr "Canon iP4000" -#: src/main/xmli18n-tmp.h:186 +#: src/main/xmli18n-tmp.h:206 #, fuzzy msgid "Canon PIXMA iP3100" -msgstr "Canon CP-300" +msgstr "Canon iP4000" -#: src/main/xmli18n-tmp.h:187 +#: src/main/xmli18n-tmp.h:207 #, fuzzy msgid "Canon PIXMA iP4000" msgstr "Canon iP4000" -#: src/main/xmli18n-tmp.h:188 +#: src/main/xmli18n-tmp.h:208 #, fuzzy msgid "Canon PIXMA iP4100" msgstr "Canon iP4000" -#: src/main/xmli18n-tmp.h:189 +#: src/main/xmli18n-tmp.h:209 #, fuzzy msgid "Canon PIXMA iP4200" msgstr "Canon iP4000" -#: src/main/xmli18n-tmp.h:190 +#: src/main/xmli18n-tmp.h:210 #, fuzzy msgid "Canon PIXMA iP4300" msgstr "Canon iP4000" -#: src/main/xmli18n-tmp.h:191 +#: src/main/xmli18n-tmp.h:211 #, fuzzy msgid "Canon PIXMA iP4500" msgstr "Canon iP4000" -#: src/main/xmli18n-tmp.h:192 +#: src/main/xmli18n-tmp.h:212 #, fuzzy msgid "Canon PIXMA iP5000" msgstr "Canon iP4000" -#: src/main/xmli18n-tmp.h:193 +#: src/main/xmli18n-tmp.h:213 #, fuzzy msgid "Canon PIXMA iP5200" -msgstr "Canon CP-200" +msgstr "Canon iP4000" -#: src/main/xmli18n-tmp.h:194 +#: src/main/xmli18n-tmp.h:214 #, fuzzy msgid "Canon PIXMA iP5300" msgstr "Canon iP4000" -#: src/main/xmli18n-tmp.h:195 +#: src/main/xmli18n-tmp.h:215 +#, fuzzy +msgid "Canon PIXMA iP6000D" +msgstr "Canon iP4000" + +#: src/main/xmli18n-tmp.h:216 #, fuzzy msgid "Canon PIXMA iP6700" msgstr "Canon iP4000" -#: src/main/xmli18n-tmp.h:196 +#: src/main/xmli18n-tmp.h:217 #, fuzzy msgid "Canon PIXMA iP8500" msgstr "Canon iP4000" -#: src/main/xmli18n-tmp.h:197 +#: src/main/xmli18n-tmp.h:218 #, fuzzy msgid "Canon PIXMA iX5000" msgstr "Canon iP4000" -#: src/main/xmli18n-tmp.h:198 +#: src/main/xmli18n-tmp.h:219 #, fuzzy msgid "Canon PIXMA Pro9500" -msgstr "Canon iP4000" +msgstr "Canon S500" -#: src/main/xmli18n-tmp.h:199 +#: src/main/xmli18n-tmp.h:220 #, fuzzy msgid "Canon PIXMA MP150" -msgstr "Canon CP-300" +msgstr "Canon GP 335" -#: src/main/xmli18n-tmp.h:200 +#: src/main/xmli18n-tmp.h:221 #, fuzzy msgid "Canon PIXMA MP170" -msgstr "Canon CP-300" +msgstr "Canon LBP-1760" -#: src/main/xmli18n-tmp.h:201 +#: src/main/xmli18n-tmp.h:222 #, fuzzy msgid "Canon PIXMA MP180" -msgstr "Canon CP-300" +msgstr "Canon CP-100" -#: src/main/xmli18n-tmp.h:202 +#: src/main/xmli18n-tmp.h:223 #, fuzzy msgid "Canon PIXMA MP500" -msgstr "Canon iP4000" +msgstr "Canon S500" -#: src/main/xmli18n-tmp.h:203 +#: src/main/xmli18n-tmp.h:224 +#, fuzzy +msgid "Canon PIXMA MP520" +msgstr "Canon GP 335" + +#: src/main/xmli18n-tmp.h:225 #, fuzzy msgid "Canon PIXMA MP610" -msgstr "Canon CP-300" +msgstr "Canon CP-100" -#: src/main/xmli18n-tmp.h:204 +#: src/main/xmli18n-tmp.h:226 #, fuzzy msgid "Canon PIXMA MP700" msgstr "Canon iP4000" -#: src/main/xmli18n-tmp.h:205 +#: src/main/xmli18n-tmp.h:227 #, fuzzy msgid "Canon PIXMA MP710" -msgstr "Canon CP-300" +msgstr "Canon CP-100" -#: src/main/xmli18n-tmp.h:206 +#: src/main/xmli18n-tmp.h:228 #, fuzzy msgid "Canon PIXMA MP730" -msgstr "Canon iP4000" +msgstr "Canon GP 335" -#: src/main/xmli18n-tmp.h:207 +#: src/main/xmli18n-tmp.h:229 #, fuzzy msgid "Canon PIXMA MP740" msgstr "Canon iP4000" -#: src/main/xmli18n-tmp.h:208 +#: src/main/xmli18n-tmp.h:230 #, fuzzy msgid "Canon PIXMA MP750" -msgstr "Canon iP4000" +msgstr "Canon GP 335" -#: src/main/xmli18n-tmp.h:209 +#: src/main/xmli18n-tmp.h:231 #, fuzzy msgid "Canon PIXMA MP760" -msgstr "Canon iP4000" +msgstr "Canon LBP-1760" -#: src/main/xmli18n-tmp.h:210 +#: src/main/xmli18n-tmp.h:232 #, fuzzy msgid "Canon PIXMA MP770" -msgstr "Canon iP4000" +msgstr "Epson PM 770C" -#: src/main/xmli18n-tmp.h:211 +#: src/main/xmli18n-tmp.h:233 #, fuzzy msgid "Canon PIXMA MP780" -msgstr "Canon iP4000" +msgstr "Epson PM 780C" -#: src/main/xmli18n-tmp.h:212 -#, fuzzy +#: src/main/xmli18n-tmp.h:234 msgid "Canon PIXMA MP790" -msgstr "Canon iP4000" +msgstr "" -#: src/main/xmli18n-tmp.h:213 +#: src/main/xmli18n-tmp.h:235 #, fuzzy msgid "Canon PIXMA MP830" -msgstr "Canon iP4000" +msgstr "Canon GP 335" -#: src/main/xmli18n-tmp.h:214 +#: src/main/xmli18n-tmp.h:236 #, fuzzy msgid "Canon PIXUS iP3100" msgstr "Canon S100" -#: src/main/xmli18n-tmp.h:215 +#: src/main/xmli18n-tmp.h:237 #, fuzzy msgid "Canon PIXUS iP4100" msgstr "Canon iP4000" -#: src/main/xmli18n-tmp.h:216 +#: src/main/xmli18n-tmp.h:238 #, fuzzy msgid "Canon i80" -msgstr "Canon S450" +msgstr "Canon S800" -#: src/main/xmli18n-tmp.h:217 +#: src/main/xmli18n-tmp.h:239 #, fuzzy msgid "Canon i560" msgstr "Canon S450" -#: src/main/xmli18n-tmp.h:218 +#: src/main/xmli18n-tmp.h:240 #, fuzzy msgid "Canon i850" msgstr "Canon S450" -#: src/main/xmli18n-tmp.h:219 +#: src/main/xmli18n-tmp.h:241 #, fuzzy msgid "Canon i860" msgstr "Canon S600" -#: src/main/xmli18n-tmp.h:220 +#: src/main/xmli18n-tmp.h:242 #, fuzzy msgid "Canon i865" msgstr "Canon BJC-85" -#: src/main/xmli18n-tmp.h:221 +#: src/main/xmli18n-tmp.h:243 msgid "Epson Stylus C20" msgstr "Epson Stylus C20" -#: src/main/xmli18n-tmp.h:222 +#: src/main/xmli18n-tmp.h:244 msgid "Epson Stylus C20SX" msgstr "Epson Stylus C20SX" -#: src/main/xmli18n-tmp.h:223 +#: src/main/xmli18n-tmp.h:245 msgid "Epson Stylus C20UX" msgstr "Epson Stylus C20UX" -#: src/main/xmli18n-tmp.h:224 +#: src/main/xmli18n-tmp.h:246 msgid "Epson Stylus C40" msgstr "Epson Stylus C40" -#: src/main/xmli18n-tmp.h:225 +#: src/main/xmli18n-tmp.h:247 msgid "Epson Stylus C40SX" msgstr "Epson Stylus C40SX" -#: src/main/xmli18n-tmp.h:226 +#: src/main/xmli18n-tmp.h:248 msgid "Epson Stylus C40UX" msgstr "Epson Stylus C40UX" -#: src/main/xmli18n-tmp.h:227 +#: src/main/xmli18n-tmp.h:249 msgid "Epson Stylus C41" msgstr "Epson Stylus C41" -#: src/main/xmli18n-tmp.h:228 +#: src/main/xmli18n-tmp.h:250 msgid "Epson Stylus C41SX" msgstr "Epson Stylus C41SX" -#: src/main/xmli18n-tmp.h:229 +#: src/main/xmli18n-tmp.h:251 msgid "Epson Stylus C41UX" msgstr "Epson Stylus C41UX" -#: src/main/xmli18n-tmp.h:230 +#: src/main/xmli18n-tmp.h:252 msgid "Epson Stylus C42" msgstr "Epson Stylus C42" -#: src/main/xmli18n-tmp.h:231 +#: src/main/xmli18n-tmp.h:253 msgid "Epson Stylus C42SX" msgstr "Epson Stylus C42SX" -#: src/main/xmli18n-tmp.h:232 +#: src/main/xmli18n-tmp.h:254 msgid "Epson Stylus C42UX" msgstr "Epson Stylus C42UX" -#: src/main/xmli18n-tmp.h:233 +#: src/main/xmli18n-tmp.h:255 msgid "Epson Stylus C43" msgstr "Epson Stylus C43" -#: src/main/xmli18n-tmp.h:234 +#: src/main/xmli18n-tmp.h:256 msgid "Epson Stylus C43SX" msgstr "Epson Stylus C43SX" -#: src/main/xmli18n-tmp.h:235 +#: src/main/xmli18n-tmp.h:257 msgid "Epson Stylus C43UX" msgstr "Epson Stylus C43UX" -#: src/main/xmli18n-tmp.h:236 +#: src/main/xmli18n-tmp.h:258 msgid "Epson Stylus C44" msgstr "Epson Stylus C44" -#: src/main/xmli18n-tmp.h:237 +#: src/main/xmli18n-tmp.h:259 msgid "Epson Stylus C44SX" msgstr "Epson Stylus C44SX" -#: src/main/xmli18n-tmp.h:238 +#: src/main/xmli18n-tmp.h:260 msgid "Epson Stylus C44UX" msgstr "Epson Stylus C44UX" -#: src/main/xmli18n-tmp.h:239 +#: src/main/xmli18n-tmp.h:261 msgid "Epson Stylus C45" msgstr "Epson Stylus C45" -#: src/main/xmli18n-tmp.h:240 +#: src/main/xmli18n-tmp.h:262 msgid "Epson Stylus C46" msgstr "Epson Stylus C46" -#: src/main/xmli18n-tmp.h:241 +#: src/main/xmli18n-tmp.h:263 msgid "Epson Stylus C48" msgstr "Epson Stylus C48" -#: src/main/xmli18n-tmp.h:242 +#: src/main/xmli18n-tmp.h:264 msgid "Epson Stylus C50" msgstr "Epson Stylus C50" -#: src/main/xmli18n-tmp.h:243 +#: src/main/xmli18n-tmp.h:265 msgid "Epson Stylus C60" msgstr "Epson Stylus C60" -#: src/main/xmli18n-tmp.h:244 +#: src/main/xmli18n-tmp.h:266 msgid "Epson Stylus C61" msgstr "Epson Stylus C61" -#: src/main/xmli18n-tmp.h:245 +#: src/main/xmli18n-tmp.h:267 msgid "Epson Stylus C62" msgstr "Epson Stylus C62" -#: src/main/xmli18n-tmp.h:246 +#: src/main/xmli18n-tmp.h:268 msgid "Epson Stylus C63" msgstr "Epson Stylus C63" -#: src/main/xmli18n-tmp.h:247 +#: src/main/xmli18n-tmp.h:269 msgid "Epson Stylus C64" msgstr "Epson Stylus C64" -#: src/main/xmli18n-tmp.h:248 +#: src/main/xmli18n-tmp.h:270 msgid "Epson Stylus C65" msgstr "Epson Stylus C65" -#: src/main/xmli18n-tmp.h:249 +#: src/main/xmli18n-tmp.h:271 msgid "Epson Stylus C66" msgstr "Epson Stylus C66" -#: src/main/xmli18n-tmp.h:250 +#: src/main/xmli18n-tmp.h:272 msgid "Epson Stylus C68" msgstr "Epson Stylus C68" -#: src/main/xmli18n-tmp.h:251 +#: src/main/xmli18n-tmp.h:273 msgid "Epson Stylus C70" msgstr "Epson Stylus C70" -#: src/main/xmli18n-tmp.h:252 +#: src/main/xmli18n-tmp.h:274 #, fuzzy msgid "Epson Stylus C79" msgstr "Epson Stylus C70" -#: src/main/xmli18n-tmp.h:253 +#: src/main/xmli18n-tmp.h:275 msgid "Epson Stylus C80" msgstr "Epson Stylus C80" -#: src/main/xmli18n-tmp.h:254 +#: src/main/xmli18n-tmp.h:276 msgid "Epson Stylus C82" msgstr "Epson Stylus C82" -#: src/main/xmli18n-tmp.h:255 +#: src/main/xmli18n-tmp.h:277 msgid "Epson Stylus C83" msgstr "Epson Stylus C83" -#: src/main/xmli18n-tmp.h:256 +#: src/main/xmli18n-tmp.h:278 msgid "Epson Stylus C84" msgstr "Epson Stylus C84" -#: src/main/xmli18n-tmp.h:257 +#: src/main/xmli18n-tmp.h:279 msgid "Epson Stylus C85" msgstr "Epson Stylus C85" -#: src/main/xmli18n-tmp.h:258 +#: src/main/xmli18n-tmp.h:280 msgid "Epson Stylus C86" msgstr "Epson Stylus C86" -#: src/main/xmli18n-tmp.h:259 +#: src/main/xmli18n-tmp.h:281 #, fuzzy msgid "Epson Stylus C87" msgstr "Epson Stylus C48" -#: src/main/xmli18n-tmp.h:260 +#: src/main/xmli18n-tmp.h:282 msgid "Epson Stylus C88" msgstr "Epson Stylus C88" -#: src/main/xmli18n-tmp.h:261 +#: src/main/xmli18n-tmp.h:283 #, fuzzy msgid "Epson Stylus C110" msgstr "Epson Stylus C20" -#: src/main/xmli18n-tmp.h:262 +#: src/main/xmli18n-tmp.h:284 #, fuzzy msgid "Epson Stylus C120" msgstr "Epson Stylus C20" -#: src/main/xmli18n-tmp.h:263 +#: src/main/xmli18n-tmp.h:285 msgid "Epson Stylus Color" msgstr "Epson Stylus Color" -#: src/main/xmli18n-tmp.h:264 +#: src/main/xmli18n-tmp.h:286 msgid "Epson Stylus Color I" msgstr "Epson Stylus Color I" -#: src/main/xmli18n-tmp.h:265 +#: src/main/xmli18n-tmp.h:287 msgid "Epson Stylus Color II" msgstr "Epson Stylus Color II" -#: src/main/xmli18n-tmp.h:266 +#: src/main/xmli18n-tmp.h:288 msgid "Epson Stylus Color IIs" msgstr "Epson Stylus Color IIs" -#: src/main/xmli18n-tmp.h:267 +#: src/main/xmli18n-tmp.h:289 msgid "Epson Stylus Color PRO" msgstr "Epson Stylus Color PRO" -#: src/main/xmli18n-tmp.h:268 +#: src/main/xmli18n-tmp.h:290 msgid "Epson Stylus Pro XL" msgstr "Epson Stylus Pro XL" -#: src/main/xmli18n-tmp.h:269 +#: src/main/xmli18n-tmp.h:291 msgid "Epson Stylus Color 400" msgstr "Epson Stylus Color 400" -#: src/main/xmli18n-tmp.h:270 +#: src/main/xmli18n-tmp.h:292 msgid "Epson Stylus Color 440" msgstr "Epson Stylus Color 440" -#: src/main/xmli18n-tmp.h:271 +#: src/main/xmli18n-tmp.h:293 msgid "Epson Stylus Color 460" msgstr "Epson Stylus Color 460" -#: src/main/xmli18n-tmp.h:272 +#: src/main/xmli18n-tmp.h:294 msgid "Epson Stylus Color 480" msgstr "Epson Stylus Color 480" -#: src/main/xmli18n-tmp.h:273 +#: src/main/xmli18n-tmp.h:295 msgid "Epson Stylus Color 500" msgstr "Epson Stylus Color 500" -#: src/main/xmli18n-tmp.h:274 +#: src/main/xmli18n-tmp.h:296 msgid "Epson Stylus Color 580" msgstr "Epson Stylus Color 580" -#: src/main/xmli18n-tmp.h:275 +#: src/main/xmli18n-tmp.h:297 msgid "Epson Stylus Color 600" msgstr "Epson Stylus Color 600" -#: src/main/xmli18n-tmp.h:276 +#: src/main/xmli18n-tmp.h:298 msgid "Epson Stylus Color 640" msgstr "Epson Stylus Color 640" -#: src/main/xmli18n-tmp.h:277 +#: src/main/xmli18n-tmp.h:299 msgid "Epson Stylus Color 660" msgstr "Epson Stylus Color 660" -#: src/main/xmli18n-tmp.h:278 +#: src/main/xmli18n-tmp.h:300 msgid "Epson Stylus Color 670" msgstr "Epson Stylus Color 670" -#: src/main/xmli18n-tmp.h:279 +#: src/main/xmli18n-tmp.h:301 msgid "Epson Stylus Color 680" msgstr "Epson Stylus Color 680" -#: src/main/xmli18n-tmp.h:280 +#: src/main/xmli18n-tmp.h:302 msgid "Epson Stylus Color 740" msgstr "Epson Stylus Color 740" -#: src/main/xmli18n-tmp.h:281 +#: src/main/xmli18n-tmp.h:303 msgid "Epson Stylus Color 760" msgstr "Epson Stylus Color 760" -#: src/main/xmli18n-tmp.h:282 +#: src/main/xmli18n-tmp.h:304 msgid "Epson Stylus Color 777" msgstr "Epson Stylus Color 777" -#: src/main/xmli18n-tmp.h:283 +#: src/main/xmli18n-tmp.h:305 msgid "Epson Stylus Color 800" msgstr "Epson Stylus Color 800" -#: src/main/xmli18n-tmp.h:284 +#: src/main/xmli18n-tmp.h:306 msgid "Epson Stylus Color 850" msgstr "Epson Stylus Color 850" -#: src/main/xmli18n-tmp.h:285 +#: src/main/xmli18n-tmp.h:307 msgid "Epson Stylus Color 860" msgstr "Epson Stylus Color 860" -#: src/main/xmli18n-tmp.h:286 +#: src/main/xmli18n-tmp.h:308 msgid "Epson Stylus Color 880" msgstr "Epson Stylus Color 880" -#: src/main/xmli18n-tmp.h:287 +#: src/main/xmli18n-tmp.h:309 msgid "Epson Stylus Color 8 3" msgstr "Epson Stylus Color 8 3" -#: src/main/xmli18n-tmp.h:288 +#: src/main/xmli18n-tmp.h:310 msgid "Epson Stylus Color 900" msgstr "Epson Stylus Color 900" -#: src/main/xmli18n-tmp.h:289 +#: src/main/xmli18n-tmp.h:311 msgid "Epson Stylus Color 980" msgstr "Epson Stylus Color 980" -#: src/main/xmli18n-tmp.h:290 +#: src/main/xmli18n-tmp.h:312 msgid "Epson Stylus Color 1160" msgstr "Epson Stylus Color 1160" -#: src/main/xmli18n-tmp.h:291 +#: src/main/xmli18n-tmp.h:313 msgid "Epson Stylus Color 1500" msgstr "Epson Stylus Color 1500" -#: src/main/xmli18n-tmp.h:292 +#: src/main/xmli18n-tmp.h:314 msgid "Epson Stylus Color 1520" msgstr "Epson Stylus Color 1520" -#: src/main/xmli18n-tmp.h:293 +#: src/main/xmli18n-tmp.h:315 msgid "Epson Stylus Color 3000" msgstr "Epson Stylus Color 3000" -#: src/main/xmli18n-tmp.h:294 +#: src/main/xmli18n-tmp.h:316 msgid "Epson Stylus Photo" msgstr "Epson Stylus Photo" -#: src/main/xmli18n-tmp.h:295 +#: src/main/xmli18n-tmp.h:317 msgid "Epson Stylus Photo 700" msgstr "Epson Stylus Photo 700" -#: src/main/xmli18n-tmp.h:296 +#: src/main/xmli18n-tmp.h:318 msgid "Epson Stylus Photo EX" msgstr "Epson Stylus Photo EX" -#: src/main/xmli18n-tmp.h:297 +#: src/main/xmli18n-tmp.h:319 msgid "Epson Stylus Photo EX3" msgstr "Epson Stylus Photo EX3" -#: src/main/xmli18n-tmp.h:298 +#: src/main/xmli18n-tmp.h:320 msgid "Epson Stylus Photo 720" msgstr "Epson Stylus Photo 720" -#: src/main/xmli18n-tmp.h:299 +#: src/main/xmli18n-tmp.h:321 msgid "Epson Stylus Photo 750" msgstr "Epson Stylus Photo 750" -#: src/main/xmli18n-tmp.h:300 +#: src/main/xmli18n-tmp.h:322 msgid "Epson Stylus Photo 780" msgstr "Epson Stylus Photo 780" -#: src/main/xmli18n-tmp.h:301 +#: src/main/xmli18n-tmp.h:323 msgid "Epson Stylus Photo 785" msgstr "Epson Stylus Photo 785" -#: src/main/xmli18n-tmp.h:302 +#: src/main/xmli18n-tmp.h:324 msgid "Epson Stylus Photo 790" msgstr "Epson Stylus Photo 790" -#: src/main/xmli18n-tmp.h:303 +#: src/main/xmli18n-tmp.h:325 msgid "Epson Stylus Photo 810" msgstr "Epson Stylus Photo 810" -#: src/main/xmli18n-tmp.h:304 +#: src/main/xmli18n-tmp.h:326 msgid "Epson Stylus Photo 820" msgstr "Epson Stylus Photo 820" -#: src/main/xmli18n-tmp.h:305 +#: src/main/xmli18n-tmp.h:327 msgid "Epson Stylus Photo 825" msgstr "Epson Stylus Photo 825" -#: src/main/xmli18n-tmp.h:306 +#: src/main/xmli18n-tmp.h:328 msgid "Epson Stylus Photo 830" msgstr "Epson Stylus Photo 830" -#: src/main/xmli18n-tmp.h:307 +#: src/main/xmli18n-tmp.h:329 msgid "Epson Stylus Photo 830U" msgstr "Epson Stylus Photo 830U" -#: src/main/xmli18n-tmp.h:308 +#: src/main/xmli18n-tmp.h:330 msgid "Epson Stylus Photo 870" msgstr "Epson Stylus Photo 870" -#: src/main/xmli18n-tmp.h:309 +#: src/main/xmli18n-tmp.h:331 msgid "Epson Stylus Photo 875" msgstr "Epson Stylus Photo 875" -#: src/main/xmli18n-tmp.h:310 +#: src/main/xmli18n-tmp.h:332 msgid "Epson Stylus Photo 890" msgstr "Epson Stylus Photo 890" -#: src/main/xmli18n-tmp.h:311 +#: src/main/xmli18n-tmp.h:333 msgid "Epson Stylus Photo 895" msgstr "Epson Stylus Photo 895" -#: src/main/xmli18n-tmp.h:312 +#: src/main/xmli18n-tmp.h:334 msgid "Epson Stylus Photo 900" msgstr "Epson Stylus Photo 900" -#: src/main/xmli18n-tmp.h:313 +#: src/main/xmli18n-tmp.h:335 msgid "Epson Stylus Photo 915" msgstr "Epson Stylus Photo 915" -#: src/main/xmli18n-tmp.h:314 +#: src/main/xmli18n-tmp.h:336 msgid "Epson Stylus Photo 925" msgstr "Epson Stylus Photo 925" -#: src/main/xmli18n-tmp.h:315 +#: src/main/xmli18n-tmp.h:337 msgid "Epson Stylus Photo 935" msgstr "Epson Stylus Photo 935" -#: src/main/xmli18n-tmp.h:316 +#: src/main/xmli18n-tmp.h:338 msgid "Epson Stylus Photo 950" msgstr "Epson Stylus Photo 950" -#: src/main/xmli18n-tmp.h:317 +#: src/main/xmli18n-tmp.h:339 msgid "Epson Stylus Photo 960" msgstr "Epson Stylus Photo 960" -#: src/main/xmli18n-tmp.h:318 +#: src/main/xmli18n-tmp.h:340 msgid "Epson Stylus Photo 1200" msgstr "Epson Stylus Photo 1200" -#: src/main/xmli18n-tmp.h:319 +#: src/main/xmli18n-tmp.h:341 msgid "Epson Stylus Photo 1270" msgstr "Epson Stylus Photo 1270" -#: src/main/xmli18n-tmp.h:320 +#: src/main/xmli18n-tmp.h:342 msgid "Epson Stylus Photo 1280" msgstr "Epson Stylus Photo 1280" -#: src/main/xmli18n-tmp.h:321 +#: src/main/xmli18n-tmp.h:343 msgid "Epson Stylus Photo 1290" msgstr "Epson Stylus Photo 1290" -#: src/main/xmli18n-tmp.h:322 +#: src/main/xmli18n-tmp.h:344 #, fuzzy msgid "Epson Stylus Photo 1400" msgstr "Epson Stylus Photo 1200" -#: src/main/xmli18n-tmp.h:323 +#: src/main/xmli18n-tmp.h:345 #, fuzzy msgid "Epson Stylus Photo 1410" msgstr "Epson Stylus Photo 810" -#: src/main/xmli18n-tmp.h:324 +#: src/main/xmli18n-tmp.h:346 msgid "Epson Stylus Photo 2000P" msgstr "Epson Stylus Photo 2000P" -#: src/main/xmli18n-tmp.h:325 +#: src/main/xmli18n-tmp.h:347 msgid "Epson Stylus Photo 2100" msgstr "Epson Stylus Photo 2100" -#: src/main/xmli18n-tmp.h:326 +#: src/main/xmli18n-tmp.h:348 msgid "Epson Stylus Photo 2200" msgstr "Epson Stylus Photo 2200" -#: src/main/xmli18n-tmp.h:327 +#: src/main/xmli18n-tmp.h:349 msgid "Epson Stylus Photo R200" msgstr "Epson Stylus Photo R200" -#: src/main/xmli18n-tmp.h:328 +#: src/main/xmli18n-tmp.h:350 msgid "Epson Stylus Photo R210" msgstr "Epson Stylus Photo R210" -#: src/main/xmli18n-tmp.h:329 +#: src/main/xmli18n-tmp.h:351 msgid "Epson Stylus Photo R220" msgstr "Epson Stylus Photo R220" -#: src/main/xmli18n-tmp.h:330 +#: src/main/xmli18n-tmp.h:352 #, fuzzy msgid "Epson Stylus Photo R230" msgstr "Epson Stylus Photo R200" -#: src/main/xmli18n-tmp.h:331 +#: src/main/xmli18n-tmp.h:353 #, fuzzy msgid "Epson Stylus Photo R240" msgstr "Epson Stylus Photo R2400" -#: src/main/xmli18n-tmp.h:332 +#: src/main/xmli18n-tmp.h:354 #, fuzzy msgid "Epson Stylus Photo R245" msgstr "Epson Stylus Photo RX425" -#: src/main/xmli18n-tmp.h:333 +#: src/main/xmli18n-tmp.h:355 #, fuzzy msgid "Epson Stylus Photo R260" msgstr "Epson Stylus Photo R200" -#: src/main/xmli18n-tmp.h:334 +#: src/main/xmli18n-tmp.h:356 #, fuzzy msgid "Epson Stylus Photo R265" msgstr "Epson Stylus Photo RX425" -#: src/main/xmli18n-tmp.h:335 +#: src/main/xmli18n-tmp.h:357 #, fuzzy msgid "Epson Stylus Photo R270" msgstr "Epson Stylus Photo 1270" -#: src/main/xmli18n-tmp.h:336 +#: src/main/xmli18n-tmp.h:358 +#, fuzzy +msgid "Epson Stylus Photo R280" +msgstr "Epson Stylus Photo 1280" + +#: src/main/xmli18n-tmp.h:359 +#, fuzzy +msgid "Epson Stylus Photo R285" +msgstr "Epson Stylus Photo RX425" + +#: src/main/xmli18n-tmp.h:360 msgid "Epson Stylus Photo R300" msgstr "Epson Stylus Photo R300" -#: src/main/xmli18n-tmp.h:337 +#: src/main/xmli18n-tmp.h:361 msgid "Epson Stylus Photo R310" msgstr "Epson Stylus Photo R310" -#: src/main/xmli18n-tmp.h:338 +#: src/main/xmli18n-tmp.h:362 msgid "Epson Stylus Photo R320" msgstr "Epson Stylus Photo R320" -#: src/main/xmli18n-tmp.h:339 +#: src/main/xmli18n-tmp.h:363 msgid "Epson Stylus Photo R340" msgstr "Epson Stylus Photo R340" -#: src/main/xmli18n-tmp.h:340 +#: src/main/xmli18n-tmp.h:364 #, fuzzy msgid "Epson Stylus Photo R350" msgstr "Epson Stylus Photo R300" -#: src/main/xmli18n-tmp.h:341 +#: src/main/xmli18n-tmp.h:365 #, fuzzy msgid "Epson Stylus Photo R360" msgstr "Epson Stylus Photo R300" -#: src/main/xmli18n-tmp.h:342 +#: src/main/xmli18n-tmp.h:366 #, fuzzy msgid "Epson Stylus Photo R380" msgstr "Epson Stylus Photo R300" -#: src/main/xmli18n-tmp.h:343 +#: src/main/xmli18n-tmp.h:367 #, fuzzy msgid "Epson Stylus Photo R390" msgstr "Epson Stylus Photo R300" -#: src/main/xmli18n-tmp.h:344 +#: src/main/xmli18n-tmp.h:368 msgid "Epson Stylus Photo RX400" msgstr "Epson Stylus Photo RX400" -#: src/main/xmli18n-tmp.h:345 +#: src/main/xmli18n-tmp.h:369 msgid "Epson Stylus Photo RX420" msgstr "Epson Stylus Photo RX420" -#: src/main/xmli18n-tmp.h:346 +#: src/main/xmli18n-tmp.h:370 msgid "Epson Stylus Photo RX425" msgstr "Epson Stylus Photo RX425" -#: src/main/xmli18n-tmp.h:347 +#: src/main/xmli18n-tmp.h:371 msgid "Epson Stylus Photo RX430" msgstr "Epson Stylus Photo RX430" -#: src/main/xmli18n-tmp.h:348 +#: src/main/xmli18n-tmp.h:372 msgid "Epson Stylus Photo RX500" msgstr "Epson Stylus Photo RX500" -#: src/main/xmli18n-tmp.h:349 +#: src/main/xmli18n-tmp.h:373 msgid "Epson Stylus Photo RX510" msgstr "Epson Stylus Photo RX510" -#: src/main/xmli18n-tmp.h:350 +#: src/main/xmli18n-tmp.h:374 #, fuzzy msgid "Epson Stylus Photo RX560" msgstr "Epson Stylus Photo RX500" -#: src/main/xmli18n-tmp.h:351 +#: src/main/xmli18n-tmp.h:375 #, fuzzy msgid "Epson Stylus Photo RX580" msgstr "Epson Stylus Photo RX500" -#: src/main/xmli18n-tmp.h:352 +#: src/main/xmli18n-tmp.h:376 +#, fuzzy +msgid "Epson Stylus Photo RX585" +msgstr "Epson Stylus Photo RX425" + +#: src/main/xmli18n-tmp.h:377 #, fuzzy msgid "Epson Stylus Photo RX590" msgstr "Epson Stylus Photo RX500" -#: src/main/xmli18n-tmp.h:353 +#: src/main/xmli18n-tmp.h:378 #, fuzzy msgid "Epson Stylus Photo RX595" -msgstr "Epson Stylus Photo RX500" +msgstr "Epson Stylus Photo RX425" -#: src/main/xmli18n-tmp.h:354 +#: src/main/xmli18n-tmp.h:379 msgid "Epson Stylus Photo RX600" msgstr "Epson Stylus Photo RX600" -#: src/main/xmli18n-tmp.h:355 +#: src/main/xmli18n-tmp.h:380 msgid "Epson Stylus Photo RX620" msgstr "Epson Stylus Photo RX620" -#: src/main/xmli18n-tmp.h:356 +#: src/main/xmli18n-tmp.h:381 msgid "Epson Stylus Photo RX630" msgstr "Epson Stylus Photo RX630" -#: src/main/xmli18n-tmp.h:357 +#: src/main/xmli18n-tmp.h:382 #, fuzzy msgid "Epson Stylus Photo RX640" msgstr "Epson Stylus Photo RX400" -#: src/main/xmli18n-tmp.h:358 +#: src/main/xmli18n-tmp.h:383 +#, fuzzy +msgid "Epson Stylus Photo RX680" +msgstr "Epson Stylus Photo RX600" + +#: src/main/xmli18n-tmp.h:384 +#, fuzzy +msgid "Epson Stylus Photo RX685" +msgstr "Epson Stylus Photo RX425" + +#: src/main/xmli18n-tmp.h:385 msgid "Epson Stylus Photo RX700" msgstr "Epson Stylus Photo RX700" -#: src/main/xmli18n-tmp.h:359 +#: src/main/xmli18n-tmp.h:386 msgid "Epson Stylus Photo R800" msgstr "Epson Stylus Photo R800" -#: src/main/xmli18n-tmp.h:360 +#: src/main/xmli18n-tmp.h:387 msgid "Epson Stylus Photo R1800" msgstr "Epson Stylus Photo R1800" -#: src/main/xmli18n-tmp.h:361 +#: src/main/xmli18n-tmp.h:388 msgid "Epson Stylus Photo R2400" msgstr "Epson Stylus Photo R2400" -#: src/main/xmli18n-tmp.h:362 +#: src/main/xmli18n-tmp.h:389 msgid "Epson Stylus Pro 5000" msgstr "Epson Stylus Pro 5000" -#: src/main/xmli18n-tmp.h:363 +#: src/main/xmli18n-tmp.h:390 msgid "Epson Stylus Pro 5500" msgstr "Epson Stylus Pro 5500" -#: src/main/xmli18n-tmp.h:364 +#: src/main/xmli18n-tmp.h:391 msgid "Epson Stylus Pro 7000" msgstr "Epson Stylus Pro 7000" -#: src/main/xmli18n-tmp.h:365 +#: src/main/xmli18n-tmp.h:392 msgid "Epson Stylus Pro 7500" msgstr "Epson Stylus Pro 7500" -#: src/main/xmli18n-tmp.h:366 +#: src/main/xmli18n-tmp.h:393 msgid "Epson Stylus Pro 7600" msgstr "Epson Stylus Pro 7600" -#: src/main/xmli18n-tmp.h:367 +#: src/main/xmli18n-tmp.h:394 msgid "Epson Stylus Pro 9000" msgstr "Epson Stylus Pro 9000" -#: src/main/xmli18n-tmp.h:368 +#: src/main/xmli18n-tmp.h:395 msgid "Epson Stylus Pro 9500" msgstr "Epson Stylus Pro 9500" -#: src/main/xmli18n-tmp.h:369 +#: src/main/xmli18n-tmp.h:396 msgid "Epson Stylus Pro 9600" msgstr "Epson Stylus Pro 9600" -#: src/main/xmli18n-tmp.h:370 +#: src/main/xmli18n-tmp.h:397 msgid "Epson Stylus Pro 10000" msgstr "Epson Stylus Pro 10000" -#: src/main/xmli18n-tmp.h:371 +#: src/main/xmli18n-tmp.h:398 msgid "Epson Stylus Scan 2000" msgstr "Epson Stylus Scan 2000" -#: src/main/xmli18n-tmp.h:372 +#: src/main/xmli18n-tmp.h:399 msgid "Epson Stylus Scan 2500" msgstr "Epson Stylus Scan 2500" -#: src/main/xmli18n-tmp.h:373 +#: src/main/xmli18n-tmp.h:400 msgid "Epson Stylus CX1500" msgstr "Epson Stylus CX1500" -#: src/main/xmli18n-tmp.h:374 +#: src/main/xmli18n-tmp.h:401 msgid "Epson Stylus CX3100" msgstr "Epson Stylus CX3100" -#: src/main/xmli18n-tmp.h:375 +#: src/main/xmli18n-tmp.h:402 msgid "Epson Stylus CX3200" msgstr "Epson Stylus CX3200" -#: src/main/xmli18n-tmp.h:376 +#: src/main/xmli18n-tmp.h:403 msgid "Epson Stylus CX3500" msgstr "Epson Stylus CX3500" -#: src/main/xmli18n-tmp.h:377 +#: src/main/xmli18n-tmp.h:404 msgid "Epson Stylus CX3600" msgstr "Epson Stylus CX3600" -#: src/main/xmli18n-tmp.h:378 +#: src/main/xmli18n-tmp.h:405 msgid "Epson Stylus CX3650" msgstr "Epson Stylus CX3650" -#: src/main/xmli18n-tmp.h:379 +#: src/main/xmli18n-tmp.h:406 msgid "Epson Stylus CX3700" msgstr "Epson Stylus CX3700" -#: src/main/xmli18n-tmp.h:380 +#: src/main/xmli18n-tmp.h:407 msgid "Epson Stylus CX3800" msgstr "Epson Stylus CX3800" -#: src/main/xmli18n-tmp.h:381 +#: src/main/xmli18n-tmp.h:408 msgid "Epson Stylus CX3805" msgstr "Epson Stylus CX3805" -#: src/main/xmli18n-tmp.h:382 +#: src/main/xmli18n-tmp.h:409 msgid "Epson Stylus CX3810" msgstr "Epson Stylus CX3810" -#: src/main/xmli18n-tmp.h:383 +#: src/main/xmli18n-tmp.h:410 msgid "Epson Stylus CX4100" msgstr "Epson Stylus CX4100" -#: src/main/xmli18n-tmp.h:384 +#: src/main/xmli18n-tmp.h:411 msgid "Epson Stylus CX4200" msgstr "Epson Stylus CX4200" -#: src/main/xmli18n-tmp.h:385 +#: src/main/xmli18n-tmp.h:412 #, fuzzy msgid "Epson Stylus CX4400" msgstr "Epson Stylus CX4100" -#: src/main/xmli18n-tmp.h:386 +#: src/main/xmli18n-tmp.h:413 msgid "Epson Stylus CX4500" msgstr "Epson Stylus CX4500" -#: src/main/xmli18n-tmp.h:387 +#: src/main/xmli18n-tmp.h:414 msgid "Epson Stylus CX4600" msgstr "Epson Stylus CX4600" -#: src/main/xmli18n-tmp.h:388 +#: src/main/xmli18n-tmp.h:415 msgid "Epson Stylus CX4700" msgstr "Epson Stylus CX4700" -#: src/main/xmli18n-tmp.h:389 +#: src/main/xmli18n-tmp.h:416 msgid "Epson Stylus CX4800" msgstr "Epson Stylus CX4800" -#: src/main/xmli18n-tmp.h:390 +#: src/main/xmli18n-tmp.h:417 #, fuzzy msgid "Epson Stylus CX4900" msgstr "Epson Stylus CX4100" -#: src/main/xmli18n-tmp.h:391 +#: src/main/xmli18n-tmp.h:418 #, fuzzy msgid "Epson Stylus CX5000" msgstr "Epson Stylus CX1500" -#: src/main/xmli18n-tmp.h:392 +#: src/main/xmli18n-tmp.h:419 #, fuzzy msgid "Epson Stylus CX5000F" msgstr "Epson Stylus CX1500" -#: src/main/xmli18n-tmp.h:393 +#: src/main/xmli18n-tmp.h:420 msgid "Epson Stylus CX5100" msgstr "Epson Stylus CX5100" -#: src/main/xmli18n-tmp.h:394 +#: src/main/xmli18n-tmp.h:421 msgid "Epson Stylus CX5200" msgstr "Epson Stylus CX5200" -#: src/main/xmli18n-tmp.h:395 +#: src/main/xmli18n-tmp.h:422 msgid "Epson Stylus CX5300" msgstr "Epson Stylus CX5300" -#: src/main/xmli18n-tmp.h:396 +#: src/main/xmli18n-tmp.h:423 msgid "Epson Stylus CX5400" msgstr "Epson Stylus CX5400" -#: src/main/xmli18n-tmp.h:397 +#: src/main/xmli18n-tmp.h:424 #, fuzzy msgid "Epson Stylus CX5600" msgstr "Epson Stylus CX1500" -#: src/main/xmli18n-tmp.h:398 +#: src/main/xmli18n-tmp.h:425 msgid "Epson Stylus CX5700" msgstr "Epson Stylus CX5700" -#: src/main/xmli18n-tmp.h:399 +#: src/main/xmli18n-tmp.h:426 msgid "Epson Stylus CX5800" msgstr "Epson Stylus CX5800" -#: src/main/xmli18n-tmp.h:400 +#: src/main/xmli18n-tmp.h:427 #, fuzzy msgid "Epson Stylus CX6000" msgstr "Epson Stylus CX3600" -#: src/main/xmli18n-tmp.h:401 +#: src/main/xmli18n-tmp.h:428 msgid "Epson Stylus CX6300" msgstr "Epson Stylus CX6300" -#: src/main/xmli18n-tmp.h:402 +#: src/main/xmli18n-tmp.h:429 msgid "Epson Stylus CX6400" msgstr "Epson Stylus CX6400" -#: src/main/xmli18n-tmp.h:403 +#: src/main/xmli18n-tmp.h:430 msgid "Epson Stylus CX6500" msgstr "Epson Stylus CX6500" -#: src/main/xmli18n-tmp.h:404 +#: src/main/xmli18n-tmp.h:431 msgid "Epson Stylus CX6600" msgstr "Epson Stylus CX6600" -#: src/main/xmli18n-tmp.h:405 +#: src/main/xmli18n-tmp.h:432 #, fuzzy msgid "Epson Stylus CX7000F" msgstr "Epson Stylus CX3700" -#: src/main/xmli18n-tmp.h:406 +#: src/main/xmli18n-tmp.h:433 #, fuzzy msgid "Epson Stylus CX7400" msgstr "Epson Stylus CX3700" -#: src/main/xmli18n-tmp.h:407 +#: src/main/xmli18n-tmp.h:434 msgid "Epson Stylus CX7700" msgstr "Epson Stylus CX7700" -#: src/main/xmli18n-tmp.h:408 +#: src/main/xmli18n-tmp.h:435 msgid "Epson Stylus CX7800" msgstr "Epson Stylus CX7800" -#: src/main/xmli18n-tmp.h:409 +#: src/main/xmli18n-tmp.h:436 msgid "Epson Stylus CX8300" msgstr "Epson Stylus CX8300" -#: src/main/xmli18n-tmp.h:410 +#: src/main/xmli18n-tmp.h:437 msgid "Epson Stylus CX8400" msgstr "Epson Stylus CX8400" -#: src/main/xmli18n-tmp.h:411 +#: src/main/xmli18n-tmp.h:438 #, fuzzy msgid "Epson Stylus CX9400" msgstr "Epson Stylus CX4100" -#: src/main/xmli18n-tmp.h:412 +#: src/main/xmli18n-tmp.h:439 msgid "Epson Stylus D68" msgstr "Epson Stylus D68" -#: src/main/xmli18n-tmp.h:413 +#: src/main/xmli18n-tmp.h:440 msgid "Epson Stylus D88" msgstr "Epson Stylus D88" -#: src/main/xmli18n-tmp.h:414 +#: src/main/xmli18n-tmp.h:441 +#, fuzzy +msgid "Epson Stylus D92" +msgstr "Epson Stylus C20" + +#: src/main/xmli18n-tmp.h:442 #, fuzzy msgid "Epson Stylus D120" msgstr "Epson Stylus C20" -#: src/main/xmli18n-tmp.h:415 +#: src/main/xmli18n-tmp.h:443 msgid "Epson Stylus DX3800" msgstr "Epson Stylus DX3800" -#: src/main/xmli18n-tmp.h:416 +#: src/main/xmli18n-tmp.h:444 msgid "Epson Stylus DX3850" msgstr "Epson Stylus DX3850" -#: src/main/xmli18n-tmp.h:417 +#: src/main/xmli18n-tmp.h:445 #, fuzzy msgid "Epson Stylus DX4050" msgstr "Epson Stylus DX4200" -#: src/main/xmli18n-tmp.h:418 +#: src/main/xmli18n-tmp.h:446 msgid "Epson Stylus DX4200" msgstr "Epson Stylus DX4200" -#: src/main/xmli18n-tmp.h:419 +#: src/main/xmli18n-tmp.h:447 msgid "Epson Stylus DX4250" msgstr "Epson Stylus DX4250" -#: src/main/xmli18n-tmp.h:420 -msgid "Epson Stylus DX4800" -msgstr "Epson Stylus DX4800" +#: src/main/xmli18n-tmp.h:448 +#, fuzzy +msgid "Epson Stylus DX4400" +msgstr "Epson Stylus DX4200" + +#: src/main/xmli18n-tmp.h:449 +#, fuzzy +msgid "Epson Stylus DX4450" +msgstr "Epson Stylus DX4250" + +#: src/main/xmli18n-tmp.h:450 +msgid "Epson Stylus DX4800" +msgstr "Epson Stylus DX4800" + +#: src/main/xmli18n-tmp.h:451 +#, fuzzy +msgid "Epson Stylus DX7000F" +msgstr "Epson Stylus CX3700" + +#: src/main/xmli18n-tmp.h:452 +#, fuzzy +msgid "Epson Stylus DX7400" +msgstr "Epson Stylus DX4200" + +#: src/main/xmli18n-tmp.h:453 +#, fuzzy +msgid "Epson Stylus DX7450" +msgstr "Epson Stylus DX4250" + +#: src/main/xmli18n-tmp.h:454 +#, fuzzy +msgid "Epson Stylus DX8400" +msgstr "Epson Stylus CX8400" -#: src/main/xmli18n-tmp.h:421 +#: src/main/xmli18n-tmp.h:455 +#, fuzzy +msgid "Epson Stylus DX8450" +msgstr "Epson Stylus DX3850" + +#: src/main/xmli18n-tmp.h:456 msgid "Epson PictureMate" msgstr "Epson PictureMate" -#: src/main/xmli18n-tmp.h:422 +#: src/main/xmli18n-tmp.h:457 +#, fuzzy +msgid "Epson PictureMate Dash" +msgstr "Epson PictureMate" + +#: src/main/xmli18n-tmp.h:458 msgid "Epson PictureMate Deluxe" msgstr "Epson PictureMate Deluxe" -#: src/main/xmli18n-tmp.h:423 +#: src/main/xmli18n-tmp.h:459 #, fuzzy msgid "Epson PictureMate Flash" msgstr "Epson PictureMate" -#: src/main/xmli18n-tmp.h:424 +#: src/main/xmli18n-tmp.h:460 #, fuzzy msgid "Epson PictureMate Pal" msgstr "Epson PictureMate" -#: src/main/xmli18n-tmp.h:425 +#: src/main/xmli18n-tmp.h:461 #, fuzzy msgid "Epson PictureMate Snap" msgstr "Epson PictureMate" -#: src/main/xmli18n-tmp.h:426 +#: src/main/xmli18n-tmp.h:462 +#, fuzzy +msgid "Epson PictureMate 100" +msgstr "Epson PictureMate" + +#: src/main/xmli18n-tmp.h:463 #, fuzzy msgid "Epson PictureMate 200" msgstr "Epson PictureMate" -#: src/main/xmli18n-tmp.h:427 +#: src/main/xmli18n-tmp.h:464 #, fuzzy msgid "Epson PictureMate 210" msgstr "Epson PictureMate" -#: src/main/xmli18n-tmp.h:428 +#: src/main/xmli18n-tmp.h:465 #, fuzzy msgid "Epson PictureMate 240" msgstr "Epson PictureMate" -#: src/main/xmli18n-tmp.h:429 +#: src/main/xmli18n-tmp.h:466 #, fuzzy msgid "Epson PictureMate 250" msgstr "Epson PictureMate" -#: src/main/xmli18n-tmp.h:430 +#: src/main/xmli18n-tmp.h:467 +#, fuzzy +msgid "Epson PictureMate 260" +msgstr "Epson PictureMate" + +#: src/main/xmli18n-tmp.h:468 +#, fuzzy +msgid "Epson PictureMate 270" +msgstr "Epson PictureMate" + +#: src/main/xmli18n-tmp.h:469 #, fuzzy msgid "Epson PictureMate 280" msgstr "Epson PictureMate" -#: src/main/xmli18n-tmp.h:431 +#: src/main/xmli18n-tmp.h:470 +#, fuzzy +msgid "Epson PictureMate 290" +msgstr "Epson PictureMate" + +#: src/main/xmli18n-tmp.h:471 +#, fuzzy +msgid "Epson PictureMate 500" +msgstr "Epson PictureMate" + +#: src/main/xmli18n-tmp.h:472 +#, fuzzy +msgid "Epson PictureMate 2005" +msgstr "Epson PictureMate" + +#: src/main/xmli18n-tmp.h:473 msgid "Epson CL 700" msgstr "Epson CL 700" -#: src/main/xmli18n-tmp.h:432 +#: src/main/xmli18n-tmp.h:474 msgid "Epson CL 750" msgstr "Epson CL 750" -#: src/main/xmli18n-tmp.h:433 +#: src/main/xmli18n-tmp.h:475 msgid "Epson CL 760" msgstr "Epson CL 760" -#: src/main/xmli18n-tmp.h:434 +#: src/main/xmli18n-tmp.h:476 msgid "Epson E 100" msgstr "Epson E 100" -#: src/main/xmli18n-tmp.h:435 +#: src/main/xmli18n-tmp.h:477 msgid "Epson E 150" msgstr "Epson E 150" -#: src/main/xmli18n-tmp.h:436 +#: src/main/xmli18n-tmp.h:478 msgid "Epson E 200" msgstr "Epson E 200" -#: src/main/xmli18n-tmp.h:437 +#: src/main/xmli18n-tmp.h:479 +#, fuzzy +msgid "Epson E 300" +msgstr "Epson E 100" + +#: src/main/xmli18n-tmp.h:480 +#, fuzzy +msgid "Epson E 500" +msgstr "Epson E 100" + +#: src/main/xmli18n-tmp.h:481 +#, fuzzy +msgid "Epson E 520" +msgstr "Epson E 150" + +#: src/main/xmli18n-tmp.h:482 +#, fuzzy +msgid "Epson E 700" +msgstr "Epson E 100" + +#: src/main/xmli18n-tmp.h:483 +#, fuzzy +msgid "Epson E 720" +msgstr "Epson E 200" + +#: src/main/xmli18n-tmp.h:484 msgid "Epson EM 900C" msgstr "Epson EM 900C" -#: src/main/xmli18n-tmp.h:438 +#: src/main/xmli18n-tmp.h:485 msgid "Epson EM 930C" msgstr "Epson EM 930C" -#: src/main/xmli18n-tmp.h:439 +#: src/main/xmli18n-tmp.h:486 msgid "Epson MC 2000" msgstr "Epson MC 2000" -#: src/main/xmli18n-tmp.h:440 +#: src/main/xmli18n-tmp.h:487 msgid "Epson MC 5000" msgstr "Epson MC 5000" -#: src/main/xmli18n-tmp.h:441 +#: src/main/xmli18n-tmp.h:488 msgid "Epson MC 7000" msgstr "Epson MC 7000" -#: src/main/xmli18n-tmp.h:442 +#: src/main/xmli18n-tmp.h:489 msgid "Epson MC 9000" msgstr "Epson MC 9000" -#: src/main/xmli18n-tmp.h:443 +#: src/main/xmli18n-tmp.h:490 msgid "Epson MC 10000" msgstr "Epson MC 10000" -#: src/main/xmli18n-tmp.h:444 +#: src/main/xmli18n-tmp.h:491 msgid "Epson MJ 930C" msgstr "Epson MJ 930C" -#: src/main/xmli18n-tmp.h:445 +#: src/main/xmli18n-tmp.h:492 msgid "Epson MJ 5100C" msgstr "Epson MJ 5100C" -#: src/main/xmli18n-tmp.h:446 +#: src/main/xmli18n-tmp.h:493 msgid "Epson MJ 6000C" msgstr "Epson MJ 6000C" -#: src/main/xmli18n-tmp.h:447 +#: src/main/xmli18n-tmp.h:494 msgid "Epson MJ 8000C" msgstr "Epson MJ 8000C" -#: src/main/xmli18n-tmp.h:448 +#: src/main/xmli18n-tmp.h:495 #, fuzzy msgid "Epson PM 670C" msgstr "Epson PM 700C" -#: src/main/xmli18n-tmp.h:449 +#: src/main/xmli18n-tmp.h:496 msgid "Epson PM 700C" msgstr "Epson PM 700C" -#: src/main/xmli18n-tmp.h:450 +#: src/main/xmli18n-tmp.h:497 msgid "Epson PM 730C" msgstr "Epson PM 730C" -#: src/main/xmli18n-tmp.h:451 +#: src/main/xmli18n-tmp.h:498 msgid "Epson PM 740C" msgstr "Epson PM 740C" -#: src/main/xmli18n-tmp.h:452 +#: src/main/xmli18n-tmp.h:499 msgid "Epson PM 750C" msgstr "Epson PM 750C" -#: src/main/xmli18n-tmp.h:453 +#: src/main/xmli18n-tmp.h:500 msgid "Epson PM 760C" msgstr "Epson PM 760C" -#: src/main/xmli18n-tmp.h:454 +#: src/main/xmli18n-tmp.h:501 msgid "Epson PM 770C" msgstr "Epson PM 770C" -#: src/main/xmli18n-tmp.h:455 +#: src/main/xmli18n-tmp.h:502 msgid "Epson PM 780C" msgstr "Epson PM 780C" -#: src/main/xmli18n-tmp.h:456 +#: src/main/xmli18n-tmp.h:503 msgid "Epson PM 790PT" msgstr "Epson PM 790PT" -#: src/main/xmli18n-tmp.h:457 +#: src/main/xmli18n-tmp.h:504 msgid "Epson PM 800C" msgstr "Epson PM 800C" -#: src/main/xmli18n-tmp.h:458 +#: src/main/xmli18n-tmp.h:505 msgid "Epson PM 850PT" msgstr "Epson PM 850PT" -#: src/main/xmli18n-tmp.h:459 +#: src/main/xmli18n-tmp.h:506 msgid "Epson PM 870C" msgstr "Epson PM 870C" -#: src/main/xmli18n-tmp.h:460 +#: src/main/xmli18n-tmp.h:507 msgid "Epson PM 880C" msgstr "Epson PM 880C" -#: src/main/xmli18n-tmp.h:461 +#: src/main/xmli18n-tmp.h:508 msgid "Epson PM 930C" msgstr "Epson PM 930C" -#: src/main/xmli18n-tmp.h:462 +#: src/main/xmli18n-tmp.h:509 msgid "Epson PM 940C" msgstr "Epson PM 940C" -#: src/main/xmli18n-tmp.h:463 +#: src/main/xmli18n-tmp.h:510 msgid "Epson PM 950C" msgstr "Epson PM 950C" -#: src/main/xmli18n-tmp.h:464 +#: src/main/xmli18n-tmp.h:511 msgid "Epson PM 970C" msgstr "Epson PM 970C" -#: src/main/xmli18n-tmp.h:465 +#: src/main/xmli18n-tmp.h:512 msgid "Epson PM 980C" msgstr "Epson PM 980C" -#: src/main/xmli18n-tmp.h:466 +#: src/main/xmli18n-tmp.h:513 msgid "Epson PM 2000C" msgstr "Epson PM 2000C" -#: src/main/xmli18n-tmp.h:467 +#: src/main/xmli18n-tmp.h:514 msgid "Epson PM 2200C" msgstr "Epson PM 2200C" -#: src/main/xmli18n-tmp.h:468 +#: src/main/xmli18n-tmp.h:515 msgid "Epson PM 3000C" msgstr "Epson PM 3000C" -#: src/main/xmli18n-tmp.h:469 +#: src/main/xmli18n-tmp.h:516 msgid "Epson PM 3300C" msgstr "Epson PM 3300C" -#: src/main/xmli18n-tmp.h:470 +#: src/main/xmli18n-tmp.h:517 msgid "Epson PM 3500C" msgstr "Epson PM 3500C" -#: src/main/xmli18n-tmp.h:471 +#: src/main/xmli18n-tmp.h:518 msgid "Epson PM 3700C" msgstr "Epson PM 3700C" -#: src/main/xmli18n-tmp.h:472 +#: src/main/xmli18n-tmp.h:519 msgid "Epson PM 4000PX" msgstr "Epson PM 4000PX" -#: src/main/xmli18n-tmp.h:473 +#: src/main/xmli18n-tmp.h:520 msgid "Epson PM 5000C" msgstr "Epson PM 5000C" -#: src/main/xmli18n-tmp.h:474 +#: src/main/xmli18n-tmp.h:521 msgid "Epson PM 7000C" msgstr "Epson PM 7000C" -#: src/main/xmli18n-tmp.h:475 +#: src/main/xmli18n-tmp.h:522 msgid "Epson PM 9000C" msgstr "Epson PM 9000C" -#: src/main/xmli18n-tmp.h:476 +#: src/main/xmli18n-tmp.h:523 msgid "Epson PM 10000" msgstr "Epson PM 10000" -#: src/main/xmli18n-tmp.h:477 +#: src/main/xmli18n-tmp.h:524 msgid "Epson PM A650" msgstr "Epson PM A650" -#: src/main/xmli18n-tmp.h:478 +#: src/main/xmli18n-tmp.h:525 msgid "Epson PM A750" msgstr "Epson PM A750" -#: src/main/xmli18n-tmp.h:479 +#: src/main/xmli18n-tmp.h:526 #, fuzzy msgid "Epson PM A820" msgstr "Epson PM A890" -#: src/main/xmli18n-tmp.h:480 +#: src/main/xmli18n-tmp.h:527 msgid "Epson PM A890" msgstr "Epson PM A890" -#: src/main/xmli18n-tmp.h:481 +#: src/main/xmli18n-tmp.h:528 msgid "Epson PM A900" msgstr "Epson PM A900" -#: src/main/xmli18n-tmp.h:482 +#: src/main/xmli18n-tmp.h:529 msgid "Epson PM A950" msgstr "Epson PM A950" -#: src/main/xmli18n-tmp.h:483 +#: src/main/xmli18n-tmp.h:530 msgid "Epson PM D600" msgstr "Epson PM D600" -#: src/main/xmli18n-tmp.h:484 +#: src/main/xmli18n-tmp.h:531 msgid "Epson PM D750" msgstr "Epson PM D750" -#: src/main/xmli18n-tmp.h:485 +#: src/main/xmli18n-tmp.h:532 msgid "Epson PM D770" msgstr "Epson PM D770" -#: src/main/xmli18n-tmp.h:486 +#: src/main/xmli18n-tmp.h:533 msgid "Epson PM D800" msgstr "Epson PM D800" -#: src/main/xmli18n-tmp.h:487 +#: src/main/xmli18n-tmp.h:534 #, fuzzy msgid "Epson PM D870" msgstr "Epson PM 870C" -#: src/main/xmli18n-tmp.h:488 +#: src/main/xmli18n-tmp.h:535 msgid "Epson PM D1000" msgstr "Epson PM D1000" -#: src/main/xmli18n-tmp.h:489 +#: src/main/xmli18n-tmp.h:536 msgid "Epson PM G700" msgstr "Epson PM G700" -#: src/main/xmli18n-tmp.h:490 +#: src/main/xmli18n-tmp.h:537 msgid "Epson PM G720" msgstr "Epson PM G720" -#: src/main/xmli18n-tmp.h:491 +#: src/main/xmli18n-tmp.h:538 msgid "Epson PM G730" msgstr "Epson PM G730" -#: src/main/xmli18n-tmp.h:492 +#: src/main/xmli18n-tmp.h:539 msgid "Epson PM G800" msgstr "Epson PM G800" -#: src/main/xmli18n-tmp.h:493 +#: src/main/xmli18n-tmp.h:540 msgid "Epson PM G820" msgstr "Epson PM G820" -#: src/main/xmli18n-tmp.h:494 +#: src/main/xmli18n-tmp.h:541 #, fuzzy msgid "Epson PM G850" msgstr "Epson PM G800" -#: src/main/xmli18n-tmp.h:495 +#: src/main/xmli18n-tmp.h:542 #, fuzzy msgid "Epson PM G4500" msgstr "Epson PM G700" -#: src/main/xmli18n-tmp.h:496 +#: src/main/xmli18n-tmp.h:543 msgid "Epson PX A650" msgstr "Epson PX A650" -#: src/main/xmli18n-tmp.h:497 +#: src/main/xmli18n-tmp.h:544 msgid "Epson PX G900" msgstr "Epson PX G900" -#: src/main/xmli18n-tmp.h:498 +#: src/main/xmli18n-tmp.h:545 msgid "Epson PX G920" msgstr "Epson PX G920" -#: src/main/xmli18n-tmp.h:499 +#: src/main/xmli18n-tmp.h:546 msgid "Epson PX G5000" msgstr "Epson PX G5000" -#: src/main/xmli18n-tmp.h:500 +#: src/main/xmli18n-tmp.h:547 msgid "Epson PX V500" msgstr "Epson PX V500" -#: src/main/xmli18n-tmp.h:501 +#: src/main/xmli18n-tmp.h:548 msgid "Epson PX V600" msgstr "Epson PX V600" -#: src/main/xmli18n-tmp.h:502 +#: src/main/xmli18n-tmp.h:549 msgid "Epson PX V630" msgstr "Epson PX V630" -#: src/main/xmli18n-tmp.h:503 +#: src/main/xmli18n-tmp.h:550 #, fuzzy msgid "Epson PX V780" msgstr "Epson PM 780C" -#: src/main/xmli18n-tmp.h:504 +#: src/main/xmli18n-tmp.h:551 msgid "Epson PX 5500" msgstr "Epson PX 5500" -#: src/main/xmli18n-tmp.h:505 +#: src/main/xmli18n-tmp.h:552 msgid "Epson PX 7000" msgstr "Epson PX 7000" -#: src/main/xmli18n-tmp.h:506 +#: src/main/xmli18n-tmp.h:553 msgid "Epson PX 9000" msgstr "Epson PX 9000" -#: src/main/xmli18n-tmp.h:507 +#: src/main/xmli18n-tmp.h:554 msgid "Apollo P-2100" msgstr "Apollo P-2100" -#: src/main/xmli18n-tmp.h:508 +#: src/main/xmli18n-tmp.h:555 msgid "Apollo P-2150" msgstr "Apollo P-2150" -#: src/main/xmli18n-tmp.h:509 +#: src/main/xmli18n-tmp.h:556 msgid "Apollo P-2200" msgstr "Apollo P-2200" -#: src/main/xmli18n-tmp.h:510 +#: src/main/xmli18n-tmp.h:557 msgid "Apollo P-2250" msgstr "Apollo P-2250" -#: src/main/xmli18n-tmp.h:511 +#: src/main/xmli18n-tmp.h:558 msgid "Apollo P-2500" msgstr "Apollo P-2500" -#: src/main/xmli18n-tmp.h:512 +#: src/main/xmli18n-tmp.h:559 msgid "Apollo P-2550" msgstr "Apollo P-2550" -#: src/main/xmli18n-tmp.h:513 +#: src/main/xmli18n-tmp.h:560 msgid "Apollo P-2600" msgstr "Apollo P-2600" -#: src/main/xmli18n-tmp.h:514 +#: src/main/xmli18n-tmp.h:561 msgid "Apollo P-2650" msgstr "Apollo P-2650" -#: src/main/xmli18n-tmp.h:515 +#: src/main/xmli18n-tmp.h:562 msgid "Apple Color StyleWriter 4100" msgstr "Apple Color StyleWriter 4100" -#: src/main/xmli18n-tmp.h:516 +#: src/main/xmli18n-tmp.h:563 msgid "Apple Color StyleWriter 4500" msgstr "Apple Color StyleWriter 4500" -#: src/main/xmli18n-tmp.h:517 +#: src/main/xmli18n-tmp.h:564 msgid "Apple Color StyleWriter 6500" msgstr "Apple Color StyleWriter 6500" -#: src/main/xmli18n-tmp.h:518 +#: src/main/xmli18n-tmp.h:565 msgid "Apple LaserWriter Select 360" msgstr "Apple LaserWriter Select 360" -#: src/main/xmli18n-tmp.h:519 +#: src/main/xmli18n-tmp.h:566 msgid "Brother DCP-1200" msgstr "Brother DCP-1200" -#: src/main/xmli18n-tmp.h:520 +#: src/main/xmli18n-tmp.h:567 msgid "Brother HL-4Ve" msgstr "Brother HL-4Ve" -#: src/main/xmli18n-tmp.h:521 +#: src/main/xmli18n-tmp.h:568 msgid "Brother HL-10V" msgstr "Brother HL-10V" -#: src/main/xmli18n-tmp.h:522 +#: src/main/xmli18n-tmp.h:569 msgid "Brother HL-10h" msgstr "Brother HL-10h" -#: src/main/xmli18n-tmp.h:523 +#: src/main/xmli18n-tmp.h:570 msgid "Brother HL-630" msgstr "Brother HL-630" -#: src/main/xmli18n-tmp.h:524 +#: src/main/xmli18n-tmp.h:571 msgid "Brother HL-660" msgstr "Brother HL-660" -#: src/main/xmli18n-tmp.h:525 +#: src/main/xmli18n-tmp.h:572 msgid "Brother HL-760" msgstr "Brother HL-760" -#: src/main/xmli18n-tmp.h:526 +#: src/main/xmli18n-tmp.h:573 msgid "Brother HL-960" msgstr "Brother HL-960" -#: src/main/xmli18n-tmp.h:527 +#: src/main/xmli18n-tmp.h:574 msgid "Brother HL-1040" msgstr "Brother HL-1040" -#: src/main/xmli18n-tmp.h:528 +#: src/main/xmli18n-tmp.h:575 msgid "Brother HL-1050" msgstr "Brother HL-1050" -#: src/main/xmli18n-tmp.h:529 +#: src/main/xmli18n-tmp.h:576 msgid "Brother HL-1060" msgstr "Brother HL-1060" -#: src/main/xmli18n-tmp.h:530 +#: src/main/xmli18n-tmp.h:577 msgid "Brother HL-1070" msgstr "Brother HL-1070" -#: src/main/xmli18n-tmp.h:531 +#: src/main/xmli18n-tmp.h:578 msgid "Brother HL-1240" msgstr "Brother HL-1240" -#: src/main/xmli18n-tmp.h:532 +#: src/main/xmli18n-tmp.h:579 msgid "Brother HL-1250" msgstr "Brother HL-1250" -#: src/main/xmli18n-tmp.h:533 +#: src/main/xmli18n-tmp.h:580 msgid "Brother HL-1260" msgstr "Brother HL-1260" -#: src/main/xmli18n-tmp.h:534 +#: src/main/xmli18n-tmp.h:581 msgid "Brother HL-1270N" msgstr "Brother HL-1270N" -#: src/main/xmli18n-tmp.h:535 +#: src/main/xmli18n-tmp.h:582 msgid "Brother HL-1440" msgstr "Brother HL-1440" -#: src/main/xmli18n-tmp.h:536 +#: src/main/xmli18n-tmp.h:583 msgid "Brother HL-1660e" msgstr "Brother HL-1660e" -#: src/main/xmli18n-tmp.h:537 +#: src/main/xmli18n-tmp.h:584 msgid "Brother HL-2060" msgstr "Brother HL-2060" -#: src/main/xmli18n-tmp.h:538 +#: src/main/xmli18n-tmp.h:585 msgid "Brother MFC-6550MC" msgstr "Brother MFC-6550MC" -#: src/main/xmli18n-tmp.h:539 +#: src/main/xmli18n-tmp.h:586 msgid "Brother MFC-8300" msgstr "Brother MFC-8300" -#: src/main/xmli18n-tmp.h:540 +#: src/main/xmli18n-tmp.h:587 msgid "Brother MFC-9500" msgstr "Brother MFC-9500" -#: src/main/xmli18n-tmp.h:541 +#: src/main/xmli18n-tmp.h:588 msgid "Brother MFC-9600" msgstr "Brother MFC-9600" -#: src/main/xmli18n-tmp.h:542 +#: src/main/xmli18n-tmp.h:589 msgid "Canon GP 335" msgstr "Canon GP 335" -#: src/main/xmli18n-tmp.h:543 +#: src/main/xmli18n-tmp.h:590 msgid "Canon LBP-4sx" msgstr "Canon LBP-4sx" -#: src/main/xmli18n-tmp.h:544 +#: src/main/xmli18n-tmp.h:591 msgid "Canon LBP-430" msgstr "Canon LBP-430" -#: src/main/xmli18n-tmp.h:545 +#: src/main/xmli18n-tmp.h:592 msgid "Canon LBP-1000" msgstr "Canon LBP-1000" -#: src/main/xmli18n-tmp.h:546 +#: src/main/xmli18n-tmp.h:593 msgid "Canon LBP-1260" msgstr "Canon LBP-1260" -#: src/main/xmli18n-tmp.h:547 +#: src/main/xmli18n-tmp.h:594 msgid "Canon LBP-1760" msgstr "Canon LBP-1760" -#: src/main/xmli18n-tmp.h:548 +#: src/main/xmli18n-tmp.h:595 msgid "Canon imageRunner 330s" msgstr "Canon imageRunner 330s" -#: src/main/xmli18n-tmp.h:549 +#: src/main/xmli18n-tmp.h:596 msgid "Citizen ProJet II" msgstr "Citizen ProJet II" -#: src/main/xmli18n-tmp.h:550 +#: src/main/xmli18n-tmp.h:597 msgid "DEC 1800" msgstr "DEC 1800" -#: src/main/xmli18n-tmp.h:551 +#: src/main/xmli18n-tmp.h:598 msgid "DEC LN17" msgstr "DEC LN17" -#: src/main/xmli18n-tmp.h:552 +#: src/main/xmli18n-tmp.h:599 msgid "Epson ActionLaser 1100" msgstr "Epson ActionLaser 1100" -#: src/main/xmli18n-tmp.h:553 +#: src/main/xmli18n-tmp.h:600 msgid "Epson ActionLaser II" msgstr "Epson ActionLaser II" -#: src/main/xmli18n-tmp.h:554 +#: src/main/xmli18n-tmp.h:601 msgid "Epson AcuLaser C2000" msgstr "Epson AcuLaser C2000" -#: src/main/xmli18n-tmp.h:555 +#: src/main/xmli18n-tmp.h:602 msgid "Epson AcuLaser C2000PS" msgstr "Epson AcuLaser C2000PS" -#: src/main/xmli18n-tmp.h:556 +#: src/main/xmli18n-tmp.h:603 msgid "Epson AcuLaser C8500" msgstr "Epson AcuLaser C8500" -#: src/main/xmli18n-tmp.h:557 +#: src/main/xmli18n-tmp.h:604 msgid "Epson AcuLaser C8500PS" msgstr "Epson AcuLaser C8500PS" -#: src/main/xmli18n-tmp.h:558 +#: src/main/xmli18n-tmp.h:605 msgid "Epson AcuLaser C8600" msgstr "Epson AcuLaser C8600" -#: src/main/xmli18n-tmp.h:559 +#: src/main/xmli18n-tmp.h:606 msgid "Epson AcuLaser C8600PS" msgstr "Epson AcuLaser C8600PS" -#: src/main/xmli18n-tmp.h:560 +#: src/main/xmli18n-tmp.h:607 msgid "Epson EPL-5200" msgstr "Epson EPL-5200" -#: src/main/xmli18n-tmp.h:561 +#: src/main/xmli18n-tmp.h:608 msgid "Epson EPL-5200+" msgstr "Epson EPL-5200+" -#: src/main/xmli18n-tmp.h:562 +#: src/main/xmli18n-tmp.h:609 msgid "Epson EPL-5700" msgstr "Epson EPL-5700" -#: src/main/xmli18n-tmp.h:563 +#: src/main/xmli18n-tmp.h:610 msgid "Epson EPL-5700PS" msgstr "Epson EPL-5700PS" -#: src/main/xmli18n-tmp.h:564 +#: src/main/xmli18n-tmp.h:611 msgid "Epson EPL-5800" msgstr "Epson EPL-5800" -#: src/main/xmli18n-tmp.h:565 +#: src/main/xmli18n-tmp.h:612 msgid "Epson EPL-5800PS" msgstr "Epson EPL-5800PS" -#: src/main/xmli18n-tmp.h:566 +#: src/main/xmli18n-tmp.h:613 msgid "Epson EPL-5900" msgstr "Epson EPL-5900" -#: src/main/xmli18n-tmp.h:567 +#: src/main/xmli18n-tmp.h:614 msgid "Epson EPL-5900PS" msgstr "Epson EPL-5900PS" -#: src/main/xmli18n-tmp.h:568 +#: src/main/xmli18n-tmp.h:615 msgid "Epson EPL-6100" msgstr "Epson EPL-6100" -#: src/main/xmli18n-tmp.h:569 +#: src/main/xmli18n-tmp.h:616 msgid "Epson EPL-6100PS" msgstr "Epson EPL-6100PS" -#: src/main/xmli18n-tmp.h:570 +#: src/main/xmli18n-tmp.h:617 msgid "Epson EPL-7100" msgstr "Epson EPL-7100" -#: src/main/xmli18n-tmp.h:571 +#: src/main/xmli18n-tmp.h:618 msgid "Fujitsu PrintPartner 10V" msgstr "Fujitsu PrintPartner 10V" -#: src/main/xmli18n-tmp.h:572 +#: src/main/xmli18n-tmp.h:619 msgid "Fujitsu PrintPartner 16DV" msgstr "Fujitsu PrintPartner 16DV" -#: src/main/xmli18n-tmp.h:573 +#: src/main/xmli18n-tmp.h:620 msgid "Fujitsu PrintPartner 20W" msgstr "Fujitsu PrintPartner 20W" -#: src/main/xmli18n-tmp.h:574 +#: src/main/xmli18n-tmp.h:621 msgid "Fujitsu PrintPartner 8000" msgstr "Fujitsu PrintPartner 8000" -#: src/main/xmli18n-tmp.h:575 +#: src/main/xmli18n-tmp.h:622 msgid "Generic PCL 4 Printer" msgstr "Allmän PCL 4-skrivare" -#: src/main/xmli18n-tmp.h:576 +#: src/main/xmli18n-tmp.h:623 +#, fuzzy +msgid "Generic PCL 4 LF Printer" +msgstr "Allmän PCL 4-skrivare" + +#: src/main/xmli18n-tmp.h:624 msgid "Generic PCL 5 Printer" msgstr "Allmän PCL 5-skivare" -#: src/main/xmli18n-tmp.h:577 +#: src/main/xmli18n-tmp.h:625 +#, fuzzy +msgid "Generic PCL 5 LF Printer" +msgstr "Allmän PCL 5-skivare" + +#: src/main/xmli18n-tmp.h:626 msgid "Generic PCL 5c Printer" msgstr "Allmän PCL 5c-skivare" -#: src/main/xmli18n-tmp.h:578 +#: src/main/xmli18n-tmp.h:627 +#, fuzzy +msgid "Generic PCL 5c LF Printer" +msgstr "Allmän PCL 5c-skivare" + +#: src/main/xmli18n-tmp.h:628 msgid "Generic PCL 5e Printer" msgstr "Allmän PCL 5e-skivare" -#: src/main/xmli18n-tmp.h:579 +#: src/main/xmli18n-tmp.h:629 +#, fuzzy +msgid "Generic PCL 5e LF Printer" +msgstr "Allmän PCL 5e-skivare" + +#: src/main/xmli18n-tmp.h:630 msgid "Generic PCL 6/PCL XL Printer" msgstr "Allmän PCL 6/PCL XL-skrivare" -#: src/main/xmli18n-tmp.h:580 +#: src/main/xmli18n-tmp.h:631 +#, fuzzy +msgid "Generic PCL 6/PCL XL LF Printer" +msgstr "Allmän PCL 6/PCL XL-skrivare" + +#: src/main/xmli18n-tmp.h:632 msgid "HP Business Inkjet 2200" msgstr "HP Business Inkjet 2200" -#: src/main/xmli18n-tmp.h:581 +#: src/main/xmli18n-tmp.h:633 msgid "HP Business Inkjet 2230" msgstr "HP Business Inkjet 2230" -#: src/main/xmli18n-tmp.h:582 +#: src/main/xmli18n-tmp.h:634 msgid "HP Business Inkjet 2250" msgstr "HP Business Inkjet 2250" -#: src/main/xmli18n-tmp.h:583 +#: src/main/xmli18n-tmp.h:635 msgid "HP Business Inkjet 2250TN" msgstr "HP Business Inkjet 2250TN" -#: src/main/xmli18n-tmp.h:584 +#: src/main/xmli18n-tmp.h:636 msgid "HP Business Inkjet 2280" msgstr "HP Business Inkjet 2280" -#: src/main/xmli18n-tmp.h:585 +#: src/main/xmli18n-tmp.h:637 msgid "HP Color Inkjet Printer CP1160" msgstr "HP Color Inkjet Printer CP1160" -#: src/main/xmli18n-tmp.h:586 +#: src/main/xmli18n-tmp.h:638 msgid "HP Color Inkjet Printer CP1700" msgstr "HP Color Inkjet Printer CP1700" -#: src/main/xmli18n-tmp.h:587 +#: src/main/xmli18n-tmp.h:639 msgid "HP Color LaserJet 2500" msgstr "HP Color LaserJet 2500" -#: src/main/xmli18n-tmp.h:588 +#: src/main/xmli18n-tmp.h:640 msgid "HP Color LaserJet 4500" msgstr "HP Color LaserJet 4500" -#: src/main/xmli18n-tmp.h:589 +#: src/main/xmli18n-tmp.h:641 msgid "HP Color LaserJet 4550" msgstr "HP Color LaserJet 4550" -#: src/main/xmli18n-tmp.h:590 +#: src/main/xmli18n-tmp.h:642 msgid "HP Color LaserJet 4600" msgstr "HP Color LaserJet 4600" -#: src/main/xmli18n-tmp.h:591 +#: src/main/xmli18n-tmp.h:643 msgid "HP Color LaserJet 5" msgstr "HP Color LaserJet 5" -#: src/main/xmli18n-tmp.h:592 +#: src/main/xmli18n-tmp.h:644 msgid "HP Color LaserJet 5000" msgstr "HP Color LaserJet 5000" -#: src/main/xmli18n-tmp.h:593 +#: src/main/xmli18n-tmp.h:645 msgid "HP Color LaserJet 5500" msgstr "HP Color LaserJet 5500" -#: src/main/xmli18n-tmp.h:594 +#: src/main/xmli18n-tmp.h:646 msgid "HP Color LaserJet 8550GN" msgstr "HP Color LaserJet 8550GN" -#: src/main/xmli18n-tmp.h:595 +#: src/main/xmli18n-tmp.h:647 msgid "HP DesignJet 230" msgstr "HP DesignJet 230" -#: src/main/xmli18n-tmp.h:596 +#: src/main/xmli18n-tmp.h:648 msgid "HP DesignJet 250C" msgstr "HP DesignJet 250C" -#: src/main/xmli18n-tmp.h:597 +#: src/main/xmli18n-tmp.h:649 msgid "HP DesignJet 430" msgstr "HP DesignJet 430" -#: src/main/xmli18n-tmp.h:598 +#: src/main/xmli18n-tmp.h:650 msgid "HP DesignJet 450C" msgstr "HP DesignJet 450C" -#: src/main/xmli18n-tmp.h:599 +#: src/main/xmli18n-tmp.h:651 msgid "HP DesignJet 455CA" msgstr "HP DesignJet 455CA" -#: src/main/xmli18n-tmp.h:600 +#: src/main/xmli18n-tmp.h:652 msgid "HP DesignJet 488CA" msgstr "HP DesignJet 488CA" -#: src/main/xmli18n-tmp.h:601 +#: src/main/xmli18n-tmp.h:653 msgid "HP DesignJet 700" msgstr "HP DesignJet 700" -#: src/main/xmli18n-tmp.h:602 +#: src/main/xmli18n-tmp.h:654 msgid "HP DesignJet 750C Plus" msgstr "HP DesignJet 750C Plus" -#: src/main/xmli18n-tmp.h:603 +#: src/main/xmli18n-tmp.h:655 msgid "HP DesignJet 750C" msgstr "HP DesignJet 750C" -#: src/main/xmli18n-tmp.h:604 +#: src/main/xmli18n-tmp.h:656 msgid "HP DesignJet 2500CP" msgstr "HP DesignJet 2500CP" -#: src/main/xmli18n-tmp.h:605 +#: src/main/xmli18n-tmp.h:657 msgid "HP DesignJet 3500CP" msgstr "HP DesignJet 3500CP" -#: src/main/xmli18n-tmp.h:606 +#: src/main/xmli18n-tmp.h:658 msgid "HP DesignJet ColorPro CAD" msgstr "HP DesignJet ColorPro CAD" -#: src/main/xmli18n-tmp.h:607 +#: src/main/xmli18n-tmp.h:659 msgid "HP DeskJet 400" msgstr "HP DeskJet 400" -#: src/main/xmli18n-tmp.h:608 +#: src/main/xmli18n-tmp.h:660 msgid "HP DeskJet 420C" msgstr "HP DeskJet 420C" -#: src/main/xmli18n-tmp.h:609 +#: src/main/xmli18n-tmp.h:661 msgid "HP DeskJet 450" msgstr "HP DeskJet 450" -#: src/main/xmli18n-tmp.h:610 +#: src/main/xmli18n-tmp.h:662 msgid "HP DeskJet 500" msgstr "HP DeskJet 500" -#: src/main/xmli18n-tmp.h:611 +#: src/main/xmli18n-tmp.h:663 msgid "HP DeskJet 500C" msgstr "HP DeskJet 500C" -#: src/main/xmli18n-tmp.h:612 +#: src/main/xmli18n-tmp.h:664 msgid "HP DeskJet 505J Plus" msgstr "HP DeskJet 505J Plus" -#: src/main/xmli18n-tmp.h:613 +#: src/main/xmli18n-tmp.h:665 msgid "HP DeskJet 510" msgstr "HP DeskJet 510" -#: src/main/xmli18n-tmp.h:614 +#: src/main/xmli18n-tmp.h:666 msgid "HP DeskJet 520" msgstr "HP DeskJet 520" -#: src/main/xmli18n-tmp.h:615 +#: src/main/xmli18n-tmp.h:667 msgid "HP DeskJet 540C" msgstr "HP DeskJet 540C" -#: src/main/xmli18n-tmp.h:616 +#: src/main/xmli18n-tmp.h:668 msgid "HP DeskJet 550C" msgstr "HP DeskJet 550C" -#: src/main/xmli18n-tmp.h:617 +#: src/main/xmli18n-tmp.h:669 msgid "HP DeskJet 5550" msgstr "HP DeskJet 5550" -#: src/main/xmli18n-tmp.h:618 +#: src/main/xmli18n-tmp.h:670 msgid "HP DeskJet 5551" msgstr "HP DeskJet 5551" -#: src/main/xmli18n-tmp.h:619 +#: src/main/xmli18n-tmp.h:671 msgid "HP DeskJet 560C" msgstr "HP DeskJet 560C" -#: src/main/xmli18n-tmp.h:620 +#: src/main/xmli18n-tmp.h:672 msgid "HP DeskJet 600" msgstr "HP DeskJet 600" -#: src/main/xmli18n-tmp.h:621 +#: src/main/xmli18n-tmp.h:673 msgid "HP DeskJet 600C" msgstr "HP DeskJet 600C" -#: src/main/xmli18n-tmp.h:622 +#: src/main/xmli18n-tmp.h:674 msgid "HP DeskJet 610C" msgstr "HP DeskJet 610C" -#: src/main/xmli18n-tmp.h:623 +#: src/main/xmli18n-tmp.h:675 msgid "HP DeskJet 610CL" msgstr "HP DeskJet 610CL" -#: src/main/xmli18n-tmp.h:624 +#: src/main/xmli18n-tmp.h:676 msgid "HP DeskJet 6122" msgstr "HP DeskJet 6122" -#: src/main/xmli18n-tmp.h:625 +#: src/main/xmli18n-tmp.h:677 msgid "HP DeskJet 6127" msgstr "HP DeskJet 6127" -#: src/main/xmli18n-tmp.h:626 +#: src/main/xmli18n-tmp.h:678 msgid "HP DeskJet 612C" msgstr "HP DeskJet 612C" -#: src/main/xmli18n-tmp.h:627 +#: src/main/xmli18n-tmp.h:679 msgid "HP DeskJet 640C" msgstr "HP DeskJet 640C" -#: src/main/xmli18n-tmp.h:628 +#: src/main/xmli18n-tmp.h:680 msgid "HP DeskJet 648C" msgstr "HP DeskJet 648C" -#: src/main/xmli18n-tmp.h:629 +#: src/main/xmli18n-tmp.h:681 msgid "HP DeskJet 660C" msgstr "HP DeskJet 660C" -#: src/main/xmli18n-tmp.h:630 +#: src/main/xmli18n-tmp.h:682 msgid "HP DeskJet 670C" msgstr "HP DeskJet 670C" -#: src/main/xmli18n-tmp.h:631 +#: src/main/xmli18n-tmp.h:683 msgid "HP DeskJet 670TV" msgstr "HP DeskJet 670TV" -#: src/main/xmli18n-tmp.h:632 +#: src/main/xmli18n-tmp.h:684 msgid "HP DeskJet 672C" msgstr "HP DeskJet 672C" -#: src/main/xmli18n-tmp.h:633 +#: src/main/xmli18n-tmp.h:685 msgid "HP DeskJet 680C" msgstr "HP DeskJet 680C" -#: src/main/xmli18n-tmp.h:634 +#: src/main/xmli18n-tmp.h:686 msgid "HP DeskJet 682C" msgstr "HP DeskJet 682C" -#: src/main/xmli18n-tmp.h:635 +#: src/main/xmli18n-tmp.h:687 msgid "HP DeskJet 690C" msgstr "HP DeskJet 690C" -#: src/main/xmli18n-tmp.h:636 +#: src/main/xmli18n-tmp.h:688 msgid "HP DeskJet 692C" msgstr "HP DeskJet 692C" -#: src/main/xmli18n-tmp.h:637 +#: src/main/xmli18n-tmp.h:689 msgid "HP DeskJet 693C" msgstr "HP DeskJet 693C" -#: src/main/xmli18n-tmp.h:638 +#: src/main/xmli18n-tmp.h:690 msgid "HP DeskJet 694C" msgstr "HP DeskJet 694C" -#: src/main/xmli18n-tmp.h:639 +#: src/main/xmli18n-tmp.h:691 msgid "HP DeskJet 695C" msgstr "HP DeskJet 695C" -#: src/main/xmli18n-tmp.h:640 +#: src/main/xmli18n-tmp.h:692 msgid "HP DeskJet 697C" msgstr "HP DeskJet 697C" -#: src/main/xmli18n-tmp.h:641 +#: src/main/xmli18n-tmp.h:693 msgid "HP DeskJet 810C" msgstr "HP DeskJet 810C" -#: src/main/xmli18n-tmp.h:642 +#: src/main/xmli18n-tmp.h:694 msgid "HP DeskJet 812C" msgstr "HP DeskJet 812C" -#: src/main/xmli18n-tmp.h:643 +#: src/main/xmli18n-tmp.h:695 msgid "HP DeskJet 815C" msgstr "HP DeskJet 815C" -#: src/main/xmli18n-tmp.h:644 +#: src/main/xmli18n-tmp.h:696 msgid "HP DeskJet 816C" msgstr "HP DeskJet 816C" -#: src/main/xmli18n-tmp.h:645 +#: src/main/xmli18n-tmp.h:697 msgid "HP DeskJet 825C" msgstr "HP DeskJet 825C" -#: src/main/xmli18n-tmp.h:646 +#: src/main/xmli18n-tmp.h:698 msgid "HP DeskJet 830C" msgstr "HP DeskJet 830C" -#: src/main/xmli18n-tmp.h:647 +#: src/main/xmli18n-tmp.h:699 msgid "HP DeskJet 832C" msgstr "HP DeskJet 832C" -#: src/main/xmli18n-tmp.h:648 +#: src/main/xmli18n-tmp.h:700 msgid "HP DeskJet 840C" msgstr "HP DeskJet 840C" -#: src/main/xmli18n-tmp.h:649 +#: src/main/xmli18n-tmp.h:701 msgid "HP DeskJet 841C" msgstr "HP DeskJet 841C" -#: src/main/xmli18n-tmp.h:650 +#: src/main/xmli18n-tmp.h:702 msgid "HP DeskJet 842C" msgstr "HP DeskJet 842C" -#: src/main/xmli18n-tmp.h:651 +#: src/main/xmli18n-tmp.h:703 msgid "HP DeskJet 843C" msgstr "HP DeskJet 843C" -#: src/main/xmli18n-tmp.h:652 +#: src/main/xmli18n-tmp.h:704 msgid "HP DeskJet 845C" msgstr "HP DeskJet 845C" -#: src/main/xmli18n-tmp.h:653 +#: src/main/xmli18n-tmp.h:705 msgid "HP DeskJet 850C" msgstr "HP DeskJet 850C" -#: src/main/xmli18n-tmp.h:654 +#: src/main/xmli18n-tmp.h:706 msgid "HP DeskJet 855C" msgstr "HP DeskJet 855C" -#: src/main/xmli18n-tmp.h:655 +#: src/main/xmli18n-tmp.h:707 msgid "HP DeskJet 870C" msgstr "HP DeskJet 870C" -#: src/main/xmli18n-tmp.h:656 +#: src/main/xmli18n-tmp.h:708 msgid "HP DeskJet 880C" msgstr "HP DeskJet 880C" -#: src/main/xmli18n-tmp.h:657 +#: src/main/xmli18n-tmp.h:709 msgid "HP DeskJet 882C" msgstr "HP DeskJet 882C" -#: src/main/xmli18n-tmp.h:658 +#: src/main/xmli18n-tmp.h:710 msgid "HP DeskJet 890C" msgstr "HP DeskJet 890C" -#: src/main/xmli18n-tmp.h:659 +#: src/main/xmli18n-tmp.h:711 msgid "HP DeskJet 895C" msgstr "HP DeskJet 895C" -#: src/main/xmli18n-tmp.h:660 +#: src/main/xmli18n-tmp.h:712 msgid "HP DeskJet 916C" msgstr "HP DeskJet 916C" -#: src/main/xmli18n-tmp.h:661 +#: src/main/xmli18n-tmp.h:713 msgid "HP DeskJet 920C" msgstr "HP DeskJet 920C" -#: src/main/xmli18n-tmp.h:662 +#: src/main/xmli18n-tmp.h:714 msgid "HP DeskJet 9300" msgstr "HP DeskJet 9300" -#: src/main/xmli18n-tmp.h:663 +#: src/main/xmli18n-tmp.h:715 msgid "HP DeskJet 930C" msgstr "HP DeskJet 930C" -#: src/main/xmli18n-tmp.h:664 +#: src/main/xmli18n-tmp.h:716 msgid "HP DeskJet 932C" msgstr "HP DeskJet 932C" -#: src/main/xmli18n-tmp.h:665 +#: src/main/xmli18n-tmp.h:717 msgid "HP DeskJet 933C" msgstr "HP DeskJet 933C" -#: src/main/xmli18n-tmp.h:666 +#: src/main/xmli18n-tmp.h:718 msgid "HP DeskJet 934C" msgstr "HP DeskJet 934C" -#: src/main/xmli18n-tmp.h:667 +#: src/main/xmli18n-tmp.h:719 msgid "HP DeskJet 935C" msgstr "HP DeskJet 935C" -#: src/main/xmli18n-tmp.h:668 +#: src/main/xmli18n-tmp.h:720 msgid "HP DeskJet 940C" msgstr "HP DeskJet 940C" -#: src/main/xmli18n-tmp.h:669 +#: src/main/xmli18n-tmp.h:721 msgid "HP DeskJet 948C" msgstr "HP DeskJet 948C" -#: src/main/xmli18n-tmp.h:670 +#: src/main/xmli18n-tmp.h:722 msgid "HP DeskJet 950C" msgstr "HP DeskJet 950C" -#: src/main/xmli18n-tmp.h:671 +#: src/main/xmli18n-tmp.h:723 msgid "HP DeskJet 952C" msgstr "HP DeskJet 952C" -#: src/main/xmli18n-tmp.h:672 +#: src/main/xmli18n-tmp.h:724 msgid "HP DeskJet 955C" msgstr "HP DeskJet 955C" -#: src/main/xmli18n-tmp.h:673 +#: src/main/xmli18n-tmp.h:725 msgid "HP DeskJet 957C" msgstr "HP DeskJet 957C" -#: src/main/xmli18n-tmp.h:674 +#: src/main/xmli18n-tmp.h:726 msgid "HP DeskJet 959C" msgstr "HP DeskJet 959C" -#: src/main/xmli18n-tmp.h:675 +#: src/main/xmli18n-tmp.h:727 msgid "HP DeskJet 960C" msgstr "HP DeskJet 960C" -#: src/main/xmli18n-tmp.h:676 +#: src/main/xmli18n-tmp.h:728 msgid "HP DeskJet 970C" msgstr "HP DeskJet 970C" -#: src/main/xmli18n-tmp.h:677 +#: src/main/xmli18n-tmp.h:729 msgid "HP DeskJet 975C" msgstr "HP DeskJet 975C" -#: src/main/xmli18n-tmp.h:678 +#: src/main/xmli18n-tmp.h:730 msgid "HP DeskJet 980C" msgstr "HP DeskJet 980C" -#: src/main/xmli18n-tmp.h:679 +#: src/main/xmli18n-tmp.h:731 msgid "HP DeskJet 990C" msgstr "HP DeskJet 990C" -#: src/main/xmli18n-tmp.h:680 +#: src/main/xmli18n-tmp.h:732 msgid "HP DeskJet 995C" msgstr "HP DeskJet 995C" -#: src/main/xmli18n-tmp.h:681 +#: src/main/xmli18n-tmp.h:733 msgid "HP DeskJet 1100C" msgstr "HP DeskJet 1100C" -#: src/main/xmli18n-tmp.h:682 +#: src/main/xmli18n-tmp.h:734 msgid "HP DeskJet 1120C" msgstr "HP DeskJet 1120C" -#: src/main/xmli18n-tmp.h:683 +#: src/main/xmli18n-tmp.h:735 msgid "HP DeskJet 1125C" msgstr "HP DeskJet 1125C" -#: src/main/xmli18n-tmp.h:684 +#: src/main/xmli18n-tmp.h:736 msgid "HP DeskJet 1200C" msgstr "HP DeskJet 1200C" -#: src/main/xmli18n-tmp.h:685 +#: src/main/xmli18n-tmp.h:737 msgid "HP DeskJet 1220C" msgstr "HP DeskJet 1220C" -#: src/main/xmli18n-tmp.h:686 +#: src/main/xmli18n-tmp.h:738 msgid "HP DeskJet 1600C" msgstr "HP DeskJet 1600C" -#: src/main/xmli18n-tmp.h:687 +#: src/main/xmli18n-tmp.h:739 msgid "HP DeskJet 1600CM" msgstr "HP DeskJet 1600CM" -#: src/main/xmli18n-tmp.h:688 +#: src/main/xmli18n-tmp.h:740 msgid "HP DeskJet 2000" msgstr "HP DeskJet 2000" -#: src/main/xmli18n-tmp.h:689 +#: src/main/xmli18n-tmp.h:741 msgid "HP DeskJet 2500" msgstr "HP DeskJet 2500" -#: src/main/xmli18n-tmp.h:690 +#: src/main/xmli18n-tmp.h:742 msgid "HP DeskJet 2500CM" msgstr "HP DeskJet 2500CM" -#: src/main/xmli18n-tmp.h:691 +#: src/main/xmli18n-tmp.h:743 msgid "HP DeskJet 340C" msgstr "HP DeskJet 340C" -#: src/main/xmli18n-tmp.h:692 +#: src/main/xmli18n-tmp.h:744 msgid "HP DeskJet 3810" msgstr "HP DeskJet 3810" -#: src/main/xmli18n-tmp.h:693 +#: src/main/xmli18n-tmp.h:745 msgid "HP DeskJet 3816" msgstr "HP DeskJet 3816" -#: src/main/xmli18n-tmp.h:694 +#: src/main/xmli18n-tmp.h:746 msgid "HP DeskJet 3820" msgstr "HP DeskJet 3820" -#: src/main/xmli18n-tmp.h:695 +#: src/main/xmli18n-tmp.h:747 msgid "HP DeskJet 3822" msgstr "HP DeskJet 3822" -#: src/main/xmli18n-tmp.h:696 +#: src/main/xmli18n-tmp.h:748 msgid "HP LaserJet 2" msgstr "HP LaserJet 2" -#: src/main/xmli18n-tmp.h:697 +#: src/main/xmli18n-tmp.h:749 msgid "HP LaserJet 2D" msgstr "HP LaserJet 2D" -#: src/main/xmli18n-tmp.h:698 +#: src/main/xmli18n-tmp.h:750 msgid "HP LaserJet 2P Plus" msgstr "HP LaserJet 2P Plus" -#: src/main/xmli18n-tmp.h:699 +#: src/main/xmli18n-tmp.h:751 msgid "HP LaserJet 2P" msgstr "HP LaserJet 2P" -#: src/main/xmli18n-tmp.h:700 +#: src/main/xmli18n-tmp.h:752 msgid "HP LaserJet 3" msgstr "HP LaserJet 3" -#: src/main/xmli18n-tmp.h:701 +#: src/main/xmli18n-tmp.h:753 msgid "HP LaserJet 3D" msgstr "HP LaserJet 3D" -#: src/main/xmli18n-tmp.h:702 +#: src/main/xmli18n-tmp.h:754 msgid "HP LaserJet 3P w/ PCL5" msgstr "HP LaserJet 3P w/ PCL5" -#: src/main/xmli18n-tmp.h:703 +#: src/main/xmli18n-tmp.h:755 msgid "HP LaserJet 3P w/PS" msgstr "HP LaserJet 3P w/PS" -#: src/main/xmli18n-tmp.h:704 +#: src/main/xmli18n-tmp.h:756 msgid "HP LaserJet 4 Plus" msgstr "HP LaserJet 4 Plus" -#: src/main/xmli18n-tmp.h:705 +#: src/main/xmli18n-tmp.h:757 msgid "HP LaserJet 4" msgstr "HP LaserJet 4" -#: src/main/xmli18n-tmp.h:706 +#: src/main/xmli18n-tmp.h:758 msgid "HP LaserJet 4L" msgstr "HP LaserJet 4L" -#: src/main/xmli18n-tmp.h:707 +#: src/main/xmli18n-tmp.h:759 msgid "HP LaserJet 4M" msgstr "HP LaserJet 4M" -#: src/main/xmli18n-tmp.h:708 +#: src/main/xmli18n-tmp.h:760 msgid "HP LaserJet 4ML" msgstr "HP LaserJet 4ML" -#: src/main/xmli18n-tmp.h:709 +#: src/main/xmli18n-tmp.h:761 msgid "HP LaserJet 4P" msgstr "HP LaserJet 4P" -#: src/main/xmli18n-tmp.h:710 +#: src/main/xmli18n-tmp.h:762 msgid "HP LaserJet 4Si" msgstr "HP LaserJet 4Si" -#: src/main/xmli18n-tmp.h:711 +#: src/main/xmli18n-tmp.h:763 msgid "HP LaserJet 4V" msgstr "HP LaserJet 4V" -#: src/main/xmli18n-tmp.h:712 +#: src/main/xmli18n-tmp.h:764 msgid "HP LaserJet 5" msgstr "HP LaserJet 5" -#: src/main/xmli18n-tmp.h:713 +#: src/main/xmli18n-tmp.h:765 msgid "HP LaserJet 5L" msgstr "HP LaserJet 5L" -#: src/main/xmli18n-tmp.h:714 +#: src/main/xmli18n-tmp.h:766 msgid "HP LaserJet 5M" msgstr "HP LaserJet 5M" -#: src/main/xmli18n-tmp.h:715 +#: src/main/xmli18n-tmp.h:767 msgid "HP LaserJet 5MP" msgstr "HP LaserJet 5MP" -#: src/main/xmli18n-tmp.h:716 +#: src/main/xmli18n-tmp.h:768 msgid "HP LaserJet 5P" msgstr "HP LaserJet 5P" -#: src/main/xmli18n-tmp.h:717 +#: src/main/xmli18n-tmp.h:769 msgid "HP LaserJet 5Si" msgstr "HP LaserJet 5Si" -#: src/main/xmli18n-tmp.h:718 +#: src/main/xmli18n-tmp.h:770 msgid "HP LaserJet 6" msgstr "HP LaserJet 6" -#: src/main/xmli18n-tmp.h:719 +#: src/main/xmli18n-tmp.h:771 msgid "HP LaserJet 6L" msgstr "HP LaserJet 6L" -#: src/main/xmli18n-tmp.h:720 +#: src/main/xmli18n-tmp.h:772 msgid "HP LaserJet 6MP" msgstr "HP LaserJet 6MP" -#: src/main/xmli18n-tmp.h:721 +#: src/main/xmli18n-tmp.h:773 msgid "HP LaserJet 6P" msgstr "HP LaserJet 6P" -#: src/main/xmli18n-tmp.h:722 +#: src/main/xmli18n-tmp.h:774 msgid "HP LaserJet 1010" msgstr "HP LaserJet 1010" -#: src/main/xmli18n-tmp.h:723 +#: src/main/xmli18n-tmp.h:775 msgid "HP LaserJet 1012" msgstr "HP LaserJet 1012" -#: src/main/xmli18n-tmp.h:724 +#: src/main/xmli18n-tmp.h:776 msgid "HP LaserJet 1015" msgstr "HP LaserJet 1015" -#: src/main/xmli18n-tmp.h:725 +#: src/main/xmli18n-tmp.h:777 #, fuzzy msgid "HP LaserJet 1022" msgstr "HP LaserJet 1012" -#: src/main/xmli18n-tmp.h:726 +#: src/main/xmli18n-tmp.h:778 msgid "HP LaserJet 1100" msgstr "HP LaserJet 1100" -#: src/main/xmli18n-tmp.h:727 +#: src/main/xmli18n-tmp.h:779 msgid "HP LaserJet 1100A" msgstr "HP LaserJet 1100A" -#: src/main/xmli18n-tmp.h:728 +#: src/main/xmli18n-tmp.h:780 msgid "HP LaserJet 1150" msgstr "HP LaserJet 1150" -#: src/main/xmli18n-tmp.h:729 +#: src/main/xmli18n-tmp.h:781 msgid "HP LaserJet 1200" msgstr "HP LaserJet 1200" -#: src/main/xmli18n-tmp.h:730 +#: src/main/xmli18n-tmp.h:782 msgid "HP LaserJet 1220" msgstr "HP LaserJet 1220" -#: src/main/xmli18n-tmp.h:731 +#: src/main/xmli18n-tmp.h:783 msgid "HP LaserJet 1300" msgstr "HP LaserJet 1300" -#: src/main/xmli18n-tmp.h:732 +#: src/main/xmli18n-tmp.h:784 msgid "HP LaserJet 2100" msgstr "HP LaserJet 2100" -#: src/main/xmli18n-tmp.h:733 +#: src/main/xmli18n-tmp.h:785 msgid "HP LaserJet 2100M" msgstr "HP LaserJet 2100M" -#: src/main/xmli18n-tmp.h:734 +#: src/main/xmli18n-tmp.h:786 msgid "HP LaserJet 2200" msgstr "HP LaserJet 2200" -#: src/main/xmli18n-tmp.h:735 +#: src/main/xmli18n-tmp.h:787 msgid "HP LaserJet 2300" msgstr "HP LaserJet 2300" -#: src/main/xmli18n-tmp.h:736 +#: src/main/xmli18n-tmp.h:788 msgid "HP LaserJet 3200" msgstr "HP LaserJet 3200" -#: src/main/xmli18n-tmp.h:737 +#: src/main/xmli18n-tmp.h:789 msgid "HP LaserJet 3200m" msgstr "HP LaserJet 3200m" -#: src/main/xmli18n-tmp.h:738 +#: src/main/xmli18n-tmp.h:790 msgid "HP LaserJet 3200se" msgstr "HP LaserJet 3200se" -#: src/main/xmli18n-tmp.h:739 +#: src/main/xmli18n-tmp.h:791 msgid "HP LaserJet 3300 MFP" msgstr "HP LaserJet 3300 MFP" -#: src/main/xmli18n-tmp.h:740 +#: src/main/xmli18n-tmp.h:792 msgid "HP LaserJet 3310 MFP" msgstr "HP LaserJet 3310 MFP" -#: src/main/xmli18n-tmp.h:741 +#: src/main/xmli18n-tmp.h:793 msgid "HP LaserJet 3320 MFP" msgstr "HP LaserJet 3320 MFP" -#: src/main/xmli18n-tmp.h:742 +#: src/main/xmli18n-tmp.h:794 msgid "HP LaserJet 3320N MFP" msgstr "HP LaserJet 3320N MFP" -#: src/main/xmli18n-tmp.h:743 +#: src/main/xmli18n-tmp.h:795 msgid "HP LaserJet 3330 MFP" msgstr "HP LaserJet 3330 MFP" -#: src/main/xmli18n-tmp.h:744 +#: src/main/xmli18n-tmp.h:796 msgid "HP LaserJet 4000" msgstr "HP LaserJet 4000" -#: src/main/xmli18n-tmp.h:745 +#: src/main/xmli18n-tmp.h:797 msgid "HP LaserJet 4050" msgstr "HP LaserJet 4050" -#: src/main/xmli18n-tmp.h:746 +#: src/main/xmli18n-tmp.h:798 msgid "HP LaserJet 4100" msgstr "HP LaserJet 4100" -#: src/main/xmli18n-tmp.h:747 +#: src/main/xmli18n-tmp.h:799 msgid "HP LaserJet 4200" msgstr "HP LaserJet 4200" -#: src/main/xmli18n-tmp.h:748 +#: src/main/xmli18n-tmp.h:800 msgid "HP LaserJet 4300" msgstr "HP LaserJet 4300" -#: src/main/xmli18n-tmp.h:749 +#: src/main/xmli18n-tmp.h:801 msgid "HP LaserJet 5000" msgstr "HP LaserJet 5000" -#: src/main/xmli18n-tmp.h:750 +#: src/main/xmli18n-tmp.h:802 msgid "HP LaserJet 5100" msgstr "HP LaserJet 5100" -#: src/main/xmli18n-tmp.h:751 +#: src/main/xmli18n-tmp.h:803 msgid "HP LaserJet 8000" msgstr "HP LaserJet 8000" -#: src/main/xmli18n-tmp.h:752 +#: src/main/xmli18n-tmp.h:804 msgid "HP LaserJet 8100" msgstr "HP LaserJet 8100" -#: src/main/xmli18n-tmp.h:753 +#: src/main/xmli18n-tmp.h:805 msgid "HP LaserJet 8150" msgstr "HP LaserJet 8150" -#: src/main/xmli18n-tmp.h:754 +#: src/main/xmli18n-tmp.h:806 msgid "HP LaserJet 9000" msgstr "HP LaserJet 9000" -#: src/main/xmli18n-tmp.h:755 +#: src/main/xmli18n-tmp.h:807 msgid "HP Mopier 240" msgstr "HP Mopier 240" -#: src/main/xmli18n-tmp.h:756 +#: src/main/xmli18n-tmp.h:808 msgid "HP Mopier 320" msgstr "HP Mopier 320" -#: src/main/xmli18n-tmp.h:757 +#: src/main/xmli18n-tmp.h:809 msgid "HP OfficeJet 300" msgstr "HP OfficeJet 300" -#: src/main/xmli18n-tmp.h:758 +#: src/main/xmli18n-tmp.h:810 msgid "HP OfficeJet 330" msgstr "HP OfficeJet 330" -#: src/main/xmli18n-tmp.h:759 +#: src/main/xmli18n-tmp.h:811 msgid "HP OfficeJet 350" msgstr "HP OfficeJet 350" -#: src/main/xmli18n-tmp.h:760 +#: src/main/xmli18n-tmp.h:812 msgid "HP OfficeJet 500" msgstr "HP OfficeJet 500" -#: src/main/xmli18n-tmp.h:761 +#: src/main/xmli18n-tmp.h:813 msgid "HP OfficeJet 520" msgstr "HP OfficeJet 520" -#: src/main/xmli18n-tmp.h:762 +#: src/main/xmli18n-tmp.h:814 msgid "HP OfficeJet 570" msgstr "HP OfficeJet 570" -#: src/main/xmli18n-tmp.h:763 +#: src/main/xmli18n-tmp.h:815 msgid "HP OfficeJet 580" msgstr "HP OfficeJet 580" -#: src/main/xmli18n-tmp.h:764 +#: src/main/xmli18n-tmp.h:816 msgid "HP OfficeJet 590" msgstr "HP OfficeJet 590" -#: src/main/xmli18n-tmp.h:765 +#: src/main/xmli18n-tmp.h:817 msgid "HP OfficeJet 600" msgstr "HP OfficeJet 600" -#: src/main/xmli18n-tmp.h:766 +#: src/main/xmli18n-tmp.h:818 msgid "HP OfficeJet 610" msgstr "HP OfficeJet 610" -#: src/main/xmli18n-tmp.h:767 +#: src/main/xmli18n-tmp.h:819 msgid "HP OfficeJet 625" msgstr "HP OfficeJet 625" -#: src/main/xmli18n-tmp.h:768 +#: src/main/xmli18n-tmp.h:820 msgid "HP OfficeJet 630" msgstr "HP OfficeJet 630" -#: src/main/xmli18n-tmp.h:769 +#: src/main/xmli18n-tmp.h:821 msgid "HP OfficeJet 635" msgstr "HP OfficeJet 635" -#: src/main/xmli18n-tmp.h:770 +#: src/main/xmli18n-tmp.h:822 msgid "HP OfficeJet 700" msgstr "HP OfficeJet 700" -#: src/main/xmli18n-tmp.h:771 +#: src/main/xmli18n-tmp.h:823 msgid "HP OfficeJet 710" msgstr "HP OfficeJet 710" -#: src/main/xmli18n-tmp.h:772 +#: src/main/xmli18n-tmp.h:824 msgid "HP OfficeJet 720" msgstr "HP OfficeJet 720" -#: src/main/xmli18n-tmp.h:773 +#: src/main/xmli18n-tmp.h:825 msgid "HP OfficeJet 725" msgstr "HP OfficeJet 725" -#: src/main/xmli18n-tmp.h:774 +#: src/main/xmli18n-tmp.h:826 msgid "HP OfficeJet 5105" msgstr "HP OfficeJet 5105" -#: src/main/xmli18n-tmp.h:775 +#: src/main/xmli18n-tmp.h:827 msgid "HP OfficeJet 5110" msgstr "HP OfficeJet 5110" -#: src/main/xmli18n-tmp.h:776 +#: src/main/xmli18n-tmp.h:828 msgid "HP OfficeJet 5110xi" msgstr "HP OfficeJet 5110xi" -#: src/main/xmli18n-tmp.h:777 +#: src/main/xmli18n-tmp.h:829 msgid "HP OfficeJet 6105" msgstr "HP OfficeJet 6105" -#: src/main/xmli18n-tmp.h:778 +#: src/main/xmli18n-tmp.h:830 msgid "HP OfficeJet 6110" msgstr "HP OfficeJet 6110" -#: src/main/xmli18n-tmp.h:779 +#: src/main/xmli18n-tmp.h:831 msgid "HP OfficeJet 7110" msgstr "HP OfficeJet 7110" -#: src/main/xmli18n-tmp.h:780 +#: src/main/xmli18n-tmp.h:832 msgid "HP OfficeJet 7130" msgstr "HP OfficeJet 7130" -#: src/main/xmli18n-tmp.h:781 +#: src/main/xmli18n-tmp.h:833 msgid "HP OfficeJet 7140" msgstr "HP OfficeJet 7140" -#: src/main/xmli18n-tmp.h:782 +#: src/main/xmli18n-tmp.h:834 msgid "HP OfficeJet D125" msgstr "HP OfficeJet D125" -#: src/main/xmli18n-tmp.h:783 +#: src/main/xmli18n-tmp.h:835 msgid "HP OfficeJet D135" msgstr "HP OfficeJet D135" -#: src/main/xmli18n-tmp.h:784 +#: src/main/xmli18n-tmp.h:836 msgid "HP OfficeJet D145" msgstr "HP OfficeJet D145" -#: src/main/xmli18n-tmp.h:785 +#: src/main/xmli18n-tmp.h:837 msgid "HP OfficeJet D155" msgstr "HP OfficeJet D155" -#: src/main/xmli18n-tmp.h:786 +#: src/main/xmli18n-tmp.h:838 msgid "HP OfficeJet G55" msgstr "HP OfficeJet G55" -#: src/main/xmli18n-tmp.h:787 +#: src/main/xmli18n-tmp.h:839 msgid "HP OfficeJet G85" msgstr "HP OfficeJet G85" -#: src/main/xmli18n-tmp.h:788 +#: src/main/xmli18n-tmp.h:840 msgid "HP OfficeJet G95" msgstr "HP OfficeJet G95" -#: src/main/xmli18n-tmp.h:789 +#: src/main/xmli18n-tmp.h:841 msgid "HP OfficeJet K60" msgstr "HP OfficeJet K60" -#: src/main/xmli18n-tmp.h:790 +#: src/main/xmli18n-tmp.h:842 msgid "HP OfficeJet K60xi" msgstr "HP OfficeJet K60xi" -#: src/main/xmli18n-tmp.h:791 +#: src/main/xmli18n-tmp.h:843 msgid "HP OfficeJet K80" msgstr "HP OfficeJet K80" -#: src/main/xmli18n-tmp.h:792 +#: src/main/xmli18n-tmp.h:844 msgid "HP OfficeJet K80xi" msgstr "HP OfficeJet K80xi" -#: src/main/xmli18n-tmp.h:793 +#: src/main/xmli18n-tmp.h:845 msgid "HP OfficeJet LX" msgstr "HP OfficeJet LX" -#: src/main/xmli18n-tmp.h:794 +#: src/main/xmli18n-tmp.h:846 msgid "HP OfficeJet Pro 1150C" msgstr "HP OfficeJet Pro 1150C" -#: src/main/xmli18n-tmp.h:795 +#: src/main/xmli18n-tmp.h:847 msgid "HP OfficeJet Pro 1170C" msgstr "HP OfficeJet Pro 1170C" -#: src/main/xmli18n-tmp.h:796 +#: src/main/xmli18n-tmp.h:848 msgid "HP OfficeJet Pro 1175C" msgstr "HP OfficeJet Pro 1175C" -#: src/main/xmli18n-tmp.h:797 +#: src/main/xmli18n-tmp.h:849 msgid "HP OfficeJet R40" msgstr "HP OfficeJet R40" -#: src/main/xmli18n-tmp.h:798 +#: src/main/xmli18n-tmp.h:850 msgid "HP OfficeJet R45" msgstr "HP OfficeJet R45" -#: src/main/xmli18n-tmp.h:799 +#: src/main/xmli18n-tmp.h:851 msgid "HP OfficeJet R60" msgstr "HP OfficeJet R60" -#: src/main/xmli18n-tmp.h:800 +#: src/main/xmli18n-tmp.h:852 msgid "HP OfficeJet R65" msgstr "HP OfficeJet R65" -#: src/main/xmli18n-tmp.h:801 +#: src/main/xmli18n-tmp.h:853 msgid "HP OfficeJet R80" msgstr "HP OfficeJet R80" -#: src/main/xmli18n-tmp.h:802 +#: src/main/xmli18n-tmp.h:854 msgid "HP OfficeJet T45" msgstr "HP OfficeJet T45" -#: src/main/xmli18n-tmp.h:803 +#: src/main/xmli18n-tmp.h:855 msgid "HP OfficeJet T65" msgstr "HP OfficeJet T65" -#: src/main/xmli18n-tmp.h:804 +#: src/main/xmli18n-tmp.h:856 msgid "HP OfficeJet V40" msgstr "HP OfficeJet V40" -#: src/main/xmli18n-tmp.h:805 +#: src/main/xmli18n-tmp.h:857 msgid "HP OfficeJet V40xi" msgstr "HP OfficeJet V40xi" -#: src/main/xmli18n-tmp.h:806 +#: src/main/xmli18n-tmp.h:858 msgid "HP OfficeJet" msgstr "HP OfficeJet" -#: src/main/xmli18n-tmp.h:807 +#: src/main/xmli18n-tmp.h:859 msgid "HP PSC 370" msgstr "HP PSC 370" -#: src/main/xmli18n-tmp.h:808 +#: src/main/xmli18n-tmp.h:860 msgid "HP PSC 380" msgstr "HP PSC 380" -#: src/main/xmli18n-tmp.h:809 +#: src/main/xmli18n-tmp.h:861 msgid "HP PSC 500" msgstr "HP PSC 500" -#: src/main/xmli18n-tmp.h:810 +#: src/main/xmli18n-tmp.h:862 msgid "HP PSC 750" msgstr "HP PSC 750" -#: src/main/xmli18n-tmp.h:811 +#: src/main/xmli18n-tmp.h:863 msgid "HP PSC 950" msgstr "HP PSC 950" -#: src/main/xmli18n-tmp.h:812 +#: src/main/xmli18n-tmp.h:864 msgid "HP PSC 950xi" msgstr "HP PSC 950xi" -#: src/main/xmli18n-tmp.h:813 +#: src/main/xmli18n-tmp.h:865 msgid "HP PSC 2110" msgstr "HP PSC 2110" -#: src/main/xmli18n-tmp.h:814 +#: src/main/xmli18n-tmp.h:866 msgid "HP PSC 2150" msgstr "HP PSC 2150" -#: src/main/xmli18n-tmp.h:815 +#: src/main/xmli18n-tmp.h:867 msgid "HP PSC 2210" msgstr "HP PSC 2210" -#: src/main/xmli18n-tmp.h:816 +#: src/main/xmli18n-tmp.h:868 msgid "HP PhotoSmart 7150" msgstr "HP PhotoSmart 7150" -#: src/main/xmli18n-tmp.h:817 +#: src/main/xmli18n-tmp.h:869 msgid "HP PhotoSmart 7345" msgstr "HP PhotoSmart 7345" -#: src/main/xmli18n-tmp.h:818 +#: src/main/xmli18n-tmp.h:870 msgid "HP PhotoSmart 7350" msgstr "HP PhotoSmart 7350" -#: src/main/xmli18n-tmp.h:819 +#: src/main/xmli18n-tmp.h:871 msgid "HP PhotoSmart 7550" msgstr "HP PhotoSmart 7550" -#: src/main/xmli18n-tmp.h:820 +#: src/main/xmli18n-tmp.h:872 msgid "HP PhotoSmart P100" msgstr "HP PhotoSmart P100" -#: src/main/xmli18n-tmp.h:821 +#: src/main/xmli18n-tmp.h:873 msgid "HP PhotoSmart P130" msgstr "HP PhotoSmart P130" -#: src/main/xmli18n-tmp.h:822 +#: src/main/xmli18n-tmp.h:874 msgid "HP PhotoSmart P230" msgstr "HP PhotoSmart P230" -#: src/main/xmli18n-tmp.h:823 +#: src/main/xmli18n-tmp.h:875 msgid "HP PhotoSmart P1000" msgstr "HP PhotoSmart P1000" -#: src/main/xmli18n-tmp.h:824 +#: src/main/xmli18n-tmp.h:876 msgid "HP PhotoSmart P1100" msgstr "HP PhotoSmart P1100" -#: src/main/xmli18n-tmp.h:825 +#: src/main/xmli18n-tmp.h:877 msgid "HP PhotoSmart P1115" msgstr "HP PhotoSmart P1115" -#: src/main/xmli18n-tmp.h:826 +#: src/main/xmli18n-tmp.h:878 msgid "HP PhotoSmart P1215" msgstr "HP PhotoSmart P1215" -#: src/main/xmli18n-tmp.h:827 +#: src/main/xmli18n-tmp.h:879 msgid "HP PhotoSmart P1218" msgstr "HP PhotoSmart P1218" -#: src/main/xmli18n-tmp.h:828 +#: src/main/xmli18n-tmp.h:880 msgid "HP PhotoSmart P1315" msgstr "HP PhotoSmart P1315" -#: src/main/xmli18n-tmp.h:829 +#: src/main/xmli18n-tmp.h:881 msgid "HP e-printer e20" msgstr "HP e-printer e20" -#: src/main/xmli18n-tmp.h:830 +#: src/main/xmli18n-tmp.h:882 msgid "IBM 4019" msgstr "IBM 4019" -#: src/main/xmli18n-tmp.h:831 +#: src/main/xmli18n-tmp.h:883 msgid "IBM 4029 030 LaserPrinter 10" msgstr "IBM 4029 030 LaserPrinter 10" -#: src/main/xmli18n-tmp.h:832 +#: src/main/xmli18n-tmp.h:884 msgid "IBM 4312" msgstr "IBM 4312" -#: src/main/xmli18n-tmp.h:833 +#: src/main/xmli18n-tmp.h:885 msgid "IBM Infoprint 12" msgstr "IBM Infoprint 12" -#: src/main/xmli18n-tmp.h:834 +#: src/main/xmli18n-tmp.h:886 msgid "IBM Page Printer 3112" msgstr "IBM Page Printer 3112" -#: src/main/xmli18n-tmp.h:835 +#: src/main/xmli18n-tmp.h:887 msgid "Infotec 4651 MF" msgstr "Infotec 4651 MF" -#: src/main/xmli18n-tmp.h:836 +#: src/main/xmli18n-tmp.h:888 msgid "Kyocera F-1010" msgstr "Kyocera F-1010" -#: src/main/xmli18n-tmp.h:837 +#: src/main/xmli18n-tmp.h:889 msgid "Kyocera FS-600 - KPDL-2" msgstr "Kyocera FS-600 - KPDL-2" -#: src/main/xmli18n-tmp.h:838 +#: src/main/xmli18n-tmp.h:890 msgid "Kyocera FS-600" msgstr "Kyocera FS-600" -#: src/main/xmli18n-tmp.h:839 +#: src/main/xmli18n-tmp.h:891 msgid "Kyocera FS-680" msgstr "Kyocera FS-680" -#: src/main/xmli18n-tmp.h:840 +#: src/main/xmli18n-tmp.h:892 msgid "Kyocera FS-800" msgstr "Kyocera FS-800" -#: src/main/xmli18n-tmp.h:841 +#: src/main/xmli18n-tmp.h:893 msgid "Kyocera FS-1000" msgstr "Kyocera FS-1000" -#: src/main/xmli18n-tmp.h:842 +#: src/main/xmli18n-tmp.h:894 msgid "Kyocera FS-1000+" msgstr "Kyocera FS-1000+" -#: src/main/xmli18n-tmp.h:843 +#: src/main/xmli18n-tmp.h:895 msgid "Kyocera FS-1010" msgstr "Kyocera FS-1010" -#: src/main/xmli18n-tmp.h:844 +#: src/main/xmli18n-tmp.h:896 msgid "Kyocera FS-1050" msgstr "Kyocera FS-1050" -#: src/main/xmli18n-tmp.h:845 +#: src/main/xmli18n-tmp.h:897 msgid "Kyocera FS-1200" msgstr "Kyocera FS-1200" -#: src/main/xmli18n-tmp.h:846 +#: src/main/xmli18n-tmp.h:898 msgid "Kyocera FS-1600" msgstr "Kyocera FS-1600" -#: src/main/xmli18n-tmp.h:847 +#: src/main/xmli18n-tmp.h:899 msgid "Kyocera FS-1600+" msgstr "Kyocera FS-1600+" -#: src/main/xmli18n-tmp.h:848 +#: src/main/xmli18n-tmp.h:900 msgid "Kyocera FS-1700" msgstr "Kyocera FS-1700" -#: src/main/xmli18n-tmp.h:849 +#: src/main/xmli18n-tmp.h:901 msgid "Kyocera FS-1700+" msgstr "Kyocera FS-1700+" -#: src/main/xmli18n-tmp.h:850 +#: src/main/xmli18n-tmp.h:902 msgid "Kyocera FS-1750" msgstr "Kyocera FS-1750" -#: src/main/xmli18n-tmp.h:851 +#: src/main/xmli18n-tmp.h:903 msgid "Kyocera FS-1800" msgstr "Kyocera FS-1800" -#: src/main/xmli18n-tmp.h:852 +#: src/main/xmli18n-tmp.h:904 msgid "Kyocera FS-1800+" msgstr "Kyocera FS-1800+" -#: src/main/xmli18n-tmp.h:853 +#: src/main/xmli18n-tmp.h:905 msgid "Kyocera FS-1900" msgstr "Kyocera FS-1900" -#: src/main/xmli18n-tmp.h:854 +#: src/main/xmli18n-tmp.h:906 msgid "Kyocera FS-3500" msgstr "Kyocera FS-3500" -#: src/main/xmli18n-tmp.h:855 +#: src/main/xmli18n-tmp.h:907 msgid "Kyocera FS-3600" msgstr "Kyocera FS-3600" -#: src/main/xmli18n-tmp.h:856 +#: src/main/xmli18n-tmp.h:908 msgid "Kyocera FS-3600+" msgstr "Kyocera FS-3600+" -#: src/main/xmli18n-tmp.h:857 +#: src/main/xmli18n-tmp.h:909 msgid "Kyocera FS-3700" msgstr "Kyocera FS-3700" -#: src/main/xmli18n-tmp.h:858 +#: src/main/xmli18n-tmp.h:910 msgid "Kyocera FS-3700+" msgstr "Kyocera FS-3700+" -#: src/main/xmli18n-tmp.h:859 +#: src/main/xmli18n-tmp.h:911 msgid "Kyocera FS-3750" msgstr "Kyocera FS-3750" -#: src/main/xmli18n-tmp.h:860 +#: src/main/xmli18n-tmp.h:912 msgid "Kyocera FS-3800" msgstr "Kyocera FS-3800" -#: src/main/xmli18n-tmp.h:861 +#: src/main/xmli18n-tmp.h:913 msgid "Kyocera FS-5800C" msgstr "Kyocera FS-5800C" -#: src/main/xmli18n-tmp.h:862 +#: src/main/xmli18n-tmp.h:914 msgid "Kyocera FS-5900C" msgstr "Kyocera FS-5900C" -#: src/main/xmli18n-tmp.h:863 +#: src/main/xmli18n-tmp.h:915 msgid "Kyocera FS-6500" msgstr "Kyocera FS-6500" -#: src/main/xmli18n-tmp.h:864 +#: src/main/xmli18n-tmp.h:916 msgid "Kyocera FS-6500+" msgstr "Kyocera FS-6500+" -#: src/main/xmli18n-tmp.h:865 +#: src/main/xmli18n-tmp.h:917 msgid "Kyocera FS-6700" msgstr "Kyocera FS-6700" -#: src/main/xmli18n-tmp.h:866 +#: src/main/xmli18n-tmp.h:918 msgid "Kyocera FS-7000" msgstr "Kyocera FS-7000" -#: src/main/xmli18n-tmp.h:867 +#: src/main/xmli18n-tmp.h:919 msgid "Kyocera FS-7000+" msgstr "Kyocera FS-7000+" -#: src/main/xmli18n-tmp.h:868 +#: src/main/xmli18n-tmp.h:920 msgid "Kyocera FS-8000C" msgstr "Kyocera FS-8000C" -#: src/main/xmli18n-tmp.h:869 +#: src/main/xmli18n-tmp.h:921 msgid "Kyocera FS-9000" msgstr "Kyocera FS-9000" -#: src/main/xmli18n-tmp.h:870 +#: src/main/xmli18n-tmp.h:922 msgid "Kyocera FS-9100DN" msgstr "Kyocera FS-9100DN" -#: src/main/xmli18n-tmp.h:871 +#: src/main/xmli18n-tmp.h:923 msgid "Kyocera FS-9500DN" msgstr "Kyocera FS-9500DN" -#: src/main/xmli18n-tmp.h:872 +#: src/main/xmli18n-tmp.h:924 msgid "Kyocera KM-1530" msgstr "Kyocera KM-1530" -#: src/main/xmli18n-tmp.h:873 +#: src/main/xmli18n-tmp.h:925 msgid "Kyocera KM-1810" msgstr "Kyocera KM-1810" -#: src/main/xmli18n-tmp.h:874 +#: src/main/xmli18n-tmp.h:926 msgid "Kyocera KM-2030" msgstr "Kyocera KM-2030" -#: src/main/xmli18n-tmp.h:875 +#: src/main/xmli18n-tmp.h:927 msgid "Kyocera KM-2530" msgstr "Kyocera KM-2530" -#: src/main/xmli18n-tmp.h:876 +#: src/main/xmli18n-tmp.h:928 msgid "Kyocera KM-3530" msgstr "Kyocera KM-3530" -#: src/main/xmli18n-tmp.h:877 +#: src/main/xmli18n-tmp.h:929 msgid "Kyocera KM-4230" msgstr "Kyocera KM-4230" -#: src/main/xmli18n-tmp.h:878 +#: src/main/xmli18n-tmp.h:930 msgid "Kyocera KM-4530" msgstr "Kyocera KM-4530" -#: src/main/xmli18n-tmp.h:879 +#: src/main/xmli18n-tmp.h:931 msgid "Kyocera KM-5230" msgstr "Kyocera KM-5230" -#: src/main/xmli18n-tmp.h:880 +#: src/main/xmli18n-tmp.h:932 msgid "Kyocera KM-5530" msgstr "Kyocera KM-5530" -#: src/main/xmli18n-tmp.h:881 +#: src/main/xmli18n-tmp.h:933 msgid "Kyocera KM-6230" msgstr "Kyocera KM-6230" -#: src/main/xmli18n-tmp.h:882 +#: src/main/xmli18n-tmp.h:934 msgid "Lexmark 4076" msgstr "Lexmark 4076" -#: src/main/xmli18n-tmp.h:883 +#: src/main/xmli18n-tmp.h:935 msgid "Lexmark Optra E" msgstr "Lexmark Optra E" -#: src/main/xmli18n-tmp.h:884 +#: src/main/xmli18n-tmp.h:936 msgid "Lexmark Optra E+" msgstr "Lexmark Optra E+" -#: src/main/xmli18n-tmp.h:885 +#: src/main/xmli18n-tmp.h:937 #, fuzzy msgid "Lexmark Optra E220" msgstr "Lexmark Optra E" -#: src/main/xmli18n-tmp.h:886 +#: src/main/xmli18n-tmp.h:938 msgid "Lexmark Valuewriter 300" msgstr "Lexmark Valuewriter 300" -#: src/main/xmli18n-tmp.h:887 +#: src/main/xmli18n-tmp.h:939 msgid "Minolta PagePro 6" msgstr "Minolta PagePro 6" -#: src/main/xmli18n-tmp.h:888 +#: src/main/xmli18n-tmp.h:940 msgid "Minolta PagePro 6e" msgstr "Minolta PagePro 6e" -#: src/main/xmli18n-tmp.h:889 +#: src/main/xmli18n-tmp.h:941 msgid "Minolta PagePro 6ex" msgstr "Minolta PagePro 6ex" -#: src/main/xmli18n-tmp.h:890 +#: src/main/xmli18n-tmp.h:942 msgid "Minolta PagePro 8" msgstr "Minolta PagePro 8" -#: src/main/xmli18n-tmp.h:891 +#: src/main/xmli18n-tmp.h:943 msgid "Minolta PagePro 8L" msgstr "Minolta PagePro 8L" -#: src/main/xmli18n-tmp.h:892 +#: src/main/xmli18n-tmp.h:944 msgid "Minolta PagePro 1100" msgstr "Minolta PagePro 1100" -#: src/main/xmli18n-tmp.h:893 +#: src/main/xmli18n-tmp.h:945 msgid "NEC SuperScript 660i" msgstr "NEC SuperScript 660i" -#: src/main/xmli18n-tmp.h:894 +#: src/main/xmli18n-tmp.h:946 msgid "NEC SuperScript 860" msgstr "NEC SuperScript 860" -#: src/main/xmli18n-tmp.h:895 +#: src/main/xmli18n-tmp.h:947 msgid "NEC SuperScript 870" msgstr "NEC SuperScript 870" -#: src/main/xmli18n-tmp.h:896 +#: src/main/xmli18n-tmp.h:948 msgid "NEC SuperScript 1260" msgstr "NEC SuperScript 1260" -#: src/main/xmli18n-tmp.h:897 +#: src/main/xmli18n-tmp.h:949 msgid "NEC SuperScript 1400" msgstr "NEC SuperScript 1400" -#: src/main/xmli18n-tmp.h:898 +#: src/main/xmli18n-tmp.h:950 msgid "NEC SuperScript 1800" msgstr "NEC SuperScript 1800" -#: src/main/xmli18n-tmp.h:899 +#: src/main/xmli18n-tmp.h:951 msgid "Okidata OL400" msgstr "Okidata OL400" -#: src/main/xmli18n-tmp.h:900 +#: src/main/xmli18n-tmp.h:952 msgid "Okidata OL400e" msgstr "Okidata OL400e" -#: src/main/xmli18n-tmp.h:901 +#: src/main/xmli18n-tmp.h:953 msgid "Okidata OL400ex" msgstr "Okidata OL400ex" -#: src/main/xmli18n-tmp.h:902 +#: src/main/xmli18n-tmp.h:954 msgid "Okidata OL410e" msgstr "Okidata OL410e" -#: src/main/xmli18n-tmp.h:903 +#: src/main/xmli18n-tmp.h:955 msgid "Okidata OL600e" msgstr "Okidata OL600e" -#: src/main/xmli18n-tmp.h:904 +#: src/main/xmli18n-tmp.h:956 msgid "Okidata OL610e/S" msgstr "Okidata OL610e/S" -#: src/main/xmli18n-tmp.h:905 +#: src/main/xmli18n-tmp.h:957 msgid "Okidata OL800" msgstr "Okidata OL800" -#: src/main/xmli18n-tmp.h:906 +#: src/main/xmli18n-tmp.h:958 msgid "Okidata OL810ex" msgstr "Okidata OL810ex" -#: src/main/xmli18n-tmp.h:907 +#: src/main/xmli18n-tmp.h:959 msgid "Okidata Okipage 6e" msgstr "Okidata Okipage 6e" -#: src/main/xmli18n-tmp.h:908 +#: src/main/xmli18n-tmp.h:960 msgid "Okidata Okipage 6ex" msgstr "Okidata Okipage 6ex" -#: src/main/xmli18n-tmp.h:909 +#: src/main/xmli18n-tmp.h:961 msgid "Okidata Okipage 8p" msgstr "Okidata Okipage 8p" -#: src/main/xmli18n-tmp.h:910 +#: src/main/xmli18n-tmp.h:962 msgid "Okidata Okipage 10e" msgstr "Okidata Okipage 10e" -#: src/main/xmli18n-tmp.h:911 +#: src/main/xmli18n-tmp.h:963 msgid "Okidata Okipage 10ex" msgstr "Okidata Okipage 10ex" -#: src/main/xmli18n-tmp.h:912 +#: src/main/xmli18n-tmp.h:964 msgid "Okidata Okipage 14ex" msgstr "Okidata Okipage 14ex" -#: src/main/xmli18n-tmp.h:913 +#: src/main/xmli18n-tmp.h:965 msgid "Okidata Super 6e" msgstr "Okidata Super 6e" -#: src/main/xmli18n-tmp.h:914 +#: src/main/xmli18n-tmp.h:966 msgid "Olivetti JP350S" msgstr "Olivetti JP350S" -#: src/main/xmli18n-tmp.h:915 +#: src/main/xmli18n-tmp.h:967 msgid "Olivetti PG 306" msgstr "Olivetti PG 306" -#: src/main/xmli18n-tmp.h:916 +#: src/main/xmli18n-tmp.h:968 msgid "PCPI 1030" msgstr "PCPI 1030" -#: src/main/xmli18n-tmp.h:917 +#: src/main/xmli18n-tmp.h:969 msgid "Panasonic KX-P4410" msgstr "Panasonic KX-P4410" -#: src/main/xmli18n-tmp.h:918 +#: src/main/xmli18n-tmp.h:970 msgid "Panasonic KX-P4450" msgstr "Panasonic KX-P4450" -#: src/main/xmli18n-tmp.h:919 +#: src/main/xmli18n-tmp.h:971 msgid "Panasonic KX-P6150" msgstr "Panasonic KX-P6150" -#: src/main/xmli18n-tmp.h:920 +#: src/main/xmli18n-tmp.h:972 msgid "Panasonic KX-P6500" msgstr "Panasonic KX-P6500" -#: src/main/xmli18n-tmp.h:921 +#: src/main/xmli18n-tmp.h:973 msgid "Raven LP-410" msgstr "Raven LP-410" -#: src/main/xmli18n-tmp.h:922 +#: src/main/xmli18n-tmp.h:974 msgid "Ricoh Aficio 220" msgstr "Ricoh Aficio 220" -#: src/main/xmli18n-tmp.h:923 +#: src/main/xmli18n-tmp.h:975 msgid "Ricoh Aficio 401" msgstr "Ricoh Aficio 401" -#: src/main/xmli18n-tmp.h:924 +#: src/main/xmli18n-tmp.h:976 msgid "Ricoh Aficio 700" msgstr "Ricoh Aficio 700" -#: src/main/xmli18n-tmp.h:925 +#: src/main/xmli18n-tmp.h:977 msgid "Samsung ML-85" msgstr "Samsung ML-85" -#: src/main/xmli18n-tmp.h:926 +#: src/main/xmli18n-tmp.h:978 msgid "Samsung ML-4600" msgstr "Samsung ML-4600" -#: src/main/xmli18n-tmp.h:927 +#: src/main/xmli18n-tmp.h:979 msgid "Samsung ML-5000a" msgstr "Samsung ML-5000a" -#: src/main/xmli18n-tmp.h:928 +#: src/main/xmli18n-tmp.h:980 msgid "Samsung ML-6000" msgstr "Samsung ML-6000" -#: src/main/xmli18n-tmp.h:929 +#: src/main/xmli18n-tmp.h:981 msgid "Samsung ML-6100" msgstr "Samsung ML-6100" -#: src/main/xmli18n-tmp.h:930 +#: src/main/xmli18n-tmp.h:982 msgid "Samsung ML-7000" msgstr "Samsung ML-7000" -#: src/main/xmli18n-tmp.h:931 +#: src/main/xmli18n-tmp.h:983 msgid "Samsung ML-7000N" msgstr "Samsung ML-7000N" -#: src/main/xmli18n-tmp.h:932 +#: src/main/xmli18n-tmp.h:984 msgid "Samsung ML-7000P" msgstr "Samsung ML-7000P" -#: src/main/xmli18n-tmp.h:933 +#: src/main/xmli18n-tmp.h:985 msgid "Samsung ML-7050" msgstr "Samsung ML-7050" -#: src/main/xmli18n-tmp.h:934 +#: src/main/xmli18n-tmp.h:986 msgid "Samsung QL-5100A" msgstr "Samsung QL-5100A" -#: src/main/xmli18n-tmp.h:935 +#: src/main/xmli18n-tmp.h:987 msgid "Samsung QL-6050" msgstr "Samsung QL-6050" -#: src/main/xmli18n-tmp.h:936 +#: src/main/xmli18n-tmp.h:988 msgid "Seiko SpeedJET 200" msgstr "Seiko SpeedJET 200" -#: src/main/xmli18n-tmp.h:937 +#: src/main/xmli18n-tmp.h:989 msgid "Sharp AR-161" msgstr "Sharp AR-161" -#: src/main/xmli18n-tmp.h:938 +#: src/main/xmli18n-tmp.h:990 #, fuzzy msgid "Sharp AR-M257" msgstr "Sharp AR-161" -#: src/main/xmli18n-tmp.h:939 +#: src/main/xmli18n-tmp.h:991 msgid "Sony IJP-V100" msgstr "Sony IJP-V100" -#: src/main/xmli18n-tmp.h:940 +#: src/main/xmli18n-tmp.h:992 msgid "Star LS-04" msgstr "Star LS-04" -#: src/main/xmli18n-tmp.h:941 +#: src/main/xmli18n-tmp.h:993 msgid "Star LaserPrinter 8" msgstr "Star LaserPrinter 8" -#: src/main/xmli18n-tmp.h:942 +#: src/main/xmli18n-tmp.h:994 msgid "Tally MT908" msgstr "Tally MT908" -#: src/main/xmli18n-tmp.h:943 +#: src/main/xmli18n-tmp.h:995 msgid "Xerox Able 1406" msgstr "Xerox Able 1406" -#: src/main/xmli18n-tmp.h:944 +#: src/main/xmli18n-tmp.h:996 msgid "Xerox DocuPrint 4508" msgstr "Xerox DocuPrint 4508" -#: src/main/xmli18n-tmp.h:945 +#: src/main/xmli18n-tmp.h:997 msgid "Xerox DocuPrint C20" msgstr "Xerox DocuPrint C20" -#: src/main/xmli18n-tmp.h:946 +#: src/main/xmli18n-tmp.h:998 msgid "Xerox DocuPrint N4512" msgstr "Xerox DocuPrint N4512" -#: src/main/xmli18n-tmp.h:947 +#: src/main/xmli18n-tmp.h:999 msgid "Xerox DocuPrint N4512PS" msgstr "Xerox DocuPrint N4512PS" -#: src/main/xmli18n-tmp.h:948 +#: src/main/xmli18n-tmp.h:1000 msgid "Xerox DocuPrint P12" msgstr "Xerox DocuPrint P12" -#: src/main/xmli18n-tmp.h:949 +#: src/main/xmli18n-tmp.h:1001 msgid "Xerox DocuPrint P1202" msgstr "Xerox DocuPrint P1202" -#: src/main/xmli18n-tmp.h:950 +#: src/main/xmli18n-tmp.h:1002 msgid "Xerox DocuPrint P8e" msgstr "Xerox DocuPrint P8e" -#: src/main/xmli18n-tmp.h:951 +#: src/main/xmli18n-tmp.h:1003 msgid "Xerox Document Centre 400" msgstr "Xerox Document Centre 400" -#: src/main/xmli18n-tmp.h:952 +#: src/main/xmli18n-tmp.h:1004 #, fuzzy msgid "Xerox WorkCentre M118" msgstr "Xerox Document Centre 400" -#: src/main/xmli18n-tmp.h:953 +#: src/main/xmli18n-tmp.h:1005 msgid "Compaq IJ1200" msgstr "" -#: src/main/xmli18n-tmp.h:954 +#: src/main/xmli18n-tmp.h:1006 #, fuzzy msgid "Lexmark X73" msgstr "Lexmark Z43" -#: src/main/xmli18n-tmp.h:955 +#: src/main/xmli18n-tmp.h:1007 msgid "Lexmark Z42" msgstr "Lexmark Z42" -#: src/main/xmli18n-tmp.h:956 +#: src/main/xmli18n-tmp.h:1008 msgid "Lexmark Z43" msgstr "Lexmark Z43" -#: src/main/xmli18n-tmp.h:957 +#: src/main/xmli18n-tmp.h:1009 msgid "Lexmark Z52" msgstr "Lexmark Z52" -#: src/main/xmli18n-tmp.h:958 +#: src/main/xmli18n-tmp.h:1010 msgid "Lexmark Z53" msgstr "Lexmark Z53" -#: src/main/xmli18n-tmp.h:959 +#: src/main/xmli18n-tmp.h:1011 msgid "Olympus P-10" msgstr "Olympus P-10" -#: src/main/xmli18n-tmp.h:960 +#: src/main/xmli18n-tmp.h:1012 msgid "Olympus P-11" msgstr "Olympus P-11" -#: src/main/xmli18n-tmp.h:961 +#: src/main/xmli18n-tmp.h:1013 msgid "Olympus P-200" msgstr "Olympus P-200" -#: src/main/xmli18n-tmp.h:962 +#: src/main/xmli18n-tmp.h:1014 msgid "Olympus P-300" msgstr "Olympus P-300" -#: src/main/xmli18n-tmp.h:963 +#: src/main/xmli18n-tmp.h:1015 msgid "Olympus P-300E" msgstr "Olympus P-300E" -#: src/main/xmli18n-tmp.h:964 +#: src/main/xmli18n-tmp.h:1016 msgid "Olympus P-300U" msgstr "Olympus P-300U" -#: src/main/xmli18n-tmp.h:965 +#: src/main/xmli18n-tmp.h:1017 msgid "Olympus P-330E" msgstr "Olympus P-330E" -#: src/main/xmli18n-tmp.h:966 +#: src/main/xmli18n-tmp.h:1018 msgid "Olympus P-330NE" msgstr "Olympus P-330NE" -#: src/main/xmli18n-tmp.h:967 +#: src/main/xmli18n-tmp.h:1019 msgid "Olympus P-400" msgstr "Olympus P-400" -#: src/main/xmli18n-tmp.h:968 +#: src/main/xmli18n-tmp.h:1020 msgid "Olympus P-440" msgstr "Olympus P-440" -#: src/main/xmli18n-tmp.h:969 +#: src/main/xmli18n-tmp.h:1021 #, fuzzy msgid "Olympus P-S100" msgstr "Olympus P-10" -#: src/main/xmli18n-tmp.h:970 +#: src/main/xmli18n-tmp.h:1022 #, fuzzy msgid "Canon CP-10" msgstr "Canon CP-100" -#: src/main/xmli18n-tmp.h:971 +#: src/main/xmli18n-tmp.h:1023 msgid "Canon CP-100" msgstr "Canon CP-100" -#: src/main/xmli18n-tmp.h:972 +#: src/main/xmli18n-tmp.h:1024 msgid "Canon CP-200" msgstr "Canon CP-200" -#: src/main/xmli18n-tmp.h:973 +#: src/main/xmli18n-tmp.h:1025 msgid "Canon CP-220" msgstr "Canon CP-220" -#: src/main/xmli18n-tmp.h:974 +#: src/main/xmli18n-tmp.h:1026 msgid "Canon CP-300" msgstr "Canon CP-300" -#: src/main/xmli18n-tmp.h:975 +#: src/main/xmli18n-tmp.h:1027 msgid "Canon CP-330" msgstr "Canon CP-330" -#: src/main/xmli18n-tmp.h:976 +#: src/main/xmli18n-tmp.h:1028 msgid "Canon SELPHY-CP-400" msgstr "Canon SELPHY-CP-400" -#: src/main/xmli18n-tmp.h:977 +#: src/main/xmli18n-tmp.h:1029 msgid "Canon SELPHY-CP-500" msgstr "Canon SELPHY-CP-500" -#: src/main/xmli18n-tmp.h:978 +#: src/main/xmli18n-tmp.h:1030 msgid "Canon SELPHY-CP-510" msgstr "Canon SELPHY-CP-510" -#: src/main/xmli18n-tmp.h:979 +#: src/main/xmli18n-tmp.h:1031 msgid "Canon SELPHY-CP-600" msgstr "Canon SELPHY-CP-600" -#: src/main/xmli18n-tmp.h:980 +#: src/main/xmli18n-tmp.h:1032 msgid "Canon SELPHY-CP-710" msgstr "Canon SELPHY-CP-710" -#: src/main/xmli18n-tmp.h:981 +#: src/main/xmli18n-tmp.h:1033 #, fuzzy msgid "Canon SELPHY-CP-720" msgstr "Canon SELPHY-CP-710" -#: src/main/xmli18n-tmp.h:982 +#: src/main/xmli18n-tmp.h:1034 #, fuzzy msgid "Canon SELPHY-CP-730" msgstr "Canon SELPHY-CP-710" -#: src/main/xmli18n-tmp.h:983 +#: src/main/xmli18n-tmp.h:1035 #, fuzzy msgid "Canon SELPHY-CP-740" msgstr "Canon SELPHY-CP-400" -#: src/main/xmli18n-tmp.h:984 +#: src/main/xmli18n-tmp.h:1036 #, fuzzy msgid "Canon SELPHY-CP-750" msgstr "Canon SELPHY-CP-500" -#: src/main/xmli18n-tmp.h:985 +#: src/main/xmli18n-tmp.h:1037 #, fuzzy msgid "Canon SELPHY ES1" msgstr "Canon SELPHY-CP-510" -#: src/main/xmli18n-tmp.h:986 +#: src/main/xmli18n-tmp.h:1038 #, fuzzy msgid "Canon SELPHY ES2" msgstr "Canon SELPHY-CP-400" -#: src/main/xmli18n-tmp.h:987 +#: src/main/xmli18n-tmp.h:1039 #, fuzzy msgid "Canon SELPHY ES20" msgstr "Canon SELPHY-CP-400" -#: src/main/xmli18n-tmp.h:988 +#: src/main/xmli18n-tmp.h:1040 #, fuzzy msgid "Sony DPP-EX5" msgstr "Sony UP-DR150" -#: src/main/xmli18n-tmp.h:989 +#: src/main/xmli18n-tmp.h:1041 msgid "Sony DPP-EX7" msgstr "" -#: src/main/xmli18n-tmp.h:990 +#: src/main/xmli18n-tmp.h:1042 msgid "Sony UP-DP10" msgstr "Sony UP-DP10" -#: src/main/xmli18n-tmp.h:991 +#: src/main/xmli18n-tmp.h:1043 #, fuzzy msgid "Sony UP-DR100" msgstr "Sony UP-DR150" -#: src/main/xmli18n-tmp.h:992 +#: src/main/xmli18n-tmp.h:1044 msgid "Sony UP-DR150" msgstr "Sony UP-DR150" -#: src/main/xmli18n-tmp.h:993 +#: src/main/xmli18n-tmp.h:1045 msgid "Fujifilm Printpix-CX-400" msgstr "Fujifilm Printpix-CX-400" -#: src/main/xmli18n-tmp.h:994 +#: src/main/xmli18n-tmp.h:1046 msgid "Fujifilm Printpix-CX-550" msgstr "Fujifilm Printpix-CX-550" -#: src/main/xmli18n-tmp.h:995 +#: src/main/xmli18n-tmp.h:1047 #, fuzzy msgid "Fujifilm FinePix-NX-500" msgstr "Fujifilm Printpix-CX-400" -#: src/main/xmli18n-tmp.h:996 +#: src/main/xmli18n-tmp.h:1048 msgid "Kodak Easyshare-Printer-Dock" msgstr "" -#: src/main/xmli18n-tmp.h:997 +#: src/main/xmli18n-tmp.h:1049 msgid "Shinko CHC-S9045" msgstr "" -#: src/main/xmli18n-tmp.h:998 +#: src/main/xmli18n-tmp.h:1050 msgid "RAW DATA 16 bit" msgstr "RÃ… DATA 16-bitar" -#: src/main/xmli18n-tmp.h:999 +#: src/main/xmli18n-tmp.h:1051 msgid "RAW DATA 8 bit" msgstr "RÃ… DATA 8-bitar" -#: src/gutenprintui/panel.c:274 src/gutenprintui2/panel.c:274 +#: src/gutenprintui2/curve.c:130 +msgid "Curve type" +msgstr "Kurvtyp" + +#: src/gutenprintui2/curve.c:131 +msgid "Is this curve linear, spline interpolated, or free-form" +msgstr "" + +#: src/gutenprintui2/curve.c:139 +msgid "Minimum X" +msgstr "Minimalt X" + +#: src/gutenprintui2/curve.c:140 +msgid "Minimum possible value for X" +msgstr "Minimalt möjligt värde för X" + +#: src/gutenprintui2/curve.c:149 +msgid "Maximum X" +msgstr "Maximalt X" + +#: src/gutenprintui2/curve.c:150 +msgid "Maximum possible X value" +msgstr "Maximalt möjligt X-värde" + +#: src/gutenprintui2/curve.c:159 +msgid "Minimum Y" +msgstr "Minimalt Y" + +#: src/gutenprintui2/curve.c:160 +msgid "Minimum possible value for Y" +msgstr "Minimalt möjligt värde för Y" + +#: src/gutenprintui2/curve.c:169 +msgid "Maximum Y" +msgstr "Maximalt Y" + +#: src/gutenprintui2/curve.c:170 +msgid "Maximum possible value for Y" +msgstr "Maximalt möjligt värde för Y" + +#: src/gutenprintui2/gammacurve.c:418 +msgid "_Gamma value" +msgstr "_Gammavärde" + +#: src/gutenprintui2/panel.c:275 msgid "Inch" msgstr "Tum" -#: src/gutenprintui/panel.c:274 src/gutenprintui2/panel.c:274 +#: src/gutenprintui2/panel.c:275 msgid "Set the base unit of measurement to inches" msgstr "Ställ in grundenheten till tum" -#: src/gutenprintui/panel.c:276 src/gutenprintui2/panel.c:276 +#: src/gutenprintui2/panel.c:277 msgid "cm" msgstr "cm" -#: src/gutenprintui/panel.c:276 src/gutenprintui2/panel.c:276 +#: src/gutenprintui2/panel.c:277 msgid "Set the base unit of measurement to centimetres" msgstr "Ställ in grundenheten till centimeter" -#: src/gutenprintui/panel.c:278 src/gutenprintui2/panel.c:278 +#: src/gutenprintui2/panel.c:279 msgid "Points" msgstr "Punkter" -#: src/gutenprintui/panel.c:278 src/gutenprintui2/panel.c:278 +#: src/gutenprintui2/panel.c:279 msgid "Set the base unit of measurement to points (1/72\")" msgstr "Ställ in grundenheten för mÃ¥tt till punkter (1/72\")" -#: src/gutenprintui/panel.c:280 src/gutenprintui2/panel.c:280 +#: src/gutenprintui2/panel.c:281 msgid "mm" msgstr "mm" -#: src/gutenprintui/panel.c:280 src/gutenprintui2/panel.c:280 +#: src/gutenprintui2/panel.c:281 msgid "Set the base unit of measurement to millimetres" msgstr "Ställ in grundenheten för mÃ¥tt till millimeter" -#: src/gutenprintui/panel.c:282 src/gutenprintui2/panel.c:282 +#: src/gutenprintui2/panel.c:283 msgid "Pica" msgstr "Pica" -#: src/gutenprintui/panel.c:282 src/gutenprintui2/panel.c:282 +#: src/gutenprintui2/panel.c:283 msgid "Set the base unit of measurement to picas (1/12\")" msgstr "Ställ in grundenheten för mÃ¥tt till pica (1/12\")" -#: src/gutenprintui/panel.c:289 src/gutenprintui2/panel.c:289 +#: src/gutenprintui2/panel.c:290 msgid "Color output" msgstr "Färgutdata" -#: src/gutenprintui/panel.c:291 src/gutenprintui2/panel.c:291 +#: src/gutenprintui2/panel.c:292 msgid "Print in shades of gray using black ink" msgstr "Skriv ut i grÃ¥toner genom att använda svart bläck" -#: src/gutenprintui/panel.c:303 src/gutenprintui2/panel.c:303 +#: src/gutenprintui2/panel.c:304 msgid "Standard Command" msgstr "Standard kommando" -#: src/gutenprintui/panel.c:303 src/gutenprintui2/panel.c:303 +#: src/gutenprintui2/panel.c:304 msgid "Use standard print command" msgstr "Använd standardkommando för utskrift" -#: src/gutenprintui/panel.c:304 src/gutenprintui2/panel.c:304 +#: src/gutenprintui2/panel.c:305 msgid "Custom Command" msgstr "Anpassat kommando" -#: src/gutenprintui/panel.c:304 src/gutenprintui2/panel.c:304 +#: src/gutenprintui2/panel.c:305 msgid "Use custom print command" msgstr "Använd anpassat kommando för utskrift" -#: src/gutenprintui/panel.c:305 src/gutenprintui/plist.c:704 -#: src/gutenprintui/plist.c:787 src/gutenprintui2/panel.c:305 -#: src/gutenprintui2/plist.c:707 src/gutenprintui2/plist.c:790 +#: src/gutenprintui2/panel.c:306 src/gutenprintui2/plist.c:710 +#: src/gutenprintui2/plist.c:793 msgid "File" msgstr "Fil" -#: src/gutenprintui/panel.c:305 src/gutenprintui2/panel.c:305 +#: src/gutenprintui2/panel.c:306 msgid "Print to a file" msgstr "Skriv ut till en fil" -#: src/gutenprintui/panel.c:521 src/gutenprintui2/panel.c:521 +#: src/gutenprintui2/panel.c:522 msgid "Edit Curve..." msgstr "Redigera kurva..." -#: src/gutenprintui/panel.c:532 src/gutenprintui2/panel.c:532 +#: src/gutenprintui2/panel.c:533 msgid "Set Default" msgstr "Ställ in standard" -#: src/gutenprintui/panel.c:534 src/gutenprintui2/panel.c:534 +#: src/gutenprintui2/panel.c:535 msgid "Restore Previous" msgstr "Ã…terställ föregÃ¥ende" -#: src/gutenprintui/panel.c:536 src/gutenprintui/panel.c:1532 -#: src/gutenprintui/panel.c:1787 src/gutenprintui/panel.c:1819 -#: src/gutenprintui2/panel.c:536 src/gutenprintui2/panel.c:1533 -#: src/gutenprintui2/panel.c:1787 src/gutenprintui2/panel.c:1819 +#: src/gutenprintui2/panel.c:537 src/gutenprintui2/panel.c:1708 +#: src/gutenprintui2/panel.c:1962 src/gutenprintui2/panel.c:1994 msgid "OK" msgstr "OK" -#: src/gutenprintui/panel.c:538 src/gutenprintui/panel.c:1197 -#: src/gutenprintui/panel.c:1534 src/gutenprintui/panel.c:1789 -#: src/gutenprintui2/panel.c:538 src/gutenprintui2/panel.c:1198 -#: src/gutenprintui2/panel.c:1535 src/gutenprintui2/panel.c:1789 +#: src/gutenprintui2/panel.c:539 src/gutenprintui2/panel.c:1373 +#: src/gutenprintui2/panel.c:1710 src/gutenprintui2/panel.c:1964 msgid "Cancel" msgstr "Avbryt" -#: src/gutenprintui/panel.c:1180 src/gutenprintui2/panel.c:1181 +#: src/gutenprintui2/panel.c:641 +#, fuzzy +msgid "Select File..." +msgstr "Konfigurera skrivare..." + +#: src/gutenprintui2/panel.c:1018 +#, fuzzy +msgid "Reset" +msgstr "Bästa" + +#: src/gutenprintui2/panel.c:1356 #, c-format msgid "%s -- Print v%s" msgstr "%s -- Utskrift v%s" -#: src/gutenprintui/panel.c:1189 src/gutenprintui2/panel.c:1190 +#: src/gutenprintui2/panel.c:1365 msgid "About" msgstr "Om" -#: src/gutenprintui/panel.c:1191 src/gutenprintui2/panel.c:1192 +#: src/gutenprintui2/panel.c:1367 msgid "" "Print and\n" "Save Settings" @@ -6398,7 +6880,7 @@ msgstr "" "Skriv ut och\n" "spara inställningar" -#: src/gutenprintui/panel.c:1193 src/gutenprintui2/panel.c:1194 +#: src/gutenprintui2/panel.c:1369 msgid "" "Save\n" "Settings" @@ -6406,15 +6888,15 @@ msgstr "" "Spara\n" "inställningar" -#: src/gutenprintui/panel.c:1195 src/gutenprintui2/panel.c:1196 +#: src/gutenprintui2/panel.c:1371 msgid "Print" msgstr "Skriv ut" -#: src/gutenprintui/panel.c:1247 src/gutenprintui2/panel.c:1248 +#: src/gutenprintui2/panel.c:1423 msgid "Preview" msgstr "Förhandsgranskning" -#: src/gutenprintui/panel.c:1272 src/gutenprintui2/panel.c:1273 +#: src/gutenprintui2/panel.c:1448 msgid "" "Position the image on the page.\n" "Click and drag with the primary button to position the image.\n" @@ -6438,193 +6920,187 @@ msgstr "" "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:1319 src/gutenprintui2/panel.c:1320 +#: src/gutenprintui2/panel.c:1495 msgid "Paper Size" msgstr "Pappersstorlek" -#: src/gutenprintui/panel.c:1342 src/gutenprintui2/panel.c:1343 +#: src/gutenprintui2/panel.c:1518 msgid "Show All Paper Sizes" msgstr "Visa alla pappersstorlekar" -#: src/gutenprintui/panel.c:1358 src/gutenprintui2/panel.c:1359 +#: src/gutenprintui2/panel.c:1534 msgid "Dimensions:" msgstr "Dimensioner:" -#: src/gutenprintui/panel.c:1363 src/gutenprintui/panel.c:2063 -#: src/gutenprintui2/panel.c:1364 src/gutenprintui2/panel.c:2063 +#: src/gutenprintui2/panel.c:1539 src/gutenprintui2/panel.c:2238 msgid "Width:" msgstr "Bredd:" -#: src/gutenprintui/panel.c:1364 src/gutenprintui2/panel.c:1365 +#: src/gutenprintui2/panel.c:1540 msgid "Width of the paper that you wish to print to" msgstr "Bredd pÃ¥ pappret som du vill skriva ut till" -#: src/gutenprintui/panel.c:1368 src/gutenprintui/panel.c:2065 -#: src/gutenprintui2/panel.c:1369 src/gutenprintui2/panel.c:2065 +#: src/gutenprintui2/panel.c:1544 src/gutenprintui2/panel.c:2240 msgid "Height:" msgstr "Höjd:" -#: src/gutenprintui/panel.c:1369 src/gutenprintui2/panel.c:1370 +#: src/gutenprintui2/panel.c:1545 msgid "Height of the paper that you wish to print to" msgstr "Höjd pÃ¥ pappret som du vill skriva ut till" -#: src/gutenprintui/panel.c:1374 src/gutenprintui2/panel.c:1375 +#: src/gutenprintui2/panel.c:1550 msgid "Automatic Paper Size" msgstr "Automatisk pappersstorlek" -#: src/gutenprintui/panel.c:1391 src/gutenprintui2/panel.c:1392 +#: src/gutenprintui2/panel.c:1567 msgid "Number of Copies" msgstr "Antal kopior" -#: src/gutenprintui/panel.c:1403 src/gutenprintui2/panel.c:1404 +#: src/gutenprintui2/panel.c:1579 msgid "Select the number of copies to print; a value between 1 and 100" msgstr "Välj antalet kopior att skriva ut; ett värde mellan 1 och 100" -#: src/gutenprintui/panel.c:1435 src/gutenprintui2/panel.c:1436 +#: src/gutenprintui2/panel.c:1611 msgid "Image Position" msgstr "Bildposition" -#: src/gutenprintui/panel.c:1452 src/gutenprintui2/panel.c:1453 +#: src/gutenprintui2/panel.c:1628 msgid "Auto" msgstr "Automatisk" -#: src/gutenprintui/panel.c:1454 src/gutenprintui2/panel.c:1455 +#: src/gutenprintui2/panel.c:1630 msgid "Portrait" msgstr "StÃ¥ende" -#: src/gutenprintui/panel.c:1456 src/gutenprintui2/panel.c:1457 +#: src/gutenprintui2/panel.c:1632 msgid "Landscape" msgstr "Liggande" -#: src/gutenprintui/panel.c:1458 src/gutenprintui2/panel.c:1459 +#: src/gutenprintui2/panel.c:1634 msgid "Upside down" msgstr "Uppochner" -#: src/gutenprintui/panel.c:1460 src/gutenprintui2/panel.c:1461 +#: src/gutenprintui2/panel.c:1636 msgid "Seascape" msgstr "Liggande uppochner" -#: src/gutenprintui/panel.c:1464 src/gutenprintui2/panel.c:1465 +#: src/gutenprintui2/panel.c:1640 msgid "" "Select the orientation: portrait, landscape, upside down, or seascape " "(upside down landscape)" msgstr "" "Välj orientering: stÃ¥ende, liggande, uppochner eller liggande uppochner" -#: src/gutenprintui/panel.c:1466 src/gutenprintui2/panel.c:1467 +#: src/gutenprintui2/panel.c:1642 msgid "Orientation:" msgstr "Orientering:" -#: src/gutenprintui/panel.c:1477 src/gutenprintui2/panel.c:1478 +#: src/gutenprintui2/panel.c:1653 msgid "Left:" msgstr "Vänster:" -#: src/gutenprintui/panel.c:1478 src/gutenprintui2/panel.c:1479 +#: src/gutenprintui2/panel.c:1654 msgid "Distance from the left of the paper to the image" msgstr "AvstÃ¥nd frÃ¥n vänsterkanten pÃ¥ pappret till bilden" -#: src/gutenprintui/panel.c:1481 src/gutenprintui/panel.c:1485 -#: src/gutenprintui2/panel.c:1482 src/gutenprintui2/panel.c:1486 +#: src/gutenprintui2/panel.c:1657 src/gutenprintui2/panel.c:1661 msgid "Right:" msgstr "Höger:" -#: src/gutenprintui/panel.c:1482 src/gutenprintui2/panel.c:1483 +#: src/gutenprintui2/panel.c:1658 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" -#: src/gutenprintui/panel.c:1486 src/gutenprintui2/panel.c:1487 +#: src/gutenprintui2/panel.c:1662 msgid "Distance from the right of the paper to the image" msgstr "AvstÃ¥nd frÃ¥n högerkanten pÃ¥ pappret till bilden" -#: src/gutenprintui/panel.c:1488 src/gutenprintui2/panel.c:1489 +#: src/gutenprintui2/panel.c:1664 msgid "Top:" msgstr "Övre kant:" -#: src/gutenprintui/panel.c:1489 src/gutenprintui2/panel.c:1490 +#: src/gutenprintui2/panel.c:1665 msgid "Distance from the top of the paper to the image" msgstr "AvstÃ¥nd frÃ¥n överkanten pÃ¥ pappret till bilden" -#: src/gutenprintui/panel.c:1492 src/gutenprintui/panel.c:1496 -#: src/gutenprintui2/panel.c:1493 src/gutenprintui2/panel.c:1497 +#: src/gutenprintui2/panel.c:1668 src/gutenprintui2/panel.c:1672 msgid "Bottom:" msgstr "Nedre kant:" -#: src/gutenprintui/panel.c:1493 src/gutenprintui2/panel.c:1494 +#: src/gutenprintui2/panel.c:1669 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" -#: src/gutenprintui/panel.c:1497 src/gutenprintui2/panel.c:1498 +#: src/gutenprintui2/panel.c:1673 msgid "Distance from the bottom of the paper to the image" msgstr "AvstÃ¥nd frÃ¥n nederkanten pÃ¥ pappret till bilden" -#: src/gutenprintui/panel.c:1507 src/gutenprintui2/panel.c:1508 +#: src/gutenprintui2/panel.c:1683 msgid "Center:" msgstr "Centrera:" -#: src/gutenprintui/panel.c:1510 src/gutenprintui2/panel.c:1511 +#: src/gutenprintui2/panel.c:1686 msgid "Horizontal" msgstr "Horisontal" -#: src/gutenprintui/panel.c:1511 src/gutenprintui2/panel.c:1512 +#: src/gutenprintui2/panel.c:1687 msgid "Center the image horizontally on the paper" msgstr "Centrera bilden horisontellt pÃ¥ pappret" -#: src/gutenprintui/panel.c:1513 src/gutenprintui2/panel.c:1514 +#: src/gutenprintui2/panel.c:1689 msgid "Both" msgstr "BÃ¥de och" -#: src/gutenprintui/panel.c:1514 src/gutenprintui2/panel.c:1515 +#: src/gutenprintui2/panel.c:1690 msgid "Center the image on the paper" msgstr "Centrera bilden pÃ¥ pappret" -#: src/gutenprintui/panel.c:1516 src/gutenprintui2/panel.c:1517 +#: src/gutenprintui2/panel.c:1692 msgid "Vertical" msgstr "Vertikal" -#: src/gutenprintui/panel.c:1517 src/gutenprintui2/panel.c:1518 +#: src/gutenprintui2/panel.c:1693 msgid "Center the image vertically on the paper" msgstr "Centrera bilden vertikalt pÃ¥ pappret" -#: src/gutenprintui/panel.c:1530 src/gutenprintui2/panel.c:1531 +#: src/gutenprintui2/panel.c:1706 msgid "Setup Printer" msgstr "Konfigurera skrivare" -#: src/gutenprintui/panel.c:1555 src/gutenprintui2/panel.c:1555 +#: src/gutenprintui2/panel.c:1730 msgid "Printer Make:" msgstr "Skrivarmärke:" -#: src/gutenprintui/panel.c:1566 src/gutenprintui2/panel.c:1566 +#: src/gutenprintui2/panel.c:1741 msgid "Select the make of your printer" msgstr "Välj märke pÃ¥ din skrivare" -#: src/gutenprintui/panel.c:1584 src/gutenprintui/panel.c:1672 -#: src/gutenprintui/panel.c:1890 src/gutenprintui2/panel.c:1584 -#: src/gutenprintui2/panel.c:1672 src/gutenprintui2/panel.c:1890 +#: src/gutenprintui2/panel.c:1759 src/gutenprintui2/panel.c:1847 +#: src/gutenprintui2/panel.c:2065 msgid "Printer Model:" msgstr "Skrivarmodell:" -#: src/gutenprintui/panel.c:1595 src/gutenprintui2/panel.c:1595 +#: src/gutenprintui2/panel.c:1770 msgid "Select your printer model" msgstr "Välj modell pÃ¥ din skrivare" -#: src/gutenprintui/panel.c:1643 src/gutenprintui2/panel.c:1643 +#: src/gutenprintui2/panel.c:1818 msgid "PPD File:" msgstr "PPD-fil:" -#: src/gutenprintui/panel.c:1659 src/gutenprintui2/panel.c:1659 +#: src/gutenprintui2/panel.c:1834 msgid "Enter the correct PPD filename for your printer" msgstr "Ange rätt PPD-filnamn för din skrivare" -#: src/gutenprintui/panel.c:1661 src/gutenprintui/panel.c:1741 -#: src/gutenprintui2/panel.c:1661 src/gutenprintui2/panel.c:1741 +#: src/gutenprintui2/panel.c:1836 src/gutenprintui2/panel.c:1916 msgid "Browse" msgstr "Bläddra" -#: src/gutenprintui/panel.c:1668 src/gutenprintui2/panel.c:1668 +#: src/gutenprintui2/panel.c:1843 msgid "Choose the correct PPD filename for your printer" msgstr "Välj rätt PPD-filnamn för din skrivare" -#: src/gutenprintui/panel.c:1710 src/gutenprintui2/panel.c:1710 +#: src/gutenprintui2/panel.c:1885 msgid "" "Select the name of the output queue (not the type, or model, of printer) " "that you wish to print to" @@ -6632,52 +7108,51 @@ msgstr "" "Välj namnet pÃ¥ utskriftskön (inte skrivarens typ eller modell) som du vill " "skriva ut pÃ¥" -#: src/gutenprintui/panel.c:1712 src/gutenprintui2/panel.c:1712 +#: src/gutenprintui2/panel.c:1887 msgid "Printer Queue:" msgstr "Skrivarkö:" -#: src/gutenprintui/panel.c:1728 src/gutenprintui2/panel.c:1728 +#: src/gutenprintui2/panel.c:1903 msgid "Enter the correct command to print to your printer. " msgstr "Ange korrekt kommando för att skriva ut pÃ¥ din skrivare. " -#: src/gutenprintui/panel.c:1739 src/gutenprintui2/panel.c:1739 +#: src/gutenprintui2/panel.c:1914 msgid "Enter the file to print to. " msgstr "Ange filen att skriva till. " -#: src/gutenprintui/panel.c:1747 src/gutenprintui2/panel.c:1747 +#: src/gutenprintui2/panel.c:1922 msgid "File to print to" msgstr "Fil att skriva ut till" -#: src/gutenprintui/panel.c:1755 src/gutenprintui2/panel.c:1755 +#: src/gutenprintui2/panel.c:1930 msgid "Print To File" msgstr "Skriv ut till fil" -#: src/gutenprintui/panel.c:1785 src/gutenprintui2/panel.c:1785 +#: src/gutenprintui2/panel.c:1960 msgid "Define New Printer" msgstr "Ange ny skrivare" -#: src/gutenprintui/panel.c:1803 src/gutenprintui/panel.c:1887 -#: src/gutenprintui2/panel.c:1803 src/gutenprintui2/panel.c:1887 +#: src/gutenprintui2/panel.c:1978 src/gutenprintui2/panel.c:2062 msgid "Printer Name:" msgstr "Skrivarnamn:" -#: src/gutenprintui/panel.c:1807 src/gutenprintui2/panel.c:1807 +#: src/gutenprintui2/panel.c:1982 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:1817 src/gutenprintui2/panel.c:1817 +#: src/gutenprintui2/panel.c:1992 msgid "About Gutenprint " msgstr "Om Gutenprint " -#: src/gutenprintui/panel.c:1824 src/gutenprintui2/panel.c:1824 +#: src/gutenprintui2/panel.c:1999 msgid "Gutenprint Version " msgstr "Gutenprint version " -#: src/gutenprintui/panel.c:1872 src/gutenprintui2/panel.c:1872 +#: src/gutenprintui2/panel.c:2047 msgid "Printer Settings" msgstr "Skrivarinställningar" -#: src/gutenprintui/panel.c:1885 src/gutenprintui2/panel.c:1885 +#: src/gutenprintui2/panel.c:2060 msgid "" "Select the name of the printer (not the type, or model, of printer) that you " "wish to print to" @@ -6685,11 +7160,11 @@ msgstr "" "Välj namnet pÃ¥ skrivaren (inte skrivarens typ eller modell) som du vill " "skriva ut till" -#: src/gutenprintui/panel.c:1902 src/gutenprintui2/panel.c:1902 +#: src/gutenprintui2/panel.c:2077 msgid "Setup Printer..." msgstr "Konfigurera skrivare..." -#: src/gutenprintui/panel.c:1904 src/gutenprintui2/panel.c:1904 +#: src/gutenprintui2/panel.c:2079 msgid "" "Choose the printer model, PPD file, and command that is used to print to " "this printer" @@ -6697,11 +7172,11 @@ msgstr "" "Välj den skrivarmodell, PPD-fil och kommando som används för att skriva ut " "till denna skrivare" -#: src/gutenprintui/panel.c:1917 src/gutenprintui2/panel.c:1917 +#: src/gutenprintui2/panel.c:2092 msgid "New Printer..." msgstr "Ny skrivare..." -#: src/gutenprintui/panel.c:1918 src/gutenprintui2/panel.c:1918 +#: src/gutenprintui2/panel.c:2093 msgid "" "Define a new logical printer. This can be used to name a collection of " "settings that you wish to remember for future use." @@ -6709,32 +7184,32 @@ 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." -#: src/gutenprintui/panel.c:1948 src/gutenprintui2/panel.c:1948 +#: src/gutenprintui2/panel.c:2123 #, fuzzy msgid "Set Printer Option Defaults" msgstr "Ställ in standardvärden" -#: src/gutenprintui/panel.c:1949 src/gutenprintui2/panel.c:1949 +#: src/gutenprintui2/panel.c:2124 msgid "Set all printer options to their defaults" msgstr "" -#: src/gutenprintui/panel.c:1972 src/gutenprintui2/panel.c:1972 +#: src/gutenprintui2/panel.c:2147 msgid "Image Size" msgstr "Bildstorlek" -#: src/gutenprintui/panel.c:1997 src/gutenprintui2/panel.c:1997 +#: src/gutenprintui2/panel.c:2172 msgid "Scaling:" msgstr "Skalning:" -#: src/gutenprintui/panel.c:2001 src/gutenprintui2/panel.c:2001 +#: src/gutenprintui2/panel.c:2176 msgid "Set the scale (size) of the image" msgstr "Ändra skalningen (storleken) pÃ¥ bilden" -#: src/gutenprintui/panel.c:2023 src/gutenprintui2/panel.c:2023 +#: src/gutenprintui2/panel.c:2198 msgid "Scale by:" msgstr "Skala efter:" -#: src/gutenprintui/panel.c:2028 src/gutenprintui2/panel.c:2028 +#: src/gutenprintui2/panel.c:2203 msgid "" "Select whether scaling is measured as percent of available page size or " "number of output dots per inch" @@ -6742,31 +7217,31 @@ msgstr "" "Välj huruvida skalning mäts i procent av tillgänglig sidstorlek eller antal " "utdatapunkter per tum" -#: src/gutenprintui/panel.c:2031 src/gutenprintui2/panel.c:2031 +#: src/gutenprintui2/panel.c:2206 msgid "Percent" msgstr "Procent" -#: src/gutenprintui/panel.c:2036 src/gutenprintui2/panel.c:2036 +#: src/gutenprintui2/panel.c:2211 msgid "Scale the print to the size of the page" msgstr "Skala utskriften till storleken pÃ¥ sidan" -#: src/gutenprintui/panel.c:2040 src/gutenprintui2/panel.c:2040 +#: src/gutenprintui2/panel.c:2215 msgid "PPI" msgstr "Punkter per tum" -#: src/gutenprintui/panel.c:2045 src/gutenprintui2/panel.c:2045 +#: src/gutenprintui2/panel.c:2220 msgid "Scale the print to the number of dots per inch" msgstr "Skala utskriften till antalet punkter per tum" -#: src/gutenprintui/panel.c:2063 src/gutenprintui2/panel.c:2063 +#: src/gutenprintui2/panel.c:2238 msgid "Set the width of the print" msgstr "Ställ in bredden pÃ¥ utskriften" -#: src/gutenprintui/panel.c:2065 src/gutenprintui2/panel.c:2065 +#: src/gutenprintui2/panel.c:2240 msgid "Set the height of the print" msgstr "Ställ in bredden pÃ¥ utskriften" -#: src/gutenprintui/panel.c:2071 src/gutenprintui2/panel.c:2071 +#: src/gutenprintui2/panel.c:2246 msgid "" "Use Original\n" "Image Size" @@ -6774,148 +7249,103 @@ msgstr "" "Använd\n" "originalbildstorlek" -#: src/gutenprintui/panel.c:2077 src/gutenprintui2/panel.c:2077 +#: src/gutenprintui2/panel.c:2252 msgid "Set the print size to the size of the image" msgstr "Ställ in storleken pÃ¥ utskriften till storleken pÃ¥ sidan" -#: src/gutenprintui/panel.c:2100 src/gutenprintui2/panel.c:2101 +#: src/gutenprintui2/panel.c:2276 msgid "Print Color Adjust" msgstr "Justera utskriftsfärg" -#: src/gutenprintui/panel.c:2103 src/gutenprintui2/panel.c:2104 +#: src/gutenprintui2/panel.c:2279 msgid "Set Defaults" msgstr "Ställ in standardvärden" -#: src/gutenprintui/panel.c:2105 src/gutenprintui2/panel.c:2106 +#: src/gutenprintui2/panel.c:2281 msgid "Close" msgstr "Stäng" -#: src/gutenprintui/panel.c:2134 src/gutenprintui2/panel.c:2135 +#: src/gutenprintui2/panel.c:2310 msgid "Image preview" msgstr "Förhandsgranskning av bild" -#: src/gutenprintui/panel.c:2148 src/gutenprintui2/panel.c:2149 +#: src/gutenprintui2/panel.c:2324 msgid "View Output Channels:" msgstr "" -#: src/gutenprintui/panel.c:2234 src/gutenprintui2/panel.c:2240 +#: src/gutenprintui2/panel.c:2415 msgid "Output" msgstr "Utdata" -#: src/gutenprintui/panel.c:2262 src/gutenprintui2/panel.c:2268 +#: src/gutenprintui2/panel.c:2443 msgid "Output Type:" msgstr "Utdatatyp:" -#: src/gutenprintui/panel.c:2266 src/gutenprintui2/panel.c:2272 +#: src/gutenprintui2/panel.c:2447 msgid "Select the desired output type" msgstr "Välj önskad typ av utdata" -#: src/gutenprintui/panel.c:2287 src/gutenprintui2/panel.c:2293 +#: src/gutenprintui2/panel.c:2468 msgid "Adjust Output..." msgstr "Justera utdata..." -#: src/gutenprintui/panel.c:2296 src/gutenprintui2/panel.c:2302 +#: src/gutenprintui2/panel.c:2477 msgid "" "Adjust color balance, brightness, contrast, saturation, and dither algorithm" msgstr "" "Justera färgbalans, ljusstyrka, kontrast, mättnad och färgutjämningsalgoritm" -#: src/gutenprintui/panel.c:2314 src/gutenprintui2/panel.c:2321 +#: src/gutenprintui2/panel.c:2496 msgid "Size Units:" msgstr "Storleksenheter:" -#: src/gutenprintui/panel.c:2317 src/gutenprintui2/panel.c:2324 +#: src/gutenprintui2/panel.c:2499 msgid " " msgstr " " -#: src/gutenprintui/panel.c:2341 src/gutenprintui2/panel.c:2348 +#: src/gutenprintui2/panel.c:2523 msgid "Units:" msgstr "Enheter:" -#: src/gutenprintui/panel.c:2346 src/gutenprintui2/panel.c:2353 +#: src/gutenprintui2/panel.c:2528 msgid "Select the base unit of measurement for printing" msgstr "Välj grundenheten för utskrift" -#: src/gutenprintui/plist.c:90 src/gutenprintui/plist.c:99 -#: src/gutenprintui2/plist.c:89 src/gutenprintui2/plist.c:98 +#: src/gutenprintui2/plist.c:92 src/gutenprintui2/plist.c:101 msgid "System V lp" msgstr "System V lp" -#: src/gutenprintui/plist.c:96 src/gutenprintui2/plist.c:95 +#: src/gutenprintui2/plist.c:98 msgid "CUPS" msgstr "CUPS" -#: src/gutenprintui/plist.c:102 src/gutenprintui2/plist.c:101 +#: src/gutenprintui2/plist.c:104 msgid "Berkeley lpd (/etc/lpc)" msgstr "Berkeley lpd (/etc/lpc)" -#: src/gutenprintui/plist.c:105 src/gutenprintui2/plist.c:104 +#: src/gutenprintui2/plist.c:107 msgid "Berkeley lpd (/usr/bsd/lpc)" -msgstr "Berkeley lpd (/usr/bsd/lpc)" - -#: src/gutenprintui/plist.c:108 src/gutenprintui2/plist.c:107 -msgid "Berkeley lpd (/usr/etc/lpc" -msgstr "Berkeley lpd (/usr/etc/lpc" - -#: src/gutenprintui/plist.c:111 src/gutenprintui2/plist.c:110 -msgid "Berkeley lpd (/usr/libexec/lpc)" -msgstr "Berkeley lpd (/usr/libexec/lpc)" - -#: src/gutenprintui/plist.c:114 src/gutenprintui2/plist.c:113 -msgid "Berkeley lpd (/usr/sbin/lpc)" -msgstr "Berkeley lpd (/usr/sbin/lpc)" - -#: src/gutenprintui/plist.c:1043 src/gutenprintui2/plist.c:1057 -msgid "Printer" -msgstr "Skrivare" - -#: src/gutenprintui/plist.c:1230 src/gutenprintui2/plist.c:1250 -msgid "(Default Printer)" -msgstr "(Standardskrivare)" - -#: src/gutenprintui2/curve.c:130 -msgid "Curve type" -msgstr "Kurvtyp" - -#: src/gutenprintui2/curve.c:131 -msgid "Is this curve linear, spline interpolated, or free-form" -msgstr "" - -#: src/gutenprintui2/curve.c:139 -msgid "Minimum X" -msgstr "Minimalt X" - -#: src/gutenprintui2/curve.c:140 -msgid "Minimum possible value for X" -msgstr "Minimalt möjligt värde för X" - -#: src/gutenprintui2/curve.c:149 -msgid "Maximum X" -msgstr "Maximalt X" - -#: src/gutenprintui2/curve.c:150 -msgid "Maximum possible X value" -msgstr "Maximalt möjligt X-värde" - -#: src/gutenprintui2/curve.c:159 -msgid "Minimum Y" -msgstr "Minimalt Y" +msgstr "Berkeley lpd (/usr/bsd/lpc)" -#: src/gutenprintui2/curve.c:160 -msgid "Minimum possible value for Y" -msgstr "Minimalt möjligt värde för Y" +#: src/gutenprintui2/plist.c:110 +msgid "Berkeley lpd (/usr/etc/lpc" +msgstr "Berkeley lpd (/usr/etc/lpc" -#: src/gutenprintui2/curve.c:169 -msgid "Maximum Y" -msgstr "Maximalt Y" +#: src/gutenprintui2/plist.c:113 +msgid "Berkeley lpd (/usr/libexec/lpc)" +msgstr "Berkeley lpd (/usr/libexec/lpc)" -#: src/gutenprintui2/curve.c:170 -msgid "Maximum possible value for Y" -msgstr "Maximalt möjligt värde för Y" +#: src/gutenprintui2/plist.c:116 +msgid "Berkeley lpd (/usr/sbin/lpc)" +msgstr "Berkeley lpd (/usr/sbin/lpc)" -#: src/gutenprintui2/gammacurve.c:418 -msgid "_Gamma value" -msgstr "_Gammavärde" +#: src/gutenprintui2/plist.c:1060 +msgid "Printer" +msgstr "Skrivare" + +#: src/gutenprintui2/plist.c:1253 +msgid "(Default Printer)" +msgstr "(Standardskrivare)" #: src/cups/genppd.c:145 msgid "Printer Features" @@ -6954,50 +7384,50 @@ msgstr "Extra 5" #. 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:1058 +#: src/cups/genppd.c:1064 msgid "English" msgstr "Swedish" #. TRANSLATORS: Specify PPD translation encoding e.g. ISOLatin1 -#: src/cups/genppd.c:1060 +#: src/cups/genppd.c:1066 msgid "ISOLatin1" msgstr "ISOLatin1" -#: src/cups/genppd.c:1641 +#: src/cups/genppd.c:1647 #, fuzzy msgid "2-Sided Printing" msgstr "Dubbelsidad utskrift" -#: src/cups/genppd.c:1665 +#: src/cups/genppd.c:1671 msgid "Shrink Page If Necessary to Fit Borders" msgstr "" -#: src/cups/genppd.c:1669 +#: src/cups/genppd.c:1675 msgid "Shrink (print the whole page)" msgstr "" -#: src/cups/genppd.c:1670 +#: src/cups/genppd.c:1676 msgid "Crop (preserve dimensions)" msgstr "" -#: src/cups/genppd.c:1671 +#: src/cups/genppd.c:1677 msgid "Expand (use maximum page area)" msgstr "" -#: src/cups/genppd.c:1756 +#: src/cups/genppd.c:1762 msgid "No" msgstr "Nej" -#: src/cups/genppd.c:1758 +#: src/cups/genppd.c:1764 msgid "Yes" msgstr "Ja" -#: src/cups/genppd.c:1795 src/cups/genppd.c:1857 +#: src/cups/genppd.c:1801 src/cups/genppd.c:1863 #, fuzzy msgid "Value" msgstr "BlÃ¥" -#: src/cups/genppd.c:1800 +#: src/cups/genppd.c:1806 msgid "Fine Adjustment" msgstr "Finjustering" @@ -7902,154 +8332,114 @@ msgstr "" msgid "Error in input\n" msgstr "Fel i indata\n" -#: src/gimp/print-image-gimp.c:225 src/gimp2/print-image-gimp.c:225 +#: src/gimp2/print-image-gimp.c:225 msgid "Printing..." msgstr "Skriver ut..." -#: src/gimp/print.c:133 -msgid "/File/Print..." -msgstr "/Arkiv/Skriv ut..." +#~ msgid "90x90 DPI" +#~ msgstr "90×90 DPI" -#: src/ghost/ijsgutenprint.c:98 -#, c-format -msgid "" -"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" -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:191 -#, c-format -msgid "ERROR: ijsgutenprint: Bad color space: bps %d channels %d space %s\n" -msgstr "" -"FEL: ijsgutenprint: Felaktigt färgutrymme: bps %d kanaler %d utrymme %s\n" +#~ msgid "90x90 DPI DMT" +#~ msgstr "90×90 DPI DMT" -#: src/ghost/ijsgutenprint.c:199 -#, c-format -msgid "ERROR: ijsgutenprint: No row buffer\n" -msgstr "FEL: ijsgutenprint: Ingen radbuffert\n" +#~ msgid "180x180 DPI" +#~ msgstr "180×180 DPI" -#: 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 "" -"FEL: ijsgutenprint: Kan inte tolka parametern %s=%s (ett tal förväntas)\n" +#~ msgid "180x180 DPI DMT" +#~ msgstr "180×180 DPI DMT" -#: src/ghost/ijsgutenprint.c:498 -#, c-format -msgid "ERROR: ijsgutenprint: Printer must be specified with -sDeviceModel\n" -msgstr "FEL: ijsgutenprint: Skrivaren mÃ¥ste anges med -sDeviceModel\n" +#~ msgid "360x360 DPI" +#~ msgstr "360×360 DPI" -#: src/ghost/ijsgutenprint.c:500 -#, c-format -msgid "ERROR: ijsgutenprint: Printer %s is not a known model\n" -msgstr "FEL: ijsgutenprint: Skrivaren %s är inte en känd modell\n" +#~ msgid "360x360 DPI DMT" +#~ msgstr "360×360 DPI DMT" -# DeviceModel är ett anrop? -#: src/ghost/ijsgutenprint.c:656 -#, c-format -msgid "ijsgutenprint: unknown DeviceModel %s\n" -msgstr "ijsgutenprint: okänd DeviceModel %s\n" +#~ msgid "720x360 DPI" +#~ msgstr "720×360 DPI" -#: src/ghost/ijsgutenprint.c:700 -#, c-format -msgid "ERROR: ijsgutenprint: cannot parse TopLeft %s\n" -msgstr "FEL: ijsgutenprint: kan inte tolka TopLeft %s\n" +#~ msgid "720x360 DPI DMT" +#~ msgstr "720×360 DPI DMT" -#: src/ghost/ijsgutenprint.c:723 -#, c-format -msgid "ERROR: ijsgutenprint: cannot parse PaperSize %s\n" -msgstr "FEL: ijsgutenprint: kan inte tolka PaperSize %s\n" +#~ msgid "720x720 DPI" +#~ msgstr "720×720 DPI" -#: src/ghost/ijsgutenprint.c:795 -#, c-format -msgid "ERROR: ijsgutenprint: cannot parse curve %s\n" -msgstr "FEL: ijsgutenprint: kan inte tolka kurvan %s\n" +#~ msgid "720x720 DPI DMT" +#~ msgstr "720×720 DPI DMT" -#: src/ghost/ijsgutenprint.c:802 -#, c-format -msgid "ERROR: ijsgutenprint: cannot parse %s float %s\n" -msgstr "FEL: ijsgutenprint: kan inte tolka %s float %s\n" +#~ msgid "1440x720 DPI" +#~ msgstr "1440×720 DPI" -#: src/ghost/ijsgutenprint.c:809 -#, c-format -msgid "ERROR: ijsgutenprint: cannot parse %s int %s\n" -msgstr "FEL: ijsgutenprint: kan inte tolka %s int %s\n" +#~ msgid "1440x720 DPI DMT" +#~ msgstr "1440×720 DPI DMT" -#: src/ghost/ijsgutenprint.c:816 -#, c-format -msgid "ERROR: ijsgutenprint: cannot parse %s dimension %s\n" -msgstr "FEL: ijsgutenprint: kan inte tolka %s dimension %s\n" +#~ msgid "1440x1440 DPI" +#~ msgstr "1440×1440 DPI" -#: src/ghost/ijsgutenprint.c:830 -#, c-format -msgid "ERROR: ijsgutenprint: cannot parse %s boolean %s\n" -msgstr "FEL: ijsgutenprint: kan inte tolka %s boolean %s\n" +#~ msgid "1440x1440 DPI DMT" +#~ msgstr "1440×1440 DPI DMT" -#: src/ghost/ijsgutenprint.c:841 -#, c-format -msgid "ERROR: ijsgutenprint: Bad parameter %s %d\n" -msgstr "FEL: ijsgutenprint: Felaktig parameter %s %d\n" +#~ msgid "2880x2880 DPI" +#~ msgstr "2880×2880 DPI" -#: 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" +#~ msgid "2880x2880 DPI DMT" +#~ msgstr "2880×2880 DPI DMT" -#: src/ghost/ijsgutenprint.c:1308 -#, c-format -msgid "ERROR: ijsgutenprint: image_init failed %d\n" -msgstr "FEL: ijsgutenprint: image_init misslyckades %d\n" +#~ msgid "150x150 DPI DMT" +#~ msgstr "150×150 DPI DMT" -#: src/ghost/ijsgutenprint.c:1319 -#, c-format -msgid "ERROR: ijsgutenprint: Unable to open file descriptor: %s\n" -msgstr "FEL: ijsgutenprint: Kunde inte öppna filidentifierare: %s\n" +#~ msgid "300x300 DPI DMT" +#~ msgstr "300×300 DPI DMT" -#: src/ghost/ijsgutenprint.c:1331 -#, c-format -msgid "ERROR: ijsgutenprint: Unable to open %s: %s\n" -msgstr "FEL: ijsgutenprint: Kunde inte öppna %s: %s\n" +#~ msgid "600x300 DPI DMT" +#~ msgstr "600×300 DPI DMT" -#: src/ghost/ijsgutenprint.c:1344 -#, c-format -msgid "ERROR: ijsgutenprint: Unknown printer %s\n" -msgstr "FEL: ijsgutenprint: Okänd skrivare %s\n" +#~ msgid "600x600 DPI DMT" +#~ msgstr "600×600 DPI DMT" -#: src/ghost/ijsgutenprint.c:1516 -#, c-format -msgid "ERROR: ijsgutenprint: Bad parameters; cannot continue!\n" -msgstr "FEL: ijsgutenprint: Felaktiga parametrar; kan inte fortsätta!\n" +#~ msgid "1200x600 DPI DMT" +#~ msgstr "1200×600 DPI DMT" -#: src/ghost/ijsgutenprint.c:1534 -#, c-format -msgid "ERROR: ijsgutenprint: Get next row failed at %.0f\n" -msgstr "FEL: ijsgutenprint: Hämtning av nästa rad misslyckades vid %.0f\n" +#~ msgid "1200x1200 DPI" +#~ msgstr "1200×1200 DPI" -#, fuzzy -#~ msgid "Model Name" -#~ msgstr "Kanalnamn" +#~ msgid "1200x1200 DPI DMT" +#~ msgstr "1200×1200 DPI DMT" -#, fuzzy -#~ msgid "Canon MULTIPASS MP500" -#~ msgstr "Canon S500" +#~ msgid "2400x2400 DPI" +#~ msgstr "2400×2400 DPI" -#, fuzzy -#~ msgid "Canon MULTIPASS MP760" -#~ msgstr "Canon LBP-1760" +#~ msgid "2400x2400 DPI DMT" +#~ msgstr "2400×2400 DPI DMT" + +#~ msgid "Plain Paper PIXMA" +#~ msgstr "Vanligt papper PIXMA" + +#~ msgid "Back Print Film" +#~ msgstr "Bakutskriftsfilm" + +#~ msgid "Fabric Sheets" +#~ msgstr "Tygark" + +#~ msgid "Envelope" +#~ msgstr "Kuvert" + +#~ msgid "High Resolution Paper" +#~ msgstr "Högupplösningspapper" + +#~ msgid "T-Shirt Transfers" +#~ msgstr "T-shirttryck" + +#~ msgid "High Gloss Film" +#~ msgstr "Högglansig film" + +#~ msgid "Glossy Photo Paper" +#~ msgstr "Glansigt fotopapper" + +#~ msgid "Glossy Photo Cards" +#~ msgstr "Glansiga fotokort" + +#~ msgid "Photo Paper Pro" +#~ msgstr "Professionellt fotopapper" #, fuzzy #~ msgid "Cassette" @@ -8058,6 +8448,18 @@ msgstr "FEL: ijsgutenprint: Hämtning av nästa rad misslyckades vid %.0f\n" #~ msgid "CD tray" #~ msgstr "Cd-lucka" +#~ msgid "Photo CcMmYK Color" +#~ msgstr "CcMmYK-fotofärg" + +#~ msgid "Photo CcMmY Color" +#~ msgstr "CcMmY-fotofärg" + +#~ msgid "CMYK Color" +#~ msgstr "CMYK-färg" + +#~ msgid "CMY Color" +#~ msgstr "CMY-färg" + #~ msgid " Gamma" #~ msgstr " Gamma" @@ -8147,6 +8549,9 @@ msgstr "FEL: ijsgutenprint: Hämtning av nästa rad misslyckades vid %.0f\n" #~ "Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 " #~ "USA\n" +#~ msgid "Gutenprint" +#~ msgstr "Gutenprint" + #~ msgid "" #~ ", Copyright (C) 2000-2006 Robert Krawitz\n" #~ "Escputil comes with ABSOLUTELY NO WARRANTY; for details type 'escputil -" @@ -8162,125 +8567,96 @@ msgstr "FEL: ijsgutenprint: Hämtning av nästa rad misslyckades vid %.0f\n" #~ "mer\n" #~ "information.\n" -#~ msgid "90x90 DPI" -#~ msgstr "90×90 DPI" - -#~ msgid "90x90 DPI DMT" -#~ msgstr "90×90 DPI DMT" - -#~ msgid "180x180 DPI" -#~ msgstr "180×180 DPI" - -#~ msgid "180x180 DPI DMT" -#~ msgstr "180×180 DPI DMT" - -#~ msgid "360x360 DPI" -#~ msgstr "360×360 DPI" - -#~ msgid "360x360 DPI DMT" -#~ msgstr "360×360 DPI DMT" - -#~ msgid "720x360 DPI" -#~ msgstr "720×360 DPI" - -#~ msgid "720x360 DPI DMT" -#~ msgstr "720×360 DPI DMT" - -#~ msgid "720x720 DPI" -#~ msgstr "720×720 DPI" - -#~ msgid "720x720 DPI DMT" -#~ msgstr "720×720 DPI DMT" - -#~ msgid "1440x720 DPI" -#~ msgstr "1440×720 DPI" - -#~ msgid "1440x720 DPI DMT" -#~ msgstr "1440×720 DPI DMT" - -#~ msgid "1440x1440 DPI" -#~ msgstr "1440×1440 DPI" - -#~ msgid "1440x1440 DPI DMT" -#~ msgstr "1440×1440 DPI DMT" - -#~ msgid "2880x2880 DPI" -#~ msgstr "2880×2880 DPI" - -#~ msgid "2880x2880 DPI DMT" -#~ msgstr "2880×2880 DPI DMT" - -#~ msgid "150x150 DPI DMT" -#~ msgstr "150×150 DPI DMT" - -#~ msgid "300x300 DPI DMT" -#~ msgstr "300×300 DPI DMT" - -#~ msgid "600x300 DPI DMT" -#~ msgstr "600×300 DPI DMT" +#~ msgid "/File/Print..." +#~ msgstr "/Arkiv/Skriv ut..." -#~ msgid "600x600 DPI DMT" -#~ msgstr "600×600 DPI DMT" +#~ msgid "" +#~ "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" +#~ 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" + +#~ msgid "ERROR: ijsgutenprint: Bad color space: bps %d channels %d space %s\n" +#~ msgstr "" +#~ "FEL: ijsgutenprint: Felaktigt färgutrymme: bps %d kanaler %d utrymme %s\n" -#~ msgid "1200x600 DPI DMT" -#~ msgstr "1200×600 DPI DMT" +#~ msgid "ERROR: ijsgutenprint: No row buffer\n" +#~ msgstr "FEL: ijsgutenprint: Ingen radbuffert\n" -#~ msgid "1200x1200 DPI" -#~ msgstr "1200×1200 DPI" +#~ msgid "" +#~ "ERROR: ijsgutenprint: Unable to parse parameter %s=%s (expect a number)\n" +#~ msgstr "" +#~ "FEL: ijsgutenprint: Kan inte tolka parametern %s=%s (ett tal förväntas)\n" -#~ msgid "1200x1200 DPI DMT" -#~ msgstr "1200×1200 DPI DMT" +#~ msgid "ERROR: ijsgutenprint: Printer must be specified with -sDeviceModel\n" +#~ msgstr "FEL: ijsgutenprint: Skrivaren mÃ¥ste anges med -sDeviceModel\n" -#~ msgid "2400x2400 DPI" -#~ msgstr "2400×2400 DPI" +#~ msgid "ERROR: ijsgutenprint: Printer %s is not a known model\n" +#~ msgstr "FEL: ijsgutenprint: Skrivaren %s är inte en känd modell\n" -#~ msgid "2400x2400 DPI DMT" -#~ msgstr "2400×2400 DPI DMT" +# DeviceModel är ett anrop? +#~ msgid "ijsgutenprint: unknown DeviceModel %s\n" +#~ msgstr "ijsgutenprint: okänd DeviceModel %s\n" -#~ msgid "Plain Paper PIXMA" -#~ msgstr "Vanligt papper PIXMA" +#~ msgid "ERROR: ijsgutenprint: cannot parse TopLeft %s\n" +#~ msgstr "FEL: ijsgutenprint: kan inte tolka TopLeft %s\n" -#~ msgid "Back Print Film" -#~ msgstr "Bakutskriftsfilm" +#~ msgid "ERROR: ijsgutenprint: cannot parse PaperSize %s\n" +#~ msgstr "FEL: ijsgutenprint: kan inte tolka PaperSize %s\n" -#~ msgid "Fabric Sheets" -#~ msgstr "Tygark" +#~ msgid "ERROR: ijsgutenprint: cannot parse curve %s\n" +#~ msgstr "FEL: ijsgutenprint: kan inte tolka kurvan %s\n" -#~ msgid "Envelope" -#~ msgstr "Kuvert" +#~ msgid "ERROR: ijsgutenprint: cannot parse %s float %s\n" +#~ msgstr "FEL: ijsgutenprint: kan inte tolka %s float %s\n" -#~ msgid "High Resolution Paper" -#~ msgstr "Högupplösningspapper" +#~ msgid "ERROR: ijsgutenprint: cannot parse %s int %s\n" +#~ msgstr "FEL: ijsgutenprint: kan inte tolka %s int %s\n" -#~ msgid "T-Shirt Transfers" -#~ msgstr "T-shirttryck" +#~ msgid "ERROR: ijsgutenprint: cannot parse %s dimension %s\n" +#~ msgstr "FEL: ijsgutenprint: kan inte tolka %s dimension %s\n" -#~ msgid "High Gloss Film" -#~ msgstr "Högglansig film" +#~ msgid "ERROR: ijsgutenprint: cannot parse %s boolean %s\n" +#~ msgstr "FEL: ijsgutenprint: kan inte tolka %s boolean %s\n" -#~ msgid "Glossy Photo Paper" -#~ msgstr "Glansigt fotopapper" +#~ msgid "ERROR: ijsgutenprint: Bad parameter %s %d\n" +#~ msgstr "FEL: ijsgutenprint: Felaktig parameter %s %d\n" -#~ msgid "Glossy Photo Cards" -#~ msgstr "Glansiga fotokort" +#, fuzzy +#~ msgid "ERROR: ijsgutenprint: bad key code %d\n" +#~ msgstr "Hämtande av nästa rad misslyckades vid %.0f\n" -#~ msgid "Photo Paper Pro" -#~ msgstr "Professionellt fotopapper" +#~ msgid "ERROR: ijsgutenprint: image_init failed %d\n" +#~ msgstr "FEL: ijsgutenprint: image_init misslyckades %d\n" -#~ msgid "Photo CcMmYK Color" -#~ msgstr "CcMmYK-fotofärg" +#~ msgid "ERROR: ijsgutenprint: Unable to open file descriptor: %s\n" +#~ msgstr "FEL: ijsgutenprint: Kunde inte öppna filidentifierare: %s\n" -#~ msgid "Photo CcMmY Color" -#~ msgstr "CcMmY-fotofärg" +#~ msgid "ERROR: ijsgutenprint: Unable to open %s: %s\n" +#~ msgstr "FEL: ijsgutenprint: Kunde inte öppna %s: %s\n" -#~ msgid "CMYK Color" -#~ msgstr "CMYK-färg" +#~ msgid "ERROR: ijsgutenprint: Unknown printer %s\n" +#~ msgstr "FEL: ijsgutenprint: Okänd skrivare %s\n" -#~ msgid "CMY Color" -#~ msgstr "CMY-färg" +#~ msgid "ERROR: ijsgutenprint: Bad parameters; cannot continue!\n" +#~ msgstr "FEL: ijsgutenprint: Felaktiga parametrar; kan inte fortsätta!\n" -#~ msgid "Gutenprint" -#~ msgstr "Gutenprint" +#~ msgid "ERROR: ijsgutenprint: Get next row failed at %.0f\n" +#~ msgstr "FEL: ijsgutenprint: Hämtning av nästa rad misslyckades vid %.0f\n" #~ msgid "ERROR: ijsgutenprint: ijs_server_get_page_header failed %d\n" #~ msgstr "FEL: ijsgutenprint: ijs_server_get_page_header misslyckades %d\n" diff --git a/po/zh_TW.gmo b/po/zh_TW.gmo index 95d0b71..82284a4 100644 Binary files a/po/zh_TW.gmo and b/po/zh_TW.gmo differ diff --git a/po/zh_TW.po b/po/zh_TW.po index 712c9f8..257b578 100644 --- a/po/zh_TW.po +++ b/po/zh_TW.po @@ -6,8 +6,8 @@ msgid "" msgstr "" "Project-Id-Version: gutenprint 5.0.0-b5\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2008-01-01 20:47-0500\n" -"PO-Revision-Date: 2006-05-28 10:06-0400\n" +"POT-Creation-Date: 2008-04-25 21:19-0400\n" +"PO-Revision-Date: 2005-08-07 12:56+0800\n" "Last-Translator: Abel Cheung \n" "Language-Team: Chinese (traditional) \n" "MIME-Version: 1.0\n" @@ -17,7 +17,7 @@ msgstr "" #. 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:1752 +#: src/main/print-escp2.c:2116 msgid "Default" msgstr "é è¨­" @@ -57,41 +57,54 @@ msgid "Ordered" msgstr "Ordered" #: src/main/dither-main.c:65 +#, fuzzy +msgid "Ordered New" +msgstr "Ordered" + +#: src/main/dither-main.c:66 msgid "Fast" msgstr "Fast" -#: src/main/dither-main.c:66 +#: src/main/dither-main.c:67 msgid "Very Fast" msgstr "Very Fast" -#: src/main/dither-main.c:67 +#: src/main/dither-main.c:68 msgid "Hybrid Floyd-Steinberg" msgstr "Hybrid Floyd-Steinberg" -#: src/main/dither-main.c:68 +#: src/main/dither-main.c:69 msgid "Predithered Input" msgstr "" -#: src/main/dither-main.c:88 src/main/print-color.c:56 +#: src/main/dither-main.c:70 +msgid "Drop Size Segmented" +msgstr "" + +#: src/main/dither-main.c:71 +msgid "Drop Size Segmented New" +msgstr "" + +#: src/main/dither-main.c:91 src/main/print-color.c:56 msgid "Density" msgstr "密度" -#: src/main/dither-main.c:88 src/main/print-canon.c:295 +#: src/main/dither-main.c:91 src/main/print-canon.c:295 #: src/main/print-canon.c:303 src/main/print-canon.c:311 -#: src/main/print-canon.c:319 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-escp2.c:471 -#: src/main/print-escp2.c:479 src/main/print-escp2.c:487 +#: src/main/print-canon.c:319 src/main/print-escp2.c:446 +#: src/main/print-escp2.c:454 src/main/print-escp2.c:462 +#: src/main/print-escp2.c:470 src/main/print-escp2.c:478 +#: src/main/print-escp2.c:486 src/main/print-escp2.c:494 #: 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:1764 src/main/print-olympus.c:1772 -#: src/main/print-olympus.c:1780 src/main/print-olympus.c:1788 -#: src/main/print-pcl.c:1261 src/main/print-pcl.c:1269 -#: src/main/print-pcl.c:1277 src/main/print-pcl.c:1285 +#: src/main/print-olympus.c:1762 src/main/print-olympus.c:1770 +#: src/main/print-olympus.c:1778 src/main/print-olympus.c:1786 +#: src/main/print-pcl.c:1329 src/main/print-pcl.c:1337 +#: src/main/print-pcl.c:1345 src/main/print-pcl.c:1353 msgid "Output Level Adjustment" msgstr "" -#: src/main/dither-main.c:89 +#: src/main/dither-main.c:92 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 +113,15 @@ msgstr "" "調整列å°æ™‚墨點的密度。如果墨水太多，滲é€åˆ°ç´™å¼µèƒŒå¾Œæˆ–者弄髒紙張，請減低密度；" "相å地，如果黑色看來ä¸å¤ å¯¦ï¼Œå‰‡æ‡‰å¢žåŠ å¯†åº¦ã€‚" -#: src/main/dither-main.c:97 +#: src/main/dither-main.c:100 msgid "Dither Algorithm" msgstr "擬色算法" -#: src/main/dither-main.c:97 +#: src/main/dither-main.c:100 msgid "Screening Adjustment" msgstr "" -#: src/main/dither-main.c:98 +#: src/main/dither-main.c:101 msgid "" "Choose the dither algorithm to be used.\n" "Adaptive Hybrid usually produces the best all-around quality.\n" @@ -142,9 +155,9 @@ msgstr "" msgid "Dither algorithm" msgstr "擬色é‹ç®—æ–¹å¼" -#: src/main/print-canon.c:200 src/main/print-escp2.c:180 -#: src/main/print-lexmark.c:266 src/main/print-olympus.c:1699 -#: src/main/print-pcl.c:1196 src/main/print-ps.c:67 +#: src/main/print-canon.c:200 src/main/print-escp2.c:182 +#: src/main/print-lexmark.c:266 src/main/print-olympus.c:1697 +#: src/main/print-pcl.c:1264 msgid "Page Size" msgstr "é é¢å°ºå¯¸" @@ -152,235 +165,244 @@ msgstr "é é¢å°ºå¯¸" #: src/main/print-canon.c:212 src/main/print-canon.c:218 #: src/main/print-canon.c:224 src/main/print-canon.c:230 #: src/main/print-canon.c:248 src/main/print-canon.c:272 -#: src/main/print-escp2.c:180 src/main/print-escp2.c:186 -#: src/main/print-escp2.c:192 src/main/print-escp2.c:198 -#: src/main/print-escp2.c:204 src/main/print-escp2.c:210 -#: src/main/print-escp2.c:228 src/main/print-escp2.c:245 -#: src/main/print-escp2.c:251 src/main/print-escp2.c:263 -#: src/main/print-escp2.c:281 src/main/print-lexmark.c:266 +#: src/main/print-escp2.c:182 src/main/print-escp2.c:188 +#: src/main/print-escp2.c:194 src/main/print-escp2.c:200 +#: src/main/print-escp2.c:206 src/main/print-escp2.c:212 +#: src/main/print-escp2.c:230 src/main/print-escp2.c:247 +#: src/main/print-escp2.c:253 src/main/print-escp2.c:265 +#: src/main/print-escp2.c:283 src/main/print-lexmark.c:266 #: src/main/print-lexmark.c:272 src/main/print-lexmark.c:278 -#: src/main/print-lexmark.c:284 src/main/print-olympus.c:1699 -#: src/main/print-olympus.c:1705 src/main/print-olympus.c:1711 -#: src/main/print-olympus.c:1717 src/main/print-pcl.c:1196 -#: src/main/print-pcl.c:1202 src/main/print-pcl.c:1208 -#: src/main/print-pcl.c:1214 src/main/print-pcl.c:1238 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 +#: src/main/print-lexmark.c:284 src/main/print-olympus.c:1697 +#: src/main/print-olympus.c:1703 src/main/print-olympus.c:1709 +#: src/main/print-olympus.c:1715 src/main/print-pcl.c:1264 +#: src/main/print-pcl.c:1270 src/main/print-pcl.c:1276 +#: src/main/print-pcl.c:1282 src/main/print-pcl.c:1306 src/main/print-ps.c:68 +#: src/main/print-ps.c:74 msgid "Basic Printer Setup" msgstr "基本å°è¡¨æ©Ÿè¨­å®š" -#: src/main/print-canon.c:201 src/main/print-escp2.c:181 -#: src/main/print-lexmark.c:267 src/main/print-olympus.c:1700 -#: src/main/print-pcl.c:1197 src/main/print-ps.c:68 +#: src/main/print-canon.c:201 src/main/print-escp2.c:183 +#: src/main/print-lexmark.c:267 src/main/print-olympus.c:1698 +#: src/main/print-pcl.c:1265 msgid "Size of the paper being printed to" msgstr "列å°æ™‚使用的紙張尺寸" -#: src/main/print-canon.c:206 src/main/print-escp2.c:186 -#: src/main/print-lexmark.c:272 src/main/print-olympus.c:1705 -#: src/main/print-pcl.c:1202 src/main/print-ps.c:73 src/cups/genppd.c:1417 +#: src/main/print-canon.c:206 src/main/print-escp2.c:188 +#: src/main/print-lexmark.c:272 src/main/print-olympus.c:1703 +#: src/main/print-pcl.c:1270 src/cups/genppd.c:1422 msgid "Media Type" msgstr "紙張類別" -#: src/main/print-canon.c:207 src/main/print-escp2.c:187 -#: src/main/print-lexmark.c:273 src/main/print-olympus.c:1706 -#: src/main/print-pcl.c:1203 src/main/print-ps.c:74 +#: src/main/print-canon.c:207 src/main/print-escp2.c:189 +#: src/main/print-lexmark.c:273 src/main/print-olympus.c:1704 +#: src/main/print-pcl.c:1271 msgid "Type of media (plain paper, photo paper, etc.)" msgstr "紙張的類別 (普通紙ã€ç›¸ç´™ç­‰ç­‰)" -#: src/main/print-canon.c:212 src/main/print-escp2.c:192 -#: src/main/print-lexmark.c:278 src/main/print-olympus.c:1711 -#: src/main/print-pcl.c:1208 src/main/print-ps.c:79 src/cups/genppd.c:1445 +#: src/main/print-canon.c:212 src/main/print-escp2.c:194 +#: src/main/print-lexmark.c:278 src/main/print-olympus.c:1709 +#: src/main/print-pcl.c:1276 src/cups/genppd.c:1450 msgid "Media Source" msgstr "紙張來æº" -#: src/main/print-canon.c:213 src/main/print-escp2.c:193 -#: src/main/print-lexmark.c:279 src/main/print-olympus.c:1712 -#: src/main/print-pcl.c:1209 src/main/print-ps.c:80 +#: src/main/print-canon.c:213 src/main/print-escp2.c:195 +#: src/main/print-lexmark.c:279 src/main/print-olympus.c:1710 +#: src/main/print-pcl.c:1277 msgid "Source (input slot) of the media" msgstr "é€ç´™åŒ£æˆ–者紙張的來æº" -#: src/main/print-canon.c:218 src/main/print-escp2.c:198 +#: src/main/print-canon.c:218 src/main/print-escp2.c:200 msgid "CD Hub Size" msgstr "" -#: src/main/print-canon.c:219 src/main/print-escp2.c:199 +#: src/main/print-canon.c:219 src/main/print-escp2.c:201 msgid "Print only outside of the hub of the CD, or all the way to the hole" msgstr "" -#: src/main/print-canon.c:224 src/main/print-escp2.c:204 +#: src/main/print-canon.c:224 src/main/print-escp2.c:206 msgid "CD Size (Custom)" msgstr "" -#: src/main/print-canon.c:225 src/main/print-escp2.c:205 +#: src/main/print-canon.c:225 src/main/print-escp2.c:207 msgid "Variable adjustment for the outer diameter of CD" msgstr "" -#: src/main/print-canon.c:230 src/main/print-escp2.c:210 +#: src/main/print-canon.c:230 src/main/print-escp2.c:212 msgid "CD Hub Size (Custom)" msgstr "" -#: src/main/print-canon.c:231 src/main/print-escp2.c:211 +#: src/main/print-canon.c:231 src/main/print-escp2.c:213 #, fuzzy msgid "Variable adjustment to the inner hub of the CD" msgstr "指定列å°æ™‚çš„å½±åƒå°ºå¯¸ç‚ºé é¢å°ºå¯¸çš„æŸå€‹ç™¾åˆ†æ¯”" -#: src/main/print-canon.c:236 src/main/print-escp2.c:216 +#: src/main/print-canon.c:236 src/main/print-escp2.c:218 msgid "CD Horizontal Fine Adjustment" msgstr "" #: src/main/print-canon.c:236 src/main/print-canon.c:242 -#: src/main/print-canon.c:254 src/main/print-escp2.c:216 -#: src/main/print-escp2.c:222 src/main/print-escp2.c:239 -#: src/main/print-escp2.c:275 src/main/print-lexmark.c:290 -#: src/main/print-olympus.c:1723 src/main/print-olympus.c:1729 -#: src/main/print-olympus.c:1735 src/main/print-pcl.c:1220 -#: src/main/print-ps.c:91 src/main/print-raw.c:80 +#: src/main/print-canon.c:254 src/main/print-escp2.c:218 +#: src/main/print-escp2.c:224 src/main/print-escp2.c:241 +#: src/main/print-escp2.c:277 src/main/print-lexmark.c:290 +#: src/main/print-olympus.c:1721 src/main/print-olympus.c:1727 +#: src/main/print-olympus.c:1733 src/main/print-pcl.c:1288 +#: src/main/print-raw.c:80 msgid "Advanced Printer Setup" msgstr "進階å°è¡¨æ©Ÿè¨­å®š" #: src/main/print-canon.c:237 src/main/print-canon.c:243 -#: src/main/print-escp2.c:217 src/main/print-escp2.c:223 +#: src/main/print-escp2.c:219 src/main/print-escp2.c:225 msgid "Fine adjustment to horizontal position for CD printing" msgstr "" -#: src/main/print-canon.c:242 src/main/print-escp2.c:222 +#: src/main/print-canon.c:242 src/main/print-escp2.c:224 msgid "CD Vertical Fine Adjustment" msgstr "" -#: src/main/print-canon.c:248 src/main/print-escp2.c:228 -#: src/main/print-lexmark.c:284 src/main/print-olympus.c:1717 -#: src/main/print-pcl.c:1214 src/main/print-ps.c:85 src/cups/genppd.c:1518 +#: src/main/print-canon.c:248 src/main/print-escp2.c:230 +#: src/main/print-lexmark.c:284 src/main/print-olympus.c:1715 +#: src/main/print-pcl.c:1282 src/cups/genppd.c:1523 msgid "Resolution" msgstr "解æžåº¦" #: src/main/print-canon.c:249 src/main/print-lexmark.c:285 -#: src/main/print-olympus.c:1718 src/main/print-pcl.c:1215 -#: src/main/print-ps.c:86 +#: src/main/print-olympus.c:1716 src/main/print-pcl.c:1283 msgid "Resolution and quality of the print" msgstr "列å°æ™‚的解æžåº¦åŠå“質" -#: src/main/print-canon.c:254 src/main/print-escp2.c:239 -#: src/main/print-lexmark.c:290 src/main/print-olympus.c:1723 -#: src/main/print-pcl.c:1220 src/main/print-ps.c:91 src/main/print-raw.c:80 +#: src/main/print-canon.c:254 src/main/print-escp2.c:241 +#: src/main/print-lexmark.c:290 src/main/print-olympus.c:1721 +#: src/main/print-pcl.c:1288 src/main/print-raw.c:80 msgid "Ink Type" msgstr "墨水類別" -#: src/main/print-canon.c:255 src/main/print-escp2.c:240 -#: src/main/print-escp2.c:252 src/main/print-lexmark.c:291 -#: src/main/print-olympus.c:1724 src/main/print-pcl.c:1221 -#: src/main/print-ps.c:92 src/main/print-raw.c:81 +#: src/main/print-canon.c:255 src/main/print-escp2.c:242 +#: src/main/print-escp2.c:254 src/main/print-lexmark.c:291 +#: src/main/print-olympus.c:1722 src/main/print-pcl.c:1289 +#: src/main/print-raw.c:81 msgid "Type of ink in the printer" msgstr "å°è¡¨æ©Ÿå¢¨æ°´çš„é¡žåž‹" #: src/main/print-canon.c:260 src/main/print-canon.c:261 -#: src/main/print-escp2.c:329 src/main/print-escp2.c:330 +#: src/main/print-escp2.c:331 src/main/print-escp2.c:332 #: src/main/print-lexmark.c:296 src/main/print-lexmark.c:297 -#: src/main/print-pcl.c:1226 src/main/print-pcl.c:1227 +#: src/main/print-pcl.c:1294 src/main/print-pcl.c:1295 msgid "Ink Channels" msgstr "" -#: src/main/print-canon.c:260 src/main/print-escp2.c:130 -#: src/main/print-escp2.c:137 src/main/print-escp2.c:144 -#: src/main/print-escp2.c:287 src/main/print-escp2.c:293 -#: src/main/print-escp2.c:299 src/main/print-escp2.c:305 -#: src/main/print-escp2.c:311 src/main/print-escp2.c:317 -#: src/main/print-escp2.c:323 src/main/print-escp2.c:329 -#: src/main/print-escp2.c:335 src/main/print-lexmark.c:296 -#: src/main/print-pcl.c:1226 +#: src/main/print-canon.c:260 src/main/print-escp2.c:132 +#: src/main/print-escp2.c:139 src/main/print-escp2.c:146 +#: src/main/print-escp2.c:289 src/main/print-escp2.c:295 +#: src/main/print-escp2.c:301 src/main/print-escp2.c:307 +#: src/main/print-escp2.c:313 src/main/print-escp2.c:319 +#: src/main/print-escp2.c:325 src/main/print-escp2.c:331 +#: src/main/print-escp2.c:337 src/main/print-lexmark.c:296 +#: src/main/print-pcl.c:1294 msgid "Advanced Printer Functionality" msgstr "進階å°è¡¨æ©ŸåŠŸèƒ½" -#: src/main/print-canon.c:266 src/main/print-escp2.c:341 -#: src/main/print-lexmark.c:302 src/main/print-olympus.c:1741 -#: src/main/print-pcl.c:1232 src/main/print-ps.c:103 src/main/print-raw.c:86 +#: src/main/print-canon.c:266 src/main/print-escp2.c:343 +#: src/main/print-lexmark.c:302 src/main/print-olympus.c:1739 +#: src/main/print-pcl.c:1300 src/main/print-ps.c:80 src/main/print-raw.c:86 msgid "Printing Mode" msgstr "列å°æ¨¡å¼" #: src/main/print-canon.c:266 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:341 -#: src/main/print-escp2.c:347 src/main/print-lexmark.c:302 -#: src/main/print-olympus.c:1741 src/main/print-pcl.c:1232 -#: src/main/print-ps.c:103 src/main/print-raw.c:86 +#: src/main/print-color.c:208 src/main/print-escp2.c:343 +#: src/main/print-escp2.c:349 src/main/print-lexmark.c:302 +#: src/main/print-olympus.c:1739 src/main/print-pcl.c:1300 +#: src/main/print-ps.c:80 src/main/print-raw.c:86 msgid "Core Parameter" msgstr "" -#: src/main/print-canon.c:267 src/main/print-escp2.c:342 -#: src/main/print-lexmark.c:303 src/main/print-olympus.c:1742 -#: src/main/print-pcl.c:1233 src/main/print-ps.c:104 src/main/print-raw.c:87 +#: src/main/print-canon.c:267 src/main/print-escp2.c:344 +#: src/main/print-lexmark.c:303 src/main/print-olympus.c:1740 +#: src/main/print-pcl.c:1301 src/main/print-ps.c:81 src/main/print-raw.c:87 msgid "Printing Output Mode" msgstr "" -#: src/main/print-canon.c:272 src/main/print-pcl.c:1238 +#: src/main/print-canon.c:272 src/main/print-pcl.c:1306 msgid "Double-Sided Printing" msgstr "é›™é¢åˆ—å°" -#: src/main/print-canon.c:273 src/main/print-pcl.c:1239 +#: src/main/print-canon.c:273 src/main/print-pcl.c:1307 msgid "Duplex/Tumble Setting" msgstr "" -#: src/main/print-canon.c:295 src/main/print-escp2.c:439 -#: src/main/print-lexmark.c:325 src/main/print-pcl.c:1261 +#: src/main/print-canon.c:295 src/main/print-escp2.c:446 +#: src/main/print-lexmark.c:325 src/main/print-pcl.c:1329 msgid "Cyan Density" msgstr "æ°°è—色密度" -#: src/main/print-canon.c:296 src/main/print-escp2.c:440 -#: src/main/print-lexmark.c:326 src/main/print-pcl.c:1262 +#: src/main/print-canon.c:296 src/main/print-escp2.c:447 +#: src/main/print-lexmark.c:326 src/main/print-pcl.c:1330 msgid "Adjust the cyan density" msgstr "調整氰è—色色彩密度" -#: src/main/print-canon.c:303 src/main/print-escp2.c:447 -#: src/main/print-lexmark.c:333 src/main/print-pcl.c:1269 +#: src/main/print-canon.c:303 src/main/print-escp2.c:454 +#: src/main/print-lexmark.c:333 src/main/print-pcl.c:1337 msgid "Magenta Density" msgstr "洋紅色密度" -#: src/main/print-canon.c:304 src/main/print-escp2.c:448 -#: src/main/print-lexmark.c:334 src/main/print-pcl.c:1270 +#: src/main/print-canon.c:304 src/main/print-escp2.c:455 +#: src/main/print-lexmark.c:334 src/main/print-pcl.c:1338 msgid "Adjust the magenta density" msgstr "調整洋紅色色彩密度" -#: src/main/print-canon.c:311 src/main/print-escp2.c:455 -#: src/main/print-lexmark.c:341 src/main/print-pcl.c:1277 +#: src/main/print-canon.c:311 src/main/print-escp2.c:462 +#: src/main/print-lexmark.c:341 src/main/print-pcl.c:1345 msgid "Yellow Density" msgstr "黃色密度" -#: src/main/print-canon.c:312 src/main/print-escp2.c:456 -#: src/main/print-lexmark.c:342 src/main/print-pcl.c:1278 +#: src/main/print-canon.c:312 src/main/print-escp2.c:463 +#: src/main/print-lexmark.c:342 src/main/print-pcl.c:1346 msgid "Adjust the yellow density" msgstr "調整黃色色彩密度" -#: src/main/print-canon.c:319 src/main/print-escp2.c:463 -#: src/main/print-lexmark.c:349 src/main/print-pcl.c:1285 +#: src/main/print-canon.c:319 src/main/print-escp2.c:470 +#: src/main/print-lexmark.c:349 src/main/print-pcl.c:1353 msgid "Black Density" msgstr "黑色密度" -#: src/main/print-canon.c:320 src/main/print-escp2.c:464 -#: src/main/print-lexmark.c:350 src/main/print-pcl.c:1286 +#: src/main/print-canon.c:320 src/main/print-escp2.c:471 +#: src/main/print-lexmark.c:350 src/main/print-pcl.c:1354 msgid "Adjust the black density" msgstr "調整黑色色彩密度" #: src/main/print-canon.c:327 src/main/print-canon.c:328 -#: src/main/print-escp2.c:495 src/main/print-escp2.c:496 +#: src/main/print-escp2.c:534 src/main/print-escp2.c:535 #: src/main/print-lexmark.c:357 src/main/print-lexmark.c:358 -#: src/main/print-pcl.c:1293 src/main/print-pcl.c:1294 +#: src/main/print-pcl.c:1361 src/main/print-pcl.c:1362 msgid "Light Cyan Transition" msgstr "" #: src/main/print-canon.c:327 src/main/print-canon.c:335 -#: src/main/print-canon.c:343 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-escp2.c:543 -#: src/main/print-escp2.c:551 src/main/print-escp2.c:559 -#: src/main/print-lexmark.c:357 src/main/print-lexmark.c:365 -#: src/main/print-pcl.c:1293 src/main/print-pcl.c:1301 +#: src/main/print-canon.c:343 src/main/print-escp2.c:502 +#: src/main/print-escp2.c:510 src/main/print-escp2.c:518 +#: src/main/print-escp2.c:526 src/main/print-escp2.c:534 +#: src/main/print-escp2.c:542 src/main/print-escp2.c:550 +#: src/main/print-escp2.c:558 src/main/print-escp2.c:566 +#: src/main/print-escp2.c:574 src/main/print-escp2.c:582 +#: src/main/print-escp2.c:590 src/main/print-escp2.c:598 +#: src/main/print-escp2.c:606 src/main/print-escp2.c:614 +#: src/main/print-escp2.c:622 src/main/print-escp2.c:630 +#: src/main/print-escp2.c:638 src/main/print-escp2.c:646 +#: src/main/print-escp2.c:654 src/main/print-escp2.c:662 +#: src/main/print-escp2.c:670 src/main/print-escp2.c:678 +#: src/main/print-escp2.c:686 src/main/print-escp2.c:694 +#: src/main/print-escp2.c:702 src/main/print-escp2.c:710 +#: src/main/print-escp2.c:718 src/main/print-escp2.c:726 +#: src/main/print-escp2.c:734 src/main/print-lexmark.c:357 +#: src/main/print-lexmark.c:365 src/main/print-pcl.c:1361 +#: src/main/print-pcl.c:1369 msgid "Advanced Ink Adjustment" msgstr "" #: src/main/print-canon.c:335 src/main/print-canon.c:336 -#: src/main/print-escp2.c:503 src/main/print-escp2.c:504 +#: src/main/print-escp2.c:566 src/main/print-escp2.c:567 #: src/main/print-lexmark.c:365 src/main/print-lexmark.c:366 -#: src/main/print-pcl.c:1301 src/main/print-pcl.c:1302 +#: src/main/print-pcl.c:1369 src/main/print-pcl.c:1370 msgid "Light Magenta Transition" msgstr "" @@ -388,54 +410,54 @@ msgstr "" msgid "Light Yellow Transition" msgstr "" -#: src/main/print-canon.c:363 src/main/print-pcl.c:1482 +#: src/main/print-canon.c:363 src/main/print-pcl.c:1550 #: src/main/escp2-resolutions.c:557 src/main/escp2-resolutions.c:565 #: src/main/escp2-resolutions.c:576 src/main/escp2-resolutions.c:588 msgid "Off" msgstr "" -#: src/main/print-canon.c:364 src/main/print-pcl.c:1483 +#: src/main/print-canon.c:364 src/main/print-pcl.c:1551 msgid "Long Edge (Standard)" msgstr "" -#: src/main/print-canon.c:365 src/main/print-pcl.c:1484 +#: src/main/print-canon.c:365 src/main/print-pcl.c:1552 msgid "Short Edge (Flip)" msgstr "" -#: src/main/print-canon.c:629 src/main/print-escp2.c:1648 +#: src/main/print-canon.c:629 src/main/print-escp2.c:2012 #: src/main/xmli18n-tmp.h:6 msgid "CD - 5 inch" msgstr "5 å‹å…‰ç¢Ÿ" -#: src/main/print-canon.c:631 src/main/print-escp2.c:1650 +#: src/main/print-canon.c:631 src/main/print-escp2.c:2014 #: src/main/xmli18n-tmp.h:7 msgid "CD - 3 inch" msgstr "3 å‹å…‰ç¢Ÿ" -#: src/main/print-canon.c:633 src/main/print-escp2.c:1652 +#: src/main/print-canon.c:633 src/main/print-escp2.c:2016 #: src/main/xmli18n-tmp.h:8 #, fuzzy msgid "CD - Custom" msgstr "自é¸" -#: src/main/print-canon.c:656 src/main/print-escp2.c:1677 +#: src/main/print-canon.c:656 src/main/print-escp2.c:2041 msgid "Normal" msgstr "" -#: src/main/print-canon.c:658 src/main/print-escp2.c:1679 +#: src/main/print-canon.c:658 src/main/print-escp2.c:2043 msgid "Print To Hub" msgstr "" -#: src/main/print-canon.c:773 src/main/print-escp2.c:2011 -#: src/main/print-lexmark.c:1279 src/main/print-olympus.c:1996 -#: src/main/print-pcl.c:1776 src/main/print-ps.c:170 src/main/print-raw.c:135 -#: src/gutenprintui/panel.c:289 src/gutenprintui2/panel.c:289 +#: src/main/print-canon.c:773 src/main/print-escp2.c:2450 +#: src/main/print-lexmark.c:1279 src/main/print-olympus.c:1994 +#: src/main/print-pcl.c:1844 src/main/print-ps.c:310 src/main/print-raw.c:135 +#: src/gutenprintui2/panel.c:290 msgid "Color" msgstr "彩色" -#: src/main/print-canon.c:775 src/main/print-escp2.c:2013 -#: src/main/print-lexmark.c:1281 src/main/print-pcl.c:1778 -#: src/main/print-ps.c:172 src/main/print-raw.c:137 +#: src/main/print-canon.c:775 src/main/print-escp2.c:2452 +#: src/main/print-lexmark.c:1281 src/main/print-pcl.c:1846 +#: src/main/print-ps.c:312 src/main/print-raw.c:137 msgid "Black and White" msgstr "黑白" @@ -473,7 +495,7 @@ msgstr "" #: src/main/print-color.c:121 src/main/escp2-channels.c:916 #: src/main/escp2-channels.c:929 src/main/escp2-channels.c:943 -#: src/gutenprintui/panel.c:290 src/gutenprintui2/panel.c:290 +#: src/gutenprintui2/panel.c:291 msgid "Grayscale" msgstr "ç°éšŽ" @@ -497,7 +519,7 @@ msgstr "CMYK" msgid "KCMY" msgstr "KCMY" -#: src/main/print-color.c:165 src/main/print-color.c:446 +#: src/main/print-color.c:165 src/main/print-color.c:454 msgid "Channel " msgstr "" @@ -553,7 +575,7 @@ msgid "Output image type" msgstr "輸出影åƒé¡žåž‹" #: src/main/print-color.c:208 src/main/print-color.c:209 -#: src/main/print-escp2.c:347 +#: src/main/print-escp2.c:349 msgid "Raw Channels" msgstr "" @@ -614,14 +636,14 @@ msgstr "" msgid "Gamma value assumed by application" msgstr "程å¼ä½¿ç”¨çš„ Gamma 值" -#: src/main/print-color.c:266 src/main/escp2-channels.c:3048 -#: src/main/escp2-channels.c:3060 src/main/escp2-channels.c:3068 -#: src/main/escp2-channels.c:3078 src/main/escp2-channels.c:3089 -#: src/main/escp2-channels.c:3101 src/main/escp2-channels.c:3117 -#: src/main/escp2-channels.c:3125 src/main/escp2-channels.c:3138 -#: src/main/escp2-channels.c:3151 src/main/escp2-channels.c:3165 -#: src/main/escp2-channels.c:3179 src/main/escp2-channels.c:3194 -#: src/gutenprintui/panel.c:2152 src/gutenprintui2/panel.c:2153 +#: src/main/print-color.c:266 src/main/escp2-channels.c:3087 +#: src/main/escp2-channels.c:3099 src/main/escp2-channels.c:3107 +#: src/main/escp2-channels.c:3117 src/main/escp2-channels.c:3128 +#: src/main/escp2-channels.c:3140 src/main/escp2-channels.c:3156 +#: src/main/escp2-channels.c:3164 src/main/escp2-channels.c:3177 +#: src/main/escp2-channels.c:3190 src/main/escp2-channels.c:3204 +#: src/main/escp2-channels.c:3218 src/main/escp2-channels.c:3230 +#: src/main/escp2-channels.c:3243 src/gutenprintui2/panel.c:2328 #: src/escputil/escputil.c:978 src/escputil/escputil.c:997 #: src/escputil/escputil.c:1201 msgid "Cyan" @@ -631,14 +653,14 @@ msgstr "æ°°è—" msgid "Adjust the cyan gamma" msgstr "調整氰è—色 gamma 值" -#: src/main/print-color.c:274 src/main/escp2-channels.c:3049 -#: src/main/escp2-channels.c:3059 src/main/escp2-channels.c:3070 -#: src/main/escp2-channels.c:3079 src/main/escp2-channels.c:3090 -#: src/main/escp2-channels.c:3103 src/main/escp2-channels.c:3116 -#: src/main/escp2-channels.c:3126 src/main/escp2-channels.c:3139 -#: src/main/escp2-channels.c:3152 src/main/escp2-channels.c:3164 -#: src/main/escp2-channels.c:3178 src/main/escp2-channels.c:3195 -#: src/gutenprintui/panel.c:2159 src/gutenprintui2/panel.c:2160 +#: src/main/print-color.c:274 src/main/escp2-channels.c:3088 +#: src/main/escp2-channels.c:3098 src/main/escp2-channels.c:3109 +#: src/main/escp2-channels.c:3118 src/main/escp2-channels.c:3129 +#: src/main/escp2-channels.c:3142 src/main/escp2-channels.c:3155 +#: src/main/escp2-channels.c:3165 src/main/escp2-channels.c:3178 +#: src/main/escp2-channels.c:3191 src/main/escp2-channels.c:3203 +#: src/main/escp2-channels.c:3217 src/main/escp2-channels.c:3229 +#: src/main/escp2-channels.c:3244 src/gutenprintui2/panel.c:2335 #: src/escputil/escputil.c:979 src/escputil/escputil.c:998 #: src/escputil/escputil.c:1202 msgid "Magenta" @@ -648,14 +670,14 @@ msgstr "æ´‹ç´…" msgid "Adjust the magenta gamma" msgstr "調整洋紅色 gamma 值" -#: src/main/print-color.c:282 src/main/escp2-channels.c:3050 -#: src/main/escp2-channels.c:3061 src/main/escp2-channels.c:3069 -#: src/main/escp2-channels.c:3080 src/main/escp2-channels.c:3091 -#: src/main/escp2-channels.c:3105 src/main/escp2-channels.c:3112 -#: src/main/escp2-channels.c:3127 src/main/escp2-channels.c:3140 -#: src/main/escp2-channels.c:3153 src/main/escp2-channels.c:3163 -#: src/main/escp2-channels.c:3177 src/main/escp2-channels.c:3196 -#: src/gutenprintui/panel.c:2166 src/gutenprintui2/panel.c:2167 +#: src/main/print-color.c:282 src/main/escp2-channels.c:3089 +#: src/main/escp2-channels.c:3100 src/main/escp2-channels.c:3108 +#: src/main/escp2-channels.c:3119 src/main/escp2-channels.c:3130 +#: src/main/escp2-channels.c:3144 src/main/escp2-channels.c:3151 +#: src/main/escp2-channels.c:3166 src/main/escp2-channels.c:3179 +#: src/main/escp2-channels.c:3192 src/main/escp2-channels.c:3202 +#: src/main/escp2-channels.c:3216 src/main/escp2-channels.c:3228 +#: src/main/escp2-channels.c:3245 src/gutenprintui2/panel.c:2342 #: src/escputil/escputil.c:980 src/escputil/escputil.c:999 #: src/escputil/escputil.c:1203 msgid "Yellow" @@ -665,10 +687,9 @@ msgstr "黃" msgid "Adjust the yellow gamma" msgstr "調整黃色 gamma 值" -#: src/main/print-color.c:290 src/main/escp2-channels.c:3168 -#: src/main/escp2-channels.c:3181 src/gutenprintui/panel.c:2180 -#: src/gutenprintui2/panel.c:2181 src/escputil/escputil.c:987 -#: src/escputil/escputil.c:1005 +#: src/main/print-color.c:290 src/main/escp2-channels.c:3207 +#: src/main/escp2-channels.c:3220 src/gutenprintui2/panel.c:2356 +#: src/escputil/escputil.c:987 src/escputil/escputil.c:1005 msgid "Red" msgstr "ç´…" @@ -676,8 +697,7 @@ msgstr "ç´…" msgid "Adjust the red gamma" msgstr "調整紅色 gamma 值" -#: src/main/print-color.c:298 src/gutenprintui/panel.c:2187 -#: src/gutenprintui2/panel.c:2188 +#: src/main/print-color.c:298 src/gutenprintui2/panel.c:2363 msgid "Green" msgstr "綠" @@ -685,10 +705,9 @@ msgstr "綠" msgid "Adjust the green gamma" msgstr "調整綠色 gamma 值" -#: src/main/print-color.c:306 src/main/escp2-channels.c:3169 -#: src/main/escp2-channels.c:3182 src/gutenprintui/panel.c:2194 -#: src/gutenprintui2/panel.c:2195 src/escputil/escputil.c:988 -#: src/escputil/escputil.c:1006 +#: src/main/print-color.c:306 src/main/escp2-channels.c:3208 +#: src/main/escp2-channels.c:3221 src/gutenprintui2/panel.c:2370 +#: src/escputil/escputil.c:988 src/escputil/escputil.c:1006 msgid "Blue" msgstr "è—" @@ -697,14 +716,14 @@ msgid "Adjust the blue gamma" msgstr "調整è—色 gamma 值" #: src/main/print-color.c:314 src/main/print-lexmark.c:613 -#: src/main/escp2-channels.c:3047 src/main/escp2-channels.c:3057 -#: src/main/escp2-channels.c:3058 src/main/escp2-channels.c:3071 -#: src/main/escp2-channels.c:3081 src/main/escp2-channels.c:3088 -#: src/main/escp2-channels.c:3100 src/main/escp2-channels.c:3113 -#: src/main/escp2-channels.c:3124 src/main/escp2-channels.c:3137 -#: src/main/escp2-channels.c:3150 src/main/escp2-channels.c:3156 -#: src/main/escp2-channels.c:3180 src/main/escp2-channels.c:3193 -#: src/gutenprintui/panel.c:2173 src/gutenprintui2/panel.c:2174 +#: src/main/escp2-channels.c:3086 src/main/escp2-channels.c:3096 +#: src/main/escp2-channels.c:3097 src/main/escp2-channels.c:3110 +#: src/main/escp2-channels.c:3120 src/main/escp2-channels.c:3127 +#: src/main/escp2-channels.c:3139 src/main/escp2-channels.c:3152 +#: src/main/escp2-channels.c:3163 src/main/escp2-channels.c:3176 +#: src/main/escp2-channels.c:3189 src/main/escp2-channels.c:3195 +#: src/main/escp2-channels.c:3219 src/main/escp2-channels.c:3231 +#: src/main/escp2-channels.c:3242 src/gutenprintui2/panel.c:2349 #: src/escputil/escputil.c:975 src/escputil/escputil.c:996 #: src/escputil/escputil.c:1200 msgid "Black" @@ -714,7 +733,7 @@ msgstr "黑" msgid "Adjust the black gamma" msgstr "調整黑色 gamma 值" -#: src/main/print-color.c:322 src/main/print-olympus.c:1764 +#: src/main/print-color.c:322 src/main/print-olympus.c:1762 msgid "Cyan Balance" msgstr "æ°°è—色平衡" @@ -727,7 +746,7 @@ msgstr "" msgid "Adjust the cyan gray balance" msgstr "" -#: src/main/print-color.c:330 src/main/print-olympus.c:1772 +#: src/main/print-color.c:330 src/main/print-olympus.c:1770 msgid "Magenta Balance" msgstr "洋紅色平衡" @@ -735,7 +754,7 @@ msgstr "洋紅色平衡" msgid "Adjust the magenta gray balance" msgstr "" -#: src/main/print-color.c:338 src/main/print-olympus.c:1780 +#: src/main/print-color.c:338 src/main/print-olympus.c:1778 msgid "Yellow Balance" msgstr "黃色平衡" @@ -761,9 +780,11 @@ msgstr "" #: 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:353 -#: src/main/print-escp2.c:359 src/main/print-escp2.c:365 -#: src/main/print-escp2.c:371 src/main/print-escp2.c:377 +#: src/main/print-color.c:421 src/main/print-color.c:553 +#: src/main/print-escp2.c:355 src/main/print-escp2.c:361 +#: src/main/print-escp2.c:367 src/main/print-escp2.c:373 +#: src/main/print-escp2.c:379 src/main/print-escp2.c:742 +#: src/main/print-escp2.c:750 src/main/print-escp2.c:758 msgid "Advanced Output Control" msgstr "" @@ -771,502 +792,611 @@ msgstr "" msgid "Limit the total ink printed to the page" msgstr "" -#: src/main/print-color.c:365 +#: src/main/print-color.c:365 src/main/print-escp2.c:742 msgid "GCR Transition" msgstr "" -#: src/main/print-color.c:366 +#: src/main/print-color.c:366 src/main/print-escp2.c:743 msgid "Adjust the gray component transition rate" msgstr "" -#: src/main/print-color.c:373 +#: src/main/print-color.c:373 src/main/print-escp2.c:750 msgid "GCR Lower Bound" msgstr "" -#: src/main/print-color.c:374 +#: src/main/print-color.c:374 src/main/print-escp2.c:751 msgid "Lower bound of gray component reduction" msgstr "" -#: src/main/print-color.c:381 +#: src/main/print-color.c:381 src/main/print-escp2.c:758 msgid "GCR Upper Bound" msgstr "" -#: src/main/print-color.c:382 +#: src/main/print-color.c:382 src/main/print-escp2.c:759 msgid "Upper bound of gray component reduction" msgstr "" -#: src/main/print-color.c:447 src/main/print-color.c:457 -#: src/main/print-color.c:465 src/main/print-color.c:473 -#: src/main/print-color.c:481 src/main/print-color.c:489 -#: src/main/print-color.c:497 src/main/print-color.c:505 -#: src/main/print-color.c:513 +#: src/main/print-color.c:421 +msgid "LUT dump file" +msgstr "" + +#: src/main/print-color.c:422 +msgid "Dump file for LUT for external color adjustment" +msgstr "" + +#: src/main/print-color.c:455 src/main/print-color.c:465 +#: src/main/print-color.c:473 src/main/print-color.c:481 +#: src/main/print-color.c:489 src/main/print-color.c:497 +#: src/main/print-color.c:505 src/main/print-color.c:513 +#: src/main/print-color.c:521 msgid "Output Curves" msgstr "" -#: src/main/print-color.c:447 +#: src/main/print-color.c:455 msgid "Curve for raw channel " msgstr "" -#: src/main/print-color.c:457 +#: src/main/print-color.c:465 msgid "Cyan Curve" msgstr "æ°°è—色曲線" -#: src/main/print-color.c:458 +#: src/main/print-color.c:466 msgid "Cyan curve" msgstr "æ°°è—色曲線" -#: src/main/print-color.c:465 +#: src/main/print-color.c:473 msgid "Magenta Curve" msgstr "洋紅色曲線" -#: src/main/print-color.c:466 +#: src/main/print-color.c:474 msgid "Magenta curve" msgstr "洋紅色曲線" -#: src/main/print-color.c:473 +#: src/main/print-color.c:481 msgid "Yellow Curve" msgstr "黃色曲線" -#: src/main/print-color.c:474 +#: src/main/print-color.c:482 msgid "Yellow curve" msgstr "黃色曲線" -#: src/main/print-color.c:481 +#: src/main/print-color.c:489 msgid "Black Curve" msgstr "黑色曲線" -#: src/main/print-color.c:482 +#: src/main/print-color.c:490 msgid "Black curve" msgstr "黑色曲線" -#: src/main/print-color.c:489 +#: src/main/print-color.c:497 msgid "Red Curve" msgstr "紅色曲線" -#: src/main/print-color.c:490 +#: src/main/print-color.c:498 msgid "Red curve" msgstr "紅色曲線" -#: src/main/print-color.c:497 +#: src/main/print-color.c:505 msgid "Green Curve" msgstr "綠色曲線" -#: src/main/print-color.c:498 +#: src/main/print-color.c:506 msgid "Green curve" msgstr "綠色曲線" -#: src/main/print-color.c:505 +#: src/main/print-color.c:513 msgid "Blue Curve" msgstr "è—色曲線" -#: src/main/print-color.c:506 +#: src/main/print-color.c:514 msgid "Blue curve" msgstr "è—色曲線" -#: src/main/print-color.c:513 +#: src/main/print-color.c:521 msgid "White Curve" msgstr "白色曲線" -#: src/main/print-color.c:514 +#: src/main/print-color.c:522 msgid "White curve" msgstr "白色曲線" -#: src/main/print-color.c:521 +#: src/main/print-color.c:529 msgid "Hue Map" msgstr "" -#: src/main/print-color.c:521 src/main/print-color.c:529 -#: src/main/print-color.c:537 +#: src/main/print-color.c:529 src/main/print-color.c:537 +#: src/main/print-color.c:545 msgid "Advanced HSL Curves" msgstr "" -#: src/main/print-color.c:522 +#: src/main/print-color.c:530 msgid "Hue adjustment curve" msgstr "" -#: src/main/print-color.c:529 +#: src/main/print-color.c:537 msgid "Saturation Map" msgstr "" -#: src/main/print-color.c:530 +#: src/main/print-color.c:538 msgid "Saturation adjustment curve" msgstr "" -#: src/main/print-color.c:537 +#: src/main/print-color.c:545 msgid "Luminosity Map" msgstr "" -#: src/main/print-color.c:538 +#: src/main/print-color.c:546 msgid "Luminosity adjustment curve" msgstr "" -#: src/main/print-color.c:545 +#: src/main/print-color.c:553 msgid "Gray Component Reduction" msgstr "" -#: src/main/print-color.c:546 +#: src/main/print-color.c:554 msgid "Gray component reduction curve" msgstr "" -#: src/main/print-color.c:1670 +#: src/main/print-color.c:1743 msgid "Traditional Gutenprint color conversion" msgstr "" -#: src/main/printers.c:517 +#: src/main/printers.c:514 #, c-format msgid "Value must be set for %s\n" msgstr "" -#: src/main/printers.c:530 src/main/printers.c:535 +#: src/main/printers.c:527 src/main/printers.c:532 #, c-format msgid "`%s' is not a valid %s\n" msgstr "" -#: src/main/printers.c:554 +#: src/main/printers.c:551 #, c-format msgid "%s must be between %f and %f (is %f)\n" msgstr "%s 必須在 %f å’Œ %f 之間 (實際上是 %f)\n" -#: src/main/printers.c:576 src/main/printers.c:600 +#: src/main/printers.c:573 src/main/printers.c:597 #, c-format msgid "%s must be between %d and %d (is %d)\n" msgstr "%s 必須在 %d å’Œ %d 之間 (實際上是 %d)\n" -#: src/main/printers.c:631 +#: src/main/printers.c:628 #, c-format msgid "%s bounds must be between %f and %f\n" msgstr "%s 必須在 %f å’Œ %f 之間\n" -#: src/main/printers.c:639 +#: src/main/printers.c:636 #, c-format msgid "%s wrap mode must be %s\n" msgstr "" -#: src/main/printers.c:643 +#: src/main/printers.c:640 msgid "no wrap" msgstr "" -#: src/main/printers.c:643 +#: src/main/printers.c:640 msgid "wrap around" msgstr "" -#: src/main/printers.c:687 +#: src/main/printers.c:684 #, c-format msgid "Unknown type parameter %s (%d)\n" msgstr "" -#: src/main/printers.c:700 src/main/printers.c:711 +#: src/main/printers.c:697 src/main/printers.c:708 #, c-format msgid "%s out of range (value %d, min %d, max %d)\n" msgstr "" -#: src/main/printers.c:772 +#: src/main/printers.c:768 msgid "Page size is not valid\n" msgstr "é é¢å°ºå¯¸ç„¡æ•ˆ\n" -#: src/main/printers.c:793 +#: src/main/printers.c:789 #, c-format msgid "Top margin must not be less than %d\n" msgstr "頂部邊框寬度必須ä¸å°‘æ–¼ %d\n" -#: src/main/printers.c:799 +#: src/main/printers.c:795 #, c-format msgid "Left margin must not be less than %d\n" msgstr "左邊邊框寬度必須ä¸å°‘æ–¼ %d\n" -#: src/main/printers.c:805 +#: src/main/printers.c:801 msgid "Height must be greater than zero\n" msgstr "高度必須大於零\n" -#: src/main/printers.c:811 +#: src/main/printers.c:807 msgid "Width must be greater than zero\n" msgstr "寬度必須大於零\n" -#: src/main/printers.c:817 +#: src/main/printers.c:813 #, c-format msgid "" "Image is too wide for the page: left margin is %d, width %d, right edge is %" "d\n" msgstr "" -#: src/main/printers.c:824 +#: src/main/printers.c:820 #, c-format msgid "" "Image is too long for the page: top margin is %d, height %d, bottom edge is %" "d\n" msgstr "" -#: src/main/print-escp2.c:162 +#: src/main/print-escp2.c:164 msgid "Automatic Printing Mode" msgstr "" -#: src/main/print-escp2.c:162 src/main/print-escp2.c:174 +#: src/main/print-escp2.c:164 src/main/print-escp2.c:176 #: src/main/generic-options.c:62 msgid "Basic Output Adjustment" msgstr "" -#: src/main/print-escp2.c:163 +#: src/main/print-escp2.c:165 msgid "Automatic printing mode" msgstr "自動列å°æ¨¡å¼" -#: src/main/print-escp2.c:174 src/main/print-escp2.c:175 +#: src/main/print-escp2.c:176 src/main/print-escp2.c:177 #: src/main/generic-options.c:62 src/main/generic-options.c:63 msgid "Print Quality" msgstr "列å°å“質" -#: src/main/print-escp2.c:229 +#: src/main/print-escp2.c:231 msgid "Resolution of the print" msgstr "列å°æ™‚的解æžåº¦" -#: src/main/print-escp2.c:245 +#: src/main/print-escp2.c:247 msgid "Enhanced Gloss" msgstr "" -#: src/main/print-escp2.c:246 +#: src/main/print-escp2.c:248 msgid "Add gloss enhancement" msgstr "" -#: src/main/print-escp2.c:251 +#: src/main/print-escp2.c:253 msgid "Ink Set" msgstr "" -#: src/main/print-escp2.c:257 +#: src/main/print-escp2.c:259 msgid "Printing Direction" msgstr "列å°æ–¹å‘" -#: src/main/print-escp2.c:257 src/main/print-escp2.c:269 +#: src/main/print-escp2.c:259 src/main/print-escp2.c:271 msgid "Advanced Output Adjustment" msgstr "" -#: src/main/print-escp2.c:258 +#: src/main/print-escp2.c:260 msgid "Printing direction (unidirectional is higher quality, but slower)" msgstr "" -#: src/main/print-escp2.c:263 src/main/print-olympus.c:1735 +#: src/main/print-escp2.c:265 src/main/print-olympus.c:1733 msgid "Borderless" msgstr "" -#: src/main/print-escp2.c:264 src/main/print-olympus.c:1736 +#: src/main/print-escp2.c:266 src/main/print-olympus.c:1734 msgid "Print without borders" msgstr "" -#: src/main/print-escp2.c:269 +#: src/main/print-escp2.c:271 msgid "Interleave Method" msgstr "" -#: src/main/print-escp2.c:270 +#: src/main/print-escp2.c:272 msgid "Interleave pattern to use" msgstr "" -#: src/main/print-escp2.c:275 +#: src/main/print-escp2.c:277 msgid "Adjust dot size as necessary" msgstr "" -#: src/main/print-escp2.c:276 +#: src/main/print-escp2.c:278 msgid "Adjust dot size as necessary to achieve desired density" msgstr "" -#: src/main/print-escp2.c:281 src/main/print-escp2.c:282 +#: src/main/print-escp2.c:283 src/main/print-escp2.c:284 msgid "Output Order" msgstr "" -#: src/main/print-escp2.c:287 src/main/print-escp2.c:288 +#: src/main/print-escp2.c:289 src/main/print-escp2.c:290 msgid "Alignment Passes" msgstr "" -#: src/main/print-escp2.c:293 src/main/print-escp2.c:294 +#: src/main/print-escp2.c:295 src/main/print-escp2.c:296 msgid "Alignment Choices" msgstr "" -#: src/main/print-escp2.c:299 src/main/print-escp2.c:300 +#: src/main/print-escp2.c:301 src/main/print-escp2.c:302 msgid "Ink change command" msgstr "" -#: src/main/print-escp2.c:305 src/main/print-escp2.c:306 +#: src/main/print-escp2.c:307 src/main/print-escp2.c:308 msgid "Alternate Alignment Passes" msgstr "" -#: src/main/print-escp2.c:311 src/main/print-escp2.c:312 +#: src/main/print-escp2.c:313 src/main/print-escp2.c:314 msgid "Alternate Alignment Choices" msgstr "" -#: src/main/print-escp2.c:317 +#: src/main/print-escp2.c:319 msgid "Supports Packet Mode" msgstr "" -#: src/main/print-escp2.c:318 +#: src/main/print-escp2.c:320 msgid "Supports D4 Packet Mode" msgstr "" -#: src/main/print-escp2.c:323 +#: src/main/print-escp2.c:325 msgid "Has Interchangeable Ink Cartridges" msgstr "" -#: src/main/print-escp2.c:324 +#: src/main/print-escp2.c:326 msgid "Has multiple choices of ink cartridges" msgstr "" -#: src/main/print-escp2.c:335 src/main/print-escp2.c:336 +#: src/main/print-escp2.c:337 src/main/print-escp2.c:338 msgid "Channel Names" msgstr "" -#: src/main/print-escp2.c:348 +#: src/main/print-escp2.c:350 msgid "Raw Channel Count" msgstr "" -#: src/main/print-escp2.c:353 +#: src/main/print-escp2.c:355 msgid "Cyan Map" msgstr "" -#: src/main/print-escp2.c:354 +#: src/main/print-escp2.c:356 msgid "Adjust the cyan map" msgstr "" -#: src/main/print-escp2.c:359 +#: src/main/print-escp2.c:361 msgid "Magenta Map" msgstr "" -#: src/main/print-escp2.c:360 +#: src/main/print-escp2.c:362 msgid "Adjust the magenta map" msgstr "" -#: src/main/print-escp2.c:365 +#: src/main/print-escp2.c:367 msgid "Yellow Map" msgstr "" -#: src/main/print-escp2.c:366 +#: src/main/print-escp2.c:368 msgid "Adjust the yellow map" msgstr "" -#: src/main/print-escp2.c:371 +#: src/main/print-escp2.c:373 msgid "Blue Map" msgstr "" -#: src/main/print-escp2.c:372 +#: src/main/print-escp2.c:374 msgid "Adjust the blue map" msgstr "" -#: src/main/print-escp2.c:377 +#: src/main/print-escp2.c:379 msgid "Red Map" msgstr "" -#: src/main/print-escp2.c:378 +#: src/main/print-escp2.c:380 msgid "Adjust the red map" msgstr "" -#: src/main/print-escp2.c:471 +#: src/main/print-escp2.c:478 msgid "Red Density" msgstr "紅色密度" -#: src/main/print-escp2.c:472 +#: src/main/print-escp2.c:479 msgid "Adjust the red density" msgstr "調整紅色色彩密度" -#: src/main/print-escp2.c:479 +#: src/main/print-escp2.c:486 msgid "Blue Density" msgstr "è—色密度" -#: src/main/print-escp2.c:480 +#: src/main/print-escp2.c:487 msgid "Adjust the blue density" msgstr "調整è—色色彩密度" -#: src/main/print-escp2.c:487 +#: src/main/print-escp2.c:494 msgid "Gloss Level" msgstr "" -#: src/main/print-escp2.c:488 +#: src/main/print-escp2.c:495 msgid "Adjust the gloss level" msgstr "" -#: src/main/print-escp2.c:511 src/main/print-escp2.c:512 +#: src/main/print-escp2.c:502 +msgid "Drop Size Small" +msgstr "" + +#: src/main/print-escp2.c:503 +msgid "Drop Size 1 (small)" +msgstr "" + +#: src/main/print-escp2.c:510 +msgid "Drop Size Medium" +msgstr "" + +#: src/main/print-escp2.c:511 +msgid "Drop Size 2 (medium)" +msgstr "" + +#: src/main/print-escp2.c:518 +msgid "Drop Size Large" +msgstr "" + +#: src/main/print-escp2.c:519 +msgid "Drop Size 3 (large)" +msgstr "" + +#: src/main/print-escp2.c:526 src/main/print-escp2.c:527 +msgid "Light Cyan Value" +msgstr "" + +#: src/main/print-escp2.c:542 src/main/print-escp2.c:543 +#, fuzzy +msgid "Light Cyan Density Scale" +msgstr "æ°°è—色密度" + +#: src/main/print-escp2.c:550 src/main/print-escp2.c:551 +#, fuzzy +msgid "Light Magenta Value" +msgstr "洋紅色平衡" + +#: src/main/print-escp2.c:558 src/main/print-escp2.c:559 +#, fuzzy +msgid "Light Magenta Density Scale" +msgstr "洋紅色密度" + +#: src/main/print-escp2.c:574 src/main/print-escp2.c:575 +#, fuzzy +msgid "Dark Yellow Value" +msgstr "黃色平衡" + +#: src/main/print-escp2.c:582 src/main/print-escp2.c:583 msgid "Dark Yellow Transition" msgstr "" -#: src/main/print-escp2.c:519 src/main/print-escp2.c:520 -#: src/main/print-escp2.c:527 src/main/print-escp2.c:528 +#: src/main/print-escp2.c:590 src/main/print-escp2.c:591 +#, fuzzy +msgid "Dark Yellow Density Scale" +msgstr "黃色密度" + +#: src/main/print-escp2.c:598 src/main/print-escp2.c:599 +#: src/main/print-escp2.c:622 src/main/print-escp2.c:623 +#, fuzzy +msgid "Gray Value" +msgstr "ç°éšŽ" + +#: src/main/print-escp2.c:606 src/main/print-escp2.c:607 +#: src/main/print-escp2.c:630 src/main/print-escp2.c:631 msgid "Gray Transition" msgstr "" -#: src/main/print-escp2.c:535 src/main/print-escp2.c:536 -#: src/main/print-escp2.c:559 src/main/print-escp2.c:560 +#: src/main/print-escp2.c:614 src/main/print-escp2.c:615 +#: src/main/print-escp2.c:638 src/main/print-escp2.c:639 +#, fuzzy +msgid "Gray Density Scale" +msgstr "ç°éšŽ" + +#: src/main/print-escp2.c:646 src/main/print-escp2.c:647 +#: src/main/print-escp2.c:718 src/main/print-escp2.c:719 +msgid "Light Gray Value" +msgstr "" + +#: src/main/print-escp2.c:654 src/main/print-escp2.c:655 +#: src/main/print-escp2.c:726 src/main/print-escp2.c:727 msgid "Light Gray Transition" msgstr "" -#: src/main/print-escp2.c:543 src/main/print-escp2.c:544 +#: src/main/print-escp2.c:662 src/main/print-escp2.c:663 +#: src/main/print-escp2.c:734 src/main/print-escp2.c:735 +msgid "Light Gray Density Scale" +msgstr "" + +#: src/main/print-escp2.c:670 src/main/print-escp2.c:671 +msgid "Dark Gray Value" +msgstr "" + +#: src/main/print-escp2.c:678 src/main/print-escp2.c:679 msgid "Dark Gray Transition" msgstr "" -#: src/main/print-escp2.c:551 +#: src/main/print-escp2.c:686 src/main/print-escp2.c:687 +msgid "Dark Gray Density Scale" +msgstr "" + +#: src/main/print-escp2.c:694 +#, fuzzy +msgid "Mid Gray Value" +msgstr "ç°éšŽ" + +#: src/main/print-escp2.c:695 +msgid "Medium Gray Value" +msgstr "" + +#: src/main/print-escp2.c:702 msgid "Mid Gray Transition" msgstr "" -#: src/main/print-escp2.c:552 +#: src/main/print-escp2.c:703 msgid "Medium Gray Transition" msgstr "" -#: src/main/print-escp2.c:1635 +#: src/main/print-escp2.c:710 +msgid "Mid Gray Density Scale" +msgstr "" + +#: src/main/print-escp2.c:711 +msgid "Medium Gray Density Scale" +msgstr "" + +#: src/main/print-escp2.c:1999 msgid "Full Manual Control" msgstr "" -#: src/main/print-escp2.c:1637 +#: src/main/print-escp2.c:2001 msgid "Automatic Setting Control" msgstr "" -#: src/main/print-escp2.c:1732 src/main/generic-options.c:213 +#: src/main/print-escp2.c:2096 src/main/generic-options.c:213 #: src/main/generic-options.c:230 msgid "Manual Control" msgstr "" -#: src/main/print-escp2.c:1771 src/main/print-escp2.c:1863 -#: src/main/print-escp2.c:1875 src/main/print-pcl.c:230 -#: src/main/escp2-channels.c:2805 src/main/escp2-papers.c:1707 -#: src/main/escp2-papers.c:1731 src/main/escp2-papers.c:1764 -#: src/main/escp2-papers.c:1815 src/main/escp2-papers.c:1857 -#: src/main/escp2-papers.c:1899 src/main/escp2-papers.c:1992 -#: src/main/escp2-resolutions.c:640 src/main/escp2-resolutions.c:655 -#: src/main/escp2-resolutions.c:668 src/main/generic-options.c:36 -#: src/gutenprintui/panel.c:2613 src/gutenprintui2/panel.c:2639 +#: src/main/print-escp2.c:2139 src/main/print-escp2.c:2231 +#: src/main/print-escp2.c:2243 src/main/print-pcl.c:237 +#: src/main/escp2-channels.c:2827 src/main/escp2-channels.c:2836 +#: src/main/escp2-papers.c:1718 src/main/escp2-papers.c:1742 +#: src/main/escp2-papers.c:1775 src/main/escp2-papers.c:1826 +#: src/main/escp2-papers.c:1868 src/main/escp2-papers.c:1910 +#: src/main/escp2-papers.c:2003 src/main/escp2-resolutions.c:640 +#: src/main/escp2-resolutions.c:655 src/main/escp2-resolutions.c:670 +#: src/main/escp2-resolutions.c:683 src/main/generic-options.c:36 +#: src/gutenprintui2/panel.c:2814 msgid "Standard" msgstr "標準" -#: src/main/print-escp2.c:1842 +#: src/main/print-escp2.c:2210 msgid "Automatic" msgstr "自動" -#: src/main/print-escp2.c:1844 +#: src/main/print-escp2.c:2212 msgid "Bidirectional" msgstr "" -#: src/main/print-escp2.c:1846 +#: src/main/print-escp2.c:2214 msgid "Unidirectional" msgstr "" -#: src/main/print-escp2.c:1877 +#: src/main/print-escp2.c:2245 msgid "Alternate Fill" msgstr "" -#: src/main/print-escp2.c:1879 +#: src/main/print-escp2.c:2247 msgid "Ascending Fill" msgstr "" -#: src/main/print-escp2.c:1881 +#: src/main/print-escp2.c:2249 msgid "Descending Fill" msgstr "" -#: src/main/print-escp2.c:1883 +#: src/main/print-escp2.c:2251 msgid "Ascending Double" msgstr "" -#: src/main/print-escp2.c:1885 +#: src/main/print-escp2.c:2253 msgid "Nearest Neighbor Avoidance" msgstr "" -#: src/main/print-escp2.c:2328 +#: src/main/print-escp2.c:2771 #, c-format msgid "This printer does not support raw printer output at depth %d\n" msgstr "" -#: src/main/print-escp2.c:3436 src/main/print-olympus.c:2451 +#: src/main/print-escp2.c:3934 src/main/print-olympus.c:2449 #: src/main/print-raw.c:217 msgid "Print options not verified; cannot print.\n" msgstr "" @@ -1340,116 +1470,116 @@ msgid "Three Color Composite" msgstr "" #: src/main/print-lexmark.c:607 src/main/print-lexmark.c:677 -#: src/main/escp2-channels.c:1540 src/main/escp2-channels.c:1554 -#: src/main/escp2-channels.c:1568 src/main/escp2-channels.c:1582 -#: src/main/escp2-channels.c:1808 src/main/escp2-channels.c:1823 -#: src/main/escp2-channels.c:1838 src/main/escp2-channels.c:1855 +#: src/main/escp2-channels.c:1554 src/main/escp2-channels.c:1568 +#: src/main/escp2-channels.c:1582 src/main/escp2-channels.c:1596 +#: src/main/escp2-channels.c:1822 src/main/escp2-channels.c:1837 +#: src/main/escp2-channels.c:1852 src/main/escp2-channels.c:1869 msgid "Six Color Photo" msgstr "" #: src/main/print-lexmark.c:610 src/main/print-lexmark.c:680 -#: src/main/escp2-channels.c:1475 src/main/escp2-channels.c:1489 -#: src/main/escp2-channels.c:1503 src/main/escp2-channels.c:1517 -#: src/main/escp2-channels.c:1752 src/main/escp2-channels.c:1767 -#: src/main/escp2-channels.c:1784 +#: src/main/escp2-channels.c:1489 src/main/escp2-channels.c:1503 +#: src/main/escp2-channels.c:1517 src/main/escp2-channels.c:1531 +#: src/main/escp2-channels.c:1766 src/main/escp2-channels.c:1781 +#: src/main/escp2-channels.c:1798 msgid "Five Color Photo Composite" msgstr "" -#: src/main/print-lexmark.c:856 src/main/escp2-papers.c:1341 -#: src/main/escp2-papers.c:1385 src/main/escp2-papers.c:1429 -#: src/main/escp2-papers.c:1477 src/main/escp2-papers.c:1525 -#: src/main/escp2-papers.c:1569 +#: src/main/print-lexmark.c:856 src/main/escp2-papers.c:1351 +#: src/main/escp2-papers.c:1395 src/main/escp2-papers.c:1439 +#: src/main/escp2-papers.c:1487 src/main/escp2-papers.c:1535 +#: src/main/escp2-papers.c:1579 msgid "Plain Paper" msgstr "普通紙張" # (Abel) from Epson -#: src/main/print-lexmark.c:860 src/main/escp2-papers.c:1347 -#: src/main/escp2-papers.c:1391 src/main/escp2-papers.c:1435 -#: src/main/escp2-papers.c:1483 src/main/escp2-papers.c:1531 -#: src/main/escp2-papers.c:1575 +#: src/main/print-lexmark.c:860 src/main/escp2-papers.c:1357 +#: src/main/escp2-papers.c:1401 src/main/escp2-papers.c:1445 +#: src/main/escp2-papers.c:1493 src/main/escp2-papers.c:1541 +#: src/main/escp2-papers.c:1585 msgid "Glossy Film" msgstr "å…‰é¢è† ç‰‡" -#: src/main/print-lexmark.c:864 src/main/escp2-papers.c:1349 -#: src/main/escp2-papers.c:1393 src/main/escp2-papers.c:1437 -#: src/main/escp2-papers.c:1485 src/main/escp2-papers.c:1533 -#: src/main/escp2-papers.c:1577 +#: src/main/print-lexmark.c:864 src/main/escp2-papers.c:1359 +#: src/main/escp2-papers.c:1403 src/main/escp2-papers.c:1447 +#: src/main/escp2-papers.c:1495 src/main/escp2-papers.c:1543 +#: src/main/escp2-papers.c:1587 msgid "Transparencies" msgstr "é€æ˜Žè† ç‰‡" -#: src/main/print-lexmark.c:868 src/main/escp2-papers.c:1351 -#: src/main/escp2-papers.c:1395 src/main/escp2-papers.c:1439 -#: src/main/escp2-papers.c:1487 src/main/escp2-papers.c:1535 -#: src/main/escp2-papers.c:1579 +#: src/main/print-lexmark.c:868 src/main/escp2-papers.c:1361 +#: src/main/escp2-papers.c:1405 src/main/escp2-papers.c:1449 +#: src/main/escp2-papers.c:1497 src/main/escp2-papers.c:1545 +#: src/main/escp2-papers.c:1589 msgid "Envelopes" msgstr "ä¿¡å°" # (Abel) from fuji, epson -#: src/main/print-lexmark.c:872 src/main/escp2-papers.c:1355 -#: src/main/escp2-papers.c:1399 src/main/escp2-papers.c:1443 -#: src/main/escp2-papers.c:1491 src/main/escp2-papers.c:1539 -#: src/main/escp2-papers.c:1583 +#: src/main/print-lexmark.c:872 src/main/escp2-papers.c:1365 +#: src/main/escp2-papers.c:1409 src/main/escp2-papers.c:1453 +#: src/main/escp2-papers.c:1501 src/main/escp2-papers.c:1549 +#: src/main/escp2-papers.c:1593 msgid "Matte Paper" msgstr "雪é¢éŠ…版紙" # (Abel) from Epson -#: src/main/print-lexmark.c:876 src/main/escp2-papers.c:1359 -#: src/main/escp2-papers.c:1403 src/main/escp2-papers.c:1447 -#: src/main/escp2-papers.c:1495 src/main/escp2-papers.c:1543 -#: src/main/escp2-papers.c:1587 +#: src/main/print-lexmark.c:876 src/main/escp2-papers.c:1369 +#: src/main/escp2-papers.c:1413 src/main/escp2-papers.c:1457 +#: src/main/escp2-papers.c:1505 src/main/escp2-papers.c:1553 +#: src/main/escp2-papers.c:1597 msgid "Inkjet Paper" msgstr "噴墨專用紙" # (Abel) from Epson -#: src/main/print-lexmark.c:880 src/main/escp2-papers.c:1361 -#: src/main/escp2-papers.c:1405 src/main/escp2-papers.c:1449 -#: src/main/escp2-papers.c:1497 src/main/escp2-papers.c:1545 -#: src/main/escp2-papers.c:1589 +#: src/main/print-lexmark.c:880 src/main/escp2-papers.c:1371 +#: src/main/escp2-papers.c:1415 src/main/escp2-papers.c:1459 +#: src/main/escp2-papers.c:1507 src/main/escp2-papers.c:1555 +#: src/main/escp2-papers.c:1599 msgid "Photo Quality Inkjet Paper" msgstr "優質噴墨專用紙" -#: src/main/print-lexmark.c:884 src/main/escp2-papers.c:1363 -#: src/main/escp2-papers.c:1407 src/main/escp2-papers.c:1451 -#: src/main/escp2-papers.c:1499 src/main/escp2-papers.c:1547 -#: src/main/escp2-papers.c:1591 +#: src/main/print-lexmark.c:884 src/main/escp2-papers.c:1373 +#: src/main/escp2-papers.c:1417 src/main/escp2-papers.c:1461 +#: src/main/escp2-papers.c:1509 src/main/escp2-papers.c:1557 +#: src/main/escp2-papers.c:1601 msgid "Photo Paper" msgstr "相紙" # (Abel) from Epson -#: src/main/print-lexmark.c:888 src/main/escp2-papers.c:1365 -#: src/main/escp2-papers.c:1409 src/main/escp2-papers.c:1453 -#: src/main/escp2-papers.c:1501 src/main/escp2-papers.c:1549 -#: src/main/escp2-papers.c:1593 src/main/escp2-papers.c:1617 +#: src/main/print-lexmark.c:888 src/main/escp2-papers.c:1375 +#: src/main/escp2-papers.c:1419 src/main/escp2-papers.c:1463 +#: src/main/escp2-papers.c:1511 src/main/escp2-papers.c:1559 +#: src/main/escp2-papers.c:1603 src/main/escp2-papers.c:1627 msgid "Premium Glossy Photo Paper" msgstr "é ‚ç´šå…‰é¢ç›¸ç´™" # (Abel) from Epson -#: src/main/print-lexmark.c:892 src/main/escp2-papers.c:1369 -#: src/main/escp2-papers.c:1413 src/main/escp2-papers.c:1457 -#: src/main/escp2-papers.c:1505 src/main/escp2-papers.c:1553 -#: src/main/escp2-papers.c:1597 +#: src/main/print-lexmark.c:892 src/main/escp2-papers.c:1379 +#: src/main/escp2-papers.c:1423 src/main/escp2-papers.c:1467 +#: src/main/escp2-papers.c:1515 src/main/escp2-papers.c:1563 +#: src/main/escp2-papers.c:1607 msgid "Premium Luster Photo Paper" msgstr "ç²¾é¸å…‰é¢ç›¸ç´™" # (Abel) from Epson -#: src/main/print-lexmark.c:896 src/main/escp2-papers.c:1371 -#: src/main/escp2-papers.c:1415 src/main/escp2-papers.c:1463 -#: src/main/escp2-papers.c:1511 src/main/escp2-papers.c:1555 -#: src/main/escp2-papers.c:1603 +#: src/main/print-lexmark.c:896 src/main/escp2-papers.c:1381 +#: src/main/escp2-papers.c:1425 src/main/escp2-papers.c:1473 +#: src/main/escp2-papers.c:1521 src/main/escp2-papers.c:1565 +#: src/main/escp2-papers.c:1613 msgid "Photo Quality Glossy Paper" msgstr "å…‰é¢ç´™" -#: src/main/print-lexmark.c:900 src/main/escp2-papers.c:1373 -#: src/main/escp2-papers.c:1417 src/main/escp2-papers.c:1465 -#: src/main/escp2-papers.c:1513 src/main/escp2-papers.c:1557 -#: src/main/escp2-papers.c:1605 +#: src/main/print-lexmark.c:900 src/main/escp2-papers.c:1383 +#: src/main/escp2-papers.c:1427 src/main/escp2-papers.c:1475 +#: src/main/escp2-papers.c:1523 src/main/escp2-papers.c:1567 +#: src/main/escp2-papers.c:1615 msgid "Ilford Heavy Paper" msgstr "" -#: src/main/print-lexmark.c:904 src/main/escp2-papers.c:1377 -#: src/main/escp2-papers.c:1421 src/main/escp2-papers.c:1469 -#: src/main/escp2-papers.c:1517 src/main/escp2-papers.c:1561 -#: src/main/escp2-papers.c:1609 src/main/escp2-papers.c:1619 +#: src/main/print-lexmark.c:904 src/main/escp2-papers.c:1387 +#: src/main/escp2-papers.c:1431 src/main/escp2-papers.c:1479 +#: src/main/escp2-papers.c:1527 src/main/escp2-papers.c:1571 +#: src/main/escp2-papers.c:1619 src/main/escp2-papers.c:1629 msgid "Other" msgstr "其它" @@ -1465,50 +1595,50 @@ msgstr "" msgid "Manual without Pause" msgstr "" -#: src/main/print-olympus.c:277 +#: src/main/print-olympus.c:275 msgid "Coated" msgstr "" -#: src/main/print-olympus.c:278 src/cups/genppd.c:1726 src/cups/genppd.c:1753 -#: src/cups/genppd.c:1834 +#: src/main/print-olympus.c:276 src/cups/genppd.c:1732 src/cups/genppd.c:1759 +#: src/cups/genppd.c:1840 msgid "None" msgstr "" -#: src/main/print-olympus.c:963 src/main/print-olympus.c:1023 -#: src/main/print-olympus.c:1127 +#: src/main/print-olympus.c:961 src/main/print-olympus.c:1021 +#: src/main/print-olympus.c:1125 msgid "Glossy" msgstr "å…‰é¢" -#: src/main/print-olympus.c:964 src/main/print-olympus.c:1024 -#: src/main/print-olympus.c:1128 +#: src/main/print-olympus.c:962 src/main/print-olympus.c:1022 +#: src/main/print-olympus.c:1126 msgid "Texture" msgstr "" -#: src/main/print-olympus.c:1025 src/main/print-olympus.c:1129 +#: src/main/print-olympus.c:1023 src/main/print-olympus.c:1127 msgid "Matte" msgstr "" -#: src/main/print-olympus.c:1729 src/main/print-olympus.c:1730 +#: src/main/print-olympus.c:1727 src/main/print-olympus.c:1728 msgid "Laminate Pattern" msgstr "" -#: src/main/print-olympus.c:1765 +#: src/main/print-olympus.c:1763 msgid "Adjust the cyan balance" msgstr "調整氰è—色色彩平衡" -#: src/main/print-olympus.c:1773 +#: src/main/print-olympus.c:1771 msgid "Adjust the magenta balance" msgstr "調整洋紅色色彩平衡" -#: src/main/print-olympus.c:1781 +#: src/main/print-olympus.c:1779 msgid "Adjust the yellow balance" msgstr "調整黃色色彩平衡" -#: src/main/print-olympus.c:1788 +#: src/main/print-olympus.c:1786 msgid "Black Balance" msgstr "黑色平衡" -#: src/main/print-olympus.c:1789 +#: src/main/print-olympus.c:1787 msgid "Adjust the black balance" msgstr "調整黑色色彩平衡" @@ -1540,92 +1670,115 @@ msgstr "" msgid "Quick-dry Transparency" msgstr "" -#: src/main/print-pcl.c:231 src/main/xmli18n-tmp.h:16 +#: src/main/print-pcl.c:238 src/main/xmli18n-tmp.h:17 msgid "Manual" msgstr "自é¸" -#: src/main/print-pcl.c:233 +#: src/main/print-pcl.c:240 +msgid "Tray 1 - Movable Guides" +msgstr "" + +#: src/main/print-pcl.c:241 msgid "Tray 1" msgstr "" -#: src/main/print-pcl.c:234 src/main/print-pcl.c:240 +#: src/main/print-pcl.c:242 +msgid "Tray 2 - Movable Guides" +msgstr "" + +#: src/main/print-pcl.c:243 src/main/print-pcl.c:251 msgid "Tray 2" msgstr "" -#: src/main/print-pcl.c:235 +#: src/main/print-pcl.c:244 +msgid "Tray 3 - Movable Guides" +msgstr "" + +#: src/main/print-pcl.c:245 msgid "Tray 3" msgstr "" -#: src/main/print-pcl.c:236 +#: src/main/print-pcl.c:246 +msgid "Tray 4 - Movable Guides" +msgstr "" + +#: src/main/print-pcl.c:247 msgid "Tray 4" msgstr "" -#: src/main/print-pcl.c:237 +#: src/main/print-pcl.c:248 msgid "Portable Sheet Feeder" msgstr "" -#: src/main/print-pcl.c:238 +#: src/main/print-pcl.c:249 msgid "Desktop Sheet Feeder" msgstr "" -#: src/main/print-pcl.c:239 +#: src/main/print-pcl.c:250 msgid "Tray" msgstr "" -#: src/main/print-pcl.c:241 +#: src/main/print-pcl.c:252 msgid "Optional Source" msgstr "" -#: src/main/print-pcl.c:242 +#: src/main/print-pcl.c:253 msgid "Autoselect" msgstr "自動é¸æ“‡" -#: src/main/print-pcl.c:256 +#: src/main/print-pcl.c:267 msgid "150x150 DPI" msgstr "150x150 DPI" -#: src/main/print-pcl.c:257 +#: src/main/print-pcl.c:268 msgid "300x300 DPI" msgstr "300x300 DPI" -#: src/main/print-pcl.c:258 +#: src/main/print-pcl.c:269 msgid "600x300 DPI" msgstr "600x300 DPI" -#: src/main/print-pcl.c:259 +#: src/main/print-pcl.c:270 msgid "600x600 DPI monochrome" msgstr "600x600 DPI 單色" -#: src/main/print-pcl.c:260 +#: src/main/print-pcl.c:271 msgid "600x600 DPI" msgstr "600x600 DPI" -#: src/main/print-pcl.c:261 +#: src/main/print-pcl.c:272 msgid "1200x600 DPI" msgstr "1200x600 DPI" -#: src/main/print-pcl.c:262 +#: src/main/print-pcl.c:273 msgid "2400x600 DPI" msgstr "2400x600 DPI" -#: src/main/print-pcl.c:1470 +#: src/main/print-pcl.c:1538 msgid "Color + Black Cartridges" msgstr "" -#: src/main/print-pcl.c:1471 +#: src/main/print-pcl.c:1539 msgid "Color + Photo Cartridges" msgstr "" -#: src/main/print-ps.c:97 +#: src/main/print-ps.c:68 #, fuzzy msgid "PPDFile" msgstr "PPD 檔" -#: src/main/print-ps.c:98 src/gutenprintui/panel.c:1768 -#: src/gutenprintui2/panel.c:1768 +#: src/main/print-ps.c:69 src/gutenprintui2/panel.c:1943 msgid "PPD File" msgstr "PPD 檔" +#: src/main/print-ps.c:74 +msgid "Model Name" +msgstr "" + +#: src/main/print-ps.c:75 +msgid "PPD File Model Name" +msgstr "" + #: src/main/print-raw.c:223 msgid "Image dimensions must match paper dimensions" msgstr "" @@ -1642,264 +1795,269 @@ msgstr "ç°éšŽ" #: src/main/escp2-channels.c:1035 src/main/escp2-channels.c:1048 #: src/main/escp2-channels.c:1061 src/main/escp2-channels.c:1074 #: src/main/escp2-channels.c:1087 src/main/escp2-channels.c:1100 -#: src/main/escp2-channels.c:2505 src/main/escp2-channels.c:2528 -#: src/main/escp2-channels.c:2548 src/main/escp2-channels.c:2568 -#: src/main/escp2-channels.c:2588 src/main/escp2-channels.c:2608 +#: src/main/escp2-channels.c:2525 src/main/escp2-channels.c:2548 +#: src/main/escp2-channels.c:2568 src/main/escp2-channels.c:2588 +#: src/main/escp2-channels.c:2608 src/main/escp2-channels.c:2628 msgid "Quadtone" msgstr "" -#: src/main/escp2-channels.c:1604 src/main/escp2-channels.c:1618 +#: src/main/escp2-channels.c:1466 +msgid "Four Color Photo" +msgstr "" + +#: src/main/escp2-channels.c:1618 src/main/escp2-channels.c:1632 msgid "Six Color Enhanced Composite" msgstr "" -#: src/main/escp2-channels.c:1641 src/main/escp2-channels.c:1655 -#: src/main/escp2-channels.c:1669 src/main/escp2-channels.c:1705 +#: src/main/escp2-channels.c:1655 src/main/escp2-channels.c:1669 +#: src/main/escp2-channels.c:1683 src/main/escp2-channels.c:1719 msgid "Seven Color Photo" msgstr "" -#: src/main/escp2-channels.c:1691 +#: src/main/escp2-channels.c:1705 msgid "Seven Color Enhanced" msgstr "" -#: src/main/escp2-channels.c:1728 +#: src/main/escp2-channels.c:1742 msgid "Eight Color Photo" msgstr "" -#: src/main/escp2-channels.c:1876 src/main/escp2-channels.c:1888 -#: src/main/escp2-channels.c:1894 +#: src/main/escp2-channels.c:1890 src/main/escp2-channels.c:1902 +#: src/main/escp2-channels.c:1908 msgid "One Color Raw" msgstr "" -#: src/main/escp2-channels.c:1900 +#: src/main/escp2-channels.c:1914 msgid "One Color Raw Enhanced Gloss" msgstr "" -#: src/main/escp2-channels.c:1913 src/main/escp2-channels.c:1925 +#: src/main/escp2-channels.c:1927 src/main/escp2-channels.c:1939 msgid "Two Color Raw" msgstr "" -#: src/main/escp2-channels.c:1939 src/main/escp2-channels.c:1953 -#: src/main/escp2-channels.c:1980 src/main/escp2-channels.c:1993 -#: src/main/escp2-channels.c:2006 src/main/escp2-channels.c:2019 -#: src/main/escp2-channels.c:2033 src/main/escp2-channels.c:2047 -#: src/main/escp2-channels.c:2060 +#: src/main/escp2-channels.c:1953 src/main/escp2-channels.c:1967 +#: src/main/escp2-channels.c:1994 src/main/escp2-channels.c:2007 +#: src/main/escp2-channels.c:2020 src/main/escp2-channels.c:2033 +#: src/main/escp2-channels.c:2047 src/main/escp2-channels.c:2061 +#: src/main/escp2-channels.c:2074 msgid "Three Color Raw" msgstr "" -#: src/main/escp2-channels.c:1967 +#: src/main/escp2-channels.c:1981 msgid "Three Color Raw Gloss" msgstr "" -#: src/main/escp2-channels.c:2067 src/main/escp2-channels.c:2073 -#: src/main/escp2-channels.c:2079 src/main/escp2-channels.c:2085 -#: src/main/escp2-channels.c:2091 src/main/escp2-channels.c:2097 -#: src/main/escp2-channels.c:2103 src/main/escp2-channels.c:2109 -#: src/main/escp2-channels.c:2115 src/main/escp2-channels.c:2121 +#: src/main/escp2-channels.c:2081 src/main/escp2-channels.c:2087 +#: src/main/escp2-channels.c:2093 src/main/escp2-channels.c:2099 +#: src/main/escp2-channels.c:2105 src/main/escp2-channels.c:2111 +#: src/main/escp2-channels.c:2117 src/main/escp2-channels.c:2123 +#: src/main/escp2-channels.c:2129 src/main/escp2-channels.c:2135 +#: src/main/escp2-channels.c:2141 msgid "Four Color Raw" msgstr "" -#: src/main/escp2-channels.c:2127 +#: src/main/escp2-channels.c:2147 msgid "Four Color Raw Gloss" msgstr "" -#: src/main/escp2-channels.c:2142 src/main/escp2-channels.c:2156 +#: src/main/escp2-channels.c:2162 src/main/escp2-channels.c:2176 msgid "Five Color Raw" msgstr "" -#: src/main/escp2-channels.c:2170 src/main/escp2-channels.c:2186 -#: src/main/escp2-channels.c:2192 src/main/escp2-channels.c:2198 -#: src/main/escp2-channels.c:2213 src/main/escp2-channels.c:2234 +#: src/main/escp2-channels.c:2190 src/main/escp2-channels.c:2206 +#: src/main/escp2-channels.c:2212 src/main/escp2-channels.c:2218 +#: src/main/escp2-channels.c:2233 src/main/escp2-channels.c:2254 msgid "Six Color Raw" msgstr "" -#: src/main/escp2-channels.c:2219 +#: src/main/escp2-channels.c:2239 msgid "Six Color Enhanced Gloss Raw" msgstr "" -#: src/main/escp2-channels.c:2250 src/main/escp2-channels.c:2265 -#: src/main/escp2-channels.c:2280 +#: src/main/escp2-channels.c:2270 src/main/escp2-channels.c:2285 +#: src/main/escp2-channels.c:2300 msgid "Seven Color Raw" msgstr "" -#: src/main/escp2-channels.c:2297 +#: src/main/escp2-channels.c:2317 msgid "Seven Color Enhanced Gloss Raw" msgstr "" -#: src/main/escp2-channels.c:2315 +#: src/main/escp2-channels.c:2335 msgid "Eight Color Raw" msgstr "" -#: src/main/escp2-channels.c:2482 src/main/escp2-channels.c:2495 -#: src/main/escp2-channels.c:2497 src/main/escp2-channels.c:2517 -#: src/main/escp2-channels.c:2520 src/main/escp2-channels.c:2540 -#: src/main/escp2-channels.c:2560 src/main/escp2-channels.c:2580 -#: src/main/escp2-channels.c:2600 src/main/escp2-channels.c:2620 -#: src/main/escp2-channels.c:2636 src/main/escp2-channels.c:2638 -#: src/main/escp2-channels.c:2640 src/main/escp2-channels.c:2642 -#: src/main/escp2-channels.c:2658 src/main/escp2-channels.c:2674 -#: src/main/escp2-channels.c:2694 +#: src/main/escp2-channels.c:2502 src/main/escp2-channels.c:2515 +#: src/main/escp2-channels.c:2517 src/main/escp2-channels.c:2537 +#: src/main/escp2-channels.c:2540 src/main/escp2-channels.c:2560 +#: src/main/escp2-channels.c:2580 src/main/escp2-channels.c:2600 +#: src/main/escp2-channels.c:2620 src/main/escp2-channels.c:2640 +#: src/main/escp2-channels.c:2656 src/main/escp2-channels.c:2658 +#: src/main/escp2-channels.c:2660 src/main/escp2-channels.c:2662 +#: src/main/escp2-channels.c:2678 src/main/escp2-channels.c:2694 +#: src/main/escp2-channels.c:2714 msgid "EPSON Standard Inks" msgstr "" -#: src/main/escp2-channels.c:2714 src/main/escp2-channels.c:2739 +#: src/main/escp2-channels.c:2734 src/main/escp2-channels.c:2759 msgid "UltraChrome Photo Black" msgstr "" -#: src/main/escp2-channels.c:2718 src/main/escp2-channels.c:2743 +#: src/main/escp2-channels.c:2738 src/main/escp2-channels.c:2763 msgid "UltraChrome Matte Black" msgstr "" -#: src/main/escp2-channels.c:2758 src/main/escp2-channels.c:2796 -#: src/main/escp2-channels.c:3167 src/escputil/escputil.c:976 +#: src/main/escp2-channels.c:2778 src/main/escp2-channels.c:2816 +#: src/main/escp2-channels.c:3206 src/escputil/escputil.c:976 msgid "Photo Black" msgstr "" -#: src/main/escp2-channels.c:2762 src/main/escp2-channels.c:2778 -#: src/main/escp2-channels.c:3166 src/escputil/escputil.c:986 +#: src/main/escp2-channels.c:2782 src/main/escp2-channels.c:2798 +#: src/main/escp2-channels.c:3205 src/escputil/escputil.c:986 msgid "Matte Black" msgstr "" -#: src/main/escp2-channels.c:3092 src/main/escp2-channels.c:3102 -#: src/main/escp2-channels.c:3114 src/main/escp2-channels.c:3128 -#: src/main/escp2-channels.c:3141 src/main/escp2-channels.c:3154 -#: src/main/escp2-channels.c:3191 src/escputil/escputil.c:981 +#: src/main/escp2-channels.c:3131 src/main/escp2-channels.c:3141 +#: src/main/escp2-channels.c:3153 src/main/escp2-channels.c:3167 +#: src/main/escp2-channels.c:3180 src/main/escp2-channels.c:3193 +#: src/main/escp2-channels.c:3240 src/escputil/escputil.c:981 #: src/escputil/escputil.c:1204 msgid "Light Cyan" msgstr "" -#: src/main/escp2-channels.c:3093 src/main/escp2-channels.c:3104 -#: src/main/escp2-channels.c:3115 src/main/escp2-channels.c:3129 -#: src/main/escp2-channels.c:3142 src/main/escp2-channels.c:3155 -#: src/main/escp2-channels.c:3190 src/escputil/escputil.c:982 +#: src/main/escp2-channels.c:3132 src/main/escp2-channels.c:3143 +#: src/main/escp2-channels.c:3154 src/main/escp2-channels.c:3168 +#: src/main/escp2-channels.c:3181 src/main/escp2-channels.c:3194 +#: src/main/escp2-channels.c:3239 src/escputil/escputil.c:982 #: src/escputil/escputil.c:1205 msgid "Light Magenta" msgstr "" -#: src/main/escp2-channels.c:3130 src/main/escp2-channels.c:3192 +#: src/main/escp2-channels.c:3169 src/main/escp2-channels.c:3241 #: src/escputil/escputil.c:985 msgid "Light Black" msgstr "" -#: src/main/escp2-channels.c:3143 +#: src/main/escp2-channels.c:3182 msgid "Dark Yellow" msgstr "" -#: src/main/escp2-channels.c:3170 src/escputil/escputil.c:989 +#: src/main/escp2-channels.c:3209 src/escputil/escputil.c:989 msgid "Gloss Optimizer" msgstr "" -#: src/main/escp2-channels.c:3189 src/escputil/escputil.c:990 +#: src/main/escp2-channels.c:3238 src/escputil/escputil.c:990 msgid "Light Light Black" msgstr "" -#: src/main/escp2-papers.c:1343 src/main/escp2-papers.c:1387 -#: src/main/escp2-papers.c:1431 src/main/escp2-papers.c:1479 -#: src/main/escp2-papers.c:1527 src/main/escp2-papers.c:1571 +#: src/main/escp2-papers.c:1353 src/main/escp2-papers.c:1397 +#: src/main/escp2-papers.c:1441 src/main/escp2-papers.c:1489 +#: src/main/escp2-papers.c:1537 src/main/escp2-papers.c:1581 msgid "Plain Paper Fast Load" msgstr "" -#: src/main/escp2-papers.c:1345 src/main/escp2-papers.c:1389 -#: src/main/escp2-papers.c:1433 src/main/escp2-papers.c:1481 -#: src/main/escp2-papers.c:1529 src/main/escp2-papers.c:1573 +#: src/main/escp2-papers.c:1355 src/main/escp2-papers.c:1399 +#: src/main/escp2-papers.c:1443 src/main/escp2-papers.c:1491 +#: src/main/escp2-papers.c:1539 src/main/escp2-papers.c:1583 #: src/main/xmli18n-tmp.h:5 msgid "Postcard" msgstr "明信片" -#: src/main/escp2-papers.c:1353 src/main/escp2-papers.c:1397 -#: src/main/escp2-papers.c:1441 src/main/escp2-papers.c:1489 -#: src/main/escp2-papers.c:1537 src/main/escp2-papers.c:1581 +#: src/main/escp2-papers.c:1363 src/main/escp2-papers.c:1407 +#: src/main/escp2-papers.c:1451 src/main/escp2-papers.c:1499 +#: src/main/escp2-papers.c:1547 src/main/escp2-papers.c:1591 msgid "Back Light Film" msgstr "" -#: src/main/escp2-papers.c:1357 src/main/escp2-papers.c:1401 -#: src/main/escp2-papers.c:1445 src/main/escp2-papers.c:1493 -#: src/main/escp2-papers.c:1541 src/main/escp2-papers.c:1585 +#: src/main/escp2-papers.c:1367 src/main/escp2-papers.c:1411 +#: src/main/escp2-papers.c:1455 src/main/escp2-papers.c:1503 +#: src/main/escp2-papers.c:1551 src/main/escp2-papers.c:1595 msgid "Matte Paper Heavyweight" msgstr "" # (Abel) from Epson -#: src/main/escp2-papers.c:1367 src/main/escp2-papers.c:1411 -#: src/main/escp2-papers.c:1455 src/main/escp2-papers.c:1503 -#: src/main/escp2-papers.c:1551 src/main/escp2-papers.c:1595 +#: src/main/escp2-papers.c:1377 src/main/escp2-papers.c:1421 +#: src/main/escp2-papers.c:1465 src/main/escp2-papers.c:1513 +#: src/main/escp2-papers.c:1561 src/main/escp2-papers.c:1605 msgid "Premium Semigloss Photo Paper" msgstr "頂級柔光相紙" -#: src/main/escp2-papers.c:1375 src/main/escp2-papers.c:1419 -#: src/main/escp2-papers.c:1467 src/main/escp2-papers.c:1515 -#: src/main/escp2-papers.c:1559 src/main/escp2-papers.c:1607 +#: src/main/escp2-papers.c:1385 src/main/escp2-papers.c:1429 +#: src/main/escp2-papers.c:1477 src/main/escp2-papers.c:1525 +#: src/main/escp2-papers.c:1569 src/main/escp2-papers.c:1617 msgid "ColorLife Paper" msgstr "" -#: src/main/escp2-papers.c:1459 src/main/escp2-papers.c:1507 -#: src/main/escp2-papers.c:1599 +#: src/main/escp2-papers.c:1469 src/main/escp2-papers.c:1517 +#: src/main/escp2-papers.c:1609 msgid "Archival Matte Paper" msgstr "" # (Abel) from Epson -#: src/main/escp2-papers.c:1461 src/main/escp2-papers.c:1509 -#: src/main/escp2-papers.c:1601 +#: src/main/escp2-papers.c:1471 src/main/escp2-papers.c:1519 +#: src/main/escp2-papers.c:1611 msgid "Watercolor Paper - Radiant White" msgstr "水彩紙-亮白色" -#: src/main/escp2-papers.c:1716 src/main/escp2-papers.c:1842 -#: src/main/escp2-papers.c:1884 src/main/escp2-papers.c:1926 -#: src/main/escp2-papers.c:2001 +#: src/main/escp2-papers.c:1727 src/main/escp2-papers.c:1853 +#: src/main/escp2-papers.c:1895 src/main/escp2-papers.c:1937 +#: src/main/escp2-papers.c:2012 msgid "Roll Feed" msgstr "" -#: src/main/escp2-papers.c:1740 src/main/escp2-papers.c:1791 +#: src/main/escp2-papers.c:1751 src/main/escp2-papers.c:1802 msgid "Roll Feed (cut each page)" msgstr "" -#: src/main/escp2-papers.c:1749 src/main/escp2-papers.c:1800 +#: src/main/escp2-papers.c:1760 src/main/escp2-papers.c:1811 msgid "Roll Feed (do not cut)" msgstr "" -#: src/main/escp2-papers.c:1773 src/main/escp2-papers.c:1824 +#: src/main/escp2-papers.c:1784 src/main/escp2-papers.c:1835 msgid "Manual Feed" msgstr "人手é€ç´™" -#: src/main/escp2-papers.c:1782 src/main/escp2-papers.c:1833 -#: src/main/escp2-papers.c:1935 src/main/escp2-papers.c:1968 +#: src/main/escp2-papers.c:1793 src/main/escp2-papers.c:1844 +#: src/main/escp2-papers.c:1946 src/main/escp2-papers.c:1979 msgid "Print to CD" msgstr "列å°è‡³å…‰ç¢Ÿ" -#: src/main/escp2-papers.c:1866 src/main/escp2-papers.c:1908 +#: src/main/escp2-papers.c:1877 src/main/escp2-papers.c:1919 #, fuzzy msgid "Manual Sheet Guide" msgstr "人手é€ç´™" -#: src/main/escp2-papers.c:1875 src/main/escp2-papers.c:1917 +#: src/main/escp2-papers.c:1886 src/main/escp2-papers.c:1928 #, fuzzy msgid "Manual Feed (Front)" msgstr "人手é€ç´™" -#: src/main/escp2-papers.c:1950 +#: src/main/escp2-papers.c:1961 msgid "Rear Tray" msgstr "" -#: src/main/escp2-papers.c:1959 +#: src/main/escp2-papers.c:1970 msgid "Front Tray" msgstr "" -#: src/main/escp2-papers.c:1977 +#: src/main/escp2-papers.c:1988 #, fuzzy msgid "Photo Board" msgstr "相紙" -#: src/main/escp2-papers.c:2016 +#: src/main/escp2-papers.c:2027 msgid "Cut Sheet Bin 1" msgstr "" -#: src/main/escp2-papers.c:2025 +#: src/main/escp2-papers.c:2036 msgid "Cut Sheet Bin 2" msgstr "" -#: src/main/escp2-papers.c:2034 +#: src/main/escp2-papers.c:2045 msgid "Cut Sheet Autoselect" msgstr "" -#: src/main/escp2-papers.c:2043 +#: src/main/escp2-papers.c:2054 msgid "Manual Selection" msgstr "" @@ -2042,42 +2200,48 @@ msgid "Eight Pass" msgstr "" #: src/main/escp2-resolutions.c:637 src/main/escp2-resolutions.c:652 -#: src/main/generic-options.c:33 +#: src/main/escp2-resolutions.c:667 src/main/generic-options.c:33 msgid "Fast Economy" msgstr "" #: src/main/escp2-resolutions.c:638 src/main/escp2-resolutions.c:653 -#: src/main/generic-options.c:34 +#: src/main/escp2-resolutions.c:668 src/main/generic-options.c:34 msgid "Economy" msgstr "" #: src/main/escp2-resolutions.c:639 src/main/escp2-resolutions.c:654 -#: src/main/escp2-resolutions.c:667 src/main/generic-options.c:35 +#: src/main/escp2-resolutions.c:669 src/main/escp2-resolutions.c:682 +#: src/main/generic-options.c:35 msgid "Draft" msgstr "" #: src/main/escp2-resolutions.c:641 src/main/escp2-resolutions.c:656 -#: src/main/escp2-resolutions.c:670 src/main/generic-options.c:37 +#: src/main/escp2-resolutions.c:671 src/main/escp2-resolutions.c:685 +#: src/main/generic-options.c:37 msgid "High" msgstr "" #: src/main/escp2-resolutions.c:642 src/main/escp2-resolutions.c:657 -#: src/main/escp2-resolutions.c:669 src/main/generic-options.c:38 +#: src/main/escp2-resolutions.c:672 src/main/escp2-resolutions.c:684 +#: src/main/generic-options.c:38 msgid "Photo" msgstr "相片" #: src/main/escp2-resolutions.c:643 src/main/escp2-resolutions.c:658 -#: src/main/escp2-resolutions.c:671 src/main/generic-options.c:39 +#: src/main/escp2-resolutions.c:673 src/main/escp2-resolutions.c:686 +#: src/main/generic-options.c:39 msgid "Super Photo" msgstr "" #: src/main/escp2-resolutions.c:644 src/main/escp2-resolutions.c:659 -#: src/main/escp2-resolutions.c:672 src/main/generic-options.c:40 +#: src/main/escp2-resolutions.c:674 src/main/escp2-resolutions.c:687 +#: src/main/generic-options.c:40 msgid "Ultra Photo" msgstr "" #: src/main/escp2-resolutions.c:645 src/main/escp2-resolutions.c:660 -#: src/main/escp2-resolutions.c:673 src/main/generic-options.c:41 +#: src/main/escp2-resolutions.c:675 src/main/escp2-resolutions.c:688 +#: src/main/generic-options.c:41 msgid "Best" msgstr "" @@ -2154,4658 +2318,4928 @@ msgid "3x5" msgstr "3x5" #: src/main/xmli18n-tmp.h:10 +msgid "3 1/2 x5" +msgstr "" + +#: src/main/xmli18n-tmp.h:11 msgid "4x6" msgstr "4x6" -#: src/main/xmli18n-tmp.h:11 +#: src/main/xmli18n-tmp.h:12 #, fuzzy msgid "Epson 4x6 Photo Paper (tear-off borders)" msgstr "Epson 4x6 相紙" -#: src/main/xmli18n-tmp.h:12 +#: src/main/xmli18n-tmp.h:13 msgid "5x7" msgstr "5x7" -#: src/main/xmli18n-tmp.h:13 +#: src/main/xmli18n-tmp.h:14 msgid "5x8" msgstr "5x8" -#: src/main/xmli18n-tmp.h:14 +#: src/main/xmli18n-tmp.h:15 msgid "6x8" msgstr "6x8" -#: src/main/xmli18n-tmp.h:15 +#: src/main/xmli18n-tmp.h:16 msgid "8x10" msgstr "8x10" -#: src/main/xmli18n-tmp.h:17 +#: src/main/xmli18n-tmp.h:18 msgid "12x18" msgstr "12x18" -#: src/main/xmli18n-tmp.h:18 +#: src/main/xmli18n-tmp.h:19 msgid "Super B 13x19" msgstr "Super B 13x19" -#: src/main/xmli18n-tmp.h:19 +#: src/main/xmli18n-tmp.h:20 msgid "Engineering C 17x22" msgstr "Engineering C 17x22" -#: src/main/xmli18n-tmp.h:20 +#: src/main/xmli18n-tmp.h:21 msgid "8x12" msgstr "8x12" -#: src/main/xmli18n-tmp.h:21 +#: src/main/xmli18n-tmp.h:22 msgid "11x14" msgstr "11x14" -#: src/main/xmli18n-tmp.h:22 +#: src/main/xmli18n-tmp.h:23 msgid "16x20" msgstr "16x20" -#: src/main/xmli18n-tmp.h:23 +#: src/main/xmli18n-tmp.h:24 msgid "16x24" msgstr "16x24" -#: src/main/xmli18n-tmp.h:24 +#: src/main/xmli18n-tmp.h:25 msgid "20x24" msgstr "20x24" -#: src/main/xmli18n-tmp.h:25 +#: src/main/xmli18n-tmp.h:26 msgid "20x30" msgstr "20x30" -#: src/main/xmli18n-tmp.h:26 +#: src/main/xmli18n-tmp.h:27 msgid "22x30" msgstr "22x30" -#: src/main/xmli18n-tmp.h:27 +#: src/main/xmli18n-tmp.h:28 msgid "24x30" msgstr "24x30" -#: src/main/xmli18n-tmp.h:28 +#: src/main/xmli18n-tmp.h:29 msgid "Super A1 24x36" msgstr "Super A1 24x36" -#: src/main/xmli18n-tmp.h:29 +#: src/main/xmli18n-tmp.h:30 msgid "30x40" msgstr "30x40" -#: src/main/xmli18n-tmp.h:30 +#: src/main/xmli18n-tmp.h:31 msgid "4A" msgstr "4A" -#: src/main/xmli18n-tmp.h:31 +#: src/main/xmli18n-tmp.h:32 msgid "2A" msgstr "2A" -#: src/main/xmli18n-tmp.h:32 +#: src/main/xmli18n-tmp.h:33 msgid "Super A0" msgstr "Super A0" -#: src/main/xmli18n-tmp.h:33 +#: src/main/xmli18n-tmp.h:34 msgid "A0" msgstr "A0" -#: src/main/xmli18n-tmp.h:34 +#: src/main/xmli18n-tmp.h:35 msgid "A1" msgstr "A1" -#: src/main/xmli18n-tmp.h:35 +#: src/main/xmli18n-tmp.h:36 msgid "A2" msgstr "A2" -#: src/main/xmli18n-tmp.h:36 +#: src/main/xmli18n-tmp.h:37 msgid "A3" msgstr "A3" -#: src/main/xmli18n-tmp.h:37 +#: src/main/xmli18n-tmp.h:38 msgid "A4" msgstr "A4" -#: src/main/xmli18n-tmp.h:38 +#: src/main/xmli18n-tmp.h:39 msgid "A5" msgstr "A5" -#: src/main/xmli18n-tmp.h:39 +#: src/main/xmli18n-tmp.h:40 msgid "A6" msgstr "A6" -#: src/main/xmli18n-tmp.h:40 +#: src/main/xmli18n-tmp.h:41 msgid "A7" msgstr "A7" -#: src/main/xmli18n-tmp.h:41 +#: src/main/xmli18n-tmp.h:42 msgid "A8" msgstr "A8" -#: src/main/xmli18n-tmp.h:42 +#: src/main/xmli18n-tmp.h:43 msgid "A9" msgstr "A9" -#: src/main/xmli18n-tmp.h:43 +#: src/main/xmli18n-tmp.h:44 msgid "A10" msgstr "A10" -#: src/main/xmli18n-tmp.h:44 +#: src/main/xmli18n-tmp.h:45 msgid "RA0" msgstr "RA0" -#: src/main/xmli18n-tmp.h:45 +#: src/main/xmli18n-tmp.h:46 msgid "RA1" msgstr "RA1" -#: src/main/xmli18n-tmp.h:46 +#: src/main/xmli18n-tmp.h:47 msgid "RA2" msgstr "RA2" -#: src/main/xmli18n-tmp.h:47 +#: src/main/xmli18n-tmp.h:48 msgid "RA3" msgstr "RA3" -#: src/main/xmli18n-tmp.h:48 +#: src/main/xmli18n-tmp.h:49 msgid "RA4" msgstr "RA4" -#: src/main/xmli18n-tmp.h:49 +#: src/main/xmli18n-tmp.h:50 msgid "SRA0" msgstr "SRA0" -#: src/main/xmli18n-tmp.h:50 +#: src/main/xmli18n-tmp.h:51 msgid "SRA1" msgstr "SRA1" -#: src/main/xmli18n-tmp.h:51 +#: src/main/xmli18n-tmp.h:52 msgid "SRA2" msgstr "SRA2" -#: src/main/xmli18n-tmp.h:52 +#: src/main/xmli18n-tmp.h:53 msgid "SRA3" msgstr "SRA3" -#: src/main/xmli18n-tmp.h:53 +#: src/main/xmli18n-tmp.h:54 msgid "SRA4" msgstr "SRA4" -#: src/main/xmli18n-tmp.h:54 +#: src/main/xmli18n-tmp.h:55 msgid "4B ISO" msgstr "4B ISO" -#: src/main/xmli18n-tmp.h:55 +#: src/main/xmli18n-tmp.h:56 msgid "2B ISO" msgstr "2B ISO" -#: src/main/xmli18n-tmp.h:56 +#: src/main/xmli18n-tmp.h:57 msgid "B0 ISO" msgstr "B0 ISO" -#: src/main/xmli18n-tmp.h:57 +#: src/main/xmli18n-tmp.h:58 msgid "B1 ISO" msgstr "B1 ISO" -#: src/main/xmli18n-tmp.h:58 +#: src/main/xmli18n-tmp.h:59 msgid "B2 ISO" msgstr "B2 ISO" -#: src/main/xmli18n-tmp.h:59 +#: src/main/xmli18n-tmp.h:60 msgid "B3 ISO" msgstr "B3 ISO" -#: src/main/xmli18n-tmp.h:60 +#: src/main/xmli18n-tmp.h:61 msgid "B4 ISO" msgstr "B4 ISO" -#: src/main/xmli18n-tmp.h:61 +#: src/main/xmli18n-tmp.h:62 msgid "B5 ISO" msgstr "B5 ISO" -#: src/main/xmli18n-tmp.h:62 +#: src/main/xmli18n-tmp.h:63 msgid "B6 ISO" msgstr "B6 ISO" -#: src/main/xmli18n-tmp.h:63 +#: src/main/xmli18n-tmp.h:64 msgid "B7 ISO" msgstr "B7 ISO" -#: src/main/xmli18n-tmp.h:64 +#: src/main/xmli18n-tmp.h:65 msgid "B8 ISO" msgstr "B8 ISO" -#: src/main/xmli18n-tmp.h:65 +#: src/main/xmli18n-tmp.h:66 msgid "B9 ISO" msgstr "B9 ISO" -#: src/main/xmli18n-tmp.h:66 +#: src/main/xmli18n-tmp.h:67 msgid "B10 ISO" msgstr "B10 ISO" -#: src/main/xmli18n-tmp.h:67 +#: src/main/xmli18n-tmp.h:68 msgid "Super B0 JIS" msgstr "Super B0 JIS" -#: src/main/xmli18n-tmp.h:68 +#: src/main/xmli18n-tmp.h:69 msgid "B0 JIS" msgstr "B0 JIS" -#: src/main/xmli18n-tmp.h:69 +#: src/main/xmli18n-tmp.h:70 msgid "B1 JIS" msgstr "B1 JIS" -#: src/main/xmli18n-tmp.h:70 +#: src/main/xmli18n-tmp.h:71 msgid "B2 JIS" msgstr "B2 JIS" -#: src/main/xmli18n-tmp.h:71 +#: src/main/xmli18n-tmp.h:72 msgid "B3 JIS" msgstr "B3 JIS" -#: src/main/xmli18n-tmp.h:72 +#: src/main/xmli18n-tmp.h:73 msgid "B4 JIS" msgstr "B4 JIS" -#: src/main/xmli18n-tmp.h:73 +#: src/main/xmli18n-tmp.h:74 msgid "B5 JIS" msgstr "B5 JIS" -#: src/main/xmli18n-tmp.h:74 +#: src/main/xmli18n-tmp.h:75 msgid "B6 JIS" msgstr "B6 JIS" -#: src/main/xmli18n-tmp.h:75 +#: src/main/xmli18n-tmp.h:76 msgid "B7 JIS" msgstr "B7 JIS" -#: src/main/xmli18n-tmp.h:76 +#: src/main/xmli18n-tmp.h:77 msgid "B8 JIS" msgstr "B8 JIS" -#: src/main/xmli18n-tmp.h:77 +#: src/main/xmli18n-tmp.h:78 msgid "B9 JIS" msgstr "B9 JIS" -#: src/main/xmli18n-tmp.h:78 +#: src/main/xmli18n-tmp.h:79 msgid "B10 JIS" msgstr "B10 JIS" -#: src/main/xmli18n-tmp.h:79 +#: src/main/xmli18n-tmp.h:80 msgid "C0" msgstr "C0" -#: src/main/xmli18n-tmp.h:80 +#: src/main/xmli18n-tmp.h:81 +#, fuzzy +msgid "C0 landscape" +msgstr "æ©«å‘" + +#: src/main/xmli18n-tmp.h:82 msgid "C1" msgstr "C1" -#: src/main/xmli18n-tmp.h:81 +#: src/main/xmli18n-tmp.h:83 +#, fuzzy +msgid "C1 landscape" +msgstr "æ©«å‘" + +#: src/main/xmli18n-tmp.h:84 msgid "C2" msgstr "C2" -#: src/main/xmli18n-tmp.h:82 +#: src/main/xmli18n-tmp.h:85 +#, fuzzy +msgid "C2 landscape" +msgstr "æ©«å‘" + +#: src/main/xmli18n-tmp.h:86 msgid "C3" msgstr "C3" -#: src/main/xmli18n-tmp.h:83 +#: src/main/xmli18n-tmp.h:87 +#, fuzzy +msgid "C3 landscape" +msgstr "æ©«å‘" + +#: src/main/xmli18n-tmp.h:88 msgid "C4" msgstr "C4" -#: src/main/xmli18n-tmp.h:84 +#: src/main/xmli18n-tmp.h:89 +#, fuzzy +msgid "C4 landscape" +msgstr "æ©«å‘" + +#: src/main/xmli18n-tmp.h:90 msgid "C5" msgstr "C5" -#: src/main/xmli18n-tmp.h:85 +#: src/main/xmli18n-tmp.h:91 +#, fuzzy +msgid "C5 landscape" +msgstr "æ©«å‘" + +#: src/main/xmli18n-tmp.h:92 msgid "B6-C4" msgstr "B6-C4" -#: src/main/xmli18n-tmp.h:86 +#: src/main/xmli18n-tmp.h:93 +#, fuzzy +msgid "B6-C4 landscape" +msgstr "æ©«å‘" + +#: src/main/xmli18n-tmp.h:94 msgid "C6" msgstr "C6" -#: src/main/xmli18n-tmp.h:87 +#: src/main/xmli18n-tmp.h:95 +#, fuzzy +msgid "C6 landscape" +msgstr "æ©«å‘" + +#: src/main/xmli18n-tmp.h:96 msgid "DL" msgstr "DL" -#: src/main/xmli18n-tmp.h:88 +#: src/main/xmli18n-tmp.h:97 +#, fuzzy +msgid "DL landscape" +msgstr "æ©«å‘" + +#: src/main/xmli18n-tmp.h:98 msgid "C7-6" msgstr "C7-6" -#: src/main/xmli18n-tmp.h:89 +#: src/main/xmli18n-tmp.h:99 +#, fuzzy +msgid "C7-6 landscape" +msgstr "æ©«å‘" + +#: src/main/xmli18n-tmp.h:100 msgid "C7" msgstr "C7" -#: src/main/xmli18n-tmp.h:90 +#: src/main/xmli18n-tmp.h:101 +#, fuzzy +msgid "C7 landscape" +msgstr "æ©«å‘" + +#: src/main/xmli18n-tmp.h:102 msgid "C8" msgstr "C8" -#: src/main/xmli18n-tmp.h:91 +#: src/main/xmli18n-tmp.h:103 +#, fuzzy +msgid "C8 landscape" +msgstr "æ©«å‘" + +#: src/main/xmli18n-tmp.h:104 msgid "C9" msgstr "C9" -#: src/main/xmli18n-tmp.h:92 +#: src/main/xmli18n-tmp.h:105 +#, fuzzy +msgid "C9 landscape" +msgstr "æ©«å‘" + +#: src/main/xmli18n-tmp.h:106 msgid "C10" msgstr "C10" -#: src/main/xmli18n-tmp.h:93 +#: src/main/xmli18n-tmp.h:107 +#, fuzzy +msgid "C10 landscape" +msgstr "æ©«å‘" + +#: src/main/xmli18n-tmp.h:108 msgid "ArchA" msgstr "ArchA" -#: src/main/xmli18n-tmp.h:94 +#: src/main/xmli18n-tmp.h:109 msgid "ArchA transposed" msgstr "" -#: src/main/xmli18n-tmp.h:95 +#: src/main/xmli18n-tmp.h:110 msgid "ArchB" msgstr "ArchB" -#: src/main/xmli18n-tmp.h:96 +#: src/main/xmli18n-tmp.h:111 msgid "ArchB transposed" msgstr "" -#: src/main/xmli18n-tmp.h:97 +#: src/main/xmli18n-tmp.h:112 msgid "ArchC" msgstr "ArchC" -#: src/main/xmli18n-tmp.h:98 +#: src/main/xmli18n-tmp.h:113 msgid "ArchC transposed" msgstr "" -#: src/main/xmli18n-tmp.h:99 +#: src/main/xmli18n-tmp.h:114 msgid "ArchD" msgstr "ArchD" -#: src/main/xmli18n-tmp.h:100 +#: src/main/xmli18n-tmp.h:115 msgid "ArchD transposed" msgstr "" -#: src/main/xmli18n-tmp.h:101 +#: src/main/xmli18n-tmp.h:116 msgid "ArchE" msgstr "ArchE" -#: src/main/xmli18n-tmp.h:102 +#: src/main/xmli18n-tmp.h:117 msgid "ArchE transposed" msgstr "" -#: src/main/xmli18n-tmp.h:103 +#: src/main/xmli18n-tmp.h:118 msgid "American foolscap" msgstr "" -#: src/main/xmli18n-tmp.h:104 +#: src/main/xmli18n-tmp.h:119 msgid "European foolscap" msgstr "" -#: src/main/xmli18n-tmp.h:105 +#: src/main/xmli18n-tmp.h:120 msgid "Crown Quarto" msgstr "" -#: src/main/xmli18n-tmp.h:106 +#: src/main/xmli18n-tmp.h:121 msgid "Large Crown Quarto" msgstr "" -#: src/main/xmli18n-tmp.h:107 +#: src/main/xmli18n-tmp.h:122 msgid "Demy Quarto" msgstr "Demy Quarto" -#: src/main/xmli18n-tmp.h:108 +#: src/main/xmli18n-tmp.h:123 msgid "Royal Quarto" msgstr "" -#: src/main/xmli18n-tmp.h:109 +#: src/main/xmli18n-tmp.h:124 msgid "ISO A4" msgstr "ISO A4" -#: src/main/xmli18n-tmp.h:110 +#: src/main/xmli18n-tmp.h:125 msgid "Crown Octavo" msgstr "Crown Octavo" -#: src/main/xmli18n-tmp.h:111 +#: src/main/xmli18n-tmp.h:126 msgid "Large Crown Octavo" msgstr "" -#: src/main/xmli18n-tmp.h:112 +#: src/main/xmli18n-tmp.h:127 msgid "Demy Octavo" msgstr "Demy Octavo" -#: src/main/xmli18n-tmp.h:113 +#: src/main/xmli18n-tmp.h:128 msgid "Royal Octavo" msgstr "" -#: src/main/xmli18n-tmp.h:114 +#: src/main/xmli18n-tmp.h:129 msgid "ISO A5" msgstr "ISO A5" -#: src/main/xmli18n-tmp.h:115 +#: src/main/xmli18n-tmp.h:130 msgid "Small paperback" msgstr "" -#: src/main/xmli18n-tmp.h:116 +#: src/main/xmli18n-tmp.h:131 msgid "Penguin small paperback" msgstr "" -#: src/main/xmli18n-tmp.h:117 +#: src/main/xmli18n-tmp.h:132 msgid "Penguin large paperback" msgstr "" -#: src/main/xmli18n-tmp.h:118 +#: src/main/xmli18n-tmp.h:133 msgid "10cm x 15cm" msgstr "" -#: src/main/xmli18n-tmp.h:119 +#: src/main/xmli18n-tmp.h:134 msgid "Hagaki Card" msgstr "" -#: src/main/xmli18n-tmp.h:120 +#: src/main/xmli18n-tmp.h:135 msgid "Oufuku Card" msgstr "" -#: src/main/xmli18n-tmp.h:121 +#: src/main/xmli18n-tmp.h:136 msgid "Japanese long envelope #3" msgstr "" -#: src/main/xmli18n-tmp.h:122 +#: src/main/xmli18n-tmp.h:137 +msgid "Japanese long envelope #3 landscape" +msgstr "" + +#: src/main/xmli18n-tmp.h:138 msgid "Japanese long envelope #4" msgstr "" -#: src/main/xmli18n-tmp.h:123 +#: src/main/xmli18n-tmp.h:139 +msgid "Japanese long envelope #4 landscape" +msgstr "" + +#: src/main/xmli18n-tmp.h:140 msgid "Japanese Kaku envelope #4" msgstr "" -#: src/main/xmli18n-tmp.h:124 +#: src/main/xmli18n-tmp.h:141 +msgid "Japanese Kaku envelope #4 landscape" +msgstr "" + +#: src/main/xmli18n-tmp.h:142 msgid "Commercial 10" msgstr "" -#: src/main/xmli18n-tmp.h:125 +#: src/main/xmli18n-tmp.h:143 +msgid "Commercial 10 landscape" +msgstr "" + +#: src/main/xmli18n-tmp.h:144 msgid "A2 Invitation" msgstr "" -#: src/main/xmli18n-tmp.h:126 +#: src/main/xmli18n-tmp.h:145 msgid "Monarch Envelope" msgstr "" -#: src/main/xmli18n-tmp.h:127 +#: src/main/xmli18n-tmp.h:146 +msgid "Monarch Envelope landscape" +msgstr "" + +#: src/main/xmli18n-tmp.h:147 msgid "4x5 3/8" msgstr "4x5 3/8" -#: src/main/xmli18n-tmp.h:128 +#: src/main/xmli18n-tmp.h:148 msgid "4x7" msgstr "4x7" -#: src/main/xmli18n-tmp.h:129 +#: src/main/xmli18n-tmp.h:149 msgid "CP_L" msgstr "" -#: src/main/xmli18n-tmp.h:130 +#: src/main/xmli18n-tmp.h:150 msgid "Card" msgstr "" -#: src/main/xmli18n-tmp.h:131 +#: src/main/xmli18n-tmp.h:151 msgid "Wide Postcard" msgstr "" -#: src/main/xmli18n-tmp.h:132 +#: src/main/xmli18n-tmp.h:152 msgid "Chilean Office" msgstr "" -#: src/main/xmli18n-tmp.h:133 +#: src/main/xmli18n-tmp.h:153 msgid "Chilean Double Letter" msgstr "" -#: src/main/xmli18n-tmp.h:134 +#: src/main/xmli18n-tmp.h:154 msgid "Chilean Double Office" msgstr "" -#: src/main/xmli18n-tmp.h:135 +#: src/main/xmli18n-tmp.h:155 msgid "Custom" msgstr "自é¸" -#: src/main/xmli18n-tmp.h:136 +#: src/main/xmli18n-tmp.h:156 msgid "89 mm Roll Paper" msgstr "" -#: src/main/xmli18n-tmp.h:137 +#: src/main/xmli18n-tmp.h:157 msgid "4 Inch Roll Paper" msgstr "4 å‹æ»¾ç­’ç´™" -#: src/main/xmli18n-tmp.h:138 +#: src/main/xmli18n-tmp.h:158 msgid "5 Inch Roll Paper" msgstr "5 å‹æ»¾ç­’ç´™" -#: src/main/xmli18n-tmp.h:139 +#: src/main/xmli18n-tmp.h:159 msgid "210 mm Roll Paper" msgstr "210 毫米滾筒紙" -#: src/main/xmli18n-tmp.h:140 +#: src/main/xmli18n-tmp.h:160 msgid "13 Inch Roll Paper" msgstr "13 å‹æ»¾ç­’ç´™" -#: src/main/xmli18n-tmp.h:141 +#: src/main/xmli18n-tmp.h:161 msgid "22 Inch Roll Paper" msgstr "22 å‹æ»¾ç­’ç´™" -#: src/main/xmli18n-tmp.h:142 +#: src/main/xmli18n-tmp.h:162 msgid "24 Inch Roll Paper" msgstr "24 å‹æ»¾ç­’ç´™" -#: src/main/xmli18n-tmp.h:143 +#: src/main/xmli18n-tmp.h:163 msgid "36 Inch Roll Paper" msgstr "36 å‹æ»¾ç­’ç´™" -#: src/main/xmli18n-tmp.h:144 +#: src/main/xmli18n-tmp.h:164 msgid "44 Inch Roll Paper" msgstr "44 å‹æ»¾ç­’ç´™" -#: src/main/xmli18n-tmp.h:145 +#: src/main/xmli18n-tmp.h:165 msgid "PostScript Level 1" msgstr "" -#: src/main/xmli18n-tmp.h:146 +#: src/main/xmli18n-tmp.h:166 msgid "PostScript Level 2" msgstr "" -#: src/main/xmli18n-tmp.h:147 +#: src/main/xmli18n-tmp.h:167 #, fuzzy msgid "Canon BJ-30" msgstr "Canon BJC 30" -#: src/main/xmli18n-tmp.h:148 +#: src/main/xmli18n-tmp.h:168 #, fuzzy msgid "Canon BJC-50" msgstr "Canon BJC 50" -#: src/main/xmli18n-tmp.h:149 +#: src/main/xmli18n-tmp.h:169 #, fuzzy msgid "Canon BJC-55" msgstr "Canon BJC 55" -#: src/main/xmli18n-tmp.h:150 +#: src/main/xmli18n-tmp.h:170 #, fuzzy msgid "Canon BJC-80" msgstr "Canon BJC 80" -#: src/main/xmli18n-tmp.h:151 +#: src/main/xmli18n-tmp.h:171 #, fuzzy msgid "Canon BJC-85" msgstr "Canon BJC 85" -#: src/main/xmli18n-tmp.h:152 +#: src/main/xmli18n-tmp.h:172 #, fuzzy msgid "Canon BJC-210" msgstr "Canon BJC 210" -#: src/main/xmli18n-tmp.h:153 +#: src/main/xmli18n-tmp.h:173 #, fuzzy msgid "Canon BJC-240" msgstr "Canon BJC 240" -#: src/main/xmli18n-tmp.h:154 +#: src/main/xmli18n-tmp.h:174 #, fuzzy msgid "Canon BJC-250" msgstr "Canon BJC 250" -#: src/main/xmli18n-tmp.h:155 +#: src/main/xmli18n-tmp.h:175 #, fuzzy msgid "Canon BJC-1000" msgstr "Canon BJC 1000" -#: src/main/xmli18n-tmp.h:156 +#: src/main/xmli18n-tmp.h:176 #, fuzzy msgid "Canon BJC-2000" msgstr "Canon BJC 2000" -#: src/main/xmli18n-tmp.h:157 +#: src/main/xmli18n-tmp.h:177 #, fuzzy msgid "Canon BJC-2010" msgstr "Canon BJC 210" -#: src/main/xmli18n-tmp.h:158 +#: src/main/xmli18n-tmp.h:178 #, fuzzy msgid "Canon BJC-2100" msgstr "Canon BJC 210" -#: src/main/xmli18n-tmp.h:159 +#: src/main/xmli18n-tmp.h:179 #, fuzzy msgid "Canon BJC-2110" msgstr "Canon BJC 210" -#: src/main/xmli18n-tmp.h:160 +#: src/main/xmli18n-tmp.h:180 #, fuzzy msgid "Canon BJC-3000" msgstr "Canon BJC 3000" -#: src/main/xmli18n-tmp.h:161 +#: src/main/xmli18n-tmp.h:181 #, fuzzy msgid "Canon BJC-4000" -msgstr "Canon BJC 7000" +msgstr "Canon BJC 1000" -#: src/main/xmli18n-tmp.h:162 +#: src/main/xmli18n-tmp.h:182 #, fuzzy msgid "Canon BJC-4300" msgstr "Canon BJC 4300" -#: src/main/xmli18n-tmp.h:163 +#: src/main/xmli18n-tmp.h:183 #, fuzzy msgid "Canon BJC-4400" msgstr "Canon BJC 4300" -#: src/main/xmli18n-tmp.h:164 +#: src/main/xmli18n-tmp.h:184 #, fuzzy msgid "Canon BJC-5100" msgstr "Canon BJC 1000" -#: src/main/xmli18n-tmp.h:165 +#: src/main/xmli18n-tmp.h:185 #, fuzzy msgid "Canon BJC-5500" msgstr "Canon BJC 6500" -#: src/main/xmli18n-tmp.h:166 +#: src/main/xmli18n-tmp.h:186 #, fuzzy msgid "Canon BJC-6000" msgstr "Canon BJC 6000" -#: src/main/xmli18n-tmp.h:167 +#: src/main/xmli18n-tmp.h:187 #, fuzzy msgid "Canon BJC-6100" msgstr "Canon BJC 6100" -#: src/main/xmli18n-tmp.h:168 +#: src/main/xmli18n-tmp.h:188 #, fuzzy msgid "Canon BJC-6200" msgstr "Canon BJC 6200" -#: src/main/xmli18n-tmp.h:169 +#: src/main/xmli18n-tmp.h:189 #, fuzzy msgid "Canon BJC-6500" msgstr "Canon BJC 6500" -#: src/main/xmli18n-tmp.h:170 +#: src/main/xmli18n-tmp.h:190 #, fuzzy msgid "Canon BJC-7000" msgstr "Canon BJC 7000" -#: src/main/xmli18n-tmp.h:171 +#: src/main/xmli18n-tmp.h:191 #, fuzzy msgid "Canon BJC-7100" msgstr "Canon BJC 7100" -#: src/main/xmli18n-tmp.h:172 +#: src/main/xmli18n-tmp.h:192 #, fuzzy msgid "Canon BJC-8200" msgstr "Canon BJC 8200" -#: src/main/xmli18n-tmp.h:173 +#: src/main/xmli18n-tmp.h:193 #, fuzzy msgid "Canon BJC-8500" msgstr "Canon BJC 6500" -#: src/main/xmli18n-tmp.h:174 +#: src/main/xmli18n-tmp.h:194 #, fuzzy msgid "Canon S100" msgstr "Canon S400" -#: src/main/xmli18n-tmp.h:175 +#: src/main/xmli18n-tmp.h:195 #, fuzzy msgid "Canon S200" msgstr "Canon S400" -#: src/main/xmli18n-tmp.h:176 +#: src/main/xmli18n-tmp.h:196 #, fuzzy msgid "Canon S300" msgstr "Canon S400" -#: src/main/xmli18n-tmp.h:177 +#: src/main/xmli18n-tmp.h:197 msgid "Canon S400" msgstr "Canon S400" -#: src/main/xmli18n-tmp.h:178 +#: src/main/xmli18n-tmp.h:198 msgid "Canon S450" msgstr "Canon S450" -#: src/main/xmli18n-tmp.h:179 +#: src/main/xmli18n-tmp.h:199 #, fuzzy msgid "Canon S500" msgstr "Canon S4500" -#: src/main/xmli18n-tmp.h:180 +#: src/main/xmli18n-tmp.h:200 #, fuzzy msgid "Canon S600" msgstr "Canon S400" -#: src/main/xmli18n-tmp.h:181 +#: src/main/xmli18n-tmp.h:201 #, fuzzy msgid "Canon S630" msgstr "Canon S400" -#: src/main/xmli18n-tmp.h:182 +#: src/main/xmli18n-tmp.h:202 msgid "Canon S800" msgstr "Canon S800" -#: src/main/xmli18n-tmp.h:183 +#: src/main/xmli18n-tmp.h:203 msgid "Canon S4500" msgstr "Canon S4500" -#: src/main/xmli18n-tmp.h:184 +#: src/main/xmli18n-tmp.h:204 #, fuzzy msgid "Canon PIXMA iP2000" -msgstr "Canon S400" +msgstr "Canon BJC 2000" -#: src/main/xmli18n-tmp.h:185 +#: src/main/xmli18n-tmp.h:205 #, fuzzy msgid "Canon PIXMA iP3000" -msgstr "Canon S400" +msgstr "Canon BJC 3000" -#: src/main/xmli18n-tmp.h:186 +#: src/main/xmli18n-tmp.h:206 #, fuzzy msgid "Canon PIXMA iP3100" -msgstr "Canon S400" +msgstr "Canon CP100" -#: src/main/xmli18n-tmp.h:187 +#: src/main/xmli18n-tmp.h:207 #, fuzzy msgid "Canon PIXMA iP4000" msgstr "Canon S400" -#: src/main/xmli18n-tmp.h:188 +#: src/main/xmli18n-tmp.h:208 #, fuzzy msgid "Canon PIXMA iP4100" -msgstr "Canon S400" +msgstr "Canon CP100" -#: src/main/xmli18n-tmp.h:189 +#: src/main/xmli18n-tmp.h:209 #, fuzzy msgid "Canon PIXMA iP4200" msgstr "Canon S400" -#: src/main/xmli18n-tmp.h:190 +#: src/main/xmli18n-tmp.h:210 #, fuzzy msgid "Canon PIXMA iP4300" -msgstr "Canon S400" +msgstr "Canon BJC 4300" -#: src/main/xmli18n-tmp.h:191 +#: src/main/xmli18n-tmp.h:211 #, fuzzy msgid "Canon PIXMA iP4500" -msgstr "Canon S400" +msgstr "Canon S4500" -#: src/main/xmli18n-tmp.h:192 +#: src/main/xmli18n-tmp.h:212 #, fuzzy msgid "Canon PIXMA iP5000" -msgstr "Canon S400" +msgstr "Canon BJC 1000" -#: src/main/xmli18n-tmp.h:193 +#: src/main/xmli18n-tmp.h:213 #, fuzzy msgid "Canon PIXMA iP5200" -msgstr "Canon S400" +msgstr "Canon BJC 2000" -#: src/main/xmli18n-tmp.h:194 +#: src/main/xmli18n-tmp.h:214 #, fuzzy msgid "Canon PIXMA iP5300" -msgstr "Canon S400" +msgstr "Canon BJC 3000" -#: src/main/xmli18n-tmp.h:195 +#: src/main/xmli18n-tmp.h:215 +#, fuzzy +msgid "Canon PIXMA iP6000D" +msgstr "Canon BJC 6000" + +#: src/main/xmli18n-tmp.h:216 #, fuzzy msgid "Canon PIXMA iP6700" -msgstr "Canon S400" +msgstr "Canon BJC 6000" -#: src/main/xmli18n-tmp.h:196 +#: src/main/xmli18n-tmp.h:217 #, fuzzy msgid "Canon PIXMA iP8500" -msgstr "Canon S400" +msgstr "Canon S800" -#: src/main/xmli18n-tmp.h:197 +#: src/main/xmli18n-tmp.h:218 #, fuzzy msgid "Canon PIXMA iX5000" -msgstr "Canon S400" +msgstr "Canon BJC 1000" -#: src/main/xmli18n-tmp.h:198 +#: src/main/xmli18n-tmp.h:219 #, fuzzy msgid "Canon PIXMA Pro9500" -msgstr "Canon S400" +msgstr "Canon BJC 6500" -#: src/main/xmli18n-tmp.h:199 +#: src/main/xmli18n-tmp.h:220 #, fuzzy msgid "Canon PIXMA MP150" -msgstr "Canon S400" +msgstr "Canon CP100" -#: src/main/xmli18n-tmp.h:200 +#: src/main/xmli18n-tmp.h:221 #, fuzzy msgid "Canon PIXMA MP170" -msgstr "Canon S400" +msgstr "Canon CP100" -#: src/main/xmli18n-tmp.h:201 +#: src/main/xmli18n-tmp.h:222 #, fuzzy msgid "Canon PIXMA MP180" -msgstr "Canon S400" +msgstr "Canon CP100" -#: src/main/xmli18n-tmp.h:202 +#: src/main/xmli18n-tmp.h:223 #, fuzzy msgid "Canon PIXMA MP500" -msgstr "Canon S400" +msgstr "Canon BJC 6500" -#: src/main/xmli18n-tmp.h:203 +#: src/main/xmli18n-tmp.h:224 +#, fuzzy +msgid "Canon PIXMA MP520" +msgstr "Canon CP220" + +#: src/main/xmli18n-tmp.h:225 #, fuzzy msgid "Canon PIXMA MP610" -msgstr "Canon S400" +msgstr "Canon BJC 6100" -#: src/main/xmli18n-tmp.h:204 +#: src/main/xmli18n-tmp.h:226 #, fuzzy msgid "Canon PIXMA MP700" -msgstr "Canon S400" +msgstr "Canon BJC 7000" -#: src/main/xmli18n-tmp.h:205 +#: src/main/xmli18n-tmp.h:227 #, fuzzy msgid "Canon PIXMA MP710" -msgstr "Canon S400" +msgstr "Canon BJC 7100" -#: src/main/xmli18n-tmp.h:206 +#: src/main/xmli18n-tmp.h:228 #, fuzzy msgid "Canon PIXMA MP730" -msgstr "Canon S400" +msgstr "Canon BJC 30" -#: src/main/xmli18n-tmp.h:207 +#: src/main/xmli18n-tmp.h:229 #, fuzzy msgid "Canon PIXMA MP740" -msgstr "Canon S400" +msgstr "Canon BJC 240" -#: src/main/xmli18n-tmp.h:208 +#: src/main/xmli18n-tmp.h:230 #, fuzzy msgid "Canon PIXMA MP750" -msgstr "Canon S400" +msgstr "Canon BJC 50" -#: src/main/xmli18n-tmp.h:209 -#, fuzzy +#: src/main/xmli18n-tmp.h:231 msgid "Canon PIXMA MP760" -msgstr "Canon S400" +msgstr "" -#: src/main/xmli18n-tmp.h:210 -#, fuzzy +#: src/main/xmli18n-tmp.h:232 msgid "Canon PIXMA MP770" -msgstr "Canon S400" +msgstr "" -#: src/main/xmli18n-tmp.h:211 +#: src/main/xmli18n-tmp.h:233 #, fuzzy msgid "Canon PIXMA MP780" -msgstr "Canon S400" +msgstr "Canon BJC 80" -#: src/main/xmli18n-tmp.h:212 -#, fuzzy +#: src/main/xmli18n-tmp.h:234 msgid "Canon PIXMA MP790" -msgstr "Canon S400" +msgstr "" -#: src/main/xmli18n-tmp.h:213 +#: src/main/xmli18n-tmp.h:235 #, fuzzy msgid "Canon PIXMA MP830" -msgstr "Canon S400" +msgstr "Canon BJC 30" -#: src/main/xmli18n-tmp.h:214 +#: src/main/xmli18n-tmp.h:236 #, fuzzy msgid "Canon PIXUS iP3100" -msgstr "Canon S400" +msgstr "Canon CP100" -#: src/main/xmli18n-tmp.h:215 +#: src/main/xmli18n-tmp.h:237 #, fuzzy msgid "Canon PIXUS iP4100" msgstr "Canon S400" -#: src/main/xmli18n-tmp.h:216 +#: src/main/xmli18n-tmp.h:238 #, fuzzy msgid "Canon i80" -msgstr "Canon S450" +msgstr "Canon S800" -#: src/main/xmli18n-tmp.h:217 +#: src/main/xmli18n-tmp.h:239 #, fuzzy msgid "Canon i560" msgstr "Canon S450" -#: src/main/xmli18n-tmp.h:218 +#: src/main/xmli18n-tmp.h:240 #, fuzzy msgid "Canon i850" msgstr "Canon S450" -#: src/main/xmli18n-tmp.h:219 +#: src/main/xmli18n-tmp.h:241 #, fuzzy msgid "Canon i860" -msgstr "Canon S400" +msgstr "Canon S800" -#: src/main/xmli18n-tmp.h:220 +#: src/main/xmli18n-tmp.h:242 #, fuzzy msgid "Canon i865" msgstr "Canon BJC 85" -#: src/main/xmli18n-tmp.h:221 +#: src/main/xmli18n-tmp.h:243 #, fuzzy msgid "Epson Stylus C20" -msgstr "EPSON Stylus C20UX" +msgstr "EPSON Stylus C20SX" -#: src/main/xmli18n-tmp.h:222 +#: src/main/xmli18n-tmp.h:244 #, fuzzy msgid "Epson Stylus C20SX" msgstr "EPSON Stylus C20SX" -#: src/main/xmli18n-tmp.h:223 +#: src/main/xmli18n-tmp.h:245 #, fuzzy msgid "Epson Stylus C20UX" msgstr "EPSON Stylus C20UX" -#: src/main/xmli18n-tmp.h:224 +#: src/main/xmli18n-tmp.h:246 #, fuzzy msgid "Epson Stylus C40" -msgstr "EPSON Stylus C40UX" +msgstr "EPSON Stylus C40SX" -#: src/main/xmli18n-tmp.h:225 +#: src/main/xmli18n-tmp.h:247 #, fuzzy msgid "Epson Stylus C40SX" msgstr "EPSON Stylus C40SX" -#: src/main/xmli18n-tmp.h:226 +#: src/main/xmli18n-tmp.h:248 #, fuzzy msgid "Epson Stylus C40UX" msgstr "EPSON Stylus C40UX" -#: src/main/xmli18n-tmp.h:227 +#: src/main/xmli18n-tmp.h:249 #, fuzzy msgid "Epson Stylus C41" -msgstr "EPSON Stylus C41UX" +msgstr "EPSON Stylus C41SX" -#: src/main/xmli18n-tmp.h:228 +#: src/main/xmli18n-tmp.h:250 #, fuzzy msgid "Epson Stylus C41SX" msgstr "EPSON Stylus C41SX" -#: src/main/xmli18n-tmp.h:229 +#: src/main/xmli18n-tmp.h:251 #, fuzzy msgid "Epson Stylus C41UX" msgstr "EPSON Stylus C41UX" -#: src/main/xmli18n-tmp.h:230 +#: src/main/xmli18n-tmp.h:252 #, fuzzy msgid "Epson Stylus C42" -msgstr "EPSON Stylus C42UX" +msgstr "EPSON Stylus C42SX" -#: src/main/xmli18n-tmp.h:231 +#: src/main/xmli18n-tmp.h:253 #, fuzzy msgid "Epson Stylus C42SX" msgstr "EPSON Stylus C42SX" -#: src/main/xmli18n-tmp.h:232 +#: src/main/xmli18n-tmp.h:254 #, fuzzy msgid "Epson Stylus C42UX" msgstr "EPSON Stylus C42UX" -#: src/main/xmli18n-tmp.h:233 +#: src/main/xmli18n-tmp.h:255 #, fuzzy msgid "Epson Stylus C43" -msgstr "EPSON Stylus C43UX" +msgstr "EPSON Stylus C43SX" -#: src/main/xmli18n-tmp.h:234 +#: src/main/xmli18n-tmp.h:256 #, fuzzy msgid "Epson Stylus C43SX" msgstr "EPSON Stylus C43SX" -#: src/main/xmli18n-tmp.h:235 +#: src/main/xmli18n-tmp.h:257 #, fuzzy msgid "Epson Stylus C43UX" msgstr "EPSON Stylus C43UX" -#: src/main/xmli18n-tmp.h:236 +#: src/main/xmli18n-tmp.h:258 #, fuzzy msgid "Epson Stylus C44" -msgstr "EPSON Stylus C44UX" +msgstr "EPSON Stylus C44SX" -#: src/main/xmli18n-tmp.h:237 +#: src/main/xmli18n-tmp.h:259 #, fuzzy msgid "Epson Stylus C44SX" msgstr "EPSON Stylus C44SX" -#: src/main/xmli18n-tmp.h:238 +#: src/main/xmli18n-tmp.h:260 #, fuzzy msgid "Epson Stylus C44UX" msgstr "EPSON Stylus C44UX" -#: src/main/xmli18n-tmp.h:239 +#: src/main/xmli18n-tmp.h:261 #, fuzzy msgid "Epson Stylus C45" msgstr "EPSON Stylus C45" -#: src/main/xmli18n-tmp.h:240 +#: src/main/xmli18n-tmp.h:262 #, fuzzy msgid "Epson Stylus C46" msgstr "EPSON Stylus C46" -#: src/main/xmli18n-tmp.h:241 +#: src/main/xmli18n-tmp.h:263 #, fuzzy msgid "Epson Stylus C48" msgstr "EPSON Stylus C45" -#: src/main/xmli18n-tmp.h:242 +#: src/main/xmli18n-tmp.h:264 #, fuzzy msgid "Epson Stylus C50" msgstr "EPSON Stylus C50" -#: src/main/xmli18n-tmp.h:243 +#: src/main/xmli18n-tmp.h:265 #, fuzzy msgid "Epson Stylus C60" msgstr "EPSON Stylus C60" -#: src/main/xmli18n-tmp.h:244 +#: src/main/xmli18n-tmp.h:266 #, fuzzy msgid "Epson Stylus C61" msgstr "EPSON Stylus C61" -#: src/main/xmli18n-tmp.h:245 +#: src/main/xmli18n-tmp.h:267 #, fuzzy msgid "Epson Stylus C62" msgstr "EPSON Stylus C62" -#: src/main/xmli18n-tmp.h:246 +#: src/main/xmli18n-tmp.h:268 #, fuzzy msgid "Epson Stylus C63" msgstr "EPSON Stylus C63" -#: src/main/xmli18n-tmp.h:247 +#: src/main/xmli18n-tmp.h:269 #, fuzzy msgid "Epson Stylus C64" msgstr "EPSON Stylus C64" -#: src/main/xmli18n-tmp.h:248 +#: src/main/xmli18n-tmp.h:270 #, fuzzy msgid "Epson Stylus C65" msgstr "EPSON Stylus C65" -#: src/main/xmli18n-tmp.h:249 +#: src/main/xmli18n-tmp.h:271 #, fuzzy msgid "Epson Stylus C66" msgstr "EPSON Stylus C66" -#: src/main/xmli18n-tmp.h:250 +#: src/main/xmli18n-tmp.h:272 #, fuzzy msgid "Epson Stylus C68" msgstr "EPSON Stylus C46" -#: src/main/xmli18n-tmp.h:251 +#: src/main/xmli18n-tmp.h:273 #, fuzzy msgid "Epson Stylus C70" msgstr "EPSON Stylus C70" -#: src/main/xmli18n-tmp.h:252 +#: src/main/xmli18n-tmp.h:274 #, fuzzy msgid "Epson Stylus C79" msgstr "EPSON Stylus C70" -#: src/main/xmli18n-tmp.h:253 +#: src/main/xmli18n-tmp.h:275 #, fuzzy msgid "Epson Stylus C80" msgstr "EPSON Stylus C80" -#: src/main/xmli18n-tmp.h:254 +#: src/main/xmli18n-tmp.h:276 #, fuzzy msgid "Epson Stylus C82" msgstr "EPSON Stylus C82" -#: src/main/xmli18n-tmp.h:255 +#: src/main/xmli18n-tmp.h:277 #, fuzzy msgid "Epson Stylus C83" msgstr "EPSON Stylus C83" -#: src/main/xmli18n-tmp.h:256 +#: src/main/xmli18n-tmp.h:278 #, fuzzy msgid "Epson Stylus C84" msgstr "EPSON Stylus C84" -#: src/main/xmli18n-tmp.h:257 +#: src/main/xmli18n-tmp.h:279 #, fuzzy msgid "Epson Stylus C85" msgstr "EPSON Stylus C85" -#: src/main/xmli18n-tmp.h:258 +#: src/main/xmli18n-tmp.h:280 #, fuzzy msgid "Epson Stylus C86" msgstr "EPSON Stylus C86" -#: src/main/xmli18n-tmp.h:259 +#: src/main/xmli18n-tmp.h:281 #, fuzzy msgid "Epson Stylus C87" -msgstr "EPSON Stylus C45" +msgstr "EPSON Stylus C70" -#: src/main/xmli18n-tmp.h:260 +#: src/main/xmli18n-tmp.h:282 #, fuzzy msgid "Epson Stylus C88" msgstr "EPSON Stylus C80" -#: src/main/xmli18n-tmp.h:261 +#: src/main/xmli18n-tmp.h:283 #, fuzzy msgid "Epson Stylus C110" -msgstr "EPSON Stylus C20UX" +msgstr "EPSON Stylus C50" -#: src/main/xmli18n-tmp.h:262 +#: src/main/xmli18n-tmp.h:284 #, fuzzy msgid "Epson Stylus C120" -msgstr "EPSON Stylus C20UX" +msgstr "EPSON Stylus C20SX" -#: src/main/xmli18n-tmp.h:263 +#: src/main/xmli18n-tmp.h:285 #, fuzzy msgid "Epson Stylus Color" msgstr "EPSON Stylus Color" -#: src/main/xmli18n-tmp.h:264 +#: src/main/xmli18n-tmp.h:286 #, fuzzy msgid "Epson Stylus Color I" msgstr "EPSON Stylus Color" -#: src/main/xmli18n-tmp.h:265 +#: src/main/xmli18n-tmp.h:287 #, fuzzy msgid "Epson Stylus Color II" msgstr "EPSON Stylus Color" -#: src/main/xmli18n-tmp.h:266 +#: src/main/xmli18n-tmp.h:288 #, fuzzy msgid "Epson Stylus Color IIs" msgstr "EPSON Stylus Color" -#: src/main/xmli18n-tmp.h:267 +#: src/main/xmli18n-tmp.h:289 #, fuzzy msgid "Epson Stylus Color PRO" msgstr "EPSON Stylus Color Pro" -#: src/main/xmli18n-tmp.h:268 +#: src/main/xmli18n-tmp.h:290 #, fuzzy msgid "Epson Stylus Pro XL" msgstr "EPSON Stylus Color Pro XL" -#: src/main/xmli18n-tmp.h:269 +#: src/main/xmli18n-tmp.h:291 #, fuzzy msgid "Epson Stylus Color 400" msgstr "EPSON Stylus Color 400" -#: src/main/xmli18n-tmp.h:270 +#: src/main/xmli18n-tmp.h:292 #, fuzzy msgid "Epson Stylus Color 440" msgstr "EPSON Stylus Color 440" -#: src/main/xmli18n-tmp.h:271 +#: src/main/xmli18n-tmp.h:293 #, fuzzy msgid "Epson Stylus Color 460" msgstr "EPSON Stylus Color 460" -#: src/main/xmli18n-tmp.h:272 +#: src/main/xmli18n-tmp.h:294 #, fuzzy msgid "Epson Stylus Color 480" msgstr "EPSON Stylus Color 480" -#: src/main/xmli18n-tmp.h:273 +#: src/main/xmli18n-tmp.h:295 #, fuzzy msgid "Epson Stylus Color 500" msgstr "EPSON Stylus Color 500" -#: src/main/xmli18n-tmp.h:274 +#: src/main/xmli18n-tmp.h:296 #, fuzzy msgid "Epson Stylus Color 580" msgstr "EPSON Stylus Color 580" -#: src/main/xmli18n-tmp.h:275 +#: src/main/xmli18n-tmp.h:297 #, fuzzy msgid "Epson Stylus Color 600" msgstr "EPSON Stylus Color 600" -#: src/main/xmli18n-tmp.h:276 +#: src/main/xmli18n-tmp.h:298 #, fuzzy msgid "Epson Stylus Color 640" msgstr "EPSON Stylus Color 640" -#: src/main/xmli18n-tmp.h:277 +#: src/main/xmli18n-tmp.h:299 #, fuzzy msgid "Epson Stylus Color 660" msgstr "EPSON Stylus Color 660" -#: src/main/xmli18n-tmp.h:278 +#: src/main/xmli18n-tmp.h:300 #, fuzzy msgid "Epson Stylus Color 670" msgstr "EPSON Stylus Color 670" -#: src/main/xmli18n-tmp.h:279 +#: src/main/xmli18n-tmp.h:301 #, fuzzy msgid "Epson Stylus Color 680" msgstr "EPSON Stylus Color 680" -#: src/main/xmli18n-tmp.h:280 +#: src/main/xmli18n-tmp.h:302 #, fuzzy msgid "Epson Stylus Color 740" msgstr "EPSON Stylus Color 740" -#: src/main/xmli18n-tmp.h:281 +#: src/main/xmli18n-tmp.h:303 #, fuzzy msgid "Epson Stylus Color 760" msgstr "EPSON Stylus Color 760" -#: src/main/xmli18n-tmp.h:282 +#: src/main/xmli18n-tmp.h:304 #, fuzzy msgid "Epson Stylus Color 777" msgstr "EPSON Stylus Color 777" -#: src/main/xmli18n-tmp.h:283 +#: src/main/xmli18n-tmp.h:305 #, fuzzy msgid "Epson Stylus Color 800" msgstr "EPSON Stylus Color 800" -#: src/main/xmli18n-tmp.h:284 +#: src/main/xmli18n-tmp.h:306 #, fuzzy msgid "Epson Stylus Color 850" msgstr "EPSON Stylus Color 850" -#: src/main/xmli18n-tmp.h:285 +#: src/main/xmli18n-tmp.h:307 #, fuzzy msgid "Epson Stylus Color 860" msgstr "EPSON Stylus Color 860" -#: src/main/xmli18n-tmp.h:286 +#: src/main/xmli18n-tmp.h:308 #, fuzzy msgid "Epson Stylus Color 880" msgstr "EPSON Stylus Color 880" -#: src/main/xmli18n-tmp.h:287 +#: src/main/xmli18n-tmp.h:309 #, fuzzy msgid "Epson Stylus Color 8 3" msgstr "EPSON Stylus Color 83" -#: src/main/xmli18n-tmp.h:288 +#: src/main/xmli18n-tmp.h:310 #, fuzzy msgid "Epson Stylus Color 900" msgstr "EPSON Stylus Color 900" -#: src/main/xmli18n-tmp.h:289 +#: src/main/xmli18n-tmp.h:311 #, fuzzy msgid "Epson Stylus Color 980" msgstr "EPSON Stylus Color 980" -#: src/main/xmli18n-tmp.h:290 +#: src/main/xmli18n-tmp.h:312 #, fuzzy msgid "Epson Stylus Color 1160" msgstr "EPSON Stylus Color 1160" -#: src/main/xmli18n-tmp.h:291 +#: src/main/xmli18n-tmp.h:313 #, fuzzy msgid "Epson Stylus Color 1500" msgstr "EPSON Stylus Color 1500" -#: src/main/xmli18n-tmp.h:292 +#: src/main/xmli18n-tmp.h:314 #, fuzzy msgid "Epson Stylus Color 1520" msgstr "EPSON Stylus Color 1520" -#: src/main/xmli18n-tmp.h:293 +#: src/main/xmli18n-tmp.h:315 #, fuzzy msgid "Epson Stylus Color 3000" msgstr "EPSON Stylus Color 3000" -#: src/main/xmli18n-tmp.h:294 +#: src/main/xmli18n-tmp.h:316 #, fuzzy msgid "Epson Stylus Photo" msgstr "EPSON Stylus Photo" -#: src/main/xmli18n-tmp.h:295 +#: src/main/xmli18n-tmp.h:317 #, fuzzy msgid "Epson Stylus Photo 700" msgstr "EPSON Stylus Photo 700" -#: src/main/xmli18n-tmp.h:296 +#: src/main/xmli18n-tmp.h:318 #, fuzzy msgid "Epson Stylus Photo EX" msgstr "EPSON Stylus Photo EX" -#: src/main/xmli18n-tmp.h:297 +#: src/main/xmli18n-tmp.h:319 #, fuzzy msgid "Epson Stylus Photo EX3" msgstr "EPSON Stylus Photo EX3" -#: src/main/xmli18n-tmp.h:298 +#: src/main/xmli18n-tmp.h:320 #, fuzzy msgid "Epson Stylus Photo 720" msgstr "EPSON Stylus Photo 720" -#: src/main/xmli18n-tmp.h:299 +#: src/main/xmli18n-tmp.h:321 #, fuzzy msgid "Epson Stylus Photo 750" msgstr "EPSON Stylus Photo 750" -#: src/main/xmli18n-tmp.h:300 +#: src/main/xmli18n-tmp.h:322 #, fuzzy msgid "Epson Stylus Photo 780" msgstr "EPSON Stylus Photo 780" -#: src/main/xmli18n-tmp.h:301 +#: src/main/xmli18n-tmp.h:323 #, fuzzy msgid "Epson Stylus Photo 785" -msgstr "EPSON Stylus Photo 895" +msgstr "EPSON Stylus Photo 750" -#: src/main/xmli18n-tmp.h:302 +#: src/main/xmli18n-tmp.h:324 #, fuzzy msgid "Epson Stylus Photo 790" msgstr "EPSON Stylus Photo 790" -#: src/main/xmli18n-tmp.h:303 +#: src/main/xmli18n-tmp.h:325 #, fuzzy msgid "Epson Stylus Photo 810" msgstr "EPSON Stylus Photo 810" -#: src/main/xmli18n-tmp.h:304 +#: src/main/xmli18n-tmp.h:326 #, fuzzy msgid "Epson Stylus Photo 820" msgstr "EPSON Stylus Photo 820" -#: src/main/xmli18n-tmp.h:305 +#: src/main/xmli18n-tmp.h:327 #, fuzzy msgid "Epson Stylus Photo 825" msgstr "EPSON Stylus Photo 825" -#: src/main/xmli18n-tmp.h:306 +#: src/main/xmli18n-tmp.h:328 #, fuzzy msgid "Epson Stylus Photo 830" msgstr "EPSON Stylus Photo 830" -#: src/main/xmli18n-tmp.h:307 +#: src/main/xmli18n-tmp.h:329 #, fuzzy msgid "Epson Stylus Photo 830U" msgstr "EPSON Stylus Photo 830" -#: src/main/xmli18n-tmp.h:308 +#: src/main/xmli18n-tmp.h:330 #, fuzzy msgid "Epson Stylus Photo 870" msgstr "EPSON Stylus Photo 870" -#: src/main/xmli18n-tmp.h:309 +#: src/main/xmli18n-tmp.h:331 #, fuzzy msgid "Epson Stylus Photo 875" msgstr "EPSON Stylus Photo 875" -#: src/main/xmli18n-tmp.h:310 +#: src/main/xmli18n-tmp.h:332 #, fuzzy msgid "Epson Stylus Photo 890" msgstr "EPSON Stylus Photo 890" -#: src/main/xmli18n-tmp.h:311 +#: src/main/xmli18n-tmp.h:333 #, fuzzy msgid "Epson Stylus Photo 895" msgstr "EPSON Stylus Photo 895" -#: src/main/xmli18n-tmp.h:312 +#: src/main/xmli18n-tmp.h:334 #, fuzzy msgid "Epson Stylus Photo 900" msgstr "EPSON Stylus Photo 900" -#: src/main/xmli18n-tmp.h:313 +#: src/main/xmli18n-tmp.h:335 #, fuzzy msgid "Epson Stylus Photo 915" msgstr "EPSON Stylus Photo 915" -#: src/main/xmli18n-tmp.h:314 +#: src/main/xmli18n-tmp.h:336 #, fuzzy msgid "Epson Stylus Photo 925" msgstr "EPSON Stylus Photo 925" -#: src/main/xmli18n-tmp.h:315 +#: src/main/xmli18n-tmp.h:337 #, fuzzy msgid "Epson Stylus Photo 935" msgstr "EPSON Stylus Photo 935" -#: src/main/xmli18n-tmp.h:316 +#: src/main/xmli18n-tmp.h:338 #, fuzzy msgid "Epson Stylus Photo 950" msgstr "EPSON Stylus Photo 950" -#: src/main/xmli18n-tmp.h:317 +#: src/main/xmli18n-tmp.h:339 #, fuzzy msgid "Epson Stylus Photo 960" msgstr "EPSON Stylus Photo 960" -#: src/main/xmli18n-tmp.h:318 +#: src/main/xmli18n-tmp.h:340 #, fuzzy msgid "Epson Stylus Photo 1200" msgstr "EPSON Stylus Photo 1200" -#: src/main/xmli18n-tmp.h:319 +#: src/main/xmli18n-tmp.h:341 #, fuzzy msgid "Epson Stylus Photo 1270" msgstr "EPSON Stylus Photo 1270" -#: src/main/xmli18n-tmp.h:320 +#: src/main/xmli18n-tmp.h:342 #, fuzzy msgid "Epson Stylus Photo 1280" msgstr "EPSON Stylus Photo 1280" -#: src/main/xmli18n-tmp.h:321 +#: src/main/xmli18n-tmp.h:343 #, fuzzy msgid "Epson Stylus Photo 1290" msgstr "EPSON Stylus Photo 1290" -#: src/main/xmli18n-tmp.h:322 +#: src/main/xmli18n-tmp.h:344 #, fuzzy msgid "Epson Stylus Photo 1400" msgstr "EPSON Stylus Photo 1200" -#: src/main/xmli18n-tmp.h:323 +#: src/main/xmli18n-tmp.h:345 #, fuzzy msgid "Epson Stylus Photo 1410" msgstr "EPSON Stylus Photo 810" -#: src/main/xmli18n-tmp.h:324 +#: src/main/xmli18n-tmp.h:346 #, fuzzy msgid "Epson Stylus Photo 2000P" msgstr "EPSON Stylus Photo 2000P" -#: src/main/xmli18n-tmp.h:325 +#: src/main/xmli18n-tmp.h:347 #, fuzzy msgid "Epson Stylus Photo 2100" msgstr "EPSON Stylus Photo 2100" -#: src/main/xmli18n-tmp.h:326 +#: src/main/xmli18n-tmp.h:348 #, fuzzy msgid "Epson Stylus Photo 2200" msgstr "EPSON Stylus Photo 2200" -#: src/main/xmli18n-tmp.h:327 +#: src/main/xmli18n-tmp.h:349 #, fuzzy msgid "Epson Stylus Photo R200" msgstr "EPSON Stylus Photo R200" -#: src/main/xmli18n-tmp.h:328 +#: src/main/xmli18n-tmp.h:350 #, fuzzy msgid "Epson Stylus Photo R210" msgstr "EPSON Stylus Photo R210" -#: src/main/xmli18n-tmp.h:329 +#: src/main/xmli18n-tmp.h:351 #, fuzzy msgid "Epson Stylus Photo R220" msgstr "EPSON Stylus Photo 2200" -#: src/main/xmli18n-tmp.h:330 +#: src/main/xmli18n-tmp.h:352 #, fuzzy msgid "Epson Stylus Photo R230" msgstr "EPSON Stylus Photo R200" -#: src/main/xmli18n-tmp.h:331 +#: src/main/xmli18n-tmp.h:353 #, fuzzy msgid "Epson Stylus Photo R240" msgstr "EPSON Stylus Photo R200" -#: src/main/xmli18n-tmp.h:332 +#: src/main/xmli18n-tmp.h:354 #, fuzzy msgid "Epson Stylus Photo R245" msgstr "EPSON Stylus Photo RX425" -#: src/main/xmli18n-tmp.h:333 +#: src/main/xmli18n-tmp.h:355 #, fuzzy msgid "Epson Stylus Photo R260" msgstr "EPSON Stylus Photo R200" -#: src/main/xmli18n-tmp.h:334 +#: src/main/xmli18n-tmp.h:356 #, fuzzy msgid "Epson Stylus Photo R265" msgstr "EPSON Stylus Photo RX425" -#: src/main/xmli18n-tmp.h:335 +#: src/main/xmli18n-tmp.h:357 #, fuzzy msgid "Epson Stylus Photo R270" msgstr "EPSON Stylus Photo 1270" -#: src/main/xmli18n-tmp.h:336 +#: src/main/xmli18n-tmp.h:358 +#, fuzzy +msgid "Epson Stylus Photo R280" +msgstr "EPSON Stylus Photo 1280" + +#: src/main/xmli18n-tmp.h:359 +#, fuzzy +msgid "Epson Stylus Photo R285" +msgstr "EPSON Stylus Photo RX425" + +#: src/main/xmli18n-tmp.h:360 #, fuzzy msgid "Epson Stylus Photo R300" msgstr "EPSON Stylus Photo R300" -#: src/main/xmli18n-tmp.h:337 +#: src/main/xmli18n-tmp.h:361 #, fuzzy msgid "Epson Stylus Photo R310" msgstr "EPSON Stylus Photo R310" -#: src/main/xmli18n-tmp.h:338 +#: src/main/xmli18n-tmp.h:362 #, fuzzy msgid "Epson Stylus Photo R320" msgstr "EPSON Stylus Photo R200" -#: src/main/xmli18n-tmp.h:339 +#: src/main/xmli18n-tmp.h:363 #, fuzzy msgid "Epson Stylus Photo R340" msgstr "EPSON Stylus Photo R300" -#: src/main/xmli18n-tmp.h:340 +#: src/main/xmli18n-tmp.h:364 #, fuzzy msgid "Epson Stylus Photo R350" msgstr "EPSON Stylus Photo R300" -#: src/main/xmli18n-tmp.h:341 +#: src/main/xmli18n-tmp.h:365 #, fuzzy msgid "Epson Stylus Photo R360" msgstr "EPSON Stylus Photo R300" -#: src/main/xmli18n-tmp.h:342 +#: src/main/xmli18n-tmp.h:366 #, fuzzy msgid "Epson Stylus Photo R380" msgstr "EPSON Stylus Photo R300" -#: src/main/xmli18n-tmp.h:343 +#: src/main/xmli18n-tmp.h:367 #, fuzzy msgid "Epson Stylus Photo R390" msgstr "EPSON Stylus Photo R300" -#: src/main/xmli18n-tmp.h:344 +#: src/main/xmli18n-tmp.h:368 #, fuzzy msgid "Epson Stylus Photo RX400" msgstr "EPSON Stylus Photo RX400" -#: src/main/xmli18n-tmp.h:345 +#: src/main/xmli18n-tmp.h:369 #, fuzzy msgid "Epson Stylus Photo RX420" msgstr "EPSON Stylus Photo RX420" -#: src/main/xmli18n-tmp.h:346 +#: src/main/xmli18n-tmp.h:370 #, fuzzy msgid "Epson Stylus Photo RX425" msgstr "EPSON Stylus Photo RX425" -#: src/main/xmli18n-tmp.h:347 +#: src/main/xmli18n-tmp.h:371 #, fuzzy msgid "Epson Stylus Photo RX430" msgstr "EPSON Stylus Photo RX430" -#: src/main/xmli18n-tmp.h:348 +#: src/main/xmli18n-tmp.h:372 #, fuzzy msgid "Epson Stylus Photo RX500" msgstr "EPSON Stylus Photo RX500" -#: src/main/xmli18n-tmp.h:349 +#: src/main/xmli18n-tmp.h:373 #, fuzzy msgid "Epson Stylus Photo RX510" msgstr "EPSON Stylus Photo RX510" -#: src/main/xmli18n-tmp.h:350 +#: src/main/xmli18n-tmp.h:374 #, fuzzy msgid "Epson Stylus Photo RX560" msgstr "EPSON Stylus Photo RX500" -#: src/main/xmli18n-tmp.h:351 +#: src/main/xmli18n-tmp.h:375 #, fuzzy msgid "Epson Stylus Photo RX580" msgstr "EPSON Stylus Photo RX500" -#: src/main/xmli18n-tmp.h:352 +#: src/main/xmli18n-tmp.h:376 +#, fuzzy +msgid "Epson Stylus Photo RX585" +msgstr "EPSON Stylus Photo RX425" + +#: src/main/xmli18n-tmp.h:377 #, fuzzy msgid "Epson Stylus Photo RX590" msgstr "EPSON Stylus Photo RX500" -#: src/main/xmli18n-tmp.h:353 +#: src/main/xmli18n-tmp.h:378 #, fuzzy msgid "Epson Stylus Photo RX595" -msgstr "EPSON Stylus Photo RX500" +msgstr "EPSON Stylus Photo RX425" -#: src/main/xmli18n-tmp.h:354 +#: src/main/xmli18n-tmp.h:379 #, fuzzy msgid "Epson Stylus Photo RX600" msgstr "EPSON Stylus Photo RX600" -#: src/main/xmli18n-tmp.h:355 +#: src/main/xmli18n-tmp.h:380 #, fuzzy msgid "Epson Stylus Photo RX620" msgstr "EPSON Stylus Photo RX620" -#: src/main/xmli18n-tmp.h:356 +#: src/main/xmli18n-tmp.h:381 #, fuzzy msgid "Epson Stylus Photo RX630" msgstr "EPSON Stylus Photo RX630" -#: src/main/xmli18n-tmp.h:357 +#: src/main/xmli18n-tmp.h:382 #, fuzzy msgid "Epson Stylus Photo RX640" msgstr "EPSON Stylus Photo RX400" -#: src/main/xmli18n-tmp.h:358 +#: src/main/xmli18n-tmp.h:383 +#, fuzzy +msgid "Epson Stylus Photo RX680" +msgstr "EPSON Stylus Photo RX600" + +#: src/main/xmli18n-tmp.h:384 +#, fuzzy +msgid "Epson Stylus Photo RX685" +msgstr "EPSON Stylus Photo RX425" + +#: src/main/xmli18n-tmp.h:385 #, fuzzy msgid "Epson Stylus Photo RX700" msgstr "EPSON Stylus Photo RX400" -#: src/main/xmli18n-tmp.h:359 +#: src/main/xmli18n-tmp.h:386 #, fuzzy msgid "Epson Stylus Photo R800" msgstr "EPSON Stylus Photo R800" -#: src/main/xmli18n-tmp.h:360 +#: src/main/xmli18n-tmp.h:387 #, fuzzy msgid "Epson Stylus Photo R1800" msgstr "EPSON Stylus Photo R1800" -#: src/main/xmli18n-tmp.h:361 +#: src/main/xmli18n-tmp.h:388 #, fuzzy msgid "Epson Stylus Photo R2400" msgstr "EPSON Stylus Photo R200" -#: src/main/xmli18n-tmp.h:362 +#: src/main/xmli18n-tmp.h:389 #, fuzzy msgid "Epson Stylus Pro 5000" msgstr "EPSON Stylus Pro 5000" -#: src/main/xmli18n-tmp.h:363 +#: src/main/xmli18n-tmp.h:390 #, fuzzy msgid "Epson Stylus Pro 5500" msgstr "EPSON Stylus Pro 5500" -#: src/main/xmli18n-tmp.h:364 +#: src/main/xmli18n-tmp.h:391 #, fuzzy msgid "Epson Stylus Pro 7000" msgstr "EPSON Stylus Pro 7000" -#: src/main/xmli18n-tmp.h:365 +#: src/main/xmli18n-tmp.h:392 #, fuzzy msgid "Epson Stylus Pro 7500" msgstr "EPSON Stylus Pro 7500" -#: src/main/xmli18n-tmp.h:366 +#: src/main/xmli18n-tmp.h:393 #, fuzzy msgid "Epson Stylus Pro 7600" msgstr "EPSON Stylus Pro 7600" -#: src/main/xmli18n-tmp.h:367 +#: src/main/xmli18n-tmp.h:394 #, fuzzy msgid "Epson Stylus Pro 9000" msgstr "EPSON Stylus Pro 9000" -#: src/main/xmli18n-tmp.h:368 +#: src/main/xmli18n-tmp.h:395 #, fuzzy msgid "Epson Stylus Pro 9500" msgstr "EPSON Stylus Pro 9500" -#: src/main/xmli18n-tmp.h:369 +#: src/main/xmli18n-tmp.h:396 #, fuzzy msgid "Epson Stylus Pro 9600" msgstr "EPSON Stylus Pro 9600" -#: src/main/xmli18n-tmp.h:370 +#: src/main/xmli18n-tmp.h:397 #, fuzzy msgid "Epson Stylus Pro 10000" msgstr "EPSON Stylus Pro 10000" -#: src/main/xmli18n-tmp.h:371 +#: src/main/xmli18n-tmp.h:398 #, fuzzy msgid "Epson Stylus Scan 2000" msgstr "EPSON Stylus Scan 2000" -#: src/main/xmli18n-tmp.h:372 +#: src/main/xmli18n-tmp.h:399 #, fuzzy msgid "Epson Stylus Scan 2500" msgstr "EPSON Stylus Scan 2500" -#: src/main/xmli18n-tmp.h:373 +#: src/main/xmli18n-tmp.h:400 #, fuzzy msgid "Epson Stylus CX1500" msgstr "EPSON Stylus CX1500" -#: src/main/xmli18n-tmp.h:374 +#: src/main/xmli18n-tmp.h:401 #, fuzzy msgid "Epson Stylus CX3100" msgstr "EPSON Stylus CX3100" -#: src/main/xmli18n-tmp.h:375 +#: src/main/xmli18n-tmp.h:402 #, fuzzy msgid "Epson Stylus CX3200" msgstr "EPSON Stylus CX3200" -#: src/main/xmli18n-tmp.h:376 +#: src/main/xmli18n-tmp.h:403 #, fuzzy msgid "Epson Stylus CX3500" msgstr "EPSON Stylus CX3500" -#: src/main/xmli18n-tmp.h:377 +#: src/main/xmli18n-tmp.h:404 #, fuzzy msgid "Epson Stylus CX3600" msgstr "EPSON Stylus CX3600" -#: src/main/xmli18n-tmp.h:378 +#: src/main/xmli18n-tmp.h:405 #, fuzzy msgid "Epson Stylus CX3650" msgstr "EPSON Stylus CX3650" -#: src/main/xmli18n-tmp.h:379 +#: src/main/xmli18n-tmp.h:406 #, fuzzy msgid "Epson Stylus CX3700" -msgstr "EPSON Stylus CX8300" +msgstr "EPSON Stylus CX3100" -#: src/main/xmli18n-tmp.h:380 +#: src/main/xmli18n-tmp.h:407 #, fuzzy msgid "Epson Stylus CX3800" -msgstr "EPSON Stylus CX8400" +msgstr "EPSON Stylus CX3100" -#: src/main/xmli18n-tmp.h:381 +#: src/main/xmli18n-tmp.h:408 #, fuzzy msgid "Epson Stylus CX3805" -msgstr "EPSON Stylus C85" +msgstr "EPSON Stylus C80" -#: src/main/xmli18n-tmp.h:382 +#: src/main/xmli18n-tmp.h:409 #, fuzzy msgid "Epson Stylus CX3810" msgstr "EPSON Stylus CX3100" -#: src/main/xmli18n-tmp.h:383 +#: src/main/xmli18n-tmp.h:410 #, fuzzy msgid "Epson Stylus CX4100" -msgstr "EPSON Stylus CX8400" +msgstr "EPSON Stylus CX1500" -#: src/main/xmli18n-tmp.h:384 +#: src/main/xmli18n-tmp.h:411 #, fuzzy msgid "Epson Stylus CX4200" -msgstr "EPSON Stylus CX8400" +msgstr "EPSON Stylus CX3200" -#: src/main/xmli18n-tmp.h:385 +#: src/main/xmli18n-tmp.h:412 #, fuzzy msgid "Epson Stylus CX4400" -msgstr "EPSON Stylus CX8400" +msgstr "EPSON Stylus CX4600" -#: src/main/xmli18n-tmp.h:386 +#: src/main/xmli18n-tmp.h:413 #, fuzzy msgid "Epson Stylus CX4500" -msgstr "EPSON Stylus CX8400" +msgstr "EPSON Stylus CX1500" -#: src/main/xmli18n-tmp.h:387 +#: src/main/xmli18n-tmp.h:414 #, fuzzy msgid "Epson Stylus CX4600" msgstr "EPSON Stylus CX4600" -#: src/main/xmli18n-tmp.h:388 +#: src/main/xmli18n-tmp.h:415 #, fuzzy msgid "Epson Stylus CX4700" -msgstr "EPSON Stylus CX8400" +msgstr "EPSON Stylus CX4600" -#: src/main/xmli18n-tmp.h:389 +#: src/main/xmli18n-tmp.h:416 #, fuzzy msgid "Epson Stylus CX4800" -msgstr "EPSON Stylus CX8400" +msgstr "EPSON Stylus CX4600" -#: src/main/xmli18n-tmp.h:390 +#: src/main/xmli18n-tmp.h:417 #, fuzzy msgid "Epson Stylus CX4900" -msgstr "EPSON Stylus CX8400" +msgstr "EPSON Stylus CX4600" -#: src/main/xmli18n-tmp.h:391 +#: src/main/xmli18n-tmp.h:418 #, fuzzy msgid "Epson Stylus CX5000" msgstr "EPSON Stylus CX1500" -#: src/main/xmli18n-tmp.h:392 +#: src/main/xmli18n-tmp.h:419 #, fuzzy msgid "Epson Stylus CX5000F" msgstr "EPSON Stylus CX1500" -#: src/main/xmli18n-tmp.h:393 +#: src/main/xmli18n-tmp.h:420 #, fuzzy msgid "Epson Stylus CX5100" msgstr "EPSON Stylus CX5100" -#: src/main/xmli18n-tmp.h:394 +#: src/main/xmli18n-tmp.h:421 #, fuzzy msgid "Epson Stylus CX5200" msgstr "EPSON Stylus CX5200" -#: src/main/xmli18n-tmp.h:395 +#: src/main/xmli18n-tmp.h:422 #, fuzzy msgid "Epson Stylus CX5300" msgstr "EPSON Stylus CX5300" -#: src/main/xmli18n-tmp.h:396 +#: src/main/xmli18n-tmp.h:423 #, fuzzy msgid "Epson Stylus CX5400" msgstr "EPSON Stylus CX5400" -#: src/main/xmli18n-tmp.h:397 +#: src/main/xmli18n-tmp.h:424 #, fuzzy msgid "Epson Stylus CX5600" msgstr "EPSON Stylus CX1500" -#: src/main/xmli18n-tmp.h:398 +#: src/main/xmli18n-tmp.h:425 #, fuzzy msgid "Epson Stylus CX5700" -msgstr "EPSON Stylus CX6500" +msgstr "EPSON Stylus CX1500" -#: src/main/xmli18n-tmp.h:399 +#: src/main/xmli18n-tmp.h:426 #, fuzzy msgid "Epson Stylus CX5800" -msgstr "EPSON Stylus CX8400" +msgstr "EPSON Stylus CX1500" -#: src/main/xmli18n-tmp.h:400 +#: src/main/xmli18n-tmp.h:427 #, fuzzy msgid "Epson Stylus CX6000" msgstr "EPSON Stylus CX3600" -#: src/main/xmli18n-tmp.h:401 +#: src/main/xmli18n-tmp.h:428 #, fuzzy msgid "Epson Stylus CX6300" msgstr "EPSON Stylus CX6300" -#: src/main/xmli18n-tmp.h:402 +#: src/main/xmli18n-tmp.h:429 #, fuzzy msgid "Epson Stylus CX6400" msgstr "EPSON Stylus CX6400" -#: src/main/xmli18n-tmp.h:403 +#: src/main/xmli18n-tmp.h:430 #, fuzzy msgid "Epson Stylus CX6500" msgstr "EPSON Stylus CX6500" -#: src/main/xmli18n-tmp.h:404 +#: src/main/xmli18n-tmp.h:431 #, fuzzy msgid "Epson Stylus CX6600" msgstr "EPSON Stylus CX6600" -#: src/main/xmli18n-tmp.h:405 +#: src/main/xmli18n-tmp.h:432 #, fuzzy msgid "Epson Stylus CX7000F" -msgstr "EPSON Stylus CX8300" +msgstr "EPSON Stylus C70" -#: src/main/xmli18n-tmp.h:406 +#: src/main/xmli18n-tmp.h:433 #, fuzzy msgid "Epson Stylus CX7400" -msgstr "EPSON Stylus CX8300" +msgstr "EPSON Stylus CX4600" -#: src/main/xmli18n-tmp.h:407 +#: src/main/xmli18n-tmp.h:434 #, fuzzy msgid "Epson Stylus CX7700" msgstr "EPSON Stylus C70" -#: src/main/xmli18n-tmp.h:408 +#: src/main/xmli18n-tmp.h:435 #, fuzzy msgid "Epson Stylus CX7800" -msgstr "EPSON Stylus CX8400" +msgstr "EPSON Stylus CX8300" -#: src/main/xmli18n-tmp.h:409 +#: src/main/xmli18n-tmp.h:436 #, fuzzy msgid "Epson Stylus CX8300" msgstr "EPSON Stylus CX8300" -#: src/main/xmli18n-tmp.h:410 +#: src/main/xmli18n-tmp.h:437 #, fuzzy msgid "Epson Stylus CX8400" msgstr "EPSON Stylus CX8400" -#: src/main/xmli18n-tmp.h:411 +#: src/main/xmli18n-tmp.h:438 #, fuzzy msgid "Epson Stylus CX9400" -msgstr "EPSON Stylus CX8400" +msgstr "EPSON Stylus CX4600" -#: src/main/xmli18n-tmp.h:412 +#: src/main/xmli18n-tmp.h:439 #, fuzzy msgid "Epson Stylus D68" msgstr "EPSON Stylus C46" -#: src/main/xmli18n-tmp.h:413 +#: src/main/xmli18n-tmp.h:440 #, fuzzy msgid "Epson Stylus D88" msgstr "EPSON Stylus C80" -#: src/main/xmli18n-tmp.h:414 +#: src/main/xmli18n-tmp.h:441 +#, fuzzy +msgid "Epson Stylus D92" +msgstr "EPSON Stylus C62" + +#: src/main/xmli18n-tmp.h:442 #, fuzzy msgid "Epson Stylus D120" -msgstr "EPSON Stylus C20UX" +msgstr "EPSON Stylus C20SX" -#: src/main/xmli18n-tmp.h:415 +#: src/main/xmli18n-tmp.h:443 #, fuzzy msgid "Epson Stylus DX3800" msgstr "EPSON Stylus CX3100" -#: src/main/xmli18n-tmp.h:416 +#: src/main/xmli18n-tmp.h:444 +#, fuzzy +msgid "Epson Stylus DX3850" +msgstr "EPSON Stylus CX3500" + +#: src/main/xmli18n-tmp.h:445 +#, fuzzy +msgid "Epson Stylus DX4050" +msgstr "EPSON Stylus CX4600" + +#: src/main/xmli18n-tmp.h:446 +#, fuzzy +msgid "Epson Stylus DX4200" +msgstr "EPSON Stylus CX3200" + +#: src/main/xmli18n-tmp.h:447 +#, fuzzy +msgid "Epson Stylus DX4250" +msgstr "EPSON Stylus CX1500" + +#: src/main/xmli18n-tmp.h:448 +#, fuzzy +msgid "Epson Stylus DX4400" +msgstr "EPSON Stylus CX4600" + +#: src/main/xmli18n-tmp.h:449 +#, fuzzy +msgid "Epson Stylus DX4450" +msgstr "EPSON Stylus CX1500" + +#: src/main/xmli18n-tmp.h:450 +#, fuzzy +msgid "Epson Stylus DX4800" +msgstr "EPSON Stylus CX4600" + +#: src/main/xmli18n-tmp.h:451 #, fuzzy -msgid "Epson Stylus DX3850" -msgstr "EPSON Stylus CX3500" +msgid "Epson Stylus DX7000F" +msgstr "EPSON Stylus Pro 7000" -#: src/main/xmli18n-tmp.h:417 +#: src/main/xmli18n-tmp.h:452 #, fuzzy -msgid "Epson Stylus DX4050" -msgstr "EPSON Stylus CX3200" +msgid "Epson Stylus DX7400" +msgstr "EPSON Stylus CX4600" -#: src/main/xmli18n-tmp.h:418 +#: src/main/xmli18n-tmp.h:453 #, fuzzy -msgid "Epson Stylus DX4200" -msgstr "EPSON Stylus CX3200" +msgid "Epson Stylus DX7450" +msgstr "EPSON Stylus CX1500" -#: src/main/xmli18n-tmp.h:419 +#: src/main/xmli18n-tmp.h:454 #, fuzzy -msgid "Epson Stylus DX4250" -msgstr "EPSON Stylus C50" +msgid "Epson Stylus DX8400" +msgstr "EPSON Stylus CX8400" -#: src/main/xmli18n-tmp.h:420 +#: src/main/xmli18n-tmp.h:455 #, fuzzy -msgid "Epson Stylus DX4800" -msgstr "EPSON Stylus CX4600" +msgid "Epson Stylus DX8450" +msgstr "EPSON Stylus CX8400" -#: src/main/xmli18n-tmp.h:421 +#: src/main/xmli18n-tmp.h:456 msgid "Epson PictureMate" msgstr "" -#: src/main/xmli18n-tmp.h:422 +#: src/main/xmli18n-tmp.h:457 +msgid "Epson PictureMate Dash" +msgstr "" + +#: src/main/xmli18n-tmp.h:458 msgid "Epson PictureMate Deluxe" msgstr "" -#: src/main/xmli18n-tmp.h:423 +#: src/main/xmli18n-tmp.h:459 msgid "Epson PictureMate Flash" msgstr "" -#: src/main/xmli18n-tmp.h:424 +#: src/main/xmli18n-tmp.h:460 msgid "Epson PictureMate Pal" msgstr "" -#: src/main/xmli18n-tmp.h:425 +#: src/main/xmli18n-tmp.h:461 msgid "Epson PictureMate Snap" msgstr "" -#: src/main/xmli18n-tmp.h:426 -#, fuzzy +#: src/main/xmli18n-tmp.h:462 +msgid "Epson PictureMate 100" +msgstr "" + +#: src/main/xmli18n-tmp.h:463 msgid "Epson PictureMate 200" -msgstr "EPSON PM-2000C" +msgstr "" -#: src/main/xmli18n-tmp.h:427 -#, fuzzy +#: src/main/xmli18n-tmp.h:464 msgid "Epson PictureMate 210" -msgstr "EPSON PM-G720" +msgstr "" -#: src/main/xmli18n-tmp.h:428 -#, fuzzy +#: src/main/xmli18n-tmp.h:465 msgid "Epson PictureMate 240" -msgstr "EPSON PM-740C" +msgstr "" -#: src/main/xmli18n-tmp.h:429 -#, fuzzy +#: src/main/xmli18n-tmp.h:466 msgid "Epson PictureMate 250" -msgstr "EPSON PM-750C" +msgstr "" -#: src/main/xmli18n-tmp.h:430 -#, fuzzy +#: src/main/xmli18n-tmp.h:467 +msgid "Epson PictureMate 260" +msgstr "" + +#: src/main/xmli18n-tmp.h:468 +msgid "Epson PictureMate 270" +msgstr "" + +#: src/main/xmli18n-tmp.h:469 msgid "Epson PictureMate 280" -msgstr "EPSON PM-780C" +msgstr "" -#: src/main/xmli18n-tmp.h:431 +#: src/main/xmli18n-tmp.h:470 +msgid "Epson PictureMate 290" +msgstr "" + +#: src/main/xmli18n-tmp.h:471 +msgid "Epson PictureMate 500" +msgstr "" + +#: src/main/xmli18n-tmp.h:472 +msgid "Epson PictureMate 2005" +msgstr "" + +#: src/main/xmli18n-tmp.h:473 #, fuzzy msgid "Epson CL 700" msgstr "Canon BJC 7000" -#: src/main/xmli18n-tmp.h:432 +#: src/main/xmli18n-tmp.h:474 msgid "Epson CL 750" msgstr "" -#: src/main/xmli18n-tmp.h:433 +#: src/main/xmli18n-tmp.h:475 msgid "Epson CL 760" msgstr "" -#: src/main/xmli18n-tmp.h:434 +#: src/main/xmli18n-tmp.h:476 msgid "Epson E 100" msgstr "" -#: src/main/xmli18n-tmp.h:435 +#: src/main/xmli18n-tmp.h:477 msgid "Epson E 150" msgstr "" -#: src/main/xmli18n-tmp.h:436 +#: src/main/xmli18n-tmp.h:478 msgid "Epson E 200" msgstr "" -#: src/main/xmli18n-tmp.h:437 +#: src/main/xmli18n-tmp.h:479 +msgid "Epson E 300" +msgstr "" + +#: src/main/xmli18n-tmp.h:480 +msgid "Epson E 500" +msgstr "" + +#: src/main/xmli18n-tmp.h:481 +msgid "Epson E 520" +msgstr "" + +#: src/main/xmli18n-tmp.h:482 +msgid "Epson E 700" +msgstr "" + +#: src/main/xmli18n-tmp.h:483 +msgid "Epson E 720" +msgstr "" + +#: src/main/xmli18n-tmp.h:484 #, fuzzy msgid "Epson EM 900C" msgstr "EPSON EM-900C" -#: src/main/xmli18n-tmp.h:438 +#: src/main/xmli18n-tmp.h:485 #, fuzzy msgid "Epson EM 930C" msgstr "EPSON EM-930C" -#: src/main/xmli18n-tmp.h:439 +#: src/main/xmli18n-tmp.h:486 #, fuzzy msgid "Epson MC 2000" msgstr "Canon BJC 2000" -#: src/main/xmli18n-tmp.h:440 +#: src/main/xmli18n-tmp.h:487 #, fuzzy msgid "Epson MC 5000" msgstr "EPSON MC-5000" -#: src/main/xmli18n-tmp.h:441 +#: src/main/xmli18n-tmp.h:488 #, fuzzy msgid "Epson MC 7000" msgstr "Canon BJC 7000" -#: src/main/xmli18n-tmp.h:442 +#: src/main/xmli18n-tmp.h:489 #, fuzzy msgid "Epson MC 9000" msgstr "EPSON MC-9000" -#: src/main/xmli18n-tmp.h:443 +#: src/main/xmli18n-tmp.h:490 #, fuzzy msgid "Epson MC 10000" msgstr "Canon BJC 1000" -#: src/main/xmli18n-tmp.h:444 +#: src/main/xmli18n-tmp.h:491 #, fuzzy msgid "Epson MJ 930C" msgstr "EPSON MJ-930C" -#: src/main/xmli18n-tmp.h:445 +#: src/main/xmli18n-tmp.h:492 #, fuzzy msgid "Epson MJ 5100C" msgstr "EPSON MJ-5100C" -#: src/main/xmli18n-tmp.h:446 +#: src/main/xmli18n-tmp.h:493 #, fuzzy msgid "Epson MJ 6000C" msgstr "Canon BJC 6000" -#: src/main/xmli18n-tmp.h:447 +#: src/main/xmli18n-tmp.h:494 #, fuzzy msgid "Epson MJ 8000C" msgstr "EPSON MJ-8000C" -#: src/main/xmli18n-tmp.h:448 -#, fuzzy +#: src/main/xmli18n-tmp.h:495 msgid "Epson PM 670C" -msgstr "EPSON PM-700C" +msgstr "" -#: src/main/xmli18n-tmp.h:449 +#: src/main/xmli18n-tmp.h:496 #, fuzzy msgid "Epson PM 700C" msgstr "EPSON PM-700C" -#: src/main/xmli18n-tmp.h:450 +#: src/main/xmli18n-tmp.h:497 #, fuzzy msgid "Epson PM 730C" msgstr "EPSON PM-730C" -#: src/main/xmli18n-tmp.h:451 +#: src/main/xmli18n-tmp.h:498 #, fuzzy msgid "Epson PM 740C" msgstr "EPSON PM-740C" -#: src/main/xmli18n-tmp.h:452 +#: src/main/xmli18n-tmp.h:499 #, fuzzy msgid "Epson PM 750C" msgstr "EPSON PM-750C" -#: src/main/xmli18n-tmp.h:453 +#: src/main/xmli18n-tmp.h:500 #, fuzzy msgid "Epson PM 760C" msgstr "EPSON PM-760C" -#: src/main/xmli18n-tmp.h:454 +#: src/main/xmli18n-tmp.h:501 #, fuzzy msgid "Epson PM 770C" msgstr "EPSON PM-770C" -#: src/main/xmli18n-tmp.h:455 +#: src/main/xmli18n-tmp.h:502 #, fuzzy msgid "Epson PM 780C" msgstr "EPSON PM-780C" -#: src/main/xmli18n-tmp.h:456 +#: src/main/xmli18n-tmp.h:503 #, fuzzy msgid "Epson PM 790PT" msgstr "EPSON PM-790PT" -#: src/main/xmli18n-tmp.h:457 +#: src/main/xmli18n-tmp.h:504 #, fuzzy msgid "Epson PM 800C" msgstr "EPSON PM-800C" -#: src/main/xmli18n-tmp.h:458 +#: src/main/xmli18n-tmp.h:505 #, fuzzy msgid "Epson PM 850PT" msgstr "EPSON PM-850PT" -#: src/main/xmli18n-tmp.h:459 +#: src/main/xmli18n-tmp.h:506 #, fuzzy msgid "Epson PM 870C" msgstr "EPSON PM-870C" -#: src/main/xmli18n-tmp.h:460 +#: src/main/xmli18n-tmp.h:507 #, fuzzy msgid "Epson PM 880C" msgstr "EPSON PM-880C" -#: src/main/xmli18n-tmp.h:461 +#: src/main/xmli18n-tmp.h:508 #, fuzzy msgid "Epson PM 930C" msgstr "EPSON PM-930C" -#: src/main/xmli18n-tmp.h:462 +#: src/main/xmli18n-tmp.h:509 #, fuzzy msgid "Epson PM 940C" msgstr "EPSON PM-940C" -#: src/main/xmli18n-tmp.h:463 +#: src/main/xmli18n-tmp.h:510 #, fuzzy msgid "Epson PM 950C" msgstr "EPSON PM-950C" -#: src/main/xmli18n-tmp.h:464 +#: src/main/xmli18n-tmp.h:511 #, fuzzy msgid "Epson PM 970C" msgstr "EPSON PM-970C" -#: src/main/xmli18n-tmp.h:465 +#: src/main/xmli18n-tmp.h:512 #, fuzzy msgid "Epson PM 980C" msgstr "EPSON PM-980C" -#: src/main/xmli18n-tmp.h:466 +#: src/main/xmli18n-tmp.h:513 #, fuzzy msgid "Epson PM 2000C" msgstr "EPSON PM-2000C" -#: src/main/xmli18n-tmp.h:467 +#: src/main/xmli18n-tmp.h:514 #, fuzzy msgid "Epson PM 2200C" msgstr "EPSON PM-2200C" -#: src/main/xmli18n-tmp.h:468 +#: src/main/xmli18n-tmp.h:515 #, fuzzy msgid "Epson PM 3000C" msgstr "EPSON PM-3000C" -#: src/main/xmli18n-tmp.h:469 +#: src/main/xmli18n-tmp.h:516 #, fuzzy msgid "Epson PM 3300C" msgstr "EPSON PM-3300C" -#: src/main/xmli18n-tmp.h:470 +#: src/main/xmli18n-tmp.h:517 #, fuzzy msgid "Epson PM 3500C" msgstr "EPSON PM-3500C" -#: src/main/xmli18n-tmp.h:471 +#: src/main/xmli18n-tmp.h:518 #, fuzzy msgid "Epson PM 3700C" msgstr "EPSON PM-3700C" -#: src/main/xmli18n-tmp.h:472 +#: src/main/xmli18n-tmp.h:519 #, fuzzy msgid "Epson PM 4000PX" msgstr "EPSON PM-4000PX" -#: src/main/xmli18n-tmp.h:473 +#: src/main/xmli18n-tmp.h:520 #, fuzzy msgid "Epson PM 5000C" msgstr "EPSON PM-5000C" -#: src/main/xmli18n-tmp.h:474 +#: src/main/xmli18n-tmp.h:521 #, fuzzy msgid "Epson PM 7000C" msgstr "EPSON PM-7000C" -#: src/main/xmli18n-tmp.h:475 +#: src/main/xmli18n-tmp.h:522 #, fuzzy msgid "Epson PM 9000C" msgstr "EPSON PM-9000C" -#: src/main/xmli18n-tmp.h:476 +#: src/main/xmli18n-tmp.h:523 #, fuzzy msgid "Epson PM 10000" msgstr "EPSON PM-10000" -#: src/main/xmli18n-tmp.h:477 +#: src/main/xmli18n-tmp.h:524 msgid "Epson PM A650" msgstr "" -#: src/main/xmli18n-tmp.h:478 +#: src/main/xmli18n-tmp.h:525 msgid "Epson PM A750" msgstr "" -#: src/main/xmli18n-tmp.h:479 -#, fuzzy +#: src/main/xmli18n-tmp.h:526 msgid "Epson PM A820" -msgstr "EPSON PM-G820" +msgstr "" -#: src/main/xmli18n-tmp.h:480 +#: src/main/xmli18n-tmp.h:527 msgid "Epson PM A890" msgstr "" -#: src/main/xmli18n-tmp.h:481 -#, fuzzy +#: src/main/xmli18n-tmp.h:528 msgid "Epson PM A900" -msgstr "EPSON PM-9000C" +msgstr "" -#: src/main/xmli18n-tmp.h:482 +#: src/main/xmli18n-tmp.h:529 msgid "Epson PM A950" msgstr "" -#: src/main/xmli18n-tmp.h:483 +#: src/main/xmli18n-tmp.h:530 msgid "Epson PM D600" msgstr "" -#: src/main/xmli18n-tmp.h:484 +#: src/main/xmli18n-tmp.h:531 #, fuzzy msgid "Epson PM D750" msgstr "EPSON PM-D750" -#: src/main/xmli18n-tmp.h:485 +#: src/main/xmli18n-tmp.h:532 #, fuzzy msgid "Epson PM D770" msgstr "EPSON PM-D770" -#: src/main/xmli18n-tmp.h:486 +#: src/main/xmli18n-tmp.h:533 msgid "Epson PM D800" msgstr "" -#: src/main/xmli18n-tmp.h:487 -#, fuzzy +#: src/main/xmli18n-tmp.h:534 msgid "Epson PM D870" -msgstr "EPSON PM-870C" +msgstr "" -#: src/main/xmli18n-tmp.h:488 +#: src/main/xmli18n-tmp.h:535 #, fuzzy msgid "Epson PM D1000" msgstr "EPSON PM-D1000" -#: src/main/xmli18n-tmp.h:489 +#: src/main/xmli18n-tmp.h:536 #, fuzzy msgid "Epson PM G700" msgstr "EPSON PM-G700" -#: src/main/xmli18n-tmp.h:490 +#: src/main/xmli18n-tmp.h:537 #, fuzzy msgid "Epson PM G720" msgstr "EPSON PM-G720" -#: src/main/xmli18n-tmp.h:491 +#: src/main/xmli18n-tmp.h:538 msgid "Epson PM G730" msgstr "" -#: src/main/xmli18n-tmp.h:492 +#: src/main/xmli18n-tmp.h:539 #, fuzzy msgid "Epson PM G800" msgstr "EPSON PM-G800" -#: src/main/xmli18n-tmp.h:493 +#: src/main/xmli18n-tmp.h:540 #, fuzzy msgid "Epson PM G820" msgstr "EPSON PM-G820" -#: src/main/xmli18n-tmp.h:494 -#, fuzzy +#: src/main/xmli18n-tmp.h:541 msgid "Epson PM G850" -msgstr "EPSON PM-G800" +msgstr "" -#: src/main/xmli18n-tmp.h:495 -#, fuzzy +#: src/main/xmli18n-tmp.h:542 msgid "Epson PM G4500" -msgstr "EPSON PM-G700" +msgstr "" -#: src/main/xmli18n-tmp.h:496 -#, fuzzy +#: src/main/xmli18n-tmp.h:543 msgid "Epson PX A650" -msgstr "EPSON PX-V600" +msgstr "" -#: src/main/xmli18n-tmp.h:497 +#: src/main/xmli18n-tmp.h:544 #, fuzzy msgid "Epson PX G900" msgstr "EPSON PX-G900" -#: src/main/xmli18n-tmp.h:498 +#: src/main/xmli18n-tmp.h:545 #, fuzzy msgid "Epson PX G920" msgstr "EPSON PX-G920" -#: src/main/xmli18n-tmp.h:499 +#: src/main/xmli18n-tmp.h:546 #, fuzzy msgid "Epson PX G5000" msgstr "EPSON PX-G5000" -#: src/main/xmli18n-tmp.h:500 +#: src/main/xmli18n-tmp.h:547 #, fuzzy msgid "Epson PX V500" msgstr "EPSON PX-V500" -#: src/main/xmli18n-tmp.h:501 +#: src/main/xmli18n-tmp.h:548 #, fuzzy msgid "Epson PX V600" msgstr "EPSON PX-V600" -#: src/main/xmli18n-tmp.h:502 +#: src/main/xmli18n-tmp.h:549 msgid "Epson PX V630" msgstr "" -#: src/main/xmli18n-tmp.h:503 -#, fuzzy +#: src/main/xmli18n-tmp.h:550 msgid "Epson PX V780" -msgstr "EPSON PM-780C" +msgstr "" -#: src/main/xmli18n-tmp.h:504 -#, fuzzy +#: src/main/xmli18n-tmp.h:551 msgid "Epson PX 5500" -msgstr "EPSON PX-V500" +msgstr "" -#: src/main/xmli18n-tmp.h:505 +#: src/main/xmli18n-tmp.h:552 #, fuzzy msgid "Epson PX 7000" msgstr "EPSON PX-7000" -#: src/main/xmli18n-tmp.h:506 +#: src/main/xmli18n-tmp.h:553 #, fuzzy msgid "Epson PX 9000" msgstr "EPSON PX-9000" -#: src/main/xmli18n-tmp.h:507 +#: src/main/xmli18n-tmp.h:554 msgid "Apollo P-2100" msgstr "" -#: src/main/xmli18n-tmp.h:508 +#: src/main/xmli18n-tmp.h:555 msgid "Apollo P-2150" msgstr "" -#: src/main/xmli18n-tmp.h:509 +#: src/main/xmli18n-tmp.h:556 msgid "Apollo P-2200" msgstr "" -#: src/main/xmli18n-tmp.h:510 +#: src/main/xmli18n-tmp.h:557 msgid "Apollo P-2250" msgstr "" -#: src/main/xmli18n-tmp.h:511 +#: src/main/xmli18n-tmp.h:558 msgid "Apollo P-2500" msgstr "" -#: src/main/xmli18n-tmp.h:512 +#: src/main/xmli18n-tmp.h:559 msgid "Apollo P-2550" msgstr "" -#: src/main/xmli18n-tmp.h:513 +#: src/main/xmli18n-tmp.h:560 msgid "Apollo P-2600" msgstr "" -#: src/main/xmli18n-tmp.h:514 +#: src/main/xmli18n-tmp.h:561 msgid "Apollo P-2650" msgstr "" -#: src/main/xmli18n-tmp.h:515 +#: src/main/xmli18n-tmp.h:562 msgid "Apple Color StyleWriter 4100" msgstr "Apple Color StyleWriter 4100" -#: src/main/xmli18n-tmp.h:516 +#: src/main/xmli18n-tmp.h:563 msgid "Apple Color StyleWriter 4500" msgstr "Apple Color StyleWriter 4500" -#: src/main/xmli18n-tmp.h:517 +#: src/main/xmli18n-tmp.h:564 msgid "Apple Color StyleWriter 6500" msgstr "Apple Color StyleWriter 6500" -#: src/main/xmli18n-tmp.h:518 +#: src/main/xmli18n-tmp.h:565 msgid "Apple LaserWriter Select 360" msgstr "" -#: src/main/xmli18n-tmp.h:519 +#: src/main/xmli18n-tmp.h:566 msgid "Brother DCP-1200" msgstr "" -#: src/main/xmli18n-tmp.h:520 +#: src/main/xmli18n-tmp.h:567 msgid "Brother HL-4Ve" msgstr "" -#: src/main/xmli18n-tmp.h:521 +#: src/main/xmli18n-tmp.h:568 msgid "Brother HL-10V" msgstr "" -#: src/main/xmli18n-tmp.h:522 +#: src/main/xmli18n-tmp.h:569 msgid "Brother HL-10h" msgstr "" -#: src/main/xmli18n-tmp.h:523 +#: src/main/xmli18n-tmp.h:570 msgid "Brother HL-630" msgstr "" -#: src/main/xmli18n-tmp.h:524 +#: src/main/xmli18n-tmp.h:571 msgid "Brother HL-660" msgstr "" -#: src/main/xmli18n-tmp.h:525 +#: src/main/xmli18n-tmp.h:572 msgid "Brother HL-760" msgstr "" -#: src/main/xmli18n-tmp.h:526 +#: src/main/xmli18n-tmp.h:573 msgid "Brother HL-960" msgstr "" -#: src/main/xmli18n-tmp.h:527 +#: src/main/xmli18n-tmp.h:574 msgid "Brother HL-1040" msgstr "" -#: src/main/xmli18n-tmp.h:528 +#: src/main/xmli18n-tmp.h:575 msgid "Brother HL-1050" msgstr "" -#: src/main/xmli18n-tmp.h:529 +#: src/main/xmli18n-tmp.h:576 msgid "Brother HL-1060" msgstr "" -#: src/main/xmli18n-tmp.h:530 +#: src/main/xmli18n-tmp.h:577 msgid "Brother HL-1070" msgstr "" -#: src/main/xmli18n-tmp.h:531 +#: src/main/xmli18n-tmp.h:578 msgid "Brother HL-1240" msgstr "" -#: src/main/xmli18n-tmp.h:532 +#: src/main/xmli18n-tmp.h:579 msgid "Brother HL-1250" msgstr "" -#: src/main/xmli18n-tmp.h:533 +#: src/main/xmli18n-tmp.h:580 msgid "Brother HL-1260" msgstr "" -#: src/main/xmli18n-tmp.h:534 +#: src/main/xmli18n-tmp.h:581 msgid "Brother HL-1270N" msgstr "" -#: src/main/xmli18n-tmp.h:535 +#: src/main/xmli18n-tmp.h:582 msgid "Brother HL-1440" msgstr "" -#: src/main/xmli18n-tmp.h:536 +#: src/main/xmli18n-tmp.h:583 msgid "Brother HL-1660e" msgstr "" -#: src/main/xmli18n-tmp.h:537 +#: src/main/xmli18n-tmp.h:584 msgid "Brother HL-2060" msgstr "" -#: src/main/xmli18n-tmp.h:538 +#: src/main/xmli18n-tmp.h:585 msgid "Brother MFC-6550MC" msgstr "" -#: src/main/xmli18n-tmp.h:539 +#: src/main/xmli18n-tmp.h:586 msgid "Brother MFC-8300" msgstr "" -#: src/main/xmli18n-tmp.h:540 +#: src/main/xmli18n-tmp.h:587 msgid "Brother MFC-9500" msgstr "" -#: src/main/xmli18n-tmp.h:541 +#: src/main/xmli18n-tmp.h:588 msgid "Brother MFC-9600" msgstr "" -#: src/main/xmli18n-tmp.h:542 +#: src/main/xmli18n-tmp.h:589 #, fuzzy msgid "Canon GP 335" -msgstr "Canon BJC 85" +msgstr "Canon BJC 30" -#: src/main/xmli18n-tmp.h:543 +#: src/main/xmli18n-tmp.h:590 #, fuzzy msgid "Canon LBP-4sx" msgstr "Canon BJC 240" -#: src/main/xmli18n-tmp.h:544 +#: src/main/xmli18n-tmp.h:591 #, fuzzy msgid "Canon LBP-430" msgstr "Canon BJC 4300" -#: src/main/xmli18n-tmp.h:545 +#: src/main/xmli18n-tmp.h:592 #, fuzzy msgid "Canon LBP-1000" msgstr "Canon CP100" -#: src/main/xmli18n-tmp.h:546 +#: src/main/xmli18n-tmp.h:593 #, fuzzy msgid "Canon LBP-1260" -msgstr "Canon CP220" +msgstr "Canon CP100" -#: src/main/xmli18n-tmp.h:547 +#: src/main/xmli18n-tmp.h:594 #, fuzzy msgid "Canon LBP-1760" msgstr "Canon CP100" -#: src/main/xmli18n-tmp.h:548 +#: src/main/xmli18n-tmp.h:595 msgid "Canon imageRunner 330s" msgstr "" -#: src/main/xmli18n-tmp.h:549 +#: src/main/xmli18n-tmp.h:596 msgid "Citizen ProJet II" msgstr "" -#: src/main/xmli18n-tmp.h:550 +#: src/main/xmli18n-tmp.h:597 msgid "DEC 1800" msgstr "" -#: src/main/xmli18n-tmp.h:551 +#: src/main/xmli18n-tmp.h:598 msgid "DEC LN17" msgstr "" -#: src/main/xmli18n-tmp.h:552 +#: src/main/xmli18n-tmp.h:599 msgid "Epson ActionLaser 1100" msgstr "" -#: src/main/xmli18n-tmp.h:553 +#: src/main/xmli18n-tmp.h:600 msgid "Epson ActionLaser II" msgstr "" -#: src/main/xmli18n-tmp.h:554 +#: src/main/xmli18n-tmp.h:601 msgid "Epson AcuLaser C2000" msgstr "" -#: src/main/xmli18n-tmp.h:555 +#: src/main/xmli18n-tmp.h:602 msgid "Epson AcuLaser C2000PS" msgstr "" -#: src/main/xmli18n-tmp.h:556 +#: src/main/xmli18n-tmp.h:603 msgid "Epson AcuLaser C8500" msgstr "" -#: src/main/xmli18n-tmp.h:557 +#: src/main/xmli18n-tmp.h:604 msgid "Epson AcuLaser C8500PS" msgstr "" -#: src/main/xmli18n-tmp.h:558 +#: src/main/xmli18n-tmp.h:605 msgid "Epson AcuLaser C8600" msgstr "" -#: src/main/xmli18n-tmp.h:559 +#: src/main/xmli18n-tmp.h:606 msgid "Epson AcuLaser C8600PS" msgstr "" -#: src/main/xmli18n-tmp.h:560 +#: src/main/xmli18n-tmp.h:607 msgid "Epson EPL-5200" msgstr "" -#: src/main/xmli18n-tmp.h:561 +#: src/main/xmli18n-tmp.h:608 msgid "Epson EPL-5200+" msgstr "" -#: src/main/xmli18n-tmp.h:562 +#: src/main/xmli18n-tmp.h:609 msgid "Epson EPL-5700" msgstr "" -#: src/main/xmli18n-tmp.h:563 +#: src/main/xmli18n-tmp.h:610 msgid "Epson EPL-5700PS" msgstr "" -#: src/main/xmli18n-tmp.h:564 +#: src/main/xmli18n-tmp.h:611 msgid "Epson EPL-5800" msgstr "" -#: src/main/xmli18n-tmp.h:565 +#: src/main/xmli18n-tmp.h:612 msgid "Epson EPL-5800PS" msgstr "" -#: src/main/xmli18n-tmp.h:566 +#: src/main/xmli18n-tmp.h:613 msgid "Epson EPL-5900" msgstr "" -#: src/main/xmli18n-tmp.h:567 +#: src/main/xmli18n-tmp.h:614 msgid "Epson EPL-5900PS" msgstr "" -#: src/main/xmli18n-tmp.h:568 +#: src/main/xmli18n-tmp.h:615 msgid "Epson EPL-6100" msgstr "" -#: src/main/xmli18n-tmp.h:569 +#: src/main/xmli18n-tmp.h:616 msgid "Epson EPL-6100PS" msgstr "" -#: src/main/xmli18n-tmp.h:570 +#: src/main/xmli18n-tmp.h:617 msgid "Epson EPL-7100" msgstr "" -#: src/main/xmli18n-tmp.h:571 +#: src/main/xmli18n-tmp.h:618 msgid "Fujitsu PrintPartner 10V" msgstr "" -#: src/main/xmli18n-tmp.h:572 +#: src/main/xmli18n-tmp.h:619 msgid "Fujitsu PrintPartner 16DV" msgstr "" -#: src/main/xmli18n-tmp.h:573 +#: src/main/xmli18n-tmp.h:620 msgid "Fujitsu PrintPartner 20W" msgstr "" -#: src/main/xmli18n-tmp.h:574 +#: src/main/xmli18n-tmp.h:621 msgid "Fujitsu PrintPartner 8000" msgstr "" -#: src/main/xmli18n-tmp.h:575 +#: src/main/xmli18n-tmp.h:622 #, fuzzy msgid "Generic PCL 4 Printer" msgstr "定義新的å°è¡¨æ©Ÿ" -#: src/main/xmli18n-tmp.h:576 +#: src/main/xmli18n-tmp.h:623 +#, fuzzy +msgid "Generic PCL 4 LF Printer" +msgstr "定義新的å°è¡¨æ©Ÿ" + +#: src/main/xmli18n-tmp.h:624 #, fuzzy msgid "Generic PCL 5 Printer" msgstr "定義新的å°è¡¨æ©Ÿ" -#: src/main/xmli18n-tmp.h:577 +#: src/main/xmli18n-tmp.h:625 +#, fuzzy +msgid "Generic PCL 5 LF Printer" +msgstr "定義新的å°è¡¨æ©Ÿ" + +#: src/main/xmli18n-tmp.h:626 #, fuzzy msgid "Generic PCL 5c Printer" msgstr "定義新的å°è¡¨æ©Ÿ" -#: src/main/xmli18n-tmp.h:578 +#: src/main/xmli18n-tmp.h:627 +#, fuzzy +msgid "Generic PCL 5c LF Printer" +msgstr "定義新的å°è¡¨æ©Ÿ" + +#: src/main/xmli18n-tmp.h:628 #, fuzzy msgid "Generic PCL 5e Printer" msgstr "定義新的å°è¡¨æ©Ÿ" -#: src/main/xmli18n-tmp.h:579 +#: src/main/xmli18n-tmp.h:629 +#, fuzzy +msgid "Generic PCL 5e LF Printer" +msgstr "定義新的å°è¡¨æ©Ÿ" + +#: src/main/xmli18n-tmp.h:630 msgid "Generic PCL 6/PCL XL Printer" msgstr "" -#: src/main/xmli18n-tmp.h:580 +#: src/main/xmli18n-tmp.h:631 +#, fuzzy +msgid "Generic PCL 6/PCL XL LF Printer" +msgstr "定義新的å°è¡¨æ©Ÿ" + +#: src/main/xmli18n-tmp.h:632 #, fuzzy msgid "HP Business Inkjet 2200" msgstr "HP DeskJet 1200C" -#: src/main/xmli18n-tmp.h:581 +#: src/main/xmli18n-tmp.h:633 #, fuzzy msgid "HP Business Inkjet 2230" msgstr "HP DesignJet 230" -#: src/main/xmli18n-tmp.h:582 +#: src/main/xmli18n-tmp.h:634 #, fuzzy msgid "HP Business Inkjet 2250" msgstr "HP DeskJet 1220C" -#: src/main/xmli18n-tmp.h:583 +#: src/main/xmli18n-tmp.h:635 msgid "HP Business Inkjet 2250TN" msgstr "" -#: src/main/xmli18n-tmp.h:584 +#: src/main/xmli18n-tmp.h:636 #, fuzzy msgid "HP Business Inkjet 2280" msgstr "HP DeskJet 1220C" -#: src/main/xmli18n-tmp.h:585 +#: src/main/xmli18n-tmp.h:637 msgid "HP Color Inkjet Printer CP1160" msgstr "" -#: src/main/xmli18n-tmp.h:586 +#: src/main/xmli18n-tmp.h:638 msgid "HP Color Inkjet Printer CP1700" msgstr "" -#: src/main/xmli18n-tmp.h:587 +#: src/main/xmli18n-tmp.h:639 #, fuzzy msgid "HP Color LaserJet 2500" msgstr "HP LaserJet 5Si" -#: src/main/xmli18n-tmp.h:588 +#: src/main/xmli18n-tmp.h:640 #, fuzzy msgid "HP Color LaserJet 4500" -msgstr "HP LaserJet 4V" +msgstr "HP LaserJet 4L" -#: src/main/xmli18n-tmp.h:589 +#: src/main/xmli18n-tmp.h:641 #, fuzzy msgid "HP Color LaserJet 4550" -msgstr "HP LaserJet 4V" +msgstr "HP LaserJet 4L" -#: src/main/xmli18n-tmp.h:590 +#: src/main/xmli18n-tmp.h:642 #, fuzzy msgid "HP Color LaserJet 4600" -msgstr "HP LaserJet 4V" +msgstr "HP LaserJet 4L" -#: src/main/xmli18n-tmp.h:591 +#: src/main/xmli18n-tmp.h:643 #, fuzzy msgid "HP Color LaserJet 5" msgstr "HP LaserJet 5Si" -#: src/main/xmli18n-tmp.h:592 +#: src/main/xmli18n-tmp.h:644 #, fuzzy msgid "HP Color LaserJet 5000" msgstr "HP LaserJet 5Si" -#: src/main/xmli18n-tmp.h:593 +#: src/main/xmli18n-tmp.h:645 #, fuzzy msgid "HP Color LaserJet 5500" msgstr "HP LaserJet 5Si" -#: src/main/xmli18n-tmp.h:594 +#: src/main/xmli18n-tmp.h:646 #, fuzzy msgid "HP Color LaserJet 8550GN" msgstr "HP LaserJet 5Si" -#: src/main/xmli18n-tmp.h:595 +#: src/main/xmli18n-tmp.h:647 msgid "HP DesignJet 230" msgstr "HP DesignJet 230" -#: src/main/xmli18n-tmp.h:596 +#: src/main/xmli18n-tmp.h:648 msgid "HP DesignJet 250C" msgstr "HP DesignJet 250C" -#: src/main/xmli18n-tmp.h:597 +#: src/main/xmli18n-tmp.h:649 msgid "HP DesignJet 430" msgstr "HP DesignJet 430" -#: src/main/xmli18n-tmp.h:598 +#: src/main/xmli18n-tmp.h:650 msgid "HP DesignJet 450C" msgstr "HP DesignJet 450C" -#: src/main/xmli18n-tmp.h:599 +#: src/main/xmli18n-tmp.h:651 msgid "HP DesignJet 455CA" msgstr "HP DesignJet 455CA" -#: src/main/xmli18n-tmp.h:600 +#: src/main/xmli18n-tmp.h:652 msgid "HP DesignJet 488CA" msgstr "HP DesignJet 488CA" -#: src/main/xmli18n-tmp.h:601 +#: src/main/xmli18n-tmp.h:653 msgid "HP DesignJet 700" msgstr "HP DesignJet 700" -#: src/main/xmli18n-tmp.h:602 +#: src/main/xmli18n-tmp.h:654 #, fuzzy msgid "HP DesignJet 750C Plus" msgstr "HP DesignJet 750C" -#: src/main/xmli18n-tmp.h:603 +#: src/main/xmli18n-tmp.h:655 msgid "HP DesignJet 750C" msgstr "HP DesignJet 750C" -#: src/main/xmli18n-tmp.h:604 +#: src/main/xmli18n-tmp.h:656 #, fuzzy msgid "HP DesignJet 2500CP" msgstr "HP DesignJet 2500C" -#: src/main/xmli18n-tmp.h:605 +#: src/main/xmli18n-tmp.h:657 #, fuzzy msgid "HP DesignJet 3500CP" msgstr "HP DesignJet 3500C" -#: src/main/xmli18n-tmp.h:606 +#: src/main/xmli18n-tmp.h:658 #, fuzzy msgid "HP DesignJet ColorPro CAD" msgstr "HP DesignJet 455CA" -#: src/main/xmli18n-tmp.h:607 +#: src/main/xmli18n-tmp.h:659 msgid "HP DeskJet 400" msgstr "HP DeskJet 400" -#: src/main/xmli18n-tmp.h:608 +#: src/main/xmli18n-tmp.h:660 #, fuzzy msgid "HP DeskJet 420C" msgstr "HP DeskJet 540C" -#: src/main/xmli18n-tmp.h:609 +#: src/main/xmli18n-tmp.h:661 #, fuzzy msgid "HP DeskJet 450" msgstr "HP DeskJet 340" -#: src/main/xmli18n-tmp.h:610 +#: src/main/xmli18n-tmp.h:662 msgid "HP DeskJet 500" msgstr "HP DeskJet 500" -#: src/main/xmli18n-tmp.h:611 +#: src/main/xmli18n-tmp.h:663 msgid "HP DeskJet 500C" msgstr "HP DeskJet 500C" -#: src/main/xmli18n-tmp.h:612 +#: src/main/xmli18n-tmp.h:664 #, fuzzy msgid "HP DeskJet 505J Plus" -msgstr "HP DeskJet 520" +msgstr "HP DeskJet 500" -#: src/main/xmli18n-tmp.h:613 +#: src/main/xmli18n-tmp.h:665 #, fuzzy msgid "HP DeskJet 510" msgstr "HP DeskJet 500" -#: src/main/xmli18n-tmp.h:614 +#: src/main/xmli18n-tmp.h:666 msgid "HP DeskJet 520" msgstr "HP DeskJet 520" -#: src/main/xmli18n-tmp.h:615 +#: src/main/xmli18n-tmp.h:667 msgid "HP DeskJet 540C" msgstr "HP DeskJet 540C" -#: src/main/xmli18n-tmp.h:616 +#: src/main/xmli18n-tmp.h:668 msgid "HP DeskJet 550C" msgstr "HP DeskJet 550C" -#: src/main/xmli18n-tmp.h:617 +#: src/main/xmli18n-tmp.h:669 #, fuzzy msgid "HP DeskJet 5550" msgstr "HP DeskJet 550C" -#: src/main/xmli18n-tmp.h:618 +#: src/main/xmli18n-tmp.h:670 #, fuzzy msgid "HP DeskJet 5551" msgstr "HP DeskJet 550C" -#: src/main/xmli18n-tmp.h:619 +#: src/main/xmli18n-tmp.h:671 msgid "HP DeskJet 560C" msgstr "HP DeskJet 560C" -#: src/main/xmli18n-tmp.h:620 +#: src/main/xmli18n-tmp.h:672 #, fuzzy msgid "HP DeskJet 600" msgstr "HP DeskJet 1600C" -#: src/main/xmli18n-tmp.h:621 +#: src/main/xmli18n-tmp.h:673 #, fuzzy msgid "HP DeskJet 600C" msgstr "HP DeskJet 1600C" -#: src/main/xmli18n-tmp.h:622 +#: src/main/xmli18n-tmp.h:674 #, fuzzy msgid "HP DeskJet 610C" msgstr "HP DeskJet 560C" -#: src/main/xmli18n-tmp.h:623 +#: src/main/xmli18n-tmp.h:675 #, fuzzy msgid "HP DeskJet 610CL" -msgstr "HP DeskJet 810C" +msgstr "HP DeskJet 560C" -#: src/main/xmli18n-tmp.h:624 +#: src/main/xmli18n-tmp.h:676 #, fuzzy msgid "HP DeskJet 6122" msgstr "HP DeskJet 1220C" -#: src/main/xmli18n-tmp.h:625 +#: src/main/xmli18n-tmp.h:677 #, fuzzy msgid "HP DeskJet 6127" msgstr "HP DeskJet 812C" -#: src/main/xmli18n-tmp.h:626 +#: src/main/xmli18n-tmp.h:678 #, fuzzy msgid "HP DeskJet 612C" msgstr "HP DeskJet 812C" -#: src/main/xmli18n-tmp.h:627 +#: src/main/xmli18n-tmp.h:679 #, fuzzy msgid "HP DeskJet 640C" msgstr "HP DeskJet 540C" -#: src/main/xmli18n-tmp.h:628 +#: src/main/xmli18n-tmp.h:680 #, fuzzy msgid "HP DeskJet 648C" msgstr "HP DeskJet 540C" -#: src/main/xmli18n-tmp.h:629 +#: src/main/xmli18n-tmp.h:681 #, fuzzy msgid "HP DeskJet 660C" msgstr "HP DeskJet 560C" -#: src/main/xmli18n-tmp.h:630 +#: src/main/xmli18n-tmp.h:682 #, fuzzy msgid "HP DeskJet 670C" msgstr "HP DeskJet 560C" -#: src/main/xmli18n-tmp.h:631 +#: src/main/xmli18n-tmp.h:683 #, fuzzy msgid "HP DeskJet 670TV" msgstr "HP DeskJet 560C" -#: src/main/xmli18n-tmp.h:632 +#: src/main/xmli18n-tmp.h:684 #, fuzzy msgid "HP DeskJet 672C" msgstr "HP DeskJet 560C" -#: src/main/xmli18n-tmp.h:633 +#: src/main/xmli18n-tmp.h:685 #, fuzzy msgid "HP DeskJet 680C" msgstr "HP DeskJet 560C" -#: src/main/xmli18n-tmp.h:634 +#: src/main/xmli18n-tmp.h:686 #, fuzzy msgid "HP DeskJet 682C" msgstr "HP DeskJet 812C" -#: src/main/xmli18n-tmp.h:635 +#: src/main/xmli18n-tmp.h:687 #, fuzzy msgid "HP DeskJet 690C" msgstr "HP DeskJet 560C" -#: src/main/xmli18n-tmp.h:636 +#: src/main/xmli18n-tmp.h:688 #, fuzzy msgid "HP DeskJet 692C" msgstr "HP DeskJet 560C" -#: src/main/xmli18n-tmp.h:637 +#: src/main/xmli18n-tmp.h:689 #, fuzzy msgid "HP DeskJet 693C" msgstr "HP DeskJet 560C" -#: src/main/xmli18n-tmp.h:638 +#: src/main/xmli18n-tmp.h:690 #, fuzzy msgid "HP DeskJet 694C" msgstr "HP DeskJet 540C" -#: src/main/xmli18n-tmp.h:639 +#: src/main/xmli18n-tmp.h:691 #, fuzzy msgid "HP DeskJet 695C" msgstr "HP DeskJet 895C" -#: src/main/xmli18n-tmp.h:640 +#: src/main/xmli18n-tmp.h:692 #, fuzzy msgid "HP DeskJet 697C" msgstr "HP DeskJet 560C" -#: src/main/xmli18n-tmp.h:641 +#: src/main/xmli18n-tmp.h:693 msgid "HP DeskJet 810C" msgstr "HP DeskJet 810C" -#: src/main/xmli18n-tmp.h:642 +#: src/main/xmli18n-tmp.h:694 msgid "HP DeskJet 812C" msgstr "HP DeskJet 812C" -#: src/main/xmli18n-tmp.h:643 +#: src/main/xmli18n-tmp.h:695 #, fuzzy msgid "HP DeskJet 815C" msgstr "HP DeskJet 810C" -#: src/main/xmli18n-tmp.h:644 +#: src/main/xmli18n-tmp.h:696 #, fuzzy msgid "HP DeskJet 816C" msgstr "HP DeskJet 810C" -#: src/main/xmli18n-tmp.h:645 +#: src/main/xmli18n-tmp.h:697 #, fuzzy msgid "HP DeskJet 825C" msgstr "HP DeskJet 812C" -#: src/main/xmli18n-tmp.h:646 +#: src/main/xmli18n-tmp.h:698 #, fuzzy msgid "HP DeskJet 830C" msgstr "HP DeskJet 810C" -#: src/main/xmli18n-tmp.h:647 +#: src/main/xmli18n-tmp.h:699 #, fuzzy msgid "HP DeskJet 832C" msgstr "HP DeskJet 812C" -#: src/main/xmli18n-tmp.h:648 +#: src/main/xmli18n-tmp.h:700 msgid "HP DeskJet 840C" msgstr "HP DeskJet 840C" -#: src/main/xmli18n-tmp.h:649 +#: src/main/xmli18n-tmp.h:701 #, fuzzy msgid "HP DeskJet 841C" msgstr "HP DeskJet 810C" -#: src/main/xmli18n-tmp.h:650 +#: src/main/xmli18n-tmp.h:702 msgid "HP DeskJet 842C" msgstr "HP DeskJet 842C" -#: src/main/xmli18n-tmp.h:651 +#: src/main/xmli18n-tmp.h:703 #, fuzzy msgid "HP DeskJet 843C" msgstr "HP DeskJet 840C" -#: src/main/xmli18n-tmp.h:652 +#: src/main/xmli18n-tmp.h:704 msgid "HP DeskJet 845C" msgstr "HP DeskJet 845C" -#: src/main/xmli18n-tmp.h:653 +#: src/main/xmli18n-tmp.h:705 msgid "HP DeskJet 850C" msgstr "HP DeskJet 850C" -#: src/main/xmli18n-tmp.h:654 +#: src/main/xmli18n-tmp.h:706 msgid "HP DeskJet 855C" msgstr "HP DeskJet 855C" -#: src/main/xmli18n-tmp.h:655 +#: src/main/xmli18n-tmp.h:707 msgid "HP DeskJet 870C" msgstr "HP DeskJet 870C" -#: src/main/xmli18n-tmp.h:656 +#: src/main/xmli18n-tmp.h:708 #, fuzzy msgid "HP DeskJet 880C" msgstr "HP DeskJet 810C" -#: src/main/xmli18n-tmp.h:657 +#: src/main/xmli18n-tmp.h:709 #, fuzzy msgid "HP DeskJet 882C" msgstr "HP DeskJet 812C" -#: src/main/xmli18n-tmp.h:658 +#: src/main/xmli18n-tmp.h:710 msgid "HP DeskJet 890C" msgstr "HP DeskJet 890C" -#: src/main/xmli18n-tmp.h:659 +#: src/main/xmli18n-tmp.h:711 msgid "HP DeskJet 895C" msgstr "HP DeskJet 895C" -#: src/main/xmli18n-tmp.h:660 +#: src/main/xmli18n-tmp.h:712 #, fuzzy msgid "HP DeskJet 916C" msgstr "HP DeskJet 1600C" -#: src/main/xmli18n-tmp.h:661 +#: src/main/xmli18n-tmp.h:713 #, fuzzy msgid "HP DeskJet 920C" msgstr "HP DeskJet 890C" -#: src/main/xmli18n-tmp.h:662 +#: src/main/xmli18n-tmp.h:714 #, fuzzy msgid "HP DeskJet 9300" msgstr "HP DeskJet 340" -#: src/main/xmli18n-tmp.h:663 +#: src/main/xmli18n-tmp.h:715 #, fuzzy msgid "HP DeskJet 930C" msgstr "HP DeskJet 890C" -#: src/main/xmli18n-tmp.h:664 +#: src/main/xmli18n-tmp.h:716 #, fuzzy msgid "HP DeskJet 932C" msgstr "HP DeskJet 812C" -#: src/main/xmli18n-tmp.h:665 +#: src/main/xmli18n-tmp.h:717 #, fuzzy msgid "HP DeskJet 933C" msgstr "HP DeskJet 890C" -#: src/main/xmli18n-tmp.h:666 +#: src/main/xmli18n-tmp.h:718 #, fuzzy msgid "HP DeskJet 934C" msgstr "HP DeskJet 340" -#: src/main/xmli18n-tmp.h:667 +#: src/main/xmli18n-tmp.h:719 #, fuzzy msgid "HP DeskJet 935C" msgstr "HP DeskJet 895C" -#: src/main/xmli18n-tmp.h:668 +#: src/main/xmli18n-tmp.h:720 #, fuzzy msgid "HP DeskJet 940C" msgstr "HP DeskJet 540C" -#: src/main/xmli18n-tmp.h:669 +#: src/main/xmli18n-tmp.h:721 #, fuzzy msgid "HP DeskJet 948C" msgstr "HP DeskJet 540C" -#: src/main/xmli18n-tmp.h:670 +#: src/main/xmli18n-tmp.h:722 #, fuzzy msgid "HP DeskJet 950C" msgstr "HP DeskJet 500C" -#: src/main/xmli18n-tmp.h:671 +#: src/main/xmli18n-tmp.h:723 #, fuzzy msgid "HP DeskJet 952C" msgstr "HP DeskJet 895C" -#: src/main/xmli18n-tmp.h:672 +#: src/main/xmli18n-tmp.h:724 #, fuzzy msgid "HP DeskJet 955C" msgstr "HP DeskJet 550C" -#: src/main/xmli18n-tmp.h:673 +#: src/main/xmli18n-tmp.h:725 #, fuzzy msgid "HP DeskJet 957C" msgstr "HP DeskJet 895C" -#: src/main/xmli18n-tmp.h:674 +#: src/main/xmli18n-tmp.h:726 #, fuzzy msgid "HP DeskJet 959C" msgstr "HP DeskJet 895C" -#: src/main/xmli18n-tmp.h:675 +#: src/main/xmli18n-tmp.h:727 #, fuzzy msgid "HP DeskJet 960C" msgstr "HP DeskJet 560C" -#: src/main/xmli18n-tmp.h:676 +#: src/main/xmli18n-tmp.h:728 #, fuzzy msgid "HP DeskJet 970C" msgstr "HP DeskJet 870C" -#: src/main/xmli18n-tmp.h:677 +#: src/main/xmli18n-tmp.h:729 #, fuzzy msgid "HP DeskJet 975C" msgstr "HP DeskJet 895C" -#: src/main/xmli18n-tmp.h:678 +#: src/main/xmli18n-tmp.h:730 #, fuzzy msgid "HP DeskJet 980C" msgstr "HP DeskJet 810C" -#: src/main/xmli18n-tmp.h:679 +#: src/main/xmli18n-tmp.h:731 #, fuzzy msgid "HP DeskJet 990C" msgstr "HP DeskJet 890C" -#: src/main/xmli18n-tmp.h:680 +#: src/main/xmli18n-tmp.h:732 #, fuzzy msgid "HP DeskJet 995C" msgstr "HP DeskJet 895C" -#: src/main/xmli18n-tmp.h:681 +#: src/main/xmli18n-tmp.h:733 msgid "HP DeskJet 1100C" msgstr "HP DeskJet 1100C" -#: src/main/xmli18n-tmp.h:682 +#: src/main/xmli18n-tmp.h:734 msgid "HP DeskJet 1120C" msgstr "HP DeskJet 1120C" -#: src/main/xmli18n-tmp.h:683 +#: src/main/xmli18n-tmp.h:735 #, fuzzy msgid "HP DeskJet 1125C" msgstr "HP DeskJet 1120C" -#: src/main/xmli18n-tmp.h:684 +#: src/main/xmli18n-tmp.h:736 msgid "HP DeskJet 1200C" msgstr "HP DeskJet 1200C" -#: src/main/xmli18n-tmp.h:685 +#: src/main/xmli18n-tmp.h:737 msgid "HP DeskJet 1220C" msgstr "HP DeskJet 1220C" -#: src/main/xmli18n-tmp.h:686 +#: src/main/xmli18n-tmp.h:738 msgid "HP DeskJet 1600C" msgstr "HP DeskJet 1600C" -#: src/main/xmli18n-tmp.h:687 +#: src/main/xmli18n-tmp.h:739 #, fuzzy msgid "HP DeskJet 1600CM" msgstr "HP DeskJet 1600C" -#: src/main/xmli18n-tmp.h:688 +#: src/main/xmli18n-tmp.h:740 #, fuzzy msgid "HP DeskJet 2000" msgstr "HP DeskJet 1200C" -#: src/main/xmli18n-tmp.h:689 +#: src/main/xmli18n-tmp.h:741 #, fuzzy msgid "HP DeskJet 2500" msgstr "HP DeskJet 500" -#: src/main/xmli18n-tmp.h:690 +#: src/main/xmli18n-tmp.h:742 #, fuzzy msgid "HP DeskJet 2500CM" msgstr "HP DeskJet 500C" -#: src/main/xmli18n-tmp.h:691 +#: src/main/xmli18n-tmp.h:743 #, fuzzy msgid "HP DeskJet 340C" msgstr "HP DeskJet 340" -#: src/main/xmli18n-tmp.h:692 +#: src/main/xmli18n-tmp.h:744 #, fuzzy msgid "HP DeskJet 3810" msgstr "HP DeskJet 810C" -#: src/main/xmli18n-tmp.h:693 +#: src/main/xmli18n-tmp.h:745 #, fuzzy msgid "HP DeskJet 3816" msgstr "HP DeskJet 810C" -#: src/main/xmli18n-tmp.h:694 +#: src/main/xmli18n-tmp.h:746 #, fuzzy msgid "HP DeskJet 3820" msgstr "HP DeskJet 340" -#: src/main/xmli18n-tmp.h:695 +#: src/main/xmli18n-tmp.h:747 #, fuzzy msgid "HP DeskJet 3822" msgstr "HP DeskJet 812C" -#: src/main/xmli18n-tmp.h:696 +#: src/main/xmli18n-tmp.h:748 #, fuzzy msgid "HP LaserJet 2" -msgstr "HP LaserJet 4V" +msgstr "HP LaserJet 4L" -#: src/main/xmli18n-tmp.h:697 +#: src/main/xmli18n-tmp.h:749 #, fuzzy msgid "HP LaserJet 2D" -msgstr "HP LaserJet 4V" +msgstr "HP LaserJet 4L" -#: src/main/xmli18n-tmp.h:698 +#: src/main/xmli18n-tmp.h:750 #, fuzzy msgid "HP LaserJet 2P Plus" msgstr "HP LaserJet IIP 系列" -#: src/main/xmli18n-tmp.h:699 +#: src/main/xmli18n-tmp.h:751 #, fuzzy msgid "HP LaserJet 2P" -msgstr "HP LaserJet 4V" +msgstr "HP LaserJet 4L" -#: src/main/xmli18n-tmp.h:700 +#: src/main/xmli18n-tmp.h:752 #, fuzzy msgid "HP LaserJet 3" -msgstr "HP LaserJet 4V" +msgstr "HP LaserJet 4L" -#: src/main/xmli18n-tmp.h:701 +#: src/main/xmli18n-tmp.h:753 #, fuzzy msgid "HP LaserJet 3D" -msgstr "HP LaserJet 4V" +msgstr "HP LaserJet 4L" -#: src/main/xmli18n-tmp.h:702 +#: src/main/xmli18n-tmp.h:754 #, fuzzy msgid "HP LaserJet 3P w/ PCL5" msgstr "HP LaserJet 4L" -#: src/main/xmli18n-tmp.h:703 +#: src/main/xmli18n-tmp.h:755 #, fuzzy msgid "HP LaserJet 3P w/PS" -msgstr "HP LaserJet 5Si" +msgstr "HP LaserJet 4Si" -#: src/main/xmli18n-tmp.h:704 +#: src/main/xmli18n-tmp.h:756 #, fuzzy msgid "HP LaserJet 4 Plus" msgstr "HP LaserJet 4L" -#: src/main/xmli18n-tmp.h:705 +#: src/main/xmli18n-tmp.h:757 #, fuzzy msgid "HP LaserJet 4" -msgstr "HP LaserJet 4V" +msgstr "HP LaserJet 4L" -#: src/main/xmli18n-tmp.h:706 +#: src/main/xmli18n-tmp.h:758 msgid "HP LaserJet 4L" msgstr "HP LaserJet 4L" -#: src/main/xmli18n-tmp.h:707 +#: src/main/xmli18n-tmp.h:759 #, fuzzy msgid "HP LaserJet 4M" msgstr "HP LaserJet 4L" -#: src/main/xmli18n-tmp.h:708 +#: src/main/xmli18n-tmp.h:760 #, fuzzy msgid "HP LaserJet 4ML" msgstr "HP LaserJet 4L" -#: src/main/xmli18n-tmp.h:709 +#: src/main/xmli18n-tmp.h:761 #, fuzzy msgid "HP LaserJet 4P" msgstr "HP LaserJet 4L" -#: src/main/xmli18n-tmp.h:710 +#: src/main/xmli18n-tmp.h:762 msgid "HP LaserJet 4Si" msgstr "HP LaserJet 4Si" -#: src/main/xmli18n-tmp.h:711 +#: src/main/xmli18n-tmp.h:763 msgid "HP LaserJet 4V" msgstr "HP LaserJet 4V" -#: src/main/xmli18n-tmp.h:712 +#: src/main/xmli18n-tmp.h:764 #, fuzzy msgid "HP LaserJet 5" msgstr "HP LaserJet 5Si" -#: src/main/xmli18n-tmp.h:713 +#: src/main/xmli18n-tmp.h:765 #, fuzzy msgid "HP LaserJet 5L" msgstr "HP LaserJet 4L" -#: src/main/xmli18n-tmp.h:714 +#: src/main/xmli18n-tmp.h:766 #, fuzzy msgid "HP LaserJet 5M" msgstr "HP LaserJet 5Si" -#: src/main/xmli18n-tmp.h:715 +#: src/main/xmli18n-tmp.h:767 #, fuzzy msgid "HP LaserJet 5MP" msgstr "HP LaserJet 5Si" -#: src/main/xmli18n-tmp.h:716 +#: src/main/xmli18n-tmp.h:768 #, fuzzy msgid "HP LaserJet 5P" msgstr "HP LaserJet 5Si" -#: src/main/xmli18n-tmp.h:717 +#: src/main/xmli18n-tmp.h:769 msgid "HP LaserJet 5Si" msgstr "HP LaserJet 5Si" -#: src/main/xmli18n-tmp.h:718 +#: src/main/xmli18n-tmp.h:770 #, fuzzy msgid "HP LaserJet 6" -msgstr "HP LaserJet 4V" +msgstr "HP LaserJet 4L" -#: src/main/xmli18n-tmp.h:719 +#: src/main/xmli18n-tmp.h:771 #, fuzzy msgid "HP LaserJet 6L" msgstr "HP LaserJet 4L" -#: src/main/xmli18n-tmp.h:720 +#: src/main/xmli18n-tmp.h:772 #, fuzzy msgid "HP LaserJet 6MP" -msgstr "HP LaserJet 4V" +msgstr "HP LaserJet 4L" -#: src/main/xmli18n-tmp.h:721 +#: src/main/xmli18n-tmp.h:773 #, fuzzy msgid "HP LaserJet 6P" -msgstr "HP LaserJet 4V" +msgstr "HP LaserJet 4L" -#: src/main/xmli18n-tmp.h:722 +#: src/main/xmli18n-tmp.h:774 #, fuzzy msgid "HP LaserJet 1010" msgstr "HP LaserJet 4L" -#: src/main/xmli18n-tmp.h:723 +#: src/main/xmli18n-tmp.h:775 #, fuzzy msgid "HP LaserJet 1012" msgstr "HP LaserJet 4L" -#: src/main/xmli18n-tmp.h:724 +#: src/main/xmli18n-tmp.h:776 #, fuzzy msgid "HP LaserJet 1015" msgstr "HP LaserJet 5Si" -#: src/main/xmli18n-tmp.h:725 +#: src/main/xmli18n-tmp.h:777 #, fuzzy msgid "HP LaserJet 1022" msgstr "HP LaserJet 4L" -#: src/main/xmli18n-tmp.h:726 +#: src/main/xmli18n-tmp.h:778 #, fuzzy msgid "HP LaserJet 1100" msgstr "HP LaserJet 4L" -#: src/main/xmli18n-tmp.h:727 +#: src/main/xmli18n-tmp.h:779 #, fuzzy msgid "HP LaserJet 1100A" -msgstr "HP LaserJet 4V" +msgstr "HP LaserJet 4L" -#: src/main/xmli18n-tmp.h:728 +#: src/main/xmli18n-tmp.h:780 #, fuzzy msgid "HP LaserJet 1150" msgstr "HP LaserJet 5Si" -#: src/main/xmli18n-tmp.h:729 +#: src/main/xmli18n-tmp.h:781 #, fuzzy msgid "HP LaserJet 1200" msgstr "HP LaserJet 4L" -#: src/main/xmli18n-tmp.h:730 +#: src/main/xmli18n-tmp.h:782 #, fuzzy msgid "HP LaserJet 1220" msgstr "HP LaserJet 4L" -#: src/main/xmli18n-tmp.h:731 +#: src/main/xmli18n-tmp.h:783 #, fuzzy msgid "HP LaserJet 1300" msgstr "HP LaserJet 4L" -#: src/main/xmli18n-tmp.h:732 +#: src/main/xmli18n-tmp.h:784 #, fuzzy msgid "HP LaserJet 2100" msgstr "HP LaserJet 4L" -#: src/main/xmli18n-tmp.h:733 +#: src/main/xmli18n-tmp.h:785 #, fuzzy msgid "HP LaserJet 2100M" -msgstr "HP LaserJet 4V" +msgstr "HP LaserJet 4L" -#: src/main/xmli18n-tmp.h:734 +#: src/main/xmli18n-tmp.h:786 #, fuzzy msgid "HP LaserJet 2200" msgstr "HP LaserJet 4L" -#: src/main/xmli18n-tmp.h:735 +#: src/main/xmli18n-tmp.h:787 #, fuzzy msgid "HP LaserJet 2300" msgstr "HP LaserJet 4L" -#: src/main/xmli18n-tmp.h:736 +#: src/main/xmli18n-tmp.h:788 #, fuzzy msgid "HP LaserJet 3200" msgstr "HP LaserJet 4L" -#: src/main/xmli18n-tmp.h:737 +#: src/main/xmli18n-tmp.h:789 #, fuzzy msgid "HP LaserJet 3200m" -msgstr "HP LaserJet 4V" +msgstr "HP LaserJet 4L" -#: src/main/xmli18n-tmp.h:738 +#: src/main/xmli18n-tmp.h:790 #, fuzzy msgid "HP LaserJet 3200se" msgstr "HP LaserJet 4L" -#: src/main/xmli18n-tmp.h:739 +#: src/main/xmli18n-tmp.h:791 #, fuzzy msgid "HP LaserJet 3300 MFP" msgstr "HP LaserJet 4L" -#: src/main/xmli18n-tmp.h:740 +#: src/main/xmli18n-tmp.h:792 #, fuzzy msgid "HP LaserJet 3310 MFP" msgstr "HP LaserJet 4L" -#: src/main/xmli18n-tmp.h:741 +#: src/main/xmli18n-tmp.h:793 #, fuzzy msgid "HP LaserJet 3320 MFP" msgstr "HP LaserJet 4L" -#: src/main/xmli18n-tmp.h:742 +#: src/main/xmli18n-tmp.h:794 #, fuzzy msgid "HP LaserJet 3320N MFP" msgstr "HP LaserJet 4L" -#: src/main/xmli18n-tmp.h:743 +#: src/main/xmli18n-tmp.h:795 #, fuzzy msgid "HP LaserJet 3330 MFP" msgstr "HP LaserJet 4L" -#: src/main/xmli18n-tmp.h:744 +#: src/main/xmli18n-tmp.h:796 #, fuzzy msgid "HP LaserJet 4000" msgstr "HP LaserJet 4L" -#: src/main/xmli18n-tmp.h:745 +#: src/main/xmli18n-tmp.h:797 #, fuzzy msgid "HP LaserJet 4050" msgstr "HP LaserJet 4L" -#: src/main/xmli18n-tmp.h:746 +#: src/main/xmli18n-tmp.h:798 #, fuzzy msgid "HP LaserJet 4100" msgstr "HP LaserJet 4L" -#: src/main/xmli18n-tmp.h:747 +#: src/main/xmli18n-tmp.h:799 #, fuzzy msgid "HP LaserJet 4200" msgstr "HP LaserJet 4L" -#: src/main/xmli18n-tmp.h:748 +#: src/main/xmli18n-tmp.h:800 #, fuzzy msgid "HP LaserJet 4300" msgstr "HP LaserJet 4L" -#: src/main/xmli18n-tmp.h:749 +#: src/main/xmli18n-tmp.h:801 #, fuzzy msgid "HP LaserJet 5000" msgstr "HP LaserJet 5Si" -#: src/main/xmli18n-tmp.h:750 +#: src/main/xmli18n-tmp.h:802 #, fuzzy msgid "HP LaserJet 5100" msgstr "HP LaserJet 5Si" -#: src/main/xmli18n-tmp.h:751 +#: src/main/xmli18n-tmp.h:803 #, fuzzy msgid "HP LaserJet 8000" msgstr "HP LaserJet 4L" -#: src/main/xmli18n-tmp.h:752 +#: src/main/xmli18n-tmp.h:804 #, fuzzy msgid "HP LaserJet 8100" msgstr "HP LaserJet 4L" -#: src/main/xmli18n-tmp.h:753 +#: src/main/xmli18n-tmp.h:805 #, fuzzy msgid "HP LaserJet 8150" msgstr "HP LaserJet 5Si" -#: src/main/xmli18n-tmp.h:754 +#: src/main/xmli18n-tmp.h:806 #, fuzzy msgid "HP LaserJet 9000" msgstr "HP LaserJet 4L" -#: src/main/xmli18n-tmp.h:755 +#: src/main/xmli18n-tmp.h:807 msgid "HP Mopier 240" msgstr "" -#: src/main/xmli18n-tmp.h:756 +#: src/main/xmli18n-tmp.h:808 msgid "HP Mopier 320" msgstr "" -#: src/main/xmli18n-tmp.h:757 +#: src/main/xmli18n-tmp.h:809 #, fuzzy msgid "HP OfficeJet 300" -msgstr "HP DeskJet 500" +msgstr "HP DeskJet 340" -#: src/main/xmli18n-tmp.h:758 +#: src/main/xmli18n-tmp.h:810 #, fuzzy msgid "HP OfficeJet 330" msgstr "HP DeskJet 340" -#: src/main/xmli18n-tmp.h:759 +#: src/main/xmli18n-tmp.h:811 #, fuzzy msgid "HP OfficeJet 350" -msgstr "HP DeskJet 520" +msgstr "HP DeskJet 340" -#: src/main/xmli18n-tmp.h:760 +#: src/main/xmli18n-tmp.h:812 #, fuzzy msgid "HP OfficeJet 500" msgstr "HP DeskJet 500" -#: src/main/xmli18n-tmp.h:761 +#: src/main/xmli18n-tmp.h:813 #, fuzzy msgid "HP OfficeJet 520" msgstr "HP DeskJet 520" -#: src/main/xmli18n-tmp.h:762 +#: src/main/xmli18n-tmp.h:814 #, fuzzy msgid "HP OfficeJet 570" -msgstr "HP DeskJet 520" +msgstr "HP DeskJet 500" -#: src/main/xmli18n-tmp.h:763 +#: src/main/xmli18n-tmp.h:815 #, fuzzy msgid "HP OfficeJet 580" -msgstr "HP DeskJet 520" +msgstr "HP DeskJet 500" -#: src/main/xmli18n-tmp.h:764 +#: src/main/xmli18n-tmp.h:816 #, fuzzy msgid "HP OfficeJet 590" -msgstr "HP DeskJet 520" +msgstr "HP DeskJet 500" -#: src/main/xmli18n-tmp.h:765 +#: src/main/xmli18n-tmp.h:817 #, fuzzy msgid "HP OfficeJet 600" msgstr "HP DeskJet 1600C" -#: src/main/xmli18n-tmp.h:766 +#: src/main/xmli18n-tmp.h:818 #, fuzzy msgid "HP OfficeJet 610" -msgstr "HP DeskJet 810C" +msgstr "HP DeskJet 560C" -#: src/main/xmli18n-tmp.h:767 +#: src/main/xmli18n-tmp.h:819 #, fuzzy msgid "HP OfficeJet 625" msgstr "HP DesignJet 250C" -#: src/main/xmli18n-tmp.h:768 +#: src/main/xmli18n-tmp.h:820 #, fuzzy msgid "HP OfficeJet 630" msgstr "HP DeskJet 340" -#: src/main/xmli18n-tmp.h:769 +#: src/main/xmli18n-tmp.h:821 #, fuzzy msgid "HP OfficeJet 635" -msgstr "HP DeskJet 520" +msgstr "HP DeskJet 340" -#: src/main/xmli18n-tmp.h:770 +#: src/main/xmli18n-tmp.h:822 #, fuzzy msgid "HP OfficeJet 700" msgstr "HP DesignJet 700" -#: src/main/xmli18n-tmp.h:771 +#: src/main/xmli18n-tmp.h:823 #, fuzzy msgid "HP OfficeJet 710" -msgstr "HP DeskJet 870C" +msgstr "HP DeskJet 810C" -#: src/main/xmli18n-tmp.h:772 +#: src/main/xmli18n-tmp.h:824 #, fuzzy msgid "HP OfficeJet 720" msgstr "HP DeskJet 520" -#: src/main/xmli18n-tmp.h:773 +#: src/main/xmli18n-tmp.h:825 #, fuzzy msgid "HP OfficeJet 725" msgstr "HP DesignJet 250C" -#: src/main/xmli18n-tmp.h:774 +#: src/main/xmli18n-tmp.h:826 #, fuzzy msgid "HP OfficeJet 5105" -msgstr "HP DeskJet 520" +msgstr "HP DeskJet 500" -#: src/main/xmli18n-tmp.h:775 +#: src/main/xmli18n-tmp.h:827 #, fuzzy msgid "HP OfficeJet 5110" -msgstr "HP DeskJet 1120C" +msgstr "HP DeskJet 1100C" -#: src/main/xmli18n-tmp.h:776 +#: src/main/xmli18n-tmp.h:828 #, fuzzy msgid "HP OfficeJet 5110xi" -msgstr "HP DeskJet 1120C" +msgstr "HP DeskJet 1100C" -#: src/main/xmli18n-tmp.h:777 +#: src/main/xmli18n-tmp.h:829 #, fuzzy msgid "HP OfficeJet 6105" msgstr "HP DeskJet 560C" -#: src/main/xmli18n-tmp.h:778 +#: src/main/xmli18n-tmp.h:830 #, fuzzy msgid "HP OfficeJet 6110" -msgstr "HP DeskJet 1120C" +msgstr "HP DeskJet 1100C" -#: src/main/xmli18n-tmp.h:779 +#: src/main/xmli18n-tmp.h:831 #, fuzzy msgid "HP OfficeJet 7110" -msgstr "HP DeskJet 1120C" +msgstr "HP DeskJet 1100C" -#: src/main/xmli18n-tmp.h:780 +#: src/main/xmli18n-tmp.h:832 #, fuzzy msgid "HP OfficeJet 7130" msgstr "HP DeskJet 340" -#: src/main/xmli18n-tmp.h:781 +#: src/main/xmli18n-tmp.h:833 #, fuzzy msgid "HP OfficeJet 7140" -msgstr "HP DeskJet 400" +msgstr "HP DeskJet 340" -#: src/main/xmli18n-tmp.h:782 +#: src/main/xmli18n-tmp.h:834 #, fuzzy msgid "HP OfficeJet D125" msgstr "HP DeskJet 812C" -#: src/main/xmli18n-tmp.h:783 +#: src/main/xmli18n-tmp.h:835 msgid "HP OfficeJet D135" msgstr "" -#: src/main/xmli18n-tmp.h:784 +#: src/main/xmli18n-tmp.h:836 #, fuzzy msgid "HP OfficeJet D145" msgstr "HP DeskJet 845C" -#: src/main/xmli18n-tmp.h:785 +#: src/main/xmli18n-tmp.h:837 #, fuzzy msgid "HP OfficeJet D155" msgstr "HP DeskJet 550C" -#: src/main/xmli18n-tmp.h:786 +#: src/main/xmli18n-tmp.h:838 #, fuzzy msgid "HP OfficeJet G55" -msgstr "HP DeskJet 855C" +msgstr "HP DeskJet 550C" -#: src/main/xmli18n-tmp.h:787 +#: src/main/xmli18n-tmp.h:839 #, fuzzy msgid "HP OfficeJet G85" -msgstr "HP DeskJet 895C" +msgstr "HP DeskJet 845C" -#: src/main/xmli18n-tmp.h:788 +#: src/main/xmli18n-tmp.h:840 #, fuzzy msgid "HP OfficeJet G95" msgstr "HP DeskJet 895C" -#: src/main/xmli18n-tmp.h:789 +#: src/main/xmli18n-tmp.h:841 #, fuzzy msgid "HP OfficeJet K60" msgstr "HP DeskJet 560C" -#: src/main/xmli18n-tmp.h:790 +#: src/main/xmli18n-tmp.h:842 #, fuzzy msgid "HP OfficeJet K60xi" msgstr "HP DeskJet 560C" -#: src/main/xmli18n-tmp.h:791 +#: src/main/xmli18n-tmp.h:843 #, fuzzy msgid "HP OfficeJet K80" -msgstr "HP DeskJet 890C" +msgstr "HP DeskJet 810C" -#: src/main/xmli18n-tmp.h:792 +#: src/main/xmli18n-tmp.h:844 #, fuzzy msgid "HP OfficeJet K80xi" msgstr "HP DeskJet 810C" -#: src/main/xmli18n-tmp.h:793 +#: src/main/xmli18n-tmp.h:845 #, fuzzy msgid "HP OfficeJet LX" msgstr "HP LaserJet 4L" -#: src/main/xmli18n-tmp.h:794 +#: src/main/xmli18n-tmp.h:846 #, fuzzy msgid "HP OfficeJet Pro 1150C" -msgstr "HP DeskJet 1120C" +msgstr "HP DeskJet 1100C" -#: src/main/xmli18n-tmp.h:795 +#: src/main/xmli18n-tmp.h:847 #, fuzzy msgid "HP OfficeJet Pro 1170C" -msgstr "HP DeskJet 1120C" +msgstr "HP DeskJet 1100C" -#: src/main/xmli18n-tmp.h:796 +#: src/main/xmli18n-tmp.h:848 msgid "HP OfficeJet Pro 1175C" msgstr "" -#: src/main/xmli18n-tmp.h:797 +#: src/main/xmli18n-tmp.h:849 #, fuzzy msgid "HP OfficeJet R40" -msgstr "HP DeskJet 400" +msgstr "HP DeskJet 340" -#: src/main/xmli18n-tmp.h:798 +#: src/main/xmli18n-tmp.h:850 #, fuzzy msgid "HP OfficeJet R45" msgstr "HP DeskJet 845C" -#: src/main/xmli18n-tmp.h:799 +#: src/main/xmli18n-tmp.h:851 #, fuzzy msgid "HP OfficeJet R60" msgstr "HP DeskJet 560C" -#: src/main/xmli18n-tmp.h:800 +#: src/main/xmli18n-tmp.h:852 #, fuzzy msgid "HP OfficeJet R65" -msgstr "HP DeskJet 520" +msgstr "HP DeskJet 500" -#: src/main/xmli18n-tmp.h:801 +#: src/main/xmli18n-tmp.h:853 #, fuzzy msgid "HP OfficeJet R80" -msgstr "HP DeskJet 890C" +msgstr "HP DeskJet 810C" -#: src/main/xmli18n-tmp.h:802 +#: src/main/xmli18n-tmp.h:854 #, fuzzy msgid "HP OfficeJet T45" msgstr "HP DeskJet 845C" -#: src/main/xmli18n-tmp.h:803 +#: src/main/xmli18n-tmp.h:855 #, fuzzy msgid "HP OfficeJet T65" -msgstr "HP DeskJet 520" +msgstr "HP DeskJet 500" -#: src/main/xmli18n-tmp.h:804 +#: src/main/xmli18n-tmp.h:856 #, fuzzy msgid "HP OfficeJet V40" -msgstr "HP DeskJet 400" +msgstr "HP DeskJet 340" -#: src/main/xmli18n-tmp.h:805 +#: src/main/xmli18n-tmp.h:857 #, fuzzy msgid "HP OfficeJet V40xi" msgstr "HP DeskJet 340" -#: src/main/xmli18n-tmp.h:806 +#: src/main/xmli18n-tmp.h:858 msgid "HP OfficeJet" msgstr "" -#: src/main/xmli18n-tmp.h:807 +#: src/main/xmli18n-tmp.h:859 msgid "HP PSC 370" msgstr "" -#: src/main/xmli18n-tmp.h:808 +#: src/main/xmli18n-tmp.h:860 msgid "HP PSC 380" msgstr "" -#: src/main/xmli18n-tmp.h:809 +#: src/main/xmli18n-tmp.h:861 msgid "HP PSC 500" msgstr "" -#: src/main/xmli18n-tmp.h:810 +#: src/main/xmli18n-tmp.h:862 msgid "HP PSC 750" msgstr "" -#: src/main/xmli18n-tmp.h:811 +#: src/main/xmli18n-tmp.h:863 msgid "HP PSC 950" msgstr "" -#: src/main/xmli18n-tmp.h:812 +#: src/main/xmli18n-tmp.h:864 msgid "HP PSC 950xi" msgstr "" -#: src/main/xmli18n-tmp.h:813 +#: src/main/xmli18n-tmp.h:865 #, fuzzy msgid "HP PSC 2110" msgstr "HP PhotoSmart P1100" -#: src/main/xmli18n-tmp.h:814 +#: src/main/xmli18n-tmp.h:866 msgid "HP PSC 2150" msgstr "" -#: src/main/xmli18n-tmp.h:815 +#: src/main/xmli18n-tmp.h:867 msgid "HP PSC 2210" msgstr "" -#: src/main/xmli18n-tmp.h:816 +#: src/main/xmli18n-tmp.h:868 #, fuzzy msgid "HP PhotoSmart 7150" msgstr "HP PhotoSmart P1000" -#: src/main/xmli18n-tmp.h:817 +#: src/main/xmli18n-tmp.h:869 #, fuzzy msgid "HP PhotoSmart 7345" msgstr "HP PhotoSmart P1000" -#: src/main/xmli18n-tmp.h:818 +#: src/main/xmli18n-tmp.h:870 #, fuzzy msgid "HP PhotoSmart 7350" msgstr "HP PhotoSmart P1000" -#: src/main/xmli18n-tmp.h:819 +#: src/main/xmli18n-tmp.h:871 #, fuzzy msgid "HP PhotoSmart 7550" msgstr "HP PhotoSmart P1000" -#: src/main/xmli18n-tmp.h:820 +#: src/main/xmli18n-tmp.h:872 #, fuzzy msgid "HP PhotoSmart P100" msgstr "HP PhotoSmart P1000" -#: src/main/xmli18n-tmp.h:821 +#: src/main/xmli18n-tmp.h:873 #, fuzzy msgid "HP PhotoSmart P130" msgstr "HP PhotoSmart P1000" -#: src/main/xmli18n-tmp.h:822 +#: src/main/xmli18n-tmp.h:874 #, fuzzy msgid "HP PhotoSmart P230" msgstr "HP PhotoSmart P1000" -#: src/main/xmli18n-tmp.h:823 +#: src/main/xmli18n-tmp.h:875 msgid "HP PhotoSmart P1000" msgstr "HP PhotoSmart P1000" -#: src/main/xmli18n-tmp.h:824 +#: src/main/xmli18n-tmp.h:876 msgid "HP PhotoSmart P1100" msgstr "HP PhotoSmart P1100" -#: src/main/xmli18n-tmp.h:825 +#: src/main/xmli18n-tmp.h:877 #, fuzzy msgid "HP PhotoSmart P1115" msgstr "HP PhotoSmart P1100" -#: src/main/xmli18n-tmp.h:826 +#: src/main/xmli18n-tmp.h:878 #, fuzzy msgid "HP PhotoSmart P1215" msgstr "HP PhotoSmart P1100" -#: src/main/xmli18n-tmp.h:827 +#: src/main/xmli18n-tmp.h:879 #, fuzzy msgid "HP PhotoSmart P1218" msgstr "HP PhotoSmart P1100" -#: src/main/xmli18n-tmp.h:828 +#: src/main/xmli18n-tmp.h:880 #, fuzzy msgid "HP PhotoSmart P1315" msgstr "HP PhotoSmart P1100" -#: src/main/xmli18n-tmp.h:829 +#: src/main/xmli18n-tmp.h:881 #, fuzzy msgid "HP e-printer e20" msgstr "HP DesignJet 230" -#: src/main/xmli18n-tmp.h:830 +#: src/main/xmli18n-tmp.h:882 msgid "IBM 4019" msgstr "" -#: src/main/xmli18n-tmp.h:831 +#: src/main/xmli18n-tmp.h:883 msgid "IBM 4029 030 LaserPrinter 10" msgstr "" -#: src/main/xmli18n-tmp.h:832 +#: src/main/xmli18n-tmp.h:884 msgid "IBM 4312" msgstr "" -#: src/main/xmli18n-tmp.h:833 +#: src/main/xmli18n-tmp.h:885 msgid "IBM Infoprint 12" msgstr "" -#: src/main/xmli18n-tmp.h:834 +#: src/main/xmli18n-tmp.h:886 msgid "IBM Page Printer 3112" msgstr "" -#: src/main/xmli18n-tmp.h:835 +#: src/main/xmli18n-tmp.h:887 msgid "Infotec 4651 MF" msgstr "" -#: src/main/xmli18n-tmp.h:836 +#: src/main/xmli18n-tmp.h:888 msgid "Kyocera F-1010" msgstr "" -#: src/main/xmli18n-tmp.h:837 +#: src/main/xmli18n-tmp.h:889 msgid "Kyocera FS-600 - KPDL-2" msgstr "" -#: src/main/xmli18n-tmp.h:838 +#: src/main/xmli18n-tmp.h:890 msgid "Kyocera FS-600" msgstr "" -#: src/main/xmli18n-tmp.h:839 +#: src/main/xmli18n-tmp.h:891 msgid "Kyocera FS-680" msgstr "" -#: src/main/xmli18n-tmp.h:840 +#: src/main/xmli18n-tmp.h:892 msgid "Kyocera FS-800" msgstr "" -#: src/main/xmli18n-tmp.h:841 +#: src/main/xmli18n-tmp.h:893 msgid "Kyocera FS-1000" msgstr "" -#: src/main/xmli18n-tmp.h:842 +#: src/main/xmli18n-tmp.h:894 msgid "Kyocera FS-1000+" msgstr "" -#: src/main/xmli18n-tmp.h:843 +#: src/main/xmli18n-tmp.h:895 msgid "Kyocera FS-1010" msgstr "" -#: src/main/xmli18n-tmp.h:844 +#: src/main/xmli18n-tmp.h:896 msgid "Kyocera FS-1050" msgstr "" -#: src/main/xmli18n-tmp.h:845 +#: src/main/xmli18n-tmp.h:897 msgid "Kyocera FS-1200" msgstr "" -#: src/main/xmli18n-tmp.h:846 +#: src/main/xmli18n-tmp.h:898 msgid "Kyocera FS-1600" msgstr "" -#: src/main/xmli18n-tmp.h:847 +#: src/main/xmli18n-tmp.h:899 msgid "Kyocera FS-1600+" msgstr "" -#: src/main/xmli18n-tmp.h:848 +#: src/main/xmli18n-tmp.h:900 msgid "Kyocera FS-1700" msgstr "" -#: src/main/xmli18n-tmp.h:849 +#: src/main/xmli18n-tmp.h:901 msgid "Kyocera FS-1700+" msgstr "" -#: src/main/xmli18n-tmp.h:850 +#: src/main/xmli18n-tmp.h:902 msgid "Kyocera FS-1750" msgstr "" -#: src/main/xmli18n-tmp.h:851 +#: src/main/xmli18n-tmp.h:903 msgid "Kyocera FS-1800" msgstr "" -#: src/main/xmli18n-tmp.h:852 +#: src/main/xmli18n-tmp.h:904 msgid "Kyocera FS-1800+" msgstr "" -#: src/main/xmli18n-tmp.h:853 +#: src/main/xmli18n-tmp.h:905 msgid "Kyocera FS-1900" msgstr "" -#: src/main/xmli18n-tmp.h:854 +#: src/main/xmli18n-tmp.h:906 msgid "Kyocera FS-3500" msgstr "" -#: src/main/xmli18n-tmp.h:855 +#: src/main/xmli18n-tmp.h:907 msgid "Kyocera FS-3600" msgstr "" -#: src/main/xmli18n-tmp.h:856 +#: src/main/xmli18n-tmp.h:908 msgid "Kyocera FS-3600+" msgstr "" -#: src/main/xmli18n-tmp.h:857 +#: src/main/xmli18n-tmp.h:909 msgid "Kyocera FS-3700" msgstr "" -#: src/main/xmli18n-tmp.h:858 +#: src/main/xmli18n-tmp.h:910 msgid "Kyocera FS-3700+" msgstr "" -#: src/main/xmli18n-tmp.h:859 +#: src/main/xmli18n-tmp.h:911 msgid "Kyocera FS-3750" msgstr "" -#: src/main/xmli18n-tmp.h:860 +#: src/main/xmli18n-tmp.h:912 msgid "Kyocera FS-3800" msgstr "" -#: src/main/xmli18n-tmp.h:861 +#: src/main/xmli18n-tmp.h:913 msgid "Kyocera FS-5800C" msgstr "" -#: src/main/xmli18n-tmp.h:862 +#: src/main/xmli18n-tmp.h:914 msgid "Kyocera FS-5900C" msgstr "" -#: src/main/xmli18n-tmp.h:863 +#: src/main/xmli18n-tmp.h:915 msgid "Kyocera FS-6500" msgstr "" -#: src/main/xmli18n-tmp.h:864 +#: src/main/xmli18n-tmp.h:916 msgid "Kyocera FS-6500+" msgstr "" -#: src/main/xmli18n-tmp.h:865 +#: src/main/xmli18n-tmp.h:917 msgid "Kyocera FS-6700" msgstr "" -#: src/main/xmli18n-tmp.h:866 +#: src/main/xmli18n-tmp.h:918 msgid "Kyocera FS-7000" msgstr "" -#: src/main/xmli18n-tmp.h:867 +#: src/main/xmli18n-tmp.h:919 msgid "Kyocera FS-7000+" msgstr "" -#: src/main/xmli18n-tmp.h:868 +#: src/main/xmli18n-tmp.h:920 msgid "Kyocera FS-8000C" msgstr "" -#: src/main/xmli18n-tmp.h:869 +#: src/main/xmli18n-tmp.h:921 msgid "Kyocera FS-9000" msgstr "" -#: src/main/xmli18n-tmp.h:870 +#: src/main/xmli18n-tmp.h:922 msgid "Kyocera FS-9100DN" msgstr "" -#: src/main/xmli18n-tmp.h:871 +#: src/main/xmli18n-tmp.h:923 msgid "Kyocera FS-9500DN" msgstr "" -#: src/main/xmli18n-tmp.h:872 +#: src/main/xmli18n-tmp.h:924 msgid "Kyocera KM-1530" msgstr "" -#: src/main/xmli18n-tmp.h:873 +#: src/main/xmli18n-tmp.h:925 msgid "Kyocera KM-1810" msgstr "" -#: src/main/xmli18n-tmp.h:874 +#: src/main/xmli18n-tmp.h:926 msgid "Kyocera KM-2030" msgstr "" -#: src/main/xmli18n-tmp.h:875 +#: src/main/xmli18n-tmp.h:927 msgid "Kyocera KM-2530" msgstr "" -#: src/main/xmli18n-tmp.h:876 +#: src/main/xmli18n-tmp.h:928 msgid "Kyocera KM-3530" msgstr "" -#: src/main/xmli18n-tmp.h:877 +#: src/main/xmli18n-tmp.h:929 msgid "Kyocera KM-4230" msgstr "" -#: src/main/xmli18n-tmp.h:878 +#: src/main/xmli18n-tmp.h:930 msgid "Kyocera KM-4530" msgstr "" -#: src/main/xmli18n-tmp.h:879 +#: src/main/xmli18n-tmp.h:931 msgid "Kyocera KM-5230" msgstr "" -#: src/main/xmli18n-tmp.h:880 +#: src/main/xmli18n-tmp.h:932 msgid "Kyocera KM-5530" msgstr "" -#: src/main/xmli18n-tmp.h:881 +#: src/main/xmli18n-tmp.h:933 msgid "Kyocera KM-6230" msgstr "" -#: src/main/xmli18n-tmp.h:882 +#: src/main/xmli18n-tmp.h:934 msgid "Lexmark 4076" msgstr "Lexmark 4076" -#: src/main/xmli18n-tmp.h:883 +#: src/main/xmli18n-tmp.h:935 #, fuzzy msgid "Lexmark Optra E" msgstr "Lexmark Z42" -#: src/main/xmli18n-tmp.h:884 +#: src/main/xmli18n-tmp.h:936 msgid "Lexmark Optra E+" msgstr "" -#: src/main/xmli18n-tmp.h:885 +#: src/main/xmli18n-tmp.h:937 #, fuzzy msgid "Lexmark Optra E220" msgstr "Lexmark Z42" -#: src/main/xmli18n-tmp.h:886 +#: src/main/xmli18n-tmp.h:938 msgid "Lexmark Valuewriter 300" msgstr "" -#: src/main/xmli18n-tmp.h:887 +#: src/main/xmli18n-tmp.h:939 msgid "Minolta PagePro 6" msgstr "" -#: src/main/xmli18n-tmp.h:888 +#: src/main/xmli18n-tmp.h:940 msgid "Minolta PagePro 6e" msgstr "" -#: src/main/xmli18n-tmp.h:889 +#: src/main/xmli18n-tmp.h:941 msgid "Minolta PagePro 6ex" msgstr "" -#: src/main/xmli18n-tmp.h:890 +#: src/main/xmli18n-tmp.h:942 msgid "Minolta PagePro 8" msgstr "" -#: src/main/xmli18n-tmp.h:891 +#: src/main/xmli18n-tmp.h:943 msgid "Minolta PagePro 8L" msgstr "" -#: src/main/xmli18n-tmp.h:892 +#: src/main/xmli18n-tmp.h:944 msgid "Minolta PagePro 1100" msgstr "" -#: src/main/xmli18n-tmp.h:893 +#: src/main/xmli18n-tmp.h:945 msgid "NEC SuperScript 660i" msgstr "" -#: src/main/xmli18n-tmp.h:894 +#: src/main/xmli18n-tmp.h:946 msgid "NEC SuperScript 860" msgstr "" -#: src/main/xmli18n-tmp.h:895 +#: src/main/xmli18n-tmp.h:947 msgid "NEC SuperScript 870" msgstr "" -#: src/main/xmli18n-tmp.h:896 +#: src/main/xmli18n-tmp.h:948 msgid "NEC SuperScript 1260" msgstr "" -#: src/main/xmli18n-tmp.h:897 +#: src/main/xmli18n-tmp.h:949 msgid "NEC SuperScript 1400" msgstr "" -#: src/main/xmli18n-tmp.h:898 +#: src/main/xmli18n-tmp.h:950 msgid "NEC SuperScript 1800" msgstr "" -#: src/main/xmli18n-tmp.h:899 +#: src/main/xmli18n-tmp.h:951 msgid "Okidata OL400" msgstr "" -#: src/main/xmli18n-tmp.h:900 +#: src/main/xmli18n-tmp.h:952 msgid "Okidata OL400e" msgstr "" -#: src/main/xmli18n-tmp.h:901 +#: src/main/xmli18n-tmp.h:953 msgid "Okidata OL400ex" msgstr "" -#: src/main/xmli18n-tmp.h:902 +#: src/main/xmli18n-tmp.h:954 msgid "Okidata OL410e" msgstr "" -#: src/main/xmli18n-tmp.h:903 +#: src/main/xmli18n-tmp.h:955 msgid "Okidata OL600e" msgstr "" -#: src/main/xmli18n-tmp.h:904 +#: src/main/xmli18n-tmp.h:956 msgid "Okidata OL610e/S" msgstr "" -#: src/main/xmli18n-tmp.h:905 +#: src/main/xmli18n-tmp.h:957 msgid "Okidata OL800" msgstr "" -#: src/main/xmli18n-tmp.h:906 +#: src/main/xmli18n-tmp.h:958 msgid "Okidata OL810ex" msgstr "" -#: src/main/xmli18n-tmp.h:907 +#: src/main/xmli18n-tmp.h:959 msgid "Okidata Okipage 6e" msgstr "" -#: src/main/xmli18n-tmp.h:908 +#: src/main/xmli18n-tmp.h:960 msgid "Okidata Okipage 6ex" msgstr "" -#: src/main/xmli18n-tmp.h:909 +#: src/main/xmli18n-tmp.h:961 msgid "Okidata Okipage 8p" msgstr "" -#: src/main/xmli18n-tmp.h:910 +#: src/main/xmli18n-tmp.h:962 msgid "Okidata Okipage 10e" msgstr "" -#: src/main/xmli18n-tmp.h:911 +#: src/main/xmli18n-tmp.h:963 msgid "Okidata Okipage 10ex" msgstr "" -#: src/main/xmli18n-tmp.h:912 +#: src/main/xmli18n-tmp.h:964 msgid "Okidata Okipage 14ex" msgstr "" -#: src/main/xmli18n-tmp.h:913 +#: src/main/xmli18n-tmp.h:965 msgid "Okidata Super 6e" msgstr "" -#: src/main/xmli18n-tmp.h:914 +#: src/main/xmli18n-tmp.h:966 msgid "Olivetti JP350S" msgstr "" -#: src/main/xmli18n-tmp.h:915 +#: src/main/xmli18n-tmp.h:967 msgid "Olivetti PG 306" msgstr "" -#: src/main/xmli18n-tmp.h:916 +#: src/main/xmli18n-tmp.h:968 msgid "PCPI 1030" msgstr "" -#: src/main/xmli18n-tmp.h:917 +#: src/main/xmli18n-tmp.h:969 msgid "Panasonic KX-P4410" msgstr "" -#: src/main/xmli18n-tmp.h:918 +#: src/main/xmli18n-tmp.h:970 msgid "Panasonic KX-P4450" msgstr "" -#: src/main/xmli18n-tmp.h:919 +#: src/main/xmli18n-tmp.h:971 msgid "Panasonic KX-P6150" msgstr "" -#: src/main/xmli18n-tmp.h:920 +#: src/main/xmli18n-tmp.h:972 msgid "Panasonic KX-P6500" msgstr "" -#: src/main/xmli18n-tmp.h:921 +#: src/main/xmli18n-tmp.h:973 msgid "Raven LP-410" msgstr "" -#: src/main/xmli18n-tmp.h:922 +#: src/main/xmli18n-tmp.h:974 msgid "Ricoh Aficio 220" msgstr "" -#: src/main/xmli18n-tmp.h:923 +#: src/main/xmli18n-tmp.h:975 msgid "Ricoh Aficio 401" msgstr "" -#: src/main/xmli18n-tmp.h:924 +#: src/main/xmli18n-tmp.h:976 msgid "Ricoh Aficio 700" msgstr "" -#: src/main/xmli18n-tmp.h:925 +#: src/main/xmli18n-tmp.h:977 msgid "Samsung ML-85" msgstr "" -#: src/main/xmli18n-tmp.h:926 +#: src/main/xmli18n-tmp.h:978 msgid "Samsung ML-4600" msgstr "" -#: src/main/xmli18n-tmp.h:927 +#: src/main/xmli18n-tmp.h:979 msgid "Samsung ML-5000a" msgstr "" -#: src/main/xmli18n-tmp.h:928 +#: src/main/xmli18n-tmp.h:980 msgid "Samsung ML-6000" msgstr "" -#: src/main/xmli18n-tmp.h:929 +#: src/main/xmli18n-tmp.h:981 msgid "Samsung ML-6100" msgstr "" -#: src/main/xmli18n-tmp.h:930 +#: src/main/xmli18n-tmp.h:982 msgid "Samsung ML-7000" msgstr "" -#: src/main/xmli18n-tmp.h:931 +#: src/main/xmli18n-tmp.h:983 msgid "Samsung ML-7000N" msgstr "" -#: src/main/xmli18n-tmp.h:932 +#: src/main/xmli18n-tmp.h:984 msgid "Samsung ML-7000P" msgstr "" -#: src/main/xmli18n-tmp.h:933 +#: src/main/xmli18n-tmp.h:985 msgid "Samsung ML-7050" msgstr "" -#: src/main/xmli18n-tmp.h:934 +#: src/main/xmli18n-tmp.h:986 msgid "Samsung QL-5100A" msgstr "" -#: src/main/xmli18n-tmp.h:935 +#: src/main/xmli18n-tmp.h:987 msgid "Samsung QL-6050" msgstr "" -#: src/main/xmli18n-tmp.h:936 +#: src/main/xmli18n-tmp.h:988 msgid "Seiko SpeedJET 200" msgstr "" -#: src/main/xmli18n-tmp.h:937 +#: src/main/xmli18n-tmp.h:989 msgid "Sharp AR-161" msgstr "" -#: src/main/xmli18n-tmp.h:938 +#: src/main/xmli18n-tmp.h:990 msgid "Sharp AR-M257" msgstr "" -#: src/main/xmli18n-tmp.h:939 +#: src/main/xmli18n-tmp.h:991 #, fuzzy msgid "Sony IJP-V100" msgstr "Sony UP-DP10" -#: src/main/xmli18n-tmp.h:940 +#: src/main/xmli18n-tmp.h:992 msgid "Star LS-04" msgstr "" -#: src/main/xmli18n-tmp.h:941 +#: src/main/xmli18n-tmp.h:993 #, fuzzy msgid "Star LaserPrinter 8" msgstr "設定å°è¡¨æ©Ÿ" -#: src/main/xmli18n-tmp.h:942 +#: src/main/xmli18n-tmp.h:994 msgid "Tally MT908" msgstr "" -#: src/main/xmli18n-tmp.h:943 +#: src/main/xmli18n-tmp.h:995 msgid "Xerox Able 1406" msgstr "" -#: src/main/xmli18n-tmp.h:944 +#: src/main/xmli18n-tmp.h:996 msgid "Xerox DocuPrint 4508" msgstr "" -#: src/main/xmli18n-tmp.h:945 +#: src/main/xmli18n-tmp.h:997 msgid "Xerox DocuPrint C20" msgstr "" -#: src/main/xmli18n-tmp.h:946 +#: src/main/xmli18n-tmp.h:998 msgid "Xerox DocuPrint N4512" msgstr "" -#: src/main/xmli18n-tmp.h:947 +#: src/main/xmli18n-tmp.h:999 msgid "Xerox DocuPrint N4512PS" msgstr "" -#: src/main/xmli18n-tmp.h:948 +#: src/main/xmli18n-tmp.h:1000 msgid "Xerox DocuPrint P12" msgstr "" -#: src/main/xmli18n-tmp.h:949 +#: src/main/xmli18n-tmp.h:1001 msgid "Xerox DocuPrint P1202" msgstr "" -#: src/main/xmli18n-tmp.h:950 +#: src/main/xmli18n-tmp.h:1002 msgid "Xerox DocuPrint P8e" msgstr "" -#: src/main/xmli18n-tmp.h:951 +#: src/main/xmli18n-tmp.h:1003 msgid "Xerox Document Centre 400" msgstr "" -#: src/main/xmli18n-tmp.h:952 +#: src/main/xmli18n-tmp.h:1004 msgid "Xerox WorkCentre M118" msgstr "" -#: src/main/xmli18n-tmp.h:953 +#: src/main/xmli18n-tmp.h:1005 msgid "Compaq IJ1200" msgstr "" -#: src/main/xmli18n-tmp.h:954 +#: src/main/xmli18n-tmp.h:1006 #, fuzzy msgid "Lexmark X73" msgstr "Lexmark Z43" -#: src/main/xmli18n-tmp.h:955 +#: src/main/xmli18n-tmp.h:1007 msgid "Lexmark Z42" msgstr "Lexmark Z42" -#: src/main/xmli18n-tmp.h:956 +#: src/main/xmli18n-tmp.h:1008 msgid "Lexmark Z43" msgstr "Lexmark Z43" -#: src/main/xmli18n-tmp.h:957 +#: src/main/xmli18n-tmp.h:1009 msgid "Lexmark Z52" msgstr "Lexmark Z52" -#: src/main/xmli18n-tmp.h:958 +#: src/main/xmli18n-tmp.h:1010 msgid "Lexmark Z53" msgstr "Lexmark Z53" -#: src/main/xmli18n-tmp.h:959 +#: src/main/xmli18n-tmp.h:1011 #, fuzzy msgid "Olympus P-10" msgstr "Olympus P10" -#: src/main/xmli18n-tmp.h:960 +#: src/main/xmli18n-tmp.h:1012 #, fuzzy msgid "Olympus P-11" msgstr "Olympus P10" -#: src/main/xmli18n-tmp.h:961 +#: src/main/xmli18n-tmp.h:1013 #, fuzzy msgid "Olympus P-200" msgstr "Olympus P200" -#: src/main/xmli18n-tmp.h:962 +#: src/main/xmli18n-tmp.h:1014 #, fuzzy msgid "Olympus P-300" msgstr "Olympus P300" -#: src/main/xmli18n-tmp.h:963 +#: src/main/xmli18n-tmp.h:1015 #, fuzzy msgid "Olympus P-300E" msgstr "Olympus P300" -#: src/main/xmli18n-tmp.h:964 +#: src/main/xmli18n-tmp.h:1016 #, fuzzy msgid "Olympus P-300U" msgstr "Olympus P300" -#: src/main/xmli18n-tmp.h:965 +#: src/main/xmli18n-tmp.h:1017 #, fuzzy msgid "Olympus P-330E" msgstr "Olympus P300" -#: src/main/xmli18n-tmp.h:966 +#: src/main/xmli18n-tmp.h:1018 #, fuzzy msgid "Olympus P-330NE" msgstr "Olympus P300" -#: src/main/xmli18n-tmp.h:967 +#: src/main/xmli18n-tmp.h:1019 #, fuzzy msgid "Olympus P-400" msgstr "Olympus P400" -#: src/main/xmli18n-tmp.h:968 +#: src/main/xmli18n-tmp.h:1020 #, fuzzy msgid "Olympus P-440" msgstr "Olympus P440" -#: src/main/xmli18n-tmp.h:969 +#: src/main/xmli18n-tmp.h:1021 #, fuzzy msgid "Olympus P-S100" msgstr "Olympus P10" -#: src/main/xmli18n-tmp.h:970 +#: src/main/xmli18n-tmp.h:1022 #, fuzzy msgid "Canon CP-10" msgstr "Canon CP100" -#: src/main/xmli18n-tmp.h:971 +#: src/main/xmli18n-tmp.h:1023 #, fuzzy msgid "Canon CP-100" msgstr "Canon CP100" -#: src/main/xmli18n-tmp.h:972 +#: src/main/xmli18n-tmp.h:1024 #, fuzzy msgid "Canon CP-200" -msgstr "Canon CP220" +msgstr "Canon CP100" -#: src/main/xmli18n-tmp.h:973 +#: src/main/xmli18n-tmp.h:1025 #, fuzzy msgid "Canon CP-220" msgstr "Canon CP220" -#: src/main/xmli18n-tmp.h:974 +#: src/main/xmli18n-tmp.h:1026 #, fuzzy msgid "Canon CP-300" msgstr "Canon CP100" -#: src/main/xmli18n-tmp.h:975 +#: src/main/xmli18n-tmp.h:1027 #, fuzzy msgid "Canon CP-330" msgstr "Canon CP100" -#: src/main/xmli18n-tmp.h:976 +#: src/main/xmli18n-tmp.h:1028 #, fuzzy msgid "Canon SELPHY-CP-400" msgstr "Canon S400" -#: src/main/xmli18n-tmp.h:977 +#: src/main/xmli18n-tmp.h:1029 #, fuzzy msgid "Canon SELPHY-CP-500" -msgstr "Canon CP100" +msgstr "Canon S4500" -#: src/main/xmli18n-tmp.h:978 +#: src/main/xmli18n-tmp.h:1030 #, fuzzy msgid "Canon SELPHY-CP-510" msgstr "Canon CP100" -#: src/main/xmli18n-tmp.h:979 +#: src/main/xmli18n-tmp.h:1031 #, fuzzy msgid "Canon SELPHY-CP-600" msgstr "Canon CP100" -#: src/main/xmli18n-tmp.h:980 +#: src/main/xmli18n-tmp.h:1032 #, fuzzy msgid "Canon SELPHY-CP-710" msgstr "Canon CP100" -#: src/main/xmli18n-tmp.h:981 +#: src/main/xmli18n-tmp.h:1033 #, fuzzy msgid "Canon SELPHY-CP-720" -msgstr "Canon CP100" +msgstr "Canon CP220" -#: src/main/xmli18n-tmp.h:982 +#: src/main/xmli18n-tmp.h:1034 #, fuzzy msgid "Canon SELPHY-CP-730" msgstr "Canon CP100" -#: src/main/xmli18n-tmp.h:983 +#: src/main/xmli18n-tmp.h:1035 #, fuzzy msgid "Canon SELPHY-CP-740" msgstr "Canon S400" -#: src/main/xmli18n-tmp.h:984 +#: src/main/xmli18n-tmp.h:1036 #, fuzzy msgid "Canon SELPHY-CP-750" -msgstr "Canon CP100" +msgstr "Canon S450" -#: src/main/xmli18n-tmp.h:985 -#, fuzzy +#: src/main/xmli18n-tmp.h:1037 msgid "Canon SELPHY ES1" -msgstr "Canon CP100" +msgstr "" -#: src/main/xmli18n-tmp.h:986 -#, fuzzy +#: src/main/xmli18n-tmp.h:1038 msgid "Canon SELPHY ES2" -msgstr "Canon S400" +msgstr "" -#: src/main/xmli18n-tmp.h:987 +#: src/main/xmli18n-tmp.h:1039 #, fuzzy msgid "Canon SELPHY ES20" -msgstr "Canon S400" +msgstr "Canon CP220" -#: src/main/xmli18n-tmp.h:988 -#, fuzzy +#: src/main/xmli18n-tmp.h:1040 msgid "Sony DPP-EX5" -msgstr "Sony UP-DP10" +msgstr "" -#: src/main/xmli18n-tmp.h:989 +#: src/main/xmli18n-tmp.h:1041 msgid "Sony DPP-EX7" msgstr "" -#: src/main/xmli18n-tmp.h:990 +#: src/main/xmli18n-tmp.h:1042 msgid "Sony UP-DP10" msgstr "Sony UP-DP10" -#: src/main/xmli18n-tmp.h:991 +#: src/main/xmli18n-tmp.h:1043 #, fuzzy msgid "Sony UP-DR100" msgstr "Sony UP-DP10" -#: src/main/xmli18n-tmp.h:992 +#: src/main/xmli18n-tmp.h:1044 #, fuzzy msgid "Sony UP-DR150" msgstr "Sony UP-DP10" -#: src/main/xmli18n-tmp.h:993 +#: src/main/xmli18n-tmp.h:1045 #, fuzzy msgid "Fujifilm Printpix-CX-400" msgstr "Fujifilm Printpix CX-400" -#: src/main/xmli18n-tmp.h:994 +#: src/main/xmli18n-tmp.h:1046 #, fuzzy msgid "Fujifilm Printpix-CX-550" msgstr "Fujifilm Printpix CX-550" -#: src/main/xmli18n-tmp.h:995 +#: src/main/xmli18n-tmp.h:1047 #, fuzzy msgid "Fujifilm FinePix-NX-500" msgstr "Fujifilm Printpix CX-400" -#: src/main/xmli18n-tmp.h:996 +#: src/main/xmli18n-tmp.h:1048 msgid "Kodak Easyshare-Printer-Dock" msgstr "" -#: src/main/xmli18n-tmp.h:997 +#: src/main/xmli18n-tmp.h:1049 msgid "Shinko CHC-S9045" msgstr "" -#: src/main/xmli18n-tmp.h:998 +#: src/main/xmli18n-tmp.h:1050 msgid "RAW DATA 16 bit" msgstr "" -#: src/main/xmli18n-tmp.h:999 +#: src/main/xmli18n-tmp.h:1051 msgid "RAW DATA 8 bit" msgstr "" -#: src/gutenprintui/panel.c:274 src/gutenprintui2/panel.c:274 +#: src/gutenprintui2/curve.c:130 +msgid "Curve type" +msgstr "" + +#: src/gutenprintui2/curve.c:131 +msgid "Is this curve linear, spline interpolated, or free-form" +msgstr "" + +#: src/gutenprintui2/curve.c:139 +msgid "Minimum X" +msgstr "X 下é™" + +#: src/gutenprintui2/curve.c:140 +msgid "Minimum possible value for X" +msgstr "" + +#: src/gutenprintui2/curve.c:149 +msgid "Maximum X" +msgstr "X 上é™" + +#: src/gutenprintui2/curve.c:150 +msgid "Maximum possible X value" +msgstr "" + +#: src/gutenprintui2/curve.c:159 +msgid "Minimum Y" +msgstr "Y 下é™" + +#: src/gutenprintui2/curve.c:160 +msgid "Minimum possible value for Y" +msgstr "" + +#: src/gutenprintui2/curve.c:169 +msgid "Maximum Y" +msgstr "Y 上é™" + +#: src/gutenprintui2/curve.c:170 +msgid "Maximum possible value for Y" +msgstr "" + +#: src/gutenprintui2/gammacurve.c:418 +msgid "_Gamma value" +msgstr "_Gamma 值" + +#: src/gutenprintui2/panel.c:275 msgid "Inch" msgstr "英å‹" -#: src/gutenprintui/panel.c:274 src/gutenprintui2/panel.c:274 +#: src/gutenprintui2/panel.c:275 msgid "Set the base unit of measurement to inches" msgstr "以英å‹ä½œç‚ºé•·åº¦å–®ä½" -#: src/gutenprintui/panel.c:276 src/gutenprintui2/panel.c:276 +#: src/gutenprintui2/panel.c:277 msgid "cm" msgstr "公分" -#: src/gutenprintui/panel.c:276 src/gutenprintui2/panel.c:276 +#: src/gutenprintui2/panel.c:277 msgid "Set the base unit of measurement to centimetres" msgstr "以公分作為長度單ä½" -#: src/gutenprintui/panel.c:278 src/gutenprintui2/panel.c:278 +#: src/gutenprintui2/panel.c:279 msgid "Points" msgstr "" -#: src/gutenprintui/panel.c:278 src/gutenprintui2/panel.c:278 +#: src/gutenprintui2/panel.c:279 msgid "Set the base unit of measurement to points (1/72\")" msgstr "" -#: src/gutenprintui/panel.c:280 src/gutenprintui2/panel.c:280 +#: src/gutenprintui2/panel.c:281 msgid "mm" msgstr "毫米" -#: src/gutenprintui/panel.c:280 src/gutenprintui2/panel.c:280 +#: src/gutenprintui2/panel.c:281 msgid "Set the base unit of measurement to millimetres" msgstr "以毫米作為長度單ä½" -#: src/gutenprintui/panel.c:282 src/gutenprintui2/panel.c:282 +#: src/gutenprintui2/panel.c:283 msgid "Pica" msgstr "鉛點" -#: src/gutenprintui/panel.c:282 src/gutenprintui2/panel.c:282 +#: src/gutenprintui2/panel.c:283 msgid "Set the base unit of measurement to picas (1/12\")" msgstr "以鉛點 (1/12\") 作為長度單ä½" -#: src/gutenprintui/panel.c:289 src/gutenprintui2/panel.c:289 +#: src/gutenprintui2/panel.c:290 msgid "Color output" msgstr "使用彩色列å°" -#: src/gutenprintui/panel.c:291 src/gutenprintui2/panel.c:291 +#: src/gutenprintui2/panel.c:292 msgid "Print in shades of gray using black ink" msgstr "使用黑色墨水來列å°ç°éšŽè‰²å½©" -#: src/gutenprintui/panel.c:303 src/gutenprintui2/panel.c:303 +#: src/gutenprintui2/panel.c:304 msgid "Standard Command" msgstr "標準指令" -#: src/gutenprintui/panel.c:303 src/gutenprintui2/panel.c:303 +#: src/gutenprintui2/panel.c:304 msgid "Use standard print command" msgstr "使用標準列å°æŒ‡ä»¤" -#: src/gutenprintui/panel.c:304 src/gutenprintui2/panel.c:304 +#: src/gutenprintui2/panel.c:305 msgid "Custom Command" msgstr "自é¸æŒ‡ä»¤" -#: src/gutenprintui/panel.c:304 src/gutenprintui2/panel.c:304 +#: src/gutenprintui2/panel.c:305 msgid "Use custom print command" msgstr "使用自行指定的列å°æŒ‡ä»¤" -#: src/gutenprintui/panel.c:305 src/gutenprintui/plist.c:704 -#: src/gutenprintui/plist.c:787 src/gutenprintui2/panel.c:305 -#: src/gutenprintui2/plist.c:707 src/gutenprintui2/plist.c:790 +#: src/gutenprintui2/panel.c:306 src/gutenprintui2/plist.c:710 +#: src/gutenprintui2/plist.c:793 msgid "File" msgstr "檔案" -#: src/gutenprintui/panel.c:305 src/gutenprintui2/panel.c:305 +#: src/gutenprintui2/panel.c:306 msgid "Print to a file" msgstr "列å°è‡³æª”案" -#: src/gutenprintui/panel.c:521 src/gutenprintui2/panel.c:521 +#: src/gutenprintui2/panel.c:522 msgid "Edit Curve..." msgstr "" -#: src/gutenprintui/panel.c:532 src/gutenprintui2/panel.c:532 +#: src/gutenprintui2/panel.c:533 msgid "Set Default" msgstr "" -#: src/gutenprintui/panel.c:534 src/gutenprintui2/panel.c:534 +#: src/gutenprintui2/panel.c:535 msgid "Restore Previous" msgstr "" -#: src/gutenprintui/panel.c:536 src/gutenprintui/panel.c:1532 -#: src/gutenprintui/panel.c:1787 src/gutenprintui/panel.c:1819 -#: src/gutenprintui2/panel.c:536 src/gutenprintui2/panel.c:1533 -#: src/gutenprintui2/panel.c:1787 src/gutenprintui2/panel.c:1819 +#: src/gutenprintui2/panel.c:537 src/gutenprintui2/panel.c:1708 +#: src/gutenprintui2/panel.c:1962 src/gutenprintui2/panel.c:1994 msgid "OK" msgstr "確定" -#: src/gutenprintui/panel.c:538 src/gutenprintui/panel.c:1197 -#: src/gutenprintui/panel.c:1534 src/gutenprintui/panel.c:1789 -#: src/gutenprintui2/panel.c:538 src/gutenprintui2/panel.c:1198 -#: src/gutenprintui2/panel.c:1535 src/gutenprintui2/panel.c:1789 +#: src/gutenprintui2/panel.c:539 src/gutenprintui2/panel.c:1373 +#: src/gutenprintui2/panel.c:1710 src/gutenprintui2/panel.c:1964 msgid "Cancel" msgstr "å–消" -#: src/gutenprintui/panel.c:1180 src/gutenprintui2/panel.c:1181 +#: src/gutenprintui2/panel.c:641 +#, fuzzy +msgid "Select File..." +msgstr "設定å°è¡¨æ©Ÿ..." + +#: src/gutenprintui2/panel.c:1018 +msgid "Reset" +msgstr "" + +#: src/gutenprintui2/panel.c:1356 #, c-format msgid "%s -- Print v%s" msgstr "%s -- 列å°å¢žæ•ˆæ¨¡çµ„ %s 版本" -#: src/gutenprintui/panel.c:1189 src/gutenprintui2/panel.c:1190 +#: src/gutenprintui2/panel.c:1365 msgid "About" msgstr "關於" -#: src/gutenprintui/panel.c:1191 src/gutenprintui2/panel.c:1192 +#: src/gutenprintui2/panel.c:1367 msgid "" "Print and\n" "Save Settings" @@ -6813,7 +7247,7 @@ msgstr "" "列å°ä¸¦\n" "儲存設定" -#: src/gutenprintui/panel.c:1193 src/gutenprintui2/panel.c:1194 +#: src/gutenprintui2/panel.c:1369 msgid "" "Save\n" "Settings" @@ -6821,15 +7255,15 @@ msgstr "" "儲存\n" "設定" -#: src/gutenprintui/panel.c:1195 src/gutenprintui2/panel.c:1196 +#: src/gutenprintui2/panel.c:1371 msgid "Print" msgstr "列å°" -#: src/gutenprintui/panel.c:1247 src/gutenprintui2/panel.c:1248 +#: src/gutenprintui2/panel.c:1423 msgid "Preview" msgstr "é è¦½" -#: src/gutenprintui/panel.c:1272 src/gutenprintui2/panel.c:1273 +#: src/gutenprintui2/panel.c:1448 msgid "" "Position the image on the page.\n" "Click and drag with the primary button to position the image.\n" @@ -6851,323 +7285,316 @@ msgstr "" "拖曳影åƒæ™‚按下 shift éµï¼Œæœƒé™åˆ¶å½±åƒåªå‘水平或垂直方å‘移動。\n" "如果拖曳的時候å†æŒ‰å¤šä¸€å€‹æ»‘鼠按鈕，影åƒæœƒé‚„原至原來ä½ç½®ã€‚" -#: src/gutenprintui/panel.c:1319 src/gutenprintui2/panel.c:1320 +#: src/gutenprintui2/panel.c:1495 msgid "Paper Size" msgstr "紙張尺寸" -#: src/gutenprintui/panel.c:1342 src/gutenprintui2/panel.c:1343 +#: src/gutenprintui2/panel.c:1518 msgid "Show All Paper Sizes" msgstr "顯示所有紙張尺寸" -#: src/gutenprintui/panel.c:1358 src/gutenprintui2/panel.c:1359 +#: src/gutenprintui2/panel.c:1534 msgid "Dimensions:" msgstr "尺寸：" -#: src/gutenprintui/panel.c:1363 src/gutenprintui/panel.c:2063 -#: src/gutenprintui2/panel.c:1364 src/gutenprintui2/panel.c:2063 +#: src/gutenprintui2/panel.c:1539 src/gutenprintui2/panel.c:2238 msgid "Width:" msgstr "寬度：" -#: src/gutenprintui/panel.c:1364 src/gutenprintui2/panel.c:1365 +#: src/gutenprintui2/panel.c:1540 msgid "Width of the paper that you wish to print to" msgstr "列å°æ™‚的紙張寬度" -#: src/gutenprintui/panel.c:1368 src/gutenprintui/panel.c:2065 -#: src/gutenprintui2/panel.c:1369 src/gutenprintui2/panel.c:2065 +#: src/gutenprintui2/panel.c:1544 src/gutenprintui2/panel.c:2240 msgid "Height:" msgstr "高度：" -#: src/gutenprintui/panel.c:1369 src/gutenprintui2/panel.c:1370 +#: src/gutenprintui2/panel.c:1545 msgid "Height of the paper that you wish to print to" msgstr "列å°æ™‚的紙張高度" -#: src/gutenprintui/panel.c:1374 src/gutenprintui2/panel.c:1375 +#: src/gutenprintui2/panel.c:1550 msgid "Automatic Paper Size" msgstr "" -#: src/gutenprintui/panel.c:1391 src/gutenprintui2/panel.c:1392 +#: src/gutenprintui2/panel.c:1567 msgid "Number of Copies" msgstr "份數" -#: src/gutenprintui/panel.c:1403 src/gutenprintui2/panel.c:1404 +#: src/gutenprintui2/panel.c:1579 msgid "Select the number of copies to print; a value between 1 and 100" msgstr "è«‹é¸æ“‡åˆ—å°å¤šå°‘份 (1-100 之間)" -#: src/gutenprintui/panel.c:1435 src/gutenprintui2/panel.c:1436 +#: src/gutenprintui2/panel.c:1611 msgid "Image Position" msgstr "å½±åƒä½ç½®" -#: src/gutenprintui/panel.c:1452 src/gutenprintui2/panel.c:1453 +#: src/gutenprintui2/panel.c:1628 msgid "Auto" msgstr "自動" -#: src/gutenprintui/panel.c:1454 src/gutenprintui2/panel.c:1455 +#: src/gutenprintui2/panel.c:1630 msgid "Portrait" msgstr "ç›´å‘" -#: src/gutenprintui/panel.c:1456 src/gutenprintui2/panel.c:1457 +#: src/gutenprintui2/panel.c:1632 msgid "Landscape" msgstr "æ©«å‘" -#: src/gutenprintui/panel.c:1458 src/gutenprintui2/panel.c:1459 +#: src/gutenprintui2/panel.c:1634 msgid "Upside down" msgstr "ç›´å‘倒置" -#: src/gutenprintui/panel.c:1460 src/gutenprintui2/panel.c:1461 +#: src/gutenprintui2/panel.c:1636 msgid "Seascape" msgstr "æ©«å‘倒置" -#: src/gutenprintui/panel.c:1464 src/gutenprintui2/panel.c:1465 +#: src/gutenprintui2/panel.c:1640 msgid "" "Select the orientation: portrait, landscape, upside down, or seascape " "(upside down landscape)" msgstr "指定列å°æ™‚çš„æ–¹å‘：直å‘ã€æ©«å‘ã€ç›´å‘倒置ã€æ©«å‘倒置" -#: src/gutenprintui/panel.c:1466 src/gutenprintui2/panel.c:1467 +#: src/gutenprintui2/panel.c:1642 msgid "Orientation:" msgstr "æ–¹å‘：" -#: src/gutenprintui/panel.c:1477 src/gutenprintui2/panel.c:1478 +#: src/gutenprintui2/panel.c:1653 msgid "Left:" msgstr "左：" -#: src/gutenprintui/panel.c:1478 src/gutenprintui2/panel.c:1479 +#: src/gutenprintui2/panel.c:1654 msgid "Distance from the left of the paper to the image" msgstr "從紙張左邊邊緣至影åƒä¹‹é–“çš„è·é›¢" -#: src/gutenprintui/panel.c:1481 src/gutenprintui/panel.c:1485 -#: src/gutenprintui2/panel.c:1482 src/gutenprintui2/panel.c:1486 +#: src/gutenprintui2/panel.c:1657 src/gutenprintui2/panel.c:1661 msgid "Right:" msgstr "å³ï¼š" -#: src/gutenprintui/panel.c:1482 src/gutenprintui2/panel.c:1483 +#: src/gutenprintui2/panel.c:1658 msgid "Distance from the left of the paper to the right of the image" msgstr "從紙張左邊邊緣至影åƒå³é‚Šé‚Šç·£ä¹‹é–“çš„è·é›¢" -#: src/gutenprintui/panel.c:1486 src/gutenprintui2/panel.c:1487 +#: src/gutenprintui2/panel.c:1662 msgid "Distance from the right of the paper to the image" msgstr "從紙張å³é‚Šé‚Šç·£è‡³å½±åƒä¹‹é–“çš„è·é›¢" -#: src/gutenprintui/panel.c:1488 src/gutenprintui2/panel.c:1489 +#: src/gutenprintui2/panel.c:1664 msgid "Top:" msgstr "上：" -#: src/gutenprintui/panel.c:1489 src/gutenprintui2/panel.c:1490 +#: src/gutenprintui2/panel.c:1665 msgid "Distance from the top of the paper to the image" msgstr "從紙張頂部邊緣至影åƒä¹‹é–“çš„è·é›¢" -#: src/gutenprintui/panel.c:1492 src/gutenprintui/panel.c:1496 -#: src/gutenprintui2/panel.c:1493 src/gutenprintui2/panel.c:1497 +#: src/gutenprintui2/panel.c:1668 src/gutenprintui2/panel.c:1672 msgid "Bottom:" msgstr "下：" -#: src/gutenprintui/panel.c:1493 src/gutenprintui2/panel.c:1494 +#: src/gutenprintui2/panel.c:1669 msgid "Distance from the top of the paper to bottom of the image" msgstr "從紙張頂部邊緣至影åƒåº•éƒ¨é‚Šç·£ä¹‹é–“çš„è·é›¢" -#: src/gutenprintui/panel.c:1497 src/gutenprintui2/panel.c:1498 +#: src/gutenprintui2/panel.c:1673 msgid "Distance from the bottom of the paper to the image" msgstr "從紙張底部邊緣至影åƒä¹‹é–“çš„è·é›¢" -#: src/gutenprintui/panel.c:1507 src/gutenprintui2/panel.c:1508 +#: src/gutenprintui2/panel.c:1683 msgid "Center:" msgstr "置中：" -#: src/gutenprintui/panel.c:1510 src/gutenprintui2/panel.c:1511 +#: src/gutenprintui2/panel.c:1686 msgid "Horizontal" msgstr "æ°´å¹³" -#: src/gutenprintui/panel.c:1511 src/gutenprintui2/panel.c:1512 +#: src/gutenprintui2/panel.c:1687 msgid "Center the image horizontally on the paper" msgstr "將影åƒçš„æ°´å¹³ä½ç½®èª¿æ•´è‡³ç´™å¼µä¸­é–“" -#: src/gutenprintui/panel.c:1513 src/gutenprintui2/panel.c:1514 +#: src/gutenprintui2/panel.c:1689 msgid "Both" msgstr "兩者" -#: src/gutenprintui/panel.c:1514 src/gutenprintui2/panel.c:1515 +#: src/gutenprintui2/panel.c:1690 msgid "Center the image on the paper" msgstr "將影åƒæ”¾ç½®åœ¨ç´™å¼µä¸­é–“" -#: src/gutenprintui/panel.c:1516 src/gutenprintui2/panel.c:1517 +#: src/gutenprintui2/panel.c:1692 msgid "Vertical" msgstr "åž‚ç›´" -#: src/gutenprintui/panel.c:1517 src/gutenprintui2/panel.c:1518 +#: src/gutenprintui2/panel.c:1693 msgid "Center the image vertically on the paper" msgstr "將影åƒçš„åž‚ç›´ä½ç½®èª¿æ•´è‡³ç´™å¼µä¸­é–“" -#: src/gutenprintui/panel.c:1530 src/gutenprintui2/panel.c:1531 +#: src/gutenprintui2/panel.c:1706 msgid "Setup Printer" msgstr "設定å°è¡¨æ©Ÿ" -#: src/gutenprintui/panel.c:1555 src/gutenprintui2/panel.c:1555 +#: src/gutenprintui2/panel.c:1730 msgid "Printer Make:" msgstr "" -#: src/gutenprintui/panel.c:1566 src/gutenprintui2/panel.c:1566 +#: src/gutenprintui2/panel.c:1741 msgid "Select the make of your printer" msgstr "" -#: src/gutenprintui/panel.c:1584 src/gutenprintui/panel.c:1672 -#: src/gutenprintui/panel.c:1890 src/gutenprintui2/panel.c:1584 -#: src/gutenprintui2/panel.c:1672 src/gutenprintui2/panel.c:1890 +#: src/gutenprintui2/panel.c:1759 src/gutenprintui2/panel.c:1847 +#: src/gutenprintui2/panel.c:2065 msgid "Printer Model:" msgstr "å°è¡¨æ©Ÿåž‹è™Ÿï¼š" -#: src/gutenprintui/panel.c:1595 src/gutenprintui2/panel.c:1595 +#: src/gutenprintui2/panel.c:1770 msgid "Select your printer model" msgstr "è«‹é¸å–å°è¡¨æ©Ÿåž‹è™Ÿ" -#: src/gutenprintui/panel.c:1643 src/gutenprintui2/panel.c:1643 +#: src/gutenprintui2/panel.c:1818 msgid "PPD File:" msgstr "PPD 檔：" -#: src/gutenprintui/panel.c:1659 src/gutenprintui2/panel.c:1659 +#: src/gutenprintui2/panel.c:1834 msgid "Enter the correct PPD filename for your printer" msgstr "請輸入é©åˆæ‚¨çš„å°è¡¨æ©Ÿä½¿ç”¨çš„ PPD 檔案å稱" -#: src/gutenprintui/panel.c:1661 src/gutenprintui/panel.c:1741 -#: src/gutenprintui2/panel.c:1661 src/gutenprintui2/panel.c:1741 +#: src/gutenprintui2/panel.c:1836 src/gutenprintui2/panel.c:1916 msgid "Browse" msgstr "ç€è¦½" -#: src/gutenprintui/panel.c:1668 src/gutenprintui2/panel.c:1668 +#: src/gutenprintui2/panel.c:1843 msgid "Choose the correct PPD filename for your printer" msgstr "è«‹é¸æ“‡é©åˆæ‚¨çš„å°è¡¨æ©Ÿä½¿ç”¨çš„ PPD 檔案å稱" -#: src/gutenprintui/panel.c:1710 src/gutenprintui2/panel.c:1710 +#: src/gutenprintui2/panel.c:1885 msgid "" "Select the name of the output queue (not the type, or model, of printer) " "that you wish to print to" msgstr "" -#: src/gutenprintui/panel.c:1712 src/gutenprintui2/panel.c:1712 +#: src/gutenprintui2/panel.c:1887 msgid "Printer Queue:" msgstr "å°è¡¨æ©Ÿä½‡åˆ—：" -#: src/gutenprintui/panel.c:1728 src/gutenprintui2/panel.c:1728 +#: src/gutenprintui2/panel.c:1903 msgid "Enter the correct command to print to your printer. " msgstr "請輸入列å°æ‰€ä½¿ç”¨çš„指令。" -#: src/gutenprintui/panel.c:1739 src/gutenprintui2/panel.c:1739 +#: src/gutenprintui2/panel.c:1914 msgid "Enter the file to print to. " msgstr "請輸入列å°æ™‚寫入的檔案。" -#: src/gutenprintui/panel.c:1747 src/gutenprintui2/panel.c:1747 +#: src/gutenprintui2/panel.c:1922 msgid "File to print to" msgstr "" -#: src/gutenprintui/panel.c:1755 src/gutenprintui2/panel.c:1755 +#: src/gutenprintui2/panel.c:1930 msgid "Print To File" msgstr "列å°è‡³æª”案" -#: src/gutenprintui/panel.c:1785 src/gutenprintui2/panel.c:1785 +#: src/gutenprintui2/panel.c:1960 msgid "Define New Printer" msgstr "定義新的å°è¡¨æ©Ÿ" -#: src/gutenprintui/panel.c:1803 src/gutenprintui/panel.c:1887 -#: src/gutenprintui2/panel.c:1803 src/gutenprintui2/panel.c:1887 +#: src/gutenprintui2/panel.c:1978 src/gutenprintui2/panel.c:2062 msgid "Printer Name:" msgstr "å°è¡¨æ©Ÿå稱：" -#: src/gutenprintui/panel.c:1807 src/gutenprintui2/panel.c:1807 +#: src/gutenprintui2/panel.c:1982 msgid "Enter the name you wish to give this logical printer" msgstr "為這個虛擬å°è¡¨æ©Ÿå‘½å" -#: src/gutenprintui/panel.c:1817 src/gutenprintui2/panel.c:1817 +#: src/gutenprintui2/panel.c:1992 msgid "About Gutenprint " msgstr "關於 Gutenprint " -#: src/gutenprintui/panel.c:1824 src/gutenprintui2/panel.c:1824 +#: src/gutenprintui2/panel.c:1999 msgid "Gutenprint Version " msgstr "Gutenprint 版本 " -#: src/gutenprintui/panel.c:1872 src/gutenprintui2/panel.c:1872 +#: src/gutenprintui2/panel.c:2047 msgid "Printer Settings" msgstr "å°è¡¨æ©Ÿè¨­å®š" -#: src/gutenprintui/panel.c:1885 src/gutenprintui2/panel.c:1885 +#: src/gutenprintui2/panel.c:2060 msgid "" "Select the name of the printer (not the type, or model, of printer) that you " "wish to print to" msgstr "指定å°è¡¨æ©Ÿå稱 (ä¸æ˜¯å°è¡¨æ©Ÿé¡žåž‹æˆ–者型號)" -#: src/gutenprintui/panel.c:1902 src/gutenprintui2/panel.c:1902 +#: src/gutenprintui2/panel.c:2077 msgid "Setup Printer..." msgstr "設定å°è¡¨æ©Ÿ..." -#: src/gutenprintui/panel.c:1904 src/gutenprintui2/panel.c:1904 +#: src/gutenprintui2/panel.c:2079 msgid "" "Choose the printer model, PPD file, and command that is used to print to " "this printer" msgstr "é¸å–列å°æ™‚使用的å°è¡¨æ©Ÿåž‹è™Ÿã€PPD 檔åŠæŒ‡ä»¤" -#: src/gutenprintui/panel.c:1917 src/gutenprintui2/panel.c:1917 +#: src/gutenprintui2/panel.c:2092 msgid "New Printer..." msgstr "新增å°è¡¨æ©Ÿ..." -#: src/gutenprintui/panel.c:1918 src/gutenprintui2/panel.c:1918 +#: src/gutenprintui2/panel.c:2093 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:1948 src/gutenprintui2/panel.c:1948 +#: src/gutenprintui2/panel.c:2123 msgid "Set Printer Option Defaults" msgstr "" -#: src/gutenprintui/panel.c:1949 src/gutenprintui2/panel.c:1949 +#: src/gutenprintui2/panel.c:2124 msgid "Set all printer options to their defaults" msgstr "" -#: src/gutenprintui/panel.c:1972 src/gutenprintui2/panel.c:1972 +#: src/gutenprintui2/panel.c:2147 msgid "Image Size" msgstr "å½±åƒå°ºå¯¸" -#: src/gutenprintui/panel.c:1997 src/gutenprintui2/panel.c:1997 +#: src/gutenprintui2/panel.c:2172 msgid "Scaling:" msgstr "縮放：" -#: src/gutenprintui/panel.c:2001 src/gutenprintui2/panel.c:2001 +#: src/gutenprintui2/panel.c:2176 msgid "Set the scale (size) of the image" msgstr "指定影åƒçš„縮放比例 (尺寸)" -#: src/gutenprintui/panel.c:2023 src/gutenprintui2/panel.c:2023 +#: src/gutenprintui2/panel.c:2198 msgid "Scale by:" msgstr "" -#: src/gutenprintui/panel.c:2028 src/gutenprintui2/panel.c:2028 +#: src/gutenprintui2/panel.c:2203 msgid "" "Select whether scaling is measured as percent of available page size or " "number of output dots per inch" msgstr "指定放大縮å°å½±åƒæ™‚çš„å–®ä½ï¼Œæ˜¯é é¢å°ºå¯¸çš„百分比，還是æ¯è‹±å‹æœ‰å¤šå°‘點" -#: src/gutenprintui/panel.c:2031 src/gutenprintui2/panel.c:2031 +#: src/gutenprintui2/panel.c:2206 msgid "Percent" msgstr "百分比" -#: src/gutenprintui/panel.c:2036 src/gutenprintui2/panel.c:2036 +#: src/gutenprintui2/panel.c:2211 msgid "Scale the print to the size of the page" msgstr "指定列å°æ™‚çš„å½±åƒå°ºå¯¸ç‚ºé é¢å°ºå¯¸çš„æŸå€‹ç™¾åˆ†æ¯”" -#: src/gutenprintui/panel.c:2040 src/gutenprintui2/panel.c:2040 +#: src/gutenprintui2/panel.c:2215 msgid "PPI" msgstr "PPI" -#: src/gutenprintui/panel.c:2045 src/gutenprintui2/panel.c:2045 +#: src/gutenprintui2/panel.c:2220 msgid "Scale the print to the number of dots per inch" msgstr "列å°æ™‚，é€éŽæŒ‡å®šæ¯è‹±å‹æœ‰å¤šå°‘點來放大縮å°å½±åƒ" -#: src/gutenprintui/panel.c:2063 src/gutenprintui2/panel.c:2063 +#: src/gutenprintui2/panel.c:2238 msgid "Set the width of the print" msgstr "指定列å°æ™‚çš„å½±åƒå¯¬åº¦" -#: src/gutenprintui/panel.c:2065 src/gutenprintui2/panel.c:2065 +#: src/gutenprintui2/panel.c:2240 msgid "Set the height of the print" msgstr "指定列å°æ™‚çš„å½±åƒé«˜åº¦" -#: src/gutenprintui/panel.c:2071 src/gutenprintui2/panel.c:2071 +#: src/gutenprintui2/panel.c:2246 msgid "" "Use Original\n" "Image Size" @@ -7175,148 +7602,103 @@ msgstr "" "使用影åƒ\n" "原來的尺寸" -#: src/gutenprintui/panel.c:2077 src/gutenprintui2/panel.c:2077 +#: src/gutenprintui2/panel.c:2252 msgid "Set the print size to the size of the image" msgstr "將列å°æ™‚çš„å½±åƒå°ºå¯¸è¨­å®šç‚ºå½±åƒåŽŸä¾†çš„尺寸" -#: src/gutenprintui/panel.c:2100 src/gutenprintui2/panel.c:2101 +#: src/gutenprintui2/panel.c:2276 msgid "Print Color Adjust" msgstr "列å°è‰²å½©èª¿æ•´" -#: src/gutenprintui/panel.c:2103 src/gutenprintui2/panel.c:2104 +#: src/gutenprintui2/panel.c:2279 msgid "Set Defaults" msgstr "" -#: src/gutenprintui/panel.c:2105 src/gutenprintui2/panel.c:2106 +#: src/gutenprintui2/panel.c:2281 msgid "Close" msgstr "關閉" -#: src/gutenprintui/panel.c:2134 src/gutenprintui2/panel.c:2135 +#: src/gutenprintui2/panel.c:2310 msgid "Image preview" msgstr "å½±åƒé è¦½" -#: src/gutenprintui/panel.c:2148 src/gutenprintui2/panel.c:2149 +#: src/gutenprintui2/panel.c:2324 msgid "View Output Channels:" msgstr "" -#: src/gutenprintui/panel.c:2234 src/gutenprintui2/panel.c:2240 +#: src/gutenprintui2/panel.c:2415 msgid "Output" msgstr "" -#: src/gutenprintui/panel.c:2262 src/gutenprintui2/panel.c:2268 +#: src/gutenprintui2/panel.c:2443 msgid "Output Type:" msgstr "" -#: src/gutenprintui/panel.c:2266 src/gutenprintui2/panel.c:2272 +#: src/gutenprintui2/panel.c:2447 msgid "Select the desired output type" msgstr "指定輸出類型：" -#: src/gutenprintui/panel.c:2287 src/gutenprintui2/panel.c:2293 +#: src/gutenprintui2/panel.c:2468 msgid "Adjust Output..." msgstr "調整輸出çµæžœ..." -#: src/gutenprintui/panel.c:2296 src/gutenprintui2/panel.c:2302 +#: src/gutenprintui2/panel.c:2477 msgid "" "Adjust color balance, brightness, contrast, saturation, and dither algorithm" msgstr "調整色彩平衡ã€å…‰åº¦ã€åå·®ã€å½©åº¦åŠæ“¬è‰²çš„é‹ç®—æ–¹å¼" -#: src/gutenprintui/panel.c:2314 src/gutenprintui2/panel.c:2321 +#: src/gutenprintui2/panel.c:2496 msgid "Size Units:" msgstr "尺寸單ä½ï¼š" -#: src/gutenprintui/panel.c:2317 src/gutenprintui2/panel.c:2324 +#: src/gutenprintui2/panel.c:2499 msgid " " msgstr "" -#: src/gutenprintui/panel.c:2341 src/gutenprintui2/panel.c:2348 +#: src/gutenprintui2/panel.c:2523 msgid "Units:" msgstr "å–®ä½ï¼š" -#: src/gutenprintui/panel.c:2346 src/gutenprintui2/panel.c:2353 +#: src/gutenprintui2/panel.c:2528 msgid "Select the base unit of measurement for printing" msgstr "指定列å°æ™‚的基本長度單ä½" -#: src/gutenprintui/plist.c:90 src/gutenprintui/plist.c:99 -#: src/gutenprintui2/plist.c:89 src/gutenprintui2/plist.c:98 +#: src/gutenprintui2/plist.c:92 src/gutenprintui2/plist.c:101 msgid "System V lp" msgstr "System V lp" -#: src/gutenprintui/plist.c:96 src/gutenprintui2/plist.c:95 +#: src/gutenprintui2/plist.c:98 msgid "CUPS" msgstr "CUPS" -#: src/gutenprintui/plist.c:102 src/gutenprintui2/plist.c:101 +#: src/gutenprintui2/plist.c:104 msgid "Berkeley lpd (/etc/lpc)" msgstr "Berkeley lpd (/etc/lpc)" -#: src/gutenprintui/plist.c:105 src/gutenprintui2/plist.c:104 +#: src/gutenprintui2/plist.c:107 msgid "Berkeley lpd (/usr/bsd/lpc)" msgstr "Berkeley lpd (/usr/bsd/lpc)" -#: src/gutenprintui/plist.c:108 src/gutenprintui2/plist.c:107 +#: src/gutenprintui2/plist.c:110 msgid "Berkeley lpd (/usr/etc/lpc" msgstr "Berkeley lpd (/usr/etc/lpc" -#: src/gutenprintui/plist.c:111 src/gutenprintui2/plist.c:110 +#: src/gutenprintui2/plist.c:113 msgid "Berkeley lpd (/usr/libexec/lpc)" msgstr "Berkeley lpd (/usr/libexec/lpc)" -#: src/gutenprintui/plist.c:114 src/gutenprintui2/plist.c:113 +#: src/gutenprintui2/plist.c:116 msgid "Berkeley lpd (/usr/sbin/lpc)" msgstr "Berkeley lpd (/usr/sbin/lpc)" -#: src/gutenprintui/plist.c:1043 src/gutenprintui2/plist.c:1057 +#: src/gutenprintui2/plist.c:1060 msgid "Printer" msgstr "å°è¡¨æ©Ÿ" -#: src/gutenprintui/plist.c:1230 src/gutenprintui2/plist.c:1250 +#: src/gutenprintui2/plist.c:1253 msgid "(Default Printer)" msgstr "(é è¨­å°è¡¨æ©Ÿ)" -#: src/gutenprintui2/curve.c:130 -msgid "Curve type" -msgstr "" - -#: src/gutenprintui2/curve.c:131 -msgid "Is this curve linear, spline interpolated, or free-form" -msgstr "" - -#: src/gutenprintui2/curve.c:139 -msgid "Minimum X" -msgstr "X 下é™" - -#: src/gutenprintui2/curve.c:140 -msgid "Minimum possible value for X" -msgstr "" - -#: src/gutenprintui2/curve.c:149 -msgid "Maximum X" -msgstr "X 上é™" - -#: src/gutenprintui2/curve.c:150 -msgid "Maximum possible X value" -msgstr "" - -#: src/gutenprintui2/curve.c:159 -msgid "Minimum Y" -msgstr "Y 下é™" - -#: src/gutenprintui2/curve.c:160 -msgid "Minimum possible value for Y" -msgstr "" - -#: src/gutenprintui2/curve.c:169 -msgid "Maximum Y" -msgstr "Y 上é™" - -#: src/gutenprintui2/curve.c:170 -msgid "Maximum possible value for Y" -msgstr "" - -#: src/gutenprintui2/gammacurve.c:418 -msgid "_Gamma value" -msgstr "_Gamma 值" - #: src/cups/genppd.c:145 msgid "Printer Features" msgstr "å°è¡¨æ©ŸåŠŸèƒ½" @@ -7352,50 +7734,50 @@ msgstr "" #. 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:1058 +#: src/cups/genppd.c:1064 msgid "English" -msgstr "Chinese-TW" +msgstr "" #. TRANSLATORS: Specify PPD translation encoding e.g. ISOLatin1 -#: src/cups/genppd.c:1060 +#: src/cups/genppd.c:1066 msgid "ISOLatin1" msgstr "" -#: src/cups/genppd.c:1641 +#: src/cups/genppd.c:1647 #, fuzzy msgid "2-Sided Printing" msgstr "é›™é¢åˆ—å°" -#: src/cups/genppd.c:1665 +#: src/cups/genppd.c:1671 msgid "Shrink Page If Necessary to Fit Borders" msgstr "" -#: src/cups/genppd.c:1669 +#: src/cups/genppd.c:1675 msgid "Shrink (print the whole page)" msgstr "" -#: src/cups/genppd.c:1670 +#: src/cups/genppd.c:1676 msgid "Crop (preserve dimensions)" msgstr "" -#: src/cups/genppd.c:1671 +#: src/cups/genppd.c:1677 msgid "Expand (use maximum page area)" msgstr "" -#: src/cups/genppd.c:1756 +#: src/cups/genppd.c:1762 msgid "No" msgstr "å¦" -#: src/cups/genppd.c:1758 +#: src/cups/genppd.c:1764 msgid "Yes" msgstr "是" -#: src/cups/genppd.c:1795 src/cups/genppd.c:1857 +#: src/cups/genppd.c:1801 src/cups/genppd.c:1863 #, fuzzy msgid "Value" msgstr "è—" -#: src/cups/genppd.c:1800 +#: src/cups/genppd.c:1806 msgid "Fine Adjustment" msgstr "" @@ -8093,205 +8475,21 @@ msgstr "" msgid "Error in input\n" msgstr "" -#: src/gimp/print-image-gimp.c:225 src/gimp2/print-image-gimp.c:225 +#: src/gimp2/print-image-gimp.c:225 msgid "Printing..." msgstr "列å°ä¸­..." -#: src/gimp/print.c:133 -msgid "/File/Print..." -msgstr "/檔案/列å°..." - -#: src/ghost/ijsgutenprint.c:98 -#, c-format -msgid "" -"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" -msgstr "" - -#: 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:199 -#, c-format -msgid "ERROR: ijsgutenprint: No row buffer\n" -msgstr "" - -#: 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:498 -#, c-format -msgid "ERROR: ijsgutenprint: Printer must be specified with -sDeviceModel\n" -msgstr "錯誤：ijsgutenprint：å°è¡¨æ©Ÿå¿…須用 -sDeviceModel é¸é …指定\n" - -#: 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:656 -#, c-format -msgid "ijsgutenprint: unknown DeviceModel %s\n" -msgstr "ijsgutenprint：DeviceModel %s ä¸æ˜Ž\n" - -#: src/ghost/ijsgutenprint.c:700 -#, c-format -msgid "ERROR: ijsgutenprint: cannot parse TopLeft %s\n" -msgstr "" - -#: src/ghost/ijsgutenprint.c:723 -#, c-format -msgid "ERROR: ijsgutenprint: cannot parse PaperSize %s\n" -msgstr "" - -#: src/ghost/ijsgutenprint.c:795 -#, c-format -msgid "ERROR: ijsgutenprint: cannot parse curve %s\n" -msgstr "" - -#: src/ghost/ijsgutenprint.c:802 -#, c-format -msgid "ERROR: ijsgutenprint: cannot parse %s float %s\n" -msgstr "" - -#: src/ghost/ijsgutenprint.c:809 -#, c-format -msgid "ERROR: ijsgutenprint: cannot parse %s int %s\n" -msgstr "" - -#: src/ghost/ijsgutenprint.c:816 -#, c-format -msgid "ERROR: ijsgutenprint: cannot parse %s dimension %s\n" -msgstr "" - -#: src/ghost/ijsgutenprint.c:830 -#, c-format -msgid "ERROR: ijsgutenprint: cannot parse %s boolean %s\n" -msgstr "" - -#: src/ghost/ijsgutenprint.c:841 -#, c-format -msgid "ERROR: ijsgutenprint: Bad parameter %s %d\n" -msgstr "" - -#: src/ghost/ijsgutenprint.c:867 -#, c-format -msgid "ERROR: ijsgutenprint: bad key code %d\n" -msgstr "" - -#: src/ghost/ijsgutenprint.c:1308 -#, c-format -msgid "ERROR: ijsgutenprint: image_init failed %d\n" -msgstr "" - -#: src/ghost/ijsgutenprint.c:1319 -#, c-format -msgid "ERROR: ijsgutenprint: Unable to open file descriptor: %s\n" -msgstr "" - -#: 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:1344 -#, c-format -msgid "ERROR: ijsgutenprint: Unknown printer %s\n" -msgstr "" - -#: src/ghost/ijsgutenprint.c:1516 -#, c-format -msgid "ERROR: ijsgutenprint: Bad parameters; cannot continue!\n" -msgstr "" - -#: src/ghost/ijsgutenprint.c:1534 -#, c-format -msgid "ERROR: ijsgutenprint: Get next row failed at %.0f\n" -msgstr "" - -#, fuzzy -#~ msgid "Canon MULTIPASS MP500" -#~ msgstr "Canon S4500" - -#, fuzzy -#~ msgid "Canon MULTIPASS MP700" -#~ msgstr "Canon S400" - -#, fuzzy -#~ msgid "Canon MULTIPASS MP760" -#~ msgstr "Canon CP100" - -#~ msgid " Gamma" -#~ msgstr " Gamma" - -#, fuzzy -#~ msgid "1440 x 1440" -#~ msgstr "1440 x 1440 DPI" - -#, fuzzy -#~ msgid "1440 x 1440 DPI High Quality" -#~ msgstr "2880 x 720 DPI 最高å“質" - -#, fuzzy -#~ msgid "1440 x 1440 DPI Highest Quality" -#~ msgstr "1440 x 720 DPI 最高å“質" +#~ msgid "ERROR: ijsgutenprint: Printer must be specified with -sDeviceModel\n" +#~ msgstr "錯誤：ijsgutenprint：å°è¡¨æ©Ÿå¿…須用 -sDeviceModel é¸é …指定\n" -#, fuzzy -#~ msgid "2880 x 1440 DPI High Quality" -#~ msgstr "2880 x 720 DPI 最高å“質" +#~ msgid "ERROR: ijsgutenprint: Printer %s is not a known model\n" +#~ msgstr "錯誤：ijsgutenprint：å°è¡¨æ©Ÿ %s ä¸å±¬æ–¼å·²çŸ¥çš„型號\n" -#, fuzzy -#~ msgid "2880 x 1440 DPI Highest Quality" -#~ msgstr "2880 x 720 DPI 最高å“質" +#~ msgid "ijsgutenprint: unknown DeviceModel %s\n" +#~ msgstr "ijsgutenprint：DeviceModel %s ä¸æ˜Ž\n" -#, fuzzy -#~ msgid "" -#~ "\n" -#~ "\n" -#~ "Copyright (C) 1997-2003 Michael Sweet, Robert Krawitz,\n" -#~ "and the rest of the Gutenprint Development Team.\n" -#~ "\n" -#~ "Please visit our web site at http://gimp-print.sourceforge.net.\n" -#~ "\n" -#~ "This program is free software; you can redistribute it and/or modify\n" -#~ "it under the terms of the GNU General Public License as published by\n" -#~ "the Free Software Foundation; either version 2 of the License, or\n" -#~ "(at your option) any later version.\n" -#~ "\n" -#~ "This program is distributed in the hope that it will be useful,\n" -#~ "but WITHOUT ANY WARRANTY; without even the implied warranty of\n" -#~ "MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the\n" -#~ "GNU General Public License for more details.\n" -#~ "\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" -#~ msgstr "" -#~ "\n" -#~ "\n" -#~ "版權所有 © 1997-2003 Michael Sweetã€Robert Krawitz\n" -#~ "åŠæ•´å€‹ Gutenprint 開發隊ä¼ã€‚\n" -#~ "\n" -#~ "è«‹ç€è¦½æˆ‘們的網é ï¼š http://gimp-print.sourceforge.net\n" -#~ "\n" -#~ "本程å¼ç‚ºè‡ªç”±è»Ÿé«”；您å¯ä¾æ“šè‡ªç”±è»Ÿé«”基金會所發表的GNU通用公共授權æ¢æ¬¾è¦å®šï¼Œ" -#~ "就本程å¼å†ç‚ºæ•£å¸ƒèˆ‡ï¼æˆ–修改；無論您ä¾æ“šçš„是本授權的第二版或（您自行é¸æ“‡çš„）" -#~ "任一日後發行的版本。\n" -#~ "本程å¼ä¿‚基於使用目的而加以散布，然而ä¸è² ä»»ä½•æ“”ä¿è²¬ä»»ï¼›äº¦ç„¡å°é©å”®æ€§æˆ–特定目" -#~ "çš„é©ç”¨æ€§æ‰€ç‚ºçš„默示性擔ä¿ã€‚詳情請åƒç…§ GNU 通用公共授權。\n" -#~ "您應已收到附隨於本程å¼çš„GNU通用公共授權的副本；如無，請寫信至自由軟體基金" -#~ "會：59 Temple Place – Suite 330, Boston, Ma 02111-1307, USA。\n" +#~ msgid "ERROR: ijsgutenprint: Unable to open %s: %s\n" +#~ msgstr "錯誤：ijsgutenprint：無法開啟 %s：%s\n" #~ msgid "90x90 DPI" #~ msgstr "90x90 DPI" @@ -8317,9 +8515,6 @@ msgstr "" #~ msgid "720x360 DPI DMT" #~ msgstr "720x360 DPI DMT" -#~ msgid "720x720 DPI" -#~ msgstr "720x720 DPI" - #~ msgid "720x720 DPI DMT" #~ msgstr "720x720 DPI DMT" @@ -8368,10 +8563,6 @@ msgstr "" #~ msgid "2400x2400 DPI DMT" #~ msgstr "2400x2400 DPI DMT" -#, fuzzy -#~ msgid "Plain Paper PIXMA" -#~ msgstr "普通紙張" - #~ msgid "Envelope" #~ msgstr "ä¿¡å°" @@ -8395,18 +8586,14 @@ msgstr "" #~ msgid "Photo Paper Pro" #~ msgstr "專業級相紙" -#~ msgid "CMYK Color" -#~ msgstr "CMYK 色系" - #~ msgid "CMY Color" #~ msgstr "CMY 色系" -#, fuzzy -#~ msgid "Canon iP4000" -#~ msgstr "Canon S400" +#~ msgid "CMYK Color" +#~ msgstr "CMYK 色系" -#~ msgid "Gutenprint" -#~ msgstr "Gutenprint" +#~ msgid " Gamma" +#~ msgstr " Gamma" #, fuzzy #~ msgid "Canon BJC 4400 photo" @@ -8424,10 +8611,6 @@ msgstr "" #~ 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" @@ -8473,9 +8656,15 @@ msgstr "" #~ msgid "HP LaserJet 6 series" #~ msgstr "HP LaserJet 6 系列" +#~ msgid "Gutenprint" +#~ msgstr "Gutenprint" + #~ msgid "Cannot identify printer!\n" #~ msgstr "無法識別å°è¡¨æ©Ÿï¼\n" +#~ msgid "/File/Print..." +#~ msgstr "/檔案/列å°..." + #~ msgid "Red Balance" #~ msgstr "紅色平衡" diff --git a/samples/Makefile.in b/samples/Makefile.in index 82c90d7..bffccb3 100644 --- a/samples/Makefile.in +++ b/samples/Makefile.in @@ -42,13 +42,12 @@ DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \ subdir = samples 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/isc-posix.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 + $(top_srcdir)/m4/iconv.m4 $(top_srcdir)/m4/isc-posix.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 @@ -114,27 +113,13 @@ 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@ GREP = @GREP@ 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@ @@ -142,13 +127,6 @@ 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@ @@ -253,16 +231,12 @@ docdir = @docdir@ dvidir = @dvidir@ 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@ @@ -291,6 +265,7 @@ target_alias = @target_alias@ top_builddir = @top_builddir@ top_srcdir = @top_srcdir@ AM_CPPFLAGS = -I$(top_srcdir)/include -I$(top_builddir)/include $(LOCAL_CPPFLAGS) $(GNUCFLAGS) +GUTENPRINTUI_LIBS = $(top_builddir)/src/gutenprintui/libgutenprintui.la pkgsampledatadir = $(datadir)/$(PACKAGE)/samples @INSTALL_SAMPLES_TRUE@pkgsampledata_DATA = colorbars4.png colorsweep.png profile.jpg MAINTAINERCLEANFILES = Makefile.in diff --git a/scripts/Makefile.in b/scripts/Makefile.in index 1eaa5ff..4e85743 100644 --- a/scripts/Makefile.in +++ b/scripts/Makefile.in @@ -43,13 +43,12 @@ DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \ subdir = scripts 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/isc-posix.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 + $(top_srcdir)/m4/iconv.m4 $(top_srcdir)/m4/isc-posix.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 @@ -106,27 +105,13 @@ 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@ GREP = @GREP@ 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@ @@ -134,13 +119,6 @@ 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@ @@ -245,16 +223,12 @@ docdir = @docdir@ dvidir = @dvidir@ 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@ @@ -283,6 +257,7 @@ target_alias = @target_alias@ top_builddir = @top_builddir@ top_srcdir = @top_srcdir@ AM_CPPFLAGS = -I$(top_srcdir)/include -I$(top_builddir)/include $(LOCAL_CPPFLAGS) $(GNUCFLAGS) +GUTENPRINTUI_LIBS = $(top_builddir)/src/gutenprintui/libgutenprintui.la # The autotools-installed scripts /should/ be automatically distributed. EXTRA_DIST = \ diff --git a/scripts/mkchlog b/scripts/mkchlog index 4a0b5d0..f6d9a45 100755 --- a/scripts/mkchlog +++ b/scripts/mkchlog @@ -5,6 +5,10 @@ # This code is in the public domain and may be used # for any purpose. +# Configuration options. +$emailsuffix = '@sourceforge.net'; +$symbolic_name_regexp = '^(guten|gimp-|)print-[0-9]+_'; + %logmsgs = (); # Index by date, time, and author %fileversions = (); $skipme = 0; @@ -90,7 +94,7 @@ sub compare_versions my ($vw, $vl) = @_; - my (@vvl) = split /\./, $vl; + my (@vvl) = split(/\./, $vl); if ($vw eq "") { if ($#vvl < 2) { @@ -100,7 +104,7 @@ sub compare_versions } } - my (@vvw) = split /\./, $vw; + my (@vvw) = split(/\./, $vw); if ($#vvl > $#vvw) { return 3; } @@ -118,50 +122,74 @@ sub compare_versions return 1; } +my ($in_header) = 0; +my (%symbols); +my $revision; +my $ignore; +my $currentfile; +my $currentbasefile; +my %symbols_printed = (); + while (<>) { if (/^Working file: /) { + $in_header = 1; chomp; ($ignore, $ignore, $currentfile) = split; + next; + } elsif ($in_header && $_ =~ /^symbolic names:/) { while (<>) { - if (/^----------------------------$/) { + if (/^\s/) { + my ($name, $revision) = split; + $name =~ s/:$//; + next if (! ($name =~ /$symbolic_name_regexp/)); + if (! defined $symbols{$currentfile}{$revision}) { + $symbols{$currentfile}{$revision} = (); + } + push @{$symbols{$currentfile}{$revision}}, $name; + } else { last; } } + } elsif ($_ =~ /^----------------------------$/) { + $in_header = 0; next; - } elsif (/^----------------------------$/) { - next; - } elsif (/^revision /) { + } elsif (! $in_header && $_ =~ /^revision /) { ($ignore, $revision) = split; - my ($currentbasefile) = $currentfile; + ($currentbasefile) = $currentfile; $currentbasefile =~ s;.*/([^/]+);\1;; - my ($check) =&compare_versions($fileversions{$currentfile}, $revision); + my ($check) = compare_versions($fileversions{$currentfile}, $revision); # # Special case -- if a file is not in the current sandbox, but it # has the same base name as a file in the sandbox, log it; # otherwise if it is not in the current sandbox, don't log it. # if (($check == 2 && (1 || ( - ($basenames{"$currentbasefile"} || !($currentfile =~ /\//)) && + ($basenames{$currentbasefile} || !($currentfile =~ /\//)) && ($currentfile =~ /\.[chly]$/)))) || $check == 1) { $skipme = 0; } else { + # We don't want to print out any symbolic names associated with + # skipped versions. + map { + $symbols_printed{$_} = 1; + } @{$symbols{$currentfile}{$revision}}; $skipme = 1; } - } elsif (/^date: /) { - ($ignore, $date, $time, $ignore, $author, $ignore, $state, - $ignore, $plus, $minus, $ignore) = split; + } elsif (! $in_header && $_ =~ /^date: /) { + my ($ignore, $date, $time, $ignore, $author, $ignore, $state, + $ignore, $plus, $minus, $ignore) = split; # $time =~ s/[0-9]:[0-9][0-9];$//; # $time =~ s/[0-9][0-9];$//; $author =~ s/;$//; - $body = ""; - $firstline = 1; + my $body = ""; + my $firstline = 1; while (<>) { - if (/^----------------------------$/) { + if ($_ =~ /^----------------------------$/) { last; - } elsif (/^=============================================================================$/) { + } elsif ($_ =~ /^=============================================================================$/) { last; - } elsif ($firstline && /^branches:([ \t]+[0-9]+(\.[0-9]+)+;)+$/) { + } elsif ($firstline && $_ =~ /^branches:([ \t]+[0-9]+(\.[0-9]+)+;)+$/) { next; } else { $body .= $_; @@ -171,7 +199,8 @@ while (<>) { $junkbody = $body; $junkbody =~ s/\s//g; $junkbody .= "x"; - $datetimeauthor = "$date $time $author $junkbody $currentfile $revision"; + my $symbols = join " ", @{$symbols{$currentfile}{$revision}}; + my $datetimeauthor = "$date $time $author $junkbody $currentfile $revision $symbols"; if ($skipme == 0) { $logmsgs{$datetimeauthor} = $body; if ($plus eq "") { @@ -194,7 +223,7 @@ $header=""; %filenames_printed = (); foreach $_ (@chlog) { - ($date, $time, $author, $junk, $file, $revision) = split; + my ($date, $time, $author, $junk, $file, $revision, @symbols) = split; $date =~ s,/,-,g; $msg = $logmsgs{$_}; my $delta; @@ -218,16 +247,30 @@ foreach $_ (@chlog) { print "$prevmsg\n"; %filenames_printed = (); } - $header = "$date\t<$author\@sourceforge.net>\n\n"; + $header = "$date\t<$author$emailsuffix>\n\n"; $prevmsg = $msg; @fileinfo = (); push @fileinfo, "\t\t$file ($revision) ($delta)\n"; $filenames_printed{$file} = 1; } + my (@symbols_to_print); + foreach my $s (@symbols) { + if (! $symbols_printed{$s}) { + push @symbols_to_print, $s; + $symbols_printed{$s} = 1; + } + } + if (@symbols_to_print) { + print "===============================================================================\n"; + map { + print "Name: $_\n"; + } @symbols_to_print; + print "\n"; + } } if ($prevmsg ne "" or $#fileinfo >= 0) { - print "$date\t<$author\@sourceforge.net>\n\n"; + print "$date\t<$author$emailsuffix>\n\n"; $filestuff = join "", sort @fileinfo; $filestuff =~ s/\t/\tFiles:/; print "$filestuff\n"; diff --git a/src/Makefile.am b/src/Makefile.am index 0f471da..fc635f1 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -1,4 +1,4 @@ -## $Id: Makefile.am,v 1.19 2005/11/21 11:16:22 rleigh Exp $ +## $Id: Makefile.am,v 1.20 2006/09/18 02:31:57 rlk Exp $ ## Copyright (C) 2000 Roger Leigh ## ## This program is free software; you can redistribute it and/or modify @@ -23,10 +23,8 @@ include $(top_srcdir)/scripts/global.mk SUBDIRS = \ main \ - gutenprintui \ gutenprintui2 \ escputil \ - gimp \ gimp2 \ cups \ foomatic \ diff --git a/src/Makefile.in b/src/Makefile.in index 1ce3791..77e3e94 100644 --- a/src/Makefile.in +++ b/src/Makefile.in @@ -41,13 +41,12 @@ DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \ subdir = src 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/isc-posix.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 + $(top_srcdir)/m4/iconv.m4 $(top_srcdir)/m4/isc-posix.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 @@ -116,27 +115,13 @@ 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@ GREP = @GREP@ 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@ @@ -144,13 +129,6 @@ 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@ @@ -255,16 +233,12 @@ docdir = @docdir@ dvidir = @dvidir@ 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@ @@ -293,12 +267,11 @@ target_alias = @target_alias@ top_builddir = @top_builddir@ top_srcdir = @top_srcdir@ AM_CPPFLAGS = -I$(top_srcdir)/include -I$(top_builddir)/include $(LOCAL_CPPFLAGS) $(GNUCFLAGS) +GUTENPRINTUI_LIBS = $(top_builddir)/src/gutenprintui/libgutenprintui.la SUBDIRS = \ main \ - gutenprintui \ gutenprintui2 \ escputil \ - gimp \ gimp2 \ cups \ foomatic \ diff --git a/src/cups/Makefile.am b/src/cups/Makefile.am index 04d870c..0331e80 100644 --- a/src/cups/Makefile.am +++ b/src/cups/Makefile.am @@ -1,4 +1,4 @@ -## $Id: Makefile.am,v 1.87.8.3 2007/12/15 20:35:36 rlk Exp $ +## $Id: Makefile.am,v 1.96 2008/04/06 01:10:52 rlk Exp $ ## Copyright (C) 2000 Roger Leigh ## ## This program is free software; you can redistribute it and/or modify @@ -34,7 +34,6 @@ pkgdatadir = $(cups_conf_datadir) pkglibdir = $(cups_conf_serverbin) pkgsysconfdir = $(cups_conf_serverroot) -cupsexec_backenddir = $(pkglibdir)/backend cupsexec_driverdir = $(pkglibdir)/driver cupsexec_filterdir = $(pkglibdir)/filter if CUPS_PPDS_AT_TOP_LEVEL @@ -67,8 +66,7 @@ endif if BUILD_CUPS bin_PROGRAMS = cups-calibrate sbin_PROGRAMS = cups-genppd.@GUTENPRINT_MAJOR_VERSION@.@GUTENPRINT_MINOR_VERSION@ -sbin_SCRIPTS = cups-genppdconfig.@GUTENPRINT_MAJOR_VERSION@.@GUTENPRINT_MINOR_VERSION@ cups-genppdupdate.@GUTENPRINT_MAJOR_VERSION@.@GUTENPRINT_MINOR_VERSION@ -cupsexec_backend_PROGRAMS = epson canon +sbin_SCRIPTS = cups-genppdupdate cupsexec_filter_PROGRAMS = rastertogutenprint.@GUTENPRINT_MAJOR_VERSION@.@GUTENPRINT_MINOR_VERSION@ commandtoepson commandtocanon TESTS= test-ppds test-rastertogutenprint @@ -88,12 +86,6 @@ commandtocanon_LDADD = $(CUPS_LIBS) commandtoepson_SOURCES = commandtoepson.c commandtoepson_LDADD = $(CUPS_LIBS) -canon_SOURCES = canon.c -canon_LDADD = $(CUPS_LIBS) - -epson_SOURCES = epson.c -epson_LDADD = $(CUPS_LIBS) - cups_genppd_@GUTENPRINT_MAJOR_VERSION@_@GUTENPRINT_MINOR_VERSION@_SOURCES = genppd.c cups_genppd_@GUTENPRINT_MAJOR_VERSION@_@GUTENPRINT_MINOR_VERSION@_CFLAGS = -DALL_LINGUAS='"@ALL_LINGUAS@"' $(BUILD_SIMPLE_PPDS) $(TRANSLATE_PPDS) cups_genppd_@GUTENPRINT_MAJOR_VERSION@_@GUTENPRINT_MINOR_VERSION@_LDADD = $(CUPS_LIBS) $(GENPPD_LIBS) $(GUTENPRINT_LIBS) @@ -108,11 +100,6 @@ rastertogutenprint_@GUTENPRINT_MAJOR_VERSION@_@GUTENPRINT_MINOR_VERSION@_SOURCES rastertogutenprint_@GUTENPRINT_MAJOR_VERSION@_@GUTENPRINT_MINOR_VERSION@_LDADD = $(CUPS_LIBS) $(GUTENPRINT_LIBS) rastertogutenprint_@GUTENPRINT_MAJOR_VERSION@_@GUTENPRINT_MINOR_VERSION@_LDFLAGS = $(STATIC_LDOPTS) -cups-genppdconfig.@GUTENPRINT_MAJOR_VERSION@.@GUTENPRINT_MINOR_VERSION@: $(top_builddir)/config.status cups-genppdconfig.in - cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/cups-genppdconfig -cups-genppdupdate.@GUTENPRINT_MAJOR_VERSION@.@GUTENPRINT_MINOR_VERSION@: $(top_builddir)/config.status cups-genppdupdate.in - cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/cups-genppdupdate - ## Data if BUILD_CUPS @@ -165,7 +152,6 @@ install-data-hook: -@echo 'These messages are harmless and should be ignored.' -rmdir $(DESTDIR)$(cups_modeldir) -rmdir $(DESTDIR)$(pkgdatadir) - -rmdir $(DESTDIR)$(cupsexec_backenddir) -rmdir $(DESTDIR)$(cupsexec_driverdir) -rmdir $(DESTDIR)$(cupsexec_filterdir) -rmdir $(DESTDIR)$(bindir) @@ -181,7 +167,7 @@ all-local: $(INSTALL_DATA_LOCAL_DEPS) ppd: ppd-stamp -ppd-stamp: cups-genppdconfig.@GUTENPRINT_MAJOR_VERSION@.@GUTENPRINT_MINOR_VERSION@ cups-genppd.@GUTENPRINT_MAJOR_VERSION@.@GUTENPRINT_MINOR_VERSION@ $(top_srcdir)/src/main/printers.xml $(top_srcdir)/src/main/papers.xml +ppd-stamp: cups-genppd.@GUTENPRINT_MAJOR_VERSION@.@GUTENPRINT_MINOR_VERSION@ $(top_srcdir)/src/main/printers.xml $(top_srcdir)/src/main/papers.xml $(MAKE) ppd-stamp-phony touch ppd-stamp @@ -229,7 +215,7 @@ clean-local: ## Clean CLEANFILES = ppd-stamp -DISTCLEANFILES = cups-genppdconfig.@GUTENPRINT_MAJOR_VERSION@.@GUTENPRINT_MINOR_VERSION@ cups-genppdupdate.@GUTENPRINT_MAJOR_VERSION@.@GUTENPRINT_MINOR_VERSION@ +DISTCLEANFILES = cups-genppdupdate MAINTAINERCLEANFILES = Makefile.in EXTRA_DIST = \ diff --git a/src/cups/Makefile.in b/src/cups/Makefile.in index dc0a6d7..fd5895c 100644 --- a/src/cups/Makefile.in +++ b/src/cups/Makefile.in @@ -38,53 +38,43 @@ POST_UNINSTALL = : build_triplet = @build@ host_triplet = @host@ DIST_COMMON = README $(srcdir)/Makefile.am $(srcdir)/Makefile.in \ - $(srcdir)/cups-genppdconfig.in $(srcdir)/cups-genppdupdate.in \ + $(srcdir)/cups-genppdupdate.in \ $(srcdir)/test-rastertogutenprint.in \ $(top_srcdir)/scripts/global.mk COPYING @BUILD_CUPS_1_2_TRUE@cupsexec_driver_PROGRAMS = gutenprint.@GUTENPRINT_MAJOR_VERSION@.@GUTENPRINT_MINOR_VERSION@$(EXEEXT) @BUILD_CUPS_TRUE@bin_PROGRAMS = cups-calibrate$(EXEEXT) @BUILD_CUPS_TRUE@sbin_PROGRAMS = cups-genppd.@GUTENPRINT_MAJOR_VERSION@.@GUTENPRINT_MINOR_VERSION@$(EXEEXT) -@BUILD_CUPS_TRUE@cupsexec_backend_PROGRAMS = epson$(EXEEXT) \ -@BUILD_CUPS_TRUE@ canon$(EXEEXT) @BUILD_CUPS_TRUE@cupsexec_filter_PROGRAMS = rastertogutenprint.@GUTENPRINT_MAJOR_VERSION@.@GUTENPRINT_MINOR_VERSION@$(EXEEXT) \ @BUILD_CUPS_TRUE@ commandtoepson$(EXEEXT) \ @BUILD_CUPS_TRUE@ commandtocanon$(EXEEXT) subdir = src/cups 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/isc-posix.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 + $(top_srcdir)/m4/iconv.m4 $(top_srcdir)/m4/isc-posix.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 = cups-genppdconfig cups-genppdupdate \ - test-rastertogutenprint +CONFIG_CLEAN_FILES = cups-genppdupdate test-rastertogutenprint am__installdirs = "$(DESTDIR)$(bindir)" \ - "$(DESTDIR)$(cupsexec_backenddir)" \ "$(DESTDIR)$(cupsexec_driverdir)" \ "$(DESTDIR)$(cupsexec_filterdir)" "$(DESTDIR)$(sbindir)" \ "$(DESTDIR)$(sbindir)" "$(DESTDIR)$(pkgdatadir)" \ "$(DESTDIR)$(pkgsysconfdir)" binPROGRAMS_INSTALL = $(INSTALL_PROGRAM) -cupsexec_backendPROGRAMS_INSTALL = $(INSTALL_PROGRAM) cupsexec_driverPROGRAMS_INSTALL = $(INSTALL_PROGRAM) cupsexec_filterPROGRAMS_INSTALL = $(INSTALL_PROGRAM) sbinPROGRAMS_INSTALL = $(INSTALL_PROGRAM) -PROGRAMS = $(bin_PROGRAMS) $(cupsexec_backend_PROGRAMS) \ - $(cupsexec_driver_PROGRAMS) $(cupsexec_filter_PROGRAMS) \ - $(sbin_PROGRAMS) -am_canon_OBJECTS = canon.$(OBJEXT) -canon_OBJECTS = $(am_canon_OBJECTS) -am__DEPENDENCIES_1 = -canon_DEPENDENCIES = $(am__DEPENDENCIES_1) +PROGRAMS = $(bin_PROGRAMS) $(cupsexec_driver_PROGRAMS) \ + $(cupsexec_filter_PROGRAMS) $(sbin_PROGRAMS) am_commandtocanon_OBJECTS = commandtocanon.$(OBJEXT) commandtocanon_OBJECTS = $(am_commandtocanon_OBJECTS) +am__DEPENDENCIES_1 = commandtocanon_DEPENDENCIES = $(am__DEPENDENCIES_1) am_commandtoepson_OBJECTS = commandtoepson.$(OBJEXT) commandtoepson_OBJECTS = $(am_commandtoepson_OBJECTS) @@ -103,9 +93,6 @@ cups_genppd_@GUTENPRINT_MAJOR_VERSION@_@GUTENPRINT_MINOR_VERSION@_LINK = \ $(CFLAGS) \ $(cups_genppd_@GUTENPRINT_MAJOR_VERSION@_@GUTENPRINT_MINOR_VERSION@_LDFLAGS) \ $(LDFLAGS) -o $@ -am_epson_OBJECTS = epson.$(OBJEXT) -epson_OBJECTS = $(am_epson_OBJECTS) -epson_DEPENDENCIES = $(am__DEPENDENCIES_1) am_gutenprint_@GUTENPRINT_MAJOR_VERSION@_@GUTENPRINT_MINOR_VERSION@_OBJECTS = gutenprint_@GUTENPRINT_MAJOR_VERSION@_@GUTENPRINT_MINOR_VERSION@-genppd.$(OBJEXT) gutenprint_@GUTENPRINT_MAJOR_VERSION@_@GUTENPRINT_MINOR_VERSION@_OBJECTS = $(am_gutenprint_@GUTENPRINT_MAJOR_VERSION@_@GUTENPRINT_MINOR_VERSION@_OBJECTS) gutenprint_@GUTENPRINT_MAJOR_VERSION@_@GUTENPRINT_MINOR_VERSION@_DEPENDENCIES = \ @@ -141,16 +128,14 @@ CCLD = $(CC) LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \ $(LDFLAGS) -o $@ -SOURCES = $(canon_SOURCES) $(commandtocanon_SOURCES) \ - $(commandtoepson_SOURCES) $(cups_calibrate_SOURCES) \ +SOURCES = $(commandtocanon_SOURCES) $(commandtoepson_SOURCES) \ + $(cups_calibrate_SOURCES) \ $(cups_genppd_@GUTENPRINT_MAJOR_VERSION@_@GUTENPRINT_MINOR_VERSION@_SOURCES) \ - $(epson_SOURCES) \ $(gutenprint_@GUTENPRINT_MAJOR_VERSION@_@GUTENPRINT_MINOR_VERSION@_SOURCES) \ $(rastertogutenprint_@GUTENPRINT_MAJOR_VERSION@_@GUTENPRINT_MINOR_VERSION@_SOURCES) -DIST_SOURCES = $(canon_SOURCES) $(commandtocanon_SOURCES) \ - $(commandtoepson_SOURCES) $(cups_calibrate_SOURCES) \ +DIST_SOURCES = $(commandtocanon_SOURCES) $(commandtoepson_SOURCES) \ + $(cups_calibrate_SOURCES) \ $(cups_genppd_@GUTENPRINT_MAJOR_VERSION@_@GUTENPRINT_MINOR_VERSION@_SOURCES) \ - $(epson_SOURCES) \ $(gutenprint_@GUTENPRINT_MAJOR_VERSION@_@GUTENPRINT_MINOR_VERSION@_SOURCES) \ $(rastertogutenprint_@GUTENPRINT_MAJOR_VERSION@_@GUTENPRINT_MINOR_VERSION@_SOURCES) am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; @@ -215,27 +200,13 @@ 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@ GREP = @GREP@ 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@ @@ -243,13 +214,6 @@ 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@ @@ -354,16 +318,12 @@ docdir = @docdir@ dvidir = @dvidir@ 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@ @@ -392,9 +352,9 @@ target_alias = @target_alias@ top_builddir = @top_builddir@ top_srcdir = @top_srcdir@ AM_CPPFLAGS = -I$(top_srcdir)/include -I$(top_builddir)/include $(LOCAL_CPPFLAGS) $(GNUCFLAGS) +GUTENPRINTUI_LIBS = $(top_builddir)/src/gutenprintui/libgutenprintui.la empty = pkgsysconfdir = $(cups_conf_serverroot) -cupsexec_backenddir = $(pkglibdir)/backend cupsexec_driverdir = $(pkglibdir)/driver cupsexec_filterdir = $(pkglibdir)/filter @CUPS_PPDS_AT_TOP_LEVEL_FALSE@cups_modeldir = $(pkgdatadir)/model/gutenprint/@GUTENPRINT_MAJOR_VERSION@.@GUTENPRINT_MINOR_VERSION@/ @@ -406,7 +366,7 @@ STP_ENV = STP_MODULE_PATH=$(top_builddir)/src/main/.libs:$(top_builddir)/src/mai @BUILD_TRANSLATED_CUPS_PPDS_TRUE@LINGUAS = $(ALL_LINGUAS) @BUILD_TRANSLATED_CUPS_PPDS_TRUE@TRANSLATE_PPDS = -DCUPS_TRANSLATED_PPDS @BUILD_SIMPLIFIED_CUPS_PPDS_TRUE@BUILD_SIMPLE_PPDS = -DGENERATE_SIMPLIFIED_PPDS -@BUILD_CUPS_TRUE@sbin_SCRIPTS = cups-genppdconfig.@GUTENPRINT_MAJOR_VERSION@.@GUTENPRINT_MINOR_VERSION@ cups-genppdupdate.@GUTENPRINT_MAJOR_VERSION@.@GUTENPRINT_MINOR_VERSION@ +@BUILD_CUPS_TRUE@sbin_SCRIPTS = cups-genppdupdate @BUILD_CUPS_TRUE@TESTS = test-ppds test-rastertogutenprint @BUILD_CUPS_TRUE@noinst_SCRIPTS = test-rastertogutenprint @BUILD_GENPPD_STATIC_TRUE@STATIC_LDOPTS = -static -export-dynamic @@ -416,10 +376,6 @@ commandtocanon_SOURCES = commandtocanon.c commandtocanon_LDADD = $(CUPS_LIBS) commandtoepson_SOURCES = commandtoepson.c commandtoepson_LDADD = $(CUPS_LIBS) -canon_SOURCES = canon.c -canon_LDADD = $(CUPS_LIBS) -epson_SOURCES = epson.c -epson_LDADD = $(CUPS_LIBS) cups_genppd_@GUTENPRINT_MAJOR_VERSION@_@GUTENPRINT_MINOR_VERSION@_SOURCES = genppd.c cups_genppd_@GUTENPRINT_MAJOR_VERSION@_@GUTENPRINT_MINOR_VERSION@_CFLAGS = -DALL_LINGUAS='"@ALL_LINGUAS@"' $(BUILD_SIMPLE_PPDS) $(TRANSLATE_PPDS) cups_genppd_@GUTENPRINT_MAJOR_VERSION@_@GUTENPRINT_MINOR_VERSION@_LDADD = $(CUPS_LIBS) $(GENPPD_LIBS) $(GUTENPRINT_LIBS) @@ -438,7 +394,7 @@ pkgsysconf_DATA = $(CUPS_CONF) @BUILD_CUPS_PPDS_TRUE@INSTALL_DATA_LOCAL_DEPS = ppd-stamp @USE_NLS_TRUE@PPD_NLS_1 = ppd-nls CLEANFILES = ppd-stamp -DISTCLEANFILES = cups-genppdconfig.@GUTENPRINT_MAJOR_VERSION@.@GUTENPRINT_MINOR_VERSION@ cups-genppdupdate.@GUTENPRINT_MAJOR_VERSION@.@GUTENPRINT_MINOR_VERSION@ +DISTCLEANFILES = cups-genppdupdate MAINTAINERCLEANFILES = Makefile.in EXTRA_DIST = \ COPYING \ @@ -481,8 +437,6 @@ $(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 -cups-genppdconfig: $(top_builddir)/config.status $(srcdir)/cups-genppdconfig.in - cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ cups-genppdupdate: $(top_builddir)/config.status $(srcdir)/cups-genppdupdate.in cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ test-rastertogutenprint: $(top_builddir)/config.status $(srcdir)/test-rastertogutenprint.in @@ -515,34 +469,6 @@ clean-binPROGRAMS: echo " rm -f $$p $$f"; \ rm -f $$p $$f ; \ done -install-cupsexec_backendPROGRAMS: $(cupsexec_backend_PROGRAMS) - @$(NORMAL_INSTALL) - test -z "$(cupsexec_backenddir)" || $(MKDIR_P) "$(DESTDIR)$(cupsexec_backenddir)" - @list='$(cupsexec_backend_PROGRAMS)'; for p in $$list; do \ - p1=`echo $$p|sed 's/$(EXEEXT)$$//'`; \ - if test -f $$p \ - || test -f $$p1 \ - ; then \ - f=`echo "$$p1" | sed 's,^.*/,,;$(transform);s/$$/$(EXEEXT)/'`; \ - echo " $(INSTALL_PROGRAM_ENV) $(LIBTOOL) --mode=install $(cupsexec_backendPROGRAMS_INSTALL) '$$p' '$(DESTDIR)$(cupsexec_backenddir)/$$f'"; \ - $(INSTALL_PROGRAM_ENV) $(LIBTOOL) --mode=install $(cupsexec_backendPROGRAMS_INSTALL) "$$p" "$(DESTDIR)$(cupsexec_backenddir)/$$f" || exit 1; \ - else :; fi; \ - done - -uninstall-cupsexec_backendPROGRAMS: - @$(NORMAL_UNINSTALL) - @list='$(cupsexec_backend_PROGRAMS)'; for p in $$list; do \ - f=`echo "$$p" | sed 's,^.*/,,;s/$(EXEEXT)$$//;$(transform);s/$$/$(EXEEXT)/'`; \ - echo " rm -f '$(DESTDIR)$(cupsexec_backenddir)/$$f'"; \ - rm -f "$(DESTDIR)$(cupsexec_backenddir)/$$f"; \ - done - -clean-cupsexec_backendPROGRAMS: - @list='$(cupsexec_backend_PROGRAMS)'; for p in $$list; do \ - f=`echo $$p|sed 's/$(EXEEXT)$$//'`; \ - echo " rm -f $$p $$f"; \ - rm -f $$p $$f ; \ - done install-cupsexec_driverPROGRAMS: $(cupsexec_driver_PROGRAMS) @$(NORMAL_INSTALL) test -z "$(cupsexec_driverdir)" || $(MKDIR_P) "$(DESTDIR)$(cupsexec_driverdir)" @@ -627,9 +553,6 @@ clean-sbinPROGRAMS: echo " rm -f $$p $$f"; \ rm -f $$p $$f ; \ done -canon$(EXEEXT): $(canon_OBJECTS) $(canon_DEPENDENCIES) - @rm -f canon$(EXEEXT) - $(LINK) $(canon_OBJECTS) $(canon_LDADD) $(LIBS) commandtocanon$(EXEEXT): $(commandtocanon_OBJECTS) $(commandtocanon_DEPENDENCIES) @rm -f commandtocanon$(EXEEXT) $(LINK) $(commandtocanon_OBJECTS) $(commandtocanon_LDADD) $(LIBS) @@ -642,9 +565,6 @@ cups-calibrate$(EXEEXT): $(cups_calibrate_OBJECTS) $(cups_calibrate_DEPENDENCIES cups-genppd.@GUTENPRINT_MAJOR_VERSION@.@GUTENPRINT_MINOR_VERSION@$(EXEEXT): $(cups_genppd_@GUTENPRINT_MAJOR_VERSION@_@GUTENPRINT_MINOR_VERSION@_OBJECTS) $(cups_genppd_@GUTENPRINT_MAJOR_VERSION@_@GUTENPRINT_MINOR_VERSION@_DEPENDENCIES) @rm -f cups-genppd.@GUTENPRINT_MAJOR_VERSION@.@GUTENPRINT_MINOR_VERSION@$(EXEEXT) $(cups_genppd_@GUTENPRINT_MAJOR_VERSION@_@GUTENPRINT_MINOR_VERSION@_LINK) $(cups_genppd_@GUTENPRINT_MAJOR_VERSION@_@GUTENPRINT_MINOR_VERSION@_OBJECTS) $(cups_genppd_@GUTENPRINT_MAJOR_VERSION@_@GUTENPRINT_MINOR_VERSION@_LDADD) $(LIBS) -epson$(EXEEXT): $(epson_OBJECTS) $(epson_DEPENDENCIES) - @rm -f epson$(EXEEXT) - $(LINK) $(epson_OBJECTS) $(epson_LDADD) $(LIBS) gutenprint.@GUTENPRINT_MAJOR_VERSION@.@GUTENPRINT_MINOR_VERSION@$(EXEEXT): $(gutenprint_@GUTENPRINT_MAJOR_VERSION@_@GUTENPRINT_MINOR_VERSION@_OBJECTS) $(gutenprint_@GUTENPRINT_MAJOR_VERSION@_@GUTENPRINT_MINOR_VERSION@_DEPENDENCIES) @rm -f gutenprint.@GUTENPRINT_MAJOR_VERSION@.@GUTENPRINT_MINOR_VERSION@$(EXEEXT) $(gutenprint_@GUTENPRINT_MAJOR_VERSION@_@GUTENPRINT_MINOR_VERSION@_LINK) $(gutenprint_@GUTENPRINT_MAJOR_VERSION@_@GUTENPRINT_MINOR_VERSION@_OBJECTS) $(gutenprint_@GUTENPRINT_MAJOR_VERSION@_@GUTENPRINT_MINOR_VERSION@_LDADD) $(LIBS) @@ -677,12 +597,10 @@ mostlyclean-compile: distclean-compile: -rm -f *.tab.c -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/canon.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/commandtocanon.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/commandtoepson.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/cups-calibrate.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/cups_genppd_@GUTENPRINT_MAJOR_VERSION@_@GUTENPRINT_MINOR_VERSION@-genppd.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/epson.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gutenprint_@GUTENPRINT_MAJOR_VERSION@_@GUTENPRINT_MINOR_VERSION@-genppd.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/rastertoprinter.Po@am__quote@ @@ -930,7 +848,7 @@ check-am: all-am check: check-am all-am: Makefile $(PROGRAMS) $(SCRIPTS) $(DATA) all-local installdirs: - for dir in "$(DESTDIR)$(bindir)" "$(DESTDIR)$(cupsexec_backenddir)" "$(DESTDIR)$(cupsexec_driverdir)" "$(DESTDIR)$(cupsexec_filterdir)" "$(DESTDIR)$(sbindir)" "$(DESTDIR)$(sbindir)" "$(DESTDIR)$(pkgdatadir)" "$(DESTDIR)$(pkgsysconfdir)"; do \ + for dir in "$(DESTDIR)$(bindir)" "$(DESTDIR)$(cupsexec_driverdir)" "$(DESTDIR)$(cupsexec_filterdir)" "$(DESTDIR)$(sbindir)" "$(DESTDIR)$(sbindir)" "$(DESTDIR)$(pkgdatadir)" "$(DESTDIR)$(pkgsysconfdir)"; do \ test -z "$$dir" || $(MKDIR_P) "$$dir"; \ done install: install-am @@ -962,10 +880,9 @@ maintainer-clean-generic: -test -z "$(MAINTAINERCLEANFILES)" || rm -f $(MAINTAINERCLEANFILES) clean: clean-am -clean-am: clean-binPROGRAMS clean-cupsexec_backendPROGRAMS \ - clean-cupsexec_driverPROGRAMS clean-cupsexec_filterPROGRAMS \ - clean-generic clean-libtool clean-local clean-sbinPROGRAMS \ - mostlyclean-am +clean-am: clean-binPROGRAMS clean-cupsexec_driverPROGRAMS \ + clean-cupsexec_filterPROGRAMS clean-generic clean-libtool \ + clean-local clean-sbinPROGRAMS mostlyclean-am distclean: distclean-am -rm -rf ./$(DEPDIR) @@ -990,8 +907,7 @@ install-data-am: install-data-local install-pkgdataDATA \ install-dvi: install-dvi-am -install-exec-am: install-binPROGRAMS install-cupsexec_backendPROGRAMS \ - install-cupsexec_driverPROGRAMS \ +install-exec-am: install-binPROGRAMS install-cupsexec_driverPROGRAMS \ install-cupsexec_filterPROGRAMS install-sbinPROGRAMS \ install-sbinSCRIPTS @@ -1025,8 +941,7 @@ ps: ps-am ps-am: -uninstall-am: uninstall-binPROGRAMS uninstall-cupsexec_backendPROGRAMS \ - uninstall-cupsexec_driverPROGRAMS \ +uninstall-am: uninstall-binPROGRAMS uninstall-cupsexec_driverPROGRAMS \ uninstall-cupsexec_filterPROGRAMS uninstall-local \ uninstall-pkgdataDATA uninstall-pkgsysconfDATA \ uninstall-sbinPROGRAMS uninstall-sbinSCRIPTS @@ -1034,13 +949,12 @@ uninstall-am: uninstall-binPROGRAMS uninstall-cupsexec_backendPROGRAMS \ .MAKE: install-am install-data-am install-strip .PHONY: CTAGS GTAGS all all-am all-local check check-TESTS check-am \ - clean clean-binPROGRAMS clean-cupsexec_backendPROGRAMS \ - clean-cupsexec_driverPROGRAMS clean-cupsexec_filterPROGRAMS \ - clean-generic clean-libtool clean-local clean-sbinPROGRAMS \ - ctags dist-hook distclean distclean-compile distclean-generic \ - distclean-libtool distclean-tags distdir dvi dvi-am html \ - html-am info info-am install install-am install-binPROGRAMS \ - install-cupsexec_backendPROGRAMS \ + clean clean-binPROGRAMS clean-cupsexec_driverPROGRAMS \ + clean-cupsexec_filterPROGRAMS clean-generic clean-libtool \ + clean-local clean-sbinPROGRAMS ctags dist-hook distclean \ + distclean-compile distclean-generic distclean-libtool \ + distclean-tags distdir dvi dvi-am html html-am info info-am \ + install install-am install-binPROGRAMS \ install-cupsexec_driverPROGRAMS \ install-cupsexec_filterPROGRAMS install-data install-data-am \ install-data-hook install-data-local install-dvi \ @@ -1053,7 +967,6 @@ uninstall-am: uninstall-binPROGRAMS uninstall-cupsexec_backendPROGRAMS \ maintainer-clean-generic mostlyclean mostlyclean-compile \ mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \ tags uninstall uninstall-am uninstall-binPROGRAMS \ - uninstall-cupsexec_backendPROGRAMS \ uninstall-cupsexec_driverPROGRAMS \ uninstall-cupsexec_filterPROGRAMS uninstall-local \ uninstall-pkgdataDATA uninstall-pkgsysconfDATA \ @@ -1076,11 +989,6 @@ $(top_builddir)/src/gutenprintui2/libgutenprintui2.la: cd $(top_builddir)/src/gutenprintui2; \ $(MAKE) -cups-genppdconfig.@GUTENPRINT_MAJOR_VERSION@.@GUTENPRINT_MINOR_VERSION@: $(top_builddir)/config.status cups-genppdconfig.in - cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/cups-genppdconfig -cups-genppdupdate.@GUTENPRINT_MAJOR_VERSION@.@GUTENPRINT_MINOR_VERSION@: $(top_builddir)/config.status cups-genppdupdate.in - cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/cups-genppdupdate - install-data-local: $(INSTALL_DATA_LOCAL_DEPS) if test -n "$(CUPS_PKG)" -a -n "$(INSTALL_DATA_LOCAL_DEPS)" ; then \ $(mkdir_p) $(DESTDIR)$(cups_modeldir); \ @@ -1110,7 +1018,6 @@ install-data-hook: -@echo 'These messages are harmless and should be ignored.' -rmdir $(DESTDIR)$(cups_modeldir) -rmdir $(DESTDIR)$(pkgdatadir) - -rmdir $(DESTDIR)$(cupsexec_backenddir) -rmdir $(DESTDIR)$(cupsexec_driverdir) -rmdir $(DESTDIR)$(cupsexec_filterdir) -rmdir $(DESTDIR)$(bindir) @@ -1126,7 +1033,7 @@ all-local: $(INSTALL_DATA_LOCAL_DEPS) ppd: ppd-stamp -ppd-stamp: cups-genppdconfig.@GUTENPRINT_MAJOR_VERSION@.@GUTENPRINT_MINOR_VERSION@ cups-genppd.@GUTENPRINT_MAJOR_VERSION@.@GUTENPRINT_MINOR_VERSION@ $(top_srcdir)/src/main/printers.xml $(top_srcdir)/src/main/papers.xml +ppd-stamp: cups-genppd.@GUTENPRINT_MAJOR_VERSION@.@GUTENPRINT_MINOR_VERSION@ $(top_srcdir)/src/main/printers.xml $(top_srcdir)/src/main/papers.xml $(MAKE) ppd-stamp-phony touch ppd-stamp diff --git a/src/cups/canon.c b/src/cups/canon.c deleted file mode 100644 index 25c235e..0000000 --- a/src/cups/canon.c +++ /dev/null @@ -1,810 +0,0 @@ -/* - * CANON backend for the Common UNIX Printing System. - * - * - * Contents: - * - * main() - Send a file to the specified parallel port. - * list_devices() - List all parallel devices. - */ - -/* - * Include necessary headers. - */ - -#include -#include -#include -#include -#include - -#if defined(WIN32) || defined(__EMX__) -# include -#else -# include -# include -# include -#endif /* WIN32 || __EMX__ */ - -#if defined(WIN32) || defined(__EMX__) -# include -#else -# include -# include -# include -# include -#endif /* WIN32 || __EMX__ */ - -#ifdef __linux -# include -# include -# include -# include -# include -#endif /* __linux */ - -#ifdef __sgi -# include -# ifndef INV_EPP_ECP_PLP -# define INV_EPP_ECP_PLP 6 /* From 6.3/6.4/6.5 sys/invent.h */ -# define INV_ASO_SERIAL 14 /* serial portion of SGI ASO board */ -# define INV_IOC3_DMA 16 /* DMA mode IOC3 serial */ -# define INV_IOC3_PIO 17 /* PIO mode IOC3 serial */ -# define INV_ISA_DMA 19 /* DMA mode ISA serial -- O2 */ -# endif /* !INV_EPP_ECP_PLP */ -#endif /* __sgi */ - - -/* - * Local functions... - */ - -void list_devices(void); - - -/* - * 'main()' - Send a file to the specified parallel port. - * - * Usage: - * - * printer-uri job-id user title copies options [file] - */ - -int /* O - Exit status */ -main(int argc, /* I - Number of command-line arguments (6 or 7) */ - char *argv[]) /* I - Command-line arguments */ -{ - char method[1024], /* Method in URI */ - hostname[1024], /* Hostname */ - username[1024], /* Username info (not used) */ - resource[1024], /* Resource info (device and options) */ - *options; /* Pointer to options */ - int port; /* Port number (not used) */ - int copies; /* Number of copies to print */ - int fd_out, /* Parallel/USB device or socket */ - fd_in, /* Print file */ - error, /* Last error */ - backchannel; /* Read backchannel data? */ - struct sockaddr_in addr; /* Socket address */ - struct hostent *hostaddr; /* Host address */ - int wbytes; /* Number of bytes written */ - int nbytes, /* Number of bytes read */ - tbytes; /* Total number of bytes written */ - char buffer[8192], /* Output buffer */ - *bufptr; /* Pointer into buffer */ - struct timeval timeout; /* Timeout for select() */ - fd_set input; /* Input set for select() */ - struct termios opts; /* Parallel port options */ -#if defined(HAVE_SIGACTION) && !defined(HAVE_SIGSET) - struct sigaction action; /* Actions for POSIX signals */ -#endif /* HAVE_SIGACTION && !HAVE_SIGSET */ - - - if (argc == 1) - { - list_devices(); - return (0); - } - else if (argc < 6 || argc > 7) - { - fputs("Usage: canon job-id user title copies options [file]\n", stderr); - return (1); - } - - /* - * If we have 7 arguments, print the file named on the command-line. - * Otherwise, send stdin instead... - */ - - if (argc == 6) - { - fd_in = fileno(stdin); - copies = 1; - } - else - { - /* - * Try to open the print file... - */ - - if ((fd_in = open(argv[6], O_RDONLY)) < 0) - { - perror("ERROR: unable to open print file"); - return (1); - } - - copies = atoi(argv[4]); - } - - /* - * Extract the device name and options from the URI... - */ - - httpSeparate(argv[0], method, username, hostname, &port, resource); - - /* - * See if there are any options... - */ - - if ((options = strchr(resource, '?')) != NULL) - { - /* - * Yup, terminate the device name string and move to the first - * character of the options... - */ - - *options++ = '\0'; - } - - if (hostname[0]) - { - /* - * Lookup the IP address... - */ - - if ((hostaddr = gethostbyname(hostname)) == NULL) - { - fprintf(stderr, "ERROR: Unable to locate printer \'%s\' - %s", - hostname, strerror(errno)); - return (1); - } - - if (port == 0) - port = 9100; /* Default for CANON NIC */ - - fprintf(stderr, "INFO: Attempting to connect to printer %s on port %d\n", - hostname, port); - - memset(&addr, 0, sizeof(addr)); - memcpy(&(addr.sin_addr), hostaddr->h_addr, hostaddr->h_length); - addr.sin_family = hostaddr->h_addrtype; - addr.sin_port = htons(port); - - /* - * Try to connect... - */ - - for (;;) - { - if ((fd_out = socket(AF_INET, SOCK_STREAM, 0)) < 0) - { - perror("ERROR: Unable to create socket"); - return (1); - } - - if (connect(fd_out, (struct sockaddr *)&addr, sizeof(addr)) < 0) - { - error = errno; - close(fd_out); - fd_out = -1; - - if (error == ECONNREFUSED) - { - fprintf(stderr, "INFO: Network printer \'%s\' is busy; will retry in 30 seconds...\n", - hostname); - sleep(30); - } - else - { - perror("ERROR: Unable to connect to printer"); - sleep(30); - } - } - else - break; - } - - fputs("INFO: Connected to printer, sending print job...\n", stderr); - } - else - { - /* - * Open the parallel or USB port device... - */ - - do - { - if ((fd_out = open(resource, O_RDWR | O_EXCL)) == -1) - { - if (errno == EBUSY) - { - fputs("INFO: Parallel port busy; will retry in 30 seconds...\n", stderr); - sleep(30); - } - else - { - perror("ERROR: Unable to open parallel port device file"); - return (1); - } - } - } - while (fd_out < 0); - - /* - * Set any options provided... - */ - - tcgetattr(fd_out, &opts); - - opts.c_cflag |= CREAD; /* Enable reading */ - opts.c_lflag &= ~(ICANON | ECHO | ISIG); /* Raw mode */ - - /**** No options supported yet ****/ - - tcsetattr(fd_out, TCSANOW, &opts); - } - - /* - * Now that we are "connected" to the port, ignore SIGTERM so that we - * can finish out any page data the driver sends (e.g. to eject the - * current page... - */ - -#ifdef HAVE_SIGSET /* Use System V signals over POSIX to avoid bugs */ - sigset(SIGTERM, SIG_IGN); -#elif defined(HAVE_SIGACTION) - memset(&action, 0, sizeof(action)); - - sigemptyset(&action.sa_mask); - action.sa_handler = SIG_IGN; - sigaction(SIGTERM, &action, NULL); -#else - signal(SIGTERM, SIG_IGN); -#endif /* HAVE_SIGSET */ - - /* - * Finally, send the print file... - */ - - backchannel = 1; - - while (copies > 0) - { - copies --; - - if (fd_in != fileno(stdin)) - { - fputs("PAGE: 1 1\n", stderr); - lseek(fd_in, 0, SEEK_SET); - } - - tbytes = 0; - while ((nbytes = read(fd_in, buffer, sizeof(buffer))) > 0) - { - /* - * Write the print data to the printer... - */ - - tbytes += nbytes; - bufptr = buffer; - - while (nbytes > 0) - { - if ((wbytes = write(fd_out, bufptr, nbytes)) < 0) - { - perror("ERROR: Unable to send print file to printer"); - break; - } - - nbytes -= wbytes; - bufptr += wbytes; - } - - if (nbytes > 0) - break; - - /* - * Check for possible data coming back from the printer... - */ - - if (!backchannel) - continue; - - timeout.tv_sec = 0; - timeout.tv_usec = 0; - FD_ZERO(&input); - FD_SET(fd_out, &input); - if (select(fd_out + 1, &input, NULL, NULL, &timeout) > 0) - { - /* - * Grab the data coming back and spit it out to stderr... - */ - - if ((nbytes = read(fd_out, buffer, sizeof(buffer) - 1)) < 0) - { - fprintf(stderr, "ERROR: Back-channel read error - %s!\n", - strerror(errno)); - backchannel = 0; - continue; - } - - /* - * Some devices report themselves permanently ready to read... - */ - - if (nbytes == 0) - continue; - - buffer[nbytes] = '\0'; - if (strncmp(buffer, "@BDC ", 5) != 0) - fprintf(stderr, "WARNING: Received %d bytes of unknown back-channel data!\n", - nbytes); - else - { - /* - * Skip initial report line... - */ - - for (bufptr = buffer; *bufptr && *bufptr != '\n'; bufptr ++); - - if (*bufptr == '\n') - bufptr ++; - - /* - * Get status data... - */ - - strcpy(buffer, bufptr); - for (bufptr = buffer; *bufptr && *bufptr != ';'; bufptr ++); - *bufptr = '\0'; - - if (strncmp(buffer, "IQ:", 3) == 0) - { - /* - * Report ink level... - */ - - int i; - int levels[6]; - - buffer[12] = '\0'; /* Limit to 6 inks */ - for (i = 0, bufptr = buffer; i < 6; i ++, bufptr += 2) - { - if (isalpha(bufptr[0])) - levels[i] = (tolower(bufptr[0]) - 'a' + 10) << 16; - else - levels[i] = (bufptr[0] - '0') << 16; - - if (isalpha(bufptr[1])) - levels[i] |= tolower(bufptr[1]) - 'a' + 10; - else - levels[i] |= bufptr[1] - '0'; - } - - switch (i) - { - case 1 : - case 2 : - fprintf(stderr, "K=%d\n", levels[0]); - break; - case 3 : - fprintf(stderr, "C=%d M=%d Y=%d\n", levels[0], levels[1], - levels[2]); - break; - case 4 : - case 5 : - fprintf(stderr, "K=%d C=%d M=%d Y=%d\n", levels[0], - levels[1], levels[2], levels[3]); - break; - case 6 : - fprintf(stderr, "K=%d C=%d M=%d Y=%d LC=%d LM=%d\n", - levels[0], levels[1], levels[2], levels[3], - levels[4], levels[5]); - break; - } - } - else - fprintf(stderr, "INFO: %s\n", buffer); - } - } - else if (argc > 6) - fprintf(stderr, "INFO: Sending print file, %u bytes...\n", tbytes); - } - } - - /* - * Close the socket connection or parallel/USB device and input file and - * return... - */ - - close(fd_out); - if (fd_in != fileno(stdin)) - close(fd_in); - - return (0); -} - - -/* - * 'list_devices()' - List all parallel devices. - */ - -void -list_devices(void) -{ -#ifdef __linux - int i; /* Looping var */ - int fd; /* File descriptor */ - char device[255]; /* Device filename */ - FILE *probe; /* /proc/parport/n/autoprobe file */ - DIR *dirprobe; /* scan /sys/bus/usb/drivers/usblp */ - char line[1024], /* Line from file */ - *delim, /* Delimiter in file */ - make[IPP_MAX_NAME], /* Make from file */ - model[IPP_MAX_NAME]; /* Model from file */ - - - /* - * Probe for parallel devices... - */ - - for (i = 0; i < 4; i ++) - { - sprintf(device, "/proc/sys/dev/parport/parport%d/autoprobe", i); - probe = fopen(device, "r"); - if ( probe == NULL ) /* older kernel versions */ - { - sprintf(device, "/proc/parport/%d/autoprobe", i); - probe = fopen(device, "r"); - } - if ( probe != NULL ) - { - memset(make, 0, sizeof(make)); - memset(model, 0, sizeof(model)); - - while (fgets(line, sizeof(line), probe) != NULL) - { - /* - * Strip trailing ; and/or newline. - */ - - if ((delim = strrchr(line, ';')) != NULL) - *delim = '\0'; - else if ((delim = strrchr(line, '\n')) != NULL) - *delim = '\0'; - - /* - * Look for MODEL and MANUFACTURER lines... - */ - - if (strncmp(line, "MODEL:", 6) == 0 && - strncmp(line, "MODEL:Unknown", 13) != 0) - strncpy(model, line + 6, sizeof(model) - 1); - else if (strncmp(line, "MANUFACTURER:", 13) == 0 && - strncmp(line, "MANUFACTURER:Unknown", 20) != 0) - strncpy(make, line + 13, sizeof(make) - 1); - } - - fclose(probe); - - if (strcasecmp(make, "CANON") == 0) - printf("direct canon:/dev/lp%d \"%s %s\" \"Gutenprint Parallel Port #%d\"\n", - i, make, model, i + 1); - } - else - { - sprintf(device, "/dev/lp%d", i); - if ((fd = open(device, O_RDWR)) >= 0) - { - close(fd); - printf("direct canon:%s \"CANON\" \"Gutenprint Parallel Port #%d\"\n", device, i + 1); - } - } - } - - /* - * Probe for USB devices... - */ - - if ((dirprobe = opendir("/sys/class/usb")) != NULL) /* SYSFS in kernel 2.6 */ - { - struct dirent *dirent; /* directory entries */ - struct stat statbuf; /* file stat */ - char entry[MAXPATHLEN]; /* pathname to usb entries */ - char link[MAXPATHLEN]; /* linkname of usb entries */ - char *cptr; /* multi used character pointer */ - FILE *file; /* read printer specific info from */ - - i = 0; - /* scan the directory entries */ - while((dirent = readdir(dirprobe)) != 0) - { - /* skip "." and ".." */ - if (dirent->d_name[0] != 'l' || dirent->d_name[1] != 'p') - continue; - - /* generate path to work with */ - snprintf(entry, MAXPATHLEN, "/sys/class/usb/%s/device", dirent->d_name); - - /* look, if we have a pointer */ - if(lstat(entry, &statbuf) < 0) - { - perror(entry); - continue; - } - - if (S_ISLNK(statbuf.st_mode)) - { - /* get the path to the link */ - if (readlink(entry, link, MAXPATHLEN) < 0) - continue; - - /* find right occurance of '/' */ - if ((cptr = strrchr(link, '/')) == NULL) - { - continue; - } - - /* - * and truncate path: cut away everything after the '/', - * because parallel directory contains the information we need - */ - *cptr = '\0'; - - memset(make, 0, sizeof(make)); - memset(model, 0, sizeof(model)); - /* read manufacturer */ - snprintf(entry, MAXPATHLEN, "/sys/class/usb/%s/%s/manufacturer", - dirent->d_name, link); - - if ((file = fopen(entry, "r")) == NULL) - { - /* skip this entry, there is no file "manufacturer" */ - continue; - } - /* read data in */ - fread(make, sizeof(make)-1, sizeof(char), file); - fclose(file); - - /* beautify "make" - strip newline away */ - if ((cptr = strrchr(make, '\n')) != NULL) - { - *cptr = '\0'; - } - - /* next entry, if manufacturer is not CANON */ - if (strcasecmp(make, "CANON") != 0) - continue; - - /* read product name */ - snprintf(entry, MAXPATHLEN, "/sys/class/usb/%s/%s/product", - dirent->d_name, link); - - if ((file = fopen(entry, "r")) == NULL) - { - /* skip this entry, there is no file "product" */ - continue; - } - /* read data in */ - fread(model, sizeof(model)-1, sizeof(char), file); - fclose(file); - - /* beautify "model" - strip away newline */ - if ((cptr = strrchr(model, '\n')) != NULL) - { - *cptr = '\0'; - } - sprintf(device, "/dev/usb/%s", dirent->d_name); - if (access(device, 0)) - { - sprintf(device, "/dev/usb/usb%s", dirent->d_name); - - if (access(device, 0)) - sprintf(device, "/dev/usb%s", dirent->d_name); - } - - printf("direct canon:%s \"%s %s\" \"Gutenprint USB Printer #%d\"\n", - device, make, model, ++i); - } - } - closedir(dirprobe); - } - else if ((probe = fopen("/proc/bus/usb/devices", "r")) != NULL) - { - i = 0; - - memset(make, 0, sizeof(make)); - memset(model, 0, sizeof(model)); - - while (fgets(line, sizeof(line), probe) != NULL) - { - /* - * Strip trailing newline. - */ - - if ((delim = strrchr(line, '\n')) != NULL) - *delim = '\0'; - - /* - * See if it is a printer device ("P: ...") - */ - - if (strncmp(line, "S:", 2) == 0) - { - /* - * String attribute... - */ - - if (strncmp(line, "S: Manufacturer=", 17) == 0) - { - strncpy(make, line + 17, sizeof(make) - 1); - if (strcmp(make, "Hewlett-Packard") == 0) - strcpy(make, "HP"); - } - else if (strncmp(line, "S: Product=", 12) == 0) - strncpy(model, line + 12, sizeof(model) - 1); - } - else if (strncmp(line, "I:", 2) == 0 && - strstr(line, "Driver=printer") != NULL && - make[0] && model[0]) - { - /* - * We were processing a printer device; send the info out... - */ - - if (strcmp(make, "CANON") == 0) - { - sprintf(device, "/dev/usb/lp%d", i); - if (access(device, 0)) - { - sprintf(device, "/dev/usb/usblp%d", i); - - if (access(device, 0)) - sprintf(device, "/dev/usblp%d", i); - } - - printf("direct canon:%s \"%s %s\" \"Gutenprint USB Printer #%d\"\n", - device, make, model, i + 1); - } - - i ++; - - memset(make, 0, sizeof(make)); - memset(model, 0, sizeof(model)); - } - } - - fclose(probe); - } - else - { - for (i = 0; i < 8; i ++) - { - sprintf(device, "/dev/usb/lp%d", i); - if ((fd = open(device, O_RDWR)) >= 0) - { - close(fd); - printf("direct canon:%s \"CANON\" \"Gutenprint USB Printer #%d\"\n", device, i + 1); - } - - sprintf(device, "/dev/usb/usblp%d", i); - if ((fd = open(device, O_RDWR)) >= 0) - { - close(fd); - printf("direct canon:%s \"CANON\" \"Gutenprint USB Printer #%d\"\n", device, i + 1); - } - - sprintf(device, "/dev/usblp%d", i); - if ((fd = open(device, O_RDWR)) >= 0) - { - close(fd); - printf("direct canon:%s \"CANON\" \"Gutenprint USB Printer #%d\"\n", device, i + 1); - } - } - } -#elif defined(__sgi) - int i, j, n; /* Looping vars */ - char device[255]; /* Device filename */ - inventory_t *inv; /* Hardware inventory info */ - - - /* - * IRIX maintains a hardware inventory of most devices... - */ - - setinvent(); - - while ((inv = getinvent()) != NULL) - { - if (inv->inv_class == INV_PARALLEL && inv->inv_type == INV_EPP_ECP_PLP) - { - /* - * Standard parallel port... - */ - - puts("direct canon:/dev/plpbi \"CANON\" \"Gutenprint Onboard Parallel Port\""); - } - } - - endinvent(); -#elif defined(__sun) - int i, j, n; /* Looping vars */ - char device[255]; /* Device filename */ - - - /* - * Standard parallel ports... - */ - - for (i = 0; i < 10; i ++) - { - sprintf(device, "/dev/ecpp%d", i); - if (access(device, 0) == 0) - printf("direct canon:%s \"CANON\" \"Gutenprint Sun IEEE-1284 Parallel Port #%d\"\n", - device, i + 1); - } - - for (i = 0; i < 3; i ++) - { - sprintf(device, "/dev/lp%d", i); - - if (access(device, 0) == 0) - printf("direct canon:%s \"CANON\" \"Gutenprint PC Parallel Port #%d\"\n", - device, i + 1); - } -#elif defined(FreeBSD) || defined(OpenBSD) || defined(NetBSD) - int i; /* Looping var */ - int fd; /* File descriptor */ - char device[255]; /* Device filename */ - - - /* - * Probe for parallel devices... - */ - - for (i = 0; i < 3; i ++) - { - sprintf(device, "/dev/lpt%d", i); - if ((fd = open(device, O_RDWR)) >= 0) - { - close(fd); - printf("direct canon:%s \"CANON\" \"Gutenprint Parallel Port #%d (interrupt-driven)\"\n", device, i + 1); - } - - sprintf(device, "/dev/lpa%d", i); - if ((fd = open(device, O_RDWR)) >= 0) - { - close(fd); - printf("direct canon:%s \"CANON\" \"Gutenprint Parallel Port #%d (polled)\"\n", device, i + 1); - } - } - - /* - * Probe for USB devices... - */ - - for (i = 0; i < 3; i ++) - { - sprintf(device, "/dev/ulpt%d", i); - if ((fd = open(device, O_RDWR)) >= 0) - { - close(fd); - printf("direct canon:%s \"CANON\" \"Gutenprint USB Port #%d\"\n", device, i + 1); - } - } -#endif -} - - -/* - */ diff --git a/src/cups/command.types b/src/cups/command.types index de77a08..6b5f181 100644 --- a/src/cups/command.types +++ b/src/cups/command.types @@ -1,5 +1,5 @@ # -# "$Id: command.types,v 1.1.78.1 2007/12/23 17:30:03 easysw Exp $" +# "$Id: command.types,v 1.2 2007/12/23 17:31:51 easysw Exp $" # # MIME types file for the CUPS drivers. # @@ -24,5 +24,5 @@ application/vnd.cups-command string(0,'#CUPS-COMMAND') # -# End of "$Id: command.types,v 1.1.78.1 2007/12/23 17:30:03 easysw Exp $". +# End of "$Id: command.types,v 1.2 2007/12/23 17:31:51 easysw Exp $". # diff --git a/src/cups/commandtoepson.c b/src/cups/commandtoepson.c index 1d0a4e3..b907a2d 100644 --- a/src/cups/commandtoepson.c +++ b/src/cups/commandtoepson.c @@ -1,5 +1,5 @@ /* - * "$Id: commandtoepson.c,v 1.2.68.1 2007/12/23 17:30:04 easysw Exp $" + * "$Id: commandtoepson.c,v 1.3 2007/12/23 17:31:51 easysw Exp $" * * EPSON ESC/P2 command filter for the Common UNIX Printing System. * @@ -229,5 +229,5 @@ main(int argc, /* I - Number of command-line arguments */ /* - * End of "$Id: commandtoepson.c,v 1.2.68.1 2007/12/23 17:30:04 easysw Exp $". + * End of "$Id: commandtoepson.c,v 1.3 2007/12/23 17:31:51 easysw Exp $". */ diff --git a/src/cups/cups-calibrate.c b/src/cups/cups-calibrate.c index 50c4eb7..28070b1 100644 --- a/src/cups/cups-calibrate.c +++ b/src/cups/cups-calibrate.c @@ -1,5 +1,5 @@ /* - * "$Id: cups-calibrate.c,v 1.5.18.1 2007/12/23 17:30:04 easysw Exp $" + * "$Id: cups-calibrate.c,v 1.6 2007/12/23 17:31:51 easysw Exp $" * * Super simple color calibration program for the Common UNIX * Printing System. diff --git a/src/cups/cups-genppdconfig.in b/src/cups/cups-genppdconfig.in deleted file mode 100644 index aa80920..0000000 --- a/src/cups/cups-genppdconfig.in +++ /dev/null @@ -1,480 +0,0 @@ -#! @PERL@ -w -# $Id: cups-genppdconfig.in,v 1.13.8.1 2007/05/29 01:47:26 rlk Exp $ -# A user-friendly dialog-based wrapper for cups-genppd(8). -# Copyright (C) 2002 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. - -use strict; -use File::Basename; -use File::Find; -use File::Temp qw(tempfile unlink0); -use IO::Handle; -use Getopt::Std; -use POSIX; - -sub init_data(); -sub init_defaults(); -sub main_menu(); -sub display_help; -sub choose_printers; -sub choose_languages; -sub choose_location; -sub create_ppds; -sub create_dir($); -sub dialog_read($$); -sub dialog_read_list (\%\@$$); - -my $DIALOG = "@DIALOG@"; # version of dialog to call -my $BACKTITLE = "Gutenprint CUPS PPD creation"; # dialog screen title -my %printers; # master list of printers -my %languages; # master list of languages -my @used_printers; # printer PPDs on system -my @used_languages; # languages used on system -my @chosen_printers = (); # chosen printers -my @chosen_languages = (); # chosen languages -my $version = "@GUTENPRINT_MAJOR_VERSION@.@GUTENPRINT_MINOR_VERSION@"; -my $chosen_location = "@cups_conf_datadir@/model/gutenprint/$version"; - # chosen PPD prefix -my $silent = 0; # no dialog - - -# Set chosen_location from command-line. -our $opt_d; -our $opt_u; -getopts('d:u'); -if ($opt_d) { - $chosen_location = create_dir($opt_d); -} - -# Initialise everything -init_data(); -init_defaults(); - -# Run non-interactively if `-u' was specified. -if ( $opt_u ) { - $silent = 1; - create_ppds; - exit 0; -} - -# Can we use dialog? -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") { - display_help(); - } elsif ($option eq "Printers") { - choose_printers(); - } elsif ($option eq "Languages") { - choose_languages(); - } elsif ($option eq "Directory") { - choose_location(); - } elsif ($option eq "Create") { - create_ppds(); - } elsif ($option eq "Exit") { - exit 0; - } else { - die "Invalid menu option: $option"; - } -} - -exit 0; - - -# -# init_data() - Populate master printer and language hashes. -# -sub init_data() { - my $model; - my $desc; - my $lang; -# Get printer drivers and descriptions, then store in a hash. - open GENPPD, "cups-genppd.$version -M -v |" or die "can't fork cups-genppd.$version: $!"; - while () { - ($model, $desc) = /([\w-]+)\W+(.*)/; - chomp ($model); - chomp ($desc); - $printers{$model} = $desc; - } - close GENPPD or die "can't close cups-genppd.$version pipe: $!"; -# Get available languages, then store in hash. - open GENPPD, "cups-genppd.$version -L |" or die "can't fork cups-genppd.$version: $!"; - while () { - $lang = $_; - chomp ($lang); - $languages{$lang} = "(No description)"; - } - $languages{"en"} = "US English"; - close GENPPD or die "can't close cups-genppd.$version pipe: $!"; -# Set defaults - @chosen_languages = ("en"); -} - - -# -# init_defaults() - Get defaults from PPD files and directories. -# -sub init_defaults() { - # Find all PPD files that we could regenerate - my %found_ppds; - if (-d $chosen_location) { - find({wanted => \&find_printers}, $chosen_location); - foreach (@used_printers) { - my $tmp; - $tmp = basename($_); - chomp ($tmp); - $tmp =~ s/(^.*)\.ppd.*/$1/; - $found_ppds{$tmp} = "" if $printers{$tmp}; - } - } - @chosen_printers = (); - foreach (sort keys %found_ppds) { - push @chosen_printers, $_; - } - - # Find all language directories that could be used - my %found_langs; - if (-d $chosen_location) { - find({wanted => \&find_languages}, $chosen_location); - foreach (@used_languages) { - my $tmp; - $tmp = basename($_); - chomp ($tmp); - $found_langs{$tmp} = "" if $languages{$tmp}; - } - } - @chosen_languages = (); - foreach (sort keys %found_langs) { - push @chosen_languages, $_; - } - if (! @chosen_languages) { - push @chosen_languages, "en"; - } -} - - -# -# find-*() - callbacks for File::Find::find(). -# -sub find_printers { - my ($dev,$ino,$mode,$nlink,$uid,$gid); - - (($dev,$ino,$mode,$nlink,$uid,$gid) = lstat($_)) && - -f _ && - /^.*\.ppd.*\z/s && push @used_printers, $_; -} - -sub find_languages { - my ($dev,$ino,$mode,$nlink,$uid,$gid); - - (($dev,$ino,$mode,$nlink,$uid,$gid) = lstat($_)) && - -d _ && push @used_languages, $_; -} - - -# string -# main_menu() - Display main menu. -# Return string containing selection. -# -sub main_menu() { - my $option; - my @menu_options; - my $menu_desc = << "END"; -Generate Gutenprint PPD files for use with CUPS. This program is a user-friendly interface for cups-genppd(8). - -Current PPD directory: $chosen_location - -Hint: if the cursor keys cause problems, you may have more luck with +/- and TAB. -END - @menu_options = ( - [ "Help", "Display help text" ], - [ "Directory", "Choose PPD location" ], - [ "Printers", "Choose printers" ], - [ "Languages", "Choose languages" ], - [ "Create", "Create PPDs" ], - [ "Exit", "Exit the program" ] - ); - 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; - } -} - - -# -# display_help() - Display help text. -# -sub display_help { - my $help_text = <<"END"; -cups-genppdconfig is a program to generate PPD files which enable the -Gutenprint printer drivers to be used with CUPS, the Common UNIX -Printing System. A PPD file is a PostScript Printer Description, -which describes the capabilities of a printer. For each printer model -that you wish to use, you will have to generate the corresponding PPD -file. - -There are three steps to generating the PPDs: - - -[0. Directory] - -The default base directory to create PPD files in is -@cups_conf_datadir@/model/gutenprint, and this is displayed on the -main menu. Choose the "Directory" option to change this, but in -almost every case the default should be used. Don\'t alter the default -unless you know what you are doing. - - -1. Printers - -Choose the "Printers" menu option. The dialog box shows a complete -list of all the printers supported by Gutenprint. Use the up and down -cursor keys to move between the printers and SPACE to select the -models you want. Next, press ENTER to confirm the selections. - -If no printers are chosen, then a PPD file will be created for *every* -model. - - -2. Languages - -PPD files can be produced in several languages. Choose the -"Languages" menu option and, as for the "Printers" menu, select the -languages that you wish to use and press ENTER to confirm the -selections. - -Since a PPD file can only be translated into one language, selecting -multiple languages is posible, but of limited usefulness (for each -printer, a separate PPD file for each language will be produced). - - -3. Save the selections - -Choose the "Save" menu option to generate the PPD files you requested. -The files will be created in the default CUPS data directory -\$cups_prefix/share/model/gutenprint. Translations will be saved in -subdirectories named according to the locale/language. - - -Note that unselecting already selected entries in the Printer and -Language Selection dialogs will *not* remove these from the -filesystem; it will simply not cause them to be generated when you -choose "Save". To remove a printer, delete the PPD file from each -language directory it appears in. To remove a language, delete the -directory named with the corresponding language code, and all its -contents. - -Once you have finished, choose the "Exit" menu option, to leave the -program. Note that your selections will be lost, so make sure you -saved your selections first, if you wanted to keep them. -END - my($HELPFILE, $helpfilename) = tempfile("cups-genppdconfig-helpXXXXXX", - UNLINK => 1) - or die "can't open temporary help file"; - print $HELPFILE "$help_text"; - $HELPFILE->flush(); - 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; -} - - -# -# choose_printers() - Select printers from master list. -# Default none (so create all printers). -# -sub choose_printers { - my $title = "Printer selection"; - my $options = "--checklist \"Choose the printer models you wish to use with CUPS.\" 18 54 11"; - dialog_read_list(%printers, @chosen_printers, $title, $options); -} - - -# -# choose_languages() - Select languages from master list. -# Default is US English (en). -# -sub choose_languages { - my $title = "Language selection"; - my $options = "--checklist \"Choose the languages you wish to use with CUPS.\" 18 54 11"; - dialog_read_list(%languages, @chosen_languages, $title, $options); -} - - -# -# choosen_location() - Select PPD prefix directory and create it if -# not present. -# -sub choose_location { - my $location; - $location = dialog_read("Location selection", - "--inputbox \"Choose a directory to create the PPD files in.\" 8 61 $chosen_location"); - if (!defined($location)) { - $location = ""; - } - $chosen_location = create_dir($location); # make sure directory exists - init_defaults; # use new location to get default selections -} - - -# -# create_dir($dir) - Create named directory. -# $dir will have excess `/'s pruned. -# -sub create_dir ($) { - my $location = $_[0]; - my $dir; - my $count = 0; - if ($location =~ m/^\//) { - $dir = "/"; - } - foreach (split /\//, $location) { - if ($_ eq "") { - next; - } - if ($count == 1) { - $dir .= "/"; - } - $count = 1; - $dir .= $_; - if (!-d $dir) # directory does not exist, so create it - { - mkdir $dir || die "can't create directory \`$dir\': $!"; - } - } - return $dir; -} - - -# -# create_ppds() - Create PPD files. -# -sub create_ppds { - create_dir($chosen_location); # make the destination directory - my $total = scalar(@chosen_printers); - my $printers; - my $count; - my $language; - my $percent; - my $file; - if (!@chosen_printers) { # calculate total files for guage - $total = scalar(keys(%printers)); - } - $total = $total * scalar(@chosen_languages); - if (@chosen_printers) { # construct printer list for dialog - foreach (@chosen_printers) { - $printers .= "$_ "; - } - } else { - $printers = ""; - } - 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: $!"; - } - $count = 0; - foreach $language (@chosen_languages) { # loop through languages - open GENPPD, - "LC_ALL=$language LANG=$language LANGUAGE=$language cups-genppd.$version -v -p $chosen_location/$language $printers 2>&1 |" - or die "can't fork cups-genppd: $!"; - $file = ""; - while ( defined($file = )) { # dump genppd stats into guage - chomp($file); - $count++; - $percent = int (($count/$total)*100); - if ($percent > 100) { - $percent = 100; - } - if (! $silent) { - print DIALOG "$percent\n"; - print DIALOG "XXX\nLanguage: $language\nPPD files: $count/$total\n\n$file\nXXX\n"; - DIALOG->flush(); - } else { - print "$file\n"; - STDOUT->flush(); - } - } - close GENPPD or die "can't close cups-genppd pipe: $!"; - } - if (! $silent) { - print DIALOG "100\nXXX\nLanguage: \nPPD files: $total/$total\n\nCompleted\nXXX\n"; - close DIALOG or die "can't close dialog pipe"; - } -} - - -# scalar -# dialog($title, $command) - Create a dialog. -# Returns dialog results. -sub dialog_read ($$) { - my($title, $command) = @_; - my $result = ""; # must not be undefined, just empty - my $status; - my $line; - open DIALOG, "$DIALOG --backtitle \"$BACKTITLE\" --title \"$title\" $command 2>&1 |"; - while (defined($line = )) { - $result .= $line; - } - close DIALOG or ($! == 0) or die "can't close dialog pipe: $!"; - if ($? >> 8) - { - return undef; - } - return $result; -} - - -# -# dialog_read_list(%masterlist -# @chosenlist -# $title -# $dialog) - Construct list dialog, entries from %masterlist, -# defaults from @chosenlist. -# -sub dialog_read_list (\%\@$$) { - my $masterlist = $_[0]; - my $list = $_[1]; - my $title = $_[2]; - my $dialogoptions = $_[3]; - my $tmplist; - my $dialoglist = ""; - my $item; - my $selected; -# Make a list for use with dialog. - foreach $item (sort keys %$masterlist) { - $selected = "off"; - foreach (@$list) { - if ($item eq $_) { - $selected = "on"; - last; - } - } - $dialoglist .= "$item \"$masterlist->{$item}\" $selected "; - } - $tmplist = dialog_read("$title", "$dialogoptions $dialoglist"); - if (defined($tmplist)) { - $tmplist =~ s/\"//g; - @$list=split(/ /, $tmplist); - } -} diff --git a/src/cups/cups-genppdupdate.in b/src/cups/cups-genppdupdate.in index 119c350..9892ce0 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.25.8.4 2007/12/29 20:42:25 rlk Exp $ +# $Id: cups-genppdupdate.in,v 1.42 2008/04/12 01:20:33 rlk Exp $ # Update CUPS PPDs for Gutenprint queues. # Copyright (C) 2002-2003 Roger Leigh (rleigh@debian.org) # @@ -25,12 +25,10 @@ use File::Copy qw(mv); sub parse_options (); sub update_ppd ($); # Original PPD filename -sub get_ppd_contents ($$$$$); # Return contents of desired PPD +sub get_ppd_fh ($$$$$); # Return contents of desired PPD sub find_ppd ($$$$); # Gutenprint Filename, driver, language (e.g. en, sv), # region (e.g. GB, DE) -sub get_default_types (*); # Source PPD FH -sub get_defaults (*); # Source PPD FH -sub get_options (*\%); # Source PPD FH, default_types hash ref +sub get_ppd_data (*$$$$$); # Source PPD FH our $opt_d; # Debug mode our $opt_h; # Help @@ -42,18 +40,20 @@ our $opt_P; # PPD generator location our $opt_v; # Verbose mode our $opt_N; # Don't update PPD file options our $opt_o; # Output directory +our $opt_r; # Gutenprint version +our $opt_i; # Interactive +our $opt_f; # Force upgrade my $debug = 0; my $verbose = 0; # Verbose output -if ($debug) { - $verbose = 1; -} +my $interactive = 0; my $quiet = 0; # No output my $no_action = 0; # Don't output files my $reset_defaults = 0; # Reset options to default settings my $version = "@GUTENPRINT_MAJOR_VERSION@.@GUTENPRINT_MINOR_VERSION@"; my $micro_version = "@GUTENPRINT_VERSION@"; my $use_static_ppd = "@BUILD_CUPS_PPDS@"; +my $file_version = '"@VERSION@"$'; my $ppd_dir = "@cups_conf_serverroot@/ppd"; # Location of in-use CUPS PPDs my $ppd_root_dir = "@cups_conf_datadir@/model"; @@ -61,14 +61,17 @@ my $ppd_base_dir = "$ppd_root_dir/gutenprint/$version"; # Available PPDs my $ppd_out_dir = ""; # By default output into source directory my $gzext = ".gz"; my $updated_ppd_count = 0; +my $skipped_ppd_count = 0; +my $failed_ppd_count = 0; my $exit_after_parse_args = 0; my $serverdir = "@cups_conf_serverbin@"; my $driver_bin = "$serverdir/driver/gutenprint.$version"; -my $driver_version = `$driver_bin VERSION`; -chomp $driver_version; - -$Getopt::Std::STANDARD_HELP_VERSION = 1; +my $driver_version = ""; +if (-x $driver_bin) { + $driver_version = `$driver_bin VERSION`; + chomp $driver_version; +} $Getopt::Std::STANDARD_HELP_VERSION = 1; @@ -109,14 +112,15 @@ umask 0177; # Find all in-use Gutenprint PPD files... +# For case-insensitive filesystems, use only one of .ppd and .PPD +# (bug 1929738). -my @ppdglob; if (@ARGV) { my $f; foreach $f (@ARGV) { if (-f $f and ($f =~ /\.ppd$/i or $f =~ /\//)) { if (-f $f) { - push @ppdglob, $f; + push @ppd_files, $f; } else { print STDERR "Cannot find file $f\n"; } @@ -124,71 +128,58 @@ if (@ARGV) { -f "$ppd_dir/$f.ppd" or -f "$ppd_dir/$f.PPD") { if (-f "$ppd_dir/$f") { - push @ppdglob, "$ppd_dir/$f"; - } - if (-f "$ppd_dir/$f.ppd") { - push @ppdglob, "$ppd_dir/$f.ppd"; - } - if (-f "$ppd_dir/$f.PPD") { - push @ppdglob, "$ppd_dir/$f.PPD"; + push @ppd_files, "$ppd_dir/$f"; + } elsif (-f "$ppd_dir/$f.ppd") { + push @ppd_files, "$ppd_dir/$f.ppd"; + } elsif (-f "$ppd_dir/$f.PPD") { + push @ppd_files, "$ppd_dir/$f.PPD"; } } else { print STDERR "Cannot find file $ppd_dir/$f, $ppd_dir/$f.ppd, or $ppd_dir/$f.PPD\n"; } } } else { - @ppdglob = glob("$ppd_dir/*.{ppd,PPD}"); -} -my $ppdlist = join ' ', @ppdglob; -if (@ppdglob) { - open PPDFILES, '-|', 'egrep', '-i', '-l', 'Gutenprint|Gimp-Print', @ppdglob or die "can't grep $ppdlist: $!"; - while () { - chomp; - push @ppd_files, $_; - } - if (@ppd_files) { - open PPDFILES, '-|', 'egrep', '-i', '-L', 'Foomatic', @ppd_files or die "can't grep $ppdlist: $!"; - @ppd_files = (); - while () { - chomp; - push @ppd_files, $_; + my @ppdtmp = glob("$ppd_dir/*.{ppd,PPD}"); + my (%ppd_map); + map { $ppd_map{$_} = 1 } @ppd_files; + foreach my $f (@ppdtmp) { + if ($f =~ /\.PPD$/) { + my ($g) = $f; + $g =~ s/\.PPD$/.ppd/; + if (! $ppd_map{$g}) { + push @ppd_files, $f; + } + } else { + push @ppd_files, $f; } - close PPDFILES or ($! == 0) or die "can't close grep pipe: $!"; } } - -# Exit if there are not files to update... - -if (!@ppd_files) { - print STDOUT "No Gutenprint PPD files to update.\n"; - exit (0); -} - # Update each of the Gutenprint PPDs, where possible... foreach (@ppd_files) { - $updated_ppd_count += update_ppd($_); - + my ($status) = update_ppd($_); + last if ($status == -2); + $failed_ppd_count++ if ($status == 0); + $updated_ppd_count++ if ($status == 1); + $skipped_ppd_count++ if ($status == -1); } if (!$quiet || $verbose) { - if ($updated_ppd_count > 0) { - my $plural = ""; - if ($updated_ppd_count != 1) { - $plural = "s"; - } + if (!@ppd_files) { + print STDOUT "No Gutenprint PPD files to update.\n"; + } elsif ($updated_ppd_count > 0) { + my $plural = $updated_ppd_count == 1 ? "" : "s"; print STDOUT "Updated $updated_ppd_count PPD file${plural}. Restart cupsd for the changes to take effect.\n"; - exit (0); } else { - if ($no_action) { - print STDOUT "Did not update any PPD files\n"; - } else { + if ($failed_ppd_count > 0) { print STDOUT "Failed to update any PPD files\n"; + } else { + print STDOUT "Did not update any PPD files\n"; } - exit (0); } } +exit ($failed_ppd_count > 0); sub HELP_MESSAGE($;$$$) { my ($fh) = @_; @@ -204,6 +195,9 @@ sub HELP_MESSAGE($;$$$) { print $fh " -v Verbose messages.\n"; print $fh " -N Reset options to defaults.\n"; print $fh " -o out_dir Output PPD files to out_dir.\n"; + print $fh " -r version Use PPD files for Gutenprint major.minor version.\n"; + print $fh " -f Ignore new PPD file safety checks.\n"; + print $fh " -i Prompt (interactively) for each PPD file.\n"; exit(0); } @@ -222,7 +216,7 @@ sub help() { } sub parse_options () { - if (!getopts('d:hnqs:vNo:p:P:')) { + if (!getopts('d:hnqs:vNo:p:P:r:if')) { help(); } if ($opt_n) { @@ -231,9 +225,57 @@ sub parse_options () { if ($opt_d) { $debug = $opt_d; } + if ($opt_v) { + $verbose = 1; + $quiet = 0; + } + if ($opt_q) { + $verbose = 0; + $quiet = 1; + } + if ($opt_N) { + $reset_defaults = 1; + } + if ($opt_o) { + if (-d $opt_o) { + $ppd_out_dir = "$opt_o"; + } + else { + die "$opt_o: invalid directory: $!\n"; + } + } + if ($opt_r) { + if ($version ne $opt_r) { + $version = $opt_r; + if ($opt_s) { + if (-d $opt_s) { + $ppd_base_dir = "$opt_s"; + $driver_bin = ""; + } else { + die "$opt_s: invalid directory: $!\n"; + } + } else { + $ppd_base_dir = "$ppd_root_dir/gutenprint/$version"; + $driver_bin = "$serverdir/driver/gutenprint.$version"; + } + $driver_version = ""; + # If user specifies version, we're not going to be able to check + # for an exact match. + $file_version = "\"$version"; + if (-x $driver_bin) { + $driver_version = `$driver_bin VERSION`; + chomp $driver_version; + $file_version = "\"$driver_version\"\$"; + } elsif (! -d $ppd_base_dir && ! -l $ppd_base_dir) { + die "Gutenprint $version does not appear to be installed!\n"; + } + } + } if ($opt_s) { if (-d $opt_s) { $ppd_base_dir = "$opt_s"; + $driver_bin = ""; + $driver_version = ""; } else { die "$opt_s: invalid directory: $!\n"; @@ -255,40 +297,27 @@ sub parse_options () { die "$opt_P: invalid executable: $!\n"; } } - if ($opt_v) { - $verbose = 1; - $quiet = 0; - } - if ($opt_q) { - $verbose = 0; - $quiet = 1; - } - if ($opt_N) { - $reset_defaults = 1; - } - if ($opt_o) { - if (-d $opt_o) { - $ppd_out_dir = "$opt_o"; - } - else { - die "$opt_o: invalid directory: $!\n"; - } - } if ($opt_h) { help(); } + if ($opt_i) { + $interactive = 1; + } if ($exit_after_parse_args) { exit(0); } + if ($verbose && $driver_version ne "") { + print STDOUT "Updating PPD files from Gutenprint $driver_version\n"; + } } -sub get_ppd_contents($$$$$) { +sub get_ppd_fh($$$$$) { my ($ppd_source_filename, $filename, $driver, $locale, $region) = @_; my $source_data; my ($new_ppd_filename); - if ($use_static_ppd eq "no" && $driver_version eq "@VERSION@") { + if ($use_static_ppd eq "no" && $driver_version ne "") { my ($simplified); if ($filename =~ m,.*/([^/]*)(.sim)(.ppd)?(.gz)?$,) { $simplified = "simple"; @@ -309,14 +338,8 @@ sub get_ppd_contents($$$$$) { if ($debug & 8) { print "Trying $driver_bin cat $url for $driver, $simplified, $locale, $region\n"; } - if (open PPD, "$driver_bin cat $url 2>/dev/null |") { - while () { - $source_data .= $_; - } - close PPD; - if ($source_data) { - return ( $new_ppd_filename, $source_data ); - } + if (open PPD, "$driver_bin cat $url |") { + return ($new_ppd_filename, \*PPD); } } # Otherwise fall through and try to find a static PPD @@ -329,7 +352,7 @@ sub get_ppd_contents($$$$$) { # There wasn't a valid source PPD file, so give up. print STDERR "$ppd_source_filename: no valid candidate for replacement. Skipping\n"; print STDERR "$ppd_source_filename: please upgrade this PPD manually\n"; - return ("", 0); + return ("", undef); } if ($debug & 1) { print "Candidate PPD: $new_ppd_filename\n"; @@ -339,20 +362,13 @@ sub get_ppd_contents($$$$$) { if ($new_ppd_filename =~ m/.gz$/) { # Decompress input buffer open GZIN, "gunzip -c $new_ppd_filename |" or die "$_: can't open for decompression: $!"; - while () { - $source_data .= $_; - } - close GZIN; + return ($new_ppd_filename, \*GZIN); } else { open SOURCE, $new_ppd_filename or die "$new_ppd_filename: can't open source file: $!"; binmode SOURCE; - my $source_size = (stat(SOURCE))[7]; - read (SOURCE, $source_data, $source_size) - or die "$new_ppd_filename: error reading source: $!"; - close SOURCE or die "$new_ppd_filename: can't close file: $!"; + return ($new_ppd_filename, \*SOURCE); } - return ( $new_ppd_filename, $source_data ); } # Update the named PPD file. @@ -365,7 +381,7 @@ sub update_ppd ($) { } open ORIG, $_ or die "$_: can't open PPD file: $!"; - seek (ORIG, 0, 0) or die "can't seek to start of PPD file"; + seek (ORIG, 0, 0) or die "can't seek to start of PPD file: $!"; my @orig_metadata = stat(ORIG); if ($debug & 1) { print "Source Filename: $ppd_source_filename\n"; @@ -381,28 +397,29 @@ sub update_ppd ($) { if (/\*StpLocale:/) { ($locale) = m/^\*StpLocale:\s\"*(.*)\"$/; $valid = 1; - } - if (/\*LanguageVersion/) { + } elsif (/\*LanguageVersion/) { ($lingo) = m/^\*LanguageVersion:\s*(.*)$/; - } - if (/^\*StpDriverName:/ ) { + } elsif (/^\*StpDriverName:/ ) { ($driver) = m/^\*StpDriverName:\s*\"(.*)\"$/; $valid = 1; - } - if (/\*%End of / && $driver eq "") { + } elsif (/\*%End of / && $driver eq "") { ($driver) = m/^\*%End of\s*(.*).ppd$/; - } - if (/^\*StpPPDLocation:/ ) { + } elsif (/^\*StpPPDLocation:/ ) { ($filename) = m/^\*StpPPDLocation:\s*\"(.*)\"$/; $valid = 1; - } - if (/^\*%Gutenprint Filename:/) { + } elsif (/^\*%Gutenprint Filename:/) { $valid = 1; } + if ($filename and $driver and $lingo and $locale) { + last; + } + if (! $valid && /^\*OpenUI/) { + last; + } } if (! $valid) { - print STDERR "$ppd_source_filename: this PPD file cannot be upgraded automatically (only files based on Gutenprint 5.0.0 and newer can be)\n"; - return 0; +# print STDERR "Skipping $ppd_source_filename: not a Gutenprint PPD file\n"; + return -1; } if ($debug & 2) { print "Gutenprint Filename: $filename\n"; @@ -432,44 +449,49 @@ sub update_ppd ($) { # Read in the new PPD, decompressing it if needed... - my ($new_ppd_filename, $source_data) = - get_ppd_contents($ppd_source_filename, $filename, - $driver, $locale, $region); + my ($new_ppd_filename, $source_fd) = + get_ppd_fh($ppd_source_filename, $filename, $driver, $locale, $region); - if (! $source_data) { + if (! defined $source_fd) { print "Unable to retrieve PPD file!\n"; return 0; } - # Save new PPD in a temporary file, for processing... - - my($tmpfile, $tmpfilename) = tmpnam(); - unlink $tmpfilename or warn "can't unlink temporary file $tmpfile: $!\n"; - print $tmpfile $source_data; - - - + if ($interactive) { + print "Update PPD $ppd_source_filename from $new_ppd_filename [nyq]? "; + my $input = readline(*STDIN); + if ($input =~ /^q/i) { + close $source_fd; + print "Skipping all...\n"; + return -2; + } elsif (! ($input =~ /^y/i)) { + close $source_fd; + print "Skipping...\n"; + return -1; + } + } # Extract the default values from the original PPD... - my %orig_default_types = get_default_types(ORIG); - my %new_default_types = get_default_types($tmpfile); - my %defaults = get_defaults(ORIG); - my %options = get_options($tmpfile, %new_default_types); - my %resolution_map = get_resolution_map($tmpfile); + seek(ORIG, 0, 0); + my ($odt, $oopt, $ores, $odef) = get_ppd_data(ORIG, 1, 0, 0, 1, 0); + my ($ndt, $nopt, $nres, $ndef, $source_data) = get_ppd_data($source_fd, 1, 1, 1, 1, 1); # Close original and temporary files... - if (! close ORIG) { - print "$_: can't close file: $!\n"; - return 0; - } - if (! close $tmpfile) { - print "can't close temporary file $tmpfile: $!\n"; + close ORIG; + if (! close $source_fd) { + print "Unable to retrieve new PPD file: $!\n"; return 0; } + my %orig_default_types = %$odt; + my %new_default_types = %$ndt; + my %defaults = %$odef; + my %new_defaults = %$ndef; + my %options = %$nopt; + my %resolution_map = %$nres; if ($debug & 4) { print "Options (Old->New Default Type):\n"; @@ -524,7 +546,7 @@ sub update_ppd ($) { } } return 0; - } + } if (! $reset_defaults) { # Update source buffer with old defaults... @@ -533,22 +555,31 @@ sub update_ppd ($) { default_loop: foreach my $default_option (sort keys %defaults) { my $option; + my $default_option_value = $defaults{$default_option}; ($option = $default_option) =~ s/Default//; # Strip off `Default' # Check method is valid my $orig_method = $orig_default_types{$option}; my $new_method = $new_default_types{$option}; + my $new_default = $new_defaults{$default_option}; if ((!defined($orig_method) || !defined($new_method)) || $orig_method ne $new_method) { next; } + if (defined($new_default) && + $default_option_value eq $new_default) { + if ($verbose) { + print "$ppd_source_filename: Preserve *$default_option ($default_option_value)\n"; + } + next; + } if ($new_method eq "PickOne") { # Check the old setting is valid foreach my $opt (@{$options{$option}}) { - my $def_option = $defaults{$default_option}; + my $def_option = $default_option_value; if (($def_option eq $opt) || ($option eq "Resolution" && - (defined $resolution_map{$defaults{$default_option}}) && - ($def_option = $resolution_map{$defaults{$default_option}}) eq $opt)) { # Valid option + (defined $resolution_map{$default_option_value}) && + ($def_option = $resolution_map{$default_option_value}) eq $opt)) { # Valid option # Set the option in the new PPD $source_data =~ s/\*($default_option).*/*$1:$def_option/m; if ($verbose) { @@ -557,7 +588,7 @@ default_loop: next default_loop; } } - warn "Warning: $ppd_source_filename: Invalid option: *$default_option: $defaults{$default_option}. Using default setting.\n"; + warn "Warning: $ppd_source_filename: Invalid option: *$default_option: $defaults{$default_option}. Using default setting $new_defaults{$default_option}.\n"; next; } warn "Warning: $ppd_source_filename: PPD OpenUI method $new_default_types{$default_option} not understood.\n"; @@ -568,12 +599,12 @@ default_loop: my $tmpnew = "${ppd_dest_filename}.new"; if (! open NEWPPD, "> $tmpnew") { - warn "Can't open $tmpnew for writing: $!\n"; + warn "Can't create $tmpnew: $!\n"; return 0; } print NEWPPD $source_data; if (! close NEWPPD) { - warn "Can't close ${tmpnew}.new for writing: $!\n"; + warn "Can't write to $tmpnew: $!\n"; unlink $tmpnew; return 0; } @@ -601,13 +632,13 @@ default_loop: sub find_ppd ($$$$) { my($gutenprintfilename, $drivername, $lang, $region) = @_; my $file; # filename to return - my ($key) = '^\\*FileVersion:[ ]*"@VERSION@"$'; + my ($key) = '^\\*FileVersion:[ ]*' . "$file_version"; my ($lingo, $suffix, $base, $basedir); my ($current_best_file, $current_best_time); my ($stored_name, $stored_dir, $simplified); $stored_name = $gutenprintfilename; - $stored_name =~ s,.*/([^/]*)(.sim)?(.ppd)?(.gz)?$,$1,; - if ($gutenprintfilename =~ m,.*/([^/]*)(.sim)(.ppd)?(.gz)?$,) { + $stored_name =~ s,.*/([^/]+\.[0-9]+\.[0-9]+)(\.sim)?(\.ppd)?(\.gz)?$,$1,; + if ($gutenprintfilename =~ m,.*/([^/]*)(\.sim)(\.ppd)?(\.gz)?$,) { $simplified = ".sim"; } else { $simplified = ""; @@ -617,23 +648,38 @@ sub find_ppd ($$$$) { $current_best_file = ""; $current_best_time = 0; + my (@basedirs); + if ($opt_s) { + @basedirs = ($opt_s); + } else { + @basedirs = ($ppd_base_dir, $stored_dir, $ppd_root_dir); + } + + my (@lingos); + if ($region ne "") { + push @lingos, "${lang}_${region}/"; + } + push @lingos, "$lang/"; + if ($lang ne "C") { + push @lingos, "C/"; + } + push @lingos, "en/", ""; + my (@bases); + push @bases, "stp-${drivername}.$version${simplified}"; + push @bases, "${drivername}.$version${simplified}"; + if ($stored_name ne "${drivername}.$version${simplified}" and + $stored_name ne "stp-${drivername}.$version${simplified}") { + push @bases, $stored_name; + } + push @bases, $drivername; # All possible candidates, in order of usefulness and gzippedness - foreach $lingo ("${lang}_${region}/", - "$lang/", - "en/", - "C/", - "") { + foreach $lingo (@lingos) { foreach $suffix (".ppd$gzext", ".ppd") { - foreach $base ("${drivername}.$version${simplified}", - "stp-${drivername}.$version${simplified}", - $stored_name, - $drivername) { - foreach $basedir ($ppd_base_dir, - $stored_dir, - $ppd_root_dir) { - if (! $basedir || ! $base) { next; } + foreach $base (@bases) { + foreach $basedir (@basedirs) { + if ($basedir eq "" || $base eq "") { next; } my ($fn) = "$basedir/$lingo$base$suffix"; if ($debug & 8) { print "Trying $fn for $gutenprintfilename, $lang, $region\n"; @@ -641,16 +687,19 @@ sub find_ppd ($$$$) { # Check that it is a regular file, owned by root.root, not writable # by other, and is readable by root. i.e. the file is secure. my @sb = stat $fn or next; - if (S_ISREG($sb[2]) && ($sb[4] == 0)) { + if ($debug & 8) { + print " Candidate $fn for $gutenprintfilename, $lang, $region\n"; + } + if ($opt_f || (S_ISREG($sb[2]) && ($sb[4] == 0))) { # Check that the file is a valid Gutenprint PPD file # of the correct version. - my $file_version; + my $new_file_version; if ($fn =~ m/\.gz$/) { - $file_version = `gunzip -c $fn | grep '$key'`; + $new_file_version = `gunzip -c $fn | grep '$key'`; } else { - $file_version = `cat $fn | grep '$key'`; + $new_file_version = `cat $fn | grep '$key'`; } - if ($file_version ne "") { + if ($new_file_version ne "") { if ($debug & 8) { print " Format valid: time $sb[9] best $current_best_time prev $current_best_file cur $fn!\n"; } @@ -682,93 +731,52 @@ sub find_ppd ($$$$) { return undef; } -# Return the default options from the given PPD filename -sub get_default_types(*) { - my $fh = $_[0]; - my %default_types; - - # Read each line of the original PPD file, and store all OpenUI - # names and their types in a hash... - seek ($fh, 0, 0) or die "can't seek to start of PPD file"; - while (<$fh>) { - if ( m/^\*OpenUI/ ) { - chomp; - my ($key, $value) = /^\*OpenUI\s\*([[:alnum:]]+).*:\s([[:alnum:]]+)/; - if ($key && $value) { - $default_types{$key}=$value; - } - } - } - return %default_types; -} - - -# Return the default options from the given PPD filename -sub get_resolution_map(*) { - my $fh = $_[0]; - my %resolution_map; - - # Read each line of the original PPD file, and store all OpenUI - # names and their types in a hash... - seek ($fh, 0, 0) or die "can't seek to start of PPD file"; - while (<$fh>) { - if ( m/^\*StpResolutionMap:/ ) { - chomp; - my ($junk, $new, $old) = split; - $resolution_map{$old} = $new; - } - } - return %resolution_map; -} - - -# Return the default options from the given PPD filename -sub get_defaults(*) { - my $fh = $_[0]; - my %defaults; - - # Read each line of the original PPD file, and store all default - # names and their values in a hash... - seek ($fh, 0, 0) or die "can't seek to start of PPD file"; - while (<$fh>) { - if ( m/^\*Default/ ) { - chomp; - my($key, $value) = /^\*([[:alnum:]]+):\s*([[:alnum:]]+)/; - if ($key && $value) { - $defaults{$key}=$value; - } - } - } - return %defaults; -} - - -# Return the available options from the given PPD filename -sub get_options(*\%) { - my $fh = $_[0]; - my $validopts = $_[1]; - my %options; - - # For each valid option name, grab each valid option for that name - # and store in a hash of arrays... - - foreach (sort keys %$validopts) { - my $tmp = $_; - my @optionlist; - - seek ($fh, 0, 0) or die "can't seek to start of PPD file"; +# Return default type, options, resolutions, and default values. +# More efficient since it takes only one pass over the data. +sub get_ppd_data(*$$$$$) { + my ($fh, $types, $opts, $resolutions, $defaults, $data) = @_; + my (%options, %defaults, %resolution_map, %default_types); + my $cur_opt = ""; + my (@optionlist); + my ($source_data) = ""; + if ($reset_defaults) { + $types = 0; + $opts = 0; + $resolutions = 0; + $defaults = 0; + } + + if ($resolutions || $types || $opts || $defaults || $data) { while (<$fh>) { - if ( m/^\*$tmp/ ) { - chomp; - my ($value) = /^\*$tmp\s*([[:alnum:]]+)[\/:]/; - if ($value) { + $source_data .= $_ if ($data); + chomp; + if (($types || $opts) && m/^\*OpenUI/) { + my ($key, $value) = /^\*OpenUI\s\*([[:alnum:]]+).*:\s([[:alnum:]]+)/; + if ($key && $value) { + $default_types{$key}=$value; + $cur_opt = $key; + } + } elsif ($opts && m/^\*CloseUI/) { + if ($cur_opt ne "") { + $options{$cur_opt} = [ @optionlist ]; + $cur_opt = ""; + } + @optionlist = (); + } elsif ($opts && m/^\*$cur_opt/) { + my ($value) = /^\*$cur_opt\s*([[:alnum:]]+)[\/:]/; + if (defined $value && $value) { push @optionlist, $value; } + } elsif ($resolutions && m/^\*StpResolutionMap:/) { + my ($junk, $new, $old) = split; + $resolution_map{$old} = $new; + } elsif ($defaults && m/^\*Default/) { + my($key, $value) = /^\*([[:alnum:]]+):\s*([[:alnum:]]+)/; + if ($key && $value) { + $defaults{$key}=$value; + } } } - if (@optionlist) { - $options{$tmp} = [ @optionlist ]; - } } - return %options; + return (\%default_types, \%options, \%resolution_map, \%defaults, $source_data); } diff --git a/src/cups/epson.c b/src/cups/epson.c deleted file mode 100644 index f3e326c..0000000 --- a/src/cups/epson.c +++ /dev/null @@ -1,879 +0,0 @@ -/* - * "$Id: epson.c,v 1.7.8.2 2007/12/23 17:30:04 easysw Exp $" - * - * EPSON backend for the Common UNIX Printing System. - * - * Copyright 1993-2000 by Easy Software Products. - * - * 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. - * - * Contents: - * - * main() - Send a file to the specified parallel port. - * list_devices() - List all parallel devices. - */ - -/* - * Include necessary headers. - */ - -#ifdef HAVE_CONFIG_H -#include -#endif -#include -#include -#include -#include -#include -#ifdef HAVE_TIME_H -# include -#endif - -#if defined(WIN32) || defined(__EMX__) -# include -#else -# include -# include -# include -#endif /* WIN32 || __EMX__ */ - -#if defined(WIN32) || defined(__EMX__) -# include -#else -# include -# include -# include -# include -#endif /* WIN32 || __EMX__ */ - -#ifdef __linux -# include -# include -# include -# include -# include -#endif /* __linux */ - -#ifdef __sgi -# include -# ifndef INV_EPP_ECP_PLP -# define INV_EPP_ECP_PLP 6 /* From 6.3/6.4/6.5 sys/invent.h */ -# define INV_ASO_SERIAL 14 /* serial portion of SGI ASO board */ -# define INV_IOC3_DMA 16 /* DMA mode IOC3 serial */ -# define INV_IOC3_PIO 17 /* PIO mode IOC3 serial */ -# define INV_ISA_DMA 19 /* DMA mode ISA serial -- O2 */ -# endif /* !INV_EPP_ECP_PLP */ -#endif /* __sgi */ - - -/* - * Local functions... - */ - -void list_devices(void); -void read_backchannel(int fd_out); - -/* - * 'main()' - Send a file to the specified parallel port. - * - * Usage: - * - * printer-uri job-id user title copies options [file] - */ - -int /* O - Exit status */ -main(int argc, /* I - Number of command-line arguments (6 or 7) */ - char *argv[]) /* I - Command-line arguments */ -{ - char method[1024], /* Method in URI */ - hostname[1024], /* Hostname */ - username[1024], /* Username info (not used) */ - resource[1024], /* Resource info (device and options) */ - *options; /* Pointer to options */ - int port; /* Port number (not used) */ - int copies; /* Number of copies to print */ - int fd_out, /* Parallel/USB device or socket */ - fd_in, /* Print file */ - error; /* Last error */ - struct sockaddr_in addr; /* Socket address */ - struct hostent *hostaddr; /* Host address */ - int wbytes; /* Number of bytes written */ - int nbytes, /* Number of bytes read */ - tbytes; /* Total number of bytes written */ - char buffer[8192], /* Output buffer */ - *bufptr; /* Pointer into buffer */ - struct termios opts; /* Parallel port options */ -#if defined(HAVE_SIGACTION) && !defined(HAVE_SIGSET) - struct sigaction action; /* Actions for POSIX signals */ -#endif /* HAVE_SIGACTION && !HAVE_SIGSET */ - - - if (argc == 1) - { - list_devices(); - return (0); - } - else if (argc < 6 || argc > 7) - { - fputs("Usage: epson job-id user title copies options [file]\n", stderr); - return (1); - } - - /* - * If we have 7 arguments, print the file named on the command-line. - * Otherwise, send stdin instead... - */ - - if (argc == 6) - { - fd_in = fileno(stdin); - copies = 1; - } - else - { - /* - * Try to open the print file... - */ - - if ((fd_in = open(argv[6], O_RDONLY)) < 0) - { - perror("ERROR: unable to open print file"); - return (1); - } - - copies = atoi(argv[4]); - } - - /* - * Extract the device name and options from the URI... - */ - - httpSeparate(argv[0], method, username, hostname, &port, resource); - - /* - * See if there are any options... - */ - - if ((options = strchr(resource, '?')) != NULL) - { - /* - * Yup, terminate the device name string and move to the first - * character of the options... - */ - - *options++ = '\0'; - } - - if (hostname[0]) - { - /* - * Lookup the IP address... - */ - - if ((hostaddr = gethostbyname(hostname)) == NULL) - { - fprintf(stderr, "ERROR: Unable to locate printer \'%s\' - %s", - hostname, strerror(errno)); - return (1); - } - - if (port == 0) - port = 9100; /* Default for EPSON NIC */ - - fprintf(stderr, "INFO: Attempting to connect to printer %s on port %d\n", - hostname, port); - - memset(&addr, 0, sizeof(addr)); - memcpy(&(addr.sin_addr), hostaddr->h_addr, hostaddr->h_length); - addr.sin_family = hostaddr->h_addrtype; - addr.sin_port = htons(port); - - /* - * Try to connect... - */ - - for (;;) - { - if ((fd_out = socket(AF_INET, SOCK_STREAM, 0)) < 0) - { - perror("ERROR: Unable to create socket"); - return (1); - } - - if (connect(fd_out, (struct sockaddr *)&addr, sizeof(addr)) < 0) - { - error = errno; - close(fd_out); - fd_out = -1; - - if (error == ECONNREFUSED) - { - fprintf(stderr, "INFO: Network printer \'%s\' is busy; will retry in 30 seconds...\n", - hostname); - sleep(30); - } - else - { - perror("ERROR: Unable to connect to printer"); - sleep(30); - } - } - else - break; - } - - fputs("INFO: Connected to printer, sending print job...\n", stderr); - } - else - { - /* - * Open the parallel or USB port device... - */ - - do - { - if ((fd_out = open(resource, O_RDWR | O_EXCL | O_NONBLOCK)) == -1) - { - if (errno == EBUSY) - { - fputs("INFO: Parallel port busy; will retry in 30 seconds...\n", stderr); - sleep(30); - } - else - { - perror("ERROR: Unable to open parallel port device file"); - return (1); - } - } - } - while (fd_out < 0); - - /* - * Set any options provided... - */ - - tcgetattr(fd_out, &opts); - - opts.c_cflag |= CREAD; /* Enable reading */ - opts.c_lflag &= ~(ICANON | ECHO | ISIG); /* Raw mode */ - - /**** No options supported yet ****/ - - tcsetattr(fd_out, TCSANOW, &opts); - } - - /* - * Set nonblocking I/O, if possible (might already be set). - */ - fcntl(fd_out, F_SETFL, - O_NONBLOCK | fcntl(fd_out, F_GETFL)); - - /* - * Now that we are "connected" to the port, ignore SIGTERM so that we - * can finish out any page data the driver sends (e.g. to eject the - * current page... - */ - -#ifdef HAVE_SIGSET /* Use System V signals over POSIX to avoid bugs */ - sigset(SIGTERM, SIG_IGN); -#elif defined(HAVE_SIGACTION) - memset(&action, 0, sizeof(action)); - - sigemptyset(&action.sa_mask); - action.sa_handler = SIG_IGN; - sigaction(SIGTERM, &action, NULL); -#else - signal(SIGTERM, SIG_IGN); -#endif /* HAVE_SIGSET */ - - /* - * Finally, send the print file... - */ - - while (copies > 0) - { - copies --; - - if (fd_in != fileno(stdin)) - { - fputs("PAGE: 1 1\n", stderr); - lseek(fd_in, 0, SEEK_SET); - } - - tbytes = 0; - while ((nbytes = read(fd_in, buffer, sizeof(buffer))) > 0) - { - /* - * Write the print data to the printer... - */ - - tbytes += nbytes; - bufptr = buffer; - - while (nbytes > 0) - { - if ((wbytes = write(fd_out, bufptr, nbytes)) < 0 && - (errno == EAGAIN || errno == EINTR)) - { - /* Write would block, so sleep 0.002s and retry... */ - - /* - * Check for possible data coming back from the printer... - */ -#if defined(HAVE_TIME_H) && defined(HAVE_NANOSLEEP) - struct timespec sleeptime; -#elif defined(HAVE_UNISTD_H) && defined(HAVE_USLEEP) -#else - struct timeval timeout; -#endif - read_backchannel(fd_out); -#if defined(HAVE_TIME_H) && defined(HAVE_NANOSLEEP) - sleeptime.tv_sec = 0; - sleeptime.tv_nsec = 2000000; - nanosleep(&sleeptime, &sleeptime); -#elif defined(HAVE_UNISTD_H) && defined(HAVE_USLEEP) - usleep(200000); -#else - timeout.tv_sec = 0; - timeout.tv_usec = 2000; - select(1, NULL, NULL, NULL, &timeout); -#endif - continue; - } - else if (wbytes < 0) /* write error */ - break; - - nbytes -= wbytes; - bufptr += wbytes; - } - - if (nbytes > 0) - { - perror("ERROR: Unable to send print file to printer"); - break; - } - - if (argc > 6) - fprintf(stderr, "INFO: Sending print file, %u bytes...\n", tbytes); - - } - } - - /* - * Close the socket connection or parallel/USB device and input file and - * return... - */ - - close(fd_out); - if (fd_in != fileno(stdin)) - close(fd_in); - - return (0); -} - - -/* - * 'read_backchannel()' - read data sent back from printer. - */ -void -read_backchannel(int fd_out) -{ - static int backchannel = 1; /* Read backchannel data? */ - int nbytes; /* Number of bytes read */ - int ninks = 0; /* Number of inks */ - char buffer[8192], /* Output buffer */ - *bufptr; /* Pointer into buffer */ - - - if (!backchannel) - return; - - if ((nbytes = read(fd_out, buffer, sizeof(buffer) - 1)) < 0 && errno != EAGAIN) - { - fprintf(stderr, "ERROR: Back-channel read error - %s!\n", - strerror(errno)); - backchannel = 0; - return; - } - - /* - * Some devices report themselves permanently ready to read... - */ - - /*fprintf(stderr, "Backchannel read: %d bytes\n", nbytes);*/ - - if (nbytes <= 0) - return; - - buffer[nbytes] = '\0'; - if (strncmp(buffer, "@BDC ", 5) != 0) - fprintf(stderr, "WARNING: Received %d bytes of unknown back-channel data!\n", - nbytes); - else - { - - /* - * Get status data... - */ - - bufptr = strstr(&buffer[0], "IQ:"); - /*fprintf(stderr, "READBACK: %20s\n", bufptr);*/ - - if (bufptr) - { - /* - * Report ink level... - */ - - int i; - int levels[7]; - - bufptr += 3; - - for (i = 0; i < 7 && bufptr < &buffer[sizeof(buffer)-1]; - i ++, bufptr += 2) - { - int j, inkend = 0; - - if (!bufptr[0] || bufptr[0] == ';') - break; - - for (j = 0; j < 2; j++) - { - if (bufptr[j] >= '0' && bufptr[j] <= '9') - bufptr[j] -= '0'; - else if (bufptr[j] >= 'A' && bufptr[j] <= 'F') - bufptr[j] = bufptr[j] - 'A' + 10; - else if (bufptr[j] >= 'a' && bufptr[j] <= 'f') - bufptr[j] = bufptr[j] - 'a' + 10; - else - { - inkend = 1; - break; - } - } - levels[i] = (bufptr[0] << 4) + bufptr[1]; - - if (inkend) - break; - - ninks++; - } - - switch (ninks) - { - case 1 : - case 2 : - fprintf(stderr, "K=%d\n", levels[0]); - break; - case 3 : - fprintf(stderr, "C=%d M=%d Y=%d\n", levels[0], levels[1], - levels[2]); - break; - case 4 : - case 5 : - fprintf(stderr, "K=%d C=%d M=%d Y=%d\n", levels[0], - levels[1], levels[2], levels[3]); - break; - case 6 : - fprintf(stderr, "K=%d C=%d M=%d Y=%d LC=%d LM=%d\n", - levels[0], levels[1], levels[2], levels[3], - levels[4], levels[5]); - break; - case 7 : - fprintf(stderr, "K=%d C=%d M=%d Y=%d LC=%d LM=%d GY=%d\n", - levels[0], levels[1], levels[2], levels[3], - levels[4], levels[5], levels[6]); - } - } - else - fprintf(stderr, "INFO: %s\n", buffer); - } -} - -/* - * 'list_devices()' - List all parallel devices. - */ - -void -list_devices(void) -{ -#ifdef __linux - int i; /* Looping var */ - int fd; /* File descriptor */ - char device[255]; /* Device filename */ - FILE *probe; /* /proc/parport/n/autoprobe file */ - DIR *dirprobe; /* scan /sys/bus/usb/drivers/usblp */ - char line[1024], /* Line from file */ - *delim, /* Delimiter in file */ - make[IPP_MAX_NAME], /* Make from file */ - model[IPP_MAX_NAME]; /* Model from file */ - - - /* - * Probe for parallel devices... - */ - - for (i = 0; i < 4; i ++) - { - sprintf(device, "/proc/sys/dev/parport/parport%d/autoprobe", i); - probe = fopen(device, "r"); - if ( probe == NULL ) /* older kernel versions */ - { - sprintf(device, "/proc/parport/%d/autoprobe", i); - probe = fopen(device, "r"); - } - if ( probe != NULL ) - { - memset(make, 0, sizeof(make)); - memset(model, 0, sizeof(model)); - - while (fgets(line, sizeof(line), probe) != NULL) - { - /* - * Strip trailing ; and/or newline. - */ - - if ((delim = strrchr(line, ';')) != NULL) - *delim = '\0'; - else if ((delim = strrchr(line, '\n')) != NULL) - *delim = '\0'; - - /* - * Look for MODEL and MANUFACTURER lines... - */ - - if (strncmp(line, "MODEL:", 6) == 0 && - strncmp(line, "MODEL:Unknown", 13) != 0) - strncpy(model, line + 6, sizeof(model) - 1); - else if (strncmp(line, "MANUFACTURER:", 13) == 0 && - strncmp(line, "MANUFACTURER:Unknown", 20) != 0) - strncpy(make, line + 13, sizeof(make) - 1); - } - - fclose(probe); - - if (strcasecmp(make, "EPSON") == 0) - printf("direct epson:/dev/lp%d \"%s %s\" \"Gutenprint Parallel Port #%d\"\n", - i, make, model, i + 1); - } - else - { - sprintf(device, "/dev/lp%d", i); - if ((fd = open(device, O_RDWR)) >= 0) - { - close(fd); - printf("direct epson:%s \"EPSON\" \"Gutenprint Parallel Port #%d\"\n", device, i + 1); - } - } - } - - /* - * Probe for USB devices... - */ - - if ((dirprobe = opendir("/sys/class/usb")) != NULL) /* SYSFS in kernel 2.6 */ - { - struct dirent *dirent; /* directory entries */ - struct stat statbuf; /* file stat */ - char entry[MAXPATHLEN]; /* pathname to usb entries */ - char link[MAXPATHLEN]; /* linkname of usb entries */ - char *cptr; /* multi used character pointer */ - FILE *file; /* read printer specific info from */ - - i = 0; - /* scan the directory entries */ - while((dirent = readdir(dirprobe)) != 0) - { - /* skip "." and ".." */ - if (dirent->d_name[0] != 'l' || dirent->d_name[1] != 'p') - continue; - - /* generate path to work with */ - snprintf(entry, MAXPATHLEN, "/sys/class/usb/%s/device", dirent->d_name); - - /* look, if we have a pointer */ - if(lstat(entry, &statbuf) < 0) - { - perror(entry); - continue; - } - - if (S_ISLNK(statbuf.st_mode)) - { - /* get the path to the link */ - if (readlink(entry, link, MAXPATHLEN) < 0) - continue; - - /* find right occurance of '/' */ - if ((cptr = strrchr(link, '/')) == NULL) - { - continue; - } - - /* - * and truncate path: cut away everything after the '/', - * because parallel directory contains the information we need - */ - *cptr = '\0'; - - memset(make, 0, sizeof(make)); - memset(model, 0, sizeof(model)); - /* read manufacturer */ - snprintf(entry, MAXPATHLEN, "/sys/class/usb/%s/%s/manufacturer", - dirent->d_name, link); - - if ((file = fopen(entry, "r")) == NULL) - { - /* skip this entry, there is no file "manufacturer" */ - continue; - } - /* read data in */ - fread(make, sizeof(make)-1, sizeof(char), file); - fclose(file); - - /* beautify "make" - strip newline away */ - if ((cptr = strrchr(make, '\n')) != NULL) - { - *cptr = '\0'; - } - - /* next entry, if manufacturer is not EPSON */ - if (strcasecmp(make, "EPSON") != 0) - continue; - - /* read product name */ - snprintf(entry, MAXPATHLEN, "/sys/class/usb/%s/%s/product", - dirent->d_name, link); - - if ((file = fopen(entry, "r")) == NULL) - { - /* skip this entry, there is no file "product" */ - continue; - } - /* read data in */ - fread(model, sizeof(model)-1, sizeof(char), file); - fclose(file); - - /* beautify "model" - strip away newline */ - if ((cptr = strrchr(model, '\n')) != NULL) - { - *cptr = '\0'; - } - sprintf(device, "/dev/usb/%s", dirent->d_name); - if (access(device, 0)) - { - sprintf(device, "/dev/usb/usb%s", dirent->d_name); - - if (access(device, 0)) - sprintf(device, "/dev/usb%s", dirent->d_name); - } - - printf("direct epson:%s \"%s %s\" \"Gutenprint USB Printer #%d\"\n", - device, make, model, ++i); - } - } - closedir(dirprobe); - } - else if ((probe = fopen("/proc/bus/usb/devices", "r")) != NULL) - { - i = 0; - - memset(make, 0, sizeof(make)); - memset(model, 0, sizeof(model)); - - while (fgets(line, sizeof(line), probe) != NULL) - { - /* - * Strip trailing newline. - */ - - if ((delim = strrchr(line, '\n')) != NULL) - *delim = '\0'; - - /* - * See if it is a printer device ("P: ...") - */ - - if (strncmp(line, "S:", 2) == 0) - { - /* - * String attribute... - */ - - if (strncmp(line, "S: Manufacturer=", 17) == 0) - { - strncpy(make, line + 17, sizeof(make) - 1); - if (strcmp(make, "Hewlett-Packard") == 0) - strcpy(make, "HP"); - } - else if (strncmp(line, "S: Product=", 12) == 0) - strncpy(model, line + 12, sizeof(model) - 1); - } - else if (strncmp(line, "I:", 2) == 0 && - strstr(line, "Driver=printer") != NULL && - make[0] && model[0]) - { - /* - * We were processing a printer device; send the info out... - */ - - if (strcmp(make, "EPSON") == 0) - { - sprintf(device, "/dev/usb/lp%d", i); - if (access(device, 0)) - { - sprintf(device, "/dev/usb/usblp%d", i); - - if (access(device, 0)) - sprintf(device, "/dev/usblp%d", i); - } - - printf("direct epson:%s \"%s %s\" \"Gutenprint USB Printer #%d\"\n", - device, make, model, i + 1); - } - - i ++; - - memset(make, 0, sizeof(make)); - memset(model, 0, sizeof(model)); - } - } - - fclose(probe); - } - else - { - for (i = 0; i < 8; i ++) - { - sprintf(device, "/dev/usb/lp%d", i); - if ((fd = open(device, O_RDWR)) >= 0) - { - close(fd); - printf("direct epson:%s \"EPSON\" \"Gutenprint USB Printer #%d\"\n", device, i + 1); - } - - sprintf(device, "/dev/usb/usblp%d", i); - if ((fd = open(device, O_RDWR)) >= 0) - { - close(fd); - printf("direct epson:%s \"EPSON\" \"Gutenprint USB Printer #%d\"\n", device, i + 1); - } - - sprintf(device, "/dev/usblp%d", i); - if ((fd = open(device, O_RDWR)) >= 0) - { - close(fd); - printf("direct epson:%s \"EPSON\" \"Gutenprint USB Printer #%d\"\n", device, i + 1); - } - } - } -#elif defined(__sgi) - int i, j, n; /* Looping vars */ - char device[255]; /* Device filename */ - inventory_t *inv; /* Hardware inventory info */ - - - /* - * IRIX maintains a hardware inventory of most devices... - */ - - setinvent(); - - while ((inv = getinvent()) != NULL) - { - if (inv->inv_class == INV_PARALLEL && inv->inv_type == INV_EPP_ECP_PLP) - { - /* - * Standard parallel port... - */ - - puts("direct epson:/dev/plpbi \"EPSON\" \"Gutenprint Onboard Parallel Port\""); - } - } - - endinvent(); -#elif defined(__sun) - int i, j, n; /* Looping vars */ - char device[255]; /* Device filename */ - - - /* - * Standard parallel ports... - */ - - for (i = 0; i < 10; i ++) - { - sprintf(device, "/dev/ecpp%d", i); - if (access(device, 0) == 0) - printf("direct epson:%s \"EPSON\" \"Gutenprint Sun IEEE-1284 Parallel Port #%d\"\n", - device, i + 1); - } - - for (i = 0; i < 3; i ++) - { - sprintf(device, "/dev/lp%d", i); - - if (access(device, 0) == 0) - printf("direct epson:%s \"EPSON\" \"Gutenprint PC Parallel Port #%d\"\n", - device, i + 1); - } -#elif defined(FreeBSD) || defined(OpenBSD) || defined(NetBSD) - int i; /* Looping var */ - int fd; /* File descriptor */ - char device[255]; /* Device filename */ - - - /* - * Probe for parallel devices... - */ - - for (i = 0; i < 3; i ++) - { - sprintf(device, "/dev/lpt%d", i); - if ((fd = open(device, O_RDWR)) >= 0) - { - close(fd); - printf("direct epson:%s \"EPSON\" \"Gutenprint Parallel Port #%d (interrupt-driven)\"\n", device, i + 1); - } - - sprintf(device, "/dev/lpa%d", i); - if ((fd = open(device, O_RDWR)) >= 0) - { - close(fd); - printf("direct epson:%s \"EPSON\" \"Gutenprint Parallel Port #%d (polled)\"\n", device, i + 1); - } - } - - /* - * Probe for USB devices... - */ - - for (i = 0; i < 3; i ++) - { - sprintf(device, "/dev/ulpt%d", i); - if ((fd = open(device, O_RDWR)) >= 0) - { - close(fd); - printf("direct epson:%s \"EPSON\" \"Gutenprint USB Port #%d\"\n", device, i + 1); - } - } -#endif -} - - -/* - * End of "$Id: epson.c,v 1.7.8.2 2007/12/23 17:30:04 easysw Exp $". - */ diff --git a/src/cups/genppd.c b/src/cups/genppd.c index 3ba6953..8df934f 100644 --- a/src/cups/genppd.c +++ b/src/cups/genppd.c @@ -1,5 +1,5 @@ /* - * "$Id: genppd.c,v 1.119.2.5 2007/12/23 17:30:05 easysw Exp $" + * "$Id: genppd.c,v 1.142 2008/04/06 21:16:08 rlk Exp $" * * PPD file generation program for the CUPS drivers. * @@ -293,6 +293,12 @@ cat_ppd(int argc, char **argv) /* I - Driver URI */ return (1); } + if (strcmp(scheme, "gutenprint." GUTENPRINT_RELEASE_VERSION) != 0) + { + fprintf(stderr, "ERROR: Gutenprint version mismatch!\n"); + return(1); + } + s = strchr(resource + 1, '/'); if (s) { @@ -1107,7 +1113,6 @@ write_ppd( gzputs(fp, "*PSVersion: \"(2017.000) 550\"\n"); else { - gzputs(fp, "*PSVersion: \"(3010.000) 550\"\n"); gzputs(fp, "*PSVersion: \"(3010.000) 651\"\n"); gzputs(fp, "*PSVersion: \"(3010.000) 652\"\n"); gzputs(fp, "*PSVersion: \"(3010.000) 653\"\n"); @@ -1526,6 +1531,7 @@ write_ppd( stp_clear_string_parameter(v, "Resolution"); stp_describe_parameter(v, "Quality", &desc1); stp_set_string_parameter(v, "Quality", desc1.deflt.str); + stp_parameter_description_destroy(&desc1); stp_describe_resolution(v, &xdpi, &ydpi); stp_clear_string_parameter(v, "Quality"); tmp_xdpi = xdpi; @@ -1924,5 +1930,5 @@ write_ppd( /* - * End of "$Id: genppd.c,v 1.119.2.5 2007/12/23 17:30:05 easysw Exp $". + * End of "$Id: genppd.c,v 1.142 2008/04/06 21:16:08 rlk Exp $". */ diff --git a/src/cups/rastertoprinter.c b/src/cups/rastertoprinter.c index 2f636ea..9c25137 100644 --- a/src/cups/rastertoprinter.c +++ b/src/cups/rastertoprinter.c @@ -1,5 +1,5 @@ /* - * "$Id: rastertoprinter.c,v 1.105.2.6 2008/01/02 01:38:09 rlk Exp $" + * "$Id: rastertoprinter.c,v 1.120 2008/01/02 01:39:06 rlk Exp $" * * Gutenprint based raster filter for the Common UNIX Printing System. * @@ -1389,5 +1389,5 @@ Image_width(stp_image_t *image) /* I - Image */ /* - * End of "$Id: rastertoprinter.c,v 1.105.2.6 2008/01/02 01:38:09 rlk Exp $". + * End of "$Id: rastertoprinter.c,v 1.120 2008/01/02 01:39:06 rlk Exp $". */ diff --git a/src/escputil/Makefile.in b/src/escputil/Makefile.in index c4c7077..0aeaade 100644 --- a/src/escputil/Makefile.in +++ b/src/escputil/Makefile.in @@ -43,13 +43,12 @@ DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \ subdir = src/escputil 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/isc-posix.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 + $(top_srcdir)/m4/iconv.m4 $(top_srcdir)/m4/isc-posix.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 @@ -127,27 +126,13 @@ 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@ GREP = @GREP@ 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@ @@ -155,13 +140,6 @@ 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@ @@ -266,16 +244,12 @@ docdir = @docdir@ dvidir = @dvidir@ 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@ @@ -304,6 +278,7 @@ target_alias = @target_alias@ top_builddir = @top_builddir@ top_srcdir = @top_srcdir@ AM_CPPFLAGS = -I$(top_srcdir)/include -I$(top_builddir)/include $(LOCAL_CPPFLAGS) $(GNUCFLAGS) +GUTENPRINTUI_LIBS = $(top_builddir)/src/gutenprintui/libgutenprintui.la escputil_SOURCES = d4lib.c escputil.c d4lib.h escputil_LDADD = $(GUTENPRINT_LIBS) $(LIBREADLINE_DEPS) MAINTAINERCLEANFILES = Makefile.in diff --git a/src/escputil/d4lib.c b/src/escputil/d4lib.c index ee36227..46e508a 100644 --- a/src/escputil/d4lib.c +++ b/src/escputil/d4lib.c @@ -311,6 +311,7 @@ static int printError(unsigned char errorNb) msg++; } fprintf(stderr,"Unknown IEEE 1284.4 error number %d\n",errorNb); + return 0; return 1; /* non recoverable error */ } diff --git a/src/escputil/escputil.c b/src/escputil/escputil.c index a28cd07..4ebdab3 100644 --- a/src/escputil/escputil.c +++ b/src/escputil/escputil.c @@ -1,5 +1,5 @@ /* - * "$Id: escputil.c,v 1.87.8.3 2007/12/29 20:42:25 rlk Exp $" + * "$Id: escputil.c,v 1.92 2007/12/26 18:13:02 rlk Exp $" * * Printer maintenance utility for EPSON Stylus (R) printers * diff --git a/src/foomatic/Makefile.in b/src/foomatic/Makefile.in index 872d850..d854d6a 100644 --- a/src/foomatic/Makefile.in +++ b/src/foomatic/Makefile.in @@ -48,13 +48,12 @@ DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \ subdir = src/foomatic 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/isc-posix.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 + $(top_srcdir)/m4/iconv.m4 $(top_srcdir)/m4/isc-posix.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 @@ -145,27 +144,13 @@ 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@ GREP = @GREP@ 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@ @@ -173,13 +158,6 @@ 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@ @@ -284,16 +262,12 @@ docdir = @docdir@ dvidir = @dvidir@ 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@ @@ -322,6 +296,7 @@ target_alias = @target_alias@ top_builddir = @top_builddir@ top_srcdir = @top_srcdir@ AM_CPPFLAGS = -I$(top_srcdir)/include -I$(top_builddir)/include $(LOCAL_CPPFLAGS) $(GNUCFLAGS) +GUTENPRINTUI_LIBS = $(top_builddir)/src/gutenprintui/libgutenprintui.la DISTDIRS = foomatic-templates-ijs LOCAL_CPPFLAGS = $(GUTENPRINT_CFLAGS) @BUILD_FOOMATIC_3_TRUE@BUILD_FOOMATIC = 1 diff --git a/src/foomatic/foomatic-printermap b/src/foomatic/foomatic-printermap index d2efaa9..cbe6867 100644 --- a/src/foomatic/foomatic-printermap +++ b/src/foomatic/foomatic-printermap @@ -105,6 +105,7 @@ #gptofoo bjc-PIXMA-iP5000 printer/Canon-PIXMA-iP5000 #gptofoo bjc-PIXMA-iP5200 printer/Canon-PIXMA-iP5200 #gptofoo bjc-PIXMA-iP5300 printer/Canon-PIXMA-iP5300 +#gptofoo bjc-PIXMA-iP6000D printer/Canon-PIXMA-iP6000D #gptofoo bjc-PIXMA-iP6700 printer/Canon-PIXMA-iP6700 #gptofoo bjc-PIXMA-iP8500 printer/Canon-PIXMA-iP8500 #gptofoo bjc-PIXMA-iX5000 printer/Canon-PIXMA-iX5000 @@ -113,6 +114,7 @@ #gptofoo bjc-MULTIPASS-MP170 printer/Canon-MULTIPASS-MP170 #gptofoo bjc-MULTIPASS-MP180 printer/Canon-MULTIPASS-MP180 #gptofoo bjc-MULTIPASS-MP500 printer/Canon-MULTIPASS-MP500 +#gptofoo bjc-MULTIPASS-MP520 printer/Canon-MULTIPASS-MP520 #gptofoo bjc-MULTIPASS-MP610 printer/Canon-MULTIPASS-MP610 #gptofoo bjc-MULTIPASS-MP700 printer/Canon-MULTIPASS-MP700 #gptofoo bjc-MULTIPASS-MP710 printer/Canon-MULTIPASS-MP710 @@ -163,6 +165,11 @@ #gptofoo escp2-e100 printer/Epson-E_100 #gptofoo escp2-e150 printer/Epson-E_150 #gptofoo escp2-e200 printer/Epson-E_200 +#gptofoo escp2-e300 printer/Epson-E_300 +#gptofoo escp2-e500 printer/Epson-E_500 +#gptofoo escp2-e520 printer/Epson-E_520 +#gptofoo escp2-e700 printer/Epson-E_700 +#gptofoo escp2-e720 printer/Epson-E_720 #gptofoo escp2-mc10000 printer/Epson-MC_10000 #gptofoo escp2-mc2000 printer/Epson-MC_2000 #gptofoo escp2-mc5000 printer/Epson-MC_5000 @@ -233,14 +240,21 @@ #gptofoo escp2-pxv780 printer/Epson-PX_V780 #gptofoo escp2-picmate printer/Epson-PictureMate #gptofoo escp2-picmated printer/Epson-PictureMate_Deluxe +#gptofoo escp2-picmatedash printer/Epson-PictureMate_Dash #gptofoo escp2-picmateflash printer/Epson-PictureMate_Flash #gptofoo escp2-picmatepal printer/Epson-PictureMate_Pal #gptofoo escp2-picmatesnap printer/Epson-PictureMate_Snap +#gptofoo escp2-picmate100 printer/Epson-PictureMate_100 #gptofoo escp2-picmate200 printer/Epson-PictureMate_200 #gptofoo escp2-picmate210 printer/Epson-PictureMate_210 #gptofoo escp2-picmate240 printer/Epson-PictureMate_240 #gptofoo escp2-picmate250 printer/Epson-PictureMate_250 +#gptofoo escp2-picmate260 printer/Epson-PictureMate_260 +#gptofoo escp2-picmate270 printer/Epson-PictureMate_270 #gptofoo escp2-picmate280 printer/Epson-PictureMate_280 +#gptofoo escp2-picmate290 printer/Epson-PictureMate_290 +#gptofoo escp2-picmate500 printer/Epson-PictureMate_500 +#gptofoo escp2-picmate2005 printer/Epson-PictureMate_2005 #gptofoo escp2-c20 printer/Epson-Stylus_C20 #gptofoo escp2-c20sx printer/Epson-Stylus_C20SX #gptofoo escp2-c20ux printer/Epson-Stylus_C20UX @@ -354,13 +368,21 @@ #gptofoo escp2-pro printer/Epson-Stylus_Color_PRO #gptofoo escp2-d68 printer/Epson-Stylus_D68 #gptofoo escp2-d88 printer/Epson-Stylus_D88 +#gptofoo escp2-d92 printer/Epson-Stylus_D92 #gptofoo escp2-d120 printer/Epson-Stylus_D120 #gptofoo escp2-dx3800 printer/Epson-Stylus_DX3800 #gptofoo escp2-dx3850 printer/Epson-Stylus_DX3850 #gptofoo escp2-dx4050 printer/Epson-Stylus_DX4050 #gptofoo escp2-dx4200 printer/Epson-Stylus_DX4200 #gptofoo escp2-dx4250 printer/Epson-Stylus_DX4250 +#gptofoo escp2-dx4400 printer/Epson-Stylus_DX4400 +#gptofoo escp2-dx4450 printer/Epson-Stylus_DX4450 #gptofoo escp2-dx4800 printer/Epson-Stylus_DX4800 +#gptofoo escp2-dx7000f printer/Epson-Stylus_DX7000F +#gptofoo escp2-dx7400 printer/Epson-Stylus_DX7400 +#gptofoo escp2-dx7450 printer/Epson-Stylus_DX7450 +#gptofoo escp2-dx8400 printer/Epson-Stylus_DX8400 +#gptofoo escp2-dx8450 printer/Epson-Stylus_DX8450 #gptofoo escp2-photo printer/Epson-Stylus_Photo #gptofoo escp2-1200 printer/Epson-Stylus_Photo_1200 #gptofoo escp2-1270 printer/Epson-Stylus_Photo_1270 @@ -405,6 +427,8 @@ #gptofoo escp2-r260 printer/Epson-Stylus_Photo_R260 #gptofoo escp2-r265 printer/Epson-Stylus_Photo_R265 #gptofoo escp2-r270 printer/Epson-Stylus_Photo_R270 +#gptofoo escp2-r280 printer/Epson-Stylus_Photo_R280 +#gptofoo escp2-r285 printer/Epson-Stylus_Photo_R285 #gptofoo escp2-r300 printer/Epson-Stylus_Photo_R300 #gptofoo escp2-r310 printer/Epson-Stylus_Photo_R310 #gptofoo escp2-r320 printer/Epson-Stylus_Photo_R320 @@ -422,12 +446,15 @@ #gptofoo escp2-rx510 printer/Epson-Stylus_Photo_RX510 #gptofoo escp2-rx560 printer/Epson-Stylus_Photo_RX560 #gptofoo escp2-rx580 printer/Epson-Stylus_Photo_RX580 +#gptofoo escp2-rx585 printer/Epson-Stylus_Photo_RX585 #gptofoo escp2-rx590 printer/Epson-Stylus_Photo_RX590 #gptofoo escp2-rx595 printer/Epson-Stylus_Photo_RX595 #gptofoo escp2-rx600 printer/Epson-Stylus_Photo_RX600 #gptofoo escp2-rx620 printer/Epson-Stylus_Photo_RX620 #gptofoo escp2-rx630 printer/Epson-Stylus_Photo_RX630 #gptofoo escp2-rx640 printer/Epson-Stylus_Photo_RX640 +#gptofoo escp2-rx680 printer/Epson-Stylus_Photo_RX680 +#gptofoo escp2-rx685 printer/Epson-Stylus_Photo_RX685 #gptofoo escp2-rx700 printer/Epson-Stylus_Photo_RX700 #gptofoo escp2-10000 printer/Epson-Stylus_Pro_10000 #gptofoo escp2-5000 printer/Epson-Stylus_Pro_5000 @@ -453,6 +480,11 @@ #gptofoo pcl-g_5c printer/Generic-PCL_5c_Printer #gptofoo pcl-g_5e printer/Generic-PCL_5e_Printer #gptofoo pcl-g_6 printer/Generic-PCL_6_PCL_XL_Printer +#gptofoo pcl-g_4_l printer/Generic-PCL_4_LF_Printer +#gptofoo pcl-g_5_l printer/Generic-PCL_5_LF_Printer +#gptofoo pcl-g_5c_l printer/Generic-PCL_5c_LF_Printer +#gptofoo pcl-g_5e_l printer/Generic-PCL_5e_LF_Printer +#gptofoo pcl-g_6_l printer/Generic-PCL_6_PCL_XL_LF_Printer #gptofoo pcl-2000 printer/HP-2000C #gptofoo pcl-2500 printer/HP-2500C #gptofoo hp-2500cm printer/HP-2500CM diff --git a/src/foomatic/gutenprint-version.c b/src/foomatic/gutenprint-version.c index 16c248a..d9910b2 100644 --- a/src/foomatic/gutenprint-version.c +++ b/src/foomatic/gutenprint-version.c @@ -1,5 +1,5 @@ /* - * "$Id: gutenprint-version.c,v 1.2.18.1 2007/03/04 23:57:48 tillkamppeter Exp $" + * "$Id: gutenprint-version.c,v 1.3 2007/03/05 00:04:00 tillkamppeter Exp $" * * Dump the per-printer options for the OpenPrinting database * diff --git a/src/foomatic/paper_sizes.c b/src/foomatic/paper_sizes.c index 7b12fe1..26f4f02 100644 --- a/src/foomatic/paper_sizes.c +++ b/src/foomatic/paper_sizes.c @@ -1,5 +1,5 @@ /* - * "$Id: paper_sizes.c,v 1.8.18.1 2007/03/04 23:57:48 tillkamppeter Exp $" + * "$Id: paper_sizes.c,v 1.9 2007/03/05 00:04:00 tillkamppeter Exp $" * * Dump the per-printer options for the OpenPrinting database * diff --git a/src/foomatic/printer_margins.c b/src/foomatic/printer_margins.c index 11c50ad..66af0d8 100644 --- a/src/foomatic/printer_margins.c +++ b/src/foomatic/printer_margins.c @@ -1,5 +1,5 @@ /* - * "$Id: printer_margins.c,v 1.17.8.2 2007/05/29 01:47:27 rlk Exp $" + * "$Id: printer_margins.c,v 1.21 2007/05/06 19:38:10 rlk Exp $" * * Dump the per-printer margins for the OpenPrinting database * diff --git a/src/foomatic/printer_options.c b/src/foomatic/printer_options.c index 6848354..a5b4c45 100644 --- a/src/foomatic/printer_options.c +++ b/src/foomatic/printer_options.c @@ -1,5 +1,5 @@ /* - * "$Id: printer_options.c,v 1.50.8.2 2007/05/29 01:47:27 rlk Exp $" + * "$Id: printer_options.c,v 1.52 2007/05/06 19:38:10 rlk Exp $" * * Dump the per-printer options for the OpenPrinting database * diff --git a/src/foomatic/printers.c b/src/foomatic/printers.c index 9eb34ce..24643e7 100644 --- a/src/foomatic/printers.c +++ b/src/foomatic/printers.c @@ -1,5 +1,5 @@ /* - * "$Id: printers.c,v 1.10.18.1 2007/03/04 23:57:48 tillkamppeter Exp $" + * "$Id: printers.c,v 1.11 2007/03/05 00:04:00 tillkamppeter Exp $" * * Dump the per-printer options for the OpenPrinting database * diff --git a/src/ghost/Makefile.in b/src/ghost/Makefile.in index d9a27df..d3d2c88 100644 --- a/src/ghost/Makefile.in +++ b/src/ghost/Makefile.in @@ -43,13 +43,12 @@ DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \ subdir = src/ghost 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/isc-posix.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 + $(top_srcdir)/m4/iconv.m4 $(top_srcdir)/m4/isc-posix.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 @@ -137,27 +136,13 @@ 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@ GREP = @GREP@ 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@ @@ -165,13 +150,6 @@ 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@ @@ -276,16 +254,12 @@ docdir = @docdir@ dvidir = @dvidir@ 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@ @@ -314,6 +288,7 @@ target_alias = @target_alias@ top_builddir = @top_builddir@ top_srcdir = @top_srcdir@ AM_CPPFLAGS = -I$(top_srcdir)/include -I$(top_builddir)/include $(LOCAL_CPPFLAGS) $(GNUCFLAGS) +GUTENPRINTUI_LIBS = $(top_builddir)/src/gutenprintui/libgutenprintui.la MAINTAINERCLEANFILES = Makefile.in LOCAL_CPPFLAGS = $(GUTENPRINT_CFLAGS) @IJS_CFLAGS@ @BUILD_GHOSTSCRIPT_TRUE@ijsgutenprint_@GUTENPRINT_MAJOR_VERSION@_@GUTENPRINT_MINOR_VERSION@_SOURCES = ijsgutenprint.c diff --git a/src/ghost/ijsgutenprint.c b/src/ghost/ijsgutenprint.c index 3056037..bdd8fed 100644 --- a/src/ghost/ijsgutenprint.c +++ b/src/ghost/ijsgutenprint.c @@ -1,5 +1,5 @@ /* - * $Id: ijsgutenprint.c,v 1.18.8.1 2007/12/15 20:35:39 rlk Exp $ + * $Id: ijsgutenprint.c,v 1.20 2008/04/22 23:59:50 rlk Exp $ * * IJS server for Gutenprint. * @@ -95,13 +95,13 @@ static const char DeviceCMYK[] = "DeviceCMYK"; static const char *version_id; static int version_is_ok = 1; -static const char *version_mismatch = N_("\ -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"); +#define VERSION_MISMATCH "\ +ERROR: ijsgutenprint: the version of Gutenprint software installed (%s)\n\ +ERROR: ijsgutenprint: does not match the PPD file (%s). If you have upgraded your version\n\ +ERROR: ijsgutenprint: of Gutenprint recently, you must reinstall all printer queues.\n\ +ERROR: ijsgutenprint: Please refer to your vendor's documentation or the ``foomatic-ppdfile''\n\ +ERROR: ijsgutenprint: command for instructions.\n\ +ERROR: ijsgutenprint: the version of Gutenprint software installed (%s) does not match the PPD file (%s).\n" const char *gutenprint_ppd_version = NULL; static int ppd_mode = 0; /* Use PPD-style margins */ @@ -188,7 +188,7 @@ image_init(IMAGE *img, IjsPageHeader *ph) } else { - fprintf(stderr, _("ERROR: ijsgutenprint: Bad color space: bps %d channels %d space %s\n"), + fprintf(stderr, "ERROR: ijsgutenprint: Bad color space: bps %d channels %d space %s\n", img->bps, img->n_chan, ph->cs); /* unsupported */ return -1; @@ -196,7 +196,7 @@ image_init(IMAGE *img, IjsPageHeader *ph) if (img->row_buf == NULL) { - STP_DEBUG(fprintf(stderr, _("ERROR: ijsgutenprint: No row buffer\n"))); + fprintf(stderr, "ERROR: ijsgutenprint: No row buffer\n"); return -1; } @@ -223,7 +223,7 @@ get_float(const char *str, const char *name, double *pval) *pval = new_value; else { - fprintf(stderr, _("ERROR: ijsgutenprint: Unable to parse parameter %s=%s (expect a number)\n"), + fprintf(stderr, "ERROR: ijsgutenprint: Unable to parse parameter %s=%s (expect a number)\n", name, str); status = -1; } @@ -243,7 +243,7 @@ get_int(const char *str, const char *name, int *pval) *pval = new_value; else { - fprintf(stderr, _("ERROR: ijsgutenprint: Unable to parse parameter %s=%s (expect a number)\n"), + fprintf(stderr, "ERROR: ijsgutenprint: Unable to parse parameter %s=%s (expect a number)\n", name, str); status = -1; } @@ -495,9 +495,9 @@ gutenprint_get_cb (void *get_cb_data, if (!printer) { if (strlen(stp_get_driver(v)) == 0) - fprintf(stderr, _("ERROR: ijsgutenprint: Printer must be specified with -sDeviceModel\n")); + fprintf(stderr, "ERROR: ijsgutenprint: Printer must be specified with -sDeviceModel\n"); else - fprintf(stderr, _("ERROR: ijsgutenprint: Printer %s is not a known model\n"), + fprintf(stderr, "ERROR: ijsgutenprint: Printer %s is not a known model\n", stp_get_driver(v)); return IJS_EUNKPARAM; } @@ -653,7 +653,7 @@ gutenprint_set_cb (void *set_cb_data, IjsServerCtx *ctx, IjsJobId jobid, } else { - fprintf(stderr, _("ijsgutenprint: unknown DeviceModel %s\n"), vbuf); + fprintf(stderr, "ERROR: ijsgutenprint: unknown DeviceModel %s\n", vbuf); code = IJS_ERANGE; } } @@ -697,7 +697,7 @@ gutenprint_set_cb (void *set_cb_data, IjsServerCtx *ctx, IjsJobId jobid, stp_set_height(img->v, b - t); } else - fprintf(stderr, _("ERROR: ijsgutenprint: cannot parse TopLeft %s\n"), vbuf); + fprintf(stderr, "ERROR: ijsgutenprint: cannot parse TopLeft %s\n", vbuf); } else if (strcmp(key, "PaperSize") == 0) { @@ -720,7 +720,7 @@ gutenprint_set_cb (void *set_cb_data, IjsServerCtx *ctx, IjsJobId jobid, STP_DEBUG(fprintf(stderr, "ijsgutenprint: No matching paper size found\n")); } else - fprintf(stderr, _("ERROR: ijsgutenprint: cannot parse PaperSize %s\n"), vbuf); + fprintf(stderr, "ERROR: ijsgutenprint: cannot parse PaperSize %s\n", vbuf); } /* @@ -744,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, gettext(version_mismatch), + fprintf(stderr, VERSION_MISMATCH, version_id, vbuf, version_id, vbuf); version_is_ok = 0; gutenprint_ppd_version = c_strdup(vbuf); @@ -792,28 +792,28 @@ gutenprint_set_cb (void *set_cb_data, IjsServerCtx *ctx, IjsJobId jobid, stp_curve_destroy(curve); } else - fprintf(stderr, _("ERROR: ijsgutenprint: cannot parse curve %s\n"), vbuf); + fprintf(stderr, "ERROR: ijsgutenprint: cannot parse curve %s\n", vbuf); break; case STP_PARAMETER_TYPE_DOUBLE: code = get_float(vbuf, xkey, &z); if (code == 0) stp_set_float_parameter(img->v, xkey, z); else - fprintf(stderr, _("ERROR: ijsgutenprint: cannot parse %s float %s\n"), xkey, vbuf); + fprintf(stderr, "ERROR: ijsgutenprint: cannot parse %s float %s\n", xkey, vbuf); break; case STP_PARAMETER_TYPE_INT: code = get_int(vbuf, xkey, &i); if (code == 0) stp_set_int_parameter(img->v, xkey, i); else - fprintf(stderr, _("ERROR: ijsgutenprint: cannot parse %s int %s\n"), xkey, vbuf); + fprintf(stderr, "ERROR: ijsgutenprint: cannot parse %s int %s\n", xkey, vbuf); break; case STP_PARAMETER_TYPE_DIMENSION: code = get_int(vbuf, xkey, &i); if (code == 0) stp_set_dimension_parameter(img->v, xkey, i); else - fprintf(stderr, _("ERROR: ijsgutenprint: cannot parse %s dimension %s\n"), xkey, vbuf); + fprintf(stderr, "ERROR: ijsgutenprint: cannot parse %s dimension %s\n", xkey, vbuf); break; case STP_PARAMETER_TYPE_BOOLEAN: if (strcmp(vbuf, "False") == 0 || @@ -827,7 +827,7 @@ gutenprint_set_cb (void *set_cb_data, IjsServerCtx *ctx, IjsJobId jobid, strcmp(vbuf, "0") == 0) stp_set_boolean_parameter(img->v, xkey, 1); else - fprintf(stderr, _("ERROR: ijsgutenprint: cannot parse %s boolean %s\n"), xkey, vbuf); + fprintf(stderr, "ERROR: ijsgutenprint: cannot parse %s boolean %s\n", xkey, vbuf); break; default: if (strncmp(xkey, "Enable", strlen("Enable")) == 0) @@ -838,7 +838,7 @@ gutenprint_set_cb (void *set_cb_data, IjsServerCtx *ctx, IjsJobId jobid, stp_set_string_parameter(img->v, xkey, vbuf); } else - fprintf(stderr, _("ERROR: ijsgutenprint: Bad parameter %s %d\n"), key, desc.p_type); + fprintf(stderr, "ERROR: ijsgutenprint: Bad parameter %s %d\n", key, desc.p_type); } stp_parameter_description_destroy(&desc); } @@ -864,7 +864,7 @@ gutenprint_set_cb (void *set_cb_data, IjsServerCtx *ctx, IjsJobId jobid, pl->value_size = value_size; } else - fprintf(stderr, _("ERROR: ijsgutenprint: bad key code %d\n"), code); + fprintf(stderr, "ERROR: ijsgutenprint: bad key code %d\n", code); return code; } @@ -1305,7 +1305,7 @@ main (int argc, char **argv) status = image_init(&img, &ph); if (status) { - fprintf(stderr, _("ERROR: ijsgutenprint: image_init failed %d\n"), status); + fprintf(stderr, "ERROR: ijsgutenprint: image_init failed %d\n", status); break; } @@ -1316,7 +1316,7 @@ main (int argc, char **argv) f = fdopen(img.fd - 1, "wb"); if (!f) { - fprintf(stderr, _("ERROR: ijsgutenprint: Unable to open file descriptor: %s\n"), + fprintf(stderr, "ERROR: ijsgutenprint: Unable to open file descriptor: %s\n", strerror(errno)); status = -1; break; @@ -1328,7 +1328,7 @@ main (int argc, char **argv) if (!f) { status = -1; - fprintf(stderr, _("ERROR: ijsgutenprint: Unable to open %s: %s\n"), img.filename, + fprintf(stderr, "ERROR: ijsgutenprint: Unable to open %s: %s\n", img.filename, strerror(errno)); break; } @@ -1341,7 +1341,7 @@ main (int argc, char **argv) printer = stp_get_printer(img.v); if (printer == NULL) { - fprintf(stderr, _("ERROR: ijsgutenprint: Unknown printer %s\n"), + fprintf(stderr, "ERROR: ijsgutenprint: Unknown printer %s\n", stp_get_driver(img.v)); status = -1; break; @@ -1496,7 +1496,7 @@ main (int argc, char **argv) print_messages_as_errors = 1; if (!version_is_ok) { - fprintf(stderr, gettext(version_mismatch), version_id, + fprintf(stderr, VERSION_MISMATCH, version_id, gutenprint_ppd_version, version_id, gutenprint_ppd_version); status = IJS_ERANGE; break; @@ -1513,7 +1513,7 @@ main (int argc, char **argv) } else { - fprintf(stderr, _("ERROR: ijsgutenprint: Bad parameters; cannot continue!\n")); + fprintf(stderr, "ERROR: ijsgutenprint: Bad parameters; cannot continue!\n"); status = IJS_ERANGE; break; } @@ -1531,7 +1531,7 @@ main (int argc, char **argv) status = image_next_row(&img); if (status) { - fprintf(stderr, _("ERROR: ijsgutenprint: Get next row failed at %.0f\n"), + fprintf(stderr, "ERROR: ijsgutenprint: Get next row failed at %.0f\n", img.bytes_left); break; } @@ -1542,7 +1542,7 @@ main (int argc, char **argv) } if (status > 0) { - fprintf(stderr, "Ending job after page %d\n", page); + fprintf(stderr, "INFO: ijsgutenprint Ready to print.\n"); stp_end_job(old_v, &si); } else diff --git a/src/gimp/Makefile.am b/src/gimp/Makefile.am deleted file mode 100644 index 3d0e8c0..0000000 --- a/src/gimp/Makefile.am +++ /dev/null @@ -1,48 +0,0 @@ -## $Id: Makefile.am,v 1.36 2005/11/21 11:16:23 rleigh Exp $ -## Copyright (C) 2000 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 - -LOCAL_CPPFLAGS = $(GUTENPRINT_CFLAGS) $(GIMP_CFLAGS) - - -## Programs - -if BUILD_GIMP -gimp_plug_in_PROGRAMS = print -endif - -print_SOURCES = \ - print-image-gimp.c \ - print-intl.h \ - print.c \ - print_gimp.h - -print_LDADD = $(GIMP_LIBS) $(GUTENPRINTUI_LIBS) -print_DEPENDENCIES = $(GUTENPRINTUI_LIBS) $(GUTENPRINT_LIBS) - - -## Clean - -MAINTAINERCLEANFILES = Makefile.in diff --git a/src/gimp/Makefile.in b/src/gimp/Makefile.in deleted file mode 100644 index e25eb5b..0000000 --- a/src/gimp/Makefile.in +++ /dev/null @@ -1,616 +0,0 @@ -# Makefile.in generated by automake 1.10 from Makefile.am. -# @configure_input@ - -# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006 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 - -VPATH = @srcdir@ -pkgdatadir = $(datadir)/@PACKAGE@ -pkglibdir = $(libdir)/@PACKAGE@ -pkgincludedir = $(includedir)/@PACKAGE@ -am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd -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 = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \ - $(top_srcdir)/scripts/global.mk -@BUILD_GIMP_TRUE@gimp_plug_in_PROGRAMS = print$(EXEEXT) -subdir = src/gimp -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/isc-posix.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 = -am__installdirs = "$(DESTDIR)$(gimp_plug_indir)" -gimp_plug_inPROGRAMS_INSTALL = $(INSTALL_PROGRAM) -PROGRAMS = $(gimp_plug_in_PROGRAMS) -am_print_OBJECTS = print-image-gimp.$(OBJEXT) print.$(OBJEXT) -print_OBJECTS = $(am_print_OBJECTS) -am__DEPENDENCIES_1 = -DEFAULT_INCLUDES = -I. -I$(top_builddir)@am__isrc@ -depcomp = $(SHELL) $(top_srcdir)/scripts/depcomp -am__depfiles_maybe = depfiles -COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ - $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -LTCOMPILE = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ - --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \ - $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -CCLD = $(CC) -LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ - --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \ - $(LDFLAGS) -o $@ -SOURCES = $(print_SOURCES) -DIST_SOURCES = $(print_SOURCES) -ETAGS = etags -CTAGS = ctags -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_PPDS = @BUILD_CUPS_PPDS@ -CC = @CC@ -CCDEPMODE = @CCDEPMODE@ -CFLAGS = @CFLAGS@ -CONVERT = @CONVERT@ -CPP = @CPP@ -CPPFLAGS = @CPPFLAGS@ -CUPS_CFLAGS = @CUPS_CFLAGS@ -CUPS_CONFIG = @CUPS_CONFIG@ -CUPS_LIBS = @CUPS_LIBS@ -CUPS_PPD_PS_LEVEL = @CUPS_PPD_PS_LEVEL@ -CXX = @CXX@ -CXXCPP = @CXXCPP@ -CXXDEPMODE = @CXXDEPMODE@ -CXXFLAGS = @CXXFLAGS@ -CYGPATH_W = @CYGPATH_W@ -DB2HTML = @DB2HTML@ -DB2PDF = @DB2PDF@ -DB2PS = @DB2PS@ -DEFS = @DEFS@ -DEPDIR = @DEPDIR@ -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@ -GREP = @GREP@ -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 = @INSTALL@ -INSTALL_DATA = @INSTALL_DATA@ -INSTALL_PROGRAM = @INSTALL_PROGRAM@ -INSTALL_SCRIPT = @INSTALL_SCRIPT@ -INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ -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@ -MAKEINFO = @MAKEINFO@ -MKDIR_P = @MKDIR_P@ -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@ -SED = @SED@ -SET_MAKE = @SET_MAKE@ -SHELL = @SHELL@ -STRIP = @STRIP@ -TEST = @TEST@ -TEXI2HTML = @TEXI2HTML@ -TRUE = @TRUE@ -USE_NLS = @USE_NLS@ -VERSION = @VERSION@ -WHICH_PPDS = @WHICH_PPDS@ -XGETTEXT = @XGETTEXT@ -YACC = @YACC@ -YFLAGS = @YFLAGS@ -abs_builddir = @abs_builddir@ -abs_srcdir = @abs_srcdir@ -abs_top_builddir = @abs_top_builddir@ -abs_top_srcdir = @abs_top_srcdir@ -ac_ct_CC = @ac_ct_CC@ -ac_ct_CXX = @ac_ct_CXX@ -ac_ct_F77 = @ac_ct_F77@ -am__include = @am__include@ -am__leading_dot = @am__leading_dot@ -am__quote = @am__quote@ -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@ -builddir = @builddir@ -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@ -datarootdir = @datarootdir@ -docdir = @docdir@ -dvidir = @dvidir@ -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@ -htmldir = @htmldir@ -includedir = @includedir@ -infodir = @infodir@ -install_sh = @install_sh@ -libdir = @libdir@ -libexecdir = @libexecdir@ -localedir = @localedir@ -localstatedir = @localstatedir@ -mandir = @mandir@ -mkdir_p = @mkdir_p@ -oldincludedir = @oldincludedir@ -pdfdir = @pdfdir@ -prefix = @prefix@ -program_transform_name = @program_transform_name@ -psdir = @psdir@ -sbindir = @sbindir@ -sharedstatedir = @sharedstatedir@ -srcdir = @srcdir@ -sysconfdir = @sysconfdir@ -target_alias = @target_alias@ -top_builddir = @top_builddir@ -top_srcdir = @top_srcdir@ -AM_CPPFLAGS = -I$(top_srcdir)/include -I$(top_builddir)/include $(LOCAL_CPPFLAGS) $(GNUCFLAGS) -LOCAL_CPPFLAGS = $(GUTENPRINT_CFLAGS) $(GIMP_CFLAGS) -print_SOURCES = \ - print-image-gimp.c \ - print-intl.h \ - print.c \ - print_gimp.h - -print_LDADD = $(GIMP_LIBS) $(GUTENPRINTUI_LIBS) -print_DEPENDENCIES = $(GUTENPRINTUI_LIBS) $(GUTENPRINT_LIBS) -MAINTAINERCLEANFILES = Makefile.in -all: all-am - -.SUFFIXES: -.SUFFIXES: .c .lo .o .obj -$(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 src/gimp/Makefile'; \ - cd $(top_srcdir) && \ - $(AUTOMAKE) --gnu src/gimp/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 -install-gimp_plug_inPROGRAMS: $(gimp_plug_in_PROGRAMS) - @$(NORMAL_INSTALL) - test -z "$(gimp_plug_indir)" || $(MKDIR_P) "$(DESTDIR)$(gimp_plug_indir)" - @list='$(gimp_plug_in_PROGRAMS)'; for p in $$list; do \ - p1=`echo $$p|sed 's/$(EXEEXT)$$//'`; \ - if test -f $$p \ - || test -f $$p1 \ - ; then \ - f=`echo "$$p1" | sed 's,^.*/,,;$(transform);s/$$/$(EXEEXT)/'`; \ - echo " $(INSTALL_PROGRAM_ENV) $(LIBTOOL) --mode=install $(gimp_plug_inPROGRAMS_INSTALL) '$$p' '$(DESTDIR)$(gimp_plug_indir)/$$f'"; \ - $(INSTALL_PROGRAM_ENV) $(LIBTOOL) --mode=install $(gimp_plug_inPROGRAMS_INSTALL) "$$p" "$(DESTDIR)$(gimp_plug_indir)/$$f" || exit 1; \ - else :; fi; \ - done - -uninstall-gimp_plug_inPROGRAMS: - @$(NORMAL_UNINSTALL) - @list='$(gimp_plug_in_PROGRAMS)'; for p in $$list; do \ - f=`echo "$$p" | sed 's,^.*/,,;s/$(EXEEXT)$$//;$(transform);s/$$/$(EXEEXT)/'`; \ - echo " rm -f '$(DESTDIR)$(gimp_plug_indir)/$$f'"; \ - rm -f "$(DESTDIR)$(gimp_plug_indir)/$$f"; \ - done - -clean-gimp_plug_inPROGRAMS: - @list='$(gimp_plug_in_PROGRAMS)'; for p in $$list; do \ - f=`echo $$p|sed 's/$(EXEEXT)$$//'`; \ - echo " rm -f $$p $$f"; \ - rm -f $$p $$f ; \ - done -print$(EXEEXT): $(print_OBJECTS) $(print_DEPENDENCIES) - @rm -f print$(EXEEXT) - $(LINK) $(print_OBJECTS) $(print_LDADD) $(LIBS) - -mostlyclean-compile: - -rm -f *.$(OBJEXT) - -distclean-compile: - -rm -f *.tab.c - -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/print-image-gimp.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/print.Po@am__quote@ - -.c.o: -@am__fastdepCC_TRUE@ $(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< -@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po -@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(COMPILE) -c $< - -.c.obj: -@am__fastdepCC_TRUE@ $(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'` -@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po -@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(COMPILE) -c `$(CYGPATH_W) '$<'` - -.c.lo: -@am__fastdepCC_TRUE@ $(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< -@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo -@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(LTCOMPILE) -c -o $@ $< - -mostlyclean-libtool: - -rm -f *.lo - -clean-libtool: - -rm -rf .libs _libs - -ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ - mkid -fID $$unique -tags: TAGS - -TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $(TAGS_FILES) $(LISP) - tags=; \ - here=`pwd`; \ - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ - if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \ - test -n "$$unique" || unique=$$empty_fix; \ - $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ - $$tags $$unique; \ - fi -ctags: CTAGS -CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $(TAGS_FILES) $(LISP) - tags=; \ - here=`pwd`; \ - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ - test -z "$(CTAGS_ARGS)$$tags$$unique" \ - || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ - $$tags $$unique - -GTAGS: - here=`$(am__cd) $(top_builddir) && pwd` \ - && cd $(top_srcdir) \ - && gtags -i $(GTAGS_ARGS) $$here - -distclean-tags: - -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags - -distdir: $(DISTFILES) - @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ - topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ - list='$(DISTFILES)'; \ - dist_files=`for file in $$list; do echo $$file; done | \ - sed -e "s|^$$srcdirstrip/||;t" \ - -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \ - case $$dist_files in \ - */*) $(MKDIR_P) `echo "$$dist_files" | \ - sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \ - sort -u` ;; \ - esac; \ - for file in $$dist_files; do \ - if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \ - if test -d $$d/$$file; then \ - dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \ - 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 -check-am: all-am -check: check-am -all-am: Makefile $(PROGRAMS) -installdirs: - for dir in "$(DESTDIR)$(gimp_plug_indir)"; do \ - test -z "$$dir" || $(MKDIR_P) "$$dir"; \ - done -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-gimp_plug_inPROGRAMS clean-libtool \ - mostlyclean-am - -distclean: distclean-am - -rm -rf ./$(DEPDIR) - -rm -f Makefile -distclean-am: clean-am distclean-compile distclean-generic \ - distclean-tags - -dvi: dvi-am - -dvi-am: - -html: html-am - -info: info-am - -info-am: - -install-data-am: install-gimp_plug_inPROGRAMS - -install-dvi: install-dvi-am - -install-exec-am: - -install-html: install-html-am - -install-info: install-info-am - -install-man: - -install-pdf: install-pdf-am - -install-ps: install-ps-am - -installcheck-am: - -maintainer-clean: maintainer-clean-am - -rm -rf ./$(DEPDIR) - -rm -f Makefile -maintainer-clean-am: distclean-am maintainer-clean-generic - -mostlyclean: mostlyclean-am - -mostlyclean-am: mostlyclean-compile mostlyclean-generic \ - mostlyclean-libtool - -pdf: pdf-am - -pdf-am: - -ps: ps-am - -ps-am: - -uninstall-am: uninstall-gimp_plug_inPROGRAMS - -.MAKE: install-am install-strip - -.PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \ - clean-gimp_plug_inPROGRAMS clean-libtool ctags distclean \ - distclean-compile distclean-generic distclean-libtool \ - distclean-tags distdir dvi dvi-am html html-am info info-am \ - install install-am install-data install-data-am install-dvi \ - install-dvi-am install-exec install-exec-am \ - install-gimp_plug_inPROGRAMS install-html install-html-am \ - install-info install-info-am install-man install-pdf \ - install-pdf-am install-ps install-ps-am install-strip \ - installcheck installcheck-am installdirs maintainer-clean \ - maintainer-clean-generic mostlyclean mostlyclean-compile \ - mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \ - tags uninstall uninstall-am uninstall-gimp_plug_inPROGRAMS - - -@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) -# 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/src/gimp/print-image-gimp.c b/src/gimp/print-image-gimp.c deleted file mode 100644 index d630931..0000000 --- a/src/gimp/print-image-gimp.c +++ /dev/null @@ -1,447 +0,0 @@ -/* - * "$Id: print-image-gimp.c,v 1.13 2004/05/09 16:06:09 rleigh Exp $" - * - * Print plug-in for the GIMP. - * - * Copyright 1997-2000 Michael Sweet (mike@easysw.com) and - * Robert Krawitz (rlk@alum.mit.edu) - * Copyright 2000 Charles Briscoe-Smith - * - * 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 -#endif -#include - -#include "print_gimp.h" - -#include "print-intl.h" - - -/* - * "Image" ADT - * - * This file defines an abstract data type called "Image". An Image wraps - * a Gimp drawable (or some other application-level image representation) - * for presentation to the low-level printer drivers (which do CMYK - * separation, dithering and weaving). The Image ADT has the ability - * to perform any combination of flips and rotations on the image, - * and then deliver individual rows to the driver code. - * - * Stuff which might be useful to do in this layer: - * - * - Scaling, optionally with interpolation/filtering. - * - * - Colour-adjustment. - * - * - Multiple-image composition. - * - * Also useful might be to break off a thin application-dependent - * sublayer leaving this layer (which does the interesting stuff) - * application-independent. - */ - - -/* Concrete type to represent image */ -typedef struct -{ - GimpDrawable *drawable; - GimpPixelRgn rgn; - - /* - * Transformations we can impose on the image. The transformations - * are considered to be performed in the order given here. - */ - - /* 1: Transpose the x and y axes (flip image over its leading diagonal) */ - int columns; /* Set if returning columns instead of rows. */ - - /* 2: Translate (ox,oy) to the origin */ - int ox, oy; /* Origin of image */ - - /* 3: Flip vertically about the x axis */ - int increment; /* +1 or -1 for offset of row n+1 from row n. */ - - /* 4: Crop to width w, height h */ - int w, h; /* Width and height of output image */ - - /* 5: Flip horizontally about the vertical centre-line of the image */ - int mirror; /* Set if mirroring rows end-for-end. */ - - gint32 image_ID; - gint32 ncolors; - gint32 real_bpp; - GimpImageBaseType base_type; - guchar *cmap; - guchar *alpha_table; - guchar *tmp; - gint last_printed_percent; - gint initialized; -} Gimp_Image_t; - -static const char *Image_get_appname(stp_image_t *image); -static void Image_conclude(stp_image_t *image); -static stp_image_status_t Image_get_row(stp_image_t *image, - unsigned char *data, - size_t byte_limit, int row); -static int Image_height(stp_image_t *image); -static int Image_width(stp_image_t *image); -static void Image_reset(stp_image_t *image); -static void Image_init(stp_image_t *image); - -static void Image_transpose(stpui_image_t *image); -static void Image_hflip(stpui_image_t *image); -static void Image_vflip(stpui_image_t *image); -static void Image_rotate_ccw(stpui_image_t *image); -static void Image_rotate_cw(stpui_image_t *image); -static void Image_rotate_180(stpui_image_t *image); -static void Image_crop(stpui_image_t *image, int, int, int, int); - -static stpui_image_t theImage = -{ - { - Image_init, - Image_reset, - Image_width, - Image_height, - Image_get_row, - Image_get_appname, - Image_conclude, - NULL, - }, - Image_transpose, - Image_hflip, - Image_vflip, - Image_rotate_ccw, - Image_rotate_cw, - Image_rotate_180, - Image_crop -}; - -static void -compute_alpha_table(Gimp_Image_t *image) -{ - unsigned val, alpha; - image->alpha_table = stp_malloc(65536 * sizeof(unsigned char)); - for (val = 0; val < 256; val++) - for (alpha = 0; alpha < 256; alpha++) - image->alpha_table[(val * 256) + alpha] = - val * alpha / 255 + 255 - alpha; -} - -static inline unsigned char -alpha_lookup(Gimp_Image_t *image, int val, int alpha) -{ - return image->alpha_table[(val * 256) + alpha]; -} - -stpui_image_t * -Image_GimpDrawable_new(GimpDrawable *drawable, gint32 image_ID) -{ - Gimp_Image_t *im = stp_malloc(sizeof(Gimp_Image_t)); - memset(im, 0, sizeof(Gimp_Image_t)); - im->drawable = drawable; - gimp_pixel_rgn_init(&(im->rgn), drawable, 0, 0, - drawable->width, drawable->height, FALSE, FALSE); - im->image_ID = image_ID; - im->base_type = gimp_image_base_type(image_ID); - im->initialized = 0; - theImage.im.rep = im; - theImage.im.reset(&(theImage.im)); - switch (im->base_type) - { - case GIMP_INDEXED: - im->cmap = gimp_image_get_cmap(image_ID, &(im->ncolors)); - im->real_bpp = 3; - break; - case GIMP_GRAY: - im->real_bpp = 1; - break; - case GIMP_RGB: - im->real_bpp = 3; - break; - } - if (im->drawable->bpp == 2 || im->drawable->bpp == 4) - compute_alpha_table(im); - return &theImage; -} - -static void -Image_init(stp_image_t *image) -{ - /* Nothing to do. */ -} - -static void -Image_reset(stp_image_t *image) -{ - Gimp_Image_t *im = (Gimp_Image_t *) (image->rep); - im->columns = FALSE; - im->ox = 0; - im->oy = 0; - im->increment = 1; - im->w = im->drawable->width; - im->h = im->drawable->height; - im->mirror = FALSE; -} - -static int -Image_width(stp_image_t *image) -{ - Gimp_Image_t *im = (Gimp_Image_t *) (image->rep); - return im->w; -} - -static int -Image_height(stp_image_t *image) -{ - Gimp_Image_t *im = (Gimp_Image_t *) (image->rep); - return im->h; -} - -static stp_image_status_t -Image_get_row(stp_image_t *image, unsigned char *data, size_t byte_limit, - int row) -{ - Gimp_Image_t *im = (Gimp_Image_t *) (image->rep); - int last_printed_percent; - guchar *inter; - if (!im->initialized) - { - gimp_progress_init(_("Printing...")); - switch (im->base_type) - { - case GIMP_INDEXED: - im->tmp = stp_malloc(im->drawable->bpp * im->w); - break; - case GIMP_GRAY: - if (im->drawable->bpp == 2) - im->tmp = stp_malloc(im->drawable->bpp * im->w); - break; - case GIMP_RGB: - if (im->drawable->bpp == 4) - im->tmp = stp_malloc(im->drawable->bpp * im->w); - break; - } - im->initialized = 1; - } - if (im->tmp) - inter = im->tmp; - else - inter = data; - if (im->columns) - gimp_pixel_rgn_get_col(&(im->rgn), inter, - im->oy + row * im->increment, im->ox, im->w); - else - gimp_pixel_rgn_get_row(&(im->rgn), inter, - im->ox, im->oy + row * im->increment, im->w); - if (im->cmap) - { - int i; - if (im->alpha_table) - { - for (i = 0; i < im->w; i++) - { - int j; - for (j = 0; j < 3; j++) - { - gint32 tval = im->cmap[(3 * inter[2 * i]) + j]; - data[(3 * i) + j] = alpha_lookup(im, tval, - inter[(2 * i) + 1]); - } - - } - } - else - { - for (i = 0; i < im->w; i++) - { - data[(3 * i) + 0] = im->cmap[(3 * inter[i]) + 0]; - data[(3 * i) + 1] = im->cmap[(3 * inter[i]) + 1]; - data[(3 * i) + 2] = im->cmap[(3 * inter[i]) + 2]; - } - } - } - else if (im->alpha_table) - { - int i; - for (i = 0; i < im->w; i++) - { - int j; - for (j = 0; j < im->real_bpp; j++) - { - gint32 tval = inter[(i * im->drawable->bpp) + j]; - data[(i * im->real_bpp) + j] = - alpha_lookup(im, tval, - inter[((i + 1) * im->drawable->bpp) - 1]); - } - - } - } - if (im->mirror) - { - /* Flip row -- probably inefficiently */ - int f; - int l; - int b = im->real_bpp; - for (f = 0, l = im->w - 1; f < l; f++, l--) - { - int c; - unsigned char tmp; - for (c = 0; c < b; c++) - { - tmp = data[f*b+c]; - data[f*b+c] = data[l*b+c]; - data[l*b+c] = tmp; - } - } - } - last_printed_percent = row * 100 / im->h; - if (last_printed_percent > im->last_printed_percent) - { - gimp_progress_update((double) row / (double) im->h); - im->last_printed_percent = last_printed_percent; - } - return STP_IMAGE_STATUS_OK; -} - -static void -Image_transpose(stpui_image_t *image) -{ - Gimp_Image_t *im = (Gimp_Image_t *) (image->im.rep); - int tmp; - - if (im->mirror) im->ox += im->w - 1; - - im->columns = !im->columns; - - tmp = im->ox; - im->ox = im->oy; - im->oy = tmp; - - tmp = im->mirror; - im->mirror = im->increment < 0; - im->increment = tmp ? -1 : 1; - - tmp = im->w; - im->w = im->h; - im->h = tmp; - - if (im->mirror) im->ox -= im->w - 1; -} - -static void -Image_hflip(stpui_image_t *image) -{ - Gimp_Image_t *im = (Gimp_Image_t *) (image->im.rep); - im->mirror = !im->mirror; -} - -static void -Image_vflip(stpui_image_t *image) -{ - Gimp_Image_t *im = (Gimp_Image_t *) (image->im.rep); - im->oy += (im->h-1) * im->increment; - im->increment = -im->increment; -} - -/* - * Image_crop: - * - * Crop the given number of pixels off the LEFT, TOP, RIGHT and BOTTOM - * of the image. - */ - -static void -Image_crop(stpui_image_t *image, int left, int top, int right, int bottom) -{ - Gimp_Image_t *im = (Gimp_Image_t *) (image->im.rep); - int xmax = (im->columns ? im->drawable->height : im->drawable->width) - 1; - int ymax = (im->columns ? im->drawable->width : im->drawable->height) - 1; - - int nx = im->ox + im->mirror ? right : left; - int ny = im->oy + top * (im->increment); - - int nw = im->w - left - right; - int nh = im->h - top - bottom; - - int wmax, hmax; - - if (nx < 0) nx = 0; - else if (nx > xmax) nx = xmax; - - if (ny < 0) ny = 0; - else if (ny > ymax) ny = ymax; - - wmax = xmax - nx + 1; - hmax = im->increment ? ny + 1 : ymax - ny + 1; - - if (nw < 1) nw = 1; - else if (nw > wmax) nw = wmax; - - if (nh < 1) nh = 1; - else if (nh > hmax) nh = hmax; - - im->ox = nx; - im->oy = ny; - im->w = nw; - im->h = nh; -} - -static void -Image_rotate_ccw(stpui_image_t *image) -{ - Image_transpose(image); - Image_vflip(image); -} - -static void -Image_rotate_cw(stpui_image_t *image) -{ - Image_transpose(image); - Image_hflip(image); -} - -static void -Image_rotate_180(stpui_image_t *image) -{ - Image_vflip(image); - Image_hflip(image); -} - -static void -Image_conclude(stp_image_t *image) -{ - Gimp_Image_t *im = (Gimp_Image_t *) (image->rep); - gimp_progress_update(1); - if (im->alpha_table) - stp_free(im->alpha_table); - if (im->tmp) - stp_free(im->tmp); -} - -static const char * -Image_get_appname(stp_image_t *image) -{ - static char pluginname[] = "Print plug-in V" VERSION " - " RELEASE_DATE - " for GIMP"; - return pluginname; -} - -/* - * End of "$Id: print-image-gimp.c,v 1.13 2004/05/09 16:06:09 rleigh Exp $". - */ diff --git a/src/gimp/print-intl.h b/src/gimp/print-intl.h deleted file mode 100644 index 4599852..0000000 --- a/src/gimp/print-intl.h +++ /dev/null @@ -1,39 +0,0 @@ -/* - * "$Id: print-intl.h,v 1.6 2004/09/17 18:38:13 rleigh Exp $" - * - * I18N header file for the GIMP Print plugin. - * - * Copyright 1997-2000 Michael Sweet (mike@easysw.com), - * Robert Krawitz (rlk@alum.mit.edu) and Michael Natterer (mitch@gimp.org) - * - * 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. - */ - -#ifndef GIMP_PRINT_INTL_H -#define GIMP_PRINT_INTL_H - -#include -#include - -#define INIT_LOCALE(domain) \ -do \ -{ \ - gtk_set_locale (); \ - setlocale (LC_NUMERIC, "C"); \ - bindtextdomain (domain, PACKAGE_LOCALE_DIR); \ - textdomain (domain); \ -} while (0) - -#endif /* GIMP_PRINT_INTL_H */ diff --git a/src/gimp/print.c b/src/gimp/print.c deleted file mode 100644 index e5ee0fd..0000000 --- a/src/gimp/print.c +++ /dev/null @@ -1,458 +0,0 @@ -/* - * "$Id: print.c,v 1.66 2006/05/04 11:30:08 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 -#endif - -#include -#include "print_gimp.h" - -#include -#include -#include -#include - -#include -#include -#include - -#include "print-intl.h" - -/* - * Local functions... - */ - -static void query (void); -static void run (char *, int, GimpParam *, int *, GimpParam **); -static int do_print_dialog (char *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... - */ - -GimpPlugInInfo PLUG_IN_INFO = /* Plug-in information */ -{ - NULL, /* init_proc */ - NULL, /* quit_proc */ - query, /* query_proc */ - run, /* run_proc */ -}; - -static stpui_plist_t gimp_vars; - -/* - * 'main()' - Main entry - just call gimp_main()... - */ - -MAIN() - -/* - * 'query()' - Respond to a plug-in query... - */ - -static void -query (void) -{ - static /* const */ GimpParamDef args[] = - { - { GIMP_PDB_INT32, (BAD_CONST_CHAR) "run_mode", (BAD_CONST_CHAR) "Interactive, non-interactive" }, - { GIMP_PDB_IMAGE, (BAD_CONST_CHAR) "image", (BAD_CONST_CHAR) "Input image" }, - { GIMP_PDB_DRAWABLE, (BAD_CONST_CHAR) "drawable", (BAD_CONST_CHAR) "Input drawable" }, - { GIMP_PDB_STRING, (BAD_CONST_CHAR) "output_to", (BAD_CONST_CHAR) "Print command or filename (| to pipe to command)" }, - { GIMP_PDB_STRING, (BAD_CONST_CHAR) "driver", (BAD_CONST_CHAR) "Printer driver short name" }, - { GIMP_PDB_STRING, (BAD_CONST_CHAR) "ppd_file", (BAD_CONST_CHAR) "PPD file" }, - { GIMP_PDB_INT32, (BAD_CONST_CHAR) "output_type", (BAD_CONST_CHAR) "Output type (0 = gray, 1 = color)" }, - { GIMP_PDB_STRING, (BAD_CONST_CHAR) "resolution", (BAD_CONST_CHAR) "Resolution (\"300\", \"720\", etc.)" }, - { GIMP_PDB_STRING, (BAD_CONST_CHAR) "media_size", (BAD_CONST_CHAR) "Media size (\"Letter\", \"A4\", etc.)" }, - { GIMP_PDB_STRING, (BAD_CONST_CHAR) "media_type", (BAD_CONST_CHAR) "Media type (\"Plain\", \"Glossy\", etc.)" }, - { GIMP_PDB_STRING, (BAD_CONST_CHAR) "media_source", (BAD_CONST_CHAR) "Media source (\"Tray1\", \"Manual\", etc.)" }, - { GIMP_PDB_FLOAT, (BAD_CONST_CHAR) "brightness", (BAD_CONST_CHAR) "Brightness (0-400%)" }, - { GIMP_PDB_FLOAT, (BAD_CONST_CHAR) "scaling", (BAD_CONST_CHAR) "Output scaling (0-100%, -PPI)" }, - { GIMP_PDB_INT32, (BAD_CONST_CHAR) "orientation", (BAD_CONST_CHAR) "Output orientation (-1 = auto, 0 = portrait, 1 = landscape)" }, - { GIMP_PDB_INT32, (BAD_CONST_CHAR) "left", (BAD_CONST_CHAR) "Left offset (points, -1 = centered)" }, - { GIMP_PDB_INT32, (BAD_CONST_CHAR) "top", (BAD_CONST_CHAR) "Top offset (points, -1 = centered)" }, - { GIMP_PDB_FLOAT, (BAD_CONST_CHAR) "gamma", (BAD_CONST_CHAR) "Output gamma (0.1 - 3.0)" }, - { GIMP_PDB_FLOAT, (BAD_CONST_CHAR) "contrast", (BAD_CONST_CHAR) "Contrast" }, - { GIMP_PDB_FLOAT, (BAD_CONST_CHAR) "cyan", (BAD_CONST_CHAR) "Cyan level" }, - { GIMP_PDB_FLOAT, (BAD_CONST_CHAR) "magenta", (BAD_CONST_CHAR) "Magenta level" }, - { GIMP_PDB_FLOAT, (BAD_CONST_CHAR) "yellow", (BAD_CONST_CHAR) "Yellow level" }, - { GIMP_PDB_INT32, (BAD_CONST_CHAR) "linear", (BAD_CONST_CHAR) "Linear output (0 = normal, 1 = linear)" }, - { GIMP_PDB_INT32, (BAD_CONST_CHAR) "image_type", (BAD_CONST_CHAR) "Image type (0 = line art, 1 = solid tones, 2 = continuous tone, 3 = monochrome)"}, - { GIMP_PDB_FLOAT, (BAD_CONST_CHAR) "saturation", (BAD_CONST_CHAR) "Saturation (0-1000%)" }, - { GIMP_PDB_FLOAT, (BAD_CONST_CHAR) "density", (BAD_CONST_CHAR) "Density (0-200%)" }, - { GIMP_PDB_STRING, (BAD_CONST_CHAR) "ink_type", (BAD_CONST_CHAR) "Type of ink or cartridge" }, - { GIMP_PDB_STRING, (BAD_CONST_CHAR) "dither_algorithm", (BAD_CONST_CHAR) "Dither algorithm" }, - { GIMP_PDB_INT32, (BAD_CONST_CHAR) "unit", (BAD_CONST_CHAR) "Unit 0=Inches 1=Metric" }, - }; - static gint nargs = sizeof(args) / sizeof(args[0]); - - 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 *auth = "Michael Sweet and Robert Krawitz "; - static const gchar *copy = "Copyright 1997-2000 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 "" */ - (BAD_CONST_CHAR) N_("/File/Print..."), - (BAD_CONST_CHAR) types, - GIMP_PLUGIN, - nargs, 0, - args, NULL); -} - -static guchar *gimp_thumbnail_data = NULL; - -static guchar * -stpui_get_thumbnail_data_function(void *image_ID, gint *width, gint *height, - gint *bpp, gint page) -{ - if (gimp_thumbnail_data) - g_free(gimp_thumbnail_data); - gimp_thumbnail_data = - gimp_image_get_thumbnail_data((gint) image_ID, width, height, bpp); - return gimp_thumbnail_data; -} - -/* - * 'run()' - Run the plug-in... - */ - -volatile int SDEBUG = 1; - -static void -run (char *name, /* I - Name of print program. */ - int nparams, /* I - Number of parameters passed in */ - GimpParam *param, /* I - Parameter values */ - int *nreturn_vals, /* O - Number of return values */ - GimpParam **return_vals) /* O - Return values */ -{ - GimpDrawable *drawable; /* Drawable for image */ - GimpRunModeType run_mode; /* Current run mode */ - GimpParam *values; /* Return values */ - gint32 drawable_ID; /* drawable ID */ - GimpExportReturnType export = GIMP_EXPORT_CANCEL; /* return value of gimp_export_image() */ - gdouble xres, yres; - char *image_filename; - char *image_basename; - stpui_image_t *image; - gint32 image_ID; - gint32 base_type; - if (getenv("STP_DEBUG_STARTUP")) - while (SDEBUG) - ; - - /* - * Initialise libgutenprint - */ - - stp_init(); - -#ifdef INIT_I18N_UI - INIT_I18N_UI(); -#else - /* - * With GCC and glib 1.2, there will be a warning here about braces in - * expressions. Getting rid of it causes more problems than it solves. - * In particular, turning on -ansi on the command line causes a number of - * other useful things, such as strcasecmp, popen, and snprintf to go away - */ - INIT_LOCALE (PACKAGE); -#endif - - stpui_printer_initialize(&gimp_vars); - /* - * Initialize parameter data... - */ - - run_mode = (GimpRunModeType)param[0].data.d_int32; - - values = g_new (GimpParam, 1); - - values[0].type = GIMP_PDB_STATUS; - values[0].data.d_status = GIMP_PDB_SUCCESS; - - *nreturn_vals = 1; - *return_vals = values; - - image_ID = param[1].data.d_int32; - drawable_ID = param[2].data.d_int32; - - image_filename = gimp_image_get_filename (image_ID); - if (image_filename) - { - image_basename = image_filename; - if (strchr(image_filename, '/')) - image_basename = strrchr(image_filename, '/') + 1; - stpui_set_image_filename(image_basename); - g_free(image_filename); - } - else - stpui_set_image_filename("Untitled"); - - /* eventually export the image */ - switch (run_mode) - { - case GIMP_RUN_INTERACTIVE: - case GIMP_RUN_WITH_LAST_VALS: - gimp_ui_init ("print", TRUE); - export = gimp_export_image (&image_ID, &drawable_ID, "Print", - (GIMP_EXPORT_CAN_HANDLE_RGB | - GIMP_EXPORT_CAN_HANDLE_GRAY | - GIMP_EXPORT_CAN_HANDLE_INDEXED | - GIMP_EXPORT_CAN_HANDLE_ALPHA)); - if (export == GIMP_EXPORT_CANCEL) - { - *nreturn_vals = 1; - values[0].data.d_status = GIMP_PDB_EXECUTION_ERROR; - return; - } - break; - default: - break; - } - - /* - * Get drawable... - */ - - drawable = gimp_drawable_get (drawable_ID); - stpui_set_image_dimensions(drawable->width, drawable->height); - gimp_image_get_resolution (image_ID, &xres, &yres); - stpui_set_image_resolution(xres, yres); - stpui_set_image_channel_depth(8); - base_type = gimp_image_base_type(image_ID); - switch (base_type) - { - case GIMP_INDEXED: - case GIMP_RGB: - stpui_set_image_type("RGB"); - break; - case GIMP_GRAY: - stpui_set_image_type("Whitescale"); - break; - default: - break; - } - - image = Image_GimpDrawable_new(drawable, image_ID); - stp_set_float_parameter(gimp_vars.v, "AppGamma", gimp_gamma()); - - /* - * See how we will run - */ - - switch (run_mode) - { - case GIMP_RUN_INTERACTIVE: - /* - * Get information from the dialog... - */ - - if (!do_print_dialog (name, image_ID)) - goto cleanup; - stpui_plist_copy(&gimp_vars, stpui_get_current_printer()); - break; - - case GIMP_RUN_NONINTERACTIVE: - /* - * Make sure all the arguments are present... - */ - if (nparams < 11) - values[0].data.d_status = GIMP_PDB_CALLING_ERROR; - else - { -#if 0 - /* What do we do with old output_to? Probably best ignore it. */ - stpui_plist_set_output_to(&gimp_vars, param[3].data.d_string); -#endif - stp_set_driver(gimp_vars.v, param[4].data.d_string); - stp_set_file_parameter(gimp_vars.v, "PPDFile", param[5].data.d_string); - switch (param[6].data.d_int32) - { - case 0: - default: - stp_set_string_parameter(gimp_vars.v, "PrintingMode", "BW"); - case 1: - stp_set_string_parameter(gimp_vars.v, "PrintingMode", "Color"); - } - stp_set_string_parameter(gimp_vars.v, "Resolution", param[7].data.d_string); - stp_set_string_parameter(gimp_vars.v, "PageSize", param[8].data.d_string); - stp_set_string_parameter(gimp_vars.v, "MediaType", param[9].data.d_string); - stp_set_string_parameter(gimp_vars.v, "InputSlot", param[10].data.d_string); - - if (nparams > 11) - stp_set_float_parameter(gimp_vars.v, "Brightness", param[11].data.d_float); - - if (nparams > 12) - gimp_vars.scaling = param[12].data.d_float; - - if (nparams > 13) - gimp_vars.orientation = param[13].data.d_int32; - - if (nparams > 14) - stp_set_left(gimp_vars.v, param[14].data.d_int32); - - if (nparams > 15) - stp_set_top(gimp_vars.v, param[15].data.d_int32); - - if (nparams > 16) - stp_set_float_parameter(gimp_vars.v, "Gamma", param[16].data.d_float); - - if (nparams > 17) - stp_set_float_parameter(gimp_vars.v, "Contrast", param[17].data.d_float); - - if (nparams > 18) - stp_set_float_parameter(gimp_vars.v, "Cyan", param[18].data.d_float); - - if (nparams > 19) - stp_set_float_parameter(gimp_vars.v, "Magenta", param[19].data.d_float); - - if (nparams > 20) - stp_set_float_parameter(gimp_vars.v, "Yellow", param[20].data.d_float); - - if (nparams > 21) - stp_set_string_parameter(gimp_vars.v, "ImageOptimization", param[21].data.d_string); - - if (nparams > 22) - stp_set_float_parameter(gimp_vars.v, "Saturation", param[23].data.d_float); - - if (nparams > 23) - stp_set_float_parameter(gimp_vars.v, "Density", param[24].data.d_float); - - if (nparams > 24) - stp_set_string_parameter(gimp_vars.v, "InkType", param[25].data.d_string); - - if (nparams > 25) - stp_set_string_parameter(gimp_vars.v, "DitherAlgorithm", - param[26].data.d_string); - - if (nparams > 26) - gimp_vars.unit = param[27].data.d_int32; - } - - break; - - case GIMP_RUN_WITH_LAST_VALS: - values[0].data.d_status = GIMP_PDB_CALLING_ERROR; - break; - - default: - values[0].data.d_status = GIMP_PDB_CALLING_ERROR; - break; - } - - if (gimp_thumbnail_data) - g_free(gimp_thumbnail_data); - - /* - * Print the image... - */ - if (values[0].data.d_status == GIMP_PDB_SUCCESS) - { - /* - * Set the tile cache size... - */ - - if (drawable->height > drawable->width) - gimp_tile_cache_ntiles ((drawable->height + gimp_tile_width () - 1) / - gimp_tile_width () + 1); - else - gimp_tile_cache_ntiles ((drawable->width + gimp_tile_width () - 1) / - gimp_tile_width () + 1); - - if (! stpui_print(&gimp_vars, image)) - values[0].data.d_status = GIMP_PDB_EXECUTION_ERROR; - - /* - * Store data... - * FIXME! This is broken! - */ - -#if 0 - if (run_mode == GIMP_RUN_INTERACTIVE) - gimp_set_data (PLUG_IN_NAME, vars, sizeof (vars)); -#endif - } - - /* - * Detach from the drawable... - */ - gimp_drawable_detach (drawable); - - cleanup: - if (export == GIMP_EXPORT_EXPORT) - gimp_image_delete (image_ID); - stp_vars_destroy(gimp_vars.v); -} - -/* - * 'do_print_dialog()' - Pop up the print dialog... - */ - -static void -gimp_writefunc(void *file, const char *buf, size_t bytes) -{ - FILE *prn = (FILE *)file; - fwrite(buf, 1, bytes, prn); -} - -static void -gimp_errfunc(void *file, const char *buf, size_t bytes) -{ - char formatbuf[32]; - snprintf(formatbuf, 31, "%%%ds", bytes); - g_message(formatbuf, buf); -} - -static gint -do_print_dialog (gchar *proc_name, gint32 image_ID) -{ - /* - * Generate the filename for the current user... - */ - char *filename = gimp_personal_rc_file ((BAD_CONST_CHAR) "printrc"); - stpui_set_printrc_file(filename); - g_free(filename); - if (! getenv("STP_PRINT_MESSAGES_TO_STDERR")) - stpui_set_errfunc(gimp_errfunc); - stpui_set_thumbnail_func(stpui_get_thumbnail_data_function); - stpui_set_thumbnail_data((void *) image_ID); - return stpui_do_print_dialog(); -} diff --git a/src/gimp/print_gimp.h b/src/gimp/print_gimp.h deleted file mode 100644 index 9ef3140..0000000 --- a/src/gimp/print_gimp.h +++ /dev/null @@ -1,46 +0,0 @@ -/* - * "$Id: print_gimp.h,v 1.44 2004/09/17 18:38:13 rleigh Exp $" - * - * Print plug-in for the GIMP. - * - * Copyright 1997-2000 Michael Sweet (mike@easysw.com), - * Robert Krawitz (rlk@alum.mit.edu). and Steve Miller (smiller@rni.net - * - * 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. - * - * - * Revision History: - * - * See ChangeLog - */ - -#ifndef __PRINT_GIMP_H__ -#define __PRINT_GIMP_H__ - -#ifdef __GNUC__ -#define inline __inline__ -#endif - -#include -#include -#include - -#include -#include - -/* How to create an Image wrapping a Gimp drawable */ -extern stpui_image_t *Image_GimpDrawable_new(GimpDrawable *drawable, gint32); - -#endif /* __PRINT_GIMP_H__ */ diff --git a/src/gimp2/Makefile.in b/src/gimp2/Makefile.in index 18a85fc..5a45632 100644 --- a/src/gimp2/Makefile.in +++ b/src/gimp2/Makefile.in @@ -44,13 +44,12 @@ DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \ subdir = src/gimp2 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/isc-posix.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 + $(top_srcdir)/m4/iconv.m4 $(top_srcdir)/m4/isc-posix.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 @@ -131,27 +130,13 @@ 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@ GREP = @GREP@ 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@ @@ -159,13 +144,6 @@ 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@ @@ -270,16 +248,12 @@ docdir = @docdir@ dvidir = @dvidir@ 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@ @@ -308,6 +282,7 @@ target_alias = @target_alias@ top_builddir = @top_builddir@ top_srcdir = @top_srcdir@ AM_CPPFLAGS = -I$(top_srcdir)/include -I$(top_builddir)/include $(LOCAL_CPPFLAGS) $(GNUCFLAGS) +GUTENPRINTUI_LIBS = $(top_builddir)/src/gutenprintui/libgutenprintui.la LOCAL_CPPFLAGS = $(GUTENPRINT_CFLAGS) $(GIMP2_CFLAGS) COMMON_PRINT_SOURCES = \ print-image-gimp.c \ diff --git a/src/gutenprintui/Makefile.am b/src/gutenprintui/Makefile.am deleted file mode 100644 index 074ba93..0000000 --- a/src/gutenprintui/Makefile.am +++ /dev/null @@ -1,75 +0,0 @@ -## $Id: Makefile.am,v 1.5.10.1 2007/12/02 02:40:39 rlk Exp $ -## Copyright (C) 2000 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 - -m4datadir = $(datadir)/aclocal -pkgconfigdatadir = $(libdir)/pkgconfig - - -## Programs - -if BUILD_LIBGUTENPRINTUI -lib_LTLIBRARIES = libgutenprintui.la -endif - -libgutenprintui_la_SOURCES = \ - printrcy.y \ - printrcl.l \ - printrc.h \ - plist.c \ - panel.c \ - ui-utils.c \ - print-image-thumbnail.c \ - gutenprintui-internal.h - -libgutenprintui_la_LIBADD = $(GUTENPRINTUI_LIBDEPS) -# Uncommment to build an unversioned library (version in soname) -libgutenprintui_la_CFLAGS = $(AM_CFLAGS) $(GUTENPRINT_CFLAGS) $(GTK_CFLAGS) -#libgutenprintui_la_LDFLAGS = -release $(GUTENPRINT_VERSION) \ -# -rpath $(libdir) -no-undefined -# Uncomment to build a versioned library -libgutenprintui_la_LDFLAGS = \ - -version-info $(GUTENPRINTUI_CURRENT_INTERFACE):$(GUTENPRINTUI_INTERFACE_AGE):$(GUTENPRINTUI_BINARY_AGE) \ - -rpath $(libdir) -no-undefined - -AM_LFLAGS = -i -AM_YFLAGS = -d - -printrcy.o: printrcl.o -plist.o: printrcy.o - -## Data - -if BUILD_LIBGUTENPRINTUI -pkgconfigdata_DATA = gutenprintui.pc -endif - - -## Rules - - -## Clean - -MAINTAINERCLEANFILES = Makefile.in printrcl.c printrcy.c printrcy.h diff --git a/src/gutenprintui/Makefile.in b/src/gutenprintui/Makefile.in deleted file mode 100644 index 72d00db..0000000 --- a/src/gutenprintui/Makefile.in +++ /dev/null @@ -1,743 +0,0 @@ -# Makefile.in generated by automake 1.10 from Makefile.am. -# @configure_input@ - -# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006 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 - - -VPATH = @srcdir@ -pkgdatadir = $(datadir)/@PACKAGE@ -pkglibdir = $(libdir)/@PACKAGE@ -pkgincludedir = $(includedir)/@PACKAGE@ -am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd -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 = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \ - $(srcdir)/gutenprintui.pc.in $(top_srcdir)/scripts/global.mk \ - printrcl.c printrcy.c printrcy.h -subdir = src/gutenprintui -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/isc-posix.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 = gutenprintui.pc -am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; -am__vpath_adj = case $$p in \ - $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \ - *) f=$$p;; \ - esac; -am__strip_dir = `echo $$p | sed -e 's|^.*/||'`; -am__installdirs = "$(DESTDIR)$(libdir)" \ - "$(DESTDIR)$(pkgconfigdatadir)" -libLTLIBRARIES_INSTALL = $(INSTALL) -LTLIBRARIES = $(lib_LTLIBRARIES) -am__DEPENDENCIES_1 = -libgutenprintui_la_DEPENDENCIES = $(am__DEPENDENCIES_1) -am_libgutenprintui_la_OBJECTS = libgutenprintui_la-printrcy.lo \ - libgutenprintui_la-printrcl.lo libgutenprintui_la-plist.lo \ - libgutenprintui_la-panel.lo libgutenprintui_la-ui-utils.lo \ - libgutenprintui_la-print-image-thumbnail.lo -libgutenprintui_la_OBJECTS = $(am_libgutenprintui_la_OBJECTS) -libgutenprintui_la_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \ - $(LIBTOOLFLAGS) --mode=link $(CCLD) \ - $(libgutenprintui_la_CFLAGS) $(CFLAGS) \ - $(libgutenprintui_la_LDFLAGS) $(LDFLAGS) -o $@ -@BUILD_LIBGUTENPRINTUI_TRUE@am_libgutenprintui_la_rpath = -rpath \ -@BUILD_LIBGUTENPRINTUI_TRUE@ $(libdir) -DEFAULT_INCLUDES = -I. -I$(top_builddir)@am__isrc@ -depcomp = $(SHELL) $(top_srcdir)/scripts/depcomp -am__depfiles_maybe = depfiles -COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ - $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -LTCOMPILE = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ - --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \ - $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -CCLD = $(CC) -LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ - --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \ - $(LDFLAGS) -o $@ -@MAINTAINER_MODE_FALSE@am__skiplex = test -f $@ || -LEXCOMPILE = $(LEX) $(LFLAGS) $(AM_LFLAGS) -LTLEXCOMPILE = $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ - --mode=compile $(LEX) $(LFLAGS) $(AM_LFLAGS) -YLWRAP = $(top_srcdir)/scripts/ylwrap -@MAINTAINER_MODE_FALSE@am__skipyacc = test -f $@ || -YACCCOMPILE = $(YACC) $(YFLAGS) $(AM_YFLAGS) -LTYACCCOMPILE = $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ - --mode=compile $(YACC) $(YFLAGS) $(AM_YFLAGS) -SOURCES = $(libgutenprintui_la_SOURCES) -DIST_SOURCES = $(libgutenprintui_la_SOURCES) -pkgconfigdataDATA_INSTALL = $(INSTALL_DATA) -DATA = $(pkgconfigdata_DATA) -ETAGS = etags -CTAGS = ctags -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_PPDS = @BUILD_CUPS_PPDS@ -CC = @CC@ -CCDEPMODE = @CCDEPMODE@ -CFLAGS = @CFLAGS@ -CONVERT = @CONVERT@ -CPP = @CPP@ -CPPFLAGS = @CPPFLAGS@ -CUPS_CFLAGS = @CUPS_CFLAGS@ -CUPS_CONFIG = @CUPS_CONFIG@ -CUPS_LIBS = @CUPS_LIBS@ -CUPS_PPD_PS_LEVEL = @CUPS_PPD_PS_LEVEL@ -CXX = @CXX@ -CXXCPP = @CXXCPP@ -CXXDEPMODE = @CXXDEPMODE@ -CXXFLAGS = @CXXFLAGS@ -CYGPATH_W = @CYGPATH_W@ -DB2HTML = @DB2HTML@ -DB2PDF = @DB2PDF@ -DB2PS = @DB2PS@ -DEFS = @DEFS@ -DEPDIR = @DEPDIR@ -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@ -GREP = @GREP@ -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 = @INSTALL@ -INSTALL_DATA = @INSTALL_DATA@ -INSTALL_PROGRAM = @INSTALL_PROGRAM@ -INSTALL_SCRIPT = @INSTALL_SCRIPT@ -INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ -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@ -MAKEINFO = @MAKEINFO@ -MKDIR_P = @MKDIR_P@ -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@ -SED = @SED@ -SET_MAKE = @SET_MAKE@ -SHELL = @SHELL@ -STRIP = @STRIP@ -TEST = @TEST@ -TEXI2HTML = @TEXI2HTML@ -TRUE = @TRUE@ -USE_NLS = @USE_NLS@ -VERSION = @VERSION@ -WHICH_PPDS = @WHICH_PPDS@ -XGETTEXT = @XGETTEXT@ -YACC = @YACC@ -YFLAGS = @YFLAGS@ -abs_builddir = @abs_builddir@ -abs_srcdir = @abs_srcdir@ -abs_top_builddir = @abs_top_builddir@ -abs_top_srcdir = @abs_top_srcdir@ -ac_ct_CC = @ac_ct_CC@ -ac_ct_CXX = @ac_ct_CXX@ -ac_ct_F77 = @ac_ct_F77@ -am__include = @am__include@ -am__leading_dot = @am__leading_dot@ -am__quote = @am__quote@ -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@ -builddir = @builddir@ -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@ -datarootdir = @datarootdir@ -docdir = @docdir@ -dvidir = @dvidir@ -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@ -htmldir = @htmldir@ -includedir = @includedir@ -infodir = @infodir@ -install_sh = @install_sh@ -libdir = @libdir@ -libexecdir = @libexecdir@ -localedir = @localedir@ -localstatedir = @localstatedir@ -mandir = @mandir@ -mkdir_p = @mkdir_p@ -oldincludedir = @oldincludedir@ -pdfdir = @pdfdir@ -prefix = @prefix@ -program_transform_name = @program_transform_name@ -psdir = @psdir@ -sbindir = @sbindir@ -sharedstatedir = @sharedstatedir@ -srcdir = @srcdir@ -sysconfdir = @sysconfdir@ -target_alias = @target_alias@ -top_builddir = @top_builddir@ -top_srcdir = @top_srcdir@ -AM_CPPFLAGS = -I$(top_srcdir)/include -I$(top_builddir)/include $(LOCAL_CPPFLAGS) $(GNUCFLAGS) -m4datadir = $(datadir)/aclocal -pkgconfigdatadir = $(libdir)/pkgconfig -@BUILD_LIBGUTENPRINTUI_TRUE@lib_LTLIBRARIES = libgutenprintui.la -libgutenprintui_la_SOURCES = \ - printrcy.y \ - printrcl.l \ - printrc.h \ - plist.c \ - panel.c \ - ui-utils.c \ - print-image-thumbnail.c \ - gutenprintui-internal.h - -libgutenprintui_la_LIBADD = $(GUTENPRINTUI_LIBDEPS) -# Uncommment to build an unversioned library (version in soname) -libgutenprintui_la_CFLAGS = $(AM_CFLAGS) $(GUTENPRINT_CFLAGS) $(GTK_CFLAGS) -#libgutenprintui_la_LDFLAGS = -release $(GUTENPRINT_VERSION) \ -# -rpath $(libdir) -no-undefined -# Uncomment to build a versioned library -libgutenprintui_la_LDFLAGS = \ - -version-info $(GUTENPRINTUI_CURRENT_INTERFACE):$(GUTENPRINTUI_INTERFACE_AGE):$(GUTENPRINTUI_BINARY_AGE) \ - -rpath $(libdir) -no-undefined - -AM_LFLAGS = -i -AM_YFLAGS = -d -@BUILD_LIBGUTENPRINTUI_TRUE@pkgconfigdata_DATA = gutenprintui.pc -MAINTAINERCLEANFILES = Makefile.in printrcl.c printrcy.c printrcy.h -all: all-am - -.SUFFIXES: -.SUFFIXES: .c .l .lo .o .obj .y -$(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 src/gutenprintui/Makefile'; \ - cd $(top_srcdir) && \ - $(AUTOMAKE) --gnu src/gutenprintui/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 -gutenprintui.pc: $(top_builddir)/config.status $(srcdir)/gutenprintui.pc.in - cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ -install-libLTLIBRARIES: $(lib_LTLIBRARIES) - @$(NORMAL_INSTALL) - test -z "$(libdir)" || $(MKDIR_P) "$(DESTDIR)$(libdir)" - @list='$(lib_LTLIBRARIES)'; for p in $$list; do \ - if test -f $$p; then \ - f=$(am__strip_dir) \ - echo " $(LIBTOOL) --mode=install $(libLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(libdir)/$$f'"; \ - $(LIBTOOL) --mode=install $(libLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(libdir)/$$f"; \ - else :; fi; \ - done - -uninstall-libLTLIBRARIES: - @$(NORMAL_UNINSTALL) - @list='$(lib_LTLIBRARIES)'; for p in $$list; do \ - p=$(am__strip_dir) \ - echo " $(LIBTOOL) --mode=uninstall rm -f '$(DESTDIR)$(libdir)/$$p'"; \ - $(LIBTOOL) --mode=uninstall rm -f "$(DESTDIR)$(libdir)/$$p"; \ - done - -clean-libLTLIBRARIES: - -test -z "$(lib_LTLIBRARIES)" || rm -f $(lib_LTLIBRARIES) - @list='$(lib_LTLIBRARIES)'; for p in $$list; do \ - dir="`echo $$p | sed -e 's|/[^/]*$$||'`"; \ - test "$$dir" != "$$p" || dir=.; \ - echo "rm -f \"$${dir}/so_locations\""; \ - rm -f "$${dir}/so_locations"; \ - done -printrcy.h: printrcy.c - @if test ! -f $@; then \ - rm -f printrcy.c; \ - $(MAKE) $(AM_MAKEFLAGS) printrcy.c; \ - else :; fi -libgutenprintui.la: $(libgutenprintui_la_OBJECTS) $(libgutenprintui_la_DEPENDENCIES) - $(libgutenprintui_la_LINK) $(am_libgutenprintui_la_rpath) $(libgutenprintui_la_OBJECTS) $(libgutenprintui_la_LIBADD) $(LIBS) - -mostlyclean-compile: - -rm -f *.$(OBJEXT) - -distclean-compile: - -rm -f *.tab.c - -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libgutenprintui_la-panel.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libgutenprintui_la-plist.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libgutenprintui_la-print-image-thumbnail.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libgutenprintui_la-printrcl.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libgutenprintui_la-printrcy.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libgutenprintui_la-ui-utils.Plo@am__quote@ - -.c.o: -@am__fastdepCC_TRUE@ $(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< -@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po -@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(COMPILE) -c $< - -.c.obj: -@am__fastdepCC_TRUE@ $(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'` -@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po -@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(COMPILE) -c `$(CYGPATH_W) '$<'` - -.c.lo: -@am__fastdepCC_TRUE@ $(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< -@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo -@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(LTCOMPILE) -c -o $@ $< - -libgutenprintui_la-printrcy.lo: printrcy.c -@am__fastdepCC_TRUE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libgutenprintui_la_CFLAGS) $(CFLAGS) -MT libgutenprintui_la-printrcy.lo -MD -MP -MF $(DEPDIR)/libgutenprintui_la-printrcy.Tpo -c -o libgutenprintui_la-printrcy.lo `test -f 'printrcy.c' || echo '$(srcdir)/'`printrcy.c -@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/libgutenprintui_la-printrcy.Tpo $(DEPDIR)/libgutenprintui_la-printrcy.Plo -@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='printrcy.c' object='libgutenprintui_la-printrcy.lo' libtool=yes @AMDEPBACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libgutenprintui_la_CFLAGS) $(CFLAGS) -c -o libgutenprintui_la-printrcy.lo `test -f 'printrcy.c' || echo '$(srcdir)/'`printrcy.c - -libgutenprintui_la-printrcl.lo: printrcl.c -@am__fastdepCC_TRUE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libgutenprintui_la_CFLAGS) $(CFLAGS) -MT libgutenprintui_la-printrcl.lo -MD -MP -MF $(DEPDIR)/libgutenprintui_la-printrcl.Tpo -c -o libgutenprintui_la-printrcl.lo `test -f 'printrcl.c' || echo '$(srcdir)/'`printrcl.c -@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/libgutenprintui_la-printrcl.Tpo $(DEPDIR)/libgutenprintui_la-printrcl.Plo -@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='printrcl.c' object='libgutenprintui_la-printrcl.lo' libtool=yes @AMDEPBACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libgutenprintui_la_CFLAGS) $(CFLAGS) -c -o libgutenprintui_la-printrcl.lo `test -f 'printrcl.c' || echo '$(srcdir)/'`printrcl.c - -libgutenprintui_la-plist.lo: plist.c -@am__fastdepCC_TRUE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libgutenprintui_la_CFLAGS) $(CFLAGS) -MT libgutenprintui_la-plist.lo -MD -MP -MF $(DEPDIR)/libgutenprintui_la-plist.Tpo -c -o libgutenprintui_la-plist.lo `test -f 'plist.c' || echo '$(srcdir)/'`plist.c -@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/libgutenprintui_la-plist.Tpo $(DEPDIR)/libgutenprintui_la-plist.Plo -@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='plist.c' object='libgutenprintui_la-plist.lo' libtool=yes @AMDEPBACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libgutenprintui_la_CFLAGS) $(CFLAGS) -c -o libgutenprintui_la-plist.lo `test -f 'plist.c' || echo '$(srcdir)/'`plist.c - -libgutenprintui_la-panel.lo: panel.c -@am__fastdepCC_TRUE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libgutenprintui_la_CFLAGS) $(CFLAGS) -MT libgutenprintui_la-panel.lo -MD -MP -MF $(DEPDIR)/libgutenprintui_la-panel.Tpo -c -o libgutenprintui_la-panel.lo `test -f 'panel.c' || echo '$(srcdir)/'`panel.c -@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/libgutenprintui_la-panel.Tpo $(DEPDIR)/libgutenprintui_la-panel.Plo -@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='panel.c' object='libgutenprintui_la-panel.lo' libtool=yes @AMDEPBACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libgutenprintui_la_CFLAGS) $(CFLAGS) -c -o libgutenprintui_la-panel.lo `test -f 'panel.c' || echo '$(srcdir)/'`panel.c - -libgutenprintui_la-ui-utils.lo: ui-utils.c -@am__fastdepCC_TRUE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libgutenprintui_la_CFLAGS) $(CFLAGS) -MT libgutenprintui_la-ui-utils.lo -MD -MP -MF $(DEPDIR)/libgutenprintui_la-ui-utils.Tpo -c -o libgutenprintui_la-ui-utils.lo `test -f 'ui-utils.c' || echo '$(srcdir)/'`ui-utils.c -@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/libgutenprintui_la-ui-utils.Tpo $(DEPDIR)/libgutenprintui_la-ui-utils.Plo -@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='ui-utils.c' object='libgutenprintui_la-ui-utils.lo' libtool=yes @AMDEPBACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libgutenprintui_la_CFLAGS) $(CFLAGS) -c -o libgutenprintui_la-ui-utils.lo `test -f 'ui-utils.c' || echo '$(srcdir)/'`ui-utils.c - -libgutenprintui_la-print-image-thumbnail.lo: print-image-thumbnail.c -@am__fastdepCC_TRUE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libgutenprintui_la_CFLAGS) $(CFLAGS) -MT libgutenprintui_la-print-image-thumbnail.lo -MD -MP -MF $(DEPDIR)/libgutenprintui_la-print-image-thumbnail.Tpo -c -o libgutenprintui_la-print-image-thumbnail.lo `test -f 'print-image-thumbnail.c' || echo '$(srcdir)/'`print-image-thumbnail.c -@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/libgutenprintui_la-print-image-thumbnail.Tpo $(DEPDIR)/libgutenprintui_la-print-image-thumbnail.Plo -@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='print-image-thumbnail.c' object='libgutenprintui_la-print-image-thumbnail.lo' libtool=yes @AMDEPBACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libgutenprintui_la_CFLAGS) $(CFLAGS) -c -o libgutenprintui_la-print-image-thumbnail.lo `test -f 'print-image-thumbnail.c' || echo '$(srcdir)/'`print-image-thumbnail.c - -.l.c: - $(am__skiplex) $(SHELL) $(YLWRAP) $< $(LEX_OUTPUT_ROOT).c $@ -- $(LEXCOMPILE) - -.y.c: - $(am__skipyacc) $(SHELL) $(YLWRAP) $< y.tab.c $@ y.tab.h $*.h y.output $*.output -- $(YACCCOMPILE) - -mostlyclean-libtool: - -rm -f *.lo - -clean-libtool: - -rm -rf .libs _libs -install-pkgconfigdataDATA: $(pkgconfigdata_DATA) - @$(NORMAL_INSTALL) - test -z "$(pkgconfigdatadir)" || $(MKDIR_P) "$(DESTDIR)$(pkgconfigdatadir)" - @list='$(pkgconfigdata_DATA)'; for p in $$list; do \ - if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ - f=$(am__strip_dir) \ - echo " $(pkgconfigdataDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(pkgconfigdatadir)/$$f'"; \ - $(pkgconfigdataDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(pkgconfigdatadir)/$$f"; \ - done - -uninstall-pkgconfigdataDATA: - @$(NORMAL_UNINSTALL) - @list='$(pkgconfigdata_DATA)'; for p in $$list; do \ - f=$(am__strip_dir) \ - echo " rm -f '$(DESTDIR)$(pkgconfigdatadir)/$$f'"; \ - rm -f "$(DESTDIR)$(pkgconfigdatadir)/$$f"; \ - done - -ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ - mkid -fID $$unique -tags: TAGS - -TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $(TAGS_FILES) $(LISP) - tags=; \ - here=`pwd`; \ - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ - if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \ - test -n "$$unique" || unique=$$empty_fix; \ - $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ - $$tags $$unique; \ - fi -ctags: CTAGS -CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $(TAGS_FILES) $(LISP) - tags=; \ - here=`pwd`; \ - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ - test -z "$(CTAGS_ARGS)$$tags$$unique" \ - || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ - $$tags $$unique - -GTAGS: - here=`$(am__cd) $(top_builddir) && pwd` \ - && cd $(top_srcdir) \ - && gtags -i $(GTAGS_ARGS) $$here - -distclean-tags: - -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags - -distdir: $(DISTFILES) - @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ - topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ - list='$(DISTFILES)'; \ - dist_files=`for file in $$list; do echo $$file; done | \ - sed -e "s|^$$srcdirstrip/||;t" \ - -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \ - case $$dist_files in \ - */*) $(MKDIR_P) `echo "$$dist_files" | \ - sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \ - sort -u` ;; \ - esac; \ - for file in $$dist_files; do \ - if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \ - if test -d $$d/$$file; then \ - dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \ - 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 -check-am: all-am -check: check-am -all-am: Makefile $(LTLIBRARIES) $(DATA) -installdirs: - for dir in "$(DESTDIR)$(libdir)" "$(DESTDIR)$(pkgconfigdatadir)"; do \ - test -z "$$dir" || $(MKDIR_P) "$$dir"; \ - done -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." - -rm -f printrcl.c - -rm -f printrcy.c - -rm -f printrcy.h - -test -z "$(MAINTAINERCLEANFILES)" || rm -f $(MAINTAINERCLEANFILES) -clean: clean-am - -clean-am: clean-generic clean-libLTLIBRARIES clean-libtool \ - mostlyclean-am - -distclean: distclean-am - -rm -rf ./$(DEPDIR) - -rm -f Makefile -distclean-am: clean-am distclean-compile distclean-generic \ - distclean-tags - -dvi: dvi-am - -dvi-am: - -html: html-am - -info: info-am - -info-am: - -install-data-am: install-pkgconfigdataDATA - -install-dvi: install-dvi-am - -install-exec-am: install-libLTLIBRARIES - -install-html: install-html-am - -install-info: install-info-am - -install-man: - -install-pdf: install-pdf-am - -install-ps: install-ps-am - -installcheck-am: - -maintainer-clean: maintainer-clean-am - -rm -rf ./$(DEPDIR) - -rm -f Makefile -maintainer-clean-am: distclean-am maintainer-clean-generic - -mostlyclean: mostlyclean-am - -mostlyclean-am: mostlyclean-compile mostlyclean-generic \ - mostlyclean-libtool - -pdf: pdf-am - -pdf-am: - -ps: ps-am - -ps-am: - -uninstall-am: uninstall-libLTLIBRARIES uninstall-pkgconfigdataDATA - -.MAKE: install-am install-strip - -.PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \ - clean-libLTLIBRARIES clean-libtool ctags distclean \ - distclean-compile distclean-generic distclean-libtool \ - distclean-tags distdir dvi dvi-am html html-am info info-am \ - install install-am install-data install-data-am install-dvi \ - install-dvi-am install-exec install-exec-am install-html \ - install-html-am install-info install-info-am \ - install-libLTLIBRARIES install-man install-pdf install-pdf-am \ - install-pkgconfigdataDATA install-ps install-ps-am \ - install-strip installcheck installcheck-am installdirs \ - maintainer-clean maintainer-clean-generic mostlyclean \ - mostlyclean-compile mostlyclean-generic mostlyclean-libtool \ - pdf pdf-am ps ps-am tags uninstall uninstall-am \ - uninstall-libLTLIBRARIES uninstall-pkgconfigdataDATA - - -@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) - -printrcy.o: printrcl.o -plist.o: printrcy.o -# 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/src/gutenprintui/gutenprintui-internal.h b/src/gutenprintui/gutenprintui-internal.h deleted file mode 100644 index 7c4547d..0000000 --- a/src/gutenprintui/gutenprintui-internal.h +++ /dev/null @@ -1,244 +0,0 @@ -/* - * "$Id: gutenprintui-internal.h,v 1.2.12.1 2007/03/02 12:01:17 rlk Exp $" - * - * Print plug-in for the GIMP. - * - * Copyright 1997-2000 Michael Sweet (mike@easysw.com), - * Robert Krawitz (rlk@alum.mit.edu). and Steve Miller (smiller@rni.net - * - * 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. - * - * - * Revision History: - * - * See ChangeLog - */ - -#ifndef __GIMP_PRINT_UI_INTERNAL_H__ -#define __GIMP_PRINT_UI_INTERNAL_H__ - -#ifdef __GNUC__ -#define inline __inline__ -#endif - -#include -#include - -#include - -typedef struct -{ - GtkWidget *checkbox; - int current; - int deflt; -} boolean_option_t; - -typedef struct -{ - gint callback_id; - char *default_val; - stp_string_list_t *params; - GtkWidget *combo; - GtkWidget *label; -} list_option_t; - -typedef struct -{ - GtkObject *adjustment; - gfloat upper; - gfloat lower; - gfloat deflt; - gfloat scale; -} float_option_t; - -typedef struct -{ - GtkWidget *label; - GtkWidget *button; - GtkWidget *dialog; - GtkWidget *gamma_curve; - const char *help_text; - stp_curve_t *current; - const stp_curve_t *deflt; - gboolean is_visible; -} curve_option_t; - -typedef struct -{ - const stp_parameter_t *fast_desc; - int is_active; - int is_enabled; - GtkWidget *checkbox; - union { - list_option_t list; - float_option_t flt; - curve_option_t curve; - boolean_option_t bool; - } info; -} option_t; - -typedef struct -{ - const char *name; - const char *help; - gdouble scale; - GtkWidget *checkbox; - const char *format; -} unit_t; - -typedef struct -{ - const char *name; - const char *help; - const char *value; - GtkWidget *button; -} radio_group_t; - -typedef struct -{ - unsigned char *base_addr; - const char *output_type; - int bpp; - off_t offset; - off_t limit; -} priv_t; - -#define PLUG_IN_VERSION VERSION " - " RELEASE_DATE -#define PLUG_IN_NAME "Print" - -#define INVALID_TOP 1 -#define INVALID_LEFT 2 - -#define SCALE_ENTRY_LABEL(adj) \ - GTK_LABEL (gtk_object_get_data (GTK_OBJECT(adj), "label")) - -#define SCALE_ENTRY_SCALE(adj) \ - GTK_HSCALE (gtk_object_get_data (GTK_OBJECT(adj), "scale")) -#define SCALE_ENTRY_SCALE_ADJ(adj) \ - gtk_range_get_adjustment \ - (GTK_RANGE (gtk_object_get_data (GTK_OBJECT (adj), "scale"))) - -#define SCALE_ENTRY_SPINBUTTON(adj) \ - GTK_SPIN_BUTTON (gtk_object_get_data (GTK_OBJECT (adj), "spinbutton")) -#define SCALE_ENTRY_SPINBUTTON_ADJ(adj) \ - gtk_spin_button_get_adjustment \ - (GTK_SPIN_BUTTON (gtk_object_get_data (GTK_OBJECT (adj), "spinbutton"))) - -extern gint stpui_plist_count; /* Number of system printers */ -extern gint stpui_plist_current; /* Current system printer */ -extern stpui_plist_t *stpui_plist; /* System printers */ -extern char *stpui_printrc_current_printer; -extern int stpui_show_all_paper_sizes; -extern stp_string_list_t *stpui_system_print_queues; - -/* - * Function prototypes - */ - -extern stpui_plist_t *stpui_plist_create(const char *name, const char *driver); -extern const char *stpui_combo_get_name(GtkWidget *combo, - const stp_string_list_t *options); -extern void stpui_table_attach_aligned(GtkTable *table, gint column, - gint row, const gchar *label_text, - gfloat xalign, gfloat yalign, - GtkWidget *widget, gint colspan, - gboolean left_align); - -extern GtkWidget *stpui_create_entry(GtkWidget *table, int hpos, int vpos, - const char *text, const char *help, - GtkSignalFunc callback); -extern GSList *stpui_create_radio_button(radio_group_t *radio, GSList *group, - GtkWidget *table, int hpos, int vpos, - GtkSignalFunc callback); -extern void stpui_set_adjustment_tooltip (GtkObject *adj, const gchar *tip); -extern void stpui_create_new_combo(option_t *option, GtkWidget *table, - int hpos, int vpos, gboolean is_optional); -extern void stpui_help_init (void); -extern void stpui_help_free (void); -extern void stpui_enable_help (void); -extern void stpui_disable_help (void); -extern void stpui_set_help_data (GtkWidget *widget, const gchar *tooltip); - -extern GtkWidget *stpui_dialog_new(const gchar *title, - const gchar *wmclass_name, - GtkWindowPosition position, - gint allow_shrink, - gint allow_grow, - gint auto_shrink, - /* specify action area buttons as va_list: - * const gchar *label, - * GtkSignalFunc callback, - * gpointer data, - * GtkObject *slot_object, - * GtkWidget **widget_ptr, - * gboolean default_action, - * gboolean connect_delete, - */ - ...); - -extern GtkWidget *stpui_option_menu_new(gboolean menu_only, - /* specify menu items as va_list: - * const gchar *label, - * GtkSignalFunc callback, - * gpointer data, - * gpointer user_data, - * GtkWidget **widget_ptr, - * gboolean active - */ - ...); - -extern GtkObject *stpui_scale_entry_new(GtkTable *table, - gint column, - gint row, - const gchar *text, - gint scale_usize, - gint spinbutton_usize, - gfloat value, - gfloat lower, - gfloat upper, - gfloat step_increment, - gfloat page_increment, - guint digits, - gboolean constrain, - gfloat unconstrained_lower, - gfloat unconstrained_upper, - const gchar *tooltip); - -extern void stpui_create_scale_entry(option_t *option, - GtkTable *table, - gint column, - gint row, - const gchar *text, - gint scale_usize, - gint spinbutton_usize, - gfloat value, - gfloat lower, - gfloat upper, - gfloat step_increment, - gfloat page_increment, - guint digits, - gboolean constrain, - gfloat unconstrained_lower, - gfloat unconstrained_upper, - const gchar *tooltip, - gboolean is_optional); - - -/* Thumbnails -- keep it simple! */ - -stp_image_t *stpui_image_thumbnail_new(const guchar *data, gint w, gint h, - gint bpp); - -#endif /* __GIMP_PRINT_UI_INTERNAL_H__ */ diff --git a/src/gutenprintui/gutenprintui.pc.in b/src/gutenprintui/gutenprintui.pc.in deleted file mode 100644 index 42e350e..0000000 --- a/src/gutenprintui/gutenprintui.pc.in +++ /dev/null @@ -1,12 +0,0 @@ -prefix=@prefix@ -exec_prefix=@exec_prefix@ -libdir=@libdir@ -includedir=@includedir@ - -Name: Gutenprint UI (GTK+-1.2 version) -Description: Gutenprint Top Quality Printer Drivers - GTK+-1.2 User Interface -Requires: gutenprint -Version: @VERSION@ -Libs: -L${libdir} @GUTENPRINTUI_LIBS@ -Libs.private: @gutenprintui_libdeps@ -Cflags: -I${includedir} @gutenprintui_cflags@ diff --git a/src/gutenprintui/panel.c b/src/gutenprintui/panel.c deleted file mode 100644 index eed8a65..0000000 --- a/src/gutenprintui/panel.c +++ /dev/null @@ -1,5225 +0,0 @@ -/* - * "$Id: panel.c,v 1.9.6.2 2007/12/15 20:35:39 rlk Exp $" - * - * Main window code for Print plug-in for the GIMP. - * - * Copyright 1997-2003 Michael Sweet (mike@easysw.com), - * Robert Krawitz (rlk@alum.mit.edu), Steve Miller (smiller@rni.net) - * and Michael Natterer (mitch@gimp.org) - * - * 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 -#endif - -#define MAX_PREVIEW_PPI (400) -#define INCH 72 -#define FINCH ((gdouble) INCH) -#define ROUNDUP(x, y) (((x) + ((y) - 1)) / (y)) -#define SCALE(x, y) (((x) + (1.0 / (2.0 * (y)))) * (y)) - -#include -#include -#include "gutenprintui-internal.h" - -#include -#include - -#define MAXIMUM_PARAMETER_LEVEL STP_PARAMETER_LEVEL_ADVANCED4 - -/* - * Constants for GUI. - */ -static int preview_size_vert = 360; -static int preview_size_horiz = 300; -static const int minimum_image_percent = 5.0; -static const int thumbnail_hintw = 128; -static const int thumbnail_hinth = 128; - -#define MOVE_CONSTRAIN 0 -#define MOVE_HORIZONTAL 1 -#define MOVE_VERTICAL 2 -#define MOVE_ANY (MOVE_HORIZONTAL | MOVE_VERTICAL) -#define MOVE_GRID 4 - -/* - * Main window widgets - */ - -static GtkWidget *main_vbox; -static GtkWidget *main_hbox; -static GtkWidget *right_vbox; -static GtkWidget *notebook; - -static GtkWidget *output_color_vbox; -static GtkWidget *cyan_button; -static GtkWidget *magenta_button; -static GtkWidget *yellow_button; -static GtkWidget *black_button; -static GtkWidget *red_button; -static GtkWidget *green_button; -static GtkWidget *blue_button; - -static GtkWidget *print_dialog; /* Print dialog window */ - -static GtkWidget *recenter_button; -static GtkWidget *recenter_vertical_button; -static GtkWidget *recenter_horizontal_button; - -static GtkWidget *left_entry; -/* -static GtkWidget *right_entry; -*/ -static GtkWidget *right_border_entry; -static GtkWidget *top_entry; -/* -static GtkWidget *bottom_entry; -*/ -static GtkWidget *bottom_border_entry; -static GtkWidget *width_entry; -static GtkWidget *height_entry; -static GtkWidget *units_hbox; -static GtkWidget *units_label; - -static GtkWidget *custom_size_width; -static GtkWidget *custom_size_height; -static GtkWidget *show_all_paper_sizes_button; -static GtkWidget *auto_paper_size_button; - -static GtkWidget *orientation_menu; /* Orientation menu */ - -static GtkWidget *scaling_percent; /* Scale by percent */ -static GtkWidget *scaling_ppi; /* Scale by pixels-per-inch */ -static GtkWidget *scaling_image; /* Scale to the image */ -static GtkObject *scaling_adjustment; /* Adjustment object for scaling */ - -static GtkWidget *setup_dialog; /* Setup dialog window */ -static GtkWidget *printer_driver; /* Printer driver widget */ -static GtkWidget *printer_model_label; /* Printer model name */ -static GtkWidget *printer_crawler; /* Scrolled Window for menu */ -static GtkWidget *printer_combo; /* Combo for menu */ -static GtkWidget *manufacturer_clist; /* Manufacturer widget */ -static GtkWidget *manufacturer_crawler; /* Scrolled Window for menu */ -static gint plist_callback_id = -1; -static GtkWidget *ppd_file; /* PPD file entry */ -static GtkWidget *ppd_box; -static GtkWidget *ppd_label; /* PPD file entry */ -static GtkWidget *ppd_button; /* PPD file browse button */ -static GtkWidget *ppd_browser; /* File selection dialog for PPDs */ -static GtkWidget *ppd_model_label; /* PPD file entry */ -static GtkWidget *ppd_model; /* PPD file entry */ -static GtkWidget *new_printer_dialog; /* New printer dialog window */ -static GtkWidget *new_printer_entry; /* New printer text entry */ -static GtkWidget *file_button; /* PPD file browse button */ -static GtkWidget *file_entry; /* FSD for print files */ -static GtkWidget *file_browser; /* FSD for print files */ -static GtkWidget *standard_cmd_entry; /* FSD for print files */ -static GtkWidget *custom_command_entry; /* FSD for print files */ -static GtkWidget *queue_combo; /* FSD for print files */ -static gint queue_callback_id = -1; - -static GtkWidget *adjust_color_button; -static GtkWidget *about_dialog; - -static GtkWidget *page_size_table; -static GtkWidget *printer_features_table; -static GtkWidget *color_adjustment_table; - -static GtkWidget *copy_count_spin_button; - -static gboolean preview_valid = FALSE; -static gboolean frame_valid = FALSE; -static gboolean need_exposure = FALSE; -static gboolean suppress_scaling_adjustment = FALSE; -static gboolean suppress_scaling_callback = FALSE; -static gboolean thumbnail_update_pending = FALSE; -static gboolean thumbnail_needs_rebuild = FALSE; -/* - * These are semaphores, not true booleans. - */ -static gint suppress_preview_update = 0; -static gint suppress_preview_reset = 0; - -static GtkDrawingArea *preview = NULL; /* Preview drawing area widget */ -static GtkDrawingArea *swatch = NULL; -static gint mouse_x, mouse_y; /* Last mouse position */ -static gint orig_top, orig_left; /* Original mouse position at start */ -static gint buttons_pressed = 0; -static gint preview_active = 0; -static gint buttons_mask = 0; -static gint move_constraint = 0; -static gint mouse_button = -1; /* Button being dragged with */ -static gint preview_thumbnail_w, preview_thumbnail_h; -static gint preview_x, preview_y, preview_w, preview_h; - -static gint physical_orientation = -2; /* Actual orientation */ - -static gint paper_width, paper_height; /* Physical width */ -static gint printable_width, printable_height; /* Size of printable area */ -static gint print_width, print_height; /* Printed area of image */ -static gint left, right, top, bottom; /* Imageable region */ -static gint image_width, image_height; /* Image size (possibly rotated) */ -static gint image_true_width, image_true_height; /* Original image */ -static gdouble image_xres, image_yres; /* Original image resolution */ -static gint do_update_thumbnail = 0; -static gint saveme = 0; /* True if printrc should be saved */ -static gint runme = 0; /* True if print should proceed */ -static gint exit_after_file_ok = 0; /* True if we should exit after file browser complete */ -static gint auto_paper_size = 0; /* True if we're using auto paper size now */ - - - -static void scaling_update (GtkAdjustment *adjustment); -static void scaling_callback (GtkWidget *widget); -static void plist_callback (GtkWidget *widget, gpointer data); -static void queue_callback (GtkWidget *widget, gpointer data); -static void custom_media_size_callback(GtkWidget *widget, gpointer data); -static void show_all_paper_sizes_callback(GtkWidget *widget, gpointer data); -static void auto_paper_size_callback(GtkWidget *widget, gpointer data); -static void combo_callback (GtkWidget *widget, gpointer data); -static void output_type_callback (GtkWidget *widget, gpointer data); -static void unit_callback (GtkWidget *widget, gpointer data); -static void orientation_callback (GtkWidget *widget, gpointer data); -static void ppd_file_callback (GtkWidget *widget, gpointer data); -static void printandsave_callback (void); -static void about_callback (void); -static void print_callback (void); -static void save_callback (void); -static void setup_callback (GtkWidget *widget); - -static void setup_update (void); -static void setup_open_callback (void); -static void setup_ok_callback (void); -static void setup_cancel_callback (void); -static void new_printer_open_callback (void); -static void new_printer_ok_callback (void); -static void ppd_browse_callback (void); -static void ppd_ok_callback (void); -static void file_browse_callback (void); -static void file_ok_callback (void); -static void file_cancel_callback (void); -static void build_printer_driver_clist(void); -static void print_driver_callback (GtkWidget *widget, - gint row, - gint column, - GdkEventButton *event, - gpointer data); -static void manufacturer_callback (GtkWidget *widget, - gint row, - gint column, - GdkEventButton *event, - gpointer data); -static void command_type_callback (GtkWidget *widget, gpointer data); - -static void do_preview_thumbnail (void); -static void invalidate_preview_thumbnail (void); -static void invalidate_frame (void); - -static GtkWidget *color_adjust_dialog; - -static void preview_update (void); -static void preview_expose (void); -static void preview_button_callback (GtkWidget *widget, - GdkEventButton *bevent, - gpointer data); -static void preview_motion_callback (GtkWidget *widget, - GdkEventMotion *mevent, - gpointer data); -static void position_callback (GtkWidget *widget); -static void position_button_callback (GtkWidget *widget, - gpointer data); -static void copy_count_callback (GtkAdjustment *widget, - gpointer data); -static void plist_build_combo(GtkWidget *combo, - GtkWidget *label, - stp_string_list_t *items, - int active, - const gchar *cur_item, - const gchar *def_value, - GtkSignalFunc callback, - gint *callback_id, - int (*check_func)(const char *string), - gpointer data); -static void initialize_thumbnail(void); -static void set_color_defaults (void); -static void set_printer_defaults (void); -static void redraw_color_swatch (void); -static void color_update (GtkAdjustment *adjustment); -static void dimension_update (GtkAdjustment *adjustment); -static void set_controls_active (GtkObject *checkbutton, gpointer optno); -static void update_adjusted_thumbnail (gboolean regenerate_image); - -static void set_media_size(const gchar *new_media_size); -static const stp_printer_t *tmp_printer = NULL; - -static option_t *current_options = NULL; -static int current_option_count = 0; - -static unit_t units[] = - { - { N_("Inch"), N_("Set the base unit of measurement to inches"), - 72.0, NULL, "%.2f" }, - { N_("cm"), N_("Set the base unit of measurement to centimetres"), - 72.0 / 2.54, NULL, "%.2f" }, - { N_("Points"), N_("Set the base unit of measurement to points (1/72\")"), - 1.0, NULL, "%.0f" }, - { N_("mm"), N_("Set the base unit of measurement to millimetres"), - 72.0 / 25.4, NULL, "%.1f" }, - { N_("Pica"), N_("Set the base unit of measurement to picas (1/12\")"), - 72.0 / 12.0, NULL, "%.1f" }, - }; -static const gint unit_count = sizeof(units) / sizeof(unit_t); - -static radio_group_t output_types[] = - { - { N_("Color"), N_("Color output"), "Color", NULL }, - { N_("Grayscale"), - N_("Print in shades of gray using black ink"), "BW", NULL } - }; - -static const gint output_type_count = (sizeof(output_types) / - sizeof(radio_group_t)); - -/* - * The order of these entries must match the order in command_t in - * gutenprintui.h - */ -static radio_group_t command_options[] = - { - { N_("Standard Command"), N_("Use standard print command"), "Standard", NULL }, - { N_("Custom Command"), N_("Use custom print command"), "Custom", NULL }, - { N_("File"), N_("Print to a file"), "File", NULL } - }; - -static const gint command_options_count = (sizeof(command_options) / - sizeof(radio_group_t)); - -static gdouble preview_ppi = 10; - -static stp_string_list_t *printer_list = 0; -static stpui_plist_t *pv; -static const char *manufacturer = 0; - -static gint thumbnail_w, thumbnail_h, thumbnail_bpp; -static guchar *thumbnail_data; -static guchar *adjusted_thumbnail_data; -static guchar *preview_thumbnail_data; - -static void -set_gtk_curve_values(GtkWidget *gcurve, const stp_curve_t *seed) -{ - if (stp_curve_get_gamma(seed)) - { - gtk_curve_set_gamma(GTK_CURVE(gcurve), stp_curve_get_gamma(seed)); - } - else - { - stp_curve_t *copy = stp_curve_create_copy(seed); - const float *fdata; - size_t count; - stp_curve_resample(copy, 256); - fdata = stp_curve_get_float_data(copy, &count); - gtk_curve_set_vector(GTK_CURVE(gcurve), count, (float *) fdata); - stp_curve_destroy(copy); - } -} - -static void -set_stp_curve_values(GtkWidget *widget, option_t *opt) -{ - int i; - double lo, hi; - gfloat vector[256]; - GtkWidget *gcurve = GTK_WIDGET(widget); - stp_curve_t *curve = stp_curve_create_copy(opt->info.curve.deflt); - gtk_curve_get_vector(GTK_CURVE(gcurve), 256, vector); - stp_curve_get_bounds(opt->info.curve.deflt, &lo, &hi); - for (i = 0; i < 256; i++) - { - if (vector[i] > hi) - vector[i] = hi; - else if (vector[i] < lo) - vector[i] = lo; - } - switch (GTK_CURVE(gcurve)->curve_type) - { - case GTK_CURVE_TYPE_SPLINE: - stp_curve_set_interpolation_type(curve, STP_CURVE_TYPE_SPLINE); - break; - default: - stp_curve_set_interpolation_type(curve, STP_CURVE_TYPE_LINEAR); - break; - } - stp_curve_set_float_data(curve, 256, vector); - stp_set_curve_parameter(pv->v, opt->fast_desc->name, curve); - stp_curve_destroy(curve); -} - -static int -open_curve_editor(GtkObject *button, gpointer xopt) -{ - option_t *opt = (option_t *)xopt; - if (opt->info.curve.is_visible == FALSE) - { - GtkWidget *gcurve = - GTK_WIDGET(GTK_GAMMA_CURVE(opt->info.curve.gamma_curve)->curve); - const stp_curve_t *seed = - stp_get_curve_parameter(pv->v, opt->fast_desc->name); - stp_curve_t *nseed = NULL; - if (!seed) - seed = opt->info.curve.deflt; - if (seed) - nseed = stp_curve_create_copy(seed); - gtk_widget_set_sensitive(GTK_WIDGET(opt->checkbox), FALSE); - gtk_widget_show(GTK_WIDGET(opt->info.curve.dialog)); - set_gtk_curve_values(gcurve, seed); - opt->info.curve.is_visible = TRUE; - if (opt->info.curve.current) - stp_curve_destroy(opt->info.curve.current); - opt->info.curve.current = nseed; - invalidate_preview_thumbnail(); - update_adjusted_thumbnail(FALSE); - } -/* gtk_window_activate_focus(GTK_WINDOW(opt->info.curve.dialog)); */ - return 1; -} - -static int -set_default_curve_callback(GtkObject *button, gpointer xopt) -{ - option_t *opt = (option_t *)xopt; - GtkWidget *gcurve = - GTK_WIDGET(GTK_GAMMA_CURVE(opt->info.curve.gamma_curve)->curve); - const stp_curve_t *seed = opt->info.curve.deflt; - set_gtk_curve_values(gcurve, seed); - set_stp_curve_values(gcurve, opt); - invalidate_preview_thumbnail(); - update_adjusted_thumbnail(TRUE); - return 1; -} - -static int -set_previous_curve_callback(GtkObject *button, gpointer xopt) -{ - option_t *opt = (option_t *)xopt; - GtkWidget *gcurve = - GTK_WIDGET(GTK_GAMMA_CURVE(opt->info.curve.gamma_curve)->curve); - const stp_curve_t *seed = opt->info.curve.current; - if (!seed) - seed = opt->info.curve.deflt; - set_gtk_curve_values(gcurve, seed); - set_stp_curve_values(gcurve, opt); - invalidate_preview_thumbnail(); - update_adjusted_thumbnail(TRUE); - return 1; -} - -static int -set_curve_callback(GtkObject *button, gpointer xopt) -{ - option_t *opt = (option_t *)xopt; - GtkWidget *gcurve = - GTK_WIDGET(GTK_GAMMA_CURVE(opt->info.curve.gamma_curve)->curve); - gtk_widget_hide(opt->info.curve.dialog); - gtk_widget_set_sensitive(GTK_WIDGET(opt->checkbox), TRUE); - opt->info.curve.is_visible = FALSE; - set_stp_curve_values(gcurve, opt); - if (opt->info.curve.current) - stp_curve_destroy(opt->info.curve.current); - opt->info.curve.current = NULL; - invalidate_preview_thumbnail(); - update_adjusted_thumbnail(TRUE); - return 1; -} - -static gint -curve_draw_callback(GtkWidget *widget, GdkEvent *event, gpointer xopt) -{ - option_t *opt = (option_t *)xopt; - switch (event->type) - { - case GDK_BUTTON_RELEASE: - set_stp_curve_values(widget, opt); - invalidate_preview_thumbnail(); - update_adjusted_thumbnail(TRUE); - break; - default: - break; - } - return 1; -} - -static gint -curve_type_changed(GtkWidget *widget, gpointer xopt) -{ - option_t *opt = (option_t *)xopt; - set_stp_curve_values(widget, opt); - invalidate_preview_thumbnail(); - update_adjusted_thumbnail(TRUE); - return 1; -} - -static int -cancel_curve_callback(GtkObject *button, gpointer xopt) -{ - option_t *opt = (option_t *)xopt; - if (opt->info.curve.is_visible) - { - stp_set_curve_parameter(pv->v, opt->fast_desc->name, - opt->info.curve.current); - stp_curve_destroy(opt->info.curve.current); - opt->info.curve.current = NULL; - gtk_widget_hide(opt->info.curve.dialog); - gtk_widget_set_sensitive(GTK_WIDGET(opt->checkbox), TRUE); - opt->info.curve.is_visible = FALSE; - invalidate_preview_thumbnail(); - update_adjusted_thumbnail(TRUE); - } - return 1; -} - -static void -stpui_create_curve(option_t *opt, - GtkTable *table, - gint column, - gint row, - const gchar *text, - const stp_curve_t *deflt, - gboolean is_optional) -{ - double lower, upper; - opt->checkbox = gtk_check_button_new(); - gtk_table_attach(GTK_TABLE(table), opt->checkbox, - column, column + 1, row, row + 1, - GTK_EXPAND|GTK_FILL, GTK_FILL, 0, 0); - if (is_optional) - gtk_widget_show(opt->checkbox); - else - gtk_widget_hide(opt->checkbox); - - opt->info.curve.label = gtk_label_new(text); - gtk_misc_set_alignment (GTK_MISC (opt->info.curve.label), 0.0, 0.5); - gtk_table_attach (GTK_TABLE (table), opt->info.curve.label, - column + 1, column + 2, row, row + 1, - GTK_FILL, GTK_FILL, 0, 0); - gtk_widget_show (opt->info.curve.label); - - opt->info.curve.button = gtk_button_new_with_label(_("Edit Curve...")); - gtk_signal_connect(GTK_OBJECT(opt->info.curve.button), "clicked", - GTK_SIGNAL_FUNC(open_curve_editor), opt); - gtk_table_attach (GTK_TABLE (table), opt->info.curve.button, - column + 2, column + 3, row, row + 1, - GTK_FILL, GTK_FILL, 0, 0); - gtk_widget_show(opt->info.curve.button); - - opt->info.curve.dialog = - 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, - _("Restore Previous"), set_previous_curve_callback, - opt, NULL, NULL, FALSE, FALSE, - _("OK"), set_curve_callback, - opt, NULL, NULL, FALSE, FALSE, - _("Cancel"), cancel_curve_callback, - opt, NULL, NULL, FALSE, FALSE, - NULL); - opt->info.curve.gamma_curve = gtk_gamma_curve_new(); - gtk_box_pack_start(GTK_BOX(GTK_DIALOG(opt->info.curve.dialog)->vbox), - opt->info.curve.gamma_curve, TRUE, TRUE, 0); - stp_curve_get_bounds(opt->info.curve.deflt, &lower, &upper); - gtk_curve_set_range(GTK_CURVE(GTK_GAMMA_CURVE(opt->info.curve.gamma_curve)->curve), - 0.0, 1.0, lower, upper); - gtk_widget_set_usize - (GTK_WIDGET(GTK_GAMMA_CURVE(opt->info.curve.gamma_curve)->curve), 256, 256); - gtk_widget_show(opt->info.curve.gamma_curve); - - gtk_signal_connect - (GTK_OBJECT(GTK_GAMMA_CURVE(opt->info.curve.gamma_curve)->curve), - "curve-type-changed", GTK_SIGNAL_FUNC(curve_type_changed), opt); - gtk_signal_connect - (GTK_OBJECT(GTK_GAMMA_CURVE(opt->info.curve.gamma_curve)->curve), - "event", GTK_SIGNAL_FUNC(curve_draw_callback), opt); - - if (opt->fast_desc->help) - { - stpui_set_help_data (opt->info.curve.label, opt->fast_desc->help); - stpui_set_help_data (opt->info.curve.button, opt->fast_desc->help); - stpui_set_help_data (opt->info.curve.gamma_curve, opt->fast_desc->help); - } -} - -static int -checkbox_callback(GtkObject *button, gpointer xopt) -{ - option_t *opt = (option_t *)xopt; - GtkWidget *checkbox = GTK_WIDGET(opt->info.bool.checkbox); - opt->info.bool.current = - gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(checkbox)); - stp_set_boolean_parameter(pv->v, opt->fast_desc->name, - opt->info.bool.current); - invalidate_frame(); - invalidate_preview_thumbnail(); - update_adjusted_thumbnail(TRUE); - preview_update(); - return 1; -} - -static int -print_mode_is_color(const stp_vars_t *v) -{ - const char *printing_mode = stp_get_string_parameter(v, "PrintingMode"); - if (!printing_mode) - { - int answer = 1; - stp_parameter_t desc; - stp_describe_parameter(v, "PrintingMode", &desc); - if (desc.p_type == STP_PARAMETER_TYPE_STRING_LIST && - strcmp(desc.deflt.str, "BW") == 0) - answer = 0; - stp_parameter_description_destroy(&desc); - return answer; - } - if (strcmp(printing_mode, "BW") == 0) - return 0; - else - return 1; -} - -static void -set_current_printer(void) -{ - pv = &(stpui_plist[stpui_plist_current]); - if (print_mode_is_color(pv->v)) - stp_set_string_parameter(pv->v, "PrintingMode", "Color"); - else - stp_set_string_parameter(pv->v, "PrintingMode", "BW"); -} - - -static void -stpui_create_boolean(option_t *opt, - GtkTable *table, - gint column, - gint row, - const gchar *text, - int deflt, - gboolean is_optional) -{ - opt->checkbox = gtk_check_button_new(); - gtk_table_attach(GTK_TABLE(table), opt->checkbox, - column, column + 1, row, row + 1, - 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(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); - gtk_widget_show(opt->info.bool.checkbox); - gtk_toggle_button_set_active - (GTK_TOGGLE_BUTTON(opt->info.bool.checkbox), - stp_get_boolean_parameter(pv->v, opt->fast_desc->name)); - gtk_signal_connect(GTK_OBJECT(opt->info.bool.checkbox), "toggled", - GTK_SIGNAL_FUNC(checkbox_callback), opt); -} - -static void -build_queue_combo(void) -{ - plist_build_combo(queue_combo, - NULL, - stpui_system_print_queues, - 1, - stpui_plist_get_queue_name(pv), - NULL, - queue_callback, - &queue_callback_id, - NULL, - NULL); -} - -static void -build_printer_combo(void) -{ - int i; - if (printer_list) - stp_string_list_destroy(printer_list); - printer_list = stp_string_list_create(); - for (i = 0; i < stpui_plist_count; i++) - stp_string_list_add_string(printer_list, - stpui_plist[i].name, stpui_plist[i].name); - plist_build_combo(printer_combo, - NULL, - printer_list, - 1, - stp_string_list_param(printer_list, stpui_plist_current)->name, - NULL, - plist_callback, - &plist_callback_id, - NULL, - NULL); -} - -static int -check_page_size(const char *paper_size) -{ - const stp_papersize_t *ps = stp_get_papersize_by_name(paper_size); - if (ps && (ps->paper_unit == PAPERSIZE_ENGLISH_STANDARD || - ps->paper_unit == PAPERSIZE_METRIC_STANDARD)) - return 1; - else - return 0; -} - -static void -build_page_size_combo(option_t *option) -{ - /* - * Some printers don't support any "standard" page sizes. If the number - * of page sizes is small, just display all of them. - */ - if (stpui_show_all_paper_sizes || - stp_string_list_count(option->info.list.params) < 10) - plist_build_combo(option->info.list.combo, option->info.list.label, - option->info.list.params, option->is_active, - stp_get_string_parameter(pv->v, option->fast_desc->name), - option->info.list.default_val, combo_callback, - &(option->info.list.callback_id), NULL, option); - else - plist_build_combo(option->info.list.combo, option->info.list.label, - option->info.list.params, option->is_active, - stp_get_string_parameter(pv->v, option->fast_desc->name), - option->info.list.default_val, combo_callback, - &(option->info.list.callback_id), - check_page_size, option); -} - -static void -build_a_combo(option_t *option) -{ - const gchar *new_value; - stp_parameter_activity_t active; - if (option->fast_desc && - option->fast_desc->p_type == STP_PARAMETER_TYPE_STRING_LIST) - { - const gchar *val = stp_get_string_parameter(pv->v, - option->fast_desc->name); - if (option->info.list.params == NULL || ! option->is_active || - stp_string_list_count(option->info.list.params) == 0) - stp_set_string_parameter(pv->v, option->fast_desc->name, NULL); - else if (!val || strlen(val) == 0 || - ! stp_string_list_is_present(option->info.list.params, val)) - stp_set_string_parameter(pv->v, option->fast_desc->name, - option->info.list.default_val); - if (strcmp(option->fast_desc->name, "PageSize") == 0) - build_page_size_combo(option); - else - plist_build_combo(option->info.list.combo, option->info.list.label, - option->info.list.params, - option->is_active, - stp_get_string_parameter(pv->v, - option->fast_desc->name), - option->info.list.default_val, combo_callback, - &(option->info.list.callback_id), NULL, option); - if (strcmp(option->fast_desc->name, "PageSize") == 0) - set_media_size - (stp_get_string_parameter(pv->v, option->fast_desc->name)); - } - else - plist_build_combo(option->info.list.combo, option->info.list.label, - NULL, 0, "", "", combo_callback, - &(option->info.list.callback_id), NULL, option); - new_value = - stpui_combo_get_name(option->info.list.combo, option->info.list.params); - active = stp_get_string_parameter_active(pv->v, option->fast_desc->name); - stp_set_string_parameter(pv->v, option->fast_desc->name, new_value); - stp_set_string_parameter_active(pv->v, option->fast_desc->name, active); -} - -static void -populate_options(const stp_vars_t *v) -{ - stp_parameter_list_t params = stp_get_parameter_list(v); - int i; - int idx; - if (current_options) - { - for (i = 0; i < current_option_count; i++) - { - option_t *opt = &(current_options[i]); - switch (opt->fast_desc->p_type) - { - case STP_PARAMETER_TYPE_STRING_LIST: - if (opt->info.list.combo) - { - gtk_widget_destroy(opt->info.list.combo); - gtk_widget_destroy(opt->info.list.label); - if (opt->info.list.params) - stp_string_list_destroy(opt->info.list.params); - g_free(opt->info.list.default_val); - } - break; - case STP_PARAMETER_TYPE_DOUBLE: - case STP_PARAMETER_TYPE_DIMENSION: - if (opt->info.flt.adjustment) - { - gtk_widget_destroy - (GTK_WIDGET - (SCALE_ENTRY_SCALE(opt->info.flt.adjustment))); - gtk_widget_destroy - (GTK_WIDGET - (SCALE_ENTRY_LABEL(opt->info.flt.adjustment))); - gtk_widget_destroy - (GTK_WIDGET - (SCALE_ENTRY_SPINBUTTON(opt->info.flt.adjustment))); - } - break; - case STP_PARAMETER_TYPE_CURVE: - gtk_widget_destroy(GTK_WIDGET(opt->info.curve.label)); - gtk_widget_destroy(GTK_WIDGET(opt->info.curve.button)); - gtk_widget_destroy(GTK_WIDGET(opt->info.curve.dialog)); - if (opt->info.curve.current) - stp_curve_destroy(opt->info.curve.current); - break; - case STP_PARAMETER_TYPE_BOOLEAN: - gtk_widget_destroy(GTK_WIDGET(opt->info.bool.checkbox)); - break; - default: - break; - } - if (opt->checkbox) - gtk_widget_destroy(GTK_WIDGET(opt->checkbox)); - } - g_free(current_options); - } - current_option_count = stp_parameter_list_count(params); - current_options = g_malloc(sizeof(option_t) * current_option_count); - - for (idx = 0, i = 0; i < current_option_count; i++) - { - stp_parameter_t desc; - const stp_parameter_t *param = stp_parameter_list_param(params, i); - if (!param->read_only && - (param->p_class == STP_PARAMETER_CLASS_OUTPUT || - param->p_class == STP_PARAMETER_CLASS_FEATURE || - (param->p_class == STP_PARAMETER_CLASS_CORE && - strcmp(param->name, "PageSize") == 0))) - { - option_t *opt = &(current_options[idx]); - opt->fast_desc = stp_parameter_list_param(params, i); - stp_describe_parameter(v, opt->fast_desc->name, &desc); - opt->checkbox = NULL; - opt->is_active = 0; - opt->is_enabled = 0; - switch (opt->fast_desc->p_type) - { - case STP_PARAMETER_TYPE_STRING_LIST: - opt->info.list.callback_id = -1; - opt->info.list.default_val = g_strdup(desc.deflt.str); - if (desc.bounds.str) - opt->info.list.params = - stp_string_list_create_copy(desc.bounds.str); - else - opt->info.list.params = NULL; - opt->info.list.combo = NULL; - opt->info.list.label = NULL; - opt->is_active = desc.is_active; - break; - case STP_PARAMETER_TYPE_DOUBLE: - opt->info.flt.adjustment = NULL; - opt->info.flt.upper = desc.bounds.dbl.upper; - opt->info.flt.lower = desc.bounds.dbl.lower; - opt->info.flt.deflt = desc.deflt.dbl; - opt->info.flt.scale = 1.0; - opt->is_active = desc.is_active; - break; - case STP_PARAMETER_TYPE_DIMENSION: - opt->info.flt.adjustment = NULL; - opt->info.flt.upper = desc.bounds.dimension.upper; - opt->info.flt.lower = desc.bounds.dimension.lower; - opt->info.flt.deflt = desc.deflt.dimension; - opt->info.flt.scale = 1.0; - opt->is_active = desc.is_active; - break; - case STP_PARAMETER_TYPE_CURVE: - opt->info.curve.label = NULL; - opt->info.curve.button = NULL; - opt->info.curve.dialog = NULL; - opt->info.curve.gamma_curve = NULL; - opt->info.curve.current = NULL; - opt->info.curve.deflt = desc.deflt.curve; - opt->info.curve.is_visible = FALSE; - opt->is_active = desc.is_active; - break; - case STP_PARAMETER_TYPE_BOOLEAN: - opt->info.bool.checkbox = NULL; - opt->info.bool.current = 0; - opt->info.bool.deflt = desc.deflt.boolean; - opt->is_active = desc.is_active; - default: - break; - } - idx++; - stp_parameter_description_destroy(&desc); - } - } - current_option_count = idx; - stp_parameter_list_destroy(params); -} - -static void -destroy_something(GtkWidget *widget, gpointer data) -{ - gtk_widget_destroy(widget); -} - -static void -populate_option_table(GtkWidget *table, int p_class) -{ - int i, j; - int current_pos = 0; - GtkWidget *previous_sep = NULL; - int counts[STP_PARAMETER_LEVEL_INVALID][STP_PARAMETER_TYPE_INVALID]; - int vpos[STP_PARAMETER_LEVEL_INVALID][STP_PARAMETER_TYPE_INVALID]; - for (i = 0; i < STP_PARAMETER_LEVEL_INVALID; i++) - for (j = 0; j < STP_PARAMETER_TYPE_INVALID; j++) - { - vpos[i][j] = 0; - counts[i][j] = 0; - } - - - gtk_container_foreach(GTK_CONTAINER(table), destroy_something, NULL); - - /* First scan the options to figure out where to start */ - for (i = 0; i < current_option_count; i++) - { - const stp_parameter_t *desc = current_options[i].fast_desc; - /* - * Specialize the core parameters (page size is the only one we want) - * Yuck. - */ - if (!desc->read_only && desc->p_class == p_class && - (desc->p_class != STP_PARAMETER_CLASS_CORE || - strcmp(desc->name, "PageSize") == 0)) - { - switch (desc->p_type) - { - case STP_PARAMETER_TYPE_STRING_LIST: - case STP_PARAMETER_TYPE_DIMENSION: - case STP_PARAMETER_TYPE_DOUBLE: - case STP_PARAMETER_TYPE_CURVE: - case STP_PARAMETER_TYPE_BOOLEAN: - counts[desc->p_level][desc->p_type]++; - break; - default: - break; - } - } - } - - /* Now, figure out where we're going to put the options */ - for (i = 0; i <= MAXIMUM_PARAMETER_LEVEL + 1; i++) - { - int level_count = 0; - if (i <= MAXIMUM_PARAMETER_LEVEL) - for (j = 0; j < STP_PARAMETER_TYPE_INVALID; j++) - level_count += counts[i][j]; - 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_EXPAND|GTK_FILL, GTK_FILL, 0, 0); - if (previous_sep) - gtk_widget_show(previous_sep); - previous_sep = sep; - current_pos++; - } - if (i <= MAXIMUM_PARAMETER_LEVEL) - for (j = 0; j < STP_PARAMETER_TYPE_INVALID; j++) - { - vpos[i][j] = current_pos; - current_pos += counts[i][j]; - } - } - - for (i = 0; i < current_option_count; i++) - { - option_t *opt = &(current_options[i]); - const stp_curve_t *xcurve; - const stp_parameter_t *desc = opt->fast_desc; - if (!desc->read_only && desc->p_class == p_class && - (desc->p_class != STP_PARAMETER_CLASS_CORE || - strcmp(desc->name, "PageSize") == 0)) - { - gdouble unit_scaler; - gdouble minor_increment; - gint digits; - switch (desc->p_type) - { - case STP_PARAMETER_TYPE_STRING_LIST: - stpui_create_new_combo(opt, table, 0, - vpos[desc->p_level][desc->p_type]++, - !(desc->is_mandatory)); - if (desc->p_level > MAXIMUM_PARAMETER_LEVEL) - stp_set_string_parameter_active(pv->v, desc->name, - STP_PARAMETER_INACTIVE); - break; - case STP_PARAMETER_TYPE_DOUBLE: - stpui_create_scale_entry(opt, GTK_TABLE(table), 0, - vpos[desc->p_level][desc->p_type]++, - 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, - gettext(desc->help)); - gtk_signal_connect(GTK_OBJECT(opt->info.flt.adjustment), - "value_changed", - GTK_SIGNAL_FUNC(color_update), opt); - if (desc->p_level > MAXIMUM_PARAMETER_LEVEL) - stp_set_float_parameter_active(pv->v, desc->name, - STP_PARAMETER_INACTIVE); - break; - case STP_PARAMETER_TYPE_DIMENSION: - unit_scaler = units[pv->unit].scale; - if (unit_scaler > 100) - { - digits = 3; - minor_increment = .001; - } - else if (unit_scaler > 10) - { - digits = 2; - minor_increment = .01; - } - else if (unit_scaler > 1) - { - digits = 1; - minor_increment = .1; - } - else - { - digits = 0; - minor_increment = 1; - } - stpui_create_scale_entry(opt, GTK_TABLE(table), 0, - vpos[desc->p_level][desc->p_type]++, - gettext(desc->text), 200, 0, - opt->info.flt.deflt / unit_scaler, - opt->info.flt.lower / unit_scaler, - opt->info.flt.upper / unit_scaler, - minor_increment, minor_increment * 10, - digits, TRUE, 0, 0, NULL, - !(desc->is_mandatory)); - stpui_set_adjustment_tooltip(opt->info.flt.adjustment, - gettext(desc->help)); - gtk_signal_connect(GTK_OBJECT(opt->info.flt.adjustment), - "value_changed", - GTK_SIGNAL_FUNC(dimension_update), opt); - if (desc->p_level > MAXIMUM_PARAMETER_LEVEL) - stp_set_dimension_parameter_active(pv->v, desc->name, - STP_PARAMETER_INACTIVE); - break; - case STP_PARAMETER_TYPE_CURVE: - xcurve = stp_get_curve_parameter(pv->v, opt->fast_desc->name); - if (xcurve) - opt->info.curve.current = stp_curve_create_copy(xcurve); - else - opt->info.curve.current = NULL; - stpui_create_curve(opt, GTK_TABLE(table), 0, - vpos[desc->p_level][desc->p_type]++, - 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, - STP_PARAMETER_INACTIVE); - break; - case STP_PARAMETER_TYPE_BOOLEAN: - opt->info.bool.current = - 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]++, - 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, - STP_PARAMETER_INACTIVE); - break; - case STP_PARAMETER_TYPE_INT: - stp_set_int_parameter_active(pv->v, opt->fast_desc->name, - STP_PARAMETER_INACTIVE); - break; - case STP_PARAMETER_TYPE_RAW: - stp_set_raw_parameter_active(pv->v, opt->fast_desc->name, - STP_PARAMETER_INACTIVE); - break; - case STP_PARAMETER_TYPE_FILE: - if (strcmp(opt->fast_desc->name, "PPDFile") != 0) - stp_set_file_parameter_active(pv->v, opt->fast_desc->name, - STP_PARAMETER_INACTIVE); - break; - default: - break; - } - if (opt->checkbox) - gtk_signal_connect - (GTK_OBJECT(opt->checkbox), "toggled", - GTK_SIGNAL_FUNC(set_controls_active), opt); - } - } -} - -static void -set_options_active(const char *omit) -{ - int i; - for (i = 0; i < current_option_count; i++) - { - option_t *opt = &(current_options[i]); - const stp_parameter_t *desc = opt->fast_desc; - GtkObject *adj; - if (omit && strcmp(omit, opt->fast_desc->name) == 0) - continue; - switch (desc->p_type) - { - case STP_PARAMETER_TYPE_STRING_LIST: - build_a_combo(opt); - break; - case STP_PARAMETER_TYPE_DOUBLE: - case STP_PARAMETER_TYPE_DIMENSION: - adj = opt->info.flt.adjustment; - if (adj) - { - if (opt->is_active && desc->p_level <= MAXIMUM_PARAMETER_LEVEL) - { - gtk_widget_show(GTK_WIDGET(SCALE_ENTRY_LABEL(adj))); - gtk_widget_show(GTK_WIDGET(SCALE_ENTRY_SCALE(adj))); - gtk_widget_show(GTK_WIDGET(SCALE_ENTRY_SPINBUTTON(adj))); - } - else - { - gtk_widget_hide(GTK_WIDGET(SCALE_ENTRY_LABEL(adj))); - gtk_widget_hide(GTK_WIDGET(SCALE_ENTRY_SCALE(adj))); - gtk_widget_hide(GTK_WIDGET(SCALE_ENTRY_SPINBUTTON(adj))); - } - } - break; - case STP_PARAMETER_TYPE_CURVE: - if (opt->is_active && desc->p_level <= MAXIMUM_PARAMETER_LEVEL) - { - gtk_widget_show(GTK_WIDGET(opt->info.curve.label)); - gtk_widget_show(GTK_WIDGET(opt->info.curve.button)); - } - else - { - gtk_widget_hide(GTK_WIDGET(opt->info.curve.label)); - gtk_widget_hide(GTK_WIDGET(opt->info.curve.button)); - gtk_widget_hide(GTK_WIDGET(opt->info.curve.dialog)); - } - case STP_PARAMETER_TYPE_BOOLEAN: - if (opt->is_active && desc->p_level <= MAXIMUM_PARAMETER_LEVEL) - { - gtk_widget_show(GTK_WIDGET(opt->info.bool.checkbox)); - } - else - { - gtk_widget_hide(GTK_WIDGET(opt->info.bool.checkbox)); - } - break; - default: - break; - } - if (opt->checkbox) - { - if (!(opt->is_active) || desc->p_level > MAXIMUM_PARAMETER_LEVEL) - gtk_widget_hide(GTK_WIDGET(opt->checkbox)); - else if (!(desc->is_mandatory)) - gtk_widget_show(GTK_WIDGET(opt->checkbox)); - } - } -} - -static void -color_button_callback(GtkWidget *widget, gpointer data) -{ - invalidate_preview_thumbnail(); - update_adjusted_thumbnail(TRUE); -} - -static void -create_top_level_structure(void) -{ - gchar *plug_in_name; - /* - * Create the main dialog - */ - - plug_in_name = g_strdup_printf (_("%s -- Print v%s"), - stpui_get_image_filename(), - VERSION " - " RELEASE_DATE); - - print_dialog = - stpui_dialog_new (plug_in_name, "print", - GTK_WIN_POS_MOUSE, - FALSE, TRUE, FALSE, - - _("About"), about_callback, - NULL, NULL, NULL, FALSE, FALSE, - _("Print and\nSave Settings"), printandsave_callback, - NULL, NULL, NULL, FALSE, FALSE, - _("Save\nSettings"), save_callback, - NULL, NULL, NULL, FALSE, FALSE, - _("Print"), print_callback, - NULL, NULL, NULL, FALSE, FALSE, - _("Cancel"), gtk_widget_destroy, - NULL, 1, NULL, FALSE, TRUE, - - NULL); - - g_free (plug_in_name); - - gtk_signal_connect (GTK_OBJECT (print_dialog), "destroy", - GTK_SIGNAL_FUNC (gtk_main_quit), NULL); - - /* - * Top-level containers - */ - - main_vbox = gtk_vbox_new (FALSE, 2); - gtk_container_set_border_width (GTK_CONTAINER (main_vbox), 6); - gtk_box_pack_start (GTK_BOX (GTK_DIALOG (print_dialog)->vbox), main_vbox, - TRUE, TRUE, 0); - gtk_widget_show (main_vbox); - - main_hbox = gtk_hbox_new (FALSE, 4); - gtk_box_pack_start (GTK_BOX (main_vbox), main_hbox, TRUE, TRUE, 0); - gtk_widget_show (main_hbox); - - right_vbox = gtk_vbox_new (FALSE, 2); - gtk_box_pack_end (GTK_BOX (main_hbox), right_vbox, FALSE, FALSE, 0); - gtk_widget_show (right_vbox); - - notebook = gtk_notebook_new (); - gtk_box_pack_start (GTK_BOX (right_vbox), notebook, TRUE, TRUE, 0); - gtk_widget_show (notebook); -} - -static gint -drawing_area_resize_callback(GtkWidget *widget, GdkEventConfigure *event) -{ - preview_size_vert = event->height - 1; - preview_size_horiz = event->width - 1; - invalidate_preview_thumbnail(); - invalidate_frame(); - preview_update(); - return 1; -} - -static void -create_preview (void) -{ - GtkWidget *frame; - GtkWidget *event_box; - - frame = gtk_frame_new (_("Preview")); - gtk_box_pack_start (GTK_BOX (main_hbox), frame, TRUE, TRUE, 0); - gtk_widget_show (frame); - - preview = (GtkDrawingArea *) gtk_drawing_area_new (); - gtk_drawing_area_size(preview, preview_size_horiz + 1, preview_size_vert +1); - gtk_signal_connect(GTK_OBJECT(preview), "configure_event", - GTK_SIGNAL_FUNC(drawing_area_resize_callback), NULL); - event_box = gtk_event_box_new (); - gtk_container_add (GTK_CONTAINER (event_box), GTK_WIDGET (preview)); - gtk_container_add (GTK_CONTAINER (frame), event_box); - gtk_widget_show (event_box); - - gtk_signal_connect (GTK_OBJECT (preview), "expose_event", - GTK_SIGNAL_FUNC (preview_expose), NULL); - gtk_signal_connect (GTK_OBJECT (preview), "button_press_event", - GTK_SIGNAL_FUNC (preview_button_callback), NULL); - gtk_signal_connect (GTK_OBJECT (preview), "button_release_event", - GTK_SIGNAL_FUNC (preview_button_callback), NULL); - gtk_signal_connect (GTK_OBJECT (preview), "motion_notify_event", - GTK_SIGNAL_FUNC (preview_motion_callback), NULL); - gtk_widget_show (GTK_WIDGET (preview)); - - stpui_set_help_data - (event_box, - _("Position the image on the page.\n" - "Click and drag with the primary button to position the image.\n" - "Click and drag with the second button to move the image with finer precision; " - "each unit of motion moves the image one point (1/72\")\n" - "Click and drag with the third (middle) button to move the image in units of " - "the image size.\n" - "Holding down the shift key while clicking and dragging constrains the image to " - "only horizontal or vertical motion.\n" - "If you click another button while dragging the mouse, the image will return " - "to its original position.")); - - gtk_widget_set_events (GTK_WIDGET (preview), - GDK_EXPOSURE_MASK | GDK_BUTTON_MOTION_MASK | - GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK); -} - -static GtkWidget * -create_positioning_entry(GtkWidget *table, int hpos, int vpos, - const char *text, const char *help) -{ - return stpui_create_entry - (table, hpos, vpos, text, help, GTK_SIGNAL_FUNC(position_callback)); -} - -static GtkWidget * -create_positioning_button(GtkWidget *box, int invalid, - const char *text, const char *help) -{ - 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); - gtk_signal_connect(GTK_OBJECT(button), "clicked", - GTK_SIGNAL_FUNC(position_button_callback), - (gpointer) invalid); - return button; -} - -static void -create_paper_size_frame(void) -{ - GtkWidget *frame; - GtkWidget *vbox; - GtkWidget *media_size_table; - GtkWidget *table; - int vpos = 0; - - frame = gtk_frame_new (_("Paper Size")); - gtk_box_pack_start (GTK_BOX (right_vbox), frame, FALSE, TRUE, 0); - gtk_widget_show (frame); - - vbox = gtk_vbox_new (FALSE, 2); - gtk_container_set_border_width (GTK_CONTAINER (vbox), 4); - gtk_container_add (GTK_CONTAINER (frame), vbox); - gtk_widget_show (vbox); - - table = gtk_table_new (1, 1, FALSE); - gtk_container_add (GTK_CONTAINER (vbox), table); - gtk_widget_show (table); - - /* - * Media size combo box. - */ - - page_size_table = gtk_table_new(1, 1, FALSE); - gtk_widget_show (page_size_table); - gtk_table_attach_defaults(GTK_TABLE(table), page_size_table, - 0, 2, vpos, vpos + 1); - vpos++; - show_all_paper_sizes_button = - gtk_check_button_new_with_label(_("Show All Paper Sizes")); - gtk_table_attach_defaults - (GTK_TABLE(table), show_all_paper_sizes_button, 0, 2, vpos, vpos + 1); - gtk_toggle_button_set_active - (GTK_TOGGLE_BUTTON(show_all_paper_sizes_button), - stpui_show_all_paper_sizes); - gtk_signal_connect(GTK_OBJECT(show_all_paper_sizes_button), "toggled", - GTK_SIGNAL_FUNC(show_all_paper_sizes_callback), NULL); - gtk_widget_show(show_all_paper_sizes_button); - vpos++; - - /* - * Custom media size entries - */ - - media_size_table = gtk_table_new (1, 1, FALSE); - stpui_table_attach_aligned(GTK_TABLE (table), 0, vpos++, _("Dimensions:"), - 0.0, 0.5, media_size_table, 1, TRUE); - gtk_table_set_col_spacings (GTK_TABLE (media_size_table), 4); - - custom_size_width = stpui_create_entry - (media_size_table, 0, 3, _("Width:"), - _("Width of the paper that you wish to print to"), - custom_media_size_callback); - - custom_size_height = stpui_create_entry - (media_size_table, 2, 3, _("Height:"), - _("Height of the paper that you wish to print to"), - custom_media_size_callback); - - vpos++; - auto_paper_size_button = - gtk_check_button_new_with_label(_("Automatic Paper Size")); - gtk_table_attach_defaults - (GTK_TABLE(table), auto_paper_size_button, 0, 2, vpos, vpos + 1); - gtk_toggle_button_set_active - (GTK_TOGGLE_BUTTON(auto_paper_size_button), FALSE); - gtk_signal_connect(GTK_OBJECT(auto_paper_size_button), "toggled", - GTK_SIGNAL_FUNC(auto_paper_size_callback), NULL); -} - -static void -create_copy_number_frame(void) -{ - GtkWidget *frame; - GtkWidget *vbox; - GtkWidget *event_box; - GtkAdjustment *adj; - - frame = gtk_frame_new (_("Number of Copies")); - gtk_box_pack_start (GTK_BOX (right_vbox), frame, FALSE, TRUE, 0); - gtk_widget_show (frame); - - vbox = gtk_hbox_new (FALSE, 2); - gtk_container_set_border_width (GTK_CONTAINER (vbox), 4); - gtk_container_add (GTK_CONTAINER (frame), vbox); - gtk_widget_show (vbox); - - event_box = gtk_event_box_new (); - gtk_container_add (GTK_CONTAINER (vbox), event_box); - stpui_set_help_data(event_box, - _("Select the number of copies to print; " - "a value between 1 and 100")); - gtk_widget_show (event_box); - - /* - * Number of Copies Spin Button - */ - - adj = (GtkAdjustment *) gtk_adjustment_new (1.0f, 1.0f, 100.0f, - 1.0f, 5.0f, 0.0f); - copy_count_spin_button = gtk_spin_button_new (adj, 0, 0); - gtk_spin_button_set_wrap (GTK_SPIN_BUTTON (copy_count_spin_button), FALSE); - gtk_spin_button_set_numeric (GTK_SPIN_BUTTON (copy_count_spin_button), TRUE); - gtk_spin_button_set_update_policy (GTK_SPIN_BUTTON (copy_count_spin_button), - GTK_UPDATE_IF_VALID); - - gtk_signal_connect(GTK_OBJECT (adj), "value_changed", - GTK_SIGNAL_FUNC (copy_count_callback), - NULL); - - gtk_container_add (GTK_CONTAINER (event_box), copy_count_spin_button); - gtk_widget_show(copy_count_spin_button); -} - -static void -create_positioning_frame (void) -{ - GtkWidget *frame; - GtkWidget *table; - GtkWidget *box; - GtkWidget *sep; - - frame = gtk_frame_new (_("Image Position")); - gtk_box_pack_start (GTK_BOX (right_vbox), frame, FALSE, TRUE, 0); - gtk_widget_show (frame); - - table = gtk_table_new (1, 1, FALSE); - gtk_table_set_col_spacings (GTK_TABLE (table), 2); - gtk_table_set_row_spacings (GTK_TABLE (table), 2); - gtk_container_set_border_width (GTK_CONTAINER (table), 4); - gtk_container_add (GTK_CONTAINER (frame), table); - gtk_widget_show (table); - - /* - * Orientation option menu. - */ - - orientation_menu = - stpui_option_menu_new (FALSE, - _("Auto"), orientation_callback, - (gpointer) ORIENT_AUTO, NULL, NULL, 0, - _("Portrait"), orientation_callback, - (gpointer) ORIENT_PORTRAIT, NULL, NULL, 0, - _("Landscape"), orientation_callback, - (gpointer) ORIENT_LANDSCAPE, NULL, NULL, 0, - _("Upside down"), orientation_callback, - (gpointer) ORIENT_UPSIDEDOWN, NULL, NULL, 0, - _("Seascape"), orientation_callback, - (gpointer) ORIENT_SEASCAPE, NULL, NULL, 0, - NULL); - stpui_set_help_data (orientation_menu, - _("Select the orientation: portrait, landscape, " - "upside down, or seascape (upside down landscape)")); - stpui_table_attach_aligned (GTK_TABLE (table), 0, 0, _("Orientation:"), - 1.0, 0.5, orientation_menu, 4, TRUE); - sep = gtk_hseparator_new (); - gtk_table_attach_defaults (GTK_TABLE (table), sep, 0, 6, 1, 2); - gtk_widget_show (sep); - - /* - * Position entries - */ - - left_entry = create_positioning_entry - (table, 0, 2, _("Left:"), - _("Distance from the left of the paper to the image")); -#if 0 - right_entry = create_positioning_entry - (table, 0, 3, _("Right:"), - _("Distance from the left of the paper to the right of the image")); -#endif - right_border_entry = create_positioning_entry - (table, 0, 4, _("Right:"), - _("Distance from the right of the paper to the image")); - top_entry = create_positioning_entry - (table, 3, 2, _("Top:"), - _("Distance from the top of the paper to the image")); -#if 0 - bottom_entry = create_positioning_entry - (table, 3, 3, _("Bottom:"), - _("Distance from the top of the paper to bottom of the image")); -#endif - bottom_border_entry = create_positioning_entry - (table, 3, 4, _("Bottom:"), - _("Distance from the bottom of the paper to the image")); - /* - * Center options - */ - - sep = gtk_hseparator_new (); - gtk_table_attach_defaults (GTK_TABLE (table), sep, 0, 6, 5, 6); - gtk_widget_show (sep); - - box = gtk_hbox_new (TRUE, 4); - stpui_table_attach_aligned (GTK_TABLE (table), 0, 7, _("Center:"), 0.5, 0.5, - box, 5, TRUE); - recenter_horizontal_button = create_positioning_button - (box, INVALID_LEFT, _("Horizontal"), - _("Center the image horizontally on the paper")); - recenter_button = create_positioning_button - (box, INVALID_LEFT | INVALID_TOP, _("Both"), - _("Center the image on the paper")); - recenter_vertical_button = create_positioning_button - (box, INVALID_TOP, _("Vertical"), - _("Center the image vertically on the paper")); -} - -static void -create_printer_dialog (void) -{ - GtkWidget *table; - GtkWidget *label; - GtkWidget *event_box; - GSList *group; - gint i; - stp_string_list_t *manufacturer_list = stp_string_list_create(); - - setup_dialog = stpui_dialog_new(_("Setup Printer"), "print", - GTK_WIN_POS_MOUSE, FALSE, TRUE, FALSE, - _("OK"), setup_ok_callback, - NULL, NULL, NULL, TRUE, FALSE, - _("Cancel"), setup_cancel_callback, - NULL, 1, NULL, FALSE, TRUE, - - NULL); - - /* - * Top-level table for dialog. - */ - - table = gtk_table_new (4, 4, FALSE); - gtk_container_set_border_width (GTK_CONTAINER (table), 6); - gtk_table_set_col_spacings (GTK_TABLE (table), 4); - gtk_table_set_row_spacing (GTK_TABLE (table), 0, 150); - gtk_box_pack_start (GTK_BOX (GTK_DIALOG (setup_dialog)->vbox), table, - TRUE, TRUE, 0); - gtk_widget_show (table); - - /* - * Printer driver option menu. - */ - - label = gtk_label_new (_("Printer Make:")); - gtk_misc_set_alignment (GTK_MISC (label), 1.0, 0.5); - gtk_table_attach (GTK_TABLE (table), label, 1, 2, 0, 2, - GTK_FILL, GTK_FILL, 0, 0); - gtk_widget_show (label); - - event_box = gtk_event_box_new (); - gtk_table_attach (GTK_TABLE (table), event_box, 2, 4, 0, 2, - GTK_FILL | GTK_EXPAND, GTK_FILL | GTK_EXPAND, 0, 0); - gtk_widget_show (event_box); - - stpui_set_help_data (event_box, _("Select the make of your printer")); - - manufacturer_crawler = gtk_scrolled_window_new (NULL, NULL); - gtk_scrolled_window_set_policy (GTK_SCROLLED_WINDOW (manufacturer_crawler), - GTK_POLICY_AUTOMATIC, GTK_POLICY_AUTOMATIC); - gtk_container_add (GTK_CONTAINER (event_box), manufacturer_crawler); - gtk_widget_show (manufacturer_crawler); - - manufacturer_clist = gtk_clist_new (1); - gtk_widget_set_usize (manufacturer_clist, 200, 0); - gtk_clist_set_selection_mode(GTK_CLIST(manufacturer_clist),GTK_SELECTION_SINGLE); - gtk_container_add (GTK_CONTAINER (manufacturer_crawler), manufacturer_clist); - gtk_widget_show (manufacturer_clist); - - gtk_signal_connect (GTK_OBJECT (manufacturer_clist), "select_row", - GTK_SIGNAL_FUNC (manufacturer_callback), NULL); - - - label = gtk_label_new (_("Printer Model:")); - gtk_misc_set_alignment (GTK_MISC (label), 1.0, 0.5); - gtk_table_attach (GTK_TABLE (table), label, 4, 5, 0, 2, - GTK_FILL, GTK_FILL, 0, 0); - gtk_widget_show (label); - - event_box = gtk_event_box_new (); - gtk_table_attach (GTK_TABLE (table), event_box, 5, 7, 0, 2, - GTK_FILL | GTK_EXPAND, GTK_FILL | GTK_EXPAND, 0, 0); - gtk_widget_show (event_box); - - stpui_set_help_data (event_box, _("Select your printer model")); - - printer_crawler = gtk_scrolled_window_new (NULL, NULL); - gtk_scrolled_window_set_policy (GTK_SCROLLED_WINDOW (printer_crawler), - GTK_POLICY_AUTOMATIC, GTK_POLICY_AUTOMATIC); - gtk_container_add (GTK_CONTAINER (event_box), printer_crawler); - gtk_widget_show (printer_crawler); - - printer_driver = gtk_clist_new (1); - gtk_widget_set_usize (printer_driver, 200, 0); - gtk_clist_set_selection_mode(GTK_CLIST(printer_driver),GTK_SELECTION_SINGLE); - gtk_container_add (GTK_CONTAINER (printer_crawler), printer_driver); - gtk_widget_show (printer_driver); - - gtk_signal_connect (GTK_OBJECT (printer_driver), "select_row", - GTK_SIGNAL_FUNC (print_driver_callback), NULL); - - - for (i = 0; i < stp_printer_model_count (); i ++) - { - const stp_printer_t *the_printer = stp_get_printer_by_index (i); - - if (strcmp(stp_printer_get_long_name (the_printer), "") != 0 && - strcmp(stp_printer_get_family(the_printer), "raw") != 0) - { - const gchar *make = stp_printer_get_manufacturer(the_printer); - if (! stp_string_list_is_present(manufacturer_list, make)) - stp_string_list_add_string(manufacturer_list, make, make); - } - } - - for (i = 0; i < stp_string_list_count(manufacturer_list); i++) - { - const stp_param_string_t *param = - stp_string_list_param(manufacturer_list, i); - gchar *xname = g_strdup(param->name); - gtk_clist_insert(GTK_CLIST(manufacturer_clist), i, &xname); - gtk_clist_set_row_data_full(GTK_CLIST(manufacturer_clist), i, xname, - g_free); - } - stp_string_list_destroy(manufacturer_list); - gtk_clist_sort(GTK_CLIST(manufacturer_clist)); - build_printer_driver_clist(); - - /* - * PPD file. - */ - - ppd_label = gtk_label_new (_("PPD File:")); - gtk_misc_set_alignment (GTK_MISC (ppd_label), 1.0, 0.5); - gtk_table_attach (GTK_TABLE (table), ppd_label, 1, 2, 3, 4, - GTK_FILL, GTK_FILL, 0, 0); - gtk_widget_show (ppd_label); - - ppd_box = gtk_hbox_new (FALSE, 8); - gtk_table_attach (GTK_TABLE (table), ppd_box, 2, 7, 3, 4, - GTK_FILL, GTK_FILL, 0, 0); - - ppd_file = gtk_entry_new (); - gtk_signal_connect(GTK_OBJECT(ppd_file), "activate", - GTK_SIGNAL_FUNC(ppd_file_callback), NULL); - gtk_box_pack_start (GTK_BOX (ppd_box), ppd_file, TRUE, TRUE, 0); - gtk_widget_show (ppd_file); - - stpui_set_help_data(ppd_file,_("Enter the correct PPD filename for your printer")); - - ppd_button = gtk_button_new_with_label (_("Browse")); - gtk_misc_set_padding (GTK_MISC (GTK_BIN (ppd_button)->child), 2, 0); - gtk_box_pack_start (GTK_BOX (ppd_box), ppd_button, FALSE, FALSE, 0); - gtk_widget_show (ppd_button); - gtk_widget_show (ppd_box); - - stpui_set_help_data(ppd_button, - _("Choose the correct PPD filename for your printer")); - gtk_signal_connect (GTK_OBJECT (ppd_button), "clicked", - GTK_SIGNAL_FUNC (ppd_browse_callback), NULL); - - ppd_model_label = gtk_label_new (_("Printer Model:")); - gtk_misc_set_alignment (GTK_MISC (ppd_model_label), 1.0, 0.5); - gtk_table_attach (GTK_TABLE (table), ppd_model_label, 1, 2, 4, 5, - GTK_FILL, GTK_FILL, 0, 0); - gtk_widget_show (ppd_model_label); - - ppd_model = gtk_label_new (""); - gtk_misc_set_alignment (GTK_MISC (ppd_model), 0.0, 0.5); - gtk_table_attach (GTK_TABLE (table), ppd_model, 2, 7, 4, 5, - GTK_FILL, GTK_FILL, 0, 0); - gtk_widget_show (ppd_model); - - - /* - * Print command. - */ - - group = NULL; - for (i = 0; i < command_options_count; i++) - group = stpui_create_radio_button(&(command_options[i]), group, table, - 0, i > 0 ? i + 6 : i + 5, - command_type_callback); - - standard_cmd_entry = gtk_entry_new(); - gtk_table_attach (GTK_TABLE (table), standard_cmd_entry, 2, 7, 6, 7, - GTK_FILL, GTK_FILL, 0, 0); - gtk_entry_set_editable(GTK_ENTRY(standard_cmd_entry), FALSE); - gtk_widget_set_sensitive(standard_cmd_entry, FALSE); - gtk_widget_show (standard_cmd_entry); - - queue_combo = gtk_combo_new (); - event_box = gtk_event_box_new (); - gtk_container_add (GTK_CONTAINER (event_box), queue_combo); - gtk_widget_show (queue_combo); - gtk_widget_show (event_box); - build_queue_combo(); - - stpui_set_help_data(event_box, - _("Select the name of the output queue (not the type, " - "or model, of printer) that you wish to print to")); - label = gtk_label_new(_("Printer Queue:")); - gtk_widget_show(label); - gtk_table_attach (GTK_TABLE (table), label, 2, 3, 5, 6, - GTK_FILL, GTK_FILL, 0, 0); - gtk_table_attach (GTK_TABLE (table), event_box, 3, 7, 5, 6, - GTK_FILL, GTK_FILL, 0, 0); - - custom_command_entry = gtk_entry_new (); - gtk_table_attach (GTK_TABLE (table), custom_command_entry, 2, 7, 7, 8, - GTK_FILL, GTK_FILL, 0, 0); - gtk_signal_connect(GTK_OBJECT(custom_command_entry), "activate", - GTK_SIGNAL_FUNC(setup_callback), NULL); - gtk_widget_set_sensitive(custom_command_entry, FALSE); - gtk_widget_show (custom_command_entry); - - stpui_set_help_data - (custom_command_entry, _("Enter the correct command to print to your printer. ")); - - file_entry = gtk_entry_new (); - gtk_table_attach (GTK_TABLE (table), file_entry, 2, 6, 8, 9, - GTK_FILL, GTK_FILL, 0, 0); - gtk_signal_connect(GTK_OBJECT(file_entry), "activate", - GTK_SIGNAL_FUNC(setup_callback), NULL); - gtk_widget_show (file_entry); - - gtk_widget_set_sensitive(file_entry, FALSE); - stpui_set_help_data - (file_entry, _("Enter the file to print to. ")); - - file_button = gtk_button_new_with_label (_("Browse")); - - gtk_table_attach (GTK_TABLE (table), file_button, 6, 7, 8, 9, - GTK_FILL, GTK_FILL, 0, 0); - gtk_widget_show (file_button); - - stpui_set_help_data(file_button, _("File to print to")); - gtk_signal_connect (GTK_OBJECT (file_button), "clicked", - GTK_SIGNAL_FUNC (file_browse_callback), NULL); - - /* - * Output file selection dialog. - */ - - file_browser = gtk_file_selection_new (_("Print To File")); - - gtk_signal_connect - (GTK_OBJECT (GTK_FILE_SELECTION (file_browser)->ok_button), "clicked", - GTK_SIGNAL_FUNC (file_ok_callback), NULL); - gtk_signal_connect - (GTK_OBJECT (GTK_FILE_SELECTION (file_browser)->cancel_button), "clicked", - GTK_SIGNAL_FUNC (file_cancel_callback), NULL); - - /* - * PPD file selection dialog. - */ - - ppd_browser = gtk_file_selection_new (_("PPD File")); - gtk_file_selection_hide_fileop_buttons (GTK_FILE_SELECTION (ppd_browser)); - - gtk_signal_connect - (GTK_OBJECT (GTK_FILE_SELECTION (ppd_browser)->ok_button), "clicked", - GTK_SIGNAL_FUNC (ppd_ok_callback), NULL); - gtk_signal_connect_object - (GTK_OBJECT (GTK_FILE_SELECTION (ppd_browser)->cancel_button), "clicked", - GTK_SIGNAL_FUNC (gtk_widget_hide), GTK_OBJECT (ppd_browser)); -} - -static void -create_new_printer_dialog (void) -{ - GtkWidget *table; - - new_printer_dialog = - stpui_dialog_new (_("Define New Printer"), "print", - GTK_WIN_POS_MOUSE, FALSE, FALSE, FALSE, - _("OK"), new_printer_ok_callback, - NULL, NULL, NULL, TRUE, FALSE, - _("Cancel"), gtk_widget_hide, - NULL, 1, NULL, FALSE, TRUE, - NULL); - - table = gtk_table_new (1, 1, FALSE); - gtk_container_set_border_width (GTK_CONTAINER (table), 6); - gtk_table_set_col_spacings (GTK_TABLE (table), 4); - gtk_table_set_row_spacings (GTK_TABLE (table), 8); - gtk_box_pack_start (GTK_BOX (GTK_DIALOG (new_printer_dialog)->vbox), table, - FALSE, FALSE, 0); - gtk_widget_show (table); - - new_printer_entry = gtk_entry_new (); - gtk_entry_set_max_length (GTK_ENTRY (new_printer_entry), 127); - stpui_table_attach_aligned(GTK_TABLE (table), 0, 0, _("Printer Name:"), 1.0, - 0.5, new_printer_entry, 1, TRUE); - - stpui_set_help_data(new_printer_entry, - _("Enter the name you wish to give this logical printer")); - gtk_signal_connect (GTK_OBJECT (new_printer_entry), "activate", - GTK_SIGNAL_FUNC (new_printer_ok_callback), NULL); -} - -static void -create_about_dialog (void) -{ - GtkWidget *label; - about_dialog = - stpui_dialog_new (_("About Gutenprint " PLUG_IN_VERSION), "print", - GTK_WIN_POS_MOUSE, FALSE, FALSE, FALSE, - _("OK"), gtk_widget_hide, - NULL, 1, NULL, TRUE, TRUE, - NULL); - - label = gtk_label_new - (_("Gutenprint Version " PLUG_IN_VERSION "\n" - "\n" - "Copyright (C) 1997-2003 Michael Sweet, Robert Krawitz,\n" - "and the rest of the Gutenprint Development Team.\n" - "\n" - "Please visit our web site at http://gimp-print.sourceforge.net.\n" - "\n" - "This program is free software; you can redistribute it and/or modify\n" - "it under the terms of the GNU General Public License as published by\n" - "the Free Software Foundation; either version 2 of the License, or\n" - "(at your option) any later version.\n" - "\n" - "This program is distributed in the hope that it will be useful,\n" - "but WITHOUT ANY WARRANTY; without even the implied warranty of\n" - "MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the\n" - "GNU General Public License for more details.\n" - "\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")); - - gtk_misc_set_padding (GTK_MISC (label), 12, 4); - gtk_box_pack_start (GTK_BOX (GTK_DIALOG (about_dialog)->vbox), label, - FALSE, FALSE, 0); - gtk_widget_show (label); -} - -static void -create_printer_settings_frame (void) -{ - GtkWidget *table; - GtkWidget *sep; - GtkWidget *printer_hbox; - GtkWidget *button; - GtkWidget *event_box; - GtkWidget *scrolled_window; - gint vpos = 0; - - create_printer_dialog (); - create_about_dialog (); - create_new_printer_dialog (); - - table = gtk_table_new (1, 1, FALSE); - gtk_table_set_col_spacings (GTK_TABLE (table), 2); - gtk_table_set_row_spacings (GTK_TABLE (table), 2); - gtk_container_set_border_width (GTK_CONTAINER (table), 4); - gtk_notebook_append_page (GTK_NOTEBOOK (notebook), table, - gtk_label_new (_("Printer Settings"))); - gtk_widget_show (table); - - /* - * Printer option menu. - */ - - printer_combo = gtk_combo_new (); - event_box = gtk_event_box_new (); - gtk_container_add (GTK_CONTAINER (event_box), printer_combo); - gtk_widget_show (printer_combo); - - stpui_set_help_data(event_box, - _("Select the name of the printer (not the type, " - "or model, of printer) that you wish to print to")); - stpui_table_attach_aligned(GTK_TABLE (table), 0, vpos++, _("Printer Name:"), - 0.0, 0.5, event_box, 1, TRUE); - printer_model_label = gtk_label_new (""); - 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_EXPAND|GTK_FILL, GTK_FILL, 0, 0); - vpos += 2; - gtk_widget_show (printer_hbox); - - /* - * Setup printer button - */ - - button = gtk_button_new_with_label (_("Setup Printer...")); - stpui_set_help_data(button, - _("Choose the printer model, PPD file, and command " - "that is used to print to this printer")); - gtk_misc_set_padding (GTK_MISC (GTK_BIN (button)->child), 2, 0); - gtk_box_pack_start (GTK_BOX (printer_hbox), button, FALSE, TRUE, 0); - gtk_widget_show (button); - - gtk_signal_connect (GTK_OBJECT (button), "clicked", - GTK_SIGNAL_FUNC (setup_open_callback), NULL); - - /* - * New printer button - */ - - button = gtk_button_new_with_label (_("New Printer...")); - stpui_set_help_data (button, _("Define a new logical printer. This can be used to " - "name a collection of settings that you wish to " - "remember for future use.")); - gtk_box_pack_start (GTK_BOX (printer_hbox), button, FALSE, TRUE, 0); - gtk_widget_show (button); - - gtk_signal_connect (GTK_OBJECT (button), "clicked", - GTK_SIGNAL_FUNC (new_printer_open_callback), NULL); - - sep = gtk_hseparator_new (); - gtk_table_attach (GTK_TABLE (table), sep, 0, 5, vpos, vpos + 1, - GTK_EXPAND|GTK_FILL, GTK_FILL, 0, 0); - gtk_widget_show (sep); - vpos++; - - printer_features_table = gtk_table_new(1, 1, FALSE); - gtk_table_set_col_spacings (GTK_TABLE (printer_features_table), 2); - gtk_table_set_row_spacings (GTK_TABLE (printer_features_table), 0); - gtk_widget_show (printer_features_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); - gtk_scrolled_window_add_with_viewport(GTK_SCROLLED_WINDOW(scrolled_window), - printer_features_table); - gtk_table_attach_defaults(GTK_TABLE(table), scrolled_window, - 0, 6, vpos, vpos + 1); - gtk_widget_show(scrolled_window); - vpos++; - - button = gtk_button_new_with_label (_("Set Printer Option Defaults")); - stpui_set_help_data (button, _("Set all printer options to their defaults")); - gtk_table_attach(GTK_TABLE(table), button, 0, 6, vpos, vpos + 1, - GTK_EXPAND|GTK_FILL, GTK_SHRINK|GTK_FILL, 0, 0); - gtk_widget_show (button); - - gtk_signal_connect (GTK_OBJECT (button), "clicked", - GTK_SIGNAL_FUNC (set_printer_defaults), NULL); - -} - -static void -create_scaling_frame (void) -{ - GtkWidget *frame; - GtkWidget *vbox; - GtkWidget *hbox; - GtkWidget *table; - GtkWidget *box; - GtkWidget *label; - GtkWidget *event_box; - GtkWidget *sep; - GSList *group; - - frame = gtk_frame_new (_("Image Size")); - gtk_box_pack_start (GTK_BOX (main_vbox), frame, FALSE, FALSE, 0); - gtk_widget_show (frame); - - hbox = gtk_hbox_new (FALSE, 2); - gtk_container_set_border_width (GTK_CONTAINER (hbox), 4); - gtk_container_add (GTK_CONTAINER (frame), hbox); - gtk_widget_show (hbox); - - vbox = gtk_vbox_new (FALSE, 2); -/* gtk_container_set_border_width (GTK_CONTAINER (vbox), 4); */ - gtk_container_add (GTK_CONTAINER (hbox), vbox); - gtk_widget_show (vbox); - - table = gtk_table_new (1, 1, FALSE); - gtk_table_set_col_spacings (GTK_TABLE (table), 4); - gtk_box_pack_start (GTK_BOX (vbox), table, FALSE, FALSE, 0); - gtk_widget_show (table); - - /* - * Create the scaling adjustment using percent. It doesn't really matter, - * since as soon as we call plist_callback at the end of initialization - * everything will be put right. - */ - scaling_adjustment = - stpui_scale_entry_new (GTK_TABLE (table), 0, 0, _("Scaling:"), 100, 75, - 100.0, minimum_image_percent, 100.0, - 1.0, 10.0, 1, TRUE, 0, 0, NULL); - stpui_set_adjustment_tooltip(scaling_adjustment, - _("Set the scale (size) of the image")); - gtk_signal_connect (GTK_OBJECT (scaling_adjustment), "value_changed", - GTK_SIGNAL_FUNC (scaling_update), NULL); - - box = gtk_hbox_new (FALSE, 4); - gtk_box_pack_start (GTK_BOX (vbox), box, TRUE, TRUE, 0); - gtk_widget_show (box); - - /* - * The scale by percent/ppi toggles - */ - - table = gtk_table_new (1, 1, FALSE); - gtk_table_set_col_spacings (GTK_TABLE (table), 4); - gtk_box_pack_start (GTK_BOX (box), table, FALSE, FALSE, 0); - gtk_widget_show (table); - - 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_widget_show (event_box); - - label = gtk_label_new (_("Scale by:")); - gtk_container_add (GTK_CONTAINER (event_box), label); - gtk_widget_show (label); - - stpui_set_help_data(event_box, - _("Select whether scaling is measured as percent of " - "available page size or number of output dots per inch")); - - scaling_percent = gtk_radio_button_new_with_label (NULL, _("Percent")); - group = gtk_radio_button_group (GTK_RADIO_BUTTON (scaling_percent)); - stpui_table_attach_aligned(GTK_TABLE (table), 0, 0, NULL, 0.5, 0.5, - scaling_percent, 2, TRUE); - - stpui_set_help_data(scaling_percent, _("Scale the print to the size of the page")); - gtk_signal_connect (GTK_OBJECT (scaling_percent), "toggled", - GTK_SIGNAL_FUNC (scaling_callback), NULL); - - scaling_ppi = gtk_radio_button_new_with_label (group, _("PPI")); - stpui_table_attach_aligned(GTK_TABLE (table), 2, 0, NULL, 0.5, 0.5, - scaling_ppi, 1, TRUE); - - stpui_set_help_data(scaling_ppi, - _("Scale the print to the number of dots per inch")); - gtk_signal_connect (GTK_OBJECT (scaling_ppi), "toggled", - GTK_SIGNAL_FUNC (scaling_callback), NULL); - - sep = gtk_vseparator_new (); - gtk_box_pack_start (GTK_BOX (hbox), sep, FALSE, FALSE, 8); - gtk_widget_show (sep); - - /* - * The width/height enries - */ - - table = gtk_table_new (1, 1, FALSE); - gtk_table_set_col_spacings (GTK_TABLE (table), 2); - gtk_box_pack_start (GTK_BOX (hbox), table, FALSE, FALSE, 0); - gtk_widget_show (table); - - width_entry = create_positioning_entry - (table, 0, 0, _("Width:"), _("Set the width of the print")); - height_entry = create_positioning_entry - (table, 0, 1, _("Height:"), _("Set the height of the print")); - - /* - * The "image size" button - */ - - scaling_image = gtk_button_new_with_label (_("Use Original\nImage Size")); - gtk_misc_set_padding (GTK_MISC (GTK_BIN (scaling_image)->child), 2, 2); - gtk_box_pack_end (GTK_BOX (hbox), scaling_image, FALSE, FALSE, 0); - gtk_widget_show (scaling_image); - - stpui_set_help_data(scaling_image, - _("Set the print size to the size of the image")); - gtk_signal_connect (GTK_OBJECT (scaling_image), "clicked", - GTK_SIGNAL_FUNC (scaling_callback), NULL); -} - -/* - * create_color_adjust_window (void) - * - * NOTES: - * creates the color adjuster popup, allowing the user to adjust brightness, - * contrast, saturation, etc. - */ -static void -create_color_adjust_window (void) -{ - GtkWidget *table; - GtkWidget *label; - GtkWidget *event_box; - GtkWidget *scrolled_window; - - initialize_thumbnail(); - - color_adjust_dialog = - stpui_dialog_new(_("Print Color Adjust"), "print", - GTK_WIN_POS_MOUSE, FALSE, TRUE, FALSE, - - _("Set Defaults"), set_color_defaults, - NULL, NULL, NULL, FALSE, FALSE, - _("Close"), gtk_widget_hide, - NULL, 1, NULL, TRUE, TRUE, - NULL); - - table = gtk_table_new (1, 1, FALSE); - gtk_container_set_border_width (GTK_CONTAINER (table), 6); - gtk_table_set_col_spacings (GTK_TABLE (table), 4); - gtk_table_set_row_spacings (GTK_TABLE (table), 0); -/* gtk_table_set_row_spacing (GTK_TABLE (table), 8, 6); */ - - gtk_box_pack_start (GTK_BOX (GTK_DIALOG (color_adjust_dialog)->vbox), - table, TRUE, TRUE, 0); - gtk_widget_show (table); - - /* - * Drawing area for color swatch feedback display... - */ - - event_box = gtk_event_box_new (); - gtk_widget_show (GTK_WIDGET (event_box)); - gtk_table_attach (GTK_TABLE (table), GTK_WIDGET (event_box), - 0, 1, 0, 1, 0, 0, 0, 0); - - swatch = (GtkDrawingArea *) gtk_drawing_area_new (); - gtk_widget_set_events (GTK_WIDGET (swatch), GDK_EXPOSURE_MASK); - gtk_drawing_area_size (swatch, thumbnail_w, thumbnail_h); - gtk_container_add (GTK_CONTAINER (event_box), GTK_WIDGET (swatch)); - gtk_widget_show (GTK_WIDGET (swatch)); - - stpui_set_help_data (GTK_WIDGET (event_box), _("Image preview")); - gtk_signal_connect (GTK_OBJECT (swatch), "expose_event", - GTK_SIGNAL_FUNC (redraw_color_swatch), - NULL); - - event_box = gtk_event_box_new (); - gtk_widget_show (GTK_WIDGET (event_box)); - gtk_table_attach (GTK_TABLE (table), GTK_WIDGET (event_box), - 1, 2, 0, 1, 0, 0, 0, 0); - - output_color_vbox = gtk_vbox_new(TRUE, 0); - gtk_container_add(GTK_CONTAINER(event_box), output_color_vbox); - gtk_widget_show(GTK_WIDGET(output_color_vbox)); - - label = gtk_label_new(_("View Output Channels:")); - gtk_box_pack_start(GTK_BOX(output_color_vbox), label, TRUE, TRUE, 0); - gtk_widget_show(GTK_WIDGET(label)); - - cyan_button = gtk_toggle_button_new_with_label(_("Cyan")); - gtk_box_pack_start(GTK_BOX(output_color_vbox), cyan_button, TRUE, TRUE, 0); - gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(cyan_button), TRUE); - gtk_widget_show(GTK_WIDGET(cyan_button)); - gtk_signal_connect (GTK_OBJECT (cyan_button), "toggled", - GTK_SIGNAL_FUNC (color_button_callback), NULL); - - magenta_button = gtk_toggle_button_new_with_label(_("Magenta")); - gtk_box_pack_start(GTK_BOX(output_color_vbox), magenta_button, TRUE, TRUE,0); - gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(magenta_button), TRUE); - gtk_widget_show(GTK_WIDGET(magenta_button)); - gtk_signal_connect (GTK_OBJECT (magenta_button), "toggled", - GTK_SIGNAL_FUNC (color_button_callback), NULL); - - yellow_button = gtk_toggle_button_new_with_label(_("Yellow")); - gtk_box_pack_start(GTK_BOX(output_color_vbox), yellow_button, TRUE, TRUE, 0); - gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(yellow_button), TRUE); - gtk_widget_show(GTK_WIDGET(yellow_button)); - gtk_signal_connect (GTK_OBJECT (yellow_button), "toggled", - GTK_SIGNAL_FUNC (color_button_callback), NULL); - - black_button = gtk_toggle_button_new_with_label(_("Black")); - gtk_box_pack_start(GTK_BOX(output_color_vbox), black_button, TRUE, TRUE, 0); - gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(black_button), TRUE); - gtk_widget_show(GTK_WIDGET(black_button)); - gtk_signal_connect (GTK_OBJECT (black_button), "toggled", - GTK_SIGNAL_FUNC (color_button_callback), NULL); - - red_button = gtk_toggle_button_new_with_label(_("Red")); - gtk_box_pack_start(GTK_BOX(output_color_vbox), red_button, TRUE, TRUE, 0); - gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(red_button), TRUE); - gtk_widget_show(GTK_WIDGET(red_button)); - gtk_signal_connect (GTK_OBJECT (red_button), "toggled", - GTK_SIGNAL_FUNC (color_button_callback), NULL); - - green_button = gtk_toggle_button_new_with_label(_("Green")); - gtk_box_pack_start(GTK_BOX(output_color_vbox), green_button, TRUE, TRUE,0); - gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(green_button), TRUE); - gtk_widget_show(GTK_WIDGET(green_button)); - gtk_signal_connect (GTK_OBJECT (green_button), "toggled", - GTK_SIGNAL_FUNC (color_button_callback), NULL); - - blue_button = gtk_toggle_button_new_with_label(_("Blue")); - gtk_box_pack_start(GTK_BOX(output_color_vbox), blue_button, TRUE, TRUE, 0); - gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(blue_button), TRUE); - gtk_widget_show(GTK_WIDGET(blue_button)); - gtk_signal_connect (GTK_OBJECT (blue_button), "toggled", - GTK_SIGNAL_FUNC (color_button_callback), NULL); - - color_adjustment_table = gtk_table_new(1, 1, FALSE); - gtk_table_set_col_spacings (GTK_TABLE (color_adjustment_table), 2); - 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); - gtk_scrolled_window_add_with_viewport(GTK_SCROLLED_WINDOW(scrolled_window), - color_adjustment_table); - gtk_table_attach_defaults(GTK_TABLE(table), scrolled_window, - 0, 2, 1, 2); - gtk_widget_show(scrolled_window); -} - -static void -create_image_settings_frame (void) -{ - GtkWidget *vbox; - GtkWidget *hbox; - GtkWidget *table; - GtkWidget *label; - GtkWidget *event_box; - GtkWidget *sep; - GSList *group; - gint i; - - create_color_adjust_window (); - - vbox = gtk_vbox_new (FALSE, 4); - gtk_container_set_border_width (GTK_CONTAINER (vbox), 4); - gtk_notebook_append_page (GTK_NOTEBOOK (notebook), vbox, - gtk_label_new (_("Output"))); - gtk_widget_show (vbox); - - table = gtk_table_new (1, 1, FALSE); - gtk_table_set_col_spacings (GTK_TABLE (table), 4); - gtk_box_pack_start (GTK_BOX (vbox), table, FALSE, FALSE, 0); - gtk_widget_show (table); - - 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_widget_show (event_box); - - /* - * Output type toggles. - */ - - table = gtk_table_new (1, 1, FALSE); - gtk_table_set_col_spacings (GTK_TABLE (table), 4); -/* gtk_table_set_row_spacing (GTK_TABLE (table), 2, 4); */ - gtk_box_pack_start (GTK_BOX (vbox), table, FALSE, FALSE, 0); - gtk_widget_show (table); - - 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_widget_show (event_box); - - label = gtk_label_new (_("Output Type:")); - gtk_container_add (GTK_CONTAINER (event_box), label); - gtk_widget_show (label); - - stpui_set_help_data(event_box, _("Select the desired output type")); - - group = NULL; - for (i = 0; i < output_type_count; i++) - group = stpui_create_radio_button(&(output_types[i]), group, table, 0, i, - output_type_callback); - - sep = gtk_hseparator_new (); - gtk_box_pack_start (GTK_BOX (vbox), sep, FALSE, FALSE, 0); - gtk_widget_show (sep); - - /* - * Color adjust button - */ - hbox = gtk_hbox_new (FALSE, 4); - gtk_box_pack_start (GTK_BOX (vbox), hbox, TRUE, TRUE, 0); - gtk_widget_show(hbox); - label = gtk_label_new(""); - gtk_box_pack_start(GTK_BOX(hbox), label, TRUE, TRUE, 0); - gtk_widget_show(label); - - adjust_color_button = gtk_button_new_with_label (_("Adjust Output...")); - gtk_misc_set_padding (GTK_MISC (GTK_BIN (adjust_color_button)->child), 4, 0); - gtk_box_pack_start (GTK_BOX (hbox), adjust_color_button, FALSE, FALSE, 0); - gtk_widget_show(adjust_color_button); - label = gtk_label_new(""); - gtk_box_pack_end(GTK_BOX(hbox), label, TRUE, TRUE, 0); - gtk_widget_show(label); - - stpui_set_help_data(adjust_color_button, - _("Adjust color balance, brightness, contrast, " - "saturation, and dither algorithm")); - gtk_signal_connect_object (GTK_OBJECT (adjust_color_button), "clicked", - GTK_SIGNAL_FUNC (gtk_widget_show), - GTK_OBJECT (color_adjust_dialog)); -} - -static void -create_units_frame (void) -{ - GtkWidget *vbox; - GtkWidget *table; - GtkWidget *label; - GtkWidget *event_box; - GSList *group; - gint i; - - units_hbox = gtk_hbox_new(FALSE, 0); - label = gtk_label_new(_("Size Units:")); - gtk_widget_show(label); - gtk_box_pack_start(GTK_BOX(units_hbox), label, TRUE, TRUE, 0); - units_label = gtk_label_new(_(" ")); - gtk_widget_show(units_label); - gtk_box_pack_start(GTK_BOX(units_hbox), units_label, TRUE, TRUE, 0); - gtk_widget_show(units_hbox); - - vbox = gtk_vbox_new (FALSE, 4); - gtk_container_set_border_width (GTK_CONTAINER (vbox), 4); - gtk_notebook_append_page (GTK_NOTEBOOK (notebook), vbox, units_hbox); - gtk_widget_show (vbox); - - /* - * The units toggles - */ - - table = gtk_table_new (1, 1, FALSE); - gtk_table_set_col_spacings (GTK_TABLE (table), 4); - gtk_box_pack_start (GTK_BOX (vbox), table, FALSE, FALSE, 0); - gtk_widget_show (table); - - event_box = gtk_event_box_new (); - gtk_table_attach (GTK_TABLE (table), event_box, 0, 1, 0, 1, - GTK_SHRINK | GTK_FILL, GTK_SHRINK | GTK_FILL, 0, 0); - gtk_widget_show (event_box); - - label = gtk_label_new (_("Units:")); - gtk_container_add (GTK_CONTAINER (event_box), label); - gtk_widget_show (label); - - stpui_set_help_data(event_box, - _("Select the base unit of measurement for printing")); - - group = NULL; - for (i = 0; i < unit_count; i++) - { - unit_t *unit = &(units[i]); - 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, gettext(unit->help)); - gtk_signal_connect(GTK_OBJECT(unit->checkbox), "toggled", - GTK_SIGNAL_FUNC(unit_callback), (gpointer) i); - } -} - -/* - * create_main_window() - */ -static void -create_main_window (void) -{ - - set_current_printer(); - manufacturer = stp_printer_get_manufacturer(stp_get_printer(pv->v)); - /* - * Create the various dialog components. Note that we're not - * actually initializing the values at this point; that will be done after - * the UI is fully created. - */ - - stpui_help_init(); - - create_top_level_structure (); - - create_preview (); - create_printer_settings_frame (); - create_units_frame(); - create_paper_size_frame(); - create_copy_number_frame(); - create_positioning_frame (); - create_scaling_frame (); - create_image_settings_frame (); - - /* - * Now actually set up the correct values in the dialog - */ - - do_update_thumbnail = 1; - build_printer_combo (); - plist_callback (NULL, (gpointer) stpui_plist_current); - update_adjusted_thumbnail (TRUE); - - gtk_widget_show (print_dialog); -} - -static void -set_entry_value(GtkWidget *entry, double value, int block) -{ - gchar s[255]; - gdouble unit_scaler = units[pv->unit].scale; - const gchar *format = units[pv->unit].format; - - g_snprintf(s, sizeof(s), format, value / unit_scaler); - if (block) - gtk_signal_handler_block_by_data (GTK_OBJECT (entry), NULL); - gtk_entry_set_text (GTK_ENTRY (entry), s); - if (block) - gtk_signal_handler_unblock_by_data (GTK_OBJECT (entry), NULL); -} - -static void -reset_preview(void) -{ - if (!suppress_preview_reset) - { - stpui_enable_help(); - buttons_pressed = preview_active = 0; - } -} - -static void -invalidate_preview_thumbnail (void) -{ - preview_valid = FALSE; -} - -static void -invalidate_frame (void) -{ - frame_valid = FALSE; -} - -static void -compute_scaling_limits(gdouble *min_ppi_scaling, gdouble *max_ppi_scaling) -{ - if (auto_paper_size) - { - *min_ppi_scaling = - FINCH * (gdouble) image_width / (gdouble) printable_width; - } - else - { - gdouble min_ppi_scaling1 = - FINCH * (gdouble) image_width / (gdouble) printable_width; - gdouble min_ppi_scaling2 = - FINCH * (gdouble) image_height / (gdouble) printable_height; - - if (min_ppi_scaling1 > min_ppi_scaling2) - *min_ppi_scaling = min_ppi_scaling1; - else - *min_ppi_scaling = min_ppi_scaling2; - } - - *max_ppi_scaling = *min_ppi_scaling * 100 / minimum_image_percent; -} - -/* - * scaling_update() - Update the scaling scale using the slider. - */ -static void -scaling_update (GtkAdjustment *adjustment) -{ - reset_preview (); - - if (pv->scaling != adjustment->value) - { - invalidate_preview_thumbnail (); - if (GTK_TOGGLE_BUTTON (scaling_ppi)->active) - pv->scaling = -adjustment->value; - else - pv->scaling = adjustment->value; - - suppress_scaling_adjustment = TRUE; - preview_update (); - suppress_scaling_adjustment = FALSE; - } -} - -/* - * scaling_callback() - Update the scaling scale using radio buttons. - */ -static void -scaling_callback (GtkWidget *widget) -{ - gdouble max_ppi_scaling; - gdouble min_ppi_scaling; - gdouble current_scale; - - reset_preview (); - - if (suppress_scaling_callback) - return; - - compute_scaling_limits(&min_ppi_scaling, &max_ppi_scaling); - - if (widget == scaling_ppi) - { - if (! GTK_TOGGLE_BUTTON (scaling_ppi)->active) - return; - - GTK_ADJUSTMENT (scaling_adjustment)->lower = min_ppi_scaling; - GTK_ADJUSTMENT (scaling_adjustment)->upper = max_ppi_scaling; - - /* - * Compute the correct PPI to create an image of the same size - * as the one measured in percent - */ - current_scale = GTK_ADJUSTMENT (scaling_adjustment)->value; - GTK_ADJUSTMENT (scaling_adjustment)->value = - min_ppi_scaling / (current_scale / 100); - pv->scaling = 0.0; - } - else if (widget == scaling_percent) - { - gdouble new_percent; - - if (! GTK_TOGGLE_BUTTON (scaling_percent)->active) - return; - - current_scale = GTK_ADJUSTMENT (scaling_adjustment)->value; - GTK_ADJUSTMENT (scaling_adjustment)->lower = minimum_image_percent; - GTK_ADJUSTMENT (scaling_adjustment)->upper = 100.0; - - new_percent = 100 * min_ppi_scaling / current_scale; - - if (new_percent > 100) - new_percent = 100; - if (new_percent < minimum_image_percent) - new_percent = minimum_image_percent; - - GTK_ADJUSTMENT (scaling_adjustment)->value = new_percent; - pv->scaling = 0.0; - } - else if (widget == scaling_image) - { - gdouble yres = image_yres; - - invalidate_preview_thumbnail (); - - GTK_ADJUSTMENT (scaling_adjustment)->lower = min_ppi_scaling; - GTK_ADJUSTMENT (scaling_adjustment)->upper = max_ppi_scaling; - - if (yres < min_ppi_scaling) - yres = min_ppi_scaling; - if (yres > max_ppi_scaling) - yres = max_ppi_scaling; - - gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (scaling_ppi), TRUE); - GTK_ADJUSTMENT (scaling_adjustment)->value = yres; - pv->scaling = 0.0; - } - - if (widget == scaling_ppi || widget == scaling_percent) - suppress_preview_update++; - gtk_adjustment_changed (GTK_ADJUSTMENT (scaling_adjustment)); - gtk_adjustment_value_changed (GTK_ADJUSTMENT (scaling_adjustment)); - if (auto_paper_size) - set_media_size(stp_get_string_parameter(pv->v, "PageSize")); - if (widget == scaling_ppi || widget == scaling_percent) - suppress_preview_update--; -} - -/**************************************************************************** - * - * plist_build_combo - * - ****************************************************************************/ -static void -plist_build_combo (GtkWidget *combo, /* I - Combo widget */ - GtkWidget *label, - stp_string_list_t *items, /* I - Menu items */ - int active, - const gchar *cur_item, /* I - Current item */ - const gchar *def_value, /* I - default item */ - GtkSignalFunc callback, /* I - Callback */ - gint *callback_id, /* IO - Callback ID (init to -1) */ - int (*check_func)(const char *string), - gpointer data) -{ - gint i; /* Looping var */ - GList *list = 0; - gint num_items = 0; - GtkEntry *entry = GTK_ENTRY (GTK_COMBO (combo)->entry); - - if (check_func && items) - { - stp_string_list_t *new_items = stp_string_list_create(); - num_items = stp_string_list_count(items); - for (i = 0; i < num_items; i++) - { - stp_param_string_t *param = stp_string_list_param(items, i); - if ((*check_func)(param->name)) - stp_string_list_add_string(new_items, param->name, param->text); - } - items = new_items; - } - - if (items) - num_items = stp_string_list_count(items); - - if (*callback_id != -1) - gtk_signal_disconnect (GTK_OBJECT (entry), *callback_id); - gtk_entry_set_editable (entry, FALSE); - - if (!active || num_items == 0) - { - list = g_list_append (list, _("Standard")); - gtk_combo_set_popdown_strings (GTK_COMBO (combo), list); - *callback_id = -1; - gtk_widget_set_sensitive (combo, FALSE); - gtk_widget_hide (combo); - if (label) - gtk_widget_hide(label); - if (check_func && items) - stp_string_list_destroy(items); - return; - } - - for (i = 0; i < num_items; i ++) - list = g_list_append(list, g_strdup(stp_string_list_param(items, i)->text)); - - gtk_combo_set_popdown_strings (GTK_COMBO (combo), list); - - if (cur_item) - for (i = 0; i < num_items; i ++) - if (strcmp(stp_string_list_param(items, i)->name, cur_item) == 0) - break; - - if (i >= num_items && def_value) - for (i = 0; i < num_items; i ++) - if (strcmp(stp_string_list_param(items, i)->name, def_value) == 0) - break; - - if (i >= num_items) - i = 0; - - gtk_entry_set_text (entry, stp_string_list_param(items, i)->text); - - gtk_combo_set_value_in_list (GTK_COMBO (combo), TRUE, FALSE); - gtk_widget_set_sensitive (combo, TRUE); - gtk_widget_show (combo); - if (label) - gtk_widget_show(label); - - *callback_id = gtk_signal_connect (GTK_OBJECT (entry), "changed", callback, - data); - if (check_func && items) - stp_string_list_destroy(items); -} - -void -stpui_set_image_dimensions(gint width, gint height) -{ - image_true_width = width; - image_true_height = height; -} - -void -stpui_set_image_resolution(gdouble xres, gdouble yres) -{ - image_xres = xres; - image_yres = yres; -} - -gint -stpui_compute_orientation(void) -{ - if (auto_paper_size || - (printable_width >= printable_height && - image_true_width >= image_true_height) || - (printable_height >= printable_width && - image_true_height >= image_true_width)) - return ORIENT_PORTRAIT; - else - return ORIENT_LANDSCAPE; -} - -static void -compute_printable_region(void) -{ - stp_get_media_size(pv->v, &paper_width, &paper_height); - stp_get_imageable_area(pv->v, &left, &right, &bottom, &top); - printable_width = right - left; - printable_height = bottom - top; -} - -static void -set_orientation(int orientation) -{ - compute_printable_region(); - pv->orientation = orientation; - if (orientation == ORIENT_AUTO) - orientation = stpui_compute_orientation(); - physical_orientation = orientation; - switch (orientation) - { - case ORIENT_PORTRAIT: - case ORIENT_UPSIDEDOWN: - image_height = image_true_height; - image_width = image_true_width; - preview_thumbnail_h = thumbnail_h; - preview_thumbnail_w = thumbnail_w; - break; - case ORIENT_LANDSCAPE: - case ORIENT_SEASCAPE: - image_height = image_true_width; - image_width = image_true_height; - preview_thumbnail_h = thumbnail_w; - preview_thumbnail_w = thumbnail_h; - break; - } - update_adjusted_thumbnail(FALSE); -} - -static void -position_button_callback(GtkWidget *widget, gpointer data) -{ - reset_preview(); - pv->invalid_mask |= (gint) data; - preview_update (); -} - -/* - * position_callback() - callback for position entry widgets - */ -static void -position_callback (GtkWidget *widget) -{ - gdouble new_printed_value = atof (gtk_entry_get_text (GTK_ENTRY (widget))); - gint new_value = SCALE(new_printed_value, units[pv->unit].scale); - - reset_preview (); - suppress_preview_update++; - - if (widget == top_entry) - stp_set_top(pv->v, new_value); -/* - else if (widget == bottom_entry) - stp_set_top(pv->v, new_value - print_height); -*/ - else if (widget == bottom_border_entry) - stp_set_top (pv->v, paper_height - print_height - new_value); - else if (widget == left_entry) - stp_set_left (pv->v, new_value); -/* - else if (widget == right_entry) - stp_set_left(pv->v, new_value - print_width); -*/ - else if (widget == right_border_entry) - stp_set_left (pv->v, paper_width - print_width - new_value); - else if (widget == width_entry || widget == height_entry) - { - gboolean was_percent = (pv->scaling >= 0); - if (pv->scaling >= 0) - { - gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (scaling_ppi), TRUE); - scaling_callback (scaling_ppi); - } - if (widget == width_entry) - GTK_ADJUSTMENT (scaling_adjustment)->value = - ((gdouble) image_width) / (new_value / FINCH); - else - GTK_ADJUSTMENT (scaling_adjustment)->value = - ((gdouble) image_height) / (new_value / FINCH); - gtk_adjustment_value_changed (GTK_ADJUSTMENT (scaling_adjustment)); - if (was_percent) - { - gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(scaling_percent),TRUE); - gtk_adjustment_value_changed(GTK_ADJUSTMENT (scaling_adjustment)); - } - } - - suppress_preview_update--; - preview_update (); -} - -static void -set_adjustment_active(option_t *opt, gboolean active, gboolean do_toggle) -{ - GtkObject *adj = opt->info.flt.adjustment; - if (do_toggle) - gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(opt->checkbox), active); - gtk_widget_set_sensitive - (GTK_WIDGET (SCALE_ENTRY_LABEL (adj)), active); - gtk_widget_set_sensitive - (GTK_WIDGET (SCALE_ENTRY_SCALE (adj)), active); - gtk_widget_set_sensitive - (GTK_WIDGET (SCALE_ENTRY_SPINBUTTON (adj)), active); -} - -static void -set_combo_active(option_t *opt, gboolean active, gboolean do_toggle) -{ - if (do_toggle) - gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(opt->checkbox), active); - gtk_widget_set_sensitive(GTK_WIDGET(opt->info.list.combo), active); - gtk_widget_set_sensitive(GTK_WIDGET(opt->info.list.label), active); -} - -static void -set_curve_active(option_t *opt, gboolean active, gboolean do_toggle) -{ - if (do_toggle) - gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(opt->checkbox), active); - gtk_widget_set_sensitive(GTK_WIDGET(opt->info.curve.button), active); - gtk_widget_set_sensitive(GTK_WIDGET(opt->info.curve.label), active); - if (active) - { - if (opt->info.curve.is_visible) - gtk_widget_show(GTK_WIDGET(opt->info.curve.dialog)); - } - else - gtk_widget_hide(GTK_WIDGET(opt->info.curve.dialog)); -} - -static void -set_bool_active(option_t *opt, gboolean active, gboolean do_toggle) -{ - if (do_toggle) - gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(opt->checkbox), active); - gtk_widget_set_sensitive(GTK_WIDGET(opt->info.bool.checkbox), active); -} - -static void -do_color_updates (void) -{ - int i; - for (i = 0; i < current_option_count; i++) - { - option_t *opt = &(current_options[i]); - if (opt->fast_desc->p_level <= MAXIMUM_PARAMETER_LEVEL) - { - switch (opt->fast_desc->p_type) - { - case STP_PARAMETER_TYPE_DOUBLE: - if (stp_check_float_parameter(pv->v, opt->fast_desc->name, - STP_PARAMETER_INACTIVE)) - gtk_adjustment_set_value - (GTK_ADJUSTMENT(opt->info.flt.adjustment), - stp_get_float_parameter(pv->v, opt->fast_desc->name)); - if (stp_check_float_parameter(pv->v, opt->fast_desc->name, - STP_PARAMETER_ACTIVE) || - opt->fast_desc->is_mandatory) - set_adjustment_active(opt, TRUE, TRUE); - else - set_adjustment_active(opt, FALSE, TRUE); - break; - case STP_PARAMETER_TYPE_DIMENSION: - if (stp_check_dimension_parameter(pv->v, opt->fast_desc->name, - STP_PARAMETER_INACTIVE)) - { - gdouble unit_scaler = units[pv->unit].scale; - gtk_adjustment_set_value - (GTK_ADJUSTMENT(opt->info.flt.adjustment), - (stp_get_dimension_parameter(pv->v, opt->fast_desc->name) / - unit_scaler)); - } - if (stp_check_dimension_parameter(pv->v, opt->fast_desc->name, - STP_PARAMETER_ACTIVE) || - opt->fast_desc->is_mandatory) - set_adjustment_active(opt, TRUE, TRUE); - else - set_adjustment_active(opt, FALSE, TRUE); - break; - case STP_PARAMETER_TYPE_CURVE: - if (stp_check_curve_parameter(pv->v, opt->fast_desc->name, - STP_PARAMETER_ACTIVE) || - opt->fast_desc->is_mandatory) - set_curve_active(opt, TRUE, TRUE); - else - set_curve_active(opt, FALSE, TRUE); - break; - case STP_PARAMETER_TYPE_STRING_LIST: - if (strcmp(opt->fast_desc->name, "PageSize") == 0) - build_page_size_combo(opt); - else if (stp_check_string_parameter(pv->v, opt->fast_desc->name, - STP_PARAMETER_INACTIVE)) - plist_build_combo(opt->info.list.combo, opt->info.list.label, - 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.callback_id), - NULL, opt); - if (stp_check_string_parameter(pv->v, opt->fast_desc->name, - STP_PARAMETER_ACTIVE) || - opt->fast_desc->is_mandatory) - set_combo_active(opt, TRUE, TRUE); - else - set_combo_active(opt, FALSE, TRUE); - break; - case STP_PARAMETER_TYPE_BOOLEAN: - if (stp_check_boolean_parameter(pv->v, opt->fast_desc->name, - STP_PARAMETER_INACTIVE)) - gtk_toggle_button_set_active - (GTK_TOGGLE_BUTTON(opt->info.bool.checkbox), - stp_get_boolean_parameter(pv->v, opt->fast_desc->name)); - if (stp_check_boolean_parameter(pv->v, opt->fast_desc->name, - STP_PARAMETER_ACTIVE) || - opt->fast_desc->is_mandatory) - set_bool_active(opt, TRUE, TRUE); - else - set_bool_active(opt, FALSE, TRUE); - break; - default: - break; - } - } - } - update_adjusted_thumbnail (TRUE); -} - -static void -update_options(void) -{ - gtk_widget_hide(page_size_table); - gtk_widget_hide(printer_features_table); - gtk_widget_hide(color_adjustment_table); - populate_options(pv->v); - populate_option_table(page_size_table, STP_PARAMETER_CLASS_CORE); - populate_option_table(printer_features_table, STP_PARAMETER_CLASS_FEATURE); - populate_option_table(color_adjustment_table, STP_PARAMETER_CLASS_OUTPUT); - gtk_widget_show(page_size_table); - gtk_widget_show(printer_features_table); - gtk_widget_show(color_adjustment_table); - set_options_active(NULL); -} - -static void -update_standard_print_command(void) -{ - char *label_text = - stpui_build_standard_print_command(pv, stp_get_printer(pv->v)); - gtk_entry_set_text(GTK_ENTRY(standard_cmd_entry), label_text); - g_free(label_text); -} - -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; - suppress_preview_update++; - set_orientation(pv->orientation); - invalidate_preview_thumbnail (); - preview_update (); - update_standard_print_command(); - - if (pv->scaling < 0) - { - gdouble tmp = -pv->scaling; - gdouble max_ppi_scaling; - gdouble min_ppi_scaling; - - compute_scaling_limits(&min_ppi_scaling, &max_ppi_scaling); - - gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (scaling_ppi), TRUE); - GTK_ADJUSTMENT (scaling_adjustment)->lower = min_ppi_scaling; - GTK_ADJUSTMENT (scaling_adjustment)->upper = max_ppi_scaling; - GTK_ADJUSTMENT (scaling_adjustment)->value = tmp; - gtk_adjustment_changed (GTK_ADJUSTMENT (scaling_adjustment)); - gtk_adjustment_value_changed (GTK_ADJUSTMENT (scaling_adjustment)); - } - else - { - gdouble tmp = pv->scaling; - - gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (scaling_percent), TRUE); - GTK_ADJUSTMENT (scaling_adjustment)->lower = minimum_image_percent; - GTK_ADJUSTMENT (scaling_adjustment)->upper = 100.0; - GTK_ADJUSTMENT (scaling_adjustment)->value = tmp; - gtk_signal_emit_by_name (scaling_adjustment, "changed"); - 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") && - strcmp(output_types[i].value, - stp_get_string_parameter(pv->v, "PrintingMode")) == 0) - gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(output_types[i].button), - TRUE); - } - - /* - * Now get option parameters. - */ - - update_options(); - do_color_updates (); - - gtk_option_menu_set_history (GTK_OPTION_MENU (orientation_menu), - pv->orientation + 1); - - gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(units[pv->unit].checkbox), - TRUE); - gtk_label_set_text(GTK_LABEL(units_label), units[pv->unit].name); - suppress_preview_update--; - preview_update (); -} - -static void -copy_count_callback(GtkAdjustment *adjustment, gpointer data) -{ - gint copy_count = (gint) adjustment->value; - stpui_plist_set_copy_count(pv, copy_count); - update_standard_print_command(); -} - -static void -auto_paper_size_callback(GtkWidget *widget, gpointer data) -{ - auto_paper_size = - gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(auto_paper_size_button)); - pv->auto_size_roll_feed_paper = auto_paper_size; - set_orientation(pv->orientation); - do_all_updates(); -} - -static void -setup_auto_paper_size(void) -{ - const stp_papersize_t *ps = - stp_get_papersize_by_name(stp_get_string_parameter(pv->v, "PageSize")); - if (ps->height == 0 && ps->width != 0) /* Implies roll feed */ - { - gtk_signal_handler_block_by_data(GTK_OBJECT(auto_paper_size_button), - NULL); - gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(auto_paper_size_button), - pv->auto_size_roll_feed_paper); - gtk_widget_show(auto_paper_size_button); - gtk_signal_handler_unblock_by_data(GTK_OBJECT(auto_paper_size_button), - NULL); - } - else - { - gtk_widget_hide(auto_paper_size_button); - auto_paper_size = 0; - } -} - -static void -queue_callback (GtkWidget *widget, - gpointer data) -{ - int i; - int count = stp_string_list_count(stpui_system_print_queues); - const gchar *result = - gtk_entry_get_text(GTK_ENTRY(GTK_COMBO(queue_combo)->entry)); - for (i = 0; i < count; i++) - { - const stp_param_string_t *s = - stp_string_list_param(stpui_system_print_queues, i); - if (!strcmp(result, s->text)) - { - stpui_plist_set_queue_name(pv, s->name); - do_all_updates(); - return; - } - } -} - -static void -setup_callback (GtkWidget *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); - else if (widget == file_entry) - { - stpui_plist_set_output_filename(pv, new_value); - gtk_file_selection_set_filename - (GTK_FILE_SELECTION (file_browser), - gtk_entry_get_text (GTK_ENTRY (file_entry))); - } -} - -/* - * plist_callback() - Update the current system printer. - */ -static void -plist_callback (GtkWidget *widget, - gpointer data) -{ - gint i; - char *tmp; - - suppress_preview_update++; - invalidate_frame (); - invalidate_preview_thumbnail (); - reset_preview (); - - if (widget) - { - const gchar *result = - gtk_entry_get_text(GTK_ENTRY(GTK_COMBO(printer_combo)->entry)); - - for (i = 0; i < stpui_plist_count; i++) - { - if (! strcmp (result, stp_string_list_param(printer_list, i)->text)) - { - stpui_plist_current = i; - break; - } - } - } - else - { - stpui_plist_current = (gint) data; - } - - set_current_printer(); - build_queue_combo(); - manufacturer = stp_printer_get_manufacturer(stp_get_printer(pv->v)); - build_printer_driver_clist(); - - if (strcmp(stp_get_driver(pv->v), "") != 0) - tmp_printer = stp_get_printer(pv->v); - - 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)); - gtk_entry_set_text(GTK_ENTRY(standard_cmd_entry), tmp); - stp_free(tmp); - gtk_entry_set_text(GTK_ENTRY(custom_command_entry), - stpui_plist_get_custom_command(pv)); - gtk_spin_button_set_value(GTK_SPIN_BUTTON(copy_count_spin_button), - (gfloat) stpui_plist_get_copy_count(pv)); - do_all_updates(); - - setup_update (); - do_all_updates(); - suppress_preview_update--; - update_adjusted_thumbnail(TRUE); - preview_update (); -} - -static void -show_all_paper_sizes_callback(GtkWidget *widget, gpointer data) -{ - int i; - stpui_show_all_paper_sizes = - gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(widget)); - for (i = 0; i < current_option_count; i++) - { - option_t *option = &(current_options[i]); - if (option->fast_desc && - strcmp(option->fast_desc->name, "PageSize") == 0) - { - build_a_combo(option); - break; - } - } -} - -static void -custom_media_size_callback(GtkWidget *widget, - gpointer data) -{ - gint width_limit, height_limit; - gint min_width_limit, min_height_limit; - gdouble new_printed_value = atof(gtk_entry_get_text(GTK_ENTRY(widget))); - gint new_value = SCALE(new_printed_value, units[pv->unit].scale); - invalidate_frame (); - invalidate_preview_thumbnail (); - reset_preview (); - - stp_get_size_limit(pv->v, &width_limit, &height_limit, - &min_width_limit, &min_height_limit); - if (widget == custom_size_width) - { - if (new_value < min_width_limit) - new_value = min_width_limit; - else if (new_value > width_limit) - new_value = width_limit; - stp_set_page_width (pv->v, new_value); - } - else - { - if (new_value < min_height_limit) - new_value = min_height_limit; - else if (new_value > height_limit) - new_value = height_limit; - stp_set_page_height (pv->v, new_value); - } - set_entry_value (widget, new_value, 0); - preview_update (); -} - - -/* - * media_size_callback() - Update the current media size. - */ -static void -set_media_size(const gchar *new_media_size) -{ - static int setting_media_size = 0; - const stp_papersize_t *pap = stp_get_papersize_by_name (new_media_size); - - if (setting_media_size) - return; - setting_media_size++; - - if (pap) - { - gint size; - int old_width = stp_get_page_width(pv->v); - int old_height = stp_get_page_height(pv->v); - int need_preview_update = 0; - - if (! stpui_show_all_paper_sizes && - (pap->paper_unit == PAPERSIZE_METRIC_EXTENDED || - pap->paper_unit == PAPERSIZE_ENGLISH_EXTENDED)) - { - int i; - stp_parameter_t desc; - stp_describe_parameter(pv->v, "PageSize", &desc); - stp_set_string_parameter(pv->v, "PageSize", desc.deflt.str); - pap = stp_get_papersize_by_name(desc.deflt.str); - stp_parameter_description_destroy(&desc); - for (i = 0; i < current_option_count; i++) - { - option_t *option = &(current_options[i]); - if (option->fast_desc && - strcmp(option->fast_desc->name, "PageSize") == 0) - { - build_a_combo(option); - break; - } - } - } - - if (pap->width == 0) - { - int max_w, max_h, min_w, min_h; - stp_get_size_limit(pv->v, &max_w, &max_h, &min_w, &min_h); - size = old_width; - if (size < min_w) - size = min_w; - else if (size > max_w) - size = max_w; - gtk_widget_set_sensitive (GTK_WIDGET (custom_size_width), TRUE); - gtk_entry_set_editable (GTK_ENTRY (custom_size_width), TRUE); - } - else - { - size = pap->width; - gtk_widget_set_sensitive (GTK_WIDGET (custom_size_width), FALSE); - gtk_entry_set_editable (GTK_ENTRY (custom_size_width), FALSE); - } - if (size != old_width) - { - need_preview_update = 1; - set_entry_value (custom_size_width, size, 0); - stp_set_page_width (pv->v, size); - } - - setup_auto_paper_size(); - if (pap->height == 0) - { - int max_w, max_h, min_w, min_h; - stp_get_size_limit(pv->v, &max_w, &max_h, &min_w, &min_h); - if (auto_paper_size) - { - int l, r, b, t; - stp_set_page_height(pv->v, 0); - old_height = 0; - stp_get_imageable_area(pv->v, &l, &r, &b, &t); - gtk_widget_set_sensitive(GTK_WIDGET(custom_size_height), FALSE); - gtk_entry_set_editable(GTK_ENTRY(custom_size_height), FALSE); - size = print_height; - } - else - { - gtk_widget_set_sensitive (GTK_WIDGET (custom_size_height), TRUE); - gtk_entry_set_editable (GTK_ENTRY (custom_size_height), TRUE); - size = old_height; - } - if (size < min_h) - size = min_h; - else if (size > max_h) - size = max_h; - } - else - { - size = pap->height; - gtk_widget_set_sensitive(GTK_WIDGET (custom_size_height), FALSE); - gtk_entry_set_editable (GTK_ENTRY (custom_size_height), FALSE); - } - if (size != old_height) - { - need_preview_update = 1; - set_entry_value (custom_size_height, size, 0); - stp_set_page_height (pv->v, size); - } - if (need_preview_update) - { - invalidate_preview_thumbnail(); - invalidate_frame(); - preview_update(); - } - } - setting_media_size--; -} - -static gboolean -refresh_all_options(gpointer data) -{ - do_all_updates(); - do_all_updates(); /* Update twice to pick up cascading changes */ - return FALSE; -} - -static void -combo_callback(GtkWidget *widget, gpointer data) -{ - option_t *option = (option_t *)data; - const gchar *new_value = - 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); - if (value && new_value) - { - 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(); - } - } -} - -/* - * orientation_callback() - Update the current media size. - */ -static void -orientation_callback (GtkWidget *widget, - gpointer data) -{ - reset_preview (); - - if (pv->orientation != (gint) data) - { - invalidate_preview_thumbnail (); - set_orientation((gint) data); - update_adjusted_thumbnail(TRUE); - preview_update (); - } -} - -/* - * output_type_callback() - Update the current output type. - */ -static void -output_type_callback (GtkWidget *widget, - gpointer data) -{ - reset_preview (); - - if (GTK_TOGGLE_BUTTON (widget)->active) - { - if (strcmp((const char *) data, "BW") == 0) - gtk_widget_hide(output_color_vbox); - else - gtk_widget_show(output_color_vbox); - stp_set_string_parameter(pv->v, "PrintingMode", (const char *) data); - invalidate_preview_thumbnail (); - update_adjusted_thumbnail (TRUE); - set_options_active(NULL); - preview_update (); - do_all_updates(); - } -} - -static void -command_type_callback(GtkWidget *widget, gpointer data) -{ - if (strcmp((const char *) data, "Standard") == 0) - { - gtk_widget_set_sensitive(standard_cmd_entry, TRUE); - gtk_widget_set_sensitive(queue_combo, TRUE); - gtk_widget_set_sensitive(file_entry, FALSE); - gtk_entry_set_editable(GTK_ENTRY(file_entry), FALSE); - gtk_widget_set_sensitive(custom_command_entry, FALSE); - gtk_entry_set_editable(GTK_ENTRY(custom_command_entry), FALSE); - gtk_widget_hide(GTK_WIDGET(file_browser)); - gtk_widget_set_sensitive(file_button, FALSE); - gtk_widget_set_sensitive(copy_count_spin_button, TRUE); - stpui_plist_set_command_type(pv, COMMAND_TYPE_DEFAULT); - } - else if (strcmp((const char *) data, "Custom") == 0) - { - gtk_widget_set_sensitive(standard_cmd_entry, FALSE); - gtk_widget_set_sensitive(queue_combo, FALSE); - gtk_widget_set_sensitive(file_entry, FALSE); - gtk_entry_set_editable(GTK_ENTRY(file_entry), FALSE); - gtk_widget_set_sensitive(custom_command_entry, TRUE); - gtk_entry_set_editable(GTK_ENTRY(custom_command_entry), TRUE); - gtk_widget_hide(GTK_WIDGET(file_browser)); - gtk_widget_set_sensitive(file_button, FALSE); - gtk_widget_set_sensitive(copy_count_spin_button, FALSE); - stpui_plist_set_command_type(pv, COMMAND_TYPE_CUSTOM); - } - else if (strcmp((const char *) data, "File") == 0) - { - gtk_widget_set_sensitive(standard_cmd_entry, FALSE); - gtk_widget_set_sensitive(queue_combo, FALSE); - gtk_widget_set_sensitive(file_entry, TRUE); - gtk_entry_set_editable(GTK_ENTRY(file_entry), TRUE); - gtk_widget_set_sensitive(custom_command_entry, FALSE); - gtk_entry_set_editable(GTK_ENTRY(custom_command_entry), FALSE); - gtk_widget_set_sensitive(file_button, TRUE); - gtk_widget_set_sensitive(copy_count_spin_button, FALSE); - stpui_plist_set_command_type(pv, COMMAND_TYPE_FILE); - } -} - -static void -set_all_entry_values(void) -{ - set_entry_value (top_entry, (stp_get_top (pv->v)), 1); - set_entry_value (left_entry, (stp_get_left (pv->v)), 1); -/* - set_entry_value (bottom_entry, (top + stp_get_top(pv->v) + print_height), 1); -*/ - set_entry_value (bottom_border_entry, - (paper_height - (stp_get_top (pv->v) + print_height)), 1); -/* - set_entry_value (right_entry, (stp_get_left(pv->v) + print_width), 1); -*/ - set_entry_value (right_border_entry, - (paper_width - (stp_get_left (pv->v) + print_width)), 1); - set_entry_value (width_entry, print_width, 1); - set_entry_value (height_entry, print_height, 1); - set_entry_value (custom_size_width, stp_get_page_width (pv->v), 1); - set_entry_value (custom_size_height, stp_get_page_height (pv->v), 1); -} - -/* - * unit_callback() - Update the current unit. - */ -static void -unit_callback (GtkWidget *widget, - gpointer data) -{ - reset_preview (); - - if (GTK_TOGGLE_BUTTON (widget)->active) - { - pv->unit = (gint) data; - gtk_label_set_text(GTK_LABEL(units_label), units[pv->unit].name); - set_all_entry_values(); - update_options(); - do_color_updates(); - } -} - -static void -destroy_dialogs (void) -{ - int i; - gtk_widget_destroy (color_adjust_dialog); - gtk_widget_destroy (setup_dialog); - gtk_widget_destroy (print_dialog); - gtk_widget_destroy (new_printer_dialog); - gtk_widget_destroy (about_dialog); - for (i = 0; i < current_option_count; i++) - { - if (current_options[i].fast_desc->p_type == STP_PARAMETER_TYPE_CURVE && - current_options[i].info.curve.dialog) - gtk_widget_destroy(current_options[i].info.curve.dialog); - } -} - -static void -dialogs_set_sensitive (gboolean sensitive) -{ - int i; - gtk_widget_set_sensitive (color_adjust_dialog, sensitive); - gtk_widget_set_sensitive (setup_dialog, sensitive); - gtk_widget_set_sensitive (print_dialog, sensitive); - gtk_widget_set_sensitive (new_printer_dialog, sensitive); - gtk_widget_set_sensitive (about_dialog, sensitive); - for (i = 0; i < current_option_count; i++) - { - if (current_options[i].fast_desc->p_type == STP_PARAMETER_TYPE_CURVE && - current_options[i].info.curve.dialog) - gtk_widget_set_sensitive(current_options[i].info.curve.dialog, - sensitive); - } -} - -/* - * 'print_callback()' - Start the print. - */ -static void -print_callback (void) -{ - if (stpui_plist_get_command_type(pv) == COMMAND_TYPE_FILE && - strlen(stpui_plist_get_output_filename(pv)) == 0) - { - dialogs_set_sensitive (FALSE); - exit_after_file_ok = 1; - gtk_widget_show (file_browser); - } - else - { - runme = TRUE; - destroy_dialogs (); - } -} - -/* - * printandsave_callback() - - */ -static void -printandsave_callback (void) -{ - saveme = TRUE; - print_callback(); -} - -static void -about_callback (void) -{ - gtk_widget_show (about_dialog); -} - -/* - * save_callback() - save settings, don't destroy dialog - */ -static void -save_callback (void) -{ - reset_preview (); - stpui_printrc_save (); -} - -/* - * setup_update() - update widgets in the setup dialog - */ -static void -setup_update (void) -{ - GtkAdjustment *adjustment; - gint idx = 0; - gint i; - gchar *tmp; - stp_parameter_t desc; - const char *ppd_file_name = stp_get_file_parameter(pv->v, "PPDFile"); - - for (i = 0; i < GTK_CLIST(manufacturer_clist)->rows; i++) - { - (void) gtk_clist_get_text(GTK_CLIST(manufacturer_clist), i, 0, &tmp); - if (tmp && strcmp(manufacturer, tmp) == 0) - { - idx = i; - break; - } - } - gtk_clist_select_row(GTK_CLIST(manufacturer_clist), idx, 0); - - idx = stp_get_printer_index_by_driver (stp_get_driver (pv->v)); - - idx = gtk_clist_find_row_from_data(GTK_CLIST(printer_driver), - (gpointer) idx); -/* - if (idx >= 0) - idx = 0; -*/ - gtk_clist_select_row (GTK_CLIST (printer_driver), idx, 0); - stp_describe_parameter(pv->v, "ModelName", &desc); - if (desc.p_type == STP_PARAMETER_TYPE_STRING_LIST && desc.is_active && - desc.deflt.str) - { - const char *extra_printer_model = desc.deflt.str; - char *label_text = - g_malloc(strlen(gettext (stp_printer_get_long_name (tmp_printer))) + - 2 + /* " (" */ - strlen(extra_printer_model) + - 2); /* ")" + null terminator */ - strcpy(label_text, extra_printer_model); - strcat(label_text, " ("); - strcat(label_text, gettext (stp_printer_get_long_name (tmp_printer))); - strcat(label_text, ")"); - gtk_label_set_text (GTK_LABEL (printer_model_label), label_text); - g_free(label_text); - } - else - { - gtk_label_set_text (GTK_LABEL (printer_model_label), - gettext (stp_printer_get_long_name (tmp_printer))); - } - stp_parameter_description_destroy(&desc); - - if (ppd_file_name) - gtk_entry_set_text (GTK_ENTRY (ppd_file), ppd_file_name); - else - gtk_entry_set_text (GTK_ENTRY (ppd_file), ""); - ppd_file_callback(ppd_file, NULL); - - if (stp_parameter_find_in_settings(pv->v, "PPDFile")) - { - gtk_widget_show (ppd_box); - gtk_widget_show (ppd_label); - gtk_widget_show (ppd_model_label); - gtk_widget_show (ppd_model); - } - else - { - gtk_widget_hide (ppd_box); - gtk_widget_hide (ppd_label); - gtk_widget_hide (ppd_model_label); - gtk_widget_hide (ppd_model); - } - gtk_entry_set_text (GTK_ENTRY (custom_command_entry), - stpui_plist_get_custom_command (pv)); - - adjustment = GTK_CLIST (printer_driver)->vadjustment; - gtk_adjustment_set_value - (adjustment, - adjustment->lower + idx * (adjustment->upper - adjustment->lower) / - GTK_CLIST (printer_driver)->rows); - - i = stpui_plist_get_command_type(pv); - if (i >= 0 && i < command_options_count) - gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(command_options[i].button), - TRUE); -} - -static void -ppd_file_callback(GtkWidget *widget, gpointer data) -{ - const gchar *name = gtk_entry_get_text(GTK_ENTRY(widget)); - if (name && pv && pv->v) - { - stp_parameter_t desc; - stp_vars_t *v = stp_vars_create_copy(pv->v); - stp_set_file_parameter(v, "PPDFile", name); - stp_describe_parameter(v, "ModelName", &desc); - if (desc.is_active) - gtk_label_set_text(GTK_LABEL(ppd_model), desc.deflt.str); - else - gtk_label_set_text(GTK_LABEL(ppd_model), ""); - stp_parameter_description_destroy(&desc); - stp_vars_destroy(v); - } - else - gtk_label_set_text(GTK_LABEL(ppd_model), ""); -} - -/* - * setup_open_callback() - - */ -static void -setup_open_callback (void) -{ - static gboolean first_time = TRUE; - manufacturer = stp_printer_get_manufacturer(stp_get_printer(pv->v)); - build_printer_driver_clist(); - - reset_preview (); - setup_update (); - -/* gtk_widget_set_sensitive(GTK_DIALOG(print_dialog)->action_area, FALSE); */ - gtk_widget_show (setup_dialog); - - if (first_time) - { - /* Make sure the driver scroller gets positioned correctly. */ - setup_update (); - first_time = FALSE; - } -} - -/* - * new_printer_open_callback() - - */ -static void -new_printer_open_callback (void) -{ - reset_preview (); - gtk_entry_set_text (GTK_ENTRY (new_printer_entry), ""); - gtk_widget_show (new_printer_dialog); -} - -static void -set_printer(void) -{ - manufacturer = stp_printer_get_manufacturer(tmp_printer); - build_printer_driver_clist(); - build_queue_combo(); - stp_set_driver (pv->v, stp_printer_get_driver (tmp_printer)); - stpui_plist_set_custom_command - (pv, gtk_entry_get_text (GTK_ENTRY (custom_command_entry))); - stpui_plist_set_output_filename - (pv, gtk_entry_get_text (GTK_ENTRY (file_entry))); - stp_set_file_parameter (pv->v, "PPDFile", - gtk_entry_get_text (GTK_ENTRY (ppd_file))); - gtk_label_set_text (GTK_LABEL (printer_model_label), - gettext (stp_printer_get_long_name (tmp_printer))); - - plist_callback (NULL, (gpointer) stpui_plist_current); -} - -/* - * setup_ok_callback() - - */ -static void -setup_ok_callback (void) -{ - gtk_widget_hide(ppd_browser); - gtk_widget_hide(file_browser); - gtk_widget_hide(setup_dialog); - set_printer(); - gtk_widget_set_sensitive(GTK_DIALOG(print_dialog)->action_area, TRUE); -} - -/* - * setup_cancel_callback() - - */ -static void -setup_cancel_callback (void) -{ - gtk_widget_hide(ppd_browser); - gtk_widget_hide(file_browser); - gtk_widget_hide(setup_dialog); - manufacturer = stp_printer_get_manufacturer(stp_get_printer(pv->v)); - build_printer_driver_clist(); - setup_update(); - gtk_widget_set_sensitive(GTK_DIALOG(print_dialog)->action_area, TRUE); -} - -/* - * setup_ok_callback() - - */ -static void -new_printer_ok_callback (void) -{ - const gchar *data = gtk_entry_get_text (GTK_ENTRY (new_printer_entry)); - stpui_plist_t key; - - if (strlen(data)) - { - memset(&key, 0, sizeof(key)); - stpui_printer_initialize (&key); - stpui_plist_copy(&key, pv); - stpui_plist_set_name(&key, data); - - if (stpui_plist_add (&key, 1)) - { - stp_vars_destroy(key.v); - g_free(key.name); - stpui_plist_current = stpui_plist_count - 1; - set_current_printer(); - build_printer_combo (); - set_printer(); - } - } - - gtk_widget_hide (new_printer_dialog); -} - -static void -pop_ppd_box(void) -{ - const stp_vars_t *v = stp_printer_get_defaults(tmp_printer); - if (stp_parameter_find_in_settings(v, "PPDFile")) - { - gtk_widget_show (ppd_label); - gtk_widget_show (ppd_box); - gtk_widget_show (ppd_model_label); - gtk_widget_show (ppd_model); - } - else - { - gtk_widget_hide (ppd_label); - gtk_widget_hide (ppd_box); - gtk_widget_hide (ppd_model_label); - gtk_widget_hide (ppd_model); - } -} - -static void -build_printer_driver_clist(void) -{ - int i; - int current_idx = 0; - gtk_clist_clear(GTK_CLIST(printer_driver)); - for (i = 0; i < stp_printer_model_count (); i ++) - { - const stp_printer_t *the_printer = stp_get_printer_by_index (i); - - if (strcmp(manufacturer, stp_printer_get_manufacturer(the_printer)) == 0) - { - gchar *tmp=g_strdup(gettext(stp_printer_get_long_name(the_printer))); - /* - * FIXME Somehow if the raw printer comes before any of the - * "real" printers in the list of printers created in module.c, - * this code barfs on any of those printers added later. For - * example, try listing olympus_LTX_stpi_module_data after - * raw_LTX_stpi_module_data. - */ - - gtk_clist_insert (GTK_CLIST (printer_driver), current_idx, &tmp); - gtk_clist_set_row_data (GTK_CLIST (printer_driver), current_idx, - (gpointer) i); - g_free(tmp); - current_idx++; - } - } -} - -static void -manufacturer_callback(GtkWidget *widget, /* I - Driver list */ - gint row, - gint column, - GdkEventButton *event, - gpointer data) -{ - static int calling_manufacturer_callback = 0; - gchar *text; - if (calling_manufacturer_callback) - return; - calling_manufacturer_callback++; - if (gtk_clist_get_text(GTK_CLIST(widget), row, column, &text)) - manufacturer = text; - build_printer_driver_clist(); - setup_update(); - calling_manufacturer_callback--; -} - -/* - * print_driver_callback() - Update the current printer driver. - */ -static void -print_driver_callback (GtkWidget *widget, /* I - Driver list */ - gint row, - gint column, - GdkEventButton *event, - gpointer data) /* I - Data */ -{ - char *tmp; - static int calling_print_driver_callback = 0; - if (calling_print_driver_callback) - return; - calling_print_driver_callback++; - invalidate_frame (); - invalidate_preview_thumbnail (); - reset_preview (); - data = gtk_clist_get_row_data (GTK_CLIST (widget), row); - tmp_printer = stp_get_printer_by_index ((gint) data); - tmp = stpui_build_standard_print_command(pv, tmp_printer); - gtk_entry_set_text(GTK_ENTRY(standard_cmd_entry), tmp); - g_free(tmp); - - pop_ppd_box(); - calling_print_driver_callback--; -} - -/* - * ppd_browse_callback() - - */ -static void -ppd_browse_callback (void) -{ - reset_preview (); - gtk_file_selection_set_filename (GTK_FILE_SELECTION (ppd_browser), - gtk_entry_get_text (GTK_ENTRY (ppd_file))); - gtk_widget_show (ppd_browser); -} - -/* - * ppd_ok_callback() - - */ -static void -ppd_ok_callback (void) -{ - reset_preview (); - gtk_widget_hide (ppd_browser); - gtk_entry_set_text - (GTK_ENTRY (ppd_file), - gtk_file_selection_get_filename (GTK_FILE_SELECTION (ppd_browser))); - ppd_file_callback(ppd_file, NULL); - update_options(); -} - -/* - * ppd_browse_callback() - - */ -static void -file_browse_callback (void) -{ - reset_preview (); - gtk_file_selection_set_filename (GTK_FILE_SELECTION (file_browser), - gtk_entry_get_text (GTK_ENTRY (file_entry))); - gtk_widget_show (file_browser); -} - -/* - * file_ok_callback() - print to file and go away - */ -static void -file_ok_callback (void) -{ - const char *filename = - gtk_file_selection_get_filename(GTK_FILE_SELECTION(file_browser)); - gtk_widget_hide (file_browser); - gtk_entry_set_text(GTK_ENTRY(file_entry), filename); - stpui_plist_set_output_filename(pv, filename); - if (exit_after_file_ok) - { - runme = TRUE; - destroy_dialogs (); - } -} - -/* - * file_cancel_callback() - - */ -static void -file_cancel_callback (void) -{ - exit_after_file_ok = 0; - gtk_widget_hide (file_browser); - dialogs_set_sensitive (TRUE); -} - -static void -fill_buffer_writefunc(void *priv, const char *buffer, size_t bytes) -{ - int mask = 0; - int i; - - priv_t *p = (priv_t *) priv; - unsigned char *where = p->base_addr + p->offset; - const unsigned char *xbuffer = (const unsigned char *)buffer; - - if (strcmp(p->output_type, "Whitescale") == 0) - { - memcpy(where, xbuffer, bytes); - p->offset += bytes; - } - else if (strcmp(p->output_type, "Grayscale") == 0) - { - for (i = 0; i < bytes; i++) - where[i] = ~xbuffer[i]; - p->offset += bytes; - } - else if (strcmp(p->output_type, "RGB") == 0) - { - int pixels = bytes / 3; - if (bytes + p->offset > p->limit) - bytes = p->limit - p->offset; - if (gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(red_button))) - mask |= 1; - if (gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(green_button))) - mask |= 2; - if (gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(blue_button))) - mask |= 4; - - memset(where, 0, pixels * 3); - for (i = 0; i < pixels; i++) - { - if (mask & 1) - where[0] = xbuffer[0]; - if (mask & 2) - where[1] = xbuffer[1]; - if (mask & 4) - where[2] = xbuffer[2]; - where += 3; - xbuffer += 3; - } - p->offset += pixels * 3; - } - else if (strcmp(p->output_type, "CMY") == 0) - { - int pixels = bytes / 3; - if (bytes + p->offset > p->limit) - bytes = p->limit - p->offset; - if (gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(cyan_button))) - mask |= 1; - if (gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(magenta_button))) - mask |= 2; - if (gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(yellow_button))) - mask |= 4; - - memset(where, 0xff, pixels * 3); - for (i = 0; i < pixels; i++) - { - if (mask & 1) - where[0] = ~xbuffer[0]; - if (mask & 2) - where[1] = ~xbuffer[1]; - if (mask & 4) - where[2] = ~xbuffer[2]; - where += 3; - xbuffer += 3; - } - p->offset += pixels * 3; - } - else - { - int pixels = bytes / 4; - if (bytes + p->offset > p->limit) - bytes = p->limit - p->offset; - if (gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(cyan_button))) - mask |= 1; - if (gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(magenta_button))) - mask |= 2; - if (gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(yellow_button))) - mask |= 4; - if (gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(black_button))) - mask |= 8; - - memset(where, 0xff, pixels * 3); - for (i = 0; i < pixels; i++) - { - if (mask & 8) - { - where[0] -= xbuffer[3]; - where[1] -= xbuffer[3]; - where[2] -= xbuffer[3]; - } - if (mask & 1) - { - if (where[0] < xbuffer[0]) - where[0] = 0; - else - where[0] -= xbuffer[0]; - } - if (mask & 2) - { - if (where[1] < xbuffer[1]) - where[1] = 0; - else - where[1] -= xbuffer[1]; - } - if (mask & 4) - { - if (where[2] < xbuffer[2]) - where[2] = 0; - else - where[2] -= xbuffer[2]; - } - where += 3; - xbuffer += 4; - } - p->offset += pixels * 3; - } -} - -/* - * update_adjusted_thumbnail() - */ - -static void -redraw_color_swatch (void) -{ - static GdkGC *gc = NULL; - static GdkColormap *cmap; - - if (adjusted_thumbnail_data && swatch && swatch->widget.window) - { - if (gc == NULL) - { - gc = gdk_gc_new (swatch->widget.window); - cmap = gtk_widget_get_colormap (GTK_WIDGET(swatch)); - } - - if (!print_mode_is_color(pv->v)) - gdk_draw_gray_image(swatch->widget.window, gc, 0, 0, - thumbnail_w, thumbnail_h, GDK_RGB_DITHER_NORMAL, - adjusted_thumbnail_data, thumbnail_w); - else - gdk_draw_rgb_image(swatch->widget.window, gc, 0, 0, - thumbnail_w, thumbnail_h, GDK_RGB_DITHER_NORMAL, - adjusted_thumbnail_data, 3 * thumbnail_w); - } -} - -static void -initialize_thumbnail(void) -{ - int i; - if (stpui_get_thumbnail_func()) - { - const guchar *internal_thumbnail_data; - /* - * Fetch a thumbnail of the image we're to print from the Gimp. - */ - - thumbnail_w = thumbnail_hintw; - thumbnail_h = thumbnail_hinth; - internal_thumbnail_data = - (stpui_get_thumbnail_func()) (stpui_get_thumbnail_data(), &thumbnail_w, - &thumbnail_h, &thumbnail_bpp, 0); - if (adjusted_thumbnail_data) - g_free(adjusted_thumbnail_data); - if (preview_thumbnail_data) - g_free(preview_thumbnail_data); - if (thumbnail_data) - g_free(thumbnail_data); - - if (internal_thumbnail_data) - { - /* - * thumbnail_w and thumbnail_h have now been adjusted to the actual - * thumbnail dimensions. Now initialize a color-adjusted version of - * the thumbnail. - */ - - adjusted_thumbnail_data = g_malloc (3 * thumbnail_w * thumbnail_h); - preview_thumbnail_data = g_malloc (3 * thumbnail_w * thumbnail_h); - thumbnail_data = g_malloc (3 * thumbnail_w * thumbnail_h); - - switch (thumbnail_bpp) - { - case 1: - for (i = 0; i < thumbnail_w * thumbnail_h; i++) - { - gint val = internal_thumbnail_data[i]; - thumbnail_data[(3 * i) + 0] = val; - thumbnail_data[(3 * i) + 1] = val; - thumbnail_data[(3 * i) + 2] = val; - } - break; - case 3: - memcpy(thumbnail_data, internal_thumbnail_data, - 3 * thumbnail_w * thumbnail_h); - break; - case 2: - for (i = 0; i < thumbnail_w * thumbnail_h; i++) - { - gint val = internal_thumbnail_data[2 * i]; - gint alpha = internal_thumbnail_data[(2 * i) + 1]; - thumbnail_data[(3 * i) +0] = val * alpha / 255 + 255 - alpha; - thumbnail_data[(3 * i) +1] = val * alpha / 255 + 255 - alpha; - thumbnail_data[(3 * i) +2] = val * alpha / 255 + 255 - alpha; - } - break; - case 4: - for (i = 0; i < thumbnail_w * thumbnail_h; i++) - { - gint r = internal_thumbnail_data[(4 * i)]; - gint g = internal_thumbnail_data[(4 * i) + 1]; - gint b = internal_thumbnail_data[(4 * i) + 2]; - gint alpha = internal_thumbnail_data[(4 * i) + 3]; - thumbnail_data[(3 * i) + 0] = r * alpha / 255 + 255 - alpha; - thumbnail_data[(3 * i) + 1] = g * alpha / 255 + 255 - alpha; - thumbnail_data[(3 * i) + 2] = b * alpha / 255 + 255 - alpha; - } - break; - default: - break; - /* Whatever */ - } - thumbnail_bpp = 3; - } - else - { - thumbnail_h = 0; - thumbnail_w = 0; - } - } - else - { - thumbnail_h = 0; - thumbnail_w = 0; - } -} - -static int -compute_thumbnail(const stp_vars_t *v) -{ - priv_t priv; - int answer = 1; - stp_image_t *im = stpui_image_thumbnail_new(thumbnail_data, thumbnail_w, - thumbnail_h, thumbnail_bpp); - stp_vars_t *nv = stp_vars_create_copy(v); - const char *output_type = stp_describe_output(nv); - stp_set_top(nv, 0); - stp_set_left(nv, 0); - stp_set_width(nv, thumbnail_w); - stp_set_height(nv, thumbnail_h); - stp_set_outfunc(nv, fill_buffer_writefunc); - stp_set_outdata(nv, &priv); - stp_set_errfunc(nv, stpui_get_errfunc()); - stp_set_errdata(nv, stpui_get_errdata()); - if (strcmp(output_type, "Whitescale") == 0) - { - gtk_widget_hide(output_color_vbox); - priv.bpp = 1; - priv.output_type = "Whitescale"; - stp_set_string_parameter(nv, "InkType", "RGBGray"); - } - else if (strcmp(output_type, "Grayscale") == 0) - { - gtk_widget_hide(output_color_vbox); - priv.bpp = 1; - priv.output_type = "Grayscale"; - stp_set_string_parameter(nv, "InkType", "CMYGray"); - } - else if (strcmp(output_type, "CMY") == 0) - { - gtk_widget_hide(black_button); - gtk_widget_hide(red_button); - gtk_widget_hide(green_button); - gtk_widget_hide(blue_button); - gtk_widget_show(cyan_button); - gtk_widget_show(magenta_button); - gtk_widget_show(yellow_button); - gtk_widget_show(output_color_vbox); - priv.bpp = 3; - priv.output_type = "CMY"; - stp_set_string_parameter(nv, "InkType", "CMY"); - } - else if (strcmp(output_type, "RGB") == 0) - { - gtk_widget_hide(cyan_button); - gtk_widget_hide(magenta_button); - gtk_widget_hide(yellow_button); - gtk_widget_hide(black_button); - gtk_widget_show(red_button); - gtk_widget_show(green_button); - gtk_widget_show(blue_button); - gtk_widget_show(output_color_vbox); - priv.bpp = 3; - priv.output_type = "RGB"; - stp_set_string_parameter(nv, "InkType", "RGB"); - } - else - { - gtk_widget_hide(red_button); - gtk_widget_hide(green_button); - gtk_widget_hide(blue_button); - gtk_widget_show(cyan_button); - gtk_widget_show(magenta_button); - gtk_widget_show(yellow_button); - gtk_widget_show(black_button); - gtk_widget_show(output_color_vbox); - priv.bpp = 4; - priv.output_type = "CMYK"; - stp_set_string_parameter(nv, "InkType", "CMYK"); - } - stp_set_page_height(nv, thumbnail_h); - stp_set_page_width(nv, thumbnail_w); - stp_set_driver(nv, "raw-data-8"); - stp_set_float_parameter(nv, "Density", 1.0); - stp_set_float_parameter(nv, "InkLimit", 0); - stp_set_string_parameter(nv, "InputImageType", "RGB"); - - priv.base_addr = adjusted_thumbnail_data; - priv.offset = 0; - priv.limit = thumbnail_bpp * thumbnail_h * thumbnail_w; - - if (stp_verify(nv) != 1 || stp_print(nv, im) != 1) - { - answer = 0; - fprintf(stderr, "Could not print thumbnail!\n"); - } - stp_vars_destroy(nv); - thumbnail_needs_rebuild = FALSE; - return answer; -} - -static void -set_thumbnail_orientation(void) -{ - gint x, y; - gint preview_limit = (thumbnail_h * thumbnail_w) - 1; - gint bpp; - if (!print_mode_is_color(pv->v)) - bpp = 1; - else - bpp = 3; - switch (physical_orientation) - { - case ORIENT_PORTRAIT: - memcpy(preview_thumbnail_data, adjusted_thumbnail_data, - bpp * thumbnail_h * thumbnail_w); - break; - case ORIENT_SEASCAPE: - for (x = 0; x < thumbnail_w; x++) - for (y = 0; y < thumbnail_h; y++) - memcpy((preview_thumbnail_data + - bpp * (preview_limit - (x * thumbnail_h + y))), - (adjusted_thumbnail_data + - bpp * ((thumbnail_h - y - 1) * thumbnail_w + x)), bpp); - break; - - case ORIENT_UPSIDEDOWN: - for (x = 0; x < thumbnail_h * thumbnail_w; x++) - memcpy((preview_thumbnail_data + bpp * (preview_limit - x)), - adjusted_thumbnail_data + bpp * x, bpp); - break; - case ORIENT_LANDSCAPE: - for (x = 0; x < thumbnail_w; x++) - for (y = 0; y < thumbnail_h; y++) - memcpy((preview_thumbnail_data + bpp * (x * thumbnail_h + y)), - (adjusted_thumbnail_data + - bpp * ((thumbnail_h - y - 1) * thumbnail_w + x)), bpp); - break; - } -} - -static void -draw_arrow (GdkWindow *w, - GdkGC *gc, - gint paper_left, - gint paper_top) -{ - gint u = preview_ppi/2; - gint ox = paper_left + preview_ppi * paper_width / INCH / 2; - gint oy = paper_top + preview_ppi * paper_height / INCH / 2; - - oy -= preview_ppi * paper_height / INCH / 4; - if (oy < paper_top + u) - oy = paper_top + u; - gdk_draw_line (w, gc, ox, oy - u, ox - u, oy); - gdk_draw_line (w, gc, ox, oy - u, ox + u, oy); - gdk_draw_line (w, gc, ox, oy - u, ox, oy + u); -} - -static void -create_valid_preview(guchar **preview_data) -{ - if (adjusted_thumbnail_data) - { - gint bpp = (print_mode_is_color(pv->v)) ? 3 : 1; - gint v_denominator = preview_h > 1 ? preview_h - 1 : 1; - gint v_numerator = (preview_thumbnail_h - 1) % v_denominator; - gint v_whole = (preview_thumbnail_h - 1) / v_denominator; - gint h_denominator = preview_w > 1 ? preview_w - 1 : 1; - gint h_numerator = (preview_thumbnail_w - 1) % h_denominator; - gint h_whole = (preview_thumbnail_w - 1) / h_denominator; - gint adjusted_preview_width = bpp * preview_w; - gint adjusted_thumbnail_width = bpp * preview_thumbnail_w; - gint v_cur = 0; - gint v_last = -1; - gint v_error = v_denominator / 2; - gint y; - gint i; - - if (*preview_data) - g_free (*preview_data); - *preview_data = g_malloc (bpp * preview_h * preview_w); - - for (y = 0; y < preview_h; y++) - { - guchar *outbuf = *preview_data + adjusted_preview_width * y; - - if (v_cur == v_last) - memcpy (outbuf, outbuf-adjusted_preview_width, - adjusted_preview_width); - else - { - guchar *inbuf = preview_thumbnail_data - bpp - + adjusted_thumbnail_width * v_cur; - - gint h_cur = 0; - gint h_last = -1; - gint h_error = h_denominator / 2; - gint x; - - v_last = v_cur; - for (x = 0; x < preview_w; x++) - { - if (h_cur == h_last) - { - for (i = 0; i < bpp; i++) - outbuf[i] = outbuf[i - bpp]; - } - else - { - inbuf += bpp * (h_cur - h_last); - h_last = h_cur; - for (i = 0; i < bpp; i++) - outbuf[i] = inbuf[i]; - } - outbuf += bpp; - h_cur += h_whole; - h_error += h_numerator; - if (h_error >= h_denominator) - { - h_error -= h_denominator; - h_cur++; - } - } - } - v_cur += v_whole; - v_error += v_numerator; - if (v_error >= v_denominator) - { - v_error -= v_denominator; - v_cur++; - } - } - preview_valid = TRUE; - } -} - -/* - * preview_update_callback() - - */ -static void -do_preview_thumbnail (void) -{ - static GdkGC *gc = NULL; - static GdkGC *gcinv = NULL; - static GdkGC *gcset = NULL; - static guchar *preview_data = NULL; - gint opx = preview_x; - gint opy = preview_y; - gint oph = preview_h; - gint opw = preview_w; - gint paper_display_left, paper_display_top; - gint printable_display_left, printable_display_top; - gint paper_display_width, paper_display_height; - gint printable_display_width, printable_display_height; - int l_bottom = stp_get_top(pv->v) + stp_get_height(pv->v); - int l_right = stp_get_left(pv->v) + stp_get_width(pv->v); - - preview_ppi = preview_size_horiz * FINCH / (gdouble) paper_width; - - if (preview_ppi > preview_size_vert * FINCH / (gdouble) paper_height) - preview_ppi = preview_size_vert * FINCH / (gdouble) paper_height; - if (preview_ppi > MAX_PREVIEW_PPI) - preview_ppi = MAX_PREVIEW_PPI; - - if (preview == NULL || preview->widget.window == NULL) - return; - /* - * Center the page on the preview - */ - paper_display_width = MAX(3, ROUNDUP(preview_ppi * paper_width, INCH)); - paper_display_height = MAX(3, ROUNDUP(preview_ppi * paper_height, INCH)); - - paper_display_left = (preview_size_horiz - paper_display_width) / 2; - paper_display_top = (preview_size_vert - paper_display_height) / 2; - - printable_display_width = - MAX(3, ROUNDUP(preview_ppi * printable_width, INCH)); - printable_display_height = - MAX(3, ROUNDUP(preview_ppi * printable_height, INCH)); - - printable_display_left = paper_display_left + preview_ppi * left / INCH; - printable_display_top = paper_display_top + preview_ppi * top / INCH ; - - preview_x = - 1 + paper_display_left + preview_ppi * stp_get_left (pv->v) / INCH; - preview_y = - 1 + paper_display_top + preview_ppi * stp_get_top (pv->v) / INCH; - - if (!preview_valid) - { - gint preview_r = 1 + paper_display_left + preview_ppi * l_right / INCH; - gint preview_b = 1 + paper_display_top + preview_ppi * l_bottom / INCH; - preview_w = preview_r - preview_x; - preview_h = preview_b - preview_y; - if (preview_w >= printable_display_width) - preview_w = printable_display_width - 1; - if (preview_h >= printable_display_height) - preview_h = printable_display_height - 1; - } - - if (preview_w + preview_x > printable_display_left + printable_display_width) - preview_x--; - if (preview_h + preview_y > printable_display_top + printable_display_height) - preview_y--; - - if (gc == NULL) - { - gc = gdk_gc_new (preview->widget.window); - gcinv = gdk_gc_new (preview->widget.window); - gdk_gc_set_function (gcinv, GDK_INVERT); - gcset = gdk_gc_new (preview->widget.window); - gdk_gc_set_function (gcset, GDK_SET); - } - - if (!preview_valid) - create_valid_preview(&preview_data); - - if (printable_display_left < paper_display_left) - printable_display_left = paper_display_left; - if (printable_display_top < paper_display_top) - printable_display_top = paper_display_top; - if (printable_display_left + printable_display_width > - paper_display_left + paper_display_width) - printable_display_width = - paper_display_width - (paper_display_left - printable_display_left); - if (printable_display_top + printable_display_height > - paper_display_top + paper_display_height) - printable_display_height = - paper_display_height - (paper_display_top - printable_display_top); - if (need_exposure) - { - if (!frame_valid) - { - gdk_window_clear (preview->widget.window); - frame_valid = TRUE; - } - /* draw paper frame */ - gdk_draw_rectangle (preview->widget.window, gc, 0, - paper_display_left, paper_display_top, - paper_display_width, paper_display_height); - - /* draw printable frame */ - gdk_draw_rectangle (preview->widget.window, gc, 0, - printable_display_left, printable_display_top, - printable_display_width, printable_display_height); - need_exposure = FALSE; - } - else if (!frame_valid) - { - gdk_window_clear (preview->widget.window); - /* draw paper frame */ - gdk_draw_rectangle (preview->widget.window, gc, 0, - paper_display_left, paper_display_top, - paper_display_width, paper_display_height); - - /* draw printable frame */ - gdk_draw_rectangle (preview->widget.window, gc, 0, - printable_display_left, printable_display_top, - printable_display_width, printable_display_height); - frame_valid = TRUE; - } - else - { - if (opx + opw <= preview_x || opy + oph <= preview_y || - preview_x + preview_w <= opx || preview_y + preview_h <= opy) - { - gdk_window_clear_area (preview->widget.window, opx, opy, opw, oph); - } - else - { - if (opx < preview_x) - gdk_window_clear_area (preview->widget.window, - opx, opy, preview_x - opx, oph); - if (opy < preview_y) - gdk_window_clear_area (preview->widget.window, - opx, opy, opw, preview_y - opy); - if (opx + opw > preview_x + preview_w) - gdk_window_clear_area (preview->widget.window, - preview_x + preview_w, opy, - (opx + opw) - (preview_x + preview_w), oph); - if (opy + oph > preview_y + preview_h) - gdk_window_clear_area (preview->widget.window, - opx, preview_y + preview_h, - opw, (opy + oph) - (preview_y + preview_h)); - } - } - - draw_arrow (preview->widget.window, gcset, paper_display_left, - paper_display_top); - - if (!preview_valid) - gdk_draw_rectangle (preview->widget.window, gc, 1, - preview_x, preview_y, preview_w, preview_h); - else if (!print_mode_is_color(pv->v)) - gdk_draw_gray_image (preview->widget.window, gc, - preview_x, preview_y, preview_w, preview_h, - GDK_RGB_DITHER_NORMAL, preview_data, preview_w); - else - gdk_draw_rgb_image (preview->widget.window, gc, - preview_x, preview_y, preview_w, preview_h, - GDK_RGB_DITHER_NORMAL, preview_data, 3 * preview_w); - - /* If we're printing full bleed, redisplay the paper frame */ - if (preview_x <= paper_display_left || opx <= paper_display_left || - preview_y <= paper_display_top || opy <= paper_display_top || - preview_x + preview_w >= paper_display_left + paper_display_width || - opx + opw >= paper_display_left + paper_display_width || - preview_y + preview_h >= paper_display_top + paper_display_height || - opy + oph >= paper_display_top + paper_display_height) - gdk_draw_rectangle (preview->widget.window, gc, 0, - paper_display_left, paper_display_top, - paper_display_width, paper_display_height); - - - /* draw orientation arrow pointing to top-of-paper */ - draw_arrow (preview->widget.window, gcinv, paper_display_left, - paper_display_top); - gdk_flush(); -} - -static gboolean -idle_preview_thumbnail(gpointer data) -{ - if (thumbnail_data && adjusted_thumbnail_data && do_update_thumbnail) - { - thumbnail_update_pending = TRUE; - set_orientation(pv->orientation); - if (thumbnail_needs_rebuild && compute_thumbnail(pv->v)) - { - set_thumbnail_orientation(); - redraw_color_swatch (); - } - do_preview_thumbnail(); - } - thumbnail_update_pending = FALSE; - return FALSE; -} - -static void -update_adjusted_thumbnail (gboolean regenerate_image) -{ - if (regenerate_image) - thumbnail_needs_rebuild = TRUE; - preview_update (); -} - -static void -preview_expose (void) -{ - need_exposure = TRUE; - preview_update (); -} - -static void -preview_update (void) -{ - gdouble max_ppi_scaling; /* Maximum PPI for current page size */ - gdouble min_ppi_scaling; /* Minimum PPI for current page size */ - - suppress_preview_update++; - compute_printable_region(); - - if (pv->scaling < 0) - { - gdouble twidth; - - compute_scaling_limits(&min_ppi_scaling, &max_ppi_scaling); - - if (pv->scaling < 0 && pv->scaling > -min_ppi_scaling) - pv->scaling = -min_ppi_scaling; - - twidth = (FINCH * (gdouble) image_width / -pv->scaling); - print_width = twidth + .5; - print_height = (twidth * (gdouble) image_height / image_width) + .5; - GTK_ADJUSTMENT (scaling_adjustment)->lower = min_ppi_scaling; - GTK_ADJUSTMENT (scaling_adjustment)->upper = max_ppi_scaling; - GTK_ADJUSTMENT (scaling_adjustment)->value = -pv->scaling; - - if (!suppress_scaling_adjustment) - { - suppress_preview_reset++; - gtk_adjustment_changed (GTK_ADJUSTMENT (scaling_adjustment)); - suppress_scaling_callback = TRUE; - gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (scaling_ppi), TRUE); - suppress_scaling_callback = FALSE; - gtk_adjustment_value_changed (GTK_ADJUSTMENT (scaling_adjustment)); - suppress_preview_reset--; - } - } - else if (auto_paper_size) - { - gdouble twidth = printable_width * pv->scaling / 100; - - print_width = twidth + .5; - print_height = - (twidth * (gdouble) image_height / (gdouble) image_width) + .5; - } - else - { - /* we do pv->scaling % of height or width, whatever is less */ - /* this is relative to printable size */ - if (image_width * printable_height > printable_width * image_height) - /* if image_width/image_height > printable_width/printable_height */ - /* i.e. if image is wider relative to its height than the width - of the printable area relative to its height */ - { - gdouble twidth = printable_width * pv->scaling / 100; - - print_width = twidth + .5; - print_height = - (twidth * (gdouble) image_height / (gdouble) image_width) + .5; - } - else - { - gdouble theight = printable_height * pv->scaling /100; - - print_height = theight + .5; - print_width = - (theight * (gdouble) image_width / (gdouble) image_height) + .5; - } - } - - if (auto_paper_size) - set_media_size(stp_get_string_parameter(pv->v, "PageSize")); - - stp_set_width(pv->v, print_width); - stp_set_height(pv->v, print_height); - - if (pv->invalid_mask & INVALID_LEFT) - stp_set_left (pv->v, (paper_width - print_width) / 2); - - if (stp_get_left(pv->v) < left) - stp_set_left(pv->v, left); - - if (stp_get_left (pv->v) > right - print_width) - stp_set_left (pv->v, right - print_width); - - if (pv->invalid_mask & INVALID_TOP) - stp_set_top (pv->v, ((paper_height - print_height) / 2)); - if (stp_get_top(pv->v) < top) - stp_set_top(pv->v, top); - - if (stp_get_top (pv->v) > bottom - print_height) - stp_set_top (pv->v, bottom - print_height); - - pv->invalid_mask = 0; - - set_all_entry_values(); - suppress_preview_update--; - - /* draw image */ - if (! suppress_preview_update && !thumbnail_update_pending) - { - thumbnail_update_pending = TRUE; - g_idle_add(idle_preview_thumbnail, NULL); - } -} - -/* - * preview_button_callback() - - */ -static void -preview_button_callback (GtkWidget *widget, - GdkEventButton *event, - gpointer data) -{ - if (event->type == GDK_BUTTON_PRESS) - { - if (preview_active == 0) - { - mouse_x = event->x; - mouse_y = event->y; - orig_left = stp_get_left (pv->v); - orig_top = stp_get_top (pv->v); - mouse_button = event->button; - buttons_mask = 1 << event->button; - buttons_pressed++; - preview_active = 1; - stpui_disable_help(); - move_constraint = - (event->state & GDK_SHIFT_MASK) ? MOVE_CONSTRAIN : MOVE_ANY; - if (event->state & GDK_CONTROL_MASK) - move_constraint |= MOVE_GRID; - } - else if ((buttons_mask & (1 << event->button)) == 0) - { - if (preview_active == 1) - { - stpui_enable_help(); - preview_active = -1; - stp_set_left (pv->v, orig_left); - stp_set_top (pv->v, orig_top); - preview_update (); - } - buttons_mask |= 1 << event->button; - buttons_pressed++; - } - } - else if (event->type == GDK_BUTTON_RELEASE) - { - buttons_pressed--; - buttons_mask &= ~(1 << event->button); - if (buttons_pressed == 0) - { - stpui_enable_help (); - preview_active = 0; - } - } -} - -/* - * preview_motion_callback() - - */ -static void -preview_motion_callback (GtkWidget *widget, - GdkEventMotion *event, - gpointer data) -{ - - gint old_top = stp_get_top (pv->v); - gint old_left = stp_get_left (pv->v); - gint new_top = old_top; - gint new_left = old_left; - gint steps; - if (preview_active != 1 || event->type != GDK_MOTION_NOTIFY) - return; - if (move_constraint == MOVE_CONSTRAIN) - { - int dx = abs(event->x - mouse_x); - int dy = abs(event->y - mouse_y); - if (dx > dy && dx > 3) - move_constraint = MOVE_HORIZONTAL; - else if (dy > dx && dy > 3) - move_constraint = MOVE_VERTICAL; - else - return; - } - - switch (mouse_button) - { - case 1: - if (move_constraint & MOVE_VERTICAL) - new_top = orig_top + INCH * (event->y - mouse_y) / preview_ppi; - if (move_constraint & MOVE_HORIZONTAL) - new_left = orig_left + INCH * (event->x - mouse_x) / preview_ppi; - break; - case 3: - if (move_constraint & MOVE_VERTICAL) - new_top = orig_top + event->y - mouse_y; - if (move_constraint & MOVE_HORIZONTAL) - new_left = orig_left + event->x - mouse_x; - break; - case 2: - if (move_constraint & MOVE_HORIZONTAL) - { - gint increment_width = - ((move_constraint & MOVE_GRID) && pv->scaling > 0) ? - printable_width * pv->scaling / 100 : print_width; - gint x_threshold = MAX (1, (preview_ppi * increment_width) / INCH); - if (event->x > mouse_x) - steps = MIN((event->x - mouse_x) / x_threshold, - ((right - orig_left) / increment_width) - 1); - else - steps = -(MIN((mouse_x - event->x) / x_threshold, - (orig_left - left) / increment_width)); - new_left = orig_left + steps * increment_width; - } - if (move_constraint & MOVE_VERTICAL) - { - gint increment_height = - ((move_constraint & MOVE_GRID) && pv->scaling > 0) ? - printable_height * pv->scaling / 100 : print_height; - gint y_threshold = MAX (1, (preview_ppi * increment_height) / INCH); - if (event->y > mouse_y) - steps = MIN((event->y - mouse_y) / y_threshold, - ((bottom - orig_top) / increment_height) - 1); - else - steps = -(MIN((mouse_y - event->y) / y_threshold, - (orig_top - top) / increment_height)); - new_top = orig_top + steps * increment_height; - } - break; - } - - if (new_top < top) - new_top = top; - if (new_top > bottom - print_height) - new_top = bottom - print_height; - if (new_left < left) - new_left = left; - if (new_left > right - print_width) - new_left = right - print_width; - - if (new_top != old_top || new_left != old_left) - { - stp_set_top (pv->v, new_top); - stp_set_left (pv->v, new_left); - preview_update (); - } -} - -static void -color_update (GtkAdjustment *adjustment) -{ - int i; - for (i = 0; i < current_option_count; i++) - { - option_t *opt = &(current_options[i]); - if (opt->fast_desc->p_type == STP_PARAMETER_TYPE_DOUBLE && - opt->fast_desc->p_level <= MAXIMUM_PARAMETER_LEVEL && - opt->info.flt.adjustment && - adjustment == GTK_ADJUSTMENT(opt->info.flt.adjustment)) - { - invalidate_preview_thumbnail (); - if (stp_get_float_parameter(pv->v, opt->fast_desc->name) != - adjustment->value) - { - stp_set_float_parameter(pv->v, opt->fast_desc->name, - adjustment->value); - update_adjusted_thumbnail(TRUE); - } - } - } -} - -static void -dimension_update (GtkAdjustment *adjustment) -{ - int i; - gdouble unit_scaler = units[pv->unit].scale; - for (i = 0; i < current_option_count; i++) - { - option_t *opt = &(current_options[i]); - if (opt->fast_desc->p_type == STP_PARAMETER_TYPE_DIMENSION && - opt->fast_desc->p_level <= MAXIMUM_PARAMETER_LEVEL && - opt->info.flt.adjustment && - adjustment == GTK_ADJUSTMENT(opt->info.flt.adjustment)) - { - invalidate_preview_thumbnail (); - if (stp_get_dimension_parameter(pv->v, opt->fast_desc->name) != - adjustment->value * unit_scaler) - { - stp_set_dimension_parameter(pv->v, opt->fast_desc->name, - adjustment->value * unit_scaler); - update_adjusted_thumbnail(FALSE); - } - } - } -} - -static void -set_controls_active (GtkObject *checkbutton, gpointer xopt) -{ - option_t *opt = (option_t *) xopt; - stp_parameter_t desc; - gboolean setting = - gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(checkbutton)); - if (setting && opt->fast_desc->p_level <= MAXIMUM_PARAMETER_LEVEL) - { - switch (opt->fast_desc->p_type) - { - case STP_PARAMETER_TYPE_DOUBLE: - set_adjustment_active(opt, TRUE, FALSE); - if (! stp_check_float_parameter(pv->v, opt->fast_desc->name, - STP_PARAMETER_INACTIVE)) - { - stp_describe_parameter(pv->v, opt->fast_desc->name, &desc); - stp_set_float_parameter(pv->v, opt->fast_desc->name, - desc.deflt.dbl); - stp_parameter_description_destroy(&desc); - } - stp_set_float_parameter_active(pv->v, opt->fast_desc->name, - STP_PARAMETER_ACTIVE); - break; - case STP_PARAMETER_TYPE_DIMENSION: - set_adjustment_active(opt, TRUE, FALSE); - if (! stp_check_dimension_parameter(pv->v, opt->fast_desc->name, - STP_PARAMETER_INACTIVE)) - { - stp_describe_parameter(pv->v, opt->fast_desc->name, &desc); - stp_set_dimension_parameter(pv->v, opt->fast_desc->name, - desc.deflt.dimension); - stp_parameter_description_destroy(&desc); - } - stp_set_dimension_parameter_active(pv->v, opt->fast_desc->name, - STP_PARAMETER_ACTIVE); - break; - case STP_PARAMETER_TYPE_CURVE: - set_curve_active(opt, TRUE, FALSE); - if (! stp_check_curve_parameter(pv->v, opt->fast_desc->name, - STP_PARAMETER_INACTIVE)) - { - stp_describe_parameter(pv->v, opt->fast_desc->name, &desc); - stp_set_curve_parameter(pv->v, opt->fast_desc->name, - desc.deflt.curve); - stp_parameter_description_destroy(&desc); - } - stp_set_curve_parameter_active(pv->v, opt->fast_desc->name, - STP_PARAMETER_ACTIVE); - break; - case STP_PARAMETER_TYPE_STRING_LIST: - set_combo_active(opt, TRUE, FALSE); - if (! stp_check_string_parameter(pv->v, opt->fast_desc->name, - STP_PARAMETER_INACTIVE)) - { - stp_describe_parameter(pv->v, opt->fast_desc->name, &desc); - stp_set_string_parameter(pv->v, opt->fast_desc->name, - desc.deflt.str); - stp_parameter_description_destroy(&desc); - } - stp_set_string_parameter_active(pv->v, opt->fast_desc->name, - STP_PARAMETER_ACTIVE); - break; - case STP_PARAMETER_TYPE_BOOLEAN: - set_bool_active(opt, TRUE, FALSE); - if (! stp_check_boolean_parameter(pv->v, opt->fast_desc->name, - STP_PARAMETER_INACTIVE)) - { - stp_describe_parameter(pv->v, opt->fast_desc->name, &desc); - stp_set_boolean_parameter(pv->v, opt->fast_desc->name, - desc.deflt.boolean); - stp_parameter_description_destroy(&desc); - } - stp_set_boolean_parameter_active(pv->v, opt->fast_desc->name, - STP_PARAMETER_ACTIVE); - break; - default: - break; - } - } - else - { - switch (opt->fast_desc->p_type) - { - case STP_PARAMETER_TYPE_DOUBLE: - set_adjustment_active(opt, FALSE, FALSE); - stp_set_float_parameter_active(pv->v, opt->fast_desc->name, - STP_PARAMETER_INACTIVE); - break; - case STP_PARAMETER_TYPE_DIMENSION: - set_adjustment_active(opt, FALSE, FALSE); - stp_set_dimension_parameter_active(pv->v, opt->fast_desc->name, - STP_PARAMETER_INACTIVE); - break; - case STP_PARAMETER_TYPE_CURVE: - set_curve_active(opt, FALSE, FALSE); - stp_set_curve_parameter_active(pv->v, opt->fast_desc->name, - STP_PARAMETER_INACTIVE); - break; - case STP_PARAMETER_TYPE_STRING_LIST: - set_combo_active(opt, FALSE, FALSE); - stp_set_string_parameter_active(pv->v, opt->fast_desc->name, - STP_PARAMETER_INACTIVE); - break; - case STP_PARAMETER_TYPE_BOOLEAN: /* ??? */ - set_bool_active(opt, FALSE, FALSE); - stp_set_boolean_parameter_active(pv->v, opt->fast_desc->name, - STP_PARAMETER_INACTIVE); - break; - default: - break; - } - } - invalidate_preview_thumbnail(); - update_adjusted_thumbnail(TRUE); -} - -static void -set_printer_defaults (void) -{ - int i; - for (i = 0; i < current_option_count; i++) - { - option_t *opt = &(current_options[i]); - if (opt->fast_desc->p_level <= MAXIMUM_PARAMETER_LEVEL && - opt->fast_desc->p_class == STP_PARAMETER_CLASS_FEATURE && - opt->is_active && !opt->fast_desc->read_only) - { - stp_parameter_activity_t active; - gdouble unit_scaler; - switch (opt->fast_desc->p_type) - { - case STP_PARAMETER_TYPE_DOUBLE: - active = - stp_get_float_parameter_active(pv->v, opt->fast_desc->name); - stp_set_float_parameter(pv->v, opt->fast_desc->name, - opt->info.flt.deflt); - stp_set_float_parameter_active(pv->v, opt->fast_desc->name, - active); - break; - case STP_PARAMETER_TYPE_DIMENSION: - unit_scaler = units[pv->unit].scale; - active = - stp_get_dimension_parameter_active(pv->v, - opt->fast_desc->name); - stp_set_dimension_parameter(pv->v, opt->fast_desc->name, - opt->info.flt.deflt * unit_scaler); - stp_set_dimension_parameter_active(pv->v, opt->fast_desc->name, - active); - break; - case STP_PARAMETER_TYPE_BOOLEAN: - active = - stp_get_boolean_parameter_active(pv->v, opt->fast_desc->name); - stp_set_boolean_parameter(pv->v, opt->fast_desc->name, - opt->info.bool.deflt); - stp_set_boolean_parameter_active(pv->v, opt->fast_desc->name, - active); - break; - case STP_PARAMETER_TYPE_STRING_LIST: - active = - stp_get_string_parameter_active(pv->v, opt->fast_desc->name); - stp_set_string_parameter(pv->v, opt->fast_desc->name, - opt->info.list.default_val); - stp_set_string_parameter_active(pv->v, opt->fast_desc->name, - active); - break; - default: - break; - } - } - } - - do_all_updates (); -} - -static void -set_color_defaults (void) -{ - int i; - for (i = 0; i < current_option_count; i++) - { - option_t *opt = &(current_options[i]); - if (opt->fast_desc->p_level <= MAXIMUM_PARAMETER_LEVEL && - opt->fast_desc->p_class == STP_PARAMETER_CLASS_OUTPUT && - opt->is_active && !opt->fast_desc->read_only) - { - stp_parameter_activity_t active; - gdouble unit_scaler; - switch (opt->fast_desc->p_type) - { - case STP_PARAMETER_TYPE_DOUBLE: - active = - stp_get_float_parameter_active(pv->v, opt->fast_desc->name); - stp_set_float_parameter(pv->v, opt->fast_desc->name, - opt->info.flt.deflt); - stp_set_float_parameter_active(pv->v, opt->fast_desc->name, - active); - break; - case STP_PARAMETER_TYPE_DIMENSION: - unit_scaler = units[pv->unit].scale; - active = - stp_get_dimension_parameter_active(pv->v, - opt->fast_desc->name); - stp_set_dimension_parameter(pv->v, opt->fast_desc->name, - opt->info.flt.deflt * unit_scaler); - stp_set_dimension_parameter_active(pv->v, opt->fast_desc->name, - active); - break; - case STP_PARAMETER_TYPE_BOOLEAN: - active = - stp_get_boolean_parameter_active(pv->v, opt->fast_desc->name); - stp_set_boolean_parameter(pv->v, opt->fast_desc->name, - opt->info.bool.deflt); - stp_set_boolean_parameter_active(pv->v, opt->fast_desc->name, - active); - break; - case STP_PARAMETER_TYPE_STRING_LIST: - active = - stp_get_string_parameter_active(pv->v, opt->fast_desc->name); - stp_set_string_parameter(pv->v, opt->fast_desc->name, - opt->info.list.default_val); - stp_set_string_parameter_active(pv->v, opt->fast_desc->name, - active); - break; - default: - break; - } - } - } - - do_color_updates (); -} - -gint -stpui_do_print_dialog(void) -{ - /* - * Get printrc options... - */ - stpui_printrc_load (); - - /* - * Print dialog window... - */ - create_main_window(); - - gtk_main (); - gdk_flush (); - - /* - * Set printrc options... - */ - if (saveme) - stpui_printrc_save (); - - /* - * Return ok/cancel... - */ - return (runme); -} diff --git a/src/gutenprintui/plist.c b/src/gutenprintui/plist.c deleted file mode 100644 index ecd6234..0000000 --- a/src/gutenprintui/plist.c +++ /dev/null @@ -1,1793 +0,0 @@ -/* - * "$Id: plist.c,v 1.3.6.2 2007/12/15 20:35:42 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 -#endif - -#include -#include -#include -#include "gutenprintui-internal.h" - -#include -#include -#include -#include -#include -#include - -#include -#include -#include - - -typedef enum -{ - PRINTERS_NONE, - PRINTERS_LPC, - PRINTERS_LPSTAT -} printer_system_t; - -static int compare_printers (stpui_plist_t *p1, stpui_plist_t *p2); - -int stpui_plist_current = 0, /* Current system printer */ - stpui_plist_count = 0; /* Number of system printers */ -stpui_plist_t *stpui_plist; /* System printers */ -int stpui_show_all_paper_sizes = 0; -static char *printrc_name = NULL; -static char *image_type; -static gint image_raw_channels = 0; -static gint image_channel_depth = 8; -static stp_string_list_t *default_parameters = NULL; -stp_string_list_t *stpui_system_print_queues; -static const char *copy_count_name = "STPUICopyCount"; - -#define SAFE_FREE(x) \ -do \ -{ \ - if ((x)) \ - g_free((char *)(x)); \ - ((x)) = NULL; \ -} while (0) - -typedef struct -{ - const char *printing_system_name; - const char *printing_system_text; - const char *print_command; - const char *queue_select; - const char *raw_flag; - const char *key_file; - const char *scan_command; - const char *copy_count_command; -} print_system_t; - -/* - * Generic printing system, based on SysV lp - */ -static const print_system_t default_printing_system = - { "SysV", N_("System V lp"), "lp -s", "-d", "-oraw", "/usr/bin/lp", - "/usr/bin/lpstat -v | grep -i '^device for ' | awk '{print $3}' | sed 's/://'", - "-n" }; - -static print_system_t known_printing_systems[] = -{ - { "CUPS", N_("CUPS"), "lp -s", "-d", "-oraw", "/usr/sbin/cupsd", - "/usr/bin/lpstat -v | grep -i '^device for ' | awk '{print $3}' | sed 's/://'", - "-n" }, - { "SysV", N_("System V lp"), "lp -s", "-d", "-oraw", "/usr/bin/lp", - "/usr/bin/lpstat -v | grep -i '^device for ' | awk '{print $3}' | sed 's/://'", - "-n" }, - { "lpd", N_("Berkeley lpd (/etc/lpc)"), "lpr", "-P", "-l", "/etc/lpc", - "/etc/lpc status | grep '^...*:' | sed 's/:.*//'", - "-#" }, - { "lpd", N_("Berkeley lpd (/usr/bsd/lpc)"), "lpr", "-P", "-l", "/usr/bsd/lpc", - "/usr/bsd/lpc status | grep '^...*:' | sed 's/:.*//'", - "-#" }, - { "lpd", N_("Berkeley lpd (/usr/etc/lpc"), "lpr", "-P", "-l", "/usr/etc/lpc", - "/usr/etc/lpc status | grep '^...*:' | sed 's/:.*//'", - "-#" }, - { "lpd", N_("Berkeley lpd (/usr/libexec/lpc)"), "lpr", "-P", "-l", "/usr/libexec/lpc", - "/usr/libexec/lpc status | grep '^...*:' | sed 's/:.*//'", - "-#" }, - { "lpd", N_("Berkeley lpd (/usr/sbin/lpc)"), "lpr", "-P", "-l", "/usr/sbin/lpc", - "/usr/sbin/lpc status | grep '^...*:' | sed 's/:.*//'", - "-#" }, -}; - -static unsigned print_system_count = sizeof(known_printing_systems) / sizeof(print_system_t); - -static const print_system_t *global_printing_system = NULL; - -static void -initialize_default_parameters(void) -{ - default_parameters = stp_string_list_create(); - stp_string_list_add_string(default_parameters, "PrintingSystem", "Autodetect"); - stp_string_list_add_string(default_parameters, "PrintCommand", ""); - stp_string_list_add_string(default_parameters, "QueueSelect", ""); - stp_string_list_add_string(default_parameters, "RawOutputFlag", ""); - stp_string_list_add_string(default_parameters, "ScanOnStartup", "False"); - stp_string_list_add_string(default_parameters, "ScanPrintersCommand", ""); -} - -void -stpui_set_global_parameter(const char *param, const char *value) -{ - stp_string_list_remove_string(default_parameters, param); - stp_string_list_add_string(default_parameters, param, value); -} - -const char * -stpui_get_global_parameter(const char *param) -{ - stp_param_string_t *ps = stp_string_list_find(default_parameters, param); - if (ps) - return ps->text; - else - return NULL; -} - -static const print_system_t * -identify_print_system(void) -{ - int i; - if (!global_printing_system) - { - for (i = 0; i < print_system_count; i++) - { - if (!access(known_printing_systems[i].key_file, R_OK)) - { - global_printing_system = &(known_printing_systems[i]); - break; - } - } - if (!global_printing_system) - global_printing_system = &default_printing_system; - } - return global_printing_system; -} - -char * -stpui_build_standard_print_command(const stpui_plist_t *plist, - const stp_printer_t *printer) -{ - const char *queue_name = stpui_plist_get_queue_name(plist); - const char *extra_options = stpui_plist_get_extra_printer_options(plist); - const char *family = stp_printer_get_family(printer); - int copy_count = stpui_plist_get_copy_count(plist); - int raw = 0; - char *print_cmd; - char *count_string = NULL; - if (!queue_name) - queue_name = ""; - identify_print_system(); - if (strcmp(family, "ps") == 0) - raw = 0; - else - raw = 1; - - if (copy_count > 1) - stp_asprintf(&count_string, "%s %d ", - global_printing_system->copy_count_command, copy_count); - - stp_asprintf(&print_cmd, "%s %s %s %s %s%s%s", - global_printing_system->print_command, - queue_name[0] ? global_printing_system->queue_select : "", - queue_name[0] ? queue_name : "", - count_string ? count_string : "", - raw ? global_printing_system->raw_flag : "", - extra_options ? " " : "", - extra_options ? extra_options : ""); - SAFE_FREE(count_string); - return print_cmd; -} - -static void -append_external_options(char **command, const stp_vars_t *v) -{ - stp_string_list_t *external_options; - if (! command || ! *command) - return; - external_options = stp_get_external_options(v); - if (external_options) - { - int count = stp_string_list_count(external_options); - int i; - for (i = 0; i < count; i++) - { - stp_param_string_t *param = stp_string_list_param(external_options, i); - /* No g_shell_quote in glib 1.2...unfortunate */ - stp_catprintf(command, " -o'%s'='%s'", param->name, param->text); - } - stp_string_list_destroy(external_options); - } -} - - -void -stpui_set_printrc_file(const char *name) -{ - if (name && name == printrc_name) - return; - SAFE_FREE(printrc_name); - if (name) - printrc_name = g_strdup(name); - else - { - const char *where = getenv("HOME"); - if (where) - printrc_name = g_strconcat(where, "/.gutenprintrc", NULL); - } -} - -const char * -stpui_get_printrc_file(void) -{ - if (!printrc_name) - stpui_set_printrc_file(NULL); - return printrc_name; -} - -#define PLIST_ACCESSORS(name) \ -void \ -stpui_plist_set_##name(stpui_plist_t *p, const char *val) \ -{ \ - if (p->name == val) \ - return; \ - SAFE_FREE(p->name); \ - p->name = g_strdup(val); \ -} \ - \ -void \ -stpui_plist_set_##name##_n(stpui_plist_t *p, const char *val, int n) \ -{ \ - if (p->name == val) \ - return; \ - SAFE_FREE(p->name); \ - p->name = g_strndup(val, n); \ -} \ - \ -const char * \ -stpui_plist_get_##name(const stpui_plist_t *p) \ -{ \ - return p->name; \ -} - -PLIST_ACCESSORS(output_filename) -PLIST_ACCESSORS(name) -PLIST_ACCESSORS(queue_name) -PLIST_ACCESSORS(extra_printer_options) -PLIST_ACCESSORS(custom_command) -PLIST_ACCESSORS(current_standard_command) - -void -stpui_plist_set_command_type(stpui_plist_t *p, command_t val) -{ - switch (val) - { - case COMMAND_TYPE_DEFAULT: - case COMMAND_TYPE_CUSTOM: - case COMMAND_TYPE_FILE: - p->command_type = val; - break; - default: - p->command_type = COMMAND_TYPE_DEFAULT; - } -} - -command_t -stpui_plist_get_command_type(const stpui_plist_t *p) -{ - return p->command_type; -} - -void -stpui_plist_set_copy_count(stpui_plist_t *p, gint copy_count) -{ - if (copy_count > 0) - stp_set_int_parameter(p->v, copy_count_name, copy_count); -} - -gint -stpui_plist_get_copy_count(const stpui_plist_t *p) -{ - if (stp_check_int_parameter(p->v, copy_count_name, STP_PARAMETER_ACTIVE)) - return stp_get_int_parameter(p->v, copy_count_name); - else - return 1; -} - -void -stpui_set_image_type(const char *itype) -{ - image_type = g_strdup(itype); -} - -void -stpui_set_image_raw_channels(gint channels) -{ - image_raw_channels = channels; -} - -void -stpui_set_image_channel_depth(gint depth) -{ - image_channel_depth = depth; -} - -static void -writefunc(void *file, const char *buf, size_t bytes) -{ - FILE *prn = (FILE *)file; - fwrite(buf, 1, bytes, prn); -} - -static void -stpui_errfunc(void *file, const char *buf, size_t bytes) -{ - g_message(buf); -} - -void -stpui_printer_initialize(stpui_plist_t *printer) -{ - char tmp[32]; - stpui_plist_set_name(printer, ""); - stpui_plist_set_output_filename(printer, ""); - stpui_plist_set_queue_name(printer, ""); - stpui_plist_set_extra_printer_options(printer, ""); - stpui_plist_set_custom_command(printer, ""); - stpui_plist_set_current_standard_command(printer, ""); - printer->command_type = COMMAND_TYPE_DEFAULT; - printer->scaling = 100.0; - printer->orientation = ORIENT_AUTO; - printer->auto_size_roll_feed_paper = 0; - printer->unit = 0; - printer->v = stp_vars_create(); - stp_set_errfunc(printer->v, writefunc); - stp_set_errdata(printer->v, stderr); - stpui_plist_set_copy_count(printer, 1); - stp_set_string_parameter(printer->v, "InputImageType", image_type); - if (image_raw_channels) - { - (void) sprintf(tmp, "%d", image_raw_channels); - stp_set_string_parameter(printer->v, "RawChannels", tmp); - } - if (image_channel_depth) - { - (void) sprintf(tmp, "%d", image_channel_depth); - stp_set_string_parameter(printer->v, "ChannelBitDepth", tmp); - } - printer->invalid_mask = INVALID_TOP | INVALID_LEFT; -} - -static void -stpui_plist_destroy(stpui_plist_t *printer) -{ - SAFE_FREE(printer->name); - SAFE_FREE(printer->queue_name); - SAFE_FREE(printer->extra_printer_options); - SAFE_FREE(printer->custom_command); - SAFE_FREE(printer->current_standard_command); - SAFE_FREE(printer->output_filename); - stp_vars_destroy(printer->v); -} - -void -stpui_plist_copy(stpui_plist_t *vd, const stpui_plist_t *vs) -{ - if (vs == vd) - return; - stp_vars_copy(vd->v, vs->v); - vd->scaling = vs->scaling; - vd->orientation = vs->orientation; - vd->auto_size_roll_feed_paper = vs->auto_size_roll_feed_paper; - vd->unit = vs->unit; - vd->invalid_mask = vs->invalid_mask; - vd->command_type = vs->command_type; - stpui_plist_set_name(vd, stpui_plist_get_name(vs)); - stpui_plist_set_queue_name(vd, stpui_plist_get_queue_name(vs)); - stpui_plist_set_extra_printer_options(vd, stpui_plist_get_extra_printer_options(vs)); - stpui_plist_set_custom_command(vd, stpui_plist_get_custom_command(vs)); - stpui_plist_set_current_standard_command(vd, stpui_plist_get_current_standard_command(vs)); - stpui_plist_set_output_filename(vd, stpui_plist_get_output_filename(vs)); - stpui_plist_set_copy_count(vd, stpui_plist_get_copy_count(vs)); -} - -static stpui_plist_t * -allocate_stpui_plist_copy(const stpui_plist_t *vs) -{ - stpui_plist_t *rep = g_malloc(sizeof(stpui_plist_t)); - memset(rep, 0, sizeof(stpui_plist_t)); - rep->v = stp_vars_create(); - stpui_plist_copy(rep, vs); - return rep; -} - -static void -check_plist(int count) -{ - static int current_plist_size = 0; - int i; - if (count <= current_plist_size) - return; - else if (current_plist_size == 0) - { - current_plist_size = count; - stpui_plist = g_malloc(current_plist_size * sizeof(stpui_plist_t)); - for (i = 0; i < current_plist_size; i++) - { - memset(&(stpui_plist[i]), 0, sizeof(stpui_plist_t)); - stpui_printer_initialize(&(stpui_plist[i])); - } - } - else - { - int old_plist_size = current_plist_size; - current_plist_size *= 2; - if (current_plist_size < count) - current_plist_size = count; - stpui_plist = g_realloc(stpui_plist, current_plist_size * sizeof(stpui_plist_t)); - for (i = old_plist_size; i < current_plist_size; i++) - { - memset(&(stpui_plist[i]), 0, sizeof(stpui_plist_t)); - stpui_printer_initialize(&(stpui_plist[i])); - } - } -} - -#define GET_MANDATORY_INTERNAL_STRING_PARAM(param) \ -do { \ - if ((commaptr = strchr(lineptr, ',')) == NULL) \ - continue; \ - stpui_plist_set_##param##_n(&key, lineptr, commaptr - line); \ - lineptr = commaptr + 1; \ -} while (0) - -#define GET_MANDATORY_STRING_PARAM(param) \ -do { \ - if ((commaptr = strchr(lineptr, ',')) == NULL) \ - continue; \ - stp_set_##param##_n(key.v, lineptr, commaptr - line); \ - lineptr = commaptr + 1; \ -} while (0) - -static int -get_mandatory_string_param(stp_vars_t *v, const char *param, char **lineptr) -{ - char *commaptr = strchr(*lineptr, ','); - if (commaptr == NULL) - return 0; - stp_set_string_parameter_n(v, param, *lineptr, commaptr - *lineptr); - *lineptr = commaptr + 1; - return 1; -} - -static int -get_mandatory_file_param(stp_vars_t *v, const char *param, char **lineptr) -{ - char *commaptr = strchr(*lineptr, ','); - if (commaptr == NULL) - return 0; - stp_set_file_parameter_n(v, param, *lineptr, commaptr - *lineptr); - *lineptr = commaptr + 1; - return 1; -} - -#define GET_MANDATORY_INT_PARAM(param) \ -do { \ - if ((commaptr = strchr(lineptr, ',')) == NULL) \ - continue; \ - stp_set_##param(key.v, atoi(lineptr)); \ - lineptr = commaptr + 1; \ -} while (0) - -#define GET_MANDATORY_INTERNAL_INT_PARAM(param) \ -do { \ - if ((commaptr = strchr(lineptr, ',')) == NULL) \ - continue; \ - key.param = atoi(lineptr); \ - lineptr = commaptr + 1; \ -} while (0) - -static void -get_optional_string_param(stp_vars_t *v, const char *param, - char **lineptr, int *keepgoing) -{ - if (*keepgoing) - { - char *commaptr = strchr(*lineptr, ','); - if (commaptr == NULL) - { - stp_set_string_parameter(v, param, *lineptr); - *keepgoing = 0; - } - else - { - stp_set_string_parameter_n(v, param, *lineptr, commaptr - *lineptr); - *lineptr = commaptr + 1; - } - } -} - -#define GET_OPTIONAL_INT_PARAM(param) \ -do { \ - if ((keepgoing == 0) || ((commaptr = strchr(lineptr, ',')) == NULL)) \ - { \ - keepgoing = 0; \ - } \ - else \ - { \ - stp_set_##param(key.v, atoi(lineptr)); \ - lineptr = commaptr + 1; \ - } \ -} while (0) - -#define GET_OPTIONAL_INTERNAL_INT_PARAM(param) \ -do { \ - if ((keepgoing == 0) || ((commaptr = strchr(lineptr, ',')) == NULL)) \ - { \ - keepgoing = 0; \ - } \ - else \ - { \ - key.param = atoi(lineptr); \ - lineptr = commaptr + 1; \ - } \ -} while (0) - -#define IGNORE_OPTIONAL_PARAM(param) \ -do { \ - if ((keepgoing == 0) || ((commaptr = strchr(lineptr, ',')) == NULL)) \ - { \ - keepgoing = 0; \ - } \ - else \ - { \ - lineptr = commaptr + 1; \ - } \ -} while (0) - -static void -get_optional_float_param(stp_vars_t *v, const char *param, - char **lineptr, int *keepgoing) -{ - if (*keepgoing) - { - char *commaptr = strchr(*lineptr, ','); - if (commaptr == NULL) - { - stp_set_float_parameter(v, param, atof(*lineptr)); - *keepgoing = 0; - } - else - { - stp_set_float_parameter(v, param, atof(*lineptr)); - *lineptr = commaptr + 1; - } - } -} - -#define GET_OPTIONAL_INTERNAL_FLOAT_PARAM(param) \ -do { \ - if ((keepgoing == 0) || ((commaptr = strchr(lineptr, ',')) == NULL)) \ - { \ - keepgoing = 0; \ - } \ - else \ - { \ - key.param = atof(lineptr); \ - } \ -} while (0) - -static void * -psearch(const void *key, void *base, size_t nmemb, size_t size, - int (*compar)(const void *, const void *)) -{ - int i; - char *cbase = (char *) base; - for (i = 0; i < nmemb; i++) - { - if ((*compar)(key, (const void *) cbase) == 0) - return (void *) cbase; - cbase += size; - } - return NULL; -} - -stpui_plist_t * -stpui_plist_create(const char *name, const char *driver) -{ - stpui_plist_t key; - stpui_plist_t *answer = NULL; - memset(&key, 0, sizeof(key)); - stpui_printer_initialize(&key); - key.invalid_mask = 0; - stpui_plist_set_name(&key, name); - stp_set_driver(key.v, driver); - if (stpui_plist_add(&key, 0)) - answer = psearch(&key, stpui_plist, stpui_plist_count, - sizeof(stpui_plist_t), - (int (*)(const void *, const void *)) compare_printers); - SAFE_FREE(key.name); - SAFE_FREE(key.queue_name); - SAFE_FREE(key.extra_printer_options); - SAFE_FREE(key.custom_command); - SAFE_FREE(key.current_standard_command); - SAFE_FREE(key.output_filename); - stp_vars_destroy(key.v); - return answer; -} - -int -stpui_plist_add(const stpui_plist_t *key, int add_only) -{ - /* - * The format of the list is the File printer followed by a qsort'ed list - * of system printers. So, if we want to update the file printer, it is - * always first in the list, else call psearch. - */ - stpui_plist_t *p; - if (!stp_get_printer(key->v)) - stp_set_driver(key->v, "ps2"); - if (stp_get_printer(key->v)) - { - p = psearch(key, stpui_plist, stpui_plist_count, - sizeof(stpui_plist_t), - (int (*)(const void *, const void *)) compare_printers); - if (p == NULL) - { -#ifdef DEBUG - fprintf(stderr, "Adding new printer from printrc file: %s\n", - key->name); -#endif - check_plist(stpui_plist_count + 1); - p = stpui_plist + stpui_plist_count; - stpui_plist_count++; - stpui_plist_copy(p, key); - if (strlen(stpui_plist_get_queue_name(p)) == 0 && - stp_string_list_is_present(stpui_system_print_queues, - stpui_plist_get_name(p))) - stpui_plist_set_queue_name(p, stpui_plist_get_name(p)); - } - else - { - if (add_only) - return 0; -#ifdef DEBUG - fprintf(stderr, "Updating printer %s.\n", key->name); -#endif - stpui_plist_copy(p, key); - } - return 1; - } - else - { - fprintf(stderr, "No printer found!\n"); - return 0; - } -} - -static void -stpui_printrc_load_v0(FILE *fp) -{ - char line[1024]; /* Line in printrc file */ - char *lineptr; /* Pointer in line */ - char *commaptr; /* Pointer to next comma */ - stpui_plist_t key; /* Search key */ - int keepgoing = 1; - (void) memset(line, 0, 1024); - (void) memset(&key, 0, sizeof(stpui_plist_t)); - stpui_printer_initialize(&key); - key.name = g_strdup(_("File")); - while (fgets(line, sizeof(line), fp) != NULL) - { - /* - * Read old format printrc lines... - */ - - stpui_printer_initialize(&key); - key.invalid_mask = 0; - lineptr = line; - - /* - * Read the command-delimited printer definition data. Note that - * we can't use sscanf because %[^,] fails if the string is empty... - */ - - GET_MANDATORY_INTERNAL_STRING_PARAM(name); - GET_MANDATORY_INTERNAL_STRING_PARAM(custom_command); - GET_MANDATORY_STRING_PARAM(driver); - - if (! stp_get_printer(key.v)) - continue; - - if (!get_mandatory_file_param(key.v, "PPDFile", &lineptr)) - continue; - if ((commaptr = strchr(lineptr, ',')) != NULL) - { - switch (atoi(lineptr)) - { - case 1: - stp_set_string_parameter(key.v, "PrintingMode", "Color"); - break; - case 0: - default: - stp_set_string_parameter(key.v, "PrintingMode", "BW"); - break; - } - } - else - continue; - - if (!get_mandatory_string_param(key.v, "Resolution", &lineptr)) - continue; - if (!get_mandatory_string_param(key.v, "PageSize", &lineptr)) - continue; - if (!get_mandatory_string_param(key.v, "MediaType", &lineptr)) - continue; - - get_optional_string_param(key.v, "InputSlot", &lineptr, &keepgoing); - get_optional_float_param(key.v, "Brightness", &lineptr, &keepgoing); - - GET_OPTIONAL_INTERNAL_FLOAT_PARAM(scaling); - GET_OPTIONAL_INTERNAL_INT_PARAM(orientation); - GET_OPTIONAL_INT_PARAM(left); - GET_OPTIONAL_INT_PARAM(top); - get_optional_float_param(key.v, "Gamma", &lineptr, &keepgoing); - get_optional_float_param(key.v, "Contrast", &lineptr, &keepgoing); - get_optional_float_param(key.v, "Cyan", &lineptr, &keepgoing); - get_optional_float_param(key.v, "Magenta", &lineptr, &keepgoing); - get_optional_float_param(key.v, "Yellow", &lineptr, &keepgoing); - IGNORE_OPTIONAL_PARAM(linear); - IGNORE_OPTIONAL_PARAM(image_type); - get_optional_float_param(key.v, "Saturation", &lineptr, &keepgoing); - get_optional_float_param(key.v, "Density", &lineptr, &keepgoing); - get_optional_string_param(key.v, "InkType", &lineptr, &keepgoing); - get_optional_string_param(key.v,"DitherAlgorithm",&lineptr,&keepgoing); - GET_OPTIONAL_INTERNAL_INT_PARAM(unit); - stpui_plist_add(&key, 0); - g_free(key.name); - stp_vars_destroy(key.v); - } - stpui_plist_current = 0; -} - -static void -stpui_printrc_load_v1(FILE *fp) -{ - char line[1024]; /* Line in printrc file */ - stpui_plist_t key; /* Search key */ - char * current_printer = 0; /* printer to select */ - (void) memset(line, 0, 1024); - (void) memset(&key, 0, sizeof(stpui_plist_t)); - stpui_printer_initialize(&key); - key.name = g_strdup(_("File")); - while (fgets(line, sizeof(line), fp) != NULL) - { - /* - * Read new format printrc lines... - */ - - char *keyword, *end, *value; - - keyword = line; - for (keyword = line; isspace(*keyword); keyword++) - { - /* skip initial spaces... */ - } - if (!isalpha(*keyword)) - continue; - for (end = keyword; isalnum(*end) || *end == '-'; end++) - { - /* find end of keyword... */ - } - value = end; - while (isspace(*value)) - { - /* skip over white space... */ - value++; - } - if (*value != ':') - continue; - value++; - *end = '\0'; - while (isspace(*value)) - { - /* skip over white space... */ - value++; - } - for (end = value; *end && *end != '\n'; end++) - { - /* find end of line... */ - } - *end = '\0'; -#ifdef DEBUG - fprintf(stderr, "Keyword = `%s', value = `%s'\n", keyword, value); -#endif - if (strcasecmp("current-printer", keyword) == 0) - { - if (current_printer) - g_free (current_printer); - current_printer = g_strdup(value); - } - else if (strcasecmp("printer", keyword) == 0) - { - /* Switch to printer named VALUE */ - stpui_plist_add(&key, 0); -#ifdef DEBUG - fprintf(stderr, - "output_to is now %s\n", stpui_plist_get_output_to(&key)); -#endif - - stp_vars_destroy(key.v); - stpui_printer_initialize(&key); - key.invalid_mask = 0; - stpui_plist_set_name(&key, value); - } - else if (strcasecmp("destination", keyword) == 0) - stpui_plist_set_custom_command(&key, value); - else if (strcasecmp("driver", keyword) == 0) - stp_set_driver(key.v, value); - else if (strcasecmp("ppd-file", keyword) == 0) - stp_set_file_parameter(key.v, "PPDFile", value); - else if (strcasecmp("output-type", keyword) == 0) - { - switch (atoi(value)) - { - case 1: - stp_set_string_parameter(key.v, "PrintingMode", "Color"); - break; - case 0: - default: - stp_set_string_parameter(key.v, "PrintingMode", "BW"); - break; - } - } - else if (strcasecmp("media-size", keyword) == 0) - stp_set_string_parameter(key.v, "PageSize", value); - else if (strcasecmp("media-type", keyword) == 0) - stp_set_string_parameter(key.v, "MediaType", value); - else if (strcasecmp("media-source", keyword) == 0) - stp_set_float_parameter(key.v, "Brightness", atof(value)); - else if (strcasecmp("scaling", keyword) == 0) - key.scaling = atof(value); - else if (strcasecmp("orientation", keyword) == 0) - key.orientation = atoi(value); - else if (strcasecmp("left", keyword) == 0) - stp_set_left(key.v, atoi(value)); - else if (strcasecmp("top", keyword) == 0) - stp_set_top(key.v, atoi(value)); - else if (strcasecmp("linear", keyword) == 0) - /* Ignore linear */ - ; - else if (strcasecmp("image-type", keyword) == 0) - /* Ignore image type */ - ; - else if (strcasecmp("unit", keyword) == 0) - key.unit = atoi(value); - else if (strcasecmp("custom-page-width", keyword) == 0) - stp_set_page_width(key.v, atoi(value)); - else if (strcasecmp("custom-page-height", keyword) == 0) - stp_set_page_height(key.v, atoi(value)); - /* Special case Ink-Type and Dither-Algorithm */ - else if (strcasecmp("ink-type", keyword) == 0) - stp_set_string_parameter(key.v, "InkType", value); - else if (strcasecmp("dither-algorithm", keyword) == 0) - stp_set_string_parameter(key.v, "DitherAlgorithm", value); - else - { - stp_parameter_t desc; - stp_curve_t *curve; - stp_describe_parameter(key.v, keyword, &desc); - switch (desc.p_type) - { - case STP_PARAMETER_TYPE_STRING_LIST: - stp_set_string_parameter(key.v, keyword, value); - break; - case STP_PARAMETER_TYPE_FILE: - stp_set_file_parameter(key.v, keyword, value); - break; - case STP_PARAMETER_TYPE_DOUBLE: - stp_set_float_parameter(key.v, keyword, atof(value)); - break; - case STP_PARAMETER_TYPE_INT: - stp_set_int_parameter(key.v, keyword, atoi(value)); - break; - case STP_PARAMETER_TYPE_BOOLEAN: - stp_set_boolean_parameter(key.v, keyword, atoi(value)); - break; - case STP_PARAMETER_TYPE_CURVE: - curve = stp_curve_create_from_string(value); - if (curve) - { - stp_set_curve_parameter(key.v, keyword, curve); - stp_curve_destroy(curve); - } - break; - default: - if (strlen(value)) - { - char buf[1024]; - snprintf(buf, sizeof(buf), - "Unrecognized keyword `%s' in printrc; value `%s' (%d)\n", - keyword, value, desc.p_type); - } - } - stp_parameter_description_destroy(&desc); - } - } - if (strlen(key.name) > 0) - { - stpui_plist_add(&key, 0); - stp_vars_destroy(key.v); - g_free(key.name); - } - if (current_printer) - { - int i; - for (i = 0; i < stpui_plist_count; i ++) - if (strcmp(current_printer, stpui_plist[i].name) == 0) - stpui_plist_current = i; - } -} - -char *stpui_printrc_current_printer = NULL; -extern FILE *yyin; -extern int yyparse(void); - -static void -stpui_printrc_load_v2(FILE *fp) -{ - int retval; - char *locale; - yyin = fp; - - stpui_printrc_current_printer = NULL; - setlocale(LC_ALL, "C"); - retval = yyparse(); - setlocale(LC_ALL, ""); - if (stpui_printrc_current_printer) - { - int i; - for (i = 0; i < stpui_plist_count; i ++) - { - if (strcmp(stpui_printrc_current_printer, stpui_plist[i].name) == 0) - stpui_plist_current = i; - if (!stp_check_boolean_parameter(stpui_plist[i].v, - "PageSizeExtended", - STP_PARAMETER_ACTIVE)) - stp_set_boolean_parameter(stpui_plist[i].v, "PageSizeExtended", 0); - } - SAFE_FREE(stpui_printrc_current_printer); - } -} - -/* - * 'stpui_printrc_load()' - Load the printer resource configuration file. - */ -void -stpui_printrc_load(void) -{ - FILE *fp; /* Printrc file */ - char line[1024]; /* Line in printrc file */ - int format = 0; /* rc file format version */ - const char *filename = stpui_get_printrc_file(); - - initialize_default_parameters(); - check_plist(1); - - /* - * Get the printer list... - */ - - stpui_get_system_printers(); - - if ((fp = fopen(filename, "r")) != NULL) - { - (void) memset(line, 0, 1024); - if (fgets(line, sizeof(line), fp) != NULL) - { - /* Force locale to "C", so that numbers scan correctly */ - setlocale(LC_ALL, "C"); - if (strncmp("#PRINTRCv", line, 9) == 0) - { -#ifdef DEBUG - fprintf(stderr, "Found printrc version tag: `%s'\n", line); - fprintf(stderr, "Version number: `%s'\n", &(line[9])); -#endif - (void) sscanf(&(line[9]), "%d", &format); - } - setlocale(LC_ALL, ""); - } - rewind(fp); - switch (format) - { - case 0: - stpui_printrc_load_v0(fp); - break; - case 1: - stpui_printrc_load_v1(fp); - break; - case 2: - case 3: - case 4: - stpui_printrc_load_v2(fp); - break; - } - (void) fclose(fp); - } - if (stpui_plist_count == 0) - stpui_plist_create(_("Printer"), "ps2"); -} - -/* - * 'stpui_printrc_save()' - Save the current printer resource configuration. - */ -void -stpui_printrc_save(void) -{ - FILE *fp; /* Printrc file */ - int i; /* Looping var */ - size_t global_settings_count = stp_string_list_count(default_parameters); - stpui_plist_t *p; /* Current printer */ - const char *filename = stpui_get_printrc_file(); - - - if ((fp = fopen(filename, "w")) != NULL) - { - /* - * Write the contents of the printer list... - */ - - /* Force locale to "C", so that numbers print correctly */ - setlocale(LC_ALL, "C"); -#ifdef DEBUG - fprintf(stderr, "Number of printers: %d\n", stpui_plist_count); -#endif - - fputs("#PRINTRCv4 written by Gutenprint " PLUG_IN_VERSION "\n\n", fp); - - fprintf(fp, "Global-Settings:\n"); - fprintf(fp, " Current-Printer: \"%s\"\n", - stpui_plist[stpui_plist_current].name); - fprintf(fp, " Show-All-Paper-Sizes: %s\n", - stpui_show_all_paper_sizes ? "True" : "False"); - for (i = 0; i < global_settings_count; i++) - { - stp_param_string_t *ps = stp_string_list_param(default_parameters, i); - fprintf(fp, " %s \"%s\"\n", ps->name, ps->text); - } - fprintf(fp, "End-Global-Settings:\n"); - - for (i = 0, p = stpui_plist; i < stpui_plist_count; i ++, p ++) - { - int count; - int j; - stp_parameter_list_t *params = stp_get_parameter_list(p->v); - count = stp_parameter_list_count(params); - fprintf(fp, "\nPrinter: \"%s\" \"%s\"\n", - p->name, stp_get_driver(p->v)); - fprintf(fp, " Command-Type: %d\n", p->command_type); - fprintf(fp, " Queue-Name: \"%s\"\n", p->queue_name); - fprintf(fp, " Output-Filename: \"%s\"\n", p->output_filename); - fprintf(fp, " Extra-Printer-Options: \"%s\"\n", p->extra_printer_options); - fprintf(fp, " Custom-Command: \"%s\"\n", p->custom_command); - fprintf(fp, " Scaling: %.3f\n", p->scaling); - fprintf(fp, " Orientation: %d\n", p->orientation); - fprintf(fp, " Autosize-Roll-Paper: %d\n", p->auto_size_roll_feed_paper); - fprintf(fp, " Unit: %d\n", p->unit); - - fprintf(fp, " Left: %d\n", stp_get_left(p->v)); - fprintf(fp, " Top: %d\n", stp_get_top(p->v)); - fprintf(fp, " Custom_Page_Width: %d\n", stp_get_page_width(p->v)); - fprintf(fp, " Custom_Page_Height: %d\n", stp_get_page_height(p->v)); - fprintf(fp, " Parameter %s Int True %d\n", copy_count_name, - stpui_plist_get_copy_count(p)); - - for (j = 0; j < count; j++) - { - const stp_parameter_t *param = stp_parameter_list_param(params, j); - if (strcmp(param->name, "AppGamma") == 0) - continue; - switch (param->p_type) - { - case STP_PARAMETER_TYPE_STRING_LIST: - if (stp_check_string_parameter(p->v, param->name, - STP_PARAMETER_INACTIVE)) - fprintf(fp, " Parameter %s String %s \"%s\"\n", - param->name, - ((stp_get_string_parameter_active - (p->v, param->name) == STP_PARAMETER_ACTIVE) ? - "True" : "False"), - stp_get_string_parameter(p->v, param->name)); - break; - case STP_PARAMETER_TYPE_FILE: - if (stp_check_file_parameter(p->v, param->name, - STP_PARAMETER_INACTIVE)) - fprintf(fp, " Parameter %s File %s \"%s\"\n", param->name, - ((stp_get_file_parameter_active - (p->v, param->name) == STP_PARAMETER_ACTIVE) ? - "True" : "False"), - stp_get_file_parameter(p->v, param->name)); - break; - case STP_PARAMETER_TYPE_DOUBLE: - if (stp_check_float_parameter(p->v, param->name, - STP_PARAMETER_INACTIVE)) - fprintf(fp, " Parameter %s Double %s %f\n", param->name, - ((stp_get_float_parameter_active - (p->v, param->name) == STP_PARAMETER_ACTIVE) ? - "True" : "False"), - stp_get_float_parameter(p->v, param->name)); - break; - case STP_PARAMETER_TYPE_DIMENSION: - if (stp_check_dimension_parameter(p->v, param->name, - STP_PARAMETER_INACTIVE)) - fprintf(fp, " Parameter %s Dimension %s %d\n", param->name, - ((stp_get_dimension_parameter_active - (p->v, param->name) == STP_PARAMETER_ACTIVE) ? - "True" : "False"), - stp_get_dimension_parameter(p->v, param->name)); - break; - case STP_PARAMETER_TYPE_INT: - if (stp_check_int_parameter(p->v, param->name, - STP_PARAMETER_INACTIVE)) - fprintf(fp, " Parameter %s Int %s %d\n", param->name, - ((stp_get_int_parameter_active - (p->v, param->name) == STP_PARAMETER_ACTIVE) ? - "True" : "False"), - stp_get_int_parameter(p->v, param->name)); - break; - case STP_PARAMETER_TYPE_BOOLEAN: - if (stp_check_boolean_parameter(p->v, param->name, - STP_PARAMETER_INACTIVE)) - fprintf(fp, " Parameter %s Boolean %s %s\n", param->name, - ((stp_get_boolean_parameter_active - (p->v, param->name) == STP_PARAMETER_ACTIVE) ? - "True" : "False"), - (stp_get_boolean_parameter(p->v, param->name) ? - "True" : "False")); - break; - case STP_PARAMETER_TYPE_CURVE: - if (stp_check_curve_parameter(p->v, param->name, - STP_PARAMETER_INACTIVE)) - { - const stp_curve_t *curve = - stp_get_curve_parameter(p->v, param->name); - if (curve) - { - fprintf(fp, " Parameter %s Curve %s '", - param->name, - ((stp_get_curve_parameter_active - (p->v, param->name) == - STP_PARAMETER_ACTIVE) ? - "True" : "False")); - stp_curve_write(fp, curve); - fprintf(fp, "'\n"); - } - } - break; - default: - break; - } - } - stp_parameter_list_destroy(params); -#ifdef DEBUG - fprintf(stderr, "Wrote printer %d: %s\n", i, p->name); -#endif - } - setlocale(LC_ALL, ""); - fclose(fp); - } - else - fprintf(stderr, "could not open printrc file \"%s\"\n",filename); -} - -/* - * 'compare_printers()' - Compare system printer names for qsort(). - */ - -static int -compare_printers(stpui_plist_t *p1, stpui_plist_t *p2) -{ - return (strcmp(p1->name, p2->name)); -} - -/* - * 'stpui_get_system_printers()' - Get a complete list of printers from the spooler. - */ - -void -stpui_get_system_printers(void) -{ - FILE *pfile; /* Pipe to status command */ - char line[1025]; /* Line from status command */ - - stpui_system_print_queues = stp_string_list_create(); - stp_string_list_add_string(stpui_system_print_queues, "", - _("(Default Printer)")); - - /* - * Run the command, if any, to get the available printers... - */ - - identify_print_system(); - if (global_printing_system) - { - if ((pfile = popen(global_printing_system->scan_command, "r")) != NULL) - { - /* - * Read input as needed... - */ - - while (fgets(line, sizeof(line), pfile) != NULL) - { - char *tmp_ptr; - if ((tmp_ptr = strchr(line, '\n'))) - tmp_ptr[0] = '\0'; - if ((tmp_ptr = strchr(line, '\r'))) - tmp_ptr[0] = '\0'; - if (strlen(line) > 0) - { - if (!stp_string_list_is_present(stpui_system_print_queues, line)) - stp_string_list_add_string(stpui_system_print_queues, - line, line); - } - } - pclose(pfile); - } - } -} - -const stpui_plist_t * -stpui_get_current_printer(void) -{ - return &(stpui_plist[stpui_plist_current]); -} - -/* - * 'usr1_handler()' - Make a note when we receive SIGUSR1. - */ - -static volatile int usr1_interrupt; - -static void -usr1_handler (int sig) -{ - usr1_interrupt = 1; -} - -/* - * - * Process control for actually printing. Documented 20040821 - * by Robert Krawitz. - * - * In addition to the print command itself and the output generator, - * we spawn two additional processes to monitor the print job and clean - * up. We do this because the GIMP is very unfriendly about how it - * terminates plugins when the user cancels an operation: it sends a - * SIGKILL, which prevents the plugin from cleaning up. Since the - * plugin is sending data to an lpr process, this SIGKILL closes off - * the input to lpr. lpr doesn't know that its parent has died - * inappropriately, and happily proceeds to print the partial job. - * - * (The child may not actually be lpr, of course, but we'll just use - * that nomenclature for convenience.) - * - * The first such process is the "lpr monitor". Its job is to - * watch the parent (the actual data generator). If its parent dies, - * it kills the print command. Notice that it must keep the file - * descriptor used to write to the lpr process open, since as soon as - * the last writer to this pipe is closed, the lpr process sees its - * input close. Therefore, it first kills the child with SIGTERM and - * then closes the pipe. Perhaps a more robust method would be to - * send a SIGTERM followed by a SIGKILL, but we can worry about that - * later. The lpr monitor process is killed with SIGUSR1 by the - * master upon successful completion, at which point it exits. The lpr - * monitor itself detects that the master has finished by periodically - * sending it a kill 0 (a null signal). When the parent exits, this - * attempt to signal will return failure. This has a potential race - * condition if another process is created with the same PID between - * checks. A more robust (but more complicated) solution would involve - * IPC of some kind. - * - * The second such process (the "error monitor") monitors the stderr - * (and stdout) of the lpr process, to send any error messages back - * to the user. Since the GIMP is normally not launched from a - * terminal window, any errors would get lost. The error monitor - * captures this output and reports it back. It stays around until - * its input is closed (normally by the lpr process exiting), at - * which point it reports to the master that it has finished, and the - * master can clean up and return. - * - * The actual master process spawns the lpr monitor, which spawns - * the process that will later run the lpr command, which itself - * spawns the error monitor. - * - * This architecture is perhaps unnecessarily complex; the lpr monitor - * and error monitor could perhaps be combined into a single process - * that watches both for the parent to go away and for the error messages. - * - * The following diagrams illustrate the control flow during the normal - * case and also when the print job is cancelled. The notation for file - * descriptors is a number prefixed with < for an input file descriptor - * and suffixed > for an output file descriptor. For example, <0 means - * input file descriptor 0 and 1> means output file descriptor 1. The - * key to the file descriptors is given below. A file descriptor named - * x,y refers to file descriptor y duplicated onto file descriptor x. - * So "<0,3" means input file descriptor 3 (pipefd[0]) dup2'ed onto - * file descriptor 0. - * - * fd0 = fd 0 - * fd1 = fd 1 - * fd2 = fd 2 - * fd3 = pipefd[0] - * fd4 = pipefd[1] - * fd5 = syncfd[0] - * fd6 = syncfd[1] - * fd7 = errfd[0] - * fd8 = errfd[1] - * - * - * NORMAL CASE - * - * PARENT CHILD 1 CHILD 2 CHILD 3 - * (print generator) (lpr monitor) (print command) (error monitor) - * | - * stpui_print - * | - * | <0 1> 2> - * | - * | pipe(syncfd) - * | - * | <0 1> 2> <5 6> - * | - * | pipe(pipefd) - * | - * | <0 1> 2> <3 4> - * | <5 6> - * | - * | fork =============| - * | | - * | close(63) | close(syncfd[0]) - * | | <0 1> 2> <3 4> - * | <0 1> 2> 4> <5 | 6> - * | | - * | | fork =============| - * | | | - * | | close(01263) | dup2(pipefd[0], 0) - * | | | close(pipefd[0] - * | | 4> | close(pipefd[1] - * | | | - * | | | 1> 2> <0,3 6> - * | | | - * | | | pipe(errfd) - * | | | 1> 2> <0,3 6> - * | | | <7 8> - * | | | - * | | | fork =============| - * | | | | close(012348) - * | | | close(12) | 6> <7 - * | | | | - * | | | <0,3 6> <7 8> | - * | | | | - * | | | dup2(errfd[1],1) | - * | | | dup2(errfd[1],2) | - * | | | close(errfd[1]) | - * | | | close(pipefd[0]) | - * | | | close(pipefd[1]) | - * | | | close(syncfd[1]) | - * |<<<<<<<<<<<<<<<<<<<|kill(0,0) * EXEC lpr | - * |>>>>>>>>>>>>>>>>>>>|OK | <0,3 1,8> 2,8> | - * | | | | - * | write>>>>>>>>>>>>>+>>>>>>>>>>>>>>>>>>>| | - * | | | write(2,8)??>>>>>>|read(<7)->warn - * | | | | - * | close(4)>>>>>>>>>>+>>>>>>>>>>>>>>>>>>>| | - * | <0 1> 2> <5 | | | - * | kill>>>>>>>>>>>>>>| | | - * | | close(4)>>>>>>>>>>| eof(<0,3) | - * | | | | - * | | *no open fd* | 1,8> 2,8> | - * | | exit | | - * | | | exit>>>>>>>>>>>>>>| eof(<7) - * | wait<<<<<<<<<<<<< - * | | - * | read(<5)<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<| write(6>) - * | | - * | close(5) | exit - * | X - * | 0< 1> 2> - * | - * | return - * X - * - * - * ERROR CASE (job cancelled) - * - * PARENT CHILD 1 CHILD 2 CHILD 3 - * (print generator) (lpr monitor) (print command) (error monitor) - * | - * stpui_print - * | - * | <0 1> 2> - * | - * | pipe(syncfd) - * | - * | <0 1> 2> <5 6> - * | - * | pipe(pipefd) - * | - * | <0 1> 2> <3 4> - * | <5 6> - * | - * | fork =============| - * | | - * | close(63) | close(syncfd[0] - * | | <0 1> 2> <3 4> - * | <0 1> 2> 4> <5 | 6> - * | | - * | | fork =============| - * | | | - * | | close(01263) | dup2(pipefd[0], 0) - * | | | close(pipefd[0] - * | | 4> | close(pipefd[1] - * | | | - * | | | 1> 2> <3,0 6> - * | | | - * | | | pipe(errfd) - * | | | 1> 2> <3,0 6> - * | | | <7 8> - * | | | - * | | | fork =============| - * | | | | close(012348) - * | | | close(12) | 6> <7 - * | | | | - * | | | <3,0 6> <7 8> | - * | | | | - * | | | dup2(errfd[1],1) | - * | | | dup2(errfd[1],2) | - * | | | close(3468) | - * |<<<<<<<<<<<<<<<<<<<|kill(0,0) * EXEC lpr | - * |>>>>>>>>>>>>>>>>>>>|OK | <0,3 1,8> 2,8> | - * | | | | - * | write>>>>>>>>>>>>>+>>>>>>>>>>>>>>>>>>>| | - * | | | write(2,8)??>>>>>>|read(<7)->warn - * | KILLED | | | - * | close(01245)>>>>>>+>>>>>>>>>>>>>>>>>>>| | - * X | | | - * <<<<<<<<<<<<<<<<<<<|kill(0,0) | | - * >>>>>>>>>>>>>>>>>>>|DEAD! | | - * |kill(2)>>>>>>>>>>>>|Terminated | - * |close(4>)>>>>>>>>>>|eof(0,3) | - * | | 1,8> 2,8> | - * | *no open fd* |exit>>>>>>>>>>>>>>>|eof(7) - * | exit X | - * X | 6> - * <| write(6) - * | exit/SIGPIPE - * X - */ - -int -stpui_print(const stpui_plist_t *printer, stpui_image_t *image) -{ - int ppid = getpid (), /* PID of plugin */ - opid, /* PID of output process */ - cpid = 0, /* PID of control/monitor process */ - pipefd[2], /* Fds of the pipe connecting all the above */ - errfd[2], /* Message logger from lp command */ - syncfd[2]; /* Sync the logger */ - FILE *prn = NULL; /* Print file/command */ - int do_sync = 0; - int print_status = 0; - int dummy; - - /* - * Open the file/execute the print command... - */ - - if (stpui_plist_get_command_type(printer) == COMMAND_TYPE_DEFAULT || - stpui_plist_get_command_type(printer) == COMMAND_TYPE_CUSTOM) - { - /* - * The following IPC code is only necessary because the GIMP kills - * plugins with SIGKILL if its "Cancel" button is pressed; this - * gives the plugin no chance whatsoever to clean up after itself. - */ - do_sync = 1; - usr1_interrupt = 0; - signal (SIGUSR1, usr1_handler); - if (pipe (syncfd) != 0) - { - do_sync = 0; - } - if (pipe (pipefd) != 0) - { - prn = NULL; - } - else - { - cpid = fork (); - if (cpid < 0) /* Error */ - { - do_sync = 0; - prn = NULL; - } - else if (cpid == 0) /* Child 1 (lpr monitor and printer command) */ - { - /* LPR monitor process. Printer output is piped to us. */ - close(syncfd[0]); - opid = fork (); - if (opid < 0) - { - /* Errors will cause the plugin to get a SIGPIPE. */ - exit (1); - } - else if (opid == 0) /* Child 2 (printer command) */ - { - dup2 (pipefd[0], 0); - close (pipefd[0]); - close (pipefd[1]); - if (pipe(errfd) == 0) - { - opid = fork(); - if (opid < 0) - _exit(1); - else if (opid == 0) /* Child 3 (monitors stderr) */ - { - stp_outfunc_t errfunc = stpui_get_errfunc(); - void *errdata = stpui_get_errdata(); - /* calls g_message on anything it sees */ - char buf[4096]; - - close (pipefd[0]); - close (pipefd[1]); - close (0); - close (1); - close (2); - close (errfd[1]); - while (1) - { - ssize_t bytes = read(errfd[0], buf, 4095); - if (bytes > 0) - { - buf[bytes] = '\0'; - (*errfunc)(errdata, buf, bytes); - } - else - { - if (bytes < 0) - { - snprintf(buf, 4095, - "Read messages failed: %s\n", - strerror(errno)); - (*errfunc)(errdata, buf, strlen(buf)); - } - write(syncfd[1], "Done", 5); - _exit(0); - } - } - /* NOTREACHED */ - write(syncfd[1], "Done", 5); - _exit(0); - } - else /* Child 2 (printer command) */ - { - char *command; - if (stpui_plist_get_command_type(printer) == - COMMAND_TYPE_DEFAULT) - { - command = - stpui_build_standard_print_command - (printer, stp_get_printer(printer->v)); - append_external_options(&command, printer->v); - } - else - command = - (char *) stpui_plist_get_custom_command(printer); - (void) close(2); - (void) close(1); - dup2 (errfd[1], 2); - dup2 (errfd[1], 1); - close(errfd[1]); - close (pipefd[0]); - close (pipefd[1]); - close(syncfd[1]); - execl("/bin/sh", "/bin/sh", "-c", command, NULL); - /* NOTREACHED */ - _exit (1); - } - /* NOTREACHED */ - _exit(1); - } - else /* pipe() failed! */ - { - _exit(1); - } - } - else /* Child 1 (lpr monitor) */ - { - /* - * If the print plugin gets SIGKILLed by gimp, we kill lpr - * in turn. If the plugin signals us with SIGUSR1 that it's - * finished printing normally, we close our end of the pipe, - * and go away. - * - * Note that we keep pipefd[1] -- which is the pipe from - * the print plugin to the lpr process -- open during this. - * If we don't, and the parent gets killed, lpr will notice - * its stdin getting closed off and start printing. - * This way its stdin stays open until we kill it. - */ - close (0); - close (1); - close (2); - close (syncfd[1]); - close (pipefd[0]); - while (usr1_interrupt == 0) - { - /* - * Note potential race condition, if some other process - * happens to get the same pid! - */ - if (kill (ppid, 0) < 0) - { - /* - * The print plugin has been killed! - * Note that there is no possibility of the print - * job sending us a SIGUSR1 and then exiting; - * the parent (print plugin) stays around after - * sending us the SIGUSR1, and then waits - * for us to die. - */ - kill (opid, SIGTERM); - waitpid (opid, &dummy, 0); - close (pipefd[1]); - /* - * We do not want to allow cleanup before exiting. - * The exiting parent has already closed the - * connection to the X server; if we try to clean - * up, we'll notice that fact and complain. - */ - _exit (0); - } - sleep (5); - } - /* We got SIGUSR1. */ - close (pipefd[1]); - /* - * We do not want to allow cleanup before exiting. - * The exiting parent has already closed the connection - * to the X server; if we try to clean up, we'll notice - * that fact and complain. - */ - _exit (0); - } - } - else /* Parent (actually generates the output) */ - { - close (syncfd[1]); - close (pipefd[0]); - /* Parent process. We generate the printer output. */ - prn = fdopen (pipefd[1], "w"); - /* and fall through... */ - } - } - } - else - prn = fopen (stpui_plist_get_output_filename(printer), "wb"); - - if (prn != NULL) - { - char tmp[32]; - stpui_plist_t *np = allocate_stpui_plist_copy(printer); - const stp_vars_t *current_vars = - stp_printer_get_defaults(stp_get_printer(np->v)); - int orientation; - stp_merge_printvars(np->v, current_vars); - stp_set_string_parameter(np->v, "InputImageType", image_type); - if (image_raw_channels) - { - sprintf(tmp, "%d", image_raw_channels); - stp_set_string_parameter(np->v, "RawChannels", tmp); - } - sprintf(tmp, "%d", image_channel_depth); - stp_set_string_parameter(np->v, "ChannelBitDepth", tmp); - - /* - * Set up the orientation - */ - orientation = np->orientation; - if (orientation == ORIENT_AUTO) - orientation = stpui_compute_orientation(); - switch (orientation) - { - case ORIENT_PORTRAIT: - break; - case ORIENT_LANDSCAPE: - if (image->rotate_cw) - (image->rotate_cw)(image); - break; - case ORIENT_UPSIDEDOWN: - if (image->rotate_180) - (image->rotate_180)(image); - break; - case ORIENT_SEASCAPE: - if (image->rotate_ccw) - (image->rotate_ccw)(image); - break; - } - - /* - * Finally, call the print driver to send the image to the printer - * and close the output file/command... - */ - - stp_set_outfunc(np->v, writefunc); - stp_set_errfunc(np->v, stpui_get_errfunc()); - stp_set_outdata(np->v, prn); - stp_set_errdata(np->v, stpui_get_errdata()); - print_status = stp_print(np->v, &(image->im)); - - /* - * Note that we do not use popen() to create the output, therefore - * we do not use pclose() to close it. See bug 1013565. - */ - (void) fclose(prn); - if (stpui_plist_get_command_type(printer) == COMMAND_TYPE_DEFAULT || - stpui_plist_get_command_type(printer) == COMMAND_TYPE_CUSTOM) - { - /* - * It is important for us to first close off the lpr process, - * then kill the lpr monitor (child 1), and then wait for it - * to die before exiting. - */ - kill (cpid, SIGUSR1); - waitpid (cpid, &dummy, 0); - } - - /* - * Make sure that any errors have been reported back to the user - * prior to completion. In addition, explicitly close off the - * synchronization file descriptor since we're merely returning, - * not exiting, and don't want to leave any pollution around. - */ - if (do_sync) - { - char buf[8]; - (void) read(syncfd[0], buf, 8); - (void) close(syncfd[0]); - } - stpui_plist_destroy(np); - g_free(np); - return 1; - } - return 0; -} - -/* - * End of "$Id: plist.c,v 1.3.6.2 2007/12/15 20:35:42 rlk Exp $". - */ diff --git a/src/gutenprintui/print-image-thumbnail.c b/src/gutenprintui/print-image-thumbnail.c deleted file mode 100644 index e692d55..0000000 --- a/src/gutenprintui/print-image-thumbnail.c +++ /dev/null @@ -1,130 +0,0 @@ -/* - * "$Id: print-image-thumbnail.c,v 1.1 2004/09/17 18:38:14 rleigh Exp $" - * - * Print plug-in for the GIMP. - * - * Copyright 1997-2000 Michael Sweet (mike@easysw.com) and - * Robert Krawitz (rlk@alum.mit.edu) - * Copyright 2000 Charles Briscoe-Smith - * - * 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 -#endif -#include -#include - -#include -#include "gutenprintui-internal.h" - -/* Concrete type to represent image */ -typedef struct -{ - const guchar *data; - gint w, h, bpp; - gint32 real_bpp; -} thumbnail_image_t; - -static const char *Thumbnail_get_appname(stp_image_t *image); -static void Thumbnail_conclude(stp_image_t *image); -static stp_image_status_t Thumbnail_get_row(stp_image_t *image, - unsigned char *data, - size_t byte_limit, int row); -static int Thumbnail_height(stp_image_t *image); -static int Thumbnail_width(stp_image_t *image); -static void Thumbnail_reset(stp_image_t *image); -static void Thumbnail_init(stp_image_t *image); - -static stp_image_t theImage = -{ - Thumbnail_init, - Thumbnail_reset, - Thumbnail_width, - Thumbnail_height, - Thumbnail_get_row, - Thumbnail_get_appname, - Thumbnail_conclude, - NULL -}; - -stp_image_t * -stpui_image_thumbnail_new(const guchar *data, gint w, gint h, gint bpp) -{ - thumbnail_image_t *im; - if (! theImage.rep) - theImage.rep = stp_malloc(sizeof(thumbnail_image_t)); - im = (thumbnail_image_t *) (theImage.rep); - memset(im, 0, sizeof(thumbnail_image_t)); - im->data = data; - im->w = w; - im->h = h; - im->bpp = bpp; - - theImage.reset(&theImage); - return &theImage; -} - -static int -Thumbnail_width(stp_image_t *image) -{ - thumbnail_image_t *im = (thumbnail_image_t *) (image->rep); - return im->w; -} - -static int -Thumbnail_height(stp_image_t *image) -{ - thumbnail_image_t *im = (thumbnail_image_t *) (image->rep); - return im->h; -} - -static stp_image_status_t -Thumbnail_get_row(stp_image_t *image, unsigned char *data, - size_t byte_limit, int row) -{ - thumbnail_image_t *im = (thumbnail_image_t *) (image->rep); - const guchar *where = im->data + (row * im->w * im->bpp); - memcpy(data, where, im->w * im->bpp); - return STP_IMAGE_STATUS_OK; -} - -static void -Thumbnail_init(stp_image_t *image) -{ - /* Nothing to do. */ -} - -static void -Thumbnail_reset(stp_image_t *image) -{ -} - -static void -Thumbnail_conclude(stp_image_t *image) -{ -} - -static const char * -Thumbnail_get_appname(stp_image_t *image) -{ - static char pluginname[] = "Thumbnail V" VERSION " - " RELEASE_DATE; - return pluginname; -} - -/* - * End of "$Id: print-image-thumbnail.c,v 1.1 2004/09/17 18:38:14 rleigh Exp $". - */ diff --git a/src/gutenprintui/printrc.h b/src/gutenprintui/printrc.h deleted file mode 100644 index 9cf2ada..0000000 --- a/src/gutenprintui/printrc.h +++ /dev/null @@ -1,44 +0,0 @@ -/* - * "$Id: printrc.h,v 1.1 2004/09/17 18:38:14 rleigh Exp $" - * - * Print plug-in for the GIMP. - * - * Copyright 1997-2000 Michael Sweet (mike@easysw.com), - * Robert Krawitz (rlk@alum.mit.edu). and Steve Miller (smiller@rni.net - * - * 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. - * - * - * Revision History: - * - * See ChangeLog - */ - -#ifndef __GIMP_PRINT_PRINTRC_H__ -#define __GIMP_PRINT_PRINTRC_H__ - -#if ! defined (YYSTYPE) && ! defined (YYSTYPE_IS_DECLARED) -typedef union yylv { - int ival; - double dval; - char *sval; -} YYSTYPE; -# define yystype YYSTYPE /* obsolescent; will be withdrawn */ -# define YYSTYPE_IS_DECLARED 1 -#endif - -#include "printrcy.h" - -#endif /* __GIMP_PRINT_PRINTRC_H__ */ diff --git a/src/gutenprintui/printrcl.c b/src/gutenprintui/printrcl.c deleted file mode 100644 index 075fa0a..0000000 --- a/src/gutenprintui/printrcl.c +++ /dev/null @@ -1,2118 +0,0 @@ - -#line 3 "printrcl.c" - -#define YY_INT_ALIGNED short int - -/* A lexical scanner generated by flex */ - -#define FLEX_SCANNER -#define YY_FLEX_MAJOR_VERSION 2 -#define YY_FLEX_MINOR_VERSION 5 -#define YY_FLEX_SUBMINOR_VERSION 33 -#if YY_FLEX_SUBMINOR_VERSION > 0 -#define FLEX_BETA -#endif - -/* First, we deal with platform-specific or compiler-specific issues. */ - -/* begin standard C headers. */ -#include -#include -#include -#include - -/* end standard C headers. */ - -/* flex integer type definitions */ - -#ifndef FLEXINT_H -#define FLEXINT_H - -/* C99 systems have . Non-C99 systems may or may not. */ - -#if __STDC_VERSION__ >= 199901L - -/* C99 says to define __STDC_LIMIT_MACROS before including stdint.h, - * if you want the limit (max/min) macros for int types. - */ -#ifndef __STDC_LIMIT_MACROS -#define __STDC_LIMIT_MACROS 1 -#endif - -#include -typedef int8_t flex_int8_t; -typedef uint8_t flex_uint8_t; -typedef int16_t flex_int16_t; -typedef uint16_t flex_uint16_t; -typedef int32_t flex_int32_t; -typedef uint32_t flex_uint32_t; -#else -typedef signed char flex_int8_t; -typedef short int flex_int16_t; -typedef int flex_int32_t; -typedef unsigned char flex_uint8_t; -typedef unsigned short int flex_uint16_t; -typedef unsigned int flex_uint32_t; -#endif /* ! C99 */ - -/* Limits of integral types. */ -#ifndef INT8_MIN -#define INT8_MIN (-128) -#endif -#ifndef INT16_MIN -#define INT16_MIN (-32767-1) -#endif -#ifndef INT32_MIN -#define INT32_MIN (-2147483647-1) -#endif -#ifndef INT8_MAX -#define INT8_MAX (127) -#endif -#ifndef INT16_MAX -#define INT16_MAX (32767) -#endif -#ifndef INT32_MAX -#define INT32_MAX (2147483647) -#endif -#ifndef UINT8_MAX -#define UINT8_MAX (255U) -#endif -#ifndef UINT16_MAX -#define UINT16_MAX (65535U) -#endif -#ifndef UINT32_MAX -#define UINT32_MAX (4294967295U) -#endif - -#endif /* ! FLEXINT_H */ - -#ifdef __cplusplus - -/* The "const" storage-class-modifier is valid. */ -#define YY_USE_CONST - -#else /* ! __cplusplus */ - -#if __STDC__ - -#define YY_USE_CONST - -#endif /* __STDC__ */ -#endif /* ! __cplusplus */ - -#ifdef YY_USE_CONST -#define yyconst const -#else -#define yyconst -#endif - -/* Returned upon end-of-file. */ -#define YY_NULL 0 - -/* Promotes a possibly negative, possibly signed char to an unsigned - * integer for use as an array index. If the signed char is negative, - * we want to instead treat it as an 8-bit unsigned char, hence the - * double cast. - */ -#define YY_SC_TO_UI(c) ((unsigned int) (unsigned char) c) - -/* Enter a start condition. This macro really ought to take a parameter, - * but we do it the disgusting crufty way forced on us by the ()-less - * definition of BEGIN. - */ -#define BEGIN (yy_start) = 1 + 2 * - -/* Translate the current start state into a value that can be later handed - * to BEGIN to return to the state. The YYSTATE alias is for lex - * compatibility. - */ -#define YY_START (((yy_start) - 1) / 2) -#define YYSTATE YY_START - -/* Action number for EOF rule of a given start state. */ -#define YY_STATE_EOF(state) (YY_END_OF_BUFFER + state + 1) - -/* Special action meaning "start processing a new file". */ -#define YY_NEW_FILE yyrestart(yyin ) - -#define YY_END_OF_BUFFER_CHAR 0 - -/* Size of default input buffer. */ -#ifndef YY_BUF_SIZE -#define YY_BUF_SIZE 16384 -#endif - -/* The state buf must be large enough to hold one state per character in the main buffer. - */ -#define YY_STATE_BUF_SIZE ((YY_BUF_SIZE + 2) * sizeof(yy_state_type)) - -#ifndef YY_TYPEDEF_YY_BUFFER_STATE -#define YY_TYPEDEF_YY_BUFFER_STATE -typedef struct yy_buffer_state *YY_BUFFER_STATE; -#endif - -extern int yyleng; - -extern FILE *yyin, *yyout; - -#define EOB_ACT_CONTINUE_SCAN 0 -#define EOB_ACT_END_OF_FILE 1 -#define EOB_ACT_LAST_MATCH 2 - - #define YY_LESS_LINENO(n) - -/* Return all but the first "n" matched characters back to the input stream. */ -#define yyless(n) \ - do \ - { \ - /* Undo effects of setting up yytext. */ \ - int yyless_macro_arg = (n); \ - YY_LESS_LINENO(yyless_macro_arg);\ - *yy_cp = (yy_hold_char); \ - YY_RESTORE_YY_MORE_OFFSET \ - (yy_c_buf_p) = yy_cp = yy_bp + yyless_macro_arg - YY_MORE_ADJ; \ - YY_DO_BEFORE_ACTION; /* set up yytext again */ \ - } \ - while ( 0 ) - -#define unput(c) yyunput( c, (yytext_ptr) ) - -/* The following is because we cannot portably get our hands on size_t - * (without autoconf's help, which isn't available because we want - * flex-generated scanners to compile on their own). - */ - -#ifndef YY_TYPEDEF_YY_SIZE_T -#define YY_TYPEDEF_YY_SIZE_T -typedef unsigned int yy_size_t; -#endif - -#ifndef YY_STRUCT_YY_BUFFER_STATE -#define YY_STRUCT_YY_BUFFER_STATE -struct yy_buffer_state - { - FILE *yy_input_file; - - char *yy_ch_buf; /* input buffer */ - char *yy_buf_pos; /* current position in input buffer */ - - /* Size of input buffer in bytes, not including room for EOB - * characters. - */ - yy_size_t yy_buf_size; - - /* Number of characters read into yy_ch_buf, not including EOB - * characters. - */ - int yy_n_chars; - - /* Whether we "own" the buffer - i.e., we know we created it, - * and can realloc() it to grow it, and should free() it to - * delete it. - */ - int yy_is_our_buffer; - - /* Whether this is an "interactive" input source; if so, and - * if we're using stdio for input, then we want to use getc() - * instead of fread(), to make sure we stop fetching input after - * each newline. - */ - int yy_is_interactive; - - /* Whether we're considered to be at the beginning of a line. - * If so, '^' rules will be active on the next match, otherwise - * not. - */ - int yy_at_bol; - - int yy_bs_lineno; /**< The line count. */ - int yy_bs_column; /**< The column count. */ - - /* Whether to try to fill the input buffer when we reach the - * end of it. - */ - int yy_fill_buffer; - - int yy_buffer_status; - -#define YY_BUFFER_NEW 0 -#define YY_BUFFER_NORMAL 1 - /* When an EOF's been seen but there's still some text to process - * then we mark the buffer as YY_EOF_PENDING, to indicate that we - * shouldn't try reading from the input source any more. We might - * still have a bunch of tokens to match, though, because of - * possible backing-up. - * - * When we actually see the EOF, we change the status to "new" - * (via yyrestart()), so that the user can continue scanning by - * just pointing yyin at a new input file. - */ -#define YY_BUFFER_EOF_PENDING 2 - - }; -#endif /* !YY_STRUCT_YY_BUFFER_STATE */ - -/* Stack of input buffers. */ -static size_t yy_buffer_stack_top = 0; /**< index of top of stack. */ -static size_t yy_buffer_stack_max = 0; /**< capacity of stack. */ -static YY_BUFFER_STATE * yy_buffer_stack = 0; /**< Stack as an array. */ - -/* We provide macros for accessing buffer states in case in the - * future we want to put the buffer states in a more general - * "scanner state". - * - * Returns the top of the stack, or NULL. - */ -#define YY_CURRENT_BUFFER ( (yy_buffer_stack) \ - ? (yy_buffer_stack)[(yy_buffer_stack_top)] \ - : NULL) - -/* Same as previous macro, but useful when we know that the buffer stack is not - * NULL or when we need an lvalue. For internal use only. - */ -#define YY_CURRENT_BUFFER_LVALUE (yy_buffer_stack)[(yy_buffer_stack_top)] - -/* yy_hold_char holds the character lost when yytext is formed. */ -static char yy_hold_char; -static int yy_n_chars; /* number of characters read into yy_ch_buf */ -int yyleng; - -/* Points to current character in buffer. */ -static char *yy_c_buf_p = (char *) 0; -static int yy_init = 0; /* whether we need to initialize */ -static int yy_start = 0; /* start state number */ - -/* Flag which is used to allow yywrap()'s to do buffer switches - * instead of setting up a fresh yyin. A bit of a hack ... - */ -static int yy_did_buffer_switch_on_eof; - -void yyrestart (FILE *input_file ); -void yy_switch_to_buffer (YY_BUFFER_STATE new_buffer ); -YY_BUFFER_STATE yy_create_buffer (FILE *file,int size ); -void yy_delete_buffer (YY_BUFFER_STATE b ); -void yy_flush_buffer (YY_BUFFER_STATE b ); -void yypush_buffer_state (YY_BUFFER_STATE new_buffer ); -void yypop_buffer_state (void ); - -static void yyensure_buffer_stack (void ); -static void yy_load_buffer_state (void ); -static void yy_init_buffer (YY_BUFFER_STATE b,FILE *file ); - -#define YY_FLUSH_BUFFER yy_flush_buffer(YY_CURRENT_BUFFER ) - -YY_BUFFER_STATE yy_scan_buffer (char *base,yy_size_t size ); -YY_BUFFER_STATE yy_scan_string (yyconst char *yy_str ); -YY_BUFFER_STATE yy_scan_bytes (yyconst char *bytes,int len ); - -void *yyalloc (yy_size_t ); -void *yyrealloc (void *,yy_size_t ); -void yyfree (void * ); - -#define yy_new_buffer yy_create_buffer - -#define yy_set_interactive(is_interactive) \ - { \ - if ( ! YY_CURRENT_BUFFER ){ \ - yyensure_buffer_stack (); \ - YY_CURRENT_BUFFER_LVALUE = \ - yy_create_buffer(yyin,YY_BUF_SIZE ); \ - } \ - YY_CURRENT_BUFFER_LVALUE->yy_is_interactive = is_interactive; \ - } - -#define yy_set_bol(at_bol) \ - { \ - if ( ! YY_CURRENT_BUFFER ){\ - yyensure_buffer_stack (); \ - YY_CURRENT_BUFFER_LVALUE = \ - yy_create_buffer(yyin,YY_BUF_SIZE ); \ - } \ - YY_CURRENT_BUFFER_LVALUE->yy_at_bol = at_bol; \ - } - -#define YY_AT_BOL() (YY_CURRENT_BUFFER_LVALUE->yy_at_bol) - -#define yywrap(n) 1 -#define YY_SKIP_YYWRAP - -typedef unsigned char YY_CHAR; - -FILE *yyin = (FILE *) 0, *yyout = (FILE *) 0; - -typedef int yy_state_type; - -extern int yylineno; -extern char *yytext; -#define yytext_ptr yytext - -static yy_state_type yy_get_previous_state (void ); -static yy_state_type yy_try_NUL_trans (yy_state_type current_state ); -static int yy_get_next_buffer (void ); -static void yy_fatal_error (yyconst char msg[] ); - -/* Done after the current pattern has been matched and before the - * corresponding action - sets up yytext. - */ -#define YY_DO_BEFORE_ACTION \ - (yytext_ptr) = yy_bp; \ - yyleng = (size_t) (yy_cp - yy_bp); \ - (yy_hold_char) = *yy_cp; \ - *yy_cp = '\0'; \ - (yy_c_buf_p) = yy_cp; - -#define YY_NUM_RULES 40 -#define YY_END_OF_BUFFER 41 -/* This struct is not used in this scanner, - but its presence is necessary. */ -struct yy_trans_info - { - flex_int32_t yy_verify; - flex_int32_t yy_nxt; - }; -static yyconst flex_int16_t yy_accept[335] = - { 0, - 0, 0, 41, 40, 37, 39, 40, 38, 40, 40, - 31, 35, 35, 35, 35, 35, 35, 35, 35, 35, - 35, 35, 35, 35, 35, 35, 35, 37, 0, 33, - 38, 38, 0, 31, 0, 0, 35, 35, 35, 35, - 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, - 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, - 35, 35, 35, 38, 32, 0, 32, 35, 35, 35, - 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, - 35, 24, 35, 35, 35, 35, 35, 35, 35, 35, - 35, 35, 35, 35, 38, 35, 35, 35, 35, 35, - - 35, 35, 35, 35, 35, 0, 35, 35, 26, 35, - 35, 35, 35, 35, 35, 35, 35, 35, 35, 11, - 34, 35, 38, 35, 35, 35, 35, 30, 35, 35, - 35, 35, 35, 0, 35, 35, 10, 35, 35, 35, - 35, 35, 35, 0, 35, 8, 38, 35, 35, 35, - 35, 35, 35, 35, 27, 35, 0, 0, 35, 35, - 35, 35, 35, 0, 35, 0, 25, 38, 35, 29, - 35, 35, 0, 35, 35, 35, 9, 0, 0, 0, - 23, 35, 0, 35, 35, 35, 0, 35, 0, 38, - 35, 0, 0, 0, 35, 35, 35, 0, 0, 0, - - 35, 0, 35, 35, 3, 0, 5, 0, 38, 0, - 0, 0, 0, 35, 35, 28, 0, 0, 0, 35, - 0, 35, 15, 0, 0, 38, 0, 0, 0, 0, - 35, 35, 0, 0, 0, 35, 0, 35, 0, 0, - 38, 36, 0, 0, 0, 0, 35, 35, 0, 0, - 0, 35, 0, 35, 16, 0, 0, 0, 0, 0, - 35, 4, 0, 0, 0, 6, 0, 14, 0, 0, - 20, 0, 0, 35, 35, 0, 0, 0, 0, 0, - 0, 0, 0, 35, 35, 0, 0, 0, 0, 0, - 0, 0, 19, 35, 35, 0, 0, 0, 0, 0, - - 0, 1, 35, 35, 0, 0, 21, 17, 0, 0, - 35, 35, 0, 0, 0, 0, 35, 12, 0, 0, - 0, 0, 13, 0, 0, 0, 7, 22, 0, 0, - 0, 2, 18, 0 - } ; - -static yyconst flex_int32_t yy_ec[256] = - { 0, - 1, 1, 1, 1, 1, 1, 1, 1, 2, 3, - 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, - 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, - 1, 2, 1, 4, 5, 1, 1, 1, 6, 1, - 1, 1, 7, 1, 8, 9, 1, 10, 10, 11, - 11, 11, 10, 10, 10, 10, 10, 12, 1, 1, - 1, 1, 1, 1, 14, 15, 16, 17, 18, 19, - 20, 21, 22, 23, 23, 24, 25, 26, 27, 28, - 29, 30, 31, 32, 33, 34, 35, 36, 37, 38, - 1, 1, 1, 1, 13, 1, 14, 15, 16, 17, - - 18, 19, 20, 21, 22, 23, 23, 24, 25, 26, - 27, 28, 29, 30, 31, 32, 33, 34, 35, 36, - 37, 38, 1, 1, 1, 1, 1, 1, 1, 1, - 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, - 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, - 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, - 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, - 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, - 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, - 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, - - 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, - 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, - 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, - 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, - 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, - 1, 1, 1, 1, 1 - } ; - -static yyconst flex_int32_t yy_meta[39] = - { 0, - 1, 1, 2, 1, 1, 1, 1, 1, 1, 3, - 3, 1, 3, 3, 3, 3, 3, 3, 3, 3, - 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, - 3, 3, 3, 3, 3, 3, 3, 3 - } ; - -static yyconst flex_int16_t yy_base[340] = - { 0, - 0, 0, 374, 375, 371, 375, 368, 343, 364, 29, - 32, 336, 341, 18, 26, 21, 32, 343, 0, 340, - 347, 19, 41, 331, 42, 32, 337, 360, 357, 375, - 0, 330, 353, 55, 50, 68, 0, 326, 330, 331, - 37, 324, 329, 320, 330, 334, 318, 325, 324, 320, - 314, 326, 322, 311, 312, 319, 322, 325, 311, 307, - 308, 302, 312, 311, 59, 70, 72, 305, 307, 305, - 54, 297, 296, 309, 311, 291, 316, 293, 291, 303, - 305, 0, 287, 300, 289, 302, 289, 281, 289, 277, - 289, 298, 291, 276, 281, 275, 287, 290, 285, 284, - - 274, 278, 273, 274, 279, 276, 281, 276, 0, 279, - 280, 265, 257, 264, 256, 269, 264, 277, 258, 375, - 0, 271, 250, 259, 266, 253, 252, 0, 252, 250, - 244, 256, 243, 248, 263, 246, 375, 237, 236, 249, - 248, 257, 238, 249, 242, 375, 231, 222, 233, 241, - 225, 77, 242, 233, 0, 242, 226, 224, 79, 237, - 81, 218, 219, 222, 227, 222, 0, 229, 226, 0, - 235, 234, 225, 212, 207, 211, 375, 222, 206, 204, - 375, 202, 214, 200, 213, 218, 215, 216, 203, 192, - 217, 192, 195, 195, 207, 198, 193, 204, 195, 198, - - 193, 192, 176, 182, 375, 186, 375, 202, 198, 178, - 170, 176, 180, 184, 176, 0, 178, 175, 168, 172, - 174, 169, 0, 178, 167, 191, 166, 164, 169, 165, - 171, 162, 179, 154, 153, 158, 165, 164, 169, 166, - 176, 375, 154, 159, 150, 161, 161, 161, 141, 153, - 148, 157, 142, 155, 375, 138, 141, 152, 131, 136, - 51, 375, 143, 130, 133, 375, 144, 375, 139, 148, - 375, 137, 137, 135, 130, 119, 142, 129, 123, 117, - 118, 115, 132, 121, 125, 109, 113, 108, 120, 129, - 122, 123, 375, 114, 101, 110, 103, 118, 117, 97, - - 99, 375, 105, 104, 98, 91, 375, 375, 100, 103, - 88, 107, 98, 95, 78, 85, 102, 375, 82, 85, - 93, 98, 375, 97, 82, 76, 375, 375, 68, 84, - 81, 375, 375, 375, 94, 97, 100, 89, 103 - } ; - -static yyconst flex_int16_t yy_def[340] = - { 0, - 334, 1, 334, 334, 334, 334, 335, 336, 337, 334, - 334, 338, 338, 338, 338, 338, 338, 338, 338, 338, - 338, 338, 338, 338, 338, 338, 338, 334, 335, 334, - 336, 336, 337, 334, 334, 334, 338, 338, 338, 338, - 338, 338, 338, 338, 338, 338, 338, 338, 338, 338, - 338, 338, 338, 338, 338, 338, 338, 338, 338, 338, - 338, 338, 338, 336, 334, 334, 334, 338, 338, 338, - 338, 338, 338, 338, 338, 338, 338, 338, 338, 338, - 338, 338, 338, 338, 338, 338, 338, 338, 338, 338, - 338, 338, 338, 338, 336, 338, 338, 338, 338, 338, - - 338, 338, 338, 338, 338, 334, 338, 338, 338, 338, - 338, 338, 338, 338, 338, 338, 338, 338, 338, 334, - 338, 338, 336, 338, 338, 338, 338, 338, 338, 338, - 338, 338, 338, 334, 338, 338, 334, 338, 338, 338, - 338, 338, 338, 334, 338, 334, 336, 338, 338, 338, - 338, 338, 338, 338, 338, 338, 334, 334, 338, 338, - 338, 338, 338, 334, 338, 334, 338, 336, 338, 338, - 338, 338, 334, 338, 338, 338, 334, 334, 334, 334, - 334, 338, 334, 338, 338, 338, 334, 338, 334, 336, - 338, 334, 334, 334, 338, 338, 338, 334, 334, 334, - - 338, 334, 338, 338, 334, 334, 334, 334, 336, 334, - 334, 334, 334, 338, 338, 338, 334, 334, 334, 338, - 334, 338, 338, 334, 334, 339, 334, 334, 334, 334, - 338, 338, 334, 334, 334, 338, 334, 338, 334, 334, - 339, 334, 334, 334, 334, 334, 338, 338, 334, 334, - 334, 338, 334, 338, 334, 334, 334, 334, 334, 334, - 338, 334, 334, 334, 334, 334, 334, 334, 334, 334, - 334, 334, 334, 338, 338, 334, 334, 334, 334, 334, - 334, 334, 334, 338, 338, 334, 334, 334, 334, 334, - 334, 334, 334, 338, 338, 334, 334, 334, 334, 334, - - 334, 334, 338, 338, 334, 334, 334, 334, 334, 334, - 338, 338, 334, 334, 334, 334, 338, 334, 334, 334, - 334, 334, 334, 334, 334, 334, 334, 334, 334, 334, - 334, 334, 334, 0, 334, 334, 334, 334, 334 - } ; - -static yyconst flex_int16_t yy_nxt[414] = - { 0, - 4, 5, 6, 7, 8, 9, 10, 10, 4, 11, - 11, 4, 4, 12, 13, 14, 15, 16, 17, 18, - 19, 20, 19, 21, 19, 19, 22, 23, 24, 19, - 25, 26, 27, 19, 19, 19, 19, 19, 34, 34, - 35, 34, 34, 42, 40, 48, 46, 43, 53, 36, - 41, 54, 44, 49, 55, 45, 47, 58, 61, 65, - 65, 62, 59, 35, 34, 34, 71, 72, 65, 65, - 56, 274, 36, 60, 66, 66, 36, 67, 67, 67, - 67, 67, 67, 99, 173, 275, 180, 100, 183, 174, - 181, 37, 333, 184, 29, 332, 29, 31, 331, 31, - - 33, 33, 33, 241, 241, 241, 330, 329, 328, 327, - 326, 325, 324, 323, 322, 321, 320, 319, 318, 317, - 316, 315, 314, 313, 312, 311, 310, 309, 308, 307, - 306, 305, 304, 303, 302, 301, 300, 299, 298, 297, - 296, 295, 294, 293, 292, 291, 290, 289, 288, 287, - 286, 285, 284, 283, 282, 281, 280, 279, 278, 277, - 276, 273, 272, 271, 270, 269, 268, 267, 266, 265, - 264, 263, 262, 261, 260, 259, 258, 257, 242, 256, - 255, 254, 253, 252, 251, 250, 249, 248, 247, 246, - 245, 244, 243, 242, 240, 239, 238, 237, 236, 235, - - 234, 233, 232, 231, 230, 229, 228, 227, 226, 225, - 224, 223, 222, 221, 220, 219, 218, 217, 216, 215, - 214, 213, 212, 211, 210, 209, 208, 207, 206, 205, - 204, 203, 202, 201, 200, 199, 198, 197, 196, 195, - 194, 193, 192, 191, 190, 189, 188, 187, 186, 185, - 182, 179, 178, 177, 176, 175, 172, 171, 170, 169, - 168, 167, 166, 165, 164, 163, 162, 161, 160, 159, - 158, 157, 156, 155, 154, 153, 152, 151, 150, 149, - 148, 147, 146, 145, 144, 143, 142, 141, 140, 139, - 138, 137, 136, 121, 135, 134, 133, 132, 131, 130, - - 129, 128, 127, 126, 125, 124, 123, 122, 121, 120, - 119, 118, 117, 116, 115, 114, 113, 112, 111, 110, - 109, 108, 107, 106, 105, 104, 103, 102, 101, 98, - 97, 96, 95, 94, 93, 92, 91, 90, 89, 88, - 87, 86, 85, 84, 83, 82, 81, 80, 79, 78, - 77, 76, 75, 74, 73, 70, 69, 68, 30, 64, - 30, 28, 63, 57, 52, 51, 50, 39, 38, 30, - 32, 30, 28, 334, 3, 334, 334, 334, 334, 334, - 334, 334, 334, 334, 334, 334, 334, 334, 334, 334, - 334, 334, 334, 334, 334, 334, 334, 334, 334, 334, - - 334, 334, 334, 334, 334, 334, 334, 334, 334, 334, - 334, 334, 334 - } ; - -static yyconst flex_int16_t yy_chk[414] = - { 0, - 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, - 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, - 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, - 1, 1, 1, 1, 1, 1, 1, 1, 10, 10, - 11, 11, 11, 15, 14, 17, 16, 15, 22, 11, - 14, 22, 15, 17, 23, 15, 16, 25, 26, 35, - 35, 26, 25, 34, 34, 34, 41, 41, 65, 65, - 23, 261, 34, 25, 36, 36, 65, 36, 36, 66, - 66, 67, 67, 71, 152, 261, 159, 71, 161, 152, - 159, 338, 331, 161, 335, 330, 335, 336, 329, 336, - - 337, 337, 337, 339, 339, 339, 326, 325, 324, 322, - 321, 320, 319, 317, 316, 315, 314, 313, 312, 311, - 310, 309, 306, 305, 304, 303, 301, 300, 299, 298, - 297, 296, 295, 294, 292, 291, 290, 289, 288, 287, - 286, 285, 284, 283, 282, 281, 280, 279, 278, 277, - 276, 275, 274, 273, 272, 270, 269, 267, 265, 264, - 263, 260, 259, 258, 257, 256, 254, 253, 252, 251, - 250, 249, 248, 247, 246, 245, 244, 243, 241, 240, - 239, 238, 237, 236, 235, 234, 233, 232, 231, 230, - 229, 228, 227, 226, 225, 224, 222, 221, 220, 219, - - 218, 217, 215, 214, 213, 212, 211, 210, 209, 208, - 206, 204, 203, 202, 201, 200, 199, 198, 197, 196, - 195, 194, 193, 192, 191, 190, 189, 188, 187, 186, - 185, 184, 183, 182, 180, 179, 178, 176, 175, 174, - 173, 172, 171, 169, 168, 166, 165, 164, 163, 162, - 160, 158, 157, 156, 154, 153, 151, 150, 149, 148, - 147, 145, 144, 143, 142, 141, 140, 139, 138, 136, - 135, 134, 133, 132, 131, 130, 129, 127, 126, 125, - 124, 123, 122, 119, 118, 117, 116, 115, 114, 113, - 112, 111, 110, 108, 107, 106, 105, 104, 103, 102, - - 101, 100, 99, 98, 97, 96, 95, 94, 93, 92, - 91, 90, 89, 88, 87, 86, 85, 84, 83, 81, - 80, 79, 78, 77, 76, 75, 74, 73, 72, 70, - 69, 68, 64, 63, 62, 61, 60, 59, 58, 57, - 56, 55, 54, 53, 52, 51, 50, 49, 48, 47, - 46, 45, 44, 43, 42, 40, 39, 38, 33, 32, - 29, 28, 27, 24, 21, 20, 18, 13, 12, 9, - 8, 7, 5, 3, 334, 334, 334, 334, 334, 334, - 334, 334, 334, 334, 334, 334, 334, 334, 334, 334, - 334, 334, 334, 334, 334, 334, 334, 334, 334, 334, - - 334, 334, 334, 334, 334, 334, 334, 334, 334, 334, - 334, 334, 334 - } ; - -static yy_state_type yy_last_accepting_state; -static char *yy_last_accepting_cpos; - -extern int yy_flex_debug; -int yy_flex_debug = 0; - -/* The intent behind this definition is that it'll catch - * any uses of REJECT which flex missed. - */ -#define REJECT reject_used_but_not_detected -#define yymore() yymore_used_but_not_detected -#define YY_MORE_ADJ 0 -#define YY_RESTORE_YY_MORE_OFFSET -char *yytext; -#line 1 "printrcl.l" -/* -*-Mode: C-*- - * "$Id: printrcl.l,v 1.10 2004/08/19 03:24:35 rlk Exp $" - * - * printrc parser - * - * Copyright 2003 Robert Krawitz - * - * 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. - */ -#line 24 "printrcl.l" - -#ifdef HAVE_CONFIG_H -#include -#endif - -#include -#include -#include "gutenprintui-internal.h" -#include "printrc.h" - -#include -#include -#include - -#define YY_NO_UNPUT - -int mylineno = 1; - -#define DBG(x) \ -do \ - { \ - if (getenv("STP_DEBUG_PRINTRC")) \ - fprintf(stderr, "'%s' => %s\n", yytext, #x); \ - } \ - while (0) - -static char * -q_strdup(const char *s) -{ - /* Strip the leading and trailing quote */ - if (strlen(s) <= 2) - return NULL; - else - return g_strndup(s + 1, strlen(s) - 2); -} - -#line 710 "printrcl.c" - -#define INITIAL 0 - -#ifndef YY_NO_UNISTD_H -/* Special case for "unistd.h", since it is non-ANSI. We include it way - * down here because we want the user's section 1 to have been scanned first. - * The user has a chance to override it with an option. - */ -#include -#endif - -#ifndef YY_EXTRA_TYPE -#define YY_EXTRA_TYPE void * -#endif - -static int yy_init_globals (void ); - -/* Macros after this point can all be overridden by user definitions in - * section 1. - */ - -#ifndef YY_SKIP_YYWRAP -#ifdef __cplusplus -extern "C" int yywrap (void ); -#else -extern int yywrap (void ); -#endif -#endif - - static void yyunput (int c,char *buf_ptr ); - -#ifndef yytext_ptr -static void yy_flex_strncpy (char *,yyconst char *,int ); -#endif - -#ifdef YY_NEED_STRLEN -static int yy_flex_strlen (yyconst char * ); -#endif - -#ifndef YY_NO_INPUT - -#ifdef __cplusplus -static int yyinput (void ); -#else -static int input (void ); -#endif - -#endif - -/* Amount of stuff to slurp up with each read. */ -#ifndef YY_READ_BUF_SIZE -#define YY_READ_BUF_SIZE 8192 -#endif - -/* Copy whatever the last rule matched to the standard output. */ -#ifndef ECHO -/* This used to be an fputs(), but since the string might contain NUL's, - * we now use fwrite(). - */ -#define ECHO (void) fwrite( yytext, yyleng, 1, yyout ) -#endif - -/* Gets input and stuffs it into "buf". number of characters read, or YY_NULL, - * is returned in "result". - */ -#ifndef YY_INPUT -#define YY_INPUT(buf,result,max_size) \ - if ( YY_CURRENT_BUFFER_LVALUE->yy_is_interactive ) \ - { \ - int c = '*'; \ - size_t n; \ - for ( n = 0; n < max_size && \ - (c = getc( yyin )) != EOF && c != '\n'; ++n ) \ - buf[n] = (char) c; \ - if ( c == '\n' ) \ - buf[n++] = (char) c; \ - if ( c == EOF && ferror( yyin ) ) \ - YY_FATAL_ERROR( "input in flex scanner failed" ); \ - result = n; \ - } \ - else \ - { \ - errno=0; \ - while ( (result = fread(buf, 1, max_size, yyin))==0 && ferror(yyin)) \ - { \ - if( errno != EINTR) \ - { \ - YY_FATAL_ERROR( "input in flex scanner failed" ); \ - break; \ - } \ - errno=0; \ - clearerr(yyin); \ - } \ - }\ -\ - -#endif - -/* No semi-colon after return; correct usage is to write "yyterminate();" - - * we don't want an extra ';' after the "return" because that will cause - * some compilers to complain about unreachable statements. - */ -#ifndef yyterminate -#define yyterminate() return YY_NULL -#endif - -/* Number of entries by which start-condition stack grows. */ -#ifndef YY_START_STACK_INCR -#define YY_START_STACK_INCR 25 -#endif - -/* Report a fatal error. */ -#ifndef YY_FATAL_ERROR -#define YY_FATAL_ERROR(msg) yy_fatal_error( msg ) -#endif - -/* end tables serialization structures and prototypes */ - -/* Default declaration of generated scanner - a define so the user can - * easily add parameters. - */ -#ifndef YY_DECL -#define YY_DECL_IS_OURS 1 - -extern int yylex (void); - -#define YY_DECL int yylex (void) -#endif /* !YY_DECL */ - -/* Code executed at the beginning of each rule, after yytext and yyleng - * have been set up. - */ -#ifndef YY_USER_ACTION -#define YY_USER_ACTION -#endif - -/* Code executed at the end of each rule. */ -#ifndef YY_BREAK -#define YY_BREAK break; -#endif - -#define YY_RULE_SETUP \ - YY_USER_ACTION - -/** The main scanner function which does all the work. - */ -YY_DECL -{ - register yy_state_type yy_current_state; - register char *yy_cp, *yy_bp; - register int yy_act; - -#line 73 "printrcl.l" - - -#line 866 "printrcl.c" - - if ( !(yy_init) ) - { - (yy_init) = 1; - -#ifdef YY_USER_INIT - YY_USER_INIT; -#endif - - if ( ! (yy_start) ) - (yy_start) = 1; /* first start state */ - - if ( ! yyin ) - yyin = stdin; - - if ( ! yyout ) - yyout = stdout; - - if ( ! YY_CURRENT_BUFFER ) { - yyensure_buffer_stack (); - YY_CURRENT_BUFFER_LVALUE = - yy_create_buffer(yyin,YY_BUF_SIZE ); - } - - yy_load_buffer_state( ); - } - - while ( 1 ) /* loops until end-of-file is reached */ - { - yy_cp = (yy_c_buf_p); - - /* Support of yytext. */ - *yy_cp = (yy_hold_char); - - /* yy_bp points to the position in yy_ch_buf of the start of - * the current run. - */ - yy_bp = yy_cp; - - yy_current_state = (yy_start); -yy_match: - do - { - register YY_CHAR yy_c = yy_ec[YY_SC_TO_UI(*yy_cp)]; - if ( yy_accept[yy_current_state] ) - { - (yy_last_accepting_state) = yy_current_state; - (yy_last_accepting_cpos) = yy_cp; - } - while ( yy_chk[yy_base[yy_current_state] + yy_c] != yy_current_state ) - { - yy_current_state = (int) yy_def[yy_current_state]; - if ( yy_current_state >= 335 ) - yy_c = yy_meta[(unsigned int) yy_c]; - } - yy_current_state = yy_nxt[yy_base[yy_current_state] + (unsigned int) yy_c]; - ++yy_cp; - } - while ( yy_base[yy_current_state] != 375 ); - -yy_find_action: - yy_act = yy_accept[yy_current_state]; - if ( yy_act == 0 ) - { /* have to back up */ - yy_cp = (yy_last_accepting_cpos); - yy_current_state = (yy_last_accepting_state); - yy_act = yy_accept[yy_current_state]; - } - - YY_DO_BEFORE_ACTION; - -do_action: /* This label is used only to access EOF actions. */ - - switch ( yy_act ) - { /* beginning of action switch */ - case 0: /* must back up */ - /* undo the effects of YY_DO_BEFORE_ACTION */ - *yy_cp = (yy_hold_char); - yy_cp = (yy_last_accepting_cpos); - yy_current_state = (yy_last_accepting_state); - goto yy_find_action; - -case 1: -YY_RULE_SETUP -#line 75 "printrcl.l" -DBG(CURRENT_PRINTER); return CURRENT_PRINTER; - YY_BREAK -case 2: -YY_RULE_SETUP -#line 76 "printrcl.l" -DBG(SHOW_ALL_PAPER_SIZES); return SHOW_ALL_PAPER_SIZES; - YY_BREAK -case 3: -YY_RULE_SETUP -#line 77 "printrcl.l" -DBG(PRINTER); return PRINTER; - YY_BREAK -case 4: -YY_RULE_SETUP -#line 78 "printrcl.l" -DBG(DESTINATION); return DESTINATION; - YY_BREAK -case 5: -YY_RULE_SETUP -#line 79 "printrcl.l" -DBG(SCALING); return SCALING; - YY_BREAK -case 6: -YY_RULE_SETUP -#line 80 "printrcl.l" -DBG(ORIENTATION); return ORIENTATION; - YY_BREAK -case 7: -YY_RULE_SETUP -#line 81 "printrcl.l" -DBG(AUTOSIZE_ROLL_PAPER); return AUTOSIZE_ROLL_PAPER; - YY_BREAK -case 8: -YY_RULE_SETUP -#line 82 "printrcl.l" -DBG(UNIT); return UNIT; - YY_BREAK -case 9: -YY_RULE_SETUP -#line 83 "printrcl.l" -DBG(DRIVER); return DRIVER; - YY_BREAK -case 10: -YY_RULE_SETUP -#line 84 "printrcl.l" -DBG(LEFT); return LEFT; - YY_BREAK -case 11: -YY_RULE_SETUP -#line 85 "printrcl.l" -DBG(TOP); return TOP; - YY_BREAK -case 12: -YY_RULE_SETUP -#line 86 "printrcl.l" -DBG(CUSTOM_PAGE_WIDTH); return CUSTOM_PAGE_WIDTH; - YY_BREAK -case 13: -YY_RULE_SETUP -#line 87 "printrcl.l" -DBG(CUSTOM_PAGE_HEIGHT); return CUSTOM_PAGE_HEIGHT; - YY_BREAK -case 14: -YY_RULE_SETUP -#line 88 "printrcl.l" -DBG(OUTPUT_TYPE); return OUTPUT_TYPE; - YY_BREAK -case 15: -YY_RULE_SETUP -#line 89 "printrcl.l" -DBG(PARAMETER); return PARAMETER; - YY_BREAK -case 16: -YY_RULE_SETUP -#line 90 "printrcl.l" -DBG(QUEUE_NAME); return QUEUE_NAME; - YY_BREAK -case 17: -YY_RULE_SETUP -#line 91 "printrcl.l" -DBG(OUTPUT_FILENAME); return OUTPUT_FILENAME; - YY_BREAK -case 18: -YY_RULE_SETUP -#line 92 "printrcl.l" -DBG(EXTRA_PRINTER_OPTIONS); return EXTRA_PRINTER_OPTIONS; - YY_BREAK -case 19: -YY_RULE_SETUP -#line 93 "printrcl.l" -DBG(CUSTOM_COMMAND); return CUSTOM_COMMAND; - YY_BREAK -case 20: -YY_RULE_SETUP -#line 94 "printrcl.l" -DBG(COMMAND_TYPE); return COMMAND_TYPE; - YY_BREAK -case 21: -YY_RULE_SETUP -#line 95 "printrcl.l" -DBG(GLOBAL_SETTINGS); return GLOBAL_SETTINGS; - YY_BREAK -case 22: -YY_RULE_SETUP -#line 96 "printrcl.l" -DBG(END_GLOBAL_SETTINGS); return END_GLOBAL_SETTINGS; - YY_BREAK -case 23: -YY_RULE_SETUP -#line 97 "printrcl.l" -DBG(GLOBAL); return GLOBAL; - YY_BREAK -case 24: -YY_RULE_SETUP -#line 99 "printrcl.l" -DBG(pINT); return pINT; - YY_BREAK -case 25: -YY_RULE_SETUP -#line 100 "printrcl.l" -DBG(pSTRING_LIST); return pSTRING_LIST; - YY_BREAK -case 26: -YY_RULE_SETUP -#line 101 "printrcl.l" -DBG(pFILE); return pFILE; - YY_BREAK -case 27: -YY_RULE_SETUP -#line 102 "printrcl.l" -DBG(pDOUBLE); return pDOUBLE; - YY_BREAK -case 28: -YY_RULE_SETUP -#line 103 "printrcl.l" -DBG(pDIMENSION); return pDIMENSION; - YY_BREAK -case 29: -YY_RULE_SETUP -#line 104 "printrcl.l" -DBG(pBOOLEAN); return pBOOLEAN; - YY_BREAK -case 30: -YY_RULE_SETUP -#line 105 "printrcl.l" -DBG(pCURVE); return pCURVE; - YY_BREAK -case 31: -YY_RULE_SETUP -#line 107 "printrcl.l" -yylval.ival = atoi(yytext); DBG(tINT); return tINT; - YY_BREAK -case 32: -YY_RULE_SETUP -#line 108 "printrcl.l" -yylval.dval = strtod(yytext, NULL); DBG(tDOUBLE); return tDOUBLE; - YY_BREAK -case 33: -/* rule 33 can match eol */ -YY_RULE_SETUP -#line 109 "printrcl.l" -yylval.sval = q_strdup(yytext); DBG(tSTRING); return tSTRING; - YY_BREAK -case 34: -YY_RULE_SETUP -#line 110 "printrcl.l" -yylval.sval = g_strdup(yytext); DBG(tBOOLEAN); return tBOOLEAN; - YY_BREAK -case 35: -YY_RULE_SETUP -#line 111 "printrcl.l" -yylval.sval = g_strdup(yytext); DBG(tWORD); return tWORD; - YY_BREAK -case 36: -/* rule 36 can match eol */ -YY_RULE_SETUP -#line 112 "printrcl.l" -DBG(PRINTRC_HDR); return PRINTRC_HDR; - YY_BREAK -case 37: -YY_RULE_SETUP -#line 113 "printrcl.l" -DBG(whitespace1); /* Skip blanks/tabs */ - YY_BREAK -case 38: -YY_RULE_SETUP -#line 114 "printrcl.l" -DBG(comment1); /* Skip comments */ - YY_BREAK -case 39: -/* rule 39 can match eol */ -YY_RULE_SETUP -#line 115 "printrcl.l" -DBG(newline); mylineno++; - YY_BREAK -case 40: -YY_RULE_SETUP -#line 116 "printrcl.l" -ECHO; - YY_BREAK -#line 1152 "printrcl.c" -case YY_STATE_EOF(INITIAL): - yyterminate(); - - case YY_END_OF_BUFFER: - { - /* Amount of text matched not including the EOB char. */ - int yy_amount_of_matched_text = (int) (yy_cp - (yytext_ptr)) - 1; - - /* Undo the effects of YY_DO_BEFORE_ACTION. */ - *yy_cp = (yy_hold_char); - YY_RESTORE_YY_MORE_OFFSET - - if ( YY_CURRENT_BUFFER_LVALUE->yy_buffer_status == YY_BUFFER_NEW ) - { - /* We're scanning a new file or input source. It's - * possible that this happened because the user - * just pointed yyin at a new source and called - * yylex(). If so, then we have to assure - * consistency between YY_CURRENT_BUFFER and our - * globals. Here is the right place to do so, because - * this is the first action (other than possibly a - * back-up) that will match for the new input source. - */ - (yy_n_chars) = YY_CURRENT_BUFFER_LVALUE->yy_n_chars; - YY_CURRENT_BUFFER_LVALUE->yy_input_file = yyin; - YY_CURRENT_BUFFER_LVALUE->yy_buffer_status = YY_BUFFER_NORMAL; - } - - /* Note that here we test for yy_c_buf_p "<=" to the position - * of the first EOB in the buffer, since yy_c_buf_p will - * already have been incremented past the NUL character - * (since all states make transitions on EOB to the - * end-of-buffer state). Contrast this with the test - * in input(). - */ - if ( (yy_c_buf_p) <= &YY_CURRENT_BUFFER_LVALUE->yy_ch_buf[(yy_n_chars)] ) - { /* This was really a NUL. */ - yy_state_type yy_next_state; - - (yy_c_buf_p) = (yytext_ptr) + yy_amount_of_matched_text; - - yy_current_state = yy_get_previous_state( ); - - /* Okay, we're now positioned to make the NUL - * transition. We couldn't have - * yy_get_previous_state() go ahead and do it - * for us because it doesn't know how to deal - * with the possibility of jamming (and we don't - * want to build jamming into it because then it - * will run more slowly). - */ - - yy_next_state = yy_try_NUL_trans( yy_current_state ); - - yy_bp = (yytext_ptr) + YY_MORE_ADJ; - - if ( yy_next_state ) - { - /* Consume the NUL. */ - yy_cp = ++(yy_c_buf_p); - yy_current_state = yy_next_state; - goto yy_match; - } - - else - { - yy_cp = (yy_c_buf_p); - goto yy_find_action; - } - } - - else switch ( yy_get_next_buffer( ) ) - { - case EOB_ACT_END_OF_FILE: - { - (yy_did_buffer_switch_on_eof) = 0; - - if ( yywrap( ) ) - { - /* Note: because we've taken care in - * yy_get_next_buffer() to have set up - * yytext, we can now set up - * yy_c_buf_p so that if some total - * hoser (like flex itself) wants to - * call the scanner after we return the - * YY_NULL, it'll still work - another - * YY_NULL will get returned. - */ - (yy_c_buf_p) = (yytext_ptr) + YY_MORE_ADJ; - - yy_act = YY_STATE_EOF(YY_START); - goto do_action; - } - - else - { - if ( ! (yy_did_buffer_switch_on_eof) ) - YY_NEW_FILE; - } - break; - } - - case EOB_ACT_CONTINUE_SCAN: - (yy_c_buf_p) = - (yytext_ptr) + yy_amount_of_matched_text; - - yy_current_state = yy_get_previous_state( ); - - yy_cp = (yy_c_buf_p); - yy_bp = (yytext_ptr) + YY_MORE_ADJ; - goto yy_match; - - case EOB_ACT_LAST_MATCH: - (yy_c_buf_p) = - &YY_CURRENT_BUFFER_LVALUE->yy_ch_buf[(yy_n_chars)]; - - yy_current_state = yy_get_previous_state( ); - - yy_cp = (yy_c_buf_p); - yy_bp = (yytext_ptr) + YY_MORE_ADJ; - goto yy_find_action; - } - break; - } - - default: - YY_FATAL_ERROR( - "fatal flex scanner internal error--no action found" ); - } /* end of action switch */ - } /* end of scanning one token */ -} /* end of yylex */ - -/* yy_get_next_buffer - try to read in a new buffer - * - * Returns a code representing an action: - * EOB_ACT_LAST_MATCH - - * EOB_ACT_CONTINUE_SCAN - continue scanning from current position - * EOB_ACT_END_OF_FILE - end of file - */ -static int yy_get_next_buffer (void) -{ - register char *dest = YY_CURRENT_BUFFER_LVALUE->yy_ch_buf; - register char *source = (yytext_ptr); - register int number_to_move, i; - int ret_val; - - if ( (yy_c_buf_p) > &YY_CURRENT_BUFFER_LVALUE->yy_ch_buf[(yy_n_chars) + 1] ) - YY_FATAL_ERROR( - "fatal flex scanner internal error--end of buffer missed" ); - - if ( YY_CURRENT_BUFFER_LVALUE->yy_fill_buffer == 0 ) - { /* Don't try to fill the buffer, so this is an EOF. */ - if ( (yy_c_buf_p) - (yytext_ptr) - YY_MORE_ADJ == 1 ) - { - /* We matched a single character, the EOB, so - * treat this as a final EOF. - */ - return EOB_ACT_END_OF_FILE; - } - - else - { - /* We matched some text prior to the EOB, first - * process it. - */ - return EOB_ACT_LAST_MATCH; - } - } - - /* Try to read more data. */ - - /* First move last chars to start of buffer. */ - number_to_move = (int) ((yy_c_buf_p) - (yytext_ptr)) - 1; - - for ( i = 0; i < number_to_move; ++i ) - *(dest++) = *(source++); - - if ( YY_CURRENT_BUFFER_LVALUE->yy_buffer_status == YY_BUFFER_EOF_PENDING ) - /* don't do the read, it's not guaranteed to return an EOF, - * just force an EOF - */ - YY_CURRENT_BUFFER_LVALUE->yy_n_chars = (yy_n_chars) = 0; - - else - { - int num_to_read = - YY_CURRENT_BUFFER_LVALUE->yy_buf_size - number_to_move - 1; - - while ( num_to_read <= 0 ) - { /* Not enough room in the buffer - grow it. */ - - /* just a shorter name for the current buffer */ - YY_BUFFER_STATE b = YY_CURRENT_BUFFER; - - int yy_c_buf_p_offset = - (int) ((yy_c_buf_p) - b->yy_ch_buf); - - if ( b->yy_is_our_buffer ) - { - int new_size = b->yy_buf_size * 2; - - if ( new_size <= 0 ) - b->yy_buf_size += b->yy_buf_size / 8; - else - b->yy_buf_size *= 2; - - b->yy_ch_buf = (char *) - /* Include room in for 2 EOB chars. */ - yyrealloc((void *) b->yy_ch_buf,b->yy_buf_size + 2 ); - } - else - /* Can't grow it, we don't own it. */ - b->yy_ch_buf = 0; - - if ( ! b->yy_ch_buf ) - YY_FATAL_ERROR( - "fatal error - scanner input buffer overflow" ); - - (yy_c_buf_p) = &b->yy_ch_buf[yy_c_buf_p_offset]; - - num_to_read = YY_CURRENT_BUFFER_LVALUE->yy_buf_size - - number_to_move - 1; - - } - - if ( num_to_read > YY_READ_BUF_SIZE ) - num_to_read = YY_READ_BUF_SIZE; - - /* Read in more data. */ - YY_INPUT( (&YY_CURRENT_BUFFER_LVALUE->yy_ch_buf[number_to_move]), - (yy_n_chars), num_to_read ); - - YY_CURRENT_BUFFER_LVALUE->yy_n_chars = (yy_n_chars); - } - - if ( (yy_n_chars) == 0 ) - { - if ( number_to_move == YY_MORE_ADJ ) - { - ret_val = EOB_ACT_END_OF_FILE; - yyrestart(yyin ); - } - - else - { - ret_val = EOB_ACT_LAST_MATCH; - YY_CURRENT_BUFFER_LVALUE->yy_buffer_status = - YY_BUFFER_EOF_PENDING; - } - } - - else - ret_val = EOB_ACT_CONTINUE_SCAN; - - (yy_n_chars) += number_to_move; - YY_CURRENT_BUFFER_LVALUE->yy_ch_buf[(yy_n_chars)] = YY_END_OF_BUFFER_CHAR; - YY_CURRENT_BUFFER_LVALUE->yy_ch_buf[(yy_n_chars) + 1] = YY_END_OF_BUFFER_CHAR; - - (yytext_ptr) = &YY_CURRENT_BUFFER_LVALUE->yy_ch_buf[0]; - - return ret_val; -} - -/* yy_get_previous_state - get the state just before the EOB char was reached */ - - static yy_state_type yy_get_previous_state (void) -{ - register yy_state_type yy_current_state; - register char *yy_cp; - - yy_current_state = (yy_start); - - for ( yy_cp = (yytext_ptr) + YY_MORE_ADJ; yy_cp < (yy_c_buf_p); ++yy_cp ) - { - register YY_CHAR yy_c = (*yy_cp ? yy_ec[YY_SC_TO_UI(*yy_cp)] : 1); - if ( yy_accept[yy_current_state] ) - { - (yy_last_accepting_state) = yy_current_state; - (yy_last_accepting_cpos) = yy_cp; - } - while ( yy_chk[yy_base[yy_current_state] + yy_c] != yy_current_state ) - { - yy_current_state = (int) yy_def[yy_current_state]; - if ( yy_current_state >= 335 ) - yy_c = yy_meta[(unsigned int) yy_c]; - } - yy_current_state = yy_nxt[yy_base[yy_current_state] + (unsigned int) yy_c]; - } - - return yy_current_state; -} - -/* yy_try_NUL_trans - try to make a transition on the NUL character - * - * synopsis - * next_state = yy_try_NUL_trans( current_state ); - */ - static yy_state_type yy_try_NUL_trans (yy_state_type yy_current_state ) -{ - register int yy_is_jam; - register char *yy_cp = (yy_c_buf_p); - - register YY_CHAR yy_c = 1; - if ( yy_accept[yy_current_state] ) - { - (yy_last_accepting_state) = yy_current_state; - (yy_last_accepting_cpos) = yy_cp; - } - while ( yy_chk[yy_base[yy_current_state] + yy_c] != yy_current_state ) - { - yy_current_state = (int) yy_def[yy_current_state]; - if ( yy_current_state >= 335 ) - yy_c = yy_meta[(unsigned int) yy_c]; - } - yy_current_state = yy_nxt[yy_base[yy_current_state] + (unsigned int) yy_c]; - yy_is_jam = (yy_current_state == 334); - - return yy_is_jam ? 0 : yy_current_state; -} - - static void yyunput (int c, register char * yy_bp ) -{ - register char *yy_cp; - - yy_cp = (yy_c_buf_p); - - /* undo effects of setting up yytext */ - *yy_cp = (yy_hold_char); - - if ( yy_cp < YY_CURRENT_BUFFER_LVALUE->yy_ch_buf + 2 ) - { /* need to shift things up to make room */ - /* +2 for EOB chars. */ - register int number_to_move = (yy_n_chars) + 2; - register char *dest = &YY_CURRENT_BUFFER_LVALUE->yy_ch_buf[ - YY_CURRENT_BUFFER_LVALUE->yy_buf_size + 2]; - register char *source = - &YY_CURRENT_BUFFER_LVALUE->yy_ch_buf[number_to_move]; - - while ( source > YY_CURRENT_BUFFER_LVALUE->yy_ch_buf ) - *--dest = *--source; - - yy_cp += (int) (dest - source); - yy_bp += (int) (dest - source); - YY_CURRENT_BUFFER_LVALUE->yy_n_chars = - (yy_n_chars) = YY_CURRENT_BUFFER_LVALUE->yy_buf_size; - - if ( yy_cp < YY_CURRENT_BUFFER_LVALUE->yy_ch_buf + 2 ) - YY_FATAL_ERROR( "flex scanner push-back overflow" ); - } - - *--yy_cp = (char) c; - - (yytext_ptr) = yy_bp; - (yy_hold_char) = *yy_cp; - (yy_c_buf_p) = yy_cp; -} - -#ifndef YY_NO_INPUT -#ifdef __cplusplus - static int yyinput (void) -#else - static int input (void) -#endif - -{ - int c; - - *(yy_c_buf_p) = (yy_hold_char); - - if ( *(yy_c_buf_p) == YY_END_OF_BUFFER_CHAR ) - { - /* yy_c_buf_p now points to the character we want to return. - * If this occurs *before* the EOB characters, then it's a - * valid NUL; if not, then we've hit the end of the buffer. - */ - if ( (yy_c_buf_p) < &YY_CURRENT_BUFFER_LVALUE->yy_ch_buf[(yy_n_chars)] ) - /* This was really a NUL. */ - *(yy_c_buf_p) = '\0'; - - else - { /* need more input */ - int offset = (yy_c_buf_p) - (yytext_ptr); - ++(yy_c_buf_p); - - switch ( yy_get_next_buffer( ) ) - { - case EOB_ACT_LAST_MATCH: - /* This happens because yy_g_n_b() - * sees that we've accumulated a - * token and flags that we need to - * try matching the token before - * proceeding. But for input(), - * there's no matching to consider. - * So convert the EOB_ACT_LAST_MATCH - * to EOB_ACT_END_OF_FILE. - */ - - /* Reset buffer status. */ - yyrestart(yyin ); - - /*FALLTHROUGH*/ - - case EOB_ACT_END_OF_FILE: - { - if ( yywrap( ) ) - return EOF; - - if ( ! (yy_did_buffer_switch_on_eof) ) - YY_NEW_FILE; -#ifdef __cplusplus - return yyinput(); -#else - return input(); -#endif - } - - case EOB_ACT_CONTINUE_SCAN: - (yy_c_buf_p) = (yytext_ptr) + offset; - break; - } - } - } - - c = *(unsigned char *) (yy_c_buf_p); /* cast for 8-bit char's */ - *(yy_c_buf_p) = '\0'; /* preserve yytext */ - (yy_hold_char) = *++(yy_c_buf_p); - - return c; -} -#endif /* ifndef YY_NO_INPUT */ - -/** Immediately switch to a different input stream. - * @param input_file A readable stream. - * - * @note This function does not reset the start condition to @c INITIAL . - */ - void yyrestart (FILE * input_file ) -{ - - if ( ! YY_CURRENT_BUFFER ){ - yyensure_buffer_stack (); - YY_CURRENT_BUFFER_LVALUE = - yy_create_buffer(yyin,YY_BUF_SIZE ); - } - - yy_init_buffer(YY_CURRENT_BUFFER,input_file ); - yy_load_buffer_state( ); -} - -/** Switch to a different input buffer. - * @param new_buffer The new input buffer. - * - */ - void yy_switch_to_buffer (YY_BUFFER_STATE new_buffer ) -{ - - /* TODO. We should be able to replace this entire function body - * with - * yypop_buffer_state(); - * yypush_buffer_state(new_buffer); - */ - yyensure_buffer_stack (); - if ( YY_CURRENT_BUFFER == new_buffer ) - return; - - if ( YY_CURRENT_BUFFER ) - { - /* Flush out information for old buffer. */ - *(yy_c_buf_p) = (yy_hold_char); - YY_CURRENT_BUFFER_LVALUE->yy_buf_pos = (yy_c_buf_p); - YY_CURRENT_BUFFER_LVALUE->yy_n_chars = (yy_n_chars); - } - - YY_CURRENT_BUFFER_LVALUE = new_buffer; - yy_load_buffer_state( ); - - /* We don't actually know whether we did this switch during - * EOF (yywrap()) processing, but the only time this flag - * is looked at is after yywrap() is called, so it's safe - * to go ahead and always set it. - */ - (yy_did_buffer_switch_on_eof) = 1; -} - -static void yy_load_buffer_state (void) -{ - (yy_n_chars) = YY_CURRENT_BUFFER_LVALUE->yy_n_chars; - (yytext_ptr) = (yy_c_buf_p) = YY_CURRENT_BUFFER_LVALUE->yy_buf_pos; - yyin = YY_CURRENT_BUFFER_LVALUE->yy_input_file; - (yy_hold_char) = *(yy_c_buf_p); -} - -/** Allocate and initialize an input buffer state. - * @param file A readable stream. - * @param size The character buffer size in bytes. When in doubt, use @c YY_BUF_SIZE. - * - * @return the allocated buffer state. - */ - YY_BUFFER_STATE yy_create_buffer (FILE * file, int size ) -{ - YY_BUFFER_STATE b; - - b = (YY_BUFFER_STATE) yyalloc(sizeof( struct yy_buffer_state ) ); - if ( ! b ) - YY_FATAL_ERROR( "out of dynamic memory in yy_create_buffer()" ); - - b->yy_buf_size = size; - - /* yy_ch_buf has to be 2 characters longer than the size given because - * we need to put in 2 end-of-buffer characters. - */ - b->yy_ch_buf = (char *) yyalloc(b->yy_buf_size + 2 ); - if ( ! b->yy_ch_buf ) - YY_FATAL_ERROR( "out of dynamic memory in yy_create_buffer()" ); - - b->yy_is_our_buffer = 1; - - yy_init_buffer(b,file ); - - return b; -} - -/** Destroy the buffer. - * @param b a buffer created with yy_create_buffer() - * - */ - void yy_delete_buffer (YY_BUFFER_STATE b ) -{ - - if ( ! b ) - return; - - if ( b == YY_CURRENT_BUFFER ) /* Not sure if we should pop here. */ - YY_CURRENT_BUFFER_LVALUE = (YY_BUFFER_STATE) 0; - - if ( b->yy_is_our_buffer ) - yyfree((void *) b->yy_ch_buf ); - - yyfree((void *) b ); -} - -#ifndef __cplusplus -extern int isatty (int ); -#endif /* __cplusplus */ - -/* Initializes or reinitializes a buffer. - * This function is sometimes called more than once on the same buffer, - * such as during a yyrestart() or at EOF. - */ - static void yy_init_buffer (YY_BUFFER_STATE b, FILE * file ) - -{ - int oerrno = errno; - - yy_flush_buffer(b ); - - b->yy_input_file = file; - b->yy_fill_buffer = 1; - - /* If b is the current buffer, then yy_init_buffer was _probably_ - * called from yyrestart() or through yy_get_next_buffer. - * In that case, we don't want to reset the lineno or column. - */ - if (b != YY_CURRENT_BUFFER){ - b->yy_bs_lineno = 1; - b->yy_bs_column = 0; - } - - b->yy_is_interactive = file ? (isatty( fileno(file) ) > 0) : 0; - - errno = oerrno; -} - -/** Discard all buffered characters. On the next scan, YY_INPUT will be called. - * @param b the buffer state to be flushed, usually @c YY_CURRENT_BUFFER. - * - */ - void yy_flush_buffer (YY_BUFFER_STATE b ) -{ - if ( ! b ) - return; - - b->yy_n_chars = 0; - - /* We always need two end-of-buffer characters. The first causes - * a transition to the end-of-buffer state. The second causes - * a jam in that state. - */ - b->yy_ch_buf[0] = YY_END_OF_BUFFER_CHAR; - b->yy_ch_buf[1] = YY_END_OF_BUFFER_CHAR; - - b->yy_buf_pos = &b->yy_ch_buf[0]; - - b->yy_at_bol = 1; - b->yy_buffer_status = YY_BUFFER_NEW; - - if ( b == YY_CURRENT_BUFFER ) - yy_load_buffer_state( ); -} - -/** Pushes the new state onto the stack. The new state becomes - * the current state. This function will allocate the stack - * if necessary. - * @param new_buffer The new state. - * - */ -void yypush_buffer_state (YY_BUFFER_STATE new_buffer ) -{ - if (new_buffer == NULL) - return; - - yyensure_buffer_stack(); - - /* This block is copied from yy_switch_to_buffer. */ - if ( YY_CURRENT_BUFFER ) - { - /* Flush out information for old buffer. */ - *(yy_c_buf_p) = (yy_hold_char); - YY_CURRENT_BUFFER_LVALUE->yy_buf_pos = (yy_c_buf_p); - YY_CURRENT_BUFFER_LVALUE->yy_n_chars = (yy_n_chars); - } - - /* Only push if top exists. Otherwise, replace top. */ - if (YY_CURRENT_BUFFER) - (yy_buffer_stack_top)++; - YY_CURRENT_BUFFER_LVALUE = new_buffer; - - /* copied from yy_switch_to_buffer. */ - yy_load_buffer_state( ); - (yy_did_buffer_switch_on_eof) = 1; -} - -/** Removes and deletes the top of the stack, if present. - * The next element becomes the new top. - * - */ -void yypop_buffer_state (void) -{ - if (!YY_CURRENT_BUFFER) - return; - - yy_delete_buffer(YY_CURRENT_BUFFER ); - YY_CURRENT_BUFFER_LVALUE = NULL; - if ((yy_buffer_stack_top) > 0) - --(yy_buffer_stack_top); - - if (YY_CURRENT_BUFFER) { - yy_load_buffer_state( ); - (yy_did_buffer_switch_on_eof) = 1; - } -} - -/* Allocates the stack if it does not exist. - * Guarantees space for at least one push. - */ -static void yyensure_buffer_stack (void) -{ - int num_to_alloc; - - if (!(yy_buffer_stack)) { - - /* First allocation is just for 2 elements, since we don't know if this - * scanner will even need a stack. We use 2 instead of 1 to avoid an - * immediate realloc on the next call. - */ - num_to_alloc = 1; - (yy_buffer_stack) = (struct yy_buffer_state**)yyalloc - (num_to_alloc * sizeof(struct yy_buffer_state*) - ); - - memset((yy_buffer_stack), 0, num_to_alloc * sizeof(struct yy_buffer_state*)); - - (yy_buffer_stack_max) = num_to_alloc; - (yy_buffer_stack_top) = 0; - return; - } - - if ((yy_buffer_stack_top) >= ((yy_buffer_stack_max)) - 1){ - - /* Increase the buffer to prepare for a possible push. */ - int grow_size = 8 /* arbitrary grow size */; - - num_to_alloc = (yy_buffer_stack_max) + grow_size; - (yy_buffer_stack) = (struct yy_buffer_state**)yyrealloc - ((yy_buffer_stack), - num_to_alloc * sizeof(struct yy_buffer_state*) - ); - - /* zero only the new slots.*/ - memset((yy_buffer_stack) + (yy_buffer_stack_max), 0, grow_size * sizeof(struct yy_buffer_state*)); - (yy_buffer_stack_max) = num_to_alloc; - } -} - -/** Setup the input buffer state to scan directly from a user-specified character buffer. - * @param base the character buffer - * @param size the size in bytes of the character buffer - * - * @return the newly allocated buffer state object. - */ -YY_BUFFER_STATE yy_scan_buffer (char * base, yy_size_t size ) -{ - YY_BUFFER_STATE b; - - if ( size < 2 || - base[size-2] != YY_END_OF_BUFFER_CHAR || - base[size-1] != YY_END_OF_BUFFER_CHAR ) - /* They forgot to leave room for the EOB's. */ - return 0; - - b = (YY_BUFFER_STATE) yyalloc(sizeof( struct yy_buffer_state ) ); - if ( ! b ) - YY_FATAL_ERROR( "out of dynamic memory in yy_scan_buffer()" ); - - b->yy_buf_size = size - 2; /* "- 2" to take care of EOB's */ - b->yy_buf_pos = b->yy_ch_buf = base; - b->yy_is_our_buffer = 0; - b->yy_input_file = 0; - b->yy_n_chars = b->yy_buf_size; - b->yy_is_interactive = 0; - b->yy_at_bol = 1; - b->yy_fill_buffer = 0; - b->yy_buffer_status = YY_BUFFER_NEW; - - yy_switch_to_buffer(b ); - - return b; -} - -/** Setup the input buffer state to scan a string. The next call to yylex() will - * scan from a @e copy of @a str. - * @param str a NUL-terminated string to scan - * - * @return the newly allocated buffer state object. - * @note If you want to scan bytes that may contain NUL values, then use - * yy_scan_bytes() instead. - */ -YY_BUFFER_STATE yy_scan_string (yyconst char * yystr ) -{ - - return yy_scan_bytes(yystr,strlen(yystr) ); -} - -/** Setup the input buffer state to scan the given bytes. The next call to yylex() will - * scan from a @e copy of @a bytes. - * @param bytes the byte buffer to scan - * @param len the number of bytes in the buffer pointed to by @a bytes. - * - * @return the newly allocated buffer state object. - */ -YY_BUFFER_STATE yy_scan_bytes (yyconst char * yybytes, int _yybytes_len ) -{ - YY_BUFFER_STATE b; - char *buf; - yy_size_t n; - int i; - - /* Get memory for full buffer, including space for trailing EOB's. */ - n = _yybytes_len + 2; - buf = (char *) yyalloc(n ); - if ( ! buf ) - YY_FATAL_ERROR( "out of dynamic memory in yy_scan_bytes()" ); - - for ( i = 0; i < _yybytes_len; ++i ) - buf[i] = yybytes[i]; - - buf[_yybytes_len] = buf[_yybytes_len+1] = YY_END_OF_BUFFER_CHAR; - - b = yy_scan_buffer(buf,n ); - if ( ! b ) - YY_FATAL_ERROR( "bad buffer in yy_scan_bytes()" ); - - /* It's okay to grow etc. this buffer, and we should throw it - * away when we're done. - */ - b->yy_is_our_buffer = 1; - - return b; -} - -#ifndef YY_EXIT_FAILURE -#define YY_EXIT_FAILURE 2 -#endif - -static void yy_fatal_error (yyconst char* msg ) -{ - (void) fprintf( stderr, "%s\n", msg ); - exit( YY_EXIT_FAILURE ); -} - -/* Redefine yyless() so it works in section 3 code. */ - -#undef yyless -#define yyless(n) \ - do \ - { \ - /* Undo effects of setting up yytext. */ \ - int yyless_macro_arg = (n); \ - YY_LESS_LINENO(yyless_macro_arg);\ - yytext[yyleng] = (yy_hold_char); \ - (yy_c_buf_p) = yytext + yyless_macro_arg; \ - (yy_hold_char) = *(yy_c_buf_p); \ - *(yy_c_buf_p) = '\0'; \ - yyleng = yyless_macro_arg; \ - } \ - while ( 0 ) - -/* Accessor methods (get/set functions) to struct members. */ - -/** Get the input stream. - * - */ -FILE *yyget_in (void) -{ - return yyin; -} - -/** Get the output stream. - * - */ -FILE *yyget_out (void) -{ - return yyout; -} - -/** Get the length of the current token. - * - */ -int yyget_leng (void) -{ - return yyleng; -} - -/** Get the current token. - * - */ - -char *yyget_text (void) -{ - return yytext; -} - -/** Set the input stream. This does not discard the current - * input buffer. - * @param in_str A readable stream. - * - * @see yy_switch_to_buffer - */ -void yyset_in (FILE * in_str ) -{ - yyin = in_str ; -} - -void yyset_out (FILE * out_str ) -{ - yyout = out_str ; -} - -int yyget_debug (void) -{ - return yy_flex_debug; -} - -void yyset_debug (int bdebug ) -{ - yy_flex_debug = bdebug ; -} - -static int yy_init_globals (void) -{ - /* Initialization is the same as for the non-reentrant scanner. - * This function is called from yylex_destroy(), so don't allocate here. - */ - - (yy_buffer_stack) = 0; - (yy_buffer_stack_top) = 0; - (yy_buffer_stack_max) = 0; - (yy_c_buf_p) = (char *) 0; - (yy_init) = 0; - (yy_start) = 0; - -/* Defined in main.c */ -#ifdef YY_STDINIT - yyin = stdin; - yyout = stdout; -#else - yyin = (FILE *) 0; - yyout = (FILE *) 0; -#endif - - /* For future reference: Set errno on error, since we are called by - * yylex_init() - */ - return 0; -} - -/* yylex_destroy is for both reentrant and non-reentrant scanners. */ -int yylex_destroy (void) -{ - - /* Pop the buffer stack, destroying each element. */ - while(YY_CURRENT_BUFFER){ - yy_delete_buffer(YY_CURRENT_BUFFER ); - YY_CURRENT_BUFFER_LVALUE = NULL; - yypop_buffer_state(); - } - - /* Destroy the stack itself. */ - yyfree((yy_buffer_stack) ); - (yy_buffer_stack) = NULL; - - /* Reset the globals. This is important in a non-reentrant scanner so the next time - * yylex() is called, initialization will occur. */ - yy_init_globals( ); - - return 0; -} - -/* - * Internal utility routines. - */ - -#ifndef yytext_ptr -static void yy_flex_strncpy (char* s1, yyconst char * s2, int n ) -{ - register int i; - for ( i = 0; i < n; ++i ) - s1[i] = s2[i]; -} -#endif - -#ifdef YY_NEED_STRLEN -static int yy_flex_strlen (yyconst char * s ) -{ - register int n; - for ( n = 0; s[n]; ++n ) - ; - - return n; -} -#endif - -void *yyalloc (yy_size_t size ) -{ - return (void *) malloc( size ); -} - -void *yyrealloc (void * ptr, yy_size_t size ) -{ - /* The cast to (char *) in the following accommodates both - * implementations that use char* generic pointers, and those - * that use void* generic pointers. It works with the latter - * because both ANSI C and C++ allow castless assignment from - * any pointer type to void*, and deal with argument conversions - * as though doing an assignment. - */ - return (void *) realloc( (char *) ptr, size ); -} - -void yyfree (void * ptr ) -{ - free( (char *) ptr ); /* see yyrealloc() for (char *) cast */ -} - -#define YYTABLES_NAME "yytables" - -#line 116 "printrcl.l" diff --git a/src/gutenprintui/printrcl.l b/src/gutenprintui/printrcl.l deleted file mode 100644 index cf4933e..0000000 --- a/src/gutenprintui/printrcl.l +++ /dev/null @@ -1,115 +0,0 @@ -/* -*-Mode: C-*- - * "$Id: printrcl.l,v 1.1 2004/09/17 18:38:14 rleigh Exp $" - * - * printrc parser - * - * Copyright 2003 Robert Krawitz - * - * 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 -#endif - -#include -#include -#include "gutenprintui-internal.h" -#include "printrc.h" - -#include -#include -#include - -#define YY_NO_UNPUT - -int mylineno = 1; - -#define DBG(x) \ -do \ - { \ - if (getenv("STP_DEBUG_PRINTRC")) \ - fprintf(stderr, "'%s' => %s\n", yytext, #x); \ - } \ - while (0) - -static char * -q_strdup(const char *s) -{ - /* Strip the leading and trailing quote */ - if (strlen(s) <= 2) - return NULL; - else - return g_strndup(s + 1, strlen(s) - 2); -} - -%} - -%option noyywrap - -digit [0-9] -boolean (True)|(False) -integer [-+]?{digit}+ -float [-+]?{digit}+(\.{digit}+)?([eE][-+]?{digit}+)? -string ([\"][^\"\n]*[\"])|([\'][^\']*[\']) -ws [ \t]+ -printrc_hdr #PRINTRCv[234].*\n -word [a-zA-Z][a-zA-Z0-9_]* - -%% - -Current-Printer: DBG(CURRENT_PRINTER); return CURRENT_PRINTER; -Show-All-Paper-Sizes: DBG(SHOW_ALL_PAPER_SIZES); return SHOW_ALL_PAPER_SIZES; -Printer: DBG(PRINTER); return PRINTER; -Destination: DBG(DESTINATION); return DESTINATION; -Scaling: DBG(SCALING); return SCALING; -Orientation: DBG(ORIENTATION); return ORIENTATION; -Autosize-Roll-Paper: DBG(AUTOSIZE_ROLL_PAPER); return AUTOSIZE_ROLL_PAPER; -Unit: DBG(UNIT); return UNIT; -Driver: DBG(DRIVER); return DRIVER; -Left: DBG(LEFT); return LEFT; -Top: DBG(TOP); return TOP; -Custom_Page_Width: DBG(CUSTOM_PAGE_WIDTH); return CUSTOM_PAGE_WIDTH; -Custom_Page_Height: DBG(CUSTOM_PAGE_HEIGHT); return CUSTOM_PAGE_HEIGHT; -Output_Type: DBG(OUTPUT_TYPE); return OUTPUT_TYPE; -Parameter DBG(PARAMETER); return PARAMETER; -Queue-Name: DBG(QUEUE_NAME); return QUEUE_NAME; -Output-Filename: DBG(OUTPUT_FILENAME); return OUTPUT_FILENAME; -Extra-Printer-Options: DBG(EXTRA_PRINTER_OPTIONS); return EXTRA_PRINTER_OPTIONS; -Custom-Command: DBG(CUSTOM_COMMAND); return CUSTOM_COMMAND; -Command-Type: DBG(COMMAND_TYPE); return COMMAND_TYPE; -Global-Settings: DBG(GLOBAL_SETTINGS); return GLOBAL_SETTINGS; -End-Global-Settings: DBG(END_GLOBAL_SETTINGS); return END_GLOBAL_SETTINGS; -Global: DBG(GLOBAL); return GLOBAL; - -Int DBG(pINT); return pINT; -String DBG(pSTRING_LIST); return pSTRING_LIST; -File DBG(pFILE); return pFILE; -Double DBG(pDOUBLE); return pDOUBLE; -Dimension DBG(pDIMENSION); return pDIMENSION; -Boolean DBG(pBOOLEAN); return pBOOLEAN; -Curve DBG(pCURVE); return pCURVE; - -{integer} yylval.ival = atoi(yytext); DBG(tINT); return tINT; -{float} yylval.dval = strtod(yytext, NULL); DBG(tDOUBLE); return tDOUBLE; -{string} yylval.sval = q_strdup(yytext); DBG(tSTRING); return tSTRING; -{boolean} yylval.sval = g_strdup(yytext); DBG(tBOOLEAN); return tBOOLEAN; -{word} yylval.sval = g_strdup(yytext); DBG(tWORD); return tWORD; -{printrc_hdr} DBG(PRINTRC_HDR); return PRINTRC_HDR; -{ws} DBG(whitespace1); /* Skip blanks/tabs */ -#[^\n]* DBG(comment1); /* Skip comments */ -\n DBG(newline); mylineno++; diff --git a/src/gutenprintui/printrcy.c b/src/gutenprintui/printrcy.c deleted file mode 100644 index ffc38c6..0000000 --- a/src/gutenprintui/printrcy.c +++ /dev/null @@ -1,2061 +0,0 @@ -/* A Bison parser, made by GNU Bison 2.3. */ - -/* Skeleton implementation for Bison's Yacc-like parsers in C - - Copyright (C) 1984, 1989, 1990, 2000, 2001, 2002, 2003, 2004, 2005, 2006 - Free Software Foundation, Inc. - - 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., 51 Franklin Street, Fifth Floor, - Boston, MA 02110-1301, USA. */ - -/* As a special exception, you may create a larger work that contains - part or all of the Bison parser skeleton and distribute that work - under terms of your choice, so long as that work isn't itself a - parser generator using the skeleton or a modified version thereof - as a parser skeleton. Alternatively, if you modify or redistribute - the parser skeleton itself, you may (at your option) remove this - special exception, which will cause the skeleton and the resulting - Bison output files to be licensed under the GNU General Public - License without this special exception. - - This special exception was added by the Free Software Foundation in - version 2.2 of Bison. */ - -/* C LALR(1) parser skeleton written by Richard Stallman, by - simplifying the original so-called "semantic" parser. */ - -/* All symbols defined below should begin with yy or YY, to avoid - infringing on user name space. This should be done even for local - variables, as they might otherwise be expanded by user macros. - There are some unavoidable exceptions within include files to - define necessary library symbols; they are noted "INFRINGES ON - USER NAME SPACE" below. */ - -/* Identify Bison output. */ -#define YYBISON 1 - -/* Bison version. */ -#define YYBISON_VERSION "2.3" - -/* Skeleton name. */ -#define YYSKELETON_NAME "yacc.c" - -/* Pure parsers. */ -#define YYPURE 0 - -/* Using locations. */ -#define YYLSP_NEEDED 0 - - - -/* Tokens. */ -#ifndef YYTOKENTYPE -# define YYTOKENTYPE - /* Put the tokens into the symbol table, so that GDB and other debuggers - know about them. */ - enum yytokentype { - tINT = 258, - tDOUBLE = 259, - tDIMENSION = 260, - tBOOLEAN = 261, - tSTRING = 262, - tWORD = 263, - tGSWORD = 264, - CURRENT_PRINTER = 265, - SHOW_ALL_PAPER_SIZES = 266, - PRINTER = 267, - DESTINATION = 268, - SCALING = 269, - ORIENTATION = 270, - AUTOSIZE_ROLL_PAPER = 271, - UNIT = 272, - DRIVER = 273, - LEFT = 274, - TOP = 275, - CUSTOM_PAGE_WIDTH = 276, - CUSTOM_PAGE_HEIGHT = 277, - OUTPUT_TYPE = 278, - PRINTRC_HDR = 279, - PARAMETER = 280, - QUEUE_NAME = 281, - OUTPUT_FILENAME = 282, - EXTRA_PRINTER_OPTIONS = 283, - CUSTOM_COMMAND = 284, - COMMAND_TYPE = 285, - GLOBAL_SETTINGS = 286, - GLOBAL = 287, - END_GLOBAL_SETTINGS = 288, - pINT = 289, - pSTRING_LIST = 290, - pFILE = 291, - pDOUBLE = 292, - pDIMENSION = 293, - pBOOLEAN = 294, - pCURVE = 295 - }; -#endif -/* Tokens. */ -#define tINT 258 -#define tDOUBLE 259 -#define tDIMENSION 260 -#define tBOOLEAN 261 -#define tSTRING 262 -#define tWORD 263 -#define tGSWORD 264 -#define CURRENT_PRINTER 265 -#define SHOW_ALL_PAPER_SIZES 266 -#define PRINTER 267 -#define DESTINATION 268 -#define SCALING 269 -#define ORIENTATION 270 -#define AUTOSIZE_ROLL_PAPER 271 -#define UNIT 272 -#define DRIVER 273 -#define LEFT 274 -#define TOP 275 -#define CUSTOM_PAGE_WIDTH 276 -#define CUSTOM_PAGE_HEIGHT 277 -#define OUTPUT_TYPE 278 -#define PRINTRC_HDR 279 -#define PARAMETER 280 -#define QUEUE_NAME 281 -#define OUTPUT_FILENAME 282 -#define EXTRA_PRINTER_OPTIONS 283 -#define CUSTOM_COMMAND 284 -#define COMMAND_TYPE 285 -#define GLOBAL_SETTINGS 286 -#define GLOBAL 287 -#define END_GLOBAL_SETTINGS 288 -#define pINT 289 -#define pSTRING_LIST 290 -#define pFILE 291 -#define pDOUBLE 292 -#define pDIMENSION 293 -#define pBOOLEAN 294 -#define pCURVE 295 - - - - -/* Copy the first part of user declarations. */ -#line 23 "printrcy.y" - - -#ifdef HAVE_CONFIG_H -#include -#endif - -#include -#include -#include "gutenprintui-internal.h" -#include "printrc.h" - -#include -#include -#include - -extern int mylineno; - -extern int yylex(void); -char *quotestrip(const char *i); -char *endstrip(const char *i); - -extern char* yytext; - -static int yyerror( const char *s ) -{ - fprintf(stderr,"stdin:%d: %s before '%s'\n", mylineno, s, yytext); - return 0; -} - -static stpui_plist_t *current_printer = NULL; - - - -/* Enabling traces. */ -#ifndef YYDEBUG -# define YYDEBUG 0 -#endif - -/* Enabling verbose error messages. */ -#ifdef YYERROR_VERBOSE -# undef YYERROR_VERBOSE -# define YYERROR_VERBOSE 1 -#else -# define YYERROR_VERBOSE 0 -#endif - -/* Enabling the token table. */ -#ifndef YYTOKEN_TABLE -# define YYTOKEN_TABLE 0 -#endif - -#if ! defined YYSTYPE && ! defined YYSTYPE_IS_DECLARED -typedef int YYSTYPE; -# define yystype YYSTYPE /* obsolescent; will be withdrawn */ -# define YYSTYPE_IS_DECLARED 1 -# define YYSTYPE_IS_TRIVIAL 1 -#endif - - - -/* Copy the second part of user declarations. */ - - -/* Line 216 of yacc.c. */ -#line 219 "printrcy.c" - -#ifdef short -# undef short -#endif - -#ifdef YYTYPE_UINT8 -typedef YYTYPE_UINT8 yytype_uint8; -#else -typedef unsigned char yytype_uint8; -#endif - -#ifdef YYTYPE_INT8 -typedef YYTYPE_INT8 yytype_int8; -#elif (defined __STDC__ || defined __C99__FUNC__ \ - || defined __cplusplus || defined _MSC_VER) -typedef signed char yytype_int8; -#else -typedef short int yytype_int8; -#endif - -#ifdef YYTYPE_UINT16 -typedef YYTYPE_UINT16 yytype_uint16; -#else -typedef unsigned short int yytype_uint16; -#endif - -#ifdef YYTYPE_INT16 -typedef YYTYPE_INT16 yytype_int16; -#else -typedef short int yytype_int16; -#endif - -#ifndef YYSIZE_T -# ifdef __SIZE_TYPE__ -# define YYSIZE_T __SIZE_TYPE__ -# elif defined size_t -# define YYSIZE_T size_t -# elif ! defined YYSIZE_T && (defined __STDC__ || defined __C99__FUNC__ \ - || defined __cplusplus || defined _MSC_VER) -# include /* INFRINGES ON USER NAME SPACE */ -# define YYSIZE_T size_t -# else -# define YYSIZE_T unsigned int -# endif -#endif - -#define YYSIZE_MAXIMUM ((YYSIZE_T) -1) - -#ifndef YY_ -# if YYENABLE_NLS -# if ENABLE_NLS -# include /* INFRINGES ON USER NAME SPACE */ -# define YY_(msgid) dgettext ("bison-runtime", msgid) -# endif -# endif -# ifndef YY_ -# define YY_(msgid) msgid -# endif -#endif - -/* Suppress unused-variable warnings by "using" E. */ -#if ! defined lint || defined __GNUC__ -# define YYUSE(e) ((void) (e)) -#else -# define YYUSE(e) /* empty */ -#endif - -/* Identity function, used to suppress warnings about constant conditions. */ -#ifndef lint -# define YYID(n) (n) -#else -#if (defined __STDC__ || defined __C99__FUNC__ \ - || defined __cplusplus || defined _MSC_VER) -static int -YYID (int i) -#else -static int -YYID (i) - int i; -#endif -{ - return i; -} -#endif - -#if ! defined yyoverflow || YYERROR_VERBOSE - -/* The parser invokes alloca or malloc; define the necessary symbols. */ - -# ifdef YYSTACK_USE_ALLOCA -# if YYSTACK_USE_ALLOCA -# ifdef __GNUC__ -# define YYSTACK_ALLOC __builtin_alloca -# elif defined __BUILTIN_VA_ARG_INCR -# include /* INFRINGES ON USER NAME SPACE */ -# elif defined _AIX -# define YYSTACK_ALLOC __alloca -# elif defined _MSC_VER -# include /* INFRINGES ON USER NAME SPACE */ -# define alloca _alloca -# else -# define YYSTACK_ALLOC alloca -# if ! defined _ALLOCA_H && ! defined _STDLIB_H && (defined __STDC__ || defined __C99__FUNC__ \ - || defined __cplusplus || defined _MSC_VER) -# include /* INFRINGES ON USER NAME SPACE */ -# ifndef _STDLIB_H -# define _STDLIB_H 1 -# endif -# endif -# endif -# endif -# endif - -# ifdef YYSTACK_ALLOC - /* Pacify GCC's `empty if-body' warning. */ -# define YYSTACK_FREE(Ptr) do { /* empty */; } while (YYID (0)) -# ifndef YYSTACK_ALLOC_MAXIMUM - /* The OS might guarantee only one guard page at the bottom of the stack, - and a page size can be as small as 4096 bytes. So we cannot safely - invoke alloca (N) if N exceeds 4096. Use a slightly smaller number - to allow for a few compiler-allocated temporary stack slots. */ -# define YYSTACK_ALLOC_MAXIMUM 4032 /* reasonable circa 2006 */ -# endif -# else -# define YYSTACK_ALLOC YYMALLOC -# define YYSTACK_FREE YYFREE -# ifndef YYSTACK_ALLOC_MAXIMUM -# define YYSTACK_ALLOC_MAXIMUM YYSIZE_MAXIMUM -# endif -# if (defined __cplusplus && ! defined _STDLIB_H \ - && ! ((defined YYMALLOC || defined malloc) \ - && (defined YYFREE || defined free))) -# include /* INFRINGES ON USER NAME SPACE */ -# ifndef _STDLIB_H -# define _STDLIB_H 1 -# endif -# endif -# ifndef YYMALLOC -# define YYMALLOC malloc -# if ! defined malloc && ! defined _STDLIB_H && (defined __STDC__ || defined __C99__FUNC__ \ - || defined __cplusplus || defined _MSC_VER) -void *malloc (YYSIZE_T); /* INFRINGES ON USER NAME SPACE */ -# endif -# endif -# ifndef YYFREE -# define YYFREE free -# if ! defined free && ! defined _STDLIB_H && (defined __STDC__ || defined __C99__FUNC__ \ - || defined __cplusplus || defined _MSC_VER) -void free (void *); /* INFRINGES ON USER NAME SPACE */ -# endif -# endif -# endif -#endif /* ! defined yyoverflow || YYERROR_VERBOSE */ - - -#if (! defined yyoverflow \ - && (! defined __cplusplus \ - || (defined YYSTYPE_IS_TRIVIAL && YYSTYPE_IS_TRIVIAL))) - -/* A type that is properly aligned for any stack member. */ -union yyalloc -{ - yytype_int16 yyss; - YYSTYPE yyvs; - }; - -/* The size of the maximum gap between one aligned stack and the next. */ -# define YYSTACK_GAP_MAXIMUM (sizeof (union yyalloc) - 1) - -/* The size of an array large to enough to hold all stacks, each with - N elements. */ -# define YYSTACK_BYTES(N) \ - ((N) * (sizeof (yytype_int16) + sizeof (YYSTYPE)) \ - + YYSTACK_GAP_MAXIMUM) - -/* Copy COUNT objects from FROM to TO. The source and destination do - not overlap. */ -# ifndef YYCOPY -# if defined __GNUC__ && 1 < __GNUC__ -# define YYCOPY(To, From, Count) \ - __builtin_memcpy (To, From, (Count) * sizeof (*(From))) -# else -# define YYCOPY(To, From, Count) \ - do \ - { \ - YYSIZE_T yyi; \ - for (yyi = 0; yyi < (Count); yyi++) \ - (To)[yyi] = (From)[yyi]; \ - } \ - while (YYID (0)) -# endif -# endif - -/* Relocate STACK from its old location to the new one. The - local variables YYSIZE and YYSTACKSIZE give the old and new number of - elements in the stack, and YYPTR gives the new location of the - stack. Advance YYPTR to a properly aligned location for the next - stack. */ -# define YYSTACK_RELOCATE(Stack) \ - do \ - { \ - YYSIZE_T yynewbytes; \ - YYCOPY (&yyptr->Stack, Stack, yysize); \ - Stack = &yyptr->Stack; \ - yynewbytes = yystacksize * sizeof (*Stack) + YYSTACK_GAP_MAXIMUM; \ - yyptr += yynewbytes / sizeof (*yyptr); \ - } \ - while (YYID (0)) - -#endif - -/* YYFINAL -- State number of the termination state. */ -#define YYFINAL 10 -/* YYLAST -- Last index in YYTABLE. */ -#define YYLAST 75 - -/* YYNTOKENS -- Number of terminals. */ -#define YYNTOKENS 41 -/* YYNNTS -- Number of nonterminals. */ -#define YYNNTS 42 -/* YYNRULES -- Number of rules. */ -#define YYNRULES 70 -/* YYNRULES -- Number of states. */ -#define YYNSTATES 114 - -/* YYTRANSLATE(YYLEX) -- Bison symbol number corresponding to YYLEX. */ -#define YYUNDEFTOK 2 -#define YYMAXUTOK 295 - -#define YYTRANSLATE(YYX) \ - ((unsigned int) (YYX) <= YYMAXUTOK ? yytranslate[YYX] : YYUNDEFTOK) - -/* YYTRANSLATE[YYLEX] -- Bison symbol number corresponding to YYLEX. */ -static const yytype_uint8 yytranslate[] = -{ - 0, 2, 2, 2, 2, 2, 2, 2, 2, 2, - 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, - 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, - 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, - 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, - 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, - 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, - 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, - 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, - 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, - 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, - 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, - 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, - 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, - 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, - 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, - 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, - 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, - 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, - 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, - 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, - 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, - 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, - 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, - 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, - 2, 2, 2, 2, 2, 2, 1, 2, 3, 4, - 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, - 15, 16, 17, 18, 19, 20, 21, 22, 23, 24, - 25, 26, 27, 28, 29, 30, 31, 32, 33, 34, - 35, 36, 37, 38, 39, 40 -}; - -#if YYDEBUG -/* YYPRHS[YYN] -- Index of the first RHS symbol of rule number YYN in - YYRHS. */ -static const yytype_uint8 yyprhs[] = -{ - 0, 0, 3, 7, 10, 13, 16, 19, 22, 25, - 28, 31, 34, 37, 40, 43, 46, 49, 52, 53, - 58, 63, 68, 73, 78, 83, 88, 90, 92, 94, - 96, 98, 100, 102, 105, 108, 110, 112, 114, 116, - 118, 120, 122, 124, 126, 128, 130, 132, 134, 136, - 138, 140, 143, 145, 149, 152, 154, 157, 160, 162, - 164, 167, 170, 172, 174, 177, 179, 183, 185, 187, - 189 -}; - -/* YYRHS -- A `-1'-separated list of the rules' RHS. */ -static const yytype_int8 yyrhs[] = -{ - 82, 0, -1, 12, 7, 7, -1, 13, 7, -1, - 26, 7, -1, 27, 7, -1, 28, 7, -1, 29, - 7, -1, 30, 3, -1, 14, 4, -1, 15, 3, - -1, 16, 3, -1, 17, 3, -1, 19, 3, -1, - 20, 3, -1, 23, 3, -1, 21, 3, -1, 22, - 3, -1, -1, 8, 34, 6, 3, -1, 8, 35, - 6, 7, -1, 8, 36, 6, 7, -1, 8, 37, - 6, 4, -1, 8, 38, 6, 3, -1, 8, 39, - 6, 6, -1, 8, 40, 6, 7, -1, 59, -1, - 60, -1, 61, -1, 62, -1, 64, -1, 65, -1, - 63, -1, 25, 66, -1, 68, 67, -1, 58, -1, - 43, -1, 49, -1, 50, -1, 51, -1, 52, -1, - 53, -1, 54, -1, 56, -1, 57, -1, 55, -1, - 44, -1, 45, -1, 46, -1, 47, -1, 48, -1, - 70, 69, -1, 58, -1, 42, 70, 68, -1, 72, - 71, -1, 58, -1, 10, 7, -1, 11, 6, -1, - 73, -1, 74, -1, 73, 74, -1, 8, 7, -1, - 75, -1, 77, -1, 79, 78, -1, 58, -1, 31, - 79, 33, -1, 80, -1, 76, -1, 58, -1, 24, - 81, 72, -1 -}; - -/* YYRLINE[YYN] -- source line where rule number YYN was defined. */ -static const yytype_uint16 yyrline[] = -{ - 0, 100, 100, 111, 118, 128, 138, 148, 158, 165, - 172, 179, 186, 193, 200, 207, 228, 235, 242, 245, - 262, 280, 298, 315, 332, 353, 376, 376, 376, 376, - 377, 377, 377, 380, 383, 383, 386, 386, 386, 386, - 387, 387, 387, 387, 387, 388, 388, 388, 388, 389, - 389, 392, 392, 395, 398, 398, 401, 405, 415, 415, - 418, 421, 432, 432, 435, 435, 438, 441, 441, 441, - 444 -}; -#endif - -#if YYDEBUG || YYERROR_VERBOSE || YYTOKEN_TABLE -/* YYTNAME[SYMBOL-NUM] -- String name of the symbol SYMBOL-NUM. - First, the terminals, then, starting at YYNTOKENS, nonterminals. */ -static const char *const yytname[] = -{ - "$end", "error", "$undefined", "tINT", "tDOUBLE", "tDIMENSION", - "tBOOLEAN", "tSTRING", "tWORD", "tGSWORD", "CURRENT_PRINTER", - "SHOW_ALL_PAPER_SIZES", "PRINTER", "DESTINATION", "SCALING", - "ORIENTATION", "AUTOSIZE_ROLL_PAPER", "UNIT", "DRIVER", "LEFT", "TOP", - "CUSTOM_PAGE_WIDTH", "CUSTOM_PAGE_HEIGHT", "OUTPUT_TYPE", "PRINTRC_HDR", - "PARAMETER", "QUEUE_NAME", "OUTPUT_FILENAME", "EXTRA_PRINTER_OPTIONS", - "CUSTOM_COMMAND", "COMMAND_TYPE", "GLOBAL_SETTINGS", "GLOBAL", - "END_GLOBAL_SETTINGS", "pINT", "pSTRING_LIST", "pFILE", "pDOUBLE", - "pDIMENSION", "pBOOLEAN", "pCURVE", "$accept", "Printer", "Destination", - "Queue_Name", "Output_Filename", "Extra_Printer_Options", - "Custom_Command", "Command_Type", "Scaling", "Orientation", - "Autosize_Roll_Paper", "Unit", "Left", "Top", "Output_Type", - "Custom_Page_Width", "Custom_Page_Height", "Empty", "Int_Param", - "String_List_Param", "File_Param", "Double_Param", "Dimension_Param", - "Boolean_Param", "Curve_Param", "Typed_Param", "Parameter", "Parameters", - "Standard_Value", "Standard_Values", "A_Printer", "Printers", - "Current_Printer", "Show_All_Paper_Sizes", "Global", "Old_Globals", - "New_Global_Setting", "Global_Setting", "Global_Settings", - "Global_Subblock", "Global_Block", "Thing", 0 -}; -#endif - -# ifdef YYPRINT -/* YYTOKNUM[YYLEX-NUM] -- Internal token number corresponding to - token YYLEX-NUM. */ -static const yytype_uint16 yytoknum[] = -{ - 0, 256, 257, 258, 259, 260, 261, 262, 263, 264, - 265, 266, 267, 268, 269, 270, 271, 272, 273, 274, - 275, 276, 277, 278, 279, 280, 281, 282, 283, 284, - 285, 286, 287, 288, 289, 290, 291, 292, 293, 294, - 295 -}; -# endif - -/* YYR1[YYN] -- Symbol number of symbol that rule YYN derives. */ -static const yytype_uint8 yyr1[] = -{ - 0, 41, 42, 43, 44, 45, 46, 47, 48, 49, - 50, 51, 52, 53, 54, 55, 56, 57, 58, 59, - 60, 61, 62, 63, 64, 65, 66, 66, 66, 66, - 66, 66, 66, 67, 68, 68, 69, 69, 69, 69, - 69, 69, 69, 69, 69, 69, 69, 69, 69, 69, - 69, 70, 70, 71, 72, 72, 73, 74, 75, 75, - 76, 77, 78, 78, 79, 79, 80, 81, 81, 81, - 82 -}; - -/* YYR2[YYN] -- Number of symbols composing right hand side of rule YYN. */ -static const yytype_uint8 yyr2[] = -{ - 0, 2, 3, 2, 2, 2, 2, 2, 2, 2, - 2, 2, 2, 2, 2, 2, 2, 2, 0, 4, - 4, 4, 4, 4, 4, 4, 1, 1, 1, 1, - 1, 1, 1, 2, 2, 1, 1, 1, 1, 1, - 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, - 1, 2, 1, 3, 2, 1, 2, 2, 1, 1, - 2, 2, 1, 1, 2, 1, 3, 1, 1, 1, - 3 -}; - -/* YYDEFACT[STATE-NAME] -- Default rule to reduce with in state - STATE-NUM when YYTABLE doesn't specify something else to do. Zero - means the default is an error. */ -static const yytype_uint8 yydefact[] = -{ - 0, 18, 0, 0, 18, 69, 0, 68, 67, 18, - 1, 56, 65, 0, 0, 60, 55, 70, 0, 66, - 58, 59, 62, 63, 64, 57, 0, 18, 54, 61, - 0, 52, 18, 2, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 36, - 46, 47, 48, 49, 50, 37, 38, 39, 40, 41, - 42, 45, 43, 44, 35, 53, 51, 3, 9, 10, - 11, 12, 13, 14, 16, 17, 15, 4, 5, 6, - 7, 8, 0, 34, 0, 26, 27, 28, 29, 32, - 30, 31, 33, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 19, 20, 21, - 22, 23, 24, 25 -}; - -/* YYDEFGOTO[NTERM-NUM]. */ -static const yytype_int8 yydefgoto[] = -{ - -1, 27, 49, 50, 51, 52, 53, 54, 55, 56, - 57, 58, 59, 60, 61, 62, 63, 5, 85, 86, - 87, 88, 89, 90, 91, 92, 83, 65, 66, 32, - 28, 17, 6, 15, 22, 7, 23, 24, 13, 8, - 9, 2 -}; - -/* YYPACT[STATE-NUM] -- Index in YYTABLE of the portion describing - STATE-NUM. */ -#define YYPACT_NINF -26 -static const yytype_int8 yypact[] = -{ - -22, -2, 6, 0, -26, -26, 5, -26, -26, -26, - -26, -26, -26, -7, 11, -26, -26, 7, 13, -26, - -26, -26, -26, -26, -26, -26, 14, -26, -26, -26, - 15, -26, 17, -26, 18, 20, 24, 32, 38, 39, - 45, 46, 47, 48, 49, 50, 51, 52, 57, -26, - -26, -26, -26, -26, -26, -26, -26, -26, -26, -26, - -26, -26, -26, -26, -26, 27, -26, -26, -26, -26, - -26, -26, -26, -26, -26, -26, -26, -26, -26, -26, - -26, -26, 10, -26, -25, -26, -26, -26, -26, -26, - -26, -26, -26, 55, 56, 58, 59, 60, 61, 62, - 66, 63, 64, 68, 70, 69, 67, -26, -26, -26, - -26, -26, -26, -26 -}; - -/* YYPGOTO[NTERM-NUM]. */ -static const yytype_int8 yypgoto[] = -{ - -26, -26, -26, -26, -26, -26, -26, -26, -26, -26, - -26, -26, -26, -26, -26, -26, -26, -4, -26, -26, - -26, -26, -26, -26, -26, -26, -26, -26, -26, -26, - -26, -26, 40, 41, -26, -26, -26, -26, -26, -26, - -26, -26 -}; - -/* YYTABLE[YYPACT[STATE-NUM]]. What to do in state STATE-NUM. If - positive, shift that token. If negative, reduce the rule which - number is the opposite. If zero, do what YYDEFACT says. - If YYTABLE_NINF, syntax error. */ -#define YYTABLE_NINF -1 -static const yytype_uint8 yytable[] = -{ - 12, 18, 1, 3, 14, 16, 10, 11, 3, 93, - 94, 95, 96, 97, 98, 99, 14, 25, 84, 26, - 29, 30, 33, 31, 68, 67, 19, 69, 64, 4, - 34, 35, 36, 37, 38, 70, 39, 40, 41, 42, - 43, 71, 72, 44, 45, 46, 47, 48, 73, 74, - 75, 76, 82, 20, 21, 0, 77, 78, 79, 80, - 81, 100, 101, 0, 102, 103, 104, 105, 106, 107, - 108, 109, 110, 111, 113, 112 -}; - -static const yytype_int8 yycheck[] = -{ - 4, 8, 24, 10, 11, 9, 0, 7, 10, 34, - 35, 36, 37, 38, 39, 40, 11, 6, 8, 12, - 7, 7, 7, 27, 4, 7, 33, 3, 32, 31, - 13, 14, 15, 16, 17, 3, 19, 20, 21, 22, - 23, 3, 3, 26, 27, 28, 29, 30, 3, 3, - 3, 3, 25, 13, 13, -1, 7, 7, 7, 7, - 3, 6, 6, -1, 6, 6, 6, 6, 6, 3, - 7, 7, 4, 3, 7, 6 -}; - -/* YYSTOS[STATE-NUM] -- The (internal number of the) accessing - symbol of state STATE-NUM. */ -static const yytype_uint8 yystos[] = -{ - 0, 24, 82, 10, 31, 58, 73, 76, 80, 81, - 0, 7, 58, 79, 11, 74, 58, 72, 8, 33, - 73, 74, 75, 77, 78, 6, 12, 42, 71, 7, - 7, 58, 70, 7, 13, 14, 15, 16, 17, 19, - 20, 21, 22, 23, 26, 27, 28, 29, 30, 43, - 44, 45, 46, 47, 48, 49, 50, 51, 52, 53, - 54, 55, 56, 57, 58, 68, 69, 7, 4, 3, - 3, 3, 3, 3, 3, 3, 3, 7, 7, 7, - 7, 3, 25, 67, 8, 59, 60, 61, 62, 63, - 64, 65, 66, 34, 35, 36, 37, 38, 39, 40, - 6, 6, 6, 6, 6, 6, 6, 3, 7, 7, - 4, 3, 6, 7 -}; - -#define yyerrok (yyerrstatus = 0) -#define yyclearin (yychar = YYEMPTY) -#define YYEMPTY (-2) -#define YYEOF 0 - -#define YYACCEPT goto yyacceptlab -#define YYABORT goto yyabortlab -#define YYERROR goto yyerrorlab - - -/* Like YYERROR except do call yyerror. This remains here temporarily - to ease the transition to the new meaning of YYERROR, for GCC. - Once GCC version 2 has supplanted version 1, this can go. */ - -#define YYFAIL goto yyerrlab - -#define YYRECOVERING() (!!yyerrstatus) - -#define YYBACKUP(Token, Value) \ -do \ - if (yychar == YYEMPTY && yylen == 1) \ - { \ - yychar = (Token); \ - yylval = (Value); \ - yytoken = YYTRANSLATE (yychar); \ - YYPOPSTACK (1); \ - goto yybackup; \ - } \ - else \ - { \ - yyerror (YY_("syntax error: cannot back up")); \ - YYERROR; \ - } \ -while (YYID (0)) - - -#define YYTERROR 1 -#define YYERRCODE 256 - - -/* YYLLOC_DEFAULT -- Set CURRENT to span from RHS[1] to RHS[N]. - If N is 0, then set CURRENT to the empty location which ends - the previous symbol: RHS[0] (always defined). */ - -#define YYRHSLOC(Rhs, K) ((Rhs)[K]) -#ifndef YYLLOC_DEFAULT -# define YYLLOC_DEFAULT(Current, Rhs, N) \ - do \ - if (YYID (N)) \ - { \ - (Current).first_line = YYRHSLOC (Rhs, 1).first_line; \ - (Current).first_column = YYRHSLOC (Rhs, 1).first_column; \ - (Current).last_line = YYRHSLOC (Rhs, N).last_line; \ - (Current).last_column = YYRHSLOC (Rhs, N).last_column; \ - } \ - else \ - { \ - (Current).first_line = (Current).last_line = \ - YYRHSLOC (Rhs, 0).last_line; \ - (Current).first_column = (Current).last_column = \ - YYRHSLOC (Rhs, 0).last_column; \ - } \ - while (YYID (0)) -#endif - - -/* YY_LOCATION_PRINT -- Print the location on the stream. - This macro was not mandated originally: define only if we know - we won't break user code: when these are the locations we know. */ - -#ifndef YY_LOCATION_PRINT -# if YYLTYPE_IS_TRIVIAL -# define YY_LOCATION_PRINT(File, Loc) \ - fprintf (File, "%d.%d-%d.%d", \ - (Loc).first_line, (Loc).first_column, \ - (Loc).last_line, (Loc).last_column) -# else -# define YY_LOCATION_PRINT(File, Loc) ((void) 0) -# endif -#endif - - -/* YYLEX -- calling `yylex' with the right arguments. */ - -#ifdef YYLEX_PARAM -# define YYLEX yylex (YYLEX_PARAM) -#else -# define YYLEX yylex () -#endif - -/* Enable debugging if requested. */ -#if YYDEBUG - -# ifndef YYFPRINTF -# include /* INFRINGES ON USER NAME SPACE */ -# define YYFPRINTF fprintf -# endif - -# define YYDPRINTF(Args) \ -do { \ - if (yydebug) \ - YYFPRINTF Args; \ -} while (YYID (0)) - -# define YY_SYMBOL_PRINT(Title, Type, Value, Location) \ -do { \ - if (yydebug) \ - { \ - YYFPRINTF (stderr, "%s ", Title); \ - yy_symbol_print (stderr, \ - Type, Value); \ - YYFPRINTF (stderr, "\n"); \ - } \ -} while (YYID (0)) - - -/*--------------------------------. -| Print this symbol on YYOUTPUT. | -`--------------------------------*/ - -/*ARGSUSED*/ -#if (defined __STDC__ || defined __C99__FUNC__ \ - || defined __cplusplus || defined _MSC_VER) -static void -yy_symbol_value_print (FILE *yyoutput, int yytype, YYSTYPE const * const yyvaluep) -#else -static void -yy_symbol_value_print (yyoutput, yytype, yyvaluep) - FILE *yyoutput; - int yytype; - YYSTYPE const * const yyvaluep; -#endif -{ - if (!yyvaluep) - return; -# ifdef YYPRINT - if (yytype < YYNTOKENS) - YYPRINT (yyoutput, yytoknum[yytype], *yyvaluep); -# else - YYUSE (yyoutput); -# endif - switch (yytype) - { - default: - break; - } -} - - -/*--------------------------------. -| Print this symbol on YYOUTPUT. | -`--------------------------------*/ - -#if (defined __STDC__ || defined __C99__FUNC__ \ - || defined __cplusplus || defined _MSC_VER) -static void -yy_symbol_print (FILE *yyoutput, int yytype, YYSTYPE const * const yyvaluep) -#else -static void -yy_symbol_print (yyoutput, yytype, yyvaluep) - FILE *yyoutput; - int yytype; - YYSTYPE const * const yyvaluep; -#endif -{ - if (yytype < YYNTOKENS) - YYFPRINTF (yyoutput, "token %s (", yytname[yytype]); - else - YYFPRINTF (yyoutput, "nterm %s (", yytname[yytype]); - - yy_symbol_value_print (yyoutput, yytype, yyvaluep); - YYFPRINTF (yyoutput, ")"); -} - -/*------------------------------------------------------------------. -| yy_stack_print -- Print the state stack from its BOTTOM up to its | -| TOP (included). | -`------------------------------------------------------------------*/ - -#if (defined __STDC__ || defined __C99__FUNC__ \ - || defined __cplusplus || defined _MSC_VER) -static void -yy_stack_print (yytype_int16 *bottom, yytype_int16 *top) -#else -static void -yy_stack_print (bottom, top) - yytype_int16 *bottom; - yytype_int16 *top; -#endif -{ - YYFPRINTF (stderr, "Stack now"); - for (; bottom <= top; ++bottom) - YYFPRINTF (stderr, " %d", *bottom); - YYFPRINTF (stderr, "\n"); -} - -# define YY_STACK_PRINT(Bottom, Top) \ -do { \ - if (yydebug) \ - yy_stack_print ((Bottom), (Top)); \ -} while (YYID (0)) - - -/*------------------------------------------------. -| Report that the YYRULE is going to be reduced. | -`------------------------------------------------*/ - -#if (defined __STDC__ || defined __C99__FUNC__ \ - || defined __cplusplus || defined _MSC_VER) -static void -yy_reduce_print (YYSTYPE *yyvsp, int yyrule) -#else -static void -yy_reduce_print (yyvsp, yyrule) - YYSTYPE *yyvsp; - int yyrule; -#endif -{ - int yynrhs = yyr2[yyrule]; - int yyi; - unsigned long int yylno = yyrline[yyrule]; - YYFPRINTF (stderr, "Reducing stack by rule %d (line %lu):\n", - yyrule - 1, yylno); - /* The symbols being reduced. */ - for (yyi = 0; yyi < yynrhs; yyi++) - { - fprintf (stderr, " $%d = ", yyi + 1); - yy_symbol_print (stderr, yyrhs[yyprhs[yyrule] + yyi], - &(yyvsp[(yyi + 1) - (yynrhs)]) - ); - fprintf (stderr, "\n"); - } -} - -# define YY_REDUCE_PRINT(Rule) \ -do { \ - if (yydebug) \ - yy_reduce_print (yyvsp, Rule); \ -} while (YYID (0)) - -/* Nonzero means print parse trace. It is left uninitialized so that - multiple parsers can coexist. */ -int yydebug; -#else /* !YYDEBUG */ -# define YYDPRINTF(Args) -# define YY_SYMBOL_PRINT(Title, Type, Value, Location) -# define YY_STACK_PRINT(Bottom, Top) -# define YY_REDUCE_PRINT(Rule) -#endif /* !YYDEBUG */ - - -/* YYINITDEPTH -- initial size of the parser's stacks. */ -#ifndef YYINITDEPTH -# define YYINITDEPTH 200 -#endif - -/* YYMAXDEPTH -- maximum size the stacks can grow to (effective only - if the built-in stack extension method is used). - - Do not make this value too large; the results are undefined if - YYSTACK_ALLOC_MAXIMUM < YYSTACK_BYTES (YYMAXDEPTH) - evaluated with infinite-precision integer arithmetic. */ - -#ifndef YYMAXDEPTH -# define YYMAXDEPTH 10000 -#endif - - - -#if YYERROR_VERBOSE - -# ifndef yystrlen -# if defined __GLIBC__ && defined _STRING_H -# define yystrlen strlen -# else -/* Return the length of YYSTR. */ -#if (defined __STDC__ || defined __C99__FUNC__ \ - || defined __cplusplus || defined _MSC_VER) -static YYSIZE_T -yystrlen (const char *yystr) -#else -static YYSIZE_T -yystrlen (yystr) - const char *yystr; -#endif -{ - YYSIZE_T yylen; - for (yylen = 0; yystr[yylen]; yylen++) - continue; - return yylen; -} -# endif -# endif - -# ifndef yystpcpy -# if defined __GLIBC__ && defined _STRING_H && defined _GNU_SOURCE -# define yystpcpy stpcpy -# else -/* Copy YYSRC to YYDEST, returning the address of the terminating '\0' in - YYDEST. */ -#if (defined __STDC__ || defined __C99__FUNC__ \ - || defined __cplusplus || defined _MSC_VER) -static char * -yystpcpy (char *yydest, const char *yysrc) -#else -static char * -yystpcpy (yydest, yysrc) - char *yydest; - const char *yysrc; -#endif -{ - char *yyd = yydest; - const char *yys = yysrc; - - while ((*yyd++ = *yys++) != '\0') - continue; - - return yyd - 1; -} -# endif -# endif - -# ifndef yytnamerr -/* Copy to YYRES the contents of YYSTR after stripping away unnecessary - quotes and backslashes, so that it's suitable for yyerror. The - heuristic is that double-quoting is unnecessary unless the string - contains an apostrophe, a comma, or backslash (other than - backslash-backslash). YYSTR is taken from yytname. If YYRES is - null, do not copy; instead, return the length of what the result - would have been. */ -static YYSIZE_T -yytnamerr (char *yyres, const char *yystr) -{ - if (*yystr == '"') - { - YYSIZE_T yyn = 0; - char const *yyp = yystr; - - for (;;) - switch (*++yyp) - { - case '\'': - case ',': - goto do_not_strip_quotes; - - case '\\': - if (*++yyp != '\\') - goto do_not_strip_quotes; - /* Fall through. */ - default: - if (yyres) - yyres[yyn] = *yyp; - yyn++; - break; - - case '"': - if (yyres) - yyres[yyn] = '\0'; - return yyn; - } - do_not_strip_quotes: ; - } - - if (! yyres) - return yystrlen (yystr); - - return yystpcpy (yyres, yystr) - yyres; -} -# endif - -/* Copy into YYRESULT an error message about the unexpected token - YYCHAR while in state YYSTATE. Return the number of bytes copied, - including the terminating null byte. If YYRESULT is null, do not - copy anything; just return the number of bytes that would be - copied. As a special case, return 0 if an ordinary "syntax error" - message will do. Return YYSIZE_MAXIMUM if overflow occurs during - size calculation. */ -static YYSIZE_T -yysyntax_error (char *yyresult, int yystate, int yychar) -{ - int yyn = yypact[yystate]; - - if (! (YYPACT_NINF < yyn && yyn <= YYLAST)) - return 0; - else - { - int yytype = YYTRANSLATE (yychar); - YYSIZE_T yysize0 = yytnamerr (0, yytname[yytype]); - YYSIZE_T yysize = yysize0; - YYSIZE_T yysize1; - int yysize_overflow = 0; - enum { YYERROR_VERBOSE_ARGS_MAXIMUM = 5 }; - char const *yyarg[YYERROR_VERBOSE_ARGS_MAXIMUM]; - int yyx; - -# if 0 - /* This is so xgettext sees the translatable formats that are - constructed on the fly. */ - YY_("syntax error, unexpected %s"); - YY_("syntax error, unexpected %s, expecting %s"); - YY_("syntax error, unexpected %s, expecting %s or %s"); - YY_("syntax error, unexpected %s, expecting %s or %s or %s"); - YY_("syntax error, unexpected %s, expecting %s or %s or %s or %s"); -# endif - char *yyfmt; - char const *yyf; - static char const yyunexpected[] = "syntax error, unexpected %s"; - static char const yyexpecting[] = ", expecting %s"; - static char const yyor[] = " or %s"; - char yyformat[sizeof yyunexpected - + sizeof yyexpecting - 1 - + ((YYERROR_VERBOSE_ARGS_MAXIMUM - 2) - * (sizeof yyor - 1))]; - char const *yyprefix = yyexpecting; - - /* Start YYX at -YYN if negative to avoid negative indexes in - YYCHECK. */ - int yyxbegin = yyn < 0 ? -yyn : 0; - - /* Stay within bounds of both yycheck and yytname. */ - int yychecklim = YYLAST - yyn + 1; - int yyxend = yychecklim < YYNTOKENS ? yychecklim : YYNTOKENS; - int yycount = 1; - - yyarg[0] = yytname[yytype]; - yyfmt = yystpcpy (yyformat, yyunexpected); - - for (yyx = yyxbegin; yyx < yyxend; ++yyx) - if (yycheck[yyx + yyn] == yyx && yyx != YYTERROR) - { - if (yycount == YYERROR_VERBOSE_ARGS_MAXIMUM) - { - yycount = 1; - yysize = yysize0; - yyformat[sizeof yyunexpected - 1] = '\0'; - break; - } - yyarg[yycount++] = yytname[yyx]; - yysize1 = yysize + yytnamerr (0, yytname[yyx]); - yysize_overflow |= (yysize1 < yysize); - yysize = yysize1; - yyfmt = yystpcpy (yyfmt, yyprefix); - yyprefix = yyor; - } - - yyf = YY_(yyformat); - yysize1 = yysize + yystrlen (yyf); - yysize_overflow |= (yysize1 < yysize); - yysize = yysize1; - - if (yysize_overflow) - return YYSIZE_MAXIMUM; - - if (yyresult) - { - /* Avoid sprintf, as that infringes on the user's name space. - Don't have undefined behavior even if the translation - produced a string with the wrong number of "%s"s. */ - char *yyp = yyresult; - int yyi = 0; - while ((*yyp = *yyf) != '\0') - { - if (*yyp == '%' && yyf[1] == 's' && yyi < yycount) - { - yyp += yytnamerr (yyp, yyarg[yyi++]); - yyf += 2; - } - else - { - yyp++; - yyf++; - } - } - } - return yysize; - } -} -#endif /* YYERROR_VERBOSE */ - - -/*-----------------------------------------------. -| Release the memory associated to this symbol. | -`-----------------------------------------------*/ - -/*ARGSUSED*/ -#if (defined __STDC__ || defined __C99__FUNC__ \ - || defined __cplusplus || defined _MSC_VER) -static void -yydestruct (const char *yymsg, int yytype, YYSTYPE *yyvaluep) -#else -static void -yydestruct (yymsg, yytype, yyvaluep) - const char *yymsg; - int yytype; - YYSTYPE *yyvaluep; -#endif -{ - YYUSE (yyvaluep); - - if (!yymsg) - yymsg = "Deleting"; - YY_SYMBOL_PRINT (yymsg, yytype, yyvaluep, yylocationp); - - switch (yytype) - { - - default: - break; - } -} - - -/* Prevent warnings from -Wmissing-prototypes. */ - -#ifdef YYPARSE_PARAM -#if defined __STDC__ || defined __cplusplus -int yyparse (void *YYPARSE_PARAM); -#else -int yyparse (); -#endif -#else /* ! YYPARSE_PARAM */ -#if defined __STDC__ || defined __cplusplus -int yyparse (void); -#else -int yyparse (); -#endif -#endif /* ! YYPARSE_PARAM */ - - - -/* The look-ahead symbol. */ -int yychar; - -/* The semantic value of the look-ahead symbol. */ -YYSTYPE yylval; - -/* Number of syntax errors so far. */ -int yynerrs; - - - -/*----------. -| yyparse. | -`----------*/ - -#ifdef YYPARSE_PARAM -#if (defined __STDC__ || defined __C99__FUNC__ \ - || defined __cplusplus || defined _MSC_VER) -int -yyparse (void *YYPARSE_PARAM) -#else -int -yyparse (YYPARSE_PARAM) - void *YYPARSE_PARAM; -#endif -#else /* ! YYPARSE_PARAM */ -#if (defined __STDC__ || defined __C99__FUNC__ \ - || defined __cplusplus || defined _MSC_VER) -int -yyparse (void) -#else -int -yyparse () - -#endif -#endif -{ - - int yystate; - int yyn; - int yyresult; - /* Number of tokens to shift before error messages enabled. */ - int yyerrstatus; - /* Look-ahead token as an internal (translated) token number. */ - int yytoken = 0; -#if YYERROR_VERBOSE - /* Buffer for error messages, and its allocated size. */ - char yymsgbuf[128]; - char *yymsg = yymsgbuf; - YYSIZE_T yymsg_alloc = sizeof yymsgbuf; -#endif - - /* Three stacks and their tools: - `yyss': related to states, - `yyvs': related to semantic values, - `yyls': related to locations. - - Refer to the stacks thru separate pointers, to allow yyoverflow - to reallocate them elsewhere. */ - - /* The state stack. */ - yytype_int16 yyssa[YYINITDEPTH]; - yytype_int16 *yyss = yyssa; - yytype_int16 *yyssp; - - /* The semantic value stack. */ - YYSTYPE yyvsa[YYINITDEPTH]; - YYSTYPE *yyvs = yyvsa; - YYSTYPE *yyvsp; - - - -#define YYPOPSTACK(N) (yyvsp -= (N), yyssp -= (N)) - - YYSIZE_T yystacksize = YYINITDEPTH; - - /* The variables used to return semantic value and location from the - action routines. */ - YYSTYPE yyval; - - - /* The number of symbols on the RHS of the reduced rule. - Keep to zero when no symbol should be popped. */ - int yylen = 0; - - YYDPRINTF ((stderr, "Starting parse\n")); - - yystate = 0; - yyerrstatus = 0; - yynerrs = 0; - yychar = YYEMPTY; /* Cause a token to be read. */ - - /* Initialize stack pointers. - Waste one element of value and location stack - so that they stay on the same level as the state stack. - The wasted elements are never initialized. */ - - yyssp = yyss; - yyvsp = yyvs; - - goto yysetstate; - -/*------------------------------------------------------------. -| yynewstate -- Push a new state, which is found in yystate. | -`------------------------------------------------------------*/ - yynewstate: - /* In all cases, when you get here, the value and location stacks - have just been pushed. So pushing a state here evens the stacks. */ - yyssp++; - - yysetstate: - *yyssp = yystate; - - if (yyss + yystacksize - 1 <= yyssp) - { - /* Get the current used size of the three stacks, in elements. */ - YYSIZE_T yysize = yyssp - yyss + 1; - -#ifdef yyoverflow - { - /* Give user a chance to reallocate the stack. Use copies of - these so that the &'s don't force the real ones into - memory. */ - YYSTYPE *yyvs1 = yyvs; - yytype_int16 *yyss1 = yyss; - - - /* Each stack pointer address is followed by the size of the - data in use in that stack, in bytes. This used to be a - conditional around just the two extra args, but that might - be undefined if yyoverflow is a macro. */ - yyoverflow (YY_("memory exhausted"), - &yyss1, yysize * sizeof (*yyssp), - &yyvs1, yysize * sizeof (*yyvsp), - - &yystacksize); - - yyss = yyss1; - yyvs = yyvs1; - } -#else /* no yyoverflow */ -# ifndef YYSTACK_RELOCATE - goto yyexhaustedlab; -# else - /* Extend the stack our own way. */ - if (YYMAXDEPTH <= yystacksize) - goto yyexhaustedlab; - yystacksize *= 2; - if (YYMAXDEPTH < yystacksize) - yystacksize = YYMAXDEPTH; - - { - yytype_int16 *yyss1 = yyss; - union yyalloc *yyptr = - (union yyalloc *) YYSTACK_ALLOC (YYSTACK_BYTES (yystacksize)); - if (! yyptr) - goto yyexhaustedlab; - YYSTACK_RELOCATE (yyss); - YYSTACK_RELOCATE (yyvs); - -# undef YYSTACK_RELOCATE - if (yyss1 != yyssa) - YYSTACK_FREE (yyss1); - } -# endif -#endif /* no yyoverflow */ - - yyssp = yyss + yysize - 1; - yyvsp = yyvs + yysize - 1; - - - YYDPRINTF ((stderr, "Stack size increased to %lu\n", - (unsigned long int) yystacksize)); - - if (yyss + yystacksize - 1 <= yyssp) - YYABORT; - } - - YYDPRINTF ((stderr, "Entering state %d\n", yystate)); - - goto yybackup; - -/*-----------. -| yybackup. | -`-----------*/ -yybackup: - - /* Do appropriate processing given the current state. Read a - look-ahead token if we need one and don't already have one. */ - - /* First try to decide what to do without reference to look-ahead token. */ - yyn = yypact[yystate]; - if (yyn == YYPACT_NINF) - goto yydefault; - - /* Not known => get a look-ahead token if don't already have one. */ - - /* YYCHAR is either YYEMPTY or YYEOF or a valid look-ahead symbol. */ - if (yychar == YYEMPTY) - { - YYDPRINTF ((stderr, "Reading a token: ")); - yychar = YYLEX; - } - - if (yychar <= YYEOF) - { - yychar = yytoken = YYEOF; - YYDPRINTF ((stderr, "Now at end of input.\n")); - } - else - { - yytoken = YYTRANSLATE (yychar); - YY_SYMBOL_PRINT ("Next token is", yytoken, &yylval, &yylloc); - } - - /* If the proper action on seeing token YYTOKEN is to reduce or to - detect an error, take that action. */ - yyn += yytoken; - if (yyn < 0 || YYLAST < yyn || yycheck[yyn] != yytoken) - goto yydefault; - yyn = yytable[yyn]; - if (yyn <= 0) - { - if (yyn == 0 || yyn == YYTABLE_NINF) - goto yyerrlab; - yyn = -yyn; - goto yyreduce; - } - - if (yyn == YYFINAL) - YYACCEPT; - - /* Count tokens shifted since error; after three, turn off error - status. */ - if (yyerrstatus) - yyerrstatus--; - - /* Shift the look-ahead token. */ - YY_SYMBOL_PRINT ("Shifting", yytoken, &yylval, &yylloc); - - /* Discard the shifted token unless it is eof. */ - if (yychar != YYEOF) - yychar = YYEMPTY; - - yystate = yyn; - *++yyvsp = yylval; - - goto yynewstate; - - -/*-----------------------------------------------------------. -| yydefault -- do the default action for the current state. | -`-----------------------------------------------------------*/ -yydefault: - yyn = yydefact[yystate]; - if (yyn == 0) - goto yyerrlab; - goto yyreduce; - - -/*-----------------------------. -| yyreduce -- Do a reduction. | -`-----------------------------*/ -yyreduce: - /* yyn is the number of a rule to reduce with. */ - yylen = yyr2[yyn]; - - /* If YYLEN is nonzero, implement the default value of the action: - `$$ = $1'. - - Otherwise, the following line sets YYVAL to garbage. - This behavior is undocumented and Bison - users should not rely upon it. Assigning to YYVAL - unconditionally makes the parser a bit smaller, and it avoids a - GCC warning that YYVAL may be used uninitialized. */ - yyval = yyvsp[1-yylen]; - - - YY_REDUCE_PRINT (yyn); - switch (yyn) - { - case 2: -#line 101 "printrcy.y" - { - current_printer = stpui_plist_create((yyvsp[(2) - (3)].sval), (yyvsp[(3) - (3)].sval)); - g_free((yyvsp[(2) - (3)].sval)); - g_free((yyvsp[(3) - (3)].sval)); - } - break; - - case 3: -#line 112 "printrcy.y" - { - if ((yyvsp[(2) - (2)].sval)) - g_free((yyvsp[(2) - (2)].sval)); - } - break; - - case 4: -#line 119 "printrcy.y" - { - if (current_printer && (yyvsp[(2) - (2)].sval)) - { - stpui_plist_set_queue_name(current_printer, (yyvsp[(2) - (2)].sval)); - g_free((yyvsp[(2) - (2)].sval)); - } - } - break; - - case 5: -#line 129 "printrcy.y" - { - if (current_printer && (yyvsp[(2) - (2)].sval)) - { - stpui_plist_set_output_filename(current_printer, (yyvsp[(2) - (2)].sval)); - g_free((yyvsp[(2) - (2)].sval)); - } - } - break; - - case 6: -#line 139 "printrcy.y" - { - if (current_printer && (yyvsp[(2) - (2)].sval)) - { - stpui_plist_set_extra_printer_options(current_printer, (yyvsp[(2) - (2)].sval)); - g_free((yyvsp[(2) - (2)].sval)); - } - } - break; - - case 7: -#line 149 "printrcy.y" - { - if (current_printer && (yyvsp[(2) - (2)].sval)) - { - stpui_plist_set_custom_command(current_printer, (yyvsp[(2) - (2)].sval)); - g_free((yyvsp[(2) - (2)].sval)); - } - } - break; - - case 8: -#line 159 "printrcy.y" - { - if (current_printer) - stpui_plist_set_command_type(current_printer, (yyvsp[(2) - (2)].ival)); - } - break; - - case 9: -#line 166 "printrcy.y" - { - if (current_printer) - current_printer->scaling = (yyvsp[(2) - (2)].dval); - } - break; - - case 10: -#line 173 "printrcy.y" - { - if (current_printer) - current_printer->orientation = (yyvsp[(2) - (2)].ival); - } - break; - - case 11: -#line 180 "printrcy.y" - { - if (current_printer) - current_printer->auto_size_roll_feed_paper = (yyvsp[(2) - (2)].ival); - } - break; - - case 12: -#line 187 "printrcy.y" - { - if (current_printer) - current_printer->unit = (yyvsp[(2) - (2)].ival); - } - break; - - case 13: -#line 194 "printrcy.y" - { - if (current_printer) - stp_set_left(current_printer->v, (yyvsp[(2) - (2)].ival)); - } - break; - - case 14: -#line 201 "printrcy.y" - { - if (current_printer) - stp_set_top(current_printer->v, (yyvsp[(2) - (2)].ival)); - } - break; - - case 15: -#line 208 "printrcy.y" - { - if (current_printer) - { - switch ((yyvsp[(2) - (2)].ival)) - { - case 0: - stp_set_string_parameter - (current_printer->v, "PrintingMode", "BW"); - break; - case 1: - case 2: - default: - stp_set_string_parameter - (current_printer->v, "PrintingMode", "Color"); - break; - } - } - } - break; - - case 16: -#line 229 "printrcy.y" - { - if (current_printer) - stp_set_page_width(current_printer->v, (yyvsp[(2) - (2)].ival)); - } - break; - - case 17: -#line 236 "printrcy.y" - { - if (current_printer) - stp_set_page_height(current_printer->v, (yyvsp[(2) - (2)].ival)); - } - break; - - case 19: -#line 246 "printrcy.y" - { - if (current_printer) - { - stp_set_int_parameter(current_printer->v, (yyvsp[(1) - (4)].sval), (yyvsp[(4) - (4)].ival)); - if (strcmp((yyvsp[(3) - (4)].sval), "False") == 0) - stp_set_int_parameter_active(current_printer->v, (yyvsp[(1) - (4)].sval), - STP_PARAMETER_INACTIVE); - else - stp_set_int_parameter_active(current_printer->v, (yyvsp[(1) - (4)].sval), - STP_PARAMETER_ACTIVE); - } - g_free((yyvsp[(1) - (4)].sval)); - g_free((yyvsp[(3) - (4)].sval)); - } - break; - - case 20: -#line 263 "printrcy.y" - { - if (current_printer) - { - stp_set_string_parameter(current_printer->v, (yyvsp[(1) - (4)].sval), (yyvsp[(4) - (4)].sval)); - if (strcmp((yyvsp[(3) - (4)].sval), "False") == 0) - stp_set_string_parameter_active(current_printer->v, (yyvsp[(1) - (4)].sval), - STP_PARAMETER_INACTIVE); - else - stp_set_string_parameter_active(current_printer->v, (yyvsp[(1) - (4)].sval), - STP_PARAMETER_ACTIVE); - } - g_free((yyvsp[(1) - (4)].sval)); - g_free((yyvsp[(3) - (4)].sval)); - g_free((yyvsp[(4) - (4)].sval)); - } - break; - - case 21: -#line 281 "printrcy.y" - { - if (current_printer) - { - stp_set_file_parameter(current_printer->v, (yyvsp[(1) - (4)].sval), (yyvsp[(4) - (4)].sval)); - if (strcmp((yyvsp[(3) - (4)].sval), "False") == 0) - stp_set_file_parameter_active(current_printer->v, (yyvsp[(1) - (4)].sval), - STP_PARAMETER_INACTIVE); - else - stp_set_file_parameter_active(current_printer->v, (yyvsp[(1) - (4)].sval), - STP_PARAMETER_ACTIVE); - } - g_free((yyvsp[(1) - (4)].sval)); - g_free((yyvsp[(3) - (4)].sval)); - g_free((yyvsp[(4) - (4)].sval)); - } - break; - - case 22: -#line 299 "printrcy.y" - { - if (current_printer) - { - stp_set_float_parameter(current_printer->v, (yyvsp[(1) - (4)].sval), (yyvsp[(4) - (4)].dval)); - if (strcmp((yyvsp[(3) - (4)].sval), "False") == 0) - stp_set_float_parameter_active(current_printer->v, (yyvsp[(1) - (4)].sval), - STP_PARAMETER_INACTIVE); - else - stp_set_float_parameter_active(current_printer->v, (yyvsp[(1) - (4)].sval), - STP_PARAMETER_ACTIVE); - } - g_free((yyvsp[(1) - (4)].sval)); - g_free((yyvsp[(3) - (4)].sval)); - } - break; - - case 23: -#line 316 "printrcy.y" - { - if (current_printer) - { - stp_set_dimension_parameter(current_printer->v, (yyvsp[(1) - (4)].sval), (yyvsp[(4) - (4)].ival)); - if (strcmp((yyvsp[(3) - (4)].sval), "False") == 0) - stp_set_dimension_parameter_active(current_printer->v, (yyvsp[(1) - (4)].sval), - STP_PARAMETER_INACTIVE); - else - stp_set_dimension_parameter_active(current_printer->v, (yyvsp[(1) - (4)].sval), - STP_PARAMETER_ACTIVE); - } - g_free((yyvsp[(1) - (4)].sval)); - g_free((yyvsp[(3) - (4)].sval)); - } - break; - - case 24: -#line 333 "printrcy.y" - { - if (current_printer) - { - if (strcmp((yyvsp[(4) - (4)].sval), "False") == 0) - stp_set_boolean_parameter(current_printer->v, (yyvsp[(1) - (4)].sval), 0); - else - stp_set_boolean_parameter(current_printer->v, (yyvsp[(1) - (4)].sval), 1); - if (strcmp((yyvsp[(3) - (4)].sval), "False") == 0) - stp_set_boolean_parameter_active(current_printer->v, (yyvsp[(1) - (4)].sval), - STP_PARAMETER_INACTIVE); - else - stp_set_boolean_parameter_active(current_printer->v, (yyvsp[(1) - (4)].sval), - STP_PARAMETER_ACTIVE); - } - g_free((yyvsp[(1) - (4)].sval)); - g_free((yyvsp[(3) - (4)].sval)); - g_free((yyvsp[(4) - (4)].sval)); - } - break; - - case 25: -#line 354 "printrcy.y" - { - if (current_printer) - { - stp_curve_t *curve = stp_curve_create_from_string((yyvsp[(4) - (4)].sval)); - if (curve) - { - stp_set_curve_parameter(current_printer->v, (yyvsp[(1) - (4)].sval), curve); - if (strcmp((yyvsp[(3) - (4)].sval), "False") == 0) - stp_set_curve_parameter_active(current_printer->v, (yyvsp[(1) - (4)].sval), - STP_PARAMETER_INACTIVE); - else - stp_set_curve_parameter_active(current_printer->v, (yyvsp[(1) - (4)].sval), - STP_PARAMETER_ACTIVE); - stp_curve_destroy(curve); - } - } - g_free((yyvsp[(1) - (4)].sval)); - g_free((yyvsp[(3) - (4)].sval)); - g_free((yyvsp[(4) - (4)].sval)); - } - break; - - case 56: -#line 402 "printrcy.y" - { stpui_printrc_current_printer = (yyvsp[(2) - (2)].sval); } - break; - - case 57: -#line 406 "printrcy.y" - { - if (strcmp((yyvsp[(2) - (2)].sval), "True") == 0) - stpui_show_all_paper_sizes = 1; - else - stpui_show_all_paper_sizes = 0; - g_free((yyvsp[(2) - (2)].sval)); - } - break; - - case 61: -#line 422 "printrcy.y" - { - if ((yyvsp[(2) - (2)].sval)) - { - stpui_set_global_parameter((yyvsp[(1) - (2)].sval), (yyvsp[(2) - (2)].sval)); - g_free((yyvsp[(2) - (2)].sval)); - } - g_free((yyvsp[(1) - (2)].sval)); - } - break; - - -/* Line 1267 of yacc.c. */ -#line 1846 "printrcy.c" - default: break; - } - YY_SYMBOL_PRINT ("-> $$ =", yyr1[yyn], &yyval, &yyloc); - - YYPOPSTACK (yylen); - yylen = 0; - YY_STACK_PRINT (yyss, yyssp); - - *++yyvsp = yyval; - - - /* Now `shift' the result of the reduction. Determine what state - that goes to, based on the state we popped back to and the rule - number reduced by. */ - - yyn = yyr1[yyn]; - - yystate = yypgoto[yyn - YYNTOKENS] + *yyssp; - if (0 <= yystate && yystate <= YYLAST && yycheck[yystate] == *yyssp) - yystate = yytable[yystate]; - else - yystate = yydefgoto[yyn - YYNTOKENS]; - - goto yynewstate; - - -/*------------------------------------. -| yyerrlab -- here on detecting error | -`------------------------------------*/ -yyerrlab: - /* If not already recovering from an error, report this error. */ - if (!yyerrstatus) - { - ++yynerrs; -#if ! YYERROR_VERBOSE - yyerror (YY_("syntax error")); -#else - { - YYSIZE_T yysize = yysyntax_error (0, yystate, yychar); - if (yymsg_alloc < yysize && yymsg_alloc < YYSTACK_ALLOC_MAXIMUM) - { - YYSIZE_T yyalloc = 2 * yysize; - if (! (yysize <= yyalloc && yyalloc <= YYSTACK_ALLOC_MAXIMUM)) - yyalloc = YYSTACK_ALLOC_MAXIMUM; - if (yymsg != yymsgbuf) - YYSTACK_FREE (yymsg); - yymsg = (char *) YYSTACK_ALLOC (yyalloc); - if (yymsg) - yymsg_alloc = yyalloc; - else - { - yymsg = yymsgbuf; - yymsg_alloc = sizeof yymsgbuf; - } - } - - if (0 < yysize && yysize <= yymsg_alloc) - { - (void) yysyntax_error (yymsg, yystate, yychar); - yyerror (yymsg); - } - else - { - yyerror (YY_("syntax error")); - if (yysize != 0) - goto yyexhaustedlab; - } - } -#endif - } - - - - if (yyerrstatus == 3) - { - /* If just tried and failed to reuse look-ahead token after an - error, discard it. */ - - if (yychar <= YYEOF) - { - /* Return failure if at end of input. */ - if (yychar == YYEOF) - YYABORT; - } - else - { - yydestruct ("Error: discarding", - yytoken, &yylval); - yychar = YYEMPTY; - } - } - - /* Else will try to reuse look-ahead token after shifting the error - token. */ - goto yyerrlab1; - - -/*---------------------------------------------------. -| yyerrorlab -- error raised explicitly by YYERROR. | -`---------------------------------------------------*/ -yyerrorlab: - - /* Pacify compilers like GCC when the user code never invokes - YYERROR and the label yyerrorlab therefore never appears in user - code. */ - if (/*CONSTCOND*/ 0) - goto yyerrorlab; - - /* Do not reclaim the symbols of the rule which action triggered - this YYERROR. */ - YYPOPSTACK (yylen); - yylen = 0; - YY_STACK_PRINT (yyss, yyssp); - yystate = *yyssp; - goto yyerrlab1; - - -/*-------------------------------------------------------------. -| yyerrlab1 -- common code for both syntax error and YYERROR. | -`-------------------------------------------------------------*/ -yyerrlab1: - yyerrstatus = 3; /* Each real token shifted decrements this. */ - - for (;;) - { - yyn = yypact[yystate]; - if (yyn != YYPACT_NINF) - { - yyn += YYTERROR; - if (0 <= yyn && yyn <= YYLAST && yycheck[yyn] == YYTERROR) - { - yyn = yytable[yyn]; - if (0 < yyn) - break; - } - } - - /* Pop the current state because it cannot handle the error token. */ - if (yyssp == yyss) - YYABORT; - - - yydestruct ("Error: popping", - yystos[yystate], yyvsp); - YYPOPSTACK (1); - yystate = *yyssp; - YY_STACK_PRINT (yyss, yyssp); - } - - if (yyn == YYFINAL) - YYACCEPT; - - *++yyvsp = yylval; - - - /* Shift the error token. */ - YY_SYMBOL_PRINT ("Shifting", yystos[yyn], yyvsp, yylsp); - - yystate = yyn; - goto yynewstate; - - -/*-------------------------------------. -| yyacceptlab -- YYACCEPT comes here. | -`-------------------------------------*/ -yyacceptlab: - yyresult = 0; - goto yyreturn; - -/*-----------------------------------. -| yyabortlab -- YYABORT comes here. | -`-----------------------------------*/ -yyabortlab: - yyresult = 1; - goto yyreturn; - -#ifndef yyoverflow -/*-------------------------------------------------. -| yyexhaustedlab -- memory exhaustion comes here. | -`-------------------------------------------------*/ -yyexhaustedlab: - yyerror (YY_("memory exhausted")); - yyresult = 2; - /* Fall through. */ -#endif - -yyreturn: - if (yychar != YYEOF && yychar != YYEMPTY) - yydestruct ("Cleanup: discarding lookahead", - yytoken, &yylval); - /* Do not reclaim the symbols of the rule which action triggered - this YYABORT or YYACCEPT. */ - YYPOPSTACK (yylen); - YY_STACK_PRINT (yyss, yyssp); - while (yyssp != yyss) - { - yydestruct ("Cleanup: popping", - yystos[*yyssp], yyvsp); - YYPOPSTACK (1); - } -#ifndef yyoverflow - if (yyss != yyssa) - YYSTACK_FREE (yyss); -#endif -#if YYERROR_VERBOSE - if (yymsg != yymsgbuf) - YYSTACK_FREE (yymsg); -#endif - /* Make sure YYID is used. */ - return YYID (yyresult); -} - - -#line 447 "printrcy.y" - - diff --git a/src/gutenprintui/printrcy.h b/src/gutenprintui/printrcy.h deleted file mode 100644 index 8a6c041..0000000 --- a/src/gutenprintui/printrcy.h +++ /dev/null @@ -1,133 +0,0 @@ -/* A Bison parser, made by GNU Bison 2.3. */ - -/* Skeleton interface for Bison's Yacc-like parsers in C - - Copyright (C) 1984, 1989, 1990, 2000, 2001, 2002, 2003, 2004, 2005, 2006 - Free Software Foundation, Inc. - - 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., 51 Franklin Street, Fifth Floor, - Boston, MA 02110-1301, USA. */ - -/* As a special exception, you may create a larger work that contains - part or all of the Bison parser skeleton and distribute that work - under terms of your choice, so long as that work isn't itself a - parser generator using the skeleton or a modified version thereof - as a parser skeleton. Alternatively, if you modify or redistribute - the parser skeleton itself, you may (at your option) remove this - special exception, which will cause the skeleton and the resulting - Bison output files to be licensed under the GNU General Public - License without this special exception. - - This special exception was added by the Free Software Foundation in - version 2.2 of Bison. */ - -/* Tokens. */ -#ifndef YYTOKENTYPE -# define YYTOKENTYPE - /* Put the tokens into the symbol table, so that GDB and other debuggers - know about them. */ - enum yytokentype { - tINT = 258, - tDOUBLE = 259, - tDIMENSION = 260, - tBOOLEAN = 261, - tSTRING = 262, - tWORD = 263, - tGSWORD = 264, - CURRENT_PRINTER = 265, - SHOW_ALL_PAPER_SIZES = 266, - PRINTER = 267, - DESTINATION = 268, - SCALING = 269, - ORIENTATION = 270, - AUTOSIZE_ROLL_PAPER = 271, - UNIT = 272, - DRIVER = 273, - LEFT = 274, - TOP = 275, - CUSTOM_PAGE_WIDTH = 276, - CUSTOM_PAGE_HEIGHT = 277, - OUTPUT_TYPE = 278, - PRINTRC_HDR = 279, - PARAMETER = 280, - QUEUE_NAME = 281, - OUTPUT_FILENAME = 282, - EXTRA_PRINTER_OPTIONS = 283, - CUSTOM_COMMAND = 284, - COMMAND_TYPE = 285, - GLOBAL_SETTINGS = 286, - GLOBAL = 287, - END_GLOBAL_SETTINGS = 288, - pINT = 289, - pSTRING_LIST = 290, - pFILE = 291, - pDOUBLE = 292, - pDIMENSION = 293, - pBOOLEAN = 294, - pCURVE = 295 - }; -#endif -/* Tokens. */ -#define tINT 258 -#define tDOUBLE 259 -#define tDIMENSION 260 -#define tBOOLEAN 261 -#define tSTRING 262 -#define tWORD 263 -#define tGSWORD 264 -#define CURRENT_PRINTER 265 -#define SHOW_ALL_PAPER_SIZES 266 -#define PRINTER 267 -#define DESTINATION 268 -#define SCALING 269 -#define ORIENTATION 270 -#define AUTOSIZE_ROLL_PAPER 271 -#define UNIT 272 -#define DRIVER 273 -#define LEFT 274 -#define TOP 275 -#define CUSTOM_PAGE_WIDTH 276 -#define CUSTOM_PAGE_HEIGHT 277 -#define OUTPUT_TYPE 278 -#define PRINTRC_HDR 279 -#define PARAMETER 280 -#define QUEUE_NAME 281 -#define OUTPUT_FILENAME 282 -#define EXTRA_PRINTER_OPTIONS 283 -#define CUSTOM_COMMAND 284 -#define COMMAND_TYPE 285 -#define GLOBAL_SETTINGS 286 -#define GLOBAL 287 -#define END_GLOBAL_SETTINGS 288 -#define pINT 289 -#define pSTRING_LIST 290 -#define pFILE 291 -#define pDOUBLE 292 -#define pDIMENSION 293 -#define pBOOLEAN 294 -#define pCURVE 295 - - - - -#if ! defined YYSTYPE && ! defined YYSTYPE_IS_DECLARED -typedef int YYSTYPE; -# define yystype YYSTYPE /* obsolescent; will be withdrawn */ -# define YYSTYPE_IS_DECLARED 1 -# define YYSTYPE_IS_TRIVIAL 1 -#endif - -extern YYSTYPE yylval; - diff --git a/src/gutenprintui/printrcy.y b/src/gutenprintui/printrcy.y deleted file mode 100644 index f2dd851..0000000 --- a/src/gutenprintui/printrcy.y +++ /dev/null @@ -1,447 +0,0 @@ -/* - * "$Id: printrcy.y,v 1.1.18.1 2007/03/02 12:01:19 rlk Exp $" - * - * Test pattern generator for Gutenprint - * - * Copyright 2001 Robert Krawitz - * - * 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 -#endif - -#include -#include -#include "gutenprintui-internal.h" -#include "printrc.h" - -#include -#include -#include - -extern int mylineno; - -extern int yylex(void); -char *quotestrip(const char *i); -char *endstrip(const char *i); - -extern char* yytext; - -static int yyerror( const char *s ) -{ - fprintf(stderr,"stdin:%d: %s before '%s'\n", mylineno, s, yytext); - return 0; -} - -static stpui_plist_t *current_printer = NULL; - -%} - -%token tINT -%token tDOUBLE -%token tDIMENSION -%token tBOOLEAN -%token tSTRING -%token tWORD -%token tGSWORD - -%token CURRENT_PRINTER -%token SHOW_ALL_PAPER_SIZES -%token PRINTER -%token DESTINATION -%token SCALING -%token ORIENTATION -%token AUTOSIZE_ROLL_PAPER -%token UNIT -%token DRIVER -%token LEFT -%token TOP -%token CUSTOM_PAGE_WIDTH -%token CUSTOM_PAGE_HEIGHT -%token OUTPUT_TYPE -%token PRINTRC_HDR -%token PARAMETER -%token QUEUE_NAME -%token OUTPUT_FILENAME -%token EXTRA_PRINTER_OPTIONS -%token CUSTOM_COMMAND -%token COMMAND_TYPE -%token GLOBAL_SETTINGS -%token GLOBAL -%token END_GLOBAL_SETTINGS -%token pINT -%token pSTRING_LIST -%token pFILE -%token pDOUBLE -%token pDIMENSION -%token pBOOLEAN -%token pCURVE - -%start Thing - -%% - -Printer: PRINTER tSTRING tSTRING - { - current_printer = stpui_plist_create($2, $3); - g_free($2); - g_free($3); - } -; - -/* - * Destination is obsolete; ignore it. - */ -Destination: DESTINATION tSTRING - { - if ($2) - g_free($2); - } -; - -Queue_Name: QUEUE_NAME tSTRING - { - if (current_printer && $2) - { - stpui_plist_set_queue_name(current_printer, $2); - g_free($2); - } - } -; - -Output_Filename: OUTPUT_FILENAME tSTRING - { - if (current_printer && $2) - { - stpui_plist_set_output_filename(current_printer, $2); - g_free($2); - } - } -; - -Extra_Printer_Options: EXTRA_PRINTER_OPTIONS tSTRING - { - if (current_printer && $2) - { - stpui_plist_set_extra_printer_options(current_printer, $2); - g_free($2); - } - } -; - -Custom_Command: CUSTOM_COMMAND tSTRING - { - if (current_printer && $2) - { - stpui_plist_set_custom_command(current_printer, $2); - g_free($2); - } - } -; - -Command_Type: COMMAND_TYPE tINT - { - if (current_printer) - stpui_plist_set_command_type(current_printer, $2); - } -; - -Scaling: SCALING tDOUBLE - { - if (current_printer) - current_printer->scaling = $2; - } -; - -Orientation: ORIENTATION tINT - { - if (current_printer) - current_printer->orientation = $2; - } -; - -Autosize_Roll_Paper: AUTOSIZE_ROLL_PAPER tINT - { - if (current_printer) - current_printer->auto_size_roll_feed_paper = $2; - } -; - -Unit: UNIT tINT - { - if (current_printer) - current_printer->unit = $2; - } -; - -Left: LEFT tINT - { - if (current_printer) - stp_set_left(current_printer->v, $2); - } -; - -Top: TOP tINT - { - if (current_printer) - stp_set_top(current_printer->v, $2); - } -; - -Output_Type: OUTPUT_TYPE tINT - { - if (current_printer) - { - switch ($2) - { - case 0: - stp_set_string_parameter - (current_printer->v, "PrintingMode", "BW"); - break; - case 1: - case 2: - default: - stp_set_string_parameter - (current_printer->v, "PrintingMode", "Color"); - break; - } - } - } -; - -Custom_Page_Width: CUSTOM_PAGE_WIDTH tINT - { - if (current_printer) - stp_set_page_width(current_printer->v, $2); - } -; - -Custom_Page_Height: CUSTOM_PAGE_HEIGHT tINT - { - if (current_printer) - stp_set_page_height(current_printer->v, $2); - } -; - -Empty: -; - -Int_Param: tWORD pINT tBOOLEAN tINT - { - if (current_printer) - { - stp_set_int_parameter(current_printer->v, $1, $4); - if (strcmp($3, "False") == 0) - stp_set_int_parameter_active(current_printer->v, $1, - STP_PARAMETER_INACTIVE); - else - stp_set_int_parameter_active(current_printer->v, $1, - STP_PARAMETER_ACTIVE); - } - g_free($1); - g_free($3); - } -; - -String_List_Param: tWORD pSTRING_LIST tBOOLEAN tSTRING - { - if (current_printer) - { - stp_set_string_parameter(current_printer->v, $1, $4); - if (strcmp($3, "False") == 0) - stp_set_string_parameter_active(current_printer->v, $1, - STP_PARAMETER_INACTIVE); - else - stp_set_string_parameter_active(current_printer->v, $1, - STP_PARAMETER_ACTIVE); - } - g_free($1); - g_free($3); - g_free($4); - } -; - -File_Param: tWORD pFILE tBOOLEAN tSTRING - { - if (current_printer) - { - stp_set_file_parameter(current_printer->v, $1, $4); - if (strcmp($3, "False") == 0) - stp_set_file_parameter_active(current_printer->v, $1, - STP_PARAMETER_INACTIVE); - else - stp_set_file_parameter_active(current_printer->v, $1, - STP_PARAMETER_ACTIVE); - } - g_free($1); - g_free($3); - g_free($4); - } -; - -Double_Param: tWORD pDOUBLE tBOOLEAN tDOUBLE - { - if (current_printer) - { - stp_set_float_parameter(current_printer->v, $1, $4); - if (strcmp($3, "False") == 0) - stp_set_float_parameter_active(current_printer->v, $1, - STP_PARAMETER_INACTIVE); - else - stp_set_float_parameter_active(current_printer->v, $1, - STP_PARAMETER_ACTIVE); - } - g_free($1); - g_free($3); - } -; - -Dimension_Param: tWORD pDIMENSION tBOOLEAN tINT - { - if (current_printer) - { - stp_set_dimension_parameter(current_printer->v, $1, $4); - if (strcmp($3, "False") == 0) - stp_set_dimension_parameter_active(current_printer->v, $1, - STP_PARAMETER_INACTIVE); - else - stp_set_dimension_parameter_active(current_printer->v, $1, - STP_PARAMETER_ACTIVE); - } - g_free($1); - g_free($3); - } -; - -Boolean_Param: tWORD pBOOLEAN tBOOLEAN tBOOLEAN - { - if (current_printer) - { - if (strcmp($4, "False") == 0) - stp_set_boolean_parameter(current_printer->v, $1, 0); - else - stp_set_boolean_parameter(current_printer->v, $1, 1); - if (strcmp($3, "False") == 0) - stp_set_boolean_parameter_active(current_printer->v, $1, - STP_PARAMETER_INACTIVE); - else - stp_set_boolean_parameter_active(current_printer->v, $1, - STP_PARAMETER_ACTIVE); - } - g_free($1); - g_free($3); - g_free($4); - } -; - -Curve_Param: tWORD pCURVE tBOOLEAN tSTRING - { - if (current_printer) - { - stp_curve_t *curve = stp_curve_create_from_string($4); - if (curve) - { - stp_set_curve_parameter(current_printer->v, $1, curve); - if (strcmp($3, "False") == 0) - stp_set_curve_parameter_active(current_printer->v, $1, - STP_PARAMETER_INACTIVE); - else - stp_set_curve_parameter_active(current_printer->v, $1, - STP_PARAMETER_ACTIVE); - stp_curve_destroy(curve); - } - } - g_free($1); - g_free($3); - g_free($4); - } -; - -Typed_Param: Int_Param | String_List_Param | File_Param | Double_Param - | Boolean_Param | Curve_Param | Dimension_Param -; - -Parameter: PARAMETER Typed_Param -; - -Parameters: Parameters Parameter | Empty -; - -Standard_Value: Destination | Scaling | Orientation | Autosize_Roll_Paper | - Unit | Left | Top | Custom_Page_Width | Custom_Page_Height | - Output_Type | Queue_Name | Output_Filename | Extra_Printer_Options | - Custom_Command | Command_Type -; - -Standard_Values: Standard_Values Standard_Value | Empty -; - -A_Printer: Printer Standard_Values Parameters -; - -Printers: Printers A_Printer | Empty -; - -Current_Printer: CURRENT_PRINTER tSTRING - { stpui_printrc_current_printer = $2; } -; - -Show_All_Paper_Sizes: SHOW_ALL_PAPER_SIZES tBOOLEAN - { - if (strcmp($2, "True") == 0) - stpui_show_all_paper_sizes = 1; - else - stpui_show_all_paper_sizes = 0; - g_free($2); - } -; - -Global: Current_Printer | Show_All_Paper_Sizes -; - -Old_Globals: Current_Printer Show_All_Paper_Sizes -; - -New_Global_Setting: tWORD tSTRING - { - if ($2) - { - stpui_set_global_parameter($1, $2); - g_free($2); - } - g_free($1); - } -; - -Global_Setting: Global | New_Global_Setting -; - -Global_Settings: Global_Settings Global_Setting | Empty -; - -Global_Subblock: GLOBAL_SETTINGS Global_Settings END_GLOBAL_SETTINGS -; - -Global_Block: Global_Subblock | Old_Globals | Empty -; - -Thing: PRINTRC_HDR Global_Block Printers -; - -%% diff --git a/src/gutenprintui/ui-utils.c b/src/gutenprintui/ui-utils.c deleted file mode 100644 index ebac462..0000000 --- a/src/gutenprintui/ui-utils.c +++ /dev/null @@ -1,870 +0,0 @@ -/* - * "$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. - * - * Copyright 1997-2000 Michael Sweet (mike@easysw.com), - * Robert Krawitz (rlk@alum.mit.edu), Steve Miller (smiller@rni.net) - * and Michael Natterer (mitch@gimp.org) - * - * 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 -#endif - -#include -#include -#include "gutenprintui-internal.h" - -#include -#include - -static void default_errfunc(void *data, const char *buffer, size_t bytes); -static gchar *image_filename; -static stp_outfunc_t the_errfunc = default_errfunc; -static void *the_errdata = NULL; -static get_thumbnail_func_t thumbnail_func; -static void *thumbnail_private_data; - -/*****************************************************************\ -* * -* The following from libgimp/gimpdialog.c * -* * -\*****************************************************************/ - -/* local callbacks of dialog_new () */ -static gint -dialog_delete_callback (GtkWidget *widget, - GdkEvent *event, - gpointer data) -{ - GtkSignalFunc cancel_callback; - GtkWidget *cancel_widget; - - cancel_callback = - (GtkSignalFunc) gtk_object_get_data (GTK_OBJECT (widget), - "dialog_cancel_callback"); - cancel_widget = - (GtkWidget*) gtk_object_get_data (GTK_OBJECT (widget), - "dialog_cancel_widget"); - - /* the cancel callback has to destroy the dialog */ - if (cancel_callback) - (* cancel_callback) (cancel_widget, data); - - return TRUE; -} - -/** - * dialog_create_action_areav: - * @dialog: The #GtkDialog you want to create the action_area for. - * @args: A @va_list as obtained with va_start() describing the action_area - * buttons. - * - */ -static void -dialog_create_action_areav (GtkDialog *dialog, - va_list args) -{ - GtkWidget *hbbox = NULL; - GtkWidget *button; - - /* action area variables */ - const gchar *label; - GtkSignalFunc callback; - gpointer data; - GtkObject *slot_object; - GtkWidget **widget_ptr; - gboolean default_action; - gboolean connect_delete; - - gboolean delete_connected = FALSE; - - g_return_if_fail (dialog != NULL); - g_return_if_fail (GTK_IS_DIALOG (dialog)); - - /* prepare the action_area */ - label = va_arg (args, const gchar *); - - if (label) - { - gtk_container_set_border_width (GTK_CONTAINER (dialog->action_area), 2); - gtk_box_set_homogeneous (GTK_BOX (dialog->action_area), FALSE); - - hbbox = gtk_hbutton_box_new (); - gtk_button_box_set_spacing (GTK_BUTTON_BOX (hbbox), 4); - gtk_box_pack_end (GTK_BOX (dialog->action_area), hbbox, FALSE, FALSE, 0); - gtk_widget_show (hbbox); - } - - /* the action_area buttons */ - while (label) - { - callback = va_arg (args, GtkSignalFunc); - data = va_arg (args, gpointer); - slot_object = va_arg (args, GtkObject *); - widget_ptr = va_arg (args, GtkWidget **); - default_action = va_arg (args, gboolean); - connect_delete = va_arg (args, gboolean); - - button = gtk_button_new_with_label (label); - GTK_WIDGET_SET_FLAGS (button, GTK_CAN_DEFAULT); - gtk_box_pack_start (GTK_BOX (hbbox), button, FALSE, FALSE, 0); - - if (slot_object == (GtkObject *) 1) - slot_object = GTK_OBJECT (dialog); - - if (data == NULL) - data = dialog; - - if (callback) - { - if (slot_object) - gtk_signal_connect_object (GTK_OBJECT (button), "clicked", - GTK_SIGNAL_FUNC (callback), - slot_object); - else - gtk_signal_connect (GTK_OBJECT (button), "clicked", - GTK_SIGNAL_FUNC (callback), - data); - } - - if (widget_ptr) - *widget_ptr = button; - - if (connect_delete && callback && !delete_connected) - { - gtk_object_set_data (GTK_OBJECT (dialog), - "dialog_cancel_callback", - (gpointer) callback); - gtk_object_set_data (GTK_OBJECT (dialog), - "dialog_cancel_widget", - slot_object ? slot_object : GTK_OBJECT (button)); - - /* catch the WM delete event */ - gtk_signal_connect (GTK_OBJECT (dialog), "delete_event", - GTK_SIGNAL_FUNC (dialog_delete_callback), - data); - - delete_connected = TRUE; - } - - if (default_action) - gtk_widget_grab_default (button); - gtk_widget_show (button); - - label = va_arg (args, gchar *); - } -} - -/** - * dialog_new: - * @title: The dialog's title which will be set with gtk_window_set_title(). - * @wmclass_name: The dialog's @wmclass_name which will be set with - * gtk_window_set_wmclass(). The @wmclass_class will be - * automatically set to "Gimp". - * @position: The dialog's initial position which will be set with - * gtk_window_set_position(). - * @allow_shrink: The dialog's @allow_shrink flag, ... - * @allow_grow: ... it't @allow_grow flag and ... - * @auto_shrink: ... it's @auto_shrink flag which will all be set with - * gtk_window_set_policy(). - * @...: A #NULL terminated @va_list destribing the action_area buttons. - * - * This function simply packs the action_area arguments passed in "..." - * into a @va_list variable and passes everything to dialog_newv(). - * - * For a description of the format of the @va_list describing the - * action_area buttons see dialog_create_action_areav(). - * - * Returns: A #GtkDialog. - * - */ -GtkWidget * -stpui_dialog_new (const gchar *title, - const gchar *wmclass_name, - GtkWindowPosition position, - gint allow_shrink, - gint allow_grow, - gint auto_shrink, - - /* specify action area buttons as va_list: - * const gchar *label, - * GtkSignalFunc callback, - * gpointer data, - * GtkObject *slot_object, - * GtkWidget **widget_ptr, - * gboolean default_action, - * gboolean connect_delete, - */ - - ...) -{ - GtkWidget *dialog; - va_list args; - - va_start (args, auto_shrink); - - g_return_val_if_fail (title != NULL, NULL); - g_return_val_if_fail (wmclass_name != NULL, NULL); - - dialog = gtk_dialog_new (); - gtk_window_set_title (GTK_WINDOW (dialog), title); - gtk_window_set_wmclass (GTK_WINDOW (dialog), wmclass_name, "Gimp"); - gtk_window_set_position (GTK_WINDOW (dialog), position); - gtk_window_set_policy (GTK_WINDOW (dialog), - allow_shrink, allow_grow, auto_shrink); - - /* prepare the action_area */ - dialog_create_action_areav (GTK_DIALOG (dialog), args); - - va_end (args); - - return dialog; -} - -/*****************************************************************\ -* * -* The following from libgimp/gimpwidgets.c * -* * -\*****************************************************************/ - -/** - * option_menu_new: - * @menu_only: #TRUE if the function should return a #GtkMenu only. - * @...: A #NULL terminated @va_list describing the menu items. - * - * Returns: A #GtkOptionMenu or a #GtkMenu (depending on @menu_only). - **/ -GtkWidget * -stpui_option_menu_new(gboolean menu_only, - - /* specify menu items as va_list: - * const gchar *label, - * GtkSignalFunc callback, - * gpointer data, - * gpointer user_data, - * GtkWidget **widget_ptr, - * gboolean active - */ - - ...) -{ - GtkWidget *menu; - GtkWidget *menuitem; - - /* menu item variables */ - const gchar *label; - GtkSignalFunc callback; - gpointer data; - gpointer user_data; - GtkWidget **widget_ptr; - gboolean active; - - va_list args; - gint i; - gint initial_index; - - menu = gtk_menu_new (); - - /* create the menu items */ - initial_index = 0; - - va_start (args, menu_only); - label = va_arg (args, const gchar *); - - for (i = 0; label; i++) - { - callback = va_arg (args, GtkSignalFunc); - data = va_arg (args, gpointer); - user_data = va_arg (args, gpointer); - widget_ptr = va_arg (args, GtkWidget **); - active = va_arg (args, gboolean); - - if (strcmp (label, "---")) - { - menuitem = gtk_menu_item_new_with_label (label); - - gtk_signal_connect (GTK_OBJECT (menuitem), "activate", - callback, - data); - - if (user_data) - gtk_object_set_user_data (GTK_OBJECT (menuitem), user_data); - } - else - { - menuitem = gtk_menu_item_new (); - - gtk_widget_set_sensitive (menuitem, FALSE); - } - - gtk_menu_append (GTK_MENU (menu), menuitem); - - if (widget_ptr) - *widget_ptr = menuitem; - - gtk_widget_show (menuitem); - - /* remember the initial menu item */ - if (active) - initial_index = i; - - label = va_arg (args, const gchar *); - } - va_end (args); - - if (! menu_only) - { - GtkWidget *optionmenu; - - optionmenu = gtk_option_menu_new (); - gtk_option_menu_set_menu (GTK_OPTION_MENU (optionmenu), menu); - - /* select the initial menu item */ - gtk_option_menu_set_history (GTK_OPTION_MENU (optionmenu), initial_index); - - return optionmenu; - } - - return menu; -} - -/*****************************************************************\ -* * -* The following from libgimp/gimpwidgets.c * -* * -\*****************************************************************/ - -/** - * spin_button_new: - * @adjustment: Returns the spinbutton's #GtkAdjustment. - * @value: The initial value of the spinbutton. - * @lower: The lower boundary. - * @upper: The uppper boundary. - * @step_increment: The spinbutton's step increment. - * @page_increment: The spinbutton's page increment (mouse button 2). - * @page_size: The spinbutton's page size. - * @climb_rate: The spinbutton's climb rate. - * @digits: The spinbutton's number of decimal digits. - * - * This function is a shortcut for gtk_adjustment_new() and a subsequent - * gtk_spin_button_new() and does some more initialisation stuff like - * setting a standard minimun horizontal size. - * - * Returns: A #GtkSpinbutton and it's #GtkAdjustment. - **/ -static GtkWidget * -spin_button_new (GtkObject **adjustment, /* return value */ - gfloat value, - gfloat lower, - gfloat upper, - gfloat step_increment, - gfloat page_increment, - gfloat page_size, - gfloat climb_rate, - guint digits) -{ - GtkWidget *spinbutton; - - *adjustment = gtk_adjustment_new (value, lower, upper, - step_increment, page_increment, page_size); - - spinbutton = gtk_spin_button_new (GTK_ADJUSTMENT (*adjustment), - climb_rate, digits); - gtk_spin_button_set_shadow_type (GTK_SPIN_BUTTON (spinbutton), - GTK_SHADOW_NONE); - gtk_spin_button_set_numeric (GTK_SPIN_BUTTON (spinbutton), TRUE); - gtk_widget_set_usize (spinbutton, 75, -1); - - return spinbutton; -} - -static void -scale_entry_unconstrained_adjustment_callback (GtkAdjustment *adjustment, - GtkAdjustment *other_adj) -{ - gtk_signal_handler_block_by_data (GTK_OBJECT (other_adj), adjustment); - - gtk_adjustment_set_value (other_adj, adjustment->value); - - gtk_signal_handler_unblock_by_data (GTK_OBJECT (other_adj), adjustment); -} - -/** - * scale_entry_new: - * @table: The #GtkTable the widgets will be attached to. - * @column: The column to start with. - * @row: The row to attach the widgets. - * @text: The text for the #GtkLabel which will appear - * left of the #GtkHScale. - * @scale_usize: The minimum horizontal size of the #GtkHScale. - * @spinbutton_usize: The minimum horizontal size of the #GtkSpinButton. - * @value: The initial value. - * @lower: The lower boundary. - * @upper: The upper boundary. - * @step_increment: The step increment. - * @page_increment: The page increment. - * @digits: The number of decimal digits. - * @constrain: #TRUE if the range of possible values of the - * #GtkSpinButton should be the same as of the #GtkHScale. - * @unconstrained_lower: The spinbutton's lower boundary - * if @constrain == #FALSE. - * @unconstrained_upper: The spinbutton's upper boundary - * if @constrain == #FALSE. - * @tooltip: A tooltip message for the scale and the spinbutton. - * - * This function creates a #GtkLabel, a #GtkHScale and a #GtkSpinButton and - * attaches them to a 3-column #GtkTable. - * - * Returns: The #GtkSpinButton's #GtkAdjustment. - **/ -GtkObject * -stpui_scale_entry_new(GtkTable *table, - gint column, - gint row, - const gchar *text, - gint scale_usize, - gint spinbutton_usize, - gfloat value, - gfloat lower, - gfloat upper, - gfloat step_increment, - gfloat page_increment, - guint digits, - gboolean constrain, - gfloat unconstrained_lower, - gfloat unconstrained_upper, - const gchar *tooltip) -{ - GtkWidget *label; - GtkWidget *scale; - GtkWidget *spinbutton; - GtkObject *adjustment; - GtkObject *return_adj; - - label = gtk_label_new (text); - gtk_misc_set_alignment (GTK_MISC (label), 0.0, 0.5); - gtk_table_attach (GTK_TABLE (table), label, - column + 1, column + 2, row, row + 1, - GTK_FILL, GTK_FILL, 0, 0); - gtk_widget_show (label); - - if (! constrain && - unconstrained_lower <= lower && - unconstrained_upper >= upper) - { - GtkObject *constrained_adj; - - constrained_adj = gtk_adjustment_new (value, lower, upper, - step_increment, page_increment, - 0.0); - - spinbutton = spin_button_new (&adjustment, value, - unconstrained_lower, - unconstrained_upper, - step_increment, page_increment, 0.0, - 1.0, digits); - - gtk_signal_connect - (GTK_OBJECT (constrained_adj), "value_changed", - GTK_SIGNAL_FUNC (scale_entry_unconstrained_adjustment_callback), - adjustment); - - gtk_signal_connect - (GTK_OBJECT (adjustment), "value_changed", - GTK_SIGNAL_FUNC (scale_entry_unconstrained_adjustment_callback), - constrained_adj); - - return_adj = adjustment; - - adjustment = constrained_adj; - } - else - { - spinbutton = spin_button_new (&adjustment, value, lower, upper, - step_increment, page_increment, 0.0, - 1.0, digits); - - return_adj = adjustment; - } - - if (spinbutton_usize > 0) - gtk_widget_set_usize (spinbutton, spinbutton_usize, -1); - - scale = gtk_hscale_new (GTK_ADJUSTMENT (adjustment)); - if (scale_usize > 0) - gtk_widget_set_usize (scale, scale_usize, -1); - gtk_scale_set_digits (GTK_SCALE (scale), digits); - gtk_scale_set_draw_value (GTK_SCALE (scale), FALSE); - gtk_table_attach (GTK_TABLE (table), scale, - column + 2, column + 3, row, row + 1, - GTK_FILL | GTK_EXPAND, GTK_FILL, 0, 0); - gtk_widget_show (scale); - - gtk_table_attach (GTK_TABLE (table), spinbutton, - column + 3, column + 4, row, row + 1, - GTK_SHRINK, GTK_SHRINK, 0, 0); - gtk_widget_show (spinbutton); - - if (tooltip) - { - stpui_set_help_data (scale, tooltip); - stpui_set_help_data (spinbutton, tooltip); - } - - gtk_object_set_data (GTK_OBJECT (return_adj), "label", label); - gtk_object_set_data (GTK_OBJECT (return_adj), "scale", scale); - gtk_object_set_data (GTK_OBJECT (return_adj), "spinbutton", spinbutton); - - return return_adj; -} - -/** - * table_attach_aligned: - * @table: The #GtkTable the widgets will be attached to. - * @column: The column to start with. - * @row: The row to attach the eidgets. - * @label_text: The text for the #GtkLabel which will be attached left of the - * widget. - * @xalign: The horizontal alignment of the #GtkLabel. - * @yalign: The vertival alignment of the #GtkLabel. - * @widget: The #GtkWidget to attach right of the label. - * @colspan: The number of columns the widget will use. - * @left_align: #TRUE if the widget should be left-aligned. - * - * Note that the @label_text can be #NULL and that the widget will be attached - * starting at (@column + 1) in this case, too. - **/ -void -stpui_table_attach_aligned (GtkTable *table, - gint column, - gint row, - const gchar *label_text, - gfloat xalign, - gfloat yalign, - GtkWidget *widget, - gint colspan, - gboolean left_align) -{ - if (label_text) - { - GtkWidget *label; - - label = gtk_label_new (label_text); - gtk_misc_set_alignment (GTK_MISC (label), xalign, yalign); - gtk_label_set_justify (GTK_LABEL (label), GTK_JUSTIFY_LEFT); - gtk_table_attach (table, label, column, column + 1, row, row + 1, - GTK_FILL, GTK_FILL, 0, 0); - gtk_widget_show (label); - } - - gtk_widget_show (widget); - if (left_align) - { - GtkWidget *alignment; - - alignment = gtk_alignment_new (0.0, 0.5, 0.0, 0.0); - gtk_container_add (GTK_CONTAINER (alignment), widget); - - widget = alignment; - } - - gtk_table_attach (table, widget, column + 1, column + 1 + colspan, - row, row + 1, - GTK_FILL | GTK_EXPAND, GTK_FILL, 0, 0); - - gtk_widget_show (widget); -} - -/*****************************************************************\ -* * -* The following borrowed from libgimp/gimphelpui.c * -* * -\*****************************************************************/ - -static GtkTooltips * tool_tips = NULL; - -/** - * stpui_help_init: - * - * This function initializes GIMP's help system. - * - * Currently it only creates a #GtkTooltips object with gtk_tooltips_new() - * which will be used by help_stpui_set_help_data(). - **/ -void -stpui_help_init (void) -{ - tool_tips = gtk_tooltips_new (); -} - -/** - * stpui_help_free: - * - * This function frees the memory used by the #GtkTooltips created by - * stpui_help_init(). - **/ -void -stpui_help_free (void) -{ - gtk_object_destroy (GTK_OBJECT (tool_tips)); - gtk_object_unref (GTK_OBJECT (tool_tips)); -} - -/** - * help_enable_tooltips: - * - * This function calls gtk_tooltips_enable(). - **/ -void -stpui_enable_help (void) -{ - gtk_tooltips_enable (tool_tips); -} - -/** - * help_disable_tooltips: - * - * This function calls gtk_tooltips_disable(). - **/ - -void -stpui_disable_help (void) -{ - gtk_tooltips_disable (tool_tips); -} - -void -stpui_set_help_data (GtkWidget *widget, const gchar *tooltip) -{ - g_return_if_fail (widget != NULL); - g_return_if_fail (GTK_IS_WIDGET (widget)); - - if (tooltip) - { - gtk_tooltips_set_tip (tool_tips, widget, tooltip, NULL); - } -} - -/*****************************************************************\ -* * -* The below is new code * -* * -\*****************************************************************/ - - -void -stpui_set_image_filename(const char *name) -{ - if (name && name == image_filename) - return; - if (image_filename) - g_free(image_filename); - if (name) - image_filename = g_strdup(name); - else - image_filename = g_strdup(""); -} - -const char * -stpui_get_image_filename(void) -{ - stpui_set_image_filename(image_filename); - return(image_filename); -} - -static void -default_errfunc(void *data, const char *buffer, size_t bytes) -{ - fwrite(buffer, 1, bytes, data ? data : stderr); -} - -void -stpui_set_errfunc(stp_outfunc_t wfunc) -{ - the_errfunc = wfunc; -} - -stp_outfunc_t -stpui_get_errfunc(void) -{ - return the_errfunc; -} - -void -stpui_set_errdata(void *errdata) -{ - the_errdata = errdata; -} - -void * -stpui_get_errdata(void) -{ - return the_errdata; -} - -void -stpui_set_thumbnail_func(get_thumbnail_func_t func) -{ - thumbnail_func = func; -} - -get_thumbnail_func_t -stpui_get_thumbnail_func(void) -{ - return thumbnail_func; -} - -void -stpui_set_thumbnail_data(void *data) -{ - thumbnail_private_data = data; -} - -void * -stpui_get_thumbnail_data(void) -{ - return thumbnail_private_data; -} - -GtkWidget * -stpui_create_entry(GtkWidget *table, int hpos, int vpos, const char *text, - const char *help, GtkSignalFunc callback) -{ - GtkWidget *entry = gtk_entry_new(); - gtk_widget_set_usize(entry, 60, 0); - stpui_table_attach_aligned(GTK_TABLE(table), hpos, vpos, text, - 0.0, 0.5, entry, 1, TRUE); - stpui_set_help_data(entry, help); - gtk_signal_connect(GTK_OBJECT(entry), "activate", - GTK_SIGNAL_FUNC(callback), NULL); - return entry; -} - -GSList * -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, 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, gettext(radio->help)); - gtk_signal_connect(GTK_OBJECT(radio->button), "toggled", - GTK_SIGNAL_FUNC(callback), (gpointer) radio->value); - return group; -} - -void -stpui_set_adjustment_tooltip (GtkObject *adj, const gchar *tip) -{ - stpui_set_help_data (GTK_WIDGET (SCALE_ENTRY_SCALE (adj)), tip); - stpui_set_help_data (GTK_WIDGET (SCALE_ENTRY_SPINBUTTON (adj)), tip); -} - -static GtkWidget * -table_label(GtkTable *table, gint column, gint row) -{ - GList *children = table->children;; - while (children) - { - GtkTableChild *child = (GtkTableChild *)children->data; - if (child->left_attach == column + 1 && child->top_attach == row) - return child->widget; - children = children->next; - } - return NULL; -} - -void -stpui_create_new_combo(option_t *option, GtkWidget *table, - int hpos, int vpos, gboolean is_optional) -{ - GtkWidget *event_box = gtk_event_box_new(); - GtkWidget *combo = gtk_combo_new(); - - option->checkbox = gtk_check_button_new(); - gtk_table_attach(GTK_TABLE(table), option->checkbox, - hpos, hpos + 1, vpos, vpos + 1, - GTK_FILL | GTK_EXPAND, GTK_FILL, 0, 0); - - option->info.list.combo = combo; - gtk_container_add(GTK_CONTAINER(event_box), combo); - gtk_widget_show(combo); - gtk_widget_show(event_box); - stpui_set_help_data(event_box, gettext(option->fast_desc->help)); - stpui_table_attach_aligned - (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); -} - -const char * -stpui_combo_get_name(GtkWidget *combo, - const stp_string_list_t *options) -{ - if (options) - { - gint i; - gint num_options = stp_string_list_count(options); - gchar *text = (gtk_entry_get_text(GTK_ENTRY(GTK_COMBO(combo)->entry))); - - if (text == NULL) - return (NULL); - - if (num_options == 0) - return ((const char *)text); - - for (i = 0; i < num_options; i ++) - if (strcmp(stp_string_list_param(options, i)->text, text) == 0) - return (stp_string_list_param(options, i)->name); - } - return (NULL); -} - -void -stpui_create_scale_entry(option_t *opt, - GtkTable *table, - gint column, - gint row, - const gchar *text, - gint scale_usize, - gint spinbutton_usize, - gfloat value, - gfloat lower, - gfloat upper, - gfloat step_increment, - gfloat page_increment, - guint digits, - gboolean constrain, - gfloat unconstrained_lower, - gfloat unconstrained_upper, - const gchar *tooltip, - gboolean is_optional) -{ - 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); - opt->info.flt.adjustment = - stpui_scale_entry_new(table, column, row, text, scale_usize, - spinbutton_usize, value, lower, upper, - step_increment, page_increment, digits, constrain, - unconstrained_lower, unconstrained_upper, tooltip); -} diff --git a/src/gutenprintui2/Makefile.am b/src/gutenprintui2/Makefile.am index 94279a3..2f436fc 100644 --- a/src/gutenprintui2/Makefile.am +++ b/src/gutenprintui2/Makefile.am @@ -1,4 +1,4 @@ -## $Id: Makefile.am,v 1.6.10.1 2007/12/02 02:41:10 rlk Exp $ +## $Id: Makefile.am,v 1.7 2007/12/02 02:39:58 rlk Exp $ ## Copyright (C) 2000 Roger Leigh ## ## This program is free software; you can redistribute it and/or modify diff --git a/src/gutenprintui2/Makefile.in b/src/gutenprintui2/Makefile.in index 6eed08e..8e850a6 100644 --- a/src/gutenprintui2/Makefile.in +++ b/src/gutenprintui2/Makefile.in @@ -44,13 +44,12 @@ DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \ subdir = src/gutenprintui2 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/isc-posix.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 + $(top_srcdir)/m4/iconv.m4 $(top_srcdir)/m4/isc-posix.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 @@ -157,27 +156,13 @@ 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@ GREP = @GREP@ 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@ @@ -185,13 +170,6 @@ 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@ @@ -296,16 +274,12 @@ docdir = @docdir@ dvidir = @dvidir@ 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@ @@ -334,6 +308,7 @@ target_alias = @target_alias@ top_builddir = @top_builddir@ top_srcdir = @top_srcdir@ AM_CPPFLAGS = -I$(top_srcdir)/include -I$(top_builddir)/include $(LOCAL_CPPFLAGS) $(GNUCFLAGS) +GUTENPRINTUI_LIBS = $(top_builddir)/src/gutenprintui/libgutenprintui.la m4datadir = $(datadir)/aclocal pkgconfigdatadir = $(libdir)/pkgconfig @BUILD_LIBGUTENPRINTUI2_TRUE@lib_LTLIBRARIES = libgutenprintui2.la diff --git a/src/gutenprintui2/gutenprintui-internal.h b/src/gutenprintui2/gutenprintui-internal.h index af3caae..fef3b63 100644 --- a/src/gutenprintui2/gutenprintui-internal.h +++ b/src/gutenprintui2/gutenprintui-internal.h @@ -1,5 +1,5 @@ /* - * "$Id: gutenprintui-internal.h,v 1.3 2005/09/17 21:54:33 rlk Exp $" + * "$Id: gutenprintui-internal.h,v 1.5 2008/01/22 02:36:42 rlk Exp $" * * Print plug-in for the GIMP. * @@ -75,17 +75,29 @@ typedef struct gboolean is_visible; } curve_option_t; +typedef struct +{ + GtkWidget *f_label; + GtkWidget *f_entry; + GtkWidget *f_button; + GtkWidget *f_browser; + gboolean f_is_visible; +} file_option_t; + typedef struct { const stp_parameter_t *fast_desc; int is_active; int is_enabled; + int reset_all; GtkWidget *checkbox; + GtkWidget *reset_btn; union { list_option_t list; float_option_t flt; curve_option_t curve; boolean_option_t bool; + file_option_t file; } info; } option_t; diff --git a/src/gutenprintui2/panel.c b/src/gutenprintui2/panel.c index 7fa3de0..cf262e5 100644 --- a/src/gutenprintui2/panel.c +++ b/src/gutenprintui2/panel.c @@ -1,5 +1,5 @@ /* - * "$Id: panel.c,v 1.11.8.3 2007/12/15 20:35:42 rlk Exp $" + * "$Id: panel.c,v 1.17 2008/01/22 02:36:42 rlk Exp $" * * Main window code for Print plug-in for the GIMP. * @@ -255,6 +255,7 @@ static void plist_build_combo(GtkWidget *combo, int (*check_func)(const char *string), gpointer data); static void initialize_thumbnail(void); +static void reset_callback (GtkObject *widget, gpointer data); static void set_color_defaults (void); static void set_printer_defaults (void); static void redraw_color_swatch (void); @@ -564,6 +565,106 @@ stpui_create_curve(option_t *opt, } } +static int +open_file_browser(GtkObject *button, gpointer xopt) +{ + option_t *opt = (option_t *)xopt; + GtkWidget *browser = opt->info.file.f_browser; + GtkWidget *entry = opt->info.file.f_entry; + gtk_file_selection_set_filename (GTK_FILE_SELECTION (browser), + gtk_entry_get_text (GTK_ENTRY (entry))); + gtk_widget_show(opt->info.file.f_browser); + return 1; +} + +static void +file_entry_callback(GtkWidget *widget, gpointer xopt) +{ + const gchar *name = gtk_entry_get_text(GTK_ENTRY(widget)); + if (name && pv && pv->v) + { + option_t *opt = (option_t *)xopt; + stp_set_file_parameter(pv->v, opt->fast_desc->name, name); + } +} + +static int +file_browser_ok_callback(GtkObject *browser_ok, gpointer xopt) +{ + option_t *opt = (option_t *)xopt; + GtkWidget *entry = opt->info.file.f_entry; + GtkWidget *browser = opt->info.file.f_browser; + gtk_widget_hide(opt->info.file.f_browser); + gtk_entry_set_text + (GTK_ENTRY (entry), + gtk_file_selection_get_filename (GTK_FILE_SELECTION (browser))); + file_entry_callback(entry, xopt); + return 1; +} + +static void +stpui_create_file_browser(option_t *opt, + GtkTable *table, + gint column, + gint row, + const gchar *text, + gboolean is_optional) +{ + opt->checkbox = gtk_check_button_new(); + gtk_table_attach(GTK_TABLE(table), opt->checkbox, + column, column + 1, row, row + 1, + GTK_EXPAND|GTK_FILL, GTK_FILL, 0, 0); + if (is_optional) + gtk_widget_show(opt->checkbox); + else + gtk_widget_hide(opt->checkbox); + + opt->info.file.f_label = gtk_label_new(text); + gtk_misc_set_alignment (GTK_MISC (opt->info.file.f_label), 0.0, 0.5); + gtk_table_attach (GTK_TABLE (table), opt->info.file.f_label, + column + 1, column + 2, row, row + 1, + GTK_FILL, GTK_FILL, 0, 0); + gtk_widget_show (opt->info.file.f_label); + + opt->info.file.f_entry = gtk_entry_new(); + gtk_table_attach (GTK_TABLE (table), opt->info.file.f_entry, + column + 2, column + 3, row, row + 1, + GTK_FILL, GTK_FILL, 0, 0); + g_signal_connect(G_OBJECT(opt->info.file.f_entry), "activate", + G_CALLBACK(file_entry_callback), opt); + if (stp_get_file_parameter(pv->v, opt->fast_desc->name)) + gtk_entry_set_text + (GTK_ENTRY (opt->info.file.f_entry), + stp_get_file_parameter(pv->v, opt->fast_desc->name)); + gtk_widget_show (opt->info.file.f_entry); + + opt->info.file.f_button = gtk_button_new_with_label(_("Select File...")); + g_signal_connect(G_OBJECT(opt->info.file.f_button), "clicked", + G_CALLBACK(open_file_browser), opt); + gtk_table_attach (GTK_TABLE (table), opt->info.file.f_button, + column + 3, column + 4, row, row + 1, + GTK_FILL, GTK_FILL, 0, 0); + gtk_widget_show(opt->info.file.f_button); + + opt->info.file.f_browser = + gtk_file_selection_new(gettext(opt->fast_desc->text)); + + g_signal_connect + (G_OBJECT (GTK_FILE_SELECTION (opt->info.file.f_browser)->ok_button), "clicked", + G_CALLBACK (file_browser_ok_callback), opt); + g_signal_connect_object + (G_OBJECT (GTK_FILE_SELECTION (opt->info.file.f_browser)->cancel_button), "clicked", + G_CALLBACK (gtk_widget_hide), G_OBJECT (opt->info.file.f_browser), G_CONNECT_SWAPPED); + + if (opt->fast_desc->help) + { + stpui_set_help_data (opt->info.file.f_label, opt->fast_desc->help); + stpui_set_help_data (opt->info.file.f_button, opt->fast_desc->help); + stpui_set_help_data (opt->info.file.f_entry, opt->fast_desc->help); + stpui_set_help_data (opt->info.file.f_browser, opt->fast_desc->help); + } +} + static int checkbox_callback(GtkObject *button, gpointer xopt) { @@ -804,11 +905,19 @@ populate_options(const stp_vars_t *v) case STP_PARAMETER_TYPE_BOOLEAN: gtk_widget_destroy(GTK_WIDGET(opt->info.bool.checkbox)); break; + case STP_PARAMETER_TYPE_FILE: + gtk_widget_destroy(GTK_WIDGET(opt->info.file.f_label)); + gtk_widget_destroy(GTK_WIDGET(opt->info.file.f_button)); + gtk_widget_destroy(GTK_WIDGET(opt->info.file.f_entry)); + gtk_widget_destroy(GTK_WIDGET(opt->info.file.f_browser)); + break; default: break; } if (opt->checkbox) gtk_widget_destroy(GTK_WIDGET(opt->checkbox)); + if (opt->reset_btn) + gtk_widget_destroy(GTK_WIDGET(opt->reset_btn)); } g_free(current_options); } @@ -829,6 +938,7 @@ populate_options(const stp_vars_t *v) opt->fast_desc = stp_parameter_list_param(params, i); stp_describe_parameter(v, opt->fast_desc->name, &desc); opt->checkbox = NULL; + opt->reset_btn = NULL; opt->is_active = 0; opt->is_enabled = 0; switch (opt->fast_desc->p_type) @@ -876,6 +986,15 @@ populate_options(const stp_vars_t *v) opt->info.bool.current = 0; opt->info.bool.deflt = desc.deflt.boolean; opt->is_active = desc.is_active; + break; + case STP_PARAMETER_TYPE_FILE: + opt->info.file.f_label = NULL; + opt->info.file.f_button = NULL; + opt->info.file.f_entry = NULL; + opt->info.file.f_browser = NULL; + opt->info.file.f_is_visible = FALSE; + opt->is_active = desc.is_active; + break; default: break; } @@ -893,6 +1012,17 @@ destroy_something(GtkWidget *widget, gpointer data) gtk_widget_destroy(widget); } +static void +add_reset_button(option_t *opt, GtkWidget *table, gint column, gint row) +{ + GtkWidget *button = gtk_button_new_with_label(_("Reset")); + gtk_table_attach(GTK_TABLE(table), button, column, column + 1, + row, row + 1, GTK_FILL, GTK_FILL, 0, 0); + g_signal_connect(G_OBJECT(button), "clicked", G_CALLBACK(reset_callback), opt); + opt->reset_btn = button; + gtk_widget_show(button); +} + static void populate_option_table(GtkWidget *table, int p_class) { @@ -930,6 +1060,7 @@ populate_option_table(GtkWidget *table, int p_class) case STP_PARAMETER_TYPE_DOUBLE: case STP_PARAMETER_TYPE_CURVE: case STP_PARAMETER_TYPE_BOOLEAN: + case STP_PARAMETER_TYPE_FILE: counts[desc->p_level][desc->p_type]++; break; default: @@ -976,9 +1107,14 @@ populate_option_table(GtkWidget *table, int p_class) gdouble unit_scaler; gdouble minor_increment; gint digits; + if (p_class == STP_PARAMETER_CLASS_OUTPUT) + opt->reset_all = FALSE; + else + opt->reset_all = TRUE; switch (desc->p_type) { case STP_PARAMETER_TYPE_STRING_LIST: + add_reset_button(opt, table, 4, vpos[desc->p_level][desc->p_type]); stpui_create_new_combo(opt, table, 0, vpos[desc->p_level][desc->p_type]++, !(desc->is_mandatory)); @@ -987,6 +1123,7 @@ populate_option_table(GtkWidget *table, int p_class) STP_PARAMETER_INACTIVE); break; case STP_PARAMETER_TYPE_DOUBLE: + add_reset_button(opt, table, 4, vpos[desc->p_level][desc->p_type]); stpui_create_scale_entry(opt, GTK_TABLE(table), 0, vpos[desc->p_level][desc->p_type]++, gettext(desc->text), 200, 0, @@ -1026,6 +1163,7 @@ populate_option_table(GtkWidget *table, int p_class) digits = 0; minor_increment = 1; } + add_reset_button(opt, table, 4, vpos[desc->p_level][desc->p_type]); stpui_create_scale_entry(opt, GTK_TABLE(table), 0, vpos[desc->p_level][desc->p_type]++, gettext(desc->text), 200, 0, @@ -1050,6 +1188,7 @@ populate_option_table(GtkWidget *table, int p_class) opt->info.curve.current = stp_curve_create_copy(xcurve); else opt->info.curve.current = NULL; + add_reset_button(opt, table, 4, vpos[desc->p_level][desc->p_type]); stpui_create_curve(opt, GTK_TABLE(table), 0, vpos[desc->p_level][desc->p_type]++, gettext(desc->text), opt->info.curve.deflt, @@ -1061,6 +1200,7 @@ populate_option_table(GtkWidget *table, int p_class) case STP_PARAMETER_TYPE_BOOLEAN: opt->info.bool.current = stp_get_boolean_parameter(pv->v, opt->fast_desc->name); + add_reset_button(opt, table, 4, vpos[desc->p_level][desc->p_type]); stpui_create_boolean(opt, GTK_TABLE(table), 0, vpos[desc->p_level][desc->p_type]++, gettext(desc->text), opt->info.bool.deflt, @@ -1079,7 +1219,15 @@ populate_option_table(GtkWidget *table, int p_class) break; case STP_PARAMETER_TYPE_FILE: if (strcmp(opt->fast_desc->name, "PPDFile") != 0) - stp_set_file_parameter_active(pv->v, opt->fast_desc->name, + { + add_reset_button(opt, table, 4, vpos[desc->p_level][desc->p_type]); + stpui_create_file_browser(opt, GTK_TABLE(table), 0, + vpos[desc->p_level][desc->p_type]++, + gettext(desc->text), + !(desc->is_mandatory)); + } + if (desc->p_level > MAXIMUM_PARAMETER_LEVEL) + stp_set_file_parameter_active(pv->v, desc->name, STP_PARAMETER_INACTIVE); break; default: @@ -1150,15 +1298,42 @@ set_options_active(const char *omit) gtk_widget_hide(GTK_WIDGET(opt->info.bool.checkbox)); } break; + case STP_PARAMETER_TYPE_FILE: + if (opt->is_active && desc->p_level <= MAXIMUM_PARAMETER_LEVEL) + { + gtk_widget_show(GTK_WIDGET(opt->info.file.f_label)); + gtk_widget_show(GTK_WIDGET(opt->info.file.f_button)); + gtk_widget_show(GTK_WIDGET(opt->info.file.f_entry)); + } + else + { + gtk_widget_hide(GTK_WIDGET(opt->info.file.f_label)); + gtk_widget_hide(GTK_WIDGET(opt->info.file.f_button)); + gtk_widget_hide(GTK_WIDGET(opt->info.file.f_entry)); + gtk_widget_hide(GTK_WIDGET(opt->info.file.f_browser)); + } + break; default: break; } - if (opt->checkbox) + if (!(opt->is_active) || desc->p_level > MAXIMUM_PARAMETER_LEVEL) { - if (!(opt->is_active) || desc->p_level > MAXIMUM_PARAMETER_LEVEL) + if (opt->checkbox) gtk_widget_hide(GTK_WIDGET(opt->checkbox)); - else if (!(desc->is_mandatory)) - gtk_widget_show(GTK_WIDGET(opt->checkbox)); + if (opt->reset_btn) + gtk_widget_hide(GTK_WIDGET(opt->reset_btn)); + } + else + { + if (opt->checkbox) + { + if (!desc->is_mandatory) + gtk_widget_show(GTK_WIDGET(opt->checkbox)); + else + gtk_widget_hide(GTK_WIDGET(opt->checkbox)); + } + if (opt->reset_btn) + gtk_widget_show(GTK_WIDGET(opt->reset_btn)); } } } @@ -2812,12 +2987,10 @@ set_adjustment_active(option_t *opt, gboolean active, gboolean do_toggle) GtkObject *adj = opt->info.flt.adjustment; if (do_toggle) gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(opt->checkbox), active); - gtk_widget_set_sensitive - (GTK_WIDGET (SCALE_ENTRY_LABEL (adj)), active); - gtk_widget_set_sensitive - (GTK_WIDGET (SCALE_ENTRY_SCALE (adj)), active); - gtk_widget_set_sensitive - (GTK_WIDGET (SCALE_ENTRY_SPINBUTTON (adj)), active); + gtk_widget_set_sensitive (GTK_WIDGET (SCALE_ENTRY_LABEL (adj)), active); + gtk_widget_set_sensitive (GTK_WIDGET (SCALE_ENTRY_SCALE (adj)), active); + gtk_widget_set_sensitive (GTK_WIDGET (SCALE_ENTRY_SPINBUTTON (adj)), active); + gtk_widget_set_sensitive (GTK_WIDGET (opt->reset_btn), active); } static void @@ -2827,6 +3000,7 @@ set_combo_active(option_t *opt, gboolean active, gboolean do_toggle) gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(opt->checkbox), active); gtk_widget_set_sensitive(GTK_WIDGET(opt->info.list.combo), active); gtk_widget_set_sensitive(GTK_WIDGET(opt->info.list.label), active); + gtk_widget_set_sensitive (GTK_WIDGET (opt->reset_btn), active); } static void @@ -2843,6 +3017,7 @@ set_curve_active(option_t *opt, gboolean active, gboolean do_toggle) } else gtk_widget_hide(GTK_WIDGET(opt->info.curve.dialog)); + gtk_widget_set_sensitive (GTK_WIDGET (opt->reset_btn), active); } static void @@ -2851,6 +3026,25 @@ set_bool_active(option_t *opt, gboolean active, gboolean do_toggle) if (do_toggle) gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(opt->checkbox), active); gtk_widget_set_sensitive(GTK_WIDGET(opt->info.bool.checkbox), active); + gtk_widget_set_sensitive (GTK_WIDGET (opt->reset_btn), active); +} + +static void +set_file_active(option_t *opt, gboolean active, gboolean do_toggle) +{ + if (do_toggle) + gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(opt->checkbox), active); + gtk_widget_set_sensitive(GTK_WIDGET(opt->info.file.f_label), active); + gtk_widget_set_sensitive(GTK_WIDGET(opt->info.file.f_button), active); + gtk_widget_set_sensitive(GTK_WIDGET(opt->info.file.f_entry), active); + if (active) + { + if (opt->info.file.f_is_visible) + gtk_widget_show(GTK_WIDGET(opt->info.file.f_browser)); + } + else + gtk_widget_hide(GTK_WIDGET(opt->info.file.f_browser)); + gtk_widget_set_sensitive (GTK_WIDGET (opt->reset_btn), active); } static void @@ -2935,6 +3129,14 @@ do_color_updates (void) else set_bool_active(opt, FALSE, TRUE); break; + case STP_PARAMETER_TYPE_FILE: + if (stp_check_file_parameter(pv->v, opt->fast_desc->name, + STP_PARAMETER_ACTIVE) || + opt->fast_desc->is_mandatory) + set_file_active(opt, TRUE, TRUE); + else + set_file_active(opt, FALSE, TRUE); + break; default: break; } @@ -4335,6 +4537,7 @@ compute_thumbnail(const stp_vars_t *v) stp_set_float_parameter(nv, "Density", 1.0); stp_set_float_parameter(nv, "InkLimit", 0); stp_set_string_parameter(nv, "InputImageType", "RGB"); + stp_clear_file_parameter(nv, "LUTDumpFile"); priv.base_addr = adjusted_thumbnail_data; priv.offset = 0; @@ -5077,6 +5280,11 @@ set_controls_active (GtkObject *checkbutton, gpointer xopt) stp_set_boolean_parameter_active(pv->v, opt->fast_desc->name, STP_PARAMETER_ACTIVE); break; + case STP_PARAMETER_TYPE_FILE: + set_file_active(opt, TRUE, FALSE); + stp_set_file_parameter_active(pv->v, opt->fast_desc->name, + STP_PARAMETER_ACTIVE); + break; default: break; } @@ -5110,6 +5318,11 @@ set_controls_active (GtkObject *checkbutton, gpointer xopt) stp_set_boolean_parameter_active(pv->v, opt->fast_desc->name, STP_PARAMETER_INACTIVE); break; + case STP_PARAMETER_TYPE_FILE: /* ??? */ + set_file_active(opt, FALSE, FALSE); + stp_set_file_parameter_active(pv->v, opt->fast_desc->name, + STP_PARAMETER_INACTIVE); + break; default: break; } @@ -5118,6 +5331,68 @@ set_controls_active (GtkObject *checkbutton, gpointer xopt) update_adjusted_thumbnail(TRUE); } +static void +set_one_default(option_t *opt) +{ + stp_parameter_activity_t active; + gdouble unit_scaler; + switch (opt->fast_desc->p_type) + { + case STP_PARAMETER_TYPE_DOUBLE: + active = stp_get_float_parameter_active(pv->v, opt->fast_desc->name); + stp_set_float_parameter(pv->v, opt->fast_desc->name, + opt->info.flt.deflt); + stp_set_float_parameter_active(pv->v, opt->fast_desc->name, + active); + break; + case STP_PARAMETER_TYPE_DIMENSION: + unit_scaler = units[pv->unit].scale; + active = stp_get_dimension_parameter_active(pv->v, + opt->fast_desc->name); + stp_set_dimension_parameter(pv->v, opt->fast_desc->name, + opt->info.flt.deflt * unit_scaler); + stp_set_dimension_parameter_active(pv->v, opt->fast_desc->name, + active); + break; + case STP_PARAMETER_TYPE_BOOLEAN: + active = stp_get_boolean_parameter_active(pv->v, opt->fast_desc->name); + stp_set_boolean_parameter(pv->v, opt->fast_desc->name, + opt->info.bool.deflt); + stp_set_boolean_parameter_active(pv->v, opt->fast_desc->name, + active); + break; + case STP_PARAMETER_TYPE_STRING_LIST: + active = stp_get_string_parameter_active(pv->v, opt->fast_desc->name); + stp_set_string_parameter(pv->v, opt->fast_desc->name, + opt->info.list.default_val); + stp_set_string_parameter_active(pv->v, opt->fast_desc->name, + active); + break; + case STP_PARAMETER_TYPE_FILE: + active = stp_get_file_parameter_active(pv->v, opt->fast_desc->name); + stp_set_file_parameter(pv->v, opt->fast_desc->name, ""); + stp_set_file_parameter_active(pv->v, opt->fast_desc->name, + active); + break; + default: + break; + } +} + +static void +reset_callback(GtkObject *button, gpointer xopt) +{ + option_t *opt = (option_t *)xopt; + if (opt) + { + set_one_default(opt); + if (opt->reset_all) + do_all_updates (); + else + do_color_updates (); + } +} + static void set_printer_defaults (void) { @@ -5128,49 +5403,7 @@ set_printer_defaults (void) if (opt->fast_desc->p_level <= MAXIMUM_PARAMETER_LEVEL && opt->fast_desc->p_class == STP_PARAMETER_CLASS_FEATURE && opt->is_active && !opt->fast_desc->read_only) - { - stp_parameter_activity_t active; - gdouble unit_scaler; - switch (opt->fast_desc->p_type) - { - case STP_PARAMETER_TYPE_DOUBLE: - active = - stp_get_float_parameter_active(pv->v, opt->fast_desc->name); - stp_set_float_parameter(pv->v, opt->fast_desc->name, - opt->info.flt.deflt); - stp_set_float_parameter_active(pv->v, opt->fast_desc->name, - active); - break; - case STP_PARAMETER_TYPE_DIMENSION: - unit_scaler = units[pv->unit].scale; - active = - stp_get_dimension_parameter_active(pv->v, - opt->fast_desc->name); - stp_set_dimension_parameter(pv->v, opt->fast_desc->name, - opt->info.flt.deflt * unit_scaler); - stp_set_dimension_parameter_active(pv->v, opt->fast_desc->name, - active); - break; - case STP_PARAMETER_TYPE_BOOLEAN: - active = - stp_get_boolean_parameter_active(pv->v, opt->fast_desc->name); - stp_set_boolean_parameter(pv->v, opt->fast_desc->name, - opt->info.bool.deflt); - stp_set_boolean_parameter_active(pv->v, opt->fast_desc->name, - active); - break; - case STP_PARAMETER_TYPE_STRING_LIST: - active = - stp_get_string_parameter_active(pv->v, opt->fast_desc->name); - stp_set_string_parameter(pv->v, opt->fast_desc->name, - opt->info.list.default_val); - stp_set_string_parameter_active(pv->v, opt->fast_desc->name, - active); - break; - default: - break; - } - } + set_one_default(opt); } do_all_updates (); @@ -5186,49 +5419,7 @@ set_color_defaults (void) if (opt->fast_desc->p_level <= MAXIMUM_PARAMETER_LEVEL && opt->fast_desc->p_class == STP_PARAMETER_CLASS_OUTPUT && opt->is_active && !opt->fast_desc->read_only) - { - stp_parameter_activity_t active; - gdouble unit_scaler; - switch (opt->fast_desc->p_type) - { - case STP_PARAMETER_TYPE_DOUBLE: - active = - stp_get_float_parameter_active(pv->v, opt->fast_desc->name); - stp_set_float_parameter(pv->v, opt->fast_desc->name, - opt->info.flt.deflt); - stp_set_float_parameter_active(pv->v, opt->fast_desc->name, - active); - break; - case STP_PARAMETER_TYPE_DIMENSION: - unit_scaler = units[pv->unit].scale; - active = - stp_get_dimension_parameter_active(pv->v, - opt->fast_desc->name); - stp_set_dimension_parameter(pv->v, opt->fast_desc->name, - opt->info.flt.deflt * unit_scaler); - stp_set_dimension_parameter_active(pv->v, opt->fast_desc->name, - active); - break; - case STP_PARAMETER_TYPE_BOOLEAN: - active = - stp_get_boolean_parameter_active(pv->v, opt->fast_desc->name); - stp_set_boolean_parameter(pv->v, opt->fast_desc->name, - opt->info.bool.deflt); - stp_set_boolean_parameter_active(pv->v, opt->fast_desc->name, - active); - break; - case STP_PARAMETER_TYPE_STRING_LIST: - active = - stp_get_string_parameter_active(pv->v, opt->fast_desc->name); - stp_set_string_parameter(pv->v, opt->fast_desc->name, - opt->info.list.default_val); - stp_set_string_parameter_active(pv->v, opt->fast_desc->name, - active); - break; - default: - break; - } - } + set_one_default(opt); } do_color_updates (); diff --git a/src/gutenprintui2/plist.c b/src/gutenprintui2/plist.c index 01d752e..e8b5aec 100644 --- a/src/gutenprintui2/plist.c +++ b/src/gutenprintui2/plist.c @@ -1,5 +1,5 @@ /* - * "$Id: plist.c,v 1.6.10.4 2007/12/15 20:35:43 rlk Exp $" + * "$Id: plist.c,v 1.17 2008/01/31 12:56:09 m0m Exp $" * * Print plug-in for the GIMP. * @@ -84,34 +84,37 @@ typedef struct /* * Generic printing system, based on SysV lp + * + * CAUTION: Do not use lpstat -t or lpstat -p. + * See bug 742187 (huge delays with lpstat -d -p) for an explanation. */ static const print_system_t default_printing_system = { "SysV", N_("System V lp"), "lp -s", "-d", "-oraw", "/usr/bin/lp", - "/usr/bin/lpstat -v | grep -i '^device for ' | awk '{print $3}' | sed 's/://'", + "/usr/bin/lpstat -v | awk '/^device for /i {sub(\":\", \"\", $3); print $3}'", "-n" }; static print_system_t known_printing_systems[] = { { "CUPS", N_("CUPS"), "lp -s", "-d", "-oraw", "/usr/sbin/cupsd", - "/usr/bin/lpstat -v | grep -i '^device for ' | awk '{print $3}' | sed 's/://'", + "/usr/bin/lpstat -v | awk '/^device for /i {sub(\":\", \"\", $3); print $3}'", "-n" }, { "SysV", N_("System V lp"), "lp -s", "-d", "-oraw", "/usr/bin/lp", - "/usr/bin/lpstat -v | grep -i '^device for ' | awk '{print $3}' | sed 's/://'", + "/usr/bin/lpstat -v | awk '/^device for /i {sub(\":\", \"\", $3); print $3}'", "-n" }, { "lpd", N_("Berkeley lpd (/etc/lpc)"), "lpr", "-P", "-l", "/etc/lpc", - "/etc/lpc status | grep '^...*:' | sed 's/:.*//'", + "/etc/lpc status | awk '/^...*:/ {sub(\":.*\", \"\"); print}'", "-#" }, { "lpd", N_("Berkeley lpd (/usr/bsd/lpc)"), "lpr", "-P", "-l", "/usr/bsd/lpc", - "/usr/bsd/lpc status | grep '^...*:' | sed 's/:.*//'", + "/usr/bsd/lpc status | awk '/^...*:/ {sub(\":.*\", \"\"); print}'", "-#" }, { "lpd", N_("Berkeley lpd (/usr/etc/lpc"), "lpr", "-P", "-l", "/usr/etc/lpc", - "/usr/etc/lpc status | grep '^...*:' | sed 's/:.*//'", + "/usr/etc/lpc status | awk '/^...*:/ {sub(\":.*\", \"\"); print}'", "-#" }, { "lpd", N_("Berkeley lpd (/usr/libexec/lpc)"), "lpr", "-P", "-l", "/usr/libexec/lpc", - "/usr/libexec/lpc status | grep '^...*:' | sed 's/:.*//'", + "/usr/libexec/lpc status | awk '/^...*:/ {sub(\":.*\", \"\"); print}'", "-#" }, { "lpd", N_("Berkeley lpd (/usr/sbin/lpc)"), "lpr", "-P", "-l", "/usr/sbin/lpc", - "/usr/sbin/lpc status | grep '^...*:' | sed 's/:.*//'", + "/usr/sbin/lpc status | awk '/^...*:/ {sub(\":.*\", \"\"); print}'", "-#" }, }; @@ -1257,7 +1260,11 @@ stpui_get_system_printers(void) if (global_printing_system) { const char *old_locale = getenv("LC_ALL"); + const char *old_lc_messages = getenv("LC_MESSAGES"); + const char *old_lang = getenv("LANG"); (void) setenv("LC_ALL", "C", 1); + (void) setenv("LC_MESSAGES", "C", 1); + (void) setenv("LANG", "C", 1); if ((pfile = popen(global_printing_system->scan_command, "r")) != NULL) { /* @@ -1283,6 +1290,14 @@ stpui_get_system_printers(void) setenv("LC_ALL", old_locale, 1); else unsetenv("LC_ALL"); + if (old_lc_messages) + setenv("LC_MESSAGES", old_lc_messages, 1); + else + unsetenv("LC_MESSAGES"); + if (old_lang) + setenv("LANG", old_lang, 1); + else + unsetenv("LANG"); } } } @@ -1623,6 +1638,7 @@ stpui_print(const stpui_plist_t *printer, stpui_image_t *image) else /* Child 2 (printer command) */ { char *command; + char *locale; if (stpui_plist_get_command_type(printer) == COMMAND_TYPE_DEFAULT) { @@ -1642,6 +1658,10 @@ stpui_print(const stpui_plist_t *printer, stpui_image_t *image) close (pipefd[0]); close (pipefd[1]); close(syncfd[1]); +#ifdef HAVE_LOCALE_H + locale = g_strdup(setlocale(LC_NUMERIC, NULL)); + setlocale(LC_NUMERIC, "C"); +#endif execl("/bin/sh", "/bin/sh", "-c", command, NULL); /* NOTREACHED */ _exit (1); @@ -1815,5 +1835,5 @@ stpui_print(const stpui_plist_t *printer, stpui_image_t *image) } /* - * End of "$Id: plist.c,v 1.6.10.4 2007/12/15 20:35:43 rlk Exp $". + * End of "$Id: plist.c,v 1.17 2008/01/31 12:56:09 m0m Exp $". */ diff --git a/src/gutenprintui2/printrcl.c b/src/gutenprintui2/printrcl.c index 94a58f5..1c4d8e1 100644 --- a/src/gutenprintui2/printrcl.c +++ b/src/gutenprintui2/printrcl.c @@ -1,93 +1,32 @@ - -#line 3 "printrcl.c" - -#define YY_INT_ALIGNED short int - /* A lexical scanner generated by flex */ +/* Scanner skeleton version: + * $Header: /home/daffy/u0/vern/flex/RCS/flex.skl,v 2.91 96/09/10 16:58:48 vern Exp $ + */ + #define FLEX_SCANNER #define YY_FLEX_MAJOR_VERSION 2 #define YY_FLEX_MINOR_VERSION 5 -#define YY_FLEX_SUBMINOR_VERSION 33 -#if YY_FLEX_SUBMINOR_VERSION > 0 -#define FLEX_BETA -#endif -/* First, we deal with platform-specific or compiler-specific issues. */ - -/* begin standard C headers. */ #include -#include -#include -#include - -/* end standard C headers. */ - -/* flex integer type definitions */ - -#ifndef FLEXINT_H -#define FLEXINT_H -/* C99 systems have . Non-C99 systems may or may not. */ -#if __STDC_VERSION__ >= 199901L - -/* C99 says to define __STDC_LIMIT_MACROS before including stdint.h, - * if you want the limit (max/min) macros for int types. - */ -#ifndef __STDC_LIMIT_MACROS -#define __STDC_LIMIT_MACROS 1 -#endif - -#include -typedef int8_t flex_int8_t; -typedef uint8_t flex_uint8_t; -typedef int16_t flex_int16_t; -typedef uint16_t flex_uint16_t; -typedef int32_t flex_int32_t; -typedef uint32_t flex_uint32_t; -#else -typedef signed char flex_int8_t; -typedef short int flex_int16_t; -typedef int flex_int32_t; -typedef unsigned char flex_uint8_t; -typedef unsigned short int flex_uint16_t; -typedef unsigned int flex_uint32_t; -#endif /* ! C99 */ - -/* Limits of integral types. */ -#ifndef INT8_MIN -#define INT8_MIN (-128) -#endif -#ifndef INT16_MIN -#define INT16_MIN (-32767-1) -#endif -#ifndef INT32_MIN -#define INT32_MIN (-2147483647-1) -#endif -#ifndef INT8_MAX -#define INT8_MAX (127) -#endif -#ifndef INT16_MAX -#define INT16_MAX (32767) -#endif -#ifndef INT32_MAX -#define INT32_MAX (2147483647) -#endif -#ifndef UINT8_MAX -#define UINT8_MAX (255U) -#endif -#ifndef UINT16_MAX -#define UINT16_MAX (65535U) +/* cfront 1.2 defines "c_plusplus" instead of "__cplusplus" */ +#ifdef c_plusplus +#ifndef __cplusplus +#define __cplusplus #endif -#ifndef UINT32_MAX -#define UINT32_MAX (4294967295U) #endif -#endif /* ! FLEXINT_H */ #ifdef __cplusplus +#include +#include + +/* Use prototypes in function declarations. */ +#define YY_USE_PROTOS + /* The "const" storage-class-modifier is valid. */ #define YY_USE_CONST @@ -95,17 +34,34 @@ typedef unsigned int flex_uint32_t; #if __STDC__ +#define YY_USE_PROTOS #define YY_USE_CONST #endif /* __STDC__ */ #endif /* ! __cplusplus */ +#ifdef __TURBOC__ + #pragma warn -rch + #pragma warn -use +#include +#include +#define YY_USE_CONST +#define YY_USE_PROTOS +#endif + #ifdef YY_USE_CONST #define yyconst const #else #define yyconst #endif + +#ifdef YY_USE_PROTOS +#define YY_PROTO(proto) proto +#else +#define YY_PROTO(proto) () +#endif + /* Returned upon end-of-file. */ #define YY_NULL 0 @@ -120,75 +76,71 @@ typedef unsigned int flex_uint32_t; * but we do it the disgusting crufty way forced on us by the ()-less * definition of BEGIN. */ -#define BEGIN (yy_start) = 1 + 2 * +#define BEGIN yy_start = 1 + 2 * /* Translate the current start state into a value that can be later handed * to BEGIN to return to the state. The YYSTATE alias is for lex * compatibility. */ -#define YY_START (((yy_start) - 1) / 2) +#define YY_START ((yy_start - 1) / 2) #define YYSTATE YY_START /* Action number for EOF rule of a given start state. */ #define YY_STATE_EOF(state) (YY_END_OF_BUFFER + state + 1) /* Special action meaning "start processing a new file". */ -#define YY_NEW_FILE yyrestart(yyin ) +#define YY_NEW_FILE yyrestart( yyin ) #define YY_END_OF_BUFFER_CHAR 0 /* Size of default input buffer. */ -#ifndef YY_BUF_SIZE #define YY_BUF_SIZE 16384 -#endif -/* The state buf must be large enough to hold one state per character in the main buffer. - */ -#define YY_STATE_BUF_SIZE ((YY_BUF_SIZE + 2) * sizeof(yy_state_type)) - -#ifndef YY_TYPEDEF_YY_BUFFER_STATE -#define YY_TYPEDEF_YY_BUFFER_STATE typedef struct yy_buffer_state *YY_BUFFER_STATE; -#endif extern int yyleng; - extern FILE *yyin, *yyout; #define EOB_ACT_CONTINUE_SCAN 0 #define EOB_ACT_END_OF_FILE 1 #define EOB_ACT_LAST_MATCH 2 - #define YY_LESS_LINENO(n) - -/* Return all but the first "n" matched characters back to the input stream. */ +/* The funky do-while in the following #define is used to turn the definition + * int a single C statement (which needs a semi-colon terminator). This + * avoids problems with code like: + * + * if ( condition_holds ) + * yyless( 5 ); + * else + * do_something_else(); + * + * Prior to using the do-while the compiler would get upset at the + * "else" because it interpreted the "if" statement as being all + * done when it reached the ';' after the yyless() call. + */ + +/* Return all but the first 'n' matched characters back to the input stream. */ + #define yyless(n) \ do \ { \ /* Undo effects of setting up yytext. */ \ - int yyless_macro_arg = (n); \ - YY_LESS_LINENO(yyless_macro_arg);\ - *yy_cp = (yy_hold_char); \ + *yy_cp = yy_hold_char; \ YY_RESTORE_YY_MORE_OFFSET \ - (yy_c_buf_p) = yy_cp = yy_bp + yyless_macro_arg - YY_MORE_ADJ; \ + yy_c_buf_p = yy_cp = yy_bp + n - YY_MORE_ADJ; \ YY_DO_BEFORE_ACTION; /* set up yytext again */ \ } \ while ( 0 ) -#define unput(c) yyunput( c, (yytext_ptr) ) +#define unput(c) yyunput( c, yytext_ptr ) /* The following is because we cannot portably get our hands on size_t * (without autoconf's help, which isn't available because we want * flex-generated scanners to compile on their own). */ - -#ifndef YY_TYPEDEF_YY_SIZE_T -#define YY_TYPEDEF_YY_SIZE_T typedef unsigned int yy_size_t; -#endif -#ifndef YY_STRUCT_YY_BUFFER_STATE -#define YY_STRUCT_YY_BUFFER_STATE + struct yy_buffer_state { FILE *yy_input_file; @@ -225,16 +177,12 @@ struct yy_buffer_state */ int yy_at_bol; - int yy_bs_lineno; /**< The line count. */ - int yy_bs_column; /**< The column count. */ - /* Whether to try to fill the input buffer when we reach the * end of it. */ int yy_fill_buffer; int yy_buffer_status; - #define YY_BUFFER_NEW 0 #define YY_BUFFER_NORMAL 1 /* When an EOF's been seen but there's still some text to process @@ -248,38 +196,28 @@ struct yy_buffer_state * just pointing yyin at a new input file. */ #define YY_BUFFER_EOF_PENDING 2 - }; -#endif /* !YY_STRUCT_YY_BUFFER_STATE */ -/* Stack of input buffers. */ -static size_t yy_buffer_stack_top = 0; /**< index of top of stack. */ -static size_t yy_buffer_stack_max = 0; /**< capacity of stack. */ -static YY_BUFFER_STATE * yy_buffer_stack = 0; /**< Stack as an array. */ +static YY_BUFFER_STATE yy_current_buffer = 0; /* We provide macros for accessing buffer states in case in the * future we want to put the buffer states in a more general * "scanner state". - * - * Returns the top of the stack, or NULL. */ -#define YY_CURRENT_BUFFER ( (yy_buffer_stack) \ - ? (yy_buffer_stack)[(yy_buffer_stack_top)] \ - : NULL) +#define YY_CURRENT_BUFFER yy_current_buffer -/* Same as previous macro, but useful when we know that the buffer stack is not - * NULL or when we need an lvalue. For internal use only. - */ -#define YY_CURRENT_BUFFER_LVALUE (yy_buffer_stack)[(yy_buffer_stack_top)] /* yy_hold_char holds the character lost when yytext is formed. */ static char yy_hold_char; + static int yy_n_chars; /* number of characters read into yy_ch_buf */ + + int yyleng; /* Points to current character in buffer. */ static char *yy_c_buf_p = (char *) 0; -static int yy_init = 0; /* whether we need to initialize */ +static int yy_init = 1; /* whether we need to initialize */ static int yy_start = 0; /* start state number */ /* Flag which is used to allow yywrap()'s to do buffer switches @@ -287,90 +225,69 @@ static int yy_start = 0; /* start state number */ */ static int yy_did_buffer_switch_on_eof; -void yyrestart (FILE *input_file ); -void yy_switch_to_buffer (YY_BUFFER_STATE new_buffer ); -YY_BUFFER_STATE yy_create_buffer (FILE *file,int size ); -void yy_delete_buffer (YY_BUFFER_STATE b ); -void yy_flush_buffer (YY_BUFFER_STATE b ); -void yypush_buffer_state (YY_BUFFER_STATE new_buffer ); -void yypop_buffer_state (void ); - -static void yyensure_buffer_stack (void ); -static void yy_load_buffer_state (void ); -static void yy_init_buffer (YY_BUFFER_STATE b,FILE *file ); +void yyrestart YY_PROTO(( FILE *input_file )); -#define YY_FLUSH_BUFFER yy_flush_buffer(YY_CURRENT_BUFFER ) +void yy_switch_to_buffer YY_PROTO(( YY_BUFFER_STATE new_buffer )); +void yy_load_buffer_state YY_PROTO(( void )); +YY_BUFFER_STATE yy_create_buffer YY_PROTO(( FILE *file, int size )); +void yy_delete_buffer YY_PROTO(( YY_BUFFER_STATE b )); +void yy_init_buffer YY_PROTO(( YY_BUFFER_STATE b, FILE *file )); +void yy_flush_buffer YY_PROTO(( YY_BUFFER_STATE b )); +#define YY_FLUSH_BUFFER yy_flush_buffer( yy_current_buffer ) -YY_BUFFER_STATE yy_scan_buffer (char *base,yy_size_t size ); -YY_BUFFER_STATE yy_scan_string (yyconst char *yy_str ); -YY_BUFFER_STATE yy_scan_bytes (yyconst char *bytes,int len ); +YY_BUFFER_STATE yy_scan_buffer YY_PROTO(( char *base, yy_size_t size )); +YY_BUFFER_STATE yy_scan_string YY_PROTO(( yyconst char *yy_str )); +YY_BUFFER_STATE yy_scan_bytes YY_PROTO(( yyconst char *bytes, int len )); -void *yyalloc (yy_size_t ); -void *yyrealloc (void *,yy_size_t ); -void yyfree (void * ); +static void *yy_flex_alloc YY_PROTO(( yy_size_t )); +static void *yy_flex_realloc YY_PROTO(( void *, yy_size_t )); +static void yy_flex_free YY_PROTO(( void * )); #define yy_new_buffer yy_create_buffer #define yy_set_interactive(is_interactive) \ { \ - if ( ! YY_CURRENT_BUFFER ){ \ - yyensure_buffer_stack (); \ - YY_CURRENT_BUFFER_LVALUE = \ - yy_create_buffer(yyin,YY_BUF_SIZE ); \ - } \ - YY_CURRENT_BUFFER_LVALUE->yy_is_interactive = is_interactive; \ + if ( ! yy_current_buffer ) \ + yy_current_buffer = yy_create_buffer( yyin, YY_BUF_SIZE ); \ + yy_current_buffer->yy_is_interactive = is_interactive; \ } #define yy_set_bol(at_bol) \ { \ - if ( ! YY_CURRENT_BUFFER ){\ - yyensure_buffer_stack (); \ - YY_CURRENT_BUFFER_LVALUE = \ - yy_create_buffer(yyin,YY_BUF_SIZE ); \ - } \ - YY_CURRENT_BUFFER_LVALUE->yy_at_bol = at_bol; \ + if ( ! yy_current_buffer ) \ + yy_current_buffer = yy_create_buffer( yyin, YY_BUF_SIZE ); \ + yy_current_buffer->yy_at_bol = at_bol; \ } -#define YY_AT_BOL() (YY_CURRENT_BUFFER_LVALUE->yy_at_bol) +#define YY_AT_BOL() (yy_current_buffer->yy_at_bol) -#define yywrap(n) 1 -#define YY_SKIP_YYWRAP +#define yywrap() 1 +#define YY_SKIP_YYWRAP typedef unsigned char YY_CHAR; - FILE *yyin = (FILE *) 0, *yyout = (FILE *) 0; - typedef int yy_state_type; - -extern int yylineno; extern char *yytext; #define yytext_ptr yytext -static yy_state_type yy_get_previous_state (void ); -static yy_state_type yy_try_NUL_trans (yy_state_type current_state ); -static int yy_get_next_buffer (void ); -static void yy_fatal_error (yyconst char msg[] ); +static yy_state_type yy_get_previous_state YY_PROTO(( void )); +static yy_state_type yy_try_NUL_trans YY_PROTO(( yy_state_type current_state )); +static int yy_get_next_buffer YY_PROTO(( void )); +static void yy_fatal_error YY_PROTO(( yyconst char msg[] )); /* Done after the current pattern has been matched and before the * corresponding action - sets up yytext. */ #define YY_DO_BEFORE_ACTION \ - (yytext_ptr) = yy_bp; \ - yyleng = (size_t) (yy_cp - yy_bp); \ - (yy_hold_char) = *yy_cp; \ + yytext_ptr = yy_bp; \ + yyleng = (int) (yy_cp - yy_bp); \ + yy_hold_char = *yy_cp; \ *yy_cp = '\0'; \ - (yy_c_buf_p) = yy_cp; + yy_c_buf_p = yy_cp; #define YY_NUM_RULES 40 #define YY_END_OF_BUFFER 41 -/* This struct is not used in this scanner, - but its presence is necessary. */ -struct yy_trans_info - { - flex_int32_t yy_verify; - flex_int32_t yy_nxt; - }; -static yyconst flex_int16_t yy_accept[335] = +static yyconst short int yy_accept[335] = { 0, 0, 0, 41, 40, 37, 39, 40, 38, 40, 40, 31, 35, 35, 35, 35, 35, 35, 35, 35, 35, @@ -411,7 +328,7 @@ static yyconst flex_int16_t yy_accept[335] = 0, 2, 18, 0 } ; -static yyconst flex_int32_t yy_ec[256] = +static yyconst int yy_ec[256] = { 0, 1, 1, 1, 1, 1, 1, 1, 1, 2, 3, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, @@ -443,7 +360,7 @@ static yyconst flex_int32_t yy_ec[256] = 1, 1, 1, 1, 1 } ; -static yyconst flex_int32_t yy_meta[39] = +static yyconst int yy_meta[39] = { 0, 1, 1, 2, 1, 1, 1, 1, 1, 1, 3, 3, 1, 3, 3, 3, 3, 3, 3, 3, 3, @@ -451,7 +368,7 @@ static yyconst flex_int32_t yy_meta[39] = 3, 3, 3, 3, 3, 3, 3, 3 } ; -static yyconst flex_int16_t yy_base[340] = +static yyconst short int yy_base[340] = { 0, 0, 0, 374, 375, 371, 375, 368, 343, 364, 29, 32, 336, 341, 18, 26, 21, 32, 343, 0, 340, @@ -492,7 +409,7 @@ static yyconst flex_int16_t yy_base[340] = 81, 375, 375, 375, 94, 97, 100, 89, 103 } ; -static yyconst flex_int16_t yy_def[340] = +static yyconst short int yy_def[340] = { 0, 334, 1, 334, 334, 334, 334, 335, 336, 337, 334, 334, 338, 338, 338, 338, 338, 338, 338, 338, 338, @@ -533,7 +450,7 @@ static yyconst flex_int16_t yy_def[340] = 334, 334, 334, 0, 334, 334, 334, 334, 334 } ; -static yyconst flex_int16_t yy_nxt[414] = +static yyconst short int yy_nxt[414] = { 0, 4, 5, 6, 7, 8, 9, 10, 10, 4, 11, 11, 4, 4, 12, 13, 14, 15, 16, 17, 18, @@ -583,7 +500,7 @@ static yyconst flex_int16_t yy_nxt[414] = 334, 334, 334 } ; -static yyconst flex_int16_t yy_chk[414] = +static yyconst short int yy_chk[414] = { 0, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, @@ -636,9 +553,6 @@ static yyconst flex_int16_t yy_chk[414] = static yy_state_type yy_last_accepting_state; static char *yy_last_accepting_cpos; -extern int yy_flex_debug; -int yy_flex_debug = 0; - /* The intent behind this definition is that it'll catch * any uses of REJECT which flex missed. */ @@ -648,6 +562,7 @@ int yy_flex_debug = 0; #define YY_RESTORE_YY_MORE_OFFSET char *yytext; #line 1 "printrcl.l" +#define INITIAL 0 /* -*-Mode: C-*- * "$Id: printrcl.l,v 1.1 2004/09/17 18:38:14 rleigh Exp $" * @@ -706,23 +621,7 @@ q_strdup(const char *s) return g_strndup(s + 1, strlen(s) - 2); } -#line 710 "printrcl.c" - -#define INITIAL 0 - -#ifndef YY_NO_UNISTD_H -/* Special case for "unistd.h", since it is non-ANSI. We include it way - * down here because we want the user's section 1 to have been scanned first. - * The user has a chance to override it with an option. - */ -#include -#endif - -#ifndef YY_EXTRA_TYPE -#define YY_EXTRA_TYPE void * -#endif - -static int yy_init_globals (void ); +#line 625 "printrcl.c" /* Macros after this point can all be overridden by user definitions in * section 1. @@ -730,30 +629,65 @@ static int yy_init_globals (void ); #ifndef YY_SKIP_YYWRAP #ifdef __cplusplus -extern "C" int yywrap (void ); +extern "C" int yywrap YY_PROTO(( void )); #else -extern int yywrap (void ); +extern int yywrap YY_PROTO(( void )); +#endif #endif + +#ifndef YY_NO_UNPUT +static void yyunput YY_PROTO(( int c, char *buf_ptr )); #endif - static void yyunput (int c,char *buf_ptr ); - #ifndef yytext_ptr -static void yy_flex_strncpy (char *,yyconst char *,int ); +static void yy_flex_strncpy YY_PROTO(( char *, yyconst char *, int )); #endif #ifdef YY_NEED_STRLEN -static int yy_flex_strlen (yyconst char * ); +static int yy_flex_strlen YY_PROTO(( yyconst char * )); #endif #ifndef YY_NO_INPUT - #ifdef __cplusplus -static int yyinput (void ); +static int yyinput YY_PROTO(( void )); #else -static int input (void ); +static int input YY_PROTO(( void )); +#endif #endif +#if YY_STACK_USED +static int yy_start_stack_ptr = 0; +static int yy_start_stack_depth = 0; +static int *yy_start_stack = 0; +#ifndef YY_NO_PUSH_STATE +static void yy_push_state YY_PROTO(( int new_state )); +#endif +#ifndef YY_NO_POP_STATE +static void yy_pop_state YY_PROTO(( void )); +#endif +#ifndef YY_NO_TOP_STATE +static int yy_top_state YY_PROTO(( void )); +#endif + +#else +#define YY_NO_PUSH_STATE 1 +#define YY_NO_POP_STATE 1 +#define YY_NO_TOP_STATE 1 +#endif + +#ifdef YY_MALLOC_DECL +YY_MALLOC_DECL +#else +#if __STDC__ +#ifndef __cplusplus +#include +#endif +#else +/* Just try to get by without declaring the routines. This will fail + * miserably on non-ANSI systems for which sizeof(size_t) != sizeof(int) + * or sizeof(void*) != sizeof(int). + */ +#endif #endif /* Amount of stuff to slurp up with each read. */ @@ -762,6 +696,7 @@ static int input (void ); #endif /* Copy whatever the last rule matched to the standard output. */ + #ifndef ECHO /* This used to be an fputs(), but since the string might contain NUL's, * we now use fwrite(). @@ -774,10 +709,9 @@ static int input (void ); */ #ifndef YY_INPUT #define YY_INPUT(buf,result,max_size) \ - if ( YY_CURRENT_BUFFER_LVALUE->yy_is_interactive ) \ + if ( yy_current_buffer->yy_is_interactive ) \ { \ - int c = '*'; \ - size_t n; \ + int c = '*', n; \ for ( n = 0; n < max_size && \ (c = getc( yyin )) != EOF && c != '\n'; ++n ) \ buf[n] = (char) c; \ @@ -787,22 +721,9 @@ static int input (void ); YY_FATAL_ERROR( "input in flex scanner failed" ); \ result = n; \ } \ - else \ - { \ - errno=0; \ - while ( (result = fread(buf, 1, max_size, yyin))==0 && ferror(yyin)) \ - { \ - if( errno != EINTR) \ - { \ - YY_FATAL_ERROR( "input in flex scanner failed" ); \ - break; \ - } \ - errno=0; \ - clearerr(yyin); \ - } \ - }\ -\ - + else if ( ((result = fread( buf, 1, max_size, yyin )) == 0) \ + && ferror( yyin ) ) \ + YY_FATAL_ERROR( "input in flex scanner failed" ); #endif /* No semi-colon after return; correct usage is to write "yyterminate();" - @@ -823,18 +744,12 @@ static int input (void ); #define YY_FATAL_ERROR(msg) yy_fatal_error( msg ) #endif -/* end tables serialization structures and prototypes */ - /* Default declaration of generated scanner - a define so the user can * easily add parameters. */ #ifndef YY_DECL -#define YY_DECL_IS_OURS 1 - -extern int yylex (void); - -#define YY_DECL int yylex (void) -#endif /* !YY_DECL */ +#define YY_DECL int yylex YY_PROTO(( void )) +#endif /* Code executed at the beginning of each rule, after yytext and yyleng * have been set up. @@ -851,29 +766,27 @@ extern int yylex (void); #define YY_RULE_SETUP \ YY_USER_ACTION -/** The main scanner function which does all the work. - */ YY_DECL -{ + { register yy_state_type yy_current_state; register char *yy_cp, *yy_bp; register int yy_act; - + #line 73 "printrcl.l" -#line 866 "printrcl.c" +#line 779 "printrcl.c" - if ( !(yy_init) ) + if ( yy_init ) { - (yy_init) = 1; + yy_init = 0; #ifdef YY_USER_INIT YY_USER_INIT; #endif - if ( ! (yy_start) ) - (yy_start) = 1; /* first start state */ + if ( ! yy_start ) + yy_start = 1; /* first start state */ if ( ! yyin ) yyin = stdin; @@ -881,36 +794,34 @@ YY_DECL if ( ! yyout ) yyout = stdout; - if ( ! YY_CURRENT_BUFFER ) { - yyensure_buffer_stack (); - YY_CURRENT_BUFFER_LVALUE = - yy_create_buffer(yyin,YY_BUF_SIZE ); - } + if ( ! yy_current_buffer ) + yy_current_buffer = + yy_create_buffer( yyin, YY_BUF_SIZE ); - yy_load_buffer_state( ); + yy_load_buffer_state(); } while ( 1 ) /* loops until end-of-file is reached */ { - yy_cp = (yy_c_buf_p); + yy_cp = yy_c_buf_p; /* Support of yytext. */ - *yy_cp = (yy_hold_char); + *yy_cp = yy_hold_char; /* yy_bp points to the position in yy_ch_buf of the start of * the current run. */ yy_bp = yy_cp; - yy_current_state = (yy_start); + yy_current_state = yy_start; yy_match: do { register YY_CHAR yy_c = yy_ec[YY_SC_TO_UI(*yy_cp)]; if ( yy_accept[yy_current_state] ) { - (yy_last_accepting_state) = yy_current_state; - (yy_last_accepting_cpos) = yy_cp; + yy_last_accepting_state = yy_current_state; + yy_last_accepting_cpos = yy_cp; } while ( yy_chk[yy_base[yy_current_state] + yy_c] != yy_current_state ) { @@ -927,22 +838,24 @@ yy_find_action: yy_act = yy_accept[yy_current_state]; if ( yy_act == 0 ) { /* have to back up */ - yy_cp = (yy_last_accepting_cpos); - yy_current_state = (yy_last_accepting_state); + yy_cp = yy_last_accepting_cpos; + yy_current_state = yy_last_accepting_state; yy_act = yy_accept[yy_current_state]; } YY_DO_BEFORE_ACTION; + do_action: /* This label is used only to access EOF actions. */ + switch ( yy_act ) { /* beginning of action switch */ case 0: /* must back up */ /* undo the effects of YY_DO_BEFORE_ACTION */ - *yy_cp = (yy_hold_char); - yy_cp = (yy_last_accepting_cpos); - yy_current_state = (yy_last_accepting_state); + *yy_cp = yy_hold_char; + yy_cp = yy_last_accepting_cpos; + yy_current_state = yy_last_accepting_state; goto yy_find_action; case 1: @@ -1106,7 +1019,6 @@ YY_RULE_SETUP yylval.dval = strtod(yytext, NULL); DBG(tDOUBLE); return tDOUBLE; YY_BREAK case 33: -/* rule 33 can match eol */ YY_RULE_SETUP #line 109 "printrcl.l" yylval.sval = q_strdup(yytext); DBG(tSTRING); return tSTRING; @@ -1122,7 +1034,6 @@ YY_RULE_SETUP yylval.sval = g_strdup(yytext); DBG(tWORD); return tWORD; YY_BREAK case 36: -/* rule 36 can match eol */ YY_RULE_SETUP #line 112 "printrcl.l" DBG(PRINTRC_HDR); return PRINTRC_HDR; @@ -1138,7 +1049,6 @@ YY_RULE_SETUP DBG(comment1); /* Skip comments */ YY_BREAK case 39: -/* rule 39 can match eol */ YY_RULE_SETUP #line 115 "printrcl.l" DBG(newline); mylineno++; @@ -1148,33 +1058,33 @@ YY_RULE_SETUP #line 116 "printrcl.l" ECHO; YY_BREAK -#line 1152 "printrcl.c" +#line 1062 "printrcl.c" case YY_STATE_EOF(INITIAL): yyterminate(); case YY_END_OF_BUFFER: { /* Amount of text matched not including the EOB char. */ - int yy_amount_of_matched_text = (int) (yy_cp - (yytext_ptr)) - 1; + int yy_amount_of_matched_text = (int) (yy_cp - yytext_ptr) - 1; /* Undo the effects of YY_DO_BEFORE_ACTION. */ - *yy_cp = (yy_hold_char); + *yy_cp = yy_hold_char; YY_RESTORE_YY_MORE_OFFSET - if ( YY_CURRENT_BUFFER_LVALUE->yy_buffer_status == YY_BUFFER_NEW ) + if ( yy_current_buffer->yy_buffer_status == YY_BUFFER_NEW ) { /* We're scanning a new file or input source. It's * possible that this happened because the user * just pointed yyin at a new source and called * yylex(). If so, then we have to assure - * consistency between YY_CURRENT_BUFFER and our + * consistency between yy_current_buffer and our * globals. Here is the right place to do so, because * this is the first action (other than possibly a * back-up) that will match for the new input source. */ - (yy_n_chars) = YY_CURRENT_BUFFER_LVALUE->yy_n_chars; - YY_CURRENT_BUFFER_LVALUE->yy_input_file = yyin; - YY_CURRENT_BUFFER_LVALUE->yy_buffer_status = YY_BUFFER_NORMAL; + yy_n_chars = yy_current_buffer->yy_n_chars; + yy_current_buffer->yy_input_file = yyin; + yy_current_buffer->yy_buffer_status = YY_BUFFER_NORMAL; } /* Note that here we test for yy_c_buf_p "<=" to the position @@ -1184,13 +1094,13 @@ case YY_STATE_EOF(INITIAL): * end-of-buffer state). Contrast this with the test * in input(). */ - if ( (yy_c_buf_p) <= &YY_CURRENT_BUFFER_LVALUE->yy_ch_buf[(yy_n_chars)] ) + if ( yy_c_buf_p <= &yy_current_buffer->yy_ch_buf[yy_n_chars] ) { /* This was really a NUL. */ yy_state_type yy_next_state; - (yy_c_buf_p) = (yytext_ptr) + yy_amount_of_matched_text; + yy_c_buf_p = yytext_ptr + yy_amount_of_matched_text; - yy_current_state = yy_get_previous_state( ); + yy_current_state = yy_get_previous_state(); /* Okay, we're now positioned to make the NUL * transition. We couldn't have @@ -1203,30 +1113,30 @@ case YY_STATE_EOF(INITIAL): yy_next_state = yy_try_NUL_trans( yy_current_state ); - yy_bp = (yytext_ptr) + YY_MORE_ADJ; + yy_bp = yytext_ptr + YY_MORE_ADJ; if ( yy_next_state ) { /* Consume the NUL. */ - yy_cp = ++(yy_c_buf_p); + yy_cp = ++yy_c_buf_p; yy_current_state = yy_next_state; goto yy_match; } else { - yy_cp = (yy_c_buf_p); + yy_cp = yy_c_buf_p; goto yy_find_action; } } - else switch ( yy_get_next_buffer( ) ) + else switch ( yy_get_next_buffer() ) { case EOB_ACT_END_OF_FILE: { - (yy_did_buffer_switch_on_eof) = 0; + yy_did_buffer_switch_on_eof = 0; - if ( yywrap( ) ) + if ( yywrap() ) { /* Note: because we've taken care in * yy_get_next_buffer() to have set up @@ -1237,7 +1147,7 @@ case YY_STATE_EOF(INITIAL): * YY_NULL, it'll still work - another * YY_NULL will get returned. */ - (yy_c_buf_p) = (yytext_ptr) + YY_MORE_ADJ; + yy_c_buf_p = yytext_ptr + YY_MORE_ADJ; yy_act = YY_STATE_EOF(YY_START); goto do_action; @@ -1245,30 +1155,30 @@ case YY_STATE_EOF(INITIAL): else { - if ( ! (yy_did_buffer_switch_on_eof) ) + if ( ! yy_did_buffer_switch_on_eof ) YY_NEW_FILE; } break; } case EOB_ACT_CONTINUE_SCAN: - (yy_c_buf_p) = - (yytext_ptr) + yy_amount_of_matched_text; + yy_c_buf_p = + yytext_ptr + yy_amount_of_matched_text; - yy_current_state = yy_get_previous_state( ); + yy_current_state = yy_get_previous_state(); - yy_cp = (yy_c_buf_p); - yy_bp = (yytext_ptr) + YY_MORE_ADJ; + yy_cp = yy_c_buf_p; + yy_bp = yytext_ptr + YY_MORE_ADJ; goto yy_match; case EOB_ACT_LAST_MATCH: - (yy_c_buf_p) = - &YY_CURRENT_BUFFER_LVALUE->yy_ch_buf[(yy_n_chars)]; + yy_c_buf_p = + &yy_current_buffer->yy_ch_buf[yy_n_chars]; - yy_current_state = yy_get_previous_state( ); + yy_current_state = yy_get_previous_state(); - yy_cp = (yy_c_buf_p); - yy_bp = (yytext_ptr) + YY_MORE_ADJ; + yy_cp = yy_c_buf_p; + yy_bp = yytext_ptr + YY_MORE_ADJ; goto yy_find_action; } break; @@ -1279,7 +1189,8 @@ case YY_STATE_EOF(INITIAL): "fatal flex scanner internal error--no action found" ); } /* end of action switch */ } /* end of scanning one token */ -} /* end of yylex */ + } /* end of yylex */ + /* yy_get_next_buffer - try to read in a new buffer * @@ -1288,20 +1199,21 @@ case YY_STATE_EOF(INITIAL): * EOB_ACT_CONTINUE_SCAN - continue scanning from current position * EOB_ACT_END_OF_FILE - end of file */ -static int yy_get_next_buffer (void) -{ - register char *dest = YY_CURRENT_BUFFER_LVALUE->yy_ch_buf; - register char *source = (yytext_ptr); + +static int yy_get_next_buffer() + { + register char *dest = yy_current_buffer->yy_ch_buf; + register char *source = yytext_ptr; register int number_to_move, i; int ret_val; - if ( (yy_c_buf_p) > &YY_CURRENT_BUFFER_LVALUE->yy_ch_buf[(yy_n_chars) + 1] ) + if ( yy_c_buf_p > &yy_current_buffer->yy_ch_buf[yy_n_chars + 1] ) YY_FATAL_ERROR( "fatal flex scanner internal error--end of buffer missed" ); - if ( YY_CURRENT_BUFFER_LVALUE->yy_fill_buffer == 0 ) + if ( yy_current_buffer->yy_fill_buffer == 0 ) { /* Don't try to fill the buffer, so this is an EOF. */ - if ( (yy_c_buf_p) - (yytext_ptr) - YY_MORE_ADJ == 1 ) + if ( yy_c_buf_p - yytext_ptr - YY_MORE_ADJ == 1 ) { /* We matched a single character, the EOB, so * treat this as a final EOF. @@ -1321,30 +1233,34 @@ static int yy_get_next_buffer (void) /* Try to read more data. */ /* First move last chars to start of buffer. */ - number_to_move = (int) ((yy_c_buf_p) - (yytext_ptr)) - 1; + number_to_move = (int) (yy_c_buf_p - yytext_ptr) - 1; for ( i = 0; i < number_to_move; ++i ) *(dest++) = *(source++); - if ( YY_CURRENT_BUFFER_LVALUE->yy_buffer_status == YY_BUFFER_EOF_PENDING ) + if ( yy_current_buffer->yy_buffer_status == YY_BUFFER_EOF_PENDING ) /* don't do the read, it's not guaranteed to return an EOF, * just force an EOF */ - YY_CURRENT_BUFFER_LVALUE->yy_n_chars = (yy_n_chars) = 0; + yy_current_buffer->yy_n_chars = yy_n_chars = 0; else { - int num_to_read = - YY_CURRENT_BUFFER_LVALUE->yy_buf_size - number_to_move - 1; + int num_to_read = + yy_current_buffer->yy_buf_size - number_to_move - 1; while ( num_to_read <= 0 ) { /* Not enough room in the buffer - grow it. */ +#ifdef YY_USES_REJECT + YY_FATAL_ERROR( +"input buffer overflow, can't enlarge buffer because scanner uses REJECT" ); +#else /* just a shorter name for the current buffer */ - YY_BUFFER_STATE b = YY_CURRENT_BUFFER; + YY_BUFFER_STATE b = yy_current_buffer; int yy_c_buf_p_offset = - (int) ((yy_c_buf_p) - b->yy_ch_buf); + (int) (yy_c_buf_p - b->yy_ch_buf); if ( b->yy_is_our_buffer ) { @@ -1357,7 +1273,8 @@ static int yy_get_next_buffer (void) b->yy_ch_buf = (char *) /* Include room in for 2 EOB chars. */ - yyrealloc((void *) b->yy_ch_buf,b->yy_buf_size + 2 ); + yy_flex_realloc( (void *) b->yy_ch_buf, + b->yy_buf_size + 2 ); } else /* Can't grow it, we don't own it. */ @@ -1367,35 +1284,35 @@ static int yy_get_next_buffer (void) YY_FATAL_ERROR( "fatal error - scanner input buffer overflow" ); - (yy_c_buf_p) = &b->yy_ch_buf[yy_c_buf_p_offset]; + yy_c_buf_p = &b->yy_ch_buf[yy_c_buf_p_offset]; - num_to_read = YY_CURRENT_BUFFER_LVALUE->yy_buf_size - + num_to_read = yy_current_buffer->yy_buf_size - number_to_move - 1; - +#endif } if ( num_to_read > YY_READ_BUF_SIZE ) num_to_read = YY_READ_BUF_SIZE; /* Read in more data. */ - YY_INPUT( (&YY_CURRENT_BUFFER_LVALUE->yy_ch_buf[number_to_move]), - (yy_n_chars), num_to_read ); + YY_INPUT( (&yy_current_buffer->yy_ch_buf[number_to_move]), + yy_n_chars, num_to_read ); - YY_CURRENT_BUFFER_LVALUE->yy_n_chars = (yy_n_chars); + yy_current_buffer->yy_n_chars = yy_n_chars; } - if ( (yy_n_chars) == 0 ) + if ( yy_n_chars == 0 ) { if ( number_to_move == YY_MORE_ADJ ) { ret_val = EOB_ACT_END_OF_FILE; - yyrestart(yyin ); + yyrestart( yyin ); } else { ret_val = EOB_ACT_LAST_MATCH; - YY_CURRENT_BUFFER_LVALUE->yy_buffer_status = + yy_current_buffer->yy_buffer_status = YY_BUFFER_EOF_PENDING; } } @@ -1403,31 +1320,32 @@ static int yy_get_next_buffer (void) else ret_val = EOB_ACT_CONTINUE_SCAN; - (yy_n_chars) += number_to_move; - YY_CURRENT_BUFFER_LVALUE->yy_ch_buf[(yy_n_chars)] = YY_END_OF_BUFFER_CHAR; - YY_CURRENT_BUFFER_LVALUE->yy_ch_buf[(yy_n_chars) + 1] = YY_END_OF_BUFFER_CHAR; + yy_n_chars += number_to_move; + yy_current_buffer->yy_ch_buf[yy_n_chars] = YY_END_OF_BUFFER_CHAR; + yy_current_buffer->yy_ch_buf[yy_n_chars + 1] = YY_END_OF_BUFFER_CHAR; - (yytext_ptr) = &YY_CURRENT_BUFFER_LVALUE->yy_ch_buf[0]; + yytext_ptr = &yy_current_buffer->yy_ch_buf[0]; return ret_val; -} + } + /* yy_get_previous_state - get the state just before the EOB char was reached */ - static yy_state_type yy_get_previous_state (void) -{ +static yy_state_type yy_get_previous_state() + { register yy_state_type yy_current_state; register char *yy_cp; - - yy_current_state = (yy_start); - for ( yy_cp = (yytext_ptr) + YY_MORE_ADJ; yy_cp < (yy_c_buf_p); ++yy_cp ) + yy_current_state = yy_start; + + for ( yy_cp = yytext_ptr + YY_MORE_ADJ; yy_cp < yy_c_buf_p; ++yy_cp ) { register YY_CHAR yy_c = (*yy_cp ? yy_ec[YY_SC_TO_UI(*yy_cp)] : 1); if ( yy_accept[yy_current_state] ) { - (yy_last_accepting_state) = yy_current_state; - (yy_last_accepting_cpos) = yy_cp; + yy_last_accepting_state = yy_current_state; + yy_last_accepting_cpos = yy_cp; } while ( yy_chk[yy_base[yy_current_state] + yy_c] != yy_current_state ) { @@ -1439,23 +1357,30 @@ static int yy_get_next_buffer (void) } return yy_current_state; -} + } + /* yy_try_NUL_trans - try to make a transition on the NUL character * * synopsis * next_state = yy_try_NUL_trans( current_state ); */ - static yy_state_type yy_try_NUL_trans (yy_state_type yy_current_state ) -{ + +#ifdef YY_USE_PROTOS +static yy_state_type yy_try_NUL_trans( yy_state_type yy_current_state ) +#else +static yy_state_type yy_try_NUL_trans( yy_current_state ) +yy_state_type yy_current_state; +#endif + { register int yy_is_jam; - register char *yy_cp = (yy_c_buf_p); + register char *yy_cp = yy_c_buf_p; register YY_CHAR yy_c = 1; if ( yy_accept[yy_current_state] ) { - (yy_last_accepting_state) = yy_current_state; - (yy_last_accepting_cpos) = yy_cp; + yy_last_accepting_state = yy_current_state; + yy_last_accepting_cpos = yy_cp; } while ( yy_chk[yy_base[yy_current_state] + yy_c] != yy_current_state ) { @@ -1467,73 +1392,80 @@ static int yy_get_next_buffer (void) yy_is_jam = (yy_current_state == 334); return yy_is_jam ? 0 : yy_current_state; -} + } - static void yyunput (int c, register char * yy_bp ) -{ - register char *yy_cp; - - yy_cp = (yy_c_buf_p); + +#ifndef YY_NO_UNPUT +#ifdef YY_USE_PROTOS +static void yyunput( int c, register char *yy_bp ) +#else +static void yyunput( c, yy_bp ) +int c; +register char *yy_bp; +#endif + { + register char *yy_cp = yy_c_buf_p; /* undo effects of setting up yytext */ - *yy_cp = (yy_hold_char); + *yy_cp = yy_hold_char; - if ( yy_cp < YY_CURRENT_BUFFER_LVALUE->yy_ch_buf + 2 ) + if ( yy_cp < yy_current_buffer->yy_ch_buf + 2 ) { /* need to shift things up to make room */ /* +2 for EOB chars. */ - register int number_to_move = (yy_n_chars) + 2; - register char *dest = &YY_CURRENT_BUFFER_LVALUE->yy_ch_buf[ - YY_CURRENT_BUFFER_LVALUE->yy_buf_size + 2]; + register int number_to_move = yy_n_chars + 2; + register char *dest = &yy_current_buffer->yy_ch_buf[ + yy_current_buffer->yy_buf_size + 2]; register char *source = - &YY_CURRENT_BUFFER_LVALUE->yy_ch_buf[number_to_move]; + &yy_current_buffer->yy_ch_buf[number_to_move]; - while ( source > YY_CURRENT_BUFFER_LVALUE->yy_ch_buf ) + while ( source > yy_current_buffer->yy_ch_buf ) *--dest = *--source; yy_cp += (int) (dest - source); yy_bp += (int) (dest - source); - YY_CURRENT_BUFFER_LVALUE->yy_n_chars = - (yy_n_chars) = YY_CURRENT_BUFFER_LVALUE->yy_buf_size; + yy_current_buffer->yy_n_chars = + yy_n_chars = yy_current_buffer->yy_buf_size; - if ( yy_cp < YY_CURRENT_BUFFER_LVALUE->yy_ch_buf + 2 ) + if ( yy_cp < yy_current_buffer->yy_ch_buf + 2 ) YY_FATAL_ERROR( "flex scanner push-back overflow" ); } *--yy_cp = (char) c; - (yytext_ptr) = yy_bp; - (yy_hold_char) = *yy_cp; - (yy_c_buf_p) = yy_cp; -} -#ifndef YY_NO_INPUT + yytext_ptr = yy_bp; + yy_hold_char = *yy_cp; + yy_c_buf_p = yy_cp; + } +#endif /* ifndef YY_NO_UNPUT */ + + #ifdef __cplusplus - static int yyinput (void) +static int yyinput() #else - static int input (void) +static int input() #endif - -{ + { int c; - - *(yy_c_buf_p) = (yy_hold_char); - if ( *(yy_c_buf_p) == YY_END_OF_BUFFER_CHAR ) + *yy_c_buf_p = yy_hold_char; + + if ( *yy_c_buf_p == YY_END_OF_BUFFER_CHAR ) { /* yy_c_buf_p now points to the character we want to return. * If this occurs *before* the EOB characters, then it's a * valid NUL; if not, then we've hit the end of the buffer. */ - if ( (yy_c_buf_p) < &YY_CURRENT_BUFFER_LVALUE->yy_ch_buf[(yy_n_chars)] ) + if ( yy_c_buf_p < &yy_current_buffer->yy_ch_buf[yy_n_chars] ) /* This was really a NUL. */ - *(yy_c_buf_p) = '\0'; + *yy_c_buf_p = '\0'; else { /* need more input */ - int offset = (yy_c_buf_p) - (yytext_ptr); - ++(yy_c_buf_p); + int offset = yy_c_buf_p - yytext_ptr; + ++yy_c_buf_p; - switch ( yy_get_next_buffer( ) ) + switch ( yy_get_next_buffer() ) { case EOB_ACT_LAST_MATCH: /* This happens because yy_g_n_b() @@ -1547,16 +1479,16 @@ static int yy_get_next_buffer (void) */ /* Reset buffer status. */ - yyrestart(yyin ); + yyrestart( yyin ); - /*FALLTHROUGH*/ + /* fall through */ case EOB_ACT_END_OF_FILE: { - if ( yywrap( ) ) + if ( yywrap() ) return EOF; - if ( ! (yy_did_buffer_switch_on_eof) ) + if ( ! yy_did_buffer_switch_on_eof ) YY_NEW_FILE; #ifdef __cplusplus return yyinput(); @@ -1566,92 +1498,90 @@ static int yy_get_next_buffer (void) } case EOB_ACT_CONTINUE_SCAN: - (yy_c_buf_p) = (yytext_ptr) + offset; + yy_c_buf_p = yytext_ptr + offset; break; } } } - c = *(unsigned char *) (yy_c_buf_p); /* cast for 8-bit char's */ - *(yy_c_buf_p) = '\0'; /* preserve yytext */ - (yy_hold_char) = *++(yy_c_buf_p); + c = *(unsigned char *) yy_c_buf_p; /* cast for 8-bit char's */ + *yy_c_buf_p = '\0'; /* preserve yytext */ + yy_hold_char = *++yy_c_buf_p; + return c; -} -#endif /* ifndef YY_NO_INPUT */ + } -/** Immediately switch to a different input stream. - * @param input_file A readable stream. - * - * @note This function does not reset the start condition to @c INITIAL . - */ - void yyrestart (FILE * input_file ) -{ - - if ( ! YY_CURRENT_BUFFER ){ - yyensure_buffer_stack (); - YY_CURRENT_BUFFER_LVALUE = - yy_create_buffer(yyin,YY_BUF_SIZE ); + +#ifdef YY_USE_PROTOS +void yyrestart( FILE *input_file ) +#else +void yyrestart( input_file ) +FILE *input_file; +#endif + { + if ( ! yy_current_buffer ) + yy_current_buffer = yy_create_buffer( yyin, YY_BUF_SIZE ); + + yy_init_buffer( yy_current_buffer, input_file ); + yy_load_buffer_state(); } - yy_init_buffer(YY_CURRENT_BUFFER,input_file ); - yy_load_buffer_state( ); -} -/** Switch to a different input buffer. - * @param new_buffer The new input buffer. - * - */ - void yy_switch_to_buffer (YY_BUFFER_STATE new_buffer ) -{ - - /* TODO. We should be able to replace this entire function body - * with - * yypop_buffer_state(); - * yypush_buffer_state(new_buffer); - */ - yyensure_buffer_stack (); - if ( YY_CURRENT_BUFFER == new_buffer ) +#ifdef YY_USE_PROTOS +void yy_switch_to_buffer( YY_BUFFER_STATE new_buffer ) +#else +void yy_switch_to_buffer( new_buffer ) +YY_BUFFER_STATE new_buffer; +#endif + { + if ( yy_current_buffer == new_buffer ) return; - if ( YY_CURRENT_BUFFER ) + if ( yy_current_buffer ) { /* Flush out information for old buffer. */ - *(yy_c_buf_p) = (yy_hold_char); - YY_CURRENT_BUFFER_LVALUE->yy_buf_pos = (yy_c_buf_p); - YY_CURRENT_BUFFER_LVALUE->yy_n_chars = (yy_n_chars); + *yy_c_buf_p = yy_hold_char; + yy_current_buffer->yy_buf_pos = yy_c_buf_p; + yy_current_buffer->yy_n_chars = yy_n_chars; } - YY_CURRENT_BUFFER_LVALUE = new_buffer; - yy_load_buffer_state( ); + yy_current_buffer = new_buffer; + yy_load_buffer_state(); /* We don't actually know whether we did this switch during * EOF (yywrap()) processing, but the only time this flag * is looked at is after yywrap() is called, so it's safe * to go ahead and always set it. */ - (yy_did_buffer_switch_on_eof) = 1; -} + yy_did_buffer_switch_on_eof = 1; + } -static void yy_load_buffer_state (void) -{ - (yy_n_chars) = YY_CURRENT_BUFFER_LVALUE->yy_n_chars; - (yytext_ptr) = (yy_c_buf_p) = YY_CURRENT_BUFFER_LVALUE->yy_buf_pos; - yyin = YY_CURRENT_BUFFER_LVALUE->yy_input_file; - (yy_hold_char) = *(yy_c_buf_p); -} -/** Allocate and initialize an input buffer state. - * @param file A readable stream. - * @param size The character buffer size in bytes. When in doubt, use @c YY_BUF_SIZE. - * - * @return the allocated buffer state. - */ - YY_BUFFER_STATE yy_create_buffer (FILE * file, int size ) -{ +#ifdef YY_USE_PROTOS +void yy_load_buffer_state( void ) +#else +void yy_load_buffer_state() +#endif + { + yy_n_chars = yy_current_buffer->yy_n_chars; + yytext_ptr = yy_c_buf_p = yy_current_buffer->yy_buf_pos; + yyin = yy_current_buffer->yy_input_file; + yy_hold_char = *yy_c_buf_p; + } + + +#ifdef YY_USE_PROTOS +YY_BUFFER_STATE yy_create_buffer( FILE *file, int size ) +#else +YY_BUFFER_STATE yy_create_buffer( file, size ) +FILE *file; +int size; +#endif + { YY_BUFFER_STATE b; - - b = (YY_BUFFER_STATE) yyalloc(sizeof( struct yy_buffer_state ) ); + + b = (YY_BUFFER_STATE) yy_flex_alloc( sizeof( struct yy_buffer_state ) ); if ( ! b ) YY_FATAL_ERROR( "out of dynamic memory in yy_create_buffer()" ); @@ -1660,75 +1590,80 @@ static void yy_load_buffer_state (void) /* yy_ch_buf has to be 2 characters longer than the size given because * we need to put in 2 end-of-buffer characters. */ - b->yy_ch_buf = (char *) yyalloc(b->yy_buf_size + 2 ); + b->yy_ch_buf = (char *) yy_flex_alloc( b->yy_buf_size + 2 ); if ( ! b->yy_ch_buf ) YY_FATAL_ERROR( "out of dynamic memory in yy_create_buffer()" ); b->yy_is_our_buffer = 1; - yy_init_buffer(b,file ); + yy_init_buffer( b, file ); return b; -} + } -/** Destroy the buffer. - * @param b a buffer created with yy_create_buffer() - * - */ - void yy_delete_buffer (YY_BUFFER_STATE b ) -{ - + +#ifdef YY_USE_PROTOS +void yy_delete_buffer( YY_BUFFER_STATE b ) +#else +void yy_delete_buffer( b ) +YY_BUFFER_STATE b; +#endif + { if ( ! b ) return; - if ( b == YY_CURRENT_BUFFER ) /* Not sure if we should pop here. */ - YY_CURRENT_BUFFER_LVALUE = (YY_BUFFER_STATE) 0; + if ( b == yy_current_buffer ) + yy_current_buffer = (YY_BUFFER_STATE) 0; if ( b->yy_is_our_buffer ) - yyfree((void *) b->yy_ch_buf ); + yy_flex_free( (void *) b->yy_ch_buf ); - yyfree((void *) b ); -} + yy_flex_free( (void *) b ); + } -#ifndef __cplusplus -extern int isatty (int ); -#endif /* __cplusplus */ - -/* Initializes or reinitializes a buffer. - * This function is sometimes called more than once on the same buffer, - * such as during a yyrestart() or at EOF. - */ - static void yy_init_buffer (YY_BUFFER_STATE b, FILE * file ) -{ - int oerrno = errno; - - yy_flush_buffer(b ); +#ifndef YY_ALWAYS_INTERACTIVE +#ifndef YY_NEVER_INTERACTIVE +extern int isatty YY_PROTO(( int )); +#endif +#endif + +#ifdef YY_USE_PROTOS +void yy_init_buffer( YY_BUFFER_STATE b, FILE *file ) +#else +void yy_init_buffer( b, file ) +YY_BUFFER_STATE b; +FILE *file; +#endif + + + { + yy_flush_buffer( b ); b->yy_input_file = file; b->yy_fill_buffer = 1; - /* If b is the current buffer, then yy_init_buffer was _probably_ - * called from yyrestart() or through yy_get_next_buffer. - * In that case, we don't want to reset the lineno or column. - */ - if (b != YY_CURRENT_BUFFER){ - b->yy_bs_lineno = 1; - b->yy_bs_column = 0; - } - - b->yy_is_interactive = file ? (isatty( fileno(file) ) > 0) : 0; - - errno = oerrno; -} +#if YY_ALWAYS_INTERACTIVE + b->yy_is_interactive = 1; +#else +#if YY_NEVER_INTERACTIVE + b->yy_is_interactive = 0; +#else + b->yy_is_interactive = file ? (isatty( fileno(file) ) > 0) : 0; +#endif +#endif + } -/** Discard all buffered characters. On the next scan, YY_INPUT will be called. - * @param b the buffer state to be flushed, usually @c YY_CURRENT_BUFFER. - * - */ - void yy_flush_buffer (YY_BUFFER_STATE b ) -{ - if ( ! b ) + +#ifdef YY_USE_PROTOS +void yy_flush_buffer( YY_BUFFER_STATE b ) +#else +void yy_flush_buffer( b ) +YY_BUFFER_STATE b; +#endif + + { + if ( ! b ) return; b->yy_n_chars = 0; @@ -1745,121 +1680,29 @@ extern int isatty (int ); b->yy_at_bol = 1; b->yy_buffer_status = YY_BUFFER_NEW; - if ( b == YY_CURRENT_BUFFER ) - yy_load_buffer_state( ); -} - -/** Pushes the new state onto the stack. The new state becomes - * the current state. This function will allocate the stack - * if necessary. - * @param new_buffer The new state. - * - */ -void yypush_buffer_state (YY_BUFFER_STATE new_buffer ) -{ - if (new_buffer == NULL) - return; - - yyensure_buffer_stack(); - - /* This block is copied from yy_switch_to_buffer. */ - if ( YY_CURRENT_BUFFER ) - { - /* Flush out information for old buffer. */ - *(yy_c_buf_p) = (yy_hold_char); - YY_CURRENT_BUFFER_LVALUE->yy_buf_pos = (yy_c_buf_p); - YY_CURRENT_BUFFER_LVALUE->yy_n_chars = (yy_n_chars); - } - - /* Only push if top exists. Otherwise, replace top. */ - if (YY_CURRENT_BUFFER) - (yy_buffer_stack_top)++; - YY_CURRENT_BUFFER_LVALUE = new_buffer; - - /* copied from yy_switch_to_buffer. */ - yy_load_buffer_state( ); - (yy_did_buffer_switch_on_eof) = 1; -} - -/** Removes and deletes the top of the stack, if present. - * The next element becomes the new top. - * - */ -void yypop_buffer_state (void) -{ - if (!YY_CURRENT_BUFFER) - return; - - yy_delete_buffer(YY_CURRENT_BUFFER ); - YY_CURRENT_BUFFER_LVALUE = NULL; - if ((yy_buffer_stack_top) > 0) - --(yy_buffer_stack_top); - - if (YY_CURRENT_BUFFER) { - yy_load_buffer_state( ); - (yy_did_buffer_switch_on_eof) = 1; + if ( b == yy_current_buffer ) + yy_load_buffer_state(); } -} -/* Allocates the stack if it does not exist. - * Guarantees space for at least one push. - */ -static void yyensure_buffer_stack (void) -{ - int num_to_alloc; - - if (!(yy_buffer_stack)) { - - /* First allocation is just for 2 elements, since we don't know if this - * scanner will even need a stack. We use 2 instead of 1 to avoid an - * immediate realloc on the next call. - */ - num_to_alloc = 1; - (yy_buffer_stack) = (struct yy_buffer_state**)yyalloc - (num_to_alloc * sizeof(struct yy_buffer_state*) - ); - - memset((yy_buffer_stack), 0, num_to_alloc * sizeof(struct yy_buffer_state*)); - - (yy_buffer_stack_max) = num_to_alloc; - (yy_buffer_stack_top) = 0; - return; - } - - if ((yy_buffer_stack_top) >= ((yy_buffer_stack_max)) - 1){ - - /* Increase the buffer to prepare for a possible push. */ - int grow_size = 8 /* arbitrary grow size */; - - num_to_alloc = (yy_buffer_stack_max) + grow_size; - (yy_buffer_stack) = (struct yy_buffer_state**)yyrealloc - ((yy_buffer_stack), - num_to_alloc * sizeof(struct yy_buffer_state*) - ); - - /* zero only the new slots.*/ - memset((yy_buffer_stack) + (yy_buffer_stack_max), 0, grow_size * sizeof(struct yy_buffer_state*)); - (yy_buffer_stack_max) = num_to_alloc; - } -} -/** Setup the input buffer state to scan directly from a user-specified character buffer. - * @param base the character buffer - * @param size the size in bytes of the character buffer - * - * @return the newly allocated buffer state object. - */ -YY_BUFFER_STATE yy_scan_buffer (char * base, yy_size_t size ) -{ +#ifndef YY_NO_SCAN_BUFFER +#ifdef YY_USE_PROTOS +YY_BUFFER_STATE yy_scan_buffer( char *base, yy_size_t size ) +#else +YY_BUFFER_STATE yy_scan_buffer( base, size ) +char *base; +yy_size_t size; +#endif + { YY_BUFFER_STATE b; - + if ( size < 2 || base[size-2] != YY_END_OF_BUFFER_CHAR || base[size-1] != YY_END_OF_BUFFER_CHAR ) /* They forgot to leave room for the EOB's. */ return 0; - b = (YY_BUFFER_STATE) yyalloc(sizeof( struct yy_buffer_state ) ); + b = (YY_BUFFER_STATE) yy_flex_alloc( sizeof( struct yy_buffer_state ) ); if ( ! b ) YY_FATAL_ERROR( "out of dynamic memory in yy_scan_buffer()" ); @@ -1873,51 +1716,56 @@ YY_BUFFER_STATE yy_scan_buffer (char * base, yy_size_t size ) b->yy_fill_buffer = 0; b->yy_buffer_status = YY_BUFFER_NEW; - yy_switch_to_buffer(b ); + yy_switch_to_buffer( b ); return b; -} + } +#endif -/** Setup the input buffer state to scan a string. The next call to yylex() will - * scan from a @e copy of @a str. - * @param str a NUL-terminated string to scan - * - * @return the newly allocated buffer state object. - * @note If you want to scan bytes that may contain NUL values, then use - * yy_scan_bytes() instead. - */ -YY_BUFFER_STATE yy_scan_string (yyconst char * yystr ) -{ - - return yy_scan_bytes(yystr,strlen(yystr) ); -} -/** Setup the input buffer state to scan the given bytes. The next call to yylex() will - * scan from a @e copy of @a bytes. - * @param bytes the byte buffer to scan - * @param len the number of bytes in the buffer pointed to by @a bytes. - * - * @return the newly allocated buffer state object. - */ -YY_BUFFER_STATE yy_scan_bytes (yyconst char * yybytes, int _yybytes_len ) -{ +#ifndef YY_NO_SCAN_STRING +#ifdef YY_USE_PROTOS +YY_BUFFER_STATE yy_scan_string( yyconst char *yy_str ) +#else +YY_BUFFER_STATE yy_scan_string( yy_str ) +yyconst char *yy_str; +#endif + { + int len; + for ( len = 0; yy_str[len]; ++len ) + ; + + return yy_scan_bytes( yy_str, len ); + } +#endif + + +#ifndef YY_NO_SCAN_BYTES +#ifdef YY_USE_PROTOS +YY_BUFFER_STATE yy_scan_bytes( yyconst char *bytes, int len ) +#else +YY_BUFFER_STATE yy_scan_bytes( bytes, len ) +yyconst char *bytes; +int len; +#endif + { YY_BUFFER_STATE b; char *buf; yy_size_t n; int i; - + /* Get memory for full buffer, including space for trailing EOB's. */ - n = _yybytes_len + 2; - buf = (char *) yyalloc(n ); + n = len + 2; + buf = (char *) yy_flex_alloc( n ); if ( ! buf ) YY_FATAL_ERROR( "out of dynamic memory in yy_scan_bytes()" ); - for ( i = 0; i < _yybytes_len; ++i ) - buf[i] = yybytes[i]; + for ( i = 0; i < len; ++i ) + buf[i] = bytes[i]; - buf[_yybytes_len] = buf[_yybytes_len+1] = YY_END_OF_BUFFER_CHAR; + buf[len] = buf[len+1] = YY_END_OF_BUFFER_CHAR; - b = yy_scan_buffer(buf,n ); + b = yy_scan_buffer( buf, n ); if ( ! b ) YY_FATAL_ERROR( "bad buffer in yy_scan_bytes()" ); @@ -1927,177 +1775,148 @@ YY_BUFFER_STATE yy_scan_bytes (yyconst char * yybytes, int _yybytes_len ) b->yy_is_our_buffer = 1; return b; -} - -#ifndef YY_EXIT_FAILURE -#define YY_EXIT_FAILURE 2 + } #endif -static void yy_fatal_error (yyconst char* msg ) -{ - (void) fprintf( stderr, "%s\n", msg ); - exit( YY_EXIT_FAILURE ); -} -/* Redefine yyless() so it works in section 3 code. */ +#ifndef YY_NO_PUSH_STATE +#ifdef YY_USE_PROTOS +static void yy_push_state( int new_state ) +#else +static void yy_push_state( new_state ) +int new_state; +#endif + { + if ( yy_start_stack_ptr >= yy_start_stack_depth ) + { + yy_size_t new_size; -#undef yyless -#define yyless(n) \ - do \ - { \ - /* Undo effects of setting up yytext. */ \ - int yyless_macro_arg = (n); \ - YY_LESS_LINENO(yyless_macro_arg);\ - yytext[yyleng] = (yy_hold_char); \ - (yy_c_buf_p) = yytext + yyless_macro_arg; \ - (yy_hold_char) = *(yy_c_buf_p); \ - *(yy_c_buf_p) = '\0'; \ - yyleng = yyless_macro_arg; \ - } \ - while ( 0 ) + yy_start_stack_depth += YY_START_STACK_INCR; + new_size = yy_start_stack_depth * sizeof( int ); -/* Accessor methods (get/set functions) to struct members. */ + if ( ! yy_start_stack ) + yy_start_stack = (int *) yy_flex_alloc( new_size ); -/** Get the input stream. - * - */ -FILE *yyget_in (void) -{ - return yyin; -} + else + yy_start_stack = (int *) yy_flex_realloc( + (void *) yy_start_stack, new_size ); -/** Get the output stream. - * - */ -FILE *yyget_out (void) -{ - return yyout; -} + if ( ! yy_start_stack ) + YY_FATAL_ERROR( + "out of memory expanding start-condition stack" ); + } -/** Get the length of the current token. - * - */ -int yyget_leng (void) -{ - return yyleng; -} + yy_start_stack[yy_start_stack_ptr++] = YY_START; -/** Get the current token. - * - */ + BEGIN(new_state); + } +#endif -char *yyget_text (void) -{ - return yytext; -} -/** Set the input stream. This does not discard the current - * input buffer. - * @param in_str A readable stream. - * - * @see yy_switch_to_buffer - */ -void yyset_in (FILE * in_str ) -{ - yyin = in_str ; -} +#ifndef YY_NO_POP_STATE +static void yy_pop_state() + { + if ( --yy_start_stack_ptr < 0 ) + YY_FATAL_ERROR( "start-condition stack underflow" ); -void yyset_out (FILE * out_str ) -{ - yyout = out_str ; -} + BEGIN(yy_start_stack[yy_start_stack_ptr]); + } +#endif -int yyget_debug (void) -{ - return yy_flex_debug; -} -void yyset_debug (int bdebug ) -{ - yy_flex_debug = bdebug ; -} +#ifndef YY_NO_TOP_STATE +static int yy_top_state() + { + return yy_start_stack[yy_start_stack_ptr - 1]; + } +#endif -static int yy_init_globals (void) -{ - /* Initialization is the same as for the non-reentrant scanner. - * This function is called from yylex_destroy(), so don't allocate here. - */ - - (yy_buffer_stack) = 0; - (yy_buffer_stack_top) = 0; - (yy_buffer_stack_max) = 0; - (yy_c_buf_p) = (char *) 0; - (yy_init) = 0; - (yy_start) = 0; - -/* Defined in main.c */ -#ifdef YY_STDINIT - yyin = stdin; - yyout = stdout; +#ifndef YY_EXIT_FAILURE +#define YY_EXIT_FAILURE 2 +#endif + +#ifdef YY_USE_PROTOS +static void yy_fatal_error( yyconst char msg[] ) #else - yyin = (FILE *) 0; - yyout = (FILE *) 0; +static void yy_fatal_error( msg ) +char msg[]; #endif + { + (void) fprintf( stderr, "%s\n", msg ); + exit( YY_EXIT_FAILURE ); + } - /* For future reference: Set errno on error, since we are called by - * yylex_init() - */ - return 0; -} -/* yylex_destroy is for both reentrant and non-reentrant scanners. */ -int yylex_destroy (void) -{ - - /* Pop the buffer stack, destroying each element. */ - while(YY_CURRENT_BUFFER){ - yy_delete_buffer(YY_CURRENT_BUFFER ); - YY_CURRENT_BUFFER_LVALUE = NULL; - yypop_buffer_state(); - } - /* Destroy the stack itself. */ - yyfree((yy_buffer_stack) ); - (yy_buffer_stack) = NULL; +/* Redefine yyless() so it works in section 3 code. */ - /* Reset the globals. This is important in a non-reentrant scanner so the next time - * yylex() is called, initialization will occur. */ - yy_init_globals( ); +#undef yyless +#define yyless(n) \ + do \ + { \ + /* Undo effects of setting up yytext. */ \ + yytext[yyleng] = yy_hold_char; \ + yy_c_buf_p = yytext + n; \ + yy_hold_char = *yy_c_buf_p; \ + *yy_c_buf_p = '\0'; \ + yyleng = n; \ + } \ + while ( 0 ) - return 0; -} -/* - * Internal utility routines. - */ +/* Internal utility routines. */ #ifndef yytext_ptr -static void yy_flex_strncpy (char* s1, yyconst char * s2, int n ) -{ +#ifdef YY_USE_PROTOS +static void yy_flex_strncpy( char *s1, yyconst char *s2, int n ) +#else +static void yy_flex_strncpy( s1, s2, n ) +char *s1; +yyconst char *s2; +int n; +#endif + { register int i; for ( i = 0; i < n; ++i ) s1[i] = s2[i]; -} + } #endif #ifdef YY_NEED_STRLEN -static int yy_flex_strlen (yyconst char * s ) -{ +#ifdef YY_USE_PROTOS +static int yy_flex_strlen( yyconst char *s ) +#else +static int yy_flex_strlen( s ) +yyconst char *s; +#endif + { register int n; for ( n = 0; s[n]; ++n ) ; return n; -} + } #endif -void *yyalloc (yy_size_t size ) -{ + +#ifdef YY_USE_PROTOS +static void *yy_flex_alloc( yy_size_t size ) +#else +static void *yy_flex_alloc( size ) +yy_size_t size; +#endif + { return (void *) malloc( size ); -} + } -void *yyrealloc (void * ptr, yy_size_t size ) -{ +#ifdef YY_USE_PROTOS +static void *yy_flex_realloc( void *ptr, yy_size_t size ) +#else +static void *yy_flex_realloc( ptr, size ) +void *ptr; +yy_size_t size; +#endif + { /* The cast to (char *) in the following accommodates both * implementations that use char* generic pointers, and those * that use void* generic pointers. It works with the latter @@ -2106,13 +1925,23 @@ void *yyrealloc (void * ptr, yy_size_t size ) * as though doing an assignment. */ return (void *) realloc( (char *) ptr, size ); -} - -void yyfree (void * ptr ) -{ - free( (char *) ptr ); /* see yyrealloc() for (char *) cast */ -} + } -#define YYTABLES_NAME "yytables" +#ifdef YY_USE_PROTOS +static void yy_flex_free( void *ptr ) +#else +static void yy_flex_free( ptr ) +void *ptr; +#endif + { + free( ptr ); + } +#if YY_MAIN +int main() + { + yylex(); + return 0; + } +#endif #line 116 "printrcl.l" diff --git a/src/gutenprintui2/printrcy.c b/src/gutenprintui2/printrcy.c index 178c7f5..d0a6c99 100644 --- a/src/gutenprintui2/printrcy.c +++ b/src/gutenprintui2/printrcy.c @@ -1,9 +1,7 @@ -/* A Bison parser, made by GNU Bison 2.3. */ +/* A Bison parser, made by GNU Bison 1.875. */ -/* Skeleton implementation for Bison's Yacc-like parsers in C - - Copyright (C) 1984, 1989, 1990, 2000, 2001, 2002, 2003, 2004, 2005, 2006 - Free Software Foundation, Inc. +/* Skeleton parser for Yacc-like parsing with Bison, + Copyright (C) 1984, 1989, 1990, 2000, 2001, 2002 Free Software Foundation, Inc. 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 @@ -17,24 +15,16 @@ 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., 51 Franklin Street, Fifth Floor, - Boston, MA 02110-1301, USA. */ - -/* As a special exception, you may create a larger work that contains - part or all of the Bison parser skeleton and distribute that work - under terms of your choice, so long as that work isn't itself a - parser generator using the skeleton or a modified version thereof - as a parser skeleton. Alternatively, if you modify or redistribute - the parser skeleton itself, you may (at your option) remove this - special exception, which will cause the skeleton and the resulting - Bison output files to be licensed under the GNU General Public - License without this special exception. + Foundation, Inc., 59 Temple Place - Suite 330, + Boston, MA 02111-1307, USA. */ - This special exception was added by the Free Software Foundation in - version 2.2 of Bison. */ +/* As a special exception, when this file is copied by Bison into a + Bison output file, you may use that output file without restriction. + This special exception was added by the Free Software Foundation + in version 1.24 of Bison. */ -/* C LALR(1) parser skeleton written by Richard Stallman, by - simplifying the original so-called "semantic" parser. */ +/* Written by Richard Stallman by simplifying the original so called + ``semantic'' parser. */ /* All symbols defined below should begin with yy or YY, to avoid infringing on user name space. This should be done even for local @@ -46,9 +36,6 @@ /* Identify Bison output. */ #define YYBISON 1 -/* Bison version. */ -#define YYBISON_VERSION "2.3" - /* Skeleton name. */ #define YYSKELETON_NAME "yacc.c" @@ -106,7 +93,6 @@ pCURVE = 295 }; #endif -/* Tokens. */ #define tINT 258 #define tDOUBLE 259 #define tDIMENSION 260 @@ -197,12 +183,7 @@ static stpui_plist_t *current_printer = NULL; # define YYERROR_VERBOSE 0 #endif -/* Enabling the token table. */ -#ifndef YYTOKEN_TABLE -# define YYTOKEN_TABLE 0 -#endif - -#if ! defined YYSTYPE && ! defined YYSTYPE_IS_DECLARED +#if ! defined (YYSTYPE) && ! defined (YYSTYPE_IS_DECLARED) typedef int YYSTYPE; # define yystype YYSTYPE /* obsolescent; will be withdrawn */ # define YYSTYPE_IS_DECLARED 1 @@ -214,171 +195,49 @@ typedef int YYSTYPE; /* Copy the second part of user declarations. */ -/* Line 216 of yacc.c. */ -#line 219 "printrcy.c" - -#ifdef short -# undef short -#endif - -#ifdef YYTYPE_UINT8 -typedef YYTYPE_UINT8 yytype_uint8; -#else -typedef unsigned char yytype_uint8; -#endif - -#ifdef YYTYPE_INT8 -typedef YYTYPE_INT8 yytype_int8; -#elif (defined __STDC__ || defined __C99__FUNC__ \ - || defined __cplusplus || defined _MSC_VER) -typedef signed char yytype_int8; -#else -typedef short int yytype_int8; -#endif - -#ifdef YYTYPE_UINT16 -typedef YYTYPE_UINT16 yytype_uint16; -#else -typedef unsigned short int yytype_uint16; -#endif - -#ifdef YYTYPE_INT16 -typedef YYTYPE_INT16 yytype_int16; -#else -typedef short int yytype_int16; -#endif - -#ifndef YYSIZE_T -# ifdef __SIZE_TYPE__ -# define YYSIZE_T __SIZE_TYPE__ -# elif defined size_t -# define YYSIZE_T size_t -# elif ! defined YYSIZE_T && (defined __STDC__ || defined __C99__FUNC__ \ - || defined __cplusplus || defined _MSC_VER) -# include /* INFRINGES ON USER NAME SPACE */ -# define YYSIZE_T size_t -# else -# define YYSIZE_T unsigned int -# endif -#endif - -#define YYSIZE_MAXIMUM ((YYSIZE_T) -1) - -#ifndef YY_ -# if YYENABLE_NLS -# if ENABLE_NLS -# include /* INFRINGES ON USER NAME SPACE */ -# define YY_(msgid) dgettext ("bison-runtime", msgid) -# endif -# endif -# ifndef YY_ -# define YY_(msgid) msgid -# endif -#endif - -/* Suppress unused-variable warnings by "using" E. */ -#if ! defined lint || defined __GNUC__ -# define YYUSE(e) ((void) (e)) -#else -# define YYUSE(e) /* empty */ -#endif - -/* Identity function, used to suppress warnings about constant conditions. */ -#ifndef lint -# define YYID(n) (n) -#else -#if (defined __STDC__ || defined __C99__FUNC__ \ - || defined __cplusplus || defined _MSC_VER) -static int -YYID (int i) -#else -static int -YYID (i) - int i; -#endif -{ - return i; -} -#endif +/* Line 214 of yacc.c. */ +#line 199 "printrcy.c" -#if ! defined yyoverflow || YYERROR_VERBOSE +#if ! defined (yyoverflow) || YYERROR_VERBOSE /* The parser invokes alloca or malloc; define the necessary symbols. */ -# ifdef YYSTACK_USE_ALLOCA -# if YYSTACK_USE_ALLOCA -# ifdef __GNUC__ -# define YYSTACK_ALLOC __builtin_alloca -# elif defined __BUILTIN_VA_ARG_INCR -# include /* INFRINGES ON USER NAME SPACE */ -# elif defined _AIX -# define YYSTACK_ALLOC __alloca -# elif defined _MSC_VER -# include /* INFRINGES ON USER NAME SPACE */ -# define alloca _alloca -# else +# if YYSTACK_USE_ALLOCA +# define YYSTACK_ALLOC alloca +# else +# ifndef YYSTACK_USE_ALLOCA +# if defined (alloca) || defined (_ALLOCA_H) # define YYSTACK_ALLOC alloca -# if ! defined _ALLOCA_H && ! defined _STDLIB_H && (defined __STDC__ || defined __C99__FUNC__ \ - || defined __cplusplus || defined _MSC_VER) -# include /* INFRINGES ON USER NAME SPACE */ -# ifndef _STDLIB_H -# define _STDLIB_H 1 -# endif +# else +# ifdef __GNUC__ +# define YYSTACK_ALLOC __builtin_alloca # endif # endif # endif # endif # ifdef YYSTACK_ALLOC - /* Pacify GCC's `empty if-body' warning. */ -# define YYSTACK_FREE(Ptr) do { /* empty */; } while (YYID (0)) -# ifndef YYSTACK_ALLOC_MAXIMUM - /* The OS might guarantee only one guard page at the bottom of the stack, - and a page size can be as small as 4096 bytes. So we cannot safely - invoke alloca (N) if N exceeds 4096. Use a slightly smaller number - to allow for a few compiler-allocated temporary stack slots. */ -# define YYSTACK_ALLOC_MAXIMUM 4032 /* reasonable circa 2006 */ -# endif + /* Pacify GCC's `empty if-body' warning. */ +# define YYSTACK_FREE(Ptr) do { /* empty */; } while (0) # else -# define YYSTACK_ALLOC YYMALLOC -# define YYSTACK_FREE YYFREE -# ifndef YYSTACK_ALLOC_MAXIMUM -# define YYSTACK_ALLOC_MAXIMUM YYSIZE_MAXIMUM -# endif -# if (defined __cplusplus && ! defined _STDLIB_H \ - && ! ((defined YYMALLOC || defined malloc) \ - && (defined YYFREE || defined free))) +# if defined (__STDC__) || defined (__cplusplus) # include /* INFRINGES ON USER NAME SPACE */ -# ifndef _STDLIB_H -# define _STDLIB_H 1 -# endif -# endif -# ifndef YYMALLOC -# define YYMALLOC malloc -# if ! defined malloc && ! defined _STDLIB_H && (defined __STDC__ || defined __C99__FUNC__ \ - || defined __cplusplus || defined _MSC_VER) -void *malloc (YYSIZE_T); /* INFRINGES ON USER NAME SPACE */ -# endif -# endif -# ifndef YYFREE -# define YYFREE free -# if ! defined free && ! defined _STDLIB_H && (defined __STDC__ || defined __C99__FUNC__ \ - || defined __cplusplus || defined _MSC_VER) -void free (void *); /* INFRINGES ON USER NAME SPACE */ -# endif +# define YYSIZE_T size_t # endif +# define YYSTACK_ALLOC malloc +# define YYSTACK_FREE free # endif -#endif /* ! defined yyoverflow || YYERROR_VERBOSE */ +#endif /* ! defined (yyoverflow) || YYERROR_VERBOSE */ -#if (! defined yyoverflow \ - && (! defined __cplusplus \ - || (defined YYSTYPE_IS_TRIVIAL && YYSTYPE_IS_TRIVIAL))) +#if (! defined (yyoverflow) \ + && (! defined (__cplusplus) \ + || (YYSTYPE_IS_TRIVIAL))) /* A type that is properly aligned for any stack member. */ union yyalloc { - yytype_int16 yyss; + short yyss; YYSTYPE yyvs; }; @@ -388,24 +247,24 @@ union yyalloc /* The size of an array large to enough to hold all stacks, each with N elements. */ # define YYSTACK_BYTES(N) \ - ((N) * (sizeof (yytype_int16) + sizeof (YYSTYPE)) \ + ((N) * (sizeof (short) + sizeof (YYSTYPE)) \ + YYSTACK_GAP_MAXIMUM) /* Copy COUNT objects from FROM to TO. The source and destination do not overlap. */ # ifndef YYCOPY -# if defined __GNUC__ && 1 < __GNUC__ +# if 1 < __GNUC__ # define YYCOPY(To, From, Count) \ __builtin_memcpy (To, From, (Count) * sizeof (*(From))) # else # define YYCOPY(To, From, Count) \ do \ { \ - YYSIZE_T yyi; \ + register YYSIZE_T yyi; \ for (yyi = 0; yyi < (Count); yyi++) \ (To)[yyi] = (From)[yyi]; \ } \ - while (YYID (0)) + while (0) # endif # endif @@ -423,33 +282,39 @@ union yyalloc yynewbytes = yystacksize * sizeof (*Stack) + YYSTACK_GAP_MAXIMUM; \ yyptr += yynewbytes / sizeof (*yyptr); \ } \ - while (YYID (0)) + while (0) #endif -/* YYFINAL -- State number of the termination state. */ +#if defined (__STDC__) || defined (__cplusplus) + typedef signed char yysigned_char; +#else + typedef short yysigned_char; +#endif + +/* YYFINAL -- State number of the termination state. */ #define YYFINAL 10 /* YYLAST -- Last index in YYTABLE. */ #define YYLAST 75 -/* YYNTOKENS -- Number of terminals. */ +/* YYNTOKENS -- Number of terminals. */ #define YYNTOKENS 41 -/* YYNNTS -- Number of nonterminals. */ +/* YYNNTS -- Number of nonterminals. */ #define YYNNTS 42 -/* YYNRULES -- Number of rules. */ +/* YYNRULES -- Number of rules. */ #define YYNRULES 70 -/* YYNRULES -- Number of states. */ +/* YYNRULES -- Number of states. */ #define YYNSTATES 114 /* YYTRANSLATE(YYLEX) -- Bison symbol number corresponding to YYLEX. */ #define YYUNDEFTOK 2 #define YYMAXUTOK 295 -#define YYTRANSLATE(YYX) \ +#define YYTRANSLATE(YYX) \ ((unsigned int) (YYX) <= YYMAXUTOK ? yytranslate[YYX] : YYUNDEFTOK) /* YYTRANSLATE[YYLEX] -- Bison symbol number corresponding to YYLEX. */ -static const yytype_uint8 yytranslate[] = +static const unsigned char yytranslate[] = { 0, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, @@ -486,7 +351,7 @@ static const yytype_uint8 yytranslate[] = #if YYDEBUG /* YYPRHS[YYN] -- Index of the first RHS symbol of rule number YYN in YYRHS. */ -static const yytype_uint8 yyprhs[] = +static const unsigned char yyprhs[] = { 0, 0, 3, 7, 10, 13, 16, 19, 22, 25, 28, 31, 34, 37, 40, 43, 46, 49, 52, 53, @@ -498,8 +363,8 @@ static const yytype_uint8 yyprhs[] = 189 }; -/* YYRHS -- A `-1'-separated list of the rules' RHS. */ -static const yytype_int8 yyrhs[] = +/* YYRHS -- A `-1'-separated list of the rules' RHS. */ +static const yysigned_char yyrhs[] = { 82, 0, -1, 12, 7, 7, -1, 13, 7, -1, 26, 7, -1, 27, 7, -1, 28, 7, -1, 29, @@ -524,7 +389,7 @@ static const yytype_int8 yyrhs[] = }; /* YYRLINE[YYN] -- source line where rule number YYN was defined. */ -static const yytype_uint16 yyrline[] = +static const unsigned short yyrline[] = { 0, 100, 100, 111, 118, 128, 138, 148, 158, 165, 172, 179, 186, 193, 200, 207, 228, 235, 242, 245, @@ -537,37 +402,37 @@ static const yytype_uint16 yyrline[] = }; #endif -#if YYDEBUG || YYERROR_VERBOSE || YYTOKEN_TABLE -/* YYTNAME[SYMBOL-NUM] -- String name of the symbol SYMBOL-NUM. - First, the terminals, then, starting at YYNTOKENS, nonterminals. */ +#if YYDEBUG || YYERROR_VERBOSE +/* YYTNME[SYMBOL-NUM] -- String name of the symbol SYMBOL-NUM. + First, the terminals, then, starting at YYNTOKENS, nonterminals. */ static const char *const yytname[] = { - "$end", "error", "$undefined", "tINT", "tDOUBLE", "tDIMENSION", - "tBOOLEAN", "tSTRING", "tWORD", "tGSWORD", "CURRENT_PRINTER", - "SHOW_ALL_PAPER_SIZES", "PRINTER", "DESTINATION", "SCALING", - "ORIENTATION", "AUTOSIZE_ROLL_PAPER", "UNIT", "DRIVER", "LEFT", "TOP", - "CUSTOM_PAGE_WIDTH", "CUSTOM_PAGE_HEIGHT", "OUTPUT_TYPE", "PRINTRC_HDR", - "PARAMETER", "QUEUE_NAME", "OUTPUT_FILENAME", "EXTRA_PRINTER_OPTIONS", - "CUSTOM_COMMAND", "COMMAND_TYPE", "GLOBAL_SETTINGS", "GLOBAL", - "END_GLOBAL_SETTINGS", "pINT", "pSTRING_LIST", "pFILE", "pDOUBLE", - "pDIMENSION", "pBOOLEAN", "pCURVE", "$accept", "Printer", "Destination", - "Queue_Name", "Output_Filename", "Extra_Printer_Options", - "Custom_Command", "Command_Type", "Scaling", "Orientation", - "Autosize_Roll_Paper", "Unit", "Left", "Top", "Output_Type", - "Custom_Page_Width", "Custom_Page_Height", "Empty", "Int_Param", - "String_List_Param", "File_Param", "Double_Param", "Dimension_Param", - "Boolean_Param", "Curve_Param", "Typed_Param", "Parameter", "Parameters", - "Standard_Value", "Standard_Values", "A_Printer", "Printers", - "Current_Printer", "Show_All_Paper_Sizes", "Global", "Old_Globals", - "New_Global_Setting", "Global_Setting", "Global_Settings", - "Global_Subblock", "Global_Block", "Thing", 0 + "$end", "error", "$undefined", "tINT", "tDOUBLE", "tDIMENSION", + "tBOOLEAN", "tSTRING", "tWORD", "tGSWORD", "CURRENT_PRINTER", + "SHOW_ALL_PAPER_SIZES", "PRINTER", "DESTINATION", "SCALING", + "ORIENTATION", "AUTOSIZE_ROLL_PAPER", "UNIT", "DRIVER", "LEFT", "TOP", + "CUSTOM_PAGE_WIDTH", "CUSTOM_PAGE_HEIGHT", "OUTPUT_TYPE", "PRINTRC_HDR", + "PARAMETER", "QUEUE_NAME", "OUTPUT_FILENAME", "EXTRA_PRINTER_OPTIONS", + "CUSTOM_COMMAND", "COMMAND_TYPE", "GLOBAL_SETTINGS", "GLOBAL", + "END_GLOBAL_SETTINGS", "pINT", "pSTRING_LIST", "pFILE", "pDOUBLE", + "pDIMENSION", "pBOOLEAN", "pCURVE", "$accept", "Printer", "Destination", + "Queue_Name", "Output_Filename", "Extra_Printer_Options", + "Custom_Command", "Command_Type", "Scaling", "Orientation", + "Autosize_Roll_Paper", "Unit", "Left", "Top", "Output_Type", + "Custom_Page_Width", "Custom_Page_Height", "Empty", "Int_Param", + "String_List_Param", "File_Param", "Double_Param", "Dimension_Param", + "Boolean_Param", "Curve_Param", "Typed_Param", "Parameter", + "Parameters", "Standard_Value", "Standard_Values", "A_Printer", + "Printers", "Current_Printer", "Show_All_Paper_Sizes", "Global", + "Old_Globals", "New_Global_Setting", "Global_Setting", + "Global_Settings", "Global_Subblock", "Global_Block", "Thing", 0 }; #endif # ifdef YYPRINT /* YYTOKNUM[YYLEX-NUM] -- Internal token number corresponding to token YYLEX-NUM. */ -static const yytype_uint16 yytoknum[] = +static const unsigned short yytoknum[] = { 0, 256, 257, 258, 259, 260, 261, 262, 263, 264, 265, 266, 267, 268, 269, 270, 271, 272, 273, 274, @@ -578,7 +443,7 @@ static const yytype_uint16 yytoknum[] = # endif /* YYR1[YYN] -- Symbol number of symbol that rule YYN derives. */ -static const yytype_uint8 yyr1[] = +static const unsigned char yyr1[] = { 0, 41, 42, 43, 44, 45, 46, 47, 48, 49, 50, 51, 52, 53, 54, 55, 56, 57, 58, 59, @@ -591,7 +456,7 @@ static const yytype_uint8 yyr1[] = }; /* YYR2[YYN] -- Number of symbols composing right hand side of rule YYN. */ -static const yytype_uint8 yyr2[] = +static const unsigned char yyr2[] = { 0, 2, 3, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 0, 4, @@ -606,7 +471,7 @@ static const yytype_uint8 yyr2[] = /* YYDEFACT[STATE-NAME] -- Default rule to reduce with in state STATE-NUM when YYTABLE doesn't specify something else to do. Zero means the default is an error. */ -static const yytype_uint8 yydefact[] = +static const unsigned char yydefact[] = { 0, 18, 0, 0, 18, 69, 0, 68, 67, 18, 1, 56, 65, 0, 0, 60, 55, 70, 0, 66, @@ -622,8 +487,8 @@ static const yytype_uint8 yydefact[] = 22, 23, 24, 25 }; -/* YYDEFGOTO[NTERM-NUM]. */ -static const yytype_int8 yydefgoto[] = +/* YYDEFGOTO[NTERM-NUM]. */ +static const yysigned_char yydefgoto[] = { -1, 27, 49, 50, 51, 52, 53, 54, 55, 56, 57, 58, 59, 60, 61, 62, 63, 5, 85, 86, @@ -635,7 +500,7 @@ static const yytype_int8 yydefgoto[] = /* YYPACT[STATE-NUM] -- Index in YYTABLE of the portion describing STATE-NUM. */ #define YYPACT_NINF -26 -static const yytype_int8 yypact[] = +static const yysigned_char yypact[] = { -22, -2, 6, 0, -26, -26, 5, -26, -26, -26, -26, -26, -26, -7, 11, -26, -26, 7, 13, -26, @@ -652,7 +517,7 @@ static const yytype_int8 yypact[] = }; /* YYPGOTO[NTERM-NUM]. */ -static const yytype_int8 yypgoto[] = +static const yysigned_char yypgoto[] = { -26, -26, -26, -26, -26, -26, -26, -26, -26, -26, -26, -26, -26, -26, -26, -26, -26, -4, -26, -26, @@ -666,7 +531,7 @@ static const yytype_int8 yypgoto[] = number is the opposite. If zero, do what YYDEFACT says. If YYTABLE_NINF, syntax error. */ #define YYTABLE_NINF -1 -static const yytype_uint8 yytable[] = +static const unsigned char yytable[] = { 12, 18, 1, 3, 14, 16, 10, 11, 3, 93, 94, 95, 96, 97, 98, 99, 14, 25, 84, 26, @@ -678,7 +543,7 @@ static const yytype_uint8 yytable[] = 108, 109, 110, 111, 113, 112 }; -static const yytype_int8 yycheck[] = +static const yysigned_char yycheck[] = { 4, 8, 24, 10, 11, 9, 0, 7, 10, 34, 35, 36, 37, 38, 39, 40, 11, 6, 8, 12, @@ -692,7 +557,7 @@ static const yytype_int8 yycheck[] = /* YYSTOS[STATE-NUM] -- The (internal number of the) accessing symbol of state STATE-NUM. */ -static const yytype_uint8 yystos[] = +static const unsigned char yystos[] = { 0, 24, 82, 10, 31, 58, 73, 76, 80, 81, 0, 7, 58, 79, 11, 74, 58, 72, 8, 33, @@ -708,6 +573,22 @@ static const yytype_uint8 yystos[] = 4, 3, 6, 7 }; +#if ! defined (YYSIZE_T) && defined (__SIZE_TYPE__) +# define YYSIZE_T __SIZE_TYPE__ +#endif +#if ! defined (YYSIZE_T) && defined (size_t) +# define YYSIZE_T size_t +#endif +#if ! defined (YYSIZE_T) +# if defined (__STDC__) || defined (__cplusplus) +# include /* INFRINGES ON USER NAME SPACE */ +# define YYSIZE_T size_t +# endif +#endif +#if ! defined (YYSIZE_T) +# define YYSIZE_T unsigned int +#endif + #define yyerrok (yyerrstatus = 0) #define yyclearin (yychar = YYEMPTY) #define YYEMPTY (-2) @@ -715,8 +596,7 @@ static const yytype_uint8 yystos[] = #define YYACCEPT goto yyacceptlab #define YYABORT goto yyabortlab -#define YYERROR goto yyerrorlab - +#define YYERROR goto yyerrlab1 /* Like YYERROR except do call yyerror. This remains here temporarily to ease the transition to the new meaning of YYERROR, for GCC. @@ -733,63 +613,30 @@ do \ yychar = (Token); \ yylval = (Value); \ yytoken = YYTRANSLATE (yychar); \ - YYPOPSTACK (1); \ + YYPOPSTACK; \ goto yybackup; \ } \ else \ - { \ - yyerror (YY_("syntax error: cannot back up")); \ + { \ + yyerror ("syntax error: cannot back up");\ YYERROR; \ } \ -while (YYID (0)) - +while (0) #define YYTERROR 1 #define YYERRCODE 256 +/* YYLLOC_DEFAULT -- Compute the default location (before the actions + are run). */ -/* YYLLOC_DEFAULT -- Set CURRENT to span from RHS[1] to RHS[N]. - If N is 0, then set CURRENT to the empty location which ends - the previous symbol: RHS[0] (always defined). */ - -#define YYRHSLOC(Rhs, K) ((Rhs)[K]) #ifndef YYLLOC_DEFAULT -# define YYLLOC_DEFAULT(Current, Rhs, N) \ - do \ - if (YYID (N)) \ - { \ - (Current).first_line = YYRHSLOC (Rhs, 1).first_line; \ - (Current).first_column = YYRHSLOC (Rhs, 1).first_column; \ - (Current).last_line = YYRHSLOC (Rhs, N).last_line; \ - (Current).last_column = YYRHSLOC (Rhs, N).last_column; \ - } \ - else \ - { \ - (Current).first_line = (Current).last_line = \ - YYRHSLOC (Rhs, 0).last_line; \ - (Current).first_column = (Current).last_column = \ - YYRHSLOC (Rhs, 0).last_column; \ - } \ - while (YYID (0)) -#endif - - -/* YY_LOCATION_PRINT -- Print the location on the stream. - This macro was not mandated originally: define only if we know - we won't break user code: when these are the locations we know. */ - -#ifndef YY_LOCATION_PRINT -# if YYLTYPE_IS_TRIVIAL -# define YY_LOCATION_PRINT(File, Loc) \ - fprintf (File, "%d.%d-%d.%d", \ - (Loc).first_line, (Loc).first_column, \ - (Loc).last_line, (Loc).last_column) -# else -# define YY_LOCATION_PRINT(File, Loc) ((void) 0) -# endif +# define YYLLOC_DEFAULT(Current, Rhs, N) \ + Current.first_line = Rhs[1].first_line; \ + Current.first_column = Rhs[1].first_column; \ + Current.last_line = Rhs[N].last_line; \ + Current.last_column = Rhs[N].last_column; #endif - /* YYLEX -- calling `yylex' with the right arguments. */ #ifdef YYLEX_PARAM @@ -810,96 +657,42 @@ while (YYID (0)) do { \ if (yydebug) \ YYFPRINTF Args; \ -} while (YYID (0)) - -# define YY_SYMBOL_PRINT(Title, Type, Value, Location) \ -do { \ - if (yydebug) \ - { \ - YYFPRINTF (stderr, "%s ", Title); \ - yy_symbol_print (stderr, \ - Type, Value); \ - YYFPRINTF (stderr, "\n"); \ - } \ -} while (YYID (0)) - - -/*--------------------------------. -| Print this symbol on YYOUTPUT. | -`--------------------------------*/ - -/*ARGSUSED*/ -#if (defined __STDC__ || defined __C99__FUNC__ \ - || defined __cplusplus || defined _MSC_VER) -static void -yy_symbol_value_print (FILE *yyoutput, int yytype, YYSTYPE const * const yyvaluep) -#else -static void -yy_symbol_value_print (yyoutput, yytype, yyvaluep) - FILE *yyoutput; - int yytype; - YYSTYPE const * const yyvaluep; -#endif -{ - if (!yyvaluep) - return; -# ifdef YYPRINT - if (yytype < YYNTOKENS) - YYPRINT (yyoutput, yytoknum[yytype], *yyvaluep); -# else - YYUSE (yyoutput); -# endif - switch (yytype) - { - default: - break; - } -} - - -/*--------------------------------. -| Print this symbol on YYOUTPUT. | -`--------------------------------*/ +} while (0) -#if (defined __STDC__ || defined __C99__FUNC__ \ - || defined __cplusplus || defined _MSC_VER) -static void -yy_symbol_print (FILE *yyoutput, int yytype, YYSTYPE const * const yyvaluep) -#else -static void -yy_symbol_print (yyoutput, yytype, yyvaluep) - FILE *yyoutput; - int yytype; - YYSTYPE const * const yyvaluep; -#endif -{ - if (yytype < YYNTOKENS) - YYFPRINTF (yyoutput, "token %s (", yytname[yytype]); - else - YYFPRINTF (yyoutput, "nterm %s (", yytname[yytype]); +# define YYDSYMPRINT(Args) \ +do { \ + if (yydebug) \ + yysymprint Args; \ +} while (0) - yy_symbol_value_print (yyoutput, yytype, yyvaluep); - YYFPRINTF (yyoutput, ")"); -} +# define YYDSYMPRINTF(Title, Token, Value, Location) \ +do { \ + if (yydebug) \ + { \ + YYFPRINTF (stderr, "%s ", Title); \ + yysymprint (stderr, \ + Token, Value); \ + YYFPRINTF (stderr, "\n"); \ + } \ +} while (0) /*------------------------------------------------------------------. | yy_stack_print -- Print the state stack from its BOTTOM up to its | -| TOP (included). | +| TOP (cinluded). | `------------------------------------------------------------------*/ -#if (defined __STDC__ || defined __C99__FUNC__ \ - || defined __cplusplus || defined _MSC_VER) +#if defined (__STDC__) || defined (__cplusplus) static void -yy_stack_print (yytype_int16 *bottom, yytype_int16 *top) +yy_stack_print (short *bottom, short *top) #else static void yy_stack_print (bottom, top) - yytype_int16 *bottom; - yytype_int16 *top; + short *bottom; + short *top; #endif { YYFPRINTF (stderr, "Stack now"); - for (; bottom <= top; ++bottom) + for (/* Nothing. */; bottom <= top; ++bottom) YYFPRINTF (stderr, " %d", *bottom); YYFPRINTF (stderr, "\n"); } @@ -908,52 +701,45 @@ yy_stack_print (bottom, top) do { \ if (yydebug) \ yy_stack_print ((Bottom), (Top)); \ -} while (YYID (0)) +} while (0) /*------------------------------------------------. | Report that the YYRULE is going to be reduced. | `------------------------------------------------*/ -#if (defined __STDC__ || defined __C99__FUNC__ \ - || defined __cplusplus || defined _MSC_VER) +#if defined (__STDC__) || defined (__cplusplus) static void -yy_reduce_print (YYSTYPE *yyvsp, int yyrule) +yy_reduce_print (int yyrule) #else static void -yy_reduce_print (yyvsp, yyrule) - YYSTYPE *yyvsp; +yy_reduce_print (yyrule) int yyrule; #endif { - int yynrhs = yyr2[yyrule]; int yyi; - unsigned long int yylno = yyrline[yyrule]; - YYFPRINTF (stderr, "Reducing stack by rule %d (line %lu):\n", - yyrule - 1, yylno); - /* The symbols being reduced. */ - for (yyi = 0; yyi < yynrhs; yyi++) - { - fprintf (stderr, " $%d = ", yyi + 1); - yy_symbol_print (stderr, yyrhs[yyprhs[yyrule] + yyi], - &(yyvsp[(yyi + 1) - (yynrhs)]) - ); - fprintf (stderr, "\n"); - } + unsigned int yylineno = yyrline[yyrule]; + YYFPRINTF (stderr, "Reducing stack by rule %d (line %u), ", + yyrule - 1, yylineno); + /* Print the symbols being reduced, and their result. */ + for (yyi = yyprhs[yyrule]; 0 <= yyrhs[yyi]; yyi++) + YYFPRINTF (stderr, "%s ", yytname [yyrhs[yyi]]); + YYFPRINTF (stderr, "-> %s\n", yytname [yyr1[yyrule]]); } # define YY_REDUCE_PRINT(Rule) \ do { \ if (yydebug) \ - yy_reduce_print (yyvsp, Rule); \ -} while (YYID (0)) + yy_reduce_print (Rule); \ +} while (0) /* Nonzero means print parse trace. It is left uninitialized so that multiple parsers can coexist. */ int yydebug; #else /* !YYDEBUG */ # define YYDPRINTF(Args) -# define YY_SYMBOL_PRINT(Title, Type, Value, Location) +# define YYDSYMPRINT(Args) +# define YYDSYMPRINTF(Title, Token, Value, Location) # define YY_STACK_PRINT(Bottom, Top) # define YY_REDUCE_PRINT(Rule) #endif /* !YYDEBUG */ @@ -968,9 +754,13 @@ int yydebug; if the built-in stack extension method is used). Do not make this value too large; the results are undefined if - YYSTACK_ALLOC_MAXIMUM < YYSTACK_BYTES (YYMAXDEPTH) + SIZE_MAX < YYSTACK_BYTES (YYMAXDEPTH) evaluated with infinite-precision integer arithmetic. */ +#if YYMAXDEPTH == 0 +# undef YYMAXDEPTH +#endif + #ifndef YYMAXDEPTH # define YYMAXDEPTH 10000 #endif @@ -980,47 +770,45 @@ int yydebug; #if YYERROR_VERBOSE # ifndef yystrlen -# if defined __GLIBC__ && defined _STRING_H +# if defined (__GLIBC__) && defined (_STRING_H) # define yystrlen strlen # else /* Return the length of YYSTR. */ -#if (defined __STDC__ || defined __C99__FUNC__ \ - || defined __cplusplus || defined _MSC_VER) static YYSIZE_T +# if defined (__STDC__) || defined (__cplusplus) yystrlen (const char *yystr) -#else -static YYSIZE_T +# else yystrlen (yystr) - const char *yystr; -#endif + const char *yystr; +# endif { - YYSIZE_T yylen; - for (yylen = 0; yystr[yylen]; yylen++) + register const char *yys = yystr; + + while (*yys++ != '\0') continue; - return yylen; + + return yys - yystr - 1; } # endif # endif # ifndef yystpcpy -# if defined __GLIBC__ && defined _STRING_H && defined _GNU_SOURCE +# if defined (__GLIBC__) && defined (_STRING_H) && defined (_GNU_SOURCE) # define yystpcpy stpcpy # else /* Copy YYSRC to YYDEST, returning the address of the terminating '\0' in YYDEST. */ -#if (defined __STDC__ || defined __C99__FUNC__ \ - || defined __cplusplus || defined _MSC_VER) static char * +# if defined (__STDC__) || defined (__cplusplus) yystpcpy (char *yydest, const char *yysrc) -#else -static char * +# else yystpcpy (yydest, yysrc) - char *yydest; - const char *yysrc; -#endif + char *yydest; + const char *yysrc; +# endif { - char *yyd = yydest; - const char *yys = yysrc; + register char *yyd = yydest; + register const char *yys = yysrc; while ((*yyd++ = *yys++) != '\0') continue; @@ -1030,192 +818,70 @@ yystpcpy (yydest, yysrc) # endif # endif -# ifndef yytnamerr -/* Copy to YYRES the contents of YYSTR after stripping away unnecessary - quotes and backslashes, so that it's suitable for yyerror. The - heuristic is that double-quoting is unnecessary unless the string - contains an apostrophe, a comma, or backslash (other than - backslash-backslash). YYSTR is taken from yytname. If YYRES is - null, do not copy; instead, return the length of what the result - would have been. */ -static YYSIZE_T -yytnamerr (char *yyres, const char *yystr) -{ - if (*yystr == '"') - { - YYSIZE_T yyn = 0; - char const *yyp = yystr; - - for (;;) - switch (*++yyp) - { - case '\'': - case ',': - goto do_not_strip_quotes; - - case '\\': - if (*++yyp != '\\') - goto do_not_strip_quotes; - /* Fall through. */ - default: - if (yyres) - yyres[yyn] = *yyp; - yyn++; - break; - - case '"': - if (yyres) - yyres[yyn] = '\0'; - return yyn; - } - do_not_strip_quotes: ; - } +#endif /* !YYERROR_VERBOSE */ - if (! yyres) - return yystrlen (yystr); + - return yystpcpy (yyres, yystr) - yyres; -} -# endif +#if YYDEBUG +/*--------------------------------. +| Print this symbol on YYOUTPUT. | +`--------------------------------*/ -/* Copy into YYRESULT an error message about the unexpected token - YYCHAR while in state YYSTATE. Return the number of bytes copied, - including the terminating null byte. If YYRESULT is null, do not - copy anything; just return the number of bytes that would be - copied. As a special case, return 0 if an ordinary "syntax error" - message will do. Return YYSIZE_MAXIMUM if overflow occurs during - size calculation. */ -static YYSIZE_T -yysyntax_error (char *yyresult, int yystate, int yychar) +#if defined (__STDC__) || defined (__cplusplus) +static void +yysymprint (FILE *yyoutput, int yytype, YYSTYPE *yyvaluep) +#else +static void +yysymprint (yyoutput, yytype, yyvaluep) + FILE *yyoutput; + int yytype; + YYSTYPE *yyvaluep; +#endif { - int yyn = yypact[yystate]; + /* Pacify ``unused variable'' warnings. */ + (void) yyvaluep; - if (! (YYPACT_NINF < yyn && yyn <= YYLAST)) - return 0; - else + if (yytype < YYNTOKENS) { - int yytype = YYTRANSLATE (yychar); - YYSIZE_T yysize0 = yytnamerr (0, yytname[yytype]); - YYSIZE_T yysize = yysize0; - YYSIZE_T yysize1; - int yysize_overflow = 0; - enum { YYERROR_VERBOSE_ARGS_MAXIMUM = 5 }; - char const *yyarg[YYERROR_VERBOSE_ARGS_MAXIMUM]; - int yyx; - -# if 0 - /* This is so xgettext sees the translatable formats that are - constructed on the fly. */ - YY_("syntax error, unexpected %s"); - YY_("syntax error, unexpected %s, expecting %s"); - YY_("syntax error, unexpected %s, expecting %s or %s"); - YY_("syntax error, unexpected %s, expecting %s or %s or %s"); - YY_("syntax error, unexpected %s, expecting %s or %s or %s or %s"); + YYFPRINTF (yyoutput, "token %s (", yytname[yytype]); +# ifdef YYPRINT + YYPRINT (yyoutput, yytoknum[yytype], *yyvaluep); # endif - char *yyfmt; - char const *yyf; - static char const yyunexpected[] = "syntax error, unexpected %s"; - static char const yyexpecting[] = ", expecting %s"; - static char const yyor[] = " or %s"; - char yyformat[sizeof yyunexpected - + sizeof yyexpecting - 1 - + ((YYERROR_VERBOSE_ARGS_MAXIMUM - 2) - * (sizeof yyor - 1))]; - char const *yyprefix = yyexpecting; - - /* Start YYX at -YYN if negative to avoid negative indexes in - YYCHECK. */ - int yyxbegin = yyn < 0 ? -yyn : 0; - - /* Stay within bounds of both yycheck and yytname. */ - int yychecklim = YYLAST - yyn + 1; - int yyxend = yychecklim < YYNTOKENS ? yychecklim : YYNTOKENS; - int yycount = 1; - - yyarg[0] = yytname[yytype]; - yyfmt = yystpcpy (yyformat, yyunexpected); - - for (yyx = yyxbegin; yyx < yyxend; ++yyx) - if (yycheck[yyx + yyn] == yyx && yyx != YYTERROR) - { - if (yycount == YYERROR_VERBOSE_ARGS_MAXIMUM) - { - yycount = 1; - yysize = yysize0; - yyformat[sizeof yyunexpected - 1] = '\0'; - break; - } - yyarg[yycount++] = yytname[yyx]; - yysize1 = yysize + yytnamerr (0, yytname[yyx]); - yysize_overflow |= (yysize1 < yysize); - yysize = yysize1; - yyfmt = yystpcpy (yyfmt, yyprefix); - yyprefix = yyor; - } - - yyf = YY_(yyformat); - yysize1 = yysize + yystrlen (yyf); - yysize_overflow |= (yysize1 < yysize); - yysize = yysize1; - - if (yysize_overflow) - return YYSIZE_MAXIMUM; - - if (yyresult) - { - /* Avoid sprintf, as that infringes on the user's name space. - Don't have undefined behavior even if the translation - produced a string with the wrong number of "%s"s. */ - char *yyp = yyresult; - int yyi = 0; - while ((*yyp = *yyf) != '\0') - { - if (*yyp == '%' && yyf[1] == 's' && yyi < yycount) - { - yyp += yytnamerr (yyp, yyarg[yyi++]); - yyf += 2; - } - else - { - yyp++; - yyf++; - } - } - } - return yysize; } + else + YYFPRINTF (yyoutput, "nterm %s (", yytname[yytype]); + + switch (yytype) + { + default: + break; + } + YYFPRINTF (yyoutput, ")"); } -#endif /* YYERROR_VERBOSE */ - +#endif /* ! YYDEBUG */ /*-----------------------------------------------. | Release the memory associated to this symbol. | `-----------------------------------------------*/ -/*ARGSUSED*/ -#if (defined __STDC__ || defined __C99__FUNC__ \ - || defined __cplusplus || defined _MSC_VER) +#if defined (__STDC__) || defined (__cplusplus) static void -yydestruct (const char *yymsg, int yytype, YYSTYPE *yyvaluep) +yydestruct (int yytype, YYSTYPE *yyvaluep) #else static void -yydestruct (yymsg, yytype, yyvaluep) - const char *yymsg; +yydestruct (yytype, yyvaluep) int yytype; YYSTYPE *yyvaluep; #endif { - YYUSE (yyvaluep); - - if (!yymsg) - yymsg = "Deleting"; - YY_SYMBOL_PRINT (yymsg, yytype, yyvaluep, yylocationp); + /* Pacify ``unused variable'' warnings. */ + (void) yyvaluep; switch (yytype) { default: - break; + break; } } @@ -1223,13 +889,13 @@ yydestruct (yymsg, yytype, yyvaluep) /* Prevent warnings from -Wmissing-prototypes. */ #ifdef YYPARSE_PARAM -#if defined __STDC__ || defined __cplusplus +# if defined (__STDC__) || defined (__cplusplus) int yyparse (void *YYPARSE_PARAM); -#else +# else int yyparse (); -#endif +# endif #else /* ! YYPARSE_PARAM */ -#if defined __STDC__ || defined __cplusplus +#if defined (__STDC__) || defined (__cplusplus) int yyparse (void); #else int yyparse (); @@ -1238,10 +904,10 @@ int yyparse (); -/* The look-ahead symbol. */ +/* The lookahead symbol. */ int yychar; -/* The semantic value of the look-ahead symbol. */ +/* The semantic value of the lookahead symbol. */ YYSTYPE yylval; /* Number of syntax errors so far. */ @@ -1254,18 +920,14 @@ int yynerrs; `----------*/ #ifdef YYPARSE_PARAM -#if (defined __STDC__ || defined __C99__FUNC__ \ - || defined __cplusplus || defined _MSC_VER) -int -yyparse (void *YYPARSE_PARAM) -#else -int -yyparse (YYPARSE_PARAM) - void *YYPARSE_PARAM; -#endif +# if defined (__STDC__) || defined (__cplusplus) +int yyparse (void *YYPARSE_PARAM) +# else +int yyparse (YYPARSE_PARAM) + void *YYPARSE_PARAM; +# endif #else /* ! YYPARSE_PARAM */ -#if (defined __STDC__ || defined __C99__FUNC__ \ - || defined __cplusplus || defined _MSC_VER) +#if defined (__STDC__) || defined (__cplusplus) int yyparse (void) #else @@ -1276,19 +938,13 @@ yyparse () #endif { - int yystate; - int yyn; + register int yystate; + register int yyn; int yyresult; /* Number of tokens to shift before error messages enabled. */ int yyerrstatus; - /* Look-ahead token as an internal (translated) token number. */ + /* Lookahead token as an internal (translated) token number. */ int yytoken = 0; -#if YYERROR_VERBOSE - /* Buffer for error messages, and its allocated size. */ - char yymsgbuf[128]; - char *yymsg = yymsgbuf; - YYSIZE_T yymsg_alloc = sizeof yymsgbuf; -#endif /* Three stacks and their tools: `yyss': related to states, @@ -1299,18 +955,18 @@ yyparse () to reallocate them elsewhere. */ /* The state stack. */ - yytype_int16 yyssa[YYINITDEPTH]; - yytype_int16 *yyss = yyssa; - yytype_int16 *yyssp; + short yyssa[YYINITDEPTH]; + short *yyss = yyssa; + register short *yyssp; /* The semantic value stack. */ YYSTYPE yyvsa[YYINITDEPTH]; YYSTYPE *yyvs = yyvsa; - YYSTYPE *yyvsp; + register YYSTYPE *yyvsp; -#define YYPOPSTACK(N) (yyvsp -= (N), yyssp -= (N)) +#define YYPOPSTACK (yyvsp--, yyssp--) YYSIZE_T yystacksize = YYINITDEPTH; @@ -1319,9 +975,9 @@ yyparse () YYSTYPE yyval; - /* The number of symbols on the RHS of the reduced rule. - Keep to zero when no symbol should be popped. */ - int yylen = 0; + /* When reducing, the number of symbols on the RHS of the reduced + rule. */ + int yylen; YYDPRINTF ((stderr, "Starting parse\n")); @@ -1345,7 +1001,8 @@ yyparse () `------------------------------------------------------------*/ yynewstate: /* In all cases, when you get here, the value and location stacks - have just been pushed. So pushing a state here evens the stacks. */ + have just been pushed. so pushing a state here evens the stacks. + */ yyssp++; yysetstate: @@ -1358,18 +1015,18 @@ yyparse () #ifdef yyoverflow { - /* Give user a chance to reallocate the stack. Use copies of + /* Give user a chance to reallocate the stack. Use copies of these so that the &'s don't force the real ones into memory. */ YYSTYPE *yyvs1 = yyvs; - yytype_int16 *yyss1 = yyss; + short *yyss1 = yyss; /* Each stack pointer address is followed by the size of the data in use in that stack, in bytes. This used to be a conditional around just the two extra args, but that might be undefined if yyoverflow is a macro. */ - yyoverflow (YY_("memory exhausted"), + yyoverflow ("parser stack overflow", &yyss1, yysize * sizeof (*yyssp), &yyvs1, yysize * sizeof (*yyvsp), @@ -1380,21 +1037,21 @@ yyparse () } #else /* no yyoverflow */ # ifndef YYSTACK_RELOCATE - goto yyexhaustedlab; + goto yyoverflowlab; # else /* Extend the stack our own way. */ if (YYMAXDEPTH <= yystacksize) - goto yyexhaustedlab; + goto yyoverflowlab; yystacksize *= 2; if (YYMAXDEPTH < yystacksize) yystacksize = YYMAXDEPTH; { - yytype_int16 *yyss1 = yyss; + short *yyss1 = yyss; union yyalloc *yyptr = (union yyalloc *) YYSTACK_ALLOC (YYSTACK_BYTES (yystacksize)); if (! yyptr) - goto yyexhaustedlab; + goto yyoverflowlab; YYSTACK_RELOCATE (yyss); YYSTACK_RELOCATE (yyvs); @@ -1425,17 +1082,19 @@ yyparse () `-----------*/ yybackup: - /* Do appropriate processing given the current state. Read a - look-ahead token if we need one and don't already have one. */ +/* Do appropriate processing given the current state. */ +/* Read a lookahead token if we need one and don't already have one. */ +/* yyresume: */ + + /* First try to decide what to do without reference to lookahead token. */ - /* First try to decide what to do without reference to look-ahead token. */ yyn = yypact[yystate]; if (yyn == YYPACT_NINF) goto yydefault; - /* Not known => get a look-ahead token if don't already have one. */ + /* Not known => get a lookahead token if don't already have one. */ - /* YYCHAR is either YYEMPTY or YYEOF or a valid look-ahead symbol. */ + /* YYCHAR is either YYEMPTY or YYEOF or a valid lookahead symbol. */ if (yychar == YYEMPTY) { YYDPRINTF ((stderr, "Reading a token: ")); @@ -1450,7 +1109,7 @@ yybackup: else { yytoken = YYTRANSLATE (yychar); - YY_SYMBOL_PRINT ("Next token is", yytoken, &yylval, &yylloc); + YYDSYMPRINTF ("Next token is", yytoken, &yylval, &yylloc); } /* If the proper action on seeing token YYTOKEN is to reduce or to @@ -1470,21 +1129,22 @@ yybackup: if (yyn == YYFINAL) YYACCEPT; - /* Count tokens shifted since error; after three, turn off error - status. */ - if (yyerrstatus) - yyerrstatus--; + /* Shift the lookahead token. */ + YYDPRINTF ((stderr, "Shifting token %s, ", yytname[yytoken])); - /* Shift the look-ahead token. */ - YY_SYMBOL_PRINT ("Shifting", yytoken, &yylval, &yylloc); - - /* Discard the shifted token unless it is eof. */ + /* Discard the token being shifted unless it is eof. */ if (yychar != YYEOF) yychar = YYEMPTY; - yystate = yyn; *++yyvsp = yylval; + + /* Count tokens shifted since error; after three, turn off error + status. */ + if (yyerrstatus) + yyerrstatus--; + + yystate = yyn; goto yynewstate; @@ -1522,27 +1182,27 @@ yyreduce: case 2: #line 101 "printrcy.y" { - current_printer = stpui_plist_create((yyvsp[(2) - (3)].sval), (yyvsp[(3) - (3)].sval)); - g_free((yyvsp[(2) - (3)].sval)); - g_free((yyvsp[(3) - (3)].sval)); + current_printer = stpui_plist_create(yyvsp[-1].sval, yyvsp[0].sval); + g_free(yyvsp[-1].sval); + g_free(yyvsp[0].sval); } break; case 3: #line 112 "printrcy.y" { - if ((yyvsp[(2) - (2)].sval)) - g_free((yyvsp[(2) - (2)].sval)); + if (yyvsp[0].sval) + g_free(yyvsp[0].sval); } break; case 4: #line 119 "printrcy.y" { - if (current_printer && (yyvsp[(2) - (2)].sval)) + if (current_printer && yyvsp[0].sval) { - stpui_plist_set_queue_name(current_printer, (yyvsp[(2) - (2)].sval)); - g_free((yyvsp[(2) - (2)].sval)); + stpui_plist_set_queue_name(current_printer, yyvsp[0].sval); + g_free(yyvsp[0].sval); } } break; @@ -1550,10 +1210,10 @@ yyreduce: case 5: #line 129 "printrcy.y" { - if (current_printer && (yyvsp[(2) - (2)].sval)) + if (current_printer && yyvsp[0].sval) { - stpui_plist_set_output_filename(current_printer, (yyvsp[(2) - (2)].sval)); - g_free((yyvsp[(2) - (2)].sval)); + stpui_plist_set_output_filename(current_printer, yyvsp[0].sval); + g_free(yyvsp[0].sval); } } break; @@ -1561,10 +1221,10 @@ yyreduce: case 6: #line 139 "printrcy.y" { - if (current_printer && (yyvsp[(2) - (2)].sval)) + if (current_printer && yyvsp[0].sval) { - stpui_plist_set_extra_printer_options(current_printer, (yyvsp[(2) - (2)].sval)); - g_free((yyvsp[(2) - (2)].sval)); + stpui_plist_set_extra_printer_options(current_printer, yyvsp[0].sval); + g_free(yyvsp[0].sval); } } break; @@ -1572,10 +1232,10 @@ yyreduce: case 7: #line 149 "printrcy.y" { - if (current_printer && (yyvsp[(2) - (2)].sval)) + if (current_printer && yyvsp[0].sval) { - stpui_plist_set_custom_command(current_printer, (yyvsp[(2) - (2)].sval)); - g_free((yyvsp[(2) - (2)].sval)); + stpui_plist_set_custom_command(current_printer, yyvsp[0].sval); + g_free(yyvsp[0].sval); } } break; @@ -1584,7 +1244,7 @@ yyreduce: #line 159 "printrcy.y" { if (current_printer) - stpui_plist_set_command_type(current_printer, (yyvsp[(2) - (2)].ival)); + stpui_plist_set_command_type(current_printer, yyvsp[0].ival); } break; @@ -1592,7 +1252,7 @@ yyreduce: #line 166 "printrcy.y" { if (current_printer) - current_printer->scaling = (yyvsp[(2) - (2)].dval); + current_printer->scaling = yyvsp[0].dval; } break; @@ -1600,7 +1260,7 @@ yyreduce: #line 173 "printrcy.y" { if (current_printer) - current_printer->orientation = (yyvsp[(2) - (2)].ival); + current_printer->orientation = yyvsp[0].ival; } break; @@ -1608,7 +1268,7 @@ yyreduce: #line 180 "printrcy.y" { if (current_printer) - current_printer->auto_size_roll_feed_paper = (yyvsp[(2) - (2)].ival); + current_printer->auto_size_roll_feed_paper = yyvsp[0].ival; } break; @@ -1616,7 +1276,7 @@ yyreduce: #line 187 "printrcy.y" { if (current_printer) - current_printer->unit = (yyvsp[(2) - (2)].ival); + current_printer->unit = yyvsp[0].ival; } break; @@ -1624,7 +1284,7 @@ yyreduce: #line 194 "printrcy.y" { if (current_printer) - stp_set_left(current_printer->v, (yyvsp[(2) - (2)].ival)); + stp_set_left(current_printer->v, yyvsp[0].ival); } break; @@ -1632,7 +1292,7 @@ yyreduce: #line 201 "printrcy.y" { if (current_printer) - stp_set_top(current_printer->v, (yyvsp[(2) - (2)].ival)); + stp_set_top(current_printer->v, yyvsp[0].ival); } break; @@ -1641,7 +1301,7 @@ yyreduce: { if (current_printer) { - switch ((yyvsp[(2) - (2)].ival)) + switch (yyvsp[0].ival) { case 0: stp_set_string_parameter @@ -1662,7 +1322,7 @@ yyreduce: #line 229 "printrcy.y" { if (current_printer) - stp_set_page_width(current_printer->v, (yyvsp[(2) - (2)].ival)); + stp_set_page_width(current_printer->v, yyvsp[0].ival); } break; @@ -1670,7 +1330,7 @@ yyreduce: #line 236 "printrcy.y" { if (current_printer) - stp_set_page_height(current_printer->v, (yyvsp[(2) - (2)].ival)); + stp_set_page_height(current_printer->v, yyvsp[0].ival); } break; @@ -1679,16 +1339,16 @@ yyreduce: { if (current_printer) { - stp_set_int_parameter(current_printer->v, (yyvsp[(1) - (4)].sval), (yyvsp[(4) - (4)].ival)); - if (strcmp((yyvsp[(3) - (4)].sval), "False") == 0) - stp_set_int_parameter_active(current_printer->v, (yyvsp[(1) - (4)].sval), + stp_set_int_parameter(current_printer->v, yyvsp[-3].sval, yyvsp[0].ival); + if (strcmp(yyvsp[-1].sval, "False") == 0) + stp_set_int_parameter_active(current_printer->v, yyvsp[-3].sval, STP_PARAMETER_INACTIVE); else - stp_set_int_parameter_active(current_printer->v, (yyvsp[(1) - (4)].sval), + stp_set_int_parameter_active(current_printer->v, yyvsp[-3].sval, STP_PARAMETER_ACTIVE); } - g_free((yyvsp[(1) - (4)].sval)); - g_free((yyvsp[(3) - (4)].sval)); + g_free(yyvsp[-3].sval); + g_free(yyvsp[-1].sval); } break; @@ -1697,17 +1357,17 @@ yyreduce: { if (current_printer) { - stp_set_string_parameter(current_printer->v, (yyvsp[(1) - (4)].sval), (yyvsp[(4) - (4)].sval)); - if (strcmp((yyvsp[(3) - (4)].sval), "False") == 0) - stp_set_string_parameter_active(current_printer->v, (yyvsp[(1) - (4)].sval), + stp_set_string_parameter(current_printer->v, yyvsp[-3].sval, yyvsp[0].sval); + if (strcmp(yyvsp[-1].sval, "False") == 0) + stp_set_string_parameter_active(current_printer->v, yyvsp[-3].sval, STP_PARAMETER_INACTIVE); else - stp_set_string_parameter_active(current_printer->v, (yyvsp[(1) - (4)].sval), + stp_set_string_parameter_active(current_printer->v, yyvsp[-3].sval, STP_PARAMETER_ACTIVE); } - g_free((yyvsp[(1) - (4)].sval)); - g_free((yyvsp[(3) - (4)].sval)); - g_free((yyvsp[(4) - (4)].sval)); + g_free(yyvsp[-3].sval); + g_free(yyvsp[-1].sval); + g_free(yyvsp[0].sval); } break; @@ -1716,17 +1376,17 @@ yyreduce: { if (current_printer) { - stp_set_file_parameter(current_printer->v, (yyvsp[(1) - (4)].sval), (yyvsp[(4) - (4)].sval)); - if (strcmp((yyvsp[(3) - (4)].sval), "False") == 0) - stp_set_file_parameter_active(current_printer->v, (yyvsp[(1) - (4)].sval), + stp_set_file_parameter(current_printer->v, yyvsp[-3].sval, yyvsp[0].sval); + if (strcmp(yyvsp[-1].sval, "False") == 0) + stp_set_file_parameter_active(current_printer->v, yyvsp[-3].sval, STP_PARAMETER_INACTIVE); else - stp_set_file_parameter_active(current_printer->v, (yyvsp[(1) - (4)].sval), + stp_set_file_parameter_active(current_printer->v, yyvsp[-3].sval, STP_PARAMETER_ACTIVE); } - g_free((yyvsp[(1) - (4)].sval)); - g_free((yyvsp[(3) - (4)].sval)); - g_free((yyvsp[(4) - (4)].sval)); + g_free(yyvsp[-3].sval); + g_free(yyvsp[-1].sval); + g_free(yyvsp[0].sval); } break; @@ -1735,16 +1395,16 @@ yyreduce: { if (current_printer) { - stp_set_float_parameter(current_printer->v, (yyvsp[(1) - (4)].sval), (yyvsp[(4) - (4)].dval)); - if (strcmp((yyvsp[(3) - (4)].sval), "False") == 0) - stp_set_float_parameter_active(current_printer->v, (yyvsp[(1) - (4)].sval), + stp_set_float_parameter(current_printer->v, yyvsp[-3].sval, yyvsp[0].dval); + if (strcmp(yyvsp[-1].sval, "False") == 0) + stp_set_float_parameter_active(current_printer->v, yyvsp[-3].sval, STP_PARAMETER_INACTIVE); else - stp_set_float_parameter_active(current_printer->v, (yyvsp[(1) - (4)].sval), + stp_set_float_parameter_active(current_printer->v, yyvsp[-3].sval, STP_PARAMETER_ACTIVE); } - g_free((yyvsp[(1) - (4)].sval)); - g_free((yyvsp[(3) - (4)].sval)); + g_free(yyvsp[-3].sval); + g_free(yyvsp[-1].sval); } break; @@ -1753,16 +1413,16 @@ yyreduce: { if (current_printer) { - stp_set_dimension_parameter(current_printer->v, (yyvsp[(1) - (4)].sval), (yyvsp[(4) - (4)].ival)); - if (strcmp((yyvsp[(3) - (4)].sval), "False") == 0) - stp_set_dimension_parameter_active(current_printer->v, (yyvsp[(1) - (4)].sval), + stp_set_dimension_parameter(current_printer->v, yyvsp[-3].sval, yyvsp[0].ival); + if (strcmp(yyvsp[-1].sval, "False") == 0) + stp_set_dimension_parameter_active(current_printer->v, yyvsp[-3].sval, STP_PARAMETER_INACTIVE); else - stp_set_dimension_parameter_active(current_printer->v, (yyvsp[(1) - (4)].sval), + stp_set_dimension_parameter_active(current_printer->v, yyvsp[-3].sval, STP_PARAMETER_ACTIVE); } - g_free((yyvsp[(1) - (4)].sval)); - g_free((yyvsp[(3) - (4)].sval)); + g_free(yyvsp[-3].sval); + g_free(yyvsp[-1].sval); } break; @@ -1771,20 +1431,20 @@ yyreduce: { if (current_printer) { - if (strcmp((yyvsp[(4) - (4)].sval), "False") == 0) - stp_set_boolean_parameter(current_printer->v, (yyvsp[(1) - (4)].sval), 0); + if (strcmp(yyvsp[0].sval, "False") == 0) + stp_set_boolean_parameter(current_printer->v, yyvsp[-3].sval, 0); else - stp_set_boolean_parameter(current_printer->v, (yyvsp[(1) - (4)].sval), 1); - if (strcmp((yyvsp[(3) - (4)].sval), "False") == 0) - stp_set_boolean_parameter_active(current_printer->v, (yyvsp[(1) - (4)].sval), + stp_set_boolean_parameter(current_printer->v, yyvsp[-3].sval, 1); + if (strcmp(yyvsp[-1].sval, "False") == 0) + stp_set_boolean_parameter_active(current_printer->v, yyvsp[-3].sval, STP_PARAMETER_INACTIVE); else - stp_set_boolean_parameter_active(current_printer->v, (yyvsp[(1) - (4)].sval), + stp_set_boolean_parameter_active(current_printer->v, yyvsp[-3].sval, STP_PARAMETER_ACTIVE); } - g_free((yyvsp[(1) - (4)].sval)); - g_free((yyvsp[(3) - (4)].sval)); - g_free((yyvsp[(4) - (4)].sval)); + g_free(yyvsp[-3].sval); + g_free(yyvsp[-1].sval); + g_free(yyvsp[0].sval); } break; @@ -1793,62 +1453,63 @@ yyreduce: { if (current_printer) { - stp_curve_t *curve = stp_curve_create_from_string((yyvsp[(4) - (4)].sval)); + stp_curve_t *curve = stp_curve_create_from_string(yyvsp[0].sval); if (curve) { - stp_set_curve_parameter(current_printer->v, (yyvsp[(1) - (4)].sval), curve); - if (strcmp((yyvsp[(3) - (4)].sval), "False") == 0) - stp_set_curve_parameter_active(current_printer->v, (yyvsp[(1) - (4)].sval), + stp_set_curve_parameter(current_printer->v, yyvsp[-3].sval, curve); + if (strcmp(yyvsp[-1].sval, "False") == 0) + stp_set_curve_parameter_active(current_printer->v, yyvsp[-3].sval, STP_PARAMETER_INACTIVE); else - stp_set_curve_parameter_active(current_printer->v, (yyvsp[(1) - (4)].sval), + stp_set_curve_parameter_active(current_printer->v, yyvsp[-3].sval, STP_PARAMETER_ACTIVE); stp_curve_destroy(curve); } } - g_free((yyvsp[(1) - (4)].sval)); - g_free((yyvsp[(3) - (4)].sval)); - g_free((yyvsp[(4) - (4)].sval)); + g_free(yyvsp[-3].sval); + g_free(yyvsp[-1].sval); + g_free(yyvsp[0].sval); } break; case 56: #line 402 "printrcy.y" - { stpui_printrc_current_printer = (yyvsp[(2) - (2)].sval); } + { stpui_printrc_current_printer = yyvsp[0].sval; } break; case 57: #line 406 "printrcy.y" { - if (strcmp((yyvsp[(2) - (2)].sval), "True") == 0) + if (strcmp(yyvsp[0].sval, "True") == 0) stpui_show_all_paper_sizes = 1; else stpui_show_all_paper_sizes = 0; - g_free((yyvsp[(2) - (2)].sval)); + g_free(yyvsp[0].sval); } break; case 61: #line 422 "printrcy.y" { - if ((yyvsp[(2) - (2)].sval)) + if (yyvsp[0].sval) { - stpui_set_global_parameter((yyvsp[(1) - (2)].sval), (yyvsp[(2) - (2)].sval)); - g_free((yyvsp[(2) - (2)].sval)); + stpui_set_global_parameter(yyvsp[-1].sval, yyvsp[0].sval); + g_free(yyvsp[0].sval); } - g_free((yyvsp[(1) - (2)].sval)); + g_free(yyvsp[-1].sval); } break; -/* Line 1267 of yacc.c. */ -#line 1846 "printrcy.c" - default: break; } - YY_SYMBOL_PRINT ("-> $$ =", yyr1[yyn], &yyval, &yyloc); - YYPOPSTACK (yylen); - yylen = 0; +/* Line 991 of yacc.c. */ +#line 1507 "printrcy.c" + + yyvsp -= yylen; + yyssp -= yylen; + + YY_STACK_PRINT (yyss, yyssp); *++yyvsp = yyval; @@ -1877,93 +1538,109 @@ yyerrlab: if (!yyerrstatus) { ++yynerrs; -#if ! YYERROR_VERBOSE - yyerror (YY_("syntax error")); -#else - { - YYSIZE_T yysize = yysyntax_error (0, yystate, yychar); - if (yymsg_alloc < yysize && yymsg_alloc < YYSTACK_ALLOC_MAXIMUM) - { - YYSIZE_T yyalloc = 2 * yysize; - if (! (yysize <= yyalloc && yyalloc <= YYSTACK_ALLOC_MAXIMUM)) - yyalloc = YYSTACK_ALLOC_MAXIMUM; - if (yymsg != yymsgbuf) +#if YYERROR_VERBOSE + yyn = yypact[yystate]; + + if (YYPACT_NINF < yyn && yyn < YYLAST) + { + YYSIZE_T yysize = 0; + int yytype = YYTRANSLATE (yychar); + char *yymsg; + int yyx, yycount; + + yycount = 0; + /* Start YYX at -YYN if negative to avoid negative indexes in + YYCHECK. */ + for (yyx = yyn < 0 ? -yyn : 0; + yyx < (int) (sizeof (yytname) / sizeof (char *)); yyx++) + if (yycheck[yyx + yyn] == yyx && yyx != YYTERROR) + yysize += yystrlen (yytname[yyx]) + 15, yycount++; + yysize += yystrlen ("syntax error, unexpected ") + 1; + yysize += yystrlen (yytname[yytype]); + yymsg = (char *) YYSTACK_ALLOC (yysize); + if (yymsg != 0) + { + char *yyp = yystpcpy (yymsg, "syntax error, unexpected "); + yyp = yystpcpy (yyp, yytname[yytype]); + + if (yycount < 5) + { + yycount = 0; + for (yyx = yyn < 0 ? -yyn : 0; + yyx < (int) (sizeof (yytname) / sizeof (char *)); + yyx++) + if (yycheck[yyx + yyn] == yyx && yyx != YYTERROR) + { + const char *yyq = ! yycount ? ", expecting " : " or "; + yyp = yystpcpy (yyp, yyq); + yyp = yystpcpy (yyp, yytname[yyx]); + yycount++; + } + } + yyerror (yymsg); YYSTACK_FREE (yymsg); - yymsg = (char *) YYSTACK_ALLOC (yyalloc); - if (yymsg) - yymsg_alloc = yyalloc; - else - { - yymsg = yymsgbuf; - yymsg_alloc = sizeof yymsgbuf; - } - } - - if (0 < yysize && yysize <= yymsg_alloc) - { - (void) yysyntax_error (yymsg, yystate, yychar); - yyerror (yymsg); - } - else - { - yyerror (YY_("syntax error")); - if (yysize != 0) - goto yyexhaustedlab; - } - } -#endif + } + else + yyerror ("syntax error; also virtual memory exhausted"); + } + else +#endif /* YYERROR_VERBOSE */ + yyerror ("syntax error"); } if (yyerrstatus == 3) { - /* If just tried and failed to reuse look-ahead token after an + /* If just tried and failed to reuse lookahead token after an error, discard it. */ - if (yychar <= YYEOF) - { - /* Return failure if at end of input. */ - if (yychar == YYEOF) - YYABORT; - } - else - { - yydestruct ("Error: discarding", - yytoken, &yylval); - yychar = YYEMPTY; - } + /* Return failure if at end of input. */ + if (yychar == YYEOF) + { + /* Pop the error token. */ + YYPOPSTACK; + /* Pop the rest of the stack. */ + while (yyss < yyssp) + { + YYDSYMPRINTF ("Error: popping", yystos[*yyssp], yyvsp, yylsp); + yydestruct (yystos[*yyssp], yyvsp); + YYPOPSTACK; + } + YYABORT; + } + + YYDSYMPRINTF ("Error: discarding", yytoken, &yylval, &yylloc); + yydestruct (yytoken, &yylval); + yychar = YYEMPTY; + } - /* Else will try to reuse look-ahead token after shifting the error + /* Else will try to reuse lookahead token after shifting the error token. */ - goto yyerrlab1; + goto yyerrlab2; + +/*----------------------------------------------------. +| yyerrlab1 -- error raised explicitly by an action. | +`----------------------------------------------------*/ +yyerrlab1: -/*---------------------------------------------------. -| yyerrorlab -- error raised explicitly by YYERROR. | -`---------------------------------------------------*/ -yyerrorlab: + /* Suppress GCC warning that yyerrlab1 is unused when no action + invokes YYERROR. */ +#if defined (__GNUC_MINOR__) && 2093 <= (__GNUC__ * 1000 + __GNUC_MINOR__) \ + && !defined __cplusplus + __attribute__ ((__unused__)) +#endif - /* Pacify compilers like GCC when the user code never invokes - YYERROR and the label yyerrorlab therefore never appears in user - code. */ - if (/*CONSTCOND*/ 0) - goto yyerrorlab; - /* Do not reclaim the symbols of the rule which action triggered - this YYERROR. */ - YYPOPSTACK (yylen); - yylen = 0; - YY_STACK_PRINT (yyss, yyssp); - yystate = *yyssp; - goto yyerrlab1; + goto yyerrlab2; -/*-------------------------------------------------------------. -| yyerrlab1 -- common code for both syntax error and YYERROR. | -`-------------------------------------------------------------*/ -yyerrlab1: +/*---------------------------------------------------------------. +| yyerrlab2 -- pop states until the error token can be shifted. | +`---------------------------------------------------------------*/ +yyerrlab2: yyerrstatus = 3; /* Each real token shifted decrements this. */ for (;;) @@ -1984,22 +1661,21 @@ yyerrlab1: if (yyssp == yyss) YYABORT; + YYDSYMPRINTF ("Error: popping", yystos[*yyssp], yyvsp, yylsp); + yydestruct (yystos[yystate], yyvsp); + yyvsp--; + yystate = *--yyssp; - yydestruct ("Error: popping", - yystos[yystate], yyvsp); - YYPOPSTACK (1); - yystate = *yyssp; YY_STACK_PRINT (yyss, yyssp); } if (yyn == YYFINAL) YYACCEPT; - *++yyvsp = yylval; + YYDPRINTF ((stderr, "Shifting error token, ")); + *++yyvsp = yylval; - /* Shift the error token. */ - YY_SYMBOL_PRINT ("Shifting", yystos[yyn], yyvsp, yylsp); yystate = yyn; goto yynewstate; @@ -2020,39 +1696,21 @@ yyabortlab: goto yyreturn; #ifndef yyoverflow -/*-------------------------------------------------. -| yyexhaustedlab -- memory exhaustion comes here. | -`-------------------------------------------------*/ -yyexhaustedlab: - yyerror (YY_("memory exhausted")); +/*----------------------------------------------. +| yyoverflowlab -- parser overflow comes here. | +`----------------------------------------------*/ +yyoverflowlab: + yyerror ("parser stack overflow"); yyresult = 2; /* Fall through. */ #endif yyreturn: - if (yychar != YYEOF && yychar != YYEMPTY) - yydestruct ("Cleanup: discarding lookahead", - yytoken, &yylval); - /* Do not reclaim the symbols of the rule which action triggered - this YYABORT or YYACCEPT. */ - YYPOPSTACK (yylen); - YY_STACK_PRINT (yyss, yyssp); - while (yyssp != yyss) - { - yydestruct ("Cleanup: popping", - yystos[*yyssp], yyvsp); - YYPOPSTACK (1); - } #ifndef yyoverflow if (yyss != yyssa) YYSTACK_FREE (yyss); #endif -#if YYERROR_VERBOSE - if (yymsg != yymsgbuf) - YYSTACK_FREE (yymsg); -#endif - /* Make sure YYID is used. */ - return YYID (yyresult); + return yyresult; } diff --git a/src/gutenprintui2/printrcy.h b/src/gutenprintui2/printrcy.h index 8a6c041..afa662b 100644 --- a/src/gutenprintui2/printrcy.h +++ b/src/gutenprintui2/printrcy.h @@ -1,9 +1,7 @@ -/* A Bison parser, made by GNU Bison 2.3. */ +/* A Bison parser, made by GNU Bison 1.875. */ -/* Skeleton interface for Bison's Yacc-like parsers in C - - Copyright (C) 1984, 1989, 1990, 2000, 2001, 2002, 2003, 2004, 2005, 2006 - Free Software Foundation, Inc. +/* Skeleton parser for Yacc-like parsing with Bison, + Copyright (C) 1984, 1989, 1990, 2000, 2001, 2002 Free Software Foundation, Inc. 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 @@ -17,21 +15,13 @@ 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., 51 Franklin Street, Fifth Floor, - Boston, MA 02110-1301, USA. */ - -/* As a special exception, you may create a larger work that contains - part or all of the Bison parser skeleton and distribute that work - under terms of your choice, so long as that work isn't itself a - parser generator using the skeleton or a modified version thereof - as a parser skeleton. Alternatively, if you modify or redistribute - the parser skeleton itself, you may (at your option) remove this - special exception, which will cause the skeleton and the resulting - Bison output files to be licensed under the GNU General Public - License without this special exception. + Foundation, Inc., 59 Temple Place - Suite 330, + Boston, MA 02111-1307, USA. */ - This special exception was added by the Free Software Foundation in - version 2.2 of Bison. */ +/* As a special exception, when this file is copied by Bison into a + Bison output file, you may use that output file without restriction. + This special exception was added by the Free Software Foundation + in version 1.24 of Bison. */ /* Tokens. */ #ifndef YYTOKENTYPE @@ -79,7 +69,6 @@ pCURVE = 295 }; #endif -/* Tokens. */ #define tINT 258 #define tDOUBLE 259 #define tDIMENSION 260 @@ -122,7 +111,7 @@ -#if ! defined YYSTYPE && ! defined YYSTYPE_IS_DECLARED +#if ! defined (YYSTYPE) && ! defined (YYSTYPE_IS_DECLARED) typedef int YYSTYPE; # define yystype YYSTYPE /* obsolescent; will be withdrawn */ # define YYSTYPE_IS_DECLARED 1 @@ -131,3 +120,5 @@ typedef int YYSTYPE; extern YYSTYPE yylval; + + diff --git a/src/gutenprintui2/printrcy.y b/src/gutenprintui2/printrcy.y index 625d1d7..72e946a 100644 --- a/src/gutenprintui2/printrcy.y +++ b/src/gutenprintui2/printrcy.y @@ -1,5 +1,5 @@ /* - * "$Id: printrcy.y,v 1.1.18.1 2007/03/02 12:01:20 rlk Exp $" + * "$Id: printrcy.y,v 1.2 2006/11/15 01:28:49 rlk Exp $" * * Test pattern generator for Gutenprint * diff --git a/src/main/Makefile.am b/src/main/Makefile.am index 55b2868..077713f 100644 --- a/src/main/Makefile.am +++ b/src/main/Makefile.am @@ -1,4 +1,4 @@ -## $Id: Makefile.am,v 1.92.10.1 2007/03/02 12:01:20 rlk Exp $ +## $Id: Makefile.am,v 1.99 2008/04/28 02:06:44 rlk Exp $ ## Copyright (C) 2000 Roger Leigh ## ## This program is free software; you can redistribute it and/or modify @@ -25,8 +25,8 @@ include $(top_srcdir)/scripts/global.mk ## Variables pkgconfigdatadir = $(libdir)/pkgconfig -pkgxmldatadir = $(pkgdatadir)/$(VERSION)/xml -pkgmoduledir = $(pkglibdir)/$(VERSION)/modules +pkgxmldatadir = $(pkgdatadir)/@GUTENPRINT_MAJOR_VERSION@.@GUTENPRINT_MINOR_VERSION@/xml +pkgmoduledir = $(pkglibdir)/@GUTENPRINT_MAJOR_VERSION@.@GUTENPRINT_MINOR_VERSION@/modules ## Programs @@ -39,7 +39,7 @@ pkgmodule_LTLIBRARIES = \ print-lexmark.la \ print-pcl.la \ print-ps.la \ - print-olympus.la \ + print-dyesub.la \ print-raw.la endif @@ -77,11 +77,11 @@ print_lexmark_la_LDFLAGS = -module -avoid-version print_pcl_la_SOURCES = print-pcl.c print_pcl_la_LDFLAGS = -module -avoid-version -print_ps_la_SOURCES = print-ps.c +print_ps_la_SOURCES = print-ps.c xmlppd.c xmlppd.h print_ps_la_LDFLAGS = -module -avoid-version -print_olympus_la_SOURCES = print-olympus.c -print_olympus_la_LDFLAGS = -module -avoid-version +print_dyesub_la_SOURCES = print-olympus.c +print_dyesub_la_LDFLAGS = -module -avoid-version print_raw_la_SOURCES = print-raw.c print_raw_la_LDFLAGS = -module -avoid-version @@ -95,7 +95,7 @@ module_SOURCES = \ $(print_lexmark_la_SOURCES) \ $(print_pcl_la_SOURCES) \ $(print_ps_la_SOURCES) \ - $(print_olympus_la_SOURCES) \ + $(print_dyesub_la_SOURCES) \ $(print_raw_la_SOURCES) if !BUILD_MODULES diff --git a/src/main/Makefile.in b/src/main/Makefile.in index ef0e99e..3af179d 100644 --- a/src/main/Makefile.in +++ b/src/main/Makefile.in @@ -43,13 +43,12 @@ DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \ subdir = src/main 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/isc-posix.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 + $(top_srcdir)/m4/iconv.m4 $(top_srcdir)/m4/isc-posix.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 @@ -91,7 +90,7 @@ am__libgutenprint_la_SOURCES_DIST = array.c bit-ops.c channel.c \ canon-printers.h print-escp2.c escp2-driver.c print-escp2.h \ print-escp2-data.c escp2-channels.c escp2-inks.c \ escp2-papers.c escp2-resolutions.c print-lexmark.c print-pcl.c \ - print-ps.c print-olympus.c print-raw.c + print-ps.c xmlppd.c xmlppd.h print-olympus.c print-raw.c am__objects_1 = mxml-attr.lo mxml-file.lo mxml-node.lo mxml-search.lo am__objects_2 = am__objects_3 = print-color.lo color-conversions.lo @@ -101,7 +100,7 @@ am__objects_5 = print-escp2.lo escp2-driver.lo print-escp2-data.lo \ escp2-resolutions.lo am__objects_6 = print-lexmark.lo am__objects_7 = print-pcl.lo -am__objects_8 = print-ps.lo +am__objects_8 = print-ps.lo xmlppd.lo am__objects_9 = print-olympus.lo am__objects_10 = print-raw.lo am__objects_11 = $(am__objects_3) $(am__objects_4) $(am__objects_5) \ @@ -128,6 +127,13 @@ print_canon_la_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \ $(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ $(print_canon_la_LDFLAGS) $(LDFLAGS) -o $@ @BUILD_MODULES_TRUE@am_print_canon_la_rpath = -rpath $(pkgmoduledir) +print_dyesub_la_LIBADD = +am_print_dyesub_la_OBJECTS = print-olympus.lo +print_dyesub_la_OBJECTS = $(am_print_dyesub_la_OBJECTS) +print_dyesub_la_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \ + $(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ + $(print_dyesub_la_LDFLAGS) $(LDFLAGS) -o $@ +@BUILD_MODULES_TRUE@am_print_dyesub_la_rpath = -rpath $(pkgmoduledir) print_escp2_la_LIBADD = am_print_escp2_la_OBJECTS = print-escp2.lo escp2-driver.lo \ print-escp2-data.lo escp2-channels.lo escp2-inks.lo \ @@ -144,13 +150,6 @@ print_lexmark_la_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \ $(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ $(print_lexmark_la_LDFLAGS) $(LDFLAGS) -o $@ @BUILD_MODULES_TRUE@am_print_lexmark_la_rpath = -rpath $(pkgmoduledir) -print_olympus_la_LIBADD = -am_print_olympus_la_OBJECTS = print-olympus.lo -print_olympus_la_OBJECTS = $(am_print_olympus_la_OBJECTS) -print_olympus_la_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \ - $(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ - $(print_olympus_la_LDFLAGS) $(LDFLAGS) -o $@ -@BUILD_MODULES_TRUE@am_print_olympus_la_rpath = -rpath $(pkgmoduledir) print_pcl_la_LIBADD = am_print_pcl_la_OBJECTS = print-pcl.lo print_pcl_la_OBJECTS = $(am_print_pcl_la_OBJECTS) @@ -159,7 +158,7 @@ print_pcl_la_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \ $(print_pcl_la_LDFLAGS) $(LDFLAGS) -o $@ @BUILD_MODULES_TRUE@am_print_pcl_la_rpath = -rpath $(pkgmoduledir) print_ps_la_LIBADD = -am_print_ps_la_OBJECTS = print-ps.lo +am_print_ps_la_OBJECTS = print-ps.lo xmlppd.lo print_ps_la_OBJECTS = $(am_print_ps_la_OBJECTS) print_ps_la_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \ $(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ @@ -185,14 +184,14 @@ LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \ $(LDFLAGS) -o $@ SOURCES = $(color_traditional_la_SOURCES) $(libgutenprint_la_SOURCES) \ - $(print_canon_la_SOURCES) $(print_escp2_la_SOURCES) \ - $(print_lexmark_la_SOURCES) $(print_olympus_la_SOURCES) \ + $(print_canon_la_SOURCES) $(print_dyesub_la_SOURCES) \ + $(print_escp2_la_SOURCES) $(print_lexmark_la_SOURCES) \ $(print_pcl_la_SOURCES) $(print_ps_la_SOURCES) \ $(print_raw_la_SOURCES) DIST_SOURCES = $(color_traditional_la_SOURCES) \ $(am__libgutenprint_la_SOURCES_DIST) $(print_canon_la_SOURCES) \ - $(print_escp2_la_SOURCES) $(print_lexmark_la_SOURCES) \ - $(print_olympus_la_SOURCES) $(print_pcl_la_SOURCES) \ + $(print_dyesub_la_SOURCES) $(print_escp2_la_SOURCES) \ + $(print_lexmark_la_SOURCES) $(print_pcl_la_SOURCES) \ $(print_ps_la_SOURCES) $(print_raw_la_SOURCES) pkgconfigdataDATA_INSTALL = $(INSTALL_DATA) pkgxmldataDATA_INSTALL = $(INSTALL_DATA) @@ -248,27 +247,13 @@ 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@ GREP = @GREP@ 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@ @@ -276,13 +261,6 @@ 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@ @@ -387,16 +365,12 @@ docdir = @docdir@ dvidir = @dvidir@ 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@ @@ -425,9 +399,10 @@ target_alias = @target_alias@ top_builddir = @top_builddir@ top_srcdir = @top_srcdir@ AM_CPPFLAGS = -I$(top_srcdir)/include -I$(top_builddir)/include $(LOCAL_CPPFLAGS) $(GNUCFLAGS) +GUTENPRINTUI_LIBS = $(top_builddir)/src/gutenprintui/libgutenprintui.la pkgconfigdatadir = $(libdir)/pkgconfig -pkgxmldatadir = $(pkgdatadir)/$(VERSION)/xml -pkgmoduledir = $(pkglibdir)/$(VERSION)/modules +pkgxmldatadir = $(pkgdatadir)/@GUTENPRINT_MAJOR_VERSION@.@GUTENPRINT_MINOR_VERSION@/xml +pkgmoduledir = $(pkglibdir)/@GUTENPRINT_MAJOR_VERSION@.@GUTENPRINT_MINOR_VERSION@/modules @BUILD_MODULES_TRUE@pkgmodule_LTLIBRARIES = \ @BUILD_MODULES_TRUE@ color-traditional.la \ @BUILD_MODULES_TRUE@ print-canon.la \ @@ -435,7 +410,7 @@ pkgmoduledir = $(pkglibdir)/$(VERSION)/modules @BUILD_MODULES_TRUE@ print-lexmark.la \ @BUILD_MODULES_TRUE@ print-pcl.la \ @BUILD_MODULES_TRUE@ print-ps.la \ -@BUILD_MODULES_TRUE@ print-olympus.la \ +@BUILD_MODULES_TRUE@ print-dyesub.la \ @BUILD_MODULES_TRUE@ print-raw.la color_traditional_la_SOURCES = \ @@ -468,10 +443,10 @@ print_lexmark_la_SOURCES = print-lexmark.c print_lexmark_la_LDFLAGS = -module -avoid-version print_pcl_la_SOURCES = print-pcl.c print_pcl_la_LDFLAGS = -module -avoid-version -print_ps_la_SOURCES = print-ps.c +print_ps_la_SOURCES = print-ps.c xmlppd.c xmlppd.h print_ps_la_LDFLAGS = -module -avoid-version -print_olympus_la_SOURCES = print-olympus.c -print_olympus_la_LDFLAGS = -module -avoid-version +print_dyesub_la_SOURCES = print-olympus.c +print_dyesub_la_LDFLAGS = -module -avoid-version print_raw_la_SOURCES = print-raw.c print_raw_la_LDFLAGS = -module -avoid-version lib_LTLIBRARIES = libgutenprint.la @@ -482,7 +457,7 @@ module_SOURCES = \ $(print_lexmark_la_SOURCES) \ $(print_pcl_la_SOURCES) \ $(print_ps_la_SOURCES) \ - $(print_olympus_la_SOURCES) \ + $(print_dyesub_la_SOURCES) \ $(print_raw_la_SOURCES) @BUILD_MODULES_FALSE@libgutenprint_modules = $(module_SOURCES) @@ -651,12 +626,12 @@ libgutenprint.la: $(libgutenprint_la_OBJECTS) $(libgutenprint_la_DEPENDENCIES) $(libgutenprint_la_LINK) -rpath $(libdir) $(libgutenprint_la_OBJECTS) $(libgutenprint_la_LIBADD) $(LIBS) print-canon.la: $(print_canon_la_OBJECTS) $(print_canon_la_DEPENDENCIES) $(print_canon_la_LINK) $(am_print_canon_la_rpath) $(print_canon_la_OBJECTS) $(print_canon_la_LIBADD) $(LIBS) +print-dyesub.la: $(print_dyesub_la_OBJECTS) $(print_dyesub_la_DEPENDENCIES) + $(print_dyesub_la_LINK) $(am_print_dyesub_la_rpath) $(print_dyesub_la_OBJECTS) $(print_dyesub_la_LIBADD) $(LIBS) print-escp2.la: $(print_escp2_la_OBJECTS) $(print_escp2_la_DEPENDENCIES) $(print_escp2_la_LINK) $(am_print_escp2_la_rpath) $(print_escp2_la_OBJECTS) $(print_escp2_la_LIBADD) $(LIBS) print-lexmark.la: $(print_lexmark_la_OBJECTS) $(print_lexmark_la_DEPENDENCIES) $(print_lexmark_la_LINK) $(am_print_lexmark_la_rpath) $(print_lexmark_la_OBJECTS) $(print_lexmark_la_LIBADD) $(LIBS) -print-olympus.la: $(print_olympus_la_OBJECTS) $(print_olympus_la_DEPENDENCIES) - $(print_olympus_la_LINK) $(am_print_olympus_la_rpath) $(print_olympus_la_OBJECTS) $(print_olympus_la_LIBADD) $(LIBS) print-pcl.la: $(print_pcl_la_OBJECTS) $(print_pcl_la_DEPENDENCIES) $(print_pcl_la_LINK) $(am_print_pcl_la_rpath) $(print_pcl_la_OBJECTS) $(print_pcl_la_LIBADD) $(LIBS) print-ps.la: $(print_ps_la_OBJECTS) $(print_ps_la_DEPENDENCIES) @@ -718,6 +693,7 @@ distclean-compile: @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/sequence.Plo@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/string-list.Plo@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/xml.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/xmlppd.Plo@am__quote@ .c.o: @am__fastdepCC_TRUE@ $(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< diff --git a/src/main/bit-ops.c b/src/main/bit-ops.c index ab111ca..a110adf 100644 --- a/src/main/bit-ops.c +++ b/src/main/bit-ops.c @@ -1,5 +1,5 @@ /* - * "$Id: bit-ops.c,v 1.9.8.2 2007/05/12 19:14:27 faust3 Exp $" + * "$Id: bit-ops.c,v 1.12 2007/03/08 13:34:27 faust3 Exp $" * * Softweave calculator for Gutenprint. * diff --git a/src/main/canon-inks.h b/src/main/canon-inks.h index a3a3fbb..1cd69fc 100644 --- a/src/main/canon-inks.h +++ b/src/main/canon-inks.h @@ -304,6 +304,19 @@ static const canon_inkset_t canon_9_C3M3Y2K2_c_inkset[] = { {0,0.0,NULL} }; +/* iP6000D */ +static const canon_inkset_t canon_9_C3M3Y3K3_inkset[] = { + {'C',1.0,&canon_2b_3l_ink}, + {'M',1.0,&canon_2b_3l_ink}, + {'Y',1.0,&canon_2b_3l_ink}, + {'K',1.0,&canon_2b_3l_ink}, + {0,0.0,NULL}, + {0,0.0,NULL}, + {0,0.0,NULL}, + {0,0.0,NULL}, + {0,0.0,NULL} +}; + /* iP4000 default print mode (quality 2) */ static const canon_inkset_t canon_9_C3M3Y2K2k3_c_inkset[] = { {'C',1.0,&canon_2b_3l_c_ink}, diff --git a/src/main/canon-modes.h b/src/main/canon-modes.h index 815481b..0397688 100644 --- a/src/main/canon-modes.h +++ b/src/main/canon-modes.h @@ -321,6 +321,10 @@ static const canon_mode_t canon_PIXMA_iP4200_modes[] = { }; DECLARE_MODES(canon_PIXMA_iP4200,2); +static const canon_mode_t canon_PIXMA_iP6000_modes[] = { + { 600, 600,CANON_INK_CMYK,"600x600dpi",N_("600x600 DPI"),INKSET(9_C3M3Y3K3),MODE_FLAG_EXTENDED_T,NULL,1.0,1.0,NULL,NULL,NULL,2}, +}; +DECLARE_MODES(canon_PIXMA_iP6000,0); static const canon_mode_t canon_PIXMA_iP6700_modes[] = { { 600, 600,CANON_INK_CMYK,"600x600dpi",N_("600x600 DPI"),INKSET(19_C3M3Y3k3),MODE_FLAG_EXTENDED_T,NULL,1.0,1.0,NULL,NULL,NULL,2}, diff --git a/src/main/canon-printers.h b/src/main/canon-printers.h index b136a41..cd44195 100644 --- a/src/main/canon-printers.h +++ b/src/main/canon-printers.h @@ -46,6 +46,7 @@ typedef struct canon_caps { const char *lum_adjustment; const char *hue_adjustment; const char *sat_adjustment; + const char *channel_order; /* (in gutenprint notation) 0123 => KCMY, 1230 => CMYK etc. */ } canon_cap_t; static const char standard_sat_adjustment[] = @@ -164,6 +165,8 @@ static const char* control_cmd_MULTIPASS_MP150[] = { NULL }; +static const char iP4500_channel_order[STP_NCOLORS] = {1,2,3,0}; /* CMYK */ + static const canon_cap_t canon_model_capabilities[] = { /* the first printer is used as default in case something has gone wrong in printers.xml */ @@ -177,6 +180,7 @@ static const canon_cap_t canon_model_capabilities[] = &canon_PIXMA_iP4000_paperlist, NULL, NULL, + NULL, NULL }, /* ******************************** */ @@ -204,6 +208,7 @@ static const canon_cap_t canon_model_capabilities[] = &canon_default_paperlist, NULL, NULL, + NULL, NULL }, @@ -217,6 +222,7 @@ static const canon_cap_t canon_model_capabilities[] = &canon_default_paperlist, NULL, NULL, + NULL, NULL }, @@ -230,6 +236,7 @@ static const canon_cap_t canon_model_capabilities[] = &canon_default_paperlist, NULL, NULL, + NULL, NULL }, { /* Canon BJC 85 *//* heads: BC-20 BC-21 BC-22 */ @@ -242,6 +249,7 @@ static const canon_cap_t canon_model_capabilities[] = &canon_default_paperlist, NULL, NULL, + NULL, NULL }, @@ -255,6 +263,7 @@ static const canon_cap_t canon_model_capabilities[] = &canon_default_paperlist, NULL, NULL, + NULL, NULL }, @@ -268,6 +277,7 @@ static const canon_cap_t canon_model_capabilities[] = &canon_default_paperlist, NULL, NULL, + NULL, NULL }, @@ -281,6 +291,7 @@ static const canon_cap_t canon_model_capabilities[] = &canon_default_paperlist, NULL, NULL, + NULL, NULL }, @@ -294,6 +305,7 @@ static const canon_cap_t canon_model_capabilities[] = &canon_default_paperlist, NULL, NULL, + NULL, NULL }, @@ -307,6 +319,7 @@ static const canon_cap_t canon_model_capabilities[] = &canon_default_paperlist, NULL, NULL, + NULL, NULL }, { /* Canon BJC 8200 *//* heads: BC-50 */ @@ -319,6 +332,7 @@ static const canon_cap_t canon_model_capabilities[] = &canon_default_paperlist, NULL, NULL, + NULL, NULL }, { /* Canon S500 */ @@ -331,6 +345,7 @@ static const canon_cap_t canon_model_capabilities[] = &canon_default_paperlist, NULL, NULL, + NULL, NULL }, @@ -351,6 +366,7 @@ static const canon_cap_t canon_model_capabilities[] = &canon_default_paperlist, NULL, NULL, + NULL, NULL }, { /* Canon BJC 240 *//* heads: BC-02 BC-05 BC-06 */ @@ -363,6 +379,7 @@ static const canon_cap_t canon_model_capabilities[] = &canon_default_paperlist, NULL, NULL, + NULL, NULL }, { /* Canon BJC 250 *//* heads: BC-02 BC-05 BC-06 */ @@ -375,6 +392,7 @@ static const canon_cap_t canon_model_capabilities[] = &canon_default_paperlist, NULL, NULL, + NULL, NULL }, { /* Canon BJC 1000 *//* heads: BC-02 BC-05 BC-06 */ @@ -387,6 +405,7 @@ static const canon_cap_t canon_model_capabilities[] = &canon_default_paperlist, NULL, NULL, + NULL, NULL }, { /* Canon BJC 2000 *//* heads: BC-20 BC-21 BC-22 BC-29 */ @@ -399,6 +418,7 @@ static const canon_cap_t canon_model_capabilities[] = &canon_default_paperlist, NULL, NULL, + NULL, NULL }, { /* Canon BJC 3000 *//* heads: BC-30 BC-33 BC-34 */ @@ -411,6 +431,7 @@ static const canon_cap_t canon_model_capabilities[] = &canon_default_paperlist, NULL, NULL, + NULL, NULL }, { /* Canon BJC 6100 *//* heads: BC-30/BC-31 BC-32/BC-31 */ @@ -423,6 +444,7 @@ static const canon_cap_t canon_model_capabilities[] = &canon_default_paperlist, NULL, NULL, + NULL, NULL }, { /* Canon BJC 7000 *//* heads: BC-60/BC-61 BC-60/BC-62 ??????? */ @@ -435,6 +457,7 @@ static const canon_cap_t canon_model_capabilities[] = &canon_default_paperlist, NULL, NULL, + NULL, NULL }, { /* Canon BJC i560 */ @@ -447,6 +470,7 @@ static const canon_cap_t canon_model_capabilities[] = &canon_default_paperlist, NULL, NULL, + NULL, NULL }, { /* Canon BJC 7100 *//* heads: BC-60/BC-61 BC-60/BC-62 ??????? */ @@ -459,6 +483,7 @@ static const canon_cap_t canon_model_capabilities[] = &canon_default_paperlist, NULL, NULL, + NULL, NULL }, { /* Canon BJC i80 *//* heads: BC-60/BC-61 BC-60/BC-62 ??????? */ @@ -471,6 +496,7 @@ static const canon_cap_t canon_model_capabilities[] = &canon_default_paperlist, NULL, NULL, + NULL, NULL }, @@ -491,6 +517,7 @@ static const canon_cap_t canon_model_capabilities[] = &canon_default_paperlist, NULL, NULL, + NULL, NULL }, { /* Canon BJC 5500 *//* heads: BC-20 BC-21 BC-29 */ @@ -503,6 +530,7 @@ static const canon_cap_t canon_model_capabilities[] = &canon_default_paperlist, NULL, NULL, + NULL, NULL }, { /* Canon BJC 6500 *//* heads: BC-30/BC-31 BC-32/BC-31 */ @@ -515,6 +543,7 @@ static const canon_cap_t canon_model_capabilities[] = &canon_default_paperlist, NULL, NULL, + NULL, NULL }, { /* Canon BJC 8500 *//* heads: BC-80/BC-81 BC-82/BC-81 */ @@ -527,6 +556,7 @@ static const canon_cap_t canon_model_capabilities[] = &canon_default_paperlist, NULL, NULL, + NULL, NULL }, { /* Canon PIXMA iP2000 */ @@ -539,6 +569,7 @@ static const canon_cap_t canon_model_capabilities[] = &canon_PIXMA_iP4000_paperlist, NULL, NULL, + NULL, NULL }, { /* Canon PIXMA iP3000 */ @@ -551,6 +582,7 @@ static const canon_cap_t canon_model_capabilities[] = &canon_PIXMA_iP4000_paperlist, NULL, NULL, + NULL, NULL }, { /* Canon PIXMA iP4000 */ @@ -563,6 +595,7 @@ static const canon_cap_t canon_model_capabilities[] = &canon_PIXMA_iP4000_paperlist, NULL, NULL, + NULL, NULL }, { /* PIXMA MP740 (== iP4000 without duplex) */ @@ -576,6 +609,7 @@ static const canon_cap_t canon_model_capabilities[] = NULL, NULL, NULL, + NULL }, { /* Canon PIXMA iP5300, MP610 */ "PIXMA iP5300", 3, /*model, model_id*/ @@ -587,6 +621,7 @@ static const canon_cap_t canon_model_capabilities[] = &canon_PIXMA_iP4000_paperlist, NULL, NULL, + NULL, NULL }, { /* Canon PIXMA iP4500 */ @@ -594,12 +629,13 @@ static const canon_cap_t canon_model_capabilities[] = 842, 17*72, /* max paper width and height */ 10, 10, 15, 15, /*border_left, border_right, border_top, border_bottom */ &canon_PIXMA_iP4000_slotlist, - CANON_CAP_STD0|CANON_CAP_DUPLEX|CANON_CAP_r|CANON_CAP_px|CANON_CAP_I,0x64,control_cmd_PIXMA_iP4000, /*features */ + CANON_CAP_STD0|CANON_CAP_DUPLEX|CANON_CAP_r|CANON_CAP_px|CANON_CAP_I,0x61,control_cmd_MULTIPASS_MP150, /*features */ &canon_PIXMA_iP5300_modelist, &canon_PIXMA_iP4000_paperlist, NULL, NULL, - NULL + NULL, + iP4500_channel_order }, { /* Canon PIXMA iP4200 */ "PIXMA iP4200", 3, /*model, model_id*/ @@ -613,6 +649,19 @@ static const canon_cap_t canon_model_capabilities[] = iP4200_hue_adjustment, iP4200_sat_adjustment }, + { /* Canon PIXMA iP6700 */ + "PIXMA iP6000", 3, /*model, model_id*/ + 842, 17*72, /* max paper width and height */ + 10, 10, 15, 15, /*border_left, border_right, border_top, border_bottom */ + &canon_PIXMA_iP4000_slotlist, + CANON_CAP_STD0|CANON_CAP_DUPLEX|CANON_CAP_r|CANON_CAP_px,0x64,control_cmd_PIXMA_iP4000, /*features */ + &canon_PIXMA_iP6000_modelist, + &canon_PIXMA_iP4000_paperlist, + NULL, + NULL, + NULL, + NULL + }, { /* Canon PIXMA iP6700 */ "PIXMA iP6700", 3, /*model, model_id*/ 842, 17*72, /* max paper width and height */ @@ -623,6 +672,7 @@ static const canon_cap_t canon_model_capabilities[] = &canon_PIXMA_iP4000_paperlist, NULL, NULL, + NULL, NULL }, { /* Canon PIXMA iX5000 */ @@ -630,11 +680,25 @@ static const canon_cap_t canon_model_capabilities[] = 842, 17*72, /* max paper width and height */ 10, 10, 15, 15, /*border_left, border_right, border_top, border_bottom */ &canon_PIXMA_iP4000_slotlist, - CANON_CAP_STD0|CANON_CAP_DUPLEX|CANON_CAP_r|CANON_CAP_px,0x61,control_cmd_PIXMA_iP4000, /*features */ + CANON_CAP_STD0|CANON_CAP_DUPLEX|CANON_CAP_r|CANON_CAP_px|CANON_CAP_I,0x61,control_cmd_PIXMA_iP4000, /*features */ + &canon_PIXMA_iX5000_modelist, + &canon_PIXMA_iP4000_paperlist, + NULL, + NULL, + NULL, + NULL + }, + { /* Canon PIXMA MP520 */ + "PIXMA MP520", 3, /*model, model_id*/ + 842, 17*72, /* max paper width and height */ + 10, 10, 15, 15, /*border_left, border_right, border_top, border_bottom */ + &canon_PIXMA_iP4000_slotlist, + CANON_CAP_STD0|CANON_CAP_DUPLEX|CANON_CAP_r|CANON_CAP_px|CANON_CAP_I,0x61,control_cmd_PIXMA_iP4000, /*features */ &canon_PIXMA_iX5000_modelist, &canon_PIXMA_iP4000_paperlist, NULL, NULL, + NULL, NULL }, { /* Canon PIXMA Pro9500 */ @@ -647,6 +711,7 @@ static const canon_cap_t canon_model_capabilities[] = &canon_PIXMA_iP4000_paperlist, NULL, NULL, + NULL, NULL }, { /* Canon PIXMA iP8500 */ @@ -659,6 +724,7 @@ static const canon_cap_t canon_model_capabilities[] = &canon_PIXMA_iP4000_paperlist, NULL, NULL, + NULL, NULL }, { /* Canon MULTIPASS MP150 */ @@ -671,6 +737,7 @@ static const canon_cap_t canon_model_capabilities[] = &canon_PIXMA_iP4000_paperlist, NULL, NULL, + NULL, NULL }, }; diff --git a/src/main/color-conversion.h b/src/main/color-conversion.h index ab04380..5e4f1c3 100644 --- a/src/main/color-conversion.h +++ b/src/main/color-conversion.h @@ -1,5 +1,5 @@ /* - * "$Id: color-conversion.h,v 1.11 2005/09/17 21:54:33 rlk Exp $" + * "$Id: color-conversion.h,v 1.12 2008/01/21 23:19:39 rlk Exp $" * * Gutenprint color management module - traditional Gimp-Print algorithm. * @@ -150,9 +150,7 @@ typedef struct stp_cached_curve_t contrast_correction; stp_cached_curve_t user_color_correction; stp_cached_curve_t channel_curves[STP_CHANNEL_LIMIT]; - stp_cached_curve_t hue_angle; double gamma_values[STP_CHANNEL_LIMIT]; - double hue_angles[STP_CHANNEL_LIMIT]; double print_gamma; double app_gamma; double screen_gamma; diff --git a/src/main/curve.c b/src/main/curve.c index 3820dea..e65900b 100644 --- a/src/main/curve.c +++ b/src/main/curve.c @@ -1,5 +1,5 @@ /* - * "$Id: curve.c,v 1.52 2006/09/12 19:03:32 easysw Exp $" + * "$Id: curve.c,v 1.53 2008/01/21 23:19:39 rlk Exp $" * * Print plug-in driver utility functions for the GIMP. * @@ -469,6 +469,49 @@ stp_curve_create_copy(const stp_curve_t *curve) return ret; } +void +stp_curve_reverse(stp_curve_t *dest, const stp_curve_t *source) +{ + check_curve(dest); + check_curve(source); + curve_dtor(dest); + dest->curve_type = source->curve_type; + dest->wrap_mode = source->wrap_mode; + dest->gamma = source->gamma; + if (source->piecewise) + { + const double *source_data; + size_t size; + double *new_data; + int i; + stp_sequence_get_data(source->seq, &size, &source_data); + new_data = stp_malloc(sizeof(double) * size); + for (i = 0; i < size; i += 2) + { + int j = size - i - 2; + new_data[i] = 1.0 - source_data[j]; + new_data[i + 1] = source_data[j + 1]; + } + dest->seq = stp_sequence_create(); + stp_sequence_set_data(dest->seq, size, new_data); + stp_free(new_data); + } + else + dest->seq = stp_sequence_create_reverse(source->seq); + dest->piecewise = source->piecewise; + dest->recompute_interval = 1; +} + +stp_curve_t * +stp_curve_create_reverse(const stp_curve_t *curve) +{ + stp_curve_t *ret; + check_curve(curve); + ret = stp_curve_create(curve->wrap_mode); + stp_curve_reverse(ret, curve); + return ret; +} + int stp_curve_set_bounds(stp_curve_t *curve, double low, double high) { diff --git a/src/main/dither-eventone.c b/src/main/dither-eventone.c index 51eb10b..2b983e0 100644 --- a/src/main/dither-eventone.c +++ b/src/main/dither-eventone.c @@ -1,5 +1,5 @@ /* - * "$Id: dither-eventone.c,v 1.40 2004/09/17 18:38:18 rleigh Exp $" + * "$Id: dither-eventone.c,v 1.42 2008/02/19 01:13:46 rlk Exp $" * * EvenTone dither implementation for Gimp-Print * @@ -55,6 +55,8 @@ typedef struct int physical_aspect; int diff_factor; stpi_dither_channel_t *dummy_channel; + double transition; /* Exponential scaling for transition region */ + stp_dither_matrix_impl_t transition_matrix; } eventone_t; typedef struct shade_segment @@ -86,14 +88,17 @@ free_eventone_data(stpi_dither_t *d) STP_SAFE_FREE(CHANNEL(d, i).aux_data); } } - if (et->dummy_channel) { - stpi_dither_channel_t *dc = et->dummy_channel; - shade_distance_t *shade = (shade_distance_t *) dc->aux_data; - STP_SAFE_FREE(shade->et_dis); - STP_SAFE_FREE(dc->aux_data); - stpi_dither_channel_destroy(dc); - STP_SAFE_FREE(et->dummy_channel); - } + if (et->dummy_channel) + { + stpi_dither_channel_t *dc = et->dummy_channel; + shade_distance_t *shade = (shade_distance_t *) dc->aux_data; + STP_SAFE_FREE(shade->et_dis); + STP_SAFE_FREE(dc->aux_data); + stpi_dither_channel_destroy(dc); + STP_SAFE_FREE(et->dummy_channel); + } + if (d->stpi_dither_type & D_UNITONE) + stp_dither_matrix_destroy(&(et->transition_matrix)); STP_SAFE_FREE(et); } @@ -105,20 +110,26 @@ et_setup(stpi_dither_t *d) eventone_t *et = stp_zalloc(sizeof(eventone_t)); int xa, ya; int i; - for (i = 0; i < CHANNEL_COUNT(d); i++) { - CHANNEL(d, i).error_rows = 1; - CHANNEL(d, i).errs = stp_zalloc(1 * sizeof(int *)); - CHANNEL(d, i).errs[0] = stp_zalloc(size * sizeof(int)); - } - if (d->stpi_dither_type & D_UNITONE) { - stpi_dither_channel_t *dc = stp_zalloc(sizeof(stpi_dither_channel_t)); - stp_dither_matrix_clone(&(d->dither_matrix), &(dc->dithermat), 0, 0); - stp_dither_matrix_clone(&(d->transition_matrix), &(dc->pick), 0, 0); - dc->error_rows = 1; - dc->errs = stp_zalloc(1 * sizeof(int *)); - dc->errs[0] = stp_zalloc(size * sizeof(int)); - et->dummy_channel = dc; - } + for (i = 0; i < CHANNEL_COUNT(d); i++) + { + CHANNEL(d, i).error_rows = 1; + CHANNEL(d, i).errs = stp_zalloc(1 * sizeof(int *)); + CHANNEL(d, i).errs[0] = stp_zalloc(size * sizeof(int)); + } + if (d->stpi_dither_type & D_UNITONE) + { + stpi_dither_channel_t *dc = stp_zalloc(sizeof(stpi_dither_channel_t)); + stp_dither_matrix_clone(&(d->dither_matrix), &(dc->dithermat), 0, 0); + et->transition = 0.7; + stp_dither_matrix_destroy(&(et->transition_matrix)); + stp_dither_matrix_copy(&(d->dither_matrix), &(et->transition_matrix)); + stp_dither_matrix_scale_exponentially(&(et->transition_matrix), et->transition); + stp_dither_matrix_clone(&(et->transition_matrix), &(dc->pick), 0, 0); + dc->error_rows = 1; + dc->errs = stp_zalloc(1 * sizeof(int *)); + dc->errs[0] = stp_zalloc(size * sizeof(int)); + et->dummy_channel = dc; + } xa = d->x_aspect / d->y_aspect; if (xa == 0) @@ -136,30 +147,30 @@ et_setup(stpi_dither_t *d) et->unitone_aspect = UNITONE_C2 / (xa * ya); et->d_sq.r_sq = 0; - for (i = 0; i < CHANNEL_COUNT(d); i++) { - int x; - shade_distance_t *shade = stp_zalloc(sizeof(shade_distance_t)); - shade->dis = et->d_sq; - shade->et_dis = stp_malloc(sizeof(distance_t) * d->dst_width); - if (CHANNEL(d, i).darkness > .1) - shade->share_this_channel = 1; - else - shade->share_this_channel = 0; - for (x = 0; x < d->dst_width; x++) { - shade->et_dis[x] = et->d_sq; + for (i = 0; i < CHANNEL_COUNT(d); i++) + { + int x; + shade_distance_t *shade = stp_zalloc(sizeof(shade_distance_t)); + shade->dis = et->d_sq; + shade->et_dis = stp_malloc(sizeof(distance_t) * d->dst_width); + if (CHANNEL(d, i).darkness > .1) + shade->share_this_channel = 1; + else + shade->share_this_channel = 0; + for (x = 0; x < d->dst_width; x++) + shade->et_dis[x] = et->d_sq; + CHANNEL(d, i).aux_data = shade; } - CHANNEL(d, i).aux_data = shade; - } - if (et->dummy_channel) { - int x; - shade_distance_t *shade = stp_zalloc(sizeof(shade_distance_t)); - shade->dis = et->d_sq; - shade->et_dis = stp_malloc(sizeof(distance_t) * d->dst_width); - for (x = 0; x < d->dst_width; x++) { - shade->et_dis[x] = et->d_sq; + if (et->dummy_channel) + { + int x; + shade_distance_t *shade = stp_zalloc(sizeof(shade_distance_t)); + shade->dis = et->d_sq; + shade->et_dis = stp_malloc(sizeof(distance_t) * d->dst_width); + for (x = 0; x < d->dst_width; x++) + shade->et_dis[x] = et->d_sq; + et->dummy_channel->aux_data = shade; } - et->dummy_channel->aux_data = shade; - } et->physical_aspect = d->y_aspect / d->x_aspect; if (et->physical_aspect >= 4) @@ -183,27 +194,27 @@ et_initializer(stpi_dither_t *d, int duplicate_line, int zero_mask) et_setup(d); et = (eventone_t *) (d->aux_data); - if (!duplicate_line) { - if ((zero_mask & ((1 << CHANNEL_COUNT(d)) - 1)) != - ((1 << CHANNEL_COUNT(d)) - 1)) { - d->last_line_was_empty = 0; - } else { - d->last_line_was_empty++; + if (!duplicate_line) + { + if ((zero_mask & ((1 << CHANNEL_COUNT(d)) - 1)) != + ((1 << CHANNEL_COUNT(d)) - 1)) + d->last_line_was_empty = 0; + else + d->last_line_was_empty++; } - } else if (d->last_line_was_empty) { + else if (d->last_line_was_empty) d->last_line_was_empty++; - } - if (d->last_line_was_empty >= 5) { + if (d->last_line_was_empty >= 5) return 0; - } else if (d->last_line_was_empty == 4) { - if (et->dummy_channel) { - memset(et->dummy_channel->errs[0], 0, d->dst_width * sizeof(int)); + else if (d->last_line_was_empty == 4) + { + if (et->dummy_channel) + memset(et->dummy_channel->errs[0], 0, d->dst_width * sizeof(int)); + for (i = 0; i < CHANNEL_COUNT(d); i++) + memset(CHANNEL(d, i).errs[0], 0, d->dst_width * sizeof(int)); + return 0; } - for (i = 0; i < CHANNEL_COUNT(d); i++) - memset(CHANNEL(d, i).errs[0], 0, d->dst_width * sizeof(int)); - return 0; - } for (i = 0; i < CHANNEL_COUNT(d); i++) CHANNEL(d, i).v = 0; if (et->dummy_channel) @@ -216,12 +227,13 @@ advance_eventone_pre(shade_distance_t *sp, eventone_t *et, int x) { distance_t *etd = &sp->et_dis[x]; int t = sp->dis.r_sq + sp->dis.dx; - if (t <= etd->r_sq) { /* Do eventone calculations */ - sp->dis.r_sq = t; /* Nearest pixel same as last one */ - sp->dis.dx += et->d2x; - } else { + if (t <= etd->r_sq) + { /* Do eventone calculations */ + sp->dis.r_sq = t; /* Nearest pixel same as last one */ + sp->dis.dx += et->d2x; + } + else sp->dis = *etd; /* Nearest pixel is from a previous line */ - } } static inline void @@ -232,16 +244,16 @@ eventone_update(stpi_dither_channel_t *dc, eventone_t *et, distance_t *etd = &sp->et_dis[x]; int t = etd->r_sq + etd->dy; /* r^2 from dot above */ int u = sp->dis.r_sq + sp->dis.dy; /* r^2 from dot on this line */ - if (u < t) { /* If dot from this line is close */ - t = u; /* Use it instead */ - etd->dx = sp->dis.dx; - etd->dy = sp->dis.dy; - } + if (u < t) + { /* If dot from this line is close */ + t = u; /* Use it instead */ + etd->dx = sp->dis.dx; + etd->dy = sp->dis.dy; + } etd->dy += et->d2y; - if (t > 65535) { /* Do some hard limiting */ - t = 65535; - } + if (t > 65535) + t = 65535; /* Do some hard limiting */ etd->r_sq = t; } @@ -255,7 +267,7 @@ diffuse_error(stpi_dither_channel_t *dc, eventone_t *et, int x, int direction) * -- rlk 20031101 */ #if 0 -/* int fraction = (dc->v + (et->diff_factor>>1)) / et->diff_factor; */ + /* int fraction = (dc->v + (et->diff_factor>>1)) / et->diff_factor; */ int frac_2 = dc->v + dc->v; int frac_3 = frac_2 + dc->v; dc->errs[0][x + MAX_SPREAD] = frac_3; @@ -277,16 +289,17 @@ eventone_adjust(stpi_dither_channel_t *dc, eventone_t *et, int dither_point, return 0; else if (dither_point >= 65535) return 65535; - if (desired == 0) { + if (desired == 0) dither_point = 0; - } else { - shade_distance_t *shade = (shade_distance_t *) dc->aux_data; - dither_point += shade->dis.r_sq * et->aspect - (EVEN_C1 * 65535) / desired; - if (dither_point > 65535) - dither_point = 65535; - else if (dither_point < 0) - dither_point = 0; - } + else + { + shade_distance_t *shade = (shade_distance_t *) dc->aux_data; + dither_point += shade->dis.r_sq * et->aspect - (EVEN_C1 * 65535) / desired; + if (dither_point > 65535) + dither_point = 65535; + else if (dither_point < 0) + dither_point = 0; + } return dither_point; } @@ -298,13 +311,14 @@ unitone_adjust(stpi_dither_channel_t *dc, eventone_t *et, return INT_MIN; else if (dither_point >= 65535) return dither_point; - if (desired == 0) { + if (desired == 0) dither_point = INT_MIN; - } else { - shade_distance_t *shade = (shade_distance_t *) dc->aux_data; - dither_point += shade->dis.r_sq * et->unitone_aspect - - (UNITONE_C1 * 65535u) / desired; - } + else + { + shade_distance_t *shade = (shade_distance_t *) dc->aux_data; + dither_point += shade->dis.r_sq * et->unitone_aspect - + (UNITONE_C1 * 65535u) / desired; + } return dither_point; } @@ -326,12 +340,13 @@ find_segment(stpi_dither_channel_t *dc, unsigned inkval, int i; stpi_ink_defn_t *ip; - for (i=0, ip = dc->ink_list; i < dc->nlevels - 1; i++, ip++) { - if (ip->value > inkval) - break; - lower->bits = ip->bits; - lower->range = ip->value; - } + for (i=0, ip = dc->ink_list; i < dc->nlevels - 1; i++, ip++) + { + if (ip->value > inkval) + break; + lower->bits = ip->bits; + lower->range = ip->value; + } upper->bits = ip->bits; upper->range = ip->value; @@ -373,10 +388,11 @@ print_ink(stpi_dither_t *d, unsigned char *tptr, const stpi_ink_defn_t *ink, tptr[length] |= bit; return; default: - for (j=1; j <= ink->bits; j+=j, tptr += length) { - if (j & ink->bits) - *tptr |= bit; - } + for (j=1; j <= ink->bits; j+=j, tptr += length) + { + if (j & ink->bits) + *tptr |= bit; + } return; } } @@ -393,8 +409,8 @@ stpi_dither_et(stp_vars_t *v, stpi_dither_t *d = (stpi_dither_t *) stp_get_component_data(v, "Dither"); eventone_t *et; - int x, - length; + int x; + int length; unsigned char bit; int i; @@ -407,90 +423,100 @@ stpi_dither_et(stp_vars_t *v, return; et = (eventone_t *) d->aux_data; + if (d->stpi_dither_type & D_UNITONE) + stp_dither_matrix_set_row(&(et->transition_matrix), row); length = (d->dst_width + 7) / 8; - if (row & 1) { - direction = 1; - x = 0; - terminate = d->dst_width; - d->ptr_offset = 0; - } else { - direction = -1; - x = d->dst_width - 1; - terminate = -1; - d->ptr_offset = length - 1; - raw += channel_count * (d->src_width - 1); - } + if (row & 1) + { + direction = 1; + x = 0; + terminate = d->dst_width; + d->ptr_offset = 0; + } + else + { + direction = -1; + x = d->dst_width - 1; + terminate = -1; + d->ptr_offset = length - 1; + raw += channel_count * (d->src_width - 1); + } bit = 1 << (7 - (x & 7)); xstep = channel_count * (d->src_width / d->dst_width); xmod = d->src_width % d->dst_width; xerror = (xmod * x) % d->dst_width; - for (; x != terminate; x += direction) { + for (; x != terminate; x += direction) + { - int point_error = 0; - int comparison = 32768; + int point_error = 0; + int comparison = 32768; - if (d->stpi_dither_type & D_ORDERED_BASE) - comparison += (ditherpoint(d, &(d->dither_matrix), x) / 16) - 2048; + if (d->stpi_dither_type & D_ORDERED_BASE) + comparison += (ditherpoint(d, &(d->dither_matrix), x) / 16) - 2048; - for (i=0; i < channel_count; i++) { - if (CHANNEL(d, i).ptr) + for (i=0; i < channel_count; i++) { - int inkspot; - int range_point; - stpi_dither_channel_t *dc = &CHANNEL(d, i); - shade_distance_t *sp = (shade_distance_t *) dc->aux_data; - stpi_ink_defn_t *inkp; - stpi_ink_defn_t lower, upper; - - advance_eventone_pre(sp, et, x); - - /* - * Find which are the two candidate dot sizes. - * Rather than use the absolute value of the point to compute - * the error, we will use the relative value of the point within - * the range to find the two candidate dot sizes. - */ - range_point = - find_segment_and_ditherpoint(dc, raw[i], &lower, &upper); - - /* Incorporate error data from previous line */ - dc->v += 2 * range_point + (dc->errs[0][x + MAX_SPREAD] + 8) / 16; - inkspot = dc->v - range_point; - - point_error += eventone_adjust(dc, et, inkspot, range_point); - - /* Determine whether to print the larger or smaller dot */ - inkp = &lower; - if (point_error >= comparison) { - point_error -= 65535; - inkp = &upper; - dc->v -= 131070; - sp->dis = et->d_sq; - } - - /* Adjust the error to reflect the dot choice */ - if (inkp->bits) { - if (!mask || (*(mask + d->ptr_offset) & bit)) { - set_row_ends(dc, x); - - /* Do the printing */ - print_ink(d, dc->ptr, inkp, bit, length); + if (CHANNEL(d, i).ptr) + { + int inkspot; + int range_point; + stpi_dither_channel_t *dc = &CHANNEL(d, i); + shade_distance_t *sp = (shade_distance_t *) dc->aux_data; + stpi_ink_defn_t *inkp; + stpi_ink_defn_t lower, upper; + + advance_eventone_pre(sp, et, x); + + /* + * Find which are the two candidate dot sizes. + * Rather than use the absolute value of the point to compute + * the error, we will use the relative value of the point within + * the range to find the two candidate dot sizes. + */ + range_point = + find_segment_and_ditherpoint(dc, raw[i], &lower, &upper); + + /* Incorporate error data from previous line */ + dc->v += 2 * range_point + (dc->errs[0][x + MAX_SPREAD] + 8) / 16; + inkspot = dc->v - range_point; + + point_error += eventone_adjust(dc, et, inkspot, range_point); + + /* Determine whether to print the larger or smaller dot */ + inkp = &lower; + if (point_error >= comparison) + { + point_error -= 65535; + inkp = &upper; + dc->v -= 131070; + sp->dis = et->d_sq; + } + + /* Adjust the error to reflect the dot choice */ + if (inkp->bits) + { + if (!mask || (*(mask + d->ptr_offset) & bit)) + { + set_row_ends(dc, x); + + /* Do the printing */ + print_ink(d, dc->ptr, inkp, bit, length); + } + } + + /* Spread the error around to the adjacent dots */ + eventone_update(dc, et, x, direction); + diffuse_error(dc, et, x, direction); } - } - - /* Spread the error around to the adjacent dots */ - eventone_update(dc, et, x, direction); - diffuse_error(dc, et, x, direction); } + if (direction == 1) + ADVANCE_UNIDIRECTIONAL(d, bit, raw, channel_count, xerror, xstep, xmod); + else + ADVANCE_REVERSE(d, bit, raw, channel_count, xerror, xstep, xmod); } - if (direction == 1) - ADVANCE_UNIDIRECTIONAL(d, bit, raw, channel_count, xerror, xstep, xmod); - else - ADVANCE_REVERSE(d, bit, raw, channel_count, xerror, xstep, xmod); - } if (direction == -1) stpi_dither_reverse_row_ends(d); } @@ -506,8 +532,8 @@ stpi_dither_ut(stp_vars_t *v, stpi_dither_t *d = (stpi_dither_t *) stp_get_component_data(v, "Dither"); eventone_t *et; - int x, - length; + int x; + int length; unsigned char bit; int i; @@ -517,10 +543,11 @@ stpi_dither_ut(stp_vars_t *v, int channel_count = CHANNEL_COUNT(d); stpi_dither_channel_t *ddc; - if (channel_count == 1) { - stpi_dither_et(v, row, raw, duplicate_line, zero_mask, mask); - return; - } + if (channel_count == 1) + { + stpi_dither_et(v, row, raw, duplicate_line, zero_mask, mask); + return; + } if (!et_initializer(d, duplicate_line, zero_mask)) return; @@ -530,181 +557,201 @@ stpi_dither_ut(stp_vars_t *v, length = (d->dst_width + 7) / 8; - if (row & 1) { - direction = 1; - x = 0; - terminate = d->dst_width; - d->ptr_offset = 0; - } else { - direction = -1; - x = d->dst_width - 1; - terminate = -1; - d->ptr_offset = length - 1; - raw += channel_count * (d->src_width - 1); - } + if (row & 1) + { + direction = 1; + x = 0; + terminate = d->dst_width; + d->ptr_offset = 0; + } + else + { + direction = -1; + x = d->dst_width - 1; + terminate = -1; + d->ptr_offset = length - 1; + raw += channel_count * (d->src_width - 1); + } bit = 1 << (7 - (x & 7)); xstep = channel_count * (d->src_width / d->dst_width); xmod = d->src_width % d->dst_width; xerror = (xmod * x) % d->dst_width; - for (; x != terminate; x += direction) { - - shade_distance_t *ssp = (shade_distance_t *) ddc->aux_data; - int point_error = 0; - int total_error = 0; - int channels_to_print = 0; - int print_all_channels = 0; - int maximum_value = 0; - int comparison = 32768; - stpi_dither_channel_t *best_channel = NULL; - stpi_dither_channel_t *second_best_channel = NULL; - int best_channel_value = INT_MIN; - int second_best_channel_value = INT_MIN; - int random_value = ditherpoint(d, &(d->dither_matrix), x); - - if (d->stpi_dither_type & D_ORDERED_BASE) - comparison += (random_value / 16) - 2048; - - - ddc->b = 0; - advance_eventone_pre(ssp, et, x); - - for (i=0; i < channel_count; i++) { - stpi_dither_channel_t *dc = &CHANNEL(d, i); - if (dc->ptr) { - shade_distance_t *sp = (shade_distance_t *) dc->aux_data; - - advance_eventone_pre(sp, et, x); - - /* - * Find which are the two candidate dot sizes. - * Rather than use the absolute value of the point to compute - * the error, we will use the relative value of the point within - * the range to find the two candidate dot sizes. - */ - dc->b = find_segment_and_ditherpoint(dc, raw[i], - &(sp->lower), &(sp->upper)); - if (sp->share_this_channel) { - if (dc->b > maximum_value) - maximum_value = dc->b; - ddc->b += dc->b; + for (; x != terminate; x += direction) + { + + shade_distance_t *ssp = (shade_distance_t *) ddc->aux_data; + int point_error = 0; + int total_error = 0; + int channels_to_print = 0; + int print_all_channels = 0; + int maximum_value = 0; + int comparison = 32768; + stpi_dither_channel_t *best_channel = NULL; + stpi_dither_channel_t *second_best_channel = NULL; + int best_channel_value = INT_MIN; + int second_best_channel_value = INT_MIN; + int random_value = ditherpoint(d, &(d->dither_matrix), x); + + if (d->stpi_dither_type & D_ORDERED_BASE) + comparison += (random_value / 16) - 2048; + + + ddc->b = 0; + advance_eventone_pre(ssp, et, x); + + for (i=0; i < channel_count; i++) + { + stpi_dither_channel_t *dc = &CHANNEL(d, i); + if (dc->ptr) + { + shade_distance_t *sp = (shade_distance_t *) dc->aux_data; + + advance_eventone_pre(sp, et, x); + + /* + * Find which are the two candidate dot sizes. + * Rather than use the absolute value of the point to compute + * the error, we will use the relative value of the point within + * the range to find the two candidate dot sizes. + */ + dc->b = find_segment_and_ditherpoint(dc, raw[i], + &(sp->lower), &(sp->upper)); + if (sp->share_this_channel) + { + if (dc->b > maximum_value) + maximum_value = dc->b; + ddc->b += dc->b; + } + /* Incorporate error data from previous line */ + dc->v += 2 * dc->b + (dc->errs[0][x + MAX_SPREAD] + 8) / 16; + dc->o = unitone_adjust(dc, et, dc->v - dc->b, dc->b); + } } - /* Incorporate error data from previous line */ - dc->v += 2 * dc->b + (dc->errs[0][x + MAX_SPREAD] + 8) / 16; - dc->o = unitone_adjust(dc, et, dc->v - dc->b, dc->b); - } - } #if 0 - if ((2 * (ddc->b - maximum_value)) < (3 * maximum_value)) - print_all_channels = 1; + if ((2 * (ddc->b - maximum_value)) < (3 * maximum_value)) + print_all_channels = 1; #endif - if (ddc->b > 131070) - print_all_channels = 1; - else if (ddc->b > 65535) { - ddc->b -= 65535; - channels_to_print = 1; - } + if (ddc->b > 131070) + print_all_channels = 1; + else if (ddc->b > 65535) + { + ddc->b -= 65535; + channels_to_print = 1; + } - if (ddc->b > 65535) { - ddc->b = 65535; - } + if (ddc->b > 65535) + ddc->b = 65535; - ddc->v += 2 * ddc->b + (ddc->errs[0][x + MAX_SPREAD] + 8) / 16; - total_error += eventone_adjust(ddc, et, ddc->v - ddc->b, ddc->b); - if (total_error >= comparison) { - channels_to_print += 1; - } + ddc->v += 2 * ddc->b + (ddc->errs[0][x + MAX_SPREAD] + 8) / 16; + total_error += eventone_adjust(ddc, et, ddc->v - ddc->b, ddc->b); + if (total_error >= comparison) + channels_to_print += 1; - if (!print_all_channels) { - for (i=0; i < channel_count; i++) { - stpi_dither_channel_t *dc = &CHANNEL(d, i); - shade_distance_t *sp = (shade_distance_t *) dc->aux_data; + if (!print_all_channels) + { + for (i=0; i < channel_count; i++) + { + stpi_dither_channel_t *dc = &CHANNEL(d, i); + shade_distance_t *sp = (shade_distance_t *) dc->aux_data; - if (dc->ptr) { - - if (sp->share_this_channel) { - if (dc->o > best_channel_value) { - second_best_channel = best_channel; - best_channel = dc; - second_best_channel_value = best_channel_value; - if (dc->o >= 32768) - best_channel_value = INT_MAX; - else - best_channel_value = dc->o; - } else if (dc->o > second_best_channel_value) { - second_best_channel = dc; - if (dc->o >= 32768) - second_best_channel_value = INT_MAX; - else - second_best_channel_value = dc->o; + if (dc->ptr) + { + + if (sp->share_this_channel) + { + if (dc->o > best_channel_value) + { + second_best_channel = best_channel; + best_channel = dc; + second_best_channel_value = best_channel_value; + if (dc->o >= 32768) + best_channel_value = INT_MAX; + else + best_channel_value = dc->o; + } + else if (dc->o > second_best_channel_value) + { + second_best_channel = dc; + if (dc->o >= 32768) + second_best_channel_value = INT_MAX; + else + second_best_channel_value = dc->o; + } + } + } } - } } - } - } - for (i=0; i < channel_count; i++) { - stpi_dither_channel_t *dc = &CHANNEL(d, i); - if (dc->ptr) { - - /* Determine whether to print the larger or smaller dot */ - shade_distance_t *sp = (shade_distance_t *) dc->aux_data; - stpi_ink_defn_t *inkp = &(sp->lower); - - if (dc->o < 0) - dc->o = 0; - else if (dc->o > 65535) - dc->o = 65535; - if (print_all_channels || !sp->share_this_channel) { - point_error += dc->o; - if (point_error >= comparison) { - point_error -= 65535; - inkp = &(sp->upper); - dc->v -= 131070; - sp->dis = et->d_sq; - } - } else if ((channels_to_print >= 1 && best_channel == dc) || - (channels_to_print >= 2 && second_best_channel == dc)) { - inkp = &(sp->upper); - dc->v -= 131070; - sp->dis = et->d_sq; - } - if (inkp->bits) { - if (!mask || (*(mask + d->ptr_offset) & bit)) { - set_row_ends(dc, x); - - /* Do the printing */ - print_ink(d, dc->ptr, inkp, bit, length); - } + for (i=0; i < channel_count; i++) + { + stpi_dither_channel_t *dc = &CHANNEL(d, i); + if (dc->ptr) + { + /* Determine whether to print the larger or smaller dot */ + shade_distance_t *sp = (shade_distance_t *) dc->aux_data; + stpi_ink_defn_t *inkp = &(sp->lower); + + if (dc->o < 0) + dc->o = 0; + else if (dc->o > 65535) + dc->o = 65535; + if (print_all_channels || !sp->share_this_channel) + { + point_error += dc->o; + if (point_error >= comparison) + { + point_error -= 65535; + inkp = &(sp->upper); + dc->v -= 131070; + sp->dis = et->d_sq; + } + } + else if ((channels_to_print >= 1 && best_channel == dc) || + (channels_to_print >= 2 && second_best_channel == dc)) + { + inkp = &(sp->upper); + dc->v -= 131070; + sp->dis = et->d_sq; + } + if (inkp->bits) + { + if (!mask || (*(mask + d->ptr_offset) & bit)) + { + set_row_ends(dc, x); + + /* Do the printing */ + print_ink(d, dc->ptr, inkp, bit, length); + } + } + } + } + if (total_error >= comparison) + { + ddc->v -= 131070; + total_error -= 65535; + ssp->dis = et->d_sq; } - } - } - if (total_error >= comparison) { - ddc->v -= 131070; - total_error -= 65535; - ssp->dis = et->d_sq; - } - - eventone_update(ddc, et, x, direction); - diffuse_error(ddc, et, x, direction); - for (i=0; i < channel_count; i++) { - stpi_dither_channel_t *dc = &CHANNEL(d, i); - if (dc->ptr) { - /* Spread the error around to the adjacent dots */ - eventone_update(dc, et, x, direction); - diffuse_error(dc, et, x, direction); - } + eventone_update(ddc, et, x, direction); + diffuse_error(ddc, et, x, direction); + for (i=0; i < channel_count; i++) + { + stpi_dither_channel_t *dc = &CHANNEL(d, i); + if (dc->ptr) + { + /* Spread the error around to the adjacent dots */ + eventone_update(dc, et, x, direction); + diffuse_error(dc, et, x, direction); + } + } + if (direction == 1) + ADVANCE_UNIDIRECTIONAL(d, bit, raw, channel_count, xerror, xstep, xmod); + else + ADVANCE_REVERSE(d, bit, raw, channel_count, xerror, xstep, xmod); } - - - if (direction == 1) - ADVANCE_UNIDIRECTIONAL(d, bit, raw, channel_count, xerror, xstep, xmod); - else - ADVANCE_REVERSE(d, bit, raw, channel_count, xerror, xstep, xmod); - } if (direction == -1) stpi_dither_reverse_row_ends(d); } diff --git a/src/main/dither-impl.h b/src/main/dither-impl.h index e297464..28f9832 100644 --- a/src/main/dither-impl.h +++ b/src/main/dither-impl.h @@ -1,5 +1,5 @@ /* - * "$Id: dither-impl.h,v 1.25.18.1 2007/12/15 20:35:44 rlk Exp $" + * "$Id: dither-impl.h,v 1.32 2008/02/18 14:20:17 rlk Exp $" * * Internal implementation of dither algorithms * @@ -57,7 +57,10 @@ extern "C" { #define D_HYBRID_EVENTONE (D_ORDERED_BASE | D_EVENTONE) #define D_HYBRID_UNITONE (D_ORDERED_BASE | D_UNITONE) #define D_HYBRID_EVENBETTER (D_ORDERED_BASE | D_EVENBETTER) -#define D_PREDITHERED 128 +#define D_PREDITHERED 256 +#define D_ORDERED_NEW 512 +#define D_ORDERED_SEGMENTED 1024 +#define D_ORDERED_SEGMENTED_NEW (D_ORDERED_SEGMENTED | D_ORDERED_NEW) #define D_INVALID -2 #define DITHER_FAST_STEPS (6) @@ -148,7 +151,6 @@ typedef struct dither int x_aspect; /* Aspect ratio numerator */ int y_aspect; /* Aspect ratio denominator */ - double transition; /* Exponential scaling for transition region */ int *offset0_table; int *offset1_table; @@ -163,7 +165,6 @@ typedef struct dither * some things */ stp_dither_matrix_impl_t dither_matrix; - stp_dither_matrix_impl_t transition_matrix; stpi_dither_channel_t *channel; unsigned channel_count; unsigned total_channel_count; @@ -259,5 +260,5 @@ do \ #endif /* GUTENPRINT_INTERNAL_DITHER_IMPL_H */ /* - * End of "$Id: dither-impl.h,v 1.25.18.1 2007/12/15 20:35:44 rlk Exp $". + * End of "$Id: dither-impl.h,v 1.32 2008/02/18 14:20:17 rlk Exp $". */ diff --git a/src/main/dither-inks.c b/src/main/dither-inks.c index f7568e3..d69cf48 100644 --- a/src/main/dither-inks.c +++ b/src/main/dither-inks.c @@ -1,5 +1,5 @@ /* - * "$Id: dither-inks.c,v 1.25 2004/09/17 18:38:18 rleigh Exp $" + * "$Id: dither-inks.c,v 1.26 2008/02/18 14:20:17 rlk Exp $" * * Print plug-in driver utility functions for the GIMP. * @@ -114,7 +114,6 @@ initialize_channel(stp_vars_t *v, int channel, int subchannel) assert(idx >= 0); memset(dc, 0, sizeof(stpi_dither_channel_t)); stp_dither_matrix_clone(&(d->dither_matrix), &(dc->dithermat), 0, 0); - stp_dither_matrix_clone(&(d->transition_matrix), &(dc->pick), 0, 0); shade.dot_sizes = ˙ shade.value = 1.0; shade.numsizes = 1; diff --git a/src/main/dither-main.c b/src/main/dither-main.c index 77211c3..b9ba80a 100644 --- a/src/main/dither-main.c +++ b/src/main/dither-main.c @@ -1,5 +1,5 @@ /* - * "$Id: dither-main.c,v 1.52.8.1 2007/12/15 20:35:44 rlk Exp $" + * "$Id: dither-main.c,v 1.59 2008/02/18 14:20:17 rlk Exp $" * * Dither routine entrypoints * @@ -62,10 +62,13 @@ static const stpi_dither_algorithm_t dither_algos[] = #endif { "Adaptive", N_ ("Adaptive Hybrid"), D_ADAPTIVE_HYBRID }, { "Ordered", N_ ("Ordered"), D_ORDERED }, + { "OrderedNew", N_ ("Ordered New"), D_ORDERED_NEW }, { "Fast", N_ ("Fast"), D_FAST }, { "VeryFast", N_ ("Very Fast"), D_VERY_FAST }, { "Floyd", N_ ("Hybrid Floyd-Steinberg"), D_FLOYD_HYBRID }, - { "Predithered", N_ ("Predithered Input"), D_PREDITHERED } + { "Predithered", N_ ("Predithered Input"), D_PREDITHERED }, + { "Segmented", N_ ("Drop Size Segmented"), D_ORDERED_SEGMENTED }, + { "SegmentedNew", N_ ("Drop Size Segmented New"),D_ORDERED_SEGMENTED_NEW } }; static const int num_dither_algos = sizeof(dither_algos)/sizeof(stpi_dither_algorithm_t); @@ -175,6 +178,9 @@ stpi_set_dither_function(stp_vars_t *v) if (color_correction && strcmp(color_correction, "Predithered") == 0) d->stpi_dither_type = D_PREDITHERED; + else if (color_correction && strcmp(color_correction, "Raw") != 0 && + algorithm && strcmp(algorithm, "Segmented") == 0) + d->stpi_dither_type = D_ORDERED; else if (algorithm && strcmp(algorithm, "None") != 0) { for (i = 0; i < num_dither_algos; i++) @@ -255,6 +261,9 @@ stpi_set_dither_function(stp_vars_t *v) case D_VERY_FAST: RETURN_DITHERFUNC(stpi_dither_very_fast, v); case D_ORDERED: + case D_ORDERED_SEGMENTED: + case D_ORDERED_NEW: + case D_ORDERED_SEGMENTED_NEW: case D_FAST: RETURN_DITHERFUNC(stpi_dither_ordered, v); case D_HYBRID_EVENTONE: @@ -323,7 +332,6 @@ stpi_dither_free(void *vd) STP_SAFE_FREE(d->offset0_table); STP_SAFE_FREE(d->offset1_table); stp_dither_matrix_destroy(&(d->dither_matrix)); - stp_dither_matrix_destroy(&(d->transition_matrix)); stp_free(d->channel); stp_free(d->channel_index); stp_free(d->subchannel_count); @@ -356,7 +364,6 @@ stp_dither_init(stp_vars_t *v, stp_image_t *image, int out_width, d->y_aspect = 1; } d->ditherfunc = stpi_set_dither_function(v); - d->transition = 1.0; d->adaptive_limit = .75 * 65535; /* @@ -399,7 +406,6 @@ stp_dither_init(stp_vars_t *v, stp_image_t *image, int out_width, stp_abort(); } } - stp_dither_set_transition(v, 0.7); d->src_width = in_width; d->dst_width = out_width; @@ -467,7 +473,6 @@ stp_dither_internal(stp_vars_t *v, int row, const unsigned short *input, stpi_dither_t *d = (stpi_dither_t *) stp_get_component_data(v, "Dither"); stpi_dither_finalize(v); stp_dither_matrix_set_row(&(d->dither_matrix), row); - stp_dither_matrix_set_row(&(d->transition_matrix), row); for (i = 0; i < CHANNEL_COUNT(d); i++) { CHANNEL(d, i).ptr = CHANNEL(d, i).ptr; diff --git a/src/main/dither-ordered.c b/src/main/dither-ordered.c index a355b41..ca119c1 100644 --- a/src/main/dither-ordered.c +++ b/src/main/dither-ordered.c @@ -1,5 +1,5 @@ /* - * "$Id: dither-ordered.c,v 1.17.18.1 2007/12/15 20:35:44 rlk Exp $" + * "$Id: dither-ordered.c,v 1.28 2008/02/18 14:20:17 rlk Exp $" * * Ordered dither algorithm * @@ -33,6 +33,184 @@ #include #include "dither-impl.h" #include "dither-inlined-functions.h" +#include + + +typedef struct { + size_t channels; + double *drops; + unsigned short *lut; +} stpi_new_ordered_t; + +typedef struct { + unsigned short shift; + unsigned short mask; + unsigned short x_mask; + stpi_new_ordered_t *ord_new; +} stpi_ordered_t; + +static int +compare_channels(const stpi_dither_channel_t *dc1, + const stpi_dither_channel_t *dc2) +{ + int i; + if (dc1->nlevels != dc2->nlevels) + return 0; + for (i = 0; i < dc1->nlevels; i++) + if (dc1->ranges[i].upper->value != dc2->ranges[i].upper->value) + return 0; + return 1; +} + +const static double dp_fraction = 0.5; + +static void +init_dither_channel_new(stpi_dither_channel_t *dc, stp_vars_t *v) +{ + int i, j, k; + double bp = 0; + double lbp = 0; + double lower_bottom = 0; + double lower_middle = 0; + double lower_top = 0; + double upper_bottom = 0; + double upper_middle = 0; + double upper_top = 0; + + double *breakpoints; + double *val; + unsigned short *data; + stpi_new_ordered_t *ord = stp_malloc(sizeof(stpi_new_ordered_t)); + ((stpi_ordered_t *) (dc->aux_data))->ord_new = ord; + ord->channels = dc->nlevels - 1; + ord->drops = stp_malloc(sizeof(double) * (ord->channels + 1)); + breakpoints = stp_malloc(sizeof(double) * (ord->channels + 1)); + val = stp_malloc(sizeof(double) * ord->channels); + data = stp_malloc(sizeof(unsigned short) * 65536 * ord->channels); + ord->lut = data; + for (j = 0; j < ord->channels; j++) + { + stpi_dither_segment_t *dd = &(dc->ranges[j]); + ord->drops[j] = (double) dd->upper->value / 65535.0; + } + ord->drops[ord->channels] = 1; + for (j = 0; j < ord->channels; j++) + { + if (j == 0) + breakpoints[j] = 65535 * ord->drops[j] * dp_fraction; + else + breakpoints[j] = 65535 * ((ord->drops[j] * dp_fraction) + + (ord->drops[j - 1] * (1.0 - dp_fraction))); + stp_dprintf(STP_DBG_INK, v, " size %.3f bp %5.0f\n", + ord->drops[j], breakpoints[j]); + } + breakpoints[ord->channels] = 65535; + j = 0; + for (i = 0; i <= ord->channels; i++) + { + lbp = bp; + bp = breakpoints[i]; + lower_bottom = upper_middle; + upper_bottom = 0; + lower_middle = upper_top; + lower_top = 0; + if (i == ord->channels) + upper_top = 0; + else + upper_top = 65535 * dp_fraction; + if (i > 0) + upper_middle = 65535 - upper_top; + while (j <= bp) + { + double range_point = (j - lbp) / (bp - lbp); + double uv, mv, lv; + int total_ink = 0; + for (k = 0; k < ord->channels; k++) + val[k] = 0; + uv = lower_top + (upper_top - lower_top) * range_point; + mv = lower_middle + (upper_middle - lower_middle) * range_point; + lv = lower_bottom + (upper_bottom - lower_bottom) * range_point; + + if (i < ord->channels) + val[i] = (unsigned short) uv; + if (i > 0) + val[i - 1] = (unsigned short) mv; + if (i > 1) + val[i - 2] = (unsigned short) lv; + for (k = ord->channels - 1; k >= 0; k--) + { + total_ink += val[k]; + if (total_ink > 65535) + total_ink = 65535; + data[k] = total_ink; + } + if ((stp_get_debug_level() & STP_DBG_INK) && (j % 257 == 0)) + { + stp_dprintf(STP_DBG_INK, v, " %5d:", j); + for (k = 0; k < ord->channels; k++) + stp_dprintf(STP_DBG_INK, v, " %9.3f", val[k]); + stp_dprintf(STP_DBG_INK, v, " "); + for (k = 0; k < ord->channels; k++) + stp_dprintf(STP_DBG_INK, v, " %9.3f", breakpoints[k]); + stp_dprintf(STP_DBG_INK, v, " "); + for (k = 0; k < ord->channels; k++) + stp_dprintf(STP_DBG_INK, v, " %5d", data[k]); + stp_dprintf(STP_DBG_INK, v, "\n"); + } + data += ord->channels; + j++; + } + } + stp_free(breakpoints); + stp_free(val); +} + +static inline void +print_color_ordered_new(const stpi_dither_t *d, stpi_dither_channel_t *dc, + int val, int x, int y, unsigned char bit, int length) +{ + int i; + int j; + unsigned bits; + int levels = dc->nlevels - 1; + unsigned dpoint = ditherpoint(d, &(dc->dithermat), x); + const stpi_ordered_t *o = (const stpi_ordered_t *) dc->aux_data; + const stpi_new_ordered_t *ord = (const stpi_new_ordered_t *) o->ord_new; + unsigned short swhere = (unsigned short) val; + unsigned short *where = ord ? ord->lut + (val * levels) : &swhere; + /* + * Look for the appropriate range into which the input value falls. + * Notice that we use the input, not the error, to decide what dot type + * to print (if any). We actually use the "density" input to permit + * the caller to use something other that simply the input value, if it's + * desired to use some function of overall density, rather than just + * this color's input, for this purpose. + */ + for (i = levels - 1; i >= 0; i--) + { + if (dpoint < where[i]) + { + stpi_dither_segment_t *dd = &(dc->ranges[i]); + bits = dd->upper->bits; + if (bits) + { + unsigned char *tptr = dc->ptr + d->ptr_offset; + + /* + * Lay down all of the bits in the pixel. + */ + set_row_ends(dc, x); + for (j = 1; j <= bits; j += j, tptr += length) + { + if (j & bits) + tptr[0] |= bit; + } + + } + return; + } + } +} static inline void print_color_ordered(const stpi_dither_t *d, stpi_dither_channel_t *dc, int val, @@ -90,6 +268,76 @@ print_color_ordered(const stpi_dither_t *d, stpi_dither_channel_t *dc, int val, } } +static void +free_dither_ordered(stpi_dither_t *d) +{ + int i; + stpi_dither_channel_t *dc0 = &CHANNEL(d, 0); + stpi_ordered_t *o0 = dc0->aux_data; + stpi_new_ordered_t *no0; + if (o0) + no0 = o0->ord_new; + for (i = CHANNEL_COUNT(d) - 1; i >= 0 ; i--) + { + stpi_dither_channel_t *dc = &CHANNEL(d, i); + if (dc->aux_data) + { + stpi_ordered_t *ord = (stpi_ordered_t *) dc->aux_data; + if (ord->ord_new && (i == 0 || ord->ord_new != no0)) + { + stpi_new_ordered_t *no = (stpi_new_ordered_t *) ord->ord_new; + if (no->drops) + stp_free(no->drops); + if (no->lut) + stp_free(no->lut); + stp_free(no); + } + stp_free(dc->aux_data); + dc->aux_data = NULL; + } + } + stp_free(d->aux_data); +} + +static void +init_dither_ordered(stpi_dither_t *d, stp_vars_t *v) +{ + int i; + d->aux_data = stp_malloc(1); + d->aux_freefunc = &free_dither_ordered; + stp_dprintf(STP_DBG_INK, v, "init_dither_ordered\n"); + for (i = 0; i < CHANNEL_COUNT(d); i++) + { + stpi_dither_channel_t *dc = &CHANNEL(d, i); + stpi_ordered_t *s; + dc->aux_data = stp_malloc(sizeof(stpi_ordered_t)); + s = (stpi_ordered_t *) dc->aux_data; + s->ord_new = NULL; + if (d->stpi_dither_type & D_ORDERED_SEGMENTED) + { + s->shift = 16 - dc->signif_bits; + s->mask = ((1 << dc->signif_bits) - 1) << s->shift; + s->x_mask = ~(s->mask); + stp_dprintf(STP_DBG_INK, v, " channel %d: shift %d mask 0x%x x_mask 0x%x\n", + i, s->shift, s->mask, s->x_mask); + } + if (d->stpi_dither_type & D_ORDERED_NEW) + { + if (dc->nlevels < 2) + stp_dprintf(STP_DBG_INK, v, " channel %d ignored\n", i); + else if (i == 0 || !compare_channels(&CHANNEL(d, 0), dc)) + { + stp_dprintf(STP_DBG_INK, v, " channel %d\n", i); + init_dither_channel_new(dc, v); + } + else + { + stp_dprintf(STP_DBG_INK, v, " channel %d duplicated from channel 0\n", i); + s->ord_new = ((stpi_ordered_t *) (CHANNEL(d, 0).aux_data))->ord_new; + } + } + } +} void stpi_dither_ordered(stp_vars_t *v, @@ -105,6 +353,7 @@ stpi_dither_ordered(stp_vars_t *v, unsigned char bit; int i; int one_bit_only = 1; + int one_level_only = 1; int xerror, xstep, xmod; @@ -122,9 +371,14 @@ stpi_dither_ordered(stp_vars_t *v, for (i = 0; i < CHANNEL_COUNT(d); i++) { stpi_dither_channel_t *dc = &(CHANNEL(d, i)); + if (dc->nlevels != 1) + one_level_only = 0; if (dc->nlevels != 1 || dc->ranges[0].upper->bits != 1) one_bit_only = 0; } + if (! one_bit_only && ! d->aux_data && + (d->stpi_dither_type & (D_ORDERED_SEGMENTED | D_ORDERED_NEW))) + init_dither_ordered(d, v); if (one_bit_only) { @@ -146,7 +400,51 @@ stpi_dither_ordered(stp_vars_t *v, xerror, xstep, xmod); } } - else + else if (d->stpi_dither_type & D_ORDERED_SEGMENTED) + { + for (x = 0; x < d->dst_width; x ++) + { + if (!mask || (*(mask + d->ptr_offset) & bit)) + { + for (i = 0; i < CHANNEL_COUNT(d); i++) + { + stpi_dither_channel_t *dc = &CHANNEL(d, i); + stpi_ordered_t *s = (stpi_ordered_t *) dc->aux_data; + unsigned short bits = raw[i] >> s->shift; + unsigned short val = raw[i] << dc->signif_bits; + val |= val >> s->shift; + + if (bits) + { + if (val && + val >= ditherpoint(d, &(CHANNEL(d, i).dithermat), x)) + { + int j; + unsigned char *tptr = dc->ptr + d->ptr_offset; + set_row_ends(dc, x); + for (j = 1; j <= bits; j += j, tptr += length) + { + if (j & bits) + tptr[0] |= bit; + } + } + } + else if (CHANNEL(d, i).ptr && val) + { + if (d->stpi_dither_type & D_ORDERED_NEW) + print_color_ordered_new(d, &(CHANNEL(d, i)), val, x, + row, bit, length); + else + print_color_ordered(d, &(CHANNEL(d, i)), val, x, + row, bit, length); + } + } + } + ADVANCE_UNIDIRECTIONAL(d, bit, raw, CHANNEL_COUNT(d), + xerror, xstep, xmod); + } + } + else if (one_level_only || !(d->stpi_dither_type == D_ORDERED_NEW)) { for (x = 0; x != d->dst_width; x ++) { @@ -163,4 +461,21 @@ stpi_dither_ordered(stp_vars_t *v, xstep, xmod); } } + else + { + for (x = 0; x != d->dst_width; x ++) + { + if (!mask || (*(mask + d->ptr_offset) & bit)) + { + for (i = 0; i < CHANNEL_COUNT(d); i++) + { + if (CHANNEL(d, i).ptr && raw[i]) + print_color_ordered_new(d, &(CHANNEL(d, i)), raw[i], x, + row, bit, length); + } + } + ADVANCE_UNIDIRECTIONAL(d, bit, raw, CHANNEL_COUNT(d), xerror, + xstep, xmod); + } + } } diff --git a/src/main/escp2-channels.c b/src/main/escp2-channels.c index 1a8cc5d..1ca2c94 100644 --- a/src/main/escp2-channels.c +++ b/src/main/escp2-channels.c @@ -1,5 +1,5 @@ /* - * "$Id: escp2-channels.c,v 1.62.8.3 2007/12/29 20:42:26 rlk Exp $" + * "$Id: escp2-channels.c,v 1.75 2008/02/27 00:43:37 rlk Exp $" * * Print plug-in EPSON ESC/P2 driver for the GIMP. * @@ -285,380 +285,380 @@ static hue_curve_t picturemate_blue_curve = static const physical_subchannel_t standard_black_subchannels[] = { - { 0, -1, 0, 0, "BlackDensity", NULL } + { 0, -1, 0, 0, "BlackDensity", NULL, NULL, NULL } }; DECLARE_INK_CHANNEL(standard_black); static const physical_subchannel_t f360_black_subchannels[] = { - { 0, 0, 1, 0, "BlackDensity", NULL } + { 0, 0, 1, 0, "BlackDensity", NULL, NULL, NULL } }; DECLARE_INK_CHANNEL(f360_black); static const physical_subchannel_t x80_black_subchannels[] = { - { 0, -1, 48, 0, "BlackDensity", NULL } + { 0, -1, 48, 0, "BlackDensity", NULL, NULL, NULL } }; DECLARE_INK_CHANNEL(x80_black); static const physical_subchannel_t c80_black_subchannels[] = { - { 0, -1, 0, 0, "BlackDensity", NULL } + { 0, -1, 0, 0, "BlackDensity", NULL, NULL, NULL } }; DECLARE_INK_CHANNEL(c80_black); static const physical_subchannel_t c120_black_subchannels[] = { - { 0, 4, 0, 2, "BlackDensity", NULL, { 0, 0x40 } } + { 0, 4, 0, 2, "BlackDensity", NULL, NULL, NULL, { 0, 0x40 } } }; DECLARE_INK_CHANNEL(c120_black); static const physical_subchannel_t c64_black_subchannels[] = { - { 0, -1, 0, 0, "BlackDensity", NULL } + { 0, -1, 0, 0, "BlackDensity", NULL, NULL, NULL } }; DECLARE_INK_CHANNEL(c64_black); static const physical_subchannel_t standard_cyan_subchannels[] = { - { 2, -1, 0, 0, "CyanDensity", NULL } + { 2, -1, 0, 0, "CyanDensity", NULL, NULL, NULL } }; DECLARE_INK_CHANNEL(standard_cyan); static const physical_subchannel_t f360_standard_cyan_subchannels[] = { - { 2, -1, 1, 0, "CyanDensity", NULL } + { 2, -1, 1, 0, "CyanDensity", NULL, NULL, NULL } }; DECLARE_INK_CHANNEL(f360_standard_cyan); static const physical_subchannel_t r800_cyan_subchannels[] = { - { 2, -1, 1, 0, "CyanDensity", NULL } + { 2, -1, 1, 0, "CyanDensity", NULL, NULL, NULL } }; DECLARE_EXTENDED_INK_CHANNEL(r800_cyan); static const physical_subchannel_t picturemate_cyan_subchannels[] = { - { 2, -1, 0, 0, "CyanDensity", NULL } + { 2, -1, 0, 0, "CyanDensity", NULL, NULL, NULL } }; DECLARE_EXTENDED_INK_CHANNEL(picturemate_cyan); static const physical_subchannel_t cx3650_standard_cyan_subchannels[] = { - { 2, -1, 2, 0, "CyanDensity", NULL } + { 2, -1, 2, 0, "CyanDensity", NULL, NULL, NULL } }; DECLARE_INK_CHANNEL(cx3650_standard_cyan); static const physical_subchannel_t x80_cyan_subchannels[] = { - { 2, -1, 96, 0, "CyanDensity", NULL } + { 2, -1, 96, 0, "CyanDensity", NULL, NULL, NULL } }; DECLARE_INK_CHANNEL(x80_cyan); static const physical_subchannel_t c80_cyan_subchannels[] = { - { 2, -1, 0, 0, "CyanDensity", NULL } + { 2, -1, 0, 0, "CyanDensity", NULL, NULL, NULL } }; DECLARE_INK_CHANNEL(c80_cyan); static const physical_subchannel_t c120_cyan_subchannels[] = { - { 2, -1, 0, 0, "CyanDensity", NULL } + { 2, -1, 0, 0, "CyanDensity", NULL, NULL, NULL } }; DECLARE_INK_CHANNEL(c120_cyan); static const physical_subchannel_t c64_cyan_subchannels[] = { - { 2, -1, 0, 0, "CyanDensity", NULL } + { 2, -1, 0, 0, "CyanDensity", NULL, NULL, NULL } }; DECLARE_INK_CHANNEL(c64_cyan); static const physical_subchannel_t standard_magenta_subchannels[] = { - { 1, -1, 0, 0, "MagentaDensity", NULL } + { 1, -1, 0, 0, "MagentaDensity", NULL, NULL, NULL } }; DECLARE_INK_CHANNEL(standard_magenta); static const physical_subchannel_t r800_magenta_subchannels[] = { - { 1, -1, 0, 0, "MagentaDensity", NULL } + { 1, -1, 0, 0, "MagentaDensity", NULL, NULL, NULL } }; DECLARE_EXTENDED_INK_CHANNEL(r800_magenta); static const physical_subchannel_t picturemate_magenta_subchannels[] = { - { 1, -1, 0, 0, "MagentaDensity", NULL } + { 1, -1, 0, 0, "MagentaDensity", NULL, NULL, NULL } }; DECLARE_EXTENDED_INK_CHANNEL(picturemate_magenta); static const physical_subchannel_t f360_standard_magenta_subchannels[] = { - { 1, -1, 1, 0, "MagentaDensity", NULL } + { 1, -1, 1, 0, "MagentaDensity", NULL, NULL, NULL } }; DECLARE_INK_CHANNEL(f360_standard_magenta); static const physical_subchannel_t x80_magenta_subchannels[] = { - { 1, -1, 48, 0, "MagentaDensity", NULL } + { 1, -1, 48, 0, "MagentaDensity", NULL, NULL, NULL } }; DECLARE_INK_CHANNEL(x80_magenta); static const physical_subchannel_t c80_magenta_subchannels[] = { - { 1, -1, 120, 0, "MagentaDensity", NULL } + { 1, -1, 120, 0, "MagentaDensity", NULL, NULL, NULL } }; DECLARE_INK_CHANNEL(c80_magenta); static const physical_subchannel_t c120_magenta_subchannels[] = { - { 1, -1, 120, 0, "MagentaDensity", NULL } + { 1, -1, 120, 0, "MagentaDensity", NULL, NULL, NULL } }; DECLARE_INK_CHANNEL(c120_magenta); static const physical_subchannel_t c64_magenta_subchannels[] = { - { 1, -1, 90, 0, "MagentaDensity", NULL } + { 1, -1, 90, 0, "MagentaDensity", NULL, NULL, NULL } }; DECLARE_INK_CHANNEL(c64_magenta); static const physical_subchannel_t standard_yellow_subchannels[] = { - { 4, -1, 0, 0, "YellowDensity", NULL } + { 4, -1, 0, 0, "YellowDensity", NULL, NULL, NULL } }; DECLARE_INK_CHANNEL(standard_yellow); static const physical_subchannel_t x80_yellow_subchannels[] = { - { 4, -1, 0, 0, "YellowDensity", NULL } + { 4, -1, 0, 0, "YellowDensity", NULL, NULL, NULL } }; DECLARE_INK_CHANNEL(x80_yellow); static const physical_subchannel_t c80_yellow_subchannels[] = { - { 4, -1, 240, 0, "YellowDensity", NULL } + { 4, -1, 240, 0, "YellowDensity", NULL, NULL, NULL } }; DECLARE_INK_CHANNEL(c80_yellow); static const physical_subchannel_t c120_yellow_subchannels[] = { - { 4, -1, 240, 0, "YellowDensity", NULL } + { 4, -1, 240, 0, "YellowDensity", NULL, NULL, NULL } }; DECLARE_INK_CHANNEL(c120_yellow); static const physical_subchannel_t c64_yellow_subchannels[] = { - { 4, -1, 180, 0, "YellowDensity", NULL } + { 4, -1, 180, 0, "YellowDensity", NULL, NULL, NULL } }; DECLARE_INK_CHANNEL(c64_yellow); static const physical_subchannel_t f360_standard_yellow_subchannels[] = { - { 4, -1, 1, 0, "YellowDensity", NULL } + { 4, -1, 1, 0, "YellowDensity", NULL, NULL, NULL } }; DECLARE_INK_CHANNEL(f360_standard_yellow); static const physical_subchannel_t r800_yellow_subchannels[] = { - { 4, -1, 1, 0, "YellowDensity", NULL } + { 4, -1, 1, 0, "YellowDensity", NULL, NULL, NULL } }; DECLARE_EXTENDED_INK_CHANNEL(r800_yellow); static const physical_subchannel_t picturemate_yellow_subchannels[] = { - { 4, -1, 0, 0, "YellowDensity", NULL } + { 4, -1, 0, 0, "YellowDensity", NULL, NULL, NULL } }; DECLARE_EXTENDED_INK_CHANNEL(picturemate_yellow); static const physical_subchannel_t r800_red_subchannels[] = { - { 7, -1, 0, 0, "RedDensity", NULL } + { 7, -1, 0, 0, "RedDensity", NULL, NULL, NULL } }; DECLARE_EXTENDED_INK_CHANNEL(r800_red); static const physical_subchannel_t picturemate_red_subchannels[] = { - { 7, -1, 0, 0, "RedDensity", NULL } + { 7, -1, 0, 0, "RedDensity", NULL, NULL, NULL } }; DECLARE_EXTENDED_INK_CHANNEL(picturemate_red); static const physical_subchannel_t r800_blue_subchannels[] = { - { 8, -1, 1, 0, "BlueDensity", NULL } + { 8, -1, 1, 0, "BlueDensity", NULL, NULL, NULL } }; DECLARE_EXTENDED_INK_CHANNEL(r800_blue); static const physical_subchannel_t picturemate_blue_subchannels[] = { - { 8, -1, 1, 0, "BlueDensity", NULL } + { 8, -1, 1, 0, "BlueDensity", NULL, NULL, NULL } }; DECLARE_EXTENDED_INK_CHANNEL(picturemate_blue); static const physical_subchannel_t standard_gloss_subchannels[] = { - { 9, -1, 0, 0, "GlossDensity", NULL } + { 9, -1, 0, 0, "GlossDensity", NULL, NULL, NULL } }; DECLARE_INK_CHANNEL(standard_gloss); static const physical_subchannel_t f360_gloss_subchannels[] = { - { 9, -1, 1, 0, "GlossDensity", NULL } + { 9, -1, 1, 0, "GlossDensity", NULL, NULL, NULL } }; DECLARE_INK_CHANNEL(f360_gloss); static const physical_subchannel_t standard_photo_black_subchannels[] = { - { 0, 4, 0, 0, "BlackDensity", NULL } + { 0, 4, 0, 0, "BlackDensity", NULL, NULL, NULL } }; DECLARE_INK_CHANNEL(standard_photo_black); static const physical_subchannel_t f360_photo_black_subchannels[] = { - { 0, 4, 1, 0, "BlackDensity", NULL } + { 0, 4, 1, 0, "BlackDensity", NULL, NULL, NULL } }; DECLARE_INK_CHANNEL(f360_photo_black); static const physical_subchannel_t r800_matte_black_subchannels[] = { - { 0, 0, 0, 0, "BlackDensity", NULL } + { 0, 0, 0, 0, "BlackDensity", NULL, NULL, NULL } }; DECLARE_INK_CHANNEL(r800_matte_black); static const physical_subchannel_t photo_black_subchannels[] = { - { 0, 0, 0, 0, "BlackDensity", NULL } + { 0, 0, 0, 0, "BlackDensity", NULL, NULL, NULL } }; DECLARE_INK_CHANNEL(photo_black); static const physical_subchannel_t extended_black_subchannels[] = { - { 0, 1, 0, 0, "BlackDensity", NULL } + { 0, 1, 0, 0, "BlackDensity", NULL, NULL, NULL } }; DECLARE_INK_CHANNEL(extended_black); static const physical_subchannel_t f360_extended_black_subchannels[] = { - { 0, 1, 1, 0, "BlackDensity", NULL } + { 0, 1, 1, 0, "BlackDensity", NULL, NULL, NULL } }; DECLARE_INK_CHANNEL(f360_extended_black); static const physical_subchannel_t photo_cyan_subchannels[] = { - { 2, 0, 0, 0, "CyanDensity", NULL }, - { 2, 1, 0, 0, "CyanDensity", "LightCyanTransition" } + { 2, 0, 0, 0, "CyanDensity", "LightCyanTransition", NULL, NULL }, + { 2, 1, 0, 0, "CyanDensity", "LightCyanTransition", "LightCyanValue", "LightCyanScale" } }; DECLARE_INK_CHANNEL(photo_cyan); static const physical_subchannel_t extended_cyan_subchannels[] = { - { 2, 1, 0, 0, "CyanDensity", NULL } + { 2, 1, 0, 0, "CyanDensity", NULL, NULL, NULL } }; DECLARE_INK_CHANNEL(extended_cyan); static const physical_subchannel_t f360_extended_cyan_subchannels[] = { - { 2, 1, 1, 0, "CyanDensity", NULL } + { 2, 1, 1, 0, "CyanDensity", NULL, NULL, NULL } }; DECLARE_INK_CHANNEL(f360_extended_cyan); static const physical_subchannel_t photo_magenta_subchannels[] = { - { 1, 0, 0, 0, "MagentaDensity", NULL }, - { 1, 1, 0, 0, "MagentaDensity", "LightMagentaTransition" } + { 1, 0, 0, 0, "MagentaDensity", "LightMagentaTransition", NULL, NULL }, + { 1, 1, 0, 0, "MagentaDensity", "LightMagentaTransition", "LightMagentaValue", "LightMagentaScale" } }; DECLARE_INK_CHANNEL(photo_magenta); static const physical_subchannel_t extended_magenta_subchannels[] = { - { 1, 1, 0, 0, "MagentaDensity", NULL } + { 1, 1, 0, 0, "MagentaDensity", NULL, NULL, NULL } }; DECLARE_INK_CHANNEL(extended_magenta); static const physical_subchannel_t f360_extended_magenta_subchannels[] = { - { 1, 1, 1, 0, "MagentaDensity", NULL } + { 1, 1, 1, 0, "MagentaDensity", NULL, NULL, NULL } }; DECLARE_INK_CHANNEL(f360_extended_magenta); static const physical_subchannel_t photo_yellow_subchannels[] = { - { 4, 0, 0, 0, "YellowDensity", NULL } + { 4, 0, 0, 0, "YellowDensity", NULL, NULL, NULL } }; DECLARE_INK_CHANNEL(photo_yellow); static const physical_subchannel_t f360_photo_yellow_subchannels[] = { - { 4, 0, 1, 0, "YellowDensity", NULL } + { 4, 0, 1, 0, "YellowDensity", NULL, NULL, NULL } }; DECLARE_INK_CHANNEL(f360_photo_yellow); static const physical_subchannel_t j_extended_yellow_subchannels[] = { - { 4, 2, 0, 0, "YellowDensity", NULL } + { 4, 2, 0, 0, "YellowDensity", NULL, NULL, NULL } }; DECLARE_INK_CHANNEL(j_extended_yellow); static const physical_subchannel_t extended_photo3_black_subchannels[] = { - { 0, 3, 0, 0, "BlackDensity", NULL } + { 0, 3, 0, 0, "BlackDensity", NULL, NULL, NULL } }; DECLARE_INK_CHANNEL(extended_photo3_black); static const physical_subchannel_t f360_extended_photo3_black_subchannels[] = { - { 0, 3, 1, 0, "BlackDensity", NULL } + { 0, 3, 1, 0, "BlackDensity", NULL, NULL, NULL } }; DECLARE_INK_CHANNEL(f360_extended_photo3_black); @@ -666,200 +666,200 @@ DECLARE_INK_CHANNEL(f360_extended_photo3_black); /* For Japanese 7-color printers, with dark yellow */ static const physical_subchannel_t photo2_yellow_subchannels[] = { - { 4, 2, 0, 0, "YellowDensity", NULL }, - { 4, 0, 0, 0, "YellowDensity", "DarkYellowTransition" } + { 4, 2, 0, 0, "YellowDensity", "DarkYellowTransition", NULL, NULL }, + { 4, 0, 0, 0, "YellowDensity", "DarkYellowTransition", "DarkYellowValue", "DarkYellowScale" } }; DECLARE_INK_CHANNEL(photo2_yellow); static const physical_subchannel_t f360_photo2_yellow_subchannels[] = { - { 4, 2, 0, 0, "YellowDensity", NULL }, - { 4, 0, 1, 0, "YellowDensity", "DarkYellowTransition" } + { 4, 2, 0, 0, "YellowDensity", "DarkYellowTransition", NULL, NULL }, + { 4, 0, 1, 0, "YellowDensity", "DarkYellowTransition", "DarkYellowValue", "DarkYellowScale" } }; DECLARE_INK_CHANNEL(f360_photo2_yellow); static const physical_subchannel_t photo2_black_subchannels[] = { - { 0, 0, 0, 0, "BlackDensity", NULL }, - { 0, 1, 0, 0, "BlackDensity", "GrayTransition" } + { 0, 0, 0, 0, "BlackDensity", "GrayTransition", NULL, NULL }, + { 0, 1, 0, 0, "BlackDensity", "GrayTransition", "GrayValue", "GrayScale" } }; DECLARE_INK_CHANNEL(photo2_black); static const physical_subchannel_t f360_photo2_black_subchannels[] = { - { 0, 0, 1, 0, "BlackDensity", NULL }, - { 0, 1, 0, 0, "BlackDensity", "GrayTransition" } + { 0, 0, 1, 0, "BlackDensity", "GrayTransition", NULL, NULL }, + { 0, 1, 0, 0, "BlackDensity", "GrayTransition", "GrayValue", "GrayScale" } }; DECLARE_INK_CHANNEL(f360_photo2_black); static const physical_subchannel_t photo3_black_subchannels[] = { - { 0, 0, 0, 0, "BlackDensity", NULL }, - { 0, 1, 0, 0, "BlackDensity", "DarkGrayTransition" }, - { 0, 3, 0, 0, "BlackDensity", "LightGrayTransition" } + { 0, 0, 0, 0, "BlackDensity", "GrayTransition", NULL, NULL }, + { 0, 1, 0, 0, "BlackDensity", "GrayTransition", "DarkGrayValue", "DarkGrayScale" }, + { 0, 3, 0, 0, "BlackDensity", "GrayTransition", "LightGrayValue", "LightGrayScale" } }; DECLARE_INK_CHANNEL(photo3_black); static const physical_subchannel_t f360_photo3_black_subchannels[] = { - { 0, 0, 1, 0, "BlackDensity", NULL }, - { 0, 1, 0, 0, "BlackDensity", "DarkGrayTransition" }, - { 0, 3, 1, 0, "BlackDensity", "LightGrayTransition" } + { 0, 0, 1, 0, "BlackDensity", NULL, NULL, NULL }, + { 0, 1, 0, 0, "BlackDensity", "DarkGrayTransition", "DarkGrayValue", "DarkGrayScale" }, + { 0, 3, 1, 0, "BlackDensity", "LightGrayTransition", "LightGrayValue", "LightGrayScale" } }; DECLARE_INK_CHANNEL(f360_photo3_black); static const physical_subchannel_t quadtone_subchannels[] = { - { 0, -1, 0, 0, "BlackDensity", NULL }, - { 2, -1, 0, 0, "BlackDensity", "Gray3Transition" }, - { 1, -1, 0, 0, "BlackDensity", "Gray2Transition" }, - { 4, -1, 0, 0, "BlackDensity", "Gray1Transition" }, + { 0, -1, 0, 0, "BlackDensity", "GrayTransition", NULL, NULL }, + { 2, -1, 0, 0, "BlackDensity", "GrayTransition", "Gray3Value", "Gray3Scale" }, + { 1, -1, 0, 0, "BlackDensity", "GrayTransition", "Gray2Value", "Gray2Scale" }, + { 4, -1, 0, 0, "BlackDensity", "GrayTransition", "Gray1Value", "Gray1Scale" }, }; DECLARE_INK_CHANNEL(quadtone); static const physical_subchannel_t c80_quadtone_subchannels[] = { - { 0, -1, 0, 0, "BlackDensity", NULL }, - { 2, -1, 0, 0, "BlackDensity", "Gray3Transition" }, - { 1, -1, 120, 0, "BlackDensity", "Gray2Transition" }, - { 4, -1, 240, 0, "BlackDensity", "Gray1Transition" }, + { 0, -1, 0, 0, "BlackDensity", "GrayTransition", NULL, NULL }, + { 2, -1, 0, 0, "BlackDensity", "GrayTransition", "Gray3Value", "Gray3Scale" }, + { 1, -1, 120, 0, "BlackDensity", "GrayTransition", "Gray2Value", "Gray2Scale" }, + { 4, -1, 240, 0, "BlackDensity", "GrayTransition", "Gray1Value", "Gray1Scale" }, }; DECLARE_INK_CHANNEL(c80_quadtone); static const physical_subchannel_t c120_quadtone_subchannels[] = { - { 0, 4, 0, 0, "BlackDensity", NULL }, - { 2, -1, 0, 0, "BlackDensity", "Gray3Transition" }, - { 1, -1, 120, 0, "BlackDensity", "Gray2Transition" }, - { 4, -1, 240, 0, "BlackDensity", "Gray1Transition" }, + { 0, 4, 0, 0, "BlackDensity", "GrayTransition", NULL, NULL }, + { 2, -1, 0, 0, "BlackDensity", "GrayTransition", "Gray3Value", "Gray3Scale" }, + { 1, -1, 120, 0, "BlackDensity", "GrayTransition", "Gray2Value", "Gray2Scale" }, + { 4, -1, 240, 0, "BlackDensity", "GrayTransition", "Gray1Value", "Gray1Scale" }, }; DECLARE_INK_CHANNEL(c120_quadtone); static const physical_subchannel_t c64_quadtone_subchannels[] = { - { 0, -1, 0, 0, "BlackDensity", NULL }, - { 2, -1, 0, 0, "BlackDensity", "Gray3Transition" }, - { 1, -1, 90, 0, "BlackDensity", "Gray2Transition" }, - { 4, -1, 180, 0, "BlackDensity", "Gray1Transition" }, + { 0, -1, 0, 0, "BlackDensity", "GrayTransition", NULL, NULL }, + { 2, -1, 0, 0, "BlackDensity", "Gray3Transition", "Gray3Value", "Gray3Scale" }, + { 1, -1, 90, 0, "BlackDensity", "Gray2Transition", "Gray2Value", "Gray2Scale" }, + { 4, -1, 180, 0, "BlackDensity", "Gray1Transition", "Gray1Value", "Gray1Scale" }, }; DECLARE_INK_CHANNEL(c64_quadtone); static const physical_subchannel_t f360_quadtone_subchannels[] = { - { 0, -1, 0, 0, "BlackDensity", NULL }, - { 2, -1, 1, 0, "BlackDensity", "Gray3Transition" }, - { 1, -1, 1, 0, "BlackDensity", "Gray2Transition" }, - { 4, -1, 0, 0, "BlackDensity", "Gray1Transition" }, + { 0, -1, 0, 0, "BlackDensity", "GrayTransition", NULL, NULL }, + { 2, -1, 1, 0, "BlackDensity", "GrayTransition", "Gray3Value", "Gray3Scale" }, + { 1, -1, 1, 0, "BlackDensity", "GrayTransition", "Gray2Value", "Gray2Scale" }, + { 4, -1, 0, 0, "BlackDensity", "GrayTransition", "Gray1Value", "Gray1Scale" }, }; DECLARE_INK_CHANNEL(f360_quadtone); static const physical_subchannel_t cx3650_quadtone_subchannels[] = { - { 0, -1, 0, 0, "BlackDensity", NULL }, - { 2, -1, 2, 0, "BlackDensity", "Gray3Transition" }, - { 1, -1, 1, 0, "BlackDensity", "Gray2Transition" }, - { 4, -1, 0, 0, "BlackDensity", "Gray1Transition" }, + { 0, -1, 0, 0, "BlackDensity", "GrayTransition", NULL, NULL }, + { 2, -1, 2, 0, "BlackDensity", "GrayTransition", "Gray3Value", "Gray3Scale" }, + { 1, -1, 1, 0, "BlackDensity", "GrayTransition", "Gray2Value", "Gray2Scale" }, + { 4, -1, 0, 0, "BlackDensity", "GrayTransition", "Gray1Value", "Gray1Scale" }, }; DECLARE_INK_CHANNEL(cx3650_quadtone); static const physical_subchannel_t f360_photo_cyan_subchannels[] = { - { 2, 0, 1, 0, "CyanDensity", NULL }, - { 2, 1, 0, 0, "CyanDensity", "LightCyanTransition" } + { 2, 0, 1, 0, "CyanDensity", "LightCyanTransition", NULL, NULL }, + { 2, 1, 0, 0, "CyanDensity", "LightCyanTransition", "LightCyanValue", "LightCyanScale" } }; DECLARE_INK_CHANNEL(f360_photo_cyan); static const physical_subchannel_t f360x_photo_cyan_subchannels[] = { - { 2, 0, 0, 0, "CyanDensity", NULL }, - { 2, 1, 1, 0, "CyanDensity", "LightCyanTransition" } + { 2, 0, 0, 0, "CyanDensity", "LightCyanTransition", NULL, NULL }, + { 2, 1, 1, 0, "CyanDensity", "LightCyanTransition", "LightCyanValue", "LightCyanScale" } }; DECLARE_INK_CHANNEL(f360x_photo_cyan); static const physical_subchannel_t f360_photo_magenta_subchannels[] = { - { 1, 0, 1, 0, "MagentaDensity", NULL }, - { 1, 1, 0, 0, "MagentaDensity", "LightMagentaTransition" } + { 1, 0, 1, 0, "MagentaDensity", "LightMagentaTransition", NULL, NULL }, + { 1, 1, 0, 0, "MagentaDensity", "LightMagentaTransition", "LightMagentaValue", "LightMagentaScale" } }; DECLARE_INK_CHANNEL(f360_photo_magenta); static const physical_subchannel_t f360x_photo_magenta_subchannels[] = { - { 1, 0, 0, 0, "MagentaDensity", NULL }, - { 1, 1, 1, 0, "MagentaDensity", "LightMagentaTransition" } + { 1, 0, 0, 0, "MagentaDensity", "LightMagentaTransition", NULL, NULL }, + { 1, 1, 1, 0, "MagentaDensity", "LightMagentaTransition", "LightMagentaValue", "LightMagentaScale" } }; DECLARE_INK_CHANNEL(f360x_photo_magenta); static const physical_subchannel_t claria_black_subchannels[] = { - { 0, 0, 0, 0, "BlackDensity", NULL }, + { 0, 0, 0, 0, "BlackDensity", NULL, NULL, NULL }, }; DECLARE_INK_CHANNEL(claria_black); static const physical_subchannel_t claria_yellow_subchannels[] = { - { 4, 0, 2, 0, "YellowDensity", NULL }, + { 4, 0, 2, 0, "YellowDensity", NULL, NULL, NULL }, }; DECLARE_INK_CHANNEL(claria_yellow); static const physical_subchannel_t claria_cyan_subchannels[] = { - { 2, 0, 0, 0, "CyanDensity", NULL }, + { 2, 0, 0, 0, "CyanDensity", NULL, NULL, NULL }, }; DECLARE_INK_CHANNEL(claria_cyan); static const physical_subchannel_t claria_photo_cyan_subchannels[] = { - { 2, 0, 0, 0, "CyanDensity", NULL }, - { 2, 1, 2, 0, "CyanDensity", "LightCyanTransition" }, + { 2, 0, 0, 0, "CyanDensity", "LightCyanTransition", NULL, NULL }, + { 2, 1, 2, 0, "CyanDensity", "LightCyanTransition", "LightCyanValue", "LightCyanScale" }, }; DECLARE_INK_CHANNEL(claria_photo_cyan); static const physical_subchannel_t extended_claria_cyan_subchannels[] = { - { 2, 1, 2, 0, "CyanDensity", "LightCyanTransition" }, + { 2, 1, 2, 0, "CyanDensity", NULL, NULL, NULL }, }; DECLARE_INK_CHANNEL(extended_claria_cyan); static const physical_subchannel_t claria_magenta_subchannels[] = { - { 1, 0, 2, 0, "MagentaDensity", NULL }, + { 1, 0, 2, 0, "MagentaDensity", NULL, NULL, NULL }, }; DECLARE_INK_CHANNEL(claria_magenta); static const physical_subchannel_t claria_photo_magenta_subchannels[] = { - { 1, 0, 2, 0, "MagentaDensity", NULL }, - { 1, 1, 0, 0, "MagentaDensity", "LightMagentaTransition" }, + { 1, 0, 2, 0, "MagentaDensity", "LightMagentaTransition", NULL, NULL }, + { 1, 1, 0, 0, "MagentaDensity", "LightMagentaTransition", "LightMagentaValue", "LightMagentaScale" }, }; DECLARE_INK_CHANNEL(claria_photo_magenta); static const physical_subchannel_t extended_claria_magenta_subchannels[] = { - { 1, 1, 0, 0, "MagentaDensity", "LightMagentaTransition" }, + { 1, 1, 0, 0, "MagentaDensity", NULL, NULL, NULL }, }; DECLARE_INK_CHANNEL(extended_claria_magenta); @@ -1453,6 +1453,20 @@ static const escp2_inkname_t claria_four_color_standard_inkset = &claria_cmyk_channel_set }; +static const ink_channel_t *const four_color_picturemate_channels[] = +{ + &photo_black_channel, &picturemate_cyan_channel, + &picturemate_magenta_channel, &picturemate_yellow_channel +}; + +DECLARE_CHANNEL_SET(four_color_picturemate); + +static const escp2_inkname_t four_color_picturemate_inkset = +{ + "CMYK", N_("Four Color Photo"), INKSET_CMYK, + &four_color_picturemate_channel_set +}; + /* **************************************************************** @@ -2116,6 +2130,12 @@ static const escp2_inkname_t claria_four_color_extended_inkset = &claria_cmyk_channel_set }; +static const escp2_inkname_t four_color_picturemate_extended_inkset = +{ + "PhysicalCMYK", N_("Four Color Raw"), INKSET_EXTENDED, + &four_color_picturemate_channel_set +}; + static const escp2_inkname_t four_color_r800_extended_inkset = { "PhysicalCMYKGloss", N_("Four Color Raw"), INKSET_EXTENDED, @@ -2795,14 +2815,25 @@ static const escp2_inkname_t *const cmykrb_photo_ink_types[] = DECLARE_INKLIST("cmykrbphoto", cmykrb_photo, cmykrb_photo, N_("Photo Black"), r800, r800_photo, standard); -static const escp2_inkname_t *const picturemate_photo_ink_types[] = +static const escp2_inkname_t *const picturemate_6_photo_ink_types[] = { &six_color_picturemate_inkset, + &four_color_picturemate_inkset, &six_color_picturemate_extended_inkset, + &four_color_picturemate_extended_inkset, +}; + +DECLARE_INKLIST("picturemate_6", picturemate_6, picturemate_6_photo, + N_("Standard"), picturemate, picturemate_6, standard); + +static const escp2_inkname_t *const picturemate_4_photo_ink_types[] = +{ + &four_color_picturemate_inkset, + &four_color_picturemate_extended_inkset, }; -DECLARE_INKLIST("picturemate", picturemate, picturemate_photo, - N_("Standard"), picturemate, picturemate, standard); +DECLARE_INKLIST("picturemate_4", picturemate_4, picturemate_4_photo, + N_("Standard"), picturemate, picturemate_4, standard); #define DECLARE_INKGROUP(name) \ @@ -2968,12 +2999,19 @@ static const inklist_t *const cmykrb_group[] = DECLARE_INKGROUP(cmykrb); -static const inklist_t *const picturemate_group[] = +static const inklist_t *const picturemate_4_group[] = { - &picturemate_inklist, + &picturemate_4_inklist, }; -DECLARE_INKGROUP(picturemate); +DECLARE_INKGROUP(picturemate_4); + +static const inklist_t *const picturemate_6_group[] = +{ + &picturemate_6_inklist, +}; + +DECLARE_INKGROUP(picturemate_6); static const inklist_t *const claria_group[] = { @@ -3010,7 +3048,8 @@ static const ink_t the_inks[] = { "f360_ultrachrome", &f360_ultrachrome_inkgroup }, { "f360_ultrachrome_k3", &f360_ultrachrome_k3_inkgroup }, { "cmykrb", &cmykrb_inkgroup }, - { "picturemate", &picturemate_inkgroup }, + { "picturemate_6", &picturemate_6_inkgroup }, + { "picturemate_4", &picturemate_4_inkgroup }, { "claria", &claria_inkgroup }, }; @@ -3172,7 +3211,7 @@ static const char *r800_channel_names[] = DECLARE_CHANNEL_LIST(r800); -static const char *picturemate_channel_names[] = +static const char *picturemate_6_channel_names[] = { N_("Yellow"), N_("Magenta"), @@ -3182,7 +3221,17 @@ static const char *picturemate_channel_names[] = N_("Blue"), }; -DECLARE_CHANNEL_LIST(picturemate); +DECLARE_CHANNEL_LIST(picturemate_6); + +static const char *picturemate_4_channel_names[] = +{ + N_("Yellow"), + N_("Magenta"), + N_("Cyan"), + N_("Black"), +}; + +DECLARE_CHANNEL_LIST(picturemate_4); static const char *r2400_channel_names[] = { @@ -3209,7 +3258,8 @@ static const channel_t the_channels[] = { "cx3800", &cx3800_channel_name_list }, { "mfp2005", &mfp2005_channel_name_list }, { "photo", &photo_channel_name_list }, - { "picturemate", &picturemate_channel_name_list }, + { "picturemate_6", &picturemate_6_channel_name_list }, + { "picturemate_4", &picturemate_4_channel_name_list }, { "pm_950c", &pm_950c_channel_name_list }, { "r2400", &r2400_channel_name_list }, { "sp1400", &sp1400_channel_name_list }, diff --git a/src/main/escp2-driver.c b/src/main/escp2-driver.c index 4e0ecbd..af8e005 100644 --- a/src/main/escp2-driver.c +++ b/src/main/escp2-driver.c @@ -1,5 +1,5 @@ /* - * "$Id: escp2-driver.c,v 1.30.6.3 2007/12/30 05:37:55 rlk Exp $" + * "$Id: escp2-driver.c,v 1.38 2007/12/30 05:38:44 rlk Exp $" * * Print plug-in EPSON ESC/P2 driver for the GIMP. * diff --git a/src/main/escp2-inks.c b/src/main/escp2-inks.c index e3d93a6..b772744 100644 --- a/src/main/escp2-inks.c +++ b/src/main/escp2-inks.c @@ -1,5 +1,5 @@ /* - * "$Id: escp2-inks.c,v 1.46.10.3 2007/12/29 20:42:26 rlk Exp $" + * "$Id: escp2-inks.c,v 1.62 2008/02/03 03:41:43 rlk Exp $" * * Print plug-in EPSON ESC/P2 driver for the GIMP. * @@ -152,21 +152,21 @@ static const escp2_dropsize_t escp2_r300_2880_1440_dropsizes = * and 0x25. The economy settings (0x10 and 0x0) don't provide any * bigger drops. We get quite smooth output at 720x360 and 360 DPI, and * even 360x180 is surprisingly smooth. - * Roy Harrington estimates the drop sizes are: + * Roy Harrington's estimates in first column; my remeasurements in second: * - * 1 1.5 pl - * 2 2.4 pl - * 3 6.3 pl - * 4 12 pl (rlk estimate) - * 5 21 pl + * 1 1.5 pl 1.5 pl + * 2 2.4 pl 1.8 pl + * 3 6.3 pl 4.5 pl + * 4 12 pl (rlk estimate) 8.0 pl + * 5 21 pl 11 pl (+/- 1 pl) */ static const escp2_dropsize_t escp2_claria_720_dropsizes = - { "claria_720", 3, { 0.071, 0.3, 1.0 } }; + { "claria_720", 3, { 0.125, 0.42, 1.0 } }; static const escp2_dropsize_t escp2_claria_1440_dropsizes = - { "claria_1440", 3, { 0.23, 0.37, 1.0 } }; + { "claria_1440", 3, { 0.338, 0.40, 1.0 } }; static const escp2_dropsize_t escp2_claria_2880_dropsizes = - { "claria_2880", 2, { 0.62, 1.0 } }; + { "claria_2880", 2, { 0.833, 1.0 } }; static const escp2_dropsize_t escp2_claria_5760_dropsizes = { "claria_5760", 1, { 1.0 } }; @@ -183,13 +183,13 @@ static const escp2_dropsize_t escp2_claria_5760_dropsizes = */ static const escp2_dropsize_t escp2_claria_1400_720_dropsizes = - { "claria_1400_720", 3, { 0.3, 0.57, 1.0 } }; + { "claria_1400_720", 3, { 0.42, 0.67, 1.0 } }; static const escp2_dropsize_t escp2_claria_1400_1440_720_dropsizes = - { "claria_1400_1440_720", 3, { 0.071, 0.3, 1.0 } }; + { "claria_1400_1440_720", 3, { 0.125, 0.42, 1.0 } }; static const escp2_dropsize_t escp2_claria_1400_1440_dropsizes = - { "claria_1400_1440", 3, { 0.23, 0.37, 1.0 } }; + { "claria_1400_1440", 3, { 0.338, 0.40, 1.0 } }; static const escp2_dropsize_t escp2_claria_1400_2880_dropsizes = - { "claria_1400_2880", 2, { 0.62, 1.0 } }; + { "claria_1400_2880", 2, { 0.833, 1.0 } }; static const escp2_dropsize_t escp2_claria_1400_5760_dropsizes = { "claria_1400_5760", 1, { 1.0 } }; @@ -376,7 +376,7 @@ static const escp2_drop_list_t claria_drops = &escp2_claria_720_dropsizes, &escp2_claria_720_dropsizes, &escp2_claria_720_dropsizes, - &escp2_claria_1440_dropsizes, + &escp2_claria_720_dropsizes, &escp2_claria_1440_dropsizes, &escp2_claria_2880_dropsizes, &escp2_claria_5760_dropsizes, @@ -389,7 +389,7 @@ static const escp2_drop_list_t claria_1400_drops = &escp2_claria_1400_720_dropsizes, &escp2_claria_1400_720_dropsizes, &escp2_claria_1400_1440_720_dropsizes, - &escp2_claria_1400_1440_dropsizes, + &escp2_claria_1400_1440_720_dropsizes, &escp2_claria_1400_1440_dropsizes, &escp2_claria_1400_2880_dropsizes, &escp2_claria_1400_5760_dropsizes, diff --git a/src/main/escp2-papers.c b/src/main/escp2-papers.c index 1cdc837..42a9fe5 100644 --- a/src/main/escp2-papers.c +++ b/src/main/escp2-papers.c @@ -1,5 +1,5 @@ /* - * "$Id: escp2-papers.c,v 1.99.8.3 2007/12/29 20:42:26 rlk Exp $" + * "$Id: escp2-papers.c,v 1.108 2008/02/27 00:43:37 rlk Exp $" * * Print plug-in EPSON ESC/P2 driver for the GIMP. * @@ -1194,7 +1194,7 @@ static const paper_adjustment_t r800_matte_adjustments[] = DECLARE_PAPER_ADJUSTMENTS(r800_matte); -static const paper_adjustment_t picturemate_adjustments[] = +static const paper_adjustment_t picturemate_6_adjustments[] = { { "GlossyPhoto", 1.00, 1, 1, .02, 2.0, .882, 1, .250, 1, 1, 0.92, r800_glossy_hue_adj, r800_glossy_lum_adj, r800_glossy_sat_adj }, @@ -1202,7 +1202,17 @@ static const paper_adjustment_t picturemate_adjustments[] = r800_glossy_hue_adj, r800_glossy_lum_adj, r800_glossy_sat_adj }, }; -DECLARE_PAPER_ADJUSTMENTS(picturemate); +DECLARE_PAPER_ADJUSTMENTS(picturemate_6); + +static const paper_adjustment_t picturemate_4_adjustments[] = +{ + { "GlossyPhoto", 1.00, 1, 1, .02, 2.0, .882, 1, .250, 1, 1, 0.92, + r800_glossy_hue_adj, r800_glossy_lum_adj, r800_glossy_sat_adj }, + { "Other", 0.878, .1, 1, .02, 2.0, .882, 1, .250, 1, 1, 1.0, + r800_glossy_hue_adj, r800_glossy_lum_adj, r800_glossy_sat_adj }, +}; + +DECLARE_PAPER_ADJUSTMENTS(picturemate_4); static const paper_adjustment_t durabrite_adjustments[] = { @@ -1674,7 +1684,8 @@ static const paperadj_t the_adjustments[] = { "ultrachrome_k3_matte", &ultrachrome_k3_matte_paper_adjustment_list }, { "r800_photo", &r800_photo_paper_adjustment_list }, { "r800_matte", &r800_matte_paper_adjustment_list }, - { "picturemate", &picturemate_paper_adjustment_list }, + { "picturemate_4", &picturemate_4_paper_adjustment_list }, + { "picturemate_6", &picturemate_6_paper_adjustment_list }, { "claria", &claria_paper_adjustment_list }, }; diff --git a/src/main/escp2-resolutions.c b/src/main/escp2-resolutions.c index 17a480a..76d8313 100644 --- a/src/main/escp2-resolutions.c +++ b/src/main/escp2-resolutions.c @@ -1,5 +1,5 @@ /* - * "$Id: escp2-resolutions.c,v 1.33.8.3 2007/12/15 20:35:44 rlk Exp $" + * "$Id: escp2-resolutions.c,v 1.44 2008/02/24 04:08:05 rlk Exp $" * * Print plug-in EPSON ESC/P2 driver for the GIMP. * @@ -647,6 +647,21 @@ static const quality_t standard_qualities[] = DECLARE_QUALITY_LIST(standard); +static const quality_t v2880_qualities[] = +{ + { "FastEconomy", N_("Fast Economy"), 180, 90, 360, 120, 360, 90 }, + { "Economy", N_("Economy"), 360, 180, 360, 240, 360, 180 }, + { "Draft", N_("Draft"), 360, 360, 360, 360, 360, 360 }, + { "Standard", N_("Standard"), 0, 0, 0, 0, 720, 360 }, + { "High", N_("High"), 0, 0, 0, 0, 720, 720 }, + { "Photo", N_("Photo"), 1440, 720, 2880, 720, 1440, 720 }, + { "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 }, +}; + +DECLARE_QUALITY_LIST(v2880); + static const quality_t p1_5_qualities[] = { { "FastEconomy", N_("Fast Economy"), 180, 90, 360, 120, 360, 90 }, @@ -686,6 +701,7 @@ static const qual_t the_qualities[] = { "standard", &standard_quality_list }, { "p1_5", &p1_5_quality_list }, { "picturemate", &picturemate_quality_list }, + { "v2880", &v2880_quality_list }, }; const quality_list_t * diff --git a/src/main/module.c b/src/main/module.c index f2fdfe6..83d9037 100644 --- a/src/main/module.c +++ b/src/main/module.c @@ -1,5 +1,5 @@ /* - * "$Id: module.c,v 1.25 2004/09/17 18:38:21 rleigh Exp $" + * "$Id: module.c,v 1.26 2006/09/28 15:40:05 m0m Exp $" * * Gutenprint module loader - load modules with libltdl/libdl. * @@ -62,7 +62,7 @@ extern stp_module_t print_escp2_LTX_stp_module_data; extern stp_module_t print_lexmark_LTX_stp_module_data; extern stp_module_t print_pcl_LTX_stp_module_data; extern stp_module_t print_ps_LTX_stp_module_data; -extern stp_module_t print_olympus_LTX_stp_module_data; +extern stp_module_t print_dyesub_LTX_stp_module_data; extern stp_module_t print_raw_LTX_stp_module_data; extern stp_module_t color_traditional_LTX_stp_module_data; @@ -76,7 +76,7 @@ static stp_module_t *static_modules[] = &print_escp2_LTX_stp_module_data, &print_pcl_LTX_stp_module_data, &print_lexmark_LTX_stp_module_data, - &print_olympus_LTX_stp_module_data, + &print_dyesub_LTX_stp_module_data, &print_raw_LTX_stp_module_data, &color_traditional_LTX_stp_module_data, NULL diff --git a/src/main/papers.xml b/src/main/papers.xml index 97b6a40..6aff8fe 100644 --- a/src/main/papers.xml +++ b/src/main/papers.xml @@ -4,7 +4,7 @@ XML description of papers known to libgutenprint. It should be edited by hand. - "$Id: papers.xml,v 1.21.8.2 2007/12/15 20:35:44 rlk Exp $" + "$Id: papers.xml,v 1.28 2008/04/15 00:08:20 rlk Exp $" --> 1.3 1.3 - - 0.7 - 0.6 - 1.7 - 0.9 - 0.6 - @@ -114,6 +107,7 @@ + @@ -122,6 +116,7 @@ + @@ -283,6 +278,8 @@ + + @@ -299,12 +296,15 @@ + + + @@ -361,29 +361,49 @@ + + + + + + + + + - - - + + + + - - - - + + + + + + + + + - + + + + + + @@ -533,10 +553,15 @@ + + + + + @@ -552,7 +577,7 @@ - + @@ -924,7 +949,7 @@ - + diff --git a/src/main/sequence.c b/src/main/sequence.c index 09cb116..9cf5885 100644 --- a/src/main/sequence.c +++ b/src/main/sequence.c @@ -1,5 +1,5 @@ /* - * "$Id: sequence.c,v 1.23.2.1 2007/12/15 20:35:51 rlk Exp $" + * "$Id: sequence.c,v 1.25 2008/01/21 23:19:41 rlk Exp $" * * Sequence data type. This type is designed to be derived from by * the curve and dither matrix types. @@ -140,6 +140,24 @@ stp_sequence_copy(stp_sequence_t *dest, const stp_sequence_t *source) memcpy(dest->data, source->data, (sizeof(double) * source->size)); } +void +stp_sequence_reverse(stp_sequence_t *dest, const stp_sequence_t *source) +{ + int i; + check_sequence(dest); + check_sequence(source); + + dest->recompute_range = source->recompute_range; + dest->blo = source->blo; + dest->bhi = source->bhi; + dest->rlo = source->rlo; + dest->rhi = source->rhi; + dest->size = source->size; + dest->data = stp_zalloc(sizeof(double) * source->size); + for (i = 0; i < source->size; i++) + dest->data[i] = source->data[source->size - i - 1]; +} + stp_sequence_t * stp_sequence_create_copy(const stp_sequence_t *sequence) { @@ -150,6 +168,16 @@ stp_sequence_create_copy(const stp_sequence_t *sequence) return ret; } +stp_sequence_t * +stp_sequence_create_reverse(const stp_sequence_t *sequence) +{ + stp_sequence_t *ret; + check_sequence(sequence); + ret = stp_sequence_create(); + stp_sequence_reverse(ret, sequence); + return ret; +} + int stp_sequence_set_bounds(stp_sequence_t *sequence, double low, double high) { diff --git a/src/main/util.h b/src/main/util.h index 7a3fe61..91165e3 100644 --- a/src/main/util.h +++ b/src/main/util.h @@ -1,5 +1,5 @@ /* - * "$Id: util.h,v 1.33.10.1 2007/03/02 12:01:33 rlk Exp $" + * "$Id: util.h,v 1.34 2007/02/24 21:43:49 faust3 Exp $" * * Gutenprint header. * @@ -70,5 +70,5 @@ extern stp_image_t* stpi_buffer_image(stp_image_t* image, unsigned int flags); #endif /* GUTENPRINT_INTERNAL_UTIL_H */ /* - * End of "$Id: util.h,v 1.33.10.1 2007/03/02 12:01:33 rlk Exp $". + * End of "$Id: util.h,v 1.34 2007/02/24 21:43:49 faust3 Exp $". */ diff --git a/src/main/xml.c b/src/main/xml.c index c43b13b..5c38736 100644 --- a/src/main/xml.c +++ b/src/main/xml.c @@ -1,5 +1,5 @@ /* - * "$Id: xml.c,v 1.33.18.1 2007/05/29 01:47:30 rlk Exp $" + * "$Id: xml.c,v 1.38 2007/05/26 15:53:06 rlk Exp $" * * XML parser - process Gutenprint XML data with mxml. * diff --git a/src/main/xmlppd.c b/src/main/xmlppd.c new file mode 100644 index 0000000..6bd2611 --- /dev/null +++ b/src/main/xmlppd.c @@ -0,0 +1,530 @@ +/* + * "xmlppd.c" + * + * PPD to XML converter. + * + * Copyright 2007 by Michael R Sweet and Robert Krawitz + * + * 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., 51 Franklin Street, Fifth Floor, Boston, MA + * 02110-1301 USA + */ + +#include +#include +#include +#include "xmlppd.h" + +typedef struct +{ + int order; + const char *name; +} order_t; + +static int +order_compare(const void *a, const void *b) +{ + const order_t *aa = (const order_t *)a; + const order_t *bb = (const order_t *)b; + if (aa->order < bb->order) + return -1; + else if (aa->order > bb->order) + return 1; + else + return strcmp(aa->name, bb->name); +} + + +static stp_mxml_node_t * +find_element_named(stp_mxml_node_t *root, const char *name, const char *what) +{ + stp_mxml_node_t *element; + if (root && name) + { + for (element = stp_mxmlFindElement(root, root, what, NULL, NULL, + STP_MXML_DESCEND); + element; + element = stp_mxmlFindElement(element, root, what, NULL, NULL, + STP_MXML_DESCEND)) + { + if (!strcmp(stp_mxmlElementGetAttr(element, "name"), name)) + return element; + } + } + return NULL; +} + +static stp_mxml_node_t * +find_element_index(stp_mxml_node_t *root, int idx, const char *what) +{ + stp_mxml_node_t *element; + int count = 0; + if (root && idx >= 0) + { + for (element = stp_mxmlFindElement(root, root, what, NULL, NULL, + STP_MXML_DESCEND); + element; + element = stp_mxmlFindElement(element, root, what, NULL, NULL, + STP_MXML_DESCEND)) + { + if (count++ == idx) + return element; + } + } + return NULL; +} + +static size_t +find_element_count(stp_mxml_node_t *root, const char *what) +{ + stp_mxml_node_t *element; + size_t count = 0; + if (root) + { + for (element = stp_mxmlFindElement(root, root, what, NULL, NULL, + STP_MXML_DESCEND); + element; + element = stp_mxmlFindElement(element, root, what, NULL, NULL, + STP_MXML_DESCEND)) + count++; + } + return count; +} + +stp_mxml_node_t * +stpi_xmlppd_find_group_named(stp_mxml_node_t *root, const char *name) +{ + return find_element_named(root, name, "group"); +} + +stp_mxml_node_t * +stpi_xmlppd_find_group_index(stp_mxml_node_t *root, int idx) +{ + return find_element_index(root, idx, "group"); +} + +int +stpi_xmlppd_find_group_count(stp_mxml_node_t *root) +{ + return find_element_count(root, "group"); +} + +stp_mxml_node_t * +stpi_xmlppd_find_option_named(stp_mxml_node_t *root, const char *name) +{ + return find_element_named(root, name, "option"); +} + +stp_mxml_node_t * +stpi_xmlppd_find_option_index(stp_mxml_node_t *root, int idx) +{ + return find_element_index(root, idx, "option"); +} + +int +stpi_xmlppd_find_option_count(stp_mxml_node_t *root) +{ + return find_element_count(root, "option"); +} + +stp_mxml_node_t * +stpi_xmlppd_find_choice_named(stp_mxml_node_t *option, const char *name) +{ + return find_element_named(option, name, "choice"); +} + +stp_mxml_node_t * +stpi_xmlppd_find_choice_index(stp_mxml_node_t *option, int idx) +{ + return find_element_index(option, idx, "choice"); +} + +int +stpi_xmlppd_find_choice_count(stp_mxml_node_t *option) +{ + return find_element_count(option, "choice"); +} + +stp_mxml_node_t * +stpi_xmlppd_find_page_size(stp_mxml_node_t *root, const char *name) +{ + return stpi_xmlppd_find_choice_named(stpi_xmlppd_find_option_named(root, "PageSize"), name); +} + +static void +parse_values(const char **data, int limit, char *value) +{ + int dptr = 0; + char *where = value; + char *end = value; + for (dptr = 0; dptr < limit; dptr++) + data[dptr] = NULL; + for (dptr = 0; *where && dptr < limit; dptr++) + { + where = end; + while (*where && isspace(*where)) + where++; + end = where; + while (*end && !isspace(*end)) + end++; + *end++ = '\0'; + data[dptr] = where; + } +} + +/* + * 'read_ppd_file()' - Read a PPD file into XML data. + */ + +stp_mxml_node_t * /* O - PPD file as XML */ +stpi_xmlppd_read_ppd_file(const char *filename) /* I - PPD file */ +{ + stp_mxml_node_t *ppd, /* Root node of "ppd" group */ + *group, /* Current group */ + *option, /* Current option */ + *choice; /* Current choice */ + FILE *fp; /* PPD file */ + int ch, /* Current character */ + sawcolon, /* Saw a colon? */ + inquote, /* In a quoted string? */ + num_choices = 0; + char buffer[32768], /* Line buffer */ + *bufptr, /* Pointer into line */ + *xptr, /* Pointer into line */ + option_name[42], /* Option name */ + stp_option_data_name[64], /* Option name */ + *keyword, /* Pointer to option keyword */ + *text, /* Pointer to text */ + *value; /* Pointer to value */ + order_t *order_array; /* Precedence order of options */ + int i; + int option_count; + int order_length; + char *order_list; + + + /* + * Open the file... + */ + + if ((fp = fopen(filename, "rb")) == NULL) + { + perror(filename); + return (NULL); + } + + /* + * Create the base PPD file tree; the completed tree will look like: + * + * + * + * + * ... + * + * + * + * + */ + +/* xml = stp_mxmlNewXML("1.0"); */ +/* ppd = stp_mxmlNewElement(xml, "ppd"); */ + ppd = stp_mxmlNewElement(STP_MXML_NO_PARENT, "ppd"); + + stp_mxmlElementSetAttr(ppd, "color", "0"); + stp_mxmlElementSetAttr(ppd, "level", "2"); + + /* + * Read all of the lines of the form: + * + * *% comment + * *Keyword: value + * *Keyword OptionKeyword: value + * *Keyword OptionKeyword/Text: value + * + * Only save groups, options, and choices, along with specific metadata + * from the file... + */ + + group = NULL; + option = NULL; + option_name[0] = '\0'; + + while ((ch = getc(fp)) != EOF) + { + /* + * Read the line... + */ + + buffer[0] = ch; + bufptr = buffer + 1; + inquote = 0; + sawcolon = 0; + + while ((ch != '\n' || inquote) && bufptr < (buffer + sizeof(buffer) - 1)) + { + if ((ch = getc(fp)) == '\r') + { + if ((ch = getc(fp)) != '\n') + ungetc(ch, fp); + } + + *bufptr++ = ch; + + if (ch == ':' && !sawcolon) + sawcolon = 1; + else if (ch == '\"' && sawcolon) + inquote = !inquote; + } + + /* + * Strip trailing whitespace... + */ + + for (bufptr --; bufptr > buffer && isspace(bufptr[-1] & 255); bufptr --); + + *bufptr = '\0'; + + /* + * Now parse it... + */ + + if (!strncmp(buffer, "*%", 2) || !buffer[0]) + continue; + + if ((value = strchr(buffer, ':')) == NULL) + continue; + + for (*value++ = '\0'; + *value && (isspace(*value & 255) || (*value & 255) == '"'); + value ++); + for (xptr = value; + *xptr && (*xptr & 255) != '"'; + xptr ++); + if (*xptr == '"') + *xptr = '\0'; + + for (keyword = buffer; *keyword && !isspace(*keyword & 255); keyword ++); + + while (isspace(*keyword & 255)) + *keyword++ = '\0'; + + if ((text = strchr(keyword, '/')) != NULL) + *text++ = '\0'; + + /* + * And then use the parsed values... + */ + + if (!strcmp(buffer, "*ColorDevice")) + { + /* + * Color support... + */ + + if (!strcasecmp(value, "true")) + stp_mxmlElementSetAttr(ppd, "color", "1"); + else + stp_mxmlElementSetAttr(ppd, "color", "0"); + } + else if (!strcmp(buffer, "*LanguageLevel") && atoi(value) > 0) + { + /* + * PostScript language level... + */ + + stp_mxmlElementSetAttr(ppd, "level", value); + } + else if (!strcmp(buffer, "*StpDriverName")) + stp_mxmlElementSetAttr(ppd, "driver", value); + else if (!strcmp(buffer, "*ModelName")) + stp_mxmlElementSetAttr(ppd, "modelname", value); + else if (!strcmp(buffer, "*ShortNickName")) + stp_mxmlElementSetAttr(ppd, "shortnickname", value); + else if (!strcmp(buffer, "*NickName")) + stp_mxmlElementSetAttr(ppd, "nickname", value); + else if (!strcmp(buffer, "*OpenGroup")) + { + if ((text = strchr(value, '/')) != NULL) + *text++ = '\0'; + + group = stp_mxmlNewElement(ppd, "group"); + stp_mxmlElementSetAttr(group, "name", value); + stp_mxmlElementSetAttr(group, "text", text ? text : value); + } + else if (!strcmp(buffer, "*CloseGroup")) + group = NULL; + else if ((!strcmp(buffer, "*OpenUI") || !strcmp(buffer, "*JCLOpenUI")) && + keyword[0] == '*' && keyword[1]) + { + /* + * Start a new option... + */ + + option = stp_mxmlNewElement(group ? group : ppd, "option"); + stp_mxmlElementSetAttr(option, "name", keyword + 1); + stp_mxmlElementSetAttr(option, "text", text ? text : keyword + 1); + stp_mxmlElementSetAttr(option, "ui", value); + + strncpy(option_name, keyword, sizeof(option_name) - 1); + option_name[sizeof(option_name) - 1] = '\0'; + strcpy(stp_option_data_name, "*Stp"); + strcpy(stp_option_data_name + 4, option_name + 1); + if (group) + { + stp_mxmlElementSetAttr(option, "groupname", stp_mxmlElementGetAttr(group, "name")); + stp_mxmlElementSetAttr(option, "grouptext", stp_mxmlElementGetAttr(group, "text")); + } + num_choices = 0; + } + else if (option && !strcmp(buffer, stp_option_data_name)) + { + const char *data[8]; + parse_values(data, 8, value); + if (data[7]) + { + stp_mxmlElementSetAttr(option, "stptype", data[0]); + stp_mxmlElementSetAttr(option, "stpmandatory", data[1]); + stp_mxmlElementSetAttr(option, "stpclass", data[2]); + stp_mxmlElementSetAttr(option, "stplevel", data[3]); + stp_mxmlElementSetAttr(option, "stpchannel", data[4]); + stp_mxmlElementSetAttr(option, "stplower", data[5]); + stp_mxmlElementSetAttr(option, "stpupper", data[6]); + stp_mxmlElementSetAttr(option, "stpdefault", data[7]); + stp_mxmlElementSetAttr(option, "stpname", stp_option_data_name + 7); + } + } + else if (!strcmp(buffer, "*OrderDependency") && option) + { + /* + * Get order and section for option + */ + + char order[256], /* Order number */ + section[256]; /* Section name */ + + + if (sscanf(value, "%255s%255s", order, section) == 2) + { + stp_mxmlElementSetAttr(option, "order", order); + stp_mxmlElementSetAttr(option, "section", section); + } + } + else if (!strncmp(buffer, "*Default", 8) && option && + !strcmp(buffer + 8, option_name + 1)) + stp_mxmlElementSetAttr(option, "default", value); + else if (!strcmp(buffer, "*CloseUI") || !strcmp(buffer, "*JCLCloseUI")) + { + char buf[64]; + (void) sprintf(buf, "%d", num_choices); + stp_mxmlElementSetAttr(option, "num_choices", buf); + option = NULL; + stp_option_data_name[0] = '\0'; + } + else if (option && !strcmp(buffer, option_name)) + { + /* + * A choice... + */ + + choice = stp_mxmlNewElement(option, "choice"); + stp_mxmlElementSetAttr(choice, "name", keyword); + stp_mxmlElementSetAttr(choice, "text", text ? text : keyword); + + if (value[0] == '\"') + value ++; + + if (bufptr > buffer && bufptr[-1] == '\"') + { + bufptr --; + *bufptr = '\0'; + } + + stp_mxmlNewOpaque(choice, value); + num_choices++; + } + else if (!option && !strcmp(buffer, "*ImageableArea")) + { + stp_mxml_node_t *psize = stpi_xmlppd_find_page_size(ppd, keyword); + if (psize) + { + const char *data[4]; + parse_values(data, 4, value); + if (data[3]) + { + stp_mxmlElementSetAttr(psize, "left", data[0]); + stp_mxmlElementSetAttr(psize, "bottom", data[1]); + stp_mxmlElementSetAttr(psize, "right", data[2]); + stp_mxmlElementSetAttr(psize, "top", data[3]); + } + } + } + else if (!option && !strcmp(buffer, "*PaperDimension")) + { + stp_mxml_node_t *psize = stpi_xmlppd_find_page_size(ppd, keyword); + if (psize) + { + const char *data[2]; + parse_values(data, 2, value); + if (data[1]) + { + stp_mxmlElementSetAttr(psize, "width", data[0]); + stp_mxmlElementSetAttr(psize, "height", data[1]); + } + } + } + } + option_count = stpi_xmlppd_find_option_count(ppd); + order_length = 1; /* Terminating null */ + order_array = malloc(sizeof(order_t) * option_count); + i = 0; + for (option = stp_mxmlFindElement(ppd, ppd, "option", NULL, NULL, + STP_MXML_DESCEND); + option && i < option_count; + option = stp_mxmlFindElement(option, ppd, "option", NULL, NULL, + STP_MXML_DESCEND)) + { + if (stp_mxmlElementGetAttr(option, "order")) + { + order_array[i].name = stp_mxmlElementGetAttr(option, "name"); + order_length += strlen(order_array[i].name) + 1; + order_array[i].order = atoi(stp_mxmlElementGetAttr(option, "order")); + i++; + } + } + option_count = i; + qsort(order_array, option_count, sizeof(order_t), &order_compare); + order_list = malloc(order_length); + order_length = 0; + for (i = 0; i < option_count; i++) + { + if (i > 0) + order_list[order_length++] = ' '; + strcpy(order_list + order_length, order_array[i].name); + order_length += strlen(order_array[i].name); + } + stp_mxmlElementSetAttr(ppd, "optionorder", order_list); + free(order_list); + free(order_array); + return (ppd); +} + +/* + * End of "xmlppd.c". + */ diff --git a/src/main/xmlppd.h b/src/main/xmlppd.h new file mode 100644 index 0000000..a348d70 --- /dev/null +++ b/src/main/xmlppd.h @@ -0,0 +1,46 @@ +/* + * "$Id: xmlppd.h,v 1.2 2007/12/24 03:05:52 rlk Exp $" + * + * Copyright 2007 by Michael R Sweet and Robert Krawitz + * + * 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. + */ + +#ifndef GUTENPRINT_INTERNAL_XMLPPD_H +#define GUTENPRINT_INTERNAL_XMLPPD_H + +extern stp_mxml_node_t *stpi_xmlppd_find_group_named(stp_mxml_node_t *root, const char *name); + +extern stp_mxml_node_t *stpi_xmlppd_find_group_index(stp_mxml_node_t *root, int idx); + +extern int stpi_xmlppd_find_group_count(stp_mxml_node_t *root); + +extern stp_mxml_node_t *stpi_xmlppd_find_option_named(stp_mxml_node_t *root, const char *name); + +extern stp_mxml_node_t *stpi_xmlppd_find_option_index(stp_mxml_node_t *root, int idx); + +extern int stpi_xmlppd_find_option_count(stp_mxml_node_t *root); + +extern stp_mxml_node_t *stpi_xmlppd_find_choice_named(stp_mxml_node_t *option, const char *name); + +extern stp_mxml_node_t *stpi_xmlppd_find_choice_index(stp_mxml_node_t *option, int idx); + +extern int stpi_xmlppd_find_choice_count(stp_mxml_node_t *option); + +extern stp_mxml_node_t *stpi_xmlppd_find_page_size(stp_mxml_node_t *root, const char *name); + +extern stp_mxml_node_t *stpi_xmlppd_read_ppd_file(const char *filename); + +#endif /* GUTENPRINT_INTERNAL_XMLPPD_H */ diff --git a/src/testpattern/Makefile.am b/src/testpattern/Makefile.am index b0ec34a..6d8434a 100644 --- a/src/testpattern/Makefile.am +++ b/src/testpattern/Makefile.am @@ -1,4 +1,4 @@ -## $Id: Makefile.am,v 1.25.8.1 2007/12/15 20:35:51 rlk Exp $ +## $Id: Makefile.am,v 1.27 2007/12/02 02:44:29 rlk Exp $ ## Copyright (C) 2000 Roger Leigh ## ## This program is free software; you can redistribute it and/or modify diff --git a/src/testpattern/Makefile.in b/src/testpattern/Makefile.in index 1249030..f6c13bc 100644 --- a/src/testpattern/Makefile.in +++ b/src/testpattern/Makefile.in @@ -47,13 +47,12 @@ DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \ subdir = src/testpattern 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/isc-posix.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 + $(top_srcdir)/m4/iconv.m4 $(top_srcdir)/m4/isc-posix.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 @@ -156,27 +155,13 @@ 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@ GREP = @GREP@ 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@ @@ -184,13 +169,6 @@ 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@ @@ -295,16 +273,12 @@ docdir = @docdir@ dvidir = @dvidir@ 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@ @@ -333,6 +307,7 @@ target_alias = @target_alias@ top_builddir = @top_builddir@ top_srcdir = @top_srcdir@ AM_CPPFLAGS = -I$(top_srcdir)/include -I$(top_builddir)/include $(LOCAL_CPPFLAGS) $(GNUCFLAGS) +GUTENPRINTUI_LIBS = $(top_builddir)/src/gutenprintui/libgutenprintui.la TESTS = run-testpattern-1 run-testpattern-2 @BUILD_TESTPATTERN_TRUE@noinst_SCRIPTS = run-testpattern-2 AM_LFLAGS = -i diff --git a/src/testpattern/printer_options.c b/src/testpattern/printer_options.c index 444e4b5..b44da2d 100644 --- a/src/testpattern/printer_options.c +++ b/src/testpattern/printer_options.c @@ -1,5 +1,5 @@ /* - * "$Id: printer_options.c,v 1.2.8.2 2007/03/04 23:57:48 tillkamppeter Exp $" + * "$Id: printer_options.c,v 1.4 2007/03/05 00:04:00 tillkamppeter Exp $" * * Dump the per-printer options for the OpenPrinting database * diff --git a/src/testpattern/printers.c b/src/testpattern/printers.c index 21ffd1e..3879de9 100644 --- a/src/testpattern/printers.c +++ b/src/testpattern/printers.c @@ -1,5 +1,5 @@ /* - * "$Id: printers.c,v 1.6.18.1 2007/03/04 23:57:49 tillkamppeter Exp $" + * "$Id: printers.c,v 1.7 2007/03/05 00:04:00 tillkamppeter Exp $" * * Dump the per-printer options for the OpenPrinting database * diff --git a/src/testpattern/run-testpattern b/src/testpattern/run-testpattern index f194323..3fa058e 100755 --- a/src/testpattern/run-testpattern +++ b/src/testpattern/run-testpattern @@ -144,7 +144,7 @@ fi #StandardDithers="EvenTone HybridEvenTone UniTone HybridUniTone Adaptive Ordered Fast VeryFast Floyd Predithered" -StandardDithers="EvenTone HybridEvenTone Adaptive Ordered Fast VeryFast Floyd Predithered" +StandardDithers="EvenTone HybridEvenTone Adaptive Ordered OrderedNew Fast VeryFast Floyd Predithered Segmented SegmentedNew" the_message='' diff --git a/src/testpattern/testpattern.c b/src/testpattern/testpattern.c index 29c30b1..a0ef100 100644 --- a/src/testpattern/testpattern.c +++ b/src/testpattern/testpattern.c @@ -1,5 +1,5 @@ /* - * "$Id: testpattern.c,v 1.44.8.2 2007/12/31 03:37:27 rlk Exp $" + * "$Id: testpattern.c,v 1.48 2008/01/27 21:44:21 rlk Exp $" * * Test pattern generator for Gimp-Print * @@ -87,6 +87,7 @@ int global_channel_depth; int global_invert_data = 0; int global_use_raw_cmyk; int global_did_something; +int global_noscale = 0; int global_suppress_output = 0; char *global_output = NULL; @@ -137,10 +138,10 @@ clear_testpattern(testpattern_t *p) int i; for (i = 0; i < STP_CHANNEL_LIMIT; i++) { - p->d.p.mins[i] = 0; - p->d.p.vals[i] = 0; - p->d.p.gammas[i] = 1; - p->d.p.levels[i] = 0; + p->d.pattern.mins[i] = 0; + p->d.pattern.vals[i] = 0; + p->d.pattern.gammas[i] = 1; + p->d.pattern.levels[i] = 0; } } @@ -639,8 +640,8 @@ fill_grid_##bits(unsigned char *data, size_t len, size_t scount, \ { \ int i; \ int xlen = (len / scount) * scount; \ - int errdiv = (p->d.g.ticks) / (xlen - 1); \ - int errmod = (p->d.g.ticks) % (xlen - 1); \ + int errdiv = (p->d.grid.ticks) / (xlen - 1); \ + int errmod = (p->d.grid.ticks) % (xlen - 1); \ int errval = 0; \ int errlast = -1; \ int errline = 0; \ @@ -683,97 +684,102 @@ fill_grid(unsigned char *data, size_t len, size_t scount, } } -#define FILL_COLORS_EXTENDED_FUNCTION(T, bits) \ -static void \ -fill_colors_extended_##bits(unsigned char *data, size_t len, \ - size_t scount, testpattern_t *p) \ -{ \ - double mins[STP_CHANNEL_LIMIT]; \ - double vals[STP_CHANNEL_LIMIT]; \ - double gammas[STP_CHANNEL_LIMIT]; \ - int i; \ - int j; \ - int k; \ - int pixels; \ - int channel_limit = global_channel_depth <= 7 ? 7 : global_channel_depth; \ - T *s_data = (T *) data; \ - unsigned multiplier = (1 << bits) - 1; \ - \ - for (j = 0; j < channel_limit; j++) \ - { \ - mins[j] = p->d.p.mins[j] == -2 ? global_levels[j] : p->d.p.mins[j]; \ - vals[j] = p->d.p.vals[j] == -2 ? global_levels[j] : p->d.p.vals[j]; \ - gammas[j] = p->d.p.gammas[j] * global_gamma * global_gammas[j]; \ - vals[j] -= mins[j]; \ - } \ - if (scount > len) \ - scount = len; \ - pixels = len / scount; \ - for (i = 0; i < scount; i++) \ - { \ - double where = (double) i / ((double) scount - 1); \ - double val = where; \ - double xvals[STP_CHANNEL_LIMIT]; \ - \ - for (j = 0; j < channel_limit; j++) \ - { \ - xvals[j] = mins[j] + val * vals[j]; \ - xvals[j] = pow(xvals[j], gammas[j]); \ - xvals[j] *= global_ink_limit * multiplier; \ - } \ - for (k = 0; k < pixels; k++) \ - { \ - switch (global_channel_depth) \ - { \ - case 1: \ - s_data[0] = xvals[0]; \ - break; \ - case 2: \ - s_data[0] = xvals[0]; \ - s_data[1] = xvals[4]; \ - break; \ - case 3: \ - s_data[0] = xvals[1]; \ - s_data[1] = xvals[2]; \ - s_data[2] = xvals[3]; \ - break; \ - case 4: \ - s_data[0] = xvals[0]; \ - s_data[1] = xvals[1]; \ - s_data[2] = xvals[2]; \ - s_data[3] = xvals[3]; \ - break; \ - case 5: \ - s_data[0] = xvals[1]; \ - s_data[1] = xvals[5]; \ - s_data[2] = xvals[2]; \ - s_data[3] = xvals[6]; \ - s_data[4] = xvals[3]; \ - break; \ - case 6: \ - s_data[0] = xvals[0]; \ - s_data[1] = xvals[1]; \ - s_data[2] = xvals[5]; \ - s_data[3] = xvals[2]; \ - s_data[4] = xvals[6]; \ - s_data[5] = xvals[3]; \ - break; \ - case 7: \ - s_data[0] = xvals[0]; \ - s_data[1] = xvals[4]; \ - s_data[2] = xvals[1]; \ - s_data[3] = xvals[5]; \ - s_data[4] = xvals[2]; \ - s_data[5] = xvals[6]; \ - s_data[6] = xvals[3]; \ - break; \ - default: \ - for (j = 0; j < global_channel_depth; j++) \ - s_data[j] = xvals[j]; \ - } \ - s_data += global_channel_depth; \ - } \ - } \ +#define FILL_COLORS_EXTENDED_FUNCTION(T, bits) \ +static void \ +fill_colors_extended_##bits(unsigned char *data, size_t len, \ + size_t scount, testpattern_t *p) \ +{ \ + double mins[STP_CHANNEL_LIMIT]; \ + double vals[STP_CHANNEL_LIMIT]; \ + double gammas[STP_CHANNEL_LIMIT]; \ + int i; \ + int j; \ + int k; \ + int pixels; \ + int channel_limit = \ + global_channel_depth <= 7 ? 7 : global_channel_depth; \ + T *s_data = (T *) data; \ + unsigned multiplier = global_noscale ? 1 : (1 << bits) - 1; \ + \ + for (j = 0; j < channel_limit; j++) \ + { \ + mins[j] = p->d.pattern.mins[j] == -2 ? \ + global_levels[j] : p->d.pattern.mins[j]; \ + vals[j] = p->d.pattern.vals[j] == -2 ? \ + global_levels[j] : p->d.pattern.vals[j]; \ + gammas[j] = \ + p->d.pattern.gammas[j] * global_gamma * global_gammas[j]; \ + vals[j] -= mins[j]; \ + } \ + if (scount > len) \ + scount = len; \ + pixels = len / scount; \ + for (i = 0; i < scount; i++) \ + { \ + double where = (double) i / ((double) scount - 1); \ + double val = where; \ + double xvals[STP_CHANNEL_LIMIT]; \ + \ + for (j = 0; j < channel_limit; j++) \ + { \ + xvals[j] = mins[j] + val * vals[j]; \ + xvals[j] = pow(xvals[j], gammas[j]); \ + xvals[j] *= global_ink_limit * multiplier; \ + xvals[j] += 0.9; \ + } \ + for (k = 0; k < pixels; k++) \ + { \ + switch (global_channel_depth) \ + { \ + case 1: \ + s_data[0] = xvals[0]; \ + break; \ + case 2: \ + s_data[0] = xvals[0]; \ + s_data[1] = xvals[4]; \ + break; \ + case 3: \ + s_data[0] = xvals[1]; \ + s_data[1] = xvals[2]; \ + s_data[2] = xvals[3]; \ + break; \ + case 4: \ + s_data[0] = xvals[0]; \ + s_data[1] = xvals[1]; \ + s_data[2] = xvals[2]; \ + s_data[3] = xvals[3]; \ + break; \ + case 5: \ + s_data[0] = xvals[1]; \ + s_data[1] = xvals[5]; \ + s_data[2] = xvals[2]; \ + s_data[3] = xvals[6]; \ + s_data[4] = xvals[3]; \ + break; \ + case 6: \ + s_data[0] = xvals[0]; \ + s_data[1] = xvals[1]; \ + s_data[2] = xvals[5]; \ + s_data[3] = xvals[2]; \ + s_data[4] = xvals[6]; \ + s_data[5] = xvals[3]; \ + break; \ + case 7: \ + s_data[0] = xvals[0]; \ + s_data[1] = xvals[4]; \ + s_data[2] = xvals[1]; \ + s_data[3] = xvals[5]; \ + s_data[4] = xvals[2]; \ + s_data[5] = xvals[6]; \ + s_data[6] = xvals[3]; \ + break; \ + default: \ + for (j = 0; j < global_channel_depth; j++) \ + s_data[j] = xvals[j]; \ + } \ + s_data += global_channel_depth; \ + } \ + } \ } FILL_COLORS_EXTENDED_FUNCTION(unsigned short, 16) @@ -794,117 +800,121 @@ fill_colors_extended(unsigned char *data, size_t len, size_t scount, } } -#define FILL_COLORS_FUNCTION(T, bits) \ -static void \ -fill_colors_##bits(unsigned char *data, size_t len, size_t scount, \ - testpattern_t *p) \ -{ \ - double mins[4]; \ - double vals[4]; \ - double gammas[4]; \ - double levels[4]; \ - double lower = p->d.p.lower; \ - double upper = p->d.p.upper; \ - int i; \ - int j; \ - int pixels; \ - T *s_data = (T *) data; \ - unsigned multiplier = (1 << bits) - 1; \ - \ - vals[0] = p->d.p.vals[0]; \ - mins[0] = p->d.p.mins[0]; \ - \ - for (j = 1; j < 4; j++) \ - { \ - vals[j] = p->d.p.vals[j] == -2 ? global_levels[j] : p->d.p.vals[j]; \ - mins[j] = p->d.p.mins[j] == -2 ? global_levels[j] : p->d.p.mins[j]; \ - levels[j] = p->d.p.levels[j] == \ - -2 ? global_levels[j] : p->d.p.levels[j]; \ - } \ - for (j = 0; j < 4; j++) \ - { \ - gammas[j] = p->d.p.gammas[j] * global_gamma * global_gammas[j]; \ - vals[j] -= mins[j]; \ - } \ - \ - if (scount > len) \ - scount = len; \ - pixels = len / scount; \ - for (i = 0; i < scount; i++) \ - { \ - int k; \ - double where = (double) i / ((double) scount - 1); \ - double cmyv; \ - double kv; \ - double val = where; \ - double xvals[4]; \ - for (j = 0; j < 4; j++) \ - { \ - if (j > 0) \ - xvals[j] = mins[j] + val * vals[j]; \ - else \ - xvals[j] = mins[j] + vals[j]; \ - xvals[j] = pow(xvals[j], gammas[j]); \ - } \ - \ - if (where <= lower) \ - kv = 0; \ - else if (where > upper) \ - kv = where; \ - else \ - kv = (where - lower) * upper / (upper - lower); \ - cmyv = vals[0] * (where - kv); \ - xvals[0] *= kv; \ - for (j = 1; j < 4; j++) \ - xvals[j] += cmyv * levels[j]; \ - for (j = 0; j < 4; j++) \ - { \ - if (xvals[j] > 1) \ - xvals[j] = 1; \ - xvals[j] *= global_ink_limit * multiplier; \ - } \ - for (k = 0; k < pixels; k++) \ - { \ - switch (global_channel_depth) \ - { \ - case 0: \ - for (j = 0; j < 4; j++) \ - s_data[j] = xvals[(j + 1) % 4]; \ - s_data += 4; \ - break; \ - case 1: \ - s_data[0] = xvals[0]; \ - break; \ - case 2: \ - s_data[0] = xvals[0]; \ - s_data[1] = 0; \ - break; \ - case 3: \ - for (j = 1; j < 4; j++) \ - s_data[j - 1] = xvals[j]; \ - break; \ - case 4: \ - for (j = 0; j < 4; j++) \ - s_data[j] = xvals[j]; \ - break; \ - case 6: \ - s_data[0] = xvals[0]; \ - s_data[1] = xvals[1]; \ - s_data[2] = 0; \ - s_data[3] = xvals[2]; \ - s_data[4] = 0; \ - s_data[5] = xvals[3]; \ - break; \ - case 7: \ - for (j = 0; j < 4; j++) \ - s_data[j * 2] = xvals[j]; \ - for (j = 1; j < 6; j += 2) \ - s_data[j] = 0; \ - break; \ - } \ - s_data += global_channel_depth; \ - } \ - } \ +#define FILL_COLORS_FUNCTION(T, bits) \ +static void \ +fill_colors_##bits(unsigned char *data, size_t len, size_t scount, \ + testpattern_t *p) \ +{ \ + double mins[4]; \ + double vals[4]; \ + double gammas[4]; \ + double levels[4]; \ + double lower = p->d.pattern.lower; \ + double upper = p->d.pattern.upper; \ + int i; \ + int j; \ + int pixels; \ + T *s_data = (T *) data; \ + unsigned multiplier = global_noscale ? 1 : (1 << bits) - 1; \ + \ + vals[0] = p->d.pattern.vals[0]; \ + mins[0] = p->d.pattern.mins[0]; \ + \ + for (j = 1; j < 4; j++) \ + { \ + vals[j] = p->d.pattern.vals[j] == -2 ? global_levels[j] : \ + p->d.pattern.vals[j]; \ + mins[j] = p->d.pattern.mins[j] == -2 ? global_levels[j] : \ + p->d.pattern.mins[j]; \ + levels[j] = p->d.pattern.levels[j] == \ + -2 ? global_levels[j] : p->d.pattern.levels[j]; \ + } \ + for (j = 0; j < 4; j++) \ + { \ + gammas[j] = \ + p->d.pattern.gammas[j] * global_gamma * global_gammas[j]; \ + vals[j] -= mins[j]; \ + } \ + \ + if (scount > len) \ + scount = len; \ + pixels = len / scount; \ + for (i = 0; i < scount; i++) \ + { \ + int k; \ + double where = (double) i / ((double) scount - 1); \ + double cmyv; \ + double kv; \ + double val = where; \ + double xvals[4]; \ + for (j = 0; j < 4; j++) \ + { \ + if (j > 0) \ + xvals[j] = mins[j] + val * vals[j]; \ + else \ + xvals[j] = mins[j] + vals[j]; \ + xvals[j] = pow(xvals[j], gammas[j]); \ + } \ + \ + if (where <= lower) \ + kv = 0; \ + else if (where > upper) \ + kv = where; \ + else \ + kv = (where - lower) * upper / (upper - lower); \ + cmyv = vals[0] * (where - kv); \ + xvals[0] *= kv; \ + for (j = 1; j < 4; j++) \ + xvals[j] += cmyv * levels[j]; \ + for (j = 0; j < 4; j++) \ + { \ + if (xvals[j] > 1) \ + xvals[j] = 1; \ + xvals[j] *= global_ink_limit * multiplier; \ + xvals[j] += 0.9; \ + } \ + for (k = 0; k < pixels; k++) \ + { \ + switch (global_channel_depth) \ + { \ + case 0: \ + for (j = 0; j < 4; j++) \ + s_data[j] = xvals[(j + 1) % 4]; \ + s_data += 4; \ + break; \ + case 1: \ + s_data[0] = xvals[0]; \ + break; \ + case 2: \ + s_data[0] = xvals[0]; \ + s_data[1] = 0; \ + break; \ + case 3: \ + for (j = 1; j < 4; j++) \ + s_data[j - 1] = xvals[j]; \ + break; \ + case 4: \ + for (j = 0; j < 4; j++) \ + s_data[j] = xvals[j]; \ + break; \ + case 6: \ + s_data[0] = xvals[0]; \ + s_data[1] = xvals[1]; \ + s_data[2] = 0; \ + s_data[3] = xvals[2]; \ + s_data[4] = 0; \ + s_data[5] = xvals[3]; \ + break; \ + case 7: \ + for (j = 0; j < 4; j++) \ + s_data[j * 2] = xvals[j]; \ + for (j = 1; j < 6; j += 2) \ + s_data[j] = 0; \ + break; \ + } \ + s_data += global_channel_depth; \ + } \ + } \ } FILL_COLORS_FUNCTION(unsigned short, 16) @@ -937,7 +947,7 @@ fill_pattern(testpattern_t *p, unsigned char *data, size_t width, size_t s_count, size_t image_depth, size_t byte_depth) { memset(data, 0, global_printer_width * image_depth * byte_depth); - switch (p->t) + switch (p->type) { case E_PATTERN: fill_colors(data, width, s_count, p, byte_depth); @@ -959,12 +969,12 @@ Image_get_row(stp_image_t *image, unsigned char *data, size_t byte_limit, int row) { int depth = global_channel_depth; - if (static_testpatterns[0].t == E_IMAGE) + if (static_testpatterns[0].type == E_IMAGE) { testpattern_t *t = &(static_testpatterns[0]); - int total_read = fread(data, 1, t->d.i.x * depth * global_bit_depth / 8, + int total_read = fread(data, 1, t->d.image.x * depth * global_bit_depth / 8, yyin); - if (total_read != t->d.i.x * depth * global_bit_depth / 8) + if (total_read != t->d.image.x * depth * global_bit_depth / 8) { fprintf(stderr, "Read failed!\n"); return STP_IMAGE_STATUS_ABORT; @@ -1008,8 +1018,8 @@ Image_get_row(stp_image_t *image, unsigned char *data, static int Image_width(stp_image_t *image) { - if (static_testpatterns[0].t == E_IMAGE) - return static_testpatterns[0].d.i.x; + if (static_testpatterns[0].type == E_IMAGE) + return static_testpatterns[0].d.image.x; else return global_printer_width; } @@ -1017,8 +1027,8 @@ Image_width(stp_image_t *image) static int Image_height(stp_image_t *image) { - if (static_testpatterns[0].t == E_IMAGE) - return static_testpatterns[0].d.i.y; + if (static_testpatterns[0].type == E_IMAGE) + return static_testpatterns[0].d.image.y; else return global_printer_height; } diff --git a/src/testpattern/testpattern.h b/src/testpattern/testpattern.h index 6b0fc83..3d3bbdc 100644 --- a/src/testpattern/testpattern.h +++ b/src/testpattern/testpattern.h @@ -1,5 +1,5 @@ /* - * "$Id: testpattern.h,v 1.15.18.1 2007/12/15 20:35:52 rlk Exp $" + * "$Id: testpattern.h,v 1.17 2008/01/27 21:44:21 rlk Exp $" * * Test pattern generator for Gimp-Print * @@ -34,7 +34,7 @@ typedef struct E_XPATTERN, E_IMAGE, E_GRID - } t; + } type; union { struct { double mins[32]; @@ -43,16 +43,16 @@ typedef struct double levels[32]; double lower; double upper; - } p; + } pattern; struct { int ticks; - } g; + } grid; struct { int x; int y; int bits; const char *data; - } i; + } image; } d; } testpattern_t; @@ -81,13 +81,14 @@ extern int global_bit_depth; extern int global_channel_depth; extern int global_did_something; extern int global_invert_data; +extern int global_noscale; extern char *global_output; extern char *c_strdup(const char *s); extern testpattern_t *get_next_testpattern(void); -typedef union yylv { +typedef struct yylv { int ival; double dval; char *sval; diff --git a/src/testpattern/testpatternl.c b/src/testpattern/testpatternl.c index 3cfa272..be9bd04 100644 --- a/src/testpattern/testpatternl.c +++ b/src/testpattern/testpatternl.c @@ -361,8 +361,8 @@ static void yy_fatal_error (yyconst char msg[] ); *yy_cp = '\0'; \ (yy_c_buf_p) = yy_cp; -#define YY_NUM_RULES 50 -#define YY_END_OF_BUFFER 51 +#define YY_NUM_RULES 51 +#define YY_END_OF_BUFFER 52 /* This struct is not used in this scanner, but its presence is necessary. */ struct yy_trans_info @@ -370,34 +370,35 @@ struct yy_trans_info flex_int32_t yy_verify; flex_int32_t yy_nxt; }; -static yyconst flex_int16_t yy_accept[239] = +static yyconst flex_int16_t yy_accept[249] = { 0, - 0, 0, 51, 50, 47, 49, 50, 48, 50, 50, - 44, 32, 46, 46, 46, 46, 46, 46, 46, 46, - 46, 46, 46, 46, 46, 46, 46, 46, 46, 46, - 46, 46, 47, 0, 48, 0, 46, 44, 46, 0, - 44, 46, 46, 46, 46, 46, 46, 46, 46, 46, - 46, 46, 46, 46, 46, 46, 46, 46, 46, 46, - 46, 46, 46, 46, 46, 46, 46, 46, 46, 46, - 46, 0, 45, 0, 46, 45, 46, 46, 37, 46, - 46, 46, 43, 46, 46, 46, 46, 46, 46, 46, - 46, 46, 46, 46, 46, 46, 46, 46, 46, 46, - - 46, 46, 46, 46, 46, 36, 46, 20, 46, 46, - 46, 46, 45, 46, 46, 34, 1, 46, 46, 46, - 46, 39, 38, 29, 46, 46, 46, 35, 46, 46, - 46, 21, 46, 46, 46, 33, 46, 46, 46, 46, - 46, 46, 46, 46, 46, 46, 7, 46, 46, 46, - 46, 9, 22, 27, 46, 46, 46, 46, 10, 46, - 46, 46, 46, 46, 46, 46, 11, 23, 40, 46, - 46, 46, 46, 46, 46, 46, 46, 46, 2, 46, - 46, 46, 41, 46, 46, 46, 46, 46, 5, 46, - 30, 46, 19, 46, 46, 8, 46, 3, 42, 46, - - 46, 25, 13, 46, 46, 6, 28, 46, 46, 46, - 46, 26, 24, 12, 4, 31, 14, 46, 46, 46, - 46, 46, 46, 46, 46, 46, 46, 46, 15, 46, - 46, 46, 46, 18, 17, 46, 16, 0 + 0, 0, 52, 51, 48, 50, 51, 49, 51, 51, + 45, 45, 32, 47, 47, 47, 47, 47, 47, 47, + 47, 47, 47, 47, 47, 47, 47, 47, 47, 47, + 47, 47, 47, 47, 48, 0, 49, 0, 47, 45, + 47, 0, 45, 47, 47, 47, 47, 47, 47, 47, + 47, 47, 47, 47, 47, 47, 47, 47, 47, 47, + 47, 47, 47, 47, 47, 47, 47, 47, 47, 47, + 47, 47, 47, 47, 47, 0, 46, 0, 47, 46, + 45, 47, 47, 37, 47, 47, 47, 44, 47, 47, + 47, 47, 47, 47, 47, 47, 47, 47, 47, 47, + + 47, 47, 47, 47, 47, 47, 47, 47, 47, 47, + 47, 36, 47, 20, 47, 47, 47, 47, 46, 47, + 47, 34, 1, 47, 47, 47, 47, 39, 38, 29, + 47, 47, 47, 35, 47, 47, 47, 21, 47, 47, + 47, 33, 47, 47, 47, 47, 47, 47, 47, 47, + 47, 47, 47, 7, 47, 47, 47, 47, 9, 22, + 27, 47, 47, 47, 47, 10, 47, 47, 47, 47, + 47, 47, 47, 47, 11, 23, 40, 47, 47, 47, + 47, 47, 47, 47, 47, 47, 2, 47, 47, 47, + 47, 41, 47, 47, 47, 47, 47, 5, 47, 30, + + 47, 19, 47, 47, 8, 47, 3, 42, 43, 47, + 47, 25, 13, 47, 47, 6, 28, 47, 47, 47, + 47, 26, 24, 12, 4, 31, 14, 47, 47, 47, + 47, 47, 47, 47, 47, 47, 47, 47, 15, 47, + 47, 47, 47, 18, 17, 47, 16, 0 } ; static yyconst flex_int32_t yy_ec[256] = @@ -406,16 +407,16 @@ static yyconst flex_int32_t yy_ec[256] = 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 2, 1, 4, 5, 1, 1, 1, 6, 1, - 1, 1, 7, 1, 8, 9, 1, 10, 10, 10, - 10, 10, 10, 10, 10, 10, 10, 1, 11, 1, - 1, 1, 1, 1, 13, 14, 15, 16, 17, 18, - 19, 20, 21, 22, 23, 24, 25, 26, 27, 28, - 22, 29, 30, 31, 32, 33, 34, 35, 36, 37, - 1, 1, 1, 1, 12, 1, 13, 14, 15, 16, - - 17, 18, 19, 20, 21, 22, 23, 24, 25, 26, - 27, 28, 22, 29, 30, 31, 32, 33, 34, 35, - 36, 37, 1, 1, 1, 1, 1, 1, 1, 1, + 1, 1, 7, 1, 8, 9, 1, 10, 11, 11, + 11, 11, 11, 11, 11, 11, 11, 1, 12, 1, + 1, 1, 1, 1, 14, 15, 16, 17, 18, 19, + 20, 21, 22, 23, 24, 25, 26, 27, 28, 29, + 23, 30, 31, 32, 33, 34, 35, 36, 37, 38, + 1, 1, 1, 1, 13, 1, 14, 15, 16, 17, + + 18, 19, 20, 21, 22, 23, 24, 25, 26, 27, + 28, 29, 23, 30, 31, 32, 33, 34, 35, 36, + 37, 38, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, @@ -432,196 +433,206 @@ static yyconst flex_int32_t yy_ec[256] = 1, 1, 1, 1, 1 } ; -static yyconst flex_int32_t yy_meta[38] = +static yyconst flex_int32_t yy_meta[39] = { 0, 1, 1, 2, 3, 1, 1, 1, 4, 4, 4, - 1, 4, 4, 4, 4, 4, 4, 4, 4, 4, + 4, 1, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, - 4, 4, 4, 4, 4, 4, 4 + 4, 4, 4, 4, 4, 4, 4, 4 } ; -static yyconst flex_int16_t yy_base[243] = +static yyconst flex_int16_t yy_base[253] = { 0, - 0, 0, 479, 480, 476, 480, 0, 0, 471, 466, - 29, 480, 466, 31, 32, 33, 34, 35, 40, 47, - 38, 42, 49, 52, 54, 56, 62, 65, 68, 69, - 71, 70, 472, 469, 0, 466, 480, 85, 462, 460, - 87, 98, 72, 73, 79, 100, 81, 92, 94, 91, - 102, 103, 105, 110, 112, 116, 119, 120, 121, 122, - 123, 127, 128, 133, 134, 146, 136, 140, 141, 147, - 142, 160, 155, 459, 164, 166, 162, 160, 169, 170, - 171, 172, 459, 173, 174, 175, 176, 178, 180, 182, - 186, 184, 191, 188, 194, 195, 196, 197, 199, 201, - - 200, 210, 212, 207, 213, 458, 214, 457, 221, 222, - 223, 224, 455, 226, 225, 455, 454, 228, 234, 231, - 232, 453, 452, 451, 227, 247, 237, 450, 250, 253, - 241, 449, 256, 258, 259, 448, 238, 262, 260, 264, - 266, 268, 269, 270, 273, 267, 279, 274, 281, 280, - 283, 447, 446, 445, 286, 287, 284, 291, 444, 292, - 297, 300, 303, 304, 305, 308, 443, 442, 441, 309, - 306, 311, 313, 315, 310, 318, 319, 320, 440, 321, - 332, 339, 439, 329, 327, 340, 330, 342, 438, 343, - 437, 344, 436, 345, 346, 435, 348, 434, 433, 351, - - 353, 432, 425, 354, 355, 422, 417, 356, 364, 359, - 365, 416, 413, 412, 411, 410, 372, 374, 366, 373, - 376, 377, 381, 382, 384, 387, 390, 392, 409, 391, - 394, 397, 398, 405, 404, 408, 137, 480, 428, 432, - 436, 87 + 0, 0, 516, 517, 513, 517, 0, 0, 508, 29, + 32, 35, 517, 504, 38, 39, 43, 42, 40, 46, + 48, 50, 49, 70, 55, 62, 71, 72, 64, 63, + 73, 78, 77, 84, 510, 507, 0, 504, 517, 98, + 500, 79, 101, 113, 104, 91, 116, 94, 118, 108, + 109, 117, 119, 120, 126, 128, 124, 130, 132, 140, + 133, 144, 134, 151, 138, 148, 152, 153, 161, 165, + 150, 164, 168, 178, 169, 188, 190, 178, 193, 196, + 200, 203, 154, 204, 188, 205, 162, 499, 207, 208, + 209, 211, 212, 213, 215, 217, 218, 222, 223, 224, + + 227, 231, 232, 230, 234, 228, 233, 236, 244, 247, + 248, 498, 254, 497, 255, 256, 257, 259, 259, 258, + 263, 496, 495, 262, 264, 265, 267, 494, 493, 492, + 276, 282, 271, 491, 288, 289, 286, 490, 290, 292, + 295, 489, 296, 298, 299, 302, 304, 305, 307, 308, + 309, 311, 312, 314, 315, 316, 320, 325, 488, 487, + 486, 323, 335, 321, 337, 485, 326, 327, 340, 341, + 344, 345, 347, 348, 484, 483, 482, 350, 351, 352, + 353, 355, 358, 361, 362, 360, 481, 363, 367, 371, + 373, 480, 376, 378, 384, 383, 385, 479, 387, 478, + + 388, 477, 390, 394, 476, 392, 475, 468, 465, 391, + 399, 461, 458, 393, 400, 457, 450, 395, 412, 410, + 403, 447, 446, 397, 396, 269, 421, 416, 413, 427, + 422, 428, 431, 430, 432, 433, 434, 436, 268, 435, + 444, 439, 442, 182, 176, 445, 88, 517, 471, 475, + 479, 90 } ; -static yyconst flex_int16_t yy_def[243] = +static yyconst flex_int16_t yy_def[253] = { 0, - 238, 1, 238, 238, 238, 238, 239, 240, 241, 238, - 242, 238, 242, 242, 242, 242, 242, 242, 242, 242, - 242, 242, 242, 242, 242, 242, 242, 242, 242, 242, - 242, 242, 238, 239, 240, 241, 238, 238, 242, 238, - 242, 242, 242, 242, 242, 242, 242, 242, 242, 242, - 242, 242, 242, 242, 242, 242, 242, 242, 242, 242, - 242, 242, 242, 242, 242, 242, 242, 242, 242, 242, - 242, 238, 238, 238, 242, 242, 242, 242, 242, 242, - 242, 242, 242, 242, 242, 242, 242, 242, 242, 242, - 242, 242, 242, 242, 242, 242, 242, 242, 242, 242, - - 242, 242, 242, 242, 242, 242, 242, 242, 242, 242, - 242, 242, 238, 242, 242, 242, 242, 242, 242, 242, - 242, 242, 242, 242, 242, 242, 242, 242, 242, 242, - 242, 242, 242, 242, 242, 242, 242, 242, 242, 242, - 242, 242, 242, 242, 242, 242, 242, 242, 242, 242, - 242, 242, 242, 242, 242, 242, 242, 242, 242, 242, - 242, 242, 242, 242, 242, 242, 242, 242, 242, 242, - 242, 242, 242, 242, 242, 242, 242, 242, 242, 242, - 242, 242, 242, 242, 242, 242, 242, 242, 242, 242, - 242, 242, 242, 242, 242, 242, 242, 242, 242, 242, - - 242, 242, 242, 242, 242, 242, 242, 242, 242, 242, - 242, 242, 242, 242, 242, 242, 242, 242, 242, 242, - 242, 242, 242, 242, 242, 242, 242, 242, 242, 242, - 242, 242, 242, 242, 242, 242, 242, 0, 238, 238, - 238, 238 + 248, 1, 248, 248, 248, 248, 249, 250, 251, 248, + 252, 252, 248, 252, 252, 252, 252, 252, 252, 252, + 252, 252, 252, 252, 252, 252, 252, 252, 252, 252, + 252, 252, 252, 252, 248, 249, 250, 251, 248, 248, + 252, 248, 252, 252, 252, 252, 252, 252, 252, 252, + 252, 252, 252, 252, 252, 252, 252, 252, 252, 252, + 252, 252, 252, 252, 252, 252, 252, 252, 252, 252, + 252, 252, 252, 252, 252, 248, 248, 248, 252, 252, + 252, 252, 252, 252, 252, 252, 252, 252, 252, 252, + 252, 252, 252, 252, 252, 252, 252, 252, 252, 252, + + 252, 252, 252, 252, 252, 252, 252, 252, 252, 252, + 252, 252, 252, 252, 252, 252, 252, 252, 248, 252, + 252, 252, 252, 252, 252, 252, 252, 252, 252, 252, + 252, 252, 252, 252, 252, 252, 252, 252, 252, 252, + 252, 252, 252, 252, 252, 252, 252, 252, 252, 252, + 252, 252, 252, 252, 252, 252, 252, 252, 252, 252, + 252, 252, 252, 252, 252, 252, 252, 252, 252, 252, + 252, 252, 252, 252, 252, 252, 252, 252, 252, 252, + 252, 252, 252, 252, 252, 252, 252, 252, 252, 252, + 252, 252, 252, 252, 252, 252, 252, 252, 252, 252, + + 252, 252, 252, 252, 252, 252, 252, 252, 252, 252, + 252, 252, 252, 252, 252, 252, 252, 252, 252, 252, + 252, 252, 252, 252, 252, 252, 252, 252, 252, 252, + 252, 252, 252, 252, 252, 252, 252, 252, 252, 252, + 252, 252, 252, 252, 252, 252, 252, 0, 248, 248, + 248, 248 } ; -static yyconst flex_int16_t yy_nxt[518] = +static yyconst flex_int16_t yy_nxt[556] = { 0, 4, 5, 6, 7, 8, 9, 10, 10, 4, 11, - 12, 13, 13, 14, 15, 16, 17, 13, 18, 19, - 20, 13, 21, 22, 23, 13, 24, 25, 26, 27, - 28, 13, 29, 30, 31, 32, 13, 40, 41, 238, - 238, 238, 238, 238, 47, 42, 238, 51, 238, 48, - 238, 44, 56, 57, 43, 238, 45, 238, 58, 49, - 238, 59, 238, 52, 238, 60, 63, 46, 50, 53, - 238, 54, 55, 238, 65, 61, 238, 238, 238, 238, - 238, 238, 64, 62, 77, 78, 71, 238, 69, 238, - 39, 67, 66, 40, 38, 40, 41, 68, 70, 238, - - 238, 72, 238, 42, 74, 75, 238, 76, 238, 83, - 238, 238, 80, 238, 79, 86, 81, 82, 238, 87, - 238, 84, 90, 88, 238, 89, 85, 238, 238, 238, - 238, 238, 93, 94, 91, 238, 238, 96, 100, 98, - 92, 238, 238, 95, 238, 238, 102, 106, 238, 238, - 238, 99, 97, 105, 238, 238, 103, 101, 104, 111, - 109, 110, 107, 108, 73, 112, 74, 74, 238, 113, - 238, 72, 238, 76, 238, 76, 114, 238, 238, 238, - 238, 238, 238, 238, 238, 115, 238, 118, 238, 120, - 238, 116, 238, 124, 238, 117, 238, 127, 121, 238, - - 126, 119, 238, 238, 238, 238, 131, 238, 238, 238, - 122, 123, 133, 134, 129, 238, 125, 136, 238, 128, - 238, 238, 238, 130, 139, 132, 138, 137, 135, 238, - 238, 238, 238, 238, 238, 238, 238, 140, 141, 238, - 238, 142, 238, 153, 152, 238, 238, 146, 147, 238, - 148, 149, 144, 145, 150, 238, 151, 143, 238, 158, - 155, 238, 156, 154, 238, 157, 238, 238, 238, 162, - 238, 161, 238, 163, 238, 238, 238, 238, 238, 159, - 165, 238, 238, 160, 164, 168, 169, 238, 238, 238, - 173, 238, 238, 171, 238, 238, 166, 167, 176, 238, - - 238, 178, 172, 170, 174, 238, 177, 180, 238, 179, - 175, 238, 238, 238, 238, 182, 238, 238, 238, 238, - 185, 238, 181, 238, 187, 188, 238, 238, 238, 238, - 183, 190, 184, 186, 194, 238, 191, 238, 238, 189, - 238, 192, 196, 195, 198, 193, 197, 238, 238, 200, - 238, 238, 238, 238, 238, 199, 238, 201, 203, 238, - 207, 238, 238, 238, 238, 202, 208, 238, 205, 211, - 204, 213, 238, 238, 238, 216, 215, 206, 209, 212, - 238, 238, 238, 218, 238, 238, 214, 210, 219, 238, - 238, 220, 238, 217, 221, 238, 224, 223, 238, 238, - - 238, 225, 238, 222, 232, 238, 238, 226, 228, 227, - 234, 233, 238, 238, 229, 230, 238, 238, 238, 238, - 238, 238, 231, 236, 238, 238, 237, 235, 34, 34, - 238, 34, 35, 238, 35, 35, 36, 36, 36, 36, - 238, 238, 238, 238, 238, 238, 238, 238, 238, 238, - 238, 238, 238, 238, 238, 238, 238, 238, 238, 238, - 238, 238, 238, 238, 113, 238, 238, 238, 113, 73, - 238, 37, 37, 33, 238, 38, 37, 33, 238, 3, - 238, 238, 238, 238, 238, 238, 238, 238, 238, 238, - 238, 238, 238, 238, 238, 238, 238, 238, 238, 238, - - 238, 238, 238, 238, 238, 238, 238, 238, 238, 238, - 238, 238, 238, 238, 238, 238, 238 + 12, 13, 14, 14, 15, 16, 17, 18, 14, 19, + 20, 21, 14, 22, 23, 24, 25, 26, 27, 28, + 29, 30, 14, 31, 32, 33, 34, 14, 40, 40, + 42, 43, 43, 42, 43, 43, 248, 248, 248, 44, + 248, 248, 44, 54, 248, 50, 248, 248, 248, 47, + 51, 60, 46, 248, 48, 59, 61, 45, 52, 55, + 248, 248, 248, 57, 58, 49, 56, 53, 248, 248, + 248, 248, 65, 62, 67, 248, 248, 63, 77, 77, + 71, 69, 248, 41, 66, 70, 248, 64, 73, 248, + + 68, 75, 248, 72, 82, 74, 42, 40, 40, 42, + 43, 43, 248, 81, 81, 76, 248, 248, 44, 78, + 79, 248, 80, 80, 248, 248, 248, 248, 248, 83, + 84, 85, 248, 88, 248, 87, 248, 95, 248, 91, + 248, 248, 248, 92, 86, 90, 248, 93, 248, 94, + 89, 101, 248, 96, 98, 99, 248, 97, 248, 248, + 248, 248, 248, 103, 104, 100, 102, 105, 106, 248, + 248, 108, 248, 248, 111, 112, 248, 248, 114, 107, + 121, 109, 113, 110, 248, 115, 248, 119, 119, 116, + 248, 117, 125, 118, 78, 78, 248, 119, 119, 77, + + 77, 248, 80, 80, 248, 80, 80, 76, 248, 81, + 81, 248, 248, 248, 123, 248, 248, 248, 120, 248, + 248, 248, 124, 248, 126, 248, 248, 122, 130, 133, + 248, 248, 248, 127, 132, 248, 248, 137, 248, 248, + 248, 248, 248, 143, 248, 128, 135, 129, 139, 140, + 131, 142, 248, 145, 134, 248, 248, 146, 138, 136, + 141, 144, 248, 248, 248, 248, 248, 248, 119, 119, + 248, 248, 248, 248, 148, 248, 248, 248, 147, 248, + 159, 154, 149, 153, 248, 157, 156, 151, 152, 155, + 248, 158, 150, 160, 248, 162, 248, 248, 248, 161, + + 248, 163, 164, 248, 248, 165, 248, 248, 168, 169, + 248, 171, 248, 248, 166, 248, 248, 248, 167, 248, + 248, 173, 248, 248, 248, 176, 177, 172, 248, 248, + 170, 248, 181, 248, 248, 248, 174, 175, 180, 179, + 182, 184, 178, 248, 185, 248, 190, 187, 248, 248, + 186, 183, 248, 248, 188, 248, 248, 189, 248, 248, + 248, 248, 194, 248, 191, 196, 248, 197, 248, 248, + 248, 248, 192, 199, 193, 248, 195, 200, 203, 248, + 207, 248, 201, 205, 248, 198, 248, 204, 208, 206, + 209, 248, 248, 248, 202, 248, 248, 210, 248, 248, + + 248, 248, 248, 248, 248, 248, 217, 248, 248, 211, + 212, 248, 213, 215, 214, 218, 221, 223, 248, 222, + 248, 248, 216, 219, 248, 225, 224, 226, 220, 248, + 248, 229, 227, 228, 230, 248, 248, 231, 248, 248, + 248, 248, 248, 248, 248, 233, 232, 248, 235, 242, + 248, 234, 248, 248, 248, 248, 243, 238, 248, 236, + 237, 244, 240, 239, 247, 248, 248, 241, 246, 248, + 245, 36, 36, 248, 36, 37, 248, 37, 37, 38, + 38, 38, 38, 248, 248, 248, 248, 248, 248, 248, + 248, 248, 248, 248, 248, 248, 248, 248, 248, 248, + + 248, 248, 248, 248, 248, 248, 248, 248, 248, 39, + 39, 35, 248, 39, 35, 248, 3, 248, 248, 248, + 248, 248, 248, 248, 248, 248, 248, 248, 248, 248, + 248, 248, 248, 248, 248, 248, 248, 248, 248, 248, + 248, 248, 248, 248, 248, 248, 248, 248, 248, 248, + 248, 248, 248, 248, 248 } ; -static yyconst flex_int16_t yy_chk[518] = +static yyconst flex_int16_t yy_chk[556] = { 0, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, - 1, 1, 1, 1, 1, 1, 1, 11, 11, 14, - 15, 16, 17, 18, 16, 11, 21, 18, 19, 16, - 22, 15, 21, 22, 14, 20, 15, 23, 22, 17, - 24, 23, 25, 18, 26, 23, 25, 15, 17, 19, - 27, 20, 20, 28, 26, 23, 29, 30, 32, 31, - 43, 44, 25, 24, 43, 44, 32, 45, 30, 47, - 242, 28, 27, 38, 38, 41, 41, 29, 31, 50, - - 48, 38, 49, 41, 42, 42, 42, 42, 46, 49, - 51, 52, 46, 53, 45, 52, 47, 48, 54, 52, - 55, 50, 54, 52, 56, 53, 51, 57, 58, 59, - 60, 61, 57, 57, 55, 62, 63, 58, 61, 59, - 56, 64, 65, 57, 67, 237, 63, 65, 68, 69, - 71, 60, 58, 64, 66, 70, 63, 62, 63, 70, - 68, 69, 66, 67, 73, 71, 72, 72, 78, 72, - 77, 73, 75, 75, 76, 76, 77, 79, 80, 81, - 82, 84, 85, 86, 87, 78, 88, 81, 89, 84, - 90, 79, 92, 88, 91, 80, 94, 91, 85, 93, - - 90, 82, 95, 96, 97, 98, 95, 99, 101, 100, - 86, 87, 97, 98, 93, 104, 89, 100, 102, 92, - 103, 105, 107, 94, 103, 96, 102, 101, 99, 109, - 110, 111, 112, 115, 114, 125, 118, 104, 105, 120, - 121, 107, 119, 125, 121, 127, 137, 112, 114, 131, - 115, 118, 110, 111, 119, 126, 120, 109, 129, 131, - 127, 130, 129, 126, 133, 130, 134, 135, 139, 137, - 138, 135, 140, 138, 141, 146, 142, 143, 144, 133, - 140, 145, 148, 134, 139, 143, 144, 147, 150, 149, - 148, 151, 157, 146, 155, 156, 141, 142, 151, 158, - - 160, 156, 147, 145, 149, 161, 155, 158, 162, 157, - 150, 163, 164, 165, 171, 161, 166, 170, 175, 172, - 164, 173, 160, 174, 166, 170, 176, 177, 178, 180, - 162, 172, 163, 165, 176, 185, 173, 184, 187, 171, - 181, 174, 178, 177, 181, 175, 180, 182, 186, 184, - 188, 190, 192, 194, 195, 182, 197, 185, 187, 200, - 194, 201, 204, 205, 208, 186, 195, 210, 190, 201, - 188, 205, 209, 211, 219, 210, 209, 192, 197, 204, - 217, 220, 218, 217, 221, 222, 208, 200, 218, 223, - 224, 218, 225, 211, 218, 226, 220, 219, 227, 230, - - 228, 221, 231, 218, 228, 232, 233, 222, 224, 223, - 231, 230, 235, 234, 225, 226, 236, 229, 216, 215, - 214, 213, 227, 233, 212, 207, 236, 232, 239, 239, - 206, 239, 240, 203, 240, 240, 241, 241, 241, 241, - 202, 199, 198, 196, 193, 191, 189, 183, 179, 169, - 168, 167, 159, 154, 153, 152, 136, 132, 128, 124, - 123, 122, 117, 116, 113, 108, 106, 83, 74, 40, - 39, 36, 34, 33, 13, 10, 9, 5, 3, 238, - 238, 238, 238, 238, 238, 238, 238, 238, 238, 238, - 238, 238, 238, 238, 238, 238, 238, 238, 238, 238, - - 238, 238, 238, 238, 238, 238, 238, 238, 238, 238, - 238, 238, 238, 238, 238, 238, 238 + 1, 1, 1, 1, 1, 1, 1, 1, 10, 10, + 11, 11, 11, 12, 12, 12, 15, 16, 19, 11, + 18, 17, 12, 19, 20, 17, 21, 23, 22, 16, + 17, 23, 15, 25, 16, 22, 23, 11, 18, 19, + 26, 30, 29, 21, 21, 16, 20, 18, 24, 27, + 28, 31, 25, 24, 27, 33, 32, 24, 42, 42, + 30, 28, 34, 252, 26, 29, 247, 24, 32, 46, + + 27, 34, 48, 31, 46, 33, 40, 40, 40, 43, + 43, 43, 45, 45, 45, 40, 50, 51, 43, 44, + 44, 44, 44, 44, 47, 52, 49, 53, 54, 47, + 48, 49, 57, 52, 55, 51, 56, 57, 58, 55, + 59, 61, 63, 55, 50, 54, 65, 55, 60, 56, + 53, 61, 62, 58, 60, 60, 66, 59, 71, 64, + 67, 68, 83, 62, 63, 60, 61, 64, 65, 69, + 87, 67, 72, 70, 68, 69, 73, 75, 71, 66, + 83, 67, 70, 67, 245, 72, 74, 78, 78, 73, + 244, 74, 87, 75, 76, 76, 85, 76, 76, 77, + + 77, 79, 79, 79, 80, 80, 80, 77, 81, 81, + 81, 82, 84, 86, 85, 89, 90, 91, 82, 92, + 93, 94, 86, 95, 89, 96, 97, 84, 93, 96, + 98, 99, 100, 90, 95, 101, 106, 100, 104, 102, + 103, 107, 105, 106, 108, 91, 98, 92, 102, 103, + 94, 105, 109, 108, 97, 110, 111, 109, 101, 99, + 104, 107, 113, 115, 116, 117, 120, 118, 119, 119, + 124, 121, 125, 126, 111, 127, 239, 226, 110, 133, + 127, 120, 113, 118, 131, 125, 124, 116, 117, 121, + 132, 126, 115, 131, 137, 133, 135, 136, 139, 132, + + 140, 135, 136, 141, 143, 137, 144, 145, 141, 143, + 146, 145, 147, 148, 139, 149, 150, 151, 140, 152, + 153, 147, 154, 155, 156, 150, 151, 146, 157, 164, + 144, 162, 155, 158, 167, 168, 148, 149, 154, 153, + 156, 158, 152, 163, 162, 165, 168, 164, 169, 170, + 163, 157, 171, 172, 165, 173, 174, 167, 178, 179, + 180, 181, 172, 182, 169, 174, 183, 178, 186, 184, + 185, 188, 170, 180, 171, 189, 173, 181, 184, 190, + 189, 191, 182, 186, 193, 179, 194, 185, 190, 188, + 191, 196, 195, 197, 183, 199, 201, 193, 203, 210, + + 206, 214, 204, 218, 225, 224, 203, 211, 215, 194, + 195, 221, 196, 199, 197, 204, 211, 215, 220, 214, + 219, 229, 201, 206, 228, 219, 218, 220, 210, 227, + 231, 228, 221, 227, 228, 230, 232, 228, 234, 233, + 235, 236, 237, 240, 238, 229, 228, 242, 231, 238, + 243, 230, 241, 246, 223, 222, 240, 234, 217, 232, + 233, 241, 236, 235, 246, 216, 213, 237, 243, 212, + 242, 249, 249, 209, 249, 250, 208, 250, 250, 251, + 251, 251, 251, 207, 205, 202, 200, 198, 192, 187, + 177, 176, 175, 166, 161, 160, 159, 142, 138, 134, + + 130, 129, 128, 123, 122, 114, 112, 88, 41, 38, + 36, 35, 14, 9, 5, 3, 248, 248, 248, 248, + 248, 248, 248, 248, 248, 248, 248, 248, 248, 248, + 248, 248, 248, 248, 248, 248, 248, 248, 248, 248, + 248, 248, 248, 248, 248, 248, 248, 248, 248, 248, + 248, 248, 248, 248, 248 } ; static yy_state_type yy_last_accepting_state; @@ -640,7 +651,7 @@ int yy_flex_debug = 0; char *yytext; #line 1 "testpatternl.l" /* - * "$Id: testpatternl.l,v 1.17.14.1 2007/12/15 20:35:52 rlk Exp $" + * "$Id: testpatternl.l,v 1.20 2008/02/03 02:48:20 rlk Exp $" * * Test pattern generator for Gimp-Print * @@ -700,7 +711,7 @@ do \ while (0) -#line 704 "testpatternl.c" +#line 715 "testpatternl.c" #define INITIAL 0 @@ -856,7 +867,7 @@ YY_DECL #line 73 "testpatternl.l" -#line 860 "testpatternl.c" +#line 871 "testpatternl.c" if ( !(yy_init) ) { @@ -909,13 +920,13 @@ yy_match: while ( yy_chk[yy_base[yy_current_state] + yy_c] != yy_current_state ) { yy_current_state = (int) yy_def[yy_current_state]; - if ( yy_current_state >= 239 ) + if ( yy_current_state >= 249 ) yy_c = yy_meta[(unsigned int) yy_c]; } yy_current_state = yy_nxt[yy_base[yy_current_state] + (unsigned int) yy_c]; ++yy_cp; } - while ( yy_base[yy_current_state] != 480 ); + while ( yy_base[yy_current_state] != 517 ); yy_find_action: yy_act = yy_accept[yy_current_state]; @@ -1152,46 +1163,51 @@ DBG(MESSAGE); return MESSAGE; case 43: YY_RULE_SETUP #line 117 "testpatternl.l" -DBG(END); return END; +DBG(NOSCALE); return NOSCALE; YY_BREAK case 44: YY_RULE_SETUP -#line 120 "testpatternl.l" -yylval.ival = atoi(yytext); DBG(tINT); return tINT; +#line 118 "testpatternl.l" +DBG(END); return END; YY_BREAK case 45: YY_RULE_SETUP #line 121 "testpatternl.l" -yylval.dval = strtod(yytext, NULL); DBG(tDOUBLE); return tDOUBLE; +yylval.ival = strtol(yytext, NULL, 0); yylval.dval = (double) yylval.ival; DBG(tINT); return tINT; YY_BREAK case 46: -/* rule 46 can match eol */ YY_RULE_SETUP #line 122 "testpatternl.l" -yylval.sval = c_strstrip(yytext); DBG(tSTRING); return tSTRING; +yylval.dval = strtod(yytext, NULL); DBG(tDOUBLE); return tDOUBLE; YY_BREAK case 47: +/* rule 47 can match eol */ YY_RULE_SETUP #line 123 "testpatternl.l" -DBG(whitespace); /* Skip blanks/tabs */ +yylval.sval = c_strstrip(yytext); DBG(tSTRING); return tSTRING; YY_BREAK case 48: YY_RULE_SETUP #line 124 "testpatternl.l" -DBG(comment); /* Skip comments */ +DBG(whitespace); /* Skip blanks/tabs */ YY_BREAK case 49: -/* rule 49 can match eol */ YY_RULE_SETUP #line 125 "testpatternl.l" -DBG(newline); mylineno++; +DBG(comment); /* Skip comments */ YY_BREAK case 50: +/* rule 50 can match eol */ YY_RULE_SETUP #line 126 "testpatternl.l" +DBG(newline); mylineno++; + YY_BREAK +case 51: +YY_RULE_SETUP +#line 127 "testpatternl.l" ECHO; YY_BREAK -#line 1195 "testpatternl.c" +#line 1211 "testpatternl.c" case YY_STATE_EOF(INITIAL): yyterminate(); @@ -1475,7 +1491,7 @@ static int yy_get_next_buffer (void) while ( yy_chk[yy_base[yy_current_state] + yy_c] != yy_current_state ) { yy_current_state = (int) yy_def[yy_current_state]; - if ( yy_current_state >= 239 ) + if ( yy_current_state >= 249 ) yy_c = yy_meta[(unsigned int) yy_c]; } yy_current_state = yy_nxt[yy_base[yy_current_state] + (unsigned int) yy_c]; @@ -1503,11 +1519,11 @@ static int yy_get_next_buffer (void) while ( yy_chk[yy_base[yy_current_state] + yy_c] != yy_current_state ) { yy_current_state = (int) yy_def[yy_current_state]; - if ( yy_current_state >= 239 ) + if ( yy_current_state >= 249 ) yy_c = yy_meta[(unsigned int) yy_c]; } yy_current_state = yy_nxt[yy_base[yy_current_state] + (unsigned int) yy_c]; - yy_is_jam = (yy_current_state == 238); + yy_is_jam = (yy_current_state == 248); return yy_is_jam ? 0 : yy_current_state; } @@ -2158,4 +2174,4 @@ void yyfree (void * ptr ) #define YYTABLES_NAME "yytables" -#line 126 "testpatternl.l" +#line 127 "testpatternl.l" diff --git a/src/testpattern/testpatternl.l b/src/testpattern/testpatternl.l index e7a213d..58dcfe2 100644 --- a/src/testpattern/testpatternl.l +++ b/src/testpattern/testpatternl.l @@ -1,5 +1,5 @@ /* - * "$Id: testpatternl.l,v 1.17.14.1 2007/12/15 20:35:52 rlk Exp $" + * "$Id: testpatternl.l,v 1.20 2008/02/03 02:48:20 rlk Exp $" * * Test pattern generator for Gimp-Print * @@ -65,7 +65,7 @@ do \ %option noyywrap digit [0-9] -integer [-+]?{digit}+ +integer ([-+]|0[xX])?{digit}+ float [-+]?{digit}+(\.{digit}+)?([eE][-+]?{digit}+)? string ([\"][^\"]+[\"])|([a-zA-Z0-9_][-a-zA-Z0-9_]*)|([\'][^\']*[\']) ws [ \t]+ @@ -114,10 +114,11 @@ gray yylval.ival = GRAY;DBG(GRAY); return GRAY; white yylval.ival = WHITE;DBG(WHITE); return WHITE; output DBG(OUTPUT); return OUTPUT; message DBG(MESSAGE); return MESSAGE; +noscale DBG(NOSCALE); return NOSCALE; end DBG(END); return END; -{integer} yylval.ival = atoi(yytext); DBG(tINT); return tINT; +{integer} yylval.ival = strtol(yytext, NULL, 0); yylval.dval = (double) yylval.ival; DBG(tINT); return tINT; {float} yylval.dval = strtod(yytext, NULL); DBG(tDOUBLE); return tDOUBLE; {string} yylval.sval = c_strstrip(yytext); DBG(tSTRING); return tSTRING; {ws} DBG(whitespace); /* Skip blanks/tabs */ diff --git a/src/testpattern/testpatterny.c b/src/testpattern/testpatterny.c index 524355e..a7ea3dc 100644 --- a/src/testpattern/testpatterny.c +++ b/src/testpattern/testpatterny.c @@ -92,25 +92,26 @@ HSIZE = 281, VSIZE = 282, BLACKLINE = 283, - PATTERN = 284, - XPATTERN = 285, - EXTENDED = 286, - IMAGE = 287, - GRID = 288, - SEMI = 289, - CHANNEL = 290, - CMYK = 291, - KCMY = 292, - RGB = 293, - CMY = 294, - GRAY = 295, - WHITE = 296, - RAW = 297, - MODE = 298, - PAGESIZE = 299, - MESSAGE = 300, - OUTPUT = 301, - END = 302 + NOSCALE = 284, + PATTERN = 285, + XPATTERN = 286, + EXTENDED = 287, + IMAGE = 288, + GRID = 289, + SEMI = 290, + CHANNEL = 291, + CMYK = 292, + KCMY = 293, + RGB = 294, + CMY = 295, + GRAY = 296, + WHITE = 297, + RAW = 298, + MODE = 299, + PAGESIZE = 300, + MESSAGE = 301, + OUTPUT = 302, + END = 303 }; #endif /* Tokens. */ @@ -140,25 +141,26 @@ #define HSIZE 281 #define VSIZE 282 #define BLACKLINE 283 -#define PATTERN 284 -#define XPATTERN 285 -#define EXTENDED 286 -#define IMAGE 287 -#define GRID 288 -#define SEMI 289 -#define CHANNEL 290 -#define CMYK 291 -#define KCMY 292 -#define RGB 293 -#define CMY 294 -#define GRAY 295 -#define WHITE 296 -#define RAW 297 -#define MODE 298 -#define PAGESIZE 299 -#define MESSAGE 300 -#define OUTPUT 301 -#define END 302 +#define NOSCALE 284 +#define PATTERN 285 +#define XPATTERN 286 +#define EXTENDED 287 +#define IMAGE 288 +#define GRID 289 +#define SEMI 290 +#define CHANNEL 291 +#define CMYK 292 +#define KCMY 293 +#define RGB 294 +#define CMY 295 +#define GRAY 296 +#define WHITE 297 +#define RAW 298 +#define MODE 299 +#define PAGESIZE 300 +#define MESSAGE 301 +#define OUTPUT 302 +#define END 303 @@ -222,7 +224,7 @@ find_color(const char *name) int i = 0; while (color_map[i].name) { - if (strcmp(color_map[i].name, name) == 0) + if (strcasecmp(color_map[i].name, name) == 0) return color_map[i].channel; i++; } @@ -262,7 +264,7 @@ typedef int YYSTYPE; /* Line 216 of yacc.c. */ -#line 266 "testpatterny.c" +#line 268 "testpatterny.c" #ifdef short # undef short @@ -475,22 +477,22 @@ union yyalloc #endif /* YYFINAL -- State number of the termination state. */ -#define YYFINAL 59 +#define YYFINAL 61 /* YYLAST -- Last index in YYTABLE. */ -#define YYLAST 136 +#define YYLAST 178 /* YYNTOKENS -- Number of terminals. */ -#define YYNTOKENS 48 +#define YYNTOKENS 49 /* YYNNTS -- Number of nonterminals. */ -#define YYNNTS 70 +#define YYNNTS 72 /* YYNRULES -- Number of rules. */ -#define YYNRULES 123 +#define YYNRULES 127 /* YYNRULES -- Number of states. */ -#define YYNSTATES 180 +#define YYNSTATES 185 /* YYTRANSLATE(YYLEX) -- Bison symbol number corresponding to YYLEX. */ #define YYUNDEFTOK 2 -#define YYMAXUTOK 302 +#define YYMAXUTOK 303 #define YYTRANSLATE(YYX) \ ((unsigned int) (YYX) <= YYMAXUTOK ? yytranslate[YYX] : YYUNDEFTOK) @@ -528,7 +530,7 @@ static const yytype_uint8 yytranslate[] = 15, 16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26, 27, 28, 29, 30, 31, 32, 33, 34, 35, 36, 37, 38, 39, 40, 41, 42, 43, 44, - 45, 46, 47 + 45, 46, 47, 48 }; #if YYDEBUG @@ -537,74 +539,75 @@ static const yytype_uint8 yytranslate[] = static const yytype_uint16 yyprhs[] = { 0, 0, 3, 5, 7, 9, 11, 13, 15, 17, - 19, 22, 25, 28, 31, 34, 37, 41, 43, 45, - 47, 49, 51, 53, 55, 58, 62, 66, 70, 74, - 77, 80, 83, 86, 89, 93, 95, 97, 101, 105, - 109, 113, 115, 117, 119, 121, 124, 127, 130, 133, - 136, 139, 143, 145, 148, 149, 151, 154, 159, 165, - 167, 169, 171, 174, 175, 177, 179, 181, 187, 191, - 194, 197, 201, 204, 208, 213, 219, 226, 228, 230, - 232, 234, 236, 238, 240, 243, 245, 247, 249, 251, - 253, 255, 257, 259, 261, 263, 265, 267, 269, 271, - 273, 275, 277, 279, 281, 283, 285, 287, 290, 292, - 294, 296, 298, 301, 302, 305, 307, 308, 311, 313, - 315, 316, 319, 320 + 19, 21, 23, 26, 29, 32, 35, 38, 41, 45, + 47, 49, 51, 53, 55, 57, 59, 62, 66, 70, + 74, 78, 81, 84, 87, 90, 93, 97, 99, 101, + 105, 109, 113, 117, 119, 121, 123, 125, 128, 131, + 134, 137, 140, 143, 146, 150, 152, 155, 156, 158, + 161, 166, 172, 174, 176, 178, 181, 182, 184, 186, + 188, 194, 198, 201, 204, 208, 211, 215, 220, 226, + 233, 235, 237, 239, 241, 243, 245, 247, 250, 252, + 254, 256, 258, 260, 262, 264, 266, 268, 270, 272, + 274, 276, 278, 280, 282, 284, 286, 288, 290, 292, + 294, 296, 299, 301, 303, 305, 307, 310, 311, 314, + 316, 317, 320, 322, 324, 325, 328, 329 }; /* YYRHS -- A `-1'-separated list of the rules' RHS. */ static const yytype_int8 yyrhs[] = { - 116, 0, -1, 6, -1, 7, -1, 8, -1, 9, - -1, 10, -1, 11, -1, 12, -1, 13, -1, 36, - 3, -1, 37, 3, -1, 38, 3, -1, 39, 3, - -1, 40, 3, -1, 41, 3, -1, 31, 3, 3, - -1, 50, -1, 51, -1, 52, -1, 53, -1, 54, - -1, 55, -1, 56, -1, 43, 57, -1, 15, 49, - 4, -1, 15, 3, 4, -1, 14, 49, 4, -1, - 14, 3, 4, -1, 14, 4, -1, 16, 3, -1, - 17, 4, -1, 18, 5, -1, 44, 5, -1, 44, - 3, 3, -1, 67, -1, 68, -1, 19, 5, 5, - -1, 20, 5, 3, -1, 21, 5, 4, -1, 22, - 5, 5, -1, 70, -1, 71, -1, 72, -1, 73, - -1, 23, 4, -1, 24, 4, -1, 25, 4, -1, - 26, 4, -1, 27, 4, -1, 28, 3, -1, 4, - 4, 4, -1, 81, -1, 82, 81, -1, -1, 82, - -1, 81, 83, -1, 49, 4, 4, 4, -1, 35, - 3, 4, 4, 4, -1, 85, -1, 86, -1, 87, - -1, 88, 87, -1, -1, 88, -1, 84, -1, 89, - -1, 4, 4, 4, 4, 4, -1, 29, 91, 90, - -1, 30, 90, -1, 33, 3, -1, 32, 3, 3, - -1, 45, 5, -1, 45, 5, 5, -1, 45, 5, - 5, 5, -1, 45, 5, 5, 5, 5, -1, 45, - 5, 5, 5, 5, 5, -1, 96, -1, 97, -1, - 98, -1, 99, -1, 100, -1, 101, -1, 46, -1, - 46, 5, -1, 103, -1, 104, -1, 105, -1, 61, - -1, 62, -1, 59, -1, 60, -1, 63, -1, 64, - -1, 65, -1, 66, -1, 74, -1, 75, -1, 76, - -1, 77, -1, 78, -1, 79, -1, 80, -1, 58, - -1, 69, -1, 102, -1, 106, -1, 107, 34, -1, - 92, -1, 93, -1, 94, -1, 102, -1, 109, 34, - -1, -1, 111, 110, -1, 95, -1, -1, 113, 108, - -1, 111, -1, 112, -1, -1, 47, 34, -1, -1, - 113, 117, 114, 115, -1 + 119, 0, -1, 6, -1, 7, -1, 8, -1, 9, + -1, 10, -1, 11, -1, 12, -1, 13, -1, 4, + -1, 3, -1, 37, 3, -1, 38, 3, -1, 39, + 3, -1, 40, 3, -1, 41, 3, -1, 42, 3, + -1, 32, 3, 3, -1, 52, -1, 53, -1, 54, + -1, 55, -1, 56, -1, 57, -1, 58, -1, 44, + 59, -1, 15, 50, 51, -1, 15, 3, 51, -1, + 14, 50, 51, -1, 14, 3, 51, -1, 14, 51, + -1, 16, 3, -1, 17, 51, -1, 18, 5, -1, + 45, 5, -1, 45, 3, 3, -1, 69, -1, 70, + -1, 19, 5, 5, -1, 20, 5, 3, -1, 21, + 5, 51, -1, 22, 5, 5, -1, 72, -1, 73, + -1, 74, -1, 75, -1, 23, 51, -1, 24, 51, + -1, 25, 51, -1, 26, 51, -1, 27, 51, -1, + 28, 3, -1, 29, 3, -1, 51, 51, 51, -1, + 84, -1, 85, 84, -1, -1, 85, -1, 84, 86, + -1, 50, 51, 51, 51, -1, 36, 3, 51, 51, + 51, -1, 88, -1, 89, -1, 90, -1, 91, 90, + -1, -1, 91, -1, 87, -1, 92, -1, 51, 51, + 51, 51, 51, -1, 30, 94, 93, -1, 31, 93, + -1, 34, 3, -1, 33, 3, 3, -1, 46, 5, + -1, 46, 5, 5, -1, 46, 5, 5, 5, -1, + 46, 5, 5, 5, 5, -1, 46, 5, 5, 5, + 5, 5, -1, 99, -1, 100, -1, 101, -1, 102, + -1, 103, -1, 104, -1, 47, -1, 47, 5, -1, + 106, -1, 107, -1, 108, -1, 63, -1, 64, -1, + 61, -1, 62, -1, 65, -1, 66, -1, 67, -1, + 68, -1, 76, -1, 77, -1, 78, -1, 79, -1, + 80, -1, 81, -1, 82, -1, 83, -1, 60, -1, + 71, -1, 105, -1, 109, -1, 110, 35, -1, 95, + -1, 96, -1, 97, -1, 105, -1, 112, 35, -1, + -1, 114, 113, -1, 98, -1, -1, 116, 111, -1, + 114, -1, 115, -1, -1, 48, 35, -1, -1, 116, + 120, 117, 118, -1 }; /* YYRLINE[YYN] -- source line where rule number YYN was defined. */ static const yytype_uint16 yyrline[] = { - 0, 140, 140, 140, 140, 140, 141, 141, 141, 141, - 144, 156, 168, 180, 192, 204, 216, 228, 228, 228, - 228, 228, 228, 228, 231, 234, 244, 253, 263, 272, - 279, 286, 293, 302, 311, 320, 320, 323, 333, 342, - 351, 365, 365, 365, 365, 367, 374, 381, 388, 395, - 402, 410, 425, 425, 428, 428, 431, 434, 448, 461, - 461, 464, 464, 467, 467, 470, 470, 473, 488, 491, - 506, 517, 534, 540, 547, 555, 564, 575, 575, 575, - 575, 575, 578, 581, 588, 593, 593, 596, 599, 599, - 599, 599, 599, 599, 600, 600, 600, 600, 600, 600, - 600, 601, 601, 601, 601, 601, 601, 604, 608, 608, - 608, 608, 611, 615, 615, 618, 622, 622, 625, 625, - 628, 628, 633, 632 + 0, 141, 141, 141, 141, 141, 142, 142, 142, 142, + 144, 144, 147, 159, 171, 183, 195, 207, 219, 231, + 231, 231, 231, 231, 231, 231, 234, 237, 247, 256, + 266, 275, 282, 289, 296, 305, 314, 323, 323, 326, + 336, 345, 354, 368, 368, 368, 368, 370, 377, 384, + 391, 398, 405, 413, 421, 436, 436, 439, 439, 442, + 445, 459, 472, 472, 475, 475, 478, 478, 481, 481, + 484, 499, 502, 517, 528, 545, 551, 558, 566, 575, + 586, 586, 586, 586, 586, 589, 592, 599, 604, 604, + 607, 610, 610, 610, 610, 610, 610, 611, 611, 611, + 611, 611, 611, 611, 612, 612, 612, 612, 612, 612, + 612, 615, 619, 619, 619, 619, 622, 626, 626, 629, + 633, 633, 636, 636, 639, 639, 644, 643 }; #endif @@ -617,21 +620,22 @@ static const char *const yytname[] = "L_CYAN", "MAGENTA", "L_MAGENTA", "YELLOW", "D_YELLOW", "BLACK", "L_BLACK", "GAMMA", "LEVEL", "STEPS", "INK_LIMIT", "PRINTER", "PARAMETER", "PARAMETER_INT", "PARAMETER_FLOAT", "PARAMETER_CURVE", - "DENSITY", "TOP", "LEFT", "HSIZE", "VSIZE", "BLACKLINE", "PATTERN", - "XPATTERN", "EXTENDED", "IMAGE", "GRID", "SEMI", "CHANNEL", "CMYK", - "KCMY", "RGB", "CMY", "GRAY", "WHITE", "RAW", "MODE", "PAGESIZE", - "MESSAGE", "OUTPUT", "END", "$accept", "COLOR", "cmykspec", "kcmyspec", - "rgbspec", "cmyspec", "grayspec", "whitespec", "extendedspec", - "modespec", "inputspec", "level", "channel_level", "gamma", - "channel_gamma", "global_gamma", "steps", "ink_limit", "printer", - "page_size_name", "page_size_custom", "page_size", "parameter_string", - "parameter_int", "parameter_float", "parameter_curve", "parameter", - "density", "top", "left", "hsize", "vsize", "blackline", "color_block1", - "color_blocks1a", "color_blocks1b", "color_blocks1", "color_block2a", - "color_block2b", "color_block2", "color_blocks2a", "color_blocks2", - "color_blocks", "patvars", "pattern", "xpattern", "grid", "image", - "Message0", "Message1", "Message2", "Message3", "Message4", "A_Message", - "message", "Output0", "Output1", "A_Output", "output", "A_Rule", "Rule", + "DENSITY", "TOP", "LEFT", "HSIZE", "VSIZE", "BLACKLINE", "NOSCALE", + "PATTERN", "XPATTERN", "EXTENDED", "IMAGE", "GRID", "SEMI", "CHANNEL", + "CMYK", "KCMY", "RGB", "CMY", "GRAY", "WHITE", "RAW", "MODE", "PAGESIZE", + "MESSAGE", "OUTPUT", "END", "$accept", "COLOR", "NUMBER", "cmykspec", + "kcmyspec", "rgbspec", "cmyspec", "grayspec", "whitespec", + "extendedspec", "modespec", "inputspec", "level", "channel_level", + "gamma", "channel_gamma", "global_gamma", "steps", "ink_limit", + "printer", "page_size_name", "page_size_custom", "page_size", + "parameter_string", "parameter_int", "parameter_float", + "parameter_curve", "parameter", "density", "top", "left", "hsize", + "vsize", "blackline", "noscale", "color_block1", "color_blocks1a", + "color_blocks1b", "color_blocks1", "color_block2a", "color_block2b", + "color_block2", "color_blocks2a", "color_blocks2", "color_blocks", + "patvars", "pattern", "xpattern", "grid", "image", "Message0", + "Message1", "Message2", "Message3", "Message4", "A_Message", "message", + "Output0", "Output1", "A_Output", "output", "A_Rule", "Rule", "A_Pattern", "Pattern", "Patterns", "Image", "Rules", "Output", "EOF", "Thing", "@1", 0 }; @@ -646,44 +650,44 @@ static const yytype_uint16 yytoknum[] = 265, 266, 267, 268, 269, 270, 271, 272, 273, 274, 275, 276, 277, 278, 279, 280, 281, 282, 283, 284, 285, 286, 287, 288, 289, 290, 291, 292, 293, 294, - 295, 296, 297, 298, 299, 300, 301, 302 + 295, 296, 297, 298, 299, 300, 301, 302, 303 }; # endif /* YYR1[YYN] -- Symbol number of symbol that rule YYN derives. */ static const yytype_uint8 yyr1[] = { - 0, 48, 49, 49, 49, 49, 49, 49, 49, 49, - 50, 51, 52, 53, 54, 55, 56, 57, 57, 57, - 57, 57, 57, 57, 58, 59, 60, 61, 62, 63, - 64, 65, 66, 67, 68, 69, 69, 70, 71, 72, - 73, 74, 74, 74, 74, 75, 76, 77, 78, 79, - 80, 81, 82, 82, 83, 83, 84, 85, 86, 87, - 87, 88, 88, 89, 89, 90, 90, 91, 92, 93, - 94, 95, 96, 97, 98, 99, 100, 101, 101, 101, - 101, 101, 102, 103, 104, 105, 105, 106, 107, 107, - 107, 107, 107, 107, 107, 107, 107, 107, 107, 107, - 107, 107, 107, 107, 107, 107, 107, 108, 109, 109, - 109, 109, 110, 111, 111, 112, 113, 113, 114, 114, - 115, 115, 117, 116 + 0, 49, 50, 50, 50, 50, 50, 50, 50, 50, + 51, 51, 52, 53, 54, 55, 56, 57, 58, 59, + 59, 59, 59, 59, 59, 59, 60, 61, 62, 63, + 64, 65, 66, 67, 68, 69, 70, 71, 71, 72, + 73, 74, 75, 76, 76, 76, 76, 77, 78, 79, + 80, 81, 82, 83, 84, 85, 85, 86, 86, 87, + 88, 89, 90, 90, 91, 91, 92, 92, 93, 93, + 94, 95, 96, 97, 98, 99, 100, 101, 102, 103, + 104, 104, 104, 104, 104, 105, 106, 107, 108, 108, + 109, 110, 110, 110, 110, 110, 110, 110, 110, 110, + 110, 110, 110, 110, 110, 110, 110, 110, 110, 110, + 110, 111, 112, 112, 112, 112, 113, 114, 114, 115, + 116, 116, 117, 117, 118, 118, 120, 119 }; /* YYR2[YYN] -- Number of symbols composing right hand side of rule YYN. */ static const yytype_uint8 yyr2[] = { 0, 2, 1, 1, 1, 1, 1, 1, 1, 1, - 2, 2, 2, 2, 2, 2, 3, 1, 1, 1, - 1, 1, 1, 1, 2, 3, 3, 3, 3, 2, - 2, 2, 2, 2, 3, 1, 1, 3, 3, 3, - 3, 1, 1, 1, 1, 2, 2, 2, 2, 2, - 2, 3, 1, 2, 0, 1, 2, 4, 5, 1, - 1, 1, 2, 0, 1, 1, 1, 5, 3, 2, - 2, 3, 2, 3, 4, 5, 6, 1, 1, 1, - 1, 1, 1, 1, 2, 1, 1, 1, 1, 1, - 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, + 1, 1, 2, 2, 2, 2, 2, 2, 3, 1, + 1, 1, 1, 1, 1, 1, 2, 3, 3, 3, + 3, 2, 2, 2, 2, 2, 3, 1, 1, 3, + 3, 3, 3, 1, 1, 1, 1, 2, 2, 2, + 2, 2, 2, 2, 3, 1, 2, 0, 1, 2, + 4, 5, 1, 1, 1, 2, 0, 1, 1, 1, + 5, 3, 2, 2, 3, 2, 3, 4, 5, 6, 1, 1, 1, 1, 1, 1, 1, 2, 1, 1, - 1, 1, 2, 0, 2, 1, 0, 2, 1, 1, - 0, 2, 0, 4 + 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, + 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, + 1, 2, 1, 1, 1, 1, 2, 0, 2, 1, + 0, 2, 1, 1, 0, 2, 0, 4 }; /* YYDEFACT[STATE-NAME] -- Default rule to reduce with in state @@ -691,73 +695,77 @@ static const yytype_uint8 yyr2[] = means the default is an error. */ static const yytype_uint8 yydefact[] = { - 116, 122, 0, 0, 0, 0, 0, 0, 0, 0, + 120, 126, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 83, 103, 90, 91, 88, 89, 92, 93, 94, - 95, 35, 36, 104, 41, 42, 43, 44, 96, 97, - 98, 99, 100, 101, 102, 77, 78, 79, 80, 81, - 82, 105, 85, 86, 87, 106, 0, 117, 113, 1, - 0, 29, 2, 3, 4, 5, 6, 7, 8, 9, - 0, 0, 0, 30, 31, 32, 0, 0, 0, 0, - 45, 46, 47, 48, 49, 50, 0, 0, 0, 0, - 0, 0, 0, 17, 18, 19, 20, 21, 22, 23, - 24, 0, 33, 72, 84, 107, 0, 115, 118, 119, - 120, 28, 27, 26, 25, 37, 38, 39, 40, 0, - 10, 11, 12, 13, 14, 15, 34, 73, 0, 0, - 63, 0, 108, 109, 110, 111, 0, 114, 0, 123, - 16, 74, 71, 0, 63, 0, 0, 0, 54, 65, - 59, 60, 61, 64, 66, 69, 70, 112, 121, 75, - 0, 68, 0, 0, 0, 52, 55, 56, 62, 76, - 0, 51, 0, 0, 53, 0, 0, 57, 67, 58 + 0, 0, 86, 107, 93, 94, 91, 92, 95, 96, + 97, 98, 37, 38, 108, 43, 44, 45, 46, 99, + 100, 101, 102, 103, 104, 105, 106, 80, 81, 82, + 83, 84, 85, 109, 88, 89, 90, 110, 0, 121, + 117, 1, 11, 10, 2, 3, 4, 5, 6, 7, + 8, 9, 0, 31, 0, 0, 32, 11, 33, 34, + 0, 0, 0, 0, 47, 48, 49, 50, 51, 52, + 53, 0, 0, 0, 0, 0, 0, 0, 19, 20, + 21, 22, 23, 24, 25, 26, 0, 35, 75, 87, + 111, 0, 119, 122, 123, 124, 30, 29, 28, 27, + 39, 40, 41, 42, 0, 12, 13, 14, 15, 16, + 17, 36, 76, 0, 0, 66, 0, 112, 113, 114, + 115, 0, 118, 0, 127, 18, 77, 74, 0, 66, + 0, 0, 0, 57, 68, 62, 63, 64, 67, 69, + 72, 73, 116, 125, 78, 0, 71, 0, 0, 0, + 55, 58, 59, 65, 79, 0, 0, 0, 54, 56, + 0, 0, 60, 70, 61 }; /* YYDEFGOTO[NTERM-NUM]. */ static const yytype_int16 yydefgoto[] = { - -1, 147, 93, 94, 95, 96, 97, 98, 99, 100, - 22, 23, 24, 25, 26, 27, 28, 29, 30, 31, + -1, 151, 152, 98, 99, 100, 101, 102, 103, 104, + 105, 23, 24, 25, 26, 27, 28, 29, 30, 31, 32, 33, 34, 35, 36, 37, 38, 39, 40, 41, - 42, 43, 44, 148, 166, 167, 149, 150, 151, 152, - 153, 154, 155, 144, 132, 133, 134, 107, 45, 46, + 42, 43, 44, 45, 46, 153, 171, 172, 154, 155, + 156, 157, 158, 159, 160, 149, 137, 138, 139, 112, 47, 48, 49, 50, 51, 52, 53, 54, 55, 56, - 57, 136, 137, 108, 109, 1, 110, 139, 2, 58 + 57, 58, 59, 141, 142, 113, 114, 1, 115, 144, + 2, 60 }; /* YYPACT[STATE-NUM] -- Index in YYTABLE of the portion describing STATE-NUM. */ -#define YYPACT_NINF -124 -static const yytype_int16 yypact[] = +#define YYPACT_NINF -112 +static const yytype_int8 yypact[] = { - -124, -14, 16, 57, 41, 24, 54, 67, 68, 69, - 70, 77, 55, 79, 80, 81, 82, 84, 40, 23, - 83, 85, -124, -124, -124, -124, -124, -124, -124, -124, - -124, -124, -124, -124, -124, -124, -124, -124, -124, -124, - -124, -124, -124, -124, -124, -124, -124, -124, -124, -124, - -124, -124, -124, -124, -124, -124, 58, -124, 59, -124, - 89, -124, -124, -124, -124, -124, -124, -124, -124, -124, - 90, 91, 92, -124, -124, -124, 93, 86, 95, 96, - -124, -124, -124, -124, -124, -124, 94, 97, 99, 100, - 101, 102, 103, -124, -124, -124, -124, -124, -124, -124, - -124, 104, -124, 105, -124, -124, 106, -124, 12, -124, - 61, -124, -124, -124, -124, -124, -124, -124, -124, 108, - -124, -124, -124, -124, -124, -124, -124, 107, 110, 111, - 11, 113, -124, -124, -124, -124, 87, -124, 88, -124, - -124, 109, -124, 114, 11, 115, 117, 119, 120, -124, - -124, -124, -124, 27, -124, -124, -124, -124, -124, 112, - 121, -124, 122, 123, 124, -124, 120, -124, -124, -124, - 125, -124, 126, 127, -124, 128, 129, -124, -124, -124 + -112, 0, 1, 77, 88, 29, 2, 36, 38, 51, + 52, 53, 2, 2, 2, 2, 2, 61, 63, 70, + -1, 62, 65, -112, -112, -112, -112, -112, -112, -112, + -112, -112, -112, -112, -112, -112, -112, -112, -112, -112, + -112, -112, -112, -112, -112, -112, -112, -112, -112, -112, + -112, -112, -112, -112, -112, -112, -112, -112, 33, -112, + 40, -112, 2, -112, -112, -112, -112, -112, -112, -112, + -112, -112, 2, -112, 2, 2, -112, -112, -112, -112, + 69, 72, 2, 71, -112, -112, -112, -112, -112, -112, + -112, 79, 89, 90, 100, 101, 102, 103, -112, -112, + -112, -112, -112, -112, -112, -112, 110, -112, 109, -112, + -112, 112, -112, 31, -112, 68, -112, -112, -112, -112, + -112, -112, -112, -112, 114, -112, -112, -112, -112, -112, + -112, -112, 113, 116, 2, 27, 117, -112, -112, -112, + -112, 86, -112, 87, -112, -112, 118, -112, 2, 27, + 121, 2, 2, 2, -112, -112, -112, -112, 42, -112, + -112, -112, -112, -112, 120, 2, -112, 2, 2, 2, + -112, 2, -112, -112, -112, 2, 2, 2, -112, -112, + 2, 2, -112, -112, -112 }; /* YYPGOTO[NTERM-NUM]. */ static const yytype_int8 yypgoto[] = { - -124, 52, -124, -124, -124, -124, -124, -124, -124, -124, - -124, -124, -124, -124, -124, -124, -124, -124, -124, -124, - -124, -124, -124, -124, -124, -124, -124, -124, -124, -124, - -124, -124, -124, -123, -124, -124, -124, -124, -124, -19, - -124, -124, -9, -124, -124, -124, -124, -124, -124, -124, - -124, -124, -124, -124, 28, -124, -124, -124, -124, -124, - -124, -124, -124, -124, -124, -124, -124, -124, -124, -124 + -112, 4, -3, -112, -112, -112, -112, -112, -112, -112, + -112, -112, -112, -112, -112, -112, -112, -112, -112, -112, + -112, -112, -112, -112, -112, -112, -112, -112, -112, -112, + -112, -112, -112, -112, -112, -111, -112, -112, -112, -112, + -112, -32, -112, -112, -22, -112, -112, -112, -112, -112, + -112, -112, -112, -112, -112, -112, 15, -112, -112, -112, + -112, -112, -112, -112, -112, -112, -112, -112, -112, -112, + -112, -112 }; /* YYTABLE[YYPACT[STATE-NUM]]. What to do in state STATE-NUM. If @@ -767,62 +775,71 @@ static const yytype_int8 yypgoto[] = #define YYTABLE_NINF -1 static const yytype_uint8 yytable[] = { - 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, - 13, 14, 15, 16, 17, 145, 59, 62, 63, 64, - 65, 66, 67, 68, 69, 165, 101, 73, 102, 18, - 19, 20, 21, 62, 63, 64, 65, 66, 67, 68, - 69, 129, 130, 174, 71, 131, 146, 62, 63, 64, - 65, 66, 67, 68, 69, 70, 72, 20, 74, 80, - 60, 61, 146, 62, 63, 64, 65, 66, 67, 68, - 69, 86, 75, 76, 77, 78, 87, 88, 89, 90, - 91, 92, 79, 81, 82, 83, 84, 85, 103, 116, - 104, 106, 105, 111, 112, 113, 114, 119, 115, 117, - 120, 118, 121, 122, 123, 124, 125, 126, 138, 128, - 127, 140, 141, 142, 159, 143, 156, 169, 160, 162, - 163, 157, 158, 164, 145, 170, 171, 172, 173, 175, - 176, 177, 178, 179, 168, 161, 135 + 73, 61, 106, 78, 107, 77, 63, 72, 75, 84, + 85, 86, 87, 88, 3, 4, 5, 6, 7, 8, + 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, + 77, 63, 76, 64, 65, 66, 67, 68, 69, 70, + 71, 79, 170, 80, 19, 20, 21, 22, 64, 65, + 66, 67, 68, 69, 70, 71, 81, 82, 83, 116, + 179, 134, 135, 150, 89, 136, 90, 108, 110, 117, + 109, 118, 119, 111, 120, 121, 123, 21, 150, 122, + 62, 63, 124, 64, 65, 66, 67, 68, 69, 70, + 71, 74, 125, 126, 64, 65, 66, 67, 68, 69, + 70, 71, 91, 127, 128, 129, 130, 92, 93, 94, + 95, 96, 97, 131, 132, 133, 143, 145, 146, 147, + 161, 162, 163, 164, 167, 174, 173, 166, 140, 0, + 0, 148, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 165, 0, 0, 168, 169, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 175, 0, 176, 177, 178, 0, 0, 0, + 0, 0, 180, 181, 182, 0, 0, 183, 184 }; -static const yytype_uint8 yycheck[] = +static const yytype_int16 yycheck[] = { - 14, 15, 16, 17, 18, 19, 20, 21, 22, 23, - 24, 25, 26, 27, 28, 4, 0, 6, 7, 8, - 9, 10, 11, 12, 13, 148, 3, 3, 5, 43, - 44, 45, 46, 6, 7, 8, 9, 10, 11, 12, - 13, 29, 30, 166, 3, 33, 35, 6, 7, 8, - 9, 10, 11, 12, 13, 3, 4, 45, 4, 4, - 3, 4, 35, 6, 7, 8, 9, 10, 11, 12, - 13, 31, 5, 5, 5, 5, 36, 37, 38, 39, - 40, 41, 5, 4, 4, 4, 4, 3, 5, 3, - 5, 32, 34, 4, 4, 4, 4, 3, 5, 4, - 3, 5, 3, 3, 3, 3, 3, 3, 47, 3, - 5, 3, 5, 3, 5, 4, 3, 5, 4, 4, - 3, 34, 34, 4, 4, 4, 4, 4, 4, 4, - 4, 4, 4, 4, 153, 144, 108 + 3, 0, 3, 6, 5, 3, 4, 3, 4, 12, + 13, 14, 15, 16, 14, 15, 16, 17, 18, 19, + 20, 21, 22, 23, 24, 25, 26, 27, 28, 29, + 3, 4, 3, 6, 7, 8, 9, 10, 11, 12, + 13, 5, 153, 5, 44, 45, 46, 47, 6, 7, + 8, 9, 10, 11, 12, 13, 5, 5, 5, 62, + 171, 30, 31, 36, 3, 34, 3, 5, 35, 72, + 5, 74, 75, 33, 5, 3, 5, 46, 36, 82, + 3, 4, 3, 6, 7, 8, 9, 10, 11, 12, + 13, 3, 3, 3, 6, 7, 8, 9, 10, 11, + 12, 13, 32, 3, 3, 3, 3, 37, 38, 39, + 40, 41, 42, 3, 5, 3, 48, 3, 5, 3, + 3, 35, 35, 5, 3, 5, 158, 149, 113, -1, + -1, 134, -1, -1, -1, -1, -1, -1, -1, -1, + -1, -1, -1, -1, -1, 148, -1, -1, 151, 152, + -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, + -1, -1, 165, -1, 167, 168, 169, -1, -1, -1, + -1, -1, 175, 176, 177, -1, -1, 180, 181 }; /* YYSTOS[STATE-NUM] -- The (internal number of the) accessing symbol of state STATE-NUM. */ static const yytype_uint8 yystos[] = { - 0, 113, 116, 14, 15, 16, 17, 18, 19, 20, - 21, 22, 23, 24, 25, 26, 27, 28, 43, 44, - 45, 46, 58, 59, 60, 61, 62, 63, 64, 65, - 66, 67, 68, 69, 70, 71, 72, 73, 74, 75, - 76, 77, 78, 79, 80, 96, 97, 98, 99, 100, - 101, 102, 103, 104, 105, 106, 107, 108, 117, 0, - 3, 4, 6, 7, 8, 9, 10, 11, 12, 13, - 49, 3, 49, 3, 4, 5, 5, 5, 5, 5, - 4, 4, 4, 4, 4, 3, 31, 36, 37, 38, - 39, 40, 41, 50, 51, 52, 53, 54, 55, 56, - 57, 3, 5, 5, 5, 34, 32, 95, 111, 112, - 114, 4, 4, 4, 4, 5, 3, 4, 5, 3, - 3, 3, 3, 3, 3, 3, 3, 5, 3, 29, - 30, 33, 92, 93, 94, 102, 109, 110, 47, 115, - 3, 5, 3, 4, 91, 4, 35, 49, 81, 84, - 85, 86, 87, 88, 89, 90, 3, 34, 34, 5, - 4, 90, 4, 3, 4, 81, 82, 83, 87, 5, - 4, 4, 4, 4, 81, 4, 4, 4, 4, 4 + 0, 116, 119, 14, 15, 16, 17, 18, 19, 20, + 21, 22, 23, 24, 25, 26, 27, 28, 29, 44, + 45, 46, 47, 60, 61, 62, 63, 64, 65, 66, + 67, 68, 69, 70, 71, 72, 73, 74, 75, 76, + 77, 78, 79, 80, 81, 82, 83, 99, 100, 101, + 102, 103, 104, 105, 106, 107, 108, 109, 110, 111, + 120, 0, 3, 4, 6, 7, 8, 9, 10, 11, + 12, 13, 50, 51, 3, 50, 3, 3, 51, 5, + 5, 5, 5, 5, 51, 51, 51, 51, 51, 3, + 3, 32, 37, 38, 39, 40, 41, 42, 52, 53, + 54, 55, 56, 57, 58, 59, 3, 5, 5, 5, + 35, 33, 98, 114, 115, 117, 51, 51, 51, 51, + 5, 3, 51, 5, 3, 3, 3, 3, 3, 3, + 3, 3, 5, 3, 30, 31, 34, 95, 96, 97, + 105, 112, 113, 48, 118, 3, 5, 3, 51, 94, + 36, 50, 51, 84, 87, 88, 89, 90, 91, 92, + 93, 3, 35, 35, 5, 51, 93, 3, 51, 51, + 84, 85, 86, 90, 5, 51, 51, 51, 51, 84, + 51, 51, 51, 51, 51 }; #define yyerrok (yyerrstatus = 0) @@ -1636,8 +1653,8 @@ yyreduce: YY_REDUCE_PRINT (yyn); switch (yyn) { - case 10: -#line 145 "testpatterny.y" + case 12: +#line 148 "testpatterny.y" { if (getenv("STP_TESTPATTERN_DEBUG")) fprintf(stderr, ">>>cmykspec %d\n", (yyvsp[(2) - (2)].ival)); @@ -1649,8 +1666,8 @@ yyreduce: } break; - case 11: -#line 157 "testpatterny.y" + case 13: +#line 160 "testpatterny.y" { if (getenv("STP_TESTPATTERN_DEBUG")) fprintf(stderr, ">>>kcmyspec %d\n", (yyvsp[(2) - (2)].ival)); @@ -1662,8 +1679,8 @@ yyreduce: } break; - case 12: -#line 169 "testpatterny.y" + case 14: +#line 172 "testpatterny.y" { if (getenv("STP_TESTPATTERN_DEBUG")) fprintf(stderr, ">>>rgbspec %d\n", (yyvsp[(2) - (2)].ival)); @@ -1675,8 +1692,8 @@ yyreduce: } break; - case 13: -#line 181 "testpatterny.y" + case 15: +#line 184 "testpatterny.y" { if (getenv("STP_TESTPATTERN_DEBUG")) fprintf(stderr, ">>>cmyspec %d\n", (yyvsp[(2) - (2)].ival)); @@ -1688,8 +1705,8 @@ yyreduce: } break; - case 14: -#line 193 "testpatterny.y" + case 16: +#line 196 "testpatterny.y" { if (getenv("STP_TESTPATTERN_DEBUG")) fprintf(stderr, ">>>grayspec %d\n", (yyvsp[(2) - (2)].ival)); @@ -1701,8 +1718,8 @@ yyreduce: } break; - case 15: -#line 205 "testpatterny.y" + case 17: +#line 208 "testpatterny.y" { if (getenv("STP_TESTPATTERN_DEBUG")) fprintf(stderr, ">>>whitespec %d\n", (yyvsp[(2) - (2)].ival)); @@ -1714,8 +1731,8 @@ yyreduce: } break; - case 16: -#line 217 "testpatterny.y" + case 18: +#line 220 "testpatterny.y" { if (getenv("STP_TESTPATTERN_DEBUG")) fprintf(stderr, ">>>extendedspec %d\n", (yyvsp[(2) - (3)].ival)); @@ -1727,59 +1744,59 @@ yyreduce: } break; - case 25: -#line 235 "testpatterny.y" + case 27: +#line 238 "testpatterny.y" { int channel = find_color((yyvsp[(2) - (3)]).sval); if (getenv("STP_TESTPATTERN_DEBUG")) - fprintf(stderr, ">>>level %s %f\n", (yyvsp[(2) - (3)]).sval, (yyvsp[(3) - (3)].dval)); + fprintf(stderr, ">>>level %s %f\n", (yyvsp[(2) - (3)]).sval, (yyvsp[(3) - (3)]).dval); if (channel >= 0) - global_levels[channel] = (yyvsp[(3) - (3)].dval); + global_levels[channel] = (yyvsp[(3) - (3)]).dval; } break; - case 26: -#line 245 "testpatterny.y" + case 28: +#line 248 "testpatterny.y" { if (getenv("STP_TESTPATTERN_DEBUG")) - fprintf(stderr, ">>>channel_level %d %f\n", (yyvsp[(2) - (3)].ival), (yyvsp[(3) - (3)].dval)); + fprintf(stderr, ">>>channel_level %d %f\n", (yyvsp[(2) - (3)].ival), (yyvsp[(3) - (3)]).dval); if ((yyvsp[(2) - (3)].ival) >= 0 && (yyvsp[(2) - (3)].ival) <= STP_CHANNEL_LIMIT) - global_levels[(yyvsp[(2) - (3)].ival)] = (yyvsp[(3) - (3)].dval); + global_levels[(yyvsp[(2) - (3)].ival)] = (yyvsp[(3) - (3)]).dval; } break; - case 27: -#line 254 "testpatterny.y" + case 29: +#line 257 "testpatterny.y" { int channel = find_color((yyvsp[(2) - (3)]).sval); if (getenv("STP_TESTPATTERN_DEBUG")) - fprintf(stderr, ">>>gamma %s %f\n", (yyvsp[(2) - (3)]).sval, (yyvsp[(3) - (3)].dval)); + fprintf(stderr, ">>>gamma %s %f\n", (yyvsp[(2) - (3)]).sval, (yyvsp[(3) - (3)]).dval); if (channel >= 0) - global_gammas[channel] = (yyvsp[(3) - (3)].dval); + global_gammas[channel] = (yyvsp[(3) - (3)]).dval; } break; - case 28: -#line 264 "testpatterny.y" + case 30: +#line 267 "testpatterny.y" { if (getenv("STP_TESTPATTERN_DEBUG")) - fprintf(stderr, ">>>channel_gamma %d %f\n", (yyvsp[(2) - (3)].ival), (yyvsp[(3) - (3)].dval)); + fprintf(stderr, ">>>channel_gamma %d %f\n", (yyvsp[(2) - (3)].ival), (yyvsp[(3) - (3)]).dval); if ((yyvsp[(2) - (3)].ival) >= 0 && (yyvsp[(2) - (3)].ival) <= STP_CHANNEL_LIMIT) - global_gammas[(yyvsp[(2) - (3)].ival)] = (yyvsp[(3) - (3)].dval); + global_gammas[(yyvsp[(2) - (3)].ival)] = (yyvsp[(3) - (3)]).dval; } break; - case 29: -#line 273 "testpatterny.y" + case 31: +#line 276 "testpatterny.y" { if (getenv("STP_TESTPATTERN_DEBUG")) - fprintf(stderr, ">>>global_gamma %f\n", (yyvsp[(2) - (2)].dval)); - global_gamma = (yyvsp[(2) - (2)].dval); + fprintf(stderr, ">>>global_gamma %f\n", (yyvsp[(2) - (2)]).dval); + global_gamma = (yyvsp[(2) - (2)]).dval; } break; - case 30: -#line 280 "testpatterny.y" + case 32: +#line 283 "testpatterny.y" { if (getenv("STP_TESTPATTERN_DEBUG")) fprintf(stderr, ">>>steps %d\n", (yyvsp[(2) - (2)].ival)); @@ -1787,17 +1804,17 @@ yyreduce: } break; - case 31: -#line 287 "testpatterny.y" + case 33: +#line 290 "testpatterny.y" { if (getenv("STP_TESTPATTERN_DEBUG")) - fprintf(stderr, ">>>ink_limit %f\n", (yyvsp[(2) - (2)].dval)); - global_ink_limit = (yyvsp[(2) - (2)].dval); + fprintf(stderr, ">>>ink_limit %f\n", (yyvsp[(2) - (2)]).dval); + global_ink_limit = (yyvsp[(2) - (2)]).dval; } break; - case 32: -#line 294 "testpatterny.y" + case 34: +#line 297 "testpatterny.y" { if (getenv("STP_TESTPATTERN_DEBUG")) fprintf(stderr, ">>>printer %s\n", (yyvsp[(2) - (2)].sval)); @@ -1806,8 +1823,8 @@ yyreduce: } break; - case 33: -#line 303 "testpatterny.y" + case 35: +#line 306 "testpatterny.y" { if (getenv("STP_TESTPATTERN_DEBUG")) fprintf(stderr, ">>>page_size_name %s\n", (yyvsp[(2) - (2)].sval)); @@ -1816,8 +1833,8 @@ yyreduce: } break; - case 34: -#line 312 "testpatterny.y" + case 36: +#line 315 "testpatterny.y" { if (getenv("STP_TESTPATTERN_DEBUG")) fprintf(stderr, ">>>page_size_custom %d %d\n", (yyvsp[(2) - (3)].ival), (yyvsp[(3) - (3)].ival)); @@ -1826,8 +1843,8 @@ yyreduce: } break; - case 37: -#line 324 "testpatterny.y" + case 39: +#line 327 "testpatterny.y" { if (getenv("STP_TESTPATTERN_DEBUG")) fprintf(stderr, ">>>parameter_string %s %s\n", (yyvsp[(2) - (3)].sval), (yyvsp[(3) - (3)].sval)); @@ -1837,8 +1854,8 @@ yyreduce: } break; - case 38: -#line 334 "testpatterny.y" + case 40: +#line 337 "testpatterny.y" { if (getenv("STP_TESTPATTERN_DEBUG")) fprintf(stderr, ">>>parameter_int %s %d\n", (yyvsp[(2) - (3)].sval), (yyvsp[(3) - (3)].ival)); @@ -1847,18 +1864,18 @@ yyreduce: } break; - case 39: -#line 343 "testpatterny.y" + case 41: +#line 346 "testpatterny.y" { if (getenv("STP_TESTPATTERN_DEBUG")) - fprintf(stderr, ">>>parameter_float %s %f\n", (yyvsp[(2) - (3)].sval), (yyvsp[(3) - (3)].dval)); - stp_set_float_parameter(global_vars, (yyvsp[(2) - (3)].sval), (yyvsp[(3) - (3)].dval)); + fprintf(stderr, ">>>parameter_float %s %f\n", (yyvsp[(2) - (3)].sval), (yyvsp[(3) - (3)]).dval); + stp_set_float_parameter(global_vars, (yyvsp[(2) - (3)].sval), (yyvsp[(3) - (3)]).dval); free((yyvsp[(2) - (3)].sval)); } break; - case 40: -#line 352 "testpatterny.y" + case 42: +#line 355 "testpatterny.y" { stp_curve_t *curve = stp_curve_create_from_string((yyvsp[(3) - (3)].sval)); if (getenv("STP_TESTPATTERN_DEBUG")) @@ -1872,53 +1889,53 @@ yyreduce: } break; - case 45: -#line 368 "testpatterny.y" + case 47: +#line 371 "testpatterny.y" { if (getenv("STP_TESTPATTERN_DEBUG")) - fprintf(stderr, ">>>density %f\n", (yyvsp[(2) - (2)].dval)); - global_density = (yyvsp[(2) - (2)].dval); + fprintf(stderr, ">>>density %f\n", (yyvsp[(2) - (2)]).dval); + global_density = (yyvsp[(2) - (2)]).dval; } break; - case 46: -#line 375 "testpatterny.y" + case 48: +#line 378 "testpatterny.y" { if (getenv("STP_TESTPATTERN_DEBUG")) - fprintf(stderr, ">>>top %f\n", (yyvsp[(2) - (2)].dval)); - global_xtop = (yyvsp[(2) - (2)].dval); + fprintf(stderr, ">>>top %f\n", (yyvsp[(2) - (2)]).dval); + global_xtop = (yyvsp[(2) - (2)]).dval; } break; - case 47: -#line 382 "testpatterny.y" + case 49: +#line 385 "testpatterny.y" { if (getenv("STP_TESTPATTERN_DEBUG")) - fprintf(stderr, ">>>left %f\n", (yyvsp[(2) - (2)].dval)); - global_xleft = (yyvsp[(2) - (2)].dval); + fprintf(stderr, ">>>left %f\n", (yyvsp[(2) - (2)]).dval); + global_xleft = (yyvsp[(2) - (2)]).dval; } break; - case 48: -#line 389 "testpatterny.y" + case 50: +#line 392 "testpatterny.y" { if (getenv("STP_TESTPATTERN_DEBUG")) - fprintf(stderr, ">>>hsize %f\n", (yyvsp[(2) - (2)].dval)); - global_hsize = (yyvsp[(2) - (2)].dval); + fprintf(stderr, ">>>hsize %f\n", (yyvsp[(2) - (2)]).dval); + global_hsize = (yyvsp[(2) - (2)]).dval; } break; - case 49: -#line 396 "testpatterny.y" + case 51: +#line 399 "testpatterny.y" { if (getenv("STP_TESTPATTERN_DEBUG")) - fprintf(stderr, ">>>vsize %f\n", (yyvsp[(2) - (2)].dval)); - global_vsize = (yyvsp[(2) - (2)].dval); + fprintf(stderr, ">>>vsize %f\n", (yyvsp[(2) - (2)]).dval); + global_vsize = (yyvsp[(2) - (2)]).dval; } break; - case 50: -#line 403 "testpatterny.y" + case 52: +#line 406 "testpatterny.y" { if (getenv("STP_TESTPATTERN_DEBUG")) fprintf(stderr, ">>>blackline %d\n", (yyvsp[(2) - (2)].ival)); @@ -1926,69 +1943,78 @@ yyreduce: } break; - case 51: -#line 411 "testpatterny.y" + case 53: +#line 414 "testpatterny.y" + { + if (getenv("STP_TESTPATTERN_DEBUG")) + fprintf(stderr, ">>>noscale %d\n", (yyvsp[(2) - (2)].ival)); + global_noscale = (yyvsp[(2) - (2)].ival); + } + break; + + case 54: +#line 422 "testpatterny.y" { if (getenv("STP_TESTPATTERN_DEBUG")) - fprintf(stderr, ">>>color_block1 %f %f %f (%d)\n", (yyvsp[(1) - (3)].dval), (yyvsp[(2) - (3)].dval), (yyvsp[(3) - (3)].dval), + fprintf(stderr, ">>>color_block1 %f %f %f (%d)\n", (yyvsp[(1) - (3)]).dval, (yyvsp[(2) - (3)]).dval, (yyvsp[(3) - (3)]).dval, current_index); if (current_index < STP_CHANNEL_LIMIT) { - current_testpattern->d.p.mins[current_index] = (yyvsp[(1) - (3)].dval); - current_testpattern->d.p.vals[current_index] = (yyvsp[(2) - (3)].dval); - current_testpattern->d.p.gammas[current_index] = (yyvsp[(3) - (3)].dval); + current_testpattern->d.pattern.mins[current_index] = (yyvsp[(1) - (3)]).dval; + current_testpattern->d.pattern.vals[current_index] = (yyvsp[(2) - (3)]).dval; + current_testpattern->d.pattern.gammas[current_index] = (yyvsp[(3) - (3)]).dval; current_index++; } } break; - case 57: -#line 435 "testpatterny.y" + case 60: +#line 446 "testpatterny.y" { int channel = find_color((yyvsp[(1) - (4)]).sval); if (getenv("STP_TESTPATTERN_DEBUG")) - fprintf(stderr, ">>>color_block2a %s %f %f %f\n", (yyvsp[(1) - (4)]).sval, (yyvsp[(2) - (4)].dval), (yyvsp[(3) - (4)].dval), (yyvsp[(4) - (4)].dval)); + fprintf(stderr, ">>>color_block2a %s %f %f %f\n", (yyvsp[(1) - (4)]).sval, (yyvsp[(2) - (4)]).dval, (yyvsp[(3) - (4)]).dval, (yyvsp[(4) - (4)]).dval); if (channel >= 0 && channel < STP_CHANNEL_LIMIT) { - current_testpattern->d.p.mins[channel] = (yyvsp[(2) - (4)].dval); - current_testpattern->d.p.vals[channel] = (yyvsp[(3) - (4)].dval); - current_testpattern->d.p.gammas[channel] = (yyvsp[(4) - (4)].dval); + current_testpattern->d.pattern.mins[channel] = (yyvsp[(2) - (4)]).dval; + current_testpattern->d.pattern.vals[channel] = (yyvsp[(3) - (4)]).dval; + current_testpattern->d.pattern.gammas[channel] = (yyvsp[(4) - (4)]).dval; } } break; - case 58: -#line 449 "testpatterny.y" + case 61: +#line 460 "testpatterny.y" { if (getenv("STP_TESTPATTERN_DEBUG")) - fprintf(stderr, ">>>color_block2b %d %f %f %f\n", (yyvsp[(2) - (5)].ival), (yyvsp[(3) - (5)].dval), (yyvsp[(4) - (5)].dval), (yyvsp[(5) - (5)].dval)); + fprintf(stderr, ">>>color_block2b %d %f %f %f\n", (yyvsp[(2) - (5)].ival), (yyvsp[(3) - (5)]).dval, (yyvsp[(4) - (5)]).dval, (yyvsp[(5) - (5)]).dval); if ((yyvsp[(2) - (5)].ival) >= 0 && (yyvsp[(2) - (5)].ival) < STP_CHANNEL_LIMIT) { - current_testpattern->d.p.mins[(yyvsp[(2) - (5)].ival)] = (yyvsp[(3) - (5)].dval); - current_testpattern->d.p.vals[(yyvsp[(2) - (5)].ival)] = (yyvsp[(4) - (5)].dval); - current_testpattern->d.p.gammas[(yyvsp[(2) - (5)].ival)] = (yyvsp[(5) - (5)].dval); + current_testpattern->d.pattern.mins[(yyvsp[(2) - (5)].ival)] = (yyvsp[(3) - (5)]).dval; + current_testpattern->d.pattern.vals[(yyvsp[(2) - (5)].ival)] = (yyvsp[(4) - (5)]).dval; + current_testpattern->d.pattern.gammas[(yyvsp[(2) - (5)].ival)] = (yyvsp[(5) - (5)]).dval; } } break; - case 67: -#line 474 "testpatterny.y" + case 70: +#line 485 "testpatterny.y" { if (getenv("STP_TESTPATTERN_DEBUG")) - fprintf(stderr, ">>>patvars %f %f %f %f %f\n", (yyvsp[(1) - (5)].dval), (yyvsp[(2) - (5)].dval), (yyvsp[(3) - (5)].dval), (yyvsp[(4) - (5)].dval), (yyvsp[(5) - (5)].dval)); - current_testpattern->t = E_PATTERN; - current_testpattern->d.p.lower = (yyvsp[(1) - (5)].dval); - current_testpattern->d.p.upper = (yyvsp[(2) - (5)].dval); - current_testpattern->d.p.levels[1] = (yyvsp[(3) - (5)].dval); - current_testpattern->d.p.levels[2] = (yyvsp[(4) - (5)].dval); - current_testpattern->d.p.levels[3] = (yyvsp[(5) - (5)].dval); + fprintf(stderr, ">>>patvars %f %f %f %f %f\n", (yyvsp[(1) - (5)]).dval, (yyvsp[(2) - (5)]).dval, (yyvsp[(3) - (5)]).dval, (yyvsp[(4) - (5)]).dval, (yyvsp[(5) - (5)]).dval); + current_testpattern->type = E_PATTERN; + current_testpattern->d.pattern.lower = (yyvsp[(1) - (5)]).dval; + current_testpattern->d.pattern.upper = (yyvsp[(2) - (5)]).dval; + current_testpattern->d.pattern.levels[1] = (yyvsp[(3) - (5)]).dval; + current_testpattern->d.pattern.levels[2] = (yyvsp[(4) - (5)]).dval; + current_testpattern->d.pattern.levels[3] = (yyvsp[(5) - (5)]).dval; current_testpattern = get_next_testpattern(); current_index = 0; } break; - case 69: -#line 492 "testpatterny.y" + case 72: +#line 503 "testpatterny.y" { if (getenv("STP_TESTPATTERN_DEBUG")) fprintf(stderr, ">>>xpattern\n"); @@ -1997,34 +2023,34 @@ yyreduce: fprintf(stderr, "xpattern may only be used with extended color depth\n"); exit(1); } - current_testpattern->t = E_XPATTERN; + current_testpattern->type = E_XPATTERN; current_testpattern = get_next_testpattern(); current_index = 0; } break; - case 70: -#line 507 "testpatterny.y" + case 73: +#line 518 "testpatterny.y" { if (getenv("STP_TESTPATTERN_DEBUG")) fprintf(stderr, ">>>grid %d\n", (yyvsp[(2) - (2)].ival)); - current_testpattern->t = E_GRID; - current_testpattern->d.g.ticks = (yyvsp[(2) - (2)].ival); + current_testpattern->type = E_GRID; + current_testpattern->d.grid.ticks = (yyvsp[(2) - (2)].ival); current_testpattern = get_next_testpattern(); current_index = 0; } break; - case 71: -#line 518 "testpatterny.y" + case 74: +#line 529 "testpatterny.y" { if (getenv("STP_TESTPATTERN_DEBUG")) fprintf(stderr, ">>>image %d %d\n", (yyvsp[(2) - (3)].ival), (yyvsp[(3) - (3)].ival)); - current_testpattern->t = E_IMAGE; - current_testpattern->d.i.x = (yyvsp[(2) - (3)].ival); - current_testpattern->d.i.y = (yyvsp[(3) - (3)].ival); - if (current_testpattern->d.i.x <= 0 || - current_testpattern->d.i.y <= 0) + current_testpattern->type = E_IMAGE; + current_testpattern->d.image.x = (yyvsp[(2) - (3)].ival); + current_testpattern->d.image.y = (yyvsp[(3) - (3)].ival); + if (current_testpattern->d.image.x <= 0 || + current_testpattern->d.image.y <= 0) { fprintf(stderr, "image width and height must be greater than zero\n"); exit(1); @@ -2033,16 +2059,16 @@ yyreduce: } break; - case 72: -#line 535 "testpatterny.y" + case 75: +#line 546 "testpatterny.y" { fprintf(stderr,"%s",(yyvsp[(2) - (2)].sval)); free((yyvsp[(2) - (2)].sval)); } break; - case 73: -#line 541 "testpatterny.y" + case 76: +#line 552 "testpatterny.y" { fprintf(stderr,"%s%s", (yyvsp[(2) - (3)].sval), (yyvsp[(3) - (3)].sval)); free((yyvsp[(2) - (3)].sval)); @@ -2050,8 +2076,8 @@ yyreduce: } break; - case 74: -#line 548 "testpatterny.y" + case 77: +#line 559 "testpatterny.y" { fprintf(stderr,"%s%s%s", (yyvsp[(2) - (4)].sval), (yyvsp[(3) - (4)].sval), (yyvsp[(4) - (4)].sval)); free((yyvsp[(2) - (4)].sval)); @@ -2060,8 +2086,8 @@ yyreduce: } break; - case 75: -#line 556 "testpatterny.y" + case 78: +#line 567 "testpatterny.y" { fprintf(stderr, "%s%s%s%s", (yyvsp[(2) - (5)].sval), (yyvsp[(3) - (5)].sval), (yyvsp[(4) - (5)].sval), (yyvsp[(5) - (5)].sval)); free((yyvsp[(2) - (5)].sval)); @@ -2071,8 +2097,8 @@ yyreduce: } break; - case 76: -#line 565 "testpatterny.y" + case 79: +#line 576 "testpatterny.y" { fprintf(stderr, "%s%s%s%s%s", (yyvsp[(2) - (6)].sval), (yyvsp[(3) - (6)].sval), (yyvsp[(4) - (6)].sval), (yyvsp[(5) - (6)].sval), (yyvsp[(6) - (6)].sval)); free((yyvsp[(2) - (6)].sval)); @@ -2083,8 +2109,8 @@ yyreduce: } break; - case 83: -#line 582 "testpatterny.y" + case 86: +#line 593 "testpatterny.y" { if (global_output) free(global_output); @@ -2092,35 +2118,35 @@ yyreduce: } break; - case 84: -#line 589 "testpatterny.y" + case 87: +#line 600 "testpatterny.y" { global_output = (yyvsp[(2) - (2)].sval); } break; - case 107: -#line 605 "testpatterny.y" + case 111: +#line 616 "testpatterny.y" { global_did_something = 1; } break; - case 112: -#line 612 "testpatterny.y" + case 116: +#line 623 "testpatterny.y" { global_did_something = 1; } break; - case 115: -#line 619 "testpatterny.y" + case 119: +#line 630 "testpatterny.y" { global_did_something = 1; } break; - case 121: -#line 629 "testpatterny.y" + case 125: +#line 640 "testpatterny.y" { return 0; } break; - case 122: -#line 633 "testpatterny.y" + case 126: +#line 644 "testpatterny.y" { current_testpattern = get_next_testpattern(); } @@ -2128,7 +2154,7 @@ yyreduce: /* Line 1267 of yacc.c. */ -#line 2132 "testpatterny.c" +#line 2158 "testpatterny.c" default: break; } YY_SYMBOL_PRINT ("-> $$ =", yyr1[yyn], &yyval, &yyloc); @@ -2342,6 +2368,6 @@ yyreturn: } -#line 639 "testpatterny.y" +#line 650 "testpatterny.y" diff --git a/src/testpattern/testpatterny.h b/src/testpattern/testpatterny.h index a005618..fdb65ae 100644 --- a/src/testpattern/testpatterny.h +++ b/src/testpattern/testpatterny.h @@ -65,25 +65,26 @@ HSIZE = 281, VSIZE = 282, BLACKLINE = 283, - PATTERN = 284, - XPATTERN = 285, - EXTENDED = 286, - IMAGE = 287, - GRID = 288, - SEMI = 289, - CHANNEL = 290, - CMYK = 291, - KCMY = 292, - RGB = 293, - CMY = 294, - GRAY = 295, - WHITE = 296, - RAW = 297, - MODE = 298, - PAGESIZE = 299, - MESSAGE = 300, - OUTPUT = 301, - END = 302 + NOSCALE = 284, + PATTERN = 285, + XPATTERN = 286, + EXTENDED = 287, + IMAGE = 288, + GRID = 289, + SEMI = 290, + CHANNEL = 291, + CMYK = 292, + KCMY = 293, + RGB = 294, + CMY = 295, + GRAY = 296, + WHITE = 297, + RAW = 298, + MODE = 299, + PAGESIZE = 300, + MESSAGE = 301, + OUTPUT = 302, + END = 303 }; #endif /* Tokens. */ @@ -113,25 +114,26 @@ #define HSIZE 281 #define VSIZE 282 #define BLACKLINE 283 -#define PATTERN 284 -#define XPATTERN 285 -#define EXTENDED 286 -#define IMAGE 287 -#define GRID 288 -#define SEMI 289 -#define CHANNEL 290 -#define CMYK 291 -#define KCMY 292 -#define RGB 293 -#define CMY 294 -#define GRAY 295 -#define WHITE 296 -#define RAW 297 -#define MODE 298 -#define PAGESIZE 299 -#define MESSAGE 300 -#define OUTPUT 301 -#define END 302 +#define NOSCALE 284 +#define PATTERN 285 +#define XPATTERN 286 +#define EXTENDED 287 +#define IMAGE 288 +#define GRID 289 +#define SEMI 290 +#define CHANNEL 291 +#define CMYK 292 +#define KCMY 293 +#define RGB 294 +#define CMY 295 +#define GRAY 296 +#define WHITE 297 +#define RAW 298 +#define MODE 299 +#define PAGESIZE 300 +#define MESSAGE 301 +#define OUTPUT 302 +#define END 303 diff --git a/src/testpattern/testpatterny.y b/src/testpattern/testpatterny.y index c32b20f..f3527d1 100644 --- a/src/testpattern/testpatterny.y +++ b/src/testpattern/testpatterny.y @@ -1,5 +1,5 @@ /* - * "$Id: testpatterny.y,v 1.26.18.3 2007/12/15 20:35:52 rlk Exp $" + * "$Id: testpatterny.y,v 1.30 2008/01/27 21:44:21 rlk Exp $" * * Test pattern generator for Gimp-Print * @@ -77,7 +77,7 @@ find_color(const char *name) int i = 0; while (color_map[i].name) { - if (strcmp(color_map[i].name, name) == 0) + if (strcasecmp(color_map[i].name, name) == 0) return color_map[i].channel; i++; } @@ -113,6 +113,7 @@ find_color(const char *name) %token HSIZE %token VSIZE %token BLACKLINE +%token NOSCALE %token PATTERN %token XPATTERN %token EXTENDED @@ -140,6 +141,8 @@ find_color(const char *name) COLOR: CYAN | L_CYAN | MAGENTA | L_MAGENTA | YELLOW | D_YELLOW | BLACK | L_BLACK ; +NUMBER: tDOUBLE | tINT +; cmykspec: CMYK tINT { @@ -231,49 +234,49 @@ modespec: cmykspec | kcmyspec | rgbspec | cmyspec | grayspec | whitespec | exten inputspec: MODE modespec ; -level: LEVEL COLOR tDOUBLE +level: LEVEL COLOR NUMBER { int channel = find_color($2.sval); if (getenv("STP_TESTPATTERN_DEBUG")) - fprintf(stderr, ">>>level %s %f\n", $2.sval, $3); + fprintf(stderr, ">>>level %s %f\n", $2.sval, $3.dval); if (channel >= 0) - global_levels[channel] = $3; + global_levels[channel] = $3.dval; } ; -channel_level: LEVEL tINT tDOUBLE +channel_level: LEVEL tINT NUMBER { if (getenv("STP_TESTPATTERN_DEBUG")) - fprintf(stderr, ">>>channel_level %d %f\n", $2, $3); + fprintf(stderr, ">>>channel_level %d %f\n", $2, $3.dval); if ($2 >= 0 && $2 <= STP_CHANNEL_LIMIT) - global_levels[$2] = $3; + global_levels[$2] = $3.dval; } ; -gamma: GAMMA COLOR tDOUBLE +gamma: GAMMA COLOR NUMBER { int channel = find_color($2.sval); if (getenv("STP_TESTPATTERN_DEBUG")) - fprintf(stderr, ">>>gamma %s %f\n", $2.sval, $3); + fprintf(stderr, ">>>gamma %s %f\n", $2.sval, $3.dval); if (channel >= 0) - global_gammas[channel] = $3; + global_gammas[channel] = $3.dval; } ; -channel_gamma: GAMMA tINT tDOUBLE +channel_gamma: GAMMA tINT NUMBER { if (getenv("STP_TESTPATTERN_DEBUG")) - fprintf(stderr, ">>>channel_gamma %d %f\n", $2, $3); + fprintf(stderr, ">>>channel_gamma %d %f\n", $2, $3.dval); if ($2 >= 0 && $2 <= STP_CHANNEL_LIMIT) - global_gammas[$2] = $3; + global_gammas[$2] = $3.dval; } ; -global_gamma: GAMMA tDOUBLE +global_gamma: GAMMA NUMBER { if (getenv("STP_TESTPATTERN_DEBUG")) - fprintf(stderr, ">>>global_gamma %f\n", $2); - global_gamma = $2; + fprintf(stderr, ">>>global_gamma %f\n", $2.dval); + global_gamma = $2.dval; } ; steps: STEPS tINT @@ -283,11 +286,11 @@ steps: STEPS tINT global_steps = $2; } ; -ink_limit: INK_LIMIT tDOUBLE +ink_limit: INK_LIMIT NUMBER { if (getenv("STP_TESTPATTERN_DEBUG")) - fprintf(stderr, ">>>ink_limit %f\n", $2); - global_ink_limit = $2; + fprintf(stderr, ">>>ink_limit %f\n", $2.dval); + global_ink_limit = $2.dval; } ; printer: PRINTER tSTRING @@ -339,11 +342,11 @@ parameter_int: PARAMETER_INT tSTRING tINT } ; -parameter_float: PARAMETER_FLOAT tSTRING tDOUBLE +parameter_float: PARAMETER_FLOAT tSTRING NUMBER { if (getenv("STP_TESTPATTERN_DEBUG")) - fprintf(stderr, ">>>parameter_float %s %f\n", $2, $3); - stp_set_float_parameter(global_vars, $2, $3); + fprintf(stderr, ">>>parameter_float %s %f\n", $2, $3.dval); + stp_set_float_parameter(global_vars, $2, $3.dval); free($2); } ; @@ -364,39 +367,39 @@ parameter_curve: PARAMETER_CURVE tSTRING tSTRING parameter: parameter_string | parameter_int | parameter_float | parameter_curve ; -density: DENSITY tDOUBLE +density: DENSITY NUMBER { if (getenv("STP_TESTPATTERN_DEBUG")) - fprintf(stderr, ">>>density %f\n", $2); - global_density = $2; + fprintf(stderr, ">>>density %f\n", $2.dval); + global_density = $2.dval; } ; -top: TOP tDOUBLE +top: TOP NUMBER { if (getenv("STP_TESTPATTERN_DEBUG")) - fprintf(stderr, ">>>top %f\n", $2); - global_xtop = $2; + fprintf(stderr, ">>>top %f\n", $2.dval); + global_xtop = $2.dval; } ; -left: LEFT tDOUBLE +left: LEFT NUMBER { if (getenv("STP_TESTPATTERN_DEBUG")) - fprintf(stderr, ">>>left %f\n", $2); - global_xleft = $2; + fprintf(stderr, ">>>left %f\n", $2.dval); + global_xleft = $2.dval; } ; -hsize: HSIZE tDOUBLE +hsize: HSIZE NUMBER { if (getenv("STP_TESTPATTERN_DEBUG")) - fprintf(stderr, ">>>hsize %f\n", $2); - global_hsize = $2; + fprintf(stderr, ">>>hsize %f\n", $2.dval); + global_hsize = $2.dval; } ; -vsize: VSIZE tDOUBLE +vsize: VSIZE NUMBER { if (getenv("STP_TESTPATTERN_DEBUG")) - fprintf(stderr, ">>>vsize %f\n", $2); - global_vsize = $2; + fprintf(stderr, ">>>vsize %f\n", $2.dval); + global_vsize = $2.dval; } ; blackline: BLACKLINE tINT @@ -407,16 +410,24 @@ blackline: BLACKLINE tINT } ; -color_block1: tDOUBLE tDOUBLE tDOUBLE +noscale: NOSCALE tINT + { + if (getenv("STP_TESTPATTERN_DEBUG")) + fprintf(stderr, ">>>noscale %d\n", $2); + global_noscale = $2; + } +; + +color_block1: NUMBER NUMBER NUMBER { if (getenv("STP_TESTPATTERN_DEBUG")) - fprintf(stderr, ">>>color_block1 %f %f %f (%d)\n", $1, $2, $3, + fprintf(stderr, ">>>color_block1 %f %f %f (%d)\n", $1.dval, $2.dval, $3.dval, current_index); if (current_index < STP_CHANNEL_LIMIT) { - current_testpattern->d.p.mins[current_index] = $1; - current_testpattern->d.p.vals[current_index] = $2; - current_testpattern->d.p.gammas[current_index] = $3; + current_testpattern->d.pattern.mins[current_index] = $1.dval; + current_testpattern->d.pattern.vals[current_index] = $2.dval; + current_testpattern->d.pattern.gammas[current_index] = $3.dval; current_index++; } } @@ -431,29 +442,29 @@ color_blocks1b: /* empty */ | color_blocks1a color_blocks1: color_block1 color_blocks1b ; -color_block2a: COLOR tDOUBLE tDOUBLE tDOUBLE +color_block2a: COLOR NUMBER NUMBER NUMBER { int channel = find_color($1.sval); if (getenv("STP_TESTPATTERN_DEBUG")) - fprintf(stderr, ">>>color_block2a %s %f %f %f\n", $1.sval, $2, $3, $4); + fprintf(stderr, ">>>color_block2a %s %f %f %f\n", $1.sval, $2.dval, $3.dval, $4.dval); if (channel >= 0 && channel < STP_CHANNEL_LIMIT) { - current_testpattern->d.p.mins[channel] = $2; - current_testpattern->d.p.vals[channel] = $3; - current_testpattern->d.p.gammas[channel] = $4; + current_testpattern->d.pattern.mins[channel] = $2.dval; + current_testpattern->d.pattern.vals[channel] = $3.dval; + current_testpattern->d.pattern.gammas[channel] = $4.dval; } } ; -color_block2b: CHANNEL tINT tDOUBLE tDOUBLE tDOUBLE +color_block2b: CHANNEL tINT NUMBER NUMBER NUMBER { if (getenv("STP_TESTPATTERN_DEBUG")) - fprintf(stderr, ">>>color_block2b %d %f %f %f\n", $2, $3, $4, $5); + fprintf(stderr, ">>>color_block2b %d %f %f %f\n", $2, $3.dval, $4.dval, $5.dval); if ($2 >= 0 && $2 < STP_CHANNEL_LIMIT) { - current_testpattern->d.p.mins[$2] = $3; - current_testpattern->d.p.vals[$2] = $4; - current_testpattern->d.p.gammas[$2] = $5; + current_testpattern->d.pattern.mins[$2] = $3.dval; + current_testpattern->d.pattern.vals[$2] = $4.dval; + current_testpattern->d.pattern.gammas[$2] = $5.dval; } } ; @@ -470,16 +481,16 @@ color_blocks2: /* empty */ | color_blocks2a color_blocks: color_blocks1 | color_blocks2 ; -patvars: tDOUBLE tDOUBLE tDOUBLE tDOUBLE tDOUBLE +patvars: NUMBER NUMBER NUMBER NUMBER NUMBER { if (getenv("STP_TESTPATTERN_DEBUG")) - fprintf(stderr, ">>>patvars %f %f %f %f %f\n", $1, $2, $3, $4, $5); - current_testpattern->t = E_PATTERN; - current_testpattern->d.p.lower = $1; - current_testpattern->d.p.upper = $2; - current_testpattern->d.p.levels[1] = $3; - current_testpattern->d.p.levels[2] = $4; - current_testpattern->d.p.levels[3] = $5; + fprintf(stderr, ">>>patvars %f %f %f %f %f\n", $1.dval, $2.dval, $3.dval, $4.dval, $5.dval); + current_testpattern->type = E_PATTERN; + current_testpattern->d.pattern.lower = $1.dval; + current_testpattern->d.pattern.upper = $2.dval; + current_testpattern->d.pattern.levels[1] = $3.dval; + current_testpattern->d.pattern.levels[2] = $4.dval; + current_testpattern->d.pattern.levels[3] = $5.dval; current_testpattern = get_next_testpattern(); current_index = 0; } @@ -497,7 +508,7 @@ xpattern: XPATTERN color_blocks fprintf(stderr, "xpattern may only be used with extended color depth\n"); exit(1); } - current_testpattern->t = E_XPATTERN; + current_testpattern->type = E_XPATTERN; current_testpattern = get_next_testpattern(); current_index = 0; } @@ -507,8 +518,8 @@ grid: GRID tINT { if (getenv("STP_TESTPATTERN_DEBUG")) fprintf(stderr, ">>>grid %d\n", $2); - current_testpattern->t = E_GRID; - current_testpattern->d.g.ticks = $2; + current_testpattern->type = E_GRID; + current_testpattern->d.grid.ticks = $2; current_testpattern = get_next_testpattern(); current_index = 0; } @@ -518,11 +529,11 @@ image: IMAGE tINT tINT { if (getenv("STP_TESTPATTERN_DEBUG")) fprintf(stderr, ">>>image %d %d\n", $2, $3); - current_testpattern->t = E_IMAGE; - current_testpattern->d.i.x = $2; - current_testpattern->d.i.y = $3; - if (current_testpattern->d.i.x <= 0 || - current_testpattern->d.i.y <= 0) + current_testpattern->type = E_IMAGE; + current_testpattern->d.image.x = $2; + current_testpattern->d.image.y = $3; + if (current_testpattern->d.image.x <= 0 || + current_testpattern->d.image.y <= 0) { fprintf(stderr, "image width and height must be greater than zero\n"); exit(1); @@ -598,7 +609,7 @@ output: A_Output A_Rule: gamma | channel_gamma | level | channel_level | global_gamma | steps | ink_limit | printer | parameter | density | top | left | hsize - | vsize | blackline | inputspec | page_size | message | output + | vsize | blackline | noscale | inputspec | page_size | message | output ; Rule: A_Rule SEMI diff --git a/test/Makefile.am b/test/Makefile.am index 5789ca3..4b0b8c5 100644 --- a/test/Makefile.am +++ b/test/Makefile.am @@ -1,4 +1,4 @@ -## $Id: Makefile.am,v 1.46.8.1 2007/03/02 12:01:35 rlk Exp $ +## $Id: Makefile.am,v 1.48 2007/01/26 01:04:52 rlk Exp $ ## Copyright (C) 2000 Roger Leigh ## ## This program is free software; you can redistribute it and/or modify diff --git a/test/Makefile.in b/test/Makefile.in index 98f5a8a..25a26a1 100644 --- a/test/Makefile.in +++ b/test/Makefile.in @@ -48,13 +48,12 @@ TESTS = curve$(EXEEXT) run-testdither run-weavetest subdir = test 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/isc-posix.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 + $(top_srcdir)/m4/iconv.m4 $(top_srcdir)/m4/isc-posix.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 @@ -156,27 +155,13 @@ 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@ GREP = @GREP@ 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@ @@ -184,13 +169,6 @@ 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@ @@ -295,16 +273,12 @@ docdir = @docdir@ dvidir = @dvidir@ 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@ @@ -333,6 +307,7 @@ target_alias = @target_alias@ top_builddir = @top_builddir@ top_srcdir = @top_srcdir@ AM_CPPFLAGS = -I$(top_srcdir)/include -I$(top_builddir)/include $(LOCAL_CPPFLAGS) $(GNUCFLAGS) +GUTENPRINTUI_LIBS = $(top_builddir)/src/gutenprintui/libgutenprintui.la LOCAL_CPPFLAGS = -I$(top_srcdir)/src/main $(GUTENPRINT_CFLAGS) escp2_weavetest_SOURCES = escp2-weavetest.c escp2_weavetest_LDADD = $(GUTENPRINT_LIBS) diff --git a/test/curve.c b/test/curve.c index 74aefd0..a526ea0 100644 --- a/test/curve.c +++ b/test/curve.c @@ -1,5 +1,5 @@ /* - * "$Id: curve.c,v 1.22 2004/09/17 18:38:28 rleigh Exp $" + * "$Id: curve.c,v 1.23 2008/01/21 23:19:41 rlk Exp $" * * Copyright 2002 Robert Krawitz (rlk@alum.mit.edu) * @@ -115,6 +115,16 @@ static const double standard_sat_adjustment[] = 0.48, 0.47, 0.47, 0.49, 0.49, 0.49, 0.52, 0.51, /* G */ }; +static const double reverse_sat_adjustment[] = +{ + 0.50, 0.51, 0.52, 0.49, 0.49, 0.49, 0.47, 0.47, + 0.48, 0.52, 0.55, 0.6, 0.65, 0.7, 0.8, 0.9, + 1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0, + 1.0, 1.03, 1.06, 1.09, 1.12, 1.15, 1.2, 1.25, + 1.3, 1.15, 1.05, 0.95, 0.9, 0.87, 0.83, 0.8, + 0.78, 0.79, 0.82, 0.86, 0.9 , 0.8, 0.7, 0.6, +}; + static const stp_curve_point_t standard_piecewise_sat_adjustment[] = { { 0.00, 0.50}, @@ -168,6 +178,59 @@ static const stp_curve_point_t standard_piecewise_sat_adjustment[] = { 1.00, 2}, }; +static const stp_curve_point_t reverse_piecewise_sat_adjustment[] = +{ + { 0.00, 0.50}, + { 0.02, 0.6}, + { 0.04, 0.7}, + { 0.06, 0.8}, + { 0.08, 0.9}, + { 0.10, 0.86}, + { 0.12, 0.82}, + { 0.14, 0.79}, + { 0.16, 0.78}, + { 0.18, 0.8}, + { 0.20, 0.83}, + { 0.22, 0.87}, + { 0.24, 0.9}, + { 0.26, 0.95}, + { 0.28, 1.05}, + { 0.30, 1.15}, + { 0.32, 0.05}, + { 0.34, 3.95}, + { 0.36, 0.05}, + { 0.38, 1.15}, + { 0.40, 1.12}, + { 0.42, 1.09}, + { 0.44, 1.06}, + { 0.46, 1.03}, + { 0.48, 1.0}, + { 0.50, 1.0}, + { 0.52, 1.0}, + { 0.54, 1.0}, + { 0.56, 1.0}, + { 0.58, 1.0}, + { 0.60, 1.0}, + { 0.62, 1.0}, + { 0.64, 1.0}, + { 0.66, 0.9}, + { 0.68, 0.8}, + { 0.70, 0.7}, + { 0.72, 0.65}, + { 0.74, 0.6}, + { 0.76, 0.55}, + { 0.78, 0.52}, + { 0.80, 0.48}, + { 0.82, 0.47}, + { 0.84, 0.47}, + { 0.86, 0.49}, + { 0.88, 0.49}, + { 0.90, 0.49}, + { 0.93, 0.52}, + { 0.96, 0.51}, + { 1.00, 2}, +}; + const char *small_piecewise_curve = "\n" " 0x10) pstate.bpp = 2; else pstate.bpp = 1; -- cgit v1.2.3